From owner-p4-projects@FreeBSD.ORG Sun Jul 23 01:35:45 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5BB5516A4E0; Sun, 23 Jul 2006 01:35:45 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 1EDEC16A4DE for ; Sun, 23 Jul 2006 01:35:45 +0000 (UTC) (envelope-from tyler@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id CEA6A43D45 for ; Sun, 23 Jul 2006 01:35:44 +0000 (GMT) (envelope-from tyler@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k6N1Zibw019936 for ; Sun, 23 Jul 2006 01:35:44 GMT (envelope-from tyler@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k6N1ZiY7019933 for perforce@freebsd.org; Sun, 23 Jul 2006 01:35:44 GMT (envelope-from tyler@freebsd.org) Date: Sun, 23 Jul 2006 01:35:44 GMT Message-Id: <200607230135.k6N1ZiY7019933@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to tyler@freebsd.org using -f From: "R. Tyler Ballance" To: Perforce Change Reviews Cc: Subject: PERFORCE change 102175 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 23 Jul 2006 01:35:45 -0000 http://perforce.freebsd.org/chv.cgi?CH=102175 Change 102175 by tyler@orange on 2006/07/23 01:35:20 Merge files from sys/i386, time to start nuking some assembly Affected files ... .. //depot/projects/l4bsd/src/sys/iguana/iguana/apic_vector.s#1 add .. //depot/projects/l4bsd/src/sys/iguana/iguana/atomic.c#1 add .. //depot/projects/l4bsd/src/sys/iguana/iguana/autoconf.c#1 add .. //depot/projects/l4bsd/src/sys/iguana/iguana/bios.c#1 add .. //depot/projects/l4bsd/src/sys/iguana/iguana/bioscall.s#1 add .. //depot/projects/l4bsd/src/sys/iguana/iguana/bpf_jit_machdep.c#1 add .. //depot/projects/l4bsd/src/sys/iguana/iguana/bpf_jit_machdep.h#1 add .. //depot/projects/l4bsd/src/sys/iguana/iguana/busdma_machdep.c#1 add .. //depot/projects/l4bsd/src/sys/iguana/iguana/db_disasm.c#1 add .. //depot/projects/l4bsd/src/sys/iguana/iguana/db_interface.c#1 add .. //depot/projects/l4bsd/src/sys/iguana/iguana/db_trace.c#1 add .. //depot/projects/l4bsd/src/sys/iguana/iguana/dump_machdep.c#1 add .. //depot/projects/l4bsd/src/sys/iguana/iguana/elan-mmcr.c#1 add .. //depot/projects/l4bsd/src/sys/iguana/iguana/elf_machdep.c#1 add .. //depot/projects/l4bsd/src/sys/iguana/iguana/exception.s#1 add .. //depot/projects/l4bsd/src/sys/iguana/iguana/gdb_machdep.c#1 add .. //depot/projects/l4bsd/src/sys/iguana/iguana/genassym.c#1 add .. //depot/projects/l4bsd/src/sys/iguana/iguana/geode.c#1 add .. //depot/projects/l4bsd/src/sys/iguana/iguana/i686_mem.c#1 add .. //depot/projects/l4bsd/src/sys/iguana/iguana/identcpu.c#1 add .. //depot/projects/l4bsd/src/sys/iguana/iguana/in_cksum.c#1 add .. //depot/projects/l4bsd/src/sys/iguana/iguana/initcpu.c#1 add .. //depot/projects/l4bsd/src/sys/iguana/iguana/intr_machdep.c#1 add .. //depot/projects/l4bsd/src/sys/iguana/iguana/io.c#1 add .. //depot/projects/l4bsd/src/sys/iguana/iguana/io_apic.c#1 add .. //depot/projects/l4bsd/src/sys/iguana/iguana/k6_mem.c#1 add .. //depot/projects/l4bsd/src/sys/iguana/iguana/legacy.c#1 add .. //depot/projects/l4bsd/src/sys/iguana/iguana/local_apic.c#1 add .. //depot/projects/l4bsd/src/sys/iguana/iguana/locore.s#1 add .. //depot/projects/l4bsd/src/sys/iguana/iguana/longrun.c#1 add .. //depot/projects/l4bsd/src/sys/iguana/iguana/machdep.c#1 add .. //depot/projects/l4bsd/src/sys/iguana/iguana/mem.c#1 add .. //depot/projects/l4bsd/src/sys/iguana/iguana/minidump_machdep.c#1 add .. //depot/projects/l4bsd/src/sys/iguana/iguana/mp_clock.c#1 add .. //depot/projects/l4bsd/src/sys/iguana/iguana/mp_machdep.c#1 add .. //depot/projects/l4bsd/src/sys/iguana/iguana/mp_watchdog.c#1 add .. //depot/projects/l4bsd/src/sys/iguana/iguana/mpboot.s#1 add .. //depot/projects/l4bsd/src/sys/iguana/iguana/mptable.c#1 add .. //depot/projects/l4bsd/src/sys/iguana/iguana/mptable_pci.c#1 add .. //depot/projects/l4bsd/src/sys/iguana/iguana/nexus.c#1 add .. //depot/projects/l4bsd/src/sys/iguana/iguana/perfmon.c#1 add .. //depot/projects/l4bsd/src/sys/iguana/iguana/pmap.c#1 add .. //depot/projects/l4bsd/src/sys/iguana/iguana/ptrace_machdep.c#1 add .. //depot/projects/l4bsd/src/sys/iguana/iguana/support.s#1 add .. //depot/projects/l4bsd/src/sys/iguana/iguana/swtch.s#1 add .. //depot/projects/l4bsd/src/sys/iguana/iguana/symbols.raw#1 add .. //depot/projects/l4bsd/src/sys/iguana/iguana/sys_machdep.c#1 add .. //depot/projects/l4bsd/src/sys/iguana/iguana/trap.c#1 add .. //depot/projects/l4bsd/src/sys/iguana/iguana/tsc.c#1 add .. //depot/projects/l4bsd/src/sys/iguana/iguana/uio_machdep.c#1 add .. //depot/projects/l4bsd/src/sys/iguana/iguana/vm86.c#1 add .. //depot/projects/l4bsd/src/sys/iguana/iguana/vm86bios.s#1 add .. //depot/projects/l4bsd/src/sys/iguana/iguana/vm_machdep.c#1 add Differences ... From owner-p4-projects@FreeBSD.ORG Sun Jul 23 09:31:30 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8D2AA16A4E1; Sun, 23 Jul 2006 09:31:30 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 5F79816A4DE for ; Sun, 23 Jul 2006 09:31:30 +0000 (UTC) (envelope-from gabor@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 1A7FA43D46 for ; Sun, 23 Jul 2006 09:31:30 +0000 (GMT) (envelope-from gabor@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k6N9VT3e068964 for ; Sun, 23 Jul 2006 09:31:29 GMT (envelope-from gabor@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k6N9VTnT068961 for perforce@freebsd.org; Sun, 23 Jul 2006 09:31:29 GMT (envelope-from gabor@FreeBSD.org) Date: Sun, 23 Jul 2006 09:31:29 GMT Message-Id: <200607230931.k6N9VTnT068961@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to gabor@FreeBSD.org using -f From: Gabor Kovesdan To: Perforce Change Reviews Cc: Subject: PERFORCE change 102178 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 23 Jul 2006 09:31:30 -0000 http://perforce.freebsd.org/chv.cgi?CH=102178 Change 102178 by gabor@gabor_spitfire on 2006/07/23 09:31:02 Fix typo. Reported by: linimon Affected files ... .. //depot/projects/soc2006/gabor_ports/Mk/bsd.openssl.mk#3 edit Differences ... ==== //depot/projects/soc2006/gabor_ports/Mk/bsd.openssl.mk#3 (text+ko) ==== @@ -98,7 +98,7 @@ .endif MAKE_ARGS+= OPENSSL_CFLAGS="${OPENSSL_CFLAGS}" .endif -OPENSSLRPATH= ${DESTDIR}$/usr/lib:${LOCALBASE}/lib +OPENSSLRPATH= ${DESTDIR}/usr/lib:${LOCALBASE}/lib .else From owner-p4-projects@FreeBSD.ORG Sun Jul 23 16:24:36 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D41D516A4E2; Sun, 23 Jul 2006 16:24:35 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 977B816A4DF for ; Sun, 23 Jul 2006 16:24:35 +0000 (UTC) (envelope-from jmg@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 858FB43D64 for ; Sun, 23 Jul 2006 16:24:31 +0000 (GMT) (envelope-from jmg@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k6NGOVIq023328 for ; Sun, 23 Jul 2006 16:24:31 GMT (envelope-from jmg@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k6NGOVYp023325 for perforce@freebsd.org; Sun, 23 Jul 2006 16:24:31 GMT (envelope-from jmg@freebsd.org) Date: Sun, 23 Jul 2006 16:24:31 GMT Message-Id: <200607231624.k6NGOVYp023325@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jmg@freebsd.org using -f From: John-Mark Gurney To: Perforce Change Reviews Cc: Subject: PERFORCE change 102209 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 23 Jul 2006 16:24:36 -0000 http://perforce.freebsd.org/chv.cgi?CH=102209 Change 102209 by jmg@jmg_carbon on 2006/07/23 16:23:46 bring in my pci work from my branch... This gets me into the ath hal, but for some reason it crashes in the hal... Interrupts are still not implemented, I think this will be required to be a pci hint since it is possible for there to be more than the normal four pci ints.. Affected files ... .. //depot/projects/arm/src/sys/arm/xscale/ixp425/files.ixp425#3 integrate .. //depot/projects/arm/src/sys/arm/xscale/ixp425/ixp425.c#7 integrate .. //depot/projects/arm/src/sys/arm/xscale/ixp425/ixp425_pci.c#1 branch .. //depot/projects/arm/src/sys/arm/xscale/ixp425/ixp425var.h#3 integrate Differences ... ==== //depot/projects/arm/src/sys/arm/xscale/ixp425/files.ixp425#3 (text+ko) ==== @@ -4,9 +4,10 @@ arm/xscale/ixp425/ixp425.c standard arm/xscale/ixp425/ixp425_mem.c standard arm/xscale/ixp425/ixp425_space.c standard -arm/xscale/ixp425/ixp425_pci_asm.S standard -arm/xscale/ixp425/ixp425_pci_space.c standard arm/xscale/ixp425/ixp425_timer.c standard +arm/xscale/ixp425/ixp425_pci.c optional pci +arm/xscale/ixp425/ixp425_pci_asm.S optional pci +arm/xscale/ixp425/ixp425_pci_space.c optional pci arm/xscale/ixp425/uart_cpu_ixp425.c optional uart arm/xscale/ixp425/uart_bus_ixp425.c optional uart arm/xscale/ixp425/ixp425_a4x_space.c optional uart ==== //depot/projects/arm/src/sys/arm/xscale/ixp425/ixp425.c#7 (text+ko) ==== @@ -56,23 +56,39 @@ volatile uint32_t intr_enabled; uint32_t intr_steer = 0; -struct ixp425_softc *ixp425_softc; +struct ixp425_softc *ixp425_softc = NULL; + +static int ixp425_probe(device_t); +static void ixp425_identify(driver_t *, device_t); +static int ixp425_attach(device_t); -int ixp425_probe(device_t); -void ixp425_identify(driver_t *, device_t); -int ixp425_attach(device_t); +static struct { + uint32_t hwbase; + uint32_t size; + uint32_t vbase; +} hwvtrans[] = { + { IXP425_IO_HWBASE, IXP425_IO_SIZE, IXP425_IO_VBASE }, + { IXP425_EXP_HWBASE, IXP425_EXP_SIZE, IXP425_EXP_VBASE }, + { IXP425_PCI_HWBASE, IXP425_PCI_SIZE, IXP425_PCI_VBASE }, + { IXP425_PCI_MEM_HWBASE, IXP425_PCI_MEM_SIZE, IXP425_PCI_MEM_VBASE }, + /*{ IXP425_PCI_IO_HWBASE, IXP425_PCI_IO_SIZE, IXP425_PCI_IO_VBASE },*/ + { IXP425_MCU_HWBASE, IXP425_MCU_SIZE, IXP425_MCU_VBASE }, +}; -int -ixp425_probe(device_t dev) +static int +getvbase(uint32_t hwbase, uint32_t size, uint32_t *vbase) { - device_set_desc(dev, "Intel IXP425"); - return (0); -} + int i; + + for (i = 0; i < sizeof hwvtrans / sizeof *hwvtrans; i++) { + if (hwbase >= hwvtrans[i].hwbase && + hwbase + size <= hwvtrans[i].hwbase + hwvtrans[i].size) { + *vbase = hwbase - hwvtrans[i].hwbase + hwvtrans[i].vbase; + return (0); + } + } -void -ixp425_identify(driver_t *driver, device_t parent) -{ - BUS_ADD_CHILD(parent, 0, "ixp", 0); + return (ENOENT); } struct arm32_dma_range * @@ -87,58 +103,6 @@ return (0); } -int -ixp425_attach(device_t dev) -{ - struct ixp425_softc *sc = device_get_softc(dev); - int unit = device_get_unit(dev); - sc->sc_iot = &ixp425_bs_tag; - ixp425_softc = sc; - - /* - * Mapping for PCI CSR - */ - if (bus_space_map(sc->sc_iot, IXP425_PCI_HWBASE, IXP425_PCI_SIZE, - 0, &sc->sc_pci_ioh)) - panic("ixp%d: unable to map PCI registers", unit); - - /* - * Mapping for GPIO Registers - */ - if (bus_space_map(sc->sc_iot, IXP425_GPIO_HWBASE, IXP425_GPIO_SIZE, - 0, &sc->sc_gpio_ioh)) - panic("ixp%d: unable to map GPIO registers", unit); - - /* - * Mapping for Expansion Bus Registers - */ - if (bus_space_map(sc->sc_iot, IXP425_EXP_HWBASE, IXP425_EXP_SIZE, - 0, &sc->sc_ioh)) - panic("ixp%d: unable to map expansion bus registers", unit); - - intr_enabled = 0; - ixp425_set_intrmask(); - ixp425_set_intrsteer(); - - sc->sc_irq_rman.rm_type = RMAN_ARRAY; - sc->sc_irq_rman.rm_descr = "IXP425 IRQs"; - if (rman_init(&sc->sc_irq_rman) != 0 || - rman_manage_region(&sc->sc_irq_rman, 0, 31) != 0) - panic("ixp425_attach: failed to set up IRQ rman"); - - sc->sc_sysmem_rman.rm_type = RMAN_ARRAY; - sc->sc_sysmem_rman.rm_descr = "IXP425 System memory"; - if (rman_init(&sc->sc_sysmem_rman) != 0 || - rman_manage_region(&sc->sc_sysmem_rman, IXP425_IO_VBASE, - IXP425_IO_VBASE + IXP425_IO_SIZE) != 0) - panic("ixp425_attach: failed to set up sys mem rman"); - device_add_child(dev, "ixpclk", 0); - bus_generic_probe(dev); - bus_generic_attach(dev); - - return (0); -} - void arm_mask_irq(uintptr_t nb) { @@ -160,7 +124,7 @@ } int -arm_get_next_irq() +arm_get_next_irq(void) { int irq; @@ -170,7 +134,7 @@ } void -cpu_reset() +cpu_reset(void) { u_int32_t reg; @@ -179,10 +143,10 @@ /* * Map the boot Flash device down at physical address 0. */ - reg = bus_space_read_4(ixp425_softc->sc_iot, IXP425_EXP_VBASE, + reg = bus_space_read_4(&ixp425_bs_tag, IXP425_EXP_VBASE, EXP_CNFG0_OFFSET); reg |= EXP_CNFG0_MEM_MAP; - bus_space_write_4(ixp425_softc->sc_iot, IXP425_EXP_VBASE, + bus_space_write_4(&ixp425_bs_tag, IXP425_EXP_VBASE, EXP_CNFG0_OFFSET, reg); cpu_idcache_wbinv_all(); /* Jump into the bootcode's reset vector. */ @@ -200,30 +164,90 @@ for(;;); } +static void +ixp425_identify(driver_t *driver, device_t parent) +{ + BUS_ADD_CHILD(parent, 0, "ixp", 0); +} + +static int +ixp425_probe(device_t dev) +{ + device_set_desc(dev, "Intel IXP425"); + return (0); +} + +static int +ixp425_attach(device_t dev) +{ + struct ixp425_softc *sc; + + sc = device_get_softc(dev); + sc->sc_iot = &ixp425_bs_tag; + KASSERT(ixp425_softc == NULL, ("ixp425_attach called twice?")); + ixp425_softc = sc; + + intr_enabled = 0; + ixp425_set_intrmask(); + ixp425_set_intrsteer(); + + sc->sc_irq_rman.rm_type = RMAN_ARRAY; + sc->sc_irq_rman.rm_descr = "IXP425 IRQs"; + if (rman_init(&sc->sc_irq_rman) != 0 || + rman_manage_region(&sc->sc_irq_rman, 0, 31) != 0) + panic("ixp425_attach: failed to set up IRQ rman"); + + sc->sc_mem_rman.rm_type = RMAN_ARRAY; + sc->sc_mem_rman.rm_descr = "IXP425 Memory"; + if (rman_init(&sc->sc_mem_rman) != 0 || + rman_manage_region(&sc->sc_mem_rman, 0, ~0) != 0) + panic("ixp425_attach: failed to set up IRQ rman"); + + device_add_child(dev, "pcib", 0); + device_add_child(dev, "ixpclk", 0); + + bus_generic_probe(dev); + bus_generic_attach(dev); + + return (0); +} + static struct resource * ixp425_alloc_resource(device_t dev, device_t child, int type, int *rid, u_long start, u_long end, u_long count, u_int flags) { struct ixp425_softc *sc = device_get_softc(dev); + struct rman *rmanp; struct resource *rv; + uint32_t vbase; + + rv = NULL; + + switch (type) { + case SYS_RES_IRQ: + rmanp = &sc->sc_irq_rman; + break; + + case SYS_RES_MEMORY: + rmanp = &sc->sc_mem_rman; + if (getvbase(start, end - start, &vbase)) + return (rv); + break; - if (type == SYS_RES_IRQ) { - rv = rman_reserve_resource(&sc->sc_irq_rman, - start, end, count, flags, child); - if (rv != NULL) - rman_set_rid(rv, *rid); + default: return (rv); } - if (type == SYS_RES_MEMORY) { - rv = rman_reserve_resource(&sc->sc_sysmem_rman, - start, end, count, flags, child); - if (rv != NULL) { - rman_set_bustag(rv, &ixp425_bs_tag); - rman_set_bushandle(rv, start); - return (rv); + + rv = rman_reserve_resource(rmanp, start, end, count, flags, child); + if (rv != NULL) { + rman_set_rid(rv, *rid); + if (type == SYS_RES_MEMORY) { + rman_set_bustag(rv, sc->sc_iot); + rman_set_bushandle(rv, vbase); } } - return (NULL); + + return (rv); } static int @@ -231,6 +255,7 @@ struct resource *ires, int flags, driver_intr_t *intr, void *arg, void **cookiep) { + BUS_SETUP_INTR(device_get_parent(dev), child, ires, flags, intr, arg, cookiep); intr_enabled |= 1 << rman_get_start(ires); @@ -243,16 +268,21 @@ ixp425_teardown_intr(device_t dev, device_t child, struct resource *res, void *cookie) { + return (BUS_TEARDOWN_INTR(device_get_parent(dev), child, res, cookie)); } static device_method_t ixp425_methods[] = { + /* Device interface */ DEVMETHOD(device_probe, ixp425_probe), DEVMETHOD(device_attach, ixp425_attach), DEVMETHOD(device_identify, ixp425_identify), + + /* Bus interface */ DEVMETHOD(bus_alloc_resource, ixp425_alloc_resource), DEVMETHOD(bus_setup_intr, ixp425_setup_intr), DEVMETHOD(bus_teardown_intr, ixp425_teardown_intr), + {0, 0}, }; ==== //depot/projects/arm/src/sys/arm/xscale/ixp425/ixp425var.h#3 (text+ko) ==== @@ -47,13 +47,6 @@ #include #include -#define PCI_CSR_WRITE_4(sc, reg, data) \ - bus_space_write_4(sc->sc_iot, sc->sc_pci_ioh, \ - reg, data) - -#define PCI_CSR_READ_4(sc, reg) \ - bus_space_read_4(sc->sc_iot, sc->sc_pci_ioh, reg) - #define GPIO_CONF_WRITE_4(sc, reg, data) \ bus_space_write_4(sc->sc_iot, sc->sc_gpio_ioh, \ reg, data) @@ -61,32 +54,14 @@ #define GPIO_CONF_READ_4(sc, reg) \ bus_space_read_4(sc->sc_iot, sc->sc_gpio_ioh, reg) -#define PCI_CONF_LOCK(s) (s) = disable_interrupts(I32_bit) -#define PCI_CONF_UNLOCK(s) restore_interrupts((s)) - struct ixp425_softc { device_t sc_dev; bus_space_tag_t sc_iot; - bus_space_handle_t sc_ioh; /* IRQ handle */ u_int32_t sc_intrmask; - /* Handles for the various subregions. */ - bus_space_handle_t sc_pci_ioh; /* PCI mem handler */ - bus_space_handle_t sc_gpio_ioh; /* GPIOs handler */ - - /* Bus space, DMA, and PCI tags for the PCI bus */ - struct bus_space sc_pci_iot; - struct bus_space sc_pci_memt; - vm_offset_t sc_pci_va; struct rman sc_irq_rman; - struct rman sc_sysmem_rman; - - /* GPIO configuration */ - u_int32_t sc_gpio_out; - u_int32_t sc_gpio_oe; - u_int32_t sc_gpio_intr1; - u_int32_t sc_gpio_intr2; + struct rman sc_mem_rman; }; extern struct bus_space ixpsip_bs_tag; From owner-p4-projects@FreeBSD.ORG Sun Jul 23 20:47:06 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3C05E16A4DF; Sun, 23 Jul 2006 20:47:06 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 092E716A4DA for ; Sun, 23 Jul 2006 20:47:06 +0000 (UTC) (envelope-from tyler@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 928BA43D46 for ; Sun, 23 Jul 2006 20:47:05 +0000 (GMT) (envelope-from tyler@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k6NKl5sJ053264 for ; Sun, 23 Jul 2006 20:47:05 GMT (envelope-from tyler@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k6NKkvdu049954 for perforce@freebsd.org; Sun, 23 Jul 2006 20:46:57 GMT (envelope-from tyler@freebsd.org) Date: Sun, 23 Jul 2006 20:46:57 GMT Message-Id: <200607232046.k6NKkvdu049954@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to tyler@freebsd.org using -f From: "R. Tyler Ballance" To: Perforce Change Reviews Cc: Subject: PERFORCE change 102218 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 23 Jul 2006 20:47:06 -0000 http://perforce.freebsd.org/chv.cgi?CH=102218 Change 102218 by tyler@orange on 2006/07/23 20:46:49 Integrate -CURRENT tree before following Warner's steps for 'building a sandboxed kernel' (http://lists.freebsd.org/pipermail/freebsd-hackers/2006-July/017344.html) Affected files ... .. //depot/projects/l4bsd/src/etc/defaults/rc.conf#3 integrate .. //depot/projects/l4bsd/src/etc/rc.d/archdep#2 integrate .. //depot/projects/l4bsd/src/etc/rc.d/mountcritlocal#2 integrate .. //depot/projects/l4bsd/src/etc/rc.d/mountlate#1 branch .. //depot/projects/l4bsd/src/etc/rc.d/ntpdate#2 integrate .. //depot/projects/l4bsd/src/gnu/usr.bin/binutils/ld/Makefile.alpha#2 integrate .. //depot/projects/l4bsd/src/gnu/usr.bin/binutils/ld/Makefile.amd64#2 integrate .. //depot/projects/l4bsd/src/gnu/usr.bin/binutils/ld/Makefile.arm#1 branch .. //depot/projects/l4bsd/src/gnu/usr.bin/binutils/ld/Makefile.i386#2 integrate .. //depot/projects/l4bsd/src/gnu/usr.bin/binutils/ld/Makefile.ia64#2 integrate .. //depot/projects/l4bsd/src/gnu/usr.bin/binutils/libbfd/Makefile.arm#1 branch .. //depot/projects/l4bsd/src/gnu/usr.bin/binutils/libopcodes/Makefile.arm#1 branch .. //depot/projects/l4bsd/src/gnu/usr.bin/cc/cc_tools/auto-host.h#2 integrate .. //depot/projects/l4bsd/src/gnu/usr.bin/gdb/kgdb/trgt_arm.c#1 branch .. //depot/projects/l4bsd/src/gnu/usr.bin/send-pr/categories#2 integrate .. //depot/projects/l4bsd/src/lib/libc/gen/getgrent.c#3 integrate .. //depot/projects/l4bsd/src/lib/libc/net/getaddrinfo.c#2 integrate .. //depot/projects/l4bsd/src/lib/libc/net/name6.c#2 integrate .. //depot/projects/l4bsd/src/lib/libc/net/resolver.3#2 integrate .. //depot/projects/l4bsd/src/lib/libc/sys/Symbol.map#2 integrate .. //depot/projects/l4bsd/src/lib/libdevinfo/devinfo.c#2 integrate .. //depot/projects/l4bsd/src/lib/libpam/libpam/security/pam_mod_misc.h#2 integrate .. //depot/projects/l4bsd/src/lib/libthr/sys/thr_error.c#2 integrate .. //depot/projects/l4bsd/src/lib/libthr/thread/thr_attr.c#2 integrate .. //depot/projects/l4bsd/src/lib/libthr/thread/thr_create.c#2 integrate .. //depot/projects/l4bsd/src/lib/libthr/thread/thr_getschedparam.c#2 integrate .. //depot/projects/l4bsd/src/lib/libthr/thread/thr_init.c#2 integrate .. //depot/projects/l4bsd/src/lib/libthr/thread/thr_list.c#2 integrate .. //depot/projects/l4bsd/src/lib/libthr/thread/thr_mutex.c#3 integrate .. //depot/projects/l4bsd/src/lib/libthr/thread/thr_private.h#3 integrate .. //depot/projects/l4bsd/src/lib/libthr/thread/thr_setprio.c#2 integrate .. //depot/projects/l4bsd/src/lib/libthr/thread/thr_setschedparam.c#2 integrate .. //depot/projects/l4bsd/src/lib/libutil/humanize_number.3#2 integrate .. //depot/projects/l4bsd/src/lib/libutil/kld.3#2 integrate .. //depot/projects/l4bsd/src/lib/libypclnt/ypclnt.h#2 integrate .. //depot/projects/l4bsd/src/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#3 integrate .. //depot/projects/l4bsd/src/sbin/growfs/growfs.c#2 integrate .. //depot/projects/l4bsd/src/sbin/mount/mount.8#2 integrate .. //depot/projects/l4bsd/src/sbin/mount/mount.c#3 integrate .. //depot/projects/l4bsd/src/sbin/mount_udf/Makefile#2 integrate .. //depot/projects/l4bsd/src/secure/lib/libcrypto/Makefile.inc#2 integrate .. //depot/projects/l4bsd/src/share/examples/etc/make.conf#2 integrate .. //depot/projects/l4bsd/src/share/man/man4/Makefile#3 integrate .. //depot/projects/l4bsd/src/share/man/man4/ipw.4#2 integrate .. //depot/projects/l4bsd/src/share/man/man4/iwi.4#2 integrate .. //depot/projects/l4bsd/src/share/man/man4/man4.i386/padlock.4#3 integrate .. //depot/projects/l4bsd/src/share/man/man4/pcn.4#2 integrate .. //depot/projects/l4bsd/src/share/man/man4/random.4#2 integrate .. //depot/projects/l4bsd/src/share/man/man4/snd_emu10kx.4#1 branch .. //depot/projects/l4bsd/src/share/man/man5/rc.conf.5#3 integrate .. //depot/projects/l4bsd/src/share/man/man7/security.7#2 integrate .. //depot/projects/l4bsd/src/share/man/man9/Makefile#3 integrate .. //depot/projects/l4bsd/src/share/man/man9/mac.9#3 integrate .. //depot/projects/l4bsd/src/share/man/man9/rwlock.9#2 integrate .. //depot/projects/l4bsd/src/share/man/man9/sx.9#2 integrate .. //depot/projects/l4bsd/src/share/mk/bsd.cpu.mk#2 integrate .. //depot/projects/l4bsd/src/sys/amd64/amd64/db_trace.c#2 integrate .. //depot/projects/l4bsd/src/sys/amd64/amd64/identcpu.c#2 integrate .. //depot/projects/l4bsd/src/sys/amd64/amd64/intr_machdep.c#2 integrate .. //depot/projects/l4bsd/src/sys/amd64/amd64/local_apic.c#2 integrate .. //depot/projects/l4bsd/src/sys/amd64/amd64/pmap.c#3 integrate .. //depot/projects/l4bsd/src/sys/amd64/include/specialreg.h#2 integrate .. //depot/projects/l4bsd/src/sys/amd64/linux32/linux32_proto.h#3 integrate .. //depot/projects/l4bsd/src/sys/amd64/linux32/linux32_syscall.h#3 integrate .. //depot/projects/l4bsd/src/sys/amd64/linux32/linux32_sysent.c#3 integrate .. //depot/projects/l4bsd/src/sys/amd64/linux32/syscalls.master#3 integrate .. //depot/projects/l4bsd/src/sys/arm/arm/db_trace.c#2 integrate .. //depot/projects/l4bsd/src/sys/arm/arm/gdb_machdep.c#1 branch .. //depot/projects/l4bsd/src/sys/arm/arm/in_cksum.c#2 integrate .. //depot/projects/l4bsd/src/sys/arm/arm/pmap.c#3 integrate .. //depot/projects/l4bsd/src/sys/arm/arm/vm_machdep.c#3 integrate .. //depot/projects/l4bsd/src/sys/arm/at91/at91_pio.c#3 integrate .. //depot/projects/l4bsd/src/sys/arm/at91/at91_piovar.h#2 integrate .. //depot/projects/l4bsd/src/sys/arm/at91/at91_pmc.c#3 integrate .. //depot/projects/l4bsd/src/sys/arm/at91/at91_rtc.c#2 integrate .. //depot/projects/l4bsd/src/sys/arm/at91/at91_rtcreg.h#2 integrate .. //depot/projects/l4bsd/src/sys/arm/at91/at91_spi.c#2 integrate .. //depot/projects/l4bsd/src/sys/arm/at91/at91_spireg.h#2 integrate .. //depot/projects/l4bsd/src/sys/arm/at91/at91_ssc.c#2 integrate .. //depot/projects/l4bsd/src/sys/arm/at91/at91_st.c#2 integrate .. //depot/projects/l4bsd/src/sys/arm/at91/at91_twi.c#2 integrate .. //depot/projects/l4bsd/src/sys/arm/at91/files.at91#3 integrate .. //depot/projects/l4bsd/src/sys/arm/at91/if_ate.c#3 integrate .. //depot/projects/l4bsd/src/sys/arm/at91/kb920x_machdep.c#3 integrate .. //depot/projects/l4bsd/src/sys/arm/at91/std.at91#2 integrate .. //depot/projects/l4bsd/src/sys/arm/at91/std.kb920x#2 integrate .. //depot/projects/l4bsd/src/sys/arm/at91/uart_dev_at91usart.c#3 integrate .. //depot/projects/l4bsd/src/sys/arm/conf/KB920X#3 integrate .. //depot/projects/l4bsd/src/sys/arm/include/gdb_machdep.h#1 branch .. //depot/projects/l4bsd/src/sys/arm/xscale/i80321/i80321_timer.c#2 integrate .. //depot/projects/l4bsd/src/sys/cam/scsi/scsi_cd.c#2 integrate .. //depot/projects/l4bsd/src/sys/cam/scsi/scsi_da.c#2 integrate .. //depot/projects/l4bsd/src/sys/compat/freebsd32/syscalls.master#3 integrate .. //depot/projects/l4bsd/src/sys/compat/linux/linux_file.c#2 integrate .. //depot/projects/l4bsd/src/sys/compat/linux/linux_misc.c#3 integrate .. //depot/projects/l4bsd/src/sys/compat/linux/linux_socket.c#3 integrate .. //depot/projects/l4bsd/src/sys/compat/svr4/svr4_misc.c#3 integrate .. //depot/projects/l4bsd/src/sys/compat/svr4/svr4_proto.h#3 integrate .. //depot/projects/l4bsd/src/sys/compat/svr4/svr4_socket.c#2 integrate .. //depot/projects/l4bsd/src/sys/compat/svr4/svr4_socket.h#2 integrate .. //depot/projects/l4bsd/src/sys/compat/svr4/svr4_stream.c#3 integrate .. //depot/projects/l4bsd/src/sys/compat/svr4/svr4_syscall.h#3 integrate .. //depot/projects/l4bsd/src/sys/compat/svr4/svr4_syscallnames.c#3 integrate .. //depot/projects/l4bsd/src/sys/compat/svr4/svr4_sysent.c#3 integrate .. //depot/projects/l4bsd/src/sys/compat/svr4/svr4_sysvec.c#2 integrate .. //depot/projects/l4bsd/src/sys/compat/svr4/syscalls.master#3 integrate .. //depot/projects/l4bsd/src/sys/conf/Makefile.arm#3 integrate .. //depot/projects/l4bsd/src/sys/conf/NOTES#3 integrate .. //depot/projects/l4bsd/src/sys/conf/files#3 integrate .. //depot/projects/l4bsd/src/sys/conf/files.arm#3 integrate .. //depot/projects/l4bsd/src/sys/conf/files.i386#3 integrate .. //depot/projects/l4bsd/src/sys/conf/files.ia64#3 integrate .. //depot/projects/l4bsd/src/sys/conf/kern.pre.mk#3 integrate .. //depot/projects/l4bsd/src/sys/conf/options#3 integrate .. //depot/projects/l4bsd/src/sys/conf/options.arm#3 integrate .. //depot/projects/l4bsd/src/sys/contrib/pf/net/pf_ioctl.c#2 integrate .. //depot/projects/l4bsd/src/sys/crypto/via/padlock.c#3 integrate .. //depot/projects/l4bsd/src/sys/crypto/via/padlock.h#1 branch .. //depot/projects/l4bsd/src/sys/crypto/via/padlock_cipher.c#1 branch .. //depot/projects/l4bsd/src/sys/crypto/via/padlock_hash.c#1 branch .. //depot/projects/l4bsd/src/sys/ddb/db_command.c#2 integrate .. //depot/projects/l4bsd/src/sys/ddb/db_output.c#2 integrate .. //depot/projects/l4bsd/src/sys/ddb/db_output.h#2 integrate .. //depot/projects/l4bsd/src/sys/ddb/db_ps.c#2 integrate .. //depot/projects/l4bsd/src/sys/ddb/db_thread.c#2 integrate .. //depot/projects/l4bsd/src/sys/ddb/ddb.h#2 integrate .. //depot/projects/l4bsd/src/sys/dev/aac/aac_cam.c#2 integrate .. //depot/projects/l4bsd/src/sys/dev/acpica/acpi_perf.c#2 integrate .. //depot/projects/l4bsd/src/sys/dev/amr/amr.c#2 integrate .. //depot/projects/l4bsd/src/sys/dev/ata/ata-queue.c#2 integrate .. //depot/projects/l4bsd/src/sys/dev/bce/if_bce.c#3 integrate .. //depot/projects/l4bsd/src/sys/dev/em/if_em.c#3 integrate .. //depot/projects/l4bsd/src/sys/dev/em/if_em.h#2 integrate .. //depot/projects/l4bsd/src/sys/dev/fdc/fdc.c#3 integrate .. //depot/projects/l4bsd/src/sys/dev/iicbus/iic.c#2 integrate .. //depot/projects/l4bsd/src/sys/dev/iicbus/iic.h#2 integrate .. //depot/projects/l4bsd/src/sys/dev/iicbus/iicbus.c#2 integrate .. //depot/projects/l4bsd/src/sys/dev/iicbus/iicbus.h#2 integrate .. //depot/projects/l4bsd/src/sys/dev/iicbus/iicbus_if.m#2 integrate .. //depot/projects/l4bsd/src/sys/dev/iicbus/iiconf.c#2 integrate .. //depot/projects/l4bsd/src/sys/dev/iicbus/iiconf.h#2 integrate .. //depot/projects/l4bsd/src/sys/dev/isp/isp.c#3 integrate .. //depot/projects/l4bsd/src/sys/dev/isp/isp_freebsd.c#3 integrate .. //depot/projects/l4bsd/src/sys/dev/isp/isp_library.c#2 integrate .. //depot/projects/l4bsd/src/sys/dev/isp/isp_pci.c#3 integrate .. //depot/projects/l4bsd/src/sys/dev/isp/isp_sbus.c#3 integrate .. //depot/projects/l4bsd/src/sys/dev/isp/isp_target.c#3 integrate .. //depot/projects/l4bsd/src/sys/dev/lmc/if_lmc.c#2 integrate .. //depot/projects/l4bsd/src/sys/dev/lmc/if_lmc.h#3 integrate .. //depot/projects/l4bsd/src/sys/dev/mpt/mpt.c#3 integrate .. //depot/projects/l4bsd/src/sys/dev/mpt/mpt.h#3 integrate .. //depot/projects/l4bsd/src/sys/dev/mpt/mpt_cam.c#3 integrate .. //depot/projects/l4bsd/src/sys/dev/mpt/mpt_debug.c#3 integrate .. //depot/projects/l4bsd/src/sys/dev/mpt/mpt_pci.c#3 integrate .. //depot/projects/l4bsd/src/sys/dev/mpt/mpt_raid.c#3 integrate .. //depot/projects/l4bsd/src/sys/dev/mpt/mpt_raid.h#3 integrate .. //depot/projects/l4bsd/src/sys/dev/mxge/if_mxge.c#2 integrate .. //depot/projects/l4bsd/src/sys/dev/ncv/ncr53c500_pccard.c#2 integrate .. //depot/projects/l4bsd/src/sys/dev/pccard/pccarddevs#2 integrate .. //depot/projects/l4bsd/src/sys/dev/pci/pci.c#2 integrate .. //depot/projects/l4bsd/src/sys/dev/random/probe.c#2 integrate .. //depot/projects/l4bsd/src/sys/dev/sio/sio.c#3 integrate .. //depot/projects/l4bsd/src/sys/dev/sk/if_sk.c#3 integrate .. //depot/projects/l4bsd/src/sys/dev/sk/if_skreg.h#2 integrate .. //depot/projects/l4bsd/src/sys/dev/sound/driver.c#3 integrate .. //depot/projects/l4bsd/src/sys/dev/sound/midi/sequencer.c#2 integrate .. //depot/projects/l4bsd/src/sys/dev/sound/pci/cmi.c#3 integrate .. //depot/projects/l4bsd/src/sys/dev/sound/pci/emu10k1.c#3 integrate .. //depot/projects/l4bsd/src/sys/dev/sound/pci/emu10kx-midi.c#1 branch .. //depot/projects/l4bsd/src/sys/dev/sound/pci/emu10kx-pcm.c#1 branch .. //depot/projects/l4bsd/src/sys/dev/sound/pci/emu10kx.c#1 branch .. //depot/projects/l4bsd/src/sys/dev/sound/pci/emu10kx.h#1 branch .. //depot/projects/l4bsd/src/sys/dev/sound/pcm/buffer.c#2 integrate .. //depot/projects/l4bsd/src/sys/dev/sound/pcm/buffer.h#2 integrate .. //depot/projects/l4bsd/src/sys/dev/sound/pcm/mixer.h#2 integrate .. //depot/projects/l4bsd/src/sys/dev/sound/pcm/sound.c#3 integrate .. //depot/projects/l4bsd/src/sys/dev/sound/pcm/sound.h#2 integrate .. //depot/projects/l4bsd/src/sys/dev/spibus/spi.h#1 branch .. //depot/projects/l4bsd/src/sys/dev/spibus/spibus.c#1 branch .. //depot/projects/l4bsd/src/sys/dev/spibus/spibus_if.m#1 branch .. //depot/projects/l4bsd/src/sys/dev/spibus/spibusvar.h#1 branch .. //depot/projects/l4bsd/src/sys/dev/stg/tmc18c30_subr.c#2 integrate .. //depot/projects/l4bsd/src/sys/dev/streams/streams.c#2 integrate .. //depot/projects/l4bsd/src/sys/fs/devfs/devfs_devs.c#2 integrate .. //depot/projects/l4bsd/src/sys/fs/devfs/devfs_rule.c#2 integrate .. //depot/projects/l4bsd/src/sys/fs/devfs/devfs_vfsops.c#3 integrate .. //depot/projects/l4bsd/src/sys/fs/devfs/devfs_vnops.c#3 integrate .. //depot/projects/l4bsd/src/sys/fs/portalfs/portal_vnops.c#3 integrate .. //depot/projects/l4bsd/src/sys/fs/smbfs/smbfs_vfsops.c#2 integrate .. //depot/projects/l4bsd/src/sys/geom/eli/g_eli_integrity.c#2 integrate .. //depot/projects/l4bsd/src/sys/geom/geom.h#3 integrate .. //depot/projects/l4bsd/src/sys/geom/mirror/g_mirror_ctl.c#2 integrate .. //depot/projects/l4bsd/src/sys/geom/raid3/g_raid3_ctl.c#3 integrate .. //depot/projects/l4bsd/src/sys/gnu/dev/sound/pci/emu10k1-alsa.h#2 integrate .. //depot/projects/l4bsd/src/sys/gnu/dev/sound/pci/p16v-alsa.h#1 branch .. //depot/projects/l4bsd/src/sys/gnu/dev/sound/pci/p17v-alsa.h#1 branch .. //depot/projects/l4bsd/src/sys/i386/i386/db_trace.c#3 integrate .. //depot/projects/l4bsd/src/sys/i386/i386/identcpu.c#3 integrate .. //depot/projects/l4bsd/src/sys/i386/i386/initcpu.c#3 integrate .. //depot/projects/l4bsd/src/sys/i386/i386/intr_machdep.c#2 integrate .. //depot/projects/l4bsd/src/sys/i386/i386/local_apic.c#2 integrate .. //depot/projects/l4bsd/src/sys/i386/i386/machdep.c#3 integrate .. //depot/projects/l4bsd/src/sys/i386/i386/pmap.c#3 integrate .. //depot/projects/l4bsd/src/sys/i386/ibcs2/ibcs2_isc_syscall.h#2 integrate .. //depot/projects/l4bsd/src/sys/i386/ibcs2/ibcs2_isc_sysent.c#2 integrate .. //depot/projects/l4bsd/src/sys/i386/ibcs2/ibcs2_misc.c#3 integrate .. //depot/projects/l4bsd/src/sys/i386/ibcs2/ibcs2_proto.h#3 integrate .. //depot/projects/l4bsd/src/sys/i386/ibcs2/ibcs2_syscall.h#3 integrate .. //depot/projects/l4bsd/src/sys/i386/ibcs2/ibcs2_sysent.c#3 integrate .. //depot/projects/l4bsd/src/sys/i386/ibcs2/syscalls.isc#2 integrate .. //depot/projects/l4bsd/src/sys/i386/ibcs2/syscalls.master#3 integrate .. //depot/projects/l4bsd/src/sys/i386/include/md_var.h#3 integrate .. //depot/projects/l4bsd/src/sys/i386/include/specialreg.h#3 integrate .. //depot/projects/l4bsd/src/sys/i386/linux/linux_proto.h#3 integrate .. //depot/projects/l4bsd/src/sys/i386/linux/linux_syscall.h#3 integrate .. //depot/projects/l4bsd/src/sys/i386/linux/linux_sysent.c#3 integrate .. //depot/projects/l4bsd/src/sys/i386/linux/syscalls.master#3 integrate .. //depot/projects/l4bsd/src/sys/ia64/conf/DEFAULTS#3 integrate .. //depot/projects/l4bsd/src/sys/ia64/ia64/db_machdep.c#2 integrate .. //depot/projects/l4bsd/src/sys/kern/init_sysent.c#3 integrate .. //depot/projects/l4bsd/src/sys/kern/kern_descrip.c#3 integrate .. //depot/projects/l4bsd/src/sys/kern/kern_intr.c#2 integrate .. //depot/projects/l4bsd/src/sys/kern/kern_ktr.c#2 integrate .. //depot/projects/l4bsd/src/sys/kern/kern_lock.c#2 integrate .. //depot/projects/l4bsd/src/sys/kern/kern_mac.c#2 integrate .. //depot/projects/l4bsd/src/sys/kern/kern_malloc.c#2 integrate .. //depot/projects/l4bsd/src/sys/kern/kern_thr.c#3 integrate .. //depot/projects/l4bsd/src/sys/kern/kern_uuid.c#2 integrate .. //depot/projects/l4bsd/src/sys/kern/link_elf.c#3 integrate .. //depot/projects/l4bsd/src/sys/kern/subr_acl_posix1e.c#2 integrate .. //depot/projects/l4bsd/src/sys/kern/subr_autoconf.c#2 integrate .. //depot/projects/l4bsd/src/sys/kern/subr_prf.c#2 integrate .. //depot/projects/l4bsd/src/sys/kern/subr_turnstile.c#2 integrate .. //depot/projects/l4bsd/src/sys/kern/syscalls.c#3 integrate .. //depot/projects/l4bsd/src/sys/kern/syscalls.master#3 integrate .. //depot/projects/l4bsd/src/sys/kern/sysv_sem.c#3 integrate .. //depot/projects/l4bsd/src/sys/kern/uipc_domain.c#2 integrate .. //depot/projects/l4bsd/src/sys/kern/uipc_socket.c#3 integrate .. //depot/projects/l4bsd/src/sys/kern/uipc_socket2.c#3 integrate .. //depot/projects/l4bsd/src/sys/kern/uipc_syscalls.c#3 integrate .. //depot/projects/l4bsd/src/sys/kern/uipc_usrreq.c#3 integrate .. //depot/projects/l4bsd/src/sys/kern/vfs_bio.c#2 integrate .. //depot/projects/l4bsd/src/sys/kern/vfs_subr.c#3 integrate .. //depot/projects/l4bsd/src/sys/kern/vfs_syscalls.c#3 integrate .. //depot/projects/l4bsd/src/sys/modules/padlock/Makefile#2 integrate .. //depot/projects/l4bsd/src/sys/modules/sound/driver/Makefile#3 integrate .. //depot/projects/l4bsd/src/sys/modules/sound/driver/emu10kx/Makefile#1 branch .. //depot/projects/l4bsd/src/sys/net/if_spppsubr.c#2 integrate .. //depot/projects/l4bsd/src/sys/net/if_tap.c#3 integrate .. //depot/projects/l4bsd/src/sys/net/raw_usrreq.c#3 integrate .. //depot/projects/l4bsd/src/sys/net/rtsock.c#3 integrate .. //depot/projects/l4bsd/src/sys/net80211/ieee80211_input.c#3 integrate .. //depot/projects/l4bsd/src/sys/net80211/ieee80211_ioctl.c#2 integrate .. //depot/projects/l4bsd/src/sys/netatalk/ddp_usrreq.c#2 integrate .. //depot/projects/l4bsd/src/sys/netatm/atm_aal5.c#2 integrate .. //depot/projects/l4bsd/src/sys/netatm/atm_usrreq.c#2 integrate .. //depot/projects/l4bsd/src/sys/netgraph/bluetooth/include/ng_btsocket_hci_raw.h#2 integrate .. //depot/projects/l4bsd/src/sys/netgraph/bluetooth/include/ng_btsocket_l2cap.h#2 integrate .. //depot/projects/l4bsd/src/sys/netgraph/bluetooth/include/ng_btsocket_rfcomm.h#2 integrate .. //depot/projects/l4bsd/src/sys/netgraph/bluetooth/socket/ng_btsocket.c#2 integrate .. //depot/projects/l4bsd/src/sys/netgraph/bluetooth/socket/ng_btsocket_hci_raw.c#2 integrate .. //depot/projects/l4bsd/src/sys/netgraph/bluetooth/socket/ng_btsocket_l2cap.c#2 integrate .. //depot/projects/l4bsd/src/sys/netgraph/bluetooth/socket/ng_btsocket_l2cap_raw.c#2 integrate .. //depot/projects/l4bsd/src/sys/netgraph/bluetooth/socket/ng_btsocket_rfcomm.c#2 integrate .. //depot/projects/l4bsd/src/sys/netgraph/ng_socket.c#3 integrate .. //depot/projects/l4bsd/src/sys/netinet/in_pcb.c#3 integrate .. //depot/projects/l4bsd/src/sys/netinet/in_pcb.h#2 integrate .. //depot/projects/l4bsd/src/sys/netinet/ip_divert.c#3 integrate .. //depot/projects/l4bsd/src/sys/netinet/raw_ip.c#2 integrate .. //depot/projects/l4bsd/src/sys/netinet/tcp_subr.c#2 integrate .. //depot/projects/l4bsd/src/sys/netinet/tcp_usrreq.c#3 integrate .. //depot/projects/l4bsd/src/sys/netinet/udp_usrreq.c#3 integrate .. //depot/projects/l4bsd/src/sys/netinet6/icmp6.c#2 integrate .. //depot/projects/l4bsd/src/sys/netinet6/in6_pcb.c#3 integrate .. //depot/projects/l4bsd/src/sys/netinet6/raw_ip6.c#3 integrate .. //depot/projects/l4bsd/src/sys/netinet6/udp6_usrreq.c#2 integrate .. //depot/projects/l4bsd/src/sys/netipsec/keysock.c#2 integrate .. //depot/projects/l4bsd/src/sys/netipx/ipx_usrreq.c#2 integrate .. //depot/projects/l4bsd/src/sys/netipx/spx_usrreq.c#2 integrate .. //depot/projects/l4bsd/src/sys/netkey/keysock.c#2 integrate .. //depot/projects/l4bsd/src/sys/netnatm/natm.c#2 integrate .. //depot/projects/l4bsd/src/sys/netsmb/smb_conn.c#2 integrate .. //depot/projects/l4bsd/src/sys/nfs4client/nfs4_vnops.c#3 integrate .. //depot/projects/l4bsd/src/sys/pc98/pc98/machdep.c#3 integrate .. //depot/projects/l4bsd/src/sys/posix4/ksched.c#3 integrate .. //depot/projects/l4bsd/src/sys/posix4/p1003_1b.c#3 integrate .. //depot/projects/l4bsd/src/sys/powerpc/powerpc/db_trace.c#2 integrate .. //depot/projects/l4bsd/src/sys/security/mac/mac_vfs.c#2 integrate .. //depot/projects/l4bsd/src/sys/sparc64/include/pmap.h#3 integrate .. //depot/projects/l4bsd/src/sys/sparc64/sparc64/db_trace.c#2 integrate .. //depot/projects/l4bsd/src/sys/sys/_label.h#2 integrate .. //depot/projects/l4bsd/src/sys/sys/extattr.h#2 integrate .. //depot/projects/l4bsd/src/sys/sys/libkern.h#2 integrate .. //depot/projects/l4bsd/src/sys/sys/mbuf.h#2 integrate .. //depot/projects/l4bsd/src/sys/sys/param.h#2 integrate .. //depot/projects/l4bsd/src/sys/sys/protosw.h#3 integrate .. //depot/projects/l4bsd/src/sys/sys/syscall.h#3 integrate .. //depot/projects/l4bsd/src/sys/sys/syscall.mk#3 integrate .. //depot/projects/l4bsd/src/sys/sys/sysctl.h#3 integrate .. //depot/projects/l4bsd/src/sys/sys/sysproto.h#3 integrate .. //depot/projects/l4bsd/src/sys/sys/thr.h#3 integrate .. //depot/projects/l4bsd/src/sys/sys/unpcb.h#2 integrate .. //depot/projects/l4bsd/src/sys/ufs/ffs/ffs_alloc.c#2 integrate .. //depot/projects/l4bsd/src/sys/ufs/ufs/ufs_lookup.c#2 integrate .. //depot/projects/l4bsd/src/sys/vm/pmap.h#3 integrate .. //depot/projects/l4bsd/src/sys/vm/uma_core.c#2 integrate .. //depot/projects/l4bsd/src/sys/vm/vm.h#2 integrate .. //depot/projects/l4bsd/src/sys/vm/vm_fault.c#3 integrate .. //depot/projects/l4bsd/src/sys/vm/vm_map.c#3 integrate .. //depot/projects/l4bsd/src/sys/vm/vm_meter.c#3 integrate .. //depot/projects/l4bsd/src/sys/vm/vm_object.c#2 integrate .. //depot/projects/l4bsd/src/sys/vm/vm_object.h#2 integrate .. //depot/projects/l4bsd/src/sys/vm/vm_page.c#3 integrate .. //depot/projects/l4bsd/src/tools/regression/ia64/emulated/brl.t#1 branch .. //depot/projects/l4bsd/src/tools/regression/ia64/emulated/test.c#1 branch .. //depot/projects/l4bsd/src/tools/regression/netinet6/ip6_sockets/Makefile#1 branch .. //depot/projects/l4bsd/src/tools/regression/netinet6/ip6_sockets/ip6_sockets.c#1 branch .. //depot/projects/l4bsd/src/tools/tools/nanobsd/nanobsd.sh#2 integrate .. //depot/projects/l4bsd/src/usr.bin/calendar/day.c#3 integrate .. //depot/projects/l4bsd/src/usr.bin/col/col.c#2 integrate .. //depot/projects/l4bsd/src/usr.bin/ctags/ctags.c#2 integrate .. //depot/projects/l4bsd/src/usr.bin/find/find.1#3 integrate .. //depot/projects/l4bsd/src/usr.bin/kdump/kdump.c#2 integrate .. //depot/projects/l4bsd/src/usr.bin/kdump/mksubr#2 integrate .. //depot/projects/l4bsd/src/usr.bin/look/look.c#2 integrate .. //depot/projects/l4bsd/src/usr.bin/make/main.c#2 integrate .. //depot/projects/l4bsd/src/usr.bin/make/parse.c#2 integrate .. //depot/projects/l4bsd/src/usr.bin/make/var.c#2 integrate .. //depot/projects/l4bsd/src/usr.bin/netstat/inet6.c#2 integrate .. //depot/projects/l4bsd/src/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_device_tbl.c#2 integrate .. //depot/projects/l4bsd/src/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_diskstorage_tbl.c#2 integrate .. //depot/projects/l4bsd/src/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_fs_tbl.c#2 integrate .. //depot/projects/l4bsd/src/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_network_tbl.c#2 integrate .. //depot/projects/l4bsd/src/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_partition_tbl.c#2 integrate .. //depot/projects/l4bsd/src/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_printer_tbl.c#2 integrate .. //depot/projects/l4bsd/src/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_processor_tbl.c#2 integrate .. //depot/projects/l4bsd/src/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_snmp.h#2 integrate .. //depot/projects/l4bsd/src/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_storage_tbl.c#2 integrate .. //depot/projects/l4bsd/src/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_swinstalled_tbl.c#2 integrate .. //depot/projects/l4bsd/src/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_swrun_tbl.c#2 integrate .. //depot/projects/l4bsd/src/usr.sbin/config/config.y#3 integrate .. //depot/projects/l4bsd/src/usr.sbin/config/mkmakefile.c#3 integrate .. //depot/projects/l4bsd/src/usr.sbin/cron/cron/cron.c#2 integrate .. //depot/projects/l4bsd/src/usr.sbin/fdread/fdread.c#2 integrate .. //depot/projects/l4bsd/src/usr.sbin/moused/moused.c#2 integrate .. //depot/projects/l4bsd/src/usr.sbin/newsyslog/newsyslog.c#3 integrate .. //depot/projects/l4bsd/src/usr.sbin/newsyslog/newsyslog.conf.5#2 integrate .. //depot/projects/l4bsd/src/usr.sbin/ngctl/config.c#3 integrate .. //depot/projects/l4bsd/src/usr.sbin/ngctl/debug.c#3 integrate .. //depot/projects/l4bsd/src/usr.sbin/ngctl/mkpeer.c#3 integrate .. //depot/projects/l4bsd/src/usr.sbin/ngctl/name.c#3 integrate .. //depot/projects/l4bsd/src/usr.sbin/ngctl/status.c#3 integrate .. //depot/projects/l4bsd/src/usr.sbin/ngctl/types.c#3 integrate .. //depot/projects/l4bsd/src/usr.sbin/sysinstall/install.c#2 integrate .. //depot/projects/l4bsd/src/usr.sbin/sysinstall/main.c#2 integrate .. //depot/projects/l4bsd/src/usr.sbin/sysinstall/misc.c#2 integrate .. //depot/projects/l4bsd/src/usr.sbin/sysinstall/sysinstall.h#2 integrate Differences ... ==== //depot/projects/l4bsd/src/etc/defaults/rc.conf#3 (text+ko) ==== @@ -15,7 +15,7 @@ # For a more detailed explanation of all the rc.conf variables, please # refer to the rc.conf(5) manual page. # -# $FreeBSD: src/etc/defaults/rc.conf,v 1.288 2006/06/07 17:14:27 brueffer Exp $ +# $FreeBSD: src/etc/defaults/rc.conf,v 1.290 2006/07/21 15:55:18 yar Exp $ ############################################################## ### Important initial Boot-time options #################### @@ -261,6 +261,8 @@ ntpdate_enable="NO" # Run ntpdate to sync time on boot (or NO). ntpdate_program="/usr/sbin/ntpdate" # path to ntpdate, if you want a different one. ntpdate_flags="-b" # Flags to ntpdate (if enabled). +ntpdate_config="/etc/ntp.conf" # ntpdate(8) configuration file +ntpdate_hosts="" # Whitespace-separated list of ntpdate(8) servers. ntpd_enable="NO" # Run ntpd Network Time Protocol (or NO). ntpd_program="/usr/sbin/ntpd" # path to ntpd, if you want a different one. ntpd_config="/etc/ntp.conf" # ntpd(8) configuration file @@ -480,7 +482,6 @@ linux_enable="NO" # Linux binary compatibility loaded at startup (or NO). svr4_enable="NO" # SysVR4 emulation loaded at startup (or NO). -osf1_enable="NO" # Alpha OSF/1 emulation loaded at startup (or NO). clear_tmp_enable="NO" # Clear /tmp at startup. clear_tmp_X="YES" # Clear and recreate X11-related directories in /tmp ldconfig_insecure="NO" # Set to YES to disable ldconfig security checks @@ -500,7 +501,6 @@ # in the system booting with securelevel set to 1, as # init(8) will raise the level when rc(8) completes. update_motd="YES" # update version info in /etc/motd (or NO) -unaligned_print="YES" # print unaligned access warnings on the alpha (or NO). entropy_file="/entropy" # Set to NO to disable caching entropy through reboots. # /var/db/entropy-file is preferred if / is not avail. entropy_dir="/var/db/entropy" # Set to NO to disable caching entropy via cron. ==== //depot/projects/l4bsd/src/etc/rc.d/archdep#2 (text+ko) ==== @@ -1,6 +1,6 @@ #!/bin/sh # -# $FreeBSD: src/etc/rc.d/archdep,v 1.11 2006/02/19 08:18:48 dougb Exp $ +# $FreeBSD: src/etc/rc.d/archdep,v 1.12 2006/07/21 15:55:18 yar Exp $ # # PROVIDE: archdep @@ -13,27 +13,6 @@ start_cmd="archdep_start" stop_cmd=":" -# should we print out unaligned access warnings? -# -unaligned_warnings() -{ - if ! checkyesno unaligned_print; then - sysctl machdep.unaligned_print=0 - fi -} - -# Alpha OSF/1 binary emulation -# -osf1_compat() -{ - if checkyesno osf1_enable; then - echo -n ' OSF/1' - if ! kldstat -v | grep osf1_ecoff > /dev/null; then - kldload osf1 > /dev/null 2>&1 - fi - fi -} - # SCO binary emulation # ibcs2_compat() @@ -61,10 +40,6 @@ i386) ibcs2_compat ;; - alpha) - osf1_compat - unaligned_warnings - ;; esac echo '.' } ==== //depot/projects/l4bsd/src/etc/rc.d/mountcritlocal#2 (text+ko) ==== @@ -1,7 +1,7 @@ #!/bin/sh # # $NetBSD: mountcritlocal,v 1.7 2002/04/29 12:29:53 lukem Exp $ -# $FreeBSD: src/etc/rc.d/mountcritlocal,v 1.12 2004/10/07 13:55:26 mtm Exp $ +# $FreeBSD: src/etc/rc.d/mountcritlocal,v 1.13 2006/07/12 16:05:51 des Exp $ # # PROVIDE: mountcritlocal @@ -27,6 +27,7 @@ esac # Mount everything except nfs filesystems. + echo -n 'Mounting local file systems:' mount_excludes='no' for i in ${netfs_types}; do fstype=${i%:*} @@ -34,6 +35,7 @@ done mount_excludes=${mount_excludes%,} mount -a -t ${mount_excludes} + echo '.' case $? in 0) ==== //depot/projects/l4bsd/src/etc/rc.d/ntpdate#2 (text+ko) ==== @@ -1,6 +1,6 @@ #!/bin/sh # -# $FreeBSD: src/etc/rc.d/ntpdate,v 1.15 2006/01/16 06:03:42 dougb Exp $ +# $FreeBSD: src/etc/rc.d/ntpdate,v 1.16 2006/07/20 10:07:34 flz Exp $ # # PROVIDE: ntpdate @@ -16,11 +16,11 @@ ntpdate_start() { - if [ -z "$ntpdate_hosts" -a -f /etc/ntp.conf ]; then + if [ -z "$ntpdate_hosts" -a -f ${ntpdate_config} ]; then ntpdate_hosts=`awk ' /^server[ \t]*127.127/ {next} /^(server|peer)/ {print $2} - ' @@ -523,7 +523,7 @@ /* The number of bytes in type int */ #define SIZEOF_INT 4 -#if defined(__i386__) || defined(__powerpc__) || defined(__strongarm__) +#if defined(__i386__) || defined(__powerpc__) || defined(__arm__) /* The number of bytes in type long */ # define SIZEOF_LONG SIZEOF_INT #elif defined(__alpha__) || defined(__sparc64__) || defined(__ia64__) || defined(__amd64__) ==== //depot/projects/l4bsd/src/gnu/usr.bin/send-pr/categories#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/gnu/usr.bin/send-pr/categories,v 1.17 2005/01/05 12:13:10 ceri Exp $ +# $FreeBSD: src/gnu/usr.bin/send-pr/categories,v 1.18 2006/07/17 10:36:56 ceri Exp $ advocacy alpha amd64 @@ -15,6 +15,7 @@ powerpc sparc64 standards +sun4v threads usb www ==== //depot/projects/l4bsd/src/lib/libc/gen/getgrent.c#3 (text+ko) ==== @@ -31,7 +31,7 @@ * */ #include -__FBSDID("$FreeBSD: src/lib/libc/gen/getgrent.c,v 1.34 2006/06/01 15:45:06 maxim Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/gen/getgrent.c,v 1.35 2006/07/14 17:45:33 maxim Exp $"); #include "namespace.h" #include @@ -770,18 +770,17 @@ * pointer for the member list terminator. */ if (bufsize <= linesize + _ALIGNBYTES + sizeof(char *)) { - fseeko(st->fp, pos, SEEK_SET); *errnop = ERANGE; rv = NS_RETURN; break; } - pos = ftello(st->fp); memcpy(buffer, line, linesize); buffer[linesize] = '\0'; rv = __gr_parse_entry(buffer, linesize, grp, &buffer[linesize + 1], bufsize - linesize - 1, errnop); if (rv & NS_TERMINATE) break; + pos = ftello(st->fp); } if (!stayopen && st->fp != NULL) { fclose(st->fp); @@ -789,6 +788,8 @@ } if (rv == NS_SUCCESS && retval != NULL) *(struct group **)retval = grp; + else if (*errnop == ERANGE) + fseeko(st->fp, pos, SEEK_SET); return (rv); } @@ -1322,18 +1323,17 @@ * pointer for the member list terminator. */ if (bufsize <= linesize + _ALIGNBYTES + sizeof(char *)) { - fseeko(st->fp, pos, SEEK_SET); *errnop = ERANGE; rv = NS_RETURN; break; } - pos = ftello(st->fp); memcpy(buffer, line, linesize); buffer[linesize] = '\0'; rv = __gr_parse_entry(buffer, linesize, grp, &buffer[linesize + 1], bufsize - linesize - 1, errnop); if (rv & NS_TERMINATE) break; + pos = ftello(st->fp); } fin: if (!stayopen && st->fp != NULL) { @@ -1342,6 +1342,8 @@ } if (rv == NS_SUCCESS && retval != NULL) *(struct group **)retval = grp; + else if (*errnop == ERANGE) + fseeko(st->fp, pos, SEEK_SET); return (rv); #undef set_lookup_type } ==== //depot/projects/l4bsd/src/lib/libc/net/getaddrinfo.c#2 (text+ko) ==== @@ -33,7 +33,6 @@ * "#ifdef FAITH" part is local hack for supporting IPv4-v6 translator. * * Issues to be discussed: - * - Thread safe-ness must be checked. * - Return values. There are nonstandard return values defined and used * in the source code. This is because RFC2553 is silent about which error * code must be returned for which situation. @@ -50,20 +49,12 @@ * against NULL hostname (3) what is AI_ADDRCONFIG itself. AF not ready? * non-loopback address configured? global address configured? * - * OS specific notes for netbsd/openbsd/freebsd4/bsdi4: - * - To avoid search order issue, we have a big amount of code duplicate - * from gethnamaddr.c and some other places. The issues that there's no - * lower layer function to lookup "IPv4 or IPv6" record. Calling - * gethostbyname2 from getaddrinfo will end up in wrong search order, as - * presented above. - * * OS specific notes for freebsd4: * - FreeBSD supported $GAI. The code does not. - * - FreeBSD allowed classful IPv4 numeric (127.1), the code does not. */ #include -__FBSDID("$FreeBSD: src/lib/libc/net/getaddrinfo.c,v 1.80 2006/04/28 12:03:35 ume Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/net/getaddrinfo.c,v 1.85 2006/07/23 15:31:03 ume Exp $"); #include "namespace.h" #include @@ -235,7 +226,7 @@ u_char buf[MAXPACKET]; } querybuf; -static int str2number(const char *); +static int str2number(const char *, int *); static int explore_null(const struct addrinfo *, const char *, struct addrinfo **); static int explore_numeric(const struct addrinfo *, const char *, @@ -350,7 +341,7 @@ } static int -str2number(const char *p) +str2number(const char *p, int *portp) { char *ep; unsigned long v; @@ -360,9 +351,10 @@ ep = NULL; errno = 0; v = strtoul(p, &ep, 10); - if (errno == 0 && ep && *ep == '\0' && v <= UINT_MAX) - return v; - else + if (errno == 0 && ep && *ep == '\0' && v <= UINT_MAX) { + *portp = v; + return 0; + } else return -1; } @@ -1062,13 +1054,11 @@ { int s; const struct afd *afd; - struct addrinfo *cur; - struct addrinfo sentinel; + struct addrinfo *ai; int error; *res = NULL; - sentinel.ai_next = NULL; - cur = &sentinel; + ai = NULL; /* * filter out AFs that are not supported by the kernel @@ -1092,26 +1082,19 @@ return 0; if (pai->ai_flags & AI_PASSIVE) { - GET_AI(cur->ai_next, afd, afd->a_addrany); - /* xxx meaningless? - * GET_CANONNAME(cur->ai_next, "anyaddr"); - */ - GET_PORT(cur->ai_next, servname); + GET_AI(ai, afd, afd->a_addrany); + GET_PORT(ai, servname); } else { - GET_AI(cur->ai_next, afd, afd->a_loopback); - /* xxx meaningless? - * GET_CANONNAME(cur->ai_next, "localhost"); - */ - GET_PORT(cur->ai_next, servname); + GET_AI(ai, afd, afd->a_loopback); + GET_PORT(ai, servname); } - cur = cur->ai_next; - *res = sentinel.ai_next; + *res = ai; return 0; free: - if (sentinel.ai_next) - freeaddrinfo(sentinel.ai_next); + if (ai != NULL) + freeaddrinfo(ai); return error; } @@ -1123,14 +1106,12 @@ const char *servname, struct addrinfo **res, const char *canonname) { const struct afd *afd; - struct addrinfo *cur; - struct addrinfo sentinel; + struct addrinfo *ai; int error; char pton[PTON_MAX]; *res = NULL; - sentinel.ai_next = NULL; - cur = &sentinel; + ai = NULL; /* * if the servname does not match socktype/protocol, ignore it. @@ -1143,57 +1124,48 @@ return 0; switch (afd->a_af) { -#if 1 /*X/Open spec*/ case AF_INET: - if (inet_aton(hostname, (struct in_addr *)pton) == 1) { - if (pai->ai_family == afd->a_af || - pai->ai_family == PF_UNSPEC /*?*/) { - GET_AI(cur->ai_next, afd, pton); - GET_PORT(cur->ai_next, servname); - if ((pai->ai_flags & AI_CANONNAME)) { - /* - * Set the numeric address itself as - * the canonical name, based on a - * clarification in rfc3493. - */ - GET_CANONNAME(cur->ai_next, canonname); - } - while (cur && cur->ai_next) - cur = cur->ai_next; - } else - ERR(EAI_FAMILY); /*xxx*/ - } + /* + * RFC3493 requires getaddrinfo() to accept AF_INET formats + * that are accepted by inet_addr() and its family. The + * accepted forms includes the "classful" one, which inet_pton + * does not accept. So we need to separate the case for + * AF_INET. + */ + if (inet_aton(hostname, (struct in_addr *)pton) != 1) + return 0; break; -#endif default: - if (inet_pton(afd->a_af, hostname, pton) == 1) { - if (pai->ai_family == afd->a_af || - pai->ai_family == PF_UNSPEC /*?*/) { - GET_AI(cur->ai_next, afd, pton); - GET_PORT(cur->ai_next, servname); - if ((pai->ai_flags & AI_CANONNAME)) { - /* - * Set the numeric address itself as - * the canonical name, based on a - * clarification in rfc3493. - */ - GET_CANONNAME(cur->ai_next, canonname); - } - while (cur && cur->ai_next) - cur = cur->ai_next; - } else - ERR(EAI_FAMILY); /* XXX */ + if (inet_pton(afd->a_af, hostname, pton) != 1) + return 0; + break; + } + + if (pai->ai_family == afd->a_af) { + GET_AI(ai, afd, pton); + GET_PORT(ai, servname); + if ((pai->ai_flags & AI_CANONNAME)) { + /* + * Set the numeric address itself as the canonical + * name, based on a clarification in RFC3493. + */ + GET_CANONNAME(ai, canonname); } - break; + } else { + /* + * XXX: This should not happen since we already matched the AF + * by find_afd. + */ + ERR(EAI_FAMILY); } - *res = sentinel.ai_next; + *res = ai; return 0; free: bad: - if (sentinel.ai_next) - freeaddrinfo(sentinel.ai_next); + if (ai != NULL) + freeaddrinfo(ai); return error; } @@ -1356,7 +1328,7 @@ { const char *proto; struct servent *sp; - int port; + int port, error; int allownumeric; if (servname == NULL) @@ -1385,8 +1357,8 @@ return EAI_SOCKTYPE; } - port = str2number(servname); - if (port >= 0) { + error = str2number(servname, &port); + if (error == 0) { if (!allownumeric) return EAI_SERVICE; if (port < 0 || port > 65535) ==== //depot/projects/l4bsd/src/lib/libc/net/name6.c#2 (text+ko) ==== @@ -88,12 +88,9 @@ */ #include -__FBSDID("$FreeBSD: src/lib/libc/net/name6.c,v 1.58 2006/04/28 12:03:35 ume Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/net/name6.c,v 1.60 2006/07/23 07:07:49 ume Exp $"); #include "namespace.h" -#ifdef ICMPNL -#include "reentrant.h" -#endif #include #include #include @@ -244,12 +241,6 @@ static int ipnode_unmarshal_func(char *, size_t, void *, va_list, void *); #endif -#ifdef ICMPNL -static mutex_t _getipnodeby_thread_lock = MUTEX_INITIALIZER; -#define THREAD_LOCK() mutex_lock(&_getipnodeby_thread_lock); -#define THREAD_UNLOCK() mutex_unlock(&_getipnodeby_thread_lock); -#endif - /* Host lookup order if nsswitch.conf is broken or nonexistant */ static const ns_src default_src[] = { { NSSRC_FILES, NS_SUCCESS }, @@ -2178,67 +2169,119 @@ /* * experimental: - * draft-ietf-ipngwg-icmp-namelookups-02.txt + * draft-ietf-ipngwg-icmp-namelookups-09.txt * ifindex is assumed to be encoded in addr. */ #include #include #include +#include + +#ifndef NI_QTYPE_NODENAME +#define NI_QTYPE_NODENAME NI_QTYPE_DNSNAME +#endif + +static char * +dnsdecode(sp, ep, base, buf, bufsiz) + const u_char **sp; + const u_char *ep; + const u_char *base; /*base for compressed name*/ >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Mon Jul 24 02:01:53 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 54E6916A4DF; Mon, 24 Jul 2006 02:01:53 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 17DCF16A4DA for ; Mon, 24 Jul 2006 02:01:53 +0000 (UTC) (envelope-from trhodes@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 8706E43D46 for ; Mon, 24 Jul 2006 02:01:45 +0000 (GMT) (envelope-from trhodes@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k6O21jbr096921 for ; Mon, 24 Jul 2006 02:01:45 GMT (envelope-from trhodes@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k6O21hXc096907 for perforce@freebsd.org; Mon, 24 Jul 2006 02:01:43 GMT (envelope-from trhodes@freebsd.org) Date: Mon, 24 Jul 2006 02:01:43 GMT Message-Id: <200607240201.k6O21hXc096907@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to trhodes@freebsd.org using -f From: Tom Rhodes To: Perforce Change Reviews Cc: Subject: PERFORCE change 102234 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 24 Jul 2006 02:01:53 -0000 http://perforce.freebsd.org/chv.cgi?CH=102234 Change 102234 by trhodes@trhodes_local on 2006/07/24 02:00:56 Do a bit of style(9) cleanup to make this code more read friendly, remove __P, etc. Reviewed by: gnn Approved by: gnn Obtained from: Requirement to do something during a boring ride home (BSDCan). Affected files ... .. //depot/projects/gnn_fast_ipsec/src/sys/netinet6/ah.h#2 edit .. //depot/projects/gnn_fast_ipsec/src/sys/netinet6/ah6.h#2 edit .. //depot/projects/gnn_fast_ipsec/src/sys/netinet6/ah_aesxcbcmac.c#2 edit .. //depot/projects/gnn_fast_ipsec/src/sys/netinet6/ah_aesxcbcmac.h#2 edit .. //depot/projects/gnn_fast_ipsec/src/sys/netinet6/ah_core.c#2 edit .. //depot/projects/gnn_fast_ipsec/src/sys/netinet6/ah_input.c#2 edit .. //depot/projects/gnn_fast_ipsec/src/sys/netinet6/ah_output.c#2 edit .. //depot/projects/gnn_fast_ipsec/src/sys/netinet6/dest6.c#2 edit .. //depot/projects/gnn_fast_ipsec/src/sys/netinet6/esp.h#2 edit .. //depot/projects/gnn_fast_ipsec/src/sys/netinet6/esp6.h#2 edit .. //depot/projects/gnn_fast_ipsec/src/sys/netinet6/esp_aesctr.c#2 edit .. //depot/projects/gnn_fast_ipsec/src/sys/netinet6/esp_aesctr.h#2 edit .. //depot/projects/gnn_fast_ipsec/src/sys/netinet6/esp_core.c#2 edit .. //depot/projects/gnn_fast_ipsec/src/sys/netinet6/esp_input.c#2 edit .. //depot/projects/gnn_fast_ipsec/src/sys/netinet6/esp_output.c#2 edit .. //depot/projects/gnn_fast_ipsec/src/sys/netinet6/esp_rijndael.c#2 edit .. //depot/projects/gnn_fast_ipsec/src/sys/netinet6/esp_rijndael.h#2 edit .. //depot/projects/gnn_fast_ipsec/src/sys/netinet6/frag6.c#5 edit .. //depot/projects/gnn_fast_ipsec/src/sys/netinet6/icmp6.c#2 edit .. //depot/projects/gnn_fast_ipsec/src/sys/netinet6/icmp6.h#2 edit .. //depot/projects/gnn_fast_ipsec/src/sys/netinet6/in6.c#5 edit .. //depot/projects/gnn_fast_ipsec/src/sys/netinet6/in6.h#3 edit .. //depot/projects/gnn_fast_ipsec/src/sys/netinet6/in6_cksum.c#4 edit .. //depot/projects/gnn_fast_ipsec/src/sys/netinet6/in6_gif.c#4 edit .. //depot/projects/gnn_fast_ipsec/src/sys/netinet6/in6_gif.h#2 edit .. //depot/projects/gnn_fast_ipsec/src/sys/netinet6/in6_ifattach.c#3 edit .. //depot/projects/gnn_fast_ipsec/src/sys/netinet6/in6_ifattach.h#2 edit .. //depot/projects/gnn_fast_ipsec/src/sys/netinet6/in6_pcb.c#7 edit .. //depot/projects/gnn_fast_ipsec/src/sys/netinet6/in6_pcb.h#4 edit .. //depot/projects/gnn_fast_ipsec/src/sys/netinet6/in6_proto.c#4 edit .. //depot/projects/gnn_fast_ipsec/src/sys/netinet6/in6_rmx.c#3 edit .. //depot/projects/gnn_fast_ipsec/src/sys/netinet6/in6_src.c#3 edit .. //depot/projects/gnn_fast_ipsec/src/sys/netinet6/in6_var.h#3 edit .. //depot/projects/gnn_fast_ipsec/src/sys/netinet6/ip6.h#2 edit .. //depot/projects/gnn_fast_ipsec/src/sys/netinet6/ip6_ecn.h#2 edit .. //depot/projects/gnn_fast_ipsec/src/sys/netinet6/ip6_forward.c#4 edit .. //depot/projects/gnn_fast_ipsec/src/sys/netinet6/ip6_id.c#2 edit .. //depot/projects/gnn_fast_ipsec/src/sys/netinet6/ip6_input.c#4 edit .. //depot/projects/gnn_fast_ipsec/src/sys/netinet6/ip6_mroute.c#5 edit .. //depot/projects/gnn_fast_ipsec/src/sys/netinet6/ip6_mroute.h#2 edit .. //depot/projects/gnn_fast_ipsec/src/sys/netinet6/ip6_output.c#4 edit .. //depot/projects/gnn_fast_ipsec/src/sys/netinet6/ip6_var.h#2 edit .. //depot/projects/gnn_fast_ipsec/src/sys/netinet6/ip6protosw.h#2 edit .. //depot/projects/gnn_fast_ipsec/src/sys/netinet6/ipcomp.h#2 edit .. //depot/projects/gnn_fast_ipsec/src/sys/netinet6/ipcomp6.h#2 edit .. //depot/projects/gnn_fast_ipsec/src/sys/netinet6/ipcomp_core.c#2 edit .. //depot/projects/gnn_fast_ipsec/src/sys/netinet6/ipcomp_input.c#3 edit .. //depot/projects/gnn_fast_ipsec/src/sys/netinet6/ipcomp_output.c#2 edit .. //depot/projects/gnn_fast_ipsec/src/sys/netinet6/ipsec.c#4 edit .. //depot/projects/gnn_fast_ipsec/src/sys/netinet6/ipsec.h#2 edit .. //depot/projects/gnn_fast_ipsec/src/sys/netinet6/ipsec6.h#2 edit .. //depot/projects/gnn_fast_ipsec/src/sys/netinet6/mld6.c#4 edit .. //depot/projects/gnn_fast_ipsec/src/sys/netinet6/mld6_var.h#2 edit .. //depot/projects/gnn_fast_ipsec/src/sys/netinet6/nd6.c#5 edit .. //depot/projects/gnn_fast_ipsec/src/sys/netinet6/nd6.h#2 edit .. //depot/projects/gnn_fast_ipsec/src/sys/netinet6/nd6_nbr.c#3 edit .. //depot/projects/gnn_fast_ipsec/src/sys/netinet6/nd6_rtr.c#3 edit .. //depot/projects/gnn_fast_ipsec/src/sys/netinet6/pim6.h#2 edit .. //depot/projects/gnn_fast_ipsec/src/sys/netinet6/pim6_var.h#2 edit .. //depot/projects/gnn_fast_ipsec/src/sys/netinet6/raw_ip6.c#6 edit .. //depot/projects/gnn_fast_ipsec/src/sys/netinet6/raw_ip6.h#2 edit .. //depot/projects/gnn_fast_ipsec/src/sys/netinet6/route6.c#2 edit .. //depot/projects/gnn_fast_ipsec/src/sys/netinet6/scope6.c#2 edit .. //depot/projects/gnn_fast_ipsec/src/sys/netinet6/scope6_var.h#2 edit .. //depot/projects/gnn_fast_ipsec/src/sys/netinet6/tcp6_var.h#2 edit .. //depot/projects/gnn_fast_ipsec/src/sys/netinet6/udp6_output.c#3 edit .. //depot/projects/gnn_fast_ipsec/src/sys/netinet6/udp6_usrreq.c#8 edit .. //depot/projects/gnn_fast_ipsec/src/sys/netinet6/udp6_var.h#2 edit Differences ... ==== //depot/projects/gnn_fast_ipsec/src/sys/netinet6/ah.h#2 (text+ko) ==== @@ -42,19 +42,19 @@ #endif struct ah { - u_int8_t ah_nxt; /* Next Header */ - u_int8_t ah_len; /* Length of data, in 32bit */ - u_int16_t ah_reserve; /* Reserved for future use */ - u_int32_t ah_spi; /* Security parameter index */ + uint8_t ah_nxt; /* Next Header */ + uint8_t ah_len; /* Length of data, in 32bit */ + uint16_t ah_reserve; /* Reserved for future use */ + uint32_t ah_spi; /* Security parameter index */ /* variable size, 32bit bound*/ /* Authentication data */ }; struct newah { - u_int8_t ah_nxt; /* Next Header */ - u_int8_t ah_len; /* Length of data + 1, in 32bit */ - u_int16_t ah_reserve; /* Reserved for future use */ - u_int32_t ah_spi; /* Security parameter index */ - u_int32_t ah_seq; /* Sequence number field */ + uint8_t ah_nxt; /* Next Header */ + uint8_t ah_len; /* Length of data + 1, in 32bit */ + uint16_t ah_reserve; /* Reserved for future use */ + uint32_t ah_spi; /* Security parameter index */ + uint32_t ah_seq; /* Sequence number field */ /* variable size, 32bit bound*/ /* Authentication data */ }; @@ -67,28 +67,28 @@ }; struct ah_algorithm { - int (*sumsiz) __P((struct secasvar *)); - int (*mature) __P((struct secasvar *)); + int (*sumsiz)(struct secasvar *); + int (*mature)(struct secasvar *); int keymin; /* in bits */ int keymax; /* in bits */ const char *name; - int (*init) __P((struct ah_algorithm_state *, struct secasvar *)); - void (*update) __P((struct ah_algorithm_state *, u_int8_t *, size_t)); - void (*result) __P((struct ah_algorithm_state *, u_int8_t *, size_t)); + int (*init)(struct ah_algorithm_state *, struct secasvar *); + void (*update) (struct ah_algorithm_state *, uint8_t *, size_t); + void (*result) (struct ah_algorithm_state *, uint8_t *, size_t); }; #define AH_MAXSUMSIZE (512 / 8) -extern const struct ah_algorithm *ah_algorithm_lookup __P((int)); +extern const struct ah_algorithm *ah_algorithm_lookup(int); /* cksum routines */ -extern int ah_hdrlen __P((struct secasvar *)); +extern int ah_hdrlen(struct secasvar *); -extern size_t ah_hdrsiz __P((struct ipsecrequest *)); -extern void ah4_input __P((struct mbuf *, int)); -extern int ah4_output __P((struct mbuf *, struct ipsecrequest *)); -extern int ah4_calccksum __P((struct mbuf *, u_int8_t *, size_t, - const struct ah_algorithm *, struct secasvar *)); +extern size_t ah_hdrsiz(struct ipsecrequest *); +extern void ah4_input(struct mbuf *, int); +extern int ah4_output(struct mbuf *, struct ipsecrequest *); +extern int ah4_calccksum(struct mbuf *, uint8_t *, size_t, + const struct ah_algorithm *, struct secasvar *); #endif /* _KERNEL */ #endif /* _NETINET6_AH_H_ */ ==== //depot/projects/gnn_fast_ipsec/src/sys/netinet6/ah6.h#2 (text+ko) ==== @@ -40,13 +40,13 @@ #ifdef _KERNEL struct secasvar; -extern int ah6_input __P((struct mbuf **, int *, int)); -extern int ah6_output __P((struct mbuf *, u_char *, struct mbuf *, - struct ipsecrequest *)); -extern int ah6_calccksum __P((struct mbuf *, u_int8_t *, size_t, - const struct ah_algorithm *, struct secasvar *)); +extern int ah6_input(struct mbuf **, int *, int); +extern int ah6_output(struct mbuf *, u_char *, struct mbuf *, + struct ipsecrequest *); +extern int ah6_calccksum(struct mbuf *, uint8_t *, size_t, + const struct ah_algorithm *, struct secasvar *); -extern void ah6_ctlinput __P((int, struct sockaddr *, void *)); +extern void ah6_ctlinput(int, struct sockaddr *, void *); #endif #endif /*_NETINET6_AH6_H_*/ ==== //depot/projects/gnn_fast_ipsec/src/sys/netinet6/ah_aesxcbcmac.c#2 (text+ko) ==== ==== //depot/projects/gnn_fast_ipsec/src/sys/netinet6/ah_aesxcbcmac.h#2 (text+ko) ==== ==== //depot/projects/gnn_fast_ipsec/src/sys/netinet6/ah_core.c#2 (text+ko) ==== ==== //depot/projects/gnn_fast_ipsec/src/sys/netinet6/ah_input.c#2 (text+ko) ==== ==== //depot/projects/gnn_fast_ipsec/src/sys/netinet6/ah_output.c#2 (text+ko) ==== ==== //depot/projects/gnn_fast_ipsec/src/sys/netinet6/dest6.c#2 (text+ko) ==== ==== //depot/projects/gnn_fast_ipsec/src/sys/netinet6/esp.h#2 (text+ko) ==== ==== //depot/projects/gnn_fast_ipsec/src/sys/netinet6/esp6.h#2 (text+ko) ==== ==== //depot/projects/gnn_fast_ipsec/src/sys/netinet6/esp_aesctr.c#2 (text+ko) ==== ==== //depot/projects/gnn_fast_ipsec/src/sys/netinet6/esp_aesctr.h#2 (text+ko) ==== ==== //depot/projects/gnn_fast_ipsec/src/sys/netinet6/esp_core.c#2 (text+ko) ==== ==== //depot/projects/gnn_fast_ipsec/src/sys/netinet6/esp_input.c#2 (text+ko) ==== ==== //depot/projects/gnn_fast_ipsec/src/sys/netinet6/esp_output.c#2 (text+ko) ==== ==== //depot/projects/gnn_fast_ipsec/src/sys/netinet6/esp_rijndael.c#2 (text+ko) ==== ==== //depot/projects/gnn_fast_ipsec/src/sys/netinet6/esp_rijndael.h#2 (text+ko) ==== ==== //depot/projects/gnn_fast_ipsec/src/sys/netinet6/frag6.c#5 (text+ko) ==== ==== //depot/projects/gnn_fast_ipsec/src/sys/netinet6/icmp6.c#2 (text+ko) ==== ==== //depot/projects/gnn_fast_ipsec/src/sys/netinet6/icmp6.h#2 (text+ko) ==== ==== //depot/projects/gnn_fast_ipsec/src/sys/netinet6/in6.c#5 (text+ko) ==== ==== //depot/projects/gnn_fast_ipsec/src/sys/netinet6/in6.h#3 (text+ko) ==== ==== //depot/projects/gnn_fast_ipsec/src/sys/netinet6/in6_cksum.c#4 (text+ko) ==== ==== //depot/projects/gnn_fast_ipsec/src/sys/netinet6/in6_gif.c#4 (text+ko) ==== ==== //depot/projects/gnn_fast_ipsec/src/sys/netinet6/in6_gif.h#2 (text+ko) ==== ==== //depot/projects/gnn_fast_ipsec/src/sys/netinet6/in6_ifattach.c#3 (text+ko) ==== ==== //depot/projects/gnn_fast_ipsec/src/sys/netinet6/in6_ifattach.h#2 (text+ko) ==== ==== //depot/projects/gnn_fast_ipsec/src/sys/netinet6/in6_pcb.c#7 (text+ko) ==== ==== //depot/projects/gnn_fast_ipsec/src/sys/netinet6/in6_pcb.h#4 (text+ko) ==== ==== //depot/projects/gnn_fast_ipsec/src/sys/netinet6/in6_proto.c#4 (text+ko) ==== ==== //depot/projects/gnn_fast_ipsec/src/sys/netinet6/in6_rmx.c#3 (text+ko) ==== ==== //depot/projects/gnn_fast_ipsec/src/sys/netinet6/in6_src.c#3 (text+ko) ==== ==== //depot/projects/gnn_fast_ipsec/src/sys/netinet6/in6_var.h#3 (text+ko) ==== ==== //depot/projects/gnn_fast_ipsec/src/sys/netinet6/ip6.h#2 (text+ko) ==== ==== //depot/projects/gnn_fast_ipsec/src/sys/netinet6/ip6_ecn.h#2 (text+ko) ==== ==== //depot/projects/gnn_fast_ipsec/src/sys/netinet6/ip6_forward.c#4 (text+ko) ==== ==== //depot/projects/gnn_fast_ipsec/src/sys/netinet6/ip6_id.c#2 (text+ko) ==== ==== //depot/projects/gnn_fast_ipsec/src/sys/netinet6/ip6_input.c#4 (text+ko) ==== ==== //depot/projects/gnn_fast_ipsec/src/sys/netinet6/ip6_mroute.c#5 (text+ko) ==== ==== //depot/projects/gnn_fast_ipsec/src/sys/netinet6/ip6_mroute.h#2 (text+ko) ==== ==== //depot/projects/gnn_fast_ipsec/src/sys/netinet6/ip6_output.c#4 (text+ko) ==== ==== //depot/projects/gnn_fast_ipsec/src/sys/netinet6/ip6_var.h#2 (text+ko) ==== @@ -69,15 +69,15 @@ * being reassembled is attached to one of these structures. */ struct ip6q { - u_int32_t ip6q_head; - u_int16_t ip6q_len; - u_int8_t ip6q_nxt; /* ip6f_nxt in first fragment */ - u_int8_t ip6q_hlim; + uint32_t ip6q_head; + uint16_t ip6q_len; + uint8_t ip6q_nxt; /* ip6f_nxt in first fragment */ + uint8_t ip6q_hlim; struct ip6asfrag *ip6q_down; struct ip6asfrag *ip6q_up; - u_int32_t ip6q_ident; - u_int8_t ip6q_arrive; - u_int8_t ip6q_ttl; + uint32_t ip6q_ident; + uint8_t ip6q_arrive; + uint8_t ip6q_ttl; struct in6_addr ip6q_src, ip6q_dst; struct ip6q *ip6q_next; struct ip6q *ip6q_prev; @@ -89,10 +89,10 @@ }; struct ip6asfrag { - u_int32_t ip6af_head; - u_int16_t ip6af_len; - u_int8_t ip6af_nxt; - u_int8_t ip6af_hlim; + uint32_t ip6af_head; + uint16_t ip6af_len; + uint8_t ip6af_nxt; + uint8_t ip6af_hlim; /* must not override the above members during reassembling */ struct ip6asfrag *ip6af_down; struct ip6asfrag *ip6af_up; @@ -100,7 +100,7 @@ int ip6af_offset; /* offset in ip6af_m to next header */ int ip6af_frglen; /* fragmentable part length */ int ip6af_off; /* fragment offset */ - u_int16_t ip6af_mff; /* more fragment bit in frag off */ + uint16_t ip6af_mff; /* more fragment bit in frag off */ }; #define IP6_REASS_MBUF(ip6af) (*(struct mbuf **)&((ip6af)->ip6af_m)) @@ -179,7 +179,7 @@ * Control options for incoming packets */ -struct ip6stat { +struct ip6stat { u_quad_t ip6s_total; /* total packets received */ u_quad_t ip6s_tooshort; /* packet too short */ u_quad_t ip6s_toosmall; /* not enough data */ @@ -250,22 +250,22 @@ * XXX do not make it a kitchen sink! */ struct ip6aux { - u_int32_t ip6a_flags; -#define IP6A_SWAP 0x01 /* swapped home/care-of on packet */ -#define IP6A_HASEEN 0x02 /* HA was present */ -#define IP6A_BRUID 0x04 /* BR Unique Identifier was present */ -#define IP6A_RTALERTSEEN 0x08 /* rtalert present */ +uint32_t ip6a_flags; +#define IP6A_SWAP 0x01 /* swapped home/care-of on packet */ +#define IP6A_HASEEN 0x02 /* HA was present */ +#define IP6A_BRUID 0x04 /* BR Unique Identifier was present */ +#define IP6A_RTALERTSEEN 0x08 /* rtalert present */ - /* ip6.ip6_src */ - struct in6_addr ip6a_careof; /* care-of address of the peer */ - struct in6_addr ip6a_home; /* home address of the peer */ - u_int16_t ip6a_bruid; /* BR unique identifier */ +/* ip6.ip6_src */ +struct in6_addr ip6a_careof; /* care-of address of the peer */ +struct in6_addr ip6a_home; /* home address of the peer */ +uint16_t ip6a_bruid; /* BR unique identifier */ - /* ip6.ip6_dst */ - struct in6_ifaddr *ip6a_dstia6; /* my ifaddr that matches ip6_dst */ +/* ip6.ip6_dst */ +struct in6_ifaddr *ip6a_dstia6; /* my ifaddr that matches ip6_dst */ - /* rtalert */ - u_int16_t ip6a_rtalert; /* rtalert option value */ +/* rtalert */ +uint16_t ip6a_rtalert; /* rtalert option value */ /* * decapsulation history will be here. @@ -301,109 +301,104 @@ extern struct socket *ip6_mrouter; /* multicast routing daemon */ extern int ip6_sendredirects; /* send IP redirects when forwarding? */ extern int ip6_maxfragpackets; /* Maximum packets in reassembly queue */ -extern int ip6_maxfrags; /* Maximum fragments in reassembly queue */ +extern int ip6_maxfrags; /* Maximum fragments in reassembly queue */ extern int ip6_sourcecheck; /* Verify source interface */ extern int ip6_sourcecheck_interval; /* Interval between log messages */ extern int ip6_accept_rtadv; /* Acts as a host not a router */ extern int ip6_keepfaith; /* Firewall Aided Internet Translator */ extern int ip6_log_interval; extern time_t ip6_log_time; -extern int ip6_hdrnestlimit; /* upper limit of # of extension headers */ +extern int ip6_hdrnestlimit; /* upper limit of # of extension headers */ extern int ip6_dad_count; /* DupAddrDetectionTransmits */ -extern int ip6_auto_flowlabel; -extern int ip6_auto_linklocal; +extern int ip6_auto_flowlabel; +extern int ip6_auto_linklocal; -extern int ip6_anonportmin; /* minimum ephemeral port */ -extern int ip6_anonportmax; /* maximum ephemeral port */ -extern int ip6_lowportmin; /* minimum reserved port */ -extern int ip6_lowportmax; /* maximum reserved port */ +extern int ip6_anonportmin; /* minimum ephemeral port */ +extern int ip6_anonportmax; /* maximum ephemeral port */ +extern int ip6_lowportmin; /* minimum reserved port */ +extern int ip6_lowportmax; /* maximum reserved port */ -extern int ip6_use_tempaddr; /* whether to use temporary addresses. */ -extern int ip6_prefer_tempaddr; /* whether to prefer temporary addresses - in the source address selection */ +extern int ip6_use_tempaddr; /* whether to use temporary addresses. */ +extern int ip6_prefer_tempaddr; /* whether to prefer temporary addresses + in the source address selection */ -extern int ip6_use_defzone; /* whether to use the default scope zone - when unspecified */ +extern int ip6_use_defzone; /* whether to use the default scope zone + when unspecified */ extern struct pfil_head inet6_pfil_hook; /* packet filter hooks */ #ifdef IPSTEALTH -extern int ip6stealth; +extern int ip6stealth; #endif -extern struct pr_usrreqs rip6_usrreqs; -struct sockopt; +extern struct pr_usrreqs rip6_usrreqs; +struct sockopt; -struct inpcb; +struct inpcb; +int icmp6_ctloutput(struct socket *, struct sockopt *sopt); -int icmp6_ctloutput __P((struct socket *, struct sockopt *sopt)); +struct in6_ifaddr; +void ip6_init(void); +void ip6_input(struct mbuf *); +struct in6_ifaddr *ip6_getdstifaddr(struct mbuf *); +void ip6_freepcbopts(struct ip6_pktopts *); +void ip6_freemoptions(struct ip6_moptions *); +int ip6_unknown_opt(uint8_t *, struct mbuf *, int); +char * ip6_get_prevhdr(struct mbuf *, int); +int ip6_nexthdr(struct mbuf *, int, int, int *); +int ip6_lasthdr(struct mbuf *, int, int, int *); -struct in6_ifaddr; -void ip6_init __P((void)); -void ip6_input __P((struct mbuf *)); -struct in6_ifaddr *ip6_getdstifaddr __P((struct mbuf *)); -void ip6_freepcbopts __P((struct ip6_pktopts *)); -void ip6_freemoptions __P((struct ip6_moptions *)); -int ip6_unknown_opt __P((u_int8_t *, struct mbuf *, int)); -char * ip6_get_prevhdr __P((struct mbuf *, int)); -int ip6_nexthdr __P((struct mbuf *, int, int, int *)); -int ip6_lasthdr __P((struct mbuf *, int, int, int *)); +struct ip6aux *ip6_addaux(struct mbuf *); +struct ip6aux *ip6_findaux(struct mbuf *); +void ip6_delaux(struct mbuf *); -struct ip6aux *ip6_addaux __P((struct mbuf *)); -struct ip6aux *ip6_findaux __P((struct mbuf *)); -void ip6_delaux __P((struct mbuf *)); +int ip6_mforward(struct ip6_hdr *, struct ifnet *, struct mbuf *); +int ip6_process_hopopts(struct mbuf *, uint8_t *, int, uint32_t *, uint32_t *); +void ip6_savecontrol(struct inpcb *, struct mbuf *, struct mbuf **); +void ip6_notify_pmtu(struct inpcb *, struct sockaddr_in6 *, uint32_t *); +int ip6_sysctl(int *, u_int, void *, size_t *, void *, size_t); -int ip6_mforward __P((struct ip6_hdr *, struct ifnet *, struct mbuf *)); -int ip6_process_hopopts __P((struct mbuf *, u_int8_t *, int, u_int32_t *, - u_int32_t *)); -void ip6_savecontrol __P((struct inpcb *, struct mbuf *, struct mbuf **)); -void ip6_notify_pmtu __P((struct inpcb *, struct sockaddr_in6 *, - u_int32_t *)); -int ip6_sysctl __P((int *, u_int, void *, size_t *, void *, size_t)); +void ip6_forward(struct mbuf *, int); -void ip6_forward __P((struct mbuf *, int)); +void ip6_mloopback(struct ifnet *, struct mbuf *, struct sockaddr_in6 *); +int ip6_output(struct mbuf *, struct ip6_pktopts *, + struct route_in6 *, int, struct ip6_moptions *, struct ifnet **, + struct inpcb *); +int ip6_ctloutput(struct socket *, struct sockopt *); +int ip6_raw_ctloutput(struct socket *, struct sockopt *); +void ip6_initpktopts(struct ip6_pktopts *); +int ip6_setpktopts(struct mbuf *, struct ip6_pktopts *, + struct ip6_pktopts *, int, int); +void ip6_clearpktopts(struct ip6_pktopts *, int); +struct ip6_pktopts *ip6_copypktopts(struct ip6_pktopts *, int); +int ip6_optlen(struct inpcb *); -void ip6_mloopback __P((struct ifnet *, struct mbuf *, struct sockaddr_in6 *)); -int ip6_output __P((struct mbuf *, struct ip6_pktopts *, - struct route_in6 *, - int, - struct ip6_moptions *, struct ifnet **, - struct inpcb *)); -int ip6_ctloutput __P((struct socket *, struct sockopt *)); -int ip6_raw_ctloutput __P((struct socket *, struct sockopt *)); -void ip6_initpktopts __P((struct ip6_pktopts *)); -int ip6_setpktopts __P((struct mbuf *, struct ip6_pktopts *, - struct ip6_pktopts *, int, int)); -void ip6_clearpktopts __P((struct ip6_pktopts *, int)); -struct ip6_pktopts *ip6_copypktopts __P((struct ip6_pktopts *, int)); -int ip6_optlen __P((struct inpcb *)); +int route6_input(struct mbuf **, int *, int); -int route6_input __P((struct mbuf **, int *, int)); +void frag6_init(void); +int frag6_input(struct mbuf **, int *, int); +void frag6_slowtimo(void); +void frag6_drain(void); -void frag6_init __P((void)); -int frag6_input __P((struct mbuf **, int *, int)); -void frag6_slowtimo __P((void)); -void frag6_drain __P((void)); +void rip6_init(void); +int rip6_input(struct mbuf **, int *, int); +void rip6_ctlinput(int, struct sockaddr *, void *); +int rip6_ctloutput(struct socket *, struct sockopt *); +int rip6_output(struct mbuf *, ...); +int rip6_usrreq(struct socket *, + int, struct mbuf *, struct mbuf *, struct mbuf *, struct thread *); -void rip6_init __P((void)); -int rip6_input __P((struct mbuf **, int *, int)); -void rip6_ctlinput __P((int, struct sockaddr *, void *)); -int rip6_ctloutput __P((struct socket *, struct sockopt *)); -int rip6_output __P((struct mbuf *, ...)); -int rip6_usrreq __P((struct socket *, - int, struct mbuf *, struct mbuf *, struct mbuf *, struct thread *)); +int dest6_input(struct mbuf **, int *, int); +int none_input(struct mbuf **, int *, int); -int dest6_input __P((struct mbuf **, int *, int)); -int none_input __P((struct mbuf **, int *, int)); - -struct in6_addr *in6_selectsrc __P((struct sockaddr_in6 *, +struct in6_addr *in6_selectsrc(struct sockaddr_in6 *, struct ip6_pktopts *, struct ip6_moptions *, struct route_in6 *, - struct in6_addr *, struct ifnet **, int *)); -int in6_selectroute __P((struct sockaddr_in6 *, struct ip6_pktopts *, + struct in6_addr *, struct ifnet **, int *); +int in6_selectroute(struct sockaddr_in6 *, struct ip6_pktopts *, struct ip6_moptions *, struct route_in6 *, struct ifnet **, - struct rtentry **, int)); -u_int32_t ip6_randomid __P((void)); -u_int32_t ip6_randomflowlabel __P((void)); + struct rtentry **, int); +uint32_t ip6_randomid(void); +uint32_t ip6_randomflowlabel(void); #endif /* _KERNEL */ #endif /* !_NETINET6_IP6_VAR_H_ */ ==== //depot/projects/gnn_fast_ipsec/src/sys/netinet6/ip6protosw.h#2 (text+ko) ==== ==== //depot/projects/gnn_fast_ipsec/src/sys/netinet6/ipcomp.h#2 (text+ko) ==== ==== //depot/projects/gnn_fast_ipsec/src/sys/netinet6/ipcomp6.h#2 (text+ko) ==== ==== //depot/projects/gnn_fast_ipsec/src/sys/netinet6/ipcomp_core.c#2 (text+ko) ==== ==== //depot/projects/gnn_fast_ipsec/src/sys/netinet6/ipcomp_input.c#3 (text+ko) ==== ==== //depot/projects/gnn_fast_ipsec/src/sys/netinet6/ipcomp_output.c#2 (text+ko) ==== ==== //depot/projects/gnn_fast_ipsec/src/sys/netinet6/ipsec.c#4 (text+ko) ==== ==== //depot/projects/gnn_fast_ipsec/src/sys/netinet6/ipsec.h#2 (text+ko) ==== ==== //depot/projects/gnn_fast_ipsec/src/sys/netinet6/ipsec6.h#2 (text+ko) ==== ==== //depot/projects/gnn_fast_ipsec/src/sys/netinet6/mld6.c#4 (text+ko) ==== ==== //depot/projects/gnn_fast_ipsec/src/sys/netinet6/mld6_var.h#2 (text+ko) ==== ==== //depot/projects/gnn_fast_ipsec/src/sys/netinet6/nd6.c#5 (text+ko) ==== ==== //depot/projects/gnn_fast_ipsec/src/sys/netinet6/nd6.h#2 (text+ko) ==== ==== //depot/projects/gnn_fast_ipsec/src/sys/netinet6/nd6_nbr.c#3 (text+ko) ==== ==== //depot/projects/gnn_fast_ipsec/src/sys/netinet6/nd6_rtr.c#3 (text+ko) ==== @@ -64,25 +64,25 @@ #define SDL(s) ((struct sockaddr_dl *)s) -static int rtpref __P((struct nd_defrouter *)); -static struct nd_defrouter *defrtrlist_update __P((struct nd_defrouter *)); -static int prelist_update __P((struct nd_prefixctl *, struct nd_defrouter *, - struct mbuf *, int)); -static struct in6_ifaddr *in6_ifadd __P((struct nd_prefixctl *, int)); -static struct nd_pfxrouter *pfxrtr_lookup __P((struct nd_prefix *, - struct nd_defrouter *)); -static void pfxrtr_add __P((struct nd_prefix *, struct nd_defrouter *)); -static void pfxrtr_del __P((struct nd_pfxrouter *)); +static int rtpref(struct nd_defrouter *); +static struct nd_defrouter *defrtrlist_update(struct nd_defrouter *); +static int prelist_update(struct nd_prefixctl *, struct nd_defrouter *, + struct mbuf *, int); +static struct in6_ifaddr *in6_ifadd(struct nd_prefixctl *, int); +static struct nd_pfxrouter *pfxrtr_lookup(struct nd_prefix *, + struct nd_defrouter *); +static void pfxrtr_add(struct nd_prefix *, struct nd_defrouter *); +static void pfxrtr_del(struct nd_pfxrouter *); static struct nd_pfxrouter *find_pfxlist_reachable_router - __P((struct nd_prefix *)); -static void defrouter_delreq __P((struct nd_defrouter *)); -static void nd6_rtmsg __P((int, struct rtentry *)); + (struct nd_prefix *); +static void defrouter_delreq(struct nd_defrouter *); +static void nd6_rtmsg(int, struct rtentry *); -static int in6_init_prefix_ltimes __P((struct nd_prefix *)); -static void in6_init_address_ltimes __P((struct nd_prefix *, - struct in6_addrlifetime *)); +static int in6_init_prefix_ltimes(struct nd_prefix *); +static void in6_init_address_ltimes(struct nd_prefix *, + struct in6_addrlifetime *); -static int rt6_deleteroute __P((struct radix_node *, void *)); +static int rt6_deleteroute(struct radix_node *, void *); extern int nd6_recalc_reachtm_interval; @@ -92,8 +92,8 @@ int ip6_use_tempaddr = 0; int ip6_desync_factor; -u_int32_t ip6_temp_preferred_lifetime = DEF_TEMP_PREFERRED_LIFETIME; -u_int32_t ip6_temp_valid_lifetime = DEF_TEMP_VALID_LIFETIME; +uint32_t ip6_temp_preferred_lifetime = DEF_TEMP_PREFERRED_LIFETIME; +uint32_t ip6_temp_valid_lifetime = DEF_TEMP_VALID_LIFETIME; /* * shorter lifetimes for debugging purposes. int ip6_temp_preferred_lifetime = 800; @@ -249,7 +249,6 @@ return; } #endif - icmp6len -= sizeof(*nd_ra); nd6_option_init(nd_ra + 1, icmp6len, &ndopts); if (nd6_options(&ndopts) < 0) { @@ -261,7 +260,7 @@ { struct nd_defrouter dr0; - u_int32_t advreachable = nd_ra->nd_ra_reachable; + uint32_t advreachable = nd_ra->nd_ra_reachable; /* remember if this is a multicasted advertisement */ if (IN6_IS_ADDR_MULTICAST(&ip6->ip6_dst)) @@ -289,7 +288,6 @@ ndi->chlim = nd_ra->nd_ra_curhoplimit; dr = defrtrlist_update(&dr0); } - /* * prefix */ @@ -1116,7 +1114,7 @@ */ TAILQ_FOREACH(ifa, &ifp->if_addrlist, ifa_list) { struct in6_ifaddr *ifa6; - u_int32_t remaininglifetime; + uint32_t remaininglifetime; if (ifa->ifa_addr->sa_family != AF_INET6) continue; @@ -1205,10 +1203,10 @@ * intervals. */ if ((ifa6->ia6_flags & IN6_IFF_TEMPORARY) != 0) { - u_int32_t maxvltime, maxpltime; + uint32_t maxvltime, maxpltime; if (ip6_temp_valid_lifetime > - (u_int32_t)((time_second - ifa6->ia6_createtime) + + (uint32_t)((time_second - ifa6->ia6_createtime) + ip6_desync_factor)) { maxvltime = ip6_temp_valid_lifetime - (time_second - ifa6->ia6_createtime) - @@ -1216,7 +1214,7 @@ } else maxvltime = 0; if (ip6_temp_preferred_lifetime > - (u_int32_t)((time_second - ifa6->ia6_createtime) + + (uint32_t)((time_second - ifa6->ia6_createtime) + ip6_desync_factor)) { maxpltime = ip6_temp_preferred_lifetime - (time_second - ifa6->ia6_createtime) - ==== //depot/projects/gnn_fast_ipsec/src/sys/netinet6/pim6.h#2 (text+ko) ==== ==== //depot/projects/gnn_fast_ipsec/src/sys/netinet6/pim6_var.h#2 (text+ko) ==== @@ -52,7 +52,7 @@ }; #if (defined(KERNEL)) || (defined(_KERNEL)) -int pim6_input __P((struct mbuf **, int*, int)); +int pim6_input(struct mbuf **, int*, int); #endif /* KERNEL */ /* ==== //depot/projects/gnn_fast_ipsec/src/sys/netinet6/raw_ip6.c#6 (text+ko) ==== @@ -145,7 +145,6 @@ m_freem(m); return IPPROTO_DONE; } - init_sin6(&fromsa, m); /* general init */ INP_INFO_RLOCK(&ripcbinfo); @@ -268,7 +267,7 @@ struct ip6ctlparam *ip6cp = NULL; const struct sockaddr_in6 *sa6_src = NULL; void *cmdarg; - struct inpcb *(*notify) __P((struct inpcb *, int)) = in6_rtchange; + struct inpcb *(*notify)(struct inpcb *, int) = in6_rtchange; if (sa->sa_family != AF_INET6 || sa->sa_len != sizeof(struct sockaddr_in6)) @@ -428,7 +427,7 @@ in6p->in6p_cksum != -1) { struct mbuf *n; int off; - u_int16_t *p; + uint16_t *p; /* compute checksum */ if (so->so_proto->pr_protocol == IPPROTO_ICMPV6) @@ -448,7 +447,7 @@ } if (!n) goto bad; - p = (u_int16_t *)(mtod(n, caddr_t) + off); + p = (uint16_t *)(mtod(n, caddr_t) + off); *p = 0; *p = in6_cksum(m, ip6->ip6_nxt, sizeof(*ip6), plen); } ==== //depot/projects/gnn_fast_ipsec/src/sys/netinet6/raw_ip6.h#2 (text+ko) ==== ==== //depot/projects/gnn_fast_ipsec/src/sys/netinet6/route6.c#2 (text+ko) ==== @@ -49,8 +49,8 @@ #include -static int ip6_rthdr0 __P((struct mbuf *, struct ip6_hdr *, - struct ip6_rthdr0 *)); +static int ip6_rthdr0(struct mbuf *, struct ip6_hdr *, + struct ip6_rthdr0 *); int route6_input(mp, offp, proto) @@ -227,7 +227,7 @@ ip6_forward(m, 1); #endif - return (-1); /* m would be freed in ip6_forward() */ + return (-1); /* m would be freed in ip6_forward() */ bad: m_freem(m); ==== //depot/projects/gnn_fast_ipsec/src/sys/netinet6/scope6.c#2 (text+ko) ==== @@ -197,7 +197,6 @@ return (0); } - /* * Get a scope of the address. Node-local, link-local, site-local or global. */ @@ -223,7 +222,6 @@ } } - if (addr->s6_addr[0] == 0xff) { scope = addr->s6_addr[1] & 0x0f; @@ -296,11 +294,11 @@ return (0); } -u_int32_t +uint32_t scope6_addr2default(addr) struct in6_addr *addr; { - u_int32_t id; + uint32_t id; /* * special case: The loopback address should be considered as @@ -333,7 +331,7 @@ int defaultok; { struct ifnet *ifp; - u_int32_t zoneid; + uint32_t zoneid; if ((zoneid = sin6->sin6_scope_id) == 0 && defaultok) zoneid = scope6_addr2default(&sin6->sin6_addr); @@ -369,13 +367,13 @@ sa6_recoverscope(sin6) struct sockaddr_in6 *sin6; { - u_int32_t zoneid; + uint32_t zoneid; if (sin6->sin6_scope_id != 0) { log(LOG_NOTICE, "sa6_recoverscope: assumption failure (non 0 ID): %s%%%d\n", ip6_sprintf(&sin6->sin6_addr), sin6->sin6_scope_id); - /* XXX: proceed anyway... */ + /* XXX: proceed anyway ... */ } if (IN6_IS_SCOPE_LINKLOCAL(&sin6->sin6_addr) || IN6_IS_ADDR_MC_INTFACELOCAL(&sin6->sin6_addr)) { @@ -406,10 +404,10 @@ in6_setscope(in6, ifp, ret_id) struct in6_addr *in6; struct ifnet *ifp; - u_int32_t *ret_id; /* unnecessary? */ + uint32_t *ret_id; /* unnecessary? */ { int scope; - u_int32_t zoneid = 0; + uint32_t zoneid = 0; struct scope6_id *sid; IF_AFDATA_LOCK(ifp); ==== //depot/projects/gnn_fast_ipsec/src/sys/netinet6/scope6_var.h#2 (text+ko) ==== @@ -39,22 +39,22 @@ * 16 is correspondent to 4bit multicast scope field. * i.e. from node-local to global with some reserved/unassigned types. */ - u_int32_t s6id_list[16]; + uint32_t s6id_list[16]; }; -void scope6_init __P((void)); -struct scope6_id *scope6_ifattach __P((struct ifnet *)); -void scope6_ifdetach __P((struct scope6_id *)); -int scope6_set __P((struct ifnet *, struct scope6_id *)); -int scope6_get __P((struct ifnet *, struct scope6_id *)); -void scope6_setdefault __P((struct ifnet *)); -int scope6_get_default __P((struct scope6_id *)); -u_int32_t scope6_in6_addrscope __P((struct in6_addr *)); -u_int32_t scope6_addr2default __P((struct in6_addr *)); -int sa6_embedscope __P((struct sockaddr_in6 *, int)); -int sa6_recoverscope __P((struct sockaddr_in6 *)); -int in6_setscope __P((struct in6_addr *, struct ifnet *, u_int32_t *)); -int in6_clearscope __P((struct in6_addr *)); +void scope6_init(void); +struct scope6_id *scope6_ifattach(struct ifnet *); +void scope6_ifdetach(struct scope6_id *); +int scope6_set(struct ifnet *, struct scope6_id *); +int scope6_get(struct ifnet *, struct scope6_id *); +void scope6_setdefault(struct ifnet *); +int scope6_get_default(struct scope6_id *); +uint32_t scope6_in6_addrscope(struct in6_addr *); +uint32_t scope6_addr2default(struct in6_addr *); +int sa6_embedscope(struct sockaddr_in6 *, int); +int sa6_recoverscope(struct sockaddr_in6 *); +int in6_setscope(struct in6_addr *, struct ifnet *, uint32_t *); +int in6_clearscope(struct in6_addr *); #endif /* _KERNEL */ #endif /* _NETINET6_SCOPE6_VAR_H_ */ ==== //depot/projects/gnn_fast_ipsec/src/sys/netinet6/tcp6_var.h#2 (text+ko) ==== @@ -72,9 +72,9 @@ extern int tcp_v6mssdflt; /* XXX */ struct ip6_hdr; -void tcp6_ctlinput __P((int, struct sockaddr *, void *)); -void tcp6_init __P((void)); -int tcp6_input __P((struct mbuf **, int *, int)); +void tcp6_ctlinput(int, struct sockaddr *, void *); +void tcp6_init(void); +int tcp6_input(struct mbuf **, int *, int); struct rtentry *tcp_rtlookup6(struct in_conninfo *); extern struct pr_usrreqs tcp6_usrreqs; ==== //depot/projects/gnn_fast_ipsec/src/sys/netinet6/udp6_output.c#3 (text+ko) ==== @@ -124,8 +124,8 @@ struct sockaddr *addr6; struct thread *td; { - u_int32_t ulen = m->m_pkthdr.len; - u_int32_t plen = sizeof(struct udphdr) + ulen; + uint32_t ulen = m->m_pkthdr.len; + uint32_t plen = sizeof(struct udphdr) + ulen; struct ip6_hdr *ip6; struct udphdr *udp6; struct in6_addr *laddr, *faddr; ==== //depot/projects/gnn_fast_ipsec/src/sys/netinet6/udp6_usrreq.c#8 (text+ko) ==== @@ -117,7 +117,7 @@ */ extern struct protosw inetsw[]; -static void udp6_detach __P((struct socket *so)); +static void udp6_detach(struct socket *so); static void udp6_append(struct inpcb *in6p, struct mbuf *n, int off, @@ -269,12 +269,12 @@ continue; if (!IN6_IS_ADDR_UNSPECIFIED(&in6p->in6p_laddr)) { if (!IN6_ARE_ADDR_EQUAL(&in6p->in6p_laddr, - &ip6->ip6_dst)) + &ip6->ip6_dst)) continue; } if (!IN6_IS_ADDR_UNSPECIFIED(&in6p->in6p_faddr)) { if (!IN6_ARE_ADDR_EQUAL(&in6p->in6p_faddr, - &ip6->ip6_src) || + &ip6->ip6_src) || in6p->in6p_fport != uh->uh_sport) continue; } @@ -370,10 +370,10 @@ struct ip6ctlparam *ip6cp = NULL; const struct sockaddr_in6 *sa6_src = NULL; void *cmdarg; - struct inpcb *(*notify) __P((struct inpcb *, int)) = udp_notify; + struct inpcb *(*notify) (struct inpcb *, int) = udp_notify; struct udp_portonly { - u_int16_t uh_sport; - u_int16_t uh_dport; + uint16_t uh_sport; + uint16_t uh_dport; } *uhp; if (sa->sa_family != AF_INET6 || ==== //depot/projects/gnn_fast_ipsec/src/sys/netinet6/udp6_var.h#2 (text+ko) ==== @@ -68,11 +68,11 @@ extern struct pr_usrreqs udp6_usrreqs; -void udp6_ctlinput __P((int, struct sockaddr *, void *)); -int udp6_input __P((struct mbuf **, int *, int)); -int udp6_output __P((struct inpcb *inp, struct mbuf *m, - struct sockaddr *addr, struct mbuf *control, - struct thread *td)); +void udp6_ctlinput(int, struct sockaddr *, void *); +int udp6_input(struct mbuf **, int *, int); +int udp6_output(struct inpcb *inp, struct mbuf *m, + struct sockaddr *addr, struct mbuf *control, + struct thread *td); #endif >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Mon Jul 24 09:02:37 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8E66B16A4E5; Mon, 24 Jul 2006 09:02:37 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 6715E16A4DA for ; Mon, 24 Jul 2006 09:02:37 +0000 (UTC) (envelope-from kevlo@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 32C9D43D46 for ; Mon, 24 Jul 2006 09:02:37 +0000 (GMT) (envelope-from kevlo@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k6O92buS051390 for ; Mon, 24 Jul 2006 09:02:37 GMT (envelope-from kevlo@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k6O92aiV051387 for perforce@freebsd.org; Mon, 24 Jul 2006 09:02:36 GMT (envelope-from kevlo@freebsd.org) Date: Mon, 24 Jul 2006 09:02:36 GMT Message-Id: <200607240902.k6O92aiV051387@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kevlo@freebsd.org using -f From: Kevin Lo To: Perforce Change Reviews Cc: Subject: PERFORCE change 102264 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 24 Jul 2006 09:02:37 -0000 http://perforce.freebsd.org/chv.cgi?CH=102264 Change 102264 by kevlo@kevlo_monet on 2006/07/24 09:02:32 Apply cleanly on current src tree. Affected files ... .. //depot/projects/arm/gnu-arm.diff#15 edit Differences ... ==== //depot/projects/arm/gnu-arm.diff#15 (text+ko) ==== @@ -272,22 +272,6 @@ TARGET_INC+= ${GCC_CPU}/freebsd.h .if ${TARGET_ARCH} == "amd64" TARGET_INC+= ${GCC_CPU}/x86-64.h -Index: gnu/usr.bin/cc/cc_tools/auto-host.h -=================================================================== -RCS file: /cognet/ncvs/src/gnu/usr.bin/cc/cc_tools/auto-host.h,v -retrieving revision 1.18 -diff -u -p -r1.18 auto-host.h ---- gnu/usr.bin/cc/cc_tools/auto-host.h 28 Jul 2004 05:27:20 -0000 1.18 -+++ gnu/usr.bin/cc/cc_tools/auto-host.h 6 Jul 2006 23:54:06 -0000 -@@ -523,7 +523,7 @@ - /* The number of bytes in type int */ - #define SIZEOF_INT 4 - --#if defined(__i386__) || defined(__powerpc__) || defined(__strongarm__) -+#if defined(__i386__) || defined(__powerpc__) || defined(__arm__) - /* The number of bytes in type long */ - # define SIZEOF_LONG SIZEOF_INT - #elif defined(__alpha__) || defined(__sparc64__) || defined(__ia64__) || defined(__amd64__) Index: gnu/usr.bin/gdb/arch/arm/Makefile =================================================================== RCS file: gnu/usr.bin/gdb/arch/arm/Makefile From owner-p4-projects@FreeBSD.ORG Mon Jul 24 09:13:52 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8601516A50C; Mon, 24 Jul 2006 09:13:52 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 4683F16A50A for ; Mon, 24 Jul 2006 09:13:52 +0000 (UTC) (envelope-from clem1@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id C69BF43D49 for ; Mon, 24 Jul 2006 09:13:51 +0000 (GMT) (envelope-from clem1@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k6O9DpPc053580 for ; Mon, 24 Jul 2006 09:13:51 GMT (envelope-from clem1@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k6O9DpA4053563 for perforce@freebsd.org; Mon, 24 Jul 2006 09:13:51 GMT (envelope-from clem1@FreeBSD.org) Date: Mon, 24 Jul 2006 09:13:51 GMT Message-Id: <200607240913.k6O9DpA4053563@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to clem1@FreeBSD.org using -f From: Clément Lecigne To: Perforce Change Reviews Cc: Subject: PERFORCE change 102265 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 24 Jul 2006 09:13:52 -0000 http://perforce.freebsd.org/chv.cgi?CH=102265 Change 102265 by clem1@clem1_ipv6vulns on 2006/07/24 09:13:35 ndping - send Neighbor Discovery request to a neighbor host. (arping equivalent) Affected files ... .. //depot/projects/soc2006/clem1_ipv6vulns/preventing-tools/ndping/Makefile#1 add .. //depot/projects/soc2006/clem1_ipv6vulns/preventing-tools/ndping/ndping.8#1 add .. //depot/projects/soc2006/clem1_ipv6vulns/preventing-tools/ndping/ndping.c#1 add Differences ... From owner-p4-projects@FreeBSD.ORG Mon Jul 24 09:15:55 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 94D5616A4E0; Mon, 24 Jul 2006 09:15:55 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 6781516A4DA for ; Mon, 24 Jul 2006 09:15:55 +0000 (UTC) (envelope-from clem1@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id DC22543D5D for ; Mon, 24 Jul 2006 09:15:54 +0000 (GMT) (envelope-from clem1@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k6O9FsZO053687 for ; Mon, 24 Jul 2006 09:15:54 GMT (envelope-from clem1@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k6O9FsIf053684 for perforce@freebsd.org; Mon, 24 Jul 2006 09:15:54 GMT (envelope-from clem1@FreeBSD.org) Date: Mon, 24 Jul 2006 09:15:54 GMT Message-Id: <200607240915.k6O9FsIf053684@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to clem1@FreeBSD.org using -f From: Clément Lecigne To: Perforce Change Reviews Cc: Subject: PERFORCE change 102266 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 24 Jul 2006 09:15:55 -0000 http://perforce.freebsd.org/chv.cgi?CH=102266 Change 102266 by clem1@clem1_ipv6vulns on 2006/07/24 09:15:18 redir6.py - corrupt routing table of a local node using redirect message. Affected files ... .. //depot/projects/soc2006/clem1_ipv6vulns/attacking-tools/redir6/redir6.py#1 add Differences ... From owner-p4-projects@FreeBSD.ORG Mon Jul 24 09:27:09 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6F8C616A4E6; Mon, 24 Jul 2006 09:27:09 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 4BAFC16A4DD for ; Mon, 24 Jul 2006 09:27:09 +0000 (UTC) (envelope-from kevlo@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id D436643D46 for ; Mon, 24 Jul 2006 09:27:08 +0000 (GMT) (envelope-from kevlo@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k6O9R8Rg054283 for ; Mon, 24 Jul 2006 09:27:08 GMT (envelope-from kevlo@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k6O9R8ip054278 for perforce@freebsd.org; Mon, 24 Jul 2006 09:27:08 GMT (envelope-from kevlo@freebsd.org) Date: Mon, 24 Jul 2006 09:27:08 GMT Message-Id: <200607240927.k6O9R8ip054278@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kevlo@freebsd.org using -f From: Kevin Lo To: Perforce Change Reviews Cc: Subject: PERFORCE change 102267 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 24 Jul 2006 09:27:09 -0000 http://perforce.freebsd.org/chv.cgi?CH=102267 Change 102267 by kevlo@kevlo_monet on 2006/07/24 09:26:16 My bad, back this up. I should commit this into my tree, not into p4. Affected files ... .. //depot/projects/arm/gnu-arm.diff#16 edit Differences ... ==== //depot/projects/arm/gnu-arm.diff#16 (text+ko) ==== @@ -272,6 +272,22 @@ TARGET_INC+= ${GCC_CPU}/freebsd.h .if ${TARGET_ARCH} == "amd64" TARGET_INC+= ${GCC_CPU}/x86-64.h +Index: gnu/usr.bin/cc/cc_tools/auto-host.h +=================================================================== +RCS file: /cognet/ncvs/src/gnu/usr.bin/cc/cc_tools/auto-host.h,v +retrieving revision 1.18 +diff -u -p -r1.18 auto-host.h +--- gnu/usr.bin/cc/cc_tools/auto-host.h 28 Jul 2004 05:27:20 -0000 1.18 ++++ gnu/usr.bin/cc/cc_tools/auto-host.h 6 Jul 2006 23:54:06 -0000 +@@ -523,7 +523,7 @@ + /* The number of bytes in type int */ + #define SIZEOF_INT 4 + +-#if defined(__i386__) || defined(__powerpc__) || defined(__strongarm__) ++#if defined(__i386__) || defined(__powerpc__) || defined(__arm__) + /* The number of bytes in type long */ + # define SIZEOF_LONG SIZEOF_INT + #elif defined(__alpha__) || defined(__sparc64__) || defined(__ia64__) || defined(__amd64__) Index: gnu/usr.bin/gdb/arch/arm/Makefile =================================================================== RCS file: gnu/usr.bin/gdb/arch/arm/Makefile From owner-p4-projects@FreeBSD.ORG Mon Jul 24 11:51:08 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4D92D16A4E1; Mon, 24 Jul 2006 11:51:08 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 119D516A4DE for ; Mon, 24 Jul 2006 11:51:08 +0000 (UTC) (envelope-from piso@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id A43E243D76 for ; Mon, 24 Jul 2006 11:51:07 +0000 (GMT) (envelope-from piso@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k6OBp7w1068877 for ; Mon, 24 Jul 2006 11:51:07 GMT (envelope-from piso@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k6OBp7Fw068874 for perforce@freebsd.org; Mon, 24 Jul 2006 11:51:07 GMT (envelope-from piso@freebsd.org) Date: Mon, 24 Jul 2006 11:51:07 GMT Message-Id: <200607241151.k6OBp7Fw068874@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to piso@freebsd.org using -f From: Paolo Pisati To: Perforce Change Reviews Cc: Subject: PERFORCE change 102270 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 24 Jul 2006 11:51:08 -0000 http://perforce.freebsd.org/chv.cgi?CH=102270 Change 102270 by piso@piso_newluxor on 2006/07/24 11:50:38 Updated. Affected files ... .. //depot/projects/soc2006/intr_filter/notes#8 edit Differences ... ==== //depot/projects/soc2006/intr_filter/notes#8 (text+ko) ==== @@ -23,6 +23,9 @@ accessing the hw registers. The simplest solution would employ a spin lock, but i'm wondering about the performance penalty... ++ Retire IH_FAST and INTR_FAST +[DONE] + + Review all the functions that override bus_generic_setup_intr() and are unaware of filter model (tipically they record in a struct just the *intr function and not the filter...) From owner-p4-projects@FreeBSD.ORG Mon Jul 24 12:03:24 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E30A816A4E8; Mon, 24 Jul 2006 12:03:23 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id A623516A4DA for ; Mon, 24 Jul 2006 12:03:23 +0000 (UTC) (envelope-from piso@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 5D5F043D4C for ; Mon, 24 Jul 2006 12:03:23 +0000 (GMT) (envelope-from piso@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k6OC3NOC070873 for ; Mon, 24 Jul 2006 12:03:23 GMT (envelope-from piso@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k6OC3N84070870 for perforce@freebsd.org; Mon, 24 Jul 2006 12:03:23 GMT (envelope-from piso@freebsd.org) Date: Mon, 24 Jul 2006 12:03:23 GMT Message-Id: <200607241203.k6OC3N84070870@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to piso@freebsd.org using -f From: Paolo Pisati To: Perforce Change Reviews Cc: Subject: PERFORCE change 102272 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 24 Jul 2006 12:03:24 -0000 http://perforce.freebsd.org/chv.cgi?CH=102272 Change 102272 by piso@piso_newluxor on 2006/07/24 12:02:53 Use IS_FAST() one more time. Affected files ... .. //depot/projects/soc2006/intr_filter/kern/kern_intr.c#11 edit Differences ... ==== //depot/projects/soc2006/intr_filter/kern/kern_intr.c#11 (text+ko) ==== @@ -468,7 +468,7 @@ */ dead = 1; TAILQ_FOREACH(ih, &ie->ie_handlers, ih_next) { - if (!(ih->ih_filter != NULL && ih->ih_handler == NULL)) { + if !IS_FAST(ih->ih_filter, ih->ih_handler) { dead = 0; break; } From owner-p4-projects@FreeBSD.ORG Mon Jul 24 13:21:11 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7329F16A4E1; Mon, 24 Jul 2006 13:21:11 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 4BF5E16A4DF for ; Mon, 24 Jul 2006 13:21:11 +0000 (UTC) (envelope-from gabor@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 0DCC443D46 for ; Mon, 24 Jul 2006 13:21:11 +0000 (GMT) (envelope-from gabor@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k6ODLAGZ086727 for ; Mon, 24 Jul 2006 13:21:10 GMT (envelope-from gabor@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k6ODLAHn086724 for perforce@freebsd.org; Mon, 24 Jul 2006 13:21:10 GMT (envelope-from gabor@FreeBSD.org) Date: Mon, 24 Jul 2006 13:21:10 GMT Message-Id: <200607241321.k6ODLAHn086724@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to gabor@FreeBSD.org using -f From: Gabor Kovesdan To: Perforce Change Reviews Cc: Subject: PERFORCE change 102277 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 24 Jul 2006 13:21:11 -0000 http://perforce.freebsd.org/chv.cgi?CH=102277 Change 102277 by gabor@gabor_spitfire on 2006/07/24 13:20:57 Add Tools/scripts/do-fetch.sh. This script will handle the whole fetching process. Currently only the distfile fetcher part of the do-fetch target is moved, I'll move other parts step-by-step. In bsd.port.mk FETCH_SCRIPT is introduced to point to Tools/scripts/do-fetch.sh. I also added FETCH_SCRIPT_ENV to pass some variables to the script. The passed environment will be reduced later when other parts have been moved. Affected files ... .. //depot/projects/soc2006/gabor_ports/Mk/bsd.port.mk#56 edit .. //depot/projects/soc2006/gabor_ports/Tools/scripts/do-fetch.sh#1 add Differences ... ==== //depot/projects/soc2006/gabor_ports/Mk/bsd.port.mk#56 (text+ko) ==== @@ -2114,6 +2114,20 @@ PTHREAD_LIBS?= -pthread .endif +FETCH_SCRIPT=${PORTSDIR}/Tools/scripts/do-fetch.sh +FETCH_SCRIPT_ENV= AWK="${AWK}" BASENAME="${BASENAME}" ECHO_CMD="${ECHO_CMD}" ECHO_MSG="${ECHO_MSG}" \ + GREP="${GREP}" MKDIR="${MKDIR}" SED="${SED}" SETENV="${SETENV}" \ + FETCH_CMD="${FETCH_CMD}" \ + FETCH_BEFORE_ARGS="${FETCH_BEFORE_ARGS}" FETCH_AFTER_ARGS="${FETCH_AFTER_ARGS}" \ + _DISTDIR="${_DISTDIR}" DIST_SUBDIR="${DIST_SUBDIR}" DISTFILES="${DISTFILES}" \ + FORCE_FETCH="${FORCE_FETCH}" NO_CHECKSUM="${NO_CHECKSUM}" MD5_FILE="${MD5_FILE}" \ + _MASTER_SITES="${_MASTER_SITES}" \ + _MASTER_SITE_OVERRIDE="${MASTER_SITE_OVERRIDE}" \ + _MASTER_SITE_BACKUP="${_MASTER_SITE_BACKUP}" MASTER_SORT_AWK="${MASTER_SORT_AWK}" \ + SORTED_MASTER_SITES_DEFAULT_CMD="${SORTED_MASTER_SITES_DEFAULT_CMD}" \ + _RANDOMIZE_SITES="${_RANDOMIZE_SITES}" + + .if exists(/usr/bin/fetch) FETCH_CMD?= /usr/bin/fetch -ARr FETCH_REGET?= 1 @@ -3301,73 +3315,8 @@ .if !target(do-fetch) do-fetch: - @${MKDIR} ${_DISTDIR} - @(cd ${_DISTDIR}; \ - ${_MASTER_SITES_ENV} ; \ - for _file in ${DISTFILES}; do \ - file=`${ECHO_CMD} $$_file | ${SED} -E -e 's/:[^:]+$$//'` ; \ - select=`${ECHO_CMD} $${_file#$${file}} | ${SED} -e 's/^://' -e 's/,/ /g'` ; \ - force_fetch=false; \ - filebasename=`${BASENAME} $$file`; \ - for afile in ${FORCE_FETCH}; do \ - afile=`${BASENAME} $$afile`; \ - if [ "x$$afile" = "x$$filebasename" ]; then \ - force_fetch=true; \ - fi; \ - done; \ - if [ ! -f $$file -a ! -f $$filebasename -o "$$force_fetch" = "true" ]; then \ - DIR=${DIST_SUBDIR}; \ - pattern="$${DIR:+$$DIR/}`${ECHO_CMD} $$file | ${SED} -e 's/\./\\\\./g'`"; \ - if [ -L $$file -o -L $$filebasename ]; then \ - ${ECHO_MSG} "=> ${_DISTDIR}/$$file is a broken symlink."; \ - ${ECHO_MSG} "=> Perhaps a filesystem (most likely a CD) isn't mounted?"; \ - ${ECHO_MSG} "=> Please correct this problem and try again."; \ - exit 1; \ - fi ; \ - if [ -f ${MD5_FILE} -a "x${NO_CHECKSUM}" = "x" ]; then \ - if ! ${GREP} -q "^MD5 ($$pattern)" ${MD5_FILE}; then \ - ${ECHO_MSG} "=> $${DIR:+$$DIR/}$$file is not in ${MD5_FILE}."; \ - ${ECHO_MSG} "=> Either ${MD5_FILE} is out of date, or"; \ - ${ECHO_MSG} "=> $${DIR:+$$DIR/}$$file is spelled incorrectly."; \ - exit 1; \ - fi; \ - fi; \ - ${ECHO_MSG} "=> $$file doesn't seem to exist in ${_DISTDIR}."; \ - if [ ! -w ${DISTDIR} ]; then \ - ${ECHO_MSG} "=> ${DISTDIR} is not writable by you; cannot fetch."; \ - exit 1; \ - fi; \ - if [ ! -z "$$select" ] ; then \ - __MASTER_SITES_TMP= ; \ - for group in $$select; do \ - if [ ! -z \$${_MASTER_SITES_$${group}} ] ; then \ - eval ___MASTER_SITES_TMP="\$${_MASTER_SITES_$${group}}" ; \ - __MASTER_SITES_TMP="$${__MASTER_SITES_TMP} $${___MASTER_SITES_TMP}" ; \ - fi \ - done; \ - ___MASTER_SITES_TMP= ; \ - SORTED_MASTER_SITES_CMD_TMP="${ECHO_CMD} ${_MASTER_SITE_OVERRIDE} `${ECHO_CMD} $${__MASTER_SITES_TMP} | ${AWK} '${MASTER_SORT_AWK:S|\\|\\\\|g}'` ${_MASTER_SITE_BACKUP}" ; \ - else \ - SORTED_MASTER_SITES_CMD_TMP="${SORTED_MASTER_SITES_DEFAULT_CMD}" ; \ - fi ; \ - for site in `eval $$SORTED_MASTER_SITES_CMD_TMP ${_RANDOMIZE_SITES}`; do \ - ${ECHO_MSG} "=> Attempting to fetch from $${site}."; \ - DIR=${DIST_SUBDIR}; \ - CKSIZE=`${GREP} "^SIZE ($${DIR:+$$DIR/}$$file)" ${MD5_FILE} | ${AWK} '{print $$4}'`; \ - case $${file} in \ - */*) ${MKDIR} $${file%/*}; \ - args="-o $${file} $${site}$${file}";; \ - *) args=$${site}$${file};; \ - esac; \ - if ${SETENV} ${FETCH_ENV} ${FETCH_CMD} ${FETCH_BEFORE_ARGS} $${args} ${FETCH_AFTER_ARGS}; then \ - continue 2; \ - fi \ - done; \ - ${ECHO_MSG} "=> Couldn't fetch it - please try to retrieve this";\ - ${ECHO_MSG} "=> port manually into ${_DISTDIR} and try again."; \ - exit 1; \ - fi \ - done) + ${SETENV} ${FETCH_SCRIPT_ENV} ${SH} -x ${FETCH_SCRIPT} + .if defined(PATCHFILES) @(cd ${_DISTDIR}; \ ${_PATCH_SITES_ENV} ; \ From owner-p4-projects@FreeBSD.ORG Mon Jul 24 13:28:22 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2538A16A4E1; Mon, 24 Jul 2006 13:28:22 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id DAA1516A4DF for ; Mon, 24 Jul 2006 13:28:21 +0000 (UTC) (envelope-from piso@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 334C743D55 for ; Mon, 24 Jul 2006 13:28:21 +0000 (GMT) (envelope-from piso@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k6ODSLma087143 for ; Mon, 24 Jul 2006 13:28:21 GMT (envelope-from piso@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k6ODSKc9087140 for perforce@freebsd.org; Mon, 24 Jul 2006 13:28:20 GMT (envelope-from piso@freebsd.org) Date: Mon, 24 Jul 2006 13:28:20 GMT Message-Id: <200607241328.k6ODSKc9087140@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to piso@freebsd.org using -f From: Paolo Pisati To: Perforce Change Reviews Cc: Subject: PERFORCE change 102279 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 24 Jul 2006 13:28:22 -0000 http://perforce.freebsd.org/chv.cgi?CH=102279 Change 102279 by piso@piso_newluxor on 2006/07/24 13:27:43 Mark with XXX_FILTER all the functions that override bus_generic_setup_intr() and keep a copy of driver_intr_t intr: if they keep a reference to *intr, maybe they want a copy of *filter too?!?!? Mark this code with a well known string, so people with better knowledge of what's going on, can easily find all these spots and fix them. Affected files ... .. //depot/projects/soc2006/intr_filter/dev/ata/ata-cbus.c#4 edit .. //depot/projects/soc2006/intr_filter/dev/ata/ata-pci.c#3 edit .. //depot/projects/soc2006/intr_filter/dev/pccard/pccard.c#3 edit .. //depot/projects/soc2006/intr_filter/dev/pccbb/pccbb.c#5 edit .. //depot/projects/soc2006/intr_filter/dev/pccbb/pccbbvar.h#4 edit .. //depot/projects/soc2006/intr_filter/dev/puc/puc.c#7 edit .. //depot/projects/soc2006/intr_filter/dev/scc/scc_core.c#8 edit .. //depot/projects/soc2006/intr_filter/dev/sound/isa/gusc.c#3 edit .. //depot/projects/soc2006/intr_filter/dev/sound/isa/sbc.c#4 edit .. //depot/projects/soc2006/intr_filter/dev/sound/pci/csa.c#3 edit .. //depot/projects/soc2006/intr_filter/sparc64/fhc/fhc.c#3 edit .. //depot/projects/soc2006/intr_filter/sparc64/pci/psycho.c#6 edit .. //depot/projects/soc2006/intr_filter/sparc64/sbus/sbus.c#6 edit Differences ... ==== //depot/projects/soc2006/intr_filter/dev/ata/ata-cbus.c#4 (text+ko) ==== @@ -194,6 +194,9 @@ struct ata_cbus_controller *controller = device_get_softc(dev); int unit = ((struct ata_channel *)device_get_softc(child))->unit; + /* + * XXX_FILTER this code doesn't take care of filters. + */ controller->interrupt[unit].function = intr; controller->interrupt[unit].argument = arg; *cookiep = controller; ==== //depot/projects/soc2006/intr_filter/dev/ata/ata-pci.c#3 (text+ko) ==== @@ -345,7 +345,10 @@ else { struct ata_pci_controller *controller = device_get_softc(dev); int unit = ((struct ata_channel *)device_get_softc(child))->unit; - + + /* + * XXX_FILTER this code doesn't take care of filters. + */ controller->interrupt[unit].function = function; controller->interrupt[unit].argument = argument; *cookiep = controller; ==== //depot/projects/soc2006/intr_filter/dev/pccard/pccard.c#3 (text+ko) ==== @@ -1224,6 +1224,9 @@ pf, cookiep); if (err != 0) return (err); + /* + * XXX_FILTER this code doesn't take care of filters. + */ pf->intr_handler = intr; pf->intr_handler_arg = arg; pf->intr_handler_cookie = *cookiep; ==== //depot/projects/soc2006/intr_filter/dev/pccbb/pccbb.c#5 (text+ko) ==== @@ -368,6 +368,9 @@ if (ih == NULL) return (ENOMEM); *cookiep = ih; + /* + * XXX_FILTER this code doesn't take care of filters. + */ ih->intr = intr; ih->arg = arg; ih->sc = sc; ==== //depot/projects/soc2006/intr_filter/dev/pccbb/pccbbvar.h#4 (text+ko) ==== @@ -31,14 +31,7 @@ * Structure definitions for the Cardbus Bridge driver */ -/* - * XXX this structure and all the code that manipulates - * it don't support interrupt filter model. - */ struct cbb_intrhand { -#if 0 - driver_filter_t *filter; -#endif driver_intr_t *intr; void *arg; struct cbb_softc *sc; ==== //depot/projects/soc2006/intr_filter/dev/puc/puc.c#7 (text+ko) ==== @@ -637,6 +637,9 @@ sc->sc_serdevs |= 1UL << (port->p_nr - 1); port->p_hasintr = 1; + /* + * XXX_FILTER this code doesn't take care of filters. + */ port->p_ih = (driver_intr_t *)filter; port->p_iharg = arg; ==== //depot/projects/soc2006/intr_filter/dev/scc/scc_core.c#8 (text) ==== @@ -533,6 +533,9 @@ m = device_get_ivars(child); m->m_hasintr = 1; + /* + * XXX_FILTER this code doesn't take care of filters. + */ m->m_fastintr = IS_FAST(filter, ihand) ? 1 : 0; m->ih = ihand; m->ih_arg = arg; ==== //depot/projects/soc2006/intr_filter/dev/sound/isa/gusc.c#3 (text+ko) ==== @@ -426,10 +426,16 @@ devclass = device_get_devclass(child); if (strcmp(devclass_get_name(devclass), "midi") == 0) { + /* + * XXX_FILTER this code doesn't take care of filters. + */ scp->midi_intr.intr = intr; scp->midi_intr.arg = arg; return 0; } else if (strcmp(devclass_get_name(devclass), "pcm") == 0) { + /* + * XXX_FILTER this code doesn't take care of filters. + */ scp->pcm_intr.intr = intr; scp->pcm_intr.arg = arg; return 0; ==== //depot/projects/soc2006/intr_filter/dev/sound/isa/sbc.c#4 (text+ko) ==== @@ -521,6 +521,9 @@ i = 0; while ((ret == 0) && (i < INTR_MAX)) { if (ihl->intr[i] == NULL) { + /* + * XXX_FILTER this code doesn't take care of filters. + */ ihl->intr[i] = intr; ihl->intr_arg[i] = arg; *cookiep = &ihl->intr[i]; ==== //depot/projects/soc2006/intr_filter/dev/sound/pci/csa.c#3 (text+ko) ==== @@ -460,11 +460,17 @@ switch (func->func) { case SCF_PCM: + /* + * XXX_FILTER this code doesn't take care of filters. + */ scp->pcmintr = intr; scp->pcmintr_arg = arg; break; case SCF_MIDI: + /* + * XXX_FILTER this code doesn't take care of filters. + */ scp->midiintr = intr; scp->midiintr_arg = arg; break; ==== //depot/projects/soc2006/intr_filter/sparc64/fhc/fhc.c#3 (text+ko) ==== @@ -238,6 +238,9 @@ fc = malloc(sizeof(*fc), M_DEVBUF, M_WAITOK | M_ZERO); if (fc == NULL) return (0); + /* + * XXX_FILTER this code doesn't take care of filters. + */ fc->fc_func = func; fc->fc_arg = arg; fc->fc_bt = bt; ==== //depot/projects/soc2006/intr_filter/sparc64/pci/psycho.c#6 (text+ko) ==== @@ -988,6 +988,9 @@ device_printf(dev, "%s: INO %d, map %#lx, clr %#lx\n", __func__, ino, (u_long)intrmapptr, (u_long)intrclrptr); #endif + /* + * XXX_FILTER this code doesn't take care of filters. + */ pc->pci_sc = sc; pc->pci_arg = arg; pc->pci_handler = intr; ==== //depot/projects/soc2006/intr_filter/sparc64/sbus/sbus.c#6 (text+ko) ==== @@ -693,6 +693,9 @@ panic("%s: IRQ not found!", __func__); } + /* + * XXX_FILTER this code doesn't take care of filters. + */ scl->scl_sc = sc; scl->scl_arg = arg; scl->scl_handler = intr; From owner-p4-projects@FreeBSD.ORG Mon Jul 24 13:29:23 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8550716A4E2; Mon, 24 Jul 2006 13:29:23 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 4932216A4E0 for ; Mon, 24 Jul 2006 13:29:23 +0000 (UTC) (envelope-from piso@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 03E8343D49 for ; Mon, 24 Jul 2006 13:29:23 +0000 (GMT) (envelope-from piso@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k6ODTMXY087216 for ; Mon, 24 Jul 2006 13:29:22 GMT (envelope-from piso@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k6ODTMNp087213 for perforce@freebsd.org; Mon, 24 Jul 2006 13:29:22 GMT (envelope-from piso@freebsd.org) Date: Mon, 24 Jul 2006 13:29:22 GMT Message-Id: <200607241329.k6ODTMNp087213@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to piso@freebsd.org using -f From: Paolo Pisati To: Perforce Change Reviews Cc: Subject: PERFORCE change 102280 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 24 Jul 2006 13:29:23 -0000 http://perforce.freebsd.org/chv.cgi?CH=102280 Change 102280 by piso@piso_newluxor on 2006/07/24 13:28:32 Updated. Affected files ... .. //depot/projects/soc2006/intr_filter/notes#9 edit Differences ... ==== //depot/projects/soc2006/intr_filter/notes#9 (text+ko) ==== @@ -29,6 +29,7 @@ + Review all the functions that override bus_generic_setup_intr() and are unaware of filter model (tipically they record in a struct just the *intr function and not the filter...) +[DONE] Interrupt filters: - First Pass: filters exist, but you only get one or the other; also, each From owner-p4-projects@FreeBSD.ORG Mon Jul 24 14:11:16 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7D5AD16A4E5; Mon, 24 Jul 2006 14:11:16 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 4122316A4E1 for ; Mon, 24 Jul 2006 14:11:16 +0000 (UTC) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 9A8BB43D58 for ; Mon, 24 Jul 2006 14:11:15 +0000 (GMT) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k6OEBFGA090787 for ; Mon, 24 Jul 2006 14:11:15 GMT (envelope-from rdivacky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k6OEBFMC090784 for perforce@freebsd.org; Mon, 24 Jul 2006 14:11:15 GMT (envelope-from rdivacky@FreeBSD.org) Date: Mon, 24 Jul 2006 14:11:15 GMT Message-Id: <200607241411.k6OEBFMC090784@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rdivacky@FreeBSD.org using -f From: Roman Divacky To: Perforce Change Reviews Cc: Subject: PERFORCE change 102283 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 24 Jul 2006 14:11:16 -0000 http://perforce.freebsd.org/chv.cgi?CH=102283 Change 102283 by rdivacky@rdivacky_witten on 2006/07/24 14:10:38 Implement CLONE_TLS semantic for clone() syscall. This let me pass my pthread testing stuff (trivial 2 threads program). Also make it compilable without -DDEBUG. Affected files ... .. //depot/projects/soc2006/rdivacky_linuxolator/i386/linux/linux_machdep.c#22 edit Differences ... ==== //depot/projects/soc2006/rdivacky_linuxolator/i386/linux/linux_machdep.c#22 (text+ko) ==== @@ -447,10 +447,6 @@ em->child_clear_tid = NULL; EMUL_RUNLOCK(&emul_lock); - if (args->flags & CLONE_SETTLS) { - /* XXX: set the TLS */ - } - PROC_LOCK(p2); p2->p_sigparent = exit_signal; PROC_UNLOCK(p2); @@ -461,8 +457,64 @@ if (args->stack) td2->td_frame->tf_esp = (unsigned int)args->stack; + if (args->flags & CLONE_SETTLS) { + struct l_user_desc info; + int idx; + int a[2]; + struct segment_descriptor sd; + + error = copyin((void *)td->td_frame->tf_esi, &info, sizeof(struct l_user_desc)); + if (error) + return (error); + + idx = info.entry_number; + + /* looks like we're getting the idx we returned + * in the set_thread_area() syscall + */ + if (idx != 6 && idx != 3) + return (EINVAL); + +#ifdef notyet + /* this doesnt happen in practice */ + if (idx == 6) { + /* we might copy out the entry_number as 3 */ + idx = info.entry_number = 3; + error = copyout(&info, args->desc, sizeof(struct l_user_desc)); + if (error) + return (error); + } +#endif + + a[0] = LDT_entry_a(&info); + a[1] = LDT_entry_b(&info); + + memcpy(&sd, &a, sizeof(a)); #ifdef DEBUG if (ldebug(clone)) + printf("Segment created in clone with CLONE_SETTLS: lobase: %x, hibase: %x, lolimit: %x, hilimit: %x, type: %i, dpl: %i, p: %i, xx: %i, def32: %i, gran: %i\n", sd.sd_lobase, + sd.sd_hibase, + sd.sd_lolimit, + sd.sd_hilimit, + sd.sd_type, + sd.sd_dpl, + sd.sd_p, + sd.sd_xx, + sd.sd_def32, + sd.sd_gran); +#endif + + /* this is taken from i386 version of cpu_set_user_tls() */ + critical_enter(); + /* set %gs */ + td2->td_pcb->pcb_gsd = sd; + PCPU_GET(fsgs_gdt)[1] = sd; + load_gs(GSEL(GUGS_SEL, SEL_UPL)); + critical_exit(); + } + +#ifdef DEBUG + if (ldebug(clone)) printf(LMSG("clone: successful rfork to %ld, stack %p sig = %d"), (long)p2->p_pid, args->stack, exit_signal); #endif @@ -1185,12 +1237,12 @@ if (__predict_false(imgp->sysent == &elf32_freebsd_sysvec && p->p_sysent == &elf_linux_sysvec)) { struct linux_emuldata *em; - struct thread *td = FIRST_THREAD_IN_PROC(p); em = em_find(p->p_pid, EMUL_UNLOCKED); if (em == NULL) { #ifdef DEBUG + struct thread *td = FIRST_THREAD_IN_PROC(p); printf(LMSG("we didnt find emuldata for the execing process.\n")); #endif return; From owner-p4-projects@FreeBSD.ORG Mon Jul 24 14:17:26 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id EBADD16A4E1; Mon, 24 Jul 2006 14:17:25 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id C79AA16A4DF for ; Mon, 24 Jul 2006 14:17:25 +0000 (UTC) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 4360843D5E for ; Mon, 24 Jul 2006 14:17:24 +0000 (GMT) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k6OEHOrG091026 for ; Mon, 24 Jul 2006 14:17:24 GMT (envelope-from rdivacky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k6OEHNBV091023 for perforce@freebsd.org; Mon, 24 Jul 2006 14:17:23 GMT (envelope-from rdivacky@FreeBSD.org) Date: Mon, 24 Jul 2006 14:17:23 GMT Message-Id: <200607241417.k6OEHNBV091023@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rdivacky@FreeBSD.org using -f From: Roman Divacky To: Perforce Change Reviews Cc: Subject: PERFORCE change 102284 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 24 Jul 2006 14:17:26 -0000 http://perforce.freebsd.org/chv.cgi?CH=102284 Change 102284 by rdivacky@rdivacky_witten on 2006/07/24 14:17:15 Fix the typo. Affected files ... .. //depot/projects/soc2006/rdivacky_linuxolator/compat/linux/linux_futex.c#7 edit Differences ... ==== //depot/projects/soc2006/rdivacky_linuxolator/compat/linux/linux_futex.c#7 (text+ko) ==== @@ -210,7 +210,7 @@ args->op); break; default: - printf("linux_sys_futex: unkonwn op %d\n", + printf("linux_sys_futex: unknown op %d\n", args->op); break; } From owner-p4-projects@FreeBSD.ORG Mon Jul 24 14:33:17 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 14D4616A4E1; Mon, 24 Jul 2006 14:33:17 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 7C13F16A4DF for ; Mon, 24 Jul 2006 14:33:16 +0000 (UTC) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 7049A43D7B for ; Mon, 24 Jul 2006 14:32:43 +0000 (GMT) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k6OEWhxD092170 for ; Mon, 24 Jul 2006 14:32:43 GMT (envelope-from rdivacky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k6OEWh9j092167 for perforce@freebsd.org; Mon, 24 Jul 2006 14:32:43 GMT (envelope-from rdivacky@FreeBSD.org) Date: Mon, 24 Jul 2006 14:32:43 GMT Message-Id: <200607241432.k6OEWh9j092167@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rdivacky@FreeBSD.org using -f From: Roman Divacky To: Perforce Change Reviews Cc: Subject: PERFORCE change 102286 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 24 Jul 2006 14:33:17 -0000 http://perforce.freebsd.org/chv.cgi?CH=102286 Change 102286 by rdivacky@rdivacky_witten on 2006/07/24 14:32:19 Introduce LINUX_FUTEX_WAKE_OP. Affected files ... .. //depot/projects/soc2006/rdivacky_linuxolator/compat/linux/linux_futex.c#8 edit .. //depot/projects/soc2006/rdivacky_linuxolator/compat/linux/linux_futex.h#2 edit Differences ... ==== //depot/projects/soc2006/rdivacky_linuxolator/compat/linux/linux_futex.c#8 (text+ko) ==== @@ -209,6 +209,11 @@ printf("linux_sys_futex: unimplemented op %d\n", args->op); break; + case LINUX_FUTEX_WAIT_OP: + /* XXX: it seems necessary for realplay */ + printf("linux_sys_futex: unimplemented op %d\n", + args->op); + break; default: printf("linux_sys_futex: unknown op %d\n", args->op); ==== //depot/projects/soc2006/rdivacky_linuxolator/compat/linux/linux_futex.h#2 (text+ko) ==== @@ -39,5 +39,6 @@ #define LINUX_FUTEX_FD 2 #define LINUX_FUTEX_REQUEUE 3 #define LINUX_FUTEX_CMP_REQUEUE 4 +#define LINUX_FUTEX_WAKE_OP 5 #endif /* !_LINUX_FUTEX_H */ From owner-p4-projects@FreeBSD.ORG Mon Jul 24 15:01:20 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9C88016A4E0; Mon, 24 Jul 2006 15:01:20 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 6021916A4DA for ; Mon, 24 Jul 2006 15:01:20 +0000 (UTC) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 1AA0F43D6B for ; Mon, 24 Jul 2006 15:01:20 +0000 (GMT) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k6OF1JYD094691 for ; Mon, 24 Jul 2006 15:01:19 GMT (envelope-from rdivacky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k6OF1JI0094688 for perforce@freebsd.org; Mon, 24 Jul 2006 15:01:19 GMT (envelope-from rdivacky@FreeBSD.org) Date: Mon, 24 Jul 2006 15:01:19 GMT Message-Id: <200607241501.k6OF1JI0094688@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rdivacky@FreeBSD.org using -f From: Roman Divacky To: Perforce Change Reviews Cc: Subject: PERFORCE change 102288 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 24 Jul 2006 15:01:20 -0000 http://perforce.freebsd.org/chv.cgi?CH=102288 Change 102288 by rdivacky@rdivacky_witten on 2006/07/24 15:00:43 Typo (fixes the previous commit). Affected files ... .. //depot/projects/soc2006/rdivacky_linuxolator/compat/linux/linux_futex.c#9 edit Differences ... ==== //depot/projects/soc2006/rdivacky_linuxolator/compat/linux/linux_futex.c#9 (text+ko) ==== @@ -209,7 +209,7 @@ printf("linux_sys_futex: unimplemented op %d\n", args->op); break; - case LINUX_FUTEX_WAIT_OP: + case LINUX_FUTEX_WAKE_OP: /* XXX: it seems necessary for realplay */ printf("linux_sys_futex: unimplemented op %d\n", args->op); From owner-p4-projects@FreeBSD.ORG Mon Jul 24 15:35:04 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4F1BC16A4E1; Mon, 24 Jul 2006 15:35:04 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 2D6DF16A4DA for ; Mon, 24 Jul 2006 15:35:04 +0000 (UTC) (envelope-from gabor@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id A1D3B43D4C for ; Mon, 24 Jul 2006 15:35:03 +0000 (GMT) (envelope-from gabor@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k6OFZ3i0097910 for ; Mon, 24 Jul 2006 15:35:03 GMT (envelope-from gabor@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k6OFZ3fk097907 for perforce@freebsd.org; Mon, 24 Jul 2006 15:35:03 GMT (envelope-from gabor@FreeBSD.org) Date: Mon, 24 Jul 2006 15:35:03 GMT Message-Id: <200607241535.k6OFZ3fk097907@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to gabor@FreeBSD.org using -f From: Gabor Kovesdan To: Perforce Change Reviews Cc: Subject: PERFORCE change 102291 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 24 Jul 2006 15:35:04 -0000 http://perforce.freebsd.org/chv.cgi?CH=102291 Change 102291 by gabor@gabor_spitfire on 2006/07/24 15:34:01 Move the code that fetches patches. This doesn't actually work so far, more environmental variables have to be moved, since they can't be passed through FETCH_SCRIPT_ENV. Affected files ... .. //depot/projects/soc2006/gabor_ports/Mk/bsd.port.mk#57 edit .. //depot/projects/soc2006/gabor_ports/Tools/scripts/do-fetch.sh#2 edit Differences ... ==== //depot/projects/soc2006/gabor_ports/Mk/bsd.port.mk#57 (text+ko) ==== @@ -2125,7 +2125,9 @@ _MASTER_SITE_OVERRIDE="${MASTER_SITE_OVERRIDE}" \ _MASTER_SITE_BACKUP="${_MASTER_SITE_BACKUP}" MASTER_SORT_AWK="${MASTER_SORT_AWK}" \ SORTED_MASTER_SITES_DEFAULT_CMD="${SORTED_MASTER_SITES_DEFAULT_CMD}" \ - _RANDOMIZE_SITES="${_RANDOMIZE_SITES}" + _RANDOMIZE_SITES="${_RANDOMIZE_SITES}" \ + PATCHFILES="${PATCHFILES}" \ + SORTED_PATCH_SITES_DEFAULT_CMD="${SORTED_PATCH_SITES_DEFAULT_CMD}" .if exists(/usr/bin/fetch) @@ -3316,62 +3318,6 @@ .if !target(do-fetch) do-fetch: ${SETENV} ${FETCH_SCRIPT_ENV} ${SH} -x ${FETCH_SCRIPT} - -.if defined(PATCHFILES) - @(cd ${_DISTDIR}; \ - ${_PATCH_SITES_ENV} ; \ - for _file in ${PATCHFILES}; do \ - file=`${ECHO_CMD} $$_file | ${SED} -E -e 's/:[^:]+$$//'` ; \ - select=`${ECHO_CMD} $${_file#$${file}} | ${SED} -e 's/^://' -e 's/,/ /g'` ; \ - force_fetch=false; \ - filebasename=`${BASENAME} $$file`; \ - for afile in ${FORCE_FETCH}; do \ - afile=`${BASENAME} $$afile`; \ - if [ "x$$afile" = "x$$filebasename" ]; then \ - force_fetch=true; \ - fi; \ - done; \ - if [ ! -f $$file -a ! -f $$filebasename -o "$$force_fetch" = "true" ]; then \ - if [ -L $$file -o -L `${BASENAME} $$file` ]; then \ - ${ECHO_MSG} "=> ${_DISTDIR}/$$file is a broken symlink."; \ - ${ECHO_MSG} "=> Perhaps a filesystem (most likely a CD) isn't mounted?"; \ - ${ECHO_MSG} "=> Please correct this problem and try again."; \ - exit 1; \ - fi ; \ - ${ECHO_MSG} "=> $$file doesn't seem to exist in ${_DISTDIR}."; \ - if [ ! -z "$$select" ] ; then \ - __PATCH_SITES_TMP= ; \ - for group in $$select; do \ - if [ ! -z \$${_PATCH_SITES_$${group}} ] ; then \ - eval ___PATCH_SITES_TMP="\$${_PATCH_SITES_$${group}}" ; \ - __PATCH_SITES_TMP="$${__PATCH_SITES_TMP} $${___PATCH_SITES_TMP}" ; \ - fi \ - done; \ - ___PATCH_SITES_TMP= ; \ - SORTED_PATCH_SITES_CMD_TMP="${ECHO_CMD} ${_MASTER_SITE_OVERRIDE} `${ECHO_CMD} $${__PATCH_SITES_TMP} | ${AWK} '${MASTER_SORT_AWK:S|\\|\\\\|g}'` ${_MASTER_SITE_BACKUP}" ; \ - else \ - SORTED_PATCH_SITES_CMD_TMP="${SORTED_PATCH_SITES_DEFAULT_CMD}" ; \ - fi ; \ - for site in `eval $$SORTED_PATCH_SITES_CMD_TMP`; do \ - ${ECHO_MSG} "=> Attempting to fetch from $${site}."; \ - DIR=${DIST_SUBDIR}; \ - pattern="$${DIR:+$$DIR/}`${ECHO_CMD} $$file | ${SED} -e 's/\./\\\\./g'`"; \ - CKSIZE=`${GREP} "^SIZE ($$pattern)" ${MD5_FILE} | ${AWK} '{print $$4}'`; \ - case $${file} in \ - */*) ${MKDIR} $${file%/*}; \ - args="-o $${file} $${site}$${file}";; \ - *) args=$${site}$${file};; \ - esac; \ - if ${SETENV} ${FETCH_ENV} ${FETCH_CMD} ${FETCH_BEFORE_ARGS} $${args} ${FETCH_AFTER_ARGS}; then \ - continue 2; \ - fi \ - done; \ - ${ECHO_MSG} "=> Couldn't fetch it - please try to retrieve this";\ - ${ECHO_MSG} "=> port manually into ${_DISTDIR} and try again."; \ - exit 1; \ - fi \ - done) -.endif .endif # Extract ==== //depot/projects/soc2006/gabor_ports/Tools/scripts/do-fetch.sh#2 (text+ko) ==== @@ -67,3 +67,61 @@ exit 1 fi done + +if [ -z "${PATCHFILES}" ] ; then + cd ${_DISTDIR} + ${_PATCH_SITES_ENV} + for _file in ${PATCHFILES}; do + file=`${ECHO_CMD} $_file | ${SED} -E -e 's/:[^:]+$$//'` + select=`${ECHO_CMD} ${_file#${file}} | ${SED} -e 's/^://' -e 's/,/ /g'` + force_fetch=false + filebasename=`${BASENAME} $file` + for afile in ${FORCE_FETCH}; do + afile=`${BASENAME} $afile` + if [ "x$afile" = "x$filebasename" ]; then + force_fetch=true + fi + done + if [ ! -f $file -a ! -f $filebasename -o "$force_fetch" = "true" ]; then + if [ -L $file -o -L `${BASENAME} $file` ]; then + ${ECHO_MSG} "=> ${_DISTDIR}/$file is a broken symlink." + ${ECHO_MSG} "=> Perhaps a filesystem (most likely a CD) isn't mounted?" + ${ECHO_MSG} "=> Please correct this problem and try again." + exit 1 + fi + ${ECHO_MSG} "=> $file doesn't seem to exist in ${_DISTDIR}." + if [ ! -z "$select" ] ; then + __PATCH_SITES_TMP= + for group in $select; do + if [ ! -z $${_PATCH_SITES_${group}} ] ; then + eval ___PATCH_SITES_TMP="$${_PATCH_SITES_${group}}" + __PATCH_SITES_TMP="${__PATCH_SITES_TMP} ${___PATCH_SITES_TMP}" + fi + done + ___PATCH_SITES_TMP= + SORTED_PATCH_SITES_CMD_TMP="${ECHO_CMD} ${_MASTER_SITE_OVERRIDE} `${ECHO_CMD} ${__PATCH_SITES_TMP} | ${AWK} '${MASTER_SORT_AWK:S|\\|\\\\|g}'` ${_MASTER_SITE_BACKUP}" + else + SORTED_PATCH_SITES_CMD_TMP="${SORTED_PATCH_SITES_DEFAULT_CMD}" + fi + for site in `eval $SORTED_PATCH_SITES_CMD_TMP`; do + ${ECHO_MSG} "=> Attempting to fetch from ${site}." + DIR=${DIST_SUBDIR} + pattern="${DIR:+$DIR/}`${ECHO_CMD} $file | ${SED} -e 's/\./\\\\./g'`" + CKSIZE=`${GREP} "^SIZE ($pattern)" ${MD5_FILE} | ${AWK} '{print $4}'` + case ${file} in + */*) + ${MKDIR} ${file%/*}; \ + args="-o ${file} ${site}${file}";; + *) + args=${site}${file};; + esac + if ${SETENV} ${FETCH_ENV} ${FETCH_CMD} ${FETCH_BEFORE_ARGS} ${args} ${FETCH_AFTER_ARGS}; then + continue 2 + fi + done + ${ECHO_MSG} "=> Couldn't fetch it - please try to retrieve this" + ${ECHO_MSG} "=> port manually into ${_DISTDIR} and try again." + exit 1 + fi + done +fi From owner-p4-projects@FreeBSD.ORG Mon Jul 24 16:28:53 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2C3F116A4E0; Mon, 24 Jul 2006 16:28:53 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 04B0816A4DA; Mon, 24 Jul 2006 16:28:53 +0000 (UTC) (envelope-from sam@errno.com) Received: from ebb.errno.com (ebb.errno.com [69.12.149.25]) by mx1.FreeBSD.org (Postfix) with ESMTP id A25F643D67; Mon, 24 Jul 2006 16:28:52 +0000 (GMT) (envelope-from sam@errno.com) Received: from [10.0.0.248] (trouble.errno.com [10.0.0.248]) (authenticated bits=0) by ebb.errno.com (8.13.6/8.12.6) with ESMTP id k6OGSpjY072990 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Mon, 24 Jul 2006 09:28:52 -0700 (PDT) (envelope-from sam@errno.com) Message-ID: <44C4F543.3090208@errno.com> Date: Mon, 24 Jul 2006 09:28:51 -0700 From: Sam Leffler User-Agent: Thunderbird 1.5.0.2 (X11/20060508) MIME-Version: 1.0 To: Kevin Lo References: <200607240927.k6O9R8ip054278@repoman.freebsd.org> In-Reply-To: <200607240927.k6O9R8ip054278@repoman.freebsd.org> X-Enigmail-Version: 0.94.0.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit Cc: Perforce Change Reviews Subject: Re: PERFORCE change 102267 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 24 Jul 2006 16:28:53 -0000 Kevin Lo wrote: > http://perforce.freebsd.org/chv.cgi?CH=102267 > > Change 102267 by kevlo@kevlo_monet on 2006/07/24 09:26:16 > > My bad, back this up. I should commit this into my tree, not into p4. Why is it a mistake? We need to start using a common tree. I ended up creating a sam_avila branch that's derived from arm-devel so I can trivially pickup mods that are committed to arm-devel. I'd like to see everyone working on arm code share arm-devel and push their changes upstream to there until we can work in CVS. Sam From owner-p4-projects@FreeBSD.ORG Mon Jul 24 16:34:24 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A954616A4E6; Mon, 24 Jul 2006 16:34:24 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 8774216A4E1; Mon, 24 Jul 2006 16:34:24 +0000 (UTC) (envelope-from doginou@dong.ci0.org) Received: from dong.ci0.org (cognet.ci0.org [80.65.224.102]) by mx1.FreeBSD.org (Postfix) with ESMTP id C85A143D73; Mon, 24 Jul 2006 16:34:23 +0000 (GMT) (envelope-from doginou@dong.ci0.org) Received: from dong.ci0.org (localhost.ci0.org [127.0.0.1]) by dong.ci0.org (8.13.6/8.13.4) with ESMTP id k6OGaOfn083222; Mon, 24 Jul 2006 18:36:24 +0200 (CEST) (envelope-from doginou@dong.ci0.org) Received: (from doginou@localhost) by dong.ci0.org (8.13.7/8.13.4/Submit) id k6OGaOea083221; Mon, 24 Jul 2006 18:36:24 +0200 (CEST) (envelope-from doginou) Date: Mon, 24 Jul 2006 18:36:24 +0200 From: Olivier Houchard To: Sam Leffler Message-ID: <20060724163624.GA83205@ci0.org> References: <200607240927.k6O9R8ip054278@repoman.freebsd.org> <44C4F543.3090208@errno.com> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <44C4F543.3090208@errno.com> User-Agent: Mutt/1.4.1i Cc: Kevin Lo , Perforce Change Reviews Subject: Re: PERFORCE change 102267 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 24 Jul 2006 16:34:24 -0000 On Mon, Jul 24, 2006 at 09:28:51AM -0700, Sam Leffler wrote: > Kevin Lo wrote: > > http://perforce.freebsd.org/chv.cgi?CH=102267 > > > > Change 102267 by kevlo@kevlo_monet on 2006/07/24 09:26:16 > > > > My bad, back this up. I should commit this into my tree, not into p4. > > Why is it a mistake? We need to start using a common tree. I ended up > creating a sam_avila branch that's derived from arm-devel so I can > trivially pickup mods that are committed to arm-devel. I'd like to see > everyone working on arm code share arm-devel and push their changes > upstream to there until we can work in CVS. > I agree. Everyone working in his own P4 branch can be a PITA. arm-devel is "experimental" enough that we don't have to worry about breaking things. Olivier From owner-p4-projects@FreeBSD.ORG Mon Jul 24 18:22:39 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9FBB316A4EC; Mon, 24 Jul 2006 18:22:39 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 4CBD716A4DE for ; Mon, 24 Jul 2006 18:22:39 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 1D43843D58 for ; Mon, 24 Jul 2006 18:22:39 +0000 (GMT) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k6OIMcer022543 for ; Mon, 24 Jul 2006 18:22:38 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k6OIMcXG022540 for perforce@freebsd.org; Mon, 24 Jul 2006 18:22:38 GMT (envelope-from jhb@freebsd.org) Date: Mon, 24 Jul 2006 18:22:38 GMT Message-Id: <200607241822.k6OIMcXG022540@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 Cc: Subject: PERFORCE change 102304 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 24 Jul 2006 18:22:39 -0000 http://perforce.freebsd.org/chv.cgi?CH=102304 Change 102304 by jhb@jhb_mutex on 2006/07/24 18:21:46 Hold the reference on the mountpoint longer since prison_enforce_statfs() likes to fondle the mountpoint. Affected files ... .. //depot/projects/smpng/sys/kern/vfs_syscalls.c#113 edit Differences ... ==== //depot/projects/smpng/sys/kern/vfs_syscalls.c#113 (text+ko) ==== @@ -266,7 +266,6 @@ sp->f_namemax = NAME_MAX; sp->f_flags = mp->mnt_flag & MNT_VISFLAGMASK; error = VFS_STATFS(mp, sp, td); - vfs_rel(mp); if (error) goto out; if (suser(td)) { @@ -277,6 +276,7 @@ } *buf = *sp; out: + vfs_rel(mp); VFS_UNLOCK_GIANT(vfslocked); if (mtx_owned(&Giant)) printf("statfs(%d): %s: %d\n", vfslocked, path, error); @@ -355,7 +355,6 @@ sp->f_namemax = NAME_MAX; sp->f_flags = mp->mnt_flag & MNT_VISFLAGMASK; error = VFS_STATFS(mp, sp, td); - vfs_rel(mp); if (error) goto out; if (suser(td)) { @@ -366,6 +365,7 @@ } *buf = *sp; out: + vfs_rel(mp); VFS_UNLOCK_GIANT(vfslocked); return (error); } From owner-p4-projects@FreeBSD.ORG Mon Jul 24 18:34:55 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B1E1016A4DE; Mon, 24 Jul 2006 18:34:55 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 0B37516A4DA for ; Mon, 24 Jul 2006 18:34:55 +0000 (UTC) (envelope-from gabor@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 9C03943D49 for ; Mon, 24 Jul 2006 18:34:54 +0000 (GMT) (envelope-from gabor@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k6OIYs4L023046 for ; Mon, 24 Jul 2006 18:34:54 GMT (envelope-from gabor@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k6OIYsh8023043 for perforce@freebsd.org; Mon, 24 Jul 2006 18:34:54 GMT (envelope-from gabor@FreeBSD.org) Date: Mon, 24 Jul 2006 18:34:54 GMT Message-Id: <200607241834.k6OIYsh8023043@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to gabor@FreeBSD.org using -f From: Gabor Kovesdan To: Perforce Change Reviews Cc: Subject: PERFORCE change 102305 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 24 Jul 2006 18:34:56 -0000 http://perforce.freebsd.org/chv.cgi?CH=102305 Change 102305 by gabor@gabor_spitfire on 2006/07/24 18:34:40 Move some PATCH_SITES_* code. This is still a work in progress, I just moved the code and converted it syntactically. Affected files ... .. //depot/projects/soc2006/gabor_ports/Mk/bsd.port.mk#58 edit .. //depot/projects/soc2006/gabor_ports/Tools/scripts/do-fetch.sh#3 edit Differences ... ==== //depot/projects/soc2006/gabor_ports/Mk/bsd.port.mk#58 (text+ko) ==== @@ -2376,9 +2376,7 @@ # Empty declaration to avoid "variable MASTER_SITES recursive" error MASTER_SITES?= -PATCH_SITES?= _MASTER_SITES_DEFAULT?= -_PATCH_SITES_DEFAULT?= # Feed internal _{MASTER,PATCH}_SITES_n where n is a group designation # as per grouping rules (:something) @@ -2401,23 +2399,6 @@ _MASTER_SITES_DEFAULT+= ${_S:C@^(.*/):[^/:]+$@\1@} . endif .endfor -.for _S in ${PATCH_SITES} -_S_TEMP= ${_S:S/^${_S:C@/:[^/:]+$@/@}//:S/^://} -. if !empty(_S_TEMP) -. for _group in ${_S_TEMP:S/,/ /g} -_G_TEMP= ${_group} -. if ${_G_TEMP} == all || ${_G_TEMP} == ALL || ${_G_TEMP} == default -check-makevars:: - @${ECHO_MSG} "The words all, ALL and default are reserved and cannot be" - @${ECHO_MSG} "used in group definitions. Please fix your PATCH_SITES" - @${FALSE} -. endif -_PATCH_SITES_${_group}+= ${_S:C@^(.*/):[^/:]+$@\1@} -. endfor -. else -_PATCH_SITES_DEFAULT+= ${_S:C@^(.*/):[^/:]+$@\1@} -. endif -.endfor # Feed internal _{MASTER,PATCH}_SITE_SUBDIR_n where n is a group designation # as per grouping rules (:something) @@ -2444,27 +2425,6 @@ . endif . endif .endfor -.for _S in ${PATCH_SITE_SUBDIR} -_S_TEMP= ${_S:S/^${_S:C@/:[^/:]+$@/@}//:S/^://} -. if !empty(_S_TEMP) -. for _group in ${_S_TEMP:S/,/ /g} -_G_TEMP= ${_group} -. if ${_G_TEMP} == all || ${_G_TEMP} == ALL || ${_G_TEMP} == default -check-makevars:: - @${ECHO_MSG} "Makefile error: the words all, ALL and default are reserved and cannot be" - @${ECHO_MSG} "used in group definitions. Please fix your PATCH_SITE_SUBDIR" - @${FALSE} -. endif -. if defined(_PATCH_SITES_${_group}) -_PATCH_SITE_SUBDIR_${_group}+= ${_S:C@^(.*)/:[^/:]+$@\1@} -. endif -. endfor -. else -. if defined(_PATCH_SITES_DEFAULT) -_PATCH_SITE_SUBDIR_DEFAULT+= ${_S:C@^(.*)/:[^/:]+$@\1@} -. endif -. endif -.endfor # Substitute subdirectory names # XXX simpler/faster solution but not the best space wise, suggestions please @@ -2518,56 +2478,6 @@ .endif _MASTER_SITES_DEFAULT:= ${MASTER_SITES_TMP} MASTER_SITES_TMP= -.for _S in ${PATCH_SITES} -_S_TEMP= ${_S:S/^${_S:C@/:[^/:]+$@/@}//:S/^://} -. if !empty(_S_TEMP) -. for _group in ${_S_TEMP:S/,/ /g} -. if !defined(_PATCH_SITE_SUBDIR_${_group}) -PATCH_SITES_TMP= ${_PATCH_SITES_${_group}:S^%SUBDIR%/^^} -. else -_S_TEMP_TEMP= ${_PATCH_SITES_${_group}:M*%SUBDIR%/*} -. if empty(_S_TEMP_TEMP) -PATCH_SITES_TMP= ${_PATCH_SITES_${_group}} -. else -PATCH_SITES_TMP= -. for site in ${_PATCH_SITES_${_group}} -_S_TEMP_TEMP= ${site:M*%SUBDIR%/*} -. if empty(_S_TEMP_TEMP) -PATCH_SITES_TMP+= ${site} -. else -. for dir in ${_PATCH_SITE_SUBDIR_${_group}} -PATCH_SITES_TMP+= ${site:S^%SUBDIR%^\${dir}^} -. endfor -. endif -. endfor -. endif -. endif -_PATCH_SITES_${_group}:= ${PATCH_SITES_TMP} -. endfor -. endif -.endfor -.if defined(_PATCH_SITE_SUBDIR_DEFAULT) -_S_TEMP= ${_PATCH_SITES_DEFAULT:M*%SUBDIR%/*} -. if empty(_S_TEMP) -PATCH_SITES_TMP= ${_PATCH_SITES_DEFAULT} -. else -PATCH_SITES_TMP= -. for site in ${_PATCH_SITES_DEFAULT} -_S_TEMP_TEMP= ${site:M*%SUBDIR%/*} -. if empty(_S_TEMP_TEMP) -PATCH_SITES_TMP+= ${site} -. else -. for dir in ${_PATCH_SITE_SUBDIR_DEFAULT} -PATCH_SITES_TMP+= ${site:S^%SUBDIR%^\${dir}^} -. endfor -. endif -. endfor -. endif -.else -PATCH_SITES_TMP= ${_PATCH_SITES_DEFAULT:S^%SUBDIR%/^^} -.endif -_PATCH_SITES_DEFAULT:= ${PATCH_SITES_TMP} -PATCH_SITES_TMP= # The primary backup site. MASTER_SITE_BACKUP?= \ @@ -2601,7 +2511,6 @@ # according to grouping rules (:something) DISTFILES?= ${DISTNAME}${EXTRACT_SUFX} _MASTER_SITES_ALL= ${_MASTER_SITES_DEFAULT} -_PATCH_SITES_ALL= ${_PATCH_SITES_DEFAULT} _G_TEMP= DEFAULT .for _D in ${DISTFILES} _D_TEMP= ${_D:S/^${_D:C/:[^:]+$//}//} @@ -2620,24 +2529,6 @@ _DISTFILES+= ${_D} . endif .endfor -_G_TEMP= DEFAULT -.for _P in ${PATCHFILES} -_P_TEMP= ${_P:S/^${_P:C/:[^:]+$//}//} -. if !empty(_P_TEMP) -. for _group in ${_P_TEMP:S/^://:S/,/ /g} -. if !defined(_PATCH_SITES_${_group}) -_G_TEMP_TEMP= ${_G_TEMP:M/${_group}/} -. if empty(_G_TEMP_TEMP) -_G_TEMP+= ${_group} -_PATCH_SITES_ALL+= ${_PATCH_SITES_${_group}} -. endif -. endif -. endfor -_PATCHFILES+= ${_P:C/:[^:]+$//} -. else -_PATCHFILES+= ${_P} -. endif -.endfor _G_TEMP= _G_TEMP_TEMP= ALLFILES?= ${_DISTFILES} ${_PATCHFILES} ==== //depot/projects/soc2006/gabor_ports/Tools/scripts/do-fetch.sh#3 (text+ko) ==== @@ -69,6 +69,109 @@ done if [ -z "${PATCHFILES}" ] ; then + for _S in ${PATCH_SITES}; do + _S_TEMP= ${_S:S/^${_S:C@/:[^/:]+$@/@}//:S/^://} + if [ -n "${_S_TEMP)" ; then \ + for _group in ${_S_TEMP:S/,/ /g}; do + _G_TEMP= ${_group} + if ${_G_TEMP} == all || ${_G_TEMP} == ALL || ${_G_TEMP} == default; then + ${ECHO_MSG} "The words all, ALL and default are reserved and cannot be" + ${ECHO_MSG} "used in group definitions. Please fix your PATCH_SITES" + exit 1 + fi + _PATCH_SITES_${_group}+= ${_S:C@^(.*/):[^/:]+$@\1@} + done + else + _PATCH_SITES_DEFAULT+= ${_S:C@^(.*/):[^/:]+$@\1@} + fi + done + for _S in ${PATCH_SITE_SUBDIR}; do + _S_TEMP= ${_S:S/^${_S:C@/:[^/:]+$@/@}//:S/^://} + if [ -n "$(_S_TEMP)" ] ; then + for _group in ${_S_TEMP:S/,/ /g}; do + _G_TEMP= ${_group} + if ${_G_TEMP} == all || ${_G_TEMP} == ALL || ${_G_TEMP} == default; then + ${ECHO_MSG} "Makefile error: the words all, ALL and default are reserved and cannot be" + ${ECHO_MSG} "used in group definitions. Please fix your PATCH_SITE_SUBDIR" + exit 1 + fi + if [ -n "$(_PATCH_SITES_${_group})" ] ; then + _PATCH_SITE_SUBDIR_${_group}+= ${_S:C@^(.*)/:[^/:]+$@\1@} + fi + done + else + if [ -n "$(_PATCH_SITES_DEFAULT)" ] ; then + _PATCH_SITE_SUBDIR_DEFAULT+= ${_S:C@^(.*)/:[^/:]+$@\1@} + fi + fi + done + for _S in ${PATCH_SITES}; do + _S_TEMP= ${_S:S/^${_S:C@/:[^/:]+$@/@}//:S/^://} + if [ -n "$(_S_TEMP)" } ; then + for _group in ${_S_TEMP:S/,/ /g}; do + if [ -z "$$(_PATCH_SITE_SUBDIR_${_group})" ] ; then + _S_TEMP_TEMP= ${_PATCH_SITES_${_group}:M*%SUBDIR%/*} + if [ -z "$(_S_TEMP_TEMP)" ] ; then + PATCH_SITES_TMP= ${_PATCH_SITES_${_group}} + else + PATCH_SITES_TMP= + for site in $${_PATCH_SITES_${_group}}; do + _S_TEMP_TEMP= ${site:M*%SUBDIR%/*} + if [ -z "$(_S_TEMP_TEMP)" ] ; then + PATCH_SITES_TMP+= ${site} + else + for dir in $${_PATCH_SITE_SUBDIR_${_group}}; do + PATCH_SITES_TMP+= ${site:S^%SUBDIR%^\${dir}^} + dine + fi + done + fi + fi + PATCH_SITES_${_group}:= ${PATCH_SITES_TMP} + done + fi + done + if [ -n "$(_PATCH_SITE_SUBDIR_DEFAULT)" ] ; then + _S_TEMP= ${_PATCH_SITES_DEFAULT:M*%SUBDIR%/*} + if [ -z "$(_S_TEMP)" ] ; then + PATCH_SITES_TMP= ${_PATCH_SITES_DEFAULT} + else + PATCH_SITES_TMP= + for site in ${_PATCH_SITES_DEFAULT}; do + _S_TEMP_TEMP= ${site:M*%SUBDIR%/*} + if [ -z "$(_S_TEMP_TEMP)" ] ; then + PATCH_SITES_TMP+= ${site} + else + for dir in ${_PATCH_SITE_SUBDIR_DEFAULT}; do + PATCH_SITES_TMP+= ${site:S^%SUBDIR%^\${dir}^} + done + fi + done + fi + else + PATCH_SITES_TMP= ${_PATCH_SITES_DEFAULT:S^%SUBDIR%/^^} + fi + _PATCH_SITES_DEFAULT:= ${PATCH_SITES_TMP} + PATCH_SITES_TMP= + _PATCH_SITES_ALL= ${_PATCH_SITES_DEFAULT} + _G_TEMP= DEFAULT + for _P in ${PATCHFILES}; do + _P_TEMP= ${_P:S/^${_P:C/:[^:]+$//}//} + if [ -n "$(_P_TEMP)" ] ; then + for _group in ${_P_TEMP:S/^://:S/,/ /g}; do + if [ -z "$$(_PATCH_SITES_${_group})" ] ; then + _G_TEMP_TEMP= ${_G_TEMP:M/${_group}/} + if [ -z "$(_G_TEMP_TEMP)" ] ; then + _G_TEMP+= ${_group} + _PATCH_SITES_ALL+= $${_PATCH_SITES_${_group}} + fi + fi + done + _PATCHFILES+= ${_P:C/:[^:]+$//} + else + _PATCHFILES+= ${_P} + fi + done cd ${_DISTDIR} ${_PATCH_SITES_ENV} for _file in ${PATCHFILES}; do From owner-p4-projects@FreeBSD.ORG Mon Jul 24 19:15:48 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 87FBC16A4DF; Mon, 24 Jul 2006 19:15:48 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 1E91716A4E1 for ; Mon, 24 Jul 2006 19:15:48 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 1B67643D5A for ; Mon, 24 Jul 2006 19:15:47 +0000 (GMT) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k6OJFkvC026906 for ; Mon, 24 Jul 2006 19:15:46 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k6OJFkJk026903 for perforce@freebsd.org; Mon, 24 Jul 2006 19:15:46 GMT (envelope-from jhb@freebsd.org) Date: Mon, 24 Jul 2006 19:15:46 GMT Message-Id: <200607241915.k6OJFkJk026903@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 Cc: Subject: PERFORCE change 102308 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 24 Jul 2006 19:15:48 -0000 http://perforce.freebsd.org/chv.cgi?CH=102308 Change 102308 by jhb@jhb_mutex on 2006/07/24 19:14:57 Update td_locks for mtx, rw, and sx locks so we always have a running count of how many non-spin locks we hold. Affected files ... .. //depot/projects/smpng/sys/kern/kern_mutex.c#130 edit .. //depot/projects/smpng/sys/kern/kern_rwlock.c#7 edit .. //depot/projects/smpng/sys/kern/kern_sx.c#34 edit Differences ... ==== //depot/projects/smpng/sys/kern/kern_mutex.c#130 (text+ko) ==== @@ -285,6 +285,7 @@ LOCK_LOG_LOCK("LOCK", &m->mtx_object, opts, m->mtx_recurse, file, line); WITNESS_LOCK(&m->mtx_object, opts | LOP_EXCLUSIVE, file, line); + curthread->td_locks++; #ifdef MUTEX_PROFILING /* don't reset the timer when/if recursing */ if (m->mtx_acqtime == 0) { @@ -304,6 +305,7 @@ KASSERT(LOCK_CLASS(&m->mtx_object) == &lock_class_mtx_sleep, ("mtx_unlock() of spin mutex %s @ %s:%d", m->mtx_object.lo_name, file, line)); + curthread->td_locks--; WITNESS_UNLOCK(&m->mtx_object, opts | LOP_EXCLUSIVE, file, line); LOCK_LOG_LOCK("UNLOCK", &m->mtx_object, opts, m->mtx_recurse, file, line); @@ -429,9 +431,11 @@ rval = _obtain_lock(m, (uintptr_t)curthread); LOCK_LOG_TRY("LOCK", &m->mtx_object, opts, rval, file, line); - if (rval) + if (rval) { WITNESS_LOCK(&m->mtx_object, opts | LOP_EXCLUSIVE | LOP_TRYLOCK, file, line); + curthread->td_locks++; + } return (rval); } ==== //depot/projects/smpng/sys/kern/kern_rwlock.c#7 (text+ko) ==== @@ -119,6 +119,7 @@ __rw_wlock(rw, curthread, file, line); LOCK_LOG_LOCK("WLOCK", &rw->rw_object, 0, 0, file, line); WITNESS_LOCK(&rw->rw_object, LOP_EXCLUSIVE, file, line); + curthread->td_locks++; } void @@ -127,6 +128,7 @@ MPASS(curthread != NULL); _rw_assert(rw, RA_WLOCKED, file, line); + curthread->td_locks--; WITNESS_UNLOCK(&rw->rw_object, LOP_EXCLUSIVE, file, line); LOCK_LOG_LOCK("WUNLOCK", &rw->rw_object, 0, 0, file, line); __rw_wunlock(rw, curthread, file, line); @@ -266,6 +268,7 @@ LOCK_LOG_LOCK("RLOCK", &rw->rw_object, 0, 0, file, line); WITNESS_LOCK(&rw->rw_object, 0, file, line); + curthread->td_locks++; } void @@ -275,6 +278,7 @@ uintptr_t x; _rw_assert(rw, RA_RLOCKED, file, line); + curthread->td_locks--; WITNESS_UNLOCK(&rw->rw_object, 0, file, line); LOCK_LOG_LOCK("RUNLOCK", &rw->rw_object, 0, 0, file, line); ==== //depot/projects/smpng/sys/kern/kern_sx.c#34 (text+ko) ==== @@ -128,6 +128,7 @@ LOCK_LOG_LOCK("SLOCK", &sx->sx_object, 0, 0, file, line); WITNESS_LOCK(&sx->sx_object, 0, file, line); + curthread->td_locks++; mtx_unlock(sx->sx_lock); } @@ -141,6 +142,7 @@ sx->sx_cnt++; LOCK_LOG_TRY("SLOCK", &sx->sx_object, 0, 1, file, line); WITNESS_LOCK(&sx->sx_object, LOP_TRYLOCK, file, line); + curthread->td_locks++; mtx_unlock(sx->sx_lock); return (1); } else { @@ -184,6 +186,7 @@ LOCK_LOG_LOCK("XLOCK", &sx->sx_object, 0, 0, file, line); WITNESS_LOCK(&sx->sx_object, LOP_EXCLUSIVE, file, line); + curthread->td_locks++; mtx_unlock(sx->sx_lock); } @@ -199,6 +202,7 @@ LOCK_LOG_TRY("XLOCK", &sx->sx_object, 0, 1, file, line); WITNESS_LOCK(&sx->sx_object, LOP_EXCLUSIVE | LOP_TRYLOCK, file, line); + curthread->td_locks++; mtx_unlock(sx->sx_lock); return (1); } else { @@ -215,6 +219,7 @@ _sx_assert(sx, SX_SLOCKED, file, line); mtx_lock(sx->sx_lock); + curthread->td_locks--; WITNESS_UNLOCK(&sx->sx_object, 0, file, line); /* Release. */ @@ -245,6 +250,7 @@ mtx_lock(sx->sx_lock); MPASS(sx->sx_cnt == -1); + curthread->td_locks--; WITNESS_UNLOCK(&sx->sx_object, LOP_EXCLUSIVE, file, line); /* Release. */ From owner-p4-projects@FreeBSD.ORG Mon Jul 24 20:20:07 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C10C616A4DF; Mon, 24 Jul 2006 20:20:07 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 9C46A16A4DD for ; Mon, 24 Jul 2006 20:20:07 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 399EF43D45 for ; Mon, 24 Jul 2006 20:20:07 +0000 (GMT) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k6OKK7nw031276 for ; Mon, 24 Jul 2006 20:20:07 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k6OKK6Lw031273 for perforce@freebsd.org; Mon, 24 Jul 2006 20:20:06 GMT (envelope-from jhb@freebsd.org) Date: Mon, 24 Jul 2006 20:20:06 GMT Message-Id: <200607242020.k6OKK6Lw031273@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 Cc: Subject: PERFORCE change 102310 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 24 Jul 2006 20:20:08 -0000 http://perforce.freebsd.org/chv.cgi?CH=102310 Change 102310 by jhb@jhb_mutex on 2006/07/24 20:19:06 Synchronize syscall() routines: - Add KTR_SYSC tracing to amd64/ia32, ia64/ia32, and ia64. - Add PTRACESTOP invocations to amd64/ia32, ia64/ia32, and powerpc. Expand and synchronize locking checks for all platforms to keep the WITNESS_WARN, add KASSERT()'s checking td_critnest and td_locks, and remove mtx_assert()'s for sched_lock and Giant. Affected files ... .. //depot/projects/smpng/sys/amd64/amd64/trap.c#45 edit .. //depot/projects/smpng/sys/amd64/ia32/ia32_syscall.c#12 edit .. //depot/projects/smpng/sys/arm/arm/trap.c#18 edit .. //depot/projects/smpng/sys/i386/i386/trap.c#94 edit .. //depot/projects/smpng/sys/ia64/ia32/ia32_trap.c#7 edit .. //depot/projects/smpng/sys/ia64/ia64/trap.c#81 edit .. //depot/projects/smpng/sys/powerpc/powerpc/trap.c#49 edit .. //depot/projects/smpng/sys/sparc64/sparc64/trap.c#68 edit Differences ... ==== //depot/projects/smpng/sys/amd64/amd64/trap.c#45 (text+ko) ==== @@ -874,6 +874,19 @@ } /* + * Check for misbehavior. + */ + KASSERT(td->td_critnest == 0, + ("System call %s returning in a critical section", + (code >= 0 && code < SYS_MAXSYSCALL) ? syscallnames[code] : "???")); + KASSERT(td->td_locks == 0, + ("System call %s returning with %d locks held", + (code >= 0 && code < SYS_MAXSYSCALL) ? syscallnames[code] : "???", + td->td_locks)); + WITNESS_WARN(WARN_PANIC, NULL, "System call %s returning", + (code >= 0 && code < SYS_MAXSYSCALL) ? syscallnames[code] : "???"); + + /* * Handle reschedule and other end-of-syscall issues */ userret(td, &frame); @@ -894,9 +907,4 @@ STOPEVENT(p, S_SCX, code); PTRACESTOP_SC(p, td, S_PT_SCX); - - WITNESS_WARN(WARN_PANIC, NULL, "System call %s returning", - (code >= 0 && code < SYS_MAXSYSCALL) ? syscallnames[code] : "???"); - mtx_assert(&sched_lock, MA_NOTOWNED); - mtx_assert(&Giant, MA_NOTOWNED); } ==== //depot/projects/smpng/sys/amd64/ia32/ia32_syscall.c#12 (text+ko) ==== @@ -171,6 +171,9 @@ if (KTRPOINT(td, KTR_SYSCALL)) ktrsyscall(code, narg, args64); #endif + CTR4(KTR_SYSC, "syscall enter thread %p pid %d proc %s code %d", td, + td->td_proc->p_pid, td->td_proc->p_comm, code); + /* * Try to run the syscall without Giant if the syscall * is MP safe. @@ -184,6 +187,8 @@ STOPEVENT(p, S_SCE, narg); + PTRACESTOP_SC(p, td, S_PT_SCE); + AUDIT_SYSCALL_ENTER(code, td); error = (*callp->sy_call)(td, args64); AUDIT_SYSCALL_EXIT(error, td); @@ -238,10 +243,25 @@ } /* + * Check for misbehavior. + */ + KASSERT(td->td_critnest == 0, + ("System call %s returning in a critical section", + (code >= 0 && code < SYS_MAXSYSCALL) ? freebsd32_syscallnames[code] : "???")); + KASSERT(td->td_locks == 0, + ("System call %s returning with %d locks held", + (code >= 0 && code < SYS_MAXSYSCALL) ? freebsd32_syscallnames[code] : "???", + td->td_locks)); + WITNESS_WARN(WARN_PANIC, NULL, "System call %s returning", + (code >= 0 && code < SYS_MAXSYSCALL) ? freebsd32_syscallnames[code] : "???"); + + /* * Handle reschedule and other end-of-syscall issues */ userret(td, &frame); + CTR4(KTR_SYSC, "syscall exit thread %p pid %d proc %s code %d", td, + td->td_proc->p_pid, td->td_proc->p_comm, code); #ifdef KTRACE if (KTRPOINT(td, KTR_SYSRET)) ktrsysret(code, error, td->td_retval[0]); @@ -254,10 +274,7 @@ */ STOPEVENT(p, S_SCX, code); - WITNESS_WARN(WARN_PANIC, NULL, "System call %s returning", - (code >= 0 && code < SYS_MAXSYSCALL) ? freebsd32_syscallnames[code] : "???"); - mtx_assert(&sched_lock, MA_NOTOWNED); - mtx_assert(&Giant, MA_NOTOWNED); + PTRACESTOP_SC(p, td, S_PT_SCX); } ==== //depot/projects/smpng/sys/arm/arm/trap.c#18 (text+ko) ==== @@ -979,8 +979,17 @@ } if (locked && (callp->sy_narg & SYF_MPSAFE) == 0) mtx_unlock(&Giant); - - + + KASSERT(td->td_critnest == 0, + ("System call %s returning in a critical section", + (code >= 0 && code < SYS_MAXSYSCALL) ? syscallnames[code] : "???")); + KASSERT(td->td_locks == 0, + ("System call %s returning with %d locks held", + (code >= 0 && code < SYS_MAXSYSCALL) ? syscallnames[code] : "???", + td->td_locks)); + WITNESS_WARN(WARN_PANIC, NULL, "System call %s returning", + (code >= 0 && code < SYS_MAXSYSCALL) ? syscallnames[code] : "???"); + userret(td, frame); CTR4(KTR_SYSC, "syscall exit thread %p pid %d proc %s code %d", td, td->td_proc->p_pid, td->td_proc->p_comm, code); @@ -991,8 +1000,6 @@ if (KTRPOINT(td, KTR_SYSRET)) ktrsysret(code, error, td->td_retval[0]); #endif - mtx_assert(&sched_lock, MA_NOTOWNED); - mtx_assert(&Giant, MA_NOTOWNED); } void ==== //depot/projects/smpng/sys/i386/i386/trap.c#94 (text+ko) ==== @@ -1065,6 +1065,19 @@ } /* + * Check for misbehavior. + */ + KASSERT(td->td_critnest == 0, + ("System call %s returning in a critical section", + (code >= 0 && code < SYS_MAXSYSCALL) ? syscallnames[code] : "???")); + KASSERT(td->td_locks == 0, + ("System call %s returning with %d locks held", + (code >= 0 && code < SYS_MAXSYSCALL) ? syscallnames[code] : "???", + td->td_locks)); + WITNESS_WARN(WARN_PANIC, NULL, "System call %s returning", + (code >= 0 && code < SYS_MAXSYSCALL) ? syscallnames[code] : "???"); + + /* * Handle reschedule and other end-of-syscall issues */ userret(td, &frame); @@ -1085,10 +1098,5 @@ STOPEVENT(p, S_SCX, code); PTRACESTOP_SC(p, td, S_PT_SCX); - - WITNESS_WARN(WARN_PANIC, NULL, "System call %s returning", - (code >= 0 && code < SYS_MAXSYSCALL) ? syscallnames[code] : "???"); - mtx_assert(&sched_lock, MA_NOTOWNED); - mtx_assert(&Giant, MA_NOTOWNED); } ==== //depot/projects/smpng/sys/ia64/ia32/ia32_trap.c#7 (text+ko) ==== @@ -112,6 +112,9 @@ if (KTRPOINT(td, KTR_SYSCALL)) ktrsyscall(code, narg, args64); #endif + CTR4(KTR_SYSC, "syscall enter thread %p pid %d proc %s code %d", td, + td->td_proc->p_pid, td->td_proc->p_comm, code); + /* * Try to run the syscall without Giant if the syscall * is MP safe. @@ -125,6 +128,8 @@ STOPEVENT(p, S_SCE, narg); + PTRACESTOP_SC(p, td, S_PT_SCE); + error = (*callp->sy_call)(td, args64); } @@ -176,6 +181,24 @@ trapsignal(td, &ksi); } + /* + * Check for misbehavior. + */ + KASSERT(td->td_critnest == 0, + ("System call %s returning in a critical section", + (code >= 0 && code < SYS_MAXSYSCALL) ? syscallnames[code] : "???")); + KASSERT(td->td_locks == 0, + ("System call %s returning with %d locks held", + (code >= 0 && code < SYS_MAXSYSCALL) ? syscallnames[code] : "???", + td->td_locks)); + WITNESS_WARN(WARN_PANIC, NULL, "System call %s returning", + (code >= 0 && code < SYS_MAXSYSCALL) ? syscallnames[code] : "???"); + + /* + * End of syscall tracing. + */ + CTR4(KTR_SYSC, "syscall exit thread %p pid %d proc %s code %d", td, + td->td_proc->p_pid, td->td_proc->p_comm, code); #ifdef KTRACE if (KTRPOINT(td, KTR_SYSRET)) ktrsysret(code, error, td->td_retval[0]); @@ -188,10 +211,7 @@ */ STOPEVENT(p, S_SCX, code); - WITNESS_WARN(WARN_PANIC, NULL, "System call %s returning", - (code >= 0 && code < SYS_MAXSYSCALL) ? syscallnames[code] : "???"); - mtx_assert(&sched_lock, MA_NOTOWNED); - mtx_assert(&Giant, MA_NOTOWNED); + PTRACESTOP_SC(p, td, S_PT_SCX); } /* ==== //depot/projects/smpng/sys/ia64/ia64/trap.c#81 (text+ko) ==== @@ -1007,6 +1007,8 @@ if (KTRPOINT(td, KTR_SYSCALL)) ktrsyscall(code, (callp->sy_narg & SYF_ARGMASK), args); #endif + CTR4(KTR_SYSC, "syscall enter thread %p pid %d proc %s code %d", td, + td->td_proc->p_pid, td->td_proc->p_comm, code); td->td_retval[0] = 0; td->td_retval[1] = 0; @@ -1046,8 +1048,26 @@ } } + /* + * Check for misbehavior. + */ + KASSERT(td->td_critnest == 0, + ("System call %s returning in a critical section", + (code >= 0 && code < SYS_MAXSYSCALL) ? syscallnames[code] : "???")); + KASSERT(td->td_locks == 0, + ("System call %s returning with %d locks held", + (code >= 0 && code < SYS_MAXSYSCALL) ? syscallnames[code] : "???", + td->td_locks)); + WITNESS_WARN(WARN_PANIC, NULL, "System call %s returning", + (code >= 0 && code < SYS_MAXSYSCALL) ? syscallnames[code] : "???"); + + /* + * Handle reschedule and other end-of-syscall issues + */ userret(td, tf); + CTR4(KTR_SYSC, "syscall exit thread %p pid %d proc %s code %d", td, + td->td_proc->p_pid, td->td_proc->p_comm, code); #ifdef KTRACE if (KTRPOINT(td, KTR_SYSRET)) ktrsysret(code, error, td->td_retval[0]); @@ -1062,10 +1082,5 @@ PTRACESTOP_SC(p, td, S_PT_SCX); - WITNESS_WARN(WARN_PANIC, NULL, "System call %s returning", - (code >= 0 && code < SYS_MAXSYSCALL) ? syscallnames[code] : "???"); - mtx_assert(&sched_lock, MA_NOTOWNED); - mtx_assert(&Giant, MA_NOTOWNED); - return (error); } ==== //depot/projects/smpng/sys/powerpc/powerpc/trap.c#49 (text+ko) ==== @@ -420,6 +420,8 @@ STOPEVENT(p, S_SCE, narg); + PTRACESTOP_SC(p, td, S_PT_SCE); + error = (*callp->sy_call)(td, params); CTR3(KTR_SYSC, "syscall: p=%s %s ret=%x", p->p_comm, @@ -467,6 +469,19 @@ if ((callp->sy_narg & SYF_MPSAFE) == 0) mtx_unlock(&Giant); + /* + * Check for misbehavior. + */ + KASSERT(td->td_critnest == 0, + ("System call %s returning in a critical section", + (code >= 0 && code < SYS_MAXSYSCALL) ? syscallnames[code] : "???")); + KASSERT(td->td_locks == 0, + ("System call %s returning with %d locks held", + (code >= 0 && code < SYS_MAXSYSCALL) ? syscallnames[code] : "???", + td->td_locks)); + WITNESS_WARN(WARN_PANIC, NULL, "System call %s returning", + (code >= 0 && code < SYS_MAXSYSCALL) ? syscallnames[code] : "???"); + #ifdef KTRACE if (KTRPOINT(td, KTR_SYSRET)) ktrsysret(code, error, td->td_retval[0]); @@ -477,10 +492,7 @@ */ STOPEVENT(p, S_SCX, code); - WITNESS_WARN(WARN_PANIC, NULL, "System call %s returning", - (code >= 0 && code < SYS_MAXSYSCALL) ? syscallnames[code] : "???"); - mtx_assert(&sched_lock, MA_NOTOWNED); - mtx_assert(&Giant, MA_NOTOWNED); + PTRACESTOP_SC(p, td, S_PT_SCX); } static int ==== //depot/projects/smpng/sys/sparc64/sparc64/trap.c#68 (text+ko) ==== @@ -648,6 +648,19 @@ mtx_unlock(&Giant); /* + * Check for misbehavior. + */ + KASSERT(td->td_critnest == 0, + ("System call %s returning in a critical section", + (code >= 0 && code < SYS_MAXSYSCALL) ? syscallnames[code] : "???")); + KASSERT(td->td_locks == 0, + ("System call %s returning with %d locks held", + (code >= 0 && code < SYS_MAXSYSCALL) ? syscallnames[code] : "???", + td->td_locks)); + WITNESS_WARN(WARN_PANIC, NULL, "System call %s returning", + (code >= 0 && code < SYS_MAXSYSCALL) ? syscallnames[code] : "???"); + + /* * Handle reschedule and other end-of-syscall issues */ userret(td, tf); @@ -664,9 +677,4 @@ STOPEVENT(p, S_SCX, code); PTRACESTOP_SC(p, td, S_PT_SCX); - - WITNESS_WARN(WARN_PANIC, NULL, "System call %s returning", - (code >= 0 && code < SYS_MAXSYSCALL) ? syscallnames[code] : "???"); - mtx_assert(&sched_lock, MA_NOTOWNED); - mtx_assert(&Giant, MA_NOTOWNED); } From owner-p4-projects@FreeBSD.ORG Mon Jul 24 20:26:59 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8D4DF16A4E2; Mon, 24 Jul 2006 20:26:59 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 3806216A4DF; Mon, 24 Jul 2006 20:26:59 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from server.baldwin.cx (66-23-211-162.clients.speedfactory.net [66.23.211.162]) by mx1.FreeBSD.org (Postfix) with ESMTP id 73FFF43D46; Mon, 24 Jul 2006 20:26:58 +0000 (GMT) (envelope-from jhb@freebsd.org) Received: from localhost.corp.yahoo.com (john@localhost [127.0.0.1]) (authenticated bits=0) by server.baldwin.cx (8.13.4/8.13.4) with ESMTP id k6OKQr3M028136; Mon, 24 Jul 2006 16:26:57 -0400 (EDT) (envelope-from jhb@freebsd.org) From: John Baldwin To: Scott Long Date: Mon, 24 Jul 2006 16:00:04 -0400 User-Agent: KMail/1.9.1 References: <200607221233.k6MCXjIL033391@repoman.freebsd.org> <44C279E9.9060002@samsco.org> In-Reply-To: <44C279E9.9060002@samsco.org> MIME-Version: 1.0 Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: 7bit Content-Disposition: inline Message-Id: <200607241600.05305.jhb@freebsd.org> X-Greylist: Sender succeeded SMTP AUTH authentication, not delayed by milter-greylist-2.0.2 (server.baldwin.cx [127.0.0.1]); Mon, 24 Jul 2006 16:26:57 -0400 (EDT) X-Virus-Scanned: ClamAV 0.87.1/1616/Mon Jul 24 13:49:29 2006 on server.baldwin.cx X-Virus-Status: Clean X-Spam-Status: No, score=-4.4 required=4.2 tests=ALL_TRUSTED,AWL,BAYES_00 autolearn=ham version=3.1.0 X-Spam-Checker-Version: SpamAssassin 3.1.0 (2005-09-13) on server.baldwin.cx Cc: Perforce Change Reviews , Paolo Pisati Subject: Re: PERFORCE change 102141 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 24 Jul 2006 20:26:59 -0000 On Saturday 22 July 2006 15:18, Scott Long wrote: > Paolo Pisati wrote: > > > http://perforce.freebsd.org/chv.cgi?CH=102141 > > > > Change 102141 by piso@piso_longino on 2006/07/22 12:33:15 > > > > Use IF_FAST macro instead of directly checking flags, > > and axe an INTR_FAST check in swi_add(): is it possible > > for a software interrupt handler to have INTR_FAST defined? > > did it make sense at all? > > > > An swi is an ithread by definition, so INTR_FAST makes no sense to > it. Hence the EINVAL. :) Now that the flag no longer exists, the check can just be removed. -- John Baldwin From owner-p4-projects@FreeBSD.ORG Mon Jul 24 20:48:05 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 78D9316A4E0; Mon, 24 Jul 2006 20:48:05 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 390C716A4DE; Mon, 24 Jul 2006 20:48:05 +0000 (UTC) (envelope-from imp@bsdimp.com) Received: from harmony.bsdimp.com (vc4-2-0-87.dsl.netrack.net [199.45.160.85]) by mx1.FreeBSD.org (Postfix) with ESMTP id 9FEFC43D82; Mon, 24 Jul 2006 20:47:47 +0000 (GMT) (envelope-from imp@bsdimp.com) Received: from localhost (localhost.village.org [127.0.0.1] (may be forged)) by harmony.bsdimp.com (8.13.4/8.13.4) with ESMTP id k6OKkUcR001671; Mon, 24 Jul 2006 14:46:31 -0600 (MDT) (envelope-from imp@bsdimp.com) Date: Mon, 24 Jul 2006 14:46:51 -0600 (MDT) Message-Id: <20060724.144651.-1632694258.imp@bsdimp.com> To: sam@errno.com From: "M. Warner Losh" In-Reply-To: <44C4F543.3090208@errno.com> References: <200607240927.k6O9R8ip054278@repoman.freebsd.org> <44C4F543.3090208@errno.com> X-Mailer: Mew version 4.2 on Emacs 21.3 / Mule 5.0 (SAKAKI) Mime-Version: 1.0 Content-Type: Text/Plain; charset=us-ascii Content-Transfer-Encoding: 7bit X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-2.0 (harmony.bsdimp.com [127.0.0.1]); Mon, 24 Jul 2006 14:46:32 -0600 (MDT) Cc: kevlo@freebsd.org, perforce@freebsd.org Subject: Re: PERFORCE change 102267 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 24 Jul 2006 20:48:05 -0000 In message: <44C4F543.3090208@errno.com> Sam Leffler writes: : Kevin Lo wrote: : > http://perforce.freebsd.org/chv.cgi?CH=102267 : > : > Change 102267 by kevlo@kevlo_monet on 2006/07/24 09:26:16 : > : > My bad, back this up. I should commit this into my tree, not into p4. : : Why is it a mistake? We need to start using a common tree. I ended up : creating a sam_avila branch that's derived from arm-devel so I can : trivially pickup mods that are committed to arm-devel. I'd like to see : everyone working on arm code share arm-devel and push their changes : upstream to there until we can work in CVS. Speaking of which, I'm planning on applying the patches to a full tree under arm-devel, after expanding that tree. Warner From owner-p4-projects@FreeBSD.ORG Mon Jul 24 21:20:36 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2086316A6C0; Mon, 24 Jul 2006 21:20:36 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id D5B9116A6B7; Mon, 24 Jul 2006 21:20:35 +0000 (UTC) (envelope-from jmg@hydrogen.funkthat.com) Received: from hydrogen.funkthat.com (gate.funkthat.com [69.17.45.168]) by mx1.FreeBSD.org (Postfix) with ESMTP id EA50D43D5E; Mon, 24 Jul 2006 21:20:27 +0000 (GMT) (envelope-from jmg@hydrogen.funkthat.com) Received: from hydrogen.funkthat.com (95mumnje4eyrc1ds@localhost.funkthat.com [127.0.0.1]) by hydrogen.funkthat.com (8.13.6/8.13.3) with ESMTP id k6OLKLll049309; Mon, 24 Jul 2006 14:20:21 -0700 (PDT) (envelope-from jmg@hydrogen.funkthat.com) Received: (from jmg@localhost) by hydrogen.funkthat.com (8.13.6/8.13.3/Submit) id k6OLKKND049308; Mon, 24 Jul 2006 14:20:20 -0700 (PDT) (envelope-from jmg) Date: Mon, 24 Jul 2006 14:20:20 -0700 From: John-Mark Gurney To: "M. Warner Losh" Message-ID: <20060724212020.GP96589@funkthat.com> References: <200607240927.k6O9R8ip054278@repoman.freebsd.org> <44C4F543.3090208@errno.com> <20060724.144651.-1632694258.imp@bsdimp.com> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20060724.144651.-1632694258.imp@bsdimp.com> User-Agent: Mutt/1.4.2.1i X-Operating-System: FreeBSD 5.4-RELEASE-p6 i386 X-PGP-Fingerprint: B7 EC EF F8 AE ED A7 31 96 7A 22 B3 D8 56 36 F4 X-Files: The truth is out there X-URL: http://resnet.uoregon.edu/~gurney_j/ X-Resume: http://resnet.uoregon.edu/~gurney_j/resume.html Cc: sam@errno.com, perforce@freebsd.org, kevlo@freebsd.org Subject: Re: PERFORCE change 102267 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: John-Mark Gurney List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 24 Jul 2006 21:20:36 -0000 Warner Losh wrote this message on Mon, Jul 24, 2006 at 14:46 -0600: > In message: <44C4F543.3090208@errno.com> > Sam Leffler writes: > : Kevin Lo wrote: > : > http://perforce.freebsd.org/chv.cgi?CH=102267 > : > > : > Change 102267 by kevlo@kevlo_monet on 2006/07/24 09:26:16 > : > > : > My bad, back this up. I should commit this into my tree, not into p4. > : > : Why is it a mistake? We need to start using a common tree. I ended up > : creating a sam_avila branch that's derived from arm-devel so I can > : trivially pickup mods that are committed to arm-devel. I'd like to see > : everyone working on arm code share arm-devel and push their changes > : upstream to there until we can work in CVS. > > Speaking of which, I'm planning on applying the patches to a full tree > under arm-devel, after expanding that tree. Yeh, I wanted to do that a year ago... If you look at the branch arm-devel's description, you see a partial breakout of the paths to add to View to make that happen... though the patches have changed so more may need to be added... P.S. I'm working on brining our arm in-line w/ the new bus.h from NetBSD as we need to add support for _stream functions to be selected based upon the bus to support non-native endian buses... -- John-Mark Gurney Voice: +1 415 225 5579 "All that I will do, has been done, All that I have, has not." From owner-p4-projects@FreeBSD.ORG Mon Jul 24 21:28:32 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 179AF16A4E5; Mon, 24 Jul 2006 21:28:32 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id CFFD016A4DA for ; Mon, 24 Jul 2006 21:28:31 +0000 (UTC) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 9AF6943D4C for ; Mon, 24 Jul 2006 21:28:31 +0000 (GMT) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k6OLSV2f044063 for ; Mon, 24 Jul 2006 21:28:31 GMT (envelope-from rdivacky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k6OLSV3D044060 for perforce@freebsd.org; Mon, 24 Jul 2006 21:28:31 GMT (envelope-from rdivacky@FreeBSD.org) Date: Mon, 24 Jul 2006 21:28:31 GMT Message-Id: <200607242128.k6OLSV3D044060@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rdivacky@FreeBSD.org using -f From: Roman Divacky To: Perforce Change Reviews Cc: Subject: PERFORCE change 102313 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 24 Jul 2006 21:28:32 -0000 http://perforce.freebsd.org/chv.cgi?CH=102313 Change 102313 by rdivacky@rdivacky_witten on 2006/07/24 21:28:00 Safekeep handler. If we are passed descriptor \#6 change it to 3. Just to be safe. This doesnt happend in practise but better safe than sorry. Affected files ... .. //depot/projects/soc2006/rdivacky_linuxolator/compat/linux/linux_futex.c#10 edit .. //depot/projects/soc2006/rdivacky_linuxolator/compat/linux/linux_futex.h#3 edit .. //depot/projects/soc2006/rdivacky_linuxolator/i386/linux/linux_machdep.c#23 edit Differences ... ==== //depot/projects/soc2006/rdivacky_linuxolator/compat/linux/linux_futex.c#10 (text+ko) ==== ==== //depot/projects/soc2006/rdivacky_linuxolator/compat/linux/linux_futex.h#3 (text+ko) ==== @@ -41,4 +41,10 @@ #define LINUX_FUTEX_CMP_REQUEUE 4 #define LINUX_FUTEX_WAKE_OP 5 +#define FUTEX_OP_SET 0 /* *(int *)UADDR2 = OPARG; */ +#define FUTEX_OP_ADD 1 /* *(int *)UADDR2 += OPARG; */ +#define FUTEX_OP_OR 2 /* *(int *)UADDR2 |= OPARG; */ +#define FUTEX_OP_ANDN 3 /* *(int *)UADDR2 &= ~OPARG; */ +#define FUTEX_OP_XOR 4 /* *(int *)UADDR2 ^= OPARG; */ + #endif /* !_LINUX_FUTEX_H */ ==== //depot/projects/soc2006/rdivacky_linuxolator/i386/linux/linux_machdep.c#23 (text+ko) ==== @@ -475,16 +475,14 @@ if (idx != 6 && idx != 3) return (EINVAL); -#ifdef notyet /* this doesnt happen in practice */ if (idx == 6) { /* we might copy out the entry_number as 3 */ - idx = info.entry_number = 3; - error = copyout(&info, args->desc, sizeof(struct l_user_desc)); + info.entry_number = 3; + error = copyout(&info, (void *) td->td_frame->tf_esi, sizeof(struct l_user_desc)); if (error) return (error); } -#endif a[0] = LDT_entry_a(&info); a[1] = LDT_entry_b(&info); From owner-p4-projects@FreeBSD.ORG Mon Jul 24 21:30:35 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4806E16A4ED; Mon, 24 Jul 2006 21:30:35 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 20C3816A4E1 for ; Mon, 24 Jul 2006 21:30:35 +0000 (UTC) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 9F2DF43D49 for ; Mon, 24 Jul 2006 21:30:34 +0000 (GMT) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k6OLUYTS044224 for ; Mon, 24 Jul 2006 21:30:34 GMT (envelope-from rdivacky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k6OLUY8I044221 for perforce@freebsd.org; Mon, 24 Jul 2006 21:30:34 GMT (envelope-from rdivacky@FreeBSD.org) Date: Mon, 24 Jul 2006 21:30:34 GMT Message-Id: <200607242130.k6OLUY8I044221@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rdivacky@FreeBSD.org using -f From: Roman Divacky To: Perforce Change Reviews Cc: Subject: PERFORCE change 102314 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 24 Jul 2006 21:30:35 -0000 http://perforce.freebsd.org/chv.cgi?CH=102314 Change 102314 by rdivacky@rdivacky_witten on 2006/07/24 21:30:30 Hm. never commit when drunk. The last change included also some defines in the linux_futex.h for the upcomming LINUX_FUTEX_WAKE_OP implementation. Affected files ... .. //depot/projects/soc2006/rdivacky_linuxolator/compat/linux/linux_futex.h#4 edit Differences ... ==== //depot/projects/soc2006/rdivacky_linuxolator/compat/linux/linux_futex.h#4 (text+ko) ==== From owner-p4-projects@FreeBSD.ORG Mon Jul 24 21:32:38 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4001D16A4E0; Mon, 24 Jul 2006 21:32:38 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 0645416A4DD for ; Mon, 24 Jul 2006 21:32:38 +0000 (UTC) (envelope-from swhitman@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id B4C5A43D53 for ; Mon, 24 Jul 2006 21:32:37 +0000 (GMT) (envelope-from swhitman@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k6OLWboP044358 for ; Mon, 24 Jul 2006 21:32:37 GMT (envelope-from swhitman@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k6OLWbnQ044355 for perforce@freebsd.org; Mon, 24 Jul 2006 21:32:37 GMT (envelope-from swhitman@FreeBSD.org) Date: Mon, 24 Jul 2006 21:32:37 GMT Message-Id: <200607242132.k6OLWbnQ044355@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to swhitman@FreeBSD.org using -f From: Spencer Whitman To: Perforce Change Reviews Cc: Subject: PERFORCE change 102315 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 24 Jul 2006 21:32:38 -0000 http://perforce.freebsd.org/chv.cgi?CH=102315 Change 102315 by swhitman@swhitman_joethecat on 2006/07/24 21:32:04 More work on implementing #defines. Each #define structure has a list of arguments. Each argument has a list of offsets which indicate this argument's position in the macro value. Affected files ... .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/k/cpp.c#14 edit Differences ... ==== //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/k/cpp.c#14 (text+ko) ==== @@ -44,27 +44,34 @@ struct ref *r; }; -/* XXX This should prob be optimized to a tree or hash table but should work for now */ +/* XXX These should be optimized, but work for now */ + +/* Each argument has a list of indexes of where it appears in the macro string */ +struct arg_ind { + int offset; + TAILQ_ENTRY(arg_ind) list; +}; + struct macro_arg { const char *name; /* Argument name */ + TAILQ_HEAD(,arg_ind) offsets; /* Offset list */ TAILQ_ENTRY(macro_arg) list; /* Entry into the argument list */ }; -TAILQ_HEAD(args_list_head, macro_arg); /* Macro argument list head */ - #define OBJ_MAC_TYPE 0/* For object like macros (no paraens, no arguments) */ #define FUNC_MAC_TYPE 1/* For function like macros (paraens and arguments) */ #define NONE_MAC_TYPE -1/* Inital value. Indecates type was not set */ struct define { const char *name; /* Name of the macro */ int mac_type; /* Object or function like macro */ - struct args_list_head *args; /* Head of argument list */ + TAILQ_HEAD(,macro_arg) args; /* Head of argument list */ const char *value; /* Value of the macro */ TAILQ_ENTRY(define) list; /* Link to list of macros */ }; - -#define INIT_DEF_ARG(def) *((def)->args) = { NULL, ((def)->args).tqh_first } //TAILQ_HEAD_INITIALIZER((def)->args) +/* XXX Implement this */ +#define FREE_LIST(HEAD,TYPE) do { \ +}while(0) static TAILQ_HEAD(,iarg) iarg = TAILQ_HEAD_INITIALIZER(iarg); static TAILQ_HEAD(,define) define = TAILQ_HEAD_INITIALIZER(define); @@ -168,17 +175,26 @@ fprintf(stderr, "PRAGMA: <%V>\n", String(b, e)); } +#if 0 +static const char * +expand_macro(struct define * mac, struct arg_ind * head) { + +} +#endif + /* -------------------------------------------------------------------*/ static void cpp_expand(struct cppfilestate *cfs, struct ref *rr __unused, const char *s, const char *e) { - assert(s != NULL); assert(e != NULL); if (s == e) return; + + /* Expand any macro expansions before passing this to the lexer */ + D(0x10, "expand <%V>\n", String(s, e)); Lexer(cfs->h->tokens, s, e); } @@ -188,20 +204,20 @@ static struct sourcefile * cpp_include_path(const char *filename) { - struct iarg *ap; - struct sourcefile *sf; - char *q; - - sf = NULL; - TAILQ_FOREACH(ap, &iarg, list) { - asprintf(&q, "%s/%s", ap->dir, filename); - assert(q != NULL); - sf = LoadFile(q); - free(q); - if (sf != NULL) - break; - } - return (sf); + struct iarg *ap; + struct sourcefile *sf; + char *q; + + sf = NULL; + TAILQ_FOREACH(ap, &iarg, list) { + asprintf(&q, "%s/%s", ap->dir, filename); + assert(q != NULL); + sf = LoadFile(q); + free(q); + if (sf != NULL) + break; + } + return (sf); } /* @@ -254,15 +270,45 @@ cppfile(cfs->h, r); } +static void +calculate_offsets(struct macro_arg *arg, struct define * mac __unused) +{ + TAILQ_INIT(&arg->offsets); + /* XXX Use strstr to find substrings of arg in mac */ +} + -/* Pass this function a string to expand any and all macros */ -/*static void -cpp_macro_expand(const char *b __unused, const char *e __unused) +static void +add_macro_arg(const char *b, const char * e, struct define * mac) { + struct macro_arg * new_arg; + struct macro_arg * tmp; - -}*/ + new_arg = calloc(sizeof(*new_arg),1); + assert(new_arg != NULL); + + new_arg->name = String(b,e); + + printf("adding macro arg: %V\n",new_arg->name); + + TAILQ_FOREACH(tmp, &mac->args, list) { + if(tmp == NULL) { + printf("tmp == null; inserting into tail\n"); + TAILQ_INSERT_TAIL(&mac->args,new_arg,list); + } + + if(tmp->name == new_arg->name) { + free(new_arg); + errx(1, "duplicate macro parameter \"%V\"",tmp->name); + } + } + + calculate_offsets(new_arg,mac); + + printf("added argument named: <%V> to macro named <%V>\n",new_arg->name, + mac->name); +} /* * This function attempts to add a define specified by b and e to the define @@ -273,7 +319,7 @@ * are both optional. */ static void -cpp_add_define(const char *b, const char *e) +cpp_add_define(struct cppfilestate *cfs, const char *b, const char *e) { struct define *mac; struct define *tmp; @@ -327,25 +373,34 @@ break; case FUNC_MAC_TYPE: - - /* Make sure function macro is wellformed (has a matching ')', arguments - * are correct, etc.) Add arguments to mac. - */ - //INIT_DEF_ARG(mac); - //*(mac->args) = TAILQ_HEAD_INITIALIZER(*(mac->args)); - //TAILQ_INIT(mac->args); - /* do { - printf("here\n"); - ((mac->args))->tqh_first = NULL; - printf("1\n"); - (mac->args)->tqh_last = &TAILQ_FIRST((mac->args)); - printf("2\n"); - QMD_TRACE_HEAD(mac->args); - printf("3\n"); - } while (0);*/ + { + const char * arg_beg = skipspace(cfs,name_e+1,e); + + TAILQ_INIT(&mac->args); + + /* Insert each argument name. Error if list does not end with a ')' */ + /* XXX Should this detect empty arguments and non-ID like arguments? */ + for(p = arg_beg; p < e; p++) { + if (*p == ')') { + add_macro_arg(arg_beg,p,mac); + break; + } + if(*p == ',') { + add_macro_arg(arg_beg,p,mac); + p = skipspace(cfs,p+1,e); + arg_beg = p-1; + } + } + /* Macro was ill-formed. Free everything and exit with error */ + if(*p != ')') { + /* XXX Free everything */ + free(mac); + errx(1, "Function macro has no ending \')\'"); + } + mac->value = String(p,e); + } break; - default: break; } @@ -396,7 +451,7 @@ printf("#define of %V\n",String(b,e)); /* The first token is the macro name */ - cpp_add_define(skipspace(cfs, b, e),e); + cpp_add_define(cfs,skipspace(cfs, b, e),e); } From owner-p4-projects@FreeBSD.ORG Mon Jul 24 21:49:08 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8A36816A4E2; Mon, 24 Jul 2006 21:49:08 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 632EE16A4E0 for ; Mon, 24 Jul 2006 21:49:08 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id AAB7E43D79 for ; Mon, 24 Jul 2006 21:49:00 +0000 (GMT) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k6OLn0cw045095 for ; Mon, 24 Jul 2006 21:49:00 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k6OLmxlx045092 for perforce@freebsd.org; Mon, 24 Jul 2006 21:48:59 GMT (envelope-from jhb@freebsd.org) Date: Mon, 24 Jul 2006 21:48:59 GMT Message-Id: <200607242148.k6OLmxlx045092@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 Cc: Subject: PERFORCE change 102318 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 24 Jul 2006 21:49:08 -0000 http://perforce.freebsd.org/chv.cgi?CH=102318 Change 102318 by jhb@jhb_mutex on 2006/07/24 21:48:42 Compile fixes for all but arm (since I can't cross-build an arm toolchain w/o patches). Affected files ... .. //depot/projects/smpng/sys/amd64/ia32/ia32_syscall.c#13 edit .. //depot/projects/smpng/sys/ia64/ia32/ia32_trap.c#8 edit .. //depot/projects/smpng/sys/powerpc/powerpc/trap.c#50 edit Differences ... ==== //depot/projects/smpng/sys/amd64/ia32/ia32_syscall.c#13 (text+ko) ==== @@ -56,6 +56,7 @@ #include #include #include +#include #include #include #include ==== //depot/projects/smpng/sys/ia64/ia32/ia32_trap.c#8 (text+ko) ==== @@ -36,6 +36,7 @@ #include #include #include +#include #include #include #include ==== //depot/projects/smpng/sys/powerpc/powerpc/trap.c#50 (text+ko) ==== @@ -43,6 +43,7 @@ #include #include #include +#include #include #include #include From owner-p4-projects@FreeBSD.ORG Mon Jul 24 22:21:42 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 28E9916A4E5; Mon, 24 Jul 2006 22:21:42 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 0453816A4DA for ; Mon, 24 Jul 2006 22:21:42 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id AACF043D45 for ; Mon, 24 Jul 2006 22:21:41 +0000 (GMT) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k6OMLf9j048051 for ; Mon, 24 Jul 2006 22:21:41 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k6OMLfhp048048 for perforce@freebsd.org; Mon, 24 Jul 2006 22:21:41 GMT (envelope-from jhb@freebsd.org) Date: Mon, 24 Jul 2006 22:21:41 GMT Message-Id: <200607242221.k6OMLfhp048048@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 Cc: Subject: PERFORCE change 102321 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 24 Jul 2006 22:21:42 -0000 http://perforce.freebsd.org/chv.cgi?CH=102321 Change 102321 by jhb@jhb_mutex on 2006/07/24 22:20:45 Fix non-witness compile. Affected files ... .. //depot/projects/smpng/sys/amd64/amd64/trap.c#46 edit .. //depot/projects/smpng/sys/arm/arm/trap.c#19 edit .. //depot/projects/smpng/sys/conf/files#181 edit .. //depot/projects/smpng/sys/i386/i386/trap.c#95 edit .. //depot/projects/smpng/sys/ia64/ia32/ia32_trap.c#9 edit .. //depot/projects/smpng/sys/ia64/ia64/trap.c#82 edit Differences ... ==== //depot/projects/smpng/sys/amd64/amd64/trap.c#46 (text+ko) ==== @@ -145,9 +145,7 @@ SYSCTL_INT(_machdep, OID_AUTO, panic_on_nmi, CTLFLAG_RW, &panic_on_nmi, 0, "Panic on NMI"); -#ifdef WITNESS extern char *syscallnames[]; -#endif /* * Exception, fault, and trap interface to the FreeBSD kernel. ==== //depot/projects/smpng/sys/arm/arm/trap.c#19 (text+ko) ==== @@ -133,6 +133,7 @@ #include extern char fusubailout[]; +extern char *syscallnames[]; #ifdef DEBUG int last_fault_code; /* For the benefit of pmap_fault_fixup() */ ==== //depot/projects/smpng/sys/conf/files#181 (text+ko) ==== @@ -1399,7 +1399,7 @@ kern/sys_pipe.c standard kern/sys_process.c standard kern/sys_socket.c standard -kern/syscalls.c optional witness +kern/syscalls.c optional witness | invariants kern/sysv_ipc.c standard kern/sysv_msg.c optional sysvmsg kern/sysv_sem.c optional sysvsem ==== //depot/projects/smpng/sys/i386/i386/trap.c#95 (text+ko) ==== @@ -159,9 +159,7 @@ SYSCTL_INT(_machdep, OID_AUTO, panic_on_nmi, CTLFLAG_RW, &panic_on_nmi, 0, "Panic on NMI"); -#ifdef WITNESS extern char *syscallnames[]; -#endif /* * Exception, fault, and trap interface to the FreeBSD kernel. ==== //depot/projects/smpng/sys/ia64/ia32/ia32_trap.c#9 (text+ko) ==== @@ -46,9 +46,7 @@ #include #include -#ifdef WITNESS extern char *syscallnames[]; -#endif static void ia32_syscall(struct trapframe *tf) ==== //depot/projects/smpng/sys/ia64/ia64/trap.c#82 (text+ko) ==== @@ -85,9 +85,7 @@ */ extern struct fpswa_iface *fpswa_iface; -#ifdef WITNESS extern char *syscallnames[]; -#endif static const char *ia64_vector_names[] = { "VHPT Translation", /* 0 */ From owner-p4-projects@FreeBSD.ORG Tue Jul 25 05:42:46 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2BFB216A4E2; Tue, 25 Jul 2006 05:42:46 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id BE24A16A4DA for ; Tue, 25 Jul 2006 05:42:45 +0000 (UTC) (envelope-from kevlo@FreeBSD.org) Received: from ns.kevlo.org (ns.kevlo.org [203.74.190.123]) by mx1.FreeBSD.org (Postfix) with ESMTP id 02A2643D46 for ; Tue, 25 Jul 2006 05:42:44 +0000 (GMT) (envelope-from kevlo@FreeBSD.org) Received: from [192.168.1.11] ([192.168.1.11]) (authenticated bits=0) by ns.kevlo.org (8.13.4/8.13.4) with ESMTP id k6PDXvGk010659 (version=TLSv1/SSLv3 cipher=RC4-MD5 bits=128 verify=NOT); Tue, 25 Jul 2006 13:34:02 GMT From: Kevin Lo To: Olivier Houchard In-Reply-To: <20060724163624.GA83205@ci0.org> References: <200607240927.k6O9R8ip054278@repoman.freebsd.org> <44C4F543.3090208@errno.com> <20060724163624.GA83205@ci0.org> Content-Type: text/plain Date: Tue, 25 Jul 2006 13:42:22 +0800 Message-Id: <1153806142.4992.10.camel@monet> Mime-Version: 1.0 X-Mailer: Evolution 2.6.1 Content-Transfer-Encoding: 7bit Cc: Sam Leffler , Perforce Change Reviews Subject: Re: PERFORCE change 102267 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 25 Jul 2006 05:42:46 -0000 Olivier Houchard wrote: > On Mon, Jul 24, 2006 at 09:28:51AM -0700, Sam Leffler wrote: > > Kevin Lo wrote: > > > http://perforce.freebsd.org/chv.cgi?CH=102267 > > > > > > Change 102267 by kevlo@kevlo_monet on 2006/07/24 09:26:16 > > > > > > My bad, back this up. I should commit this into my tree, not into p4. > > > > Why is it a mistake? We need to start using a common tree. I ended up > > creating a sam_avila branch that's derived from arm-devel so I can > > trivially pickup mods that are committed to arm-devel. I'd like to see > > everyone working on arm code share arm-devel and push their changes > > upstream to there until we can work in CVS. > > > > I agree. Everyone working in his own P4 branch can be a PITA. arm-devel is > "experimental" enough that we don't have to worry about breaking things. Got it. I'll commit the modified gnu-arm.diff into P4. > Olivier Kevin From owner-p4-projects@FreeBSD.ORG Tue Jul 25 05:48:16 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 20A5816A4DF; Tue, 25 Jul 2006 05:48:16 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id AA36A16A4DA for ; Tue, 25 Jul 2006 05:48:15 +0000 (UTC) (envelope-from kevlo@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 6821043D4C for ; Tue, 25 Jul 2006 05:48:15 +0000 (GMT) (envelope-from kevlo@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k6P5mFxk097485 for ; Tue, 25 Jul 2006 05:48:15 GMT (envelope-from kevlo@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k6P5mE91097482 for perforce@freebsd.org; Tue, 25 Jul 2006 05:48:14 GMT (envelope-from kevlo@freebsd.org) Date: Tue, 25 Jul 2006 05:48:14 GMT Message-Id: <200607250548.k6P5mE91097482@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kevlo@freebsd.org using -f From: Kevin Lo To: Perforce Change Reviews Cc: Subject: PERFORCE change 102351 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 25 Jul 2006 05:48:16 -0000 http://perforce.freebsd.org/chv.cgi?CH=102351 Change 102351 by kevlo@kevlo_monet on 2006/07/25 05:47:56 Regen the gnu patch, apply it cleanly on current src tree. Affected files ... .. //depot/projects/arm/gnu-arm.diff#17 edit Differences ... ==== //depot/projects/arm/gnu-arm.diff#17 (text+ko) ==== @@ -95,58 +95,56 @@ =================================================================== RCS file: gnu/usr.bin/binutils/ld/Makefile.arm diff -N gnu/usr.bin/binutils/ld/Makefile.arm ---- /dev/null 1 Jan 1970 00:00:00 -0000 -+++ gnu/usr.bin/binutils/ld/Makefile.arm 21 Jul 2006 12:53:38 -0000 -@@ -0,0 +1,16 @@ -+# $FreeBSD$ -+ +--- ld.orig/Makefile.arm Tue Jul 25 11:25:14 2006 ++++ ld/Makefile.arm Tue Jul 25 11:27:44 2006 +@@ -1,6 +1,10 @@ + # $FreeBSD: src/gnu/usr.bin/binutils/ld/Makefile.arm,v 1.1 2006/07/22 14:36:15 obrien Exp $ + +.if defined(ARM_BIG_ENDIAN) -+NATIVE_EMULATION= armelfb_fbsd ++NATIVE_EMULATION= armelfb_fbsd +.else -+NATIVE_EMULATION= armelf_fbsd + NATIVE_EMULATION= armelf_fbsd +.endif -+ -+SRCS+= e${NATIVE_EMULATION}.c -+CLEANFILES+= e${NATIVE_EMULATION}.c -+e${NATIVE_EMULATION}.c: emulparams/${NATIVE_EMULATION}.sh emultempl/elf32.em \ -+ scripttempl/elf.sc genscripts.sh stringify.sed -+ sh ${.CURDIR}/genscripts.sh ${SRCDIR}/ld ${LIBSERACHPATH} \ -+ ${TOOLS_PREFIX}/usr \ -+ ${HOST} ${TARGET_TUPLE} ${TARGET_TUPLE} \ -+ "${NATIVE_EMULATION}" "" no ${NATIVE_EMULATION} "${TARGET_TUPLE}" + + SRCS+= e${NATIVE_EMULATION}.c + CLEANFILES+= e${NATIVE_EMULATION}.c Index: gnu/usr.bin/binutils/libbfd/Makefile.arm =================================================================== RCS file: gnu/usr.bin/binutils/libbfd/Makefile.arm diff -N gnu/usr.bin/binutils/libbfd/Makefile.arm ---- /dev/null 1 Jan 1970 00:00:00 -0000 -+++ gnu/usr.bin/binutils/libbfd/Makefile.arm 21 Jul 2006 00:22:53 -0000 -@@ -0,0 +1,49 @@ -+# $FreeBSD$ -+ +--- gnu/usr.bin/binutils/libbfd.orig/Makefile.arm Tue Jul 25 10:59:44 2006 ++++ gnu/usr.bin/binutils/libbfd/Makefile.arm Tue Jul 25 10:58:56 2006 +@@ -1,14 +1,47 @@ + # $FreeBSD: src/gnu/usr.bin/binutils/libbfd/Makefile.arm,v 1.2 2006/07/22 14:55:55 obrien Exp $ + +-DEFAULT_VECTOR= bfd_elf32_littlearm_vec +.if defined(ARM_BIG_ENDIAN) +DEFAULT_VECTOR= bfd_elf32_bigarm_vec +ADDITIONAL_VECTOR= bfd_elf32_littlearm_vec +.else -+DEFAULT_VECTOR= bfd_elf32_littlearm_vec ++DEFAULT_VECTOR= bfd_elf32_littlearm_vec +ADDITIONAL_VECTOR= bfd_elf32_bigarm_vec +.endif -+ -+SRCS+= \ -+ cpu-arm.c \ -+ elf32.c \ -+ elf32-gen.c \ -+ elflink.c \ -+ elfarm-oabi.c \ -+ elf32-arm-fbsd.c \ -+ elf32-target.h -+VECS+= ${DEFAULT_VECTOR} \ + + SRCS+= cpu-arm.c \ + elf32.c \ + elf32-arm-fbsd.c \ + elf32-gen.c \ +- elf32-target.h +- elfarm-nabi.c \ ++ elf32-target.h \ ++ elfarm-oabi.c \ + elflink.c + + VECS= ${DEFAULT_VECTOR} \ +- bfd_elf32_bigarm_vec + ${ADDITIONAL_VECTOR} + +.if ${TARGET_ARCH} == "arm" +CFLAGS+= -DDEFAULT_VECTOR=${DEFAULT_VECTOR} +.endif + -+CLEANFILES+= elf32-arm-fbsd.c ++CLEANFILES+= elf32-arm-fbsd.c + +elf32-arm-fbsd.c: elfarm-nabi.c + cat ${.ALLSRC} | sed -e s/ELFOSABI_ARM/ELFOSABI_FREEBSD/g \ @@ -158,18 +156,17 @@ + int offset; \ + if (note->descsz != 96) \ + return (FALSE); \ -+ offset = 28; \ -+ raw_size = 68; \ -+ if (elf_tdata(abfd)->core_signal == 0) \ -+ elf_tdata (abfd)->core_signal = ((int *)(note->descdata))[5]; \ -+ elf_tdata (abfd)->core_pid = ((int *)(note->descdata))[6]; \ -+ /* Make a ".reg/999" section. */ \ -+ return _bfd_elfcore_make_pseudosection (abfd, ".reg", \ -+ raw_size, note->descpos + offset); \ -+}' >> ${.TARGET}; \ ++ offset = 28; \ ++ raw_size = 68; \ ++ if (elf_tdata(abfd)->core_signal == 0) \ ++ elf_tdata (abfd)->core_signal = ((int *)(note->descdata))[5]; \ ++ elf_tdata (abfd)->core_pid = ((int *)(note->descdata))[6]; \ ++ /* Make a ".reg/999" section. */ \ ++ return _bfd_elfcore_make_pseudosection (abfd, ".reg", \ ++ raw_size, note->descpos + offset); \ ++ }' >> ${.TARGET}; \ + echo '#include "elf32-arm.h"' >> ${.TARGET} -+ -+ + Index: gnu/usr.bin/binutils/libiberty/Makefile =================================================================== RCS file: /cognet/ncvs/src/gnu/usr.bin/binutils/libiberty/Makefile,v @@ -272,22 +269,6 @@ TARGET_INC+= ${GCC_CPU}/freebsd.h .if ${TARGET_ARCH} == "amd64" TARGET_INC+= ${GCC_CPU}/x86-64.h -Index: gnu/usr.bin/cc/cc_tools/auto-host.h -=================================================================== -RCS file: /cognet/ncvs/src/gnu/usr.bin/cc/cc_tools/auto-host.h,v -retrieving revision 1.18 -diff -u -p -r1.18 auto-host.h ---- gnu/usr.bin/cc/cc_tools/auto-host.h 28 Jul 2004 05:27:20 -0000 1.18 -+++ gnu/usr.bin/cc/cc_tools/auto-host.h 6 Jul 2006 23:54:06 -0000 -@@ -523,7 +523,7 @@ - /* The number of bytes in type int */ - #define SIZEOF_INT 4 - --#if defined(__i386__) || defined(__powerpc__) || defined(__strongarm__) -+#if defined(__i386__) || defined(__powerpc__) || defined(__arm__) - /* The number of bytes in type long */ - # define SIZEOF_LONG SIZEOF_INT - #elif defined(__alpha__) || defined(__sparc64__) || defined(__ia64__) || defined(__amd64__) Index: gnu/usr.bin/gdb/arch/arm/Makefile =================================================================== RCS file: gnu/usr.bin/gdb/arch/arm/Makefile From owner-p4-projects@FreeBSD.ORG Tue Jul 25 05:57:59 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B233116A4E1; Tue, 25 Jul 2006 05:57:59 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 791CF16A4DD for ; Tue, 25 Jul 2006 05:57:59 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 2A81843D5A for ; Tue, 25 Jul 2006 05:57:45 +0000 (GMT) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k6P5vjLA097834 for ; Tue, 25 Jul 2006 05:57:45 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k6P5vWpW097793 for perforce@freebsd.org; Tue, 25 Jul 2006 05:57:32 GMT (envelope-from imp@freebsd.org) Date: Tue, 25 Jul 2006 05:57:32 GMT Message-Id: <200607250557.k6P5vWpW097793@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to imp@freebsd.org using -f From: Warner Losh To: Perforce Change Reviews Cc: Subject: PERFORCE change 102352 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 25 Jul 2006 05:58:00 -0000 http://perforce.freebsd.org/chv.cgi?CH=102352 Change 102352 by imp@imp_lighthouse on 2006/07/25 05:49:35 IFC@102348 Make this a full tree. Affected files ... .. //depot/projects/arm/src/COPYRIGHT#1 branch .. //depot/projects/arm/src/LOCKS#1 branch .. //depot/projects/arm/src/MAINTAINERS#1 branch .. //depot/projects/arm/src/Makefile#1 branch .. //depot/projects/arm/src/Makefile.inc1#1 branch .. //depot/projects/arm/src/ObsoleteFiles.inc#1 branch .. //depot/projects/arm/src/README#1 branch .. //depot/projects/arm/src/UPDATING#1 branch .. //depot/projects/arm/src/bin/Makefile#1 branch .. //depot/projects/arm/src/bin/Makefile.inc#1 branch .. //depot/projects/arm/src/bin/cat/Makefile#1 branch .. //depot/projects/arm/src/bin/cat/cat.1#1 branch .. //depot/projects/arm/src/bin/cat/cat.c#1 branch .. //depot/projects/arm/src/bin/chflags/Makefile#1 branch .. //depot/projects/arm/src/bin/chflags/chflags.1#1 branch .. //depot/projects/arm/src/bin/chflags/chflags.c#1 branch .. //depot/projects/arm/src/bin/chio/Makefile#1 branch .. //depot/projects/arm/src/bin/chio/chio.1#1 branch .. //depot/projects/arm/src/bin/chio/chio.c#1 branch .. //depot/projects/arm/src/bin/chio/defs.h#1 branch .. //depot/projects/arm/src/bin/chio/pathnames.h#1 branch .. //depot/projects/arm/src/bin/chmod/Makefile#1 branch .. //depot/projects/arm/src/bin/chmod/chmod.1#1 branch .. //depot/projects/arm/src/bin/chmod/chmod.c#1 branch .. //depot/projects/arm/src/bin/cp/Makefile#1 branch .. //depot/projects/arm/src/bin/cp/cp.1#1 branch .. //depot/projects/arm/src/bin/cp/cp.c#1 branch .. //depot/projects/arm/src/bin/cp/extern.h#1 branch .. //depot/projects/arm/src/bin/cp/utils.c#1 branch .. //depot/projects/arm/src/bin/csh/Makefile#1 branch .. //depot/projects/arm/src/bin/csh/USD.doc/csh.1#1 branch .. //depot/projects/arm/src/bin/csh/USD.doc/csh.2#1 branch .. //depot/projects/arm/src/bin/csh/USD.doc/csh.3#1 branch .. //depot/projects/arm/src/bin/csh/USD.doc/csh.4#1 branch .. //depot/projects/arm/src/bin/csh/USD.doc/csh.a#1 branch .. //depot/projects/arm/src/bin/csh/USD.doc/csh.g#1 branch .. //depot/projects/arm/src/bin/csh/USD.doc/tabs#1 branch .. //depot/projects/arm/src/bin/csh/config.h#1 branch .. //depot/projects/arm/src/bin/csh/config_p.h#1 branch .. //depot/projects/arm/src/bin/csh/host.defs#1 branch .. //depot/projects/arm/src/bin/csh/iconv.h#1 branch .. //depot/projects/arm/src/bin/csh/iconv_stub.c#1 branch .. //depot/projects/arm/src/bin/date/Makefile#1 branch .. //depot/projects/arm/src/bin/date/date.1#1 branch .. //depot/projects/arm/src/bin/date/date.c#1 branch .. //depot/projects/arm/src/bin/date/extern.h#1 branch .. //depot/projects/arm/src/bin/date/netdate.c#1 branch .. //depot/projects/arm/src/bin/date/vary.c#1 branch .. //depot/projects/arm/src/bin/date/vary.h#1 branch .. //depot/projects/arm/src/bin/dd/Makefile#1 branch .. //depot/projects/arm/src/bin/dd/args.c#1 branch .. //depot/projects/arm/src/bin/dd/conv.c#1 branch .. //depot/projects/arm/src/bin/dd/conv_tab.c#1 branch .. //depot/projects/arm/src/bin/dd/dd.1#1 branch .. //depot/projects/arm/src/bin/dd/dd.c#1 branch .. //depot/projects/arm/src/bin/dd/dd.h#1 branch .. //depot/projects/arm/src/bin/dd/extern.h#1 branch .. //depot/projects/arm/src/bin/dd/gen.c#1 branch .. //depot/projects/arm/src/bin/dd/misc.c#1 branch .. //depot/projects/arm/src/bin/dd/position.c#1 branch .. //depot/projects/arm/src/bin/dd/ref.ascii#1 branch .. //depot/projects/arm/src/bin/dd/ref.ebcdic#1 branch .. //depot/projects/arm/src/bin/dd/ref.ibm#1 branch .. //depot/projects/arm/src/bin/dd/ref.lcase#1 branch .. //depot/projects/arm/src/bin/dd/ref.oldascii#1 branch .. //depot/projects/arm/src/bin/dd/ref.oldebcdic#1 branch .. //depot/projects/arm/src/bin/dd/ref.oldibm#1 branch .. //depot/projects/arm/src/bin/dd/ref.pareven#1 branch .. //depot/projects/arm/src/bin/dd/ref.parnone#1 branch .. //depot/projects/arm/src/bin/dd/ref.parodd#1 branch .. //depot/projects/arm/src/bin/dd/ref.parset#1 branch .. //depot/projects/arm/src/bin/dd/ref.swab#1 branch .. //depot/projects/arm/src/bin/dd/ref.ucase#1 branch .. //depot/projects/arm/src/bin/df/Makefile#1 branch .. //depot/projects/arm/src/bin/df/df.1#1 branch .. //depot/projects/arm/src/bin/df/df.c#1 branch .. //depot/projects/arm/src/bin/domainname/Makefile#1 branch .. //depot/projects/arm/src/bin/domainname/domainname.1#1 branch .. //depot/projects/arm/src/bin/domainname/domainname.c#1 branch .. //depot/projects/arm/src/bin/echo/Makefile#1 branch .. //depot/projects/arm/src/bin/echo/echo.1#1 branch .. //depot/projects/arm/src/bin/echo/echo.c#1 branch .. //depot/projects/arm/src/bin/ed/Makefile#1 branch .. //depot/projects/arm/src/bin/ed/POSIX#1 branch .. //depot/projects/arm/src/bin/ed/README#1 branch .. //depot/projects/arm/src/bin/ed/buf.c#1 branch .. //depot/projects/arm/src/bin/ed/cbc.c#1 branch .. //depot/projects/arm/src/bin/ed/ed.1#1 branch .. //depot/projects/arm/src/bin/ed/ed.h#1 branch .. //depot/projects/arm/src/bin/ed/glbl.c#1 branch .. //depot/projects/arm/src/bin/ed/io.c#1 branch .. //depot/projects/arm/src/bin/ed/main.c#1 branch .. //depot/projects/arm/src/bin/ed/re.c#1 branch .. //depot/projects/arm/src/bin/ed/sub.c#1 branch .. //depot/projects/arm/src/bin/ed/test/=.err#1 branch .. //depot/projects/arm/src/bin/ed/test/Makefile#1 branch .. //depot/projects/arm/src/bin/ed/test/README#1 branch .. //depot/projects/arm/src/bin/ed/test/TODO#1 branch .. //depot/projects/arm/src/bin/ed/test/a.d#1 branch .. //depot/projects/arm/src/bin/ed/test/a.r#1 branch .. //depot/projects/arm/src/bin/ed/test/a.t#1 branch .. //depot/projects/arm/src/bin/ed/test/a1.err#1 branch .. //depot/projects/arm/src/bin/ed/test/a2.err#1 branch .. //depot/projects/arm/src/bin/ed/test/addr.d#1 branch .. //depot/projects/arm/src/bin/ed/test/addr.r#1 branch .. //depot/projects/arm/src/bin/ed/test/addr.t#1 branch .. //depot/projects/arm/src/bin/ed/test/addr1.err#1 branch .. //depot/projects/arm/src/bin/ed/test/addr2.err#1 branch .. //depot/projects/arm/src/bin/ed/test/ascii.d.uu#1 branch .. //depot/projects/arm/src/bin/ed/test/ascii.r.uu#1 branch .. //depot/projects/arm/src/bin/ed/test/ascii.t#1 branch .. //depot/projects/arm/src/bin/ed/test/bang1.d#1 branch .. //depot/projects/arm/src/bin/ed/test/bang1.err#1 branch .. //depot/projects/arm/src/bin/ed/test/bang1.r#1 branch .. //depot/projects/arm/src/bin/ed/test/bang1.t#1 branch .. //depot/projects/arm/src/bin/ed/test/bang2.err#1 branch .. //depot/projects/arm/src/bin/ed/test/c.d#1 branch .. //depot/projects/arm/src/bin/ed/test/c.r#1 branch .. //depot/projects/arm/src/bin/ed/test/c.t#1 branch .. //depot/projects/arm/src/bin/ed/test/c1.err#1 branch .. //depot/projects/arm/src/bin/ed/test/c2.err#1 branch .. //depot/projects/arm/src/bin/ed/test/ckscripts.sh#1 branch .. //depot/projects/arm/src/bin/ed/test/d.d#1 branch .. //depot/projects/arm/src/bin/ed/test/d.err#1 branch .. //depot/projects/arm/src/bin/ed/test/d.r#1 branch .. //depot/projects/arm/src/bin/ed/test/d.t#1 branch .. //depot/projects/arm/src/bin/ed/test/e1.d#1 branch .. //depot/projects/arm/src/bin/ed/test/e1.err#1 branch .. //depot/projects/arm/src/bin/ed/test/e1.r#1 branch .. //depot/projects/arm/src/bin/ed/test/e1.t#1 branch .. //depot/projects/arm/src/bin/ed/test/e2.d#1 branch .. //depot/projects/arm/src/bin/ed/test/e2.err#1 branch .. //depot/projects/arm/src/bin/ed/test/e2.r#1 branch .. //depot/projects/arm/src/bin/ed/test/e2.t#1 branch .. //depot/projects/arm/src/bin/ed/test/e3.d#1 branch .. //depot/projects/arm/src/bin/ed/test/e3.err#1 branch .. //depot/projects/arm/src/bin/ed/test/e3.r#1 branch .. //depot/projects/arm/src/bin/ed/test/e3.t#1 branch .. //depot/projects/arm/src/bin/ed/test/e4.d#1 branch .. //depot/projects/arm/src/bin/ed/test/e4.r#1 branch .. //depot/projects/arm/src/bin/ed/test/e4.t#1 branch .. //depot/projects/arm/src/bin/ed/test/f1.err#1 branch .. //depot/projects/arm/src/bin/ed/test/f2.err#1 branch .. //depot/projects/arm/src/bin/ed/test/g1.d#1 branch .. //depot/projects/arm/src/bin/ed/test/g1.err#1 branch .. //depot/projects/arm/src/bin/ed/test/g1.r#1 branch .. //depot/projects/arm/src/bin/ed/test/g1.t#1 branch .. //depot/projects/arm/src/bin/ed/test/g2.d#1 branch .. //depot/projects/arm/src/bin/ed/test/g2.err#1 branch .. //depot/projects/arm/src/bin/ed/test/g2.r#1 branch .. //depot/projects/arm/src/bin/ed/test/g2.t#1 branch .. //depot/projects/arm/src/bin/ed/test/g3.d#1 branch .. //depot/projects/arm/src/bin/ed/test/g3.err#1 branch .. //depot/projects/arm/src/bin/ed/test/g3.r#1 branch .. //depot/projects/arm/src/bin/ed/test/g3.t#1 branch .. //depot/projects/arm/src/bin/ed/test/g4.d#1 branch .. //depot/projects/arm/src/bin/ed/test/g4.r#1 branch .. //depot/projects/arm/src/bin/ed/test/g4.t#1 branch .. //depot/projects/arm/src/bin/ed/test/g5.d#1 branch .. //depot/projects/arm/src/bin/ed/test/g5.r#1 branch .. //depot/projects/arm/src/bin/ed/test/g5.t#1 branch .. //depot/projects/arm/src/bin/ed/test/h.err#1 branch .. //depot/projects/arm/src/bin/ed/test/i.d#1 branch .. //depot/projects/arm/src/bin/ed/test/i.r#1 branch .. //depot/projects/arm/src/bin/ed/test/i.t#1 branch .. //depot/projects/arm/src/bin/ed/test/i1.err#1 branch .. //depot/projects/arm/src/bin/ed/test/i2.err#1 branch .. //depot/projects/arm/src/bin/ed/test/i3.err#1 branch .. //depot/projects/arm/src/bin/ed/test/j.d#1 branch .. //depot/projects/arm/src/bin/ed/test/j.r#1 branch .. //depot/projects/arm/src/bin/ed/test/j.t#1 branch .. //depot/projects/arm/src/bin/ed/test/k.d#1 branch .. //depot/projects/arm/src/bin/ed/test/k.r#1 branch .. //depot/projects/arm/src/bin/ed/test/k.t#1 branch .. //depot/projects/arm/src/bin/ed/test/k1.err#1 branch .. //depot/projects/arm/src/bin/ed/test/k2.err#1 branch .. //depot/projects/arm/src/bin/ed/test/k3.err#1 branch .. //depot/projects/arm/src/bin/ed/test/k4.err#1 branch .. //depot/projects/arm/src/bin/ed/test/l.d#1 branch .. //depot/projects/arm/src/bin/ed/test/l.r#1 branch .. //depot/projects/arm/src/bin/ed/test/l.t#1 branch .. //depot/projects/arm/src/bin/ed/test/m.d#1 branch .. //depot/projects/arm/src/bin/ed/test/m.err#1 branch .. //depot/projects/arm/src/bin/ed/test/m.r#1 branch .. //depot/projects/arm/src/bin/ed/test/m.t#1 branch .. //depot/projects/arm/src/bin/ed/test/mkscripts.sh#1 branch .. //depot/projects/arm/src/bin/ed/test/n.d#1 branch .. //depot/projects/arm/src/bin/ed/test/n.r#1 branch .. //depot/projects/arm/src/bin/ed/test/n.t#1 branch .. //depot/projects/arm/src/bin/ed/test/nl.err#1 branch .. //depot/projects/arm/src/bin/ed/test/nl1.d#1 branch .. //depot/projects/arm/src/bin/ed/test/nl1.r#1 branch .. //depot/projects/arm/src/bin/ed/test/nl1.t#1 branch .. //depot/projects/arm/src/bin/ed/test/nl2.d#1 branch .. //depot/projects/arm/src/bin/ed/test/nl2.r#1 branch .. //depot/projects/arm/src/bin/ed/test/nl2.t#1 branch .. //depot/projects/arm/src/bin/ed/test/p.d#1 branch .. //depot/projects/arm/src/bin/ed/test/p.r#1 branch .. //depot/projects/arm/src/bin/ed/test/p.t#1 branch .. //depot/projects/arm/src/bin/ed/test/q.d#1 branch .. //depot/projects/arm/src/bin/ed/test/q.r#1 branch .. //depot/projects/arm/src/bin/ed/test/q.t#1 branch .. //depot/projects/arm/src/bin/ed/test/q1.err#1 branch .. //depot/projects/arm/src/bin/ed/test/r1.d#1 branch .. //depot/projects/arm/src/bin/ed/test/r1.err#1 branch .. //depot/projects/arm/src/bin/ed/test/r1.r#1 branch .. //depot/projects/arm/src/bin/ed/test/r1.t#1 branch .. //depot/projects/arm/src/bin/ed/test/r2.d#1 branch .. //depot/projects/arm/src/bin/ed/test/r2.err#1 branch .. //depot/projects/arm/src/bin/ed/test/r2.r#1 branch .. //depot/projects/arm/src/bin/ed/test/r2.t#1 branch .. //depot/projects/arm/src/bin/ed/test/r3.d#1 branch .. //depot/projects/arm/src/bin/ed/test/r3.r#1 branch .. //depot/projects/arm/src/bin/ed/test/r3.t#1 branch .. //depot/projects/arm/src/bin/ed/test/s1.d#1 branch .. //depot/projects/arm/src/bin/ed/test/s1.err#1 branch .. //depot/projects/arm/src/bin/ed/test/s1.r#1 branch .. //depot/projects/arm/src/bin/ed/test/s1.t#1 branch .. //depot/projects/arm/src/bin/ed/test/s10.err#1 branch .. //depot/projects/arm/src/bin/ed/test/s2.d#1 branch .. //depot/projects/arm/src/bin/ed/test/s2.err#1 branch .. //depot/projects/arm/src/bin/ed/test/s2.r#1 branch .. //depot/projects/arm/src/bin/ed/test/s2.t#1 branch .. //depot/projects/arm/src/bin/ed/test/s3.d#1 branch .. //depot/projects/arm/src/bin/ed/test/s3.err#1 branch .. //depot/projects/arm/src/bin/ed/test/s3.r#1 branch .. //depot/projects/arm/src/bin/ed/test/s3.t#1 branch .. //depot/projects/arm/src/bin/ed/test/s4.err#1 branch .. //depot/projects/arm/src/bin/ed/test/s5.err#1 branch .. //depot/projects/arm/src/bin/ed/test/s6.err#1 branch .. //depot/projects/arm/src/bin/ed/test/s7.err#1 branch .. //depot/projects/arm/src/bin/ed/test/s8.err#1 branch .. //depot/projects/arm/src/bin/ed/test/s9.err#1 branch .. //depot/projects/arm/src/bin/ed/test/t.d#1 branch .. //depot/projects/arm/src/bin/ed/test/t.r#1 branch .. //depot/projects/arm/src/bin/ed/test/t1.d#1 branch .. //depot/projects/arm/src/bin/ed/test/t1.err#1 branch .. //depot/projects/arm/src/bin/ed/test/t1.r#1 branch .. //depot/projects/arm/src/bin/ed/test/t1.t#1 branch .. //depot/projects/arm/src/bin/ed/test/t2.d#1 branch .. //depot/projects/arm/src/bin/ed/test/t2.err#1 branch .. //depot/projects/arm/src/bin/ed/test/t2.r#1 branch .. //depot/projects/arm/src/bin/ed/test/t2.t#1 branch .. //depot/projects/arm/src/bin/ed/test/u.d#1 branch .. //depot/projects/arm/src/bin/ed/test/u.err#1 branch .. //depot/projects/arm/src/bin/ed/test/u.r#1 branch .. //depot/projects/arm/src/bin/ed/test/u.t#1 branch .. //depot/projects/arm/src/bin/ed/test/v.d#1 branch .. //depot/projects/arm/src/bin/ed/test/v.r#1 branch .. //depot/projects/arm/src/bin/ed/test/v.t#1 branch .. //depot/projects/arm/src/bin/ed/test/w.d#1 branch .. //depot/projects/arm/src/bin/ed/test/w.r#1 branch .. //depot/projects/arm/src/bin/ed/test/w.t#1 branch .. //depot/projects/arm/src/bin/ed/test/w1.err#1 branch .. //depot/projects/arm/src/bin/ed/test/w2.err#1 branch .. //depot/projects/arm/src/bin/ed/test/w3.err#1 branch .. //depot/projects/arm/src/bin/ed/test/x.err#1 branch .. //depot/projects/arm/src/bin/ed/test/z.err#1 branch .. //depot/projects/arm/src/bin/ed/undo.c#1 branch .. //depot/projects/arm/src/bin/expr/Makefile#1 branch .. //depot/projects/arm/src/bin/expr/expr.1#1 branch .. //depot/projects/arm/src/bin/expr/expr.y#1 branch .. //depot/projects/arm/src/bin/getfacl/Makefile#1 branch .. //depot/projects/arm/src/bin/getfacl/getfacl.1#1 branch .. //depot/projects/arm/src/bin/getfacl/getfacl.c#1 branch .. //depot/projects/arm/src/bin/hostname/Makefile#1 branch .. //depot/projects/arm/src/bin/hostname/hostname.1#1 branch .. //depot/projects/arm/src/bin/hostname/hostname.c#1 branch .. //depot/projects/arm/src/bin/kenv/Makefile#1 branch .. //depot/projects/arm/src/bin/kenv/kenv.1#1 branch .. //depot/projects/arm/src/bin/kenv/kenv.c#1 branch .. //depot/projects/arm/src/bin/kill/Makefile#1 branch .. //depot/projects/arm/src/bin/kill/kill.1#1 branch .. //depot/projects/arm/src/bin/kill/kill.c#1 branch .. //depot/projects/arm/src/bin/ln/Makefile#1 branch .. //depot/projects/arm/src/bin/ln/ln.1#1 branch .. //depot/projects/arm/src/bin/ln/ln.c#1 branch .. //depot/projects/arm/src/bin/ln/symlink.7#1 branch .. //depot/projects/arm/src/bin/ls/Makefile#1 branch .. //depot/projects/arm/src/bin/ls/cmp.c#1 branch .. //depot/projects/arm/src/bin/ls/extern.h#1 branch .. //depot/projects/arm/src/bin/ls/ls.1#1 branch .. //depot/projects/arm/src/bin/ls/ls.c#1 branch .. //depot/projects/arm/src/bin/ls/ls.h#1 branch .. //depot/projects/arm/src/bin/ls/print.c#1 branch .. //depot/projects/arm/src/bin/ls/util.c#1 branch .. //depot/projects/arm/src/bin/mkdir/Makefile#1 branch .. //depot/projects/arm/src/bin/mkdir/mkdir.1#1 branch .. //depot/projects/arm/src/bin/mkdir/mkdir.c#1 branch .. //depot/projects/arm/src/bin/mv/Makefile#1 branch .. //depot/projects/arm/src/bin/mv/mv.1#1 branch .. //depot/projects/arm/src/bin/mv/mv.c#1 branch .. //depot/projects/arm/src/bin/pax/Makefile#1 branch .. //depot/projects/arm/src/bin/pax/ar_io.c#1 branch .. //depot/projects/arm/src/bin/pax/ar_subs.c#1 branch .. //depot/projects/arm/src/bin/pax/buf_subs.c#1 branch .. //depot/projects/arm/src/bin/pax/cache.c#1 branch .. //depot/projects/arm/src/bin/pax/cache.h#1 branch .. //depot/projects/arm/src/bin/pax/cpio.1#1 branch .. //depot/projects/arm/src/bin/pax/cpio.c#1 branch .. //depot/projects/arm/src/bin/pax/cpio.h#1 branch .. //depot/projects/arm/src/bin/pax/extern.h#1 branch .. //depot/projects/arm/src/bin/pax/file_subs.c#1 branch .. //depot/projects/arm/src/bin/pax/ftree.c#1 branch .. //depot/projects/arm/src/bin/pax/ftree.h#1 branch .. //depot/projects/arm/src/bin/pax/gen_subs.c#1 branch .. //depot/projects/arm/src/bin/pax/getoldopt.c#1 branch .. //depot/projects/arm/src/bin/pax/options.c#1 branch .. //depot/projects/arm/src/bin/pax/options.h#1 branch .. //depot/projects/arm/src/bin/pax/pat_rep.c#1 branch .. //depot/projects/arm/src/bin/pax/pat_rep.h#1 branch .. //depot/projects/arm/src/bin/pax/pax.1#1 branch .. //depot/projects/arm/src/bin/pax/pax.c#1 branch .. //depot/projects/arm/src/bin/pax/pax.h#1 branch .. //depot/projects/arm/src/bin/pax/sel_subs.c#1 branch .. //depot/projects/arm/src/bin/pax/sel_subs.h#1 branch .. //depot/projects/arm/src/bin/pax/tables.c#1 branch .. //depot/projects/arm/src/bin/pax/tables.h#1 branch .. //depot/projects/arm/src/bin/pax/tar.1#1 branch .. //depot/projects/arm/src/bin/pax/tar.c#1 branch .. //depot/projects/arm/src/bin/pax/tar.h#1 branch .. //depot/projects/arm/src/bin/pax/tty_subs.c#1 branch .. //depot/projects/arm/src/bin/ps/Makefile#1 branch .. //depot/projects/arm/src/bin/ps/extern.h#1 branch .. //depot/projects/arm/src/bin/ps/fmt.c#1 branch .. //depot/projects/arm/src/bin/ps/keyword.c#1 branch .. //depot/projects/arm/src/bin/ps/nlist.c#1 branch .. //depot/projects/arm/src/bin/ps/print.c#1 branch .. //depot/projects/arm/src/bin/ps/ps.1#1 branch .. //depot/projects/arm/src/bin/ps/ps.c#1 branch .. //depot/projects/arm/src/bin/ps/ps.h#1 branch .. //depot/projects/arm/src/bin/pwd/Makefile#1 branch .. //depot/projects/arm/src/bin/pwd/pwd.1#1 branch .. //depot/projects/arm/src/bin/pwd/pwd.c#1 branch .. //depot/projects/arm/src/bin/rcp/Makefile#1 branch .. //depot/projects/arm/src/bin/rcp/extern.h#1 branch .. //depot/projects/arm/src/bin/rcp/rcp.1#1 branch .. //depot/projects/arm/src/bin/rcp/rcp.c#1 branch .. //depot/projects/arm/src/bin/rcp/util.c#1 branch .. //depot/projects/arm/src/bin/realpath/Makefile#1 branch .. //depot/projects/arm/src/bin/realpath/realpath.1#1 branch .. //depot/projects/arm/src/bin/realpath/realpath.c#1 branch .. //depot/projects/arm/src/bin/rm/Makefile#1 branch .. //depot/projects/arm/src/bin/rm/rm.1#1 branch .. //depot/projects/arm/src/bin/rm/rm.c#1 branch .. //depot/projects/arm/src/bin/rmail/Makefile#1 branch .. //depot/projects/arm/src/bin/rmdir/Makefile#1 branch .. //depot/projects/arm/src/bin/rmdir/rmdir.1#1 branch .. //depot/projects/arm/src/bin/rmdir/rmdir.c#1 branch .. //depot/projects/arm/src/bin/setfacl/Makefile#1 branch .. //depot/projects/arm/src/bin/setfacl/file.c#1 branch .. //depot/projects/arm/src/bin/setfacl/mask.c#1 branch .. //depot/projects/arm/src/bin/setfacl/merge.c#1 branch .. //depot/projects/arm/src/bin/setfacl/remove.c#1 branch .. //depot/projects/arm/src/bin/setfacl/setfacl.1#1 branch .. //depot/projects/arm/src/bin/setfacl/setfacl.c#1 branch .. //depot/projects/arm/src/bin/setfacl/setfacl.h#1 branch .. //depot/projects/arm/src/bin/setfacl/util.c#1 branch .. //depot/projects/arm/src/bin/sh/Makefile#1 branch .. //depot/projects/arm/src/bin/sh/TOUR#1 branch .. //depot/projects/arm/src/bin/sh/alias.c#1 branch .. //depot/projects/arm/src/bin/sh/alias.h#1 branch .. //depot/projects/arm/src/bin/sh/arith.h#1 branch .. //depot/projects/arm/src/bin/sh/arith.y#1 branch .. //depot/projects/arm/src/bin/sh/arith_lex.l#1 branch .. //depot/projects/arm/src/bin/sh/bltin/bltin.h#1 branch .. //depot/projects/arm/src/bin/sh/bltin/echo.1#1 branch .. //depot/projects/arm/src/bin/sh/bltin/echo.c#1 branch .. //depot/projects/arm/src/bin/sh/builtins.def#1 branch .. //depot/projects/arm/src/bin/sh/cd.c#1 branch .. //depot/projects/arm/src/bin/sh/cd.h#1 branch .. //depot/projects/arm/src/bin/sh/error.c#1 branch .. //depot/projects/arm/src/bin/sh/error.h#1 branch .. //depot/projects/arm/src/bin/sh/eval.c#1 branch .. //depot/projects/arm/src/bin/sh/eval.h#1 branch .. //depot/projects/arm/src/bin/sh/exec.c#1 branch .. //depot/projects/arm/src/bin/sh/exec.h#1 branch .. //depot/projects/arm/src/bin/sh/expand.c#1 branch .. //depot/projects/arm/src/bin/sh/expand.h#1 branch .. //depot/projects/arm/src/bin/sh/funcs/cmv#1 branch .. //depot/projects/arm/src/bin/sh/funcs/dirs#1 branch .. //depot/projects/arm/src/bin/sh/funcs/kill#1 branch .. //depot/projects/arm/src/bin/sh/funcs/login#1 branch .. //depot/projects/arm/src/bin/sh/funcs/newgrp#1 branch .. //depot/projects/arm/src/bin/sh/funcs/popd#1 branch .. //depot/projects/arm/src/bin/sh/funcs/pushd#1 branch .. //depot/projects/arm/src/bin/sh/funcs/suspend#1 branch .. //depot/projects/arm/src/bin/sh/histedit.c#1 branch .. //depot/projects/arm/src/bin/sh/init.h#1 branch .. //depot/projects/arm/src/bin/sh/input.c#1 branch .. //depot/projects/arm/src/bin/sh/input.h#1 branch .. //depot/projects/arm/src/bin/sh/jobs.c#1 branch .. //depot/projects/arm/src/bin/sh/jobs.h#1 branch .. //depot/projects/arm/src/bin/sh/mail.c#1 branch .. //depot/projects/arm/src/bin/sh/mail.h#1 branch .. //depot/projects/arm/src/bin/sh/main.c#1 branch .. //depot/projects/arm/src/bin/sh/main.h#1 branch .. //depot/projects/arm/src/bin/sh/memalloc.c#1 branch .. //depot/projects/arm/src/bin/sh/memalloc.h#1 branch .. //depot/projects/arm/src/bin/sh/miscbltin.c#1 branch .. //depot/projects/arm/src/bin/sh/mkbuiltins#1 branch .. //depot/projects/arm/src/bin/sh/mkinit.c#1 branch .. //depot/projects/arm/src/bin/sh/mknodes.c#1 branch .. //depot/projects/arm/src/bin/sh/mksyntax.c#1 branch .. //depot/projects/arm/src/bin/sh/mktokens#1 branch .. //depot/projects/arm/src/bin/sh/myhistedit.h#1 branch .. //depot/projects/arm/src/bin/sh/mystring.c#1 branch .. //depot/projects/arm/src/bin/sh/mystring.h#1 branch .. //depot/projects/arm/src/bin/sh/nodes.c.pat#1 branch .. //depot/projects/arm/src/bin/sh/nodetypes#1 branch .. //depot/projects/arm/src/bin/sh/options.c#1 branch .. //depot/projects/arm/src/bin/sh/options.h#1 branch .. //depot/projects/arm/src/bin/sh/output.c#1 branch .. //depot/projects/arm/src/bin/sh/output.h#1 branch .. //depot/projects/arm/src/bin/sh/parser.c#1 branch .. //depot/projects/arm/src/bin/sh/parser.h#1 branch .. //depot/projects/arm/src/bin/sh/redir.c#1 branch .. //depot/projects/arm/src/bin/sh/redir.h#1 branch .. //depot/projects/arm/src/bin/sh/sh.1#1 branch .. //depot/projects/arm/src/bin/sh/shell.h#1 branch .. //depot/projects/arm/src/bin/sh/show.c#1 branch .. //depot/projects/arm/src/bin/sh/show.h#1 branch .. //depot/projects/arm/src/bin/sh/trap.c#1 branch .. //depot/projects/arm/src/bin/sh/trap.h#1 branch .. //depot/projects/arm/src/bin/sh/var.c#1 branch .. //depot/projects/arm/src/bin/sh/var.h#1 branch .. //depot/projects/arm/src/bin/sleep/Makefile#1 branch .. //depot/projects/arm/src/bin/sleep/sleep.1#1 branch .. //depot/projects/arm/src/bin/sleep/sleep.c#1 branch .. //depot/projects/arm/src/bin/stty/Makefile#1 branch .. //depot/projects/arm/src/bin/stty/cchar.c#1 branch .. //depot/projects/arm/src/bin/stty/extern.h#1 branch .. //depot/projects/arm/src/bin/stty/gfmt.c#1 branch .. //depot/projects/arm/src/bin/stty/key.c#1 branch .. //depot/projects/arm/src/bin/stty/modes.c#1 branch .. //depot/projects/arm/src/bin/stty/print.c#1 branch .. //depot/projects/arm/src/bin/stty/stty.1#1 branch .. //depot/projects/arm/src/bin/stty/stty.c#1 branch .. //depot/projects/arm/src/bin/stty/stty.h#1 branch .. //depot/projects/arm/src/bin/stty/util.c#1 branch .. //depot/projects/arm/src/bin/sync/Makefile#1 branch .. //depot/projects/arm/src/bin/sync/sync.8#1 branch .. //depot/projects/arm/src/bin/sync/sync.c#1 branch .. //depot/projects/arm/src/bin/test/Makefile#1 branch .. //depot/projects/arm/src/bin/test/TEST.README#1 branch .. //depot/projects/arm/src/bin/test/TEST.csh#1 branch .. //depot/projects/arm/src/bin/test/TEST.sh#1 branch .. //depot/projects/arm/src/bin/test/test.1#1 branch .. //depot/projects/arm/src/bin/test/test.c#1 branch .. //depot/projects/arm/src/contrib/amd/AUTHORS#1 branch .. //depot/projects/arm/src/contrib/amd/BUGS#1 branch .. //depot/projects/arm/src/contrib/amd/COPYING#1 branch .. //depot/projects/arm/src/contrib/amd/ChangeLog#1 branch .. //depot/projects/arm/src/contrib/amd/FREEBSD-Xlist#1 branch .. //depot/projects/arm/src/contrib/amd/FREEBSD-upgrade#1 branch .. //depot/projects/arm/src/contrib/amd/INSTALL#1 branch .. //depot/projects/arm/src/contrib/amd/MIRRORS.html#1 branch .. //depot/projects/arm/src/contrib/amd/MIRRORS.txt#1 branch .. //depot/projects/arm/src/contrib/amd/NEWS#1 branch .. //depot/projects/arm/src/contrib/amd/README#1 branch .. //depot/projects/arm/src/contrib/amd/README.ldap#1 branch .. //depot/projects/arm/src/contrib/amd/README.y2k#1 branch .. //depot/projects/arm/src/contrib/amd/amd/am_ops.c#1 branch .. //depot/projects/arm/src/contrib/amd/amd/amd.8#1 branch .. //depot/projects/arm/src/contrib/amd/amd/amd.c#1 branch .. //depot/projects/arm/src/contrib/amd/amd/amd.h#1 branch .. //depot/projects/arm/src/contrib/amd/amd/amfs_auto.c#1 branch .. //depot/projects/arm/src/contrib/amd/amd/amfs_direct.c#1 branch .. //depot/projects/arm/src/contrib/amd/amd/amfs_error.c#1 branch .. //depot/projects/arm/src/contrib/amd/amd/amfs_host.c#1 branch .. //depot/projects/arm/src/contrib/amd/amd/amfs_inherit.c#1 branch .. //depot/projects/arm/src/contrib/amd/amd/amfs_link.c#1 branch .. //depot/projects/arm/src/contrib/amd/amd/amfs_linkx.c#1 branch .. //depot/projects/arm/src/contrib/amd/amd/amfs_nfsl.c#1 branch .. //depot/projects/arm/src/contrib/amd/amd/amfs_nfsx.c#1 branch .. //depot/projects/arm/src/contrib/amd/amd/amfs_program.c#1 branch .. //depot/projects/arm/src/contrib/amd/amd/amfs_root.c#1 branch .. //depot/projects/arm/src/contrib/amd/amd/amfs_toplvl.c#1 branch .. //depot/projects/arm/src/contrib/amd/amd/amfs_union.c#1 branch .. //depot/projects/arm/src/contrib/amd/amd/amq_subr.c#1 branch .. //depot/projects/arm/src/contrib/amd/amd/amq_svc.c#1 branch .. //depot/projects/arm/src/contrib/amd/amd/autil.c#1 branch .. //depot/projects/arm/src/contrib/amd/amd/clock.c#1 branch .. //depot/projects/arm/src/contrib/amd/amd/conf.c#1 branch .. //depot/projects/arm/src/contrib/amd/amd/conf_parse.y#1 branch .. //depot/projects/arm/src/contrib/amd/amd/conf_tok.l#1 branch .. //depot/projects/arm/src/contrib/amd/amd/get_args.c#1 branch .. //depot/projects/arm/src/contrib/amd/amd/info_file.c#1 branch .. //depot/projects/arm/src/contrib/amd/amd/info_hesiod.c#1 branch .. //depot/projects/arm/src/contrib/amd/amd/info_ldap.c#1 branch .. //depot/projects/arm/src/contrib/amd/amd/info_ndbm.c#1 branch .. //depot/projects/arm/src/contrib/amd/amd/info_nis.c#1 branch .. //depot/projects/arm/src/contrib/amd/amd/info_nisplus.c#1 branch .. //depot/projects/arm/src/contrib/amd/amd/info_passwd.c#1 branch .. //depot/projects/arm/src/contrib/amd/amd/info_union.c#1 branch .. //depot/projects/arm/src/contrib/amd/amd/map.c#1 branch .. //depot/projects/arm/src/contrib/amd/amd/mapc.c#1 branch .. //depot/projects/arm/src/contrib/amd/amd/mntfs.c#1 branch .. //depot/projects/arm/src/contrib/amd/amd/nfs_prot_svc.c#1 branch .. //depot/projects/arm/src/contrib/amd/amd/nfs_start.c#1 branch .. //depot/projects/arm/src/contrib/amd/amd/nfs_subr.c#1 branch .. //depot/projects/arm/src/contrib/amd/amd/ops_TEMPLATE.c#1 branch .. //depot/projects/arm/src/contrib/amd/amd/ops_cachefs.c#1 branch .. //depot/projects/arm/src/contrib/amd/amd/ops_cdfs.c#1 branch .. //depot/projects/arm/src/contrib/amd/amd/ops_efs.c#1 branch .. //depot/projects/arm/src/contrib/amd/amd/ops_lofs.c#1 branch .. //depot/projects/arm/src/contrib/amd/amd/ops_mfs.c#1 branch .. //depot/projects/arm/src/contrib/amd/amd/ops_nfs.c#1 branch .. //depot/projects/arm/src/contrib/amd/amd/ops_nfs3.c#1 branch .. //depot/projects/arm/src/contrib/amd/amd/ops_nullfs.c#1 branch .. //depot/projects/arm/src/contrib/amd/amd/ops_pcfs.c#1 branch .. //depot/projects/arm/src/contrib/amd/amd/ops_tfs.c#1 branch .. //depot/projects/arm/src/contrib/amd/amd/ops_tmpfs.c#1 branch .. //depot/projects/arm/src/contrib/amd/amd/ops_ufs.c#1 branch .. //depot/projects/arm/src/contrib/amd/amd/ops_umapfs.c#1 branch .. //depot/projects/arm/src/contrib/amd/amd/ops_unionfs.c#1 branch .. //depot/projects/arm/src/contrib/amd/amd/ops_xfs.c#1 branch .. //depot/projects/arm/src/contrib/amd/amd/opts.c#1 branch .. //depot/projects/arm/src/contrib/amd/amd/restart.c#1 branch .. //depot/projects/arm/src/contrib/amd/amd/rpc_fwd.c#1 branch .. //depot/projects/arm/src/contrib/amd/amd/sched.c#1 branch .. //depot/projects/arm/src/contrib/amd/amd/srvr_amfs_auto.c#1 branch .. //depot/projects/arm/src/contrib/amd/amd/srvr_nfs.c#1 branch .. //depot/projects/arm/src/contrib/amd/amq/amq.8#1 branch .. //depot/projects/arm/src/contrib/amd/amq/amq.c#1 branch .. //depot/projects/arm/src/contrib/amd/amq/amq.h#1 branch .. //depot/projects/arm/src/contrib/amd/amq/amq_clnt.c#1 branch .. //depot/projects/arm/src/contrib/amd/amq/amq_xdr.c#1 branch .. //depot/projects/arm/src/contrib/amd/amq/pawd.1#1 branch .. //depot/projects/arm/src/contrib/amd/amq/pawd.c#1 branch .. //depot/projects/arm/src/contrib/amd/aux_conf.h.in#1 branch .. //depot/projects/arm/src/contrib/amd/bootstrap#1 branch .. //depot/projects/arm/src/contrib/amd/conf/checkmount/checkmount_bsd44.c#1 branch .. //depot/projects/arm/src/contrib/amd/conf/fh_dref/fh_dref_freebsd22.h#1 branch .. //depot/projects/arm/src/contrib/amd/conf/mtab/mtab_bsd.c#1 branch .. //depot/projects/arm/src/contrib/amd/conf/nfs_prot/nfs_prot_freebsd2.h#1 branch .. //depot/projects/arm/src/contrib/amd/conf/nfs_prot/nfs_prot_freebsd3.h#1 branch .. //depot/projects/arm/src/contrib/amd/conf/sa_dref/sa_dref_bsd44.h#1 branch .. //depot/projects/arm/src/contrib/amd/conf/transp/transp_sockets.c#1 branch .. //depot/projects/arm/src/contrib/amd/conf/trap/trap_default.h#1 branch .. //depot/projects/arm/src/contrib/amd/conf/umount/umount_bsd44.c#1 branch .. //depot/projects/arm/src/contrib/amd/doc/am-utils.texi#1 branch .. //depot/projects/arm/src/contrib/amd/doc/texinfo.tex#1 branch .. //depot/projects/arm/src/contrib/amd/doc/version.texi#1 branch .. //depot/projects/arm/src/contrib/amd/fixmount/fixmount.8#1 branch .. //depot/projects/arm/src/contrib/amd/fixmount/fixmount.c#1 branch .. //depot/projects/arm/src/contrib/amd/fsinfo/fsi_analyze.c#1 branch .. //depot/projects/arm/src/contrib/amd/fsinfo/fsi_data.h#1 branch .. //depot/projects/arm/src/contrib/amd/fsinfo/fsi_dict.c#1 branch .. //depot/projects/arm/src/contrib/amd/fsinfo/fsi_gram.y#1 branch .. //depot/projects/arm/src/contrib/amd/fsinfo/fsi_lex.l#1 branch .. //depot/projects/arm/src/contrib/amd/fsinfo/fsi_util.c#1 branch .. //depot/projects/arm/src/contrib/amd/fsinfo/fsinfo.8#1 branch .. //depot/projects/arm/src/contrib/amd/fsinfo/fsinfo.c#1 branch .. //depot/projects/arm/src/contrib/amd/fsinfo/fsinfo.h#1 branch .. //depot/projects/arm/src/contrib/amd/fsinfo/wr_atab.c#1 branch .. //depot/projects/arm/src/contrib/amd/fsinfo/wr_bparam.c#1 branch .. //depot/projects/arm/src/contrib/amd/fsinfo/wr_dumpset.c#1 branch .. //depot/projects/arm/src/contrib/amd/fsinfo/wr_exportfs.c#1 branch .. //depot/projects/arm/src/contrib/amd/fsinfo/wr_fstab.c#1 branch .. //depot/projects/arm/src/contrib/amd/hlfsd/hlfsd.8#1 branch .. //depot/projects/arm/src/contrib/amd/hlfsd/hlfsd.c#1 branch .. //depot/projects/arm/src/contrib/amd/hlfsd/hlfsd.h#1 branch .. //depot/projects/arm/src/contrib/amd/hlfsd/homedir.c#1 branch .. //depot/projects/arm/src/contrib/amd/hlfsd/nfs_prot_svc.c#1 branch .. //depot/projects/arm/src/contrib/amd/hlfsd/stubs.c#1 branch .. //depot/projects/arm/src/contrib/amd/include/am_compat.h#1 branch .. //depot/projects/arm/src/contrib/amd/include/am_defs.h#1 branch .. //depot/projects/arm/src/contrib/amd/include/am_utils.h#1 branch .. //depot/projects/arm/src/contrib/amd/include/am_xdr_func.h#1 branch .. //depot/projects/arm/src/contrib/amd/include/amq_defs.h#1 branch .. //depot/projects/arm/src/contrib/amd/include/mount_headers1.h#1 branch .. //depot/projects/arm/src/contrib/amd/include/mount_headers2.h#1 branch .. //depot/projects/arm/src/contrib/amd/ldap-id.ms#1 branch .. //depot/projects/arm/src/contrib/amd/ldap-id.txt#1 branch .. //depot/projects/arm/src/contrib/amd/libamu/alloca.c#1 branch .. //depot/projects/arm/src/contrib/amd/libamu/amu.h#1 branch .. //depot/projects/arm/src/contrib/amd/libamu/hasmntopt.c#1 branch .. //depot/projects/arm/src/contrib/amd/libamu/misc_rpc.c#1 branch .. //depot/projects/arm/src/contrib/amd/libamu/mount_fs.c#1 branch .. //depot/projects/arm/src/contrib/amd/libamu/mtab.c#1 branch .. //depot/projects/arm/src/contrib/amd/libamu/nfs_prot_xdr.c#1 branch .. //depot/projects/arm/src/contrib/amd/libamu/strerror.c#1 branch .. //depot/projects/arm/src/contrib/amd/libamu/util.c#1 branch .. //depot/projects/arm/src/contrib/amd/libamu/wire.c#1 branch .. //depot/projects/arm/src/contrib/amd/libamu/xdr_func.c#1 branch .. //depot/projects/arm/src/contrib/amd/libamu/xutil.c#1 branch .. //depot/projects/arm/src/contrib/amd/m4/GNUmakefile#1 branch .. //depot/projects/arm/src/contrib/amd/m4/amdgrep#1 branch .. //depot/projects/arm/src/contrib/amd/m4/amindent#1 branch .. //depot/projects/arm/src/contrib/amd/m4/autopat#1 branch .. //depot/projects/arm/src/contrib/amd/m4/chop-aclocal.pl#1 branch .. //depot/projects/arm/src/contrib/amd/m4/copy-if-newbig#1 branch .. //depot/projects/arm/src/contrib/amd/m4/macros/HEADER#1 branch .. //depot/projects/arm/src/contrib/amd/m4/macros/TRAILER#1 branch .. //depot/projects/arm/src/contrib/amd/m4/mk-aclocal#1 branch .. //depot/projects/arm/src/contrib/amd/m4/mkconf#1 branch .. //depot/projects/arm/src/contrib/amd/m4/rmtspc#1 branch .. //depot/projects/arm/src/contrib/amd/m4/update_build_version#1 branch .. //depot/projects/arm/src/contrib/amd/mk-amd-map/mk-amd-map.8#1 branch .. //depot/projects/arm/src/contrib/amd/mk-amd-map/mk-amd-map.c#1 branch .. //depot/projects/arm/src/contrib/amd/scripts/Makefile.am#1 branch .. //depot/projects/arm/src/contrib/amd/scripts/Makefile.in#1 branch .. //depot/projects/arm/src/contrib/amd/scripts/am-eject.in#1 branch .. //depot/projects/arm/src/contrib/amd/scripts/amd.conf-sample#1 branch .. //depot/projects/arm/src/contrib/amd/scripts/amd.conf.5#1 branch .. //depot/projects/arm/src/contrib/amd/scripts/amd2ldif.in#1 branch .. //depot/projects/arm/src/contrib/amd/scripts/amd2sun.in#1 branch .. //depot/projects/arm/src/contrib/amd/scripts/automount2amd.8#1 branch .. //depot/projects/arm/src/contrib/amd/scripts/automount2amd.in#1 branch .. //depot/projects/arm/src/contrib/amd/scripts/ctl-amd.in#1 branch .. //depot/projects/arm/src/contrib/amd/scripts/ctl-hlfsd.in#1 branch .. //depot/projects/arm/src/contrib/amd/scripts/expn.1#1 branch .. //depot/projects/arm/src/contrib/amd/scripts/expn.in#1 branch .. //depot/projects/arm/src/contrib/amd/scripts/fix-amd-map.in#1 branch .. //depot/projects/arm/src/contrib/amd/scripts/fixrmtab.in#1 branch .. //depot/projects/arm/src/contrib/amd/scripts/redhat-ctl-amd.in#1 branch .. //depot/projects/arm/src/contrib/amd/scripts/wait4amd.in#1 branch .. //depot/projects/arm/src/contrib/amd/scripts/wait4amd2die.in#1 branch .. //depot/projects/arm/src/contrib/amd/tasks#1 branch .. //depot/projects/arm/src/contrib/amd/wire-test/wire-test.8#1 branch .. //depot/projects/arm/src/contrib/amd/wire-test/wire-test.c#1 branch .. //depot/projects/arm/src/contrib/bc/AUTHORS#1 branch .. //depot/projects/arm/src/contrib/bc/ChangeLog#1 branch .. //depot/projects/arm/src/contrib/bc/Examples/ckbook.b#1 branch .. //depot/projects/arm/src/contrib/bc/Examples/pi.b#1 branch .. //depot/projects/arm/src/contrib/bc/Examples/primes.b#1 branch .. //depot/projects/arm/src/contrib/bc/Examples/twins.b#1 branch .. //depot/projects/arm/src/contrib/bc/FAQ#1 branch .. //depot/projects/arm/src/contrib/bc/FREEBSD-upgrade#1 branch .. //depot/projects/arm/src/contrib/bc/INSTALL#1 branch .. //depot/projects/arm/src/contrib/bc/Makefile.am#1 branch .. //depot/projects/arm/src/contrib/bc/Makefile.in#1 branch .. //depot/projects/arm/src/contrib/bc/NEWS#1 branch .. //depot/projects/arm/src/contrib/bc/README#1 branch .. //depot/projects/arm/src/contrib/bc/Test/BUG.bc#1 branch .. //depot/projects/arm/src/contrib/bc/Test/array.b#1 branch .. //depot/projects/arm/src/contrib/bc/Test/arrayp.b#1 branch .. //depot/projects/arm/src/contrib/bc/Test/aryprm.b#1 branch .. //depot/projects/arm/src/contrib/bc/Test/atan.b#1 branch .. //depot/projects/arm/src/contrib/bc/Test/checklib.b#1 branch .. //depot/projects/arm/src/contrib/bc/Test/div.b#1 branch .. //depot/projects/arm/src/contrib/bc/Test/exp.b#1 branch .. //depot/projects/arm/src/contrib/bc/Test/fact.b#1 branch .. //depot/projects/arm/src/contrib/bc/Test/jn.b#1 branch .. //depot/projects/arm/src/contrib/bc/Test/ln.b#1 branch .. //depot/projects/arm/src/contrib/bc/Test/mul.b#1 branch .. //depot/projects/arm/src/contrib/bc/Test/raise.b#1 branch .. //depot/projects/arm/src/contrib/bc/Test/signum#1 branch .. //depot/projects/arm/src/contrib/bc/Test/sine.b#1 branch .. //depot/projects/arm/src/contrib/bc/Test/sqrt.b#1 branch .. //depot/projects/arm/src/contrib/bc/Test/sqrt1.b#1 branch .. //depot/projects/arm/src/contrib/bc/Test/sqrt2.b#1 branch .. //depot/projects/arm/src/contrib/bc/Test/testfn.b#1 branch .. //depot/projects/arm/src/contrib/bc/Test/timetest#1 branch .. //depot/projects/arm/src/contrib/bc/acconfig.h#1 branch .. //depot/projects/arm/src/contrib/bc/aclocal.m4#1 branch .. //depot/projects/arm/src/contrib/bc/bc/Makefile.am#1 branch .. //depot/projects/arm/src/contrib/bc/bc/Makefile.in#1 branch .. //depot/projects/arm/src/contrib/bc/bc/bc.y#1 branch .. //depot/projects/arm/src/contrib/bc/bc/bcdefs.h#1 branch .. //depot/projects/arm/src/contrib/bc/bc/const.h#1 branch .. //depot/projects/arm/src/contrib/bc/bc/execute.c#1 branch .. //depot/projects/arm/src/contrib/bc/bc/fix-libmath_h#1 branch .. //depot/projects/arm/src/contrib/bc/bc/global.c#1 branch .. //depot/projects/arm/src/contrib/bc/bc/global.h#1 branch .. //depot/projects/arm/src/contrib/bc/bc/libmath.b#1 branch .. //depot/projects/arm/src/contrib/bc/bc/libmath.h#1 branch .. //depot/projects/arm/src/contrib/bc/bc/load.c#1 branch .. //depot/projects/arm/src/contrib/bc/bc/main.c#1 branch .. //depot/projects/arm/src/contrib/bc/bc/proto.h#1 branch .. //depot/projects/arm/src/contrib/bc/bc/sbc.y#1 branch .. //depot/projects/arm/src/contrib/bc/bc/scan.l#1 branch .. //depot/projects/arm/src/contrib/bc/bc/storage.c#1 branch .. //depot/projects/arm/src/contrib/bc/bc/util.c#1 branch .. //depot/projects/arm/src/contrib/bc/config.h.in#1 branch .. //depot/projects/arm/src/contrib/bc/configure#1 branch .. //depot/projects/arm/src/contrib/bc/configure.in#1 branch .. //depot/projects/arm/src/contrib/bc/dc/Makefile.am#1 branch .. //depot/projects/arm/src/contrib/bc/dc/Makefile.in#1 branch .. //depot/projects/arm/src/contrib/bc/dc/array.c#1 branch .. //depot/projects/arm/src/contrib/bc/dc/dc-proto.h#1 branch .. //depot/projects/arm/src/contrib/bc/dc/dc-regdef.h#1 branch .. //depot/projects/arm/src/contrib/bc/dc/dc.c#1 branch .. //depot/projects/arm/src/contrib/bc/dc/dc.h#1 branch .. //depot/projects/arm/src/contrib/bc/dc/eval.c#1 branch .. //depot/projects/arm/src/contrib/bc/dc/misc.c#1 branch .. //depot/projects/arm/src/contrib/bc/dc/numeric.c#1 branch .. //depot/projects/arm/src/contrib/bc/dc/stack.c#1 branch .. //depot/projects/arm/src/contrib/bc/dc/string.c#1 branch .. //depot/projects/arm/src/contrib/bc/doc/Makefile.am#1 branch .. //depot/projects/arm/src/contrib/bc/doc/Makefile.in#1 branch .. //depot/projects/arm/src/contrib/bc/doc/bc.1#1 branch .. //depot/projects/arm/src/contrib/bc/doc/bc.texi#1 branch .. //depot/projects/arm/src/contrib/bc/doc/dc.1#1 branch .. //depot/projects/arm/src/contrib/bc/doc/dc.texi#1 branch .. //depot/projects/arm/src/contrib/bc/h/number.h#1 branch .. //depot/projects/arm/src/contrib/bc/install-sh#1 branch .. //depot/projects/arm/src/contrib/bc/lib/Makefile.am#1 branch .. //depot/projects/arm/src/contrib/bc/lib/Makefile.in#1 branch .. //depot/projects/arm/src/contrib/bc/lib/number.c#1 branch .. //depot/projects/arm/src/contrib/bc/lib/testmul.c#1 branch .. //depot/projects/arm/src/contrib/bc/lib/vfprintf.c#1 branch .. //depot/projects/arm/src/contrib/bc/missing#1 branch .. //depot/projects/arm/src/contrib/bc/mkinstalldirs#1 branch .. //depot/projects/arm/src/contrib/bc/stamp-h.in#1 branch .. //depot/projects/arm/src/contrib/bind9/CHANGES#1 branch .. //depot/projects/arm/src/contrib/bind9/COPYRIGHT#1 branch .. //depot/projects/arm/src/contrib/bind9/FAQ#1 branch .. //depot/projects/arm/src/contrib/bind9/FAQ.xml#1 branch .. //depot/projects/arm/src/contrib/bind9/FREEBSD-Upgrade#1 branch .. //depot/projects/arm/src/contrib/bind9/FREEBSD-Xlist#1 branch .. //depot/projects/arm/src/contrib/bind9/Makefile.in#1 branch .. //depot/projects/arm/src/contrib/bind9/README#1 branch .. //depot/projects/arm/src/contrib/bind9/acconfig.h#1 branch .. //depot/projects/arm/src/contrib/bind9/bin/Makefile.in#1 branch .. //depot/projects/arm/src/contrib/bind9/bin/check/Makefile.in#1 branch .. //depot/projects/arm/src/contrib/bind9/bin/check/check-tool.c#1 branch .. //depot/projects/arm/src/contrib/bind9/bin/check/check-tool.h#1 branch .. //depot/projects/arm/src/contrib/bind9/bin/check/named-checkconf.8#1 branch .. //depot/projects/arm/src/contrib/bind9/bin/check/named-checkconf.c#1 branch .. //depot/projects/arm/src/contrib/bind9/bin/check/named-checkconf.docbook#1 branch .. //depot/projects/arm/src/contrib/bind9/bin/check/named-checkconf.html#1 branch .. //depot/projects/arm/src/contrib/bind9/bin/check/named-checkzone.8#1 branch .. //depot/projects/arm/src/contrib/bind9/bin/check/named-checkzone.c#1 branch .. //depot/projects/arm/src/contrib/bind9/bin/check/named-checkzone.docbook#1 branch .. //depot/projects/arm/src/contrib/bind9/bin/check/named-checkzone.html#1 branch .. //depot/projects/arm/src/contrib/bind9/bin/dig/Makefile.in#1 branch .. //depot/projects/arm/src/contrib/bind9/bin/dig/dig.1#1 branch .. //depot/projects/arm/src/contrib/bind9/bin/dig/dig.c#1 branch .. //depot/projects/arm/src/contrib/bind9/bin/dig/dig.docbook#1 branch .. //depot/projects/arm/src/contrib/bind9/bin/dig/dig.html#1 branch .. //depot/projects/arm/src/contrib/bind9/bin/dig/dighost.c#1 branch .. //depot/projects/arm/src/contrib/bind9/bin/dig/host.1#1 branch .. //depot/projects/arm/src/contrib/bind9/bin/dig/host.c#1 branch .. //depot/projects/arm/src/contrib/bind9/bin/dig/host.docbook#1 branch .. //depot/projects/arm/src/contrib/bind9/bin/dig/host.html#1 branch .. //depot/projects/arm/src/contrib/bind9/bin/dig/include/dig/dig.h#1 branch .. //depot/projects/arm/src/contrib/bind9/bin/dig/nslookup.1#1 branch .. //depot/projects/arm/src/contrib/bind9/bin/dig/nslookup.c#1 branch .. //depot/projects/arm/src/contrib/bind9/bin/dig/nslookup.docbook#1 branch .. //depot/projects/arm/src/contrib/bind9/bin/dig/nslookup.html#1 branch .. //depot/projects/arm/src/contrib/bind9/bin/dnssec/Makefile.in#1 branch .. //depot/projects/arm/src/contrib/bind9/bin/dnssec/dnssec-keygen.8#1 branch .. //depot/projects/arm/src/contrib/bind9/bin/dnssec/dnssec-keygen.c#1 branch .. //depot/projects/arm/src/contrib/bind9/bin/dnssec/dnssec-keygen.docbook#1 branch .. //depot/projects/arm/src/contrib/bind9/bin/dnssec/dnssec-keygen.html#1 branch .. //depot/projects/arm/src/contrib/bind9/bin/dnssec/dnssec-signzone.8#1 branch .. //depot/projects/arm/src/contrib/bind9/bin/dnssec/dnssec-signzone.c#1 branch .. //depot/projects/arm/src/contrib/bind9/bin/dnssec/dnssec-signzone.docbook#1 branch .. //depot/projects/arm/src/contrib/bind9/bin/dnssec/dnssec-signzone.html#1 branch .. //depot/projects/arm/src/contrib/bind9/bin/dnssec/dnssectool.c#1 branch .. //depot/projects/arm/src/contrib/bind9/bin/dnssec/dnssectool.h#1 branch .. //depot/projects/arm/src/contrib/bind9/bin/named/Makefile.in#1 branch .. //depot/projects/arm/src/contrib/bind9/bin/named/aclconf.c#1 branch .. //depot/projects/arm/src/contrib/bind9/bin/named/builtin.c#1 branch .. //depot/projects/arm/src/contrib/bind9/bin/named/client.c#1 branch .. //depot/projects/arm/src/contrib/bind9/bin/named/config.c#1 branch .. //depot/projects/arm/src/contrib/bind9/bin/named/control.c#1 branch .. //depot/projects/arm/src/contrib/bind9/bin/named/controlconf.c#1 branch .. //depot/projects/arm/src/contrib/bind9/bin/named/include/named/aclconf.h#1 branch .. //depot/projects/arm/src/contrib/bind9/bin/named/include/named/builtin.h#1 branch .. //depot/projects/arm/src/contrib/bind9/bin/named/include/named/client.h#1 branch .. //depot/projects/arm/src/contrib/bind9/bin/named/include/named/config.h#1 branch .. //depot/projects/arm/src/contrib/bind9/bin/named/include/named/control.h#1 branch .. //depot/projects/arm/src/contrib/bind9/bin/named/include/named/globals.h#1 branch .. //depot/projects/arm/src/contrib/bind9/bin/named/include/named/interfacemgr.h#1 branch .. //depot/projects/arm/src/contrib/bind9/bin/named/include/named/listenlist.h#1 branch .. //depot/projects/arm/src/contrib/bind9/bin/named/include/named/log.h#1 branch .. //depot/projects/arm/src/contrib/bind9/bin/named/include/named/logconf.h#1 branch .. //depot/projects/arm/src/contrib/bind9/bin/named/include/named/lwaddr.h#1 branch .. //depot/projects/arm/src/contrib/bind9/bin/named/include/named/lwdclient.h#1 branch .. //depot/projects/arm/src/contrib/bind9/bin/named/include/named/lwresd.h#1 branch .. //depot/projects/arm/src/contrib/bind9/bin/named/include/named/lwsearch.h#1 branch .. //depot/projects/arm/src/contrib/bind9/bin/named/include/named/main.h#1 branch .. //depot/projects/arm/src/contrib/bind9/bin/named/include/named/notify.h#1 branch .. //depot/projects/arm/src/contrib/bind9/bin/named/include/named/ns_smf_globals.h#1 branch .. //depot/projects/arm/src/contrib/bind9/bin/named/include/named/query.h#1 branch .. //depot/projects/arm/src/contrib/bind9/bin/named/include/named/server.h#1 branch .. //depot/projects/arm/src/contrib/bind9/bin/named/include/named/sortlist.h#1 branch .. //depot/projects/arm/src/contrib/bind9/bin/named/include/named/tkeyconf.h#1 branch .. //depot/projects/arm/src/contrib/bind9/bin/named/include/named/tsigconf.h#1 branch .. //depot/projects/arm/src/contrib/bind9/bin/named/include/named/types.h#1 branch .. //depot/projects/arm/src/contrib/bind9/bin/named/include/named/update.h#1 branch .. //depot/projects/arm/src/contrib/bind9/bin/named/include/named/xfrout.h#1 branch .. //depot/projects/arm/src/contrib/bind9/bin/named/include/named/zoneconf.h#1 branch .. //depot/projects/arm/src/contrib/bind9/bin/named/interfacemgr.c#1 branch .. //depot/projects/arm/src/contrib/bind9/bin/named/listenlist.c#1 branch .. //depot/projects/arm/src/contrib/bind9/bin/named/log.c#1 branch .. //depot/projects/arm/src/contrib/bind9/bin/named/logconf.c#1 branch .. //depot/projects/arm/src/contrib/bind9/bin/named/lwaddr.c#1 branch .. //depot/projects/arm/src/contrib/bind9/bin/named/lwdclient.c#1 branch .. //depot/projects/arm/src/contrib/bind9/bin/named/lwderror.c#1 branch .. //depot/projects/arm/src/contrib/bind9/bin/named/lwdgabn.c#1 branch .. //depot/projects/arm/src/contrib/bind9/bin/named/lwdgnba.c#1 branch .. //depot/projects/arm/src/contrib/bind9/bin/named/lwdgrbn.c#1 branch .. //depot/projects/arm/src/contrib/bind9/bin/named/lwdnoop.c#1 branch .. //depot/projects/arm/src/contrib/bind9/bin/named/lwresd.8#1 branch .. //depot/projects/arm/src/contrib/bind9/bin/named/lwresd.c#1 branch .. //depot/projects/arm/src/contrib/bind9/bin/named/lwresd.docbook#1 branch .. //depot/projects/arm/src/contrib/bind9/bin/named/lwresd.html#1 branch .. //depot/projects/arm/src/contrib/bind9/bin/named/lwsearch.c#1 branch .. //depot/projects/arm/src/contrib/bind9/bin/named/main.c#1 branch .. //depot/projects/arm/src/contrib/bind9/bin/named/named.8#1 branch .. //depot/projects/arm/src/contrib/bind9/bin/named/named.conf.5#1 branch .. //depot/projects/arm/src/contrib/bind9/bin/named/named.conf.docbook#1 branch .. //depot/projects/arm/src/contrib/bind9/bin/named/named.conf.html#1 branch .. //depot/projects/arm/src/contrib/bind9/bin/named/named.docbook#1 branch .. //depot/projects/arm/src/contrib/bind9/bin/named/named.html#1 branch .. //depot/projects/arm/src/contrib/bind9/bin/named/notify.c#1 branch .. //depot/projects/arm/src/contrib/bind9/bin/named/query.c#1 branch .. //depot/projects/arm/src/contrib/bind9/bin/named/server.c#1 branch .. //depot/projects/arm/src/contrib/bind9/bin/named/sortlist.c#1 branch .. //depot/projects/arm/src/contrib/bind9/bin/named/tkeyconf.c#1 branch .. //depot/projects/arm/src/contrib/bind9/bin/named/tsigconf.c#1 branch .. //depot/projects/arm/src/contrib/bind9/bin/named/unix/Makefile.in#1 branch .. //depot/projects/arm/src/contrib/bind9/bin/named/unix/include/named/os.h#1 branch .. //depot/projects/arm/src/contrib/bind9/bin/named/unix/os.c#1 branch .. //depot/projects/arm/src/contrib/bind9/bin/named/update.c#1 branch .. //depot/projects/arm/src/contrib/bind9/bin/named/xfrout.c#1 branch .. //depot/projects/arm/src/contrib/bind9/bin/named/zoneconf.c#1 branch .. //depot/projects/arm/src/contrib/bind9/bin/nsupdate/Makefile.in#1 branch .. //depot/projects/arm/src/contrib/bind9/bin/nsupdate/nsupdate.8#1 branch .. //depot/projects/arm/src/contrib/bind9/bin/nsupdate/nsupdate.c#1 branch .. //depot/projects/arm/src/contrib/bind9/bin/nsupdate/nsupdate.docbook#1 branch .. //depot/projects/arm/src/contrib/bind9/bin/nsupdate/nsupdate.html#1 branch .. //depot/projects/arm/src/contrib/bind9/bin/rndc/Makefile.in#1 branch .. //depot/projects/arm/src/contrib/bind9/bin/rndc/include/rndc/os.h#1 branch .. //depot/projects/arm/src/contrib/bind9/bin/rndc/rndc-confgen.8#1 branch .. //depot/projects/arm/src/contrib/bind9/bin/rndc/rndc-confgen.c#1 branch .. //depot/projects/arm/src/contrib/bind9/bin/rndc/rndc-confgen.docbook#1 branch .. //depot/projects/arm/src/contrib/bind9/bin/rndc/rndc-confgen.html#1 branch .. //depot/projects/arm/src/contrib/bind9/bin/rndc/rndc.8#1 branch .. //depot/projects/arm/src/contrib/bind9/bin/rndc/rndc.c#1 branch .. //depot/projects/arm/src/contrib/bind9/bin/rndc/rndc.conf#1 branch .. //depot/projects/arm/src/contrib/bind9/bin/rndc/rndc.conf.5#1 branch .. //depot/projects/arm/src/contrib/bind9/bin/rndc/rndc.conf.docbook#1 branch .. //depot/projects/arm/src/contrib/bind9/bin/rndc/rndc.conf.html#1 branch .. //depot/projects/arm/src/contrib/bind9/bin/rndc/rndc.docbook#1 branch .. //depot/projects/arm/src/contrib/bind9/bin/rndc/rndc.html#1 branch .. //depot/projects/arm/src/contrib/bind9/bin/rndc/unix/Makefile.in#1 branch .. //depot/projects/arm/src/contrib/bind9/bin/rndc/unix/os.c#1 branch .. //depot/projects/arm/src/contrib/bind9/bin/rndc/util.c#1 branch .. //depot/projects/arm/src/contrib/bind9/bin/rndc/util.h#1 branch .. //depot/projects/arm/src/contrib/bind9/config.guess#1 branch .. //depot/projects/arm/src/contrib/bind9/config.sub#1 branch .. //depot/projects/arm/src/contrib/bind9/config.threads.in#1 branch .. //depot/projects/arm/src/contrib/bind9/configure.in#1 branch .. //depot/projects/arm/src/contrib/bind9/doc/Makefile.in#1 branch .. //depot/projects/arm/src/contrib/bind9/doc/arm/Bv9ARM-book.xml#1 branch .. //depot/projects/arm/src/contrib/bind9/doc/arm/Bv9ARM.ch01.html#1 branch .. //depot/projects/arm/src/contrib/bind9/doc/arm/Bv9ARM.ch02.html#1 branch .. //depot/projects/arm/src/contrib/bind9/doc/arm/Bv9ARM.ch03.html#1 branch .. //depot/projects/arm/src/contrib/bind9/doc/arm/Bv9ARM.ch04.html#1 branch .. //depot/projects/arm/src/contrib/bind9/doc/arm/Bv9ARM.ch05.html#1 branch .. //depot/projects/arm/src/contrib/bind9/doc/arm/Bv9ARM.ch06.html#1 branch .. //depot/projects/arm/src/contrib/bind9/doc/arm/Bv9ARM.ch07.html#1 branch .. //depot/projects/arm/src/contrib/bind9/doc/arm/Bv9ARM.ch08.html#1 branch .. //depot/projects/arm/src/contrib/bind9/doc/arm/Bv9ARM.ch09.html#1 branch .. //depot/projects/arm/src/contrib/bind9/doc/arm/Bv9ARM.html#1 branch .. //depot/projects/arm/src/contrib/bind9/doc/arm/Bv9ARM.pdf#1 branch .. //depot/projects/arm/src/contrib/bind9/doc/arm/Makefile.in#1 branch .. //depot/projects/arm/src/contrib/bind9/doc/arm/README-SGML#1 branch .. //depot/projects/arm/src/contrib/bind9/doc/draft/draft-baba-dnsext-acl-reqts-01.txt#1 branch .. //depot/projects/arm/src/contrib/bind9/doc/draft/draft-daigle-napstr-04.txt#1 branch .. //depot/projects/arm/src/contrib/bind9/doc/draft/draft-danisch-dns-rr-smtp-03.txt#1 branch .. //depot/projects/arm/src/contrib/bind9/doc/draft/draft-dnsext-opcode-discover-02.txt#1 branch .. //depot/projects/arm/src/contrib/bind9/doc/draft/draft-durand-dnsop-dynreverse-00.txt#1 branch .. //depot/projects/arm/src/contrib/bind9/doc/draft/draft-ietf-dnsext-2929bis-01.txt#1 branch .. //depot/projects/arm/src/contrib/bind9/doc/draft/draft-ietf-dnsext-axfr-clarify-05.txt#1 branch .. //depot/projects/arm/src/contrib/bind9/doc/draft/draft-ietf-dnsext-dhcid-rr-09.txt#1 branch .. //depot/projects/arm/src/contrib/bind9/doc/draft/draft-ietf-dnsext-dns-name-p-s-00.txt#1 branch .. //depot/projects/arm/src/contrib/bind9/doc/draft/draft-ietf-dnsext-dnssec-2535typecode-change-06.txt#1 branch .. //depot/projects/arm/src/contrib/bind9/doc/draft/draft-ietf-dnsext-dnssec-bis-updates-01.txt#1 branch .. //depot/projects/arm/src/contrib/bind9/doc/draft/draft-ietf-dnsext-dnssec-experiments-01.txt#1 branch .. //depot/projects/arm/src/contrib/bind9/doc/draft/draft-ietf-dnsext-dnssec-online-signing-00.txt#1 branch .. //depot/projects/arm/src/contrib/bind9/doc/draft/draft-ietf-dnsext-dnssec-opt-in-07.txt#1 branch .. //depot/projects/arm/src/contrib/bind9/doc/draft/draft-ietf-dnsext-dnssec-trans-02.txt#1 branch .. //depot/projects/arm/src/contrib/bind9/doc/draft/draft-ietf-dnsext-ecc-key-07.txt#1 branch .. //depot/projects/arm/src/contrib/bind9/doc/draft/draft-ietf-dnsext-insensitive-06.txt#1 branch .. //depot/projects/arm/src/contrib/bind9/doc/draft/draft-ietf-dnsext-interop3597-02.txt#1 branch .. //depot/projects/arm/src/contrib/bind9/doc/draft/draft-ietf-dnsext-keyrr-key-signing-flag-12.txt#1 branch .. //depot/projects/arm/src/contrib/bind9/doc/draft/draft-ietf-dnsext-mdns-43.txt#1 branch .. //depot/projects/arm/src/contrib/bind9/doc/draft/draft-ietf-dnsext-nsec3-02.txt#1 branch .. //depot/projects/arm/src/contrib/bind9/doc/draft/draft-ietf-dnsext-rfc2536bis-dsa-06.txt#1 branch .. //depot/projects/arm/src/contrib/bind9/doc/draft/draft-ietf-dnsext-rfc2538bis-04.txt#1 branch .. //depot/projects/arm/src/contrib/bind9/doc/draft/draft-ietf-dnsext-rfc2539bis-dhk-06.txt#1 branch .. //depot/projects/arm/src/contrib/bind9/doc/draft/draft-ietf-dnsext-signed-nonexistence-requirements-01.txt#1 branch .. //depot/projects/arm/src/contrib/bind9/doc/draft/draft-ietf-dnsext-tkey-renewal-mode-05.txt#1 branch .. //depot/projects/arm/src/contrib/bind9/doc/draft/draft-ietf-dnsext-trustupdate-threshold-00.txt#1 branch .. //depot/projects/arm/src/contrib/bind9/doc/draft/draft-ietf-dnsext-trustupdate-timers-01.txt#1 branch .. //depot/projects/arm/src/contrib/bind9/doc/draft/draft-ietf-dnsext-tsig-sha-04.txt#1 branch .. //depot/projects/arm/src/contrib/bind9/doc/draft/draft-ietf-dnsext-wcard-clarify-08.txt#1 branch .. //depot/projects/arm/src/contrib/bind9/doc/draft/draft-ietf-dnsop-bad-dns-res-04.txt#1 branch .. //depot/projects/arm/src/contrib/bind9/doc/draft/draft-ietf-dnsop-dnssec-operational-practices-04.txt#1 branch .. //depot/projects/arm/src/contrib/bind9/doc/draft/draft-ietf-dnsop-inaddr-required-07.txt#1 branch .. //depot/projects/arm/src/contrib/bind9/doc/draft/draft-ietf-dnsop-ipv6-dns-configuration-06.txt#1 branch .. //depot/projects/arm/src/contrib/bind9/doc/draft/draft-ietf-dnsop-ipv6-dns-issues-11.txt#1 branch .. //depot/projects/arm/src/contrib/bind9/doc/draft/draft-ietf-dnsop-ipv6-transport-guidelines-01.txt#1 branch .. //depot/projects/arm/src/contrib/bind9/doc/draft/draft-ietf-dnsop-key-rollover-requirements-02.txt#1 branch .. //depot/projects/arm/src/contrib/bind9/doc/draft/draft-ietf-dnsop-respsize-02.txt#1 branch .. //depot/projects/arm/src/contrib/bind9/doc/draft/draft-ietf-dnsop-serverid-04.txt#1 branch .. //depot/projects/arm/src/contrib/bind9/doc/draft/draft-ietf-enum-e164-gstn-np-05.txt#1 branch .. //depot/projects/arm/src/contrib/bind9/doc/draft/draft-ietf-ipv6-node-requirements-08.txt#1 branch .. //depot/projects/arm/src/contrib/bind9/doc/draft/draft-ietf-secsh-dns-05.txt#1 branch .. //depot/projects/arm/src/contrib/bind9/doc/draft/draft-ihren-dnsext-threshold-validation-00.txt#1 branch .. //depot/projects/arm/src/contrib/bind9/doc/draft/draft-kato-dnsop-local-zones-00.txt#1 branch .. //depot/projects/arm/src/contrib/bind9/doc/draft/draft-park-ipv6-extensions-dns-pnp-00.txt#1 branch .. //depot/projects/arm/src/contrib/bind9/doc/draft/update#1 branch .. //depot/projects/arm/src/contrib/bind9/doc/misc/Makefile.in#1 branch .. //depot/projects/arm/src/contrib/bind9/doc/misc/dnssec#1 branch .. //depot/projects/arm/src/contrib/bind9/doc/misc/format-options.pl#1 branch .. //depot/projects/arm/src/contrib/bind9/doc/misc/ipv6#1 branch .. //depot/projects/arm/src/contrib/bind9/doc/misc/migration#1 branch .. //depot/projects/arm/src/contrib/bind9/doc/misc/migration-4to9#1 branch .. //depot/projects/arm/src/contrib/bind9/doc/misc/options#1 branch .. //depot/projects/arm/src/contrib/bind9/doc/misc/rfc-compliance#1 branch .. //depot/projects/arm/src/contrib/bind9/doc/misc/roadmap#1 branch .. //depot/projects/arm/src/contrib/bind9/doc/misc/sdb#1 branch .. //depot/projects/arm/src/contrib/bind9/doc/rfc/index#1 branch .. //depot/projects/arm/src/contrib/bind9/doc/rfc/rfc1032.txt#1 branch .. //depot/projects/arm/src/contrib/bind9/doc/rfc/rfc1033.txt#1 branch .. //depot/projects/arm/src/contrib/bind9/doc/rfc/rfc1034.txt#1 branch .. //depot/projects/arm/src/contrib/bind9/doc/rfc/rfc1035.txt#1 branch .. //depot/projects/arm/src/contrib/bind9/doc/rfc/rfc1101.txt#1 branch .. //depot/projects/arm/src/contrib/bind9/doc/rfc/rfc1122.txt#1 branch .. //depot/projects/arm/src/contrib/bind9/doc/rfc/rfc1123.txt#1 branch .. //depot/projects/arm/src/contrib/bind9/doc/rfc/rfc1183.txt#1 branch .. //depot/projects/arm/src/contrib/bind9/doc/rfc/rfc1348.txt#1 branch .. //depot/projects/arm/src/contrib/bind9/doc/rfc/rfc1535.txt#1 branch .. //depot/projects/arm/src/contrib/bind9/doc/rfc/rfc1536.txt#1 branch .. //depot/projects/arm/src/contrib/bind9/doc/rfc/rfc1537.txt#1 branch .. //depot/projects/arm/src/contrib/bind9/doc/rfc/rfc1591.txt#1 branch .. //depot/projects/arm/src/contrib/bind9/doc/rfc/rfc1611.txt#1 branch .. //depot/projects/arm/src/contrib/bind9/doc/rfc/rfc1612.txt#1 branch .. //depot/projects/arm/src/contrib/bind9/doc/rfc/rfc1706.txt#1 branch .. //depot/projects/arm/src/contrib/bind9/doc/rfc/rfc1712.txt#1 branch .. //depot/projects/arm/src/contrib/bind9/doc/rfc/rfc1750.txt#1 branch .. //depot/projects/arm/src/contrib/bind9/doc/rfc/rfc1876.txt#1 branch .. //depot/projects/arm/src/contrib/bind9/doc/rfc/rfc1886.txt#1 branch .. //depot/projects/arm/src/contrib/bind9/doc/rfc/rfc1982.txt#1 branch .. //depot/projects/arm/src/contrib/bind9/doc/rfc/rfc1995.txt#1 branch .. //depot/projects/arm/src/contrib/bind9/doc/rfc/rfc1996.txt#1 branch .. //depot/projects/arm/src/contrib/bind9/doc/rfc/rfc2052.txt#1 branch .. //depot/projects/arm/src/contrib/bind9/doc/rfc/rfc2104.txt#1 branch .. //depot/projects/arm/src/contrib/bind9/doc/rfc/rfc2119.txt#1 branch .. //depot/projects/arm/src/contrib/bind9/doc/rfc/rfc2133.txt#1 branch .. //depot/projects/arm/src/contrib/bind9/doc/rfc/rfc2136.txt#1 branch .. //depot/projects/arm/src/contrib/bind9/doc/rfc/rfc2137.txt#1 branch .. //depot/projects/arm/src/contrib/bind9/doc/rfc/rfc2163.txt#1 branch .. //depot/projects/arm/src/contrib/bind9/doc/rfc/rfc2168.txt#1 branch .. //depot/projects/arm/src/contrib/bind9/doc/rfc/rfc2181.txt#1 branch .. //depot/projects/arm/src/contrib/bind9/doc/rfc/rfc2230.txt#1 branch .. //depot/projects/arm/src/contrib/bind9/doc/rfc/rfc2308.txt#1 branch .. //depot/projects/arm/src/contrib/bind9/doc/rfc/rfc2317.txt#1 branch .. //depot/projects/arm/src/contrib/bind9/doc/rfc/rfc2373.txt#1 branch .. //depot/projects/arm/src/contrib/bind9/doc/rfc/rfc2374.txt#1 branch .. //depot/projects/arm/src/contrib/bind9/doc/rfc/rfc2375.txt#1 branch .. //depot/projects/arm/src/contrib/bind9/doc/rfc/rfc2418.txt#1 branch .. //depot/projects/arm/src/contrib/bind9/doc/rfc/rfc2535.txt#1 branch .. //depot/projects/arm/src/contrib/bind9/doc/rfc/rfc2536.txt#1 branch .. //depot/projects/arm/src/contrib/bind9/doc/rfc/rfc2537.txt#1 branch .. //depot/projects/arm/src/contrib/bind9/doc/rfc/rfc2538.txt#1 branch .. //depot/projects/arm/src/contrib/bind9/doc/rfc/rfc2539.txt#1 branch .. //depot/projects/arm/src/contrib/bind9/doc/rfc/rfc2540.txt#1 branch .. //depot/projects/arm/src/contrib/bind9/doc/rfc/rfc2541.txt#1 branch .. //depot/projects/arm/src/contrib/bind9/doc/rfc/rfc2553.txt#1 branch .. //depot/projects/arm/src/contrib/bind9/doc/rfc/rfc2671.txt#1 branch .. //depot/projects/arm/src/contrib/bind9/doc/rfc/rfc2672.txt#1 branch .. //depot/projects/arm/src/contrib/bind9/doc/rfc/rfc2673.txt#1 branch .. //depot/projects/arm/src/contrib/bind9/doc/rfc/rfc2782.txt#1 branch .. //depot/projects/arm/src/contrib/bind9/doc/rfc/rfc2825.txt#1 branch .. //depot/projects/arm/src/contrib/bind9/doc/rfc/rfc2826.txt#1 branch .. //depot/projects/arm/src/contrib/bind9/doc/rfc/rfc2845.txt#1 branch .. //depot/projects/arm/src/contrib/bind9/doc/rfc/rfc2874.txt#1 branch .. //depot/projects/arm/src/contrib/bind9/doc/rfc/rfc2915.txt#1 branch .. //depot/projects/arm/src/contrib/bind9/doc/rfc/rfc2929.txt#1 branch .. //depot/projects/arm/src/contrib/bind9/doc/rfc/rfc2930.txt#1 branch .. //depot/projects/arm/src/contrib/bind9/doc/rfc/rfc2931.txt#1 branch .. //depot/projects/arm/src/contrib/bind9/doc/rfc/rfc3007.txt#1 branch .. //depot/projects/arm/src/contrib/bind9/doc/rfc/rfc3008.txt#1 branch .. //depot/projects/arm/src/contrib/bind9/doc/rfc/rfc3071.txt#1 branch .. //depot/projects/arm/src/contrib/bind9/doc/rfc/rfc3090.txt#1 branch .. //depot/projects/arm/src/contrib/bind9/doc/rfc/rfc3110.txt#1 branch .. //depot/projects/arm/src/contrib/bind9/doc/rfc/rfc3123.txt#1 branch .. //depot/projects/arm/src/contrib/bind9/doc/rfc/rfc3152.txt#1 branch .. //depot/projects/arm/src/contrib/bind9/doc/rfc/rfc3197.txt#1 branch .. //depot/projects/arm/src/contrib/bind9/doc/rfc/rfc3225.txt#1 branch .. //depot/projects/arm/src/contrib/bind9/doc/rfc/rfc3226.txt#1 branch .. //depot/projects/arm/src/contrib/bind9/doc/rfc/rfc3258.txt#1 branch .. //depot/projects/arm/src/contrib/bind9/doc/rfc/rfc3363.txt#1 branch .. //depot/projects/arm/src/contrib/bind9/doc/rfc/rfc3364.txt#1 branch >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Tue Jul 25 09:16:56 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A10CB16A4DE; Tue, 25 Jul 2006 09:16:56 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id DB8EA16A4DA for ; Tue, 25 Jul 2006 09:16:55 +0000 (UTC) (envelope-from cdjones@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id A8A9643D4C for ; Tue, 25 Jul 2006 09:16:55 +0000 (GMT) (envelope-from cdjones@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k6P9GtW4019909 for ; Tue, 25 Jul 2006 09:16:55 GMT (envelope-from cdjones@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k6P9GtAY019902 for perforce@freebsd.org; Tue, 25 Jul 2006 09:16:55 GMT (envelope-from cdjones@FreeBSD.org) Date: Tue, 25 Jul 2006 09:16:55 GMT Message-Id: <200607250916.k6P9GtAY019902@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to cdjones@FreeBSD.org using -f From: Chris Jones To: Perforce Change Reviews Cc: Subject: PERFORCE change 102356 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 25 Jul 2006 09:16:56 -0000 http://perforce.freebsd.org/chv.cgi?CH=102356 Change 102356 by cdjones@cdjones-impulse on 2006/07/25 09:16:19 Add memory limit argument to jail(8). Affected files ... .. //depot/projects/soc2006/cdjones_jail/src/sys/kern/kern_jail.c#10 edit .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/jail.h#11 edit .. //depot/projects/soc2006/cdjones_jail/src/usr.sbin/jail/jail.c#5 edit Differences ... ==== //depot/projects/soc2006/cdjones_jail/src/sys/kern/kern_jail.c#10 (text+ko) ==== @@ -162,6 +162,7 @@ pr->pr_linux = NULL; pr->pr_priority = j.priority; pr->pr_securelevel = securelevel; + pr->pr_mem_limit = j.mem_limit; /* Determine next pr_id and add prison to allprison list. */ mtx_lock(&allprison_mtx); @@ -446,6 +447,7 @@ } /* Get memory usage (see vm/vm_map.h). */ + /* TODO maybe use vm_swrss? */ mem_used += (p->p_vmspace)->vm_tsize; /* text size (pages) */ mem_used += (p->p_vmspace)->vm_dsize; /* data size (pages) */ mem_used += (p->p_vmspace)->vm_ssize; /* stack size (pages) */ ==== //depot/projects/soc2006/cdjones_jail/src/sys/sys/jail.h#11 (text+ko) ==== @@ -19,6 +19,7 @@ char *hostname; u_int32_t ip_number; unsigned int priority; + unsigned int mem_limit; /* struct thread *scheduler; CJ TODO --- add reference to preferred scheduler, e.g. by name? */ }; @@ -30,6 +31,7 @@ char pr_host[MAXHOSTNAMELEN]; u_int32_t pr_ip; unsigned int priority; + unsigned int mem_limit; /* struct thread *scheduler; */ }; #define XPRISON_VERSION 1 @@ -38,6 +40,8 @@ #define JAIL_MINIMUM_PRIORITY 1 #define JAIL_MAXIMUM_PRIORITY 100 +#define JAIL_DEFAULT_MEM_LIMIT 256 * 1024 * 1024 + #define J_SCHED_TD_ACTIVE 0x01 #define J_SCHED_TD_DIE 0x02 #define J_SCHED_TD_DEAD 0x04 ==== //depot/projects/soc2006/cdjones_jail/src/usr.sbin/jail/jail.c#5 (text+ko) ==== @@ -56,6 +56,7 @@ struct in_addr in; gid_t groups[NGROUPS]; int ch, i, iflag, Jflag, lflag, ngroups, securelevel, uflag, Uflag; + unsigned int mem_limit, priority; char path[PATH_MAX], *ep, *username, *JidFile; static char *cleanenv; const char *shell, *p = NULL; @@ -63,12 +64,13 @@ FILE *fp; iflag = Jflag = lflag = uflag = Uflag = 0; + mem_limit = JAIL_DEFAULT_MEM_LIMIT; priority = JAIL_DEFAULT_PRIORITY; securelevel = -1; username = JidFile = cleanenv = NULL; fp = NULL; - while ((ch = getopt(argc, argv, "ilp:s:u:U:J:")) != -1) { + while ((ch = getopt(argc, argv, "ilp:m:s:u:U:J:")) != -1) { switch (ch) { case 'i': iflag = 1; @@ -77,6 +79,9 @@ JidFile = optarg; Jflag = 1; break; + case 'm': + mem_limit = atoi(optarg); + break; case 'p': priority = atoi(optarg); if (priority < JAIL_MINIMUM_PRIORITY || @@ -125,6 +130,7 @@ if (inet_aton(argv[2], &in) == 0) errx(1, "Could not make sense of ip-number: %s", argv[2]); j.ip_number = ntohl(in.s_addr); + j.mem_limit = mem_limit; j.priority = priority; if (Jflag) { fp = fopen(JidFile, "w"); @@ -190,8 +196,9 @@ usage(void) { - (void)fprintf(stderr, "%s%s%s\n", - "usage: jail [-i] [-J jid_file] [-p priority] [-s securelevel]", + (void)fprintf(stderr, "%s%s%s%s\n", + "usage: jail [-i] [-J jid_file] [-m mem_limit] ", + "[-p priority] [-s securelevel]", " [-l -u ", "username | -U username]", " path hostname ip-number command ..."); From owner-p4-projects@FreeBSD.ORG Tue Jul 25 09:17:57 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C19BF16A4DF; Tue, 25 Jul 2006 09:17:57 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 9ED9916A4DD for ; Tue, 25 Jul 2006 09:17:57 +0000 (UTC) (envelope-from cdjones@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 754B943D58 for ; Tue, 25 Jul 2006 09:17:57 +0000 (GMT) (envelope-from cdjones@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k6P9HvF0019944 for ; Tue, 25 Jul 2006 09:17:57 GMT (envelope-from cdjones@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k6P9HvqE019941 for perforce@freebsd.org; Tue, 25 Jul 2006 09:17:57 GMT (envelope-from cdjones@FreeBSD.org) Date: Tue, 25 Jul 2006 09:17:57 GMT Message-Id: <200607250917.k6P9HvqE019941@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to cdjones@FreeBSD.org using -f From: Chris Jones To: Perforce Change Reviews Cc: Subject: PERFORCE change 102357 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 25 Jul 2006 09:17:58 -0000 http://perforce.freebsd.org/chv.cgi?CH=102357 Change 102357 by cdjones@cdjones-impulse on 2006/07/25 09:16:55 Check memory usage when loading ELF binary under jails. Affected files ... .. //depot/projects/soc2006/cdjones_jail/src/sys/kern/imgact_elf.c#5 edit Differences ... ==== //depot/projects/soc2006/cdjones_jail/src/sys/kern/imgact_elf.c#5 (text+ko) ==== @@ -58,6 +58,7 @@ #include #include #include +#include #include #include @@ -761,7 +762,10 @@ PROC_LOCK(imgp->proc); if (data_size > lim_cur(imgp->proc, RLIMIT_DATA) || text_size > maxtsiz || - total_size > lim_cur(imgp->proc, RLIMIT_VMEM)) { + total_size > lim_cur(imgp->proc, RLIMIT_VMEM) || + (jailed(imgp->proc->p_ucred) && + total_size > (prison_memory_limit(imgp->proc->p_ucred) + - prison_memory(imgp->proc->p_ucred)))) { PROC_UNLOCK(imgp->proc); return (ENOMEM); } From owner-p4-projects@FreeBSD.ORG Tue Jul 25 10:38:38 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C882016A4E0; Tue, 25 Jul 2006 10:38:38 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 8999216A4DD for ; Tue, 25 Jul 2006 10:38:38 +0000 (UTC) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 38E1C43D53 for ; Tue, 25 Jul 2006 10:38:38 +0000 (GMT) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k6PAccRD025049 for ; Tue, 25 Jul 2006 10:38:38 GMT (envelope-from rdivacky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k6PAcb7n025046 for perforce@freebsd.org; Tue, 25 Jul 2006 10:38:37 GMT (envelope-from rdivacky@FreeBSD.org) Date: Tue, 25 Jul 2006 10:38:37 GMT Message-Id: <200607251038.k6PAcb7n025046@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rdivacky@FreeBSD.org using -f From: Roman Divacky To: Perforce Change Reviews Cc: Subject: PERFORCE change 102358 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 25 Jul 2006 10:38:39 -0000 http://perforce.freebsd.org/chv.cgi?CH=102358 Change 102358 by rdivacky@rdivacky_witten on 2006/07/25 10:37:37 Add prototypes for timer_* functions. Affected files ... .. //depot/projects/soc2006/rdivacky_linuxolator/i386/linux/syscalls.master#14 edit Differences ... ==== //depot/projects/soc2006/rdivacky_linuxolator/i386/linux/syscalls.master#14 (text+ko) ==== @@ -427,11 +427,13 @@ 256 AUE_NULL MSTD { int linux_epoll_wait(void); } 257 AUE_NULL MSTD { int linux_remap_file_pages(void); } 258 AUE_NULL MSTD { int linux_set_tid_address(int *tidptr); } -259 AUE_NULL MSTD { int linux_timer_create(void); } -260 AUE_NULL MSTD { int linux_timer_settime(void); } -261 AUE_NULL MSTD { int linux_timer_gettime(void); } -262 AUE_NULL MSTD { int linux_timer_getoverrun(void); } -263 AUE_NULL MSTD { int linux_timer_delete(void); } +259 AUE_NULL MSTD { int linux_timer_create(clockid_t clock_id, \ + struct sigevent *evp, timer_t *timerid); } +260 AUE_NULL MSTD { int linux_timer_settime(timer_t timerid, \ + const struct itimerspec *new, struct itimerspec *old); } +261 AUE_NULL MSTD { int linux_timer_gettime(timer_t timerid, struct itimerspec *setting); } +262 AUE_NULL MSTD { int linux_timer_getoverrun(timer_t timerid); } +263 AUE_NULL MSTD { int linux_timer_delete(timer_t timerid); } 264 AUE_CLOCK_SETTIME MSTD { int linux_clock_settime(clockid_t which, struct linux_timespec *tp); } 265 AUE_NULL MSTD { int linux_clock_gettime(clockid_t which, struct linux_timespec *tp); } 266 AUE_NULL MSTD { int linux_clock_getres(clockid_t which, struct linux_timespec *tp); } From owner-p4-projects@FreeBSD.ORG Tue Jul 25 10:38:40 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E279E16A56B; Tue, 25 Jul 2006 10:38:39 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id C033216A53D for ; Tue, 25 Jul 2006 10:38:38 +0000 (UTC) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id A964143D53 for ; Tue, 25 Jul 2006 10:38:38 +0000 (GMT) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k6PAccqW025055 for ; Tue, 25 Jul 2006 10:38:38 GMT (envelope-from rdivacky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k6PAccfG025052 for perforce@freebsd.org; Tue, 25 Jul 2006 10:38:38 GMT (envelope-from rdivacky@FreeBSD.org) Date: Tue, 25 Jul 2006 10:38:38 GMT Message-Id: <200607251038.k6PAccfG025052@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rdivacky@FreeBSD.org using -f From: Roman Divacky To: Perforce Change Reviews Cc: Subject: PERFORCE change 102359 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 25 Jul 2006 10:38:40 -0000 http://perforce.freebsd.org/chv.cgi?CH=102359 Change 102359 by rdivacky@rdivacky_witten on 2006/07/25 10:37:57 Regen after syscalls.master update. Affected files ... .. //depot/projects/soc2006/rdivacky_linuxolator/i386/linux/linux_proto.h#14 edit .. //depot/projects/soc2006/rdivacky_linuxolator/i386/linux/linux_syscall.h#14 edit .. //depot/projects/soc2006/rdivacky_linuxolator/i386/linux/linux_sysent.c#14 edit Differences ... ==== //depot/projects/soc2006/rdivacky_linuxolator/i386/linux/linux_proto.h#14 (text+ko) ==== @@ -2,7 +2,7 @@ * System call prototypes. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/i386/linux/linux_proto.h,v 1.77 2006/07/21 20:41:33 jhb Exp $ + * $FreeBSD$ * created from FreeBSD: src/sys/i386/linux/syscalls.master,v 1.74 2006/07/21 20:22:13 jhb Exp */ @@ -740,19 +740,24 @@ char tidptr_l_[PADL_(int *)]; int * tidptr; char tidptr_r_[PADR_(int *)]; }; struct linux_timer_create_args { - register_t dummy; + char clock_id_l_[PADL_(clockid_t)]; clockid_t clock_id; char clock_id_r_[PADR_(clockid_t)]; + char evp_l_[PADL_(struct sigevent *)]; struct sigevent * evp; char evp_r_[PADR_(struct sigevent *)]; + char timerid_l_[PADL_(timer_t *)]; timer_t * timerid; char timerid_r_[PADR_(timer_t *)]; }; struct linux_timer_settime_args { - register_t dummy; + char timerid_l_[PADL_(timer_t)]; timer_t timerid; char timerid_r_[PADR_(timer_t)]; + char new_l_[PADL_(const struct itimerspec *)]; const struct itimerspec * new; char new_r_[PADR_(const struct itimerspec *)]; + char old_l_[PADL_(struct itimerspec *)]; struct itimerspec * old; char old_r_[PADR_(struct itimerspec *)]; }; struct linux_timer_gettime_args { - register_t dummy; + char timerid_l_[PADL_(timer_t)]; timer_t timerid; char timerid_r_[PADR_(timer_t)]; + char setting_l_[PADL_(struct itimerspec *)]; struct itimerspec * setting; char setting_r_[PADR_(struct itimerspec *)]; }; struct linux_timer_getoverrun_args { - register_t dummy; + char timerid_l_[PADL_(timer_t)]; timer_t timerid; char timerid_r_[PADR_(timer_t)]; }; struct linux_timer_delete_args { - register_t dummy; + char timerid_l_[PADL_(timer_t)]; timer_t timerid; char timerid_r_[PADR_(timer_t)]; }; struct linux_clock_settime_args { char which_l_[PADL_(clockid_t)]; clockid_t which; char which_r_[PADR_(clockid_t)]; ==== //depot/projects/soc2006/rdivacky_linuxolator/i386/linux/linux_syscall.h#14 (text+ko) ==== @@ -2,7 +2,7 @@ * System call numbers. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/i386/linux/linux_syscall.h,v 1.71 2006/07/21 20:41:33 jhb Exp $ + * $FreeBSD$ * created from FreeBSD: src/sys/i386/linux/syscalls.master,v 1.74 2006/07/21 20:22:13 jhb Exp */ ==== //depot/projects/soc2006/rdivacky_linuxolator/i386/linux/linux_sysent.c#14 (text+ko) ==== @@ -2,7 +2,7 @@ * System call switch table. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/i386/linux/linux_sysent.c,v 1.78 2006/07/21 20:41:33 jhb Exp $ + * $FreeBSD$ * created from FreeBSD: src/sys/i386/linux/syscalls.master,v 1.74 2006/07/21 20:22:13 jhb Exp */ @@ -278,11 +278,11 @@ { SYF_MPSAFE | 0, (sy_call_t *)linux_epoll_wait, AUE_NULL }, /* 256 = linux_epoll_wait */ { SYF_MPSAFE | 0, (sy_call_t *)linux_remap_file_pages, AUE_NULL }, /* 257 = linux_remap_file_pages */ { SYF_MPSAFE | AS(linux_set_tid_address_args), (sy_call_t *)linux_set_tid_address, AUE_NULL }, /* 258 = linux_set_tid_address */ - { SYF_MPSAFE | 0, (sy_call_t *)linux_timer_create, AUE_NULL }, /* 259 = linux_timer_create */ - { SYF_MPSAFE | 0, (sy_call_t *)linux_timer_settime, AUE_NULL }, /* 260 = linux_timer_settime */ - { SYF_MPSAFE | 0, (sy_call_t *)linux_timer_gettime, AUE_NULL }, /* 261 = linux_timer_gettime */ - { SYF_MPSAFE | 0, (sy_call_t *)linux_timer_getoverrun, AUE_NULL }, /* 262 = linux_timer_getoverrun */ - { SYF_MPSAFE | 0, (sy_call_t *)linux_timer_delete, AUE_NULL }, /* 263 = linux_timer_delete */ + { SYF_MPSAFE | AS(linux_timer_create_args), (sy_call_t *)linux_timer_create, AUE_NULL }, /* 259 = linux_timer_create */ + { SYF_MPSAFE | AS(linux_timer_settime_args), (sy_call_t *)linux_timer_settime, AUE_NULL }, /* 260 = linux_timer_settime */ + { SYF_MPSAFE | AS(linux_timer_gettime_args), (sy_call_t *)linux_timer_gettime, AUE_NULL }, /* 261 = linux_timer_gettime */ + { SYF_MPSAFE | AS(linux_timer_getoverrun_args), (sy_call_t *)linux_timer_getoverrun, AUE_NULL }, /* 262 = linux_timer_getoverrun */ + { SYF_MPSAFE | AS(linux_timer_delete_args), (sy_call_t *)linux_timer_delete, AUE_NULL }, /* 263 = linux_timer_delete */ { SYF_MPSAFE | AS(linux_clock_settime_args), (sy_call_t *)linux_clock_settime, AUE_CLOCK_SETTIME }, /* 264 = linux_clock_settime */ { SYF_MPSAFE | AS(linux_clock_gettime_args), (sy_call_t *)linux_clock_gettime, AUE_NULL }, /* 265 = linux_clock_gettime */ { SYF_MPSAFE | AS(linux_clock_getres_args), (sy_call_t *)linux_clock_getres, AUE_NULL }, /* 266 = linux_clock_getres */ From owner-p4-projects@FreeBSD.ORG Tue Jul 25 10:55:01 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0CC5616A4E0; Tue, 25 Jul 2006 10:55:01 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id C3BF416A52D for ; Tue, 25 Jul 2006 10:55:00 +0000 (UTC) (envelope-from piso@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 790D143D45 for ; Tue, 25 Jul 2006 10:54:59 +0000 (GMT) (envelope-from piso@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k6PAsxVO029118 for ; Tue, 25 Jul 2006 10:54:59 GMT (envelope-from piso@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k6PAsxh9029112 for perforce@freebsd.org; Tue, 25 Jul 2006 10:54:59 GMT (envelope-from piso@freebsd.org) Date: Tue, 25 Jul 2006 10:54:59 GMT Message-Id: <200607251054.k6PAsxh9029112@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to piso@freebsd.org using -f From: Paolo Pisati To: Perforce Change Reviews Cc: Subject: PERFORCE change 102360 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 25 Jul 2006 10:55:01 -0000 http://perforce.freebsd.org/chv.cgi?CH=102360 Change 102360 by piso@piso_newluxor on 2006/07/25 10:54:48 Axe a (now) useless check. Affected files ... .. //depot/projects/soc2006/intr_filter/kern/kern_intr.c#12 edit Differences ... ==== //depot/projects/soc2006/intr_filter/kern/kern_intr.c#12 (text+ko) ==== @@ -551,12 +551,6 @@ struct intr_event *ie; int error; -#if 0 - // XXX a software intr handler with INTR_FAST?!?!?!? - if (flags & (INTR_FAST | INTR_ENTROPY)) - return (EINVAL); -#endif - if (flags & INTR_ENTROPY) return (EINVAL); From owner-p4-projects@FreeBSD.ORG Tue Jul 25 11:01:08 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D922E16A4E6; Tue, 25 Jul 2006 11:01:07 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 9B51B16A4E2 for ; Tue, 25 Jul 2006 11:01:07 +0000 (UTC) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 6A1BC43D49 for ; Tue, 25 Jul 2006 11:01:07 +0000 (GMT) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k6PB17YF037631 for ; Tue, 25 Jul 2006 11:01:07 GMT (envelope-from rdivacky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k6PB17uP037628 for perforce@freebsd.org; Tue, 25 Jul 2006 11:01:07 GMT (envelope-from rdivacky@FreeBSD.org) Date: Tue, 25 Jul 2006 11:01:07 GMT Message-Id: <200607251101.k6PB17uP037628@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rdivacky@FreeBSD.org using -f From: Roman Divacky To: Perforce Change Reviews Cc: Subject: PERFORCE change 102361 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 25 Jul 2006 11:01:08 -0000 http://perforce.freebsd.org/chv.cgi?CH=102361 Change 102361 by rdivacky@rdivacky_witten on 2006/07/25 11:00:52 Change all the timer_* functions to use l_timer_t instead of timer_t. Affected files ... .. //depot/projects/soc2006/rdivacky_linuxolator/i386/linux/syscalls.master#15 edit Differences ... ==== //depot/projects/soc2006/rdivacky_linuxolator/i386/linux/syscalls.master#15 (text+ko) ==== @@ -428,12 +428,12 @@ 257 AUE_NULL MSTD { int linux_remap_file_pages(void); } 258 AUE_NULL MSTD { int linux_set_tid_address(int *tidptr); } 259 AUE_NULL MSTD { int linux_timer_create(clockid_t clock_id, \ - struct sigevent *evp, timer_t *timerid); } -260 AUE_NULL MSTD { int linux_timer_settime(timer_t timerid, \ + struct sigevent *evp, l_timer_t *timerid); } +260 AUE_NULL MSTD { int linux_timer_settime(l_timer_t timerid, \ const struct itimerspec *new, struct itimerspec *old); } -261 AUE_NULL MSTD { int linux_timer_gettime(timer_t timerid, struct itimerspec *setting); } -262 AUE_NULL MSTD { int linux_timer_getoverrun(timer_t timerid); } -263 AUE_NULL MSTD { int linux_timer_delete(timer_t timerid); } +261 AUE_NULL MSTD { int linux_timer_gettime(l_timer_t timerid, struct itimerspec *setting); } +262 AUE_NULL MSTD { int linux_timer_getoverrun(l_timer_t timerid); } +263 AUE_NULL MSTD { int linux_timer_delete(l_timer_t timerid); } 264 AUE_CLOCK_SETTIME MSTD { int linux_clock_settime(clockid_t which, struct linux_timespec *tp); } 265 AUE_NULL MSTD { int linux_clock_gettime(clockid_t which, struct linux_timespec *tp); } 266 AUE_NULL MSTD { int linux_clock_getres(clockid_t which, struct linux_timespec *tp); } From owner-p4-projects@FreeBSD.ORG Tue Jul 25 11:02:09 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id CC77E16A4E2; Tue, 25 Jul 2006 11:02:09 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 6F6D616A4E0 for ; Tue, 25 Jul 2006 11:02:09 +0000 (UTC) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 231D943D46 for ; Tue, 25 Jul 2006 11:02:09 +0000 (GMT) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k6PB287g037664 for ; Tue, 25 Jul 2006 11:02:08 GMT (envelope-from rdivacky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k6PB28dE037661 for perforce@freebsd.org; Tue, 25 Jul 2006 11:02:08 GMT (envelope-from rdivacky@FreeBSD.org) Date: Tue, 25 Jul 2006 11:02:08 GMT Message-Id: <200607251102.k6PB28dE037661@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rdivacky@FreeBSD.org using -f From: Roman Divacky To: Perforce Change Reviews Cc: Subject: PERFORCE change 102362 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 25 Jul 2006 11:02:10 -0000 http://perforce.freebsd.org/chv.cgi?CH=102362 Change 102362 by rdivacky@rdivacky_witten on 2006/07/25 11:01:15 Regen after syscalls.master update. Affected files ... .. //depot/projects/soc2006/rdivacky_linuxolator/i386/linux/linux_proto.h#15 edit .. //depot/projects/soc2006/rdivacky_linuxolator/i386/linux/linux_syscall.h#15 edit .. //depot/projects/soc2006/rdivacky_linuxolator/i386/linux/linux_sysent.c#15 edit Differences ... ==== //depot/projects/soc2006/rdivacky_linuxolator/i386/linux/linux_proto.h#15 (text+ko) ==== @@ -742,22 +742,22 @@ struct linux_timer_create_args { char clock_id_l_[PADL_(clockid_t)]; clockid_t clock_id; char clock_id_r_[PADR_(clockid_t)]; char evp_l_[PADL_(struct sigevent *)]; struct sigevent * evp; char evp_r_[PADR_(struct sigevent *)]; - char timerid_l_[PADL_(timer_t *)]; timer_t * timerid; char timerid_r_[PADR_(timer_t *)]; + char timerid_l_[PADL_(l_timer_t *)]; l_timer_t * timerid; char timerid_r_[PADR_(l_timer_t *)]; }; struct linux_timer_settime_args { - char timerid_l_[PADL_(timer_t)]; timer_t timerid; char timerid_r_[PADR_(timer_t)]; + char timerid_l_[PADL_(l_timer_t)]; l_timer_t timerid; char timerid_r_[PADR_(l_timer_t)]; char new_l_[PADL_(const struct itimerspec *)]; const struct itimerspec * new; char new_r_[PADR_(const struct itimerspec *)]; char old_l_[PADL_(struct itimerspec *)]; struct itimerspec * old; char old_r_[PADR_(struct itimerspec *)]; }; struct linux_timer_gettime_args { - char timerid_l_[PADL_(timer_t)]; timer_t timerid; char timerid_r_[PADR_(timer_t)]; + char timerid_l_[PADL_(l_timer_t)]; l_timer_t timerid; char timerid_r_[PADR_(l_timer_t)]; char setting_l_[PADL_(struct itimerspec *)]; struct itimerspec * setting; char setting_r_[PADR_(struct itimerspec *)]; }; struct linux_timer_getoverrun_args { - char timerid_l_[PADL_(timer_t)]; timer_t timerid; char timerid_r_[PADR_(timer_t)]; + char timerid_l_[PADL_(l_timer_t)]; l_timer_t timerid; char timerid_r_[PADR_(l_timer_t)]; }; struct linux_timer_delete_args { - char timerid_l_[PADL_(timer_t)]; timer_t timerid; char timerid_r_[PADR_(timer_t)]; + char timerid_l_[PADL_(l_timer_t)]; l_timer_t timerid; char timerid_r_[PADR_(l_timer_t)]; }; struct linux_clock_settime_args { char which_l_[PADL_(clockid_t)]; clockid_t which; char which_r_[PADR_(clockid_t)]; ==== //depot/projects/soc2006/rdivacky_linuxolator/i386/linux/linux_syscall.h#15 (text+ko) ==== ==== //depot/projects/soc2006/rdivacky_linuxolator/i386/linux/linux_sysent.c#15 (text+ko) ==== From owner-p4-projects@FreeBSD.ORG Tue Jul 25 11:03:11 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4CBF116A4E8; Tue, 25 Jul 2006 11:03:11 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 29DC216A4DF for ; Tue, 25 Jul 2006 11:03:11 +0000 (UTC) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id D4C3F43D45 for ; Tue, 25 Jul 2006 11:03:10 +0000 (GMT) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k6PB3ACU038988 for ; Tue, 25 Jul 2006 11:03:10 GMT (envelope-from rdivacky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k6PB3Atf038985 for perforce@freebsd.org; Tue, 25 Jul 2006 11:03:10 GMT (envelope-from rdivacky@FreeBSD.org) Date: Tue, 25 Jul 2006 11:03:10 GMT Message-Id: <200607251103.k6PB3Atf038985@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rdivacky@FreeBSD.org using -f From: Roman Divacky To: Perforce Change Reviews Cc: Subject: PERFORCE change 102363 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 25 Jul 2006 11:03:11 -0000 http://perforce.freebsd.org/chv.cgi?CH=102363 Change 102363 by rdivacky@rdivacky_witten on 2006/07/25 11:02:43 Introduce timer_* functions. These are implemented just as wrappers around ktimer_*. Affected files ... .. //depot/projects/soc2006/rdivacky_linuxolator/compat/linux/linux_time.c#2 edit .. //depot/projects/soc2006/rdivacky_linuxolator/i386/linux/linux.h#11 edit .. //depot/projects/soc2006/rdivacky_linuxolator/i386/linux/linux_dummy.c#7 edit Differences ... ==== //depot/projects/soc2006/rdivacky_linuxolator/compat/linux/linux_time.c#2 (text+ko) ==== @@ -201,3 +201,34 @@ return 0; } + +/* copied from kern/kern_time.c */ +int +linux_timer_create(struct thread *td, struct linux_timer_create_args *args) +{ + return ktimer_create(td, (struct ktimer_create_args *) args); +} + +int +linux_timer_settime(struct thread *td, struct linux_timer_settime_args *args) +{ + return ktimer_settime(td, (struct ktimer_settime_args *) args); +} + +int +linux_timer_gettime(struct thread *td, struct linux_timer_gettime_args *args) +{ + return ktimer_gettime(td, (struct ktimer_gettime_args *) args); +} + +int +linux_timer_getoverrun(struct thread *td, struct linux_timer_getoverrun_args *args) +{ + return ktimer_getoverrun(td, (struct ktimer_getoverrun_args *) args); +} + +int +linux_timer_delete(struct thread *td, struct linux_timer_delete_args *args) +{ + return ktimer_delete(td, (struct ktimer_delete_args *) args); +} ==== //depot/projects/soc2006/rdivacky_linuxolator/i386/linux/linux.h#11 (text+ko) ==== @@ -814,4 +814,5 @@ #define LINUX_CLOCK_REALTIME_HR 4 #define LINUX_CLOCK_MONOTONIC_HR 5 +typedef int l_timer_t; #endif /* !_I386_LINUX_LINUX_H_ */ ==== //depot/projects/soc2006/rdivacky_linuxolator/i386/linux/linux_dummy.c#7 (text+ko) ==== @@ -73,11 +73,6 @@ DUMMY(epoll_ctl); DUMMY(epoll_wait); DUMMY(remap_file_pages); -DUMMY(timer_create); -DUMMY(timer_settime); -DUMMY(timer_gettime); -DUMMY(timer_getoverrun); -DUMMY(timer_delete); DUMMY(statfs64); DUMMY(fstatfs64); DUMMY(tgkill); From owner-p4-projects@FreeBSD.ORG Tue Jul 25 11:07:17 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 013E416A4E1; Tue, 25 Jul 2006 11:07:17 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id CC27D16A4DA for ; Tue, 25 Jul 2006 11:07:16 +0000 (UTC) (envelope-from gabor@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 85C7243D49 for ; Tue, 25 Jul 2006 11:07:16 +0000 (GMT) (envelope-from gabor@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k6PB7GE8039288 for ; Tue, 25 Jul 2006 11:07:16 GMT (envelope-from gabor@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k6PB7GED039285 for perforce@freebsd.org; Tue, 25 Jul 2006 11:07:16 GMT (envelope-from gabor@FreeBSD.org) Date: Tue, 25 Jul 2006 11:07:16 GMT Message-Id: <200607251107.k6PB7GED039285@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to gabor@FreeBSD.org using -f From: Gabor Kovesdan To: Perforce Change Reviews Cc: Subject: PERFORCE change 102364 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 25 Jul 2006 11:07:17 -0000 http://perforce.freebsd.org/chv.cgi?CH=102364 Change 102364 by gabor@gabor_spitfire on 2006/07/25 11:06:24 Move another pieces of code. Affected files ... .. //depot/projects/soc2006/gabor_ports/Mk/bsd.port.mk#59 edit .. //depot/projects/soc2006/gabor_ports/Tools/scripts/do-fetch.sh#4 edit Differences ... ==== //depot/projects/soc2006/gabor_ports/Mk/bsd.port.mk#59 (text+ko) ==== @@ -2374,164 +2374,7 @@ # Popular master sites .include "bsd.sites.mk" -# Empty declaration to avoid "variable MASTER_SITES recursive" error -MASTER_SITES?= -_MASTER_SITES_DEFAULT?= - -# Feed internal _{MASTER,PATCH}_SITES_n where n is a group designation -# as per grouping rules (:something) -# Organize _{MASTER,PATCH}_SITES_{DEFAULT,[^/:]+} according to grouping -# rules (:something) -.for _S in ${MASTER_SITES} -_S_TEMP= ${_S:S/^${_S:C@/:[^/:]+$@/@}//:S/^://} -. if !empty(_S_TEMP) -. for _group in ${_S_TEMP:S/,/ /g} -_G_TEMP= ${_group} -. if ${_G_TEMP} == all || ${_G_TEMP} == ALL || ${_G_TEMP} == default -check-makevars:: - @${ECHO_MSG} "Makefile error: the words all, ALL and default are reserved and cannot be" - @${ECHO_MSG} "used in group definitions. Please fix your MASTER_SITES" - @${FALSE} -. endif -_MASTER_SITES_${_group}+= ${_S:C@^(.*/):[^/:]+$@\1@} -. endfor -. else -_MASTER_SITES_DEFAULT+= ${_S:C@^(.*/):[^/:]+$@\1@} -. endif -.endfor - -# Feed internal _{MASTER,PATCH}_SITE_SUBDIR_n where n is a group designation -# as per grouping rules (:something) -# Organize _{MASTER,PATCH}_SITE_SUBDIR_{DEFAULT,[^/:]+} according to grouping -# rules (:something) -.for _S in ${MASTER_SITE_SUBDIR} -_S_TEMP= ${_S:S/^${_S:C@/:[^/:]+$@/@}//:S/^://} -. if !empty(_S_TEMP) -. for _group in ${_S_TEMP:S/,/ /g} -_G_TEMP= ${_group} -. if ${_G_TEMP} == all || ${_G_TEMP} == ALL || ${_G_TEMP} == default -check-makevars:: - @${ECHO_MSG} "Makefile error: the words all, ALL and default are reserved and cannot be" - @${ECHO_MSG} "used in group definitions. Please fix your MASTER_SITE_SUBDIR" - @${FALSE} -. endif -. if defined(_MASTER_SITES_${_group}) -_MASTER_SITE_SUBDIR_${_group}+= ${_S:C@^(.*)/:[^/:]+$@\1@} -. endif -. endfor -. else -. if defined(_MASTER_SITES_DEFAULT) -_MASTER_SITE_SUBDIR_DEFAULT+= ${_S:C@^(.*)/:[^/:]+$@\1@} -. endif -. endif -.endfor - -# Substitute subdirectory names -# XXX simpler/faster solution but not the best space wise, suggestions please -.for _S in ${MASTER_SITES} -_S_TEMP= ${_S:S/^${_S:C@/:[^/:]+$@/@}//:S/^://} -. if !empty(_S_TEMP) -. for _group in ${_S_TEMP:S/,/ /g} -. if !defined(_MASTER_SITE_SUBDIR_${_group}) -MASTER_SITES_TMP= ${_MASTER_SITES_${_group}:S^%SUBDIR%/^^} -. else -_S_TEMP_TEMP= ${_MASTER_SITES_${_group}:M*%SUBDIR%/*} -. if empty(_S_TEMP_TEMP) -MASTER_SITES_TMP= ${_MASTER_SITES_${_group}} -. else -MASTER_SITES_TMP= -. for site in ${_MASTER_SITES_${_group}} -_S_TEMP_TEMP= ${site:M*%SUBDIR%/*} -. if empty(_S_TEMP_TEMP) -MASTER_SITES_TMP+= ${site} -. else -. for dir in ${_MASTER_SITE_SUBDIR_${_group}} -MASTER_SITES_TMP+= ${site:S^%SUBDIR%^\${dir}^} -. endfor -. endif -. endfor -. endif -. endif -_MASTER_SITES_${_group}:= ${MASTER_SITES_TMP} -. endfor -. endif -.endfor -.if defined(_MASTER_SITE_SUBDIR_DEFAULT) -_S_TEMP= ${_MASTER_SITES_DEFAULT:M*%SUBDIR%/*} -. if empty(_S_TEMP) -MASTER_SITES_TMP= ${_MASTER_SITES_DEFAULT} -. else -MASTER_SITES_TMP= -. for site in ${_MASTER_SITES_DEFAULT} -_S_TEMP_TEMP= ${site:M*%SUBDIR%/*} -. if empty(_S_TEMP_TEMP) -MASTER_SITES_TMP+= ${site} -. else -. for dir in ${_MASTER_SITE_SUBDIR_DEFAULT} -MASTER_SITES_TMP+= ${site:S^%SUBDIR%^\${dir}^} -. endfor -. endif -. endfor -. endif -.else -MASTER_SITES_TMP= ${_MASTER_SITES_DEFAULT:S^%SUBDIR%/^^} -.endif -_MASTER_SITES_DEFAULT:= ${MASTER_SITES_TMP} -MASTER_SITES_TMP= - -# The primary backup site. -MASTER_SITE_BACKUP?= \ - ftp://ftp.FreeBSD.org/pub/FreeBSD/ports/distfiles/${DIST_SUBDIR}/ -MASTER_SITE_BACKUP:= ${MASTER_SITE_BACKUP:S^\${DIST_SUBDIR}/^^} - -# If the user has MASTER_SITE_FREEBSD set, go to the FreeBSD repository -# for everything, but don't search it twice by appending it to the end. -.if defined(MASTER_SITE_FREEBSD) -_MASTER_SITE_OVERRIDE:= ${MASTER_SITE_BACKUP} -_MASTER_SITE_BACKUP:= # empty -.else -_MASTER_SITE_OVERRIDE= ${MASTER_SITE_OVERRIDE} -_MASTER_SITE_BACKUP= ${MASTER_SITE_BACKUP} -.endif - -# Search CDROM first if mounted, symlink instead of copy if -# FETCH_SYMLINK_DISTFILES is set -.for MOUNTPT in ${CD_MOUNTPTS} -.if exists(${MOUNTPT}/ports/distfiles) -_MASTER_SITE_OVERRIDE:= file:${MOUNTPT}/ports/distfiles/${DIST_SUBDIR}/ ${_MASTER_SITE_OVERRIDE} -.if defined(FETCH_SYMLINK_DISTFILES) -FETCH_BEFORE_ARGS+= -l -.endif -.endif -.endfor - -NOFETCHFILES?= - -# Organize DISTFILES, PATCHFILES, _MASTER_SITES_ALL, _PATCH_SITES_ALL -# according to grouping rules (:something) -DISTFILES?= ${DISTNAME}${EXTRACT_SUFX} -_MASTER_SITES_ALL= ${_MASTER_SITES_DEFAULT} -_G_TEMP= DEFAULT -.for _D in ${DISTFILES} -_D_TEMP= ${_D:S/^${_D:C/:[^:]+$//}//} -. if !empty(_D_TEMP) -. for _group in ${_D_TEMP:S/^://:S/,/ /g} -. if !defined(_MASTER_SITES_${_group}) -_G_TEMP_TEMP= ${_G_TEMP:M/${_group}/} -. if empty(_G_TEMP_TEMP) -_G_TEMP+= ${_group} -_MASTER_SITES_ALL+= ${_MASTER_SITES_${_group}} -. endif -. endif -. endfor -_DISTFILES+= ${_D:C/:[^:]+$//} -. else -_DISTFILES+= ${_D} -. endif -.endfor -_G_TEMP= -_G_TEMP_TEMP= -ALLFILES?= ${_DISTFILES} ${_PATCHFILES} +ALLFILES?= ${_DISTFILES} ${_PATCHFILES} # # Sort the master site list according to the patterns in MASTER_SORT ==== //depot/projects/soc2006/gabor_ports/Tools/scripts/do-fetch.sh#4 (text+ko) ==== @@ -1,5 +1,152 @@ ${MKDIR} ${_DISTDIR} cd ${_DISTDIR} + +for _S in ${MASTER_SITES}; do + _S_TEMP= ${_S:S/^${_S:C@/:[^/:]+$@/@}//:S/^://} + if [ -n "$(_S_TEMP)" ] ; then + for _group in ${_S_TEMP:S/,/ /g}; do + _G_TEMP= ${_group} + if ${_G_TEMP} == all || ${_G_TEMP} == ALL || ${_G_TEMP} == default + ${ECHO_MSG} "Makefile error: the words all, ALL and default are reserved and cannot be" + ${ECHO_MSG} "used in group definitions. Please fix your MASTER_SITES." + exit 1 + fi + _MASTER_SITES_${_group}+= ${_S:C@^(.*/):[^/:]+$@\1@} + done + else + _MASTER_SITES_DEFAULT+= ${_S:C@^(.*/):[^/:]+$@\1@} + fi +done +for _S in ${MASTER_SITE_SUBDIR}; do + _S_TEMP= ${_S:S/^${_S:C@/:[^/:]+$@/@}//:S/^://} + if [ -n "$(_S_TEMP)" ] ; then + for _group in ${_S_TEMP:S/,/ /g}; do + _G_TEMP= ${_group} + if ${_G_TEMP} == all || ${_G_TEMP} == ALL || ${_G_TEMP} == default; then + ${ECHO_MSG} "Makefile error: the words all, ALL and default are reserved and cannot be" + ${ECHO_MSG} "used in group definitions. Please fix your MASTER_SITES." + exit 1 + fi + if [ -n "$(_MASTER_SITES_${_group})" ] ; then + _MASTER_SITE_SUBDIR_${_group}+= ${_S:C@^(.*)/:[^/:]+$@\1@} + fi + done + else + if [ -n "$(_MASTER_SITES_DEFAULT)" ] ; then + _MASTER_SITE_SUBDIR_DEFAULT+= ${_S:C@^(.*)/:[^/:]+$@\1@} + fi + fi +done +for _S in ${MASTER_SITES}; do + _S_TEMP= ${_S:S/^${_S:C@/:[^/:]+$@/@}//:S/^://} + if [ -n "$(_S_TEMP)" ] ; then + for _group in ${_S_TEMP:S/,/ /g}; do + if [ -z "$$(_MASTER_SITE_SUBDIR_${_group})" ] ; then + MASTER_SITES_TMP= ${_MASTER_SITES_${_group}:S^%SUBDIR%/^^} + else + _S_TEMP_TEMP= ${_MASTER_SITES_${_group}:M*%SUBDIR%/*} + if [ -z "$(_S_TEMP_TEMP)" ] ; then + MASTER_SITES_TMP= $${_MASTER_SITES_${_group}} + else + MASTER_SITES_TMP= + for site in $${_MASTER_SITES_${_group}}; do + _S_TEMP_TEMP= ${site:M*%SUBDIR%/*} + if [ -z "$(_S_TEMP_TEMP)" ] ; then + MASTER_SITES_TMP+= ${site} + else + for dir in $${_MASTER_SITE_SUBDIR_${_group}}; do + MASTER_SITES_TMP+= ${site:S^%SUBDIR%^\${dir}^} + done + fi + done + fi + fi + _MASTER_SITES_${_group}:= ${MASTER_SITES_TMP} + done + fi +done +if [ -n "$(_MASTER_SITE_SUBDIR_DEFAULT)" ] ; then + _S_TEMP= ${_MASTER_SITES_DEFAULT:M*%SUBDIR%/*} + if [ -z "$(_S_TEMP)" ] ; then + MASTER_SITES_TMP= ${_MASTER_SITES_DEFAULT} + else + MASTER_SITES_TMP= + for site in ${_MASTER_SITES_DEFAULT}; do + _S_TEMP_TEMP= ${site:M*%SUBDIR%/*} + if [ -z "$(_S_TEMP_TEMP)" ] ; then + MASTER_SITES_TMP+= ${site} + else + for dir in ${_MASTER_SITE_SUBDIR_DEFAULT}; do + MASTER_SITES_TMP+= ${site:S^%SUBDIR%^\${dir}^} + done + fi + done + fi +else + MASTER_SITES_TMP= ${_MASTER_SITES_DEFAULT:S^%SUBDIR%/^^} +fi +_MASTER_SITES_DEFAULT:= ${MASTER_SITES_TMP} +MASTER_SITES_TMP= + +# The primary backup site. +if [ -z "${MASTER_SITE_BACKUP}" ] ; then + MASTER_SITE_BACKUP= ftp://ftp.FreeBSD.org/pub/FreeBSD/ports/distfiles/${DIST_SUBDIR}/ +fi +MASTER_SITE_BACKUP:= ${MASTER_SITE_BACKUP:S^\${DIST_SUBDIR}/^^} + +# If the user has MASTER_SITE_FREEBSD set, go to the FreeBSD repository +# for everything, but don't search it twice by appending it to the end. +if [ -n "$(MASTER_SITE_FREEBSD)" ] ; then + _MASTER_SITE_OVERRIDE= ${MASTER_SITE_BACKUP} + _MASTER_SITE_BACKUP= +else +_MASTER_SITE_OVERRIDE= ${MASTER_SITE_OVERRIDE} +_MASTER_SITE_BACKUP= ${MASTER_SITE_BACKUP} +fi + +# Search CDROM first if mounted, symlink instead of copy if +# FETCH_SYMLINK_DISTFILES is set +for MOUNTPT in ${CD_MOUNTPTS}; do + if [ -d ${MOUNTPT}/ports/distfiles ] ; then + _MASTER_SITE_OVERRIDE:= file:${MOUNTPT}/ports/distfiles/${DIST_SUBDIR}/ ${_MASTER_SITE_OVERRIDE} + if [ -n "${FETCH_SYMLINK_DISTFILES}" ]; then + FETCH_BEFORE_ARGS+= -l + fi + fi +done + +if [ -z "${NOFETCHFILES}" ] ; then + NOFETCHFILES= +fi + +# Organize DISTFILES, PATCHFILES, _MASTER_SITES_ALL, _PATCH_SITES_ALL +# according to grouping rules (:something) +if [ -z "${DISTFILES}" ] ; then + DISTFILES= ${DISTNAME}${EXTRACT_SUFX} +fi +_MASTER_SITES_ALL= ${_MASTER_SITES_DEFAULT} +_G_TEMP= DEFAULT +for _D in ${DISTFILES}; do + _D_TEMP= ${_D:S/^${_D:C/:[^:]+$//}//} + if [ -n "$(_D_TEMP)" ] ; then + for _group in ${_D_TEMP:S/^://:S/,/ /g}; do + if [ -z "$$(_MASTER_SITES_${_group})" ] ; then + _G_TEMP_TEMP= ${_G_TEMP:M/${_group}/} + if [ -z "$(_G_TEMP_TEMP)" ; then + _G_TEMP+= ${_group} + _MASTER_SITES_ALL+= ${_MASTER_SITES_${_group}} + fi + fi + done + _DISTFILES+= ${_D:C/:[^:]+$//} + else + _DISTFILES+= ${_D} + fi +done +_G_TEMP= +_G_TEMP_TEMP= +ALLFILES= ${_DISTFILES} ${_PATCHFILES} + ${_MASTER_SITES_ENV} for _file in ${DISTFILES}; do file=`${ECHO_CMD} $_file | ${SED} -E -e 's/:[^:]+$//'` From owner-p4-projects@FreeBSD.ORG Tue Jul 25 11:31:49 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B5B1316A4E2; Tue, 25 Jul 2006 11:31:49 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 9481716A4DF for ; Tue, 25 Jul 2006 11:31:49 +0000 (UTC) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 57AC843D76 for ; Tue, 25 Jul 2006 11:31:49 +0000 (GMT) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k6PBVnSM040675 for ; Tue, 25 Jul 2006 11:31:49 GMT (envelope-from rdivacky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k6PBVn3H040672 for perforce@freebsd.org; Tue, 25 Jul 2006 11:31:49 GMT (envelope-from rdivacky@FreeBSD.org) Date: Tue, 25 Jul 2006 11:31:49 GMT Message-Id: <200607251131.k6PBVn3H040672@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rdivacky@FreeBSD.org using -f From: Roman Divacky To: Perforce Change Reviews Cc: Subject: PERFORCE change 102366 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 25 Jul 2006 11:31:50 -0000 http://perforce.freebsd.org/chv.cgi?CH=102366 Change 102366 by rdivacky@rdivacky_witten on 2006/07/25 11:31:10 Add prototypes for mq_* functions. Affected files ... .. //depot/projects/soc2006/rdivacky_linuxolator/i386/linux/syscalls.master#16 edit Differences ... ==== //depot/projects/soc2006/rdivacky_linuxolator/i386/linux/syscalls.master#16 (text+ko) ==== @@ -448,12 +448,18 @@ 274 AUE_NULL MSTD { int linux_mbind(void); } 275 AUE_NULL MSTD { int linux_get_mempolicy(void); } 276 AUE_NULL MSTD { int linux_set_mempolicy(void); } -277 AUE_NULL MSTD { int linux_mq_open(void); } -278 AUE_NULL MSTD { int linux_mq_unlink(void); } -279 AUE_NULL MSTD { int linux_mq_timedsend(void); } -280 AUE_NULL MSTD { int linux_mq_timedreceive(void); } -281 AUE_NULL MSTD { int linux_mq_notify(void); } -282 AUE_NULL MSTD { int linux_mq_getsetattr(void); } +277 AUE_NULL MSTD { int linux_mq_open(const char *name, int oflag, mode_t mode, \ + struct mq_attr *attr); } +278 AUE_NULL MSTD { int linux_mq_unlink(const char *name); } +279 AUE_NULL MSTD { int linux_mq_timedsend(l_mqd_t mqd, const char *msg_ptr, \ + size_t msg_len, unsigned int msg_prio, const struct \ + timespec *abs_timeout); } +280 AUE_NULL MSTD { int linux_mq_timedreceive(l_mqd_t mqd, char *msg_ptr, \ + size_t msg_len, unsigned int msg_prio, const struct \ + timespec *abs_timeout); } +281 AUE_NULL MSTD { int linux_mq_notify(l_mqd_t mqd, const struct timespec *abs_timeout); } +282 AUE_NULL MSTD { int linux_mq_getsetattr(l_mqd_t mqd, const struct mq_attr *attr, \ + struct mq_attr *oattr); } 283 AUE_NULL MSTD { int linux_kexec_load(void); } 284 AUE_NULL MSTD { int linux_waitid(void); } 285 AUE_NULL UNIMPL From owner-p4-projects@FreeBSD.ORG Tue Jul 25 11:32:53 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9B06116A4E2; Tue, 25 Jul 2006 11:32:53 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 71F8416A4E0 for ; Tue, 25 Jul 2006 11:32:53 +0000 (UTC) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 4F48A43D72 for ; Tue, 25 Jul 2006 11:32:51 +0000 (GMT) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k6PBWp9k040745 for ; Tue, 25 Jul 2006 11:32:51 GMT (envelope-from rdivacky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k6PBWops040742 for perforce@freebsd.org; Tue, 25 Jul 2006 11:32:50 GMT (envelope-from rdivacky@FreeBSD.org) Date: Tue, 25 Jul 2006 11:32:50 GMT Message-Id: <200607251132.k6PBWops040742@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rdivacky@FreeBSD.org using -f From: Roman Divacky To: Perforce Change Reviews Cc: Subject: PERFORCE change 102367 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 25 Jul 2006 11:32:53 -0000 http://perforce.freebsd.org/chv.cgi?CH=102367 Change 102367 by rdivacky@rdivacky_witten on 2006/07/25 11:32:19 Regen after syscalls.master update. Affected files ... .. //depot/projects/soc2006/rdivacky_linuxolator/i386/linux/linux_proto.h#16 edit .. //depot/projects/soc2006/rdivacky_linuxolator/i386/linux/linux_syscall.h#16 edit .. //depot/projects/soc2006/rdivacky_linuxolator/i386/linux/linux_sysent.c#16 edit Differences ... ==== //depot/projects/soc2006/rdivacky_linuxolator/i386/linux/linux_proto.h#16 (text+ko) ==== @@ -802,22 +802,36 @@ register_t dummy; }; struct linux_mq_open_args { - register_t dummy; + char name_l_[PADL_(const char *)]; const char * name; char name_r_[PADR_(const char *)]; + char oflag_l_[PADL_(int)]; int oflag; char oflag_r_[PADR_(int)]; + char mode_l_[PADL_(mode_t)]; mode_t mode; char mode_r_[PADR_(mode_t)]; + char attr_l_[PADL_(struct mq_attr *)]; struct mq_attr * attr; char attr_r_[PADR_(struct mq_attr *)]; }; struct linux_mq_unlink_args { - register_t dummy; + char name_l_[PADL_(const char *)]; const char * name; char name_r_[PADR_(const char *)]; }; struct linux_mq_timedsend_args { - register_t dummy; + char mqd_l_[PADL_(l_mqd_t)]; l_mqd_t mqd; char mqd_r_[PADR_(l_mqd_t)]; + char msg_ptr_l_[PADL_(const char *)]; const char * msg_ptr; char msg_ptr_r_[PADR_(const char *)]; + char msg_len_l_[PADL_(size_t)]; size_t msg_len; char msg_len_r_[PADR_(size_t)]; + char msg_prio_l_[PADL_(unsigned int)]; unsigned int msg_prio; char msg_prio_r_[PADR_(unsigned int)]; + char abs_timeout_l_[PADL_(const struct timespec *)]; const struct timespec * abs_timeout; char abs_timeout_r_[PADR_(const struct timespec *)]; }; struct linux_mq_timedreceive_args { - register_t dummy; + char mqd_l_[PADL_(l_mqd_t)]; l_mqd_t mqd; char mqd_r_[PADR_(l_mqd_t)]; + char msg_ptr_l_[PADL_(char *)]; char * msg_ptr; char msg_ptr_r_[PADR_(char *)]; + char msg_len_l_[PADL_(size_t)]; size_t msg_len; char msg_len_r_[PADR_(size_t)]; + char msg_prio_l_[PADL_(unsigned int)]; unsigned int msg_prio; char msg_prio_r_[PADR_(unsigned int)]; + char abs_timeout_l_[PADL_(const struct timespec *)]; const struct timespec * abs_timeout; char abs_timeout_r_[PADR_(const struct timespec *)]; }; struct linux_mq_notify_args { - register_t dummy; + char mqd_l_[PADL_(l_mqd_t)]; l_mqd_t mqd; char mqd_r_[PADR_(l_mqd_t)]; + char abs_timeout_l_[PADL_(const struct timespec *)]; const struct timespec * abs_timeout; char abs_timeout_r_[PADR_(const struct timespec *)]; }; struct linux_mq_getsetattr_args { - register_t dummy; + char mqd_l_[PADL_(l_mqd_t)]; l_mqd_t mqd; char mqd_r_[PADR_(l_mqd_t)]; + char attr_l_[PADL_(const struct mq_attr *)]; const struct mq_attr * attr; char attr_r_[PADR_(const struct mq_attr *)]; + char oattr_l_[PADL_(struct mq_attr *)]; struct mq_attr * oattr; char oattr_r_[PADR_(struct mq_attr *)]; }; struct linux_kexec_load_args { register_t dummy; ==== //depot/projects/soc2006/rdivacky_linuxolator/i386/linux/linux_syscall.h#16 (text+ko) ==== ==== //depot/projects/soc2006/rdivacky_linuxolator/i386/linux/linux_sysent.c#16 (text+ko) ==== @@ -296,12 +296,12 @@ { SYF_MPSAFE | 0, (sy_call_t *)linux_mbind, AUE_NULL }, /* 274 = linux_mbind */ { SYF_MPSAFE | 0, (sy_call_t *)linux_get_mempolicy, AUE_NULL }, /* 275 = linux_get_mempolicy */ { SYF_MPSAFE | 0, (sy_call_t *)linux_set_mempolicy, AUE_NULL }, /* 276 = linux_set_mempolicy */ - { SYF_MPSAFE | 0, (sy_call_t *)linux_mq_open, AUE_NULL }, /* 277 = linux_mq_open */ - { SYF_MPSAFE | 0, (sy_call_t *)linux_mq_unlink, AUE_NULL }, /* 278 = linux_mq_unlink */ - { SYF_MPSAFE | 0, (sy_call_t *)linux_mq_timedsend, AUE_NULL }, /* 279 = linux_mq_timedsend */ - { SYF_MPSAFE | 0, (sy_call_t *)linux_mq_timedreceive, AUE_NULL }, /* 280 = linux_mq_timedreceive */ - { SYF_MPSAFE | 0, (sy_call_t *)linux_mq_notify, AUE_NULL }, /* 281 = linux_mq_notify */ - { SYF_MPSAFE | 0, (sy_call_t *)linux_mq_getsetattr, AUE_NULL }, /* 282 = linux_mq_getsetattr */ + { SYF_MPSAFE | AS(linux_mq_open_args), (sy_call_t *)linux_mq_open, AUE_NULL }, /* 277 = linux_mq_open */ + { SYF_MPSAFE | AS(linux_mq_unlink_args), (sy_call_t *)linux_mq_unlink, AUE_NULL }, /* 278 = linux_mq_unlink */ + { SYF_MPSAFE | AS(linux_mq_timedsend_args), (sy_call_t *)linux_mq_timedsend, AUE_NULL }, /* 279 = linux_mq_timedsend */ + { SYF_MPSAFE | AS(linux_mq_timedreceive_args), (sy_call_t *)linux_mq_timedreceive, AUE_NULL }, /* 280 = linux_mq_timedreceive */ + { SYF_MPSAFE | AS(linux_mq_notify_args), (sy_call_t *)linux_mq_notify, AUE_NULL }, /* 281 = linux_mq_notify */ + { SYF_MPSAFE | AS(linux_mq_getsetattr_args), (sy_call_t *)linux_mq_getsetattr, AUE_NULL }, /* 282 = linux_mq_getsetattr */ { SYF_MPSAFE | 0, (sy_call_t *)linux_kexec_load, AUE_NULL }, /* 283 = linux_kexec_load */ { SYF_MPSAFE | 0, (sy_call_t *)linux_waitid, AUE_NULL }, /* 284 = linux_waitid */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 285 = */ From owner-p4-projects@FreeBSD.ORG Tue Jul 25 11:41:03 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2D80B16A4E2; Tue, 25 Jul 2006 11:41:03 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id E515616A4DA for ; Tue, 25 Jul 2006 11:41:02 +0000 (UTC) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 70FAA43D49 for ; Tue, 25 Jul 2006 11:41:02 +0000 (GMT) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k6PBf2Vc041286 for ; Tue, 25 Jul 2006 11:41:02 GMT (envelope-from rdivacky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k6PBf2TZ041283 for perforce@freebsd.org; Tue, 25 Jul 2006 11:41:02 GMT (envelope-from rdivacky@FreeBSD.org) Date: Tue, 25 Jul 2006 11:41:02 GMT Message-Id: <200607251141.k6PBf2TZ041283@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rdivacky@FreeBSD.org using -f From: Roman Divacky To: Perforce Change Reviews Cc: Subject: PERFORCE change 102368 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 25 Jul 2006 11:41:03 -0000 http://perforce.freebsd.org/chv.cgi?CH=102368 Change 102368 by rdivacky@rdivacky_witten on 2006/07/25 11:40:32 Introduce mq_* functions. These are implemented just as wrappers around kmq_*. Affected files ... .. //depot/projects/soc2006/rdivacky_linuxolator/compat/linux/linux_ipc.c#3 edit .. //depot/projects/soc2006/rdivacky_linuxolator/i386/linux/linux.h#12 edit .. //depot/projects/soc2006/rdivacky_linuxolator/i386/linux/linux_dummy.c#8 edit Differences ... ==== //depot/projects/soc2006/rdivacky_linuxolator/compat/linux/linux_ipc.c#3 (text+ko) ==== @@ -805,6 +805,42 @@ } } +int +linux_mq_open(struct thread *td, struct linux_mq_open_args *args) +{ + return kmq_open(td, (struct kmq_open_args *) args); +} + +int +linux_mq_unlink(struct thread *td, struct linux_mq_unlink_args *args) +{ + return kmq_unlink(td, (struct kmq_unlink_args *) args); +} + +int +linux_mq_timedsend(struct thread *td, struct linux_mq_timedsend_args *args) +{ + return kmq_timedsend(td, (struct kmq_timedsend_args *) args); +} + +int +linux_mq_timedreceive(struct thread *td, struct linux_mq_timedreceive_args *args) +{ + return kmq_timedreceive(td, (struct kmq_timedreceive_args *) args); +} + +int +linux_mq_notify(struct thread *td, struct linux_mq_notify_args *args) +{ + return kmq_notify(td, (struct kmq_notify_args *) args); +} + +int +linux_mq_getsetattr(struct thread *td, struct linux_mq_getsetattr_args *args) +{ + return kmq_setattr(td, (struct kmq_setattr_args *) args); +} + MODULE_DEPEND(linux, sysvmsg, 1, 1, 1); MODULE_DEPEND(linux, sysvsem, 1, 1, 1); MODULE_DEPEND(linux, sysvshm, 1, 1, 1); ==== //depot/projects/soc2006/rdivacky_linuxolator/i386/linux/linux.h#12 (text+ko) ==== @@ -815,4 +815,6 @@ #define LINUX_CLOCK_MONOTONIC_HR 5 typedef int l_timer_t; +typedef int l_mqd_t; + #endif /* !_I386_LINUX_LINUX_H_ */ ==== //depot/projects/soc2006/rdivacky_linuxolator/i386/linux/linux_dummy.c#8 (text+ko) ==== @@ -81,12 +81,6 @@ DUMMY(mbind); DUMMY(get_mempolicy); DUMMY(set_mempolicy); -DUMMY(mq_open); -DUMMY(mq_unlink); -DUMMY(mq_timedsend); -DUMMY(mq_timedreceive); -DUMMY(mq_notify); -DUMMY(mq_getsetattr); DUMMY(kexec_load); DUMMY(waitid); DUMMY(add_key); From owner-p4-projects@FreeBSD.ORG Tue Jul 25 13:56:57 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6147D16A4DF; Tue, 25 Jul 2006 13:56:57 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 37BD816A4DD for ; Tue, 25 Jul 2006 13:56:57 +0000 (UTC) (envelope-from piso@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id E73AE43D4C for ; Tue, 25 Jul 2006 13:56:56 +0000 (GMT) (envelope-from piso@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k6PDuuUO058331 for ; Tue, 25 Jul 2006 13:56:56 GMT (envelope-from piso@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k6PDuuAG058328 for perforce@freebsd.org; Tue, 25 Jul 2006 13:56:56 GMT (envelope-from piso@freebsd.org) Date: Tue, 25 Jul 2006 13:56:56 GMT Message-Id: <200607251356.k6PDuuAG058328@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to piso@freebsd.org using -f From: Paolo Pisati To: Perforce Change Reviews Cc: Subject: PERFORCE change 102374 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 25 Jul 2006 13:56:57 -0000 http://perforce.freebsd.org/chv.cgi?CH=102374 Change 102374 by piso@piso_newluxor on 2006/07/25 13:56:30 Correct a comment. Affected files ... .. //depot/projects/soc2006/intr_filter/i386/i386/intr_machdep.c#7 edit Differences ... ==== //depot/projects/soc2006/intr_filter/i386/i386/intr_machdep.c#7 (text+ko) ==== @@ -216,9 +216,8 @@ /* * If the interrupt was fully served, send it an EOI but leave it - * unmasked. Otherwise, if there are any threaded handlers that need - * to run or it was a stray interrupt, mask the source as well as - * sending it an EOI. + * unmasked. Otherwise, if it was a stray interrupt, mask the source + * as well as sending it an EOI. */ if (thread & FILTER_HANDLED) isrc->is_pic->pic_eoi_source(isrc); From owner-p4-projects@FreeBSD.ORG Tue Jul 25 14:25:42 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E281F16A4DE; Tue, 25 Jul 2006 14:25:41 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id A637C16A4E0 for ; Tue, 25 Jul 2006 14:25:41 +0000 (UTC) (envelope-from piso@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id F0EF843D77 for ; Tue, 25 Jul 2006 14:25:33 +0000 (GMT) (envelope-from piso@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k6PEPXUA061114 for ; Tue, 25 Jul 2006 14:25:33 GMT (envelope-from piso@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k6PEPXNt061111 for perforce@freebsd.org; Tue, 25 Jul 2006 14:25:33 GMT (envelope-from piso@freebsd.org) Date: Tue, 25 Jul 2006 14:25:33 GMT Message-Id: <200607251425.k6PEPXNt061111@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to piso@freebsd.org using -f From: Paolo Pisati To: Perforce Change Reviews Cc: Subject: PERFORCE change 102376 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 25 Jul 2006 14:25:42 -0000 http://perforce.freebsd.org/chv.cgi?CH=102376 Change 102376 by piso@piso_newluxor on 2006/07/25 14:25:11 Axe the stale part of a comment. Affected files ... .. //depot/projects/soc2006/intr_filter/kern/kern_intr.c#13 edit Differences ... ==== //depot/projects/soc2006/intr_filter/kern/kern_intr.c#13 (text+ko) ==== @@ -759,8 +759,6 @@ * Some architectures (i386, amd64 and arm) require the optional frame * parameter, and use it as the main argument for fast handler execution * when ih_argument == NULL. - * - * Return: 0 (everything done) or 1 (schedule ithread) */ int From owner-p4-projects@FreeBSD.ORG Tue Jul 25 15:27:52 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C5C0316A4DE; Tue, 25 Jul 2006 15:27:52 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 846B016A4DA for ; Tue, 25 Jul 2006 15:27:52 +0000 (UTC) (envelope-from swhitman@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 389E243D49 for ; Tue, 25 Jul 2006 15:27:52 +0000 (GMT) (envelope-from swhitman@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k6PFRq6T065446 for ; Tue, 25 Jul 2006 15:27:52 GMT (envelope-from swhitman@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k6PFRpFS065443 for perforce@freebsd.org; Tue, 25 Jul 2006 15:27:51 GMT (envelope-from swhitman@FreeBSD.org) Date: Tue, 25 Jul 2006 15:27:51 GMT Message-Id: <200607251527.k6PFRpFS065443@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to swhitman@FreeBSD.org using -f From: Spencer Whitman To: Perforce Change Reviews Cc: Subject: PERFORCE change 102377 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 25 Jul 2006 15:27:53 -0000 http://perforce.freebsd.org/chv.cgi?CH=102377 Change 102377 by swhitman@swhitman_joethecat on 2006/07/25 15:27:03 Minor additions to #define processing Affected files ... .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/k/cpp.c#15 edit Differences ... ==== //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/k/cpp.c#15 (text+ko) ==== @@ -44,17 +44,12 @@ struct ref *r; }; -/* XXX These should be optimized, but work for now */ -/* Each argument has a list of indexes of where it appears in the macro string */ -struct arg_ind { - int offset; - TAILQ_ENTRY(arg_ind) list; -}; - +/* XXX This should be optimized, but works for now */ struct macro_arg { const char *name; /* Argument name */ - TAILQ_HEAD(,arg_ind) offsets; /* Offset list */ + int length /* Length of the arg name */ + int *offsets; /* Offset list */ TAILQ_ENTRY(macro_arg) list; /* Entry into the argument list */ }; @@ -66,11 +61,16 @@ int mac_type; /* Object or function like macro */ TAILQ_HEAD(,macro_arg) args; /* Head of argument list */ const char *value; /* Value of the macro */ + int length; /* Length of the macro value */ TAILQ_ENTRY(define) list; /* Link to list of macros */ }; -/* XXX Implement this */ -#define FREE_LIST(HEAD,TYPE) do { \ +#define FREE_LIST(HEAD,TYPE,LIST) do { \ + (TYPE) * tmpvar; \ + TAILQ_FOREACH(tmpvar, (HEAD), LIST) { \ + TAILQ_REMOVE(tmpvar, (HEAD), LIST); \ + free(tmpvar); \ + } \ }while(0) static TAILQ_HEAD(,iarg) iarg = TAILQ_HEAD_INITIALIZER(iarg); @@ -271,9 +271,9 @@ } static void -calculate_offsets(struct macro_arg *arg, struct define * mac __unused) +calculate_offsets(struct macro_arg *arg __unused, struct define * mac __unused) { - TAILQ_INIT(&arg->offsets); + /* XXX Use strstr to find substrings of arg in mac */ } @@ -303,6 +303,8 @@ } } + new_arg->length = strlen(new_arg->name); + calculate_offsets(new_arg,mac); printf("added argument named: <%V> to macro named <%V>\n",new_arg->name, @@ -394,7 +396,7 @@ /* Macro was ill-formed. Free everything and exit with error */ if(*p != ')') { - /* XXX Free everything */ + FREE_LIST(&mac->args, struct macro_args, list); free(mac); errx(1, "Function macro has no ending \')\'"); } @@ -405,13 +407,17 @@ break; } + mac->length = strlen(mac->value); + /* Add this macro to the defined list */ TAILQ_FOREACH(tmp, &define, list) { if(tmp == NULL) { TAILQ_INSERT_TAIL(&define, mac, list); break; } - + /* Warn if redefining a previous definition */ + if(tmp->name == mac->name) + cpp_warning(cfs,NULL,b,e); } } From owner-p4-projects@FreeBSD.ORG Tue Jul 25 16:48:55 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 98BF716A4E5; Tue, 25 Jul 2006 16:48:55 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 75B4D16A4DA for ; Tue, 25 Jul 2006 16:48:55 +0000 (UTC) (envelope-from gabor@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 3176043D46 for ; Tue, 25 Jul 2006 16:48:55 +0000 (GMT) (envelope-from gabor@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k6PGmoKc078795 for ; Tue, 25 Jul 2006 16:48:50 GMT (envelope-from gabor@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k6PGmnp8078792 for perforce@freebsd.org; Tue, 25 Jul 2006 16:48:49 GMT (envelope-from gabor@FreeBSD.org) Date: Tue, 25 Jul 2006 16:48:49 GMT Message-Id: <200607251648.k6PGmnp8078792@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to gabor@FreeBSD.org using -f From: Gabor Kovesdan To: Perforce Change Reviews Cc: Subject: PERFORCE change 102390 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 25 Jul 2006 16:48:55 -0000 http://perforce.freebsd.org/chv.cgi?CH=102390 Change 102390 by gabor@gabor_spitfire on 2006/07/25 16:48:49 Move another bunch of the code to the script from bsd.port.mk. Affected files ... .. //depot/projects/soc2006/gabor_ports/Mk/bsd.port.mk#60 edit .. //depot/projects/soc2006/gabor_ports/Tools/scripts/do-fetch.sh#5 edit Differences ... ==== //depot/projects/soc2006/gabor_ports/Mk/bsd.port.mk#60 (text+ko) ==== @@ -2376,79 +2376,7 @@ ALLFILES?= ${_DISTFILES} ${_PATCHFILES} -# -# Sort the master site list according to the patterns in MASTER_SORT -# -MASTER_SORT?= -MASTER_SORT_REGEX?= -MASTER_SORT_REGEX+= ${MASTER_SORT:S|.|\\.|g:S|^|://[^/]*|:S|$|/|} - -MASTER_SORT_AWK= BEGIN { RS = " "; ORS = " "; IGNORECASE = 1 ; gl = "${MASTER_SORT_REGEX:S|\\|\\\\|g}"; } -.for srt in ${MASTER_SORT_REGEX} -MASTER_SORT_AWK+= /${srt:S|/|\\/|g}/ { good["${srt:S|\\|\\\\|g}"] = good["${srt:S|\\|\\\\|g}"] " " $$0 ; next; } -.endfor -MASTER_SORT_AWK+= { rest = rest " " $$0; } END { n=split(gl, gla); for(i=1;i<=n;i++) { print good[gla[i]]; } print rest; } - -SORTED_MASTER_SITES_DEFAULT_CMD= cd ${.CURDIR} && ${MAKE} ${__softMAKEFLAGS} master-sites-DEFAULT -SORTED_PATCH_SITES_DEFAULT_CMD= cd ${.CURDIR} && ${MAKE} ${__softMAKEFLAGS} patch-sites-DEFAULT -SORTED_MASTER_SITES_ALL_CMD= cd ${.CURDIR} && ${MAKE} ${__softMAKEFLAGS} master-sites-ALL -SORTED_PATCH_SITES_ALL_CMD= cd ${.CURDIR} && ${MAKE} ${__softMAKEFLAGS} patch-sites-ALL - -# -# Sort the master site list according to the patterns in MASTER_SORT -# according to grouping rules (:something) -# -# for use in the fetch targets -.for _S in ${MASTER_SITES} -_S_TEMP= ${_S:S/^${_S:C@/:[^/:]+$@/@}//} -. if !empty(_S_TEMP) -. for _group in ${_S_TEMP:S/^://:S/,/ /g} -. if !target(master-sites-${_group}) -SORTED_MASTER_SITES_${_group}_CMD= cd ${.CURDIR} && ${MAKE} ${__softMAKEFLAGS} master-sites-${_group} -master-sites-${_group}: - @${ECHO_CMD} ${_MASTER_SITE_OVERRIDE} `${ECHO_CMD} '${_MASTER_SITES_${_group}}' | ${AWK} '${MASTER_SORT_AWK:S|\\|\\\\|g}'` ${_MASTER_SITE_BACKUP} -. endif -. endfor -. endif -.endfor -.for _S in ${PATCH_SITES} -_S_TEMP= ${_S:S/^${_S:C@/:[^/:]+$@/@}//} -. if !empty(_S_TEMP) -. for _group in ${_S_TEMP:S/^://:S/,/ /g} -. if !target(patch-sites-${_group}) -SORTED_PATCH_SITES_${_group}_CMD= cd ${.CURDIR} && ${MAKE} ${__softMAKEFLAGS} patch-sites-${_group} -patch-sites-${_group}: - @${ECHO_CMD} ${_MASTER_SITE_OVERRIDE} `${ECHO_CMD} '${_PATCH_SITES_${_group}}' | ${AWK} '${MASTER_SORT_AWK:S|\\|\\\\|g}'` ${_MASTER_SITE_BACKUP} -. endif -. endfor -. endif -.endfor - -# -# Hackery to enable simple fetch targets with several dynamic MASTER_SITES -# -_MASTER_SITES_ENV= _MASTER_SITES_DEFAULT="${_MASTER_SITES_DEFAULT}" -.for _F in ${DISTFILES} -_F_TEMP= ${_F:S/^${_F:C/:[^:]+$//}//:S/^://} -. if !empty(_F_TEMP) -. for _group in ${_F_TEMP:S/,/ /g} -. if defined(_MASTER_SITES_${_group}) -_MASTER_SITES_ENV+= _MASTER_SITES_${_group}="${_MASTER_SITES_${_group}}" -. endif -. endfor -. endif -.endfor -_PATCH_SITES_ENV= _PATCH_SITES_DEFAULT="${_PATCH_SITES_DEFAULT}" -.for _F in ${PATCHFILES} -_F_TEMP= ${_F:S/^${_F:C/:[^:]+$//}//:S/^://} -. if !empty(_F_TEMP) -. for _group in ${_F_TEMP:S/,/ /g} -. if defined(_PATCH_SITES_${_group}) -_PATCH_SITES_ENV+= _PATCH_SITES_${_group}="${_PATCH_SITES_${_group}}" -. endif -. endfor -. endif -.endfor +### FIXME: shellify these targets, too master-sites-ALL: @${ECHO_CMD} ${_MASTER_SITE_OVERRIDE} `${ECHO_CMD} '${_MASTER_SITES_ALL}' | ${AWK} '${MASTER_SORT_AWK:S|\\|\\\\|g}'` ${_MASTER_SITE_BACKUP} ==== //depot/projects/soc2006/gabor_ports/Tools/scripts/do-fetch.sh#5 (text+ko) ==== @@ -147,6 +147,51 @@ _G_TEMP_TEMP= ALLFILES= ${_DISTFILES} ${_PATCHFILES} +# +# Sort the master site list according to the patterns in MASTER_SORT +# +MASTER_SORT_REGEX+= ${MASTER_SORT:S|.|\\.|g:S|^|://[^/]*|:S|$|/|} +MASTER_SORT_AWK= BEGIN { RS = " "; ORS = " "; IGNORECASE = 1 ; gl = "${MASTER_SORT_REGEX:S|\\|\\\\|g}"; } +.for srt in ${MASTER_SORT_REGEX} +MASTER_SORT_AWK+= /${srt:S|/|\\/|g}/ { good["${srt:S|\\|\\\\|g}"] = good["${srt:S|\\|\\\\|g}"] " " $$0 ; next; } +.endfor +MASTER_SORT_AWK+= { rest = rest " " $$0; } END { n=split(gl, gla); for(i=1;i<=n;i++) { print good[gla[i]]; } print rest; } + +SORTED_MASTER_SITES_DEFAULT_CMD= cd ${.CURDIR} && ${MAKE} ${__softMAKEFLAGS} master-sites-DEFAULT +SORTED_PATCH_SITES_DEFAULT_CMD= cd ${.CURDIR} && ${MAKE} ${__softMAKEFLAGS} patch-sites-DEFAULT +SORTED_MASTER_SITES_ALL_CMD= cd ${.CURDIR} && ${MAKE} ${__softMAKEFLAGS} master-sites-ALL +SORTED_PATCH_SITES_ALL_CMD= cd ${.CURDIR} && ${MAKE} ${__softMAKEFLAGS} patch-sites-ALL + +# Sort the master site list according to the patterns in MASTER_SORT +# according to grouping rules (:something) +# +# for use in the fetch targets +for _S in ${MASTER_SITES}; do + _S_TEMP= ${_S:S/^${_S:C@/:[^/:]+$@/@}//} + if [ -n "${_S_TEMP}" ] ; then + for _group in ${_S_TEMP:S/^://:S/,/ /g}; do + SORTED_MASTER_SITES_${_group}_CMD= cd ${.CURDIR} && ${MAKE} ${__softMAKEFLAGS} master-sites--${_group} + ${ECHO_CMD} ${_MASTER_SITE_OVERRIDE} `${ECHO_CMD} '${_MASTER_SITES_${_group}}' | ${AWK} '${MASTER_SORT_AWK:S|\\|\\\\|g}'` ${_MASTER_SITE_BACKUP} + done + fi +done + +### FIXME: thos should be convert to be done in this script itself +# +# Hackery to enable simple fetch targets with several dynamic MASTER_SITES +# +_MASTER_SITES_ENV= _MASTER_SITES_DEFAULT="${_MASTER_SITES_DEFAULT}" +.for _F in ${DISTFILES} +_F_TEMP= ${_F:S/^${_F:C/:[^:]+$//}//:S/^://} +. if !empty(_F_TEMP) +. for _group in ${_F_TEMP:S/,/ /g} +. if defined(_MASTER_SITES_${_group}) +_MASTER_SITES_ENV+= _MASTER_SITES_${_group}="${_MASTER_SITES_${_group}}" +. endif +. endfor +. endif +.endfor + ${_MASTER_SITES_ENV} for _file in ${DISTFILES}; do file=`${ECHO_CMD} $_file | ${SED} -E -e 's/:[^:]+$//'` @@ -319,6 +364,30 @@ _PATCHFILES+= ${_P} fi done +for _S in ${PATCH_SITES}; do + _S_TEMP= ${_S:S/^${_S:C@/:[^/:]+$@/@}//} + if [ -n "${_S_TEMP}" ] ; then + for _group in ${_S_TEMP:S/^://:S/,/ /g}; do + SORTED_PATCH_SITES_${_group}_CMD= cd ${.CURDIR} && ${MAKE} ${__softMAKEFLAGS} patch-sites-${_group} + ${ECHO_CMD} ${_MASTER_SITE_OVERRIDE} `${ECHO_CMD} '${_PATCH_SITES_${_group}}' | ${AWK} '${MASTER_SORT_AWK:S|\\|\\\\|g}'` ${_MASTER_SITE_BACKUP} + done + fi +done + +### FIXME: this should be convert to be done in this script itself + +_PATCH_SITES_ENV= _PATCH_SITES_DEFAULT="${_PATCH_SITES_DEFAULT}" +.for _F in ${PATCHFILES} +_F_TEMP= ${_F:S/^${_F:C/:[^:]+$//}//:S/^://} +. if !empty(_F_TEMP) +. for _group in ${_F_TEMP:S/,/ /g} +. if defined(_PATCH_SITES_${_group}) +_PATCH_SITES_ENV+= _PATCH_SITES_${_group}="${_PATCH_SITES_${_group}}" +. endif +. endfor +. endif +.endfor + cd ${_DISTDIR} ${_PATCH_SITES_ENV} for _file in ${PATCHFILES}; do From owner-p4-projects@FreeBSD.ORG Tue Jul 25 17:15:26 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A8CA516A4E7; Tue, 25 Jul 2006 17:15:26 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 493C916A4E6 for ; Tue, 25 Jul 2006 17:15:26 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id D7CBA43D49 for ; Tue, 25 Jul 2006 17:15:25 +0000 (GMT) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k6PHFP0g082210 for ; Tue, 25 Jul 2006 17:15:25 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k6PHFPU4082207 for perforce@freebsd.org; Tue, 25 Jul 2006 17:15:25 GMT (envelope-from jhb@freebsd.org) Date: Tue, 25 Jul 2006 17:15:25 GMT Message-Id: <200607251715.k6PHFPU4082207@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 Cc: Subject: PERFORCE change 102393 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 25 Jul 2006 17:15:26 -0000 http://perforce.freebsd.org/chv.cgi?CH=102393 Change 102393 by jhb@jhb_mutex on 2006/07/25 17:14:51 Missed an unlock case where td_locks needs to be decremented. Affected files ... .. //depot/projects/smpng/sys/kern/kern_mutex.c#131 edit Differences ... ==== //depot/projects/smpng/sys/kern/kern_mutex.c#131 (text+ko) ==== @@ -912,6 +912,8 @@ /* Perform the non-mtx related part of mtx_unlock_spin(). */ if (LOCK_CLASS(&m->mtx_object) == &lock_class_mtx_spin) spinlock_exit(); + else + curthread->td_locks--; /* Tell witness this isn't locked to make it happy. */ WITNESS_UNLOCK(&m->mtx_object, LOP_EXCLUSIVE, __FILE__, From owner-p4-projects@FreeBSD.ORG Tue Jul 25 17:57:44 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3F64C16A4DA; Tue, 25 Jul 2006 17:57:44 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id C587916A50A for ; Tue, 25 Jul 2006 17:57:43 +0000 (UTC) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 6B6B243DA3 for ; Tue, 25 Jul 2006 17:56:21 +0000 (GMT) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k6PHuHrg085295 for ; Tue, 25 Jul 2006 17:56:17 GMT (envelope-from rdivacky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k6PHuHv4085292 for perforce@freebsd.org; Tue, 25 Jul 2006 17:56:17 GMT (envelope-from rdivacky@FreeBSD.org) Date: Tue, 25 Jul 2006 17:56:17 GMT Message-Id: <200607251756.k6PHuHv4085292@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rdivacky@FreeBSD.org using -f From: Roman Divacky To: Perforce Change Reviews Cc: Subject: PERFORCE change 102396 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 25 Jul 2006 17:57:44 -0000 http://perforce.freebsd.org/chv.cgi?CH=102396 Change 102396 by rdivacky@rdivacky_witten on 2006/07/25 17:56:12 Make the module loadable if you dont have P1003_1B_MQUEUE in kernel config. Affected files ... .. //depot/projects/soc2006/rdivacky_linuxolator/compat/linux/linux_ipc.c#4 edit .. //depot/projects/soc2006/rdivacky_linuxolator/modules/linux/Makefile#6 edit Differences ... ==== //depot/projects/soc2006/rdivacky_linuxolator/compat/linux/linux_ipc.c#4 (text+ko) ==== @@ -40,6 +40,7 @@ #include #include "opt_compat.h" +#include "opt_posix.h" #ifdef COMPAT_LINUX32 #include @@ -808,37 +809,61 @@ int linux_mq_open(struct thread *td, struct linux_mq_open_args *args) { +#ifdef P1003_1B_MQUEUE return kmq_open(td, (struct kmq_open_args *) args); +#else + return (ENOSYS); +#endif } int linux_mq_unlink(struct thread *td, struct linux_mq_unlink_args *args) { +#ifdef P1003_1B_MQUEUE return kmq_unlink(td, (struct kmq_unlink_args *) args); +#else + return (ENOSYS); +#endif } int linux_mq_timedsend(struct thread *td, struct linux_mq_timedsend_args *args) { +#ifdef P1003_1B_MQUEUE return kmq_timedsend(td, (struct kmq_timedsend_args *) args); +#else + return (ENOSYS); +#endif } int linux_mq_timedreceive(struct thread *td, struct linux_mq_timedreceive_args *args) { +#ifdef P1003_1B_MQUEUE return kmq_timedreceive(td, (struct kmq_timedreceive_args *) args); +#else + return (ENOSYS); +#endif } int linux_mq_notify(struct thread *td, struct linux_mq_notify_args *args) { +#ifdef P1003_1B_MQUEUE return kmq_notify(td, (struct kmq_notify_args *) args); +#else + return (ENOSYS); +#endif } int linux_mq_getsetattr(struct thread *td, struct linux_mq_getsetattr_args *args) { +#ifdef P1003_1B_MQUEUE return kmq_setattr(td, (struct kmq_setattr_args *) args); +#else + return (ENOSYS); +#endif } MODULE_DEPEND(linux, sysvmsg, 1, 1, 1); ==== //depot/projects/soc2006/rdivacky_linuxolator/modules/linux/Makefile#6 (text+ko) ==== @@ -11,7 +11,7 @@ SRCS= linux${SFX}_dummy.c linux_file.c linux_futex.c linux_getcwd.c linux_ioctl.c \ linux_ipc.c linux${SFX}_machdep.c linux_mib.c linux_misc.c linux_signal.c \ linux_socket.c linux_stats.c linux_sysctl.c linux${SFX}_sysent.c linux${SFX}_sysvec.c \ - linux_uid16.c linux_util.c linux_time.c opt_inet6.h opt_mac.h opt_compat.h \ + linux_uid16.c linux_util.c linux_time.c opt_inet6.h opt_mac.h opt_compat.h opt_posix.h \ vnode_if.h device_if.h bus_if.h OBJS= linux${SFX}_locore.o From owner-p4-projects@FreeBSD.ORG Tue Jul 25 19:43:37 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5F80016A4DF; Tue, 25 Jul 2006 19:43:37 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 3BD0516A4DA for ; Tue, 25 Jul 2006 19:43:37 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id E6C7343D45 for ; Tue, 25 Jul 2006 19:43:36 +0000 (GMT) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k6PJhadG094014 for ; Tue, 25 Jul 2006 19:43:36 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k6PJhaQR094011 for perforce@freebsd.org; Tue, 25 Jul 2006 19:43:36 GMT (envelope-from jb@freebsd.org) Date: Tue, 25 Jul 2006 19:43:36 GMT Message-Id: <200607251943.k6PJhaQR094011@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 102405 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 25 Jul 2006 19:43:37 -0000 http://perforce.freebsd.org/chv.cgi?CH=102405 Change 102405 by jb@jb_freebsd2 on 2006/07/25 19:43:01 Support 32 CPUs instead of just 16. I guess the author thought that 16 was a *big* number. 8-) Affected files ... .. //depot/projects/dtrace/src/lib/libmemstat/memstat.h#3 edit Differences ... ==== //depot/projects/dtrace/src/lib/libmemstat/memstat.h#3 (text+ko) ==== @@ -33,7 +33,7 @@ * Number of CPU slots in library-internal data structures. This should be * at least the value of MAXCPU from param.h. */ -#define MEMSTAT_MAXCPU 16 +#define MEMSTAT_MAXCPU 32 /* * Amount of caller data to maintain for each caller data slot. Applications From owner-p4-projects@FreeBSD.ORG Tue Jul 25 21:08:35 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 944AA16A4E6; Tue, 25 Jul 2006 21:08:35 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 56BE316A4E2 for ; Tue, 25 Jul 2006 21:08:35 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 1357743D81 for ; Tue, 25 Jul 2006 21:08:28 +0000 (GMT) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k6PL8STe009709 for ; Tue, 25 Jul 2006 21:08:28 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k6PL8RI0009706 for perforce@freebsd.org; Tue, 25 Jul 2006 21:08:27 GMT (envelope-from sam@freebsd.org) Date: Tue, 25 Jul 2006 21:08:27 GMT Message-Id: <200607252108.k6PL8RI0009706@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 Cc: Subject: PERFORCE change 102412 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 25 Jul 2006 21:08:35 -0000 http://perforce.freebsd.org/chv.cgi?CH=102412 Change 102412 by sam@sam_ebb on 2006/07/25 21:08:10 Checkpoint bus space changes: o add stream members and associated glop to struct bus_space o switch struct initializations to c99 syntax o start pci support; 4-byte r/w works well enough for ath to run but need to fix 1+2 byte ops Affected files ... .. //depot/projects/arm/src/sys/arm/include/bus.h#4 edit .. //depot/projects/arm/src/sys/arm/xscale/ixp425/ixp425_a4x_space.c#2 edit .. //depot/projects/arm/src/sys/arm/xscale/ixp425/ixp425_pci_space.c#2 edit .. //depot/projects/arm/src/sys/arm/xscale/ixp425/ixp425_space.c#2 edit Differences ... ==== //depot/projects/arm/src/sys/arm/include/bus.h#4 (text+ko) ==== @@ -195,6 +195,61 @@ void (*bs_c_8) (void *, bus_space_handle_t, bus_size_t, bus_space_handle_t, bus_size_t, bus_size_t); + /* read stream (single) */ + u_int8_t (*bs_r_1_s) (void *, bus_space_handle_t, bus_size_t); + u_int16_t (*bs_r_2_s) (void *, bus_space_handle_t, bus_size_t); + u_int32_t (*bs_r_4_s) (void *, bus_space_handle_t, bus_size_t); + u_int64_t (*bs_r_8_s) (void *, bus_space_handle_t, bus_size_t); + + /* read multiple stream */ + void (*bs_rm_1_s) (void *, bus_space_handle_t, bus_size_t, + u_int8_t *, bus_size_t); + void (*bs_rm_2_s) (void *, bus_space_handle_t, bus_size_t, + u_int16_t *, bus_size_t); + void (*bs_rm_4_s) (void *, bus_space_handle_t, + bus_size_t, u_int32_t *, bus_size_t); + void (*bs_rm_8_s) (void *, bus_space_handle_t, + bus_size_t, u_int64_t *, bus_size_t); + + /* read region stream */ + void (*bs_rr_1_s) (void *, bus_space_handle_t, + bus_size_t, u_int8_t *, bus_size_t); + void (*bs_rr_2_s) (void *, bus_space_handle_t, + bus_size_t, u_int16_t *, bus_size_t); + void (*bs_rr_4_s) (void *, bus_space_handle_t, + bus_size_t, u_int32_t *, bus_size_t); + void (*bs_rr_8_s) (void *, bus_space_handle_t, + bus_size_t, u_int64_t *, bus_size_t); + + /* write stream (single) */ + void (*bs_w_1_s) (void *, bus_space_handle_t, + bus_size_t, u_int8_t); + void (*bs_w_2_s) (void *, bus_space_handle_t, + bus_size_t, u_int16_t); + void (*bs_w_4_s) (void *, bus_space_handle_t, + bus_size_t, u_int32_t); + void (*bs_w_8_s) (void *, bus_space_handle_t, + bus_size_t, u_int64_t); + + /* write multiple stream */ + void (*bs_wm_1_s) (void *, bus_space_handle_t, + bus_size_t, const u_int8_t *, bus_size_t); + void (*bs_wm_2_s) (void *, bus_space_handle_t, + bus_size_t, const u_int16_t *, bus_size_t); + void (*bs_wm_4_s) (void *, bus_space_handle_t, + bus_size_t, const u_int32_t *, bus_size_t); + void (*bs_wm_8_s) (void *, bus_space_handle_t, + bus_size_t, const u_int64_t *, bus_size_t); + + /* write region stream */ + void (*bs_wr_1_s) (void *, bus_space_handle_t, + bus_size_t, const u_int8_t *, bus_size_t); + void (*bs_wr_2_s) (void *, bus_space_handle_t, + bus_size_t, const u_int16_t *, bus_size_t); + void (*bs_wr_4_s) (void *, bus_space_handle_t, + bus_size_t, const u_int32_t *, bus_size_t); + void (*bs_wr_8_s) (void *, bus_space_handle_t, + bus_size_t, const u_int64_t *, bus_size_t); }; @@ -215,6 +270,14 @@ #define __bs_copy(sz, t, h1, o1, h2, o2, cnt) \ (*(t)->__bs_opname(c,sz))((t)->bs_cookie, h1, o1, h2, o2, cnt) +#define __bs_opname_s(op,size) __bs_c(__bs_c(__bs_c(__bs_c(bs_,op),_),size),_s) +#define __bs_rs_s(sz, t, h, o) \ + (*(t)->__bs_opname_s(r,sz))((t)->bs_cookie, h, o) +#define __bs_ws_s(sz, t, h, o, v) \ + (*(t)->__bs_opname_s(w,sz))((t)->bs_cookie, h, o, v) +#define __bs_nonsingle_s(type, sz, t, h, o, a, c) \ + (*(t)->__bs_opname_s(type,sz))((t)->bs_cookie, h, o, a, c) + /* * Mapping and unmapping operations. @@ -253,6 +316,10 @@ #define bus_space_read_4(t, h, o) __bs_rs(4,(t),(h),(o)) #define bus_space_read_8(t, h, o) __bs_rs(8,(t),(h),(o)) +#define bus_space_read_stream_1(t, h, o) __bs_rs_s(1,(t), (h), (o)) +#define bus_space_read_stream_2(t, h, o) __bs_rs_s(2,(t), (h), (o)) +#define bus_space_read_stream_4(t, h, o) __bs_rs_s(4,(t), (h), (o)) +#define bus_space_read_stream_8(t, h, o) __bs_rs_s(8,8,(t),(h),(o)) /* * Bus read multiple operations. @@ -266,6 +333,15 @@ #define bus_space_read_multi_8(t, h, o, a, c) \ __bs_nonsingle(rm,8,(t),(h),(o),(a),(c)) +#define bus_space_read_multi_stream_1(t, h, o, a, c) \ + __bs_nonsingle_s(rm,1,(t),(h),(o),(a),(c)) +#define bus_space_read_multi_stream_2(t, h, o, a, c) \ + __bs_nonsingle_s(rm,2,(t),(h),(o),(a),(c)) +#define bus_space_read_multi_stream_4(t, h, o, a, c) \ + __bs_nonsingle_s(rm,4,(t),(h),(o),(a),(c)) +#define bus_space_read_multi_stream_8(t, h, o, a, c) \ + __bs_nonsingle_s(rm,8,(t),(h),(o),(a),(c)) + /* * Bus read region operations. @@ -279,6 +355,15 @@ #define bus_space_read_region_8(t, h, o, a, c) \ __bs_nonsingle(rr,8,(t),(h),(o),(a),(c)) +#define bus_space_read_region_stream_1(t, h, o, a, c) \ + __bs_nonsingle_s(rr,1,(t),(h),(o),(a),(c)) +#define bus_space_read_region_stream_2(t, h, o, a, c) \ + __bs_nonsingle_s(rr,2,(t),(h),(o),(a),(c)) +#define bus_space_read_region_stream_4(t, h, o, a, c) \ + __bs_nonsingle_s(rr,4,(t),(h),(o),(a),(c)) +#define bus_space_read_region_stream_8(t, h, o, a, c) \ + __bs_nonsingle_s(rr,8,(t),(h),(o),(a),(c)) + /* * Bus write (single) operations. @@ -288,7 +373,12 @@ #define bus_space_write_4(t, h, o, v) __bs_ws(4,(t),(h),(o),(v)) #define bus_space_write_8(t, h, o, v) __bs_ws(8,(t),(h),(o),(v)) +#define bus_space_write_stream_1(t, h, o, v) __bs_ws_s(1,(t),(h),(o),(v)) +#define bus_space_write_stream_2(t, h, o, v) __bs_ws_s(2,(t),(h),(o),(v)) +#define bus_space_write_stream_4(t, h, o, v) __bs_ws_s(4,(t),(h),(o),(v)) +#define bus_space_write_stream_8(t, h, o, v) __bs_ws_s(8,(t),(h),(o),(v)) + /* * Bus write multiple operations. */ @@ -301,6 +391,15 @@ #define bus_space_write_multi_8(t, h, o, a, c) \ __bs_nonsingle(wm,8,(t),(h),(o),(a),(c)) +#define bus_space_write_multi_stream_1(t, h, o, a, c) \ + __bs_nonsingle_s(wm,1,(t),(h),(o),(a),(c)) +#define bus_space_write_multi_stream_2(t, h, o, a, c) \ + __bs_nonsingle_s(wm,2,(t),(h),(o),(a),(c)) +#define bus_space_write_multi_stream_4(t, h, o, a, c) \ + __bs_nonsingle_s(wm,4,(t),(h),(o),(a),(c)) +#define bus_space_write_multi_stream_8(t, h, o, a, c) \ + __bs_nonsingle_s(wm,8,(t),(h),(o),(a),(c)) + /* * Bus write region operations. @@ -314,7 +413,16 @@ #define bus_space_write_region_8(t, h, o, a, c) \ __bs_nonsingle(wr,8,(t),(h),(o),(a),(c)) +#define bus_space_write_region_stream_1(t, h, o, a, c) \ + __bs_nonsingle_s(wr,1,(t),(h),(o),(a),(c)) +#define bus_space_write_region_stream_2(t, h, o, a, c) \ + __bs_nonsingle_s(wr,2,(t),(h),(o),(a),(c)) +#define bus_space_write_region_stream_4(t, h, o, a, c) \ + __bs_nonsingle_s(wr,4,(t),(h),(o),(a),(c)) +#define bus_space_write_region_stream_8(t, h, o, a, c) \ + __bs_nonsingle_s(wr,8,(t),(h),(o),(a),(c)) + /* * Set multiple operations. */ @@ -403,6 +511,18 @@ u_int64_t __bs_c(f,_bs_r_8) (void *t, bus_space_handle_t bsh, \ bus_size_t offset); +#define bs_r_1_s_proto(f) \ +u_int8_t __bs_c(f,_bs_r_1_s) (void *t, bus_space_handle_t bsh, \ + bus_size_t offset); + +#define bs_r_2_s_proto(f) \ +u_int16_t __bs_c(f,_bs_r_2_s) (void *t, bus_space_handle_t bsh, \ + bus_size_t offset); + +#define bs_r_4_s_proto(f) \ +u_int32_t __bs_c(f,_bs_r_4_s) (void *t, bus_space_handle_t bsh, \ + bus_size_t offset); + #define bs_w_1_proto(f) \ void __bs_c(f,_bs_w_1) (void *t, bus_space_handle_t bsh, \ bus_size_t offset, u_int8_t value); @@ -419,6 +539,18 @@ void __bs_c(f,_bs_w_8) (void *t, bus_space_handle_t bsh, \ bus_size_t offset, u_int64_t value); +#define bs_w_1_s_proto(f) \ +void __bs_c(f,_bs_w_1_s) (void *t, bus_space_handle_t bsh, \ + bus_size_t offset, u_int8_t value); + +#define bs_w_2_s_proto(f) \ +void __bs_c(f,_bs_w_2_s) (void *t, bus_space_handle_t bsh, \ + bus_size_t offset, u_int16_t value); + +#define bs_w_4_s_proto(f) \ +void __bs_c(f,_bs_w_4_s) (void *t, bus_space_handle_t bsh, \ + bus_size_t offset, u_int32_t value); + #define bs_rm_1_proto(f) \ void __bs_c(f,_bs_rm_1) (void *t, bus_space_handle_t bsh, \ bus_size_t offset, u_int8_t *addr, bus_size_t count); @@ -547,10 +679,16 @@ bs_r_2_proto(f); \ bs_r_4_proto(f); \ bs_r_8_proto(f); \ +bs_r_1_s_proto(f); \ +bs_r_2_s_proto(f); \ +bs_r_4_s_proto(f); \ bs_w_1_proto(f); \ bs_w_2_proto(f); \ bs_w_4_proto(f); \ bs_w_8_proto(f); \ +bs_w_1_s_proto(f); \ +bs_w_2_s_proto(f); \ +bs_w_4_s_proto(f); \ bs_rm_1_proto(f); \ bs_rm_2_proto(f); \ bs_rm_4_proto(f); \ @@ -589,33 +727,6 @@ #define BUS_SPACE_MAXSIZE_32BIT 0xFFFFFFFF #define BUS_SPACE_MAXSIZE 0xFFFFFFFF -/* XXX: is this right ? */ -#define bus_space_read_stream_1(t, h, o) bus_space_read_1((t), (h), (o)) -#define bus_space_read_stream_2(t, h, o) bus_space_read_2((t), (h), (o)) -#define bus_space_read_stream_4(t, h, o) bus_space_read_4((t), (h), (o)) - -#define bus_space_read_multi_stream_1(t, h, o, a, c) \ - bus_space_read_multi_1((t), (h), (o), (a), (c)) -#define bus_space_read_multi_stream_2(t, h, o, a, c) \ - bus_space_read_multi_2((t), (h), (o), (a), (c)) -#define bus_space_read_multi_stream_4(t, h, o, a, c) \ - bus_space_read_multi_4((t), (h), (o), (a), (c)) - -#define bus_space_write_stream_1(t, h, o, v) \ - bus_space_write_1((t), (h), (o), (v)) -#define bus_space_write_stream_2(t, h, o, v) \ - bus_space_write_2((t), (h), (o), (v)) -#define bus_space_write_stream_4(t, h, o, v) \ - bus_space_write_4((t), (h), (o), (v)) - -#define bus_space_write_multi_stream_1(t, h, o, a, c) \ - bus_space_write_multi_1((t), (h), (o), (a), (c)) -#define bus_space_write_multi_stream_2(t, h, o, a, c) \ - bus_space_write_multi_2((t), (h), (o), (a), (c)) -#define bus_space_write_multi_stream_4(t, h, o, a, c) \ - bus_space_write_multi_4((t), (h), (o), (a), (c)) - - #include #endif /* _MACHINE_BUS_H_ */ ==== //depot/projects/arm/src/sys/arm/xscale/ixp425/ixp425_a4x_space.c#2 (text+ko) ==== @@ -67,71 +67,50 @@ struct bus_space ixp425_a4x_bs_tag = { /* cookie */ - (void *) 0, + .bs_cookie = (void *) 0, /* mapping/unmapping */ - ixp425_bs_map, - ixp425_bs_unmap, - ixp425_bs_subregion, + .bs_map = ixp425_bs_map, + .bs_unmap = ixp425_bs_unmap, + .bs_subregion = ixp425_bs_subregion, /* allocation/deallocation */ - ixp425_bs_alloc, /* not implemented */ - ixp425_bs_free, /* not implemented */ + .bs_alloc = ixp425_bs_alloc, /* XXX not implemented */ + .bs_free = ixp425_bs_free, /* XXX not implemented */ /* barrier */ - ixp425_bs_barrier, + .bs_barrier = ixp425_bs_barrier, /* read (single) */ - a4x_bs_r_1, - a4x_bs_r_2, - a4x_bs_r_4, - NULL, + .bs_r_1 = a4x_bs_r_1, + .bs_r_2 = a4x_bs_r_2, + .bs_r_4 = a4x_bs_r_4, /* read multiple */ - a4x_bs_rm_1, - a4x_bs_rm_2, - NULL, - NULL, + .bs_rm_1 = a4x_bs_rm_1, + .bs_rm_2 = a4x_bs_rm_2, /* read region */ - NULL, - NULL, - NULL, - NULL, + /* XXX not implemented */ /* write (single) */ - a4x_bs_w_1, - a4x_bs_w_2, - a4x_bs_w_4, - NULL, + .bs_w_1 = a4x_bs_w_1, + .bs_w_2 = a4x_bs_w_2, + .bs_w_4 = a4x_bs_w_4, /* write multiple */ - a4x_bs_wm_1, - a4x_bs_wm_2, - NULL, - NULL, + .bs_wm_1 = a4x_bs_wm_1, + .bs_wm_2 = a4x_bs_wm_2, /* write region */ - NULL, - NULL, - NULL, - NULL, + /* XXX not implemented */ /* set multiple */ - NULL, - NULL, - NULL, - NULL, + /* XXX not implemented */ /* set region */ - NULL, - NULL, - NULL, - NULL, + /* XXX not implemented */ /* copy */ - NULL, - NULL, - NULL, - NULL, + /* XXX not implemented */ }; ==== //depot/projects/arm/src/sys/arm/xscale/ixp425/ixp425_pci_space.c#2 (text+ko) ==== @@ -43,6 +43,7 @@ #include #include #include +#include #include @@ -71,130 +72,137 @@ bs_protos(ixp425_pci_mem); /* special I/O functions */ -inline u_int8_t _pci_io_bs_r_1(void *, bus_space_handle_t, bus_size_t); -inline u_int16_t _pci_io_bs_r_2(void *, bus_space_handle_t, bus_size_t); -inline u_int32_t _pci_io_bs_r_4(void *, bus_space_handle_t, bus_size_t); +static u_int8_t _pci_io_bs_r_1(void *, bus_space_handle_t, bus_size_t); +static u_int16_t _pci_io_bs_r_2(void *, bus_space_handle_t, bus_size_t); +static u_int32_t _pci_io_bs_r_4(void *, bus_space_handle_t, bus_size_t); + +static void _pci_io_bs_w_1(void *, bus_space_handle_t, bus_size_t, u_int8_t); +static void _pci_io_bs_w_2(void *, bus_space_handle_t, bus_size_t, u_int16_t); +static void _pci_io_bs_w_4(void *, bus_space_handle_t, bus_size_t, u_int32_t); + +#ifdef __ARMEB__ +static u_int8_t _pci_io_bs_r_1_s(void *, bus_space_handle_t, bus_size_t); +static u_int16_t _pci_io_bs_r_2_s(void *, bus_space_handle_t, bus_size_t); +static u_int32_t _pci_io_bs_r_4_s(void *, bus_space_handle_t, bus_size_t); + +static void _pci_io_bs_w_1_s(void *, bus_space_handle_t, bus_size_t, u_int8_t); +static void _pci_io_bs_w_2_s(void *, bus_space_handle_t, bus_size_t, u_int16_t); +static void _pci_io_bs_w_4_s(void *, bus_space_handle_t, bus_size_t, u_int32_t); -inline void _pci_io_bs_w_1(void *, bus_space_handle_t, bus_size_t, u_int8_t); -inline void _pci_io_bs_w_2(void *, bus_space_handle_t, bus_size_t, u_int16_t); -inline void _pci_io_bs_w_4(void *, bus_space_handle_t, bus_size_t, u_int32_t); +static u_int8_t _pci_mem_bs_r_1(void *, bus_space_handle_t, bus_size_t); +static u_int16_t _pci_mem_bs_r_2(void *, bus_space_handle_t, bus_size_t); +static u_int32_t _pci_mem_bs_r_4(void *, bus_space_handle_t, bus_size_t); -struct bus_space ixp425_pci_bs_tag_template = { - /* cookie */ - (void *) 0, +static void _pci_mem_bs_w_1(void *, bus_space_handle_t, bus_size_t, u_int8_t); +static void _pci_mem_bs_w_2(void *, bus_space_handle_t, bus_size_t, u_int16_t); +static void _pci_mem_bs_w_4(void *, bus_space_handle_t, bus_size_t, u_int32_t); +#endif +struct bus_space ixp425_pci_io_bs_tag_template = { /* mapping/unmapping */ - NULL, - NULL, - ixp425_pci_bs_subregion, + .bs_map = ixp425_pci_io_bs_map, + .bs_unmap = ixp425_pci_io_bs_unmap, + .bs_subregion = ixp425_pci_bs_subregion, - /* allocation/deallocation */ - NULL, - NULL, + .bs_alloc = ixp425_pci_io_bs_alloc, + .bs_free = ixp425_pci_io_bs_free, /* barrier */ - ixp425_pci_bs_barrier, + .bs_barrier = ixp425_pci_bs_barrier, + /* + * IXP425 processor does not have PCI I/O windows + */ /* read (single) */ - NULL, - NULL, - NULL, - NULL, - - /* read multiple */ - NULL, - NULL, - NULL, - NULL, - - /* read region */ - NULL, - NULL, - NULL, - NULL, + .bs_r_1 = _pci_io_bs_r_1, + .bs_r_2 = _pci_io_bs_r_2, + .bs_r_4 = _pci_io_bs_r_4, /* write (single) */ - NULL, - NULL, - NULL, - NULL, + .bs_w_1 = _pci_io_bs_w_1, + .bs_w_2 = _pci_io_bs_w_2, + .bs_w_4 = _pci_io_bs_w_4, - /* write multiple */ - NULL, - NULL, - NULL, - NULL, +#ifdef __ARMEB__ + .bs_r_1_s = _pci_io_bs_r_1_s, + .bs_r_2_s = _pci_io_bs_r_2_s, + .bs_r_4_s = _pci_io_bs_r_4_s, - /* write region */ - NULL, - NULL, - NULL, - NULL, + .bs_w_1_s = _pci_io_bs_w_1_s, + .bs_w_2_s = _pci_io_bs_w_2_s, + .bs_w_4_s = _pci_io_bs_w_4_s, +#else + .bs_r_1_s = _pci_io_bs_r_1, + .bs_r_2_s = _pci_io_bs_r_2, + .bs_r_4_s = _pci_io_bs_r_4, - /* set multiple */ - NULL, - NULL, - NULL, - NULL, - - /* set region */ - NULL, - NULL, - NULL, - NULL, - - /* copy */ - NULL, - NULL, - NULL, - NULL, + .bs_w_1_s = _pci_io_bs_w_1, + .bs_w_2_s = _pci_io_bs_w_2, + .bs_w_4_s = _pci_io_bs_w_4, +#endif }; void ixp425_io_bs_init(bus_space_tag_t bs, void *cookie) { - *bs = ixp425_pci_bs_tag_template; + *bs = ixp425_pci_io_bs_tag_template; bs->bs_cookie = cookie; +} + +struct bus_space ixp425_pci_mem_bs_tag_template = { + /* mapping/unmapping */ + .bs_map = ixp425_pci_mem_bs_map, + .bs_unmap = ixp425_pci_mem_bs_unmap, + .bs_subregion = ixp425_pci_bs_subregion, + + .bs_alloc = ixp425_pci_mem_bs_alloc, + .bs_free = ixp425_pci_mem_bs_free, + + /* barrier */ + .bs_barrier = ixp425_pci_bs_barrier, + +#ifdef __ARMEB__ + /* read (single) */ + .bs_r_1 = _pci_mem_bs_r_1, + .bs_r_2 = _pci_mem_bs_r_2, + .bs_r_4 = _pci_mem_bs_r_4, + + .bs_r_1_s = ixp425_pci_mem_bs_r_1, + .bs_r_2_s = ixp425_pci_mem_bs_r_2, + .bs_r_4_s = ixp425_pci_mem_bs_r_4, - bs->bs_map = ixp425_pci_io_bs_map; - bs->bs_unmap = ixp425_pci_io_bs_unmap; - bs->bs_alloc = ixp425_pci_io_bs_alloc; - bs->bs_free = ixp425_pci_io_bs_free; + /* write (single) */ + .bs_w_1 = _pci_mem_bs_w_1, + .bs_w_2 = _pci_mem_bs_w_2, + .bs_w_4 = _pci_mem_bs_w_4, - /* - * IXP425 processor does not have PCI I/O windows - */ + .bs_w_1_s = ixp425_pci_mem_bs_w_1, + .bs_w_2_s = ixp425_pci_mem_bs_w_2, + .bs_w_4_s = ixp425_pci_mem_bs_w_4, +#else /* read (single) */ - bs->bs_r_1 = _pci_io_bs_r_1; - bs->bs_r_2 = _pci_io_bs_r_2; - bs->bs_r_4 = _pci_io_bs_r_4; + .bs_r_1 = ixp425_pci_mem_bs_r_1, + .bs_r_2 = ixp425_pci_mem_bs_r_2, + .bs_r_4 = ixp425_pci_mem_bs_r_4, + .bs_r_1_s = ixp425_pci_mem_bs_r_1, + .bs_r_2_s = ixp425_pci_mem_bs_r_2, + .bs_r_4_s = ixp425_pci_mem_bs_r_4, /* write (single) */ - bs->bs_w_1 = _pci_io_bs_w_1; - bs->bs_w_2 = _pci_io_bs_w_2; - bs->bs_w_4 = _pci_io_bs_w_4; -} + .bs_w_1 = ixp425_pci_mem_bs_w_1, + .bs_w_2 = ixp425_pci_mem_bs_w_2, + .bs_w_4 = ixp425_pci_mem_bs_w_4, + .bs_w_1_s = ixp425_pci_mem_bs_w_1, + .bs_w_2_s = ixp425_pci_mem_bs_w_2, + .bs_w_4_s = ixp425_pci_mem_bs_w_4, +#endif +}; void ixp425_mem_bs_init(bus_space_tag_t bs, void *cookie) { - *bs = ixp425_pci_bs_tag_template; + *bs = ixp425_pci_mem_bs_tag_template; bs->bs_cookie = cookie; - - bs->bs_map = ixp425_pci_mem_bs_map; - bs->bs_unmap = ixp425_pci_mem_bs_unmap; - bs->bs_alloc = ixp425_pci_mem_bs_alloc; - bs->bs_free = ixp425_pci_mem_bs_free; - - /* read (single) */ - bs->bs_r_1 = ixp425_pci_mem_bs_r_1; - bs->bs_r_2 = ixp425_pci_mem_bs_r_2; - bs->bs_r_4 = ixp425_pci_mem_bs_r_4; - - /* write (single) */ - bs->bs_w_1 = ixp425_pci_mem_bs_w_1; - bs->bs_w_2 = ixp425_pci_mem_bs_w_2; - bs->bs_w_4 = ixp425_pci_mem_bs_w_4; } /* common routine */ @@ -243,56 +251,100 @@ } /* special I/O functions */ -#if 1 /* _pci_io_bs_{rw}_{124} */ -inline u_int8_t -_pci_io_bs_r_1(void *v, bus_space_handle_t ioh, bus_size_t off) +static __inline u_int32_t +_bs_r(void *v, bus_space_handle_t ioh, bus_size_t off, u_int32_t be) { - u_int32_t data, n, be; + u_int32_t data; - n = (ioh + off) % 4; - be = (0xf & ~(1U << n)) << NP_CBE_SHIFT; - CSR_WRITE_4(PCI_NP_AD, (ioh + off) & ~3); CSR_WRITE_4(PCI_NP_CBE, be | COMMAND_NP_IO_READ); data = CSR_READ_4(PCI_NP_RDATA); if (CSR_READ_4(PCI_ISR) & ISR_PFE) CSR_WRITE_4(PCI_ISR, ISR_PFE); + return data; +} + +static u_int8_t +_pci_io_bs_r_1(void *v, bus_space_handle_t ioh, bus_size_t off) +{ + u_int32_t data, n, be; + + n = (ioh + off) % 4; + be = (0xf & ~(1U << n)) << NP_CBE_SHIFT; + data = _bs_r(v, ioh, off, be); + return data >> (8 * n); } -inline u_int16_t +static u_int16_t _pci_io_bs_r_2(void *v, bus_space_handle_t ioh, bus_size_t off) { u_int32_t data, n, be; n = (ioh + off) % 4; be = (0xf & ~((1U << n) | (1U << (n + 1)))) << NP_CBE_SHIFT; + data = _bs_r(v, ioh, off, be); + + return data >> (8 * n); +} + +static u_int32_t +_pci_io_bs_r_4(void *v, bus_space_handle_t ioh, bus_size_t off) +{ + u_int32_t data; + + data = _bs_r(v, ioh, off, 0); + return le32toh(data); +} + +#ifdef __ARMEB__ +static u_int8_t +_pci_io_bs_r_1_s(void *v, bus_space_handle_t ioh, bus_size_t off) +{ + u_int32_t data, n, be; - CSR_WRITE_4(PCI_NP_AD, (ioh + off) & ~3); - CSR_WRITE_4(PCI_NP_CBE, be | COMMAND_NP_IO_READ); - data = CSR_READ_4(PCI_NP_RDATA); - if (CSR_READ_4(PCI_ISR) & ISR_PFE) - CSR_WRITE_4(PCI_ISR, ISR_PFE); + n = (ioh + off) % 4; + be = (0xf & ~(1U << n)) << NP_CBE_SHIFT; + data = _bs_r(v, ioh, off, be); + + return data >> (8 * n); +} + +static u_int16_t +_pci_io_bs_r_2_s(void *v, bus_space_handle_t ioh, bus_size_t off) +{ + u_int32_t data, n, be; + + n = (ioh + off) % 4; + be = (0xf & ~((1U << n) | (1U << (n + 1)))) << NP_CBE_SHIFT; + data = _bs_r(v, ioh, off, be); return data >> (8 * n); } -inline u_int32_t -_pci_io_bs_r_4(void *v, bus_space_handle_t ioh, bus_size_t off) +static u_int32_t +_pci_io_bs_r_4_s(void *v, bus_space_handle_t ioh, bus_size_t off) { u_int32_t data; + data = _bs_r(v, ioh, off, 0); + return data; +} +#endif /* __ARMEB__ */ + +static __inline void +_bs_w(void *v, bus_space_handle_t ioh, bus_size_t off, + u_int32_t be, u_int32_t data) +{ CSR_WRITE_4(PCI_NP_AD, (ioh + off) & ~3); - CSR_WRITE_4(PCI_NP_CBE, COMMAND_NP_IO_READ); - data = CSR_READ_4(PCI_NP_RDATA); + CSR_WRITE_4(PCI_NP_CBE, be | COMMAND_NP_IO_WRITE); + CSR_WRITE_4(PCI_NP_WDATA, data); if (CSR_READ_4(PCI_ISR) & ISR_PFE) CSR_WRITE_4(PCI_ISR, ISR_PFE); - - return data; } -inline void +static void _pci_io_bs_w_1(void *v, bus_space_handle_t ioh, bus_size_t off, u_int8_t val) { @@ -301,15 +353,10 @@ n = (ioh + off) % 4; be = (0xf & ~(1U << n)) << NP_CBE_SHIFT; data = val << (8 * n); - - CSR_WRITE_4(PCI_NP_AD, (ioh + off) & ~3); - CSR_WRITE_4(PCI_NP_CBE, be | COMMAND_NP_IO_WRITE); - CSR_WRITE_4(PCI_NP_WDATA, data); - if (CSR_READ_4(PCI_ISR) & ISR_PFE) - CSR_WRITE_4(PCI_ISR, ISR_PFE); + _bs_w(v, ioh, off, be, data); } -inline void +static void _pci_io_bs_w_2(void *v, bus_space_handle_t ioh, bus_size_t off, u_int16_t val) { @@ -318,25 +365,48 @@ n = (ioh + off) % 4; be = (0xf & ~((1U << n) | (1U << (n + 1)))) << NP_CBE_SHIFT; data = val << (8 * n); - - CSR_WRITE_4(PCI_NP_AD, (ioh + off) & ~3); - CSR_WRITE_4(PCI_NP_CBE, be | COMMAND_NP_IO_WRITE); - CSR_WRITE_4(PCI_NP_WDATA, data); - if (CSR_READ_4(PCI_ISR) & ISR_PFE) - CSR_WRITE_4(PCI_ISR, ISR_PFE); + _bs_w(v, ioh, off, be, data); } -inline void +static void _pci_io_bs_w_4(void *v, bus_space_handle_t ioh, bus_size_t off, u_int32_t val) { - CSR_WRITE_4(PCI_NP_AD, (ioh + off) & ~3); - CSR_WRITE_4(PCI_NP_CBE, COMMAND_NP_IO_WRITE); - CSR_WRITE_4(PCI_NP_WDATA, val); - if (CSR_READ_4(PCI_ISR) & ISR_PFE) - CSR_WRITE_4(PCI_ISR, ISR_PFE); + _bs_w(v, ioh, off, 0, htole32(val)); +} + +#ifdef __ARMEB__ +static void +_pci_io_bs_w_1_s(void *v, bus_space_handle_t ioh, bus_size_t off, + u_int8_t val) +{ + u_int32_t data, n, be; + + n = (ioh + off) % 4; + be = (0xf & ~(1U << n)) << NP_CBE_SHIFT; + data = val << (8 * n); + _bs_w(v, ioh, off, be, data); +} + +static void +_pci_io_bs_w_2_s(void *v, bus_space_handle_t ioh, bus_size_t off, + u_int16_t val) +{ + u_int32_t data, n, be; + + n = (ioh + off) % 4; + be = (0xf & ~((1U << n) | (1U << (n + 1)))) << NP_CBE_SHIFT; + data = val << (8 * n); + _bs_w(v, ioh, off, be, data); +} + +static void +_pci_io_bs_w_4_s(void *v, bus_space_handle_t ioh, bus_size_t off, + u_int32_t val) +{ + _bs_w(v, ioh, off, 0, val); } -#endif /* _pci_io_bs_{rw}_{124} */ +#endif /* __ARMEB__ */ /* mem bs */ int @@ -379,4 +449,48 @@ panic("ixp425_mem_bs_free(): not implemented\n"); } +#ifdef __ARMEB__ +static u_int8_t +_pci_mem_bs_r_1(void *v, bus_space_handle_t ioh, bus_size_t off) +{ + return ixp425_pci_mem_bs_r_1(v, ioh, off); +} + +static u_int16_t +_pci_mem_bs_r_2(void *v, bus_space_handle_t ioh, bus_size_t off) +{ + return ixp425_pci_mem_bs_r_2(v, ioh, off); +} + +static u_int32_t +_pci_mem_bs_r_4(void *v, bus_space_handle_t ioh, bus_size_t off) +{ + u_int32_t data; + + data = ixp425_pci_mem_bs_r_4(v, ioh, off); + return le32toh(data); +} + +static void +_pci_mem_bs_w_1(void *v, bus_space_handle_t ioh, bus_size_t off, + u_int8_t val) +{ + ixp425_pci_mem_bs_w_1(v, ioh, off, val); +} + +static void +_pci_mem_bs_w_2(void *v, bus_space_handle_t ioh, bus_size_t off, + u_int16_t val) +{ + ixp425_pci_mem_bs_w_2(v, ioh, off, val); +} + +static void +_pci_mem_bs_w_4(void *v, bus_space_handle_t ioh, bus_size_t off, + u_int32_t val) +{ + ixp425_pci_mem_bs_w_4(v, ioh, off, htole32(val)); +} +#endif /* __ARMEB__ */ + /* End of ixp425_pci_space.c */ ==== //depot/projects/arm/src/sys/arm/xscale/ixp425/ixp425_space.c#2 (text+ko) ==== @@ -64,73 +64,70 @@ struct bus_space ixp425_bs_tag = { /* cookie */ - (void *) 0, + .bs_cookie = (void *) 0, /* mapping/unmapping */ - ixp425_bs_map, - ixp425_bs_unmap, - ixp425_bs_subregion, + .bs_map = ixp425_bs_map, + .bs_unmap = ixp425_bs_unmap, + .bs_subregion = ixp425_bs_subregion, /* allocation/deallocation */ - ixp425_bs_alloc, - ixp425_bs_free, + .bs_alloc = ixp425_bs_alloc, + .bs_free = ixp425_bs_free, /* barrier */ - ixp425_bs_barrier, + .bs_barrier = ixp425_bs_barrier, /* read (single) */ - generic_bs_r_1, - generic_armv4_bs_r_2, - generic_bs_r_4, - NULL, + .bs_r_1 = generic_bs_r_1, + .bs_r_2 = generic_armv4_bs_r_2, + .bs_r_4 = generic_bs_r_4, + .bs_r_8 = NULL, /* read multiple */ - generic_bs_rm_1, - generic_armv4_bs_rm_2, - generic_bs_rm_4, - NULL, + .bs_rm_1 = generic_bs_rm_1, + .bs_rm_2 = generic_armv4_bs_rm_2, + .bs_rm_4 = generic_bs_rm_4, + .bs_rm_8 = NULL, /* read region */ - generic_bs_rr_1, - generic_armv4_bs_rr_2, - generic_bs_rr_4, - NULL, + .bs_rr_1 = generic_bs_rr_1, + .bs_rr_2 = generic_armv4_bs_rr_2, + .bs_rr_4 = generic_bs_rr_4, + .bs_rr_8 = NULL, /* write (single) */ - generic_bs_w_1, - generic_armv4_bs_w_2, - generic_bs_w_4, - NULL, + .bs_w_1 = generic_bs_w_1, + .bs_w_2 = generic_armv4_bs_w_2, + .bs_w_4 = generic_bs_w_4, + .bs_w_8 = NULL, /* write multiple */ - generic_bs_wm_1, - generic_armv4_bs_wm_2, - generic_bs_wm_4, - NULL, + .bs_wm_1 = generic_bs_wm_1, + .bs_wm_2 = generic_armv4_bs_wm_2, + .bs_wm_4 = generic_bs_wm_4, + .bs_wm_8 = NULL, /* write region */ - generic_bs_wr_1, - generic_armv4_bs_wr_2, - generic_bs_wr_4, - NULL, + .bs_wr_1 = generic_bs_wr_1, + .bs_wr_2 = generic_armv4_bs_wr_2, + .bs_wr_4 = generic_bs_wr_4, + .bs_wr_8 = NULL, /* set multiple */ - NULL, - NULL, - NULL, - NULL, + /* XXX not implemented */ /* set region */ - NULL, - generic_armv4_bs_sr_2, - generic_bs_sr_4, - NULL, + .bs_sr_1 = NULL, + .bs_sr_2 = generic_armv4_bs_sr_2, + .bs_sr_4 = generic_bs_sr_4, + .bs_sr_8 = NULL, /* copy */ - NULL, - generic_armv4_bs_c_2, - NULL, - NULL, + .bs_c_1 = NULL, + .bs_c_2 = generic_armv4_bs_c_2, + .bs_c_4 = NULL, + .bs_c_8 = NULL, }; int From owner-p4-projects@FreeBSD.ORG Wed Jul 26 00:17:15 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5BF3916A4DD; Wed, 26 Jul 2006 00:17:15 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 0F52E16A4E0; Wed, 26 Jul 2006 00:17:15 +0000 (UTC) (envelope-from rwatson@FreeBSD.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id 2532543D66; Wed, 26 Jul 2006 00:17:13 +0000 (GMT) (envelope-from rwatson@FreeBSD.org) Received: from fledge.watson.org (fledge.watson.org [209.31.154.41]) by cyrus.watson.org (Postfix) with ESMTP id C243946BE9; Tue, 25 Jul 2006 20:17:12 -0400 (EDT) Date: Wed, 26 Jul 2006 01:17:12 +0100 (BST) From: Robert Watson X-X-Sender: robert@fledge.watson.org To: John Birrell In-Reply-To: <200607251943.k6PJhaQR094011@repoman.freebsd.org> Message-ID: <20060726011626.U4612@fledge.watson.org> References: <200607251943.k6PJhaQR094011@repoman.freebsd.org> MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII; format=flowed Cc: Perforce Change Reviews Subject: Re: PERFORCE change 102405 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 26 Jul 2006 00:17:15 -0000 On Tue, 25 Jul 2006, John Birrell wrote: > http://perforce.freebsd.org/chv.cgi?CH=102405 > > Change 102405 by jb@jb_freebsd2 on 2006/07/25 19:43:01 > > Support 32 CPUs instead of just 16. > > I guess the author thought that 16 was a *big* number. 8-) The libmemstat(3) limit is based on the MAXCPU value. Feel free to bump the libmemstat limit in CVS also. Robert N M Watson Computer Laboratory University of Cambridge From owner-p4-projects@FreeBSD.ORG Wed Jul 26 00:54:27 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E5E4816A4E0; Wed, 26 Jul 2006 00:54:26 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id BE1C916A4DA for ; Wed, 26 Jul 2006 00:54:26 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 6FED843D45 for ; Wed, 26 Jul 2006 00:54:26 +0000 (GMT) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k6Q0sQtC034496 for ; Wed, 26 Jul 2006 00:54:26 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k6Q0sQ0W034493 for perforce@freebsd.org; Wed, 26 Jul 2006 00:54:26 GMT (envelope-from jhb@freebsd.org) Date: Wed, 26 Jul 2006 00:54:26 GMT Message-Id: <200607260054.k6Q0sQ0W034493@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 Cc: Subject: PERFORCE change 102423 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 26 Jul 2006 00:54:27 -0000 http://perforce.freebsd.org/chv.cgi?CH=102423 Change 102423 by jhb@jhb_mutex on 2006/07/26 00:53:41 Another test kernel module that runs tests triggered via a sysctl. This one runs the events synchronously rather than off in a kthread. For now it has 2 tests to test leaking a lock from a syscall to validate the td_locks stuff I just submitted to this tree yesterday. Affected files ... .. //depot/projects/smpng/sys/modules/crash3/Makefile#1 add .. //depot/projects/smpng/sys/modules/crash3/crash3.c#1 add Differences ... From owner-p4-projects@FreeBSD.ORG Wed Jul 26 01:36:20 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 00BB616A4E1; Wed, 26 Jul 2006 01:36:20 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 9714616A4DE for ; Wed, 26 Jul 2006 01:36:19 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 3812643D49 for ; Wed, 26 Jul 2006 01:36:19 +0000 (GMT) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k6Q1aJiG038765 for ; Wed, 26 Jul 2006 01:36:19 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k6Q1aI6u038762 for perforce@freebsd.org; Wed, 26 Jul 2006 01:36:18 GMT (envelope-from jhb@freebsd.org) Date: Wed, 26 Jul 2006 01:36:18 GMT Message-Id: <200607260136.k6Q1aI6u038762@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 Cc: Subject: PERFORCE change 102424 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 26 Jul 2006 01:36:20 -0000 http://perforce.freebsd.org/chv.cgi?CH=102424 Change 102424 by jhb@jhb_mutex on 2006/07/26 01:35:17 Add a 'kldstat' ddb command complete with a '/v' option that mimics 'kldstat -v'. Affected files ... .. //depot/projects/smpng/sys/kern/kern_linker.c#80 edit .. //depot/projects/smpng/sys/kern/kern_module.c#22 edit .. //depot/projects/smpng/sys/sys/module.h#8 edit Differences ... ==== //depot/projects/smpng/sys/kern/kern_linker.c#80 (text+ko) ==== @@ -54,6 +54,10 @@ #include "linker_if.h" +#ifdef DDB +#include +#endif + #ifdef HWPMC_HOOKS #include #endif @@ -2012,3 +2016,28 @@ SYSCTL_PROC(_kern, OID_AUTO, function_list, CTLFLAG_RD, NULL, 0, sysctl_kern_function_list, "", "kernel function list"); + +#ifdef DDB +DB_COMMAND(kldstat, db_kldstat) +{ + linker_file_t lf; + int verbose; + + verbose = index(modif, 'v') != NULL; +#ifdef __LP64__ + db_printf("Id Refs Address Size Name\n"); +#else + db_printf("Id Refs Address Size Name\n"); +#endif + TAILQ_FOREACH(lf, &linker_files, link) { + if (db_pager_quit) + return; + db_printf("%2d %4d %p %-8zx %s\n", lf->id, lf->refs, + lf->address, lf->size, lf->filename); + if (!verbose) + continue; + db_printf(" Contains modules:\n"); + db_show_modules(lf, " "); + } +} +#endif ==== //depot/projects/smpng/sys/kern/kern_module.c#22 (text+ko) ==== @@ -25,6 +25,7 @@ */ #include "opt_compat.h" +#include "opt_ddb.h" #include __FBSDID("$FreeBSD: src/sys/kern/kern_module.c,v 1.51 2006/06/26 18:34:45 jhb Exp $"); @@ -44,6 +45,10 @@ #include #include +#ifdef DDB +#include +#endif + static MALLOC_DEFINE(M_MODULE, "module", "module data structures"); typedef TAILQ_HEAD(, module) modulelist_t; @@ -504,3 +509,18 @@ return (error); } #endif + +#ifdef DDB +void +db_show_modules(linker_file_t lf, const char *prefix) +{ + module_t mod; + + db_printf("%sId Name\n", prefix); + TAILQ_FOREACH(mod, &lf->modules, flink) { + if (db_pager_quit) + return; + db_printf("%s%-4d %s\n", prefix, mod->id, mod->name); + } +} +#endif ==== //depot/projects/smpng/sys/sys/module.h#8 (text+ko) ==== @@ -148,6 +148,9 @@ module_t module_getfnext(module_t); void module_setspecific(module_t, modspecific_t *); struct linker_file *module_file(module_t); +#ifdef DDB +void db_show_modules(struct linker_file *, const char *); +#endif #ifdef MOD_DEBUG extern int mod_debug; From owner-p4-projects@FreeBSD.ORG Wed Jul 26 08:16:52 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 87C9F16A4E0; Wed, 26 Jul 2006 08:16:52 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 4742216A4DA for ; Wed, 26 Jul 2006 08:16:52 +0000 (UTC) (envelope-from cdjones@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 0423943D53 for ; Wed, 26 Jul 2006 08:16:52 +0000 (GMT) (envelope-from cdjones@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k6Q8GpBB079715 for ; Wed, 26 Jul 2006 08:16:51 GMT (envelope-from cdjones@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k6Q8GpIr079711 for perforce@freebsd.org; Wed, 26 Jul 2006 08:16:51 GMT (envelope-from cdjones@FreeBSD.org) Date: Wed, 26 Jul 2006 08:16:51 GMT Message-Id: <200607260816.k6Q8GpIr079711@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to cdjones@FreeBSD.org using -f From: Chris Jones To: Perforce Change Reviews Cc: Subject: PERFORCE change 102438 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 26 Jul 2006 08:16:52 -0000 http://perforce.freebsd.org/chv.cgi?CH=102438 Change 102438 by cdjones@cdjones-impulse on 2006/07/26 08:16:11 Bring VM tree in for slotting memory limits in. While at it, update the rest of the tree as req'd. Affected files ... .. //depot/projects/soc2006/cdjones_jail/src/sys/kern/bus_if.m#5 integrate .. //depot/projects/soc2006/cdjones_jail/src/sys/kern/kern_synch.c#6 integrate .. //depot/projects/soc2006/cdjones_jail/src/sys/kern/subr_bus.c#6 integrate .. //depot/projects/soc2006/cdjones_jail/src/sys/kern/subr_taskqueue.c#5 integrate .. //depot/projects/soc2006/cdjones_jail/src/sys/kern/sysv_shm.c#6 integrate .. //depot/projects/soc2006/cdjones_jail/src/sys/kern/uipc_usrreq.c#6 integrate .. //depot/projects/soc2006/cdjones_jail/src/sys/kern/vfs_subr.c#6 integrate .. //depot/projects/soc2006/cdjones_jail/src/sys/kern/vfs_vnops.c#5 integrate .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/bus.h#5 integrate .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/gpt.h#5 integrate .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/param.h#5 integrate .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/sysctl.h#5 integrate .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/systm.h#5 integrate .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/taskqueue.h#5 integrate .. //depot/projects/soc2006/cdjones_jail/src/sys/vm/default_pager.c#1 branch .. //depot/projects/soc2006/cdjones_jail/src/sys/vm/device_pager.c#1 branch .. //depot/projects/soc2006/cdjones_jail/src/sys/vm/memguard.c#1 branch .. //depot/projects/soc2006/cdjones_jail/src/sys/vm/memguard.h#1 branch .. //depot/projects/soc2006/cdjones_jail/src/sys/vm/phys_pager.c#1 branch .. //depot/projects/soc2006/cdjones_jail/src/sys/vm/pmap.h#1 branch .. //depot/projects/soc2006/cdjones_jail/src/sys/vm/swap_pager.c#1 branch .. //depot/projects/soc2006/cdjones_jail/src/sys/vm/swap_pager.h#1 branch .. //depot/projects/soc2006/cdjones_jail/src/sys/vm/uma.h#1 branch .. //depot/projects/soc2006/cdjones_jail/src/sys/vm/uma_core.c#1 branch .. //depot/projects/soc2006/cdjones_jail/src/sys/vm/uma_dbg.c#1 branch .. //depot/projects/soc2006/cdjones_jail/src/sys/vm/uma_dbg.h#1 branch .. //depot/projects/soc2006/cdjones_jail/src/sys/vm/uma_int.h#1 branch .. //depot/projects/soc2006/cdjones_jail/src/sys/vm/vm.h#1 branch .. //depot/projects/soc2006/cdjones_jail/src/sys/vm/vm_contig.c#1 branch .. //depot/projects/soc2006/cdjones_jail/src/sys/vm/vm_extern.h#1 branch .. //depot/projects/soc2006/cdjones_jail/src/sys/vm/vm_fault.c#1 branch .. //depot/projects/soc2006/cdjones_jail/src/sys/vm/vm_glue.c#1 branch .. //depot/projects/soc2006/cdjones_jail/src/sys/vm/vm_init.c#1 branch .. //depot/projects/soc2006/cdjones_jail/src/sys/vm/vm_kern.c#1 branch .. //depot/projects/soc2006/cdjones_jail/src/sys/vm/vm_kern.h#1 branch .. //depot/projects/soc2006/cdjones_jail/src/sys/vm/vm_map.c#1 branch .. //depot/projects/soc2006/cdjones_jail/src/sys/vm/vm_map.h#1 branch .. //depot/projects/soc2006/cdjones_jail/src/sys/vm/vm_meter.c#1 branch .. //depot/projects/soc2006/cdjones_jail/src/sys/vm/vm_mmap.c#1 branch .. //depot/projects/soc2006/cdjones_jail/src/sys/vm/vm_object.c#1 branch .. //depot/projects/soc2006/cdjones_jail/src/sys/vm/vm_object.h#1 branch .. //depot/projects/soc2006/cdjones_jail/src/sys/vm/vm_page.c#1 branch .. //depot/projects/soc2006/cdjones_jail/src/sys/vm/vm_page.h#1 branch .. //depot/projects/soc2006/cdjones_jail/src/sys/vm/vm_pageout.h#1 branch .. //depot/projects/soc2006/cdjones_jail/src/sys/vm/vm_pageq.c#1 branch .. //depot/projects/soc2006/cdjones_jail/src/sys/vm/vm_pager.c#1 branch .. //depot/projects/soc2006/cdjones_jail/src/sys/vm/vm_pager.h#1 branch .. //depot/projects/soc2006/cdjones_jail/src/sys/vm/vm_param.h#1 branch .. //depot/projects/soc2006/cdjones_jail/src/sys/vm/vm_unix.c#1 branch .. //depot/projects/soc2006/cdjones_jail/src/sys/vm/vm_zeroidle.c#1 branch .. //depot/projects/soc2006/cdjones_jail/src/sys/vm/vnode_pager.c#1 branch .. //depot/projects/soc2006/cdjones_jail/src/sys/vm/vnode_pager.h#1 branch Differences ... ==== //depot/projects/soc2006/cdjones_jail/src/sys/kern/bus_if.m#5 (text+ko) ==== @@ -23,7 +23,7 @@ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # -# $FreeBSD: src/sys/kern/bus_if.m,v 1.29 2005/01/06 23:35:38 imp Exp $ +# $FreeBSD: src/sys/kern/bus_if.m,v 1.29.2.1 2006/07/12 22:57:57 imp Exp $ # #include @@ -507,3 +507,25 @@ enum intr_trigger _trig; enum intr_polarity _pol; } DEFAULT bus_generic_config_intr; + +/** + * @brief Notify a (bus) driver about a child that the hints mechanism + * believes it has discovered. + * + * The bus is responsible for then adding the child in the right order + * and discovering other things about the child. The bus driver is + * free to ignore this hint, to do special things, etc. It is all up + * to the bus driver to interpret. + * + * This method is only called in response to the parent bus asking for + * hinted devices to be enumerated. + * + * @param _dev the bus device + * @param _dname the name of the device w/o unit numbers + * @param _dunit the unit number of the device + */ +METHOD void hinted_child { + device_t _dev; + const char * _dname; + int _dunit; +}; ==== //depot/projects/soc2006/cdjones_jail/src/sys/kern/kern_synch.c#6 (text+ko) ==== @@ -35,7 +35,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/kern_synch.c,v 1.270.2.5 2006/06/16 22:11:55 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/kern_synch.c,v 1.270.2.6 2006/07/06 08:32:50 glebius Exp $"); #include "opt_ktrace.h" @@ -223,6 +223,88 @@ return (rval); } +int +msleep_spin(ident, mtx, wmesg, timo) + void *ident; + struct mtx *mtx; + const char *wmesg; + int timo; +{ + struct thread *td; + struct proc *p; + int rval; + WITNESS_SAVE_DECL(mtx); + + td = curthread; + p = td->td_proc; + KASSERT(mtx != NULL, ("sleeping without a mutex")); + KASSERT(p != NULL, ("msleep1")); + KASSERT(ident != NULL && TD_IS_RUNNING(td), ("msleep")); + + if (cold) { + /* + * During autoconfiguration, just return; + * don't run any other threads or panic below, + * in case this is the idle thread and already asleep. + * XXX: this used to do "s = splhigh(); splx(safepri); + * splx(s);" to give interrupts a chance, but there is + * no way to give interrupts a chance now. + */ + return (0); + } + + sleepq_lock(ident); + CTR5(KTR_PROC, "msleep_spin: thread %p (pid %ld, %s) on %s (%p)", + (void *)td, (long)p->p_pid, p->p_comm, wmesg, ident); + + DROP_GIANT(); + mtx_assert(mtx, MA_OWNED | MA_NOTRECURSED); + WITNESS_SAVE(&mtx->mtx_object, mtx); + mtx_unlock_spin(mtx); + + /* + * We put ourselves on the sleep queue and start our timeout. + */ + sleepq_add(ident, mtx, wmesg, SLEEPQ_MSLEEP); + if (timo) + sleepq_set_timeout(ident, timo); + + /* + * Can't call ktrace with any spin locks held so it can lock the + * ktrace_mtx lock, and WITNESS_WARN considers it an error to hold + * any spin lock. Thus, we have to drop the sleepq spin lock while + * we handle those requests. This is safe since we have placed our + * thread on the sleep queue already. + */ +#ifdef KTRACE + if (KTRPOINT(td, KTR_CSW)) { + sleepq_release(ident); + ktrcsw(1, 0); + sleepq_lock(ident); + } +#endif +#ifdef WITNESS + sleepq_release(ident); + WITNESS_WARN(WARN_GIANTOK | WARN_SLEEPOK, NULL, "Sleeping on \"%s\"", + wmesg); + sleepq_lock(ident); +#endif + if (timo) + rval = sleepq_timedwait(ident); + else { + sleepq_wait(ident); + rval = 0; + } +#ifdef KTRACE + if (KTRPOINT(td, KTR_CSW)) + ktrcsw(0, 0); +#endif + PICKUP_GIANT(); + mtx_lock_spin(mtx); + WITNESS_RESTORE(&mtx->mtx_object, mtx); + return (rval); +} + /* * Make all threads sleeping on the specified identifier runnable. */ ==== //depot/projects/soc2006/cdjones_jail/src/sys/kern/subr_bus.c#6 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/subr_bus.c,v 1.184.2.1 2005/10/06 23:15:18 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/subr_bus.c,v 1.184.2.3 2006/07/15 22:53:53 njl Exp $"); #include "opt_bus.h" @@ -3556,7 +3556,19 @@ return (BUS_CHILD_LOCATION_STR(parent, child, buf, buflen)); } +/* Resume all devices and then notify userland that we're up again. */ static int +root_resume(device_t dev) +{ + int error; + + error = bus_generic_resume(dev); + if (error == 0) + devctl_notify("kern", "power", "resume", NULL); + return (error); +} + +static int root_print_child(device_t dev, device_t child) { int retval = 0; @@ -3594,7 +3606,7 @@ /* Device interface */ KOBJMETHOD(device_shutdown, bus_generic_shutdown), KOBJMETHOD(device_suspend, bus_generic_suspend), - KOBJMETHOD(device_resume, bus_generic_resume), + KOBJMETHOD(device_resume, root_resume), /* Bus interface */ KOBJMETHOD(bus_print_child, root_print_child), @@ -3745,6 +3757,40 @@ return (error); } +/** + * @brief Enumerate all hinted devices for this bus. + * + * Walks throught he hints for this bus and calls the bus_hinted_child + * routine for each one it fines. It searches first for the specific + * bus that's being probed for hinted children (eg isa0), and then for + * generic children (eg isa). + * + * @param dev bus device to enumerate + */ +void +bus_enumerate_hinted_children(device_t bus) +{ + int i; + const char *dname, *busname; + int dunit; + + /* + * enumerate all devices on the specific bus + */ + busname = device_get_nameunit(bus); + i = 0; + while (resource_find_match(&i, &dname, &dunit, "at", busname) == 0) + BUS_HINTED_CHILD(bus, dname, dunit); + + /* + * and all the generic ones. + */ + busname = device_get_name(bus); + i = 0; + while (resource_find_match(&i, &dname, &dunit, "at", busname) == 0) + BUS_HINTED_CHILD(bus, dname, dunit); +} + #ifdef BUS_DEBUG /* the _short versions avoid iteration by not calling anything that prints ==== //depot/projects/soc2006/cdjones_jail/src/sys/kern/subr_taskqueue.c#5 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/subr_taskqueue.c,v 1.27.2.3 2006/04/02 00:14:57 sam Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/subr_taskqueue.c,v 1.27.2.4 2006/07/06 08:32:50 glebius Exp $"); #include #include @@ -37,8 +37,10 @@ #include #include #include +#include #include #include +#include static MALLOC_DEFINE(M_TASKQUEUE, "taskqueue", "Task Queues"); static void *taskqueue_giant_ih; @@ -55,10 +57,42 @@ struct task *tq_running; struct mtx tq_mutex; struct proc **tq_pproc; + int tq_pcount; + int tq_spin; + int tq_flags; }; +#define TQ_FLAGS_ACTIVE (1 << 0) + +static __inline void +TQ_LOCK(struct taskqueue *tq) +{ + if (tq->tq_spin) + mtx_lock_spin(&tq->tq_mutex); + else + mtx_lock(&tq->tq_mutex); +} + +static __inline void +TQ_UNLOCK(struct taskqueue *tq) +{ + if (tq->tq_spin) + mtx_unlock_spin(&tq->tq_mutex); + else + mtx_unlock(&tq->tq_mutex); +} + static void init_taskqueue_list(void *data); +static __inline int +TQ_SLEEP(struct taskqueue *tq, void *p, struct mtx *m, int pri, const char *wm, + int t) +{ + if (tq->tq_spin) + return (msleep_spin(p, m, wm, t)); + return (msleep(p, m, pri, wm, t)); +} + static void init_taskqueue_list(void *data __unused) { @@ -69,10 +103,10 @@ SYSINIT(taskqueue_list, SI_SUB_INTRINSIC, SI_ORDER_ANY, init_taskqueue_list, NULL); -struct taskqueue * -taskqueue_create(const char *name, int mflags, +static struct taskqueue * +_taskqueue_create(const char *name, int mflags, taskqueue_enqueue_fn enqueue, void *context, - struct proc **pp) + int mtxflags, const char *mtxname) { struct taskqueue *queue; @@ -84,8 +118,9 @@ queue->tq_name = name; queue->tq_enqueue = enqueue; queue->tq_context = context; - queue->tq_pproc = pp; - mtx_init(&queue->tq_mutex, "taskqueue", NULL, MTX_DEF); + queue->tq_spin = (mtxflags & MTX_SPIN) != 0; + queue->tq_flags |= TQ_FLAGS_ACTIVE; + mtx_init(&queue->tq_mutex, mtxname, NULL, mtxflags); mtx_lock(&taskqueue_queues_mutex); STAILQ_INSERT_TAIL(&taskqueue_queues, queue, tq_link); @@ -94,23 +129,26 @@ return queue; } +struct taskqueue * +taskqueue_create(const char *name, int mflags, + taskqueue_enqueue_fn enqueue, void *context, + struct proc **pp) +{ + (void) pp; + return _taskqueue_create(name, mflags, enqueue, context, + MTX_DEF, "taskqueue"); +} + /* * Signal a taskqueue thread to terminate. */ static void taskqueue_terminate(struct proc **pp, struct taskqueue *tq) { - struct proc *p; - p = *pp; - *pp = NULL; - if (p) { - wakeup_one(tq); - PROC_LOCK(p); /* NB: insure we don't miss wakeup */ - mtx_unlock(&tq->tq_mutex); /* let taskqueue thread run */ - msleep(p, &p->p_mtx, PWAIT, "taskqueue_destroy", 0); - PROC_UNLOCK(p); - mtx_lock(&tq->tq_mutex); + while (tq->tq_pcount > 0) { + wakeup(tq); + TQ_SLEEP(tq, pp, &tq->tq_mutex, PWAIT, "taskqueue_destroy", 0); } } @@ -122,10 +160,12 @@ STAILQ_REMOVE(&taskqueue_queues, queue, taskqueue, tq_link); mtx_unlock(&taskqueue_queues_mutex); - mtx_lock(&queue->tq_mutex); + TQ_LOCK(queue); + queue->tq_flags &= ~TQ_FLAGS_ACTIVE; taskqueue_run(queue); taskqueue_terminate(queue->tq_pproc, queue); mtx_destroy(&queue->tq_mutex); + free(queue->tq_pproc, M_TASKQUEUE); free(queue, M_TASKQUEUE); } @@ -140,7 +180,7 @@ mtx_lock(&taskqueue_queues_mutex); STAILQ_FOREACH(queue, &taskqueue_queues, tq_link) { if (strcmp(queue->tq_name, name) == 0) { - mtx_lock(&queue->tq_mutex); + TQ_LOCK(queue); mtx_unlock(&taskqueue_queues_mutex); return queue; } @@ -155,14 +195,14 @@ struct task *ins; struct task *prev; - mtx_lock(&queue->tq_mutex); + TQ_LOCK(queue); /* * Count multiple enqueues. */ if (task->ta_pending) { task->ta_pending++; - mtx_unlock(&queue->tq_mutex); + TQ_UNLOCK(queue); return 0; } @@ -188,7 +228,7 @@ task->ta_pending = 1; queue->tq_enqueue(queue->tq_context); - mtx_unlock(&queue->tq_mutex); + TQ_UNLOCK(queue); return 0; } @@ -201,7 +241,7 @@ owned = mtx_owned(&queue->tq_mutex); if (!owned) - mtx_lock(&queue->tq_mutex); + TQ_LOCK(queue); while (STAILQ_FIRST(&queue->tq_queue)) { /* * Carefully remove the first task from the queue and @@ -212,11 +252,11 @@ pending = task->ta_pending; task->ta_pending = 0; queue->tq_running = task; - mtx_unlock(&queue->tq_mutex); + TQ_UNLOCK(queue); task->ta_func(task->ta_context, pending); - mtx_lock(&queue->tq_mutex); + TQ_LOCK(queue); queue->tq_running = NULL; wakeup(task); } @@ -226,18 +266,25 @@ * on entry, although this opens a race window. */ if (!owned) - mtx_unlock(&queue->tq_mutex); + TQ_UNLOCK(queue); } void taskqueue_drain(struct taskqueue *queue, struct task *task) { - WITNESS_WARN(WARN_GIANTOK | WARN_SLEEPOK, NULL, "taskqueue_drain"); + if (queue->tq_spin) { /* XXX */ + mtx_lock_spin(&queue->tq_mutex); + while (task->ta_pending != 0 || task == queue->tq_running) + msleep_spin(task, &queue->tq_mutex, "-", 0); + mtx_unlock_spin(&queue->tq_mutex); + } else { + WITNESS_WARN(WARN_GIANTOK | WARN_SLEEPOK, NULL, __func__); - mtx_lock(&queue->tq_mutex); - while (task->ta_pending != 0 || task == queue->tq_running) - msleep(task, &queue->tq_mutex, PWAIT, "-", 0); - mtx_unlock(&queue->tq_mutex); + mtx_lock(&queue->tq_mutex); + while (task->ta_pending != 0 || task == queue->tq_running) + msleep(task, &queue->tq_mutex, PWAIT, "-", 0); + mtx_unlock(&queue->tq_mutex); + } } static void @@ -264,6 +311,43 @@ taskqueue_run(taskqueue_swi_giant); } +int +taskqueue_start_threads(struct taskqueue **tqp, int count, int pri, + const char *name, ...) +{ + va_list ap; + struct taskqueue *tq; + char ktname[MAXCOMLEN]; + int i; + + if (count <= 0) + return (EINVAL); + tq = *tqp; + + if ((tq->tq_pproc = malloc(sizeof(struct proc *) * count, M_TASKQUEUE, + M_NOWAIT | M_ZERO)) == NULL) + return (ENOMEM); + + va_start(ap, name); + vsnprintf(ktname, MAXCOMLEN, name, ap); + va_end(ap); + + for (i = 0; i < count; i++) { + if (count == 1) + kthread_create(taskqueue_thread_loop, tqp, + &tq->tq_pproc[i], 0, 0, ktname); + else + kthread_create(taskqueue_thread_loop, tqp, + &tq->tq_pproc[i], 0, 0, "%s_%d", ktname, i); + mtx_lock_spin(&sched_lock); + sched_prio(FIRST_THREAD_IN_PROC(tq->tq_pproc[i]), pri); + mtx_unlock_spin(&sched_lock); + tq->tq_pcount++; + } + + return (0); +} + void taskqueue_thread_loop(void *arg) { @@ -271,15 +355,16 @@ tqp = arg; tq = *tqp; - mtx_lock(&tq->tq_mutex); + TQ_LOCK(tq); do { taskqueue_run(tq); - msleep(tq, &tq->tq_mutex, PWAIT, "-", 0); - } while (*tq->tq_pproc != NULL); + TQ_SLEEP(tq, tq, &tq->tq_mutex, curthread->td_priority, "-", 0); + } while ((tq->tq_flags & TQ_FLAGS_ACTIVE) != 0); /* rendezvous with thread that asked us to terminate */ - wakeup_one(tq); - mtx_unlock(&tq->tq_mutex); + tq->tq_pcount--; + wakeup_one(tq->tq_pproc); + TQ_UNLOCK(tq); kthread_exit(0); } @@ -300,85 +385,30 @@ INTR_MPSAFE, &taskqueue_ih)); TASKQUEUE_DEFINE(swi_giant, taskqueue_swi_giant_enqueue, 0, - swi_add(NULL, "Giant task queue", taskqueue_swi_giant_run, + swi_add(NULL, "Giant taskq", taskqueue_swi_giant_run, NULL, SWI_TQ_GIANT, 0, &taskqueue_giant_ih)); TASKQUEUE_DEFINE_THREAD(thread); -int -taskqueue_enqueue_fast(struct taskqueue *queue, struct task *task) +struct taskqueue * +taskqueue_create_fast(const char *name, int mflags, + taskqueue_enqueue_fn enqueue, void *context) { - struct task *ins; - struct task *prev; - - mtx_lock_spin(&queue->tq_mutex); - - /* - * Count multiple enqueues. - */ - if (task->ta_pending) { - task->ta_pending++; - mtx_unlock_spin(&queue->tq_mutex); - return 0; - } - - /* - * Optimise the case when all tasks have the same priority. - */ - prev = STAILQ_LAST(&queue->tq_queue, task, ta_link); - if (!prev || prev->ta_priority >= task->ta_priority) { - STAILQ_INSERT_TAIL(&queue->tq_queue, task, ta_link); - } else { - prev = 0; - for (ins = STAILQ_FIRST(&queue->tq_queue); ins; - prev = ins, ins = STAILQ_NEXT(ins, ta_link)) - if (ins->ta_priority < task->ta_priority) - break; - - if (prev) - STAILQ_INSERT_AFTER(&queue->tq_queue, prev, task, ta_link); - else - STAILQ_INSERT_HEAD(&queue->tq_queue, task, ta_link); - } - - task->ta_pending = 1; - queue->tq_enqueue(queue->tq_context); - - mtx_unlock_spin(&queue->tq_mutex); - - return 0; + return _taskqueue_create(name, mflags, enqueue, context, + MTX_SPIN, "fast_taskqueue"); } -static void -taskqueue_run_fast(struct taskqueue *queue) +/* NB: for backwards compatibility */ +int +taskqueue_enqueue_fast(struct taskqueue *queue, struct task *task) { - struct task *task; - int pending; - - mtx_lock_spin(&queue->tq_mutex); - while (STAILQ_FIRST(&queue->tq_queue)) { - /* - * Carefully remove the first task from the queue and - * zero its pending count. - */ - task = STAILQ_FIRST(&queue->tq_queue); - STAILQ_REMOVE_HEAD(&queue->tq_queue, ta_link); - pending = task->ta_pending; - task->ta_pending = 0; - mtx_unlock_spin(&queue->tq_mutex); - - task->ta_func(task->ta_context, pending); - - mtx_lock_spin(&queue->tq_mutex); - } - mtx_unlock_spin(&queue->tq_mutex); + return taskqueue_enqueue(queue, task); } -struct taskqueue *taskqueue_fast; static void *taskqueue_fast_ih; static void -taskqueue_fast_schedule(void *context) +taskqueue_fast_enqueue(void *context) { swi_sched(taskqueue_fast_ih, 0); } @@ -386,31 +416,9 @@ static void taskqueue_fast_run(void *dummy) { - taskqueue_run_fast(taskqueue_fast); + taskqueue_run(taskqueue_fast); } -static void -taskqueue_define_fast(void *arg) -{ - - taskqueue_fast = malloc(sizeof(struct taskqueue), M_TASKQUEUE, - M_NOWAIT | M_ZERO); - if (!taskqueue_fast) { - printf("%s: Unable to allocate fast task queue!\n", __func__); - return; - } - - STAILQ_INIT(&taskqueue_fast->tq_queue); - taskqueue_fast->tq_name = "fast"; - taskqueue_fast->tq_enqueue = taskqueue_fast_schedule; - mtx_init(&taskqueue_fast->tq_mutex, "taskqueue_fast", NULL, MTX_SPIN); - - mtx_lock(&taskqueue_queues_mutex); - STAILQ_INSERT_TAIL(&taskqueue_queues, taskqueue_fast, tq_link); - mtx_unlock(&taskqueue_queues_mutex); - - swi_add(NULL, "Fast task queue", taskqueue_fast_run, - NULL, SWI_TQ_FAST, INTR_MPSAFE, &taskqueue_fast_ih); -} -SYSINIT(taskqueue_fast, SI_SUB_CONFIGURE, SI_ORDER_SECOND, - taskqueue_define_fast, NULL); +TASKQUEUE_FAST_DEFINE(fast, taskqueue_fast_enqueue, 0, + swi_add(NULL, "Fast task queue", taskqueue_fast_run, NULL, + SWI_TQ_FAST, INTR_MPSAFE, &taskqueue_fast_ih)); ==== //depot/projects/soc2006/cdjones_jail/src/sys/kern/sysv_shm.c#6 (text+ko) ==== @@ -60,7 +60,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/sysv_shm.c,v 1.102.2.1 2006/05/15 18:47:52 ps Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/sysv_shm.c,v 1.102.2.2 2006/07/24 23:41:38 rwatson Exp $"); #include "opt_compat.h" #include "opt_sysvipc.h" @@ -732,12 +732,14 @@ } if ((uap->shmflg & (IPC_CREAT | IPC_EXCL)) == (IPC_CREAT | IPC_EXCL)) return (EEXIST); - error = ipcperm(td, &shmseg->u.shm_perm, mode); #ifdef MAC error = mac_check_sysv_shmget(td->td_ucred, shmseg, uap->shmflg); - if (error != 0) + if (error != 0) { MPRINTF(("mac_check_sysv_shmget returned %d\n", error)); + return (error); + } #endif + error = ipcperm(td, &shmseg->u.shm_perm, mode); if (error) return (error); if (uap->size && uap->size > shmseg->u.shm_segsz) ==== //depot/projects/soc2006/cdjones_jail/src/sys/kern/uipc_usrreq.c#6 (text+ko) ==== @@ -32,7 +32,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/uipc_usrreq.c,v 1.155.2.5 2006/05/21 09:12:24 maxim Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/uipc_usrreq.c,v 1.155.2.6 2006/07/13 13:42:37 maxim Exp $"); #include "opt_mac.h" @@ -1561,8 +1561,9 @@ struct mbuf * unp_addsockcred(struct thread *td, struct mbuf *control) { - struct mbuf *m, *n; + struct mbuf *m, *n, *n_prev; struct sockcred *sc; + const struct cmsghdr *cm; int ngroups; int i; @@ -1571,7 +1572,6 @@ m = sbcreatecontrol(NULL, SOCKCREDSIZE(ngroups), SCM_CREDS, SOL_SOCKET); if (m == NULL) return (control); - m->m_next = NULL; sc = (struct sockcred *) CMSG_DATA(mtod(m, struct cmsghdr *)); sc->sc_uid = td->td_ucred->cr_ruid; @@ -1583,16 +1583,30 @@ sc->sc_groups[i] = td->td_ucred->cr_groups[i]; /* - * If a control message already exists, append us to the end. + * Unlink SCM_CREDS control messages (struct cmsgcred), since + * just created SCM_CREDS control message (struct sockcred) has + * another format. */ - if (control != NULL) { - for (n = control; n->m_next != NULL; n = n->m_next) - ; - n->m_next = m; - } else - control = m; + if (control != NULL) + for (n = control, n_prev = NULL; n != NULL;) { + cm = mtod(n, struct cmsghdr *); + if (cm->cmsg_level == SOL_SOCKET && + cm->cmsg_type == SCM_CREDS) { + if (n_prev == NULL) + control = n->m_next; + else + n_prev->m_next = n->m_next; + n = m_free(n); + } else { + n_prev = n; + n = n->m_next; + } + } + + /* Prepend it to the head. */ + m->m_next = control; - return (control); + return (m); } /* ==== //depot/projects/soc2006/cdjones_jail/src/sys/kern/vfs_subr.c#6 (text+ko) ==== @@ -39,7 +39,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/vfs_subr.c,v 1.635.2.18 2006/05/13 14:01:35 pjd Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/vfs_subr.c,v 1.635.2.19 2006/07/05 16:34:16 kib Exp $"); #include "opt_ddb.h" #include "opt_mac.h" @@ -790,6 +790,7 @@ VNASSERT(bo->bo_dirty.bv_root == NULL, vp, ("dirtyblkroot not NULL")); VNASSERT(TAILQ_EMPTY(&vp->v_cache_dst), vp, ("vp has namecache dst")); VNASSERT(LIST_EMPTY(&vp->v_cache_src), vp, ("vp has namecache src")); + VI_UNLOCK(vp); #ifdef MAC mac_destroy_vnode(vp); #endif ==== //depot/projects/soc2006/cdjones_jail/src/sys/kern/vfs_vnops.c#5 (text+ko) ==== @@ -35,7 +35,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/vfs_vnops.c,v 1.233.2.2 2006/05/30 02:58:36 ps Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/vfs_vnops.c,v 1.233.2.3 2006/07/16 16:05:50 pjd Exp $"); #include "opt_mac.h" @@ -1070,23 +1070,19 @@ struct thread *td = curthread; int error; - error = 0; MNT_ILOCK(mp); - if (mp->mnt_kern_flag & MNTK_SUSPEND) - goto unlock; + if (mp->mnt_kern_flag & MNTK_SUSPEND) { + MNT_IUNLOCK(mp); + return (0); + } mp->mnt_kern_flag |= MNTK_SUSPEND; if (mp->mnt_writeopcount > 0) (void) msleep(&mp->mnt_writeopcount, MNT_MTX(mp), (PUSER - 1)|PDROP, "suspwt", 0); else MNT_IUNLOCK(mp); - if ((error = VFS_SYNC(mp, MNT_SUSPEND, td)) != 0) { + if ((error = VFS_SYNC(mp, MNT_SUSPEND, td)) != 0) vfs_write_resume(mp); - return (error); - } - MNT_ILOCK(mp); -unlock: - MNT_IUNLOCK(mp); return (error); } ==== //depot/projects/soc2006/cdjones_jail/src/sys/sys/bus.h#5 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/sys/bus.h,v 1.70 2005/04/12 15:20:36 imp Exp $ + * $FreeBSD: src/sys/sys/bus.h,v 1.70.2.2 2006/07/12 22:57:57 imp Exp $ */ #ifndef _SYS_BUS_H_ @@ -317,6 +317,7 @@ int bus_child_present(device_t child); int bus_child_pnpinfo_str(device_t child, char *buf, size_t buflen); int bus_child_location_str(device_t child, char *buf, size_t buflen); +void bus_enumerate_hinted_children(device_t bus); static __inline struct resource * bus_alloc_resource_any(device_t dev, int type, int *rid, u_int flags) @@ -513,6 +514,141 @@ ivarp ## _IVAR_ ## ivar, v); \ } +/** + * Shorthand macros, taking resource argument + */ + +#define bus_barrier(r, o, l, f) \ + bus_space_barrier(rman_get_bustag(r), rman_get_bushandle(r), (o), (l), (f)) +#define bus_read_1(r, o) \ + bus_space_read_1(rman_get_bustag(r), rman_get_bushandle(r), (o)) +#define bus_read_multi_1(r, o, d, c) \ + bus_space_read_multi_1(rman_get_bustag(r), rman_get_bushandle(r), (o), (d), (c)) +#define bus_read_region_1(r, o, d, c) \ + bus_space_read_region_1(rman_get_bustag(r), rman_get_bushandle(r), (o), (d), (c)) +#define bus_set_multi_1(r, o, v, c) \ + bus_space_set_multi_1(rman_get_bustag(r), rman_get_bushandle(r), (o), (v), (c)) +#define bus_set_region_1(r, o, v, c) \ + bus_space_set_region_1(rman_get_bustag(r), rman_get_bushandle(r), (o), (v), (c)) +#define bus_write_1(r, o, v) \ + bus_space_write_1(rman_get_bustag(r), rman_get_bushandle(r), (o), (v)) +#define bus_write_multi_1(r, o, d, c) \ + bus_space_write_multi_1(rman_get_bustag(r), rman_get_bushandle(r), (o), (d), (c)) +#define bus_write_region_1(r, o, d, c) \ + bus_space_write_region_1(rman_get_bustag(r), rman_get_bushandle(r), (o), (d), (c)) +#define bus_read_stream_1(r, o) \ + bus_space_read_stream_1(rman_get_bustag(r), rman_get_bushandle(r), (o)) +#define bus_read_multi_stream_1(r, o, d, c) \ + bus_space_read_multi_stream_1(rman_get_bustag(r), rman_get_bushandle(r), (o), (d), (c)) +#define bus_read_region_stream_1(r, o, d, c) \ + bus_space_read_region_stream_1(rman_get_bustag(r), rman_get_bushandle(r), (o), (d), (c)) +#define bus_set_multi_stream_1(r, o, v, c) \ + bus_space_set_multi_stream_1(rman_get_bustag(r), rman_get_bushandle(r), (o), (v), (c)) +#define bus_set_region_stream_1(r, o, v, c) \ + bus_space_set_region_stream_1(rman_get_bustag(r), rman_get_bushandle(r), (o), (v), (c)) +#define bus_write_stream_1(r, o, v) \ + bus_space_write_stream_1(rman_get_bustag(r), rman_get_bushandle(r), (o), (v)) +#define bus_write_multi_stream_1(r, o, d, c) \ + bus_space_write_multi_stream_1(rman_get_bustag(r), rman_get_bushandle(r), (o), (d), (c)) +#define bus_write_region_stream_1(r, o, d, c) \ + bus_space_write_region_stream_1(rman_get_bustag(r), rman_get_bushandle(r), (o), (d), (c)) +#define bus_read_2(r, o) \ + bus_space_read_2(rman_get_bustag(r), rman_get_bushandle(r), (o)) +#define bus_read_multi_2(r, o, d, c) \ + bus_space_read_multi_2(rman_get_bustag(r), rman_get_bushandle(r), (o), (d), (c)) +#define bus_read_region_2(r, o, d, c) \ + bus_space_read_region_2(rman_get_bustag(r), rman_get_bushandle(r), (o), (d), (c)) +#define bus_set_multi_2(r, o, v, c) \ + bus_space_set_multi_2(rman_get_bustag(r), rman_get_bushandle(r), (o), (v), (c)) +#define bus_set_region_2(r, o, v, c) \ + bus_space_set_region_2(rman_get_bustag(r), rman_get_bushandle(r), (o), (v), (c)) +#define bus_write_2(r, o, v) \ + bus_space_write_2(rman_get_bustag(r), rman_get_bushandle(r), (o), (v)) +#define bus_write_multi_2(r, o, d, c) \ + bus_space_write_multi_2(rman_get_bustag(r), rman_get_bushandle(r), (o), (d), (c)) +#define bus_write_region_2(r, o, d, c) \ + bus_space_write_region_2(rman_get_bustag(r), rman_get_bushandle(r), (o), (d), (c)) +#define bus_read_stream_2(r, o) \ + bus_space_read_stream_2(rman_get_bustag(r), rman_get_bushandle(r), (o)) +#define bus_read_multi_stream_2(r, o, d, c) \ + bus_space_read_multi_stream_2(rman_get_bustag(r), rman_get_bushandle(r), (o), (d), (c)) +#define bus_read_region_stream_2(r, o, d, c) \ + bus_space_read_region_stream_2(rman_get_bustag(r), rman_get_bushandle(r), (o), (d), (c)) +#define bus_set_multi_stream_2(r, o, v, c) \ + bus_space_set_multi_stream_2(rman_get_bustag(r), rman_get_bushandle(r), (o), (v), (c)) +#define bus_set_region_stream_2(r, o, v, c) \ + bus_space_set_region_stream_2(rman_get_bustag(r), rman_get_bushandle(r), (o), (v), (c)) +#define bus_write_stream_2(r, o, v) \ + bus_space_write_stream_2(rman_get_bustag(r), rman_get_bushandle(r), (o), (v)) +#define bus_write_multi_stream_2(r, o, d, c) \ + bus_space_write_multi_stream_2(rman_get_bustag(r), rman_get_bushandle(r), (o), (d), (c)) +#define bus_write_region_stream_2(r, o, d, c) \ + bus_space_write_region_stream_2(rman_get_bustag(r), rman_get_bushandle(r), (o), (d), (c)) +#define bus_read_4(r, o) \ + bus_space_read_4(rman_get_bustag(r), rman_get_bushandle(r), (o)) +#define bus_read_multi_4(r, o, d, c) \ + bus_space_read_multi_4(rman_get_bustag(r), rman_get_bushandle(r), (o), (d), (c)) +#define bus_read_region_4(r, o, d, c) \ + bus_space_read_region_4(rman_get_bustag(r), rman_get_bushandle(r), (o), (d), (c)) +#define bus_set_multi_4(r, o, v, c) \ + bus_space_set_multi_4(rman_get_bustag(r), rman_get_bushandle(r), (o), (v), (c)) +#define bus_set_region_4(r, o, v, c) \ + bus_space_set_region_4(rman_get_bustag(r), rman_get_bushandle(r), (o), (v), (c)) +#define bus_write_4(r, o, v) \ + bus_space_write_4(rman_get_bustag(r), rman_get_bushandle(r), (o), (v)) +#define bus_write_multi_4(r, o, d, c) \ + bus_space_write_multi_4(rman_get_bustag(r), rman_get_bushandle(r), (o), (d), (c)) +#define bus_write_region_4(r, o, d, c) \ + bus_space_write_region_4(rman_get_bustag(r), rman_get_bushandle(r), (o), (d), (c)) +#define bus_read_stream_4(r, o) \ + bus_space_read_stream_4(rman_get_bustag(r), rman_get_bushandle(r), (o)) +#define bus_read_multi_stream_4(r, o, d, c) \ + bus_space_read_multi_stream_4(rman_get_bustag(r), rman_get_bushandle(r), (o), (d), (c)) +#define bus_read_region_stream_4(r, o, d, c) \ + bus_space_read_region_stream_4(rman_get_bustag(r), rman_get_bushandle(r), (o), (d), (c)) +#define bus_set_multi_stream_4(r, o, v, c) \ + bus_space_set_multi_stream_4(rman_get_bustag(r), rman_get_bushandle(r), (o), (v), (c)) +#define bus_set_region_stream_4(r, o, v, c) \ + bus_space_set_region_stream_4(rman_get_bustag(r), rman_get_bushandle(r), (o), (v), (c)) +#define bus_write_stream_4(r, o, v) \ + bus_space_write_stream_4(rman_get_bustag(r), rman_get_bushandle(r), (o), (v)) +#define bus_write_multi_stream_4(r, o, d, c) \ + bus_space_write_multi_stream_4(rman_get_bustag(r), rman_get_bushandle(r), (o), (d), (c)) +#define bus_write_region_stream_4(r, o, d, c) \ + bus_space_write_region_stream_4(rman_get_bustag(r), rman_get_bushandle(r), (o), (d), (c)) +#define bus_read_8(r, o) \ >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Wed Jul 26 08:20:58 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7CF4A16A4E1; Wed, 26 Jul 2006 08:20:58 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 40D9D16A4DF for ; Wed, 26 Jul 2006 08:20:58 +0000 (UTC) (envelope-from cdjones@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 1019C43D53 for ; Wed, 26 Jul 2006 08:20:58 +0000 (GMT) (envelope-from cdjones@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k6Q8KvLD080059 for ; Wed, 26 Jul 2006 08:20:57 GMT (envelope-from cdjones@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k6Q8KvUq080056 for perforce@freebsd.org; Wed, 26 Jul 2006 08:20:57 GMT (envelope-from cdjones@FreeBSD.org) Date: Wed, 26 Jul 2006 08:20:57 GMT Message-Id: <200607260820.k6Q8KvUq080056@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to cdjones@FreeBSD.org using -f From: Chris Jones To: Perforce Change Reviews Cc: Subject: PERFORCE change 102440 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 26 Jul 2006 08:20:58 -0000 http://perforce.freebsd.org/chv.cgi?CH=102440 Change 102440 by cdjones@cdjones-impulse on 2006/07/26 08:20:24 ... got lost in shuffle somehow. Affected files ... .. //depot/projects/soc2006/cdjones_jail/src/sys/vm/vm_pageout.c#1 branch Differences ... From owner-p4-projects@FreeBSD.ORG Wed Jul 26 12:04:45 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id ECE2E16A4E5; Wed, 26 Jul 2006 12:04:44 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id B06E716A4DF for ; Wed, 26 Jul 2006 12:04:44 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id DD7F843D5C for ; Wed, 26 Jul 2006 12:04:40 +0000 (GMT) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k6QC4eeX004308 for ; Wed, 26 Jul 2006 12:04:40 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k6QC4eUC004305 for perforce@freebsd.org; Wed, 26 Jul 2006 12:04:40 GMT (envelope-from hselasky@FreeBSD.org) Date: Wed, 26 Jul 2006 12:04:40 GMT Message-Id: <200607261204.k6QC4eUC004305@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to hselasky@FreeBSD.org using -f From: Hans Petter Selasky To: Perforce Change Reviews Cc: Subject: PERFORCE change 102448 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 26 Jul 2006 12:04:45 -0000 http://perforce.freebsd.org/chv.cgi?CH=102448 Change 102448 by hselasky@hselasky_mini_itx on 2006/07/26 12:04:36 Add some extra assertions. Affected files ... .. //depot/projects/usb/src/sys/dev/usb/usb_transfer.c#10 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb/usb_transfer.c#10 (text+ko) ==== @@ -1220,7 +1220,9 @@ usbd_config[0].callback = &usbd_default_callback; if (mtx) { + mtx_assert(mtx, MA_OWNED); mtx_unlock(mtx); + mtx_assert(mtx, MA_NOTOWNED); } /* setup transfer */ From owner-p4-projects@FreeBSD.ORG Wed Jul 26 12:08:47 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E67EA16A4E2; Wed, 26 Jul 2006 12:08:46 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id C22F216A4E0 for ; Wed, 26 Jul 2006 12:08:46 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 721C743D55 for ; Wed, 26 Jul 2006 12:08:46 +0000 (GMT) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k6QC8kTT004515 for ; Wed, 26 Jul 2006 12:08:46 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k6QC8kQF004512 for perforce@freebsd.org; Wed, 26 Jul 2006 12:08:46 GMT (envelope-from hselasky@FreeBSD.org) Date: Wed, 26 Jul 2006 12:08:46 GMT Message-Id: <200607261208.k6QC8kQF004512@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to hselasky@FreeBSD.org using -f From: Hans Petter Selasky To: Perforce Change Reviews Cc: Subject: PERFORCE change 102449 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 26 Jul 2006 12:08:47 -0000 http://perforce.freebsd.org/chv.cgi?CH=102449 Change 102449 by hselasky@hselasky_mini_itx on 2006/07/26 12:08:39 Import rewritten "if_ural" driver. Some bugs were fixed. None of the bugs posed a security risk to the system, rather a panic. Again there are a lot of changes. Mostly because all of the configuration had to be moved into a separate thread, that allows sleeping. Please test. Affected files ... .. //depot/projects/usb/src/sys/dev/usb/if_ural.c#4 edit .. //depot/projects/usb/src/sys/dev/usb/if_uralreg.h#3 add .. //depot/projects/usb/src/sys/dev/usb/if_uralvar.h#3 add Differences ... ==== //depot/projects/usb/src/sys/dev/usb/if_ural.c#4 (text+ko) ==== @@ -1,0 +1,2991 @@ +/*- + * Copyright (c) 2005, 2006 + * Damien Bergamini + * + * Copyright (c) 2006 + * Hans Petter Selasky + * + * Permission to use, copy, modify, and distribute this software for any + * purpose with or without fee is hereby granted, provided that the above + * copyright notice and this permission notice appear in all copies. + * + * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES + * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF + * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR + * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES + * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN + * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF + * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + * + * + * NOTE: all function names beginning like "ural_cfg_" can only + * be called from within the "ural_config_thread()" function! + */ + +/*- + * Ralink Technology RT2500USB chipset driver + * http://www.ralinktech.com/ + */ + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include +#include +#include +#include +#include +#include +#include + +#include +#include + +#include +#include +#include +#include +#include + +#include +#include +#include + +#include "usbdevs.h" + +#include +#include + +__FBSDID("$FreeBSD: src/sys/dev/usb/if_ural.c,v 1.38 2006/05/16 14:36:32 phk Exp $"); + +#ifdef USB_DEBUG +#define DPRINTF(sc,n,fmt,...) \ + do { if (ural_debug > (n)) { \ + printf("%s:%s: " fmt, (sc)->sc_name, \ + __FUNCTION__,## __VA_ARGS__); } } while (0) + +static int ural_debug = 0; +SYSCTL_NODE(_hw_usb, OID_AUTO, ural, CTLFLAG_RW, 0, "USB ural"); +SYSCTL_INT(_hw_usb_ural, OID_AUTO, debug, CTLFLAG_RW, &ural_debug, 0, + "ural debug level"); +#else +#define DPRINTF(...) +#endif + +/* prototypes */ +static device_probe_t ural_probe; +static device_attach_t ural_attach; +static device_detach_t ural_detach; + +static void +ural_cfg_do_request(struct ural_softc *sc, usb_device_request_t *req, + void *data); +static void +ural_cfg_set_testmode(struct ural_softc *sc); + +static void +ural_cfg_eeprom_read(struct ural_softc *sc, u_int16_t addr, + void *buf, int len); +static u_int16_t +ural_cfg_read(struct ural_softc *sc, u_int16_t reg); + +static void +ural_cfg_read_multi(struct ural_softc *sc, u_int16_t reg, + void *buf, int len); +static void +ural_cfg_write(struct ural_softc *sc, u_int16_t reg, u_int16_t val); + +static void +ural_cfg_write_multi(struct ural_softc *sc, u_int16_t reg, + void *buf, int len); +static void +ural_cfg_bbp_write(struct ural_softc *sc, u_int8_t reg, u_int8_t val); + +static u_int8_t +ural_cfg_bbp_read(struct ural_softc *sc, u_int8_t reg); + +static void +ural_cfg_rf_write(struct ural_softc *sc, u_int8_t reg, u_int32_t val); + +static void +ural_config_thread(void *arg); + +static void +ural_config_copy(struct ural_softc *sc, struct ural_config_copy *cc); + +static void +ural_queue_command(struct ural_softc *sc, ural_command_t *command_func); + +static void +ural_check_gone(struct ural_softc *sc); + +static const char * +ural_get_rf(int rev); + +static int +ural_rxrate(struct ural_rx_desc *desc); + +static void +ural_bulk_read_callback(struct usbd_xfer *xfer); + +static void +ural_bulk_read_clear_stall_callback(struct usbd_xfer *xfer); + +static u_int16_t +ural_ack_rate(struct ieee80211com *ic, u_int16_t rate); + +static u_int16_t +ural_txtime(struct ural_softc *sc, u_int16_t len, u_int16_t rate, u_int32_t flags); + +static u_int8_t +ural_plcp_signal(u_int16_t rate); + +static void +ural_setup_tx_desc(struct ural_softc *sc, u_int32_t flags, u_int16_t len, + u_int16_t rate); +static void +ural_bulk_write_callback(struct usbd_xfer *xfer); + +static void +ural_bulk_write_clear_stall_callback(struct usbd_xfer *xfer); + +static void +ural_watchdog(void *arg); + +static void +ural_init_cb(void *arg); + +static int +ural_ioctl_cb(struct ifnet *ifp, u_long cmd, caddr_t data); + +static void +ural_start_cb(struct ifnet *ifp); + +static int +ural_media_change_cb(struct ifnet *ifp); + +static int +ural_reset_cb(struct ifnet *ifp); + +static int +ural_newstate_cb(struct ieee80211com *ic, enum ieee80211_state nstate, int arg); + +static void +ural_cfg_sleep(struct ural_softc *sc, u_int32_t timeout); + +static void +ural_tx_bcn_complete(struct ural_softc *sc); + +static void +ural_cfg_tx_bcn(struct ural_softc *sc); + +static void +ural_cfg_dummy(struct ural_softc *sc, + struct ural_config_copy *cc); +static void +ural_cfg_set_chan(struct ural_softc *sc, + struct ural_config_copy *cc); +static void +ural_cfg_set_run(struct ural_softc *sc, + struct ural_config_copy *cc); +static void +ural_cfg_disable_rf_tune(struct ural_softc *sc); + +static void +ural_cfg_enable_tsf_sync(struct ural_softc *sc, + struct ural_config_copy *cc); +static void +ural_cfg_disable_tsf_sync(struct ural_softc *sc, + struct ural_config_copy *cc); +static void +ural_cfg_update_slot(struct ural_softc *sc, + struct ural_config_copy *cc); +static void +ural_cfg_set_txpreamble(struct ural_softc *sc, + struct ural_config_copy *cc); +static void +ural_cfg_set_basicrates(struct ural_softc *sc, + struct ural_config_copy *cc); +static void +ural_cfg_set_bssid(struct ural_softc *sc, const u_int8_t *bssid); + +static void +ural_cfg_set_macaddr(struct ural_softc *sc, const u_int8_t *addr); + +static void +ural_cfg_update_promisc(struct ural_softc *sc, + struct ural_config_copy *cc); +static void +ural_cfg_set_txantenna(struct ural_softc *sc, u_int8_t antenna); + +static void +ural_cfg_set_rxantenna(struct ural_softc *sc, u_int8_t antenna); + +static void +ural_cfg_read_eeprom(struct ural_softc *sc); + +static u_int8_t +ural_cfg_bbp_init(struct ural_softc *sc); + +static void +ural_cfg_init(struct ural_softc *sc, + struct ural_config_copy *cc); +static void +ural_cfg_stop(struct ural_softc *sc, + struct ural_config_copy *cc); +static void +ural_cfg_amrr_start(struct ural_softc *sc); + +static void +ural_cfg_amrr_timeout(struct ural_softc *sc, + struct ural_config_copy *cc); +static void +ural_ratectl(struct ural_amrr *amrr, struct ieee80211_node *ni); + +/* various supported device vendors/products */ +static const struct usb_devno ural_devs[] = { + { USB_VENDOR_ASUS, USB_PRODUCT_ASUS_WL167G }, + { USB_VENDOR_ASUS, USB_PRODUCT_RALINK_RT2570 }, + { USB_VENDOR_BELKIN, USB_PRODUCT_BELKIN_F5D7050 }, + { USB_VENDOR_CONCEPTRONIC, USB_PRODUCT_CONCEPTRONIC_C54U }, + { USB_VENDOR_DLINK, USB_PRODUCT_DLINK_DWLG122 }, + { USB_VENDOR_GIGABYTE, USB_PRODUCT_GIGABYTE_GNWBKG }, + { USB_VENDOR_GUILLEMOT, USB_PRODUCT_GUILLEMOT_HWGUSB254 }, + { USB_VENDOR_LINKSYS4, USB_PRODUCT_LINKSYS4_WUSB54G }, + { USB_VENDOR_LINKSYS4, USB_PRODUCT_LINKSYS4_WUSB54GP }, + { USB_VENDOR_LINKSYS4, USB_PRODUCT_LINKSYS4_HU200TS }, + { USB_VENDOR_MELCO, USB_PRODUCT_MELCO_KG54 }, + { USB_VENDOR_MELCO, USB_PRODUCT_MELCO_KG54AI }, + { USB_VENDOR_MELCO, USB_PRODUCT_MELCO_KG54YB }, + { USB_VENDOR_MELCO, USB_PRODUCT_MELCO_NINWIFI }, + { USB_VENDOR_MSI, USB_PRODUCT_MSI_RT2570 }, + { USB_VENDOR_MSI, USB_PRODUCT_MSI_RT2570_2 }, + { USB_VENDOR_MSI, USB_PRODUCT_MSI_RT2570_3 }, + { USB_VENDOR_RALINK, USB_PRODUCT_RALINK_RT2570 }, + { USB_VENDOR_RALINK, USB_PRODUCT_RALINK_RT2570_2 }, + { USB_VENDOR_VTECH, USB_PRODUCT_VTECH_RT2570 }, + { USB_VENDOR_ZINWELL, USB_PRODUCT_ZINWELL_RT2570 } +}; + +/* + * Supported rates for 802.11a/b/g modes (in 500Kbps unit). + */ +static const struct ieee80211_rateset ural_rateset_11a = + { 8, { 12, 18, 24, 36, 48, 72, 96, 108 } }; + +static const struct ieee80211_rateset ural_rateset_11b = + { 4, { 2, 4, 11, 22 } }; + +static const struct ieee80211_rateset ural_rateset_11g = + { 12, { 2, 4, 11, 22, 12, 18, 24, 36, 48, 72, 96, 108 } }; + +/* + * Default values for MAC registers; values taken from + * the reference driver: + */ +static const struct { + u_int16_t reg; + u_int16_t val; +} ural_def_mac[] = { + { RAL_TXRX_CSR5, 0x8c8d }, + { RAL_TXRX_CSR6, 0x8b8a }, + { RAL_TXRX_CSR7, 0x8687 }, + { RAL_TXRX_CSR8, 0x0085 }, + { RAL_MAC_CSR13, 0x1111 }, + { RAL_MAC_CSR14, 0x1e11 }, + { RAL_TXRX_CSR21, 0xe78f }, + { RAL_MAC_CSR9, 0xff1d }, + { RAL_MAC_CSR11, 0x0002 }, + { RAL_MAC_CSR22, 0x0053 }, + { RAL_MAC_CSR15, 0x0000 }, + { RAL_MAC_CSR8, 0x0780 }, + { RAL_TXRX_CSR19, 0x0000 }, + { RAL_TXRX_CSR18, 0x005a }, + { RAL_PHY_CSR2, 0x0000 }, + { RAL_TXRX_CSR0, 0x1ec0 }, + { RAL_PHY_CSR4, 0x000f } +}; + +/* + * Default values for BBP registers; values taken from the reference driver. + */ +static const struct { + u_int8_t reg; + u_int8_t val; +} ural_def_bbp[] = { + { 3, 0x02 }, + { 4, 0x19 }, + { 14, 0x1c }, + { 15, 0x30 }, + { 16, 0xac }, + { 17, 0x48 }, + { 18, 0x18 }, + { 19, 0xff }, + { 20, 0x1e }, + { 21, 0x08 }, + { 22, 0x08 }, + { 23, 0x08 }, + { 24, 0x80 }, + { 25, 0x50 }, + { 26, 0x08 }, + { 27, 0x23 }, + { 30, 0x10 }, + { 31, 0x2b }, + { 32, 0xb9 }, + { 34, 0x12 }, + { 35, 0x50 }, + { 39, 0xc4 }, + { 40, 0x02 }, + { 41, 0x60 }, + { 53, 0x10 }, + { 54, 0x18 }, + { 56, 0x08 }, + { 57, 0x10 }, + { 58, 0x08 }, + { 61, 0x60 }, + { 62, 0x10 }, + { 75, 0xff } +}; + +/* + * Default values for RF register R2 indexed by channel numbers. + */ +static const u_int32_t ural_rf2522_r2[] = { + 0x307f6, 0x307fb, 0x30800, 0x30805, 0x3080a, 0x3080f, 0x30814, + 0x30819, 0x3081e, 0x30823, 0x30828, 0x3082d, 0x30832, 0x3083e +}; + +static const u_int32_t ural_rf2523_r2[] = { + 0x00327, 0x00328, 0x00329, 0x0032a, 0x0032b, 0x0032c, 0x0032d, + 0x0032e, 0x0032f, 0x00340, 0x00341, 0x00342, 0x00343, 0x00346 +}; + +static const u_int32_t ural_rf2524_r2[] = { + 0x00327, 0x00328, 0x00329, 0x0032a, 0x0032b, 0x0032c, 0x0032d, + 0x0032e, 0x0032f, 0x00340, 0x00341, 0x00342, 0x00343, 0x00346 +}; + +static const u_int32_t ural_rf2525_r2[] = { + 0x20327, 0x20328, 0x20329, 0x2032a, 0x2032b, 0x2032c, 0x2032d, + 0x2032e, 0x2032f, 0x20340, 0x20341, 0x20342, 0x20343, 0x20346 +}; + +static const u_int32_t ural_rf2525_hi_r2[] = { + 0x2032f, 0x20340, 0x20341, 0x20342, 0x20343, 0x20344, 0x20345, + 0x20346, 0x20347, 0x20348, 0x20349, 0x2034a, 0x2034b, 0x2034e +}; + +static const u_int32_t ural_rf2525e_r2[] = { + 0x2044d, 0x2044e, 0x2044f, 0x20460, 0x20461, 0x20462, 0x20463, + 0x20464, 0x20465, 0x20466, 0x20467, 0x20468, 0x20469, 0x2046b +}; + +static const u_int32_t ural_rf2526_hi_r2[] = { + 0x0022a, 0x0022b, 0x0022b, 0x0022c, 0x0022c, 0x0022d, 0x0022d, + 0x0022e, 0x0022e, 0x0022f, 0x0022d, 0x00240, 0x00240, 0x00241 +}; + +static const u_int32_t ural_rf2526_r2[] = { + 0x00226, 0x00227, 0x00227, 0x00228, 0x00228, 0x00229, 0x00229, + 0x0022a, 0x0022a, 0x0022b, 0x0022b, 0x0022c, 0x0022c, 0x0022d +}; + +/* + * For dual-band RF, RF registers R1 and R4 also depend on channel number; + * values taken from the reference driver. + */ +static const struct { + u_int8_t chan; + u_int32_t r1; + u_int32_t r2; + u_int32_t r4; +} ural_rf5222[] = { + { 1, 0x08808, 0x0044d, 0x00282 }, + { 2, 0x08808, 0x0044e, 0x00282 }, + { 3, 0x08808, 0x0044f, 0x00282 }, + { 4, 0x08808, 0x00460, 0x00282 }, + { 5, 0x08808, 0x00461, 0x00282 }, + { 6, 0x08808, 0x00462, 0x00282 }, + { 7, 0x08808, 0x00463, 0x00282 }, + { 8, 0x08808, 0x00464, 0x00282 }, + { 9, 0x08808, 0x00465, 0x00282 }, + { 10, 0x08808, 0x00466, 0x00282 }, + { 11, 0x08808, 0x00467, 0x00282 }, + { 12, 0x08808, 0x00468, 0x00282 }, + { 13, 0x08808, 0x00469, 0x00282 }, + { 14, 0x08808, 0x0046b, 0x00286 }, + + { 36, 0x08804, 0x06225, 0x00287 }, + { 40, 0x08804, 0x06226, 0x00287 }, + { 44, 0x08804, 0x06227, 0x00287 }, + { 48, 0x08804, 0x06228, 0x00287 }, + { 52, 0x08804, 0x06229, 0x00287 }, + { 56, 0x08804, 0x0622a, 0x00287 }, + { 60, 0x08804, 0x0622b, 0x00287 }, + { 64, 0x08804, 0x0622c, 0x00287 }, + + { 100, 0x08804, 0x02200, 0x00283 }, + { 104, 0x08804, 0x02201, 0x00283 }, + { 108, 0x08804, 0x02202, 0x00283 }, + { 112, 0x08804, 0x02203, 0x00283 }, + { 116, 0x08804, 0x02204, 0x00283 }, + { 120, 0x08804, 0x02205, 0x00283 }, + { 124, 0x08804, 0x02206, 0x00283 }, + { 128, 0x08804, 0x02207, 0x00283 }, + { 132, 0x08804, 0x02208, 0x00283 }, + { 136, 0x08804, 0x02209, 0x00283 }, + { 140, 0x08804, 0x0220a, 0x00283 }, + + { 149, 0x08808, 0x02429, 0x00281 }, + { 153, 0x08808, 0x0242b, 0x00281 }, + { 157, 0x08808, 0x0242d, 0x00281 }, + { 161, 0x08808, 0x0242f, 0x00281 } +}; + +static const struct usbd_config ural_config[URAL_N_TRANSFER] = { + [0] = { + .type = UE_BULK, + .endpoint = -1, /* any */ + .direction = UE_DIR_OUT, + .bufsize = (MCLBYTES + RAL_TX_DESC_SIZE + 4), + .flags = (USBD_USE_DMA|USBD_FORCE_SHORT_XFER), + .callback = &ural_bulk_write_callback, + }, + + [1] = { + .type = UE_BULK, + .endpoint = -1, /* any */ + .direction = UE_DIR_IN, + .bufsize = (MCLBYTES + RAL_RX_DESC_SIZE), + .flags = (USBD_USE_DMA|USBD_SHORT_XFER_OK), + .callback = &ural_bulk_read_callback, + }, + + [2] = { + .type = UE_CONTROL, + .endpoint = 0x00, /* Control pipe */ + .direction = -1, + .bufsize = sizeof(usb_device_request_t), + .callback = &ural_bulk_write_clear_stall_callback, + .timeout = 1000, /* 1 second */ + }, + + [3] = { + .type = UE_CONTROL, + .endpoint = 0x00, /* Control pipe */ + .direction = -1, + .bufsize = sizeof(usb_device_request_t), + .callback = &ural_bulk_read_clear_stall_callback, + .timeout = 1000, /* 1 second */ + }, +}; + +static devclass_t ural_devclass; + +static device_method_t ural_methods[] = { + DEVMETHOD(device_probe, ural_probe), + DEVMETHOD(device_attach, ural_attach), + DEVMETHOD(device_detach, ural_detach), + { 0, 0 } +}; + +static driver_t ural_driver = { + .name = "ural", + .methods = ural_methods, + .size = sizeof(struct ural_softc), +}; + +DRIVER_MODULE(ural, uhub, ural_driver, ural_devclass, usbd_driver_load, 0); +MODULE_DEPEND(ural, usb, 1, 1, 1); +MODULE_DEPEND(ural, wlan, 1, 1, 1); + +static int +ural_probe(device_t dev) +{ + struct usb_attach_arg *uaa = device_get_ivars(dev); + + if (uaa->iface != NULL) { + return UMATCH_NONE; + } + + return ((usb_lookup(ural_devs, uaa->vendor, uaa->product) != NULL) ? + UMATCH_VENDOR_PRODUCT : UMATCH_NONE); +} + +static int +ural_attach(device_t dev) +{ + struct usb_attach_arg *uaa = device_get_ivars(dev); + struct ural_softc *sc = device_get_softc(dev); + int error; + + if (sc == NULL) { + return ENOMEM; + } + + usbd_set_desc(dev, uaa->device); + + mtx_init(&sc->sc_mtx, "ural lock", MTX_NETWORK_LOCK, + MTX_DEF | MTX_RECURSE); + + snprintf(sc->sc_name, sizeof(sc->sc_name), "%s", + device_get_nameunit(dev)); + + sc->sc_udev = uaa->device; /* XXX */ + sc->sc_unit = device_get_unit(dev); + + __callout_init_mtx(&(sc->sc_watchdog), + &(sc->sc_mtx), CALLOUT_RETURNUNLOCKED); + + error = usbd_set_config_no(uaa->device, RAL_CONFIG_NO, 0); + + if (error) { + device_printf(dev, "could not set configuration " + "number, err=%s!\n", usbd_errstr(error)); + goto detach; + } + + error = usbd_transfer_setup(uaa->device, RAL_IFACE_INDEX, + sc->sc_xfer, ural_config, URAL_N_TRANSFER, + sc, &(sc->sc_mtx), &(sc->sc_mem_wait)); + if (error) { + device_printf(dev, "could not allocate USB transfers, " + "err=%s\n", usbd_errstr(error)) ; + goto detach; + } + + sc->sc_cmd_queue_ptr = + usbd_alloc_mbufs(M_DEVBUF, &(sc->sc_cmd_free), + sizeof(struct ural_config_copy), 16); + + if (sc->sc_cmd_queue_ptr == NULL) { + device_printf(dev, "could not allocate memory for " + "command queue!\n"); + goto detach; + } + + if(usb_kthread_create1(&ural_config_thread, sc, + &(sc->sc_config_thread), "%s", sc->sc_name)) + { + sc->sc_config_thread = NULL; + device_printf(dev, "unable to create config thread!\n"); + goto detach; + } + + /* start watchdog */ + + mtx_lock(&(sc->sc_mtx)); + ural_watchdog(sc); + + return 0; /* success */ + + detach: + ural_detach(dev); + return ENXIO; /* failure */ +} + +static int +ural_detach(device_t dev) +{ + struct ural_softc *sc = device_get_softc(dev); + struct ieee80211com *ic; + struct ifnet *ifp; + register int error; + + mtx_lock(&(sc->sc_mtx)); + + sc->sc_flags |= URAL_FLAG_DEV_GONE; + + __callout_stop(&sc->sc_watchdog); + + ural_queue_command(sc, &ural_cfg_dummy); + + ural_cfg_stop(sc, NULL); + + if (sc->sc_config_thread) { + + while (!(sc->sc_flags & URAL_FLAG_TD_EXIT)) { + + if (cold) { + panic("cannot stop config thread!\n"); + } + + error = msleep(&(sc->sc_wakeup_td_gone), + &(sc->sc_mtx), 0, "ural wait TD", 0); + } + } + + ic = &(sc->sc_ic); + ifp = ic->ic_ifp; + + mtx_unlock(&(sc->sc_mtx)); + + if (ifp) { + bpfdetach(ifp); + ieee80211_ifdetach(ic); + if_free(ifp); + } + + usbd_transfer_unsetup(sc->sc_xfer, URAL_N_TRANSFER); + + usbd_transfer_drain(&(sc->sc_mem_wait), &(sc->sc_mtx)); + + if (sc->sc_cmd_queue_ptr) { + free(sc->sc_cmd_queue_ptr, M_DEVBUF); + sc->sc_cmd_queue_ptr = NULL; + } + + mtx_destroy(&sc->sc_mtx); + + return 0; +} + +/*========================================================================* + * REGISTER READ / WRITE WRAPPER ROUTINES + *========================================================================*/ + +static void +ural_cfg_do_request(struct ural_softc *sc, usb_device_request_t *req, + void *data) +{ + usbd_status err; + + err = usbd_do_request_flags_mtx(sc->sc_udev, &(sc->sc_mtx), req, + data, 0, NULL, 1000); + ural_check_gone(sc); + + if (err) { + u_int16_t length = UGETW(req->wLength); + + printf("%s: device request failed, err=%s " + "(ignored)\n", sc->sc_name, usbd_errstr(err)); + + if ((req->bmRequestType & UT_READ) && length) { + bzero(data, length); + } + } + return; +} + +static void +ural_cfg_set_testmode(struct ural_softc *sc) +{ + usb_device_request_t req; + + req.bmRequestType = UT_WRITE_VENDOR_DEVICE; + req.bRequest = RAL_VENDOR_REQUEST; + USETW(req.wValue, 4); + USETW(req.wIndex, 1); + USETW(req.wLength, 0); + + ural_cfg_do_request(sc, &req, NULL); + return; +} + +static void +ural_cfg_eeprom_read(struct ural_softc *sc, u_int16_t addr, + void *buf, int len) +{ + usb_device_request_t req; + + req.bmRequestType = UT_READ_VENDOR_DEVICE; + req.bRequest = RAL_READ_EEPROM; + USETW(req.wValue, 0); + USETW(req.wIndex, addr); + USETW(req.wLength, len); + + ural_cfg_do_request(sc, &req, buf); + return; +} + +static u_int16_t +ural_cfg_read(struct ural_softc *sc, u_int16_t reg) +{ + usb_device_request_t req; + u_int16_t val; + + req.bmRequestType = UT_READ_VENDOR_DEVICE; + req.bRequest = RAL_READ_MAC; + USETW(req.wValue, 0); + USETW(req.wIndex, reg); + USETW(req.wLength, sizeof(val)); + + ural_cfg_do_request(sc, &req, &val); + + return le16toh(val); +} + +static void +ural_cfg_read_multi(struct ural_softc *sc, u_int16_t reg, + void *buf, int len) +{ + usb_device_request_t req; + + req.bmRequestType = UT_READ_VENDOR_DEVICE; + req.bRequest = RAL_READ_MULTI_MAC; + USETW(req.wValue, 0); + USETW(req.wIndex, reg); + USETW(req.wLength, len); + + ural_cfg_do_request(sc, &req, buf); + return; +} + +static void +ural_cfg_write(struct ural_softc *sc, u_int16_t reg, u_int16_t val) +{ + usb_device_request_t req; + + req.bmRequestType = UT_WRITE_VENDOR_DEVICE; + req.bRequest = RAL_WRITE_MAC; + USETW(req.wValue, val); + USETW(req.wIndex, reg); + USETW(req.wLength, 0); + + ural_cfg_do_request(sc, &req, NULL); + return; +} + +static void +ural_cfg_write_multi(struct ural_softc *sc, u_int16_t reg, + void *buf, int len) +{ + usb_device_request_t req; + + req.bmRequestType = UT_WRITE_VENDOR_DEVICE; + req.bRequest = RAL_WRITE_MULTI_MAC; + USETW(req.wValue, 0); + USETW(req.wIndex, reg); + USETW(req.wLength, len); + + ural_cfg_do_request(sc, &req, buf); + return; +} + +static void +ural_cfg_bbp_write(struct ural_softc *sc, u_int8_t reg, u_int8_t val) +{ + u_int16_t tmp; + u_int8_t to; + + for (to = 0; ; to++) { + if (to < 5) { + tmp = ural_cfg_read(sc, RAL_PHY_CSR8); + + if (!(tmp & RAL_BBP_BUSY)) { + break; + } + } else { + printf("%s: could not write to BBP\n", + sc->sc_name); + return; + } + } + + tmp = (reg << 8) | val; + ural_cfg_write(sc, RAL_PHY_CSR7, tmp); + return; +} + +static u_int8_t +ural_cfg_bbp_read(struct ural_softc *sc, u_int8_t reg) +{ + u_int16_t val; + u_int8_t to; + + val = RAL_BBP_WRITE | (reg << 8); + ural_cfg_write(sc, RAL_PHY_CSR7, val); + + for (to = 0; ; to++) { + if (to < 5) { + val = ural_cfg_read(sc, RAL_PHY_CSR8); + + if (!(val & RAL_BBP_BUSY)) { + break; + } + } else { + printf("%s: could not read BBP\n", + sc->sc_name); + return 0; + } + } + return (ural_cfg_read(sc, RAL_PHY_CSR7) & 0xff); +} + +static void +ural_cfg_rf_write(struct ural_softc *sc, u_int8_t reg, u_int32_t val) +{ + u_int32_t tmp; + u_int8_t to; + + reg &= 3; + + for (to = 0; ; to++) { + if (to < 5) { + tmp = ural_cfg_read(sc, RAL_PHY_CSR10); + + if (!(tmp & RAL_RF_LOBUSY)) { + break; + } + } else { + printf("%s: could not write to RF\n", + sc->sc_name); + return; + } + } + + tmp = RAL_RF_BUSY | RAL_RF_20BIT | ((val & 0xfffff) << 2) | reg; + ural_cfg_write(sc, RAL_PHY_CSR9, tmp & 0xffff); + ural_cfg_write(sc, RAL_PHY_CSR10, tmp >> 16); + + /* remember last written value in sc */ + sc->sc_rf_regs[reg] = val; + + DPRINTF(sc, 15, "RF R[%u] <- 0x%05x\n", reg, val & 0xfffff); + return; +} + +/*========================================================================* + * CONFIGURE THREAD + *========================================================================*/ + +static void +ural_config_thread(void *arg) +{ + struct ural_softc *sc = arg; + struct ieee80211com *ic = &(sc->sc_ic); + struct ifnet *ifp; + struct usbd_mbuf *m; + struct ural_config_copy *cc; + register int error; + register u_int16_t i; + + mtx_lock(&(sc->sc_mtx)); + + /* retrieve RT2570 rev. no */ + sc->sc_asic_rev = ural_cfg_read(sc, RAL_MAC_CSR0); + + /* retrieve MAC address and various other things from EEPROM */ + ural_cfg_read_eeprom(sc); + + printf("%s: MAC/BBP RT2570 (rev 0x%02x), RF %s\n", + sc->sc_name, sc->sc_asic_rev, ural_get_rf(sc->sc_rf_rev)); + + mtx_unlock(&(sc->sc_mtx)); + + ifp = if_alloc(IFT_ETHER); + + mtx_lock(&(sc->sc_mtx)); + + if (ifp == NULL) { + printf("%s: could not if_alloc()!\n", + sc->sc_name); + goto command_loop; + } + + sc->sc_ifp = ifp; + + ifp->if_softc = sc; + if_initname(ifp, "ural", sc->sc_unit); + ifp->if_flags = IFF_BROADCAST | IFF_SIMPLEX | IFF_MULTICAST; + ifp->if_init = &ural_init_cb; + ifp->if_ioctl = &ural_ioctl_cb; + ifp->if_start = &ural_start_cb; + ifp->if_watchdog = NULL; + IFQ_SET_MAXLEN(&ifp->if_snd, IFQ_MAXLEN); + ifp->if_snd.ifq_drv_maxlen = IFQ_MAXLEN; + IFQ_SET_READY(&ifp->if_snd); + + ic->ic_ifp = ifp; + ic->ic_phytype = IEEE80211_T_OFDM; /* not only, but not used */ + ic->ic_opmode = IEEE80211_M_STA; /* default to BSS mode */ + ic->ic_state = IEEE80211_S_INIT; + + /* set device capabilities */ + ic->ic_caps = + IEEE80211_C_IBSS | /* IBSS mode supported */ + IEEE80211_C_MONITOR | /* monitor mode supported */ + IEEE80211_C_HOSTAP | /* HostAp mode supported */ + IEEE80211_C_TXPMGT | /* tx power management */ + IEEE80211_C_SHPREAMBLE | /* short preamble supported */ + IEEE80211_C_SHSLOT | /* short slot time supported */ + IEEE80211_C_WPA; /* 802.11i */ + + if (sc->sc_rf_rev == RAL_RF_5222) { + + /* set supported .11a rates */ + ic->ic_sup_rates[IEEE80211_MODE_11A] = ural_rateset_11a; + + /* set supported .11a channels */ + for (i = 36; i <= 64; i += 4) { + ic->ic_channels[i].ic_freq = + ieee80211_ieee2mhz(i, IEEE80211_CHAN_5GHZ); + ic->ic_channels[i].ic_flags = IEEE80211_CHAN_A; + } + for (i = 100; i <= 140; i += 4) { + ic->ic_channels[i].ic_freq = + ieee80211_ieee2mhz(i, IEEE80211_CHAN_5GHZ); + ic->ic_channels[i].ic_flags = IEEE80211_CHAN_A; + } + for (i = 149; i <= 161; i += 4) { + ic->ic_channels[i].ic_freq = + ieee80211_ieee2mhz(i, IEEE80211_CHAN_5GHZ); + ic->ic_channels[i].ic_flags = IEEE80211_CHAN_A; + } + } + + /* set supported .11b and .11g rates */ + ic->ic_sup_rates[IEEE80211_MODE_11B] = ural_rateset_11b; + ic->ic_sup_rates[IEEE80211_MODE_11G] = ural_rateset_11g; + + /* set supported .11b and .11g channels (1 through 14) */ + for (i = 1; i <= 14; i++) { + ic->ic_channels[i].ic_freq = + ieee80211_ieee2mhz(i, IEEE80211_CHAN_2GHZ); + ic->ic_channels[i].ic_flags = + IEEE80211_CHAN_CCK | IEEE80211_CHAN_OFDM | + IEEE80211_CHAN_DYN | IEEE80211_CHAN_2GHZ; + } + + mtx_unlock(&(sc->sc_mtx)); + + ieee80211_ifattach(ic); + + mtx_lock(&(sc->sc_mtx)); + + ic->ic_reset = &ural_reset_cb; + + /* enable SW bmiss handling in sta mode */ + ic->ic_flags_ext |= IEEE80211_FEXT_SWBMISS; + + /* override state transition machine */ + sc->sc_newstate = ic->ic_newstate; + ic->ic_newstate = ural_newstate_cb; + + mtx_unlock(&(sc->sc_mtx)); + + ieee80211_media_init(ic, ural_media_change_cb, ieee80211_media_status); + + bpfattach2(ifp, DLT_IEEE802_11_RADIO, + sizeof(struct ieee80211_frame) + 64, &sc->sc_drvbpf); + + mtx_lock(&(sc->sc_mtx)); + >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Wed Jul 26 12:13:02 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 932BF16A4E2; Wed, 26 Jul 2006 12:13:02 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 5674716A4DD for ; Wed, 26 Jul 2006 12:13:02 +0000 (UTC) (envelope-from gabor@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id CE9A843D9A for ; Wed, 26 Jul 2006 12:12:52 +0000 (GMT) (envelope-from gabor@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k6QCCp5x004823 for ; Wed, 26 Jul 2006 12:12:51 GMT (envelope-from gabor@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k6QCCpfL004820 for perforce@freebsd.org; Wed, 26 Jul 2006 12:12:51 GMT (envelope-from gabor@FreeBSD.org) Date: Wed, 26 Jul 2006 12:12:51 GMT Message-Id: <200607261212.k6QCCpfL004820@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to gabor@FreeBSD.org using -f From: Gabor Kovesdan To: Perforce Change Reviews Cc: Subject: PERFORCE change 102450 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 26 Jul 2006 12:13:02 -0000 http://perforce.freebsd.org/chv.cgi?CH=102450 Change 102450 by gabor@gabor_spitfire on 2006/07/26 12:12:02 Fix manpage issues. Affected files ... .. //depot/projects/soc2006/gabor_ports/Mk/bsd.port.mk#61 edit Differences ... ==== //depot/projects/soc2006/gabor_ports/Mk/bsd.port.mk#61 (text+ko) ==== @@ -1322,7 +1322,7 @@ INDEXFILE?= INDEX .endif -TARGETDIR= ${DESTDIR}${PREFIX} +TARGETDIR:= ${DESTDIR}${PREFIX} .if defined(USE_LINUX_RPM) .include "${PORTSDIR}/Mk/bsd.linux-rpm.mk" From owner-p4-projects@FreeBSD.ORG Wed Jul 26 12:39:26 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8E77616A4DF; Wed, 26 Jul 2006 12:39:26 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 51B0916A4DA for ; Wed, 26 Jul 2006 12:39:26 +0000 (UTC) (envelope-from gabor@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 0FE1A43D55 for ; Wed, 26 Jul 2006 12:39:26 +0000 (GMT) (envelope-from gabor@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k6QCdPPm009268 for ; Wed, 26 Jul 2006 12:39:25 GMT (envelope-from gabor@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k6QCdPLX009265 for perforce@freebsd.org; Wed, 26 Jul 2006 12:39:25 GMT (envelope-from gabor@FreeBSD.org) Date: Wed, 26 Jul 2006 12:39:25 GMT Message-Id: <200607261239.k6QCdPLX009265@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to gabor@FreeBSD.org using -f From: Gabor Kovesdan To: Perforce Change Reviews Cc: Subject: PERFORCE change 102452 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 26 Jul 2006 12:39:26 -0000 http://perforce.freebsd.org/chv.cgi?CH=102452 Change 102452 by gabor@gabor_spitfire on 2006/07/26 12:38:31 Use GMAKE appropriately. GNU make is always a build time dependency, accordingly it should be used in the host environment. This fixes the build of ports like net/avahi on the cluster in i386-6-exp run. Affected files ... .. //depot/projects/soc2006/gabor_ports/Mk/bsd.port.mk#62 edit Differences ... ==== //depot/projects/soc2006/gabor_ports/Mk/bsd.port.mk#62 (text+ko) ==== @@ -2077,7 +2077,7 @@ NONEXISTENT?= /nonexistent # Miscellaneous overridable commands: -GMAKE?= ${LOCALBASE}/bin/gmake +GMAKE?= gmake XMKMF?= xmkmf -a .if exists(/sbin/md5) MD5?= /sbin/md5 From owner-p4-projects@FreeBSD.ORG Wed Jul 26 13:48:55 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C776316A4E0; Wed, 26 Jul 2006 13:48:54 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 9DC4816A4DA for ; Wed, 26 Jul 2006 13:48:54 +0000 (UTC) (envelope-from piso@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 6773C43D49 for ; Wed, 26 Jul 2006 13:48:54 +0000 (GMT) (envelope-from piso@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k6QDmsrQ022171 for ; Wed, 26 Jul 2006 13:48:54 GMT (envelope-from piso@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k6QDmsmD022168 for perforce@freebsd.org; Wed, 26 Jul 2006 13:48:54 GMT (envelope-from piso@freebsd.org) Date: Wed, 26 Jul 2006 13:48:54 GMT Message-Id: <200607261348.k6QDmsmD022168@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to piso@freebsd.org using -f From: Paolo Pisati To: Perforce Change Reviews Cc: Subject: PERFORCE change 102455 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 26 Jul 2006 13:48:55 -0000 http://perforce.freebsd.org/chv.cgi?CH=102455 Change 102455 by piso@piso_newluxor on 2006/07/26 13:47:54 Protocol filed is always 8 bit long. Affected files ... .. //depot/projects/soc2005/libalias/sys/netinet/libalias/alias_mod.h#15 edit Differences ... ==== //depot/projects/soc2005/libalias/sys/netinet/libalias/alias_mod.h#15 (text+ko) ==== @@ -67,7 +67,7 @@ struct proto_handler { u_int pri; /* Handler priority. */ int16_t dir; /* Flow direction. */ - int16_t proto; /* Working protocol. */ + int8_t proto; /* Working protocol. */ int (*fingerprint)(struct libalias *la, /* Fingerprint * function. */ struct ip *pip, struct alias_data *ah); int (*protohandler)(struct libalias *la, /* Aliasing * function. */ From owner-p4-projects@FreeBSD.ORG Wed Jul 26 13:59:08 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id F3CD416A4E2; Wed, 26 Jul 2006 13:59:07 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id B6FA716A4DF for ; Wed, 26 Jul 2006 13:59:07 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 7F79443D46 for ; Wed, 26 Jul 2006 13:59:07 +0000 (GMT) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k6QDx7xR022652 for ; Wed, 26 Jul 2006 13:59:07 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k6QDx7dL022649 for perforce@freebsd.org; Wed, 26 Jul 2006 13:59:07 GMT (envelope-from hselasky@FreeBSD.org) Date: Wed, 26 Jul 2006 13:59:07 GMT Message-Id: <200607261359.k6QDx7dL022649@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to hselasky@FreeBSD.org using -f From: Hans Petter Selasky To: Perforce Change Reviews Cc: Subject: PERFORCE change 102456 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 26 Jul 2006 13:59:08 -0000 http://perforce.freebsd.org/chv.cgi?CH=102456 Change 102456 by hselasky@hselasky_mini_itx on 2006/07/26 13:58:20 There is a big problem in the keyboard system: If scroll lock is pressed and "printf()" is called, the Giant lock must be acquired by "printf()" before un-scroll-locking the keyboard by an IOCTL call. Hence that will cause a locking reversal problem, I see no other solution than to disable the IOCTL call, leaving the keyboard scroll-locked. Affected files ... .. //depot/projects/usb/src/sys/dev/usb/ukbd.c#7 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb/ukbd.c#7 (text+ko) ==== @@ -1162,6 +1162,21 @@ struct ukbd_softc *sc = kbd->kb_data; int i; + if (!mtx_owned(&Giant)) { + /* XXX big problem: + * If scroll lock is pressed and + * "printf()" is called, the CPU will + * get here, to un-scroll lock the + * keyboard. But if "printf()" acquires + * the "Giant" lock, there will be a + * locking order reversal problem, + * so the keyboard system must get + * out of "Giant" first, before + * the CPU can proceed here ... + */ + return EINVAL; + } + mtx_assert(&Giant, MA_OWNED); switch (cmd) { From owner-p4-projects@FreeBSD.ORG Wed Jul 26 16:04:55 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7A54E16A4DF; Wed, 26 Jul 2006 16:04:55 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 3B67116A4E0 for ; Wed, 26 Jul 2006 16:04:55 +0000 (UTC) (envelope-from piso@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id C467F43D68 for ; Wed, 26 Jul 2006 16:04:54 +0000 (GMT) (envelope-from piso@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k6QG4sTE033262 for ; Wed, 26 Jul 2006 16:04:54 GMT (envelope-from piso@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k6QG4h5L033259 for perforce@freebsd.org; Wed, 26 Jul 2006 16:04:43 GMT (envelope-from piso@freebsd.org) Date: Wed, 26 Jul 2006 16:04:43 GMT Message-Id: <200607261604.k6QG4h5L033259@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to piso@freebsd.org using -f From: Paolo Pisati To: Perforce Change Reviews Cc: Subject: PERFORCE change 102458 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 26 Jul 2006 16:04:55 -0000 http://perforce.freebsd.org/chv.cgi?CH=102458 Change 102458 by piso@piso_newluxor on 2006/07/26 16:04:08 IFC Affected files ... .. //depot/projects/soc2005/libalias/MAINTAINERS#2 integrate .. //depot/projects/soc2005/libalias/ObsoleteFiles.inc#2 integrate .. //depot/projects/soc2005/libalias/UPDATING#2 integrate .. //depot/projects/soc2005/libalias/bin/cp/cp.c#2 integrate .. //depot/projects/soc2005/libalias/bin/dd/Makefile#2 integrate .. //depot/projects/soc2005/libalias/bin/sh/sh.1#2 integrate .. //depot/projects/soc2005/libalias/contrib/openbsm/FREEBSD-upgrade#2 integrate .. //depot/projects/soc2005/libalias/contrib/openbsm/HISTORY#2 integrate .. //depot/projects/soc2005/libalias/contrib/openbsm/VERSION#2 integrate .. //depot/projects/soc2005/libalias/contrib/openbsm/bsm/audit_kevents.h#2 integrate .. //depot/projects/soc2005/libalias/contrib/openbsm/bsm/audit_record.h#2 integrate .. //depot/projects/soc2005/libalias/contrib/openbsm/bsm/libbsm.h#2 integrate .. //depot/projects/soc2005/libalias/contrib/openbsm/config/ltmain.sh#2 integrate .. //depot/projects/soc2005/libalias/contrib/openbsm/configure#2 integrate .. //depot/projects/soc2005/libalias/contrib/openbsm/configure.ac#2 integrate .. //depot/projects/soc2005/libalias/contrib/openbsm/etc/audit_event#2 integrate .. //depot/projects/soc2005/libalias/contrib/openbsm/libbsm/bsm_notify.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/openbsm/libbsm/bsm_token.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/openbsm/man/audit.log.5#2 integrate .. //depot/projects/soc2005/libalias/contrib/openbsm/test/bsm/generate.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/texinfo/FREEBSD-upgrade#2 integrate .. //depot/projects/soc2005/libalias/etc/defaults/rc.conf#2 integrate .. //depot/projects/soc2005/libalias/etc/rc.d/archdep#2 integrate .. //depot/projects/soc2005/libalias/etc/rc.d/dhclient#2 integrate .. //depot/projects/soc2005/libalias/etc/rc.d/ipfw#2 integrate .. //depot/projects/soc2005/libalias/etc/rc.d/mdconfig#2 integrate .. //depot/projects/soc2005/libalias/etc/rc.d/mdconfig2#2 integrate .. //depot/projects/soc2005/libalias/etc/rc.d/mountcritlocal#2 integrate .. //depot/projects/soc2005/libalias/etc/rc.d/mountlate#1 branch .. //depot/projects/soc2005/libalias/etc/rc.d/natd#2 integrate .. //depot/projects/soc2005/libalias/etc/rc.d/ntpdate#2 integrate .. //depot/projects/soc2005/libalias/etc/rc.subr#2 integrate .. //depot/projects/soc2005/libalias/games/fortune/datfiles/Makefile#2 integrate .. //depot/projects/soc2005/libalias/games/fortune/datfiles/fortunes#2 integrate .. //depot/projects/soc2005/libalias/gnu/usr.bin/binutils/ld/Makefile.alpha#2 integrate .. //depot/projects/soc2005/libalias/gnu/usr.bin/binutils/ld/Makefile.amd64#2 integrate .. //depot/projects/soc2005/libalias/gnu/usr.bin/binutils/ld/Makefile.arm#1 branch .. //depot/projects/soc2005/libalias/gnu/usr.bin/binutils/ld/Makefile.i386#2 integrate .. //depot/projects/soc2005/libalias/gnu/usr.bin/binutils/ld/Makefile.ia64#2 integrate .. //depot/projects/soc2005/libalias/gnu/usr.bin/binutils/libbfd/Makefile.arm#1 branch .. //depot/projects/soc2005/libalias/gnu/usr.bin/binutils/libopcodes/Makefile.arm#1 branch .. //depot/projects/soc2005/libalias/gnu/usr.bin/cc/cc_tools/auto-host.h#2 integrate .. //depot/projects/soc2005/libalias/gnu/usr.bin/gdb/kgdb/trgt_arm.c#1 branch .. //depot/projects/soc2005/libalias/gnu/usr.bin/send-pr/categories#2 integrate .. //depot/projects/soc2005/libalias/include/malloc_np.h#2 integrate .. //depot/projects/soc2005/libalias/lib/libc/gen/getgrent.c#2 integrate .. //depot/projects/soc2005/libalias/lib/libc/net/Makefile.inc#2 integrate .. //depot/projects/soc2005/libalias/lib/libc/net/getaddrinfo.c#2 integrate .. //depot/projects/soc2005/libalias/lib/libc/net/name6.c#2 integrate .. //depot/projects/soc2005/libalias/lib/libc/net/resolver.3#2 integrate .. //depot/projects/soc2005/libalias/lib/libc/posix1e/Makefile.inc#2 integrate .. //depot/projects/soc2005/libalias/lib/libc/posix1e/mac_is_present.3#1 branch .. //depot/projects/soc2005/libalias/lib/libc/posix1e/mac_is_present_np.3#2 delete .. //depot/projects/soc2005/libalias/lib/libc/posix1e/mac_prepare.3#2 integrate .. //depot/projects/soc2005/libalias/lib/libc/posix1e/mac_set.3#2 integrate .. //depot/projects/soc2005/libalias/lib/libc/posix1e/mac_text.3#2 integrate .. //depot/projects/soc2005/libalias/lib/libc/stdlib/malloc.c#2 integrate .. //depot/projects/soc2005/libalias/lib/libc/sys/Symbol.map#2 integrate .. //depot/projects/soc2005/libalias/lib/libdevinfo/devinfo.c#2 integrate .. //depot/projects/soc2005/libalias/lib/libkvm/kvm_proc.c#2 integrate .. //depot/projects/soc2005/libalias/lib/libmemstat/memstat.h#2 integrate .. //depot/projects/soc2005/libalias/lib/libpam/libpam/security/pam_mod_misc.h#2 integrate .. //depot/projects/soc2005/libalias/lib/libthr/pthread.map#2 integrate .. //depot/projects/soc2005/libalias/lib/libthr/sys/thr_error.c#2 integrate .. //depot/projects/soc2005/libalias/lib/libthr/thread/thr_attr.c#2 integrate .. //depot/projects/soc2005/libalias/lib/libthr/thread/thr_create.c#2 integrate .. //depot/projects/soc2005/libalias/lib/libthr/thread/thr_getschedparam.c#2 integrate .. //depot/projects/soc2005/libalias/lib/libthr/thread/thr_init.c#2 integrate .. //depot/projects/soc2005/libalias/lib/libthr/thread/thr_list.c#2 integrate .. //depot/projects/soc2005/libalias/lib/libthr/thread/thr_mutex.c#2 integrate .. //depot/projects/soc2005/libalias/lib/libthr/thread/thr_private.h#2 integrate .. //depot/projects/soc2005/libalias/lib/libthr/thread/thr_setprio.c#2 integrate .. //depot/projects/soc2005/libalias/lib/libthr/thread/thr_setschedparam.c#2 integrate .. //depot/projects/soc2005/libalias/lib/libthr/thread/thr_sig.c#2 integrate .. //depot/projects/soc2005/libalias/lib/libthr/thread/thr_syscalls.c#2 integrate .. //depot/projects/soc2005/libalias/lib/libutil/humanize_number.3#2 integrate .. //depot/projects/soc2005/libalias/lib/libutil/kld.3#2 integrate .. //depot/projects/soc2005/libalias/lib/libypclnt/ypclnt.h#2 integrate .. //depot/projects/soc2005/libalias/lib/msun/i387/Makefile.inc#2 integrate .. //depot/projects/soc2005/libalias/lib/msun/i387/e_scalb.S#2 delete .. //depot/projects/soc2005/libalias/lib/msun/i387/e_scalbf.S#2 delete .. //depot/projects/soc2005/libalias/lib/msun/src/e_log.c#2 integrate .. //depot/projects/soc2005/libalias/lib/msun/src/e_logf.c#2 integrate .. //depot/projects/soc2005/libalias/lib/msun/src/e_scalbf.c#2 integrate .. //depot/projects/soc2005/libalias/lib/msun/src/s_tanh.c#2 integrate .. //depot/projects/soc2005/libalias/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml#2 integrate .. //depot/projects/soc2005/libalias/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#2 integrate .. //depot/projects/soc2005/libalias/release/doc/share/misc/dev.archlist.txt#2 integrate .. //depot/projects/soc2005/libalias/sbin/dhclient/dhclient.c#2 integrate .. //depot/projects/soc2005/libalias/sbin/gpt/gpt.c#2 integrate .. //depot/projects/soc2005/libalias/sbin/growfs/growfs.c#2 integrate .. //depot/projects/soc2005/libalias/sbin/ifconfig/ifclone.c#2 integrate .. //depot/projects/soc2005/libalias/sbin/ifconfig/ifconfig.8#2 integrate .. //depot/projects/soc2005/libalias/sbin/ifconfig/ifconfig.c#2 integrate .. //depot/projects/soc2005/libalias/sbin/ifconfig/ifconfig.h#2 integrate .. //depot/projects/soc2005/libalias/sbin/ifconfig/ifieee80211.c#2 integrate .. //depot/projects/soc2005/libalias/sbin/ifconfig/ifvlan.c#2 integrate .. //depot/projects/soc2005/libalias/sbin/ipfw/ipfw.8#3 integrate .. //depot/projects/soc2005/libalias/sbin/mount/mount.8#2 integrate .. //depot/projects/soc2005/libalias/sbin/mount/mount.c#2 integrate .. //depot/projects/soc2005/libalias/sbin/mount_udf/Makefile#2 integrate .. //depot/projects/soc2005/libalias/sbin/sysctl/sysctl.c#2 integrate .. //depot/projects/soc2005/libalias/secure/lib/libcrypto/Makefile.inc#2 integrate .. //depot/projects/soc2005/libalias/share/examples/etc/make.conf#2 integrate .. //depot/projects/soc2005/libalias/share/man/man4/Makefile#2 integrate .. //depot/projects/soc2005/libalias/share/man/man4/acpi_thermal.4#2 integrate .. //depot/projects/soc2005/libalias/share/man/man4/altq.4#2 integrate .. //depot/projects/soc2005/libalias/share/man/man4/ata.4#2 integrate .. //depot/projects/soc2005/libalias/share/man/man4/enc.4#1 branch .. //depot/projects/soc2005/libalias/share/man/man4/fast_ipsec.4#2 integrate .. //depot/projects/soc2005/libalias/share/man/man4/ipw.4#2 integrate .. //depot/projects/soc2005/libalias/share/man/man4/iwi.4#2 integrate .. //depot/projects/soc2005/libalias/share/man/man4/man4.i386/padlock.4#2 integrate .. //depot/projects/soc2005/libalias/share/man/man4/miibus.4#2 integrate .. //depot/projects/soc2005/libalias/share/man/man4/nfe.4#1 branch .. //depot/projects/soc2005/libalias/share/man/man4/ng_netflow.4#2 integrate .. //depot/projects/soc2005/libalias/share/man/man4/ng_tag.4#1 branch .. //depot/projects/soc2005/libalias/share/man/man4/pcn.4#2 integrate .. //depot/projects/soc2005/libalias/share/man/man4/polling.4#2 integrate .. //depot/projects/soc2005/libalias/share/man/man4/random.4#2 integrate .. //depot/projects/soc2005/libalias/share/man/man4/re.4#2 integrate .. //depot/projects/soc2005/libalias/share/man/man4/sched_core.4#2 integrate .. //depot/projects/soc2005/libalias/share/man/man4/snd_emu10kx.4#1 branch .. //depot/projects/soc2005/libalias/share/man/man4/stge.4#1 branch .. //depot/projects/soc2005/libalias/share/man/man4/uplcom.4#2 integrate .. //depot/projects/soc2005/libalias/share/man/man4/vlan.4#2 integrate .. //depot/projects/soc2005/libalias/share/man/man5/rc.conf.5#2 integrate .. //depot/projects/soc2005/libalias/share/man/man7/ports.7#2 integrate .. //depot/projects/soc2005/libalias/share/man/man7/security.7#2 integrate .. //depot/projects/soc2005/libalias/share/man/man8/rc.subr.8#2 integrate .. //depot/projects/soc2005/libalias/share/man/man9/Makefile#2 integrate .. //depot/projects/soc2005/libalias/share/man/man9/mac.9#2 integrate .. //depot/projects/soc2005/libalias/share/man/man9/mbuf.9#2 integrate .. //depot/projects/soc2005/libalias/share/man/man9/mutex.9#2 integrate .. //depot/projects/soc2005/libalias/share/man/man9/rwlock.9#2 integrate .. //depot/projects/soc2005/libalias/share/man/man9/sx.9#2 integrate .. //depot/projects/soc2005/libalias/share/misc/bsd-family-tree#2 integrate .. //depot/projects/soc2005/libalias/share/mk/bsd.cpu.mk#2 integrate .. //depot/projects/soc2005/libalias/sys/Makefile#2 integrate .. //depot/projects/soc2005/libalias/sys/amd64/amd64/db_trace.c#2 integrate .. //depot/projects/soc2005/libalias/sys/amd64/amd64/identcpu.c#2 integrate .. //depot/projects/soc2005/libalias/sys/amd64/amd64/intr_machdep.c#2 integrate .. //depot/projects/soc2005/libalias/sys/amd64/amd64/local_apic.c#2 integrate .. //depot/projects/soc2005/libalias/sys/amd64/amd64/pmap.c#2 integrate .. //depot/projects/soc2005/libalias/sys/amd64/amd64/vm_machdep.c#2 integrate .. //depot/projects/soc2005/libalias/sys/amd64/conf/GENERIC#2 integrate .. //depot/projects/soc2005/libalias/sys/amd64/conf/NOTES#2 integrate .. //depot/projects/soc2005/libalias/sys/amd64/include/specialreg.h#2 integrate .. //depot/projects/soc2005/libalias/sys/amd64/linux32/linux32_proto.h#2 integrate .. //depot/projects/soc2005/libalias/sys/amd64/linux32/linux32_syscall.h#2 integrate .. //depot/projects/soc2005/libalias/sys/amd64/linux32/linux32_sysent.c#2 integrate .. //depot/projects/soc2005/libalias/sys/amd64/linux32/syscalls.master#2 integrate .. //depot/projects/soc2005/libalias/sys/arm/arm/db_trace.c#2 integrate .. //depot/projects/soc2005/libalias/sys/arm/arm/gdb_machdep.c#1 branch .. //depot/projects/soc2005/libalias/sys/arm/arm/in_cksum.c#2 integrate .. //depot/projects/soc2005/libalias/sys/arm/arm/pmap.c#2 integrate .. //depot/projects/soc2005/libalias/sys/arm/arm/vm_machdep.c#2 integrate .. //depot/projects/soc2005/libalias/sys/arm/at91/at91_pio.c#2 integrate .. //depot/projects/soc2005/libalias/sys/arm/at91/at91_pio_rm9200.h#1 branch .. //depot/projects/soc2005/libalias/sys/arm/at91/at91_piovar.h#1 branch .. //depot/projects/soc2005/libalias/sys/arm/at91/at91_pmc.c#2 integrate .. //depot/projects/soc2005/libalias/sys/arm/at91/at91_rtc.c#2 integrate .. //depot/projects/soc2005/libalias/sys/arm/at91/at91_rtcreg.h#2 integrate .. //depot/projects/soc2005/libalias/sys/arm/at91/at91_spi.c#2 integrate .. //depot/projects/soc2005/libalias/sys/arm/at91/at91_spiio.h#2 delete .. //depot/projects/soc2005/libalias/sys/arm/at91/at91_spireg.h#2 integrate .. //depot/projects/soc2005/libalias/sys/arm/at91/at91_ssc.c#2 integrate .. //depot/projects/soc2005/libalias/sys/arm/at91/at91_st.c#2 integrate .. //depot/projects/soc2005/libalias/sys/arm/at91/at91_twi.c#2 integrate .. //depot/projects/soc2005/libalias/sys/arm/at91/files.at91#2 integrate .. //depot/projects/soc2005/libalias/sys/arm/at91/if_ate.c#2 integrate .. //depot/projects/soc2005/libalias/sys/arm/at91/kb920x_machdep.c#2 integrate .. //depot/projects/soc2005/libalias/sys/arm/at91/std.at91#2 integrate .. //depot/projects/soc2005/libalias/sys/arm/at91/std.kb920x#2 integrate .. //depot/projects/soc2005/libalias/sys/arm/at91/uart_dev_at91usart.c#2 integrate .. //depot/projects/soc2005/libalias/sys/arm/conf/KB920X#2 integrate .. //depot/projects/soc2005/libalias/sys/arm/include/gdb_machdep.h#1 branch .. //depot/projects/soc2005/libalias/sys/arm/xscale/i80321/i80321.c#2 integrate .. //depot/projects/soc2005/libalias/sys/arm/xscale/i80321/i80321_timer.c#2 integrate .. //depot/projects/soc2005/libalias/sys/arm/xscale/i80321/iq80321.c#2 integrate .. //depot/projects/soc2005/libalias/sys/boot/forth/loader.conf#2 integrate .. //depot/projects/soc2005/libalias/sys/bsm/audit_kevents.h#2 integrate .. //depot/projects/soc2005/libalias/sys/bsm/audit_record.h#2 integrate .. //depot/projects/soc2005/libalias/sys/cam/cam_xpt.c#2 integrate .. //depot/projects/soc2005/libalias/sys/cam/scsi/scsi_cd.c#2 integrate .. //depot/projects/soc2005/libalias/sys/cam/scsi/scsi_da.c#2 integrate .. //depot/projects/soc2005/libalias/sys/compat/freebsd32/freebsd32_misc.c#2 integrate .. //depot/projects/soc2005/libalias/sys/compat/freebsd32/freebsd32_proto.h#2 integrate .. //depot/projects/soc2005/libalias/sys/compat/freebsd32/freebsd32_syscall.h#2 integrate .. //depot/projects/soc2005/libalias/sys/compat/freebsd32/freebsd32_syscalls.c#2 integrate .. //depot/projects/soc2005/libalias/sys/compat/freebsd32/freebsd32_sysent.c#2 integrate .. //depot/projects/soc2005/libalias/sys/compat/freebsd32/syscalls.master#2 integrate .. //depot/projects/soc2005/libalias/sys/compat/linprocfs/linprocfs.c#2 integrate .. //depot/projects/soc2005/libalias/sys/compat/linux/linux_file.c#2 integrate .. //depot/projects/soc2005/libalias/sys/compat/linux/linux_ioctl.c#2 integrate .. //depot/projects/soc2005/libalias/sys/compat/linux/linux_ipc.c#2 integrate .. //depot/projects/soc2005/libalias/sys/compat/linux/linux_misc.c#2 integrate .. //depot/projects/soc2005/libalias/sys/compat/linux/linux_socket.c#2 integrate .. //depot/projects/soc2005/libalias/sys/compat/linux/linux_util.h#2 integrate .. //depot/projects/soc2005/libalias/sys/compat/svr4/Makefile#2 integrate .. //depot/projects/soc2005/libalias/sys/compat/svr4/svr4_ipc.c#2 integrate .. //depot/projects/soc2005/libalias/sys/compat/svr4/svr4_misc.c#2 integrate .. //depot/projects/soc2005/libalias/sys/compat/svr4/svr4_proto.h#2 integrate .. //depot/projects/soc2005/libalias/sys/compat/svr4/svr4_socket.c#2 integrate .. //depot/projects/soc2005/libalias/sys/compat/svr4/svr4_socket.h#2 integrate .. //depot/projects/soc2005/libalias/sys/compat/svr4/svr4_stream.c#2 integrate .. //depot/projects/soc2005/libalias/sys/compat/svr4/svr4_syscall.h#2 integrate .. //depot/projects/soc2005/libalias/sys/compat/svr4/svr4_syscallnames.c#2 integrate .. //depot/projects/soc2005/libalias/sys/compat/svr4/svr4_sysent.c#2 integrate .. //depot/projects/soc2005/libalias/sys/compat/svr4/svr4_sysvec.c#2 integrate .. //depot/projects/soc2005/libalias/sys/compat/svr4/svr4_util.h#2 integrate .. //depot/projects/soc2005/libalias/sys/compat/svr4/syscalls.master#2 integrate .. //depot/projects/soc2005/libalias/sys/conf/Makefile.arm#2 integrate .. //depot/projects/soc2005/libalias/sys/conf/NOTES#2 integrate .. //depot/projects/soc2005/libalias/sys/conf/files#3 integrate .. //depot/projects/soc2005/libalias/sys/conf/files.amd64#2 integrate .. //depot/projects/soc2005/libalias/sys/conf/files.arm#2 integrate .. //depot/projects/soc2005/libalias/sys/conf/files.i386#2 integrate .. //depot/projects/soc2005/libalias/sys/conf/files.ia64#2 integrate .. //depot/projects/soc2005/libalias/sys/conf/kern.mk#2 integrate .. //depot/projects/soc2005/libalias/sys/conf/kern.pre.mk#2 integrate .. //depot/projects/soc2005/libalias/sys/conf/kmod.mk#2 integrate .. //depot/projects/soc2005/libalias/sys/conf/options#2 integrate .. //depot/projects/soc2005/libalias/sys/conf/options.arm#2 integrate .. //depot/projects/soc2005/libalias/sys/contrib/ia64/libuwx/src.diff#2 delete .. //depot/projects/soc2005/libalias/sys/contrib/ia64/libuwx/src/Makefile#2 integrate .. //depot/projects/soc2005/libalias/sys/contrib/ia64/libuwx/src/uwx.h#2 integrate .. //depot/projects/soc2005/libalias/sys/contrib/ia64/libuwx/src/uwx_bstream.c#2 integrate .. //depot/projects/soc2005/libalias/sys/contrib/ia64/libuwx/src/uwx_bstream.h#2 integrate .. //depot/projects/soc2005/libalias/sys/contrib/ia64/libuwx/src/uwx_context.c#2 integrate .. //depot/projects/soc2005/libalias/sys/contrib/ia64/libuwx/src/uwx_context.h#2 integrate .. //depot/projects/soc2005/libalias/sys/contrib/ia64/libuwx/src/uwx_env.c#2 integrate .. //depot/projects/soc2005/libalias/sys/contrib/ia64/libuwx/src/uwx_env.h#2 integrate .. //depot/projects/soc2005/libalias/sys/contrib/ia64/libuwx/src/uwx_scoreboard.c#2 integrate .. //depot/projects/soc2005/libalias/sys/contrib/ia64/libuwx/src/uwx_scoreboard.h#2 integrate .. //depot/projects/soc2005/libalias/sys/contrib/ia64/libuwx/src/uwx_self-new.c#2 delete .. //depot/projects/soc2005/libalias/sys/contrib/ia64/libuwx/src/uwx_self.c#2 integrate .. //depot/projects/soc2005/libalias/sys/contrib/ia64/libuwx/src/uwx_self.h#2 integrate .. //depot/projects/soc2005/libalias/sys/contrib/ia64/libuwx/src/uwx_self_context.s#2 integrate .. //depot/projects/soc2005/libalias/sys/contrib/ia64/libuwx/src/uwx_self_info.h#1 branch .. //depot/projects/soc2005/libalias/sys/contrib/ia64/libuwx/src/uwx_step.c#2 integrate .. //depot/projects/soc2005/libalias/sys/contrib/ia64/libuwx/src/uwx_step.h#2 integrate .. //depot/projects/soc2005/libalias/sys/contrib/ia64/libuwx/src/uwx_str.c#2 integrate .. //depot/projects/soc2005/libalias/sys/contrib/ia64/libuwx/src/uwx_str.h#2 integrate .. //depot/projects/soc2005/libalias/sys/contrib/ia64/libuwx/src/uwx_swap.c#2 integrate .. //depot/projects/soc2005/libalias/sys/contrib/ia64/libuwx/src/uwx_swap.h#2 integrate .. //depot/projects/soc2005/libalias/sys/contrib/ia64/libuwx/src/uwx_symbols.c#1 branch .. //depot/projects/soc2005/libalias/sys/contrib/ia64/libuwx/src/uwx_symbols.h#1 branch .. //depot/projects/soc2005/libalias/sys/contrib/ia64/libuwx/src/uwx_trace.c#2 integrate .. //depot/projects/soc2005/libalias/sys/contrib/ia64/libuwx/src/uwx_trace.h#2 integrate .. //depot/projects/soc2005/libalias/sys/contrib/ia64/libuwx/src/uwx_ttrace.c#2 delete .. //depot/projects/soc2005/libalias/sys/contrib/ia64/libuwx/src/uwx_ttrace.h#2 delete .. //depot/projects/soc2005/libalias/sys/contrib/ia64/libuwx/src/uwx_uinfo.c#2 integrate .. //depot/projects/soc2005/libalias/sys/contrib/ia64/libuwx/src/uwx_uinfo.h#2 integrate .. //depot/projects/soc2005/libalias/sys/contrib/ia64/libuwx/src/uwx_utable.c#2 integrate .. //depot/projects/soc2005/libalias/sys/contrib/ia64/libuwx/src/uwx_utable.h#2 integrate .. //depot/projects/soc2005/libalias/sys/contrib/pf/net/if_pflog.c#2 integrate .. //depot/projects/soc2005/libalias/sys/contrib/pf/net/if_pfsync.c#2 integrate .. //depot/projects/soc2005/libalias/sys/contrib/pf/net/pf_ioctl.c#2 integrate .. //depot/projects/soc2005/libalias/sys/crypto/via/padlock.c#2 integrate .. //depot/projects/soc2005/libalias/sys/crypto/via/padlock.h#1 branch .. //depot/projects/soc2005/libalias/sys/crypto/via/padlock_cipher.c#1 branch .. //depot/projects/soc2005/libalias/sys/crypto/via/padlock_hash.c#1 branch .. //depot/projects/soc2005/libalias/sys/ddb/db_command.c#2 integrate .. //depot/projects/soc2005/libalias/sys/ddb/db_output.c#2 integrate .. //depot/projects/soc2005/libalias/sys/ddb/db_output.h#2 integrate .. //depot/projects/soc2005/libalias/sys/ddb/db_ps.c#2 integrate .. //depot/projects/soc2005/libalias/sys/ddb/db_thread.c#2 integrate .. //depot/projects/soc2005/libalias/sys/ddb/ddb.h#2 integrate .. //depot/projects/soc2005/libalias/sys/dev/aac/aac_cam.c#2 integrate .. //depot/projects/soc2005/libalias/sys/dev/acpica/acpi_perf.c#2 integrate .. //depot/projects/soc2005/libalias/sys/dev/acpica/acpi_thermal.c#2 integrate .. //depot/projects/soc2005/libalias/sys/dev/amr/amr.c#2 integrate .. //depot/projects/soc2005/libalias/sys/dev/asr/MAINTAINER#2 delete .. //depot/projects/soc2005/libalias/sys/dev/ata/ata-all.h#2 integrate .. //depot/projects/soc2005/libalias/sys/dev/ata/ata-chipset.c#2 integrate .. //depot/projects/soc2005/libalias/sys/dev/ata/ata-lowlevel.c#2 integrate .. //depot/projects/soc2005/libalias/sys/dev/ata/ata-pci.h#2 integrate .. //depot/projects/soc2005/libalias/sys/dev/ata/ata-queue.c#2 integrate .. //depot/projects/soc2005/libalias/sys/dev/ata/atapi-cd.c#2 integrate .. //depot/projects/soc2005/libalias/sys/dev/ath/ath_rate/sample/sample.h#2 integrate .. //depot/projects/soc2005/libalias/sys/dev/ath/if_ath.c#2 integrate .. //depot/projects/soc2005/libalias/sys/dev/ath/if_athvar.h#2 integrate .. //depot/projects/soc2005/libalias/sys/dev/atkbdc/atkbdc_isa.c#2 integrate .. //depot/projects/soc2005/libalias/sys/dev/bce/if_bce.c#2 integrate .. //depot/projects/soc2005/libalias/sys/dev/bge/if_bge.c#2 integrate .. //depot/projects/soc2005/libalias/sys/dev/bge/if_bgereg.h#2 integrate .. //depot/projects/soc2005/libalias/sys/dev/bktr/CHANGELOG.TXT#2 integrate .. //depot/projects/soc2005/libalias/sys/dev/em/if_em.c#2 integrate .. //depot/projects/soc2005/libalias/sys/dev/em/if_em.h#2 integrate .. //depot/projects/soc2005/libalias/sys/dev/fdc/fdc.c#2 integrate .. //depot/projects/soc2005/libalias/sys/dev/ic/nec765.h#2 integrate .. //depot/projects/soc2005/libalias/sys/dev/iicbus/iic.c#2 integrate .. //depot/projects/soc2005/libalias/sys/dev/iicbus/iic.h#2 integrate .. //depot/projects/soc2005/libalias/sys/dev/iicbus/iicbus.c#2 integrate .. //depot/projects/soc2005/libalias/sys/dev/iicbus/iicbus.h#2 integrate .. //depot/projects/soc2005/libalias/sys/dev/iicbus/iicbus_if.m#2 integrate .. //depot/projects/soc2005/libalias/sys/dev/iicbus/iiconf.c#2 integrate .. //depot/projects/soc2005/libalias/sys/dev/iicbus/iiconf.h#2 integrate .. //depot/projects/soc2005/libalias/sys/dev/isp/isp.c#2 integrate .. //depot/projects/soc2005/libalias/sys/dev/isp/isp_freebsd.c#2 integrate .. //depot/projects/soc2005/libalias/sys/dev/isp/isp_freebsd.h#2 integrate .. //depot/projects/soc2005/libalias/sys/dev/isp/isp_library.c#2 integrate .. //depot/projects/soc2005/libalias/sys/dev/isp/isp_pci.c#2 integrate .. //depot/projects/soc2005/libalias/sys/dev/isp/isp_sbus.c#2 integrate .. //depot/projects/soc2005/libalias/sys/dev/isp/isp_target.c#2 integrate .. //depot/projects/soc2005/libalias/sys/dev/isp/ispmbox.h#2 integrate .. //depot/projects/soc2005/libalias/sys/dev/isp/ispreg.h#2 integrate .. //depot/projects/soc2005/libalias/sys/dev/isp/ispvar.h#2 integrate .. //depot/projects/soc2005/libalias/sys/dev/ispfw/asm_1040.h#2 integrate .. //depot/projects/soc2005/libalias/sys/dev/ispfw/asm_1080.h#2 integrate .. //depot/projects/soc2005/libalias/sys/dev/ispfw/asm_12160.h#2 integrate .. //depot/projects/soc2005/libalias/sys/dev/ispfw/asm_2322.h#1 branch .. //depot/projects/soc2005/libalias/sys/dev/ispfw/ispfw.c#2 integrate .. //depot/projects/soc2005/libalias/sys/dev/iwi/if_iwi.c#2 integrate .. //depot/projects/soc2005/libalias/sys/dev/lmc/if_lmc.c#2 integrate .. //depot/projects/soc2005/libalias/sys/dev/lmc/if_lmc.h#2 integrate .. //depot/projects/soc2005/libalias/sys/dev/mfi/mfi.c#2 integrate .. //depot/projects/soc2005/libalias/sys/dev/mii/acphy.c#2 integrate .. //depot/projects/soc2005/libalias/sys/dev/mii/amphy.c#2 integrate .. //depot/projects/soc2005/libalias/sys/dev/mii/bmtphy.c#2 integrate .. //depot/projects/soc2005/libalias/sys/dev/mii/brgphy.c#2 integrate .. //depot/projects/soc2005/libalias/sys/dev/mii/ciphy.c#2 integrate .. //depot/projects/soc2005/libalias/sys/dev/mii/e1000phy.c#2 integrate .. //depot/projects/soc2005/libalias/sys/dev/mii/exphy.c#2 integrate .. //depot/projects/soc2005/libalias/sys/dev/mii/gentbi.c#1 branch .. //depot/projects/soc2005/libalias/sys/dev/mii/inphy.c#2 integrate .. //depot/projects/soc2005/libalias/sys/dev/mii/ip1000phy.c#1 branch .. //depot/projects/soc2005/libalias/sys/dev/mii/ip1000phyreg.h#1 branch .. //depot/projects/soc2005/libalias/sys/dev/mii/lxtphy.c#2 integrate .. //depot/projects/soc2005/libalias/sys/dev/mii/mii_physubr.c#2 integrate .. //depot/projects/soc2005/libalias/sys/dev/mii/miidevs#2 integrate .. //depot/projects/soc2005/libalias/sys/dev/mii/mlphy.c#2 integrate .. //depot/projects/soc2005/libalias/sys/dev/mii/nsgphy.c#2 integrate .. //depot/projects/soc2005/libalias/sys/dev/mii/nsphy.c#2 integrate .. //depot/projects/soc2005/libalias/sys/dev/mii/pnaphy.c#2 integrate .. //depot/projects/soc2005/libalias/sys/dev/mii/qsphy.c#2 integrate .. //depot/projects/soc2005/libalias/sys/dev/mii/rgephy.c#2 integrate .. //depot/projects/soc2005/libalias/sys/dev/mii/rlphy.c#2 integrate .. //depot/projects/soc2005/libalias/sys/dev/mii/ruephy.c#2 integrate .. //depot/projects/soc2005/libalias/sys/dev/mii/tdkphy.c#2 integrate .. //depot/projects/soc2005/libalias/sys/dev/mii/tlphy.c#2 integrate .. //depot/projects/soc2005/libalias/sys/dev/mii/ukphy.c#2 integrate .. //depot/projects/soc2005/libalias/sys/dev/mii/xmphy.c#2 integrate .. //depot/projects/soc2005/libalias/sys/dev/mpt/mpt.c#2 integrate .. //depot/projects/soc2005/libalias/sys/dev/mpt/mpt.h#2 integrate .. //depot/projects/soc2005/libalias/sys/dev/mpt/mpt_cam.c#2 integrate .. //depot/projects/soc2005/libalias/sys/dev/mpt/mpt_debug.c#2 integrate .. //depot/projects/soc2005/libalias/sys/dev/mpt/mpt_pci.c#2 integrate .. //depot/projects/soc2005/libalias/sys/dev/mpt/mpt_raid.c#2 integrate .. //depot/projects/soc2005/libalias/sys/dev/mpt/mpt_raid.h#2 integrate .. //depot/projects/soc2005/libalias/sys/dev/mxge/if_mxge.c#2 integrate .. //depot/projects/soc2005/libalias/sys/dev/ncv/ncr53c500_pccard.c#2 integrate .. //depot/projects/soc2005/libalias/sys/dev/nfe/if_nfe.c#1 branch .. //depot/projects/soc2005/libalias/sys/dev/nfe/if_nfereg.h#1 branch .. //depot/projects/soc2005/libalias/sys/dev/nfe/if_nfevar.h#1 branch .. //depot/projects/soc2005/libalias/sys/dev/pccard/pccarddevs#2 integrate .. //depot/projects/soc2005/libalias/sys/dev/pci/pci.c#2 integrate .. //depot/projects/soc2005/libalias/sys/dev/puc/puc.c#2 integrate .. //depot/projects/soc2005/libalias/sys/dev/puc/puc_cfg.c#2 integrate .. //depot/projects/soc2005/libalias/sys/dev/puc/puc_pccard.c#2 integrate .. //depot/projects/soc2005/libalias/sys/dev/puc/puc_pci.c#2 integrate .. //depot/projects/soc2005/libalias/sys/dev/puc/pucdata.c#2 integrate .. //depot/projects/soc2005/libalias/sys/dev/ral/rt2560.c#2 integrate .. //depot/projects/soc2005/libalias/sys/dev/random/probe.c#2 integrate .. //depot/projects/soc2005/libalias/sys/dev/re/if_re.c#2 integrate .. //depot/projects/soc2005/libalias/sys/dev/scc/scc_core.c#2 integrate .. //depot/projects/soc2005/libalias/sys/dev/scc/scc_dev_z8530.c#2 integrate .. //depot/projects/soc2005/libalias/sys/dev/sio/sio.c#2 integrate .. //depot/projects/soc2005/libalias/sys/dev/sk/if_sk.c#2 integrate .. //depot/projects/soc2005/libalias/sys/dev/sk/if_skreg.h#2 integrate .. //depot/projects/soc2005/libalias/sys/dev/sound/driver.c#2 integrate .. //depot/projects/soc2005/libalias/sys/dev/sound/midi/sequencer.c#2 integrate .. //depot/projects/soc2005/libalias/sys/dev/sound/pci/cmi.c#2 integrate .. //depot/projects/soc2005/libalias/sys/dev/sound/pci/emu10k1.c#2 integrate .. //depot/projects/soc2005/libalias/sys/dev/sound/pci/emu10kx-midi.c#1 branch .. //depot/projects/soc2005/libalias/sys/dev/sound/pci/emu10kx-pcm.c#1 branch .. //depot/projects/soc2005/libalias/sys/dev/sound/pci/emu10kx.c#1 branch .. //depot/projects/soc2005/libalias/sys/dev/sound/pci/emu10kx.h#1 branch .. //depot/projects/soc2005/libalias/sys/dev/sound/pci/solo.c#2 integrate .. //depot/projects/soc2005/libalias/sys/dev/sound/pcm/buffer.c#2 integrate .. //depot/projects/soc2005/libalias/sys/dev/sound/pcm/buffer.h#2 integrate .. //depot/projects/soc2005/libalias/sys/dev/sound/pcm/mixer.h#2 integrate .. //depot/projects/soc2005/libalias/sys/dev/sound/pcm/sound.c#2 integrate .. //depot/projects/soc2005/libalias/sys/dev/sound/pcm/sound.h#2 integrate .. //depot/projects/soc2005/libalias/sys/dev/spibus/spi.h#1 branch .. //depot/projects/soc2005/libalias/sys/dev/spibus/spibus.c#1 branch .. //depot/projects/soc2005/libalias/sys/dev/spibus/spibus_if.m#1 branch .. //depot/projects/soc2005/libalias/sys/dev/spibus/spibusvar.h#1 branch .. //depot/projects/soc2005/libalias/sys/dev/stg/tmc18c30_subr.c#2 integrate .. //depot/projects/soc2005/libalias/sys/dev/stge/if_stge.c#1 branch .. //depot/projects/soc2005/libalias/sys/dev/stge/if_stgereg.h#1 branch .. //depot/projects/soc2005/libalias/sys/dev/streams/streams.c#2 integrate .. //depot/projects/soc2005/libalias/sys/dev/usb/if_aue.c#2 integrate .. //depot/projects/soc2005/libalias/sys/dev/usb/if_ural.c#2 integrate .. //depot/projects/soc2005/libalias/sys/dev/usb/uplcom.c#2 integrate .. //depot/projects/soc2005/libalias/sys/dev/usb/usbdevs#2 integrate .. //depot/projects/soc2005/libalias/sys/doc/Doxyfile#2 delete .. //depot/projects/soc2005/libalias/sys/doc/Makefile#2 delete .. //depot/projects/soc2005/libalias/sys/doc/subsys/Dependencies#2 delete .. //depot/projects/soc2005/libalias/sys/doc/subsys/Doxyfile-cam#2 delete .. //depot/projects/soc2005/libalias/sys/doc/subsys/Doxyfile-crypto#2 delete .. //depot/projects/soc2005/libalias/sys/doc/subsys/Doxyfile-dev_pci#2 delete .. //depot/projects/soc2005/libalias/sys/doc/subsys/Doxyfile-dev_sound#2 delete .. //depot/projects/soc2005/libalias/sys/doc/subsys/Doxyfile-dev_usb#2 delete .. //depot/projects/soc2005/libalias/sys/doc/subsys/Doxyfile-geom#2 delete .. //depot/projects/soc2005/libalias/sys/doc/subsys/Doxyfile-i4b#2 delete .. //depot/projects/soc2005/libalias/sys/doc/subsys/Doxyfile-kern#2 delete .. //depot/projects/soc2005/libalias/sys/doc/subsys/Doxyfile-libkern#2 delete .. //depot/projects/soc2005/libalias/sys/doc/subsys/Doxyfile-linux#2 delete .. //depot/projects/soc2005/libalias/sys/doc/subsys/Doxyfile-net80211#2 delete .. //depot/projects/soc2005/libalias/sys/doc/subsys/Doxyfile-netgraph#2 delete .. //depot/projects/soc2005/libalias/sys/doc/subsys/Doxyfile-netinet#2 delete .. //depot/projects/soc2005/libalias/sys/doc/subsys/Doxyfile-netinet6#2 delete .. //depot/projects/soc2005/libalias/sys/doc/subsys/Doxyfile-netipsec#2 delete .. //depot/projects/soc2005/libalias/sys/doc/subsys/Doxyfile-opencrypto#2 delete .. //depot/projects/soc2005/libalias/sys/doc/subsys/Doxyfile-vm#2 delete .. //depot/projects/soc2005/libalias/sys/doc/subsys/Makefile#2 delete .. //depot/projects/soc2005/libalias/sys/doc/subsys/README#2 delete .. //depot/projects/soc2005/libalias/sys/doc/subsys/common-Doxyfile#2 delete .. //depot/projects/soc2005/libalias/sys/doc/subsys/notreviewed.dox#2 delete .. //depot/projects/soc2005/libalias/sys/fs/devfs/devfs_devs.c#2 integrate .. //depot/projects/soc2005/libalias/sys/fs/devfs/devfs_rule.c#2 integrate .. //depot/projects/soc2005/libalias/sys/fs/devfs/devfs_vfsops.c#2 integrate .. //depot/projects/soc2005/libalias/sys/fs/devfs/devfs_vnops.c#2 integrate .. //depot/projects/soc2005/libalias/sys/fs/portalfs/portal_vnops.c#2 integrate .. //depot/projects/soc2005/libalias/sys/fs/pseudofs/pseudofs_vnops.c#2 integrate .. //depot/projects/soc2005/libalias/sys/fs/smbfs/smbfs_vfsops.c#2 integrate .. //depot/projects/soc2005/libalias/sys/fs/udf/ecma167-udf.h#2 integrate .. //depot/projects/soc2005/libalias/sys/fs/udf/udf_vfsops.c#2 integrate .. //depot/projects/soc2005/libalias/sys/fs/unionfs/union_vnops.c#2 integrate .. //depot/projects/soc2005/libalias/sys/geom/eli/g_eli_integrity.c#2 integrate .. //depot/projects/soc2005/libalias/sys/geom/geom.h#2 integrate .. //depot/projects/soc2005/libalias/sys/geom/geom_gpt.c#2 integrate .. //depot/projects/soc2005/libalias/sys/geom/mirror/g_mirror.c#2 integrate .. //depot/projects/soc2005/libalias/sys/geom/mirror/g_mirror_ctl.c#2 integrate .. //depot/projects/soc2005/libalias/sys/geom/raid3/g_raid3.c#2 integrate .. //depot/projects/soc2005/libalias/sys/geom/raid3/g_raid3_ctl.c#2 integrate .. //depot/projects/soc2005/libalias/sys/gnu/dev/sound/pci/emu10k1-ac97.h#2 delete .. //depot/projects/soc2005/libalias/sys/gnu/dev/sound/pci/emu10k1-alsa.h#2 integrate .. //depot/projects/soc2005/libalias/sys/gnu/dev/sound/pci/emu10k1.h#2 delete .. //depot/projects/soc2005/libalias/sys/gnu/dev/sound/pci/p16v-alsa.h#1 branch .. //depot/projects/soc2005/libalias/sys/gnu/dev/sound/pci/p17v-alsa.h#1 branch .. //depot/projects/soc2005/libalias/sys/i386/conf/GENERIC#2 integrate .. //depot/projects/soc2005/libalias/sys/i386/conf/NOTES#2 integrate .. //depot/projects/soc2005/libalias/sys/i386/conf/PAE#2 integrate .. //depot/projects/soc2005/libalias/sys/i386/conf/XBOX#2 integrate .. //depot/projects/soc2005/libalias/sys/i386/i386/db_trace.c#2 integrate .. //depot/projects/soc2005/libalias/sys/i386/i386/identcpu.c#2 integrate .. //depot/projects/soc2005/libalias/sys/i386/i386/initcpu.c#2 integrate .. //depot/projects/soc2005/libalias/sys/i386/i386/intr_machdep.c#2 integrate .. //depot/projects/soc2005/libalias/sys/i386/i386/local_apic.c#2 integrate .. //depot/projects/soc2005/libalias/sys/i386/i386/machdep.c#2 integrate .. //depot/projects/soc2005/libalias/sys/i386/i386/pmap.c#2 integrate .. //depot/projects/soc2005/libalias/sys/i386/ibcs2/ibcs2_ipc.c#2 integrate .. //depot/projects/soc2005/libalias/sys/i386/ibcs2/ibcs2_ipc.h#2 integrate .. //depot/projects/soc2005/libalias/sys/i386/ibcs2/ibcs2_isc_syscall.h#2 integrate .. //depot/projects/soc2005/libalias/sys/i386/ibcs2/ibcs2_isc_sysent.c#2 integrate .. //depot/projects/soc2005/libalias/sys/i386/ibcs2/ibcs2_misc.c#2 integrate .. //depot/projects/soc2005/libalias/sys/i386/ibcs2/ibcs2_msg.c#2 integrate .. //depot/projects/soc2005/libalias/sys/i386/ibcs2/ibcs2_other.c#2 integrate .. //depot/projects/soc2005/libalias/sys/i386/ibcs2/ibcs2_poll.h#2 delete .. //depot/projects/soc2005/libalias/sys/i386/ibcs2/ibcs2_proto.h#2 integrate .. //depot/projects/soc2005/libalias/sys/i386/ibcs2/ibcs2_syscall.h#2 integrate .. //depot/projects/soc2005/libalias/sys/i386/ibcs2/ibcs2_sysent.c#2 integrate .. //depot/projects/soc2005/libalias/sys/i386/ibcs2/ibcs2_util.h#2 integrate .. //depot/projects/soc2005/libalias/sys/i386/ibcs2/ibcs2_xenix.c#2 integrate .. //depot/projects/soc2005/libalias/sys/i386/ibcs2/ibcs2_xenix.h#2 integrate .. //depot/projects/soc2005/libalias/sys/i386/ibcs2/ibcs2_xenix_syscall.h#2 integrate .. //depot/projects/soc2005/libalias/sys/i386/ibcs2/ibcs2_xenix_sysent.c#2 integrate .. //depot/projects/soc2005/libalias/sys/i386/ibcs2/imgact_coff.c#2 integrate .. //depot/projects/soc2005/libalias/sys/i386/ibcs2/syscalls.isc#2 integrate .. //depot/projects/soc2005/libalias/sys/i386/ibcs2/syscalls.master#2 integrate .. //depot/projects/soc2005/libalias/sys/i386/ibcs2/syscalls.xenix#2 integrate .. //depot/projects/soc2005/libalias/sys/i386/include/i4b_ioctl.h#2 integrate .. //depot/projects/soc2005/libalias/sys/i386/include/md_var.h#2 integrate .. //depot/projects/soc2005/libalias/sys/i386/include/specialreg.h#2 integrate .. //depot/projects/soc2005/libalias/sys/i386/linux/linux_proto.h#2 integrate .. //depot/projects/soc2005/libalias/sys/i386/linux/linux_syscall.h#2 integrate .. //depot/projects/soc2005/libalias/sys/i386/linux/linux_sysent.c#2 integrate .. //depot/projects/soc2005/libalias/sys/i386/linux/syscalls.master#2 integrate .. //depot/projects/soc2005/libalias/sys/i4b/layer4/i4b_l4mgmt.c#2 integrate .. //depot/projects/soc2005/libalias/sys/ia64/conf/DEFAULTS#2 integrate .. //depot/projects/soc2005/libalias/sys/ia64/conf/GENERIC#2 integrate .. //depot/projects/soc2005/libalias/sys/ia64/ia64/db_machdep.c#2 integrate .. //depot/projects/soc2005/libalias/sys/ia64/ia64/emulate.c#1 branch .. //depot/projects/soc2005/libalias/sys/ia64/ia64/pmap.c#2 integrate .. //depot/projects/soc2005/libalias/sys/ia64/ia64/trap.c#2 integrate .. //depot/projects/soc2005/libalias/sys/ia64/include/ieeefp.h#2 integrate .. //depot/projects/soc2005/libalias/sys/ia64/include/md_var.h#2 integrate .. //depot/projects/soc2005/libalias/sys/isa/isahint.c#2 integrate .. //depot/projects/soc2005/libalias/sys/kern/bus_if.m#2 integrate .. //depot/projects/soc2005/libalias/sys/kern/init_sysent.c#2 integrate .. //depot/projects/soc2005/libalias/sys/kern/kern_acl.c#2 integrate .. //depot/projects/soc2005/libalias/sys/kern/kern_descrip.c#2 integrate .. //depot/projects/soc2005/libalias/sys/kern/kern_environment.c#2 integrate .. //depot/projects/soc2005/libalias/sys/kern/kern_fork.c#2 integrate .. //depot/projects/soc2005/libalias/sys/kern/kern_intr.c#2 integrate .. //depot/projects/soc2005/libalias/sys/kern/kern_ktr.c#2 integrate .. //depot/projects/soc2005/libalias/sys/kern/kern_ktrace.c#2 integrate .. //depot/projects/soc2005/libalias/sys/kern/kern_linker.c#2 integrate .. //depot/projects/soc2005/libalias/sys/kern/kern_lock.c#2 integrate .. //depot/projects/soc2005/libalias/sys/kern/kern_mac.c#2 integrate .. //depot/projects/soc2005/libalias/sys/kern/kern_malloc.c#2 integrate .. //depot/projects/soc2005/libalias/sys/kern/kern_module.c#2 integrate .. //depot/projects/soc2005/libalias/sys/kern/kern_prot.c#2 integrate .. //depot/projects/soc2005/libalias/sys/kern/kern_thr.c#2 integrate .. //depot/projects/soc2005/libalias/sys/kern/kern_thread.c#2 integrate .. //depot/projects/soc2005/libalias/sys/kern/kern_uuid.c#2 integrate .. //depot/projects/soc2005/libalias/sys/kern/link_elf.c#2 integrate .. //depot/projects/soc2005/libalias/sys/kern/sched_4bsd.c#2 integrate .. //depot/projects/soc2005/libalias/sys/kern/sched_core.c#2 integrate .. //depot/projects/soc2005/libalias/sys/kern/subr_acl_posix1e.c#1 branch .. //depot/projects/soc2005/libalias/sys/kern/subr_autoconf.c#2 integrate .. //depot/projects/soc2005/libalias/sys/kern/subr_bus.c#2 integrate .. //depot/projects/soc2005/libalias/sys/kern/subr_hints.c#2 integrate .. //depot/projects/soc2005/libalias/sys/kern/subr_prf.c#2 integrate .. //depot/projects/soc2005/libalias/sys/kern/subr_turnstile.c#2 integrate .. //depot/projects/soc2005/libalias/sys/kern/sys_generic.c#2 integrate .. //depot/projects/soc2005/libalias/sys/kern/sys_socket.c#2 integrate .. //depot/projects/soc2005/libalias/sys/kern/syscalls.c#2 integrate .. //depot/projects/soc2005/libalias/sys/kern/syscalls.master#2 integrate .. //depot/projects/soc2005/libalias/sys/kern/sysv_sem.c#2 integrate .. //depot/projects/soc2005/libalias/sys/kern/uipc_domain.c#2 integrate .. //depot/projects/soc2005/libalias/sys/kern/uipc_sockbuf.c#1 branch .. //depot/projects/soc2005/libalias/sys/kern/uipc_socket.c#2 integrate .. //depot/projects/soc2005/libalias/sys/kern/uipc_socket2.c#2 integrate .. //depot/projects/soc2005/libalias/sys/kern/uipc_syscalls.c#2 integrate .. //depot/projects/soc2005/libalias/sys/kern/uipc_usrreq.c#2 integrate .. //depot/projects/soc2005/libalias/sys/kern/vfs_bio.c#2 integrate .. //depot/projects/soc2005/libalias/sys/kern/vfs_init.c#2 integrate .. //depot/projects/soc2005/libalias/sys/kern/vfs_mount.c#2 integrate .. //depot/projects/soc2005/libalias/sys/kern/vfs_subr.c#2 integrate .. //depot/projects/soc2005/libalias/sys/kern/vfs_syscalls.c#2 integrate .. //depot/projects/soc2005/libalias/sys/modules/Makefile#2 integrate .. //depot/projects/soc2005/libalias/sys/modules/bktr/bktr_mem/Makefile#2 integrate .. //depot/projects/soc2005/libalias/sys/modules/ispfw/Makefile#2 integrate .. //depot/projects/soc2005/libalias/sys/modules/ispfw/isp_1000/Makefile#1 branch .. //depot/projects/soc2005/libalias/sys/modules/ispfw/isp_1040/Makefile#1 branch .. //depot/projects/soc2005/libalias/sys/modules/ispfw/isp_1040_it/Makefile#1 branch .. //depot/projects/soc2005/libalias/sys/modules/ispfw/isp_1080/Makefile#1 branch .. //depot/projects/soc2005/libalias/sys/modules/ispfw/isp_1080_it/Makefile#1 branch .. //depot/projects/soc2005/libalias/sys/modules/ispfw/isp_12160/Makefile#1 branch .. //depot/projects/soc2005/libalias/sys/modules/ispfw/isp_12160_it/Makefile#1 branch .. //depot/projects/soc2005/libalias/sys/modules/ispfw/isp_2100/Makefile#1 branch .. //depot/projects/soc2005/libalias/sys/modules/ispfw/isp_2200/Makefile#1 branch .. //depot/projects/soc2005/libalias/sys/modules/ispfw/isp_2300/Makefile#1 branch .. //depot/projects/soc2005/libalias/sys/modules/ispfw/isp_2322/Makefile#1 branch .. //depot/projects/soc2005/libalias/sys/modules/ispfw/ispfw/Makefile#1 branch .. //depot/projects/soc2005/libalias/sys/modules/mii/Makefile#2 integrate .. //depot/projects/soc2005/libalias/sys/modules/netgraph/Makefile#2 integrate .. //depot/projects/soc2005/libalias/sys/modules/netgraph/tag/Makefile#1 branch .. //depot/projects/soc2005/libalias/sys/modules/nfe/Makefile#1 branch .. //depot/projects/soc2005/libalias/sys/modules/padlock/Makefile#2 integrate .. //depot/projects/soc2005/libalias/sys/modules/sound/driver/Makefile#2 integrate .. //depot/projects/soc2005/libalias/sys/modules/sound/driver/emu10kx/Makefile#1 branch .. //depot/projects/soc2005/libalias/sys/modules/stge/Makefile#1 branch .. //depot/projects/soc2005/libalias/sys/modules/streams/Makefile#2 integrate .. //depot/projects/soc2005/libalias/sys/modules/svr4/Makefile#2 integrate .. //depot/projects/soc2005/libalias/sys/net/bpf.c#2 integrate .. //depot/projects/soc2005/libalias/sys/net/bridgestp.c#2 integrate .. //depot/projects/soc2005/libalias/sys/net/bridgestp.h#1 branch .. //depot/projects/soc2005/libalias/sys/net/if.c#2 integrate .. //depot/projects/soc2005/libalias/sys/net/if_atmsubr.c#2 integrate .. //depot/projects/soc2005/libalias/sys/net/if_bridge.c#2 integrate .. //depot/projects/soc2005/libalias/sys/net/if_bridgevar.h#2 integrate .. //depot/projects/soc2005/libalias/sys/net/if_clone.c#2 integrate .. //depot/projects/soc2005/libalias/sys/net/if_clone.h#2 integrate .. //depot/projects/soc2005/libalias/sys/net/if_disc.c#2 integrate .. //depot/projects/soc2005/libalias/sys/net/if_enc.c#1 branch .. //depot/projects/soc2005/libalias/sys/net/if_faith.c#2 integrate .. //depot/projects/soc2005/libalias/sys/net/if_gif.c#2 integrate .. //depot/projects/soc2005/libalias/sys/net/if_gre.c#2 integrate .. //depot/projects/soc2005/libalias/sys/net/if_loop.c#2 integrate .. //depot/projects/soc2005/libalias/sys/net/if_ppp.c#2 integrate .. //depot/projects/soc2005/libalias/sys/net/if_spppsubr.c#2 integrate .. //depot/projects/soc2005/libalias/sys/net/if_stf.c#2 integrate .. //depot/projects/soc2005/libalias/sys/net/if_tap.c#2 integrate .. //depot/projects/soc2005/libalias/sys/net/if_tun.c#2 integrate .. //depot/projects/soc2005/libalias/sys/net/if_types.h#2 integrate .. //depot/projects/soc2005/libalias/sys/net/if_vlan.c#2 integrate .. //depot/projects/soc2005/libalias/sys/net/raw_usrreq.c#2 integrate .. //depot/projects/soc2005/libalias/sys/net/rtsock.c#2 integrate .. //depot/projects/soc2005/libalias/sys/net80211/ieee80211.c#2 integrate .. //depot/projects/soc2005/libalias/sys/net80211/ieee80211.h#2 integrate .. //depot/projects/soc2005/libalias/sys/net80211/ieee80211_freebsd.h#2 integrate .. //depot/projects/soc2005/libalias/sys/net80211/ieee80211_input.c#2 integrate .. //depot/projects/soc2005/libalias/sys/net80211/ieee80211_ioctl.c#2 integrate .. //depot/projects/soc2005/libalias/sys/net80211/ieee80211_ioctl.h#2 integrate .. //depot/projects/soc2005/libalias/sys/net80211/ieee80211_output.c#2 integrate .. //depot/projects/soc2005/libalias/sys/net80211/ieee80211_proto.c#2 integrate .. //depot/projects/soc2005/libalias/sys/net80211/ieee80211_proto.h#2 integrate .. //depot/projects/soc2005/libalias/sys/net80211/ieee80211_var.h#2 integrate .. //depot/projects/soc2005/libalias/sys/netatalk/ddp_usrreq.c#2 integrate .. //depot/projects/soc2005/libalias/sys/netatm/atm_aal5.c#2 integrate .. //depot/projects/soc2005/libalias/sys/netatm/atm_usrreq.c#2 integrate .. //depot/projects/soc2005/libalias/sys/netgraph/bluetooth/drivers/bt3c/ng_bt3c_pccard.c#2 integrate .. //depot/projects/soc2005/libalias/sys/netgraph/bluetooth/drivers/bt3c/ng_bt3c_var.h#2 integrate .. //depot/projects/soc2005/libalias/sys/netgraph/bluetooth/include/ng_btsocket_hci_raw.h#2 integrate .. //depot/projects/soc2005/libalias/sys/netgraph/bluetooth/include/ng_btsocket_l2cap.h#2 integrate .. //depot/projects/soc2005/libalias/sys/netgraph/bluetooth/include/ng_btsocket_rfcomm.h#2 integrate .. //depot/projects/soc2005/libalias/sys/netgraph/bluetooth/socket/ng_btsocket.c#2 integrate .. //depot/projects/soc2005/libalias/sys/netgraph/bluetooth/socket/ng_btsocket_hci_raw.c#2 integrate .. //depot/projects/soc2005/libalias/sys/netgraph/bluetooth/socket/ng_btsocket_l2cap.c#2 integrate .. //depot/projects/soc2005/libalias/sys/netgraph/bluetooth/socket/ng_btsocket_l2cap_raw.c#2 integrate .. //depot/projects/soc2005/libalias/sys/netgraph/bluetooth/socket/ng_btsocket_rfcomm.c#2 integrate .. //depot/projects/soc2005/libalias/sys/netgraph/ng_ksocket.c#2 integrate .. //depot/projects/soc2005/libalias/sys/netgraph/ng_socket.c#2 integrate .. //depot/projects/soc2005/libalias/sys/netgraph/ng_tag.c#1 branch .. //depot/projects/soc2005/libalias/sys/netgraph/ng_tag.h#1 branch .. //depot/projects/soc2005/libalias/sys/netinet/if_ether.c#2 integrate .. //depot/projects/soc2005/libalias/sys/netinet/in_pcb.c#2 integrate .. //depot/projects/soc2005/libalias/sys/netinet/in_pcb.h#2 integrate .. //depot/projects/soc2005/libalias/sys/netinet/in_rmx.c#2 integrate .. //depot/projects/soc2005/libalias/sys/netinet/ip_carp.c#2 integrate .. //depot/projects/soc2005/libalias/sys/netinet/ip_divert.c#2 integrate .. //depot/projects/soc2005/libalias/sys/netinet/ip_fw2.c#3 integrate .. //depot/projects/soc2005/libalias/sys/netinet/ip_ipsec.c#2 integrate .. //depot/projects/soc2005/libalias/sys/netinet/ip_output.c#2 integrate .. //depot/projects/soc2005/libalias/sys/netinet/libalias/libalias.3#3 integrate .. //depot/projects/soc2005/libalias/sys/netinet/raw_ip.c#3 integrate .. //depot/projects/soc2005/libalias/sys/netinet/tcp_input.c#2 integrate .. //depot/projects/soc2005/libalias/sys/netinet/tcp_subr.c#2 integrate .. //depot/projects/soc2005/libalias/sys/netinet/tcp_syncache.c#2 integrate .. //depot/projects/soc2005/libalias/sys/netinet/tcp_usrreq.c#2 integrate .. //depot/projects/soc2005/libalias/sys/netinet/tcp_var.h#2 integrate .. //depot/projects/soc2005/libalias/sys/netinet/udp_usrreq.c#2 integrate .. //depot/projects/soc2005/libalias/sys/netinet6/README#2 delete .. //depot/projects/soc2005/libalias/sys/netinet6/icmp6.c#2 integrate .. //depot/projects/soc2005/libalias/sys/netinet6/in6.c#2 integrate .. //depot/projects/soc2005/libalias/sys/netinet6/in6_cksum.c#2 integrate .. //depot/projects/soc2005/libalias/sys/netinet6/in6_pcb.c#2 integrate .. //depot/projects/soc2005/libalias/sys/netinet6/in6_rmx.c#2 integrate .. //depot/projects/soc2005/libalias/sys/netinet6/in6_var.h#2 integrate .. //depot/projects/soc2005/libalias/sys/netinet6/ipsec.c#2 integrate .. //depot/projects/soc2005/libalias/sys/netinet6/raw_ip6.c#2 integrate .. //depot/projects/soc2005/libalias/sys/netinet6/udp6_usrreq.c#2 integrate .. //depot/projects/soc2005/libalias/sys/netipsec/ipsec.h#2 integrate .. //depot/projects/soc2005/libalias/sys/netipsec/ipsec_input.c#2 integrate .. //depot/projects/soc2005/libalias/sys/netipsec/ipsec_osdep.h#2 integrate .. //depot/projects/soc2005/libalias/sys/netipsec/ipsec_output.c#2 integrate .. //depot/projects/soc2005/libalias/sys/netipsec/keysock.c#2 integrate .. //depot/projects/soc2005/libalias/sys/netipsec/xform_ipip.c#2 integrate .. //depot/projects/soc2005/libalias/sys/netipx/ipx_usrreq.c#2 integrate .. //depot/projects/soc2005/libalias/sys/netipx/spx_usrreq.c#2 integrate .. //depot/projects/soc2005/libalias/sys/netkey/keysock.c#2 integrate .. //depot/projects/soc2005/libalias/sys/netnatm/natm.c#2 integrate .. //depot/projects/soc2005/libalias/sys/netncp/ncp_sock.c#2 integrate .. //depot/projects/soc2005/libalias/sys/netsmb/smb_conn.c#2 integrate .. //depot/projects/soc2005/libalias/sys/netsmb/smb_trantcp.c#2 integrate .. //depot/projects/soc2005/libalias/sys/nfs4client/nfs4_vnops.c#2 integrate .. //depot/projects/soc2005/libalias/sys/nfsclient/bootp_subr.c#2 integrate .. //depot/projects/soc2005/libalias/sys/nfsclient/nfs_diskless.c#2 integrate .. //depot/projects/soc2005/libalias/sys/nfsclient/nfs_socket.c#2 integrate .. //depot/projects/soc2005/libalias/sys/nfsclient/nfs_vnops.c#2 integrate .. //depot/projects/soc2005/libalias/sys/nfsserver/nfs_srvsock.c#2 integrate .. //depot/projects/soc2005/libalias/sys/pc98/conf/GENERIC#2 integrate .. //depot/projects/soc2005/libalias/sys/pc98/pc98/machdep.c#2 integrate .. //depot/projects/soc2005/libalias/sys/pci/agp_i810.c#2 integrate .. //depot/projects/soc2005/libalias/sys/pci/if_rlreg.h#2 integrate .. //depot/projects/soc2005/libalias/sys/posix4/ksched.c#2 integrate .. //depot/projects/soc2005/libalias/sys/posix4/p1003_1b.c#2 integrate .. //depot/projects/soc2005/libalias/sys/posix4/posix4.h#2 integrate .. //depot/projects/soc2005/libalias/sys/powerpc/conf/GENERIC#2 integrate .. //depot/projects/soc2005/libalias/sys/powerpc/powerpc/db_trace.c#2 integrate .. //depot/projects/soc2005/libalias/sys/powerpc/powerpc/mmu_oea.c#2 integrate .. //depot/projects/soc2005/libalias/sys/security/audit/audit.h#2 integrate .. //depot/projects/soc2005/libalias/sys/security/audit/audit_arg.c#2 integrate .. //depot/projects/soc2005/libalias/sys/security/audit/audit_bsm.c#2 integrate .. //depot/projects/soc2005/libalias/sys/security/mac/mac_vfs.c#2 integrate .. //depot/projects/soc2005/libalias/sys/security/mac_biba/mac_biba.c#2 integrate .. //depot/projects/soc2005/libalias/sys/sparc64/conf/GENERIC#2 integrate .. //depot/projects/soc2005/libalias/sys/sparc64/include/pmap.h#2 integrate .. //depot/projects/soc2005/libalias/sys/sparc64/sparc64/db_trace.c#2 integrate .. //depot/projects/soc2005/libalias/sys/sys/_label.h#2 integrate .. //depot/projects/soc2005/libalias/sys/sys/bufobj.h#2 integrate .. //depot/projects/soc2005/libalias/sys/sys/bus.h#2 integrate .. //depot/projects/soc2005/libalias/sys/sys/extattr.h#2 integrate .. //depot/projects/soc2005/libalias/sys/sys/libkern.h#2 integrate .. //depot/projects/soc2005/libalias/sys/sys/mbuf.h#2 integrate .. //depot/projects/soc2005/libalias/sys/sys/param.h#2 integrate .. //depot/projects/soc2005/libalias/sys/sys/protosw.h#2 integrate .. //depot/projects/soc2005/libalias/sys/sys/socket.h#2 integrate .. //depot/projects/soc2005/libalias/sys/sys/socketvar.h#2 integrate .. //depot/projects/soc2005/libalias/sys/sys/sockio.h#2 integrate .. //depot/projects/soc2005/libalias/sys/sys/syscall.h#2 integrate .. //depot/projects/soc2005/libalias/sys/sys/syscall.mk#2 integrate .. //depot/projects/soc2005/libalias/sys/sys/syscallsubr.h#2 integrate .. //depot/projects/soc2005/libalias/sys/sys/sysctl.h#2 integrate .. //depot/projects/soc2005/libalias/sys/sys/sysproto.h#2 integrate .. //depot/projects/soc2005/libalias/sys/sys/systm.h#2 integrate .. //depot/projects/soc2005/libalias/sys/sys/thr.h#2 integrate .. //depot/projects/soc2005/libalias/sys/sys/unpcb.h#2 integrate .. //depot/projects/soc2005/libalias/sys/ufs/ffs/ffs_alloc.c#2 integrate .. //depot/projects/soc2005/libalias/sys/ufs/ffs/ffs_vfsops.c#2 integrate .. //depot/projects/soc2005/libalias/sys/ufs/ufs/ufs_lookup.c#2 integrate .. //depot/projects/soc2005/libalias/sys/vm/pmap.h#2 integrate .. //depot/projects/soc2005/libalias/sys/vm/uma_core.c#2 integrate .. //depot/projects/soc2005/libalias/sys/vm/vm.h#2 integrate .. //depot/projects/soc2005/libalias/sys/vm/vm_fault.c#2 integrate .. //depot/projects/soc2005/libalias/sys/vm/vm_map.c#2 integrate .. //depot/projects/soc2005/libalias/sys/vm/vm_meter.c#2 integrate .. //depot/projects/soc2005/libalias/sys/vm/vm_object.c#2 integrate .. //depot/projects/soc2005/libalias/sys/vm/vm_object.h#2 integrate .. //depot/projects/soc2005/libalias/sys/vm/vm_page.c#2 integrate .. //depot/projects/soc2005/libalias/tools/kerneldoc/Doxyfile#1 branch .. //depot/projects/soc2005/libalias/tools/kerneldoc/Makefile#1 branch .. //depot/projects/soc2005/libalias/tools/kerneldoc/subsys/Dependencies#1 branch .. //depot/projects/soc2005/libalias/tools/kerneldoc/subsys/Doxyfile-cam#1 branch .. //depot/projects/soc2005/libalias/tools/kerneldoc/subsys/Doxyfile-crypto#1 branch .. //depot/projects/soc2005/libalias/tools/kerneldoc/subsys/Doxyfile-dev_pci#1 branch .. //depot/projects/soc2005/libalias/tools/kerneldoc/subsys/Doxyfile-dev_sound#1 branch .. //depot/projects/soc2005/libalias/tools/kerneldoc/subsys/Doxyfile-dev_usb#1 branch .. //depot/projects/soc2005/libalias/tools/kerneldoc/subsys/Doxyfile-geom#1 branch .. //depot/projects/soc2005/libalias/tools/kerneldoc/subsys/Doxyfile-i4b#1 branch .. //depot/projects/soc2005/libalias/tools/kerneldoc/subsys/Doxyfile-kern#1 branch .. //depot/projects/soc2005/libalias/tools/kerneldoc/subsys/Doxyfile-libkern#1 branch .. //depot/projects/soc2005/libalias/tools/kerneldoc/subsys/Doxyfile-linux#1 branch .. //depot/projects/soc2005/libalias/tools/kerneldoc/subsys/Doxyfile-net80211#1 branch .. //depot/projects/soc2005/libalias/tools/kerneldoc/subsys/Doxyfile-netgraph#1 branch .. //depot/projects/soc2005/libalias/tools/kerneldoc/subsys/Doxyfile-netinet#1 branch .. //depot/projects/soc2005/libalias/tools/kerneldoc/subsys/Doxyfile-netinet6#1 branch .. //depot/projects/soc2005/libalias/tools/kerneldoc/subsys/Doxyfile-netipsec#1 branch .. //depot/projects/soc2005/libalias/tools/kerneldoc/subsys/Doxyfile-opencrypto#1 branch .. //depot/projects/soc2005/libalias/tools/kerneldoc/subsys/Doxyfile-vm#1 branch .. //depot/projects/soc2005/libalias/tools/kerneldoc/subsys/Makefile#1 branch .. //depot/projects/soc2005/libalias/tools/kerneldoc/subsys/README#1 branch .. //depot/projects/soc2005/libalias/tools/kerneldoc/subsys/common-Doxyfile#1 branch .. //depot/projects/soc2005/libalias/tools/kerneldoc/subsys/notreviewed.dox#1 branch .. //depot/projects/soc2005/libalias/tools/regression/fifo/fifo_create/Makefile#2 integrate .. //depot/projects/soc2005/libalias/tools/regression/fifo/fifo_io/Makefile#2 integrate .. //depot/projects/soc2005/libalias/tools/regression/fifo/fifo_misc/Makefile#2 integrate .. //depot/projects/soc2005/libalias/tools/regression/fifo/fifo_open/Makefile#2 integrate .. //depot/projects/soc2005/libalias/tools/regression/file/ftruncate/Makefile#1 branch .. //depot/projects/soc2005/libalias/tools/regression/file/ftruncate/ftruncate.c#1 branch .. //depot/projects/soc2005/libalias/tools/regression/ia64/emulated/brl.t#1 branch .. //depot/projects/soc2005/libalias/tools/regression/ia64/emulated/test.c#1 branch .. //depot/projects/soc2005/libalias/tools/regression/netinet/msocket_ifnet_remove/Makefile#2 integrate .. //depot/projects/soc2005/libalias/tools/regression/netinet/tcpdrop/Makefile#2 integrate .. //depot/projects/soc2005/libalias/tools/regression/netinet/tcpsockclosebeforeaccept/Makefile#2 integrate .. //depot/projects/soc2005/libalias/tools/regression/netinet/tcpsocktimewait/Makefile#2 integrate .. //depot/projects/soc2005/libalias/tools/regression/netinet6/ip6_sockets/Makefile#1 branch .. //depot/projects/soc2005/libalias/tools/regression/netinet6/ip6_sockets/ip6_sockets.c#1 branch .. //depot/projects/soc2005/libalias/tools/regression/netipx/ipxdgramloopback/Makefile#2 integrate .. //depot/projects/soc2005/libalias/tools/regression/netipx/spxabort/Makefile#2 integrate .. //depot/projects/soc2005/libalias/tools/regression/netipx/spxloopback/Makefile#2 integrate .. //depot/projects/soc2005/libalias/tools/regression/sockets/listen_backlog/Makefile#2 integrate .. //depot/projects/soc2005/libalias/tools/regression/sockets/rtsocket/Makefile#2 integrate .. //depot/projects/soc2005/libalias/tools/regression/sockets/sendfile/Makefile#2 integrate .. //depot/projects/soc2005/libalias/tools/regression/sockets/socketpair/Makefile#2 integrate .. //depot/projects/soc2005/libalias/tools/regression/sockets/unix_bindconnect/Makefile#2 integrate .. //depot/projects/soc2005/libalias/tools/regression/sockets/unix_passfd/Makefile#2 integrate .. //depot/projects/soc2005/libalias/tools/regression/sockets/unix_socket/Makefile#2 integrate .. //depot/projects/soc2005/libalias/tools/regression/ufs/uprintf/Makefile#2 integrate .. //depot/projects/soc2005/libalias/tools/tools/nanobsd/nanobsd.sh#2 integrate .. //depot/projects/soc2005/libalias/tools/tools/net80211/wlanwatch/wlanwatch.c#2 integrate .. //depot/projects/soc2005/libalias/usr.bin/calendar/calendars/calendar.freebsd#2 integrate .. //depot/projects/soc2005/libalias/usr.bin/calendar/day.c#2 integrate .. //depot/projects/soc2005/libalias/usr.bin/col/col.c#2 integrate .. //depot/projects/soc2005/libalias/usr.bin/ctags/ctags.c#2 integrate .. //depot/projects/soc2005/libalias/usr.bin/enigma/enigma.c#2 integrate .. //depot/projects/soc2005/libalias/usr.bin/find/find.1#2 integrate .. //depot/projects/soc2005/libalias/usr.bin/kdump/kdump.c#2 integrate .. //depot/projects/soc2005/libalias/usr.bin/kdump/mksubr#2 integrate .. //depot/projects/soc2005/libalias/usr.bin/look/look.c#2 integrate .. //depot/projects/soc2005/libalias/usr.bin/make/main.c#2 integrate .. //depot/projects/soc2005/libalias/usr.bin/make/parse.c#2 integrate .. //depot/projects/soc2005/libalias/usr.bin/make/var.c#2 integrate .. //depot/projects/soc2005/libalias/usr.bin/netstat/inet6.c#2 integrate .. //depot/projects/soc2005/libalias/usr.bin/netstat/route.c#2 integrate .. //depot/projects/soc2005/libalias/usr.bin/systat/mbufs.c#2 integrate .. //depot/projects/soc2005/libalias/usr.bin/tail/extern.h#2 integrate .. //depot/projects/soc2005/libalias/usr.bin/tail/forward.c#2 integrate .. //depot/projects/soc2005/libalias/usr.bin/tail/tail.1#2 integrate .. //depot/projects/soc2005/libalias/usr.bin/tail/tail.c#2 integrate .. //depot/projects/soc2005/libalias/usr.bin/truss/i386-fbsd.c#2 integrate .. //depot/projects/soc2005/libalias/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_device_tbl.c#2 integrate .. //depot/projects/soc2005/libalias/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_diskstorage_tbl.c#2 integrate .. //depot/projects/soc2005/libalias/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_fs_tbl.c#2 integrate .. //depot/projects/soc2005/libalias/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_network_tbl.c#2 integrate .. //depot/projects/soc2005/libalias/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_partition_tbl.c#2 integrate .. //depot/projects/soc2005/libalias/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_printer_tbl.c#2 integrate .. //depot/projects/soc2005/libalias/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_processor_tbl.c#2 integrate .. //depot/projects/soc2005/libalias/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_snmp.h#2 integrate .. //depot/projects/soc2005/libalias/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_storage_tbl.c#2 integrate .. //depot/projects/soc2005/libalias/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_swinstalled_tbl.c#2 integrate .. //depot/projects/soc2005/libalias/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_swrun_tbl.c#2 integrate .. //depot/projects/soc2005/libalias/usr.sbin/config/config.y#2 integrate .. //depot/projects/soc2005/libalias/usr.sbin/config/mkmakefile.c#2 integrate .. //depot/projects/soc2005/libalias/usr.sbin/cron/cron/cron.c#2 integrate .. //depot/projects/soc2005/libalias/usr.sbin/fdread/fdread.c#2 integrate .. //depot/projects/soc2005/libalias/usr.sbin/i4b/isdnd/controller.c#2 integrate .. //depot/projects/soc2005/libalias/usr.sbin/i4b/isdnd/main.c#2 integrate .. //depot/projects/soc2005/libalias/usr.sbin/i4b/isdndebug/main.c#2 integrate .. //depot/projects/soc2005/libalias/usr.sbin/i4b/isdnmonitor/main.c#2 integrate .. //depot/projects/soc2005/libalias/usr.sbin/i4b/isdnphone/main.c#2 integrate .. //depot/projects/soc2005/libalias/usr.sbin/i4b/isdntelctl/main.c#2 integrate .. //depot/projects/soc2005/libalias/usr.sbin/i4b/isdntest/main.c#2 integrate .. //depot/projects/soc2005/libalias/usr.sbin/kgmon/kgmon.c#2 integrate .. //depot/projects/soc2005/libalias/usr.sbin/lpr/lpd/printjob.c#2 integrate .. //depot/projects/soc2005/libalias/usr.sbin/mountd/mountd.c#2 integrate .. //depot/projects/soc2005/libalias/usr.sbin/moused/moused.c#2 integrate .. //depot/projects/soc2005/libalias/usr.sbin/mtree/misc.c#2 integrate .. //depot/projects/soc2005/libalias/usr.sbin/mtree/mtree.8#2 integrate .. //depot/projects/soc2005/libalias/usr.sbin/mtree/mtree.h#2 integrate .. //depot/projects/soc2005/libalias/usr.sbin/mtree/spec.c#2 integrate .. //depot/projects/soc2005/libalias/usr.sbin/mtree/test/test05.sh#1 branch .. //depot/projects/soc2005/libalias/usr.sbin/mtree/verify.c#2 integrate .. //depot/projects/soc2005/libalias/usr.sbin/newsyslog/newsyslog.c#2 integrate .. //depot/projects/soc2005/libalias/usr.sbin/newsyslog/newsyslog.conf.5#2 integrate .. //depot/projects/soc2005/libalias/usr.sbin/ngctl/config.c#2 integrate .. //depot/projects/soc2005/libalias/usr.sbin/ngctl/connect.c#2 integrate .. //depot/projects/soc2005/libalias/usr.sbin/ngctl/debug.c#2 integrate .. //depot/projects/soc2005/libalias/usr.sbin/ngctl/list.c#2 integrate .. //depot/projects/soc2005/libalias/usr.sbin/ngctl/main.c#2 integrate .. //depot/projects/soc2005/libalias/usr.sbin/ngctl/mkpeer.c#2 integrate .. //depot/projects/soc2005/libalias/usr.sbin/ngctl/msg.c#2 integrate .. //depot/projects/soc2005/libalias/usr.sbin/ngctl/name.c#2 integrate .. //depot/projects/soc2005/libalias/usr.sbin/ngctl/rmhook.c#2 integrate .. //depot/projects/soc2005/libalias/usr.sbin/ngctl/show.c#2 integrate .. //depot/projects/soc2005/libalias/usr.sbin/ngctl/shutdown.c#2 integrate .. //depot/projects/soc2005/libalias/usr.sbin/ngctl/status.c#2 integrate .. //depot/projects/soc2005/libalias/usr.sbin/ngctl/types.c#2 integrate .. //depot/projects/soc2005/libalias/usr.sbin/ngctl/write.c#2 integrate .. //depot/projects/soc2005/libalias/usr.sbin/pkg_install/lib/url.c#2 integrate .. //depot/projects/soc2005/libalias/usr.sbin/sade/Makefile#1 branch .. //depot/projects/soc2005/libalias/usr.sbin/sade/command.c#1 branch .. //depot/projects/soc2005/libalias/usr.sbin/sade/config.c#1 branch .. //depot/projects/soc2005/libalias/usr.sbin/sade/devices.c#1 branch .. //depot/projects/soc2005/libalias/usr.sbin/sade/disks.c#1 branch .. //depot/projects/soc2005/libalias/usr.sbin/sade/dispatch.c#1 branch .. //depot/projects/soc2005/libalias/usr.sbin/sade/dmenu.c#1 branch .. //depot/projects/soc2005/libalias/usr.sbin/sade/globals.c#1 branch .. //depot/projects/soc2005/libalias/usr.sbin/sade/help/partition.hlp#1 branch .. //depot/projects/soc2005/libalias/usr.sbin/sade/help/slice.hlp#1 branch .. //depot/projects/soc2005/libalias/usr.sbin/sade/install.c#1 branch .. //depot/projects/soc2005/libalias/usr.sbin/sade/keymap.c#1 branch .. //depot/projects/soc2005/libalias/usr.sbin/sade/label.c#1 branch .. //depot/projects/soc2005/libalias/usr.sbin/sade/list.h#1 branch .. //depot/projects/soc2005/libalias/usr.sbin/sade/main.c#1 branch .. //depot/projects/soc2005/libalias/usr.sbin/sade/menus.c#1 branch .. //depot/projects/soc2005/libalias/usr.sbin/sade/misc.c#1 branch .. //depot/projects/soc2005/libalias/usr.sbin/sade/msg.c#1 branch .. //depot/projects/soc2005/libalias/usr.sbin/sade/rtermcap.c#1 branch .. //depot/projects/soc2005/libalias/usr.sbin/sade/sade.8#1 branch .. //depot/projects/soc2005/libalias/usr.sbin/sade/sade.h#1 branch .. //depot/projects/soc2005/libalias/usr.sbin/sade/system.c#1 branch .. //depot/projects/soc2005/libalias/usr.sbin/sade/termcap.c#1 branch .. //depot/projects/soc2005/libalias/usr.sbin/sade/usb.c#1 branch .. //depot/projects/soc2005/libalias/usr.sbin/sade/variable.c#1 branch .. //depot/projects/soc2005/libalias/usr.sbin/sade/wizard.c#1 branch .. //depot/projects/soc2005/libalias/usr.sbin/sysinstall/devices.c#2 integrate .. //depot/projects/soc2005/libalias/usr.sbin/sysinstall/install.c#2 integrate .. //depot/projects/soc2005/libalias/usr.sbin/sysinstall/main.c#2 integrate .. //depot/projects/soc2005/libalias/usr.sbin/sysinstall/misc.c#2 integrate .. //depot/projects/soc2005/libalias/usr.sbin/sysinstall/sysinstall.h#2 integrate Differences ... ==== //depot/projects/soc2005/libalias/MAINTAINERS#2 (text+ko) ==== @@ -1,4 +1,4 @@ -$FreeBSD: src/MAINTAINERS,v 1.135 2006/06/03 01:52:11 scottl Exp $ +$FreeBSD: src/MAINTAINERS,v 1.139 2006/07/11 06:09:54 mjacob Exp $ Please note that the content of this file is strictly advisory. No locks listed here are valid. The only strict review requirements @@ -35,10 +35,6 @@ NEWCARD imp Pre-commit review requested. OLDCARD imp Pre-commit review requested. pci bus imp,jhb Pre-commit review requested. -telnet markm Heads-up appreciated. Try not to break it. -secure/* markm Heads-up appreciated. Try not to break it. -kerberos5 nectar Pre-commit review requested. -heimdal nectar Pre-commit review requested. cdboot jhb Pre-commit review requested. pxeboot jhb Pre-commit review requested. witness jhb Pre-commit review requested. @@ -55,7 +51,6 @@ pass(4) ken Pre-commit review requested. ch(4) ken Pre-commit review requested. isp(4) mjacob Pre-commit review requested. -mpt(4) mjacob Pre-commit review requested. em(4) tackerman Pre-commit review requested. tdfx(4) cokane Just keep me informed of changes, try not to break it. sendmail gshapiro Pre-commit review requested. @@ -63,8 +58,6 @@ Keep in sync with -STABLE. etc/sendmail gshapiro Pre-commit review requested. Keep in sync with -STABLE. -dhcp mbr Needs to pre-approve commits to contrib/isc-dhcp, so - changes can be made to the isc.org CVS repository. libfetch des Advance notification requested. fetch des Advance notification requested. libpam des Pre-commit review requested. @@ -91,8 +84,6 @@ libufs jmallett Willing to handle problems, help with work. fdc(4) joerg Just keep me informed of changes, try not to break it. sppp(4) joerg Just keep me informed of changes, try not to break it. -libc nectar Opportuntity for pre-commit review appreciated for - nsdispatch(3) and its consumers. unifdef(1) fanf Pre-commit review requested. ntp roberto Pre-commit review requested. inetd dwmalone Recommends pre-commit review. @@ -143,17 +134,7 @@ List below generated with: $ cd /usr/src; find */* -type f|xargs egrep 'MAINTAINER[ ]*=' -bin/dd/Makefile:MAINTAINER= green@FreeBSD.org -games/fortune/datfiles/Makefile:MAINTAINER= jkh -gnu/usr.bin/man/apropos/Makefile:MAINTAINER= wosch -sbin/dhclient/Makefile.inc:MAINTAINER= mbr -sys/compat/svr4/Makefile:MAINTAINER= newton@freebsd.org -sys/dev/bktr/CHANGELOG.TXT: * MAINTAINER = Roger Hardiman sys/modules/3dfx/Makefile:MAINTAINER= cokane@FreeBSD.org -sys/modules/bktr/bktr_mem/Makefile:MAINTAINER= roger@freebsd.org -sys/modules/streams/Makefile:MAINTAINER= newton@atdot.dotat.org -sys/modules/svr4/Makefile:MAINTAINER= newton@FreeBSD.org sys/modules/urio/Makefile:MAINTAINER= Iwasa Kazmi tools/tools/sysdoc/Makefile:MAINTAINER= trhodes@FreeBSD.org -usr.bin/locate/Makefile:MAINTAINER= wosch usr.sbin/zic/Makefile:MAINTAINER= wollman@FreeBSD.org ==== //depot/projects/soc2005/libalias/ObsoleteFiles.inc#2 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/ObsoleteFiles.inc,v 1.37 2006/05/20 00:30:06 marcel Exp $ +# $FreeBSD: src/ObsoleteFiles.inc,v 1.41 2006/07/08 03:22:44 avatar Exp $ # # This file lists old files (OLD_FILES), libraries (OLD_LIBS) and # directories (OLD_DIRS) which should get removed at an update. Recently @@ -594,6 +594,8 @@ OLD_FILES+=usr/share/man/man1aout/strip.1aout.gz OLD_FILES+=bin/mountd OLD_FILES+=bin/nfsd +# 20020707 sbin/nfsd -> usr.sbin/nfsd +OLD_FILES+=sbin/nfsd # 200206XX OLD_FILES+=usr/lib/libpam_ssh.a OLD_FILES+=usr/lib/libpam_ssh_p.a @@ -622,6 +624,9 @@ OLD_FILES+=usr/bin/find2perl OLD_FILES+=usr/sbin/pkg_update OLD_FILES+=usr/sbin/scriptdump +# 20020409 GC kget(1), userconfig is long dead. +OLD_FILES+=sbin/kget +OLD_FILES+=usr/share/man/man8/kget.8.gz # 200203XX OLD_FILES+=usr/lib/libss.a OLD_FILES+=usr/lib/libss_p.a @@ -649,6 +654,9 @@ OLD_FILES+=usr/sbin/stlstty OLD_FILES+=usr/sbin/ispppcontrol OLD_FILES+=usr/sbin/rndcontrol +# 20010523 mount_portal -> mount_portalfs +OLD_FILES+=sbin/mount_portal +OLD_FILES+=usr/share/man/man8/mount_portal.8.gz # 200104XX OLD_FILES+=usr/lib/libdescrypt.a OLD_FILES+=usr/lib/libscrypt.a @@ -2717,6 +2725,11 @@ OLD_FILES+=usr/games/worms OLD_FILES+=usr/games/wump +# 20060521: gethostbyaddr(3) ABI change +OLD_LIBS+=usr/lib/libroken.so.8 +OLD_LIBS+=lib/libatm.so.3 +OLD_LIBS+=lib/libc.so.6 +OLD_LIBS+=lib/libutil.so.5 # 20060413: shared library moved to /usr/lib OLD_LIBS+=lib/libgpib.so.1 # 20060127: revert libdisk to static-only ==== //depot/projects/soc2005/libalias/UPDATING#2 (text+ko) ==== @@ -21,6 +21,17 @@ developers choose to disable these features on build machines to maximize performance. +20060709: + The interface version of the i4b kernel part has changed. So + after updating the kernel sources and compiling a new kernel, + the i4b user space tools in "/usr/src/usr.sbin/i4b" must also + be rebuilt, and vice versa. + +20060627: + The XBOX kernel now defaults to the nfe(4) driver instead of + the nve(4) driver. Please update your configuration + accordingly. + 20060511: The machdep.* sysctls and the adjkerntz utility have been modified a bit. The new adjkerntz utility uses the new >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Wed Jul 26 16:08:25 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0D4CC16A4E5; Wed, 26 Jul 2006 16:08:25 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id C2A8F16A4E0 for ; Wed, 26 Jul 2006 16:08:24 +0000 (UTC) (envelope-from gabor@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 9F5AA43D49 for ; Wed, 26 Jul 2006 16:08:00 +0000 (GMT) (envelope-from gabor@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k6QG7xfd033419 for ; Wed, 26 Jul 2006 16:07:59 GMT (envelope-from gabor@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k6QG7wgt033416 for perforce@freebsd.org; Wed, 26 Jul 2006 16:07:58 GMT (envelope-from gabor@FreeBSD.org) Date: Wed, 26 Jul 2006 16:07:58 GMT Message-Id: <200607261607.k6QG7wgt033416@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to gabor@FreeBSD.org using -f From: Gabor Kovesdan To: Perforce Change Reviews Cc: Subject: PERFORCE change 102459 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 26 Jul 2006 16:08:25 -0000 http://perforce.freebsd.org/chv.cgi?CH=102459 Change 102459 by gabor@gabor_spitfire on 2006/07/26 16:07:10 IFC Affected files ... .. //depot/projects/soc2006/gabor_ports/GIDs#1 branch .. //depot/projects/soc2006/gabor_ports/LEGAL#2 integrate .. //depot/projects/soc2006/gabor_ports/MOVED#8 integrate .. //depot/projects/soc2006/gabor_ports/Mk/bsd.scons.mk#5 integrate .. //depot/projects/soc2006/gabor_ports/Mk/bsd.sites.mk#5 integrate .. //depot/projects/soc2006/gabor_ports/UIDs#1 branch .. //depot/projects/soc2006/gabor_ports/UPDATING#9 integrate Differences ... ==== //depot/projects/soc2006/gabor_ports/LEGAL#2 (text+ko) ==== @@ -1,5 +1,5 @@ # Creator: Jordan Hubbard -# $FreeBSD: ports/LEGAL,v 1.481 2006/06/13 18:16:15 alepulver Exp $ +# $FreeBSD: ports/LEGAL,v 1.483 2006/07/21 23:13:13 sat Exp $ ********************************************************************** *** NOTE TO COMMITTERS *** @@ -386,6 +386,7 @@ binaries should not be distributed. Contains crypto from OpenSSL +lpac-* audio/lpac No commercial use lsh* security/lsh Crypto; export-controlled l_cc_p*_*.*.*.tar.gz lang/icc No redistribution allowed l_cc_p*_*.*.*.tar lang/icc7 No redistribution allowed @@ -452,6 +453,8 @@ openssl-* security/openssl Crypto; export/import-controlled opera-* www/linux-opera No redistribution, commercial software +optimfrog-* audio/optimfrog No commercial use, no distribution + of a modified package oracle/* databases/jdbc-oracle* This software is under license and export controls otojiro*.txt japanese/otojiro-fpw The original dictionary is not free ==== //depot/projects/soc2006/gabor_ports/MOVED#8 (text+ko) ==== @@ -1,7 +1,7 @@ # # MOVED - a list of (recently) moved or removed ports # -# $FreeBSD: ports/MOVED,v 1.1099 2006/07/18 05:05:37 marcus Exp $ +# $FreeBSD: ports/MOVED,v 1.1103 2006/07/26 08:59:38 itetcu Exp $ # # Each entry consists of a single line containing the following four # fields in the order named, separated with the pipe (`|') character: @@ -2421,3 +2421,7 @@ net/ethereal-lite|net/wireshark-lite|2006-07-17|Project name has changed net/tethereal|net/tshark|2006-07-17|Project name has changed net/tethereal-lite|net/tshark-lite|2006-07-17|Project name has changed +games/quake3-q3base|games/q3base|2006-07-22|the "quake3-" prefix is used by modifications and the like, not engines +lang/fpc-demo||2006-07-24|Removed because it's not necessary anymore +www/horde-php5||2006-07-24|Removed: this port is redundant now that php5 is the default +ports/sysutils/e17-module-devian|ports/x11/e17-module-devian|2006-07-26|Move e17-module-devian from sysutils to x11 ==== //depot/projects/soc2006/gabor_ports/Mk/bsd.scons.mk#5 (text+ko) ==== @@ -1,7 +1,7 @@ #-*- mode: Makefile; tab-width: 4; -*- # ex:ts=4 # -# $FreeBSD: ports/Mk/bsd.scons.mk,v 1.4 2006/07/13 22:10:39 alepulver Exp $ +# $FreeBSD: ports/Mk/bsd.scons.mk,v 1.5 2006/07/24 22:49:32 itetcu Exp $ # # bsd.scons.mk - Python-based SCons build system interface. # Author: Alexander Botero-Lowry @@ -37,8 +37,8 @@ CCFLAGS?= ${CFLAGS} LINKFLAGS?= ${LDFLAGS} PKGCONFIGDIR?= ${LOCALBASE}/libdata/pkgconfig -LIBPATH= ${LOCALBASE}/lib ${X11BASE}/lib -CPPPATH= ${LOCALBASE}/include ${X11BASE}/include +LIBPATH?= ${LOCALBASE}/lib ${X11BASE}/lib +CPPPATH?= ${LOCALBASE}/include ${X11BASE}/include # # SCONS_ENV is where we pass all the stuff that should be the ==== //depot/projects/soc2006/gabor_ports/Mk/bsd.sites.mk#5 (text+ko) ==== @@ -20,7 +20,7 @@ # # Note: all entries should terminate with a slash. # -# $FreeBSD: ports/Mk/bsd.sites.mk,v 1.374 2006/07/06 23:56:12 bsam Exp $ +# $FreeBSD: ports/Mk/bsd.sites.mk,v 1.390 2006/07/25 16:11:37 jmelo Exp $ # # Where to put distfiles that don't have any other master site @@ -47,7 +47,7 @@ .if !defined(IGNORE_MASTER_SITE_AFTERSTEP) MASTER_SITE_AFTERSTEP+= \ ftp://ftp.afterstep.org/%SUBDIR%/ \ - ftp://ftp.kddlabs.co.jp/X11/window_manager/AfterStep/%SUBDIR%/ \ + ftp://ftp.kddlabs.co.jp/X11/AfterStep/%SUBDIR%/ \ ftp://ftp.dti.ad.jp/pub/X/AfterStep/%SUBDIR%/ \ ftp://ftp.chg.ru/pub/X11/windowmanagers/afterstep/%SUBDIR%/ .endif @@ -57,7 +57,7 @@ http://www.apache.org/dist/%SUBDIR%/ \ http://archive.apache.org/dist/%SUBDIR%/ \ ftp://ftp.planetmirror.com/pub/apache/dist/%SUBDIR%/ \ - ftp://ftp.pop-mg.com.br/pub/apache/dist/%SUBDIR%/ \ + ftp://ftp.pop-mg.com.br/data/apache/dist/%SUBDIR%/ \ ftp://ftp.gin.cz/pub/mirrors/www.apache.org/dist/%SUBDIR%/ \ ftp://ftp-stud.fht-esslingen.de/pub/Mirrors/ftp.apache.org/dist/%SUBDIR%/ \ ftp://ftp.apache.de/mirrors/dev.apache.org/dist/%SUBDIR%/ \ @@ -76,7 +76,6 @@ ftp://ftp.chg.ru/pub/WWW/apache/dist/%SUBDIR%/ \ ftp://ftp.sunet.se/pub/www/servers/apache/dist/%SUBDIR%/ \ ftp://ftp.flirble.org/pub/web/apache/dist/%SUBDIR%/ \ - ftp://ftp.gbnet.net/pub/apache/dist/%SUBDIR%/ \ ftp://mirrors.rmplc.co.uk/pub/apache/%SUBDIR%/ \ ftp://apache.secsup.org/pub/apache/dist/%SUBDIR%/ \ ftp://ftp.ccs.neu.edu/net/mirrors/Apache/dist/%SUBDIR%/ \ @@ -285,8 +284,8 @@ .if !defined(IGNORE_MASTER_SITE_FESTIVAL) MASTER_SITE_FESTIVAL+= \ http://www.festvox.org/packed/festival/%SUBDIR%/ \ - http://www.speech.cs.cmu.edu/festival/cstr/festival/%SUBDIR%/ \ - ftp://ftp.tuwien.ac.at/opsys/linux/blinux/festival/mirror.festival_home/%SUBDIR%/ + http://www.cstr.ed.ac.uk/downloads/festival/%SUBDIR%/ \ + http://stuff.mit.edu/afs/sipb/project/speech-tools/src/festival/festvox.org/packed/festival/%SUBDIR%/ .endif .if !defined(IGNORE_MASTER_SITE_FESTIVAL_OGI) @@ -338,7 +337,6 @@ http://distro.ibiblio.org/pub/linux/distributions/gentoo/%SUBDIR%/ \ http://csociety-ftp.ecn.purdue.edu/pub/gentoo/%SUBDIR%/ \ http://gentoo.mirrors.pair.com/%SUBDIR%/ \ - http://gentoo.seren.com/gentoo/%SUBDIR%/ \ http://gentoo.chem.wisc.edu/gentoo/%SUBDIR%/ \ http://adelie.polymtl.ca/%SUBDIR%/ \ http://mirrors.tds.net/gentoo/%SUBDIR%/ \ @@ -349,7 +347,6 @@ http://ftp.snt.utwente.nl/pub/os/linux/gentoo/%SUBDIR%/ \ http://trumpetti.atm.tut.fi/gentoo/%SUBDIR%/ \ http://ds.thn.htu.se/linux/gentoo/%SUBDIR%/ \ - http://mirror.pudas.net/gentoo/%SUBDIR%/ \ http://sunsite.cnlab-switch.ch/ftp/mirror/gentoo/%SUBDIR%/ \ http://linux.rz.ruhr-uni-bochum.de/download/gentoo-mirror/%SUBDIR%/ \ http://mirrors.sec.informatik.tu-darmstadt.de/gentoo/%SUBDIR%/ \ @@ -376,7 +373,6 @@ ftp://ftp.easynet.nl/mirror/gentoo/%SUBDIR%/ \ ftp://ftp.snt.utwente.nl/pub/os/linux/gentoo/%SUBDIR%/ \ ftp://trumpetti.atm.tut.fi/gentoo/%SUBDIR%/ \ - ftp://mirror.pudas.net/gentoo/%SUBDIR%/ \ ftp://sunsite.cnlab-switch.ch/mirror/gentoo/%SUBDIR%/ \ ftp://ftp.join.uni-muenster.de/pub/linux/distributions/gentoo/%SUBDIR%/\ ftp://ftp6.uni-muenster.de/pub/linux/distributions/gentoo/%SUBDIR%/ \ @@ -418,11 +414,9 @@ MASTER_SITE_GNU+= \ http://ftp.gnu.org/gnu/%SUBDIR%/ \ ftp://ftp.gnu.org/gnu/%SUBDIR%/ \ - ftp://ftp.nstu.ru/pub/mirrors/ftp.gnu.org/gnu/%SUBDIR%/ \ http://www.gtlib.cc.gatech.edu/pub/gnu/gnu/%SUBDIR%/ \ http://mirrors.usc.edu/pub/gnu/%SUBDIR%/ \ http://ftp.funet.fi/pub/gnu/prep/%SUBDIR%/ \ - ftp://ftp.wustl.edu/mirrors/gnu/%SUBDIR%/ \ ftp://ftp.kddlabs.co.jp/GNU/%SUBDIR%/ \ ftp://ftp.dti.ad.jp/pub/GNU/%SUBDIR%/ \ ${MASTER_SITE_RINGSERVER:S,%SUBDIR%,GNU/&,} \ @@ -431,7 +425,6 @@ ftp://ftp.informatik.hu-berlin.de/pub/gnu/%SUBDIR%/ \ ftp://ftp.informatik.rwth-aachen.de/pub/mirror/ftp.gnu.org/pub/gnu/%SUBDIR%/ \ ftp://ftp.rediris.es/sites/ftp.gnu.org/ftp/gnu/%SUBDIR%/ \ - ftp://ftp.lip6.fr/pub/gnu/%SUBDIR%/ \ ftp://ftp.chg.ru/pub/gnu/%SUBDIR%/ .endif @@ -682,10 +675,7 @@ ftp://netbsd.secsup.org/pub/NetBSD/packages/distfiles/%SUBDIR%/ \ ftp://ftp.plig.net/pub/NetBSD/packages/distfiles/%SUBDIR%/ \ ftp://ftp.proxad.net/mirrors/ftp.netbsd.org/packages/distfiles/%SUBDIR%/\ - ftp://ftp.fu-berlin.de/unix/NetBSD/packages/distfiles/%SUBDIR%/ \ - ftp://sunsite.rediris.es/sites/ftp.netbsd.org/pub/NetBSD/packages/distfiles/%SUBDIR%/ \ ftp://ftp.funet.fi/pub/NetBSD/packages/distfiles/%SUBDIR%/ \ - ftp://ftp.cz.netbsd.org/pub/NetBSD/packages/distfiles/%SUBDIR%/ \ ftp://ftp.unina.it/pub/Unix/NetBSD/packages/distfiles/%SUBDIR%/ \ ftp://ftp.uninett.no/bsd/unix/NetBSD/packages/distfiles/%SUBDIR%/ \ ftp://sunsite.uio.no/bsd/unix/NetBSD/packages/distfiles/%SUBDIR%/ \ @@ -710,12 +700,9 @@ http://packetstormsecurity.nl/%SUBDIR%/ \ http://packetstorm.troop218.org/%SUBDIR%/ \ http://packetstorm.linuxsecurity.com/%SUBDIR%/ \ - http://packetstormsecurity.com/%SUBDIR%/ \ http://packetstorm.digital-network.net/%SUBDIR%/ \ http://packetstorm.icx.fr/%SUBDIR%/ \ http://packetstorm.security-guide.de/%SUBDIR%/ \ - http://packetstorm.dyn.org/%SUBDIR%/ \ - http://packetstorm.digitallinx.com/%SUBDIR%/ \ http://packetstormsecurity.org.pk/%SUBDIR%/ .endif @@ -732,10 +719,8 @@ ftp://ftp.mirrorservice.org/sites/ftp.funet.fi/pub/languages/perl/CPAN/modules/by-module/%SUBDIR%/ \ ftp://csociety-ftp.ecn.purdue.edu/pub/CPAN/modules/by-module/%SUBDIR%/ \ ftp://ftp.isu.net.sa/pub/CPAN/modules/by-module/%SUBDIR%/ \ - ftp://ftp.ucr.ac.cr/pub/Unix/CPAN/modules/by-module/%SUBDIR%/ \ ftp://ftp.cs.colorado.edu/pub/perl/CPAN/modules/by-module/%SUBDIR%/ \ ftp://cpan.pop-mg.com.br/pub/CPAN/modules/by-module/%SUBDIR%/ \ - ftp://ftp.is.co.za/programming/perl/CPAN/modules/by-module/%SUBDIR%/ \ http://at.cpan.org/modules/by-module/%SUBDIR%/ \ ftp://ftp.chg.ru/pub/lang/perl/CPAN/modules/by-module/%SUBDIR%/ \ ftp://ftp.auckland.ac.nz/pub/perl/CPAN/modules/by-module/%SUBDIR%/ @@ -752,7 +737,6 @@ # .if !defined(IGNORE_MASTER_SITE_PGSQL) MASTER_SITE_PGSQL+= \ - ftp://ftp3.us.postgresql.org/pub/postgresql/%SUBDIR%/ \ ftp://ftp8.us.postgresql.org/postgresql/%SUBDIR%/ \ ftp://ftp9.us.postgresql.org/pub/mirrors/postgresql/%SUBDIR%/ \ ftp://ftp10.us.postgresql.org/pub/postgresql/%SUBDIR%/ \ @@ -761,14 +745,10 @@ ftp://ftp.at.postgresql.org/db/www.postgresql.org/pub/%SUBDIR%/ \ ftp://ftp.be.postgresql.org/postgresql/%SUBDIR%/ \ ftp://ftp.ba.postgresql.org/pub/postgresql/%SUBDIR%/ \ - ftp://ftp.br.postgresql.org/pub/PostgreSQL/%SUBDIR%/ \ - ftp://ftp3.ca.postgresql.org/pub/%SUBDIR%/ \ - ftp://ftp2.cr.postgresql.org/pub/Unix/postgres/%SUBDIR%/ \ - ftp://ftp.cz.postgresql.org/pub/ftp.postgresql.org/%SUBDIR%/ \ + ftp://ftp.cz.postgresql.org/DATA/postgresql/%SUBDIR%/ \ ftp://ftp2.cz.postgresql.org/pub/postgresql/%SUBDIR%/ \ ftp://ftp.ee.postgresql.org/mirrors/postgresql/%SUBDIR%/ \ ftp://ftp.fr.postgresql.org/%SUBDIR%/ \ - ftp://ftp2.fr.postgresql.org/postgresql/%SUBDIR%/ \ ftp://ftp.de.postgresql.org/mirror/postgresql/%SUBDIR%/ \ ftp://ftp3.de.postgresql.org/pub/Mirrors/ftp.postgresql.org/%SUBDIR%/ \ ftp://ftp.gr.postgresql.org/pub/databases/postgresql/%SUBDIR%/ \ @@ -776,7 +756,7 @@ ftp://ftp.ie.postgresql.org/mirrors/ftp.postgresql.org/pub/%SUBDIR%/ \ ftp://ftp2.it.postgresql.org/mirrors/postgres/%SUBDIR%/ \ ftp://ftp.kr.postgresql.org/postgresql/%SUBDIR%/ \ - ftp://ftp.lv.postgresql.org/pub/software/postgresql/%SUBDIR%/ \ + ftp://ftp.lv.postgresql.org/pub/postgresql/%SUBDIR%/ \ ftp://ftp.eu.postgresql.org/pub/unix/db/postgresql/%SUBDIR%/ \ ftp://ftp2.nl.postgresql.org/mirror/postgresql/%SUBDIR%/ \ ftp://ftp4.nl.postgresql.org/postgresql.zeelandnet.nl/%SUBDIR%/ \ @@ -961,7 +941,7 @@ .endif .if !defined(IGNORE_MASTER_SITE_SOURCEFORGE) -.for mirror in heanet nchc kent ufpr surfnet jaist umn +.for mirror in heanet nchc kent easynews ufpr jaist umn MASTER_SITE_SOURCEFORGE+= \ http://${mirror}.dl.sourceforge.net/sourceforge/%SUBDIR%/ .endfor @@ -995,12 +975,10 @@ MASTER_SITE_SUNSITE+= \ http://www.ibiblio.org/pub/Linux/%SUBDIR%/ \ http://www.gtlib.cc.gatech.edu/pub/Linux/%SUBDIR%/ \ - ftp://sunsite.cnlab-switch.ch/mirror/linux/sunsite/%SUBDIR%/ \ ftp://ftp.cs.tu-berlin.de/pub/linux/Mirrors/sunsite.unc.edu/%SUBDIR%/ \ ftp://ftp.physics.auth.gr/pub/mirrors/ibiblio/Linux/%SUBDIR%/ \ ftp://ftp.edisontel.com/pub/Sunsite_Mirror/%SUBDIR%/ \ ftp://ftp.nluug.nl/pub/metalab/%SUBDIR%/ \ - ftp://ftp.lip6.fr/pub/linux/sunsite/%SUBDIR%/ \ ftp://ftp.nvg.ntnu.no/pub/mirrors/metalab.unc.edu/%SUBDIR%/ \ ftp://ftp.icm.edu.pl/pub/Linux/sunsite/%SUBDIR%/ \ ftp://ftp.cse.cuhk.edu.hk/pub4/Linux/%SUBDIR%/ \ @@ -1170,7 +1148,7 @@ ${MASTER_SITE_RINGSERVER:S,%SUBDIR%,X/opengroup/contrib/&,} \ ftp://ftp.mirrorservice.org/sites/ftp.x.org/contrib/%SUBDIR%/ \ ftp://sunsite.org.uk/sites/ftp.x.org/contrib/%SUBDIR%/ \ - ftp://ftp.chg.ru/pub/X11/contrib/%SUBDIR%/ + ftp://ftp.chg.ru/pub/X11/x.org/contrib/%SUBDIR%/ .endif .if !defined(IGNORE_MASTER_SITE_XEMACS) ==== //depot/projects/soc2006/gabor_ports/UPDATING#9 (text+ko) ==== @@ -6,16 +6,35 @@ time you update your ports collection, before attempting any port upgrades. +20060723: + AFFECTS: users of www/dillo-i18n + AUTHOR: tmseck@netcologne.de + + Starting with version 20060709 the i18n version of Dillo encodes + the bookmark file using UTF-8 encoding. You can try to convert + your existing bookmark file with the bm-update script or you could + try to convert it by hand using iconv(1) from you current locale + to UTF-8, e.g. by calling 'iconv -f ISO-8859-1 -t UTF-8 ~/.dillo/bm.txt'. + + Please see the iconv documentation for further details. + +20060722: + AFFECTS: users of games/phpua-* + AUTHOR: miwi@FreeBSD.org + + The default install location has changed from + ${PREFIX}/www/data/phpua-* to ${PREFIX}/www/phpua-*. + 20060719: AFFECTS: users of mail/postfix AUTHOR: mnag@FreeBSD.org - mail/postfix are updated to 2.3.0, and now doesn't support POSTFIX_OPTIONS, - consider using "make config" to set your OPTIONS. Patch SPF are removed too, - this patch doesn't apply cleanly and have problems when use pipe(8). Consider - using mail/postfix-policyd-spf instead of patch SPF. + mail/postfix was updated to 2.3.0 and does no longer support POSTIX_OPTIONS, + please consider using "make config" to set your OPTIONS. The SPF patch was + removed since this does not apply cleanly and has problems when using + pipe(8). Consider using mail/postfix-policyd-spf instead of the SPF patch. - If you need of Postfix 2.2 version you can found in mail/postfix22. + If you need the Postfix 2.2 version you can find this in mail/postfix22. 20060715: AFFECTS: users of Aspell or its versions bundled with dictionaries @@ -78,6 +97,19 @@ will be necessary to run slapindex after making this change. There has been no change to actual data storage schema. +20060711: + AFFECTS: users of games/linux-ut + AUTHOR: netchild@FreeBSD.org, sean-freebsd@farley.org + + Some fixes for network play were done in UnrealTournament.ini + There are two ways to fix it: + 1. The easy way is to remove the ${HOME}/.loki/ut directory, yet all + local settings will be lost. + 2. The hard way: in ${HOME}/.loki/ut/UnrealTrounament.ini, under the + [Core.System] section, SavePath, CachePath and multiple Paths + variables should be replaced with the ones in (and in the same order + as) ${PREFIX}/share/linux-ut/System/UnrealTournament.ini. + 20060707: AFFECTS: users of www/lifetype AUTHOR: clsung@FreeBSD.org @@ -113,7 +145,7 @@ versions, you can end up with a portupgrade that does not work with older databases. A quick fix is to remove the databases, type: 'rm /var/db/pkg/pkgdb.db /usr/ports/INDEX*.db'. - portupgrade will recreate them automaticaly. It does absolutely no harm. + portupgrade will recreate them automatically. It does absolutely no harm. If you do not want remove the databases, you should detect what database type do you use, and set the port options for portupgrade accordingly. @@ -219,6 +251,18 @@ portupgrade -f -o emulators/linux_base-fc4 linux_base\* portupgrade -f -o x11/linux-xorg-libs linux-XFree86-libs + In case "printenv | grep LD_" prints something, e.g., LD_LIBRARY_PATH + or LD_PRELOAD, you have to make sure it is not set when starting + linux programs, else FreeBSD libraries will be picked up and the + programs do not start. + + After this start a linux program to test, e.g., acroread. If you get + errors when starting linux programs about problems with libraries, and + you made sure no LD_* variable is set as described above, you are one of + those unlucky people where we do not have a better solution as to tell + you to deinstall every linux port, remove /compat/linux completely to + make sure no cruft is left and reinstall everything you need. + 20060612: AFFECTS: users of editors/staroffice60, editors/staroffice70 and german/staroffice70 @@ -259,7 +303,7 @@ STARTTLS support on smtpd and pop3d, if you want to use it, you need to install sysutils/ucspi-ssl-tls port that has the necessary patch applied. - Remember to select STDERR option and rebuils security/clamav port, this is + Remember to select STDERR option and rebuild security/clamav port, this is necessary to have the correct log on smtpd. After upgrade from 2.3.x you will need to set environment var SMTPAUTH to @@ -572,7 +616,7 @@ When a port has USE_BDB defined as either 'USE_BDB=41+' or 'USE_BDB=yes', the port will use the oldest installed version of Berkeley DB. For example if - both db41 and db43 are installed, the port would end up compling with db41. + both db41 and db43 are installed, the port would end up compiling with db41. If you add -DWITH_BDB_HIGHEST to your make command, the port will use highest db* instead. If no Berkeley DB is installed then the port will default to the version specified or the default Berkeley DB version (currently db41). @@ -723,8 +767,8 @@ AFFECTS: net-im/jabber-pyicq and net-im/jabber-pymsn AUTHOR: garga@FreeBSD.org - Port versions older than 0.7 and 0.11a respectivly run as root which - is an uneeded security risk. Newer versions run as as user jabber, + Port versions older than 0.7 and 0.11a respectively run as root which + is an unneeded security risk. Newer versions run as as user jabber, so before starting the daemons, you should fix permissions for each spooldir (default: /var/spool/jabber): @@ -816,7 +860,7 @@ mxdcc ip 10.7.8.9 "MX" marks the IP address of one of your mail systems that should be ignored in initial Received: headers and when reported by sendmail to dccm. "MXDCC" - marks IP addresss of your mail systems that run DCC clients and that will have + marks IP addresses of your mail systems that run DCC clients and that will have already reported mail to the DCC. Continue using "OK" whitelist entries for mail systems that you trust to never send or forward unsolicited bulk email. Allow custom DNS blacklist SMTP rejection messages. See -Bset:rej-msg=X in the @@ -2371,7 +2415,7 @@ AFFECTS: users of x11-wm/xfce4 AUTHOR: oliver@FreeBSD.org - If you use Xorg 6.8.1: Make shure there is an /tmp/.ICE-unix with propper + If you use Xorg 6.8.1: Make sure there is an /tmp/.ICE-unix with propper rights. For further informations about that, please refer to 20041229 Please update all your plugins as well when you update from 4.0.6 to 4.2 They all need recompiling to link against the new xfce libraries @@ -3861,4 +3905,4 @@ 2) Update all p5-* modules. portupgrade -f p5-\* -$FreeBSD: ports/UPDATING,v 1.365 2006/07/19 12:59:10 mnag Exp $ +$FreeBSD: ports/UPDATING,v 1.370 2006/07/25 07:52:13 blackend Exp $ From owner-p4-projects@FreeBSD.ORG Wed Jul 26 16:16:23 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E5DDD16A4EB; Wed, 26 Jul 2006 16:16:22 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id A7E1E16A4E2 for ; Wed, 26 Jul 2006 16:16:22 +0000 (UTC) (envelope-from gabor@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id E79E943DBF for ; Wed, 26 Jul 2006 16:14:10 +0000 (GMT) (envelope-from gabor@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k6QGE752033712 for ; Wed, 26 Jul 2006 16:14:07 GMT (envelope-from gabor@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k6QGE7Vq033709 for perforce@freebsd.org; Wed, 26 Jul 2006 16:14:07 GMT (envelope-from gabor@FreeBSD.org) Date: Wed, 26 Jul 2006 16:14:07 GMT Message-Id: <200607261614.k6QGE7Vq033709@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to gabor@FreeBSD.org using -f From: Gabor Kovesdan To: Perforce Change Reviews Cc: Subject: PERFORCE change 102460 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 26 Jul 2006 16:16:23 -0000 http://perforce.freebsd.org/chv.cgi?CH=102460 Change 102460 by gabor@gabor_spitfire on 2006/07/26 16:13:27 IFC Affected files ... .. //depot/projects/soc2006/gabor_docs/porters-handbook/book.sgml#10 integrate Differences ... ==== //depot/projects/soc2006/gabor_docs/porters-handbook/book.sgml#10 (text+ko) ==== @@ -1,7 +1,7 @@ UIDs and GIDs + The current list of reserved UIDs and GIDs can be found + in ports/UIDs and + ports/GIDs. + If your port requires a certain user to be on the installed system, let the pkg-install script call pw to create it automatically. Look at - net/cvsup-mirror for an example. + net/cvsup-mirror for an example. + Please note that this is strongly discouraged, please register + user/group ID numbers as stated below. If your port must use the same user/group ID number when it is installed as a binary package as when it was compiled, then you must - choose a free UID from 50 to 999 and register it below. Look at + choose a free UID from 50 to 999 and register it either in + ports/UIDs (for users) or in + ports/GIDs (for groups). Look at japanese/Wnn6 for an example. Make sure you do not use a UID already used by the system or other ports. - This is the current list of UIDs between 50 and 999. - - - bind:*:53:53:Bind Sandbox:/:/sbin/nologin -majordom:*:54:54:Majordomo Pseudo User:/usr/local/majordomo:/nonexistent -rdfdb:*:55:55:rdfDB Daemon:/var/db/rdfdb:/bin/sh -spamd:*:58:58:SpamAssassin user:/var/spool/spamd:/sbin/nologin -cyrus:*:60:60:the cyrus mail server:/nonexistent:/nonexistent -gnats:*:61:1:GNATS database owner:/usr/local/share/gnats/gnats-db:/bin/sh -proxy:*:62:62:Packet Filter pseudo-user:/nonexistent:/nonexistent -uucp:*:66:66:UUCP pseudo-user:/var/spool/uucppublic:/usr/libexec/uucp/uucico -xten:*:67:67:X-10 daemon:/usr/local/xten:/nonexistent -pop:*:68:6:Post Office Owner (popper):/nonexistent:/sbin/nologin -wnn:*:69:7:Wnn:/nonexistent:/nonexistent -pgsql:*:70:70:PostgreSQL pseudo-user:/usr/local/pgsql:/bin/sh -oracle:*:71:71::0:0:Oracle:/usr/local/oracle7:/sbin/nologin -ircd:*:72:72:IRC daemon:/nonexistent:/nonexistent -ircservices:*:73:73:IRC services:/nonexistent:/nonexistent -simscan:*:74:74:Simscan User:/nonexistent:/sbin/nologin -ifmail:*:75:66:Ifmail user:/nonexistent:/nonexistent -www:*:80:80:World Wide Web Owner:/nonexistent:/sbin/nologin -alias:*:81:81:QMail user:/var/qmail/alias:/nonexistent -qmaild:*:82:81:QMail user:/var/qmail:/nonexistent -qmaill:*:83:81:QMail user:/var/qmail:/nonexistent -qmailp:*:84:81:QMail user:/var/qmail:/nonexistent -qmailq:*:85:82:QMail user:/var/qmail:/nonexistent -qmailr:*:86:82:QMail user:/var/qmail:/nonexistent -qmails:*:87:82:QMail user:/var/qmail:/nonexistent -mysql:*:88:88:MySQL Daemon:/var/db/mysql:/sbin/nologin -vpopmail:*:89:89:VPop Mail User:/usr/local/vpopmail:/nonexistent -firebird:*:90:90:Firebird Database Administrator:/usr/local/firebird:/bin/sh -mailman:*:91:91:Mailman User:/usr/local/mailman:/sbin/nologin -gdm:*:92:92:GDM Sandbox:/:/sbin/nologin -jabber:*:93:93:Jabber Daemon:/nonexistent:/nonexistent -p4admin:*:94:94:Perforce admin:/usr/local/perforce:/sbin/nologin -interch:*:95:95:Interchange user:/usr/local/interchange:/sbin/nologin -squeuer:*:96:96:SQueuer Owner:/nonexistent:/bin/sh -mud:*:97:97:MUD Owner:/nonexistent:/bin/sh -msql:*:98:98:mSQL-2 pseudo-user:/var/db/msqldb:/bin/sh -rscsi:*:99:99:Remote SCSI:/usr/local/rscsi:/usr/local/sbin/rscsi -squid:*:100:100:squid caching-proxy pseudo user:/usr/local/squid:/sbin/nologin -quagga:*:101:101:Quagga route daemon pseudo user:/usr/local/etc/quagga:/sbin/nologin -ganglia:*:102:102:Ganglia User:/nonexistent:/sbin/nologin -sgeadmin:*:103:103:Sun Grid Engine Admin:/nonexistent:/sbin/nologin -slimserv:*:104:104:Slim Devices SlimServer pseudo-user:/nonexistent:/sbin/nologin -dnetc:*:105:105:distributed.net client and proxy pseudo-user:/nonexistent:/sbin/nologin -clamav:*:106:106:Clamav Antivirus:/nonexistent:/sbin/nologin -cacti:*:107:107:Cacti Sandbox:/nonexistent:/sbin/nologin -webkit:*:108:108:WebKit Default User:/usr/local/www/webkit:/bin/sh -quickml:*:109:109:quickml Server:/nonexistent:/sbin/nologin -vscan:*:110:110:Scanning Virus Account:/var/amavis:/bin/sh -fido:*:111:111:Fido System:/usr/local/fido:/bin/sh -dcc:*:112:112:Distributed Checksum Clearinghouse:/nonexistent:/sbin/nologin -amavis:*:113:113:Amavis-stats Account:/nonexistent:/sbin/nologin -dhis:*:114:114:DHIS Daemon:/nonexistent:/sbin/nologin -_symon:*:115:115:Symon Account:/var/empty:/sbin/nologin -hplip:*:116:116:HPLIP Server:/nonexistent:/sbin/nologin -postfix:*:125:125:Postfix Mail System:/var/spool/postfix:/sbin/nologin -_bgpd:*:130:130:BGP Daemon:/var/empty:/sbin/nologin -_ospfd:*:131:131:OSPF Daemon:/var/empty:/sbin/nologin -rbldns:*:153:153:rbldnsd pseudo-user:/nonexistent:/sbin/nologin -sfs:*:171:171:Self-Certifying File System:/nonexistent:/sbin/nologin -agk:*:172:172:AquaGateKeeper:/nonexistent:/nonexistent -polipo:*:173:173:polipo web cache:/nonexistent:/sbin/nologin -bogomilter:*:174:174:milter-bogom:/nonexistent:/sbin/nologin -moinmoin:*:192:192:MoinMoin User:/nonexistent:/sbin/nologin -sympa:*:200:200:Sympa Owner:/nonexistent:/sbin/nologin -privoxy:*:201:201:Privoxy proxy user:/nonexistent:/sbin/nologin -dspam:*:202:202:Dspam:/nonexistent:/sbin/nologin -shoutcast:*:210:210:Shoutcast sandbox:/nonexistent:/bin/sh -_tor:*:256:256:Tor anonymising router:/var/db/tor:/bin/sh -smxs:*:260:260:Sendmail X SMTPS:/nonexistent:/sbin/nologin -smxq:*:261:261:Sendmail X QMGR:/nonexistent:/sbin/nologin -smxc:*:262:262:Sendmail X SMTPC:/nonexistent:/sbin/nologin -smxm:*:263:263:Sendmail X misc:/nonexistent:/sbin/nologin -smx:*:264:264:Sendmail X other:/nonexistent:/sbin/nologin -mrtg:*:279:279:MRTG daemon:/nonexistent:/sbin/nologin -ldap:*:389:389:OpenLDAP Server:/nonexistent:/sbin/nologin -drweb:*:426:426:Dr.Web Mail Scanner:/nonexistent:/sbin/nologin -courier:*:465:465:Courier Mail Server:/nonexistent:/sbin/nologin -_bbstored:*:505:505::0:0:BoxBackup Store Daemon:/nonexistent:/bin/sh -ejabberd:*:544:544::0:0:ejabberd pseudo user:/var/spool/ejabberd:/bin/sh -qtss:*:554:554:Darwin Streaming Server:/nonexistent:/sbin/nologin -ircdru:*:555:555:Russian hybrid IRC server:/nonexistent:/bin/sh -messagebus:*:556:556:D-BUS Daemon User:/nonexistent:/sbin/nologin -avahi:*:558:558:Avahi Daemon User:/nonexistent:/sbin/nologin -bnetd:*:700:700:Bnetd user:/nonexistent:/sbin/nologin -bopm:*:717:717:Blitzed Open Proxy Monitor:/nonexistent:/bin/sh -openxpki:*:777:777:OpenXPKI Owner:/nonexistent:/usr/sbin/nologin -bacula:*:910:910:Bacula Daemon:/var/db/bacula:/sbin/nologin - - This is the current list of reserved GIDs. - - - - bind:*:53: -rdfdb:*:55: -spamd:*:58: -cyrus:*:60: -proxy:*:62: -authpf:*:63: -uucp:*:66: -xten:*:67: -dialer:*:68: -network:*:69: -pgsql:*:70: -simscan:*:74: -audit:*:77: -www:*:80: -qnofiles:*:81: -qmail:*:82: -mysql:*:88: -vpopmail:*:89: -firebird:*:90: -mailman:*:91: -gdm:*:92: -jabber:*:93: -p4admin:*:94: -interch:*:95: -squeuer:*:96: -mud:*:97: -msql:*:98: -rscsi:*:99: -squid:*:100: -quagga:*:101: -ganglia:*:102: -sgeadmin:*:103: -slimserv:*:104: -dnetc:*:105: -clamav:*:106: -cacti:*:107: -webkit:*:108: -quickml:*:109: -vscan:*:110: -fido:*:111: -dcc:*:112: -amavis:*:113: -dhis:*:114: -_symon:*:115: -postfix:*:125: -maildrop:*:126: -_bgpd:*:130: -_ospfd:*:131: -rbldns:*:153: -sfs:*:171: -agk:*:172: -polipo:*:173: -moinmoin:*:192: -sympa:*:200: -dspam:*:202: -_tor:*:256: -smxs:*:260: -smxq:*:261: -smxc:*:262: -smxm:*:263: -smx:*:264: -mrtg:*:279: -ldap:*:389: -drweb:*:426: -courier:*:465: -_bbstored:*:505: -ejabberd:*:544: -qtss:*:554: -ircdru:*:555: -messagebus:*:556: -realtime:*:557: -avahi:*:558: -bnetd:*:700: -bopm:*:717: -openxpki:*:777: -bacula:*:910: - - Please include a notice when you submit a port (or an upgrade) - that reserves a new UID or GID in this range. This allows us to - keep the list of reserved IDs up to date. + Please include a patch against these two files when you + require a new user or group to be created for your + port. From owner-p4-projects@FreeBSD.ORG Wed Jul 26 17:20:36 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8B1D416A4E5; Wed, 26 Jul 2006 17:20:36 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 6105B16A4DE for ; Wed, 26 Jul 2006 17:20:36 +0000 (UTC) (envelope-from gabor@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id A5E8A43D6D for ; Wed, 26 Jul 2006 17:20:35 +0000 (GMT) (envelope-from gabor@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k6QHKZeP046275 for ; Wed, 26 Jul 2006 17:20:35 GMT (envelope-from gabor@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k6QHKZ63046270 for perforce@freebsd.org; Wed, 26 Jul 2006 17:20:35 GMT (envelope-from gabor@FreeBSD.org) Date: Wed, 26 Jul 2006 17:20:35 GMT Message-Id: <200607261720.k6QHKZ63046270@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to gabor@FreeBSD.org using -f From: Gabor Kovesdan To: Perforce Change Reviews Cc: Subject: PERFORCE change 102468 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 26 Jul 2006 17:20:36 -0000 http://perforce.freebsd.org/chv.cgi?CH=102468 Change 102468 by gabor@gabor_spitfire on 2006/07/26 17:19:44 Convert some make substitution to sed script. Affected files ... .. //depot/projects/soc2006/gabor_ports/Tools/scripts/do-fetch.sh#6 edit Differences ... ==== //depot/projects/soc2006/gabor_ports/Tools/scripts/do-fetch.sh#6 (text+ko) ==== @@ -4,7 +4,7 @@ for _S in ${MASTER_SITES}; do _S_TEMP= ${_S:S/^${_S:C@/:[^/:]+$@/@}//:S/^://} if [ -n "$(_S_TEMP)" ] ; then - for _group in ${_S_TEMP:S/,/ /g}; do + for _group in `${ECHO_CMD} ${_S_TEMP} | ${SED} "s/,/ /g"`; do _G_TEMP= ${_group} if ${_G_TEMP} == all || ${_G_TEMP} == ALL || ${_G_TEMP} == default ${ECHO_MSG} "Makefile error: the words all, ALL and default are reserved and cannot be" @@ -20,7 +20,7 @@ for _S in ${MASTER_SITE_SUBDIR}; do _S_TEMP= ${_S:S/^${_S:C@/:[^/:]+$@/@}//:S/^://} if [ -n "$(_S_TEMP)" ] ; then - for _group in ${_S_TEMP:S/,/ /g}; do + for _group in `${ECHO_CMD} ${_S_TEMP} | ${SED} "s/,/ /g"`; do _G_TEMP= ${_group} if ${_G_TEMP} == all || ${_G_TEMP} == ALL || ${_G_TEMP} == default; then ${ECHO_MSG} "Makefile error: the words all, ALL and default are reserved and cannot be" @@ -40,7 +40,7 @@ for _S in ${MASTER_SITES}; do _S_TEMP= ${_S:S/^${_S:C@/:[^/:]+$@/@}//:S/^://} if [ -n "$(_S_TEMP)" ] ; then - for _group in ${_S_TEMP:S/,/ /g}; do + for _group in `${ECHO_CMD} ${_S_TEMP} | ${SED} "s/,/ /g"`; do if [ -z "$$(_MASTER_SITE_SUBDIR_${_group})" ] ; then MASTER_SITES_TMP= ${_MASTER_SITES_${_group}:S^%SUBDIR%/^^} else @@ -129,7 +129,7 @@ for _D in ${DISTFILES}; do _D_TEMP= ${_D:S/^${_D:C/:[^:]+$//}//} if [ -n "$(_D_TEMP)" ] ; then - for _group in ${_D_TEMP:S/^://:S/,/ /g}; do + for _group in `${ECHO_CMD} ${_S_TEMP} | ${SED} -e "s/^://" -e "s/,/ /g"`; do if [ -z "$$(_MASTER_SITES_${_group})" ] ; then _G_TEMP_TEMP= ${_G_TEMP:M/${_group}/} if [ -z "$(_G_TEMP_TEMP)" ; then @@ -169,14 +169,14 @@ for _S in ${MASTER_SITES}; do _S_TEMP= ${_S:S/^${_S:C@/:[^/:]+$@/@}//} if [ -n "${_S_TEMP}" ] ; then - for _group in ${_S_TEMP:S/^://:S/,/ /g}; do + for _group in `${ECHO_CMD} ${_S_TEMP} | ${SED} -e "s/^://" -e "s/,/ /g"`; do SORTED_MASTER_SITES_${_group}_CMD= cd ${.CURDIR} && ${MAKE} ${__softMAKEFLAGS} master-sites--${_group} ${ECHO_CMD} ${_MASTER_SITE_OVERRIDE} `${ECHO_CMD} '${_MASTER_SITES_${_group}}' | ${AWK} '${MASTER_SORT_AWK:S|\\|\\\\|g}'` ${_MASTER_SITE_BACKUP} done fi done -### FIXME: thos should be convert to be done in this script itself +### FIXME: those should be convert to be done in this script itself # # Hackery to enable simple fetch targets with several dynamic MASTER_SITES # @@ -184,7 +184,7 @@ .for _F in ${DISTFILES} _F_TEMP= ${_F:S/^${_F:C/:[^:]+$//}//:S/^://} . if !empty(_F_TEMP) -. for _group in ${_F_TEMP:S/,/ /g} +. for _group in `${ECHO_CMD} ${_F_TEMP} | ${SED} "s/,/ /g"`; do . if defined(_MASTER_SITES_${_group}) _MASTER_SITES_ENV+= _MASTER_SITES_${_group}="${_MASTER_SITES_${_group}}" . endif @@ -264,7 +264,7 @@ for _S in ${PATCH_SITES}; do _S_TEMP= ${_S:S/^${_S:C@/:[^/:]+$@/@}//:S/^://} if [ -n "${_S_TEMP)" ; then \ - for _group in ${_S_TEMP:S/,/ /g}; do + for _group in `${ECHO_CMD} ${_S_TEMP} | ${SED} "s/,/ /g"`; do _G_TEMP= ${_group} if ${_G_TEMP} == all || ${_G_TEMP} == ALL || ${_G_TEMP} == default; then ${ECHO_MSG} "The words all, ALL and default are reserved and cannot be" @@ -280,7 +280,7 @@ for _S in ${PATCH_SITE_SUBDIR}; do _S_TEMP= ${_S:S/^${_S:C@/:[^/:]+$@/@}//:S/^://} if [ -n "$(_S_TEMP)" ] ; then - for _group in ${_S_TEMP:S/,/ /g}; do + for _group in `${ECHO_CMD} ${_S_TEMP} | ${SED} "s/,/ /g"`; do _G_TEMP= ${_group} if ${_G_TEMP} == all || ${_G_TEMP} == ALL || ${_G_TEMP} == default; then ${ECHO_MSG} "Makefile error: the words all, ALL and default are reserved and cannot be" @@ -300,7 +300,7 @@ for _S in ${PATCH_SITES}; do _S_TEMP= ${_S:S/^${_S:C@/:[^/:]+$@/@}//:S/^://} if [ -n "$(_S_TEMP)" } ; then - for _group in ${_S_TEMP:S/,/ /g}; do + for _group in `${ECHO_CMD} ${_S_TEMP} | ${SED} "s/,/ /g"`; do if [ -z "$$(_PATCH_SITE_SUBDIR_${_group})" ] ; then _S_TEMP_TEMP= ${_PATCH_SITES_${_group}:M*%SUBDIR%/*} if [ -z "$(_S_TEMP_TEMP)" ] ; then @@ -367,7 +367,7 @@ for _S in ${PATCH_SITES}; do _S_TEMP= ${_S:S/^${_S:C@/:[^/:]+$@/@}//} if [ -n "${_S_TEMP}" ] ; then - for _group in ${_S_TEMP:S/^://:S/,/ /g}; do + for _group in `${ECHO_CMD} ${_S_TEMP} | ${SED} -e "s/^://" "s/,/ /g"`; do SORTED_PATCH_SITES_${_group}_CMD= cd ${.CURDIR} && ${MAKE} ${__softMAKEFLAGS} patch-sites-${_group} ${ECHO_CMD} ${_MASTER_SITE_OVERRIDE} `${ECHO_CMD} '${_PATCH_SITES_${_group}}' | ${AWK} '${MASTER_SORT_AWK:S|\\|\\\\|g}'` ${_MASTER_SITE_BACKUP} done @@ -380,7 +380,7 @@ .for _F in ${PATCHFILES} _F_TEMP= ${_F:S/^${_F:C/:[^:]+$//}//:S/^://} . if !empty(_F_TEMP) -. for _group in ${_F_TEMP:S/,/ /g} +. for _group in `${ECHO_CMD} ${_F_TEMP} | ${SED} "s/,/ /g"`; do . if defined(_PATCH_SITES_${_group}) _PATCH_SITES_ENV+= _PATCH_SITES_${_group}="${_PATCH_SITES_${_group}}" . endif From owner-p4-projects@FreeBSD.ORG Wed Jul 26 17:39:07 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9544B16A4F1; Wed, 26 Jul 2006 17:39:07 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 5786216A4EF for ; Wed, 26 Jul 2006 17:39:07 +0000 (UTC) (envelope-from piso@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id AB13E43D5D for ; Wed, 26 Jul 2006 17:39:02 +0000 (GMT) (envelope-from piso@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k6QHd2gm047522 for ; Wed, 26 Jul 2006 17:39:02 GMT (envelope-from piso@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k6QHd2Ac047519 for perforce@freebsd.org; Wed, 26 Jul 2006 17:39:02 GMT (envelope-from piso@freebsd.org) Date: Wed, 26 Jul 2006 17:39:02 GMT Message-Id: <200607261739.k6QHd2Ac047519@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to piso@freebsd.org using -f From: Paolo Pisati To: Perforce Change Reviews Cc: Subject: PERFORCE change 102475 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 26 Jul 2006 17:39:07 -0000 http://perforce.freebsd.org/chv.cgi?CH=102475 Change 102475 by piso@piso_newluxor on 2006/07/26 17:39:01 IFC (again) Affected files ... .. //depot/projects/soc2005/libalias/UPDATING#3 integrate .. //depot/projects/soc2005/libalias/sys/dev/uart/uart_cpu_powerpc.c#2 integrate .. //depot/projects/soc2005/libalias/sys/dev/uart/uart_dev_z8530.c#2 integrate .. //depot/projects/soc2005/libalias/sys/powerpc/conf/GENERIC#3 integrate .. //depot/projects/soc2005/libalias/sys/powerpc/conf/NOTES#2 integrate .. //depot/projects/soc2005/libalias/sys/powerpc/include/md_var.h#2 integrate .. //depot/projects/soc2005/libalias/sys/powerpc/include/ofw_machdep.h#2 integrate .. //depot/projects/soc2005/libalias/sys/powerpc/include/pcb.h#2 integrate .. //depot/projects/soc2005/libalias/sys/powerpc/powerpc/clock.c#2 integrate .. //depot/projects/soc2005/libalias/sys/powerpc/powerpc/mem.c#2 integrate .. //depot/projects/soc2005/libalias/sys/powerpc/powerpc/ofw_machdep.c#2 integrate Differences ... ==== //depot/projects/soc2005/libalias/UPDATING#3 (text+ko) ==== @@ -21,6 +21,13 @@ developers choose to disable these features on build machines to maximize performance. +20060725: + enigma(1)/crypt(1) utility has been changed on 64 bit architectures. + Now it can decrypt files created from different architectures. + Unfortunately, it is no longer able to decrypt a cipher text + generated with an older version on 64 bit architectures. + If you have such a file, you need old utility to decrypt it. + 20060709: The interface version of the i4b kernel part has changed. So after updating the kernel sources and compiling a new kernel, @@ -591,4 +598,4 @@ Contact Warner Losh if you have any questions about your use of this document. -$FreeBSD: src/UPDATING,v 1.451 2006/07/09 21:16:06 twinterg Exp $ +$FreeBSD: src/UPDATING,v 1.452 2006/07/26 16:31:10 jkim Exp $ ==== //depot/projects/soc2005/libalias/sys/dev/uart/uart_cpu_powerpc.c#2 (text) ==== @@ -25,14 +25,16 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/uart/uart_cpu_powerpc.c,v 1.1 2006/03/31 01:42:55 marcel Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/uart/uart_cpu_powerpc.c,v 1.2 2006/07/26 17:17:23 marcel Exp $"); #include #include -#include #include +#include +#include + #include #include @@ -43,12 +45,63 @@ uart_cpu_eqres(struct uart_bas *b1, struct uart_bas *b2) { - return (0); + return ((b1->bsh == b2->bsh) ? 1 : 0); } int uart_cpu_getdev(int devtype, struct uart_devinfo *di) { + char buf[64]; + phandle_t input, opts; + int error; - return (ENXIO); + if ((opts = OF_finddevice("/options")) == -1) + return (ENXIO); + switch (devtype) { + case UART_DEV_CONSOLE: + if (OF_getprop(opts, "input-device", buf, sizeof(buf)) == -1) + return (ENXIO); + input = OF_finddevice(buf); + if (input == -1) + return (ENXIO); + if (OF_getprop(opts, "output-device", buf, sizeof(buf)) == -1) + return (ENXIO); + if (OF_finddevice(buf) != input) + return (ENXIO); + break; + case UART_DEV_DBGPORT: + if (!getenv_string("hw.uart.dbgport", buf, sizeof(buf))) + return (ENXIO); + input = OF_finddevice(buf); + if (input == -1) + return (ENXIO); + break; + default: + return (EINVAL); + } + + if (OF_getprop(input, "device_type", buf, sizeof(buf)) == -1) + return (ENXIO); + if (strcmp(buf, "serial") != 0) + return (ENXIO); + if (OF_getprop(input, "name", buf, sizeof(buf)) == -1) + return (ENXIO); + if (strcmp(buf, "ch-a")) + return (ENXIO); + + error = OF_decode_addr(input, 0, &di->bas.bst, &di->bas.bsh); + if (error) + return (error); + + di->ops = uart_z8530_ops; + + di->bas.rclk = 230400; + di->bas.chan = 1; + di->bas.regshft = 4; + + di->baudrate = 0; + di->databits = 8; + di->stopbits = 1; + di->parity = UART_PARITY_NONE; + return (0); } ==== //depot/projects/soc2005/libalias/sys/dev/uart/uart_dev_z8530.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/uart/uart_dev_z8530.c,v 1.18 2006/05/12 23:24:45 marcel Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/uart/uart_dev_z8530.c,v 1.20 2006/07/26 17:29:37 marcel Exp $"); #include #include @@ -43,6 +43,13 @@ #define DEFAULT_RCLK 307200 +/* Hack! */ +#ifdef __powerpc__ +#define UART_PCLK 0 +#else +#define UART_PCLK MCB2_PCLK +#endif + /* Multiplexed I/O. */ static __inline void uart_setmreg(struct uart_bas *bas, int reg, int val) @@ -124,7 +131,7 @@ } else divisor = -1; - uart_setmreg(bas, WR_MCB2, MCB2_PCLK); + uart_setmreg(bas, WR_MCB2, UART_PCLK); uart_barrier(bas); if (divisor >= 0) { @@ -140,7 +147,7 @@ uart_barrier(bas); uart_setmreg(bas, WR_TPC, tpc); uart_barrier(bas); - uart_setmreg(bas, WR_MCB2, MCB2_PCLK | MCB2_BRGE); + uart_setmreg(bas, WR_MCB2, UART_PCLK | MCB2_BRGE); uart_barrier(bas); *tpcp = tpc; return (0); @@ -167,7 +174,7 @@ uart_barrier(bas); /* Set clock sources. */ uart_setmreg(bas, WR_CMC, CMC_RC_BRG | CMC_TC_BRG); - uart_setmreg(bas, WR_MCB2, MCB2_PCLK); + uart_setmreg(bas, WR_MCB2, UART_PCLK); uart_barrier(bas); /* Set data encoding. */ uart_setmreg(bas, WR_MCB1, MCB1_NRZ); @@ -383,7 +390,7 @@ { struct z8530_softc *z8530 = (struct z8530_softc*)sc; struct uart_bas *bas; - int error; + int baudrate, divisor, error; bas = &sc->sc_bas; error = 0; @@ -397,6 +404,12 @@ uart_setmreg(bas, WR_TPC, z8530->tpc); uart_barrier(bas); break; + case UART_IOCTL_BAUD: + divisor = uart_getmreg(bas, RR_TCH); + divisor = (divisor << 8) | uart_getmreg(bas, RR_TCL); + baudrate = bas->rclk / 2 / (divisor + 2); + *(int*)data = baudrate; + break; default: error = EINVAL; break; ==== //depot/projects/soc2005/libalias/sys/powerpc/conf/GENERIC#3 (text+ko) ==== @@ -16,7 +16,7 @@ # If you are in doubt as to the purpose or necessity of a line, check first # in NOTES. # -# $FreeBSD: src/sys/powerpc/conf/GENERIC,v 1.57 2006/06/26 22:03:22 babkin Exp $ +# $FreeBSD: src/sys/powerpc/conf/GENERIC,v 1.58 2006/07/26 17:34:05 marcel Exp $ cpu OEA ident GENERIC @@ -25,7 +25,6 @@ #hints "GENERIC.hints" makeoptions DEBUG=-g #Build kernel with gdb(1) debug symbols -makeoptions WERROR=-Wno-error #XXX: We don't want -Werror just now # Platform support options POWERMAC #NewWorld Apple PowerMacs @@ -93,8 +92,8 @@ makeoptions SC_DFLT_FONT=cp437 # Serial (COM) ports -#device sio # 8250, 16[45]50 based serial ports -device zs # Zilog 8350 based serial ports +device scc +device uart # PCI Ethernet NICs that use the common MII bus controller code. device miibus # MII bus support ==== //depot/projects/soc2005/libalias/sys/powerpc/conf/NOTES#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/powerpc/conf/NOTES,v 1.2 2005/12/30 16:45:31 ru Exp $ +# $FreeBSD: src/sys/powerpc/conf/NOTES,v 1.3 2006/07/26 17:35:40 marcel Exp $ # # This file contains machine dependent kernel configuration notes. For # machine independent notes, look in /sys/conf/NOTES. @@ -20,7 +20,6 @@ # Standard busses device pci -device zs # Zilog 8350 based serial ports device gem # Sun GEM/Sun ERI/Apple GMAC device ofwd # Open Firmware disks @@ -31,6 +30,7 @@ nodevice atkbdc nodevice atkbd nodevice psm +nodevice sio nodevice vga nodevice fdc nodevice ppc @@ -52,16 +52,12 @@ nodevice snake_saver # needs outsw use fixed nodevice cs -# XXX can't remember why -nodevice uart # isa nodevice pcii nodevice tnt4882 # wants gdb_cur nodevice dcons nodevice dcons_crom -# not yet -nodevice sio ##################################################################### ==== //depot/projects/soc2005/libalias/sys/powerpc/include/md_var.h#2 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/powerpc/include/md_var.h,v 1.26 2003/08/16 16:57:57 marcel Exp $ + * $FreeBSD: src/sys/powerpc/include/md_var.h,v 1.27 2006/07/26 17:12:54 marcel Exp $ */ #ifndef _MACHINE_MD_VAR_H_ @@ -52,6 +52,7 @@ void busdma_swi(void); int is_physical_memory(vm_offset_t addr); +int mem_valid(vm_offset_t addr, int len); void decr_init(void); ==== //depot/projects/soc2005/libalias/sys/powerpc/include/ofw_machdep.h#2 (text+ko) ==== @@ -22,7 +22,7 @@ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE * USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/powerpc/include/ofw_machdep.h,v 1.2 2004/08/16 13:07:40 ssouhlal Exp $ + * $FreeBSD: src/sys/powerpc/include/ofw_machdep.h,v 1.3 2006/07/26 17:12:54 marcel Exp $ */ #ifndef _MACHINE_OFW_MACHDEP_H_ @@ -30,7 +30,7 @@ #include +int OF_decode_addr(phandle_t, int, bus_space_tag_t *, bus_space_handle_t *); void OF_getetheraddr(device_t dev, u_char *addr); -int mem_valid(vm_offset_t addr, int len); #endif /* _MACHINE_OFW_MACHDEP_H_ */ ==== //depot/projects/soc2005/libalias/sys/powerpc/include/pcb.h#2 (text+ko) ==== @@ -29,7 +29,7 @@ * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * * $NetBSD: pcb.h,v 1.4 2000/06/04 11:57:17 tsubai Exp $ - * $FreeBSD: src/sys/powerpc/include/pcb.h,v 1.8 2004/07/12 22:17:20 grehan Exp $ + * $FreeBSD: src/sys/powerpc/include/pcb.h,v 1.9 2006/07/26 17:05:11 marcel Exp $ */ #ifndef _MACHINE_PCB_H_ @@ -59,6 +59,8 @@ #ifdef _KERNEL +struct trapframe; + #ifndef curpcb extern struct pcb *curpcb; #endif ==== //depot/projects/soc2005/libalias/sys/powerpc/powerpc/clock.c#2 (text+ko) ==== @@ -56,7 +56,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/powerpc/powerpc/clock.c,v 1.23 2006/05/16 14:32:17 phk Exp $"); +__FBSDID("$FreeBSD: src/sys/powerpc/powerpc/clock.c,v 1.24 2006/07/26 17:06:39 marcel Exp $"); #include #include @@ -68,6 +68,7 @@ #include +#include #include #include #include ==== //depot/projects/soc2005/libalias/sys/powerpc/powerpc/mem.c#2 (text+ko) ==== @@ -37,7 +37,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/powerpc/powerpc/mem.c,v 1.1 2004/08/16 13:07:40 ssouhlal Exp $"); +__FBSDID("$FreeBSD: src/sys/powerpc/powerpc/mem.c,v 1.2 2006/07/26 17:12:54 marcel Exp $"); /* * Memory special file @@ -59,7 +59,6 @@ #include #include -#include #include #include ==== //depot/projects/soc2005/libalias/sys/powerpc/powerpc/ofw_machdep.c#2 (text+ko) ==== @@ -32,7 +32,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/powerpc/powerpc/ofw_machdep.c,v 1.15 2005/11/11 09:32:27 grehan Exp $"); +__FBSDID("$FreeBSD: src/sys/powerpc/powerpc/ofw_machdep.c,v 1.16 2006/07/26 17:12:54 marcel Exp $"); #include #include @@ -51,6 +51,8 @@ #include #include +#include +#include #include #include #include @@ -284,6 +286,22 @@ OF_getprop(node, "local-mac-address", addr, ETHER_ADDR_LEN); } +/* + * Return the physical address and the bus space to use for a node + * referenced by its package handle and the index of the register bank + * to decode. Intended to be used by console drivers in early boot only. + * Works by mapping the address of the node's bank given in the address + * space of its parent upward in the device tree at each bridge along the + * path. + */ +int +OF_decode_addr(phandle_t node, int bank, bus_space_tag_t *tag, + bus_space_handle_t *handle) +{ + + return (ENXIO); +} + int mem_valid(vm_offset_t addr, int len) { From owner-p4-projects@FreeBSD.ORG Wed Jul 26 18:58:01 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5ACCC16A4E0; Wed, 26 Jul 2006 18:58:01 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id C59A116A4DD for ; Wed, 26 Jul 2006 18:58:00 +0000 (UTC) (envelope-from gabor@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 5933843D77 for ; Wed, 26 Jul 2006 18:57:48 +0000 (GMT) (envelope-from gabor@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k6QIvjrZ053369 for ; Wed, 26 Jul 2006 18:57:45 GMT (envelope-from gabor@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k6QIvjYw053366 for perforce@freebsd.org; Wed, 26 Jul 2006 18:57:45 GMT (envelope-from gabor@FreeBSD.org) Date: Wed, 26 Jul 2006 18:57:45 GMT Message-Id: <200607261857.k6QIvjYw053366@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to gabor@FreeBSD.org using -f From: Gabor Kovesdan To: Perforce Change Reviews Cc: Subject: PERFORCE change 102483 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 26 Jul 2006 18:58:01 -0000 http://perforce.freebsd.org/chv.cgi?CH=102483 Change 102483 by gabor@gabor_spitfire on 2006/07/26 18:57:24 Remove two hackery. These were to pass some pieces of data thorugh _ENV variables to the do-fetch target. This is don't needed anymore since they are set in the script itself. Affected files ... .. //depot/projects/soc2006/gabor_ports/Tools/scripts/do-fetch.sh#7 edit Differences ... ==== //depot/projects/soc2006/gabor_ports/Tools/scripts/do-fetch.sh#7 (text+ko) ==== @@ -176,23 +176,6 @@ fi done -### FIXME: those should be convert to be done in this script itself -# -# Hackery to enable simple fetch targets with several dynamic MASTER_SITES -# -_MASTER_SITES_ENV= _MASTER_SITES_DEFAULT="${_MASTER_SITES_DEFAULT}" -.for _F in ${DISTFILES} -_F_TEMP= ${_F:S/^${_F:C/:[^:]+$//}//:S/^://} -. if !empty(_F_TEMP) -. for _group in `${ECHO_CMD} ${_F_TEMP} | ${SED} "s/,/ /g"`; do -. if defined(_MASTER_SITES_${_group}) -_MASTER_SITES_ENV+= _MASTER_SITES_${_group}="${_MASTER_SITES_${_group}}" -. endif -. endfor -. endif -.endfor - -${_MASTER_SITES_ENV} for _file in ${DISTFILES}; do file=`${ECHO_CMD} $_file | ${SED} -E -e 's/:[^:]+$//'` select=`${ECHO_CMD} ${_file#${file}} | ${SED} -e 's/^://' -e 's/,/ /g'` @@ -374,22 +357,7 @@ fi done -### FIXME: this should be convert to be done in this script itself - -_PATCH_SITES_ENV= _PATCH_SITES_DEFAULT="${_PATCH_SITES_DEFAULT}" -.for _F in ${PATCHFILES} -_F_TEMP= ${_F:S/^${_F:C/:[^:]+$//}//:S/^://} -. if !empty(_F_TEMP) -. for _group in `${ECHO_CMD} ${_F_TEMP} | ${SED} "s/,/ /g"`; do -. if defined(_PATCH_SITES_${_group}) -_PATCH_SITES_ENV+= _PATCH_SITES_${_group}="${_PATCH_SITES_${_group}}" -. endif -. endfor -. endif -.endfor - cd ${_DISTDIR} - ${_PATCH_SITES_ENV} for _file in ${PATCHFILES}; do file=`${ECHO_CMD} $_file | ${SED} -E -e 's/:[^:]+$$//'` select=`${ECHO_CMD} ${_file#${file}} | ${SED} -e 's/^://' -e 's/,/ /g'` From owner-p4-projects@FreeBSD.ORG Wed Jul 26 19:11:04 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E742416A4DF; Wed, 26 Jul 2006 19:11:03 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id AA1DC16A4DA for ; Wed, 26 Jul 2006 19:11:03 +0000 (UTC) (envelope-from gabor@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 58A2A43D46 for ; Wed, 26 Jul 2006 19:11:03 +0000 (GMT) (envelope-from gabor@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k6QJB3ao055347 for ; Wed, 26 Jul 2006 19:11:03 GMT (envelope-from gabor@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k6QJB2Ox055344 for perforce@freebsd.org; Wed, 26 Jul 2006 19:11:02 GMT (envelope-from gabor@FreeBSD.org) Date: Wed, 26 Jul 2006 19:11:02 GMT Message-Id: <200607261911.k6QJB2Ox055344@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to gabor@FreeBSD.org using -f From: Gabor Kovesdan To: Perforce Change Reviews Cc: Subject: PERFORCE change 102485 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 26 Jul 2006 19:11:04 -0000 http://perforce.freebsd.org/chv.cgi?CH=102485 Change 102485 by gabor@gabor_spitfire on 2006/07/26 19:10:34 Syntactical fixes. I did not use the correct brackets everywhere. Affected files ... .. //depot/projects/soc2006/gabor_ports/Tools/scripts/do-fetch.sh#8 edit Differences ... ==== //depot/projects/soc2006/gabor_ports/Tools/scripts/do-fetch.sh#8 (text+ko) ==== @@ -3,7 +3,7 @@ for _S in ${MASTER_SITES}; do _S_TEMP= ${_S:S/^${_S:C@/:[^/:]+$@/@}//:S/^://} - if [ -n "$(_S_TEMP)" ] ; then + if [ -n "${_S_TEMP}" ] ; then for _group in `${ECHO_CMD} ${_S_TEMP} | ${SED} "s/,/ /g"`; do _G_TEMP= ${_group} if ${_G_TEMP} == all || ${_G_TEMP} == ALL || ${_G_TEMP} == default @@ -19,7 +19,7 @@ done for _S in ${MASTER_SITE_SUBDIR}; do _S_TEMP= ${_S:S/^${_S:C@/:[^/:]+$@/@}//:S/^://} - if [ -n "$(_S_TEMP)" ] ; then + if [ -n "${_S_TEMP}" ] ; then for _group in `${ECHO_CMD} ${_S_TEMP} | ${SED} "s/,/ /g"`; do _G_TEMP= ${_group} if ${_G_TEMP} == all || ${_G_TEMP} == ALL || ${_G_TEMP} == default; then @@ -27,31 +27,31 @@ ${ECHO_MSG} "used in group definitions. Please fix your MASTER_SITES." exit 1 fi - if [ -n "$(_MASTER_SITES_${_group})" ] ; then + if [ -n "${_MASTER_SITES_${_group}}" ] ; then _MASTER_SITE_SUBDIR_${_group}+= ${_S:C@^(.*)/:[^/:]+$@\1@} fi done else - if [ -n "$(_MASTER_SITES_DEFAULT)" ] ; then + if [ -n "${_MASTER_SITES_DEFAULT}" ] ; then _MASTER_SITE_SUBDIR_DEFAULT+= ${_S:C@^(.*)/:[^/:]+$@\1@} fi fi done for _S in ${MASTER_SITES}; do _S_TEMP= ${_S:S/^${_S:C@/:[^/:]+$@/@}//:S/^://} - if [ -n "$(_S_TEMP)" ] ; then + if [ -n "${_S_TEMP}" ] ; then for _group in `${ECHO_CMD} ${_S_TEMP} | ${SED} "s/,/ /g"`; do - if [ -z "$$(_MASTER_SITE_SUBDIR_${_group})" ] ; then + if [ -z "$${_MASTER_SITE_SUBDIR_${_group}}" ] ; then MASTER_SITES_TMP= ${_MASTER_SITES_${_group}:S^%SUBDIR%/^^} else _S_TEMP_TEMP= ${_MASTER_SITES_${_group}:M*%SUBDIR%/*} - if [ -z "$(_S_TEMP_TEMP)" ] ; then + if [ -z "${_S_TEMP_TEMP}" ] ; then MASTER_SITES_TMP= $${_MASTER_SITES_${_group}} else MASTER_SITES_TMP= for site in $${_MASTER_SITES_${_group}}; do _S_TEMP_TEMP= ${site:M*%SUBDIR%/*} - if [ -z "$(_S_TEMP_TEMP)" ] ; then + if [ -z "${_S_TEMP_TEMP}" ] ; then MASTER_SITES_TMP+= ${site} else for dir in $${_MASTER_SITE_SUBDIR_${_group}}; do @@ -65,15 +65,15 @@ done fi done -if [ -n "$(_MASTER_SITE_SUBDIR_DEFAULT)" ] ; then +if [ -n "${_MASTER_SITE_SUBDIR_DEFAULT}" ] ; then _S_TEMP= ${_MASTER_SITES_DEFAULT:M*%SUBDIR%/*} - if [ -z "$(_S_TEMP)" ] ; then + if [ -z "${_S_TEMP}" ] ; then MASTER_SITES_TMP= ${_MASTER_SITES_DEFAULT} else MASTER_SITES_TMP= for site in ${_MASTER_SITES_DEFAULT}; do _S_TEMP_TEMP= ${site:M*%SUBDIR%/*} - if [ -z "$(_S_TEMP_TEMP)" ] ; then + if [ -z "${_S_TEMP_TEMP}" ] ; then MASTER_SITES_TMP+= ${site} else for dir in ${_MASTER_SITE_SUBDIR_DEFAULT}; do @@ -96,7 +96,7 @@ # If the user has MASTER_SITE_FREEBSD set, go to the FreeBSD repository # for everything, but don't search it twice by appending it to the end. -if [ -n "$(MASTER_SITE_FREEBSD)" ] ; then +if [ -n "${MASTER_SITE_FREEBSD}" ] ; then _MASTER_SITE_OVERRIDE= ${MASTER_SITE_BACKUP} _MASTER_SITE_BACKUP= else @@ -128,11 +128,11 @@ _G_TEMP= DEFAULT for _D in ${DISTFILES}; do _D_TEMP= ${_D:S/^${_D:C/:[^:]+$//}//} - if [ -n "$(_D_TEMP)" ] ; then + if [ -n "${_D_TEMP}" ] ; then for _group in `${ECHO_CMD} ${_S_TEMP} | ${SED} -e "s/^://" -e "s/,/ /g"`; do - if [ -z "$$(_MASTER_SITES_${_group})" ] ; then + if [ -z "$$}_MASTER_SITES_${_group}}" ] ; then _G_TEMP_TEMP= ${_G_TEMP:M/${_group}/} - if [ -z "$(_G_TEMP_TEMP)" ; then + if [ -z "${_G_TEMP_TEMP}" ; then _G_TEMP+= ${_group} _MASTER_SITES_ALL+= ${_MASTER_SITES_${_group}} fi @@ -209,10 +209,10 @@ ${ECHO_MSG} "=> ${DISTDIR} is not writable by you; cannot fetch." exit 1 fi - if [ ! -z "$select" ] ; then + if [ ! -z "${select}" ] ; then ___MASTER_SITES_TMP= for group in $select; do - if [ ! -z "$${_MASTER_SITES_${group}}" ] ; then + if [ ! -z "$${_MASTER_SITES_${group}n" ] ; then eval ___MASTER_SITES_TMP="$${_MASTER_SITES_${group}}" __MASTER_SITES_TMP="${__MASTER_SITES_TMP} ${___MASTER_SITES_TMP}" fi @@ -246,7 +246,7 @@ if [ -z "${PATCHFILES}" ] ; then for _S in ${PATCH_SITES}; do _S_TEMP= ${_S:S/^${_S:C@/:[^/:]+$@/@}//:S/^://} - if [ -n "${_S_TEMP)" ; then \ + if [ -n "${_S_TEMP}" ; then \ for _group in `${ECHO_CMD} ${_S_TEMP} | ${SED} "s/,/ /g"`; do _G_TEMP= ${_group} if ${_G_TEMP} == all || ${_G_TEMP} == ALL || ${_G_TEMP} == default; then @@ -262,7 +262,7 @@ done for _S in ${PATCH_SITE_SUBDIR}; do _S_TEMP= ${_S:S/^${_S:C@/:[^/:]+$@/@}//:S/^://} - if [ -n "$(_S_TEMP)" ] ; then + if [ -n "${_S_TEMP}" ] ; then for _group in `${ECHO_CMD} ${_S_TEMP} | ${SED} "s/,/ /g"`; do _G_TEMP= ${_group} if ${_G_TEMP} == all || ${_G_TEMP} == ALL || ${_G_TEMP} == default; then @@ -270,29 +270,29 @@ ${ECHO_MSG} "used in group definitions. Please fix your PATCH_SITE_SUBDIR" exit 1 fi - if [ -n "$(_PATCH_SITES_${_group})" ] ; then + if [ -n "${_PATCH_SITES_${_group}}" ] ; then _PATCH_SITE_SUBDIR_${_group}+= ${_S:C@^(.*)/:[^/:]+$@\1@} fi done else - if [ -n "$(_PATCH_SITES_DEFAULT)" ] ; then + if [ -n "${_PATCH_SITES_DEFAULT}" ] ; then _PATCH_SITE_SUBDIR_DEFAULT+= ${_S:C@^(.*)/:[^/:]+$@\1@} fi fi done for _S in ${PATCH_SITES}; do _S_TEMP= ${_S:S/^${_S:C@/:[^/:]+$@/@}//:S/^://} - if [ -n "$(_S_TEMP)" } ; then + if [ -n "${_S_TEMP}" } ; then for _group in `${ECHO_CMD} ${_S_TEMP} | ${SED} "s/,/ /g"`; do - if [ -z "$$(_PATCH_SITE_SUBDIR_${_group})" ] ; then + if [ -z "$${_PATCH_SITE_SUBDIR_${_group}}" ] ; then _S_TEMP_TEMP= ${_PATCH_SITES_${_group}:M*%SUBDIR%/*} - if [ -z "$(_S_TEMP_TEMP)" ] ; then + if [ -z "${_S_TEMP_TEMP}" ] ; then PATCH_SITES_TMP= ${_PATCH_SITES_${_group}} else PATCH_SITES_TMP= for site in $${_PATCH_SITES_${_group}}; do _S_TEMP_TEMP= ${site:M*%SUBDIR%/*} - if [ -z "$(_S_TEMP_TEMP)" ] ; then + if [ -z "${_S_TEMP_TEMP}" ] ; then PATCH_SITES_TMP+= ${site} else for dir in $${_PATCH_SITE_SUBDIR_${_group}}; do @@ -306,15 +306,15 @@ done fi done - if [ -n "$(_PATCH_SITE_SUBDIR_DEFAULT)" ] ; then + if [ -n "${_PATCH_SITE_SUBDIR_DEFAULT}" ] ; then _S_TEMP= ${_PATCH_SITES_DEFAULT:M*%SUBDIR%/*} - if [ -z "$(_S_TEMP)" ] ; then + if [ -z "${_S_TEMP}" ] ; then PATCH_SITES_TMP= ${_PATCH_SITES_DEFAULT} else PATCH_SITES_TMP= for site in ${_PATCH_SITES_DEFAULT}; do _S_TEMP_TEMP= ${site:M*%SUBDIR%/*} - if [ -z "$(_S_TEMP_TEMP)" ] ; then + if [ -z "${_S_TEMP_TEMP}" ] ; then PATCH_SITES_TMP+= ${site} else for dir in ${_PATCH_SITE_SUBDIR_DEFAULT}; do @@ -332,11 +332,11 @@ _G_TEMP= DEFAULT for _P in ${PATCHFILES}; do _P_TEMP= ${_P:S/^${_P:C/:[^:]+$//}//} - if [ -n "$(_P_TEMP)" ] ; then + if [ -n "${_P_TEMP}" ] ; then for _group in ${_P_TEMP:S/^://:S/,/ /g}; do - if [ -z "$$(_PATCH_SITES_${_group})" ] ; then + if [ -z "$${_PATCH_SITES_${_group}}" ] ; then _G_TEMP_TEMP= ${_G_TEMP:M/${_group}/} - if [ -z "$(_G_TEMP_TEMP)" ] ; then + if [ -z "${_G_TEMP_TEMP}" ] ; then _G_TEMP+= ${_group} _PATCH_SITES_ALL+= $${_PATCH_SITES_${_group}} fi @@ -377,7 +377,7 @@ exit 1 fi ${ECHO_MSG} "=> $file doesn't seem to exist in ${_DISTDIR}." - if [ ! -z "$select" ] ; then + if [ ! -z "${select}" ] ; then __PATCH_SITES_TMP= for group in $select; do if [ ! -z $${_PATCH_SITES_${group}} ] ; then From owner-p4-projects@FreeBSD.ORG Wed Jul 26 20:25:47 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 319EF16A4E1; Wed, 26 Jul 2006 20:25:47 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 1076D16A4DA for ; Wed, 26 Jul 2006 20:25:47 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 8E9E243D55 for ; Wed, 26 Jul 2006 20:25:43 +0000 (GMT) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k6QKPhOK061258 for ; Wed, 26 Jul 2006 20:25:43 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k6QKPhk8061255 for perforce@freebsd.org; Wed, 26 Jul 2006 20:25:43 GMT (envelope-from jb@freebsd.org) Date: Wed, 26 Jul 2006 20:25:43 GMT Message-Id: <200607262025.k6QKPhk8061255@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 102496 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 26 Jul 2006 20:25:47 -0000 http://perforce.freebsd.org/chv.cgi?CH=102496 Change 102496 by jb@jb_freebsd2 on 2006/07/26 20:25:03 Patch from yongari@ which resolves the bus_dmamap_unload problem. Affected files ... .. //depot/projects/dtrace/src/sys/dev/em/if_em.c#5 edit Differences ... ==== //depot/projects/dtrace/src/sys/dev/em/if_em.c#5 (text+ko) ==== @@ -1388,13 +1388,13 @@ struct ifnet *ifp = sc->ifp; bus_dma_segment_t segs[EM_MAX_SCATTER]; bus_dmamap_t map; - struct em_buffer *tx_buffer; + struct em_buffer *tx_buffer, *tx_buffer_last; struct em_tx_desc *current_tx_desc; struct mbuf *m_head; struct m_tag *mtag; uint32_t txd_upper, txd_lower, txd_used, txd_saved; int nsegs, i, j; - int error = 0; + int error; m_head = *m_headp; current_tx_desc = NULL; @@ -1416,9 +1416,10 @@ * Map the packet for DMA. */ tx_buffer = &sc->tx_buffer_area[sc->next_avail_tx_desc]; - error = bus_dmamap_load_mbuf_sg(sc->txtag, tx_buffer->map, m_head, + tx_buffer_last = tx_buffer; + map = tx_buffer->map; + error = bus_dmamap_load_mbuf_sg(sc->txtag, map, m_head, segs, &nsegs, BUS_DMA_NOWAIT); - map = tx_buffer->map; if (error != 0) { sc->no_tx_dma_setup++; return (error); @@ -1548,6 +1549,8 @@ } tx_buffer->m_head = m_head; + tx_buffer_last->map = tx_buffer->map; + tx_buffer->map = map; bus_dmamap_sync(sc->txtag, map, BUS_DMASYNC_PREWRITE); /* @@ -1572,7 +1575,7 @@ return (0); encap_fail: - bus_dmamap_unload(sc->txtag, tx_buffer->map); + bus_dmamap_unload(sc->txtag, map); return (error); } @@ -2808,7 +2811,7 @@ MCLBYTES, /* maxsize */ 1, /* nsegments */ MCLBYTES, /* maxsegsize */ - BUS_DMA_ALLOCNOW, /* flags */ + 0, /* flags */ NULL, /* lockfunc */ NULL, /* lockarg */ &sc->rxtag); From owner-p4-projects@FreeBSD.ORG Wed Jul 26 22:37:38 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6EB3F16A4E2; Wed, 26 Jul 2006 22:37:38 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 9C01216A4DF for ; Wed, 26 Jul 2006 22:37:37 +0000 (UTC) (envelope-from cognet@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 4885943D55 for ; Wed, 26 Jul 2006 22:37:37 +0000 (GMT) (envelope-from cognet@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k6QMbbt0080001 for ; Wed, 26 Jul 2006 22:37:37 GMT (envelope-from cognet@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k6QMbZIM079998 for perforce@freebsd.org; Wed, 26 Jul 2006 22:37:35 GMT (envelope-from cognet@freebsd.org) Date: Wed, 26 Jul 2006 22:37:35 GMT Message-Id: <200607262237.k6QMbZIM079998@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to cognet@freebsd.org using -f From: Olivier Houchard To: Perforce Change Reviews Cc: Subject: PERFORCE change 102504 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 26 Jul 2006 22:37:38 -0000 http://perforce.freebsd.org/chv.cgi?CH=102504 Change 102504 by cognet@cognet on 2006/07/26 22:37:15 Bring in PCI IRQ routing support. Largely untested. Obtained from: NetBSD Affected files ... .. //depot/projects/arm/src/sys/arm/xscale/ixp425/files.avila#2 edit .. //depot/projects/arm/src/sys/arm/xscale/ixp425/ixdp425_pci.c#1 add .. //depot/projects/arm/src/sys/arm/xscale/ixp425/ixdp425reg.h#1 add .. //depot/projects/arm/src/sys/arm/xscale/ixp425/ixp425.c#8 edit .. //depot/projects/arm/src/sys/arm/xscale/ixp425/ixp425_pci.c#2 edit .. //depot/projects/arm/src/sys/arm/xscale/ixp425/ixp425var.h#4 edit Differences ... ==== //depot/projects/arm/src/sys/arm/xscale/ixp425/files.avila#2 (text+ko) ==== @@ -1,2 +1,3 @@ #$FreeBSD$ arm/xscale/ixp425/avila_machdep.c standard +arm/xscale/ixp425/ixdp425_pci.c optional pci ==== //depot/projects/arm/src/sys/arm/xscale/ixp425/ixp425.c#8 (text+ko) ==== @@ -103,11 +103,34 @@ return (0); } +static __inline u_int32_t +ixp425_irq2gpio_bit(int irq) +{ + + static const uint8_t int2gpio[32] __attribute__ ((aligned(32))) = { + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, /* INT#0 -> INT#5 */ + 0x00, 0x01, /* GPIO#0 -> GPIO#1 */ + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, /* INT#8 -> INT#13 */ + 0xff, 0xff, 0xff, 0xff, 0xff, /* INT#14 -> INT#18 */ + 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, /* GPIO#2 -> GPIO#7 */ + 0x08, 0x09, 0x0a, 0x0b, 0x0c, /* GPIO#8 -> GPIO#12 */ + 0xff, 0xff /* INT#30 -> INT#31 */ + }; + + return (1U << int2gpio[irq]); +} + void arm_mask_irq(uintptr_t nb) { intr_enabled &= ~(1 << nb); ixp425_set_intrmask(); + /*XXX; If it's a GPIO interrupt, ACK it know. Can it be a problem ?*/ + if ((1 << nb) & IXP425_INT_GPIOMASK) + IXPREG(IXP425_GPIO_VBASE + IXP425_GPIO_GPISR) = + ixp425_irq2gpio_bit(nb); + + } void @@ -206,6 +229,9 @@ device_add_child(dev, "pcib", 0); device_add_child(dev, "ixpclk", 0); + if (bus_space_map(sc->sc_iot, IXP425_GPIO_HWBASE, IXP425_GPIO_SIZE, + 0, &sc->sc_gpio_ioh)) + panic("ixp425_attach: unable to map GPIO registers"); bus_generic_probe(dev); bus_generic_attach(dev); ==== //depot/projects/arm/src/sys/arm/xscale/ixp425/ixp425_pci.c#2 (text+ko) ==== @@ -124,6 +124,7 @@ if (sc->sc_csr == NULL) panic("cannot allocate PCI CSR registers"); + ixp425_md_attach(dev); /* always setup the base, incase another OS messes w/ it */ PCI_CSR_WRITE_4(sc, PCI_PCIMEMBASE, 0x48494a4b); @@ -377,12 +378,10 @@ } static int -ixppcib_route_interrupt(device_t bridge, device_t dev, int pin) +ixppcib_route_interrupt(device_t bridge, device_t device, int pin) { - device_printf(bridge, "routing pin %d for %s\n", pin, - device_get_nameunit(dev)); - return (pin); + return (ixp425_md_route_interrupt(bridge, device, pin)); } static device_method_t ixppcib_methods[] = { ==== //depot/projects/arm/src/sys/arm/xscale/ixp425/ixp425var.h#4 (text+ko) ==== @@ -57,6 +57,7 @@ struct ixp425_softc { device_t sc_dev; bus_space_tag_t sc_iot; + bus_space_handle_t sc_gpio_ioh; u_int32_t sc_intrmask; @@ -85,4 +86,7 @@ uint32_t ixp425_sdram_size(void); +int ixp425_md_route_interrupt(device_t, device_t, int); +void ixp425_md_attach(device_t); + #endif /* _IXP425VAR_H_ */ From owner-p4-projects@FreeBSD.ORG Wed Jul 26 22:41:44 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 07B0416A4E0; Wed, 26 Jul 2006 22:41:44 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id BF92516A4DD for ; Wed, 26 Jul 2006 22:41:43 +0000 (UTC) (envelope-from cognet@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 88F1D43D4C for ; Wed, 26 Jul 2006 22:41:43 +0000 (GMT) (envelope-from cognet@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k6QMfhrs080278 for ; Wed, 26 Jul 2006 22:41:43 GMT (envelope-from cognet@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k6QMfh6U080275 for perforce@freebsd.org; Wed, 26 Jul 2006 22:41:43 GMT (envelope-from cognet@freebsd.org) Date: Wed, 26 Jul 2006 22:41:43 GMT Message-Id: <200607262241.k6QMfh6U080275@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to cognet@freebsd.org using -f From: Olivier Houchard To: Perforce Change Reviews Cc: Subject: PERFORCE change 102506 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 26 Jul 2006 22:41:44 -0000 http://perforce.freebsd.org/chv.cgi?CH=102506 Change 102506 by cognet@cognet on 2006/07/26 22:41:07 Move the IXP425 PCI IRQ rman initializaion to the MD code, since it knows which IRQ to use. Affected files ... .. //depot/projects/arm/src/sys/arm/xscale/ixp425/ixdp425_pci.c#2 edit .. //depot/projects/arm/src/sys/arm/xscale/ixp425/ixp425_pci.c#3 edit Differences ... ==== //depot/projects/arm/src/sys/arm/xscale/ixp425/ixdp425_pci.c#2 (text+ko) ==== @@ -101,6 +101,12 @@ /* PCI Reset deassert */ reg = GPIO_CONF_READ_4(sc, IXP425_GPIO_GPOUTR); GPIO_CONF_WRITE_4(sc, IXP425_GPIO_GPOUTR, reg | (1U << GPIO_PCI_RESET)); + sc->sc_irq_rman.rm_type = RMAN_ARRAY; + sc->sc_irq_rman.rm_descr = "IXP425 PCI IRQs"; + if (rman_init(&sc->sc_irq_rman) != 0 || + rman_manage_region(&sc->sc_irq_rman, PCI_INT_A, PCI_INT_D) != 0) + panic("ixp425_md_attach: failed to set up IRQ rman"); + } #define IXP425_MAX_DEV 4 ==== //depot/projects/arm/src/sys/arm/xscale/ixp425/ixp425_pci.c#3 (text+ko) ==== @@ -160,12 +160,6 @@ panic("ixppcib_probe: failed to set up memory rman"); } - sc->sc_irq_rman.rm_type = RMAN_ARRAY; - sc->sc_irq_rman.rm_descr = "IXP425 PCI IRQs"; - if (rman_init(&sc->sc_irq_rman) != 0 || - rman_manage_region(&sc->sc_irq_rman, 1, 5) != 0) - panic("ixppcib_probe: failed to set up IRQ rman"); - device_add_child(dev, "pci", -1); return (bus_generic_attach(dev)); From owner-p4-projects@FreeBSD.ORG Wed Jul 26 23:09:20 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 00E3116A4DF; Wed, 26 Jul 2006 23:09:20 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id B572716A4DD for ; Wed, 26 Jul 2006 23:09:19 +0000 (UTC) (envelope-from tyler@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 7FD6943D49 for ; Wed, 26 Jul 2006 23:09:19 +0000 (GMT) (envelope-from tyler@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k6QN9J8h082685 for ; Wed, 26 Jul 2006 23:09:19 GMT (envelope-from tyler@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k6QN9Js0082682 for perforce@freebsd.org; Wed, 26 Jul 2006 23:09:19 GMT (envelope-from tyler@freebsd.org) Date: Wed, 26 Jul 2006 23:09:19 GMT Message-Id: <200607262309.k6QN9Js0082682@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to tyler@freebsd.org using -f From: "R. Tyler Ballance" To: Perforce Change Reviews Cc: Subject: PERFORCE change 102508 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 26 Jul 2006 23:09:20 -0000 http://perforce.freebsd.org/chv.cgi?CH=102508 Change 102508 by tyler@orange on 2006/07/26 23:09:10 Merge changes to progress buildworld further along with TARGET=iguana Affected files ... .. //depot/projects/l4bsd/src/gnu/usr.bin/gdb/arch/iguana/Makefile#1 add .. //depot/projects/l4bsd/src/lib/libc/iguana/Makefile.inc#1 add .. //depot/projects/l4bsd/src/lib/libpthread/arch/iguana/Makefile.inc#1 add .. //depot/projects/l4bsd/src/lib/libthr/arch/iguana/Makefile.inc#1 add .. //depot/projects/l4bsd/src/lib/msun/iguana/Makefile.inc#1 add .. //depot/projects/l4bsd/src/share/mk/bsd.endian.mk#2 edit Differences ... ==== //depot/projects/l4bsd/src/share/mk/bsd.endian.mk#2 (text+ko) ==== @@ -4,6 +4,7 @@ ${MACHINE_ARCH} == "amd64" || \ ${MACHINE_ARCH} == "i386" || \ ${MACHINE_ARCH} == "ia64" || \ + ${MACHINE_ARCH} == "iguana" || \ (${MACHINE_ARCH} == "arm" && !defined(ARM_BIG_ENDIAN)) TARGET_ENDIANNESS= 1234 .elif ${MACHINE_ARCH} == "powerpc" || \ From owner-p4-projects@FreeBSD.ORG Thu Jul 27 02:14:16 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D57FB16A4E2; Thu, 27 Jul 2006 02:14:15 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 9875016A4DE for ; Thu, 27 Jul 2006 02:14:15 +0000 (UTC) (envelope-from kevlo@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 4984D43D4C for ; Thu, 27 Jul 2006 02:14:15 +0000 (GMT) (envelope-from kevlo@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k6R2EFeG002892 for ; Thu, 27 Jul 2006 02:14:15 GMT (envelope-from kevlo@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k6R2EFfc002889 for perforce@freebsd.org; Thu, 27 Jul 2006 02:14:15 GMT (envelope-from kevlo@freebsd.org) Date: Thu, 27 Jul 2006 02:14:15 GMT Message-Id: <200607270214.k6R2EFfc002889@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kevlo@freebsd.org using -f From: Kevin Lo To: Perforce Change Reviews Cc: Subject: PERFORCE change 102515 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 27 Jul 2006 02:14:16 -0000 http://perforce.freebsd.org/chv.cgi?CH=102515 Change 102515 by kevlo@kevlo_monet on 2006/07/27 02:13:50 1) GPIO[13] uses to generate the PCI reset. 2) Set active low on the GPIO pin chosen to drive the PCI reset signal. See IXP42x Developer's Manual section 6.12 and Operating Manual for GW2348-4 Network Processor Section 2.4. Affected files ... .. //depot/projects/arm/src/sys/arm/xscale/ixp425/ixdp425_pci.c#3 edit Differences ... ==== //depot/projects/arm/src/sys/arm/xscale/ixp425/ixdp425_pci.c#3 (text+ko) ==== @@ -60,10 +60,12 @@ /* PCI Reset Assert */ reg = GPIO_CONF_READ_4(sc, IXP425_GPIO_GPOUTR); + reg &= ~(1U << GPIO_PCI_RESET); GPIO_CONF_WRITE_4(sc, IXP425_GPIO_GPOUTR, reg & ~(1U << GPIO_PCI_RESET)); /* PCI Clock Disable */ reg = GPIO_CONF_READ_4(sc, IXP425_GPIO_GPCLKR); + reg &= ~GPCLKR_MUX14; GPIO_CONF_WRITE_4(sc, IXP425_GPIO_GPCLKR, reg & ~GPCLKR_MUX14); /* @@ -78,6 +80,30 @@ (1U << GPIO_PCI_INTC) | (1U << GPIO_PCI_INTD)); GPIO_CONF_WRITE_4(sc, IXP425_GPIO_GPOER, reg); + /* + * Set GPIO interrupt type + * PCI_INT_A, PCI_INTB, PCI_INT_C, PCI_INT_D: Active Low + */ + reg = GPIO_CONF_READ_4(sc, GPIO_TYPE_REG(GPIO_PCI_INTA)); + reg &= ~GPIO_TYPE(GPIO_PCI_INTA, GPIO_TYPE_MASK); + reg |= GPIO_TYPE(GPIO_PCI_INTA, GPIO_TYPE_ACT_LOW); + GPIO_CONF_WRITE_4(sc, GPIO_TYPE_REG(GPIO_PCI_INTA), reg); + + reg = GPIO_CONF_READ_4(sc, GPIO_TYPE_REG(GPIO_PCI_INTB)); + reg &= ~GPIO_TYPE(GPIO_PCI_INTB, GPIO_TYPE_MASK); + reg |= GPIO_TYPE(GPIO_PCI_INTB, GPIO_TYPE_ACT_LOW); + GPIO_CONF_WRITE_4(sc, GPIO_TYPE_REG(GPIO_PCI_INTB), reg); + + reg = GPIO_CONF_READ_4(sc, GPIO_TYPE_REG(GPIO_PCI_INTC)); + reg &= ~GPIO_TYPE(GPIO_PCI_INTC, GPIO_TYPE_MASK); + reg |= GPIO_TYPE(GPIO_PCI_INTC, GPIO_TYPE_ACT_LOW); + GPIO_CONF_WRITE_4(sc, GPIO_TYPE_REG(GPIO_PCI_INTC), reg); + + reg = GPIO_CONF_READ_4(sc, GPIO_TYPE_REG(GPIO_PCI_INTD)); + reg &= ~GPIO_TYPE(GPIO_PCI_INTD, GPIO_TYPE_MASK); + reg |= GPIO_TYPE(GPIO_PCI_INTD, GPIO_TYPE_ACT_LOW); + GPIO_CONF_WRITE_4(sc, GPIO_TYPE_REG(GPIO_PCI_INTD), reg); + /* clear ISR */ GPIO_CONF_WRITE_4(sc, IXP425_GPIO_GPISR, (1U << GPIO_PCI_INTA) | (1U << GPIO_PCI_INTB) | @@ -91,6 +117,7 @@ /* PCI Clock Enable */ reg = GPIO_CONF_READ_4(sc, IXP425_GPIO_GPCLKR); + reg |= GPCLKR_MUX14; GPIO_CONF_WRITE_4(sc, IXP425_GPIO_GPCLKR, reg | GPCLKR_MUX14); /* @@ -100,6 +127,7 @@ DELAY(100); /* PCI Reset deassert */ reg = GPIO_CONF_READ_4(sc, IXP425_GPIO_GPOUTR); + reg |= 1U << GPIO_PCI_RESET; GPIO_CONF_WRITE_4(sc, IXP425_GPIO_GPOUTR, reg | (1U << GPIO_PCI_RESET)); sc->sc_irq_rman.rm_type = RMAN_ARRAY; sc->sc_irq_rman.rm_descr = "IXP425 PCI IRQs"; From owner-p4-projects@FreeBSD.ORG Thu Jul 27 03:49:17 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4374C16A4E1; Thu, 27 Jul 2006 03:49:17 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 0599516A4DA for ; Thu, 27 Jul 2006 03:49:17 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id B40A443D5A for ; Thu, 27 Jul 2006 03:49:16 +0000 (GMT) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k6R3nGMX014522 for ; Thu, 27 Jul 2006 03:49:16 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k6R3nG0C014519 for perforce@freebsd.org; Thu, 27 Jul 2006 03:49:16 GMT (envelope-from sam@freebsd.org) Date: Thu, 27 Jul 2006 03:49:16 GMT Message-Id: <200607270349.k6R3nG0C014519@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 Cc: Subject: PERFORCE change 102516 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 27 Jul 2006 03:49:17 -0000 http://perforce.freebsd.org/chv.cgi?CH=102516 Change 102516 by sam@sam_ebb on 2006/07/27 03:48:58 remove extranous return Affected files ... .. //depot/projects/arm/src/sys/arm/xscale/ixp425/ixp425_pci.c#4 edit Differences ... ==== //depot/projects/arm/src/sys/arm/xscale/ixp425/ixp425_pci.c#4 (text+ko) ==== @@ -258,7 +258,6 @@ } return (rv); - return (NULL); } static int From owner-p4-projects@FreeBSD.ORG Thu Jul 27 03:54:32 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5262A16A4E2; Thu, 27 Jul 2006 03:54:32 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id E5B8A16A4DA for ; Thu, 27 Jul 2006 03:54:31 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id A2F0043D8E for ; Thu, 27 Jul 2006 03:54:23 +0000 (GMT) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k6R3sNH9014886 for ; Thu, 27 Jul 2006 03:54:23 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k6R3sNL2014883 for perforce@freebsd.org; Thu, 27 Jul 2006 03:54:23 GMT (envelope-from sam@freebsd.org) Date: Thu, 27 Jul 2006 03:54:23 GMT Message-Id: <200607270354.k6R3sNL2014883@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 Cc: Subject: PERFORCE change 102518 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 27 Jul 2006 03:54:32 -0000 http://perforce.freebsd.org/chv.cgi?CH=102518 Change 102518 by sam@sam_ebb on 2006/07/27 03:53:36 correct start+end order for pci irq's; something doesn't seem right though as the pci irq's overlap the full set of irq's setup elsewhere and we're using the same rman structure--maybe pci has it's own? Affected files ... .. //depot/projects/arm/src/sys/arm/xscale/ixp425/ixdp425_pci.c#4 edit Differences ... ==== //depot/projects/arm/src/sys/arm/xscale/ixp425/ixdp425_pci.c#4 (text+ko) ==== @@ -131,10 +131,11 @@ GPIO_CONF_WRITE_4(sc, IXP425_GPIO_GPOUTR, reg | (1U << GPIO_PCI_RESET)); sc->sc_irq_rman.rm_type = RMAN_ARRAY; sc->sc_irq_rman.rm_descr = "IXP425 PCI IRQs"; + CTASSERT(PCI_INT_D < PCI_INT_A); + /* XXX this overlaps the irq's setup in ixp425_attach */ if (rman_init(&sc->sc_irq_rman) != 0 || - rman_manage_region(&sc->sc_irq_rman, PCI_INT_A, PCI_INT_D) != 0) + rman_manage_region(&sc->sc_irq_rman, PCI_INT_D, PCI_INT_A) != 0) panic("ixp425_md_attach: failed to set up IRQ rman"); - } #define IXP425_MAX_DEV 4 From owner-p4-projects@FreeBSD.ORG Thu Jul 27 06:15:26 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id CA3EE16A4DF; Thu, 27 Jul 2006 06:15:25 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id A1DB316A4DD for ; Thu, 27 Jul 2006 06:15:25 +0000 (UTC) (envelope-from cdjones@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 5C33443D46 for ; Thu, 27 Jul 2006 06:15:25 +0000 (GMT) (envelope-from cdjones@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k6R6FPwD033423 for ; Thu, 27 Jul 2006 06:15:25 GMT (envelope-from cdjones@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k6R6FPrx033420 for perforce@freebsd.org; Thu, 27 Jul 2006 06:15:25 GMT (envelope-from cdjones@FreeBSD.org) Date: Thu, 27 Jul 2006 06:15:25 GMT Message-Id: <200607270615.k6R6FPrx033420@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to cdjones@FreeBSD.org using -f From: Chris Jones To: Perforce Change Reviews Cc: Subject: PERFORCE change 102525 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 27 Jul 2006 06:15:26 -0000 http://perforce.freebsd.org/chv.cgi?CH=102525 Change 102525 by cdjones@cdjones-impulse on 2006/07/27 06:14:36 Re-add sched_hier, as 4BSD (for now). Affected files ... .. //depot/projects/soc2006/cdjones_jail/src/sys/kern/sched_hier.c#5 add Differences ... From owner-p4-projects@FreeBSD.ORG Thu Jul 27 07:05:30 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 60DAD16A4E1; Thu, 27 Jul 2006 07:05:30 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 3C44A16A4DF for ; Thu, 27 Jul 2006 07:05:30 +0000 (UTC) (envelope-from cdjones@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id EC4EE43D55 for ; Thu, 27 Jul 2006 07:05:29 +0000 (GMT) (envelope-from cdjones@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k6R75THu038256 for ; Thu, 27 Jul 2006 07:05:29 GMT (envelope-from cdjones@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k6R75Tld038253 for perforce@freebsd.org; Thu, 27 Jul 2006 07:05:29 GMT (envelope-from cdjones@FreeBSD.org) Date: Thu, 27 Jul 2006 07:05:29 GMT Message-Id: <200607270705.k6R75Tld038253@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to cdjones@FreeBSD.org using -f From: Chris Jones To: Perforce Change Reviews Cc: Subject: PERFORCE change 102528 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 27 Jul 2006 07:05:30 -0000 http://perforce.freebsd.org/chv.cgi?CH=102528 Change 102528 by cdjones@cdjones-impulse on 2006/07/27 07:04:48 Branch conf to add kernel option for SCHED_HIER. Affected files ... .. //depot/projects/soc2006/cdjones_jail/src/sys/conf/Makefile.alpha#1 branch .. //depot/projects/soc2006/cdjones_jail/src/sys/conf/Makefile.amd64#1 branch .. //depot/projects/soc2006/cdjones_jail/src/sys/conf/Makefile.arm#1 branch .. //depot/projects/soc2006/cdjones_jail/src/sys/conf/Makefile.i386#1 branch .. //depot/projects/soc2006/cdjones_jail/src/sys/conf/Makefile.ia64#1 branch .. //depot/projects/soc2006/cdjones_jail/src/sys/conf/Makefile.pc98#1 branch .. //depot/projects/soc2006/cdjones_jail/src/sys/conf/Makefile.powerpc#1 branch .. //depot/projects/soc2006/cdjones_jail/src/sys/conf/Makefile.sparc64#1 branch .. //depot/projects/soc2006/cdjones_jail/src/sys/conf/NOTES#1 branch .. //depot/projects/soc2006/cdjones_jail/src/sys/conf/defines#1 branch .. //depot/projects/soc2006/cdjones_jail/src/sys/conf/files#1 branch .. //depot/projects/soc2006/cdjones_jail/src/sys/conf/files.alpha#1 branch .. //depot/projects/soc2006/cdjones_jail/src/sys/conf/files.amd64#1 branch .. //depot/projects/soc2006/cdjones_jail/src/sys/conf/files.arm#1 branch .. //depot/projects/soc2006/cdjones_jail/src/sys/conf/files.i386#1 branch .. //depot/projects/soc2006/cdjones_jail/src/sys/conf/files.ia64#1 branch .. //depot/projects/soc2006/cdjones_jail/src/sys/conf/files.pc98#1 branch .. //depot/projects/soc2006/cdjones_jail/src/sys/conf/files.powerpc#1 branch .. //depot/projects/soc2006/cdjones_jail/src/sys/conf/files.sparc64#1 branch .. //depot/projects/soc2006/cdjones_jail/src/sys/conf/kern.mk#1 branch .. //depot/projects/soc2006/cdjones_jail/src/sys/conf/kern.post.mk#1 branch .. //depot/projects/soc2006/cdjones_jail/src/sys/conf/kern.pre.mk#1 branch .. //depot/projects/soc2006/cdjones_jail/src/sys/conf/kmod.mk#1 branch .. //depot/projects/soc2006/cdjones_jail/src/sys/conf/kmod_syms.awk#1 branch .. //depot/projects/soc2006/cdjones_jail/src/sys/conf/ldscript.alpha#1 branch .. //depot/projects/soc2006/cdjones_jail/src/sys/conf/ldscript.amd64#1 branch .. //depot/projects/soc2006/cdjones_jail/src/sys/conf/ldscript.arm#1 branch .. //depot/projects/soc2006/cdjones_jail/src/sys/conf/ldscript.i386#1 branch .. //depot/projects/soc2006/cdjones_jail/src/sys/conf/ldscript.ia64#1 branch .. //depot/projects/soc2006/cdjones_jail/src/sys/conf/ldscript.powerpc#1 branch .. //depot/projects/soc2006/cdjones_jail/src/sys/conf/ldscript.sparc64#1 branch .. //depot/projects/soc2006/cdjones_jail/src/sys/conf/makeLINT.mk#1 branch .. //depot/projects/soc2006/cdjones_jail/src/sys/conf/makeLINT.sed#1 branch .. //depot/projects/soc2006/cdjones_jail/src/sys/conf/newvers.sh#1 branch .. //depot/projects/soc2006/cdjones_jail/src/sys/conf/options#1 branch .. //depot/projects/soc2006/cdjones_jail/src/sys/conf/options.alpha#1 branch .. //depot/projects/soc2006/cdjones_jail/src/sys/conf/options.amd64#1 branch .. //depot/projects/soc2006/cdjones_jail/src/sys/conf/options.arm#1 branch .. //depot/projects/soc2006/cdjones_jail/src/sys/conf/options.i386#1 branch .. //depot/projects/soc2006/cdjones_jail/src/sys/conf/options.ia64#1 branch .. //depot/projects/soc2006/cdjones_jail/src/sys/conf/options.pc98#1 branch .. //depot/projects/soc2006/cdjones_jail/src/sys/conf/options.powerpc#1 branch .. //depot/projects/soc2006/cdjones_jail/src/sys/conf/options.sparc64#1 branch .. //depot/projects/soc2006/cdjones_jail/src/sys/conf/systags.sh#1 branch .. //depot/projects/soc2006/cdjones_jail/src/sys/kern/kern_fork.c#5 edit .. //depot/projects/soc2006/cdjones_jail/src/sys/kern/kern_jail.c#11 edit .. //depot/projects/soc2006/cdjones_jail/src/sys/kern/sched_hier.c#6 edit .. //depot/projects/soc2006/cdjones_jail/src/sys/vm/vm_pageout.c#2 edit Differences ... ==== //depot/projects/soc2006/cdjones_jail/src/sys/kern/kern_fork.c#5 (text+ko) ==== ==== //depot/projects/soc2006/cdjones_jail/src/sys/kern/kern_jail.c#11 (text+ko) ==== @@ -116,6 +116,24 @@ kthread_exit(0); } +static void +jpager_td(void *arg) +{ + struct prison *pr; + pr = arg; + + for (;;) { + if (pr->pr_pager_flags & J_PAGER_TD_DIE) + break; + + /* TODO --- make interval into a sysctl? */ + tsleep(pr, 0, "-", hz); + } + + pr->pr_pager_flags = J_PAGER_TD_DEAD; + kthread_exit(0); +} + /* * MPSAFE * @@ -192,6 +210,11 @@ goto e_dropprref; KASSERT(j_sched_proc != NULL, ("NULL j_sched_proc")); pr->pr_scheduler = j_sched_proc; + pr->pr_pager_flags = J_PAGER_TD_ACTIVE; + if (kthread_create(jpager_td, pr, (void *) j_pager_proc, 0, 0, "jpager %d", pr->pr_id)) + goto e_dropprref; + KASSERT(j_pager_proc != NULL, ("NULL j_pager_proc")); + pr->pr_pager = j_pager_proc; /* TODO #endif */ error = jail_attach(td, &jaa); ==== //depot/projects/soc2006/cdjones_jail/src/sys/kern/sched_hier.c#6 (text+ko) ==== ==== //depot/projects/soc2006/cdjones_jail/src/sys/vm/vm_pageout.c#2 (text+ko) ==== From owner-p4-projects@FreeBSD.ORG Thu Jul 27 07:10:37 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id AFC5616A4DF; Thu, 27 Jul 2006 07:10:37 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 72CB616A4DD for ; Thu, 27 Jul 2006 07:10:37 +0000 (UTC) (envelope-from cdjones@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 3F89443D46 for ; Thu, 27 Jul 2006 07:10:37 +0000 (GMT) (envelope-from cdjones@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k6R7AbbJ038478 for ; Thu, 27 Jul 2006 07:10:37 GMT (envelope-from cdjones@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k6R7AauJ038474 for perforce@freebsd.org; Thu, 27 Jul 2006 07:10:36 GMT (envelope-from cdjones@FreeBSD.org) Date: Thu, 27 Jul 2006 07:10:36 GMT Message-Id: <200607270710.k6R7AauJ038474@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to cdjones@FreeBSD.org using -f From: Chris Jones To: Perforce Change Reviews Cc: Subject: PERFORCE change 102529 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 27 Jul 2006 07:10:38 -0000 http://perforce.freebsd.org/chv.cgi?CH=102529 Change 102529 by cdjones@cdjones-impulse on 2006/07/27 07:10:35 Add hooks to support SCHED_HIER at kernel compile time. Affected files ... .. //depot/projects/soc2006/cdjones_jail/src/sys/conf/NOTES#2 edit .. //depot/projects/soc2006/cdjones_jail/src/sys/conf/files#2 edit .. //depot/projects/soc2006/cdjones_jail/src/sys/conf/options#2 edit Differences ... ==== //depot/projects/soc2006/cdjones_jail/src/sys/conf/NOTES#2 (text+ko) ==== @@ -171,7 +171,11 @@ # advantages for UP as well. It is intended to replace the 4BSD scheduler # over time. # +# SCHED_HIER is an experimental scheduler intended to allow CPU share +# limiting for jails. +# options SCHED_4BSD +#options SCHED_HIER #options SCHED_ULE ##################################################################### ==== //depot/projects/soc2006/cdjones_jail/src/sys/conf/files#2 (text+ko) ==== @@ -1287,6 +1287,7 @@ kern/md4c.c optional netsmb kern/md5c.c standard kern/sched_4bsd.c optional sched_4bsd +kern/sched_hier.c optional sched_hier kern/sched_ule.c optional sched_ule kern/subr_autoconf.c standard kern/subr_blist.c standard ==== //depot/projects/soc2006/cdjones_jail/src/sys/conf/options#2 (text+ko) ==== @@ -126,6 +126,7 @@ PUC_FASTINTR opt_puc.h QUOTA SCHED_4BSD opt_sched.h +SCHED_HIER opt_sched.h SCHED_ULE opt_sched.h SHOW_BUSYBUFS SLEEPQUEUE_PROFILING From owner-p4-projects@FreeBSD.ORG Thu Jul 27 08:19:07 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6C7B716A4E2; Thu, 27 Jul 2006 08:19:07 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 474E016A4DA for ; Thu, 27 Jul 2006 08:19:07 +0000 (UTC) (envelope-from cdjones@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 12C1843D53 for ; Thu, 27 Jul 2006 08:19:07 +0000 (GMT) (envelope-from cdjones@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k6R8J6vD043613 for ; Thu, 27 Jul 2006 08:19:06 GMT (envelope-from cdjones@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k6R8J6PR043608 for perforce@freebsd.org; Thu, 27 Jul 2006 08:19:06 GMT (envelope-from cdjones@FreeBSD.org) Date: Thu, 27 Jul 2006 08:19:06 GMT Message-Id: <200607270819.k6R8J6PR043608@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to cdjones@FreeBSD.org using -f From: Chris Jones To: Perforce Change Reviews Cc: Subject: PERFORCE change 102534 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 27 Jul 2006 08:19:07 -0000 http://perforce.freebsd.org/chv.cgi?CH=102534 Change 102534 by cdjones@cdjones-impulse on 2006/07/27 08:18:58 Fix silly errors in adding the pager process. Affected files ... .. //depot/projects/soc2006/cdjones_jail/src/sys/kern/kern_jail.c#12 edit .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/jail.h#12 edit Differences ... ==== //depot/projects/soc2006/cdjones_jail/src/sys/kern/kern_jail.c#12 (text+ko) ==== @@ -149,6 +149,7 @@ struct jail j; struct jail_attach_args jaa; struct proc *j_sched_proc = NULL; + struct proc *j_pager_proc = NULL; int vfslocked, error, tryprid; error = copyin(uap->jail, &j, sizeof(j)); ==== //depot/projects/soc2006/cdjones_jail/src/sys/sys/jail.h#12 (text+ko) ==== @@ -46,6 +46,10 @@ #define J_SCHED_TD_DIE 0x02 #define J_SCHED_TD_DEAD 0x04 +#define J_PAGER_TD_ACTIVE 0x01 +#define J_PAGER_TD_DIE 0x02 +#define J_PAGER_TD_DEAD 0x04 + #ifndef _KERNEL int jail(struct jail *); @@ -98,6 +102,8 @@ unsigned int pr_priority; /* (p) jail priority */ struct proc *pr_scheduler; /* (c) scheduler pid */ int pr_scheduler_flags; /* (p) communication to scheduler */ + struct proc *pr_pager; /* (c) pager pid */ + int pr_pager_flags; /* (p) communication to pager */ size_t pr_mem_limit; /* (p) memory allocation limit */ size_t pr_mem_usage; /* (p) memory in use */ }; From owner-p4-projects@FreeBSD.ORG Thu Jul 27 08:38:32 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id EB0C916A4E5; Thu, 27 Jul 2006 08:38:31 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id BCDB916A4DE for ; Thu, 27 Jul 2006 08:38:31 +0000 (UTC) (envelope-from cdjones@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 6F65843D46 for ; Thu, 27 Jul 2006 08:38:31 +0000 (GMT) (envelope-from cdjones@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k6R8cVTK044538 for ; Thu, 27 Jul 2006 08:38:31 GMT (envelope-from cdjones@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k6R8cV8j044535 for perforce@freebsd.org; Thu, 27 Jul 2006 08:38:31 GMT (envelope-from cdjones@FreeBSD.org) Date: Thu, 27 Jul 2006 08:38:31 GMT Message-Id: <200607270838.k6R8cV8j044535@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to cdjones@FreeBSD.org using -f From: Chris Jones To: Perforce Change Reviews Cc: Subject: PERFORCE change 102535 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 27 Jul 2006 08:38:32 -0000 http://perforce.freebsd.org/chv.cgi?CH=102535 Change 102535 by cdjones@cdjones-impulse on 2006/07/27 08:37:54 Refactor to pass prison structures to _memory and _memory_limit. Affected files ... .. //depot/projects/soc2006/cdjones_jail/src/sys/kern/kern_jail.c#13 edit .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/jail.h#13 edit Differences ... ==== //depot/projects/soc2006/cdjones_jail/src/sys/kern/kern_jail.c#13 (text+ko) ==== @@ -126,6 +126,11 @@ if (pr->pr_pager_flags & J_PAGER_TD_DIE) break; + if (prison_memory(pr) > prison_memory_limit(pr)) { + /* the logic from vm_daemon() really needs to go here. + TODO: refactor vm_daemon to optionally act on specific jails. */ + } + /* TODO --- make interval into a sysctl? */ tsleep(pr, 0, "-", hz); } @@ -458,7 +463,7 @@ /* Given credential, return memory usage in bytes. */ int -prison_memory(struct ucred *cred) +prison_memory(struct prison *pr) { struct proc *p; u_int mem_used = 0; @@ -466,7 +471,7 @@ /* TODO: cut this to search only procs in given jail. */ FOREACH_PROC_IN_SYSTEM(p) { if (!jailed(p->p_ucred) || - (cred->cr_prison != p->p_ucred->cr_prison)) { + (pr != p->p_ucred->cr_prison)) { continue; } @@ -479,17 +484,17 @@ /* Convert to bytes, cache (maybe unncessary?). */ mem_used *= PAGE_SIZE; - mtx_lock(&cred->cr_prison->pr_mtx); - cred->cr_prison->pr_mem_usage = mem_used; - mtx_unlock(&cred->cr_prison->pr_mtx); + mtx_lock(&pr->pr_mtx); + pr->pr_mem_usage = mem_used; + mtx_unlock(&pr->pr_mtx); return mem_used; } /* Given credential, return permitted memory usage in bytes. */ int -prison_memory_limit(struct ucred *cred) +prison_memory_limit(struct prison *pr) { - return cred->cr_prison->pr_mem_limit; + return pr->pr_mem_limit; } /* ==== //depot/projects/soc2006/cdjones_jail/src/sys/sys/jail.h#13 (text+ko) ==== @@ -143,8 +143,8 @@ void prison_hold(struct prison *pr); int prison_if(struct ucred *cred, struct sockaddr *sa); int prison_ip(struct ucred *cred, int flag, u_int32_t *ip); -int prison_memory(struct ucred *cred); -int prison_memory_limit(struct ucred *cred); +int prison_memory(struct prison *pr); +int prison_memory_limit(struct prison *pr); void prison_remote_ip(struct ucred *cred, int flags, u_int32_t *ip); #endif /* _KERNEL */ From owner-p4-projects@FreeBSD.ORG Thu Jul 27 09:14:18 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 74CD316A4DE; Thu, 27 Jul 2006 09:14:18 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 096BD16A4DD for ; Thu, 27 Jul 2006 09:14:18 +0000 (UTC) (envelope-from piso@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id A6C1643D46 for ; Thu, 27 Jul 2006 09:14:17 +0000 (GMT) (envelope-from piso@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k6R9EHws055292 for ; Thu, 27 Jul 2006 09:14:17 GMT (envelope-from piso@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k6R9EGu1055289 for perforce@freebsd.org; Thu, 27 Jul 2006 09:14:16 GMT (envelope-from piso@freebsd.org) Date: Thu, 27 Jul 2006 09:14:16 GMT Message-Id: <200607270914.k6R9EGu1055289@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to piso@freebsd.org using -f From: Paolo Pisati To: Perforce Change Reviews Cc: Subject: PERFORCE change 102537 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 27 Jul 2006 09:14:18 -0000 http://perforce.freebsd.org/chv.cgi?CH=102537 Change 102537 by piso@piso_newluxor on 2006/07/27 09:13:16 IFC Affected files ... .. //depot/projects/soc2005/libalias/lib/libc/gen/tls.c#2 integrate .. //depot/projects/soc2005/libalias/lib/libc/stdlib/malloc.c#3 integrate .. //depot/projects/soc2005/libalias/lib/libfetch/Makefile#2 integrate .. //depot/projects/soc2005/libalias/lib/libftpio/Makefile#2 integrate .. //depot/projects/soc2005/libalias/sys/conf/files.powerpc#2 integrate .. //depot/projects/soc2005/libalias/sys/dev/em/if_em.c#3 integrate .. //depot/projects/soc2005/libalias/sys/dev/sk/if_sk.c#3 integrate .. //depot/projects/soc2005/libalias/sys/dev/sk/if_skreg.h#3 integrate .. //depot/projects/soc2005/libalias/sys/dev/uart/uart_tty.c#2 integrate .. //depot/projects/soc2005/libalias/sys/kern/uipc_usrreq.c#3 integrate .. //depot/projects/soc2005/libalias/sys/modules/Makefile#3 integrate .. //depot/projects/soc2005/libalias/sys/modules/bridgestp/Makefile#1 branch .. //depot/projects/soc2005/libalias/sys/modules/if_bridge/Makefile#2 integrate .. //depot/projects/soc2005/libalias/sys/net/if_bridge.c#3 integrate .. //depot/projects/soc2005/libalias/sys/net/if_ethersubr.c#2 integrate .. //depot/projects/soc2005/libalias/sys/net/if_gif.c#3 integrate .. //depot/projects/soc2005/libalias/sys/netgraph/ng_ether.c#2 integrate .. //depot/projects/soc2005/libalias/sys/powerpc/psim/sio_iobus.c#2 delete .. //depot/projects/soc2005/libalias/sys/powerpc/psim/uart_iobus.c#1 branch .. //depot/projects/soc2005/libalias/tools/tools/nanobsd/FlashDevice.sub#2 integrate Differences ... ==== //depot/projects/soc2005/libalias/lib/libc/gen/tls.c#2 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/lib/libc/gen/tls.c,v 1.9 2006/03/28 06:06:38 davidxu Exp $ + * $FreeBSD: src/lib/libc/gen/tls.c,v 1.10 2006/07/26 16:56:56 imp Exp $ */ /* @@ -40,8 +40,6 @@ #include "libc_private.h" -/* XXX not sure what variants to use for arm. */ - __weak_reference(__libc_allocate_tls, _rtld_allocate_tls); __weak_reference(__libc_free_tls, _rtld_free_tls); ==== //depot/projects/soc2005/libalias/lib/libc/stdlib/malloc.c#3 (text+ko) ==== @@ -185,7 +185,7 @@ #endif #include -__FBSDID("$FreeBSD: src/lib/libc/stdlib/malloc.c,v 1.129 2006/07/01 16:51:10 jasone Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/stdlib/malloc.c,v 1.130 2006/07/27 04:00:12 jasone Exp $"); #include "libc_private.h" #ifdef MALLOC_DEBUG @@ -835,15 +835,13 @@ static arena_chunk_t *arena_chunk_alloc(arena_t *arena); static void arena_chunk_dealloc(arena_chunk_t *chunk); static void arena_bin_run_promote(arena_t *arena, arena_bin_t *bin, - arena_run_t *run, size_t size); + arena_run_t *run); static void arena_bin_run_demote(arena_t *arena, arena_bin_t *bin, - arena_run_t *run, size_t size); + arena_run_t *run); static arena_run_t *arena_run_alloc(arena_t *arena, bool large, size_t size); static void arena_run_dalloc(arena_t *arena, arena_run_t *run, size_t size); -static arena_run_t *arena_bin_nonfull_run_get(arena_t *arena, arena_bin_t *bin, - size_t size); -static void *arena_bin_malloc_hard(arena_t *arena, arena_bin_t *bin, - size_t size); +static arena_run_t *arena_bin_nonfull_run_get(arena_t *arena, arena_bin_t *bin); +static void *arena_bin_malloc_hard(arena_t *arena, arena_bin_t *bin); static void *arena_malloc(arena_t *arena, size_t size); static size_t arena_salloc(const void *ptr); static void *arena_ralloc(void *ptr, size_t size, size_t oldsize); @@ -1778,8 +1776,7 @@ } static void -arena_bin_run_promote(arena_t *arena, arena_bin_t *bin, arena_run_t *run, - size_t size) +arena_bin_run_promote(arena_t *arena, arena_bin_t *bin, arena_run_t *run) { assert(bin == run->bin); @@ -1850,8 +1847,7 @@ } static void -arena_bin_run_demote(arena_t *arena, arena_bin_t *bin, arena_run_t *run, - size_t size) +arena_bin_run_demote(arena_t *arena, arena_bin_t *bin, arena_run_t *run) { assert(bin == run->bin); @@ -2057,7 +2053,7 @@ } static arena_run_t * -arena_bin_nonfull_run_get(arena_t *arena, arena_bin_t *bin, size_t size) +arena_bin_nonfull_run_get(arena_t *arena, arena_bin_t *bin) { arena_run_t *run; unsigned i, remainder; @@ -2118,8 +2114,7 @@ /* bin->runcur must have space available before this function is called. */ static inline void * -arena_bin_malloc_easy(arena_t *arena, arena_bin_t *bin, arena_run_t *run, - size_t size) +arena_bin_malloc_easy(arena_t *arena, arena_bin_t *bin, arena_run_t *run) { void *ret; @@ -2131,7 +2126,7 @@ run->nfree--; if (run->nfree < run->free_min) { /* Promote run to higher fullness quartile. */ - arena_bin_run_promote(arena, bin, run, size); + arena_bin_run_promote(arena, bin, run); } return (ret); @@ -2139,18 +2134,18 @@ /* Re-fill bin->runcur, then call arena_bin_malloc_easy(). */ static void * -arena_bin_malloc_hard(arena_t *arena, arena_bin_t *bin, size_t size) +arena_bin_malloc_hard(arena_t *arena, arena_bin_t *bin) { assert(bin->runcur == NULL || bin->runcur->quartile == RUN_Q100); - bin->runcur = arena_bin_nonfull_run_get(arena, bin, size); + bin->runcur = arena_bin_nonfull_run_get(arena, bin); if (bin->runcur == NULL) return (NULL); assert(bin->runcur->magic == ARENA_RUN_MAGIC); assert(bin->runcur->nfree > 0); - return (arena_bin_malloc_easy(arena, bin, bin->runcur, size)); + return (arena_bin_malloc_easy(arena, bin, bin->runcur)); } static void * @@ -2173,10 +2168,11 @@ /* Tiny. */ size = pow2_ceil(size); bin = &arena->bins[ffs(size >> (tiny_min_2pow + 1))]; -#ifdef MALLOC_STATS +#if (!defined(NDEBUG) || defined(MALLOC_STATS)) /* - * Bin calculation is always correct, but we may need to - * fix size for the purposes of stats accuracy. + * Bin calculation is always correct, but we may need + * to fix size for the purposes of assertions and/or + * stats accuracy. */ if (size < (1 << tiny_min_2pow)) size = (1 << tiny_min_2pow); @@ -2196,9 +2192,9 @@ malloc_mutex_lock(&arena->mtx); if ((run = bin->runcur) != NULL) - ret = arena_bin_malloc_easy(arena, bin, run, size); + ret = arena_bin_malloc_easy(arena, bin, run); else - ret = arena_bin_malloc_hard(arena, bin, size); + ret = arena_bin_malloc_hard(arena, bin); #ifdef MALLOC_STATS bin->stats.nrequests++; @@ -2343,7 +2339,7 @@ run->nfree++; if (run->nfree > run->free_max) { /* Demote run to lower fullness quartile. */ - arena_bin_run_demote(arena, bin, run, size); + arena_bin_run_demote(arena, bin, run); } } else { /* Medium allocation. */ ==== //depot/projects/soc2005/libalias/lib/libfetch/Makefile#2 (text+ko) ==== @@ -1,16 +1,19 @@ -# $FreeBSD: src/lib/libfetch/Makefile,v 1.46 2006/03/17 18:54:26 ru Exp $ +# $FreeBSD: src/lib/libfetch/Makefile,v 1.47 2006/07/27 04:54:03 yar Exp $ .include LIB= fetch CFLAGS+= -I. -CFLAGS+= -DINET6 SRCS= fetch.c common.c ftp.c http.c file.c \ ftperr.h httperr.h INCS= fetch.h MAN= fetch.3 CLEANFILES= ftperr.h httperr.h +.if ${MK_INET6_SUPPORT} != "no" +CFLAGS+= -DINET6 +.endif + .if ${MK_OPENSSL} != "no" CFLAGS+= -DWITH_SSL DPADD= ${LIBSSL} ${LIBCRYPTO} ==== //depot/projects/soc2005/libalias/lib/libftpio/Makefile#2 (text+ko) ==== @@ -1,4 +1,6 @@ -# $FreeBSD: src/lib/libftpio/Makefile,v 1.14 2005/07/22 17:19:01 kensmith Exp $ +# $FreeBSD: src/lib/libftpio/Makefile,v 1.15 2006/07/27 04:54:03 yar Exp $ + +.include LIB= ftpio SHLIB_MAJOR= 6 @@ -6,10 +8,13 @@ SRCS= ftpio.c ftperr.c INCS= ftpio.h CFLAGS+= -I${.CURDIR} -Wall -CFLAGS+= -DINET6 MAN= ftpio.3 CLEANFILES= ftperr.c +.if ${MK_INET6_SUPPORT} != "no" +CFLAGS+= -DINET6 +.endif + ftperr.c: ftp.errors @echo '#include ' > ${.TARGET} @echo '#include "ftpio.h"' >> ${.TARGET} ==== //depot/projects/soc2005/libalias/sys/conf/files.powerpc#2 (text+ko) ==== @@ -1,7 +1,7 @@ # This file tells config what files go into building a kernel, # files marked standard are always included. # -# $FreeBSD: src/sys/conf/files.powerpc,v 1.54 2006/06/08 23:38:01 sam Exp $ +# $FreeBSD: src/sys/conf/files.powerpc,v 1.56 2006/07/26 19:44:42 marcel Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -125,8 +125,6 @@ powerpc/psim/iobus.c optional psim powerpc/psim/ata_iobus.c optional ata psim powerpc/psim/openpic_iobus.c optional psim -powerpc/psim/sio_iobus.c optional sio psim +powerpc/psim/uart_iobus.c optional uart psim dev/scc/scc_bfe_macio.c optional scc powermac -dev/zs/zs.c optional powermac zs -dev/zs/zs_macio.c optional powermac zs ==== //depot/projects/soc2005/libalias/sys/dev/em/if_em.c#3 (text+ko) ==== @@ -31,7 +31,7 @@ ***************************************************************************/ -/*$FreeBSD: src/sys/dev/em/if_em.c,v 1.119 2006/07/20 04:18:45 yongari Exp $*/ +/*$FreeBSD: src/sys/dev/em/if_em.c,v 1.122 2006/07/27 00:43:34 yongari Exp $*/ #ifdef HAVE_KERNEL_OPTION_HEADERS #include "opt_device_polling.h" @@ -1388,13 +1388,13 @@ struct ifnet *ifp = sc->ifp; bus_dma_segment_t segs[EM_MAX_SCATTER]; bus_dmamap_t map; - struct em_buffer *tx_buffer; + struct em_buffer *tx_buffer, *tx_buffer_last; struct em_tx_desc *current_tx_desc; struct mbuf *m_head; struct m_tag *mtag; uint32_t txd_upper, txd_lower, txd_used, txd_saved; int nsegs, i, j; - int error = 0; + int error; m_head = *m_headp; current_tx_desc = NULL; @@ -1412,30 +1412,6 @@ } } - /* - * Map the packet for DMA. - */ - tx_buffer = &sc->tx_buffer_area[sc->next_avail_tx_desc]; - error = bus_dmamap_load_mbuf_sg(sc->txtag, tx_buffer->map, m_head, - segs, &nsegs, BUS_DMA_NOWAIT); - map = tx_buffer->map; - if (error != 0) { - sc->no_tx_dma_setup++; - return (error); - } - KASSERT(nsegs != 0, ("em_encap: empty packet")); - - if (nsegs > sc->num_tx_desc_avail) { - sc->no_tx_desc_avail2++; - error = ENOBUFS; - goto encap_fail; - } - - if (ifp->if_hwassist > 0) - em_transmit_checksum_setup(sc, m_head, &txd_upper, &txd_lower); - else - txd_upper = txd_lower = 0; - /* Find out if we are in vlan mode. */ mtag = VLAN_OUTPUT_TAG(ifp, m_head); @@ -1452,21 +1428,18 @@ m_head = m_pullup(m_head, sizeof(eh)); if (m_head == NULL) { *m_headp = NULL; - error = ENOBUFS; - goto encap_fail; + return (ENOBUFS); } eh = *mtod(m_head, struct ether_header *); M_PREPEND(m_head, sizeof(*evl), M_DONTWAIT); if (m_head == NULL) { *m_headp = NULL; - error = ENOBUFS; - goto encap_fail; + return (ENOBUFS); } m_head = m_pullup(m_head, sizeof(*evl)); if (m_head == NULL) { *m_headp = NULL; - error = ENOBUFS; - goto encap_fail; + return (ENOBUFS); } evl = mtod(m_head, struct ether_vlan_header *); bcopy(&eh, evl, sizeof(*evl)); @@ -1478,6 +1451,31 @@ *m_headp = m_head; } + /* + * Map the packet for DMA. + */ + tx_buffer = &sc->tx_buffer_area[sc->next_avail_tx_desc]; + tx_buffer_last = tx_buffer; + map = tx_buffer->map; + error = bus_dmamap_load_mbuf_sg(sc->txtag, map, m_head, segs, &nsegs, + BUS_DMA_NOWAIT); + if (error != 0) { + sc->no_tx_dma_setup++; + return (error); + } + KASSERT(nsegs != 0, ("em_encap: empty packet")); + + if (nsegs > sc->num_tx_desc_avail) { + sc->no_tx_desc_avail2++; + error = ENOBUFS; + goto encap_fail; + } + + if (ifp->if_hwassist > 0) + em_transmit_checksum_setup(sc, m_head, &txd_upper, &txd_lower); + else + txd_upper = txd_lower = 0; + i = sc->next_avail_tx_desc; if (sc->pcix_82544) { txd_saved = i; @@ -1548,6 +1546,8 @@ } tx_buffer->m_head = m_head; + tx_buffer_last->map = tx_buffer->map; + tx_buffer->map = map; bus_dmamap_sync(sc->txtag, map, BUS_DMASYNC_PREWRITE); /* @@ -1572,7 +1572,7 @@ return (0); encap_fail: - bus_dmamap_unload(sc->txtag, tx_buffer->map); + bus_dmamap_unload(sc->txtag, map); return (error); } @@ -2808,7 +2808,7 @@ MCLBYTES, /* maxsize */ 1, /* nsegments */ MCLBYTES, /* maxsegsize */ - BUS_DMA_ALLOCNOW, /* flags */ + 0, /* flags */ NULL, /* lockfunc */ NULL, /* lockarg */ &sc->rxtag); ==== //depot/projects/soc2005/libalias/sys/dev/sk/if_sk.c#3 (text) ==== @@ -48,7 +48,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/sk/if_sk.c,v 1.127 2006/07/19 04:12:59 yongari Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/sk/if_sk.c,v 1.128 2006/07/27 05:06:43 yongari Exp $"); /* * SysKonnect SK-NET gigabit ethernet driver for FreeBSD. Supports @@ -140,7 +140,7 @@ #ifndef lint static const char rcsid[] = - "$FreeBSD: src/sys/dev/sk/if_sk.c,v 1.127 2006/07/19 04:12:59 yongari Exp $"; + "$FreeBSD: src/sys/dev/sk/if_sk.c,v 1.128 2006/07/27 05:06:43 yongari Exp $"; #endif static struct sk_type sk_devs[] = { @@ -193,7 +193,12 @@ }, { VENDORID_DLINK, - DEVICEID_DLINK_DGE530T, + DEVICEID_DLINK_DGE530T_A1, + "D-Link DGE-530T Gigabit Ethernet" + }, + { + VENDORID_DLINK, + DEVICEID_DLINK_DGE530T_B1, "D-Link DGE-530T Gigabit Ethernet" }, { 0, 0, NULL } @@ -1805,7 +1810,8 @@ case DEVICEID_BELKIN_5005: case DEVICEID_3COM_3C940: case DEVICEID_LINKSYS_EG1032: - case DEVICEID_DLINK_DGE530T: + case DEVICEID_DLINK_DGE530T_A1: + case DEVICEID_DLINK_DGE530T_B1: /* Stay with VPD PN. */ pname = sc->sk_vpd_prodname; break; ==== //depot/projects/soc2005/libalias/sys/dev/sk/if_skreg.h#3 (text) ==== @@ -31,7 +31,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/sk/if_skreg.h,v 1.37 2006/07/19 04:12:59 yongari Exp $ + * $FreeBSD: src/sys/dev/sk/if_skreg.h,v 1.38 2006/07/27 05:06:43 yongari Exp $ */ /*- @@ -133,7 +133,8 @@ /* * D-Link gigabit ethernet device ID */ -#define DEVICEID_DLINK_DGE530T 0x4c00 +#define DEVICEID_DLINK_DGE530T_A1 0x4c00 +#define DEVICEID_DLINK_DGE530T_B1 0x4b01 /* * GEnesis registers. The GEnesis chip has a 256-byte I/O window ==== //depot/projects/soc2005/libalias/sys/dev/uart/uart_tty.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/uart/uart_tty.c,v 1.28 2006/05/26 13:53:31 phk Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/uart/uart_tty.c,v 1.29 2006/07/27 00:07:10 marcel Exp $"); #include #include @@ -313,6 +313,8 @@ c = xc & 0xff; if (xc & UART_STAT_FRAMERR) c |= TTY_FE; + if (xc & UART_STAT_OVERRUN) + c |= TTY_OE; if (xc & UART_STAT_PARERR) c |= TTY_PE; ttyld_rint(tp, c); ==== //depot/projects/soc2005/libalias/sys/kern/uipc_usrreq.c#3 (text+ko) ==== @@ -50,7 +50,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/uipc_usrreq.c,v 1.181 2006/07/24 15:20:07 rwatson Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/uipc_usrreq.c,v 1.182 2006/07/26 19:16:34 rwatson Exp $"); #include "opt_mac.h" @@ -443,7 +443,6 @@ struct unpcb *ref = LIST_FIRST(&unp->unp_refs); unp_drop(ref, ECONNRESET); } - soisdisconnected(unp->unp_socket); unp->unp_socket->so_pcb = NULL; local_unp_rights = unp_rights; UNP_UNLOCK(); ==== //depot/projects/soc2005/libalias/sys/modules/Makefile#3 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/modules/Makefile,v 1.503 2006/07/25 00:45:54 yongari Exp $ +# $FreeBSD: src/sys/modules/Makefile,v 1.504 2006/07/26 22:10:10 thompsa Exp $ .include @@ -38,6 +38,7 @@ bge \ ${_bios} \ ${_bktr} \ + bridgestp \ cam \ ${_canbepm} \ ${_canbus} \ ==== //depot/projects/soc2005/libalias/sys/modules/if_bridge/Makefile#2 (text+ko) ==== @@ -1,10 +1,10 @@ -# $FreeBSD: src/sys/modules/if_bridge/Makefile,v 1.5 2006/06/08 23:40:16 thompsa Exp $ +# $FreeBSD: src/sys/modules/if_bridge/Makefile,v 1.6 2006/07/26 22:15:14 thompsa Exp $ .include .PATH: ${.CURDIR}/../../net KMOD= if_bridge -SRCS= if_bridge.c bridgestp.c opt_inet.h opt_inet6.h opt_carp.h +SRCS= if_bridge.c opt_inet.h opt_inet6.h opt_carp.h .if !defined(KERNBUILDDIR) opt_inet.h: ==== //depot/projects/soc2005/libalias/sys/net/if_bridge.c#3 (text+ko) ==== @@ -80,7 +80,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/net/if_bridge.c,v 1.69 2006/07/26 10:45:38 thompsa Exp $"); +__FBSDID("$FreeBSD: src/sys/net/if_bridge.c,v 1.71 2006/07/26 22:15:15 thompsa Exp $"); #include "opt_inet.h" #include "opt_inet6.h" @@ -404,6 +404,7 @@ }; DECLARE_MODULE(if_bridge, bridge_mod, SI_SUB_PSEUDO, SI_ORDER_ANY); +MODULE_DEPEND(if_bridge, bridgestp, 1, 1, 1); /* * handler for net.link.bridge.pfil_ipfw @@ -461,11 +462,6 @@ sc->sc_brtmax = BRIDGE_RTABLE_MAX; sc->sc_brttimeout = BRIDGE_RTABLE_TIMEOUT; - sc->sc_stp.bs_bridge_max_age = BSTP_DEFAULT_MAX_AGE; - sc->sc_stp.bs_bridge_hello_time = BSTP_DEFAULT_HELLO_TIME; - sc->sc_stp.bs_bridge_forward_delay = BSTP_DEFAULT_FORWARD_DELAY; - sc->sc_stp.bs_bridge_priority = BSTP_DEFAULT_BRIDGE_PRIORITY; - sc->sc_stp.bs_hold_time = BSTP_DEFAULT_HOLD_TIME; /* Initialize our routing table. */ bridge_rtable_init(sc); ==== //depot/projects/soc2005/libalias/sys/net/if_ethersubr.c#2 (text+ko) ==== @@ -27,7 +27,7 @@ * SUCH DAMAGE. * * @(#)if_ethersubr.c 8.1 (Berkeley) 6/10/93 - * $FreeBSD: src/sys/net/if_ethersubr.c,v 1.215 2006/03/03 17:21:08 csjp Exp $ + * $FreeBSD: src/sys/net/if_ethersubr.c,v 1.216 2006/07/27 03:50:38 avatar Exp $ */ #include "opt_atalk.h" @@ -59,6 +59,7 @@ #include #include #include +#include #include #include ==== //depot/projects/soc2005/libalias/sys/net/if_gif.c#3 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/net/if_gif.c,v 1.62 2006/07/09 06:04:00 sam Exp $ */ +/* $FreeBSD: src/sys/net/if_gif.c,v 1.63 2006/07/27 03:50:38 avatar Exp $ */ /* $KAME: if_gif.c,v 1.87 2001/10/19 08:50:27 itojun Exp $ */ /*- @@ -81,6 +81,7 @@ #include #include +#include #include #include ==== //depot/projects/soc2005/libalias/sys/netgraph/ng_ether.c#2 (text+ko) ==== @@ -39,7 +39,7 @@ * Authors: Archie Cobbs * Julian Elischer * - * $FreeBSD: src/sys/netgraph/ng_ether.c,v 1.58 2006/01/12 21:09:12 glebius Exp $ + * $FreeBSD: src/sys/netgraph/ng_ether.c,v 1.59 2006/07/27 06:15:37 avatar Exp $ */ /* @@ -61,6 +61,7 @@ #include #include #include +#include #include #include ==== //depot/projects/soc2005/libalias/tools/tools/nanobsd/FlashDevice.sub#2 (text+ko) ==== @@ -24,7 +24,7 @@ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # -# $FreeBSD: src/tools/tools/nanobsd/FlashDevice.sub,v 1.6 2006/04/18 12:37:44 ru Exp $ +# $FreeBSD: src/tools/tools/nanobsd/FlashDevice.sub,v 1.7 2006/07/26 20:35:52 simon Exp $ # # Convenience function for commonly used Flash devices. # @@ -55,6 +55,21 @@ ;; esac ;; + memorycorp) + # Source: simon@FreeBSD.org + case $a2 in + 512|512mb) + # MC512CFLS2 + NANO_MEDIASIZE=`expr 519192576 / 512` + NANO_HEADS=16 + NANO_SECTS=63 + ;; + *) + echo "Unknown Memory Corp Flash capacity" + exit 2 + ;; + esac + ;; sandisk) # Source: # SanDisk CompactFlash Memory Card From owner-p4-projects@FreeBSD.ORG Thu Jul 27 09:16:21 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C1E8716A4E2; Thu, 27 Jul 2006 09:16:21 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 6B2AD16A4E0 for ; Thu, 27 Jul 2006 09:16:21 +0000 (UTC) (envelope-from gonzo@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 001EC43D46 for ; Thu, 27 Jul 2006 09:16:20 +0000 (GMT) (envelope-from gonzo@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k6R9GKoB055421 for ; Thu, 27 Jul 2006 09:16:20 GMT (envelope-from gonzo@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k6R9GKw5055418 for perforce@freebsd.org; Thu, 27 Jul 2006 09:16:20 GMT (envelope-from gonzo@FreeBSD.org) Date: Thu, 27 Jul 2006 09:16:20 GMT Message-Id: <200607270916.k6R9GKw5055418@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to gonzo@FreeBSD.org using -f From: Oleksandr Tymoshenko To: Perforce Change Reviews Cc: Subject: PERFORCE change 102538 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 27 Jul 2006 09:16:22 -0000 http://perforce.freebsd.org/chv.cgi?CH=102538 Change 102538 by gonzo@gonzo_hq on 2006/07/27 09:15:56 o Replace AMD64 in defines' names with MIPS o Threw away(temporary) MIPS_BUS_SPACE_IO part of bus_space_rw routines. o BUS_SPACE_MAXADDR is 32 bits long Affected files ... .. //depot/projects/mips2/src/sys/mips/include/bus.h#3 edit Differences ... ==== //depot/projects/mips2/src/sys/mips/include/bus.h#3 (text+ko) ==== @@ -101,8 +101,8 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef _AMD64_BUS_H_ -#define _AMD64_BUS_H_ +#ifndef _MIPS_BUS_H_ +#define _MIPS_BUS_H_ #include #include @@ -110,15 +110,15 @@ /* * Values for the amd64 bus space tag, not to be used directly by MI code. */ -#define AMD64_BUS_SPACE_IO 0 /* space is i/o space */ -#define AMD64_BUS_SPACE_MEM 1 /* space is mem space */ +#define MIPS_BUS_SPACE_IO 0 /* space is i/o space */ +#define MIPS_BUS_SPACE_MEM 1 /* space is mem space */ #define BUS_SPACE_MAXSIZE_24BIT 0xFFFFFF #define BUS_SPACE_MAXSIZE_32BIT 0xFFFFFFFF #define BUS_SPACE_MAXSIZE 0xFFFFFFFF #define BUS_SPACE_MAXADDR_24BIT 0xFFFFFF #define BUS_SPACE_MAXADDR_32BIT 0xFFFFFFFF -#define BUS_SPACE_MAXADDR 0xFFFFFFFFFFFFFFFFULL +#define BUS_SPACE_MAXADDR 0xFFFFFFFF #define BUS_SPACE_UNRESTRICTED (~0) @@ -214,36 +214,21 @@ bus_space_read_1(bus_space_tag_t tag, bus_space_handle_t handle, bus_size_t offset) { -#if 0 - if (tag == AMD64_BUS_SPACE_IO) - return (inb(handle + offset)); return (*(volatile u_int8_t *)(handle + offset)); -#endif - return (0); } static __inline u_int16_t bus_space_read_2(bus_space_tag_t tag, bus_space_handle_t handle, bus_size_t offset) { -#if 0 - if (tag == AMD64_BUS_SPACE_IO) - return (inw(handle + offset)); return (*(volatile u_int16_t *)(handle + offset)); -#endif - return (0); } static __inline u_int32_t bus_space_read_4(bus_space_tag_t tag, bus_space_handle_t handle, bus_size_t offset) { -#if 0 - if (tag == AMD64_BUS_SPACE_IO) - return (inl(handle + offset)); return (*(volatile u_int32_t *)(handle + offset)); -#endif - return (0); } #if 0 /* Cause a link error for bus_space_read_8 */ @@ -274,7 +259,7 @@ bus_size_t offset, u_int8_t *addr, size_t count) { #if 0 - if (tag == AMD64_BUS_SPACE_IO) + if (tag == MIPS_BUS_SPACE_IO) insb(bsh + offset, addr, count); else { #ifdef __GNUCLIKE_ASM @@ -296,7 +281,7 @@ bus_size_t offset, u_int16_t *addr, size_t count) { #if 0 - if (tag == AMD64_BUS_SPACE_IO) + if (tag == MIPS_BUS_SPACE_IO) insw(bsh + offset, addr, count); else { #ifdef __GNUCLIKE_ASM @@ -318,7 +303,7 @@ bus_size_t offset, u_int32_t *addr, size_t count) { #if 0 - if (tag == AMD64_BUS_SPACE_IO) + if (tag == MIPS_BUS_SPACE_IO) insl(bsh + offset, addr, count); else { #ifdef __GNUCLIKE_ASM @@ -365,7 +350,7 @@ bus_size_t offset, u_int8_t *addr, size_t count) { #if 0 - if (tag == AMD64_BUS_SPACE_IO) { + if (tag == MIPS_BUS_SPACE_IO) { int _port_ = bsh + offset; #ifdef __GNUCLIKE_ASM __asm __volatile(" \n\ @@ -398,7 +383,7 @@ bus_size_t offset, u_int16_t *addr, size_t count) { #if 0 - if (tag == AMD64_BUS_SPACE_IO) { + if (tag == MIPS_BUS_SPACE_IO) { int _port_ = bsh + offset; #ifdef __GNUCLIKE_ASM __asm __volatile(" \n\ @@ -431,7 +416,7 @@ bus_size_t offset, u_int32_t *addr, size_t count) { #if 0 - if (tag == AMD64_BUS_SPACE_IO) { + if (tag == MIPS_BUS_SPACE_IO) { int _port_ = bsh + offset; #ifdef __GNUCLIKE_ASM __asm __volatile(" \n\ @@ -485,7 +470,7 @@ bus_size_t offset, u_int8_t value) { #if 0 - if (tag == AMD64_BUS_SPACE_IO) + if (tag == MIPS_BUS_SPACE_IO) outb(bsh + offset, value); else *(volatile u_int8_t *)(bsh + offset) = value; @@ -497,7 +482,7 @@ bus_size_t offset, u_int16_t value) { #if 0 - if (tag == AMD64_BUS_SPACE_IO) + if (tag == MIPS_BUS_SPACE_IO) outw(bsh + offset, value); else *(volatile u_int16_t *)(bsh + offset) = value; @@ -509,7 +494,7 @@ bus_size_t offset, u_int32_t value) { #if 0 - if (tag == AMD64_BUS_SPACE_IO) + if (tag == MIPS_BUS_SPACE_IO) outl(bsh + offset, value); else *(volatile u_int32_t *)(bsh + offset) = value; @@ -547,7 +532,7 @@ bus_size_t offset, const u_int8_t *addr, size_t count) { #if 0 - if (tag == AMD64_BUS_SPACE_IO) + if (tag == MIPS_BUS_SPACE_IO) outsb(bsh + offset, addr, count); else { #ifdef __GNUCLIKE_ASM @@ -569,7 +554,7 @@ bus_size_t offset, const u_int16_t *addr, size_t count) { #if 0 - if (tag == AMD64_BUS_SPACE_IO) + if (tag == MIPS_BUS_SPACE_IO) outsw(bsh + offset, addr, count); else { #ifdef __GNUCLIKE_ASM @@ -592,7 +577,7 @@ { #if 0 - if (tag == AMD64_BUS_SPACE_IO) + if (tag == MIPS_BUS_SPACE_IO) outsl(bsh + offset, addr, count); else { #ifdef __GNUCLIKE_ASM @@ -641,7 +626,7 @@ { #if 0 - if (tag == AMD64_BUS_SPACE_IO) { + if (tag == MIPS_BUS_SPACE_IO) { int _port_ = bsh + offset; #ifdef __GNUCLIKE_ASM __asm __volatile(" \n\ @@ -675,7 +660,7 @@ { #if 0 - if (tag == AMD64_BUS_SPACE_IO) { + if (tag == MIPS_BUS_SPACE_IO) { int _port_ = bsh + offset; #ifdef __GNUCLIKE_ASM __asm __volatile(" \n\ @@ -709,7 +694,7 @@ { #if 0 - if (tag == AMD64_BUS_SPACE_IO) { + if (tag == MIPS_BUS_SPACE_IO) { int _port_ = bsh + offset; #ifdef __GNUCLIKE_ASM __asm __volatile(" \n\ @@ -767,7 +752,7 @@ #if 0 bus_space_handle_t addr = bsh + offset; - if (tag == AMD64_BUS_SPACE_IO) + if (tag == MIPS_BUS_SPACE_IO) while (count--) outb(addr, value); else @@ -783,7 +768,7 @@ #if 0 bus_space_handle_t addr = bsh + offset; - if (tag == AMD64_BUS_SPACE_IO) + if (tag == MIPS_BUS_SPACE_IO) while (count--) outw(addr, value); else @@ -799,7 +784,7 @@ #if 0 bus_space_handle_t addr = bsh + offset; - if (tag == AMD64_BUS_SPACE_IO) + if (tag == MIPS_BUS_SPACE_IO) while (count--) outl(addr, value); else @@ -837,7 +822,7 @@ #if 0 bus_space_handle_t addr = bsh + offset; - if (tag == AMD64_BUS_SPACE_IO) + if (tag == MIPS_BUS_SPACE_IO) for (; count != 0; count--, addr++) outb(addr, value); else @@ -853,7 +838,7 @@ #if 0 bus_space_handle_t addr = bsh + offset; - if (tag == AMD64_BUS_SPACE_IO) + if (tag == MIPS_BUS_SPACE_IO) for (; count != 0; count--, addr += 2) outw(addr, value); else @@ -869,7 +854,7 @@ #if 0 bus_space_handle_t addr = bsh + offset; - if (tag == AMD64_BUS_SPACE_IO) + if (tag == MIPS_BUS_SPACE_IO) for (; count != 0; count--, addr += 4) outl(addr, value); else @@ -914,7 +899,7 @@ bus_space_handle_t addr1 = bsh1 + off1; bus_space_handle_t addr2 = bsh2 + off2; - if (tag == AMD64_BUS_SPACE_IO) { + if (tag == MIPS_BUS_SPACE_IO) { if (addr1 >= addr2) { /* src after dest: copy forward */ for (; count != 0; count--, addr1++, addr2++) @@ -951,7 +936,7 @@ bus_space_handle_t addr1 = bsh1 + off1; bus_space_handle_t addr2 = bsh2 + off2; - if (tag == AMD64_BUS_SPACE_IO) { + if (tag == MIPS_BUS_SPACE_IO) { if (addr1 >= addr2) { /* src after dest: copy forward */ for (; count != 0; count--, addr1 += 2, addr2 += 2) @@ -988,7 +973,7 @@ bus_space_handle_t addr1 = bsh1 + off1; bus_space_handle_t addr2 = bsh2 + off2; - if (tag == AMD64_BUS_SPACE_IO) { + if (tag == MIPS_BUS_SPACE_IO) { if (addr1 >= addr2) { /* src after dest: copy forward */ for (; count != 0; count--, addr1 += 4, addr2 += 4) @@ -1125,4 +1110,4 @@ #define bus_space_copy_region_stream_4(t, h1, o1, h2, o2, c) \ bus_space_copy_region_4((t), (h1), (o1), (h2), (o2), (c)) -#endif /* _AMD64_BUS_H_ */ +#endif /* _MIPS_BUS_H_ */ From owner-p4-projects@FreeBSD.ORG Thu Jul 27 09:18:24 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7400D16A4E5; Thu, 27 Jul 2006 09:18:24 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 5081C16A4DA for ; Thu, 27 Jul 2006 09:18:24 +0000 (UTC) (envelope-from gonzo@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 201BF43D55 for ; Thu, 27 Jul 2006 09:18:24 +0000 (GMT) (envelope-from gonzo@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k6R9INgx055527 for ; Thu, 27 Jul 2006 09:18:24 GMT (envelope-from gonzo@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k6R9IN0x055524 for perforce@freebsd.org; Thu, 27 Jul 2006 09:18:23 GMT (envelope-from gonzo@FreeBSD.org) Date: Thu, 27 Jul 2006 09:18:23 GMT Message-Id: <200607270918.k6R9IN0x055524@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to gonzo@FreeBSD.org using -f From: Oleksandr Tymoshenko To: Perforce Change Reviews Cc: Subject: PERFORCE change 102539 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 27 Jul 2006 09:18:24 -0000 http://perforce.freebsd.org/chv.cgi?CH=102539 Change 102539 by gonzo@gonzo_hq on 2006/07/27 09:17:34 o There is no ACPI for MIPS devices. o MACHINE/MACHINE_ARCH changes from amd64 to mips. Affected files ... .. //depot/projects/mips2/src/sys/mips/include/param.h#2 edit Differences ... ==== //depot/projects/mips2/src/sys/mips/include/param.h#2 (text+ko) ==== @@ -66,17 +66,16 @@ #ifndef _NO_NAMESPACE_POLLUTION -#define __HAVE_ACPI #define __PCI_REROUTE_INTERRUPT #ifndef _MACHINE_PARAM_H_ #define _MACHINE_PARAM_H_ #ifndef MACHINE -#define MACHINE "amd64" +#define MACHINE "mips" #endif #ifndef MACHINE_ARCH -#define MACHINE_ARCH "amd64" +#define MACHINE_ARCH "mips" #endif #ifdef SMP From owner-p4-projects@FreeBSD.ORG Thu Jul 27 09:24:33 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id DB82A16A4E0; Thu, 27 Jul 2006 09:24:32 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 9EAD016A4DD for ; Thu, 27 Jul 2006 09:24:32 +0000 (UTC) (envelope-from cdjones@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 5C2B243D46 for ; Thu, 27 Jul 2006 09:24:32 +0000 (GMT) (envelope-from cdjones@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k6R9OWub055899 for ; Thu, 27 Jul 2006 09:24:32 GMT (envelope-from cdjones@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k6R9OVeM055896 for perforce@freebsd.org; Thu, 27 Jul 2006 09:24:31 GMT (envelope-from cdjones@FreeBSD.org) Date: Thu, 27 Jul 2006 09:24:31 GMT Message-Id: <200607270924.k6R9OVeM055896@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to cdjones@FreeBSD.org using -f From: Chris Jones To: Perforce Change Reviews Cc: Subject: PERFORCE change 102540 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 27 Jul 2006 09:24:33 -0000 http://perforce.freebsd.org/chv.cgi?CH=102540 Change 102540 by cdjones@cdjones-impulse on 2006/07/27 09:24:09 Under memory pressure, remove a page from each process in the jail until the pressure goes away. This doesn't prevent a jail from exceeding its memory limit, but rather tends to return it to the limit; there may merit in pushing it further below the limit. Affected files ... .. //depot/projects/soc2006/cdjones_jail/src/sys/kern/kern_jail.c#14 edit .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/jail.h#14 edit .. //depot/projects/soc2006/cdjones_jail/src/sys/vm/vm_pageout.c#3 edit .. //depot/projects/soc2006/cdjones_jail/src/sys/vm/vm_pageout.h#2 edit Differences ... ==== //depot/projects/soc2006/cdjones_jail/src/sys/kern/kern_jail.c#14 (text+ko) ==== @@ -27,6 +27,7 @@ #include #include #include +#include #include #include #include @@ -119,22 +120,88 @@ static void jpager_td(void *arg) { + struct proc *p; struct prison *pr; + struct thread *td; + vm_pindex_t limit, size, usage; + int breakout; + pr = arg; for (;;) { if (pr->pr_pager_flags & J_PAGER_TD_DIE) break; - if (prison_memory(pr) > prison_memory_limit(pr)) { - /* the logic from vm_daemon() really needs to go here. - TODO: refactor vm_daemon to optionally act on specific jails. */ + /* TODO: consider whether it might be better to start + * pushing back when we approach the limit, rather than + * when we hit it. + */ + limit = prison_memory_limit(pr); + usage = prison_memory(pr); + + if ((usage - limit) > 0) + continue; + + /* The logic from vm_daemon() really needs to go here. + * Problem: we want to push things below their rlimits. + * + * TODO: refactor vm_daemon to optionally act on specific jails? + */ + + sx_slock(&allproc_lock); + LIST_FOREACH(p, &allproc, p_list) { + + if (pr != p->p_ucred->cr_prison) + continue; + + PROC_LOCK(p); + if (p->p_flag & (P_SYSTEM | P_WEXIT)) { + PROC_UNLOCK(p); + continue; + } + + mtx_lock_spin(&sched_lock); + breakout = 0; + FOREACH_THREAD_IN_PROC(p, td) { + if (!TD_ON_RUNQ(td) && + !TD_IS_RUNNING(td) && + !TD_IS_SLEEPING(td)) { + breakout = 1; + break; + } + } + mtx_unlock_spin(&sched_lock); + if (breakout) { + PROC_UNLOCK(p); + continue; + } + + /* NOTE: we differ here from vm_daemon b/c we don't + * care about the rlimit; things that are exceeding that will + * get caught in due course. We need, however, to decrease + * the pressure on our permitted memory allocation. Fortunately, + * we only care about eventually hitting the limit, so if we + * don't get there right away, it's okay. + */ + + /* TODO: this arbitrarily reduces each process's space by + * one page (until it's completely swapped out) while + * we're under memory pressure. A better way would be + * to either hit large processes first, or to hit the + * least-active processes first, or .... + */ + size = vmspace_resident_count(p->p_vmspace) - 1; + if (size < 0) + size = 0; + vm_pageout_map_deactivate_pages(&p->p_vmspace->vm_map, size); + + sx_sunlock(&allproc_lock); } - + /* TODO --- make interval into a sysctl? */ tsleep(pr, 0, "-", hz); } - + pr->pr_pager_flags = J_PAGER_TD_DEAD; kthread_exit(0); } @@ -462,7 +529,7 @@ } /* Given credential, return memory usage in bytes. */ -int +vm_pindex_t prison_memory(struct prison *pr) { struct proc *p; @@ -491,7 +558,7 @@ } /* Given credential, return permitted memory usage in bytes. */ -int +vm_pindex_t prison_memory_limit(struct prison *pr) { return pr->pr_mem_limit; ==== //depot/projects/soc2006/cdjones_jail/src/sys/sys/jail.h#14 (text+ko) ==== @@ -143,8 +143,8 @@ void prison_hold(struct prison *pr); int prison_if(struct ucred *cred, struct sockaddr *sa); int prison_ip(struct ucred *cred, int flag, u_int32_t *ip); -int prison_memory(struct prison *pr); -int prison_memory_limit(struct prison *pr); +vm_pindex_t prison_memory(struct prison *pr); +vm_pindex_t prison_memory_limit(struct prison *pr); void prison_remote_ip(struct ucred *cred, int flags, u_int32_t *ip); #endif /* _KERNEL */ ==== //depot/projects/soc2006/cdjones_jail/src/sys/vm/vm_pageout.c#3 (text+ko) ==== @@ -205,7 +205,7 @@ int vm_page_max_wired; /* XXX max # of wired pages system-wide */ #if !defined(NO_SWAPPING) -static void vm_pageout_map_deactivate_pages(vm_map_t, long); +/* static void vm_pageout_map_deactivate_pages(vm_map_t, long); */ static void vm_pageout_object_deactivate_pages(pmap_t, vm_object_t, long); static void vm_req_vmdaemon(void); #endif @@ -592,7 +592,7 @@ * deactivate some number of pages in a map, try to do it fairly, but * that is really hard to do. */ -static void +void vm_pageout_map_deactivate_pages(map, desired) vm_map_t map; long desired; ==== //depot/projects/soc2006/cdjones_jail/src/sys/vm/vm_pageout.h#2 (text+ko) ==== @@ -87,6 +87,8 @@ * Exported routines. */ +void vm_pageout_map_deactivate_pages(vm_map_t map, long desired); + /* * Signal pageout-daemon and wait for it. */ From owner-p4-projects@FreeBSD.ORG Thu Jul 27 11:23:07 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8232B16A4E6; Thu, 27 Jul 2006 11:23:07 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 5DA7A16A4E1 for ; Thu, 27 Jul 2006 11:23:07 +0000 (UTC) (envelope-from cognet@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 7728343D72 for ; Thu, 27 Jul 2006 11:23:04 +0000 (GMT) (envelope-from cognet@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k6RBN4of064770 for ; Thu, 27 Jul 2006 11:23:04 GMT (envelope-from cognet@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k6RBN4Uv064767 for perforce@freebsd.org; Thu, 27 Jul 2006 11:23:04 GMT (envelope-from cognet@freebsd.org) Date: Thu, 27 Jul 2006 11:23:04 GMT Message-Id: <200607271123.k6RBN4Uv064767@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to cognet@freebsd.org using -f From: Olivier Houchard To: Perforce Change Reviews Cc: Subject: PERFORCE change 102546 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 27 Jul 2006 11:23:07 -0000 http://perforce.freebsd.org/chv.cgi?CH=102546 Change 102546 by cognet@cognet on 2006/07/27 11:22:09 Erm. Get this right, and manage the IRQ rman entry in the pci softc, NOT the ixp425 entry... Pointy hat to: cognet Affected files ... .. //depot/projects/arm/src/sys/arm/xscale/ixp425/ixdp425_pci.c#5 edit .. //depot/projects/arm/src/sys/arm/xscale/ixp425/ixp425_pci.c#5 edit .. //depot/projects/arm/src/sys/arm/xscale/ixp425/ixp425var.h#5 edit Differences ... ==== //depot/projects/arm/src/sys/arm/xscale/ixp425/ixdp425_pci.c#5 (text+ko) ==== @@ -55,6 +55,7 @@ ixp425_md_attach(device_t dev) { struct ixp425_softc *sc = device_get_softc(device_get_parent(dev)); + struct ixppcib_softc *pci_sc = device_get_softc(dev); uint32_t reg; @@ -133,8 +134,8 @@ sc->sc_irq_rman.rm_descr = "IXP425 PCI IRQs"; CTASSERT(PCI_INT_D < PCI_INT_A); /* XXX this overlaps the irq's setup in ixp425_attach */ - if (rman_init(&sc->sc_irq_rman) != 0 || - rman_manage_region(&sc->sc_irq_rman, PCI_INT_D, PCI_INT_A) != 0) + if (rman_init(&pci_sc->sc_irq_rman) != 0 || + rman_manage_region(&pci_sc->sc_irq_rman, PCI_INT_D, PCI_INT_A) != 0) panic("ixp425_md_attach: failed to set up IRQ rman"); } ==== //depot/projects/arm/src/sys/arm/xscale/ixp425/ixp425_pci.c#5 (text+ko) ==== @@ -70,22 +70,6 @@ #define PCI_CONF_LOCK(s) (s) = disable_interrupts(I32_bit) #define PCI_CONF_UNLOCK(s) restore_interrupts((s)) -struct ixppcib_softc { - device_t sc_dev; - - u_int sc_bus; - - struct resource *sc_csr; - struct resource *sc_mem; - - struct rman sc_io_rman; - struct rman sc_mem_rman; - struct rman sc_irq_rman; - - struct bus_space sc_pci_memt; - struct bus_space sc_pci_iot; -}; - static device_probe_t ixppcib_probe; static device_attach_t ixppcib_attach; static bus_read_ivar_t ixppcib_read_ivar; ==== //depot/projects/arm/src/sys/arm/xscale/ixp425/ixp425var.h#5 (text+ko) ==== @@ -65,6 +65,22 @@ struct rman sc_mem_rman; }; +struct ixppcib_softc { + device_t sc_dev; + + u_int sc_bus; + + struct resource *sc_csr; + struct resource *sc_mem; + + struct rman sc_io_rman; + struct rman sc_mem_rman; + struct rman sc_irq_rman; + + struct bus_space sc_pci_memt; + struct bus_space sc_pci_iot; +}; + extern struct bus_space ixpsip_bs_tag; extern struct bus_space ixp425_bs_tag; extern struct bus_space ixp425_a4x_bs_tag; From owner-p4-projects@FreeBSD.ORG Thu Jul 27 12:29:32 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 17FCF16A4E0; Thu, 27 Jul 2006 12:29:32 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id D999016A4DE for ; Thu, 27 Jul 2006 12:29:31 +0000 (UTC) (envelope-from cognet@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 527CB43D53 for ; Thu, 27 Jul 2006 12:29:31 +0000 (GMT) (envelope-from cognet@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k6RCTV4h069301 for ; Thu, 27 Jul 2006 12:29:31 GMT (envelope-from cognet@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k6RCTVC7069298 for perforce@freebsd.org; Thu, 27 Jul 2006 12:29:31 GMT (envelope-from cognet@freebsd.org) Date: Thu, 27 Jul 2006 12:29:31 GMT Message-Id: <200607271229.k6RCTVC7069298@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to cognet@freebsd.org using -f From: Olivier Houchard To: Perforce Change Reviews Cc: Subject: PERFORCE change 102551 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 27 Jul 2006 12:29:32 -0000 http://perforce.freebsd.org/chv.cgi?CH=102551 Change 102551 by cognet@cognet on 2006/07/27 12:28:41 Grrr use the pci softc there too. Affected files ... .. //depot/projects/arm/src/sys/arm/xscale/ixp425/ixdp425_pci.c#6 edit Differences ... ==== //depot/projects/arm/src/sys/arm/xscale/ixp425/ixdp425_pci.c#6 (text+ko) ==== @@ -130,8 +130,8 @@ reg = GPIO_CONF_READ_4(sc, IXP425_GPIO_GPOUTR); reg |= 1U << GPIO_PCI_RESET; GPIO_CONF_WRITE_4(sc, IXP425_GPIO_GPOUTR, reg | (1U << GPIO_PCI_RESET)); - sc->sc_irq_rman.rm_type = RMAN_ARRAY; - sc->sc_irq_rman.rm_descr = "IXP425 PCI IRQs"; + pci_sc->sc_irq_rman.rm_type = RMAN_ARRAY; + pci_sc->sc_irq_rman.rm_descr = "IXP425 PCI IRQs"; CTASSERT(PCI_INT_D < PCI_INT_A); /* XXX this overlaps the irq's setup in ixp425_attach */ if (rman_init(&pci_sc->sc_irq_rman) != 0 || From owner-p4-projects@FreeBSD.ORG Thu Jul 27 12:32:37 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id AF16D16A4E0; Thu, 27 Jul 2006 12:32:37 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 880C816A4DA for ; Thu, 27 Jul 2006 12:32:37 +0000 (UTC) (envelope-from cognet@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 2630843D49 for ; Thu, 27 Jul 2006 12:32:37 +0000 (GMT) (envelope-from cognet@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k6RCWbQa069516 for ; Thu, 27 Jul 2006 12:32:37 GMT (envelope-from cognet@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k6RCWZ4f069513 for perforce@freebsd.org; Thu, 27 Jul 2006 12:32:35 GMT (envelope-from cognet@freebsd.org) Date: Thu, 27 Jul 2006 12:32:35 GMT Message-Id: <200607271232.k6RCWZ4f069513@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to cognet@freebsd.org using -f From: Olivier Houchard To: Perforce Change Reviews Cc: Subject: PERFORCE change 102552 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 27 Jul 2006 12:32:37 -0000 http://perforce.freebsd.org/chv.cgi?CH=102552 Change 102552 by cognet@cognet on 2006/07/27 12:32:04 IFC Affected files ... .. //depot/projects/arm/src/UPDATING#2 integrate .. //depot/projects/arm/src/bin/sh/sh.1#2 integrate .. //depot/projects/arm/src/etc/rc.d/ipfw#2 integrate .. //depot/projects/arm/src/etc/rc.d/mdconfig#2 integrate .. //depot/projects/arm/src/etc/rc.d/mdconfig2#2 integrate .. //depot/projects/arm/src/etc/rc.d/natd#2 integrate .. //depot/projects/arm/src/etc/rc.subr#2 integrate .. //depot/projects/arm/src/lib/libc/gen/tls.c#2 integrate .. //depot/projects/arm/src/lib/libc/net/Makefile.inc#2 integrate .. //depot/projects/arm/src/lib/libc/net/name6.c#2 integrate .. //depot/projects/arm/src/lib/libc/stdlib/malloc.c#2 integrate .. //depot/projects/arm/src/lib/libfetch/Makefile#2 integrate .. //depot/projects/arm/src/lib/libftpio/Makefile#2 integrate .. //depot/projects/arm/src/lib/libkvm/kvm_proc.c#2 integrate .. //depot/projects/arm/src/lib/libmemstat/memstat.h#2 integrate .. //depot/projects/arm/src/lib/libthr/pthread.map#2 integrate .. //depot/projects/arm/src/lib/libthr/thread/thr_init.c#2 integrate .. //depot/projects/arm/src/lib/libthr/thread/thr_sig.c#2 integrate .. //depot/projects/arm/src/lib/libthr/thread/thr_syscalls.c#2 integrate .. //depot/projects/arm/src/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml#2 integrate .. //depot/projects/arm/src/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#2 integrate .. //depot/projects/arm/src/release/doc/share/misc/dev.archlist.txt#2 integrate .. //depot/projects/arm/src/sbin/ifconfig/ifconfig.8#2 integrate .. //depot/projects/arm/src/sbin/ifconfig/ifieee80211.c#2 integrate .. //depot/projects/arm/src/sbin/ipfw/ipfw.8#2 integrate .. //depot/projects/arm/src/share/man/man4/stge.4#2 integrate .. //depot/projects/arm/src/share/misc/bsd-family-tree#2 integrate .. //depot/projects/arm/src/sys/arm/at91/kb920x_machdep.c#33 integrate .. //depot/projects/arm/src/sys/arm/include/db_machdep.h#2 integrate .. //depot/projects/arm/src/sys/boot/forth/loader.conf#6 integrate .. //depot/projects/arm/src/sys/conf/files.powerpc#9 integrate .. //depot/projects/arm/src/sys/crypto/via/padlock.c#7 integrate .. //depot/projects/arm/src/sys/crypto/via/padlock.h#2 integrate .. //depot/projects/arm/src/sys/crypto/via/padlock_cipher.c#2 integrate .. //depot/projects/arm/src/sys/crypto/via/padlock_hash.c#2 integrate .. //depot/projects/arm/src/sys/dev/ath/ath_rate/sample/sample.h#4 integrate .. //depot/projects/arm/src/sys/dev/ath/if_ath.c#15 integrate .. //depot/projects/arm/src/sys/dev/em/if_em.c#20 integrate .. //depot/projects/arm/src/sys/dev/iwi/if_iwi.c#8 integrate .. //depot/projects/arm/src/sys/dev/ral/rt2560.c#5 integrate .. //depot/projects/arm/src/sys/dev/scc/scc_core.c#3 integrate .. //depot/projects/arm/src/sys/dev/scc/scc_dev_z8530.c#2 integrate .. //depot/projects/arm/src/sys/dev/sk/if_sk.c#5 integrate .. //depot/projects/arm/src/sys/dev/sk/if_skreg.h#3 integrate .. //depot/projects/arm/src/sys/dev/uart/uart_cpu_powerpc.c#2 integrate .. //depot/projects/arm/src/sys/dev/uart/uart_dev_z8530.c#6 integrate .. //depot/projects/arm/src/sys/dev/uart/uart_tty.c#7 integrate .. //depot/projects/arm/src/sys/dev/usb/if_ural.c#12 integrate .. //depot/projects/arm/src/sys/fs/udf/ecma167-udf.h#4 integrate .. //depot/projects/arm/src/sys/fs/udf/udf_vfsops.c#8 integrate .. //depot/projects/arm/src/sys/geom/eli/g_eli.c#11 integrate .. //depot/projects/arm/src/sys/kern/uipc_usrreq.c#15 integrate .. //depot/projects/arm/src/sys/modules/Makefile#25 integrate .. //depot/projects/arm/src/sys/modules/bridgestp/Makefile#1 branch .. //depot/projects/arm/src/sys/modules/if_bridge/Makefile#4 integrate .. //depot/projects/arm/src/sys/net/bpf.c#12 integrate .. //depot/projects/arm/src/sys/net/bridgestp.c#5 integrate .. //depot/projects/arm/src/sys/net/bridgestp.h#1 branch .. //depot/projects/arm/src/sys/net/if_bridge.c#17 integrate .. //depot/projects/arm/src/sys/net/if_bridgevar.h#6 integrate .. //depot/projects/arm/src/sys/net/if_ethersubr.c#12 integrate .. //depot/projects/arm/src/sys/net/if_gif.c#8 integrate .. //depot/projects/arm/src/sys/net80211/ieee80211.c#9 integrate .. //depot/projects/arm/src/sys/net80211/ieee80211.h#3 integrate .. //depot/projects/arm/src/sys/net80211/ieee80211_freebsd.h#3 integrate .. //depot/projects/arm/src/sys/net80211/ieee80211_ioctl.c#10 integrate .. //depot/projects/arm/src/sys/net80211/ieee80211_ioctl.h#6 integrate .. //depot/projects/arm/src/sys/net80211/ieee80211_output.c#8 integrate .. //depot/projects/arm/src/sys/net80211/ieee80211_proto.c#8 integrate .. //depot/projects/arm/src/sys/net80211/ieee80211_proto.h#5 integrate .. //depot/projects/arm/src/sys/net80211/ieee80211_var.h#10 integrate .. //depot/projects/arm/src/sys/netgraph/ng_ether.c#4 integrate .. //depot/projects/arm/src/sys/powerpc/conf/GENERIC#9 integrate .. //depot/projects/arm/src/sys/powerpc/conf/NOTES#3 integrate .. //depot/projects/arm/src/sys/powerpc/include/md_var.h#2 integrate .. //depot/projects/arm/src/sys/powerpc/include/ofw_machdep.h#2 integrate .. //depot/projects/arm/src/sys/powerpc/include/pcb.h#2 integrate .. //depot/projects/arm/src/sys/powerpc/powerpc/clock.c#4 integrate .. //depot/projects/arm/src/sys/powerpc/powerpc/mem.c#2 integrate .. //depot/projects/arm/src/sys/powerpc/powerpc/ofw_machdep.c#3 integrate .. //depot/projects/arm/src/sys/powerpc/psim/sio_iobus.c#3 delete .. //depot/projects/arm/src/sys/powerpc/psim/uart_iobus.c#1 branch .. //depot/projects/arm/src/sys/sys/socket.h#4 integrate .. //depot/projects/arm/src/tools/tools/nanobsd/FlashDevice.sub#2 integrate .. //depot/projects/arm/src/usr.bin/enigma/enigma.c#2 integrate .. //depot/projects/arm/src/usr.bin/truss/i386-fbsd.c#2 integrate Differences ... ==== //depot/projects/arm/src/UPDATING#2 (text+ko) ==== @@ -21,6 +21,13 @@ developers choose to disable these features on build machines to maximize performance. +20060725: + enigma(1)/crypt(1) utility has been changed on 64 bit architectures. + Now it can decrypt files created from different architectures. + Unfortunately, it is no longer able to decrypt a cipher text + generated with an older version on 64 bit architectures. + If you have such a file, you need old utility to decrypt it. + 20060709: The interface version of the i4b kernel part has changed. So after updating the kernel sources and compiling a new kernel, @@ -591,4 +598,4 @@ Contact Warner Losh if you have any questions about your use of this document. -$FreeBSD: src/UPDATING,v 1.451 2006/07/09 21:16:06 twinterg Exp $ +$FreeBSD: src/UPDATING,v 1.452 2006/07/26 16:31:10 jkim Exp $ ==== //depot/projects/arm/src/bin/sh/sh.1#2 (text+ko) ==== @@ -30,9 +30,9 @@ .\" SUCH DAMAGE. .\" .\" from: @(#)sh.1 8.6 (Berkeley) 5/4/95 -.\" $FreeBSD: src/bin/sh/sh.1,v 1.120 2006/06/21 12:01:52 yar Exp $ +.\" $FreeBSD: src/bin/sh/sh.1,v 1.121 2006/07/26 06:48:18 yar Exp $ .\" -.Dd June 21, 2006 +.Dd July 26, 2006 .Dt SH 1 .Os .Sh NAME @@ -1361,9 +1361,8 @@ are built-in because they need to perform some operation that cannot be performed by a separate process. In addition to -these, a built-in version of the -.Xr test 1 -command is provided for efficiency. +these, built-in versions of essential utilities +are provided for efficiency. .Bl -tag -width indent .It Ic \&: A null command that returns a 0 (true) exit value. @@ -1385,6 +1384,9 @@ If it is not found in the .Ev PATH , it is sought in the current working directory. +.It Ic \&[ +A built-in equivalent of +.Xr test 1 . .It Ic alias Oo Ar name Ns Oo = Ns Ar string Oc ... Oc If .Ar name Ns = Ns Ar string @@ -1961,6 +1963,9 @@ the value of $2 to the value of $3, and so on, decreasing the value of $# by one. If there are zero positional parameters, shifting does not do anything. +.It Ic test +A built-in equivalent of +.Xr test 1 . .It Ic times Print the amount of time spent executing the shell and its children. The first output line shows the user and system times for the shell ==== //depot/projects/arm/src/etc/rc.d/ipfw#2 (text+ko) ==== @@ -1,6 +1,6 @@ #!/bin/sh # -# $FreeBSD: src/etc/rc.d/ipfw,v 1.12 2006/02/26 16:45:29 wkoszek Exp $ +# $FreeBSD: src/etc/rc.d/ipfw,v 1.13 2006/07/25 17:28:18 yar Exp $ # # PROVIDE: ipfw @@ -35,23 +35,21 @@ [ -z "${firewall_script}" ] && firewall_script=/etc/rc.firewall if [ -r "${firewall_script}" ]; then - echo -n 'Starting divert daemons:' if [ -f /etc/rc.d/natd ] ; then /etc/rc.d/natd start fi . "${firewall_script}" - echo -n 'Firewall rules loaded' + echo 'Firewall rules loaded.' elif [ "`ipfw list 65535`" = "65535 deny ip from any to any" ]; then echo 'Warning: kernel has firewall functionality, but' \ ' firewall rules are not enabled.' echo ' All ip services are disabled.' fi - echo '.' # Firewall logging # if checkyesno firewall_logging; then - echo 'Firewall logging enabled' + echo 'Firewall logging enabled.' sysctl net.inet.ip.fw.verbose=1 >/dev/null fi ==== //depot/projects/arm/src/etc/rc.d/mdconfig#2 (text) ==== @@ -24,7 +24,7 @@ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # -# $FreeBSD: src/etc/rc.d/mdconfig,v 1.2 2006/05/18 16:04:56 flz Exp $ +# $FreeBSD: src/etc/rc.d/mdconfig,v 1.3 2006/07/25 17:19:00 pjd Exp $ # # PROVIDE: mdconfig @@ -103,6 +103,11 @@ { local _md _mp _config _type _dev _file _fs _newfs _fsck_cmd + # If there are no devices return before loading geom_md.ko. + if [ -z "${_mdconfig_list}" ]; then + return + fi + kldstat -q -m g_md || kldload geom_md || err 1 "geom_md failed to load." for _md in ${_mdconfig_list}; do ==== //depot/projects/arm/src/etc/rc.d/mdconfig2#2 (text) ==== @@ -24,7 +24,7 @@ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # -# $FreeBSD: src/etc/rc.d/mdconfig2,v 1.2 2006/05/18 16:04:56 flz Exp $ +# $FreeBSD: src/etc/rc.d/mdconfig2,v 1.3 2006/07/25 17:19:00 pjd Exp $ # # PROVIDE: mdconfig2 @@ -111,6 +111,11 @@ { local _md _fs _mp _mounted _dev _config _type _file _owner _perms _files _populate _fsck_cmd _i + # If there are no devices return before loading geom_md.ko. + if [ -z "${_mdconfig2_list}" ]; then + return + fi + kldstat -q -m g_md || kldload geom_md || err 1 "geom_md failed to load." for _md in ${_mdconfig2_list}; do ==== //depot/projects/arm/src/etc/rc.d/natd#2 (text+ko) ==== @@ -1,6 +1,6 @@ #!/bin/sh # -# $FreeBSD: src/etc/rc.d/natd,v 1.3 2004/10/22 19:36:03 andre Exp $ +# $FreeBSD: src/etc/rc.d/natd,v 1.4 2006/07/25 17:25:44 yar Exp $ # # PROVIDE: natd @@ -12,8 +12,8 @@ name="natd" rcvar=`set_rcvar` command="/sbin/${name}" +pidfile="/var/run/${name}.pid" start_precmd="natd_precmd" -start_cmd="natd_start" natd_precmd() { @@ -24,31 +24,25 @@ fi fi - return 0 -} + if [ -n "${natd_interface}" ]; then + dhcp_list="`list_net_interfaces dhcp`" + for ifn in ${dhcp_list}; do + case "${natd_interface}" in + ${ifn}) + rc_flags="$rc_flags -dynamic" + ;; + esac + done -natd_start() -{ - dhcp_list="`list_net_interfaces dhcp`" - for ifn in ${dhcp_list}; do - case ${natd_interface} in - ${ifn}) - natd_flags="$natd_flags -dynamic" - ;; - *) - ;; - esac - done - if [ -n "${natd_interface}" ]; then - if echo ${natd_interface} | \ - grep -q -E '^[0-9]+(\.[0-9]+){0,3}$'; then - natd_flags="$natd_flags -a ${natd_interface}" + if echo "${natd_interface}" | \ + grep -q -E '^[0-9]+(\.[0-9]+){0,3}$'; then + rc_flags="$rc_flags -a ${natd_interface}" else - natd_flags="$natd_flags -n ${natd_interface}" + rc_flags="$rc_flags -n ${natd_interface}" fi fi - echo -n ' natd' - ${natd_program:-/sbin/natd} ${natd_flags} ${natd_ifarg} + + return 0 } load_rc_config $name ==== //depot/projects/arm/src/etc/rc.subr#2 (text+ko) ==== @@ -1,5 +1,5 @@ # $NetBSD: rc.subr,v 1.66 2006/04/01 10:05:50 he Exp $ -# $FreeBSD: src/etc/rc.subr,v 1.59 2006/06/21 09:42:55 yar Exp $ +# $FreeBSD: src/etc/rc.subr,v 1.64 2006/07/26 08:03:24 yar Exp $ # # Copyright (c) 1997-2004 The NetBSD Foundation, Inc. # All rights reserved. @@ -613,7 +613,7 @@ fi if [ ! -x ${_chroot}${command} ]; then - info "run_rc_command: cannot run ($command)." + warn "run_rc_command: cannot run $command" return 1 fi @@ -656,7 +656,7 @@ return 1 fi - # setup the command to run, and run it + # setup the full command to run # echo "Starting ${name}." if [ -n "$_chroot" ]; then @@ -674,6 +674,7 @@ fi fi + # run the full command; # if the cmd failed and force # isn't set, exit # @@ -1141,7 +1142,7 @@ return 1 fi if [ ! -d "$linkdir" ]; then - warn "$_me: the directory $linkdir does not exist" + warn "$_me: the directory $linkdir does not exist." return 1 fi if ! ln -sf $src $link; then @@ -1358,12 +1359,12 @@ # Code common to scripts that need to load a kernel module # if it isn't in the kernel yet. Syntax: -# load_kld [-e regexp] [-m modname] filename +# load_kld [-e regex] [-m module] file # where -e or -m chooses the way to check if the module # is already loaded: -# regexp is egrep'd in the output from `kldstat -v', -# modname is passed to `kldstat -m'. -# The default way is as though `-m filename' were specified. +# regex is egrep'd in the output from `kldstat -v', +# module is passed to `kldstat -m'. +# The default way is as though `-m file' were specified. load_kld() { local _loaded _mod _opt _re @@ -1372,9 +1373,13 @@ case "$_opt" in e) _re="$OPTARG" ;; m) _mod="$OPTARG" ;; + *) err 3 'USAGE: load_kld [-e regex] [-m module] file' ;; esac done shift $(($OPTIND - 1)) + if [ $# -ne 1 ]; then + err 3 'USAGE: load_kld [-e regex] [-m module] file' + fi _mod=${_mod:-$1} _loaded=false if [ -n "$_re" ]; then @@ -1390,7 +1395,11 @@ if ! kldload "$1"; then warn "Unable to load kernel module $1" return 1 + else + info "$1 kernel module loaded." fi + else + debug "load_kld: $1 kernel module already loaded." fi return 0 } ==== //depot/projects/arm/src/lib/libc/gen/tls.c#2 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/lib/libc/gen/tls.c,v 1.9 2006/03/28 06:06:38 davidxu Exp $ + * $FreeBSD: src/lib/libc/gen/tls.c,v 1.10 2006/07/26 16:56:56 imp Exp $ */ /* @@ -40,8 +40,6 @@ #include "libc_private.h" -/* XXX not sure what variants to use for arm. */ - __weak_reference(__libc_allocate_tls, _rtld_allocate_tls); __weak_reference(__libc_free_tls, _rtld_free_tls); ==== //depot/projects/arm/src/lib/libc/net/Makefile.inc#2 (text+ko) ==== @@ -1,5 +1,5 @@ # from @(#)Makefile.inc 8.2 (Berkeley) 9/5/93 -# $FreeBSD: src/lib/libc/net/Makefile.inc,v 1.60 2006/05/21 11:19:36 ume Exp $ +# $FreeBSD: src/lib/libc/net/Makefile.inc,v 1.61 2006/07/26 08:36:46 yar Exp $ # machine-independent net sources .PATH: ${.CURDIR}/${MACHINE_ARCH}/net ${.CURDIR}/net @@ -21,7 +21,11 @@ SYM_MAPS+=${.CURDIR}/net/Symbol.map -CFLAGS+=-DINET6 -I${.OBJDIR} +.if ${MK_INET6_SUPPORT} != "no" +CFLAGS+=-DINET6 +.endif + +CFLAGS+=-I${.OBJDIR} # name6.c refers res_private.h CFLAGS+=-I${.CURDIR}/resolv ==== //depot/projects/arm/src/lib/libc/net/name6.c#2 (text+ko) ==== @@ -88,7 +88,7 @@ */ #include -__FBSDID("$FreeBSD: src/lib/libc/net/name6.c,v 1.60 2006/07/23 07:07:49 ume Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/net/name6.c,v 1.61 2006/07/26 08:35:46 yar Exp $"); #include "namespace.h" #include @@ -2025,7 +2025,9 @@ querybuf *buf; char qbuf[MAXDNAME+1]; char *hlist[2]; +#ifdef INET6 char *tld6[] = { "ip6.arpa", NULL }; +#endif char *tld4[] = { "in-addr.arpa", NULL }; char **tld; res_state statp; ==== //depot/projects/arm/src/lib/libc/stdlib/malloc.c#2 (text+ko) ==== @@ -185,7 +185,7 @@ #endif #include -__FBSDID("$FreeBSD: src/lib/libc/stdlib/malloc.c,v 1.129 2006/07/01 16:51:10 jasone Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/stdlib/malloc.c,v 1.130 2006/07/27 04:00:12 jasone Exp $"); #include "libc_private.h" #ifdef MALLOC_DEBUG @@ -835,15 +835,13 @@ static arena_chunk_t *arena_chunk_alloc(arena_t *arena); static void arena_chunk_dealloc(arena_chunk_t *chunk); static void arena_bin_run_promote(arena_t *arena, arena_bin_t *bin, - arena_run_t *run, size_t size); + arena_run_t *run); static void arena_bin_run_demote(arena_t *arena, arena_bin_t *bin, - arena_run_t *run, size_t size); + arena_run_t *run); static arena_run_t *arena_run_alloc(arena_t *arena, bool large, size_t size); static void arena_run_dalloc(arena_t *arena, arena_run_t *run, size_t size); -static arena_run_t *arena_bin_nonfull_run_get(arena_t *arena, arena_bin_t *bin, - size_t size); -static void *arena_bin_malloc_hard(arena_t *arena, arena_bin_t *bin, - size_t size); +static arena_run_t *arena_bin_nonfull_run_get(arena_t *arena, arena_bin_t *bin); +static void *arena_bin_malloc_hard(arena_t *arena, arena_bin_t *bin); static void *arena_malloc(arena_t *arena, size_t size); static size_t arena_salloc(const void *ptr); static void *arena_ralloc(void *ptr, size_t size, size_t oldsize); @@ -1778,8 +1776,7 @@ } static void -arena_bin_run_promote(arena_t *arena, arena_bin_t *bin, arena_run_t *run, - size_t size) +arena_bin_run_promote(arena_t *arena, arena_bin_t *bin, arena_run_t *run) { assert(bin == run->bin); @@ -1850,8 +1847,7 @@ } static void -arena_bin_run_demote(arena_t *arena, arena_bin_t *bin, arena_run_t *run, - size_t size) +arena_bin_run_demote(arena_t *arena, arena_bin_t *bin, arena_run_t *run) { assert(bin == run->bin); @@ -2057,7 +2053,7 @@ } static arena_run_t * -arena_bin_nonfull_run_get(arena_t *arena, arena_bin_t *bin, size_t size) +arena_bin_nonfull_run_get(arena_t *arena, arena_bin_t *bin) { arena_run_t *run; unsigned i, remainder; @@ -2118,8 +2114,7 @@ /* bin->runcur must have space available before this function is called. */ static inline void * -arena_bin_malloc_easy(arena_t *arena, arena_bin_t *bin, arena_run_t *run, - size_t size) +arena_bin_malloc_easy(arena_t *arena, arena_bin_t *bin, arena_run_t *run) { void *ret; @@ -2131,7 +2126,7 @@ run->nfree--; if (run->nfree < run->free_min) { /* Promote run to higher fullness quartile. */ - arena_bin_run_promote(arena, bin, run, size); + arena_bin_run_promote(arena, bin, run); } return (ret); @@ -2139,18 +2134,18 @@ /* Re-fill bin->runcur, then call arena_bin_malloc_easy(). */ static void * -arena_bin_malloc_hard(arena_t *arena, arena_bin_t *bin, size_t size) +arena_bin_malloc_hard(arena_t *arena, arena_bin_t *bin) { assert(bin->runcur == NULL || bin->runcur->quartile == RUN_Q100); - bin->runcur = arena_bin_nonfull_run_get(arena, bin, size); + bin->runcur = arena_bin_nonfull_run_get(arena, bin); if (bin->runcur == NULL) return (NULL); assert(bin->runcur->magic == ARENA_RUN_MAGIC); assert(bin->runcur->nfree > 0); - return (arena_bin_malloc_easy(arena, bin, bin->runcur, size)); + return (arena_bin_malloc_easy(arena, bin, bin->runcur)); } static void * @@ -2173,10 +2168,11 @@ /* Tiny. */ size = pow2_ceil(size); bin = &arena->bins[ffs(size >> (tiny_min_2pow + 1))]; -#ifdef MALLOC_STATS +#if (!defined(NDEBUG) || defined(MALLOC_STATS)) /* - * Bin calculation is always correct, but we may need to - * fix size for the purposes of stats accuracy. + * Bin calculation is always correct, but we may need + * to fix size for the purposes of assertions and/or + * stats accuracy. */ if (size < (1 << tiny_min_2pow)) size = (1 << tiny_min_2pow); @@ -2196,9 +2192,9 @@ malloc_mutex_lock(&arena->mtx); if ((run = bin->runcur) != NULL) - ret = arena_bin_malloc_easy(arena, bin, run, size); + ret = arena_bin_malloc_easy(arena, bin, run); else - ret = arena_bin_malloc_hard(arena, bin, size); + ret = arena_bin_malloc_hard(arena, bin); #ifdef MALLOC_STATS bin->stats.nrequests++; @@ -2343,7 +2339,7 @@ run->nfree++; if (run->nfree > run->free_max) { /* Demote run to lower fullness quartile. */ - arena_bin_run_demote(arena, bin, run, size); + arena_bin_run_demote(arena, bin, run); } } else { /* Medium allocation. */ ==== //depot/projects/arm/src/lib/libfetch/Makefile#2 (text+ko) ==== @@ -1,16 +1,19 @@ -# $FreeBSD: src/lib/libfetch/Makefile,v 1.46 2006/03/17 18:54:26 ru Exp $ +# $FreeBSD: src/lib/libfetch/Makefile,v 1.47 2006/07/27 04:54:03 yar Exp $ .include LIB= fetch CFLAGS+= -I. -CFLAGS+= -DINET6 SRCS= fetch.c common.c ftp.c http.c file.c \ ftperr.h httperr.h INCS= fetch.h MAN= fetch.3 CLEANFILES= ftperr.h httperr.h +.if ${MK_INET6_SUPPORT} != "no" +CFLAGS+= -DINET6 +.endif + .if ${MK_OPENSSL} != "no" CFLAGS+= -DWITH_SSL DPADD= ${LIBSSL} ${LIBCRYPTO} ==== //depot/projects/arm/src/lib/libftpio/Makefile#2 (text+ko) ==== @@ -1,4 +1,6 @@ -# $FreeBSD: src/lib/libftpio/Makefile,v 1.14 2005/07/22 17:19:01 kensmith Exp $ +# $FreeBSD: src/lib/libftpio/Makefile,v 1.15 2006/07/27 04:54:03 yar Exp $ + +.include LIB= ftpio SHLIB_MAJOR= 6 @@ -6,10 +8,13 @@ SRCS= ftpio.c ftperr.c INCS= ftpio.h CFLAGS+= -I${.CURDIR} -Wall -CFLAGS+= -DINET6 MAN= ftpio.3 CLEANFILES= ftperr.c +.if ${MK_INET6_SUPPORT} != "no" +CFLAGS+= -DINET6 +.endif + ftperr.c: ftp.errors @echo '#include ' > ${.TARGET} @echo '#include "ftpio.h"' >> ${.TARGET} ==== //depot/projects/arm/src/lib/libkvm/kvm_proc.c#2 (text+ko) ==== @@ -42,7 +42,7 @@ #endif #include -__FBSDID("$FreeBSD: src/lib/libkvm/kvm_proc.c,v 1.87 2005/06/24 00:37:04 peter Exp $"); +__FBSDID("$FreeBSD: src/lib/libkvm/kvm_proc.c,v 1.88 2006/07/25 22:39:57 yar Exp $"); /* * Proc traversal interface for kvm. ps and w are (probably) the exclusive @@ -374,6 +374,13 @@ kp->ki_lockname, LOCKNAMELEN); kp->ki_lockname[LOCKNAMELEN] = 0; } + /* + * XXX: This is plain wrong, rux_runtime has nothing + * to do with struct bintime, rux_runtime is just a 64-bit + * integer counter of cputicks. What we need here is a way + * to convert cputicks to usecs. The kernel does it in + * kern/kern_tc.c, but the function can't be just copied. + */ bintime2timeval(&proc.p_rux.rux_runtime, &tv); kp->ki_runtime = (u_int64_t)tv.tv_sec * 1000000 + tv.tv_usec; kp->ki_pid = proc.p_pid; ==== //depot/projects/arm/src/lib/libmemstat/memstat.h#2 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/lib/libmemstat/memstat.h,v 1.9 2005/08/06 13:54:03 rwatson Exp $ + * $FreeBSD: src/lib/libmemstat/memstat.h,v 1.10 2006/07/26 07:46:32 jb Exp $ */ #ifndef _MEMSTAT_H_ @@ -33,7 +33,7 @@ * Number of CPU slots in library-internal data structures. This should be * at least the value of MAXCPU from param.h. */ -#define MEMSTAT_MAXCPU 16 +#define MEMSTAT_MAXCPU 32 /* * Amount of caller data to maintain for each caller data slot. Applications ==== //depot/projects/arm/src/lib/libthr/pthread.map#2 (text+ko) ==== @@ -1,8 +1,17 @@ -# $FreeBSD: src/lib/libthr/pthread.map,v 1.15 2006/05/11 07:02:52 davidxu Exp $ +# $FreeBSD: src/lib/libthr/pthread.map,v 1.16 2006/07/25 12:50:04 davidxu Exp $ LIBTHREAD_1_0 { global: ___creat; + ___pause; + ___pselect; + ___sleep; + ___system; + ___tcdrain; + ___usleep; + ___wait; + ___waitpid; __accept; + __aio_suspend; __close; __connect; __error; @@ -29,15 +38,11 @@ __sigtimedwait; __sigwait; __sigwaitinfo; + __wait3; __wait4; __write; __writev; - _aio_suspend; - _execve; _fork; - _nanosleep; - _pause; - _pselect; _pthread_atfork; _pthread_barrier_destroy; _pthread_barrier_init; @@ -169,16 +174,10 @@ _sigtimedwait; _sigwait; _sigwaitinfo; - _sleep; _spinlock; _spinlock_debug; _spinunlock; - _system; - _tcdrain; - _usleep; _vfork; - _wait; - _waitpid; accept; aio_suspend; close; @@ -338,6 +337,7 @@ usleep; vfork; wait; + wait3; wait4; waitpid; write; @@ -538,6 +538,7 @@ usleep; vfork; wait; + wait3; wait4; waitpid; write; @@ -553,7 +554,16 @@ FBSDprivate { global: ___creat; + ___pause; + ___pselect; + ___sleep; + ___system; + ___tcdrain; + ___usleep; + ___wait; + ___waitpid; __accept; + __aio_suspend; __close; __connect; __fcntl; @@ -579,15 +589,11 @@ __sigtimedwait; __sigwait; __sigwaitinfo; + __wait3; __wait4; __write; __writev; - _aio_suspend; - _execve; _fork; - _nanosleep; - _pause; - _pselect; _pthread_atfork; _pthread_barrier_destroy; _pthread_barrier_init; @@ -719,16 +725,10 @@ _sigtimedwait; _sigwait; _sigwaitinfo; - _sleep; _spinlock; _spinlock_debug; _spinunlock; - _system; - _tcdrain; - _usleep; _vfork; - _wait; - _waitpid; # Debugger needs these. _libthr_debug; ==== //depot/projects/arm/src/lib/libthr/thread/thr_init.c#2 (text+ko) ==== @@ -30,7 +30,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/lib/libthr/thread/thr_init.c,v 1.36 2006/07/13 22:45:19 davidxu Exp $ + * $FreeBSD: src/lib/libthr/thread/thr_init.c,v 1.37 2006/07/25 12:50:05 davidxu Exp $ */ #include "namespace.h" @@ -123,13 +123,8 @@ * All weak references used within libc should be in this table. * This is so that static libraries will work. */ -STATIC_LIB_REQUIRE(_accept); -STATIC_LIB_REQUIRE(_close); -STATIC_LIB_REQUIRE(_connect); -STATIC_LIB_REQUIRE(_fcntl); -STATIC_LIB_REQUIRE(_fsync); -STATIC_LIB_REQUIRE(_nanosleep); -STATIC_LIB_REQUIRE(_open); + +STATIC_LIB_REQUIRE(_fork); STATIC_LIB_REQUIRE(_pthread_getspecific); STATIC_LIB_REQUIRE(_pthread_key_create); STATIC_LIB_REQUIRE(_pthread_key_delete); @@ -143,20 +138,25 @@ STATIC_LIB_REQUIRE(_pthread_mutexattr_settype); STATIC_LIB_REQUIRE(_pthread_once); STATIC_LIB_REQUIRE(_pthread_setspecific); -STATIC_LIB_REQUIRE(_read); -STATIC_LIB_REQUIRE(_readv); -STATIC_LIB_REQUIRE(_recvfrom); -STATIC_LIB_REQUIRE(_recvmsg); -STATIC_LIB_REQUIRE(_select); -STATIC_LIB_REQUIRE(_sendmsg); -STATIC_LIB_REQUIRE(_sendto); +STATIC_LIB_REQUIRE(_raise); +STATIC_LIB_REQUIRE(_sem_destroy); +STATIC_LIB_REQUIRE(_sem_getvalue); +STATIC_LIB_REQUIRE(_sem_init); +STATIC_LIB_REQUIRE(_sem_post); +STATIC_LIB_REQUIRE(_sem_timedwait); +STATIC_LIB_REQUIRE(_sem_trywait); +STATIC_LIB_REQUIRE(_sem_wait); STATIC_LIB_REQUIRE(_sigaction); STATIC_LIB_REQUIRE(_sigprocmask); STATIC_LIB_REQUIRE(_sigsuspend); +STATIC_LIB_REQUIRE(_sigtimedwait); +STATIC_LIB_REQUIRE(_sigwait); +STATIC_LIB_REQUIRE(_sigwaitinfo); +STATIC_LIB_REQUIRE(_spinlock); +STATIC_LIB_REQUIRE(_spinlock_debug); +STATIC_LIB_REQUIRE(_spinunlock); STATIC_LIB_REQUIRE(_thread_init_hack); -STATIC_LIB_REQUIRE(_wait4); -STATIC_LIB_REQUIRE(_write); -STATIC_LIB_REQUIRE(_writev); +STATIC_LIB_REQUIRE(_vfork); /* * These are needed when linking statically. All references within ==== //depot/projects/arm/src/lib/libthr/thread/thr_sig.c#2 (text+ko) ==== @@ -23,7 +23,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/lib/libthr/thread/thr_sig.c,v 1.18 2006/04/04 02:57:49 davidxu Exp $ + * $FreeBSD: src/lib/libthr/thread/thr_sig.c,v 1.19 2006/07/25 12:50:05 davidxu Exp $ */ #include "namespace.h" @@ -47,6 +47,9 @@ #define DBG_MSG(x...) #endif +extern int __pause(void); +int ___pause(void); +int _raise(int); int __sigtimedwait(const sigset_t *set, siginfo_t *info, const struct timespec * timeout); int __sigwaitinfo(const sigset_t *set, siginfo_t *info); @@ -145,6 +148,36 @@ { } +__weak_reference(___pause, pause); + +int +___pause(void) +{ + struct pthread *curthread = _get_curthread(); + int oldcancel; + int ret; + + oldcancel = _thr_cancel_enter(curthread); + ret = __pause(); + _thr_cancel_leave(curthread, oldcancel); + + return ret; +} + +__weak_reference(_raise, raise); + +int +_raise(int sig) +{ + int ret; + + if (!_thr_isthreaded()) + ret = kill(getpid(), sig); + else + ret = _thr_send_sig(_get_curthread(), sig); + return (ret); +} + __weak_reference(_sigaction, sigaction); int @@ -188,11 +221,30 @@ return (0); } -__weak_reference(_sigsuspend, sigsuspend); +__weak_reference(__sigsuspend, sigsuspend); int _sigsuspend(const sigset_t * set) { + sigset_t newset; + const sigset_t *pset; + int ret; + + if (SIGISMEMBER(*set, SIGCANCEL)) { + newset = *set; + SIGDELSET(newset, SIGCANCEL); + pset = &newset; + } else + pset = set; + + ret = __sys_sigsuspend(pset); + + return (ret); +} + +int +__sigsuspend(const sigset_t * set) +{ struct pthread *curthread = _get_curthread(); sigset_t newset; const sigset_t *pset; @@ -218,6 +270,24 @@ __weak_reference(__sigwaitinfo, sigwaitinfo); int +_sigtimedwait(const sigset_t *set, siginfo_t *info, + const struct timespec * timeout) +{ + sigset_t newset; + const sigset_t *pset; + int ret; + + if (SIGISMEMBER(*set, SIGCANCEL)) { + newset = *set; + SIGDELSET(newset, SIGCANCEL); + pset = &newset; >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Thu Jul 27 14:19:09 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 767D616A4E7; Thu, 27 Jul 2006 14:19:09 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 4A98916A4E5 for ; Thu, 27 Jul 2006 14:19:09 +0000 (UTC) (envelope-from piso@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 1FCBB43D7C for ; Thu, 27 Jul 2006 14:19:03 +0000 (GMT) (envelope-from piso@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k6REIx59014367 for ; Thu, 27 Jul 2006 14:18:59 GMT (envelope-from piso@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k6REIxfr014354 for perforce@freebsd.org; Thu, 27 Jul 2006 14:18:59 GMT (envelope-from piso@freebsd.org) Date: Thu, 27 Jul 2006 14:18:59 GMT Message-Id: <200607271418.k6REIxfr014354@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to piso@freebsd.org using -f From: Paolo Pisati To: Perforce Change Reviews Cc: Subject: PERFORCE change 102559 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 27 Jul 2006 14:19:09 -0000 http://perforce.freebsd.org/chv.cgi?CH=102559 Change 102559 by piso@piso_newluxor on 2006/07/27 14:18:18 Check for end of list. Affected files ... .. //depot/projects/soc2005/libalias/sys/netinet/libalias/alias_mod.c#16 edit Differences ... ==== //depot/projects/soc2005/libalias/sys/netinet/libalias/alias_mod.c#16 (text+ko) ==== @@ -300,6 +300,8 @@ struct dll *t; t = SLIST_FIRST(&dll_chain); + if (t == NULL) + return (NULL); SLIST_REMOVE_HEAD(&dll_chain, next); return (t); } From owner-p4-projects@FreeBSD.ORG Thu Jul 27 14:25:15 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id AECB916A4F6; Thu, 27 Jul 2006 14:25:15 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 6695816A4EF for ; Thu, 27 Jul 2006 14:25:15 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 7E76E43D49 for ; Thu, 27 Jul 2006 14:25:08 +0000 (GMT) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k6REP8Cw025519 for ; Thu, 27 Jul 2006 14:25:08 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k6REP84B025511 for perforce@freebsd.org; Thu, 27 Jul 2006 14:25:08 GMT (envelope-from millert@freebsd.org) Date: Thu, 27 Jul 2006 14:25:08 GMT Message-Id: <200607271425.k6REP84B025511@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to millert@freebsd.org using -f From: Todd Miller To: Perforce Change Reviews Cc: Subject: PERFORCE change 102561 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 27 Jul 2006 14:25:16 -0000 http://perforce.freebsd.org/chv.cgi?CH=102561 Change 102561 by millert@millert_macbook on 2006/07/27 14:24:23 Initial import of sedarwin8 based on Mac OS X 10.4.6. Affected files ... .. //depot/projects/trustedbsd/sedarwin8/ERRATA#1 add .. //depot/projects/trustedbsd/sedarwin8/Makeconfig.in#1 add .. //depot/projects/trustedbsd/sedarwin8/Makefile#1 add .. //depot/projects/trustedbsd/sedarwin8/README#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/BootX/APPLE_LICENSE#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/BootX/Makefile#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/BootX/Makefile.postamble#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/BootX/Makefile.preamble#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/BootX/PB.project#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/BootX/bootx.tproj/Makefile#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/BootX/bootx.tproj/Makefile.postamble#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/BootX/bootx.tproj/Makefile.preamble#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/BootX/bootx.tproj/PB.project#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/BootX/bootx.tproj/bootinfo.hdr#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/BootX/bootx.tproj/ci.subproj/Control2.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/BootX/bootx.tproj/ci.subproj/MAC-PARTS.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/BootX/bootx.tproj/ci.subproj/Makefile#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/BootX/bootx.tproj/ci.subproj/Makefile.postamble#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/BootX/bootx.tproj/ci.subproj/Makefile.preamble#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/BootX/bootx.tproj/ci.subproj/PB.project#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/BootX/bootx.tproj/ci.subproj/ci.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/BootX/bootx.tproj/ci.subproj/ci_io.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/BootX/bootx.tproj/ci.subproj/sl_words.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/BootX/bootx.tproj/fs.subproj/CaseTables.h#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/BootX/bootx.tproj/fs.subproj/HFSCompare.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/BootX/bootx.tproj/fs.subproj/Makefile#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/BootX/bootx.tproj/fs.subproj/Makefile.postamble#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/BootX/bootx.tproj/fs.subproj/Makefile.preamble#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/BootX/bootx.tproj/fs.subproj/PB.project#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/BootX/bootx.tproj/fs.subproj/cache.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/BootX/bootx.tproj/fs.subproj/ext2fs.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/BootX/bootx.tproj/fs.subproj/ext2fs.h#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/BootX/bootx.tproj/fs.subproj/ext2fs_bswap.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/BootX/bootx.tproj/fs.subproj/ext2fs_dinode.h#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/BootX/bootx.tproj/fs.subproj/ext2fs_dir.h#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/BootX/bootx.tproj/fs.subproj/fs.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/BootX/bootx.tproj/fs.subproj/hfs.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/BootX/bootx.tproj/fs.subproj/md5c.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/BootX/bootx.tproj/fs.subproj/net.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/BootX/bootx.tproj/fs.subproj/ufs.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/BootX/bootx.tproj/fs.subproj/ufs_byteorder.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/BootX/bootx.tproj/fs.subproj/ufs_byteorder.h#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/BootX/bootx.tproj/include.subproj/Makefile#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/BootX/bootx.tproj/include.subproj/Makefile.postamble#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/BootX/bootx.tproj/include.subproj/Makefile.preamble#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/BootX/bootx.tproj/include.subproj/PB.project#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/BootX/bootx.tproj/include.subproj/boot_args.h#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/BootX/bootx.tproj/include.subproj/ci.h#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/BootX/bootx.tproj/include.subproj/device_tree.h#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/BootX/bootx.tproj/include.subproj/fs.h#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/BootX/bootx.tproj/include.subproj/libclite.h#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/BootX/bootx.tproj/include.subproj/sl.h#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/BootX/bootx.tproj/include.subproj/sl_words.h#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/BootX/bootx.tproj/libclite.subproj/Makefile#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/BootX/bootx.tproj/libclite.subproj/Makefile.postamble#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/BootX/bootx.tproj/libclite.subproj/Makefile.preamble#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/BootX/bootx.tproj/libclite.subproj/PB.project#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/BootX/bootx.tproj/libclite.subproj/bsearch.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/BootX/bootx.tproj/libclite.subproj/bswap.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/BootX/bootx.tproj/libclite.subproj/mem.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/BootX/bootx.tproj/libclite.subproj/prf.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/BootX/bootx.tproj/libclite.subproj/printf.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/BootX/bootx.tproj/libclite.subproj/sprintf.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/BootX/bootx.tproj/libclite.subproj/string.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/BootX/bootx.tproj/libclite.subproj/strtol.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/BootX/bootx.tproj/libclite.subproj/zalloc.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/BootX/bootx.tproj/sl.subproj/Makefile#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/BootX/bootx.tproj/sl.subproj/Makefile.postamble#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/BootX/bootx.tproj/sl.subproj/Makefile.preamble#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/BootX/bootx.tproj/sl.subproj/PB.project#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/BootX/bootx.tproj/sl.subproj/aes.h#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/BootX/bootx.tproj/sl.subproj/aescrypt.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/BootX/bootx.tproj/sl.subproj/aeskey.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/BootX/bootx.tproj/sl.subproj/aesopt.h#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/BootX/bootx.tproj/sl.subproj/aestab.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/BootX/bootx.tproj/sl.subproj/aestab.h#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/BootX/bootx.tproj/sl.subproj/appleboot.h#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/BootX/bootx.tproj/sl.subproj/bmdecompress.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/BootX/bootx.tproj/sl.subproj/clut.h#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/BootX/bootx.tproj/sl.subproj/device_tree.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/BootX/bootx.tproj/sl.subproj/display.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/BootX/bootx.tproj/sl.subproj/drivers.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/BootX/bootx.tproj/sl.subproj/elf.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/BootX/bootx.tproj/sl.subproj/elf.h#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/BootX/bootx.tproj/sl.subproj/failedboot.h#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/BootX/bootx.tproj/sl.subproj/lzss.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/BootX/bootx.tproj/sl.subproj/macho.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/BootX/bootx.tproj/sl.subproj/main.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/BootX/bootx.tproj/sl.subproj/netboot.h#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/BootX/bootx.tproj/sl.subproj/plist.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/BootX/bootx.tproj/sl.subproj/raid.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/BootX/dpkg/control#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/BootX/fcode-to-c.tproj/Makefile#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/BootX/fcode-to-c.tproj/Makefile.postamble#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/BootX/fcode-to-c.tproj/Makefile.preamble#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/BootX/fcode-to-c.tproj/PB.project#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/BootX/fcode-to-c.tproj/fcode-to-c.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/BootX/macho-to-xcoff.tproj/Makefile#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/BootX/macho-to-xcoff.tproj/Makefile.postamble#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/BootX/macho-to-xcoff.tproj/Makefile.preamble#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/BootX/macho-to-xcoff.tproj/PB.project#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/BootX/macho-to-xcoff.tproj/macho-to-xcoff.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/Libstreams/Makefile#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/Libstreams/Makefile.postamble#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/Libstreams/Makefile.preamble#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/Libstreams/NXLogError.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/Libstreams/PB.project#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/Libstreams/defs.h#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/Libstreams/except.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/Libstreams/file_funcs.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/Libstreams/globals.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/Libstreams/indir_ops.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/Libstreams/ipc_funcs.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/Libstreams/memory_funcs.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/Libstreams/streams.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/Libstreams/streams.h#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/Libstreams/streams_doprnt.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/Libstreams/streams_doscan.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/Libstreams/streams_internal.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/Libstreams/streamsextra.h#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/Libstreams/streamsimpl.h#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/Makefile#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/BSDmakefile#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/Makefile#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/adv_cmds.rtf#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/cap_mkdb.tproj/BSDmakefile#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/cap_mkdb.tproj/COMPINFO#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/cap_mkdb.tproj/Makefile#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/cap_mkdb.tproj/cap_mkdb.1#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/cap_mkdb.tproj/cap_mkdb.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/colldef.tproj/BSDmakefile#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/colldef.tproj/Makefile#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/colldef.tproj/colldef.1#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/colldef.tproj/common.h#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/colldef.tproj/fbsdcompat.h#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/colldef.tproj/locale/collate.h#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/colldef.tproj/parse.y#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/colldef.tproj/scan.l#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/dpkg/control#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/finger.tproj/BSDmakefile#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/finger.tproj/COMPINFO#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/finger.tproj/Makefile#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/finger.tproj/extern.h#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/finger.tproj/finger.1#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/finger.tproj/finger.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/finger.tproj/finger.conf.5#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/finger.tproj/finger.h#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/finger.tproj/lprint.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/finger.tproj/net.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/finger.tproj/pathnames.h#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/finger.tproj/sprint.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/finger.tproj/util.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/fingerd.tproj/BSDmakefile#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/fingerd.tproj/COMPINFO#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/fingerd.tproj/Makefile#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/fingerd.tproj/finger.plist#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/fingerd.tproj/fingerd.8#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/fingerd.tproj/fingerd.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/fingerd.tproj/pathnames.h#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/gencat.tproj/BSDmakefile#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/gencat.tproj/COMPINFO#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/gencat.tproj/Makefile#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/gencat.tproj/fbsdcompat.h#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/gencat.tproj/gencat.1#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/gencat.tproj/gencat.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/gencat.tproj/gencat.h#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/gencat.tproj/genlib.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/gencat.tproj/nls/msgcat.h#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/last.tproj/BSDmakefile#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/last.tproj/COMPINFO#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/last.tproj/Makefile#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/last.tproj/last.1#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/last.tproj/last.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/locale/BSDmakefile#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/locale/Makefile#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/locale/locale.1#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/locale/locale.cc#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/localedef/BSDmakefile#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/localedef/Makefile#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/localedef/charmap.p-1#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/localedef/charmap.p-2#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/localedef/charmap.test#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/localedef/def.p-1#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/localedef/def.p-2#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/localedef/localedef#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/localedef/localedef.1#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/lsvfs.tproj/BSDmakefile#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/lsvfs.tproj/Makefile#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/lsvfs.tproj/lsvfs.1#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/lsvfs.tproj/lsvfs.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/md.tproj/BSDmakefile#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/md.tproj/COMPINFO#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/md.tproj/Makefile#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/md.tproj/md.1#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/md.tproj/md.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/mklocale.tproj/BSDmakefile#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/mklocale.tproj/COMPINFO#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/mklocale.tproj/Makefile#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/mklocale.tproj/extern.h#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/mklocale.tproj/fbsdcompat.h#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/mklocale.tproj/ldef.h#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/mklocale.tproj/lex.l#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/mklocale.tproj/mklocale.1#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/mklocale.tproj/yacc.y#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/mklocale.tproj/yacc.y.patch#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/mksymroot#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/ps.tproj/BSDmakefile#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/ps.tproj/COMPINFO#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/ps.tproj/Makefile#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/ps.tproj/extern.h#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/ps.tproj/fmt.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/ps.tproj/h.template#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/ps.tproj/keyword.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/ps.tproj/m.template#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/ps.tproj/nlist.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/ps.tproj/print.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/ps.tproj/ps.1#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/ps.tproj/ps.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/ps.tproj/ps.h#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/ps.tproj/tasks.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/pstat.tproj/BSDmakefile#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/pstat.tproj/COMPINFO#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/pstat.tproj/Makefile#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/pstat.tproj/pstat.8#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/pstat.tproj/pstat.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/stty.tproj/BSDmakefile#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/stty.tproj/COMPINFO#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/stty.tproj/Makefile#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/stty.tproj/cchar.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/stty.tproj/extern.h#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/stty.tproj/gfmt.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/stty.tproj/key.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/stty.tproj/modes.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/stty.tproj/print.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/stty.tproj/stty.1#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/stty.tproj/stty.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/stty.tproj/stty.h#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/stty.tproj/util.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/tabs.tproj/BSDmakefile#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/tabs.tproj/Makefile#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/tabs.tproj/tabs.1#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/tabs.tproj/tabs.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/tty.tproj/BSDmakefile#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/tty.tproj/COMPINFO#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/tty.tproj/Makefile#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/tty.tproj/tty.1#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/tty.tproj/tty.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/BSDmakefile#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/Makefile#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/colldef/BSDmakefile#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/colldef/Makefile#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/colldef/README#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/colldef/be_BY.CP1131.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/colldef/be_BY.CP1251.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/colldef/be_BY.ISO8859-5.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/colldef/bg_BG.CP1251.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/colldef/ca_ES.ISO8859-1.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/colldef/ca_ES.ISO8859-15.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/colldef/cs_CZ.ISO8859-2.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/colldef/de_DE.ISO8859-1.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/colldef/de_DE.ISO8859-15.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/colldef/el_GR.ISO8859-7.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/colldef/en_DK.example#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/colldef/es_ES.ISO8859-1.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/colldef/es_ES.ISO8859-15.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/colldef/et_EE.ISO8859-15.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/colldef/hi_IN.ISCII-DEV.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/colldef/hy_AM.ARMSCII-8.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/colldef/is_IS.ISO8859-1.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/colldef/is_IS.ISO8859-15.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/colldef/kk_KZ.PT154.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/colldef/la_LN.ISO8859-1.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/colldef/la_LN.ISO8859-15.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/colldef/la_LN.ISO8859-2.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/colldef/la_LN.ISO8859-4.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/colldef/la_LN.US-ASCII.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/colldef/lt_LT.ISO8859-13.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/colldef/lt_LT.ISO8859-4.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/colldef/map.ARMSCII-8#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/colldef/map.CP1131#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/colldef/map.CP1251#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/colldef/map.CP866#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/colldef/map.ISCII-DEV#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/colldef/map.ISO8859-1#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/colldef/map.ISO8859-13#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/colldef/map.ISO8859-15#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/colldef/map.ISO8859-2#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/colldef/map.ISO8859-4#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/colldef/map.ISO8859-5#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/colldef/map.ISO8859-7#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/colldef/map.KOI8-R#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/colldef/map.KOI8-U#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/colldef/map.PT154#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/colldef/pl_PL.ISO8859-2.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/colldef/ru_RU.CP1251.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/colldef/ru_RU.CP866.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/colldef/ru_RU.ISO8859-5.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/colldef/ru_RU.KOI8-R.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/colldef/sl_SI.ISO8859-2.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/colldef/sr_YU.ISO8859-5.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/colldef/sv_SE.ISO8859-1.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/colldef/sv_SE.ISO8859-15.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/colldef/uk_UA.ISO8859-5.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/colldef/uk_UA.KOI8-U.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/dummy.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/mklocale/BSDmakefile#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/mklocale/Makefile#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/mklocale/README.locale_name#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/mklocale/UTF-8.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/mklocale/am_ET.UTF-8.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/mklocale/be_BY.CP1131.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/mklocale/bg_BG.CP1251.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/mklocale/el_GR.ISO8859-7.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/mklocale/hi_IN.ISCII-DEV.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/mklocale/hy_AM.ARMSCII-8.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/mklocale/ja_JP.SJIS.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/mklocale/ja_JP.eucJP.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/mklocale/kk_KZ.PT154.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/mklocale/ko_KR.CP949.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/mklocale/ko_KR.eucKR.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/mklocale/la_LN.ISO8859-1.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/mklocale/la_LN.ISO8859-15.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/mklocale/la_LN.ISO8859-2.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/mklocale/la_LN.ISO8859-4.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/mklocale/la_LN.US-ASCII.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/mklocale/lt_LT.ISO8859-13.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/mklocale/ru_RU.CP866.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/mklocale/ru_RU.ISO8859-5.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/mklocale/ru_RU.KOI8-R.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/mklocale/uk_UA.KOI8-U.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/mklocale/zh_CN.GB18030.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/mklocale/zh_CN.GB2312.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/mklocale/zh_CN.GBK.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/mklocale/zh_CN.eucCN.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/mklocale/zh_HK.Big5HKSCS.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/mklocale/zh_TW.Big5.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/monetdef/BSDmakefile#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/monetdef/Makefile#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/monetdef/af_ZA.ISO8859-1.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/monetdef/am_ET.UTF-8.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/monetdef/be_BY.CP1131.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/monetdef/be_BY.CP1251.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/monetdef/be_BY.ISO8859-5.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/monetdef/be_BY.UTF-8.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/monetdef/bg_BG.CP1251.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/monetdef/bg_BG.UTF-8.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/monetdef/ca_ES.ISO8859-1.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/monetdef/cs_CZ.ISO8859-2.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/monetdef/cs_CZ.UTF-8.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/monetdef/da_DK.ISO8859-1.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/monetdef/de_AT.ISO8859-1.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/monetdef/de_CH.ISO8859-1.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/monetdef/de_DE.ISO8859-1.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/monetdef/el_GR.ISO8859-7.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/monetdef/en_AU.ISO8859-1.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/monetdef/en_CA.ISO8859-1.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/monetdef/en_GB.ISO8859-1.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/monetdef/en_GB.UTF-8.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/monetdef/en_IE.UTF-8.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/monetdef/en_NZ.ISO8859-1.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/monetdef/en_US.ISO8859-1.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/monetdef/es_ES.ISO8859-1.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/monetdef/et_EE.ISO8859-15.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/monetdef/fi_FI.ISO8859-1.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/monetdef/fr_BE.ISO8859-1.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/monetdef/fr_CA.ISO8859-1.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/monetdef/fr_FR.ISO8859-1.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/monetdef/he_IL.UTF-8.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/monetdef/hi_IN.ISCII-DEV.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/monetdef/hr_HR.ISO8859-2.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/monetdef/hu_HU.ISO8859-2.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/monetdef/hy_AM.ARMSCII-8.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/monetdef/hy_AM.UTF-8.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/monetdef/is_IS.ISO8859-1.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/monetdef/it_IT.ISO8859-1.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/monetdef/ja_JP.UTF-8.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/monetdef/ja_JP.eucJP.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/monetdef/kk_KZ.PT154.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/monetdef/kk_KZ.UTF-8.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/monetdef/ko_KR.UTF-8.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/monetdef/ko_KR.eucKR.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/monetdef/lt_LT.ISO8859-13.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/monetdef/nl_BE.ISO8859-1.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/monetdef/nl_NL.ISO8859-1.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/monetdef/no_NO.ISO8859-1.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/monetdef/pl_PL.ISO8859-2.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/monetdef/pl_PL.UTF-8.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/monetdef/pt_BR.ISO8859-1.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/monetdef/pt_PT.ISO8859-1.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/monetdef/ro_RO.ISO8859-2.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/monetdef/ru_RU.CP1251.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/monetdef/ru_RU.CP866.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/monetdef/ru_RU.ISO8859-5.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/monetdef/ru_RU.KOI8-R.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/monetdef/ru_RU.UTF-8.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/monetdef/sk_SK.ISO8859-2.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/monetdef/sl_SI.ISO8859-2.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/monetdef/sr_YU.ISO8859-2.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/monetdef/sr_YU.ISO8859-5.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/monetdef/sr_YU.UTF-8.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/monetdef/sv_SE.ISO8859-1.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/monetdef/tr_TR.ISO8859-9.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/monetdef/uk_UA.ISO8859-5.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/monetdef/uk_UA.KOI8-U.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/monetdef/uk_UA.UTF-8.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/monetdef/zh_CN.GB18030.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/monetdef/zh_CN.GB2312.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/monetdef/zh_CN.UTF-8.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/monetdef/zh_CN.eucCN.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/monetdef/zh_HK.UTF-8.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/monetdef/zh_TW.Big5.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/msgdef/BSDmakefile#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/msgdef/Makefile#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/msgdef/af_ZA.ISO8859-1.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/msgdef/am_ET.UTF-8.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/msgdef/be_BY.CP1131.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/msgdef/be_BY.CP1251.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/msgdef/be_BY.ISO8859-5.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/msgdef/be_BY.UTF-8.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/msgdef/bg_BG.CP1251.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/msgdef/bg_BG.UTF-8.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/msgdef/ca_ES.ISO8859-1.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/msgdef/cs_CZ.ISO8859-2.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/msgdef/da_DK.ISO8859-1.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/msgdef/de_DE.ISO8859-1.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/msgdef/el_GR.ISO8859-7.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/msgdef/el_GR.UTF-8.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/msgdef/en_CA.ISO8859-1.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/msgdef/en_GB.ISO8859-1.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/msgdef/en_US.ISO8859-1.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/msgdef/es_ES.ISO8859-1.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/msgdef/et_EE.ISO8859-15.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/msgdef/eu_ES.ISO8859-1.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/msgdef/fi_FI.ISO8859-1.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/msgdef/fr_BE.ISO8859-1.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/msgdef/fr_CH.ISO8859-1.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/msgdef/fr_FR.ISO8859-1.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/msgdef/he_IL.UTF-8.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/msgdef/hi_IN.ISCII-DEV.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/msgdef/hr_HR.ISO8859-2.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/msgdef/hu_HU.ISO8859-2.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/msgdef/hy_AM.ARMSCII-8.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/msgdef/hy_AM.UTF-8.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/msgdef/is_IS.ISO8859-1.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/msgdef/it_IT.ISO8859-1.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/msgdef/ja_JP.SJIS.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/msgdef/ja_JP.UTF-8.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/msgdef/ja_JP.eucJP.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/msgdef/kk_KZ.PT154.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/msgdef/kk_KZ.UTF-8.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/msgdef/ko_KR.eucKR.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/msgdef/lt_LT.ISO8859-13.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/msgdef/nl_NL.ISO8859-1.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/msgdef/no_NO.ISO8859-1.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/msgdef/pl_PL.ISO8859-2.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/msgdef/pt_PT.ISO8859-1.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/msgdef/ro_RO.ISO8859-2.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/msgdef/ru_RU.CP1251.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/msgdef/ru_RU.CP866.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/msgdef/ru_RU.ISO8859-5.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/msgdef/ru_RU.KOI8-R.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/msgdef/ru_RU.UTF-8.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/msgdef/sl_SI.ISO8859-2.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/msgdef/sr_YU.ISO8859-2.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/msgdef/sr_YU.ISO8859-5.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/msgdef/sr_YU.UTF-8.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/msgdef/sv_SE.ISO8859-1.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/msgdef/tr_TR.ISO8859-9.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/msgdef/uk_UA.ISO8859-5.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/msgdef/uk_UA.KOI8-U.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/msgdef/uk_UA.UTF-8.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/msgdef/zh_CN.GB18030.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/msgdef/zh_CN.GB2312.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/msgdef/zh_CN.UTF-8.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/msgdef/zh_CN.eucCN.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/msgdef/zh_TW.Big5.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/msgdef/zh_TW.UTF-8.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/numericdef/BSDmakefile#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/numericdef/Makefile#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/numericdef/af_ZA.ISO8859-1.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/numericdef/am_ET.UTF-8.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/numericdef/be_BY.CP1251.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/numericdef/bg_BG.CP1251.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/numericdef/ca_ES.ISO8859-1.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/numericdef/cs_CZ.ISO8859-2.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/numericdef/da_DK.ISO8859-1.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/numericdef/de_DE.ISO8859-1.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/numericdef/el_GR.ISO8859-7.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/numericdef/en_US.ISO8859-1.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/numericdef/es_ES.ISO8859-1.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/numericdef/et_EE.ISO8859-15.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/numericdef/eu_ES.ISO8859-1.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/numericdef/fi_FI.ISO8859-1.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/numericdef/fr_BE.ISO8859-1.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/numericdef/fr_FR.ISO8859-1.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/numericdef/hi_IN.ISCII-DEV.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/numericdef/hr_HR.ISO8859-2.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/numericdef/hu_HU.ISO8859-2.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/numericdef/hy_AM.ARMSCII-8.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/numericdef/is_IS.ISO8859-1.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/numericdef/it_IT.ISO8859-1.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/numericdef/ja_JP.eucJP.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/numericdef/kk_KZ.PT154.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/numericdef/ko_KR.eucKR.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/numericdef/lt_LT.ISO8859-13.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/numericdef/nl_NL.ISO8859-1.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/numericdef/no_NO.ISO8859-1.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/numericdef/pl_PL.ISO8859-2.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/numericdef/pt_BR.ISO8859-1.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/numericdef/pt_PT.ISO8859-1.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/numericdef/ro_RO.ISO8859-2.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/numericdef/ru_RU.KOI8-R.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/numericdef/sk_SK.ISO8859-2.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/numericdef/sl_SI.ISO8859-2.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/numericdef/sr_YU.ISO8859-2.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/numericdef/sr_YU.ISO8859-5.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/numericdef/sv_SE.ISO8859-1.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/numericdef/tr_TR.ISO8859-9.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/numericdef/uk_UA.KOI8-U.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/numericdef/zh_CN.eucCN.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/timedef/BSDmakefile#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/timedef/Makefile#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/timedef/am_ET.UTF-8.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/timedef/be_BY.CP1131.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/timedef/be_BY.CP1251.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/timedef/be_BY.ISO8859-5.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/timedef/be_BY.UTF-8.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/timedef/bg_BG.CP1251.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/timedef/bg_BG.UTF-8.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/timedef/ca_ES.ISO8859-1.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/timedef/ca_ES.UTF-8.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/timedef/cs_CZ.ISO8859-2.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/timedef/cs_CZ.UTF-8.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/timedef/da_DK.ISO8859-1.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/timedef/da_DK.UTF-8.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/timedef/de_AT.ISO8859-1.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/timedef/de_AT.UTF-8.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/timedef/de_DE.ISO8859-1.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/timedef/de_DE.UTF-8.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/timedef/el_GR.ISO8859-7.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/timedef/el_GR.UTF-8.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/timedef/en_GB.ISO8859-1.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/timedef/en_US.ISO8859-1.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/timedef/es_ES.ISO8859-1.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/timedef/es_ES.UTF-8.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/timedef/et_EE.ISO8859-15.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/timedef/et_EE.UTF-8.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/timedef/eu_ES.ISO8859-1.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/timedef/fi_FI.ISO8859-1.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/timedef/fi_FI.UTF-8.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/timedef/fr_FR.ISO8859-1.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/timedef/fr_FR.UTF-8.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/timedef/he_IL.UTF-8.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/timedef/hi_IN.ISCII-DEV.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/timedef/hr_HR.ISO8859-2.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/timedef/hr_HR.UTF-8.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/timedef/hu_HU.ISO8859-2.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/timedef/hu_HU.UTF-8.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/timedef/hy_AM.ARMSCII-8.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/timedef/hy_AM.UTF-8.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/timedef/is_IS.ISO8859-1.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/timedef/is_IS.UTF-8.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/timedef/it_IT.ISO8859-1.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/timedef/it_IT.UTF-8.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/timedef/ja_JP.SJIS.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/timedef/ja_JP.UTF-8.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/timedef/ja_JP.eucJP.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/timedef/kk_KZ.PT154.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/timedef/kk_KZ.UTF-8.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/timedef/ko_KR.UTF-8.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/timedef/ko_KR.eucKR.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/timedef/la_LN.ISO8859-1.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/timedef/lt_LT.ISO8859-13.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/timedef/lt_LT.ISO8859-4.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/timedef/lt_LT.UTF-8.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/timedef/nl_NL.ISO8859-1.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/timedef/no_NO.ISO8859-1.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/timedef/no_NO.UTF-8.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/timedef/pl_PL.ISO8859-2.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/timedef/pl_PL.UTF-8.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/timedef/pt_BR.ISO8859-1.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/timedef/pt_BR.UTF-8.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/timedef/pt_PT.ISO8859-1.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/timedef/pt_PT.UTF-8.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/timedef/ro_RO.ISO8859-2.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/timedef/ro_RO.UTF-8.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/timedef/ru_RU.CP1251.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/timedef/ru_RU.CP866.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/timedef/ru_RU.ISO8859-5.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/timedef/ru_RU.KOI8-R.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/timedef/ru_RU.UTF-8.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/timedef/sk_SK.ISO8859-2.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/timedef/sk_SK.UTF-8.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/timedef/sl_SI.ISO8859-2.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/timedef/sl_SI.UTF-8.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/timedef/sr_YU.ISO8859-2.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/timedef/sr_YU.ISO8859-5.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/timedef/sr_YU.UTF-8.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/timedef/sv_SE.ISO8859-1.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/timedef/sv_SE.UTF-8.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/timedef/tr_TR.ISO8859-9.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/timedef/tr_TR.UTF-8.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/timedef/uk_UA.ISO8859-5.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/timedef/uk_UA.KOI8-U.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/timedef/uk_UA.UTF-8.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/timedef/zh_CN.GB18030.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/timedef/zh_CN.GB2312.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/timedef/zh_CN.UTF-8.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/timedef/zh_CN.eucCN.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/timedef/zh_TW.Big5.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/timedef/zh_TW.UTF-8.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/whois.tproj/BSDmakefile#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/whois.tproj/COMPINFO#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/whois.tproj/Makefile#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/whois.tproj/whois.1#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/whois.tproj/whois.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/bootstrap_cmds/Makefile#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/bootstrap_cmds/Makefile.postamble#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/bootstrap_cmds/Makefile.preamble#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/bootstrap_cmds/PB.project#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/bootstrap_cmds/config.tproj/Makefile#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/bootstrap_cmds/config.tproj/Makefile.postamble#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/bootstrap_cmds/config.tproj/Makefile.preamble#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/bootstrap_cmds/config.tproj/PB.project#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/bootstrap_cmds/config.tproj/config.h#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/bootstrap_cmds/config.tproj/externs.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/bootstrap_cmds/config.tproj/lexer.l#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/bootstrap_cmds/config.tproj/main.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/bootstrap_cmds/config.tproj/mkglue.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/bootstrap_cmds/config.tproj/mkheaders.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/bootstrap_cmds/config.tproj/mkioconf.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/bootstrap_cmds/config.tproj/mkmakefile.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/bootstrap_cmds/config.tproj/mkswapconf.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/bootstrap_cmds/config.tproj/openp.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/bootstrap_cmds/config.tproj/parser.y#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/bootstrap_cmds/config.tproj/searchp.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/bootstrap_cmds/decomment.tproj/Makefile#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/bootstrap_cmds/decomment.tproj/Makefile.postamble#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/bootstrap_cmds/decomment.tproj/Makefile.preamble#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/bootstrap_cmds/decomment.tproj/PB.project#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/bootstrap_cmds/decomment.tproj/decomment.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/bootstrap_cmds/migcom.tproj/Makefile#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/bootstrap_cmds/migcom.tproj/Makefile.postamble#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/bootstrap_cmds/migcom.tproj/Makefile.preamble#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/bootstrap_cmds/migcom.tproj/PB.project#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/bootstrap_cmds/migcom.tproj/alloc.h#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/bootstrap_cmds/migcom.tproj/error.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/bootstrap_cmds/migcom.tproj/error.h#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/bootstrap_cmds/migcom.tproj/flask.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/bootstrap_cmds/migcom.tproj/global.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/bootstrap_cmds/migcom.tproj/global.h#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/bootstrap_cmds/migcom.tproj/header.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/bootstrap_cmds/migcom.tproj/i386/mig_machine.h#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/bootstrap_cmds/migcom.tproj/lexxer.h#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/bootstrap_cmds/migcom.tproj/lexxer.l#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/bootstrap_cmds/migcom.tproj/mig.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/bootstrap_cmds/migcom.tproj/mig.sh#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/bootstrap_cmds/migcom.tproj/mig_machine.h#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/bootstrap_cmds/migcom.tproj/parser.y#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/bootstrap_cmds/migcom.tproj/ppc/mig_machine.h#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/bootstrap_cmds/migcom.tproj/routine.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/bootstrap_cmds/migcom.tproj/routine.h#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/bootstrap_cmds/migcom.tproj/server.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/bootstrap_cmds/migcom.tproj/statement.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/bootstrap_cmds/migcom.tproj/statement.h#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/bootstrap_cmds/migcom.tproj/strdefs.h#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/bootstrap_cmds/migcom.tproj/string.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/bootstrap_cmds/migcom.tproj/type.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/bootstrap_cmds/migcom.tproj/type.h#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/bootstrap_cmds/migcom.tproj/user.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/bootstrap_cmds/migcom.tproj/utils.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/bootstrap_cmds/migcom.tproj/utils.h#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/bootstrap_cmds/migcom.tproj/write.h#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/bootstrap_cmds/relpath.tproj/Makefile#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/bootstrap_cmds/relpath.tproj/Makefile.postamble#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/bootstrap_cmds/relpath.tproj/Makefile.preamble#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/bootstrap_cmds/relpath.tproj/PB.project#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/bootstrap_cmds/relpath.tproj/relpath.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/bootstrap_cmds/vers_string.1#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/bootstrap_cmds/vers_string.sh#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/bsm/Makefile#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/bsm/bsm/Makefile#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/bsm/bsm/bin/Makefile#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/bsm/bsm/bin/auditreduce.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/bsm/bsm/bin/auditreduce.h#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/bsm/bsm/bin/praudit.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/bsm/bsm/etc/Makefile#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/bsm/bsm/etc/audit_class#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/bsm/bsm/etc/audit_control#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/bsm/bsm/etc/audit_event#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/bsm/bsm/etc/audit_user#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/bsm/bsm/etc/audit_warn#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/bsm/bsm/lib/Makefile#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/bsm/bsm/lib/audit_uevents.h#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/bsm/bsm/lib/bsm_audit.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/bsm/bsm/lib/bsm_class.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/bsm/bsm/lib/bsm_control.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/bsm/bsm/lib/bsm_event.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/bsm/bsm/lib/bsm_flags.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/bsm/bsm/lib/bsm_io.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/bsm/bsm/lib/bsm_mask.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/bsm/bsm/lib/bsm_notify.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/bsm/bsm/lib/bsm_token.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/bsm/bsm/lib/bsm_user.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/bsm/bsm/lib/lib_wrappers.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/bsm/bsm/lib/libbsm.h#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/bsm/bsm/man/Makefile#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/bsm/bsm/man/audit_class.5#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/bsm/bsm/man/audit_control.5#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/bsm/bsm/man/audit_event.5#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/bsm/bsm/man/audit_user.5#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/bsm/bsm/man/audit_warn.5#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/bsm/bsm/man/auditreduce.1#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/bsm/bsm/man/praudit.1#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/bsm/bsm/test/Makefile#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/bsm/bsm/test/bsm_lib_test.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/bsm/bsm/test/bsm_tok_test.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/build/Mig.mk#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/build/PolicyKext.mk#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/build/mkPolicyInfoPlist.sh#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/build/policy-ops.gdb#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/cctools/APPLE_LICENSE#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/cctools/Makefile#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/cctools/PB.project#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/cctools/RelNotes/CompilerTools.html#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/cctools/RelNotes/FatFiles.rtf#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/cctools/RelNotes/Makefile#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/cctools/RelNotes/Prebinding.html#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/cctools/RelNotes/Private_CompilerTools.html#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/cctools/ar/Makefile#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/cctools/ar/append.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/cctools/ar/ar.1#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/cctools/ar/ar.5#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/cctools/ar/ar.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/cctools/ar/archive.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/cctools/ar/archive.h#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/cctools/ar/contents.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/cctools/ar/delete.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/cctools/ar/extern.h#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/cctools/ar/extract.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/cctools/ar/misc.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/cctools/ar/move.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/cctools/ar/notes#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/cctools/ar/pathnames.h#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/cctools/ar/print.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/cctools/ar/replace.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/cctools/as/COPYING#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/cctools/as/Makefile#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/cctools/as/app.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/cctools/as/app.h#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/cctools/as/as.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/cctools/as/as.h#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/cctools/as/atof-generic.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/cctools/as/atof-ieee.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/cctools/as/atof-ieee.h#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/cctools/as/bignum.h#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/cctools/as/driver.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/cctools/as/expr.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/cctools/as/expr.h#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/cctools/as/fixes.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/cctools/as/fixes.h#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/cctools/as/flonum-const.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/cctools/as/flonum-copy.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/cctools/as/flonum-mult.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/cctools/as/flonum.h#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/cctools/as/frags.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/cctools/as/frags.h#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/cctools/as/hash.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/cctools/as/hash.h#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/cctools/as/hex-value.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/cctools/as/hex_value.h#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/cctools/as/hppa-aux.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/cctools/as/hppa-aux.h#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/cctools/as/hppa-check.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/cctools/as/hppa-opcode.h#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/cctools/as/hppa.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/cctools/as/i386-check.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/cctools/as/i386-opcode.h#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/cctools/as/i386.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/cctools/as/i386.h#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/cctools/as/i860-check.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/cctools/as/i860-opcode.h#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/cctools/as/i860.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/cctools/as/input-file.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/cctools/as/input-file.h#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/cctools/as/input-scrub.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/cctools/as/input-scrub.h#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/cctools/as/layout.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/cctools/as/layout.h#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/cctools/as/m68k-check.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/cctools/as/m68k-opcode.h#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/cctools/as/m68k.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/cctools/as/m88k-check.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/cctools/as/m88k-opcode.h#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/cctools/as/m88k.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/cctools/as/make.defs#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/cctools/as/make_defs.h#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/cctools/as/md.h#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/cctools/as/messages.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/cctools/as/messages.h#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/cctools/as/notes#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/cctools/as/obstack.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/cctools/as/obstack.h#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/cctools/as/ppc-check.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/cctools/as/ppc-opcode.h#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/cctools/as/ppc.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/cctools/as/read.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/cctools/as/read.h#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/cctools/as/relax.h#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/cctools/as/sections.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/cctools/as/sections.h#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/cctools/as/sparc-check.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/cctools/as/sparc-opcode.h#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/cctools/as/sparc.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/cctools/as/struc-symbol.h#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/cctools/as/symbols.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/cctools/as/symbols.h#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/cctools/as/write_object.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/cctools/as/write_object.h#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/cctools/as/xmalloc.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/cctools/as/xmalloc.h#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/cctools/cbtlibs/Makefile#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/cctools/cbtlibs/libsyminfo.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/cctools/cbtlibs/notes#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/cctools/dyld/Makefile#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/cctools/dyld/allocate.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/cctools/dyld/allocate.h#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/cctools/dyld/cache_flush.s#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/cctools/dyld/cthread_internals.h#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/cctools/dyld/debug.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/cctools/dyld/debug.h#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/cctools/dyld/dyld_api#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/cctools/dyld/dyld_debug.defs#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/cctools/dyld/dyld_debug_defs.h#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/cctools/dyld/dyld_event.defs#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/cctools/dyld/dyld_event_MsgError.h#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/cctools/dyld/dyld_event_defs.h#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/cctools/dyld/dyld_init.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/cctools/dyld/dyld_init.h#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/cctools/dyld/dyld_libfuncs.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/cctools/dyld/dyld_prebind.defs#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/cctools/dyld/dyld_prebind_defs.h#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/cctools/dyld/dyld_reloc.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/cctools/dyld/dyld_start.s#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/cctools/dyld/entry_point.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/cctools/dyld/entry_point.h#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/cctools/dyld/errors.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/cctools/dyld/errors.h#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/cctools/dyld/fp_save_restore.h#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/cctools/dyld/fp_save_restore.s#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/cctools/dyld/generic_reloc.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/cctools/dyld/getsecbyname.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/cctools/dyld/gmon.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/cctools/dyld/halt.s#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/cctools/dyld/hppa_reloc.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/cctools/dyld/images.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/cctools/dyld/images.h#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/cctools/dyld/inline_bsearch.h#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/cctools/dyld/inline_strcmp.h#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/cctools/dyld/lock.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/cctools/dyld/lock.h#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/cctools/dyld/machdep_lock.s#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/cctools/dyld/malloc.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/cctools/dyld/mig_support.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/cctools/dyld/mod_init_funcs.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/cctools/dyld/mod_init_funcs.h#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/cctools/dyld/notes#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/cctools/dyld/ppc_reloc.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/cctools/dyld/register_funcs.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/cctools/dyld/register_funcs.h#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/cctools/dyld/reloc.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/cctools/dyld/reloc.h#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/cctools/dyld/section_order.s#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/cctools/dyld/sparc_reloc.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/cctools/dyld/stub_binding_helper.s#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/cctools/dyld/symbols.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/cctools/dyld/symbols.h#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/cctools/dyld/trace.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/cctools/dyld/trace.h#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/cctools/dyld/zoneprotect.h#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/cctools/file/Makefile#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/cctools/file/apprentice.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/cctools/file/ascmagic.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/cctools/file/compress.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/cctools/file/file.1#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/cctools/file/file.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/cctools/file/file.h#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/cctools/file/fsmagic.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/cctools/file/internat.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/cctools/file/is_tar.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/cctools/file/magdir/386bsd#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/cctools/file/magdir/Header#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/cctools/file/magdir/Localstuff#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/cctools/file/magdir/OpenBSD#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/cctools/file/magdir/alliant#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/cctools/file/magdir/alpha#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/cctools/file/magdir/amanda#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/cctools/file/magdir/amigaos#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/cctools/file/magdir/animation#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/cctools/file/magdir/apl#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/cctools/file/magdir/apple#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/cctools/file/magdir/archive#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/cctools/file/magdir/asterix#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/cctools/file/magdir/att3b#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/cctools/file/magdir/audio#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/cctools/file/magdir/blit#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/cctools/file/magdir/bsdi#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/cctools/file/magdir/c-lang#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/cctools/file/magdir/chi#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/cctools/file/magdir/clipper#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/cctools/file/magdir/commands#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/cctools/file/magdir/compress#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/cctools/file/magdir/convex#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/cctools/file/magdir/database#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/cctools/file/magdir/diamond#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/cctools/file/magdir/diff#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/cctools/file/magdir/digital#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/cctools/file/magdir/dump#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/cctools/file/magdir/elf#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/cctools/file/magdir/encore#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/cctools/file/magdir/filesystems#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/cctools/file/magdir/fonts#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/cctools/file/magdir/frame#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/cctools/file/magdir/freebsd#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/cctools/file/magdir/hp#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/cctools/file/magdir/ibm370#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/cctools/file/magdir/ibm6000#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/cctools/file/magdir/iff#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/cctools/file/magdir/images#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/cctools/file/magdir/intel#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/cctools/file/magdir/interleaf#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/cctools/file/magdir/ispell#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/cctools/file/magdir/java#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/cctools/file/magdir/karma#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/cctools/file/magdir/lex#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/cctools/file/magdir/lif#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/cctools/file/magdir/linux#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/cctools/file/magdir/lisp#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/cctools/file/magdir/mach#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/cctools/file/magdir/macintosh#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/cctools/file/magdir/magic#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/cctools/file/magdir/mail.news#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/cctools/file/magdir/mirage#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/cctools/file/magdir/mkid#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/cctools/file/magdir/mmdf#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/cctools/file/magdir/motorola#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/cctools/file/magdir/msdos#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/cctools/file/magdir/ncr#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/cctools/file/magdir/news#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/cctools/file/magdir/olf#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/cctools/file/magdir/os9#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/cctools/file/magdir/osf1#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/cctools/file/magdir/pbm#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/cctools/file/magdir/pdf#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/cctools/file/magdir/pdp#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/cctools/file/magdir/pgp#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/cctools/file/magdir/pkgadd#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/cctools/file/magdir/plus5#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/cctools/file/magdir/printer#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/cctools/file/magdir/psdbms#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/cctools/file/magdir/pyramid#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/cctools/file/magdir/rpm#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/cctools/file/magdir/rtf#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/cctools/file/magdir/sc#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/cctools/file/magdir/sccs#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/cctools/file/magdir/sendmail#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/cctools/file/magdir/sequent#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/cctools/file/magdir/sgi#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/cctools/file/magdir/sgml#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/cctools/file/magdir/sniffer#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/cctools/file/magdir/softquad#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/cctools/file/magdir/sun#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/cctools/file/magdir/terminfo#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/cctools/file/magdir/tex#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/cctools/file/magdir/timezone#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/cctools/file/magdir/troff#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/cctools/file/magdir/typeset#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/cctools/file/magdir/unknown#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/cctools/file/magdir/uuencode#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/cctools/file/magdir/varied.out#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/cctools/file/magdir/vax#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/cctools/file/magdir/visx#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/cctools/file/magdir/vms#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/cctools/file/magdir/xenix#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/cctools/file/magdir/zilog#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/cctools/file/magdir/zyxel#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/cctools/file/magic.5#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/cctools/file/names.h#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/cctools/file/notes#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/cctools/file/patchlevel.h#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/cctools/file/print.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/cctools/file/readelf.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/cctools/file/readelf.h#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/cctools/file/readfat.c#1 add >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Thu Jul 27 15:56:07 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id AA20716A4DE; Thu, 27 Jul 2006 15:56:07 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 6C8A916A4DA for ; Thu, 27 Jul 2006 15:56:07 +0000 (UTC) (envelope-from cognet@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 8346243D72 for ; Thu, 27 Jul 2006 15:56:01 +0000 (GMT) (envelope-from cognet@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k6RFu1CY087816 for ; Thu, 27 Jul 2006 15:56:01 GMT (envelope-from cognet@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k6RFu19B087811 for perforce@freebsd.org; Thu, 27 Jul 2006 15:56:01 GMT (envelope-from cognet@freebsd.org) Date: Thu, 27 Jul 2006 15:56:01 GMT Message-Id: <200607271556.k6RFu19B087811@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to cognet@freebsd.org using -f From: Olivier Houchard To: Perforce Change Reviews Cc: Subject: PERFORCE change 102564 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 27 Jul 2006 15:56:07 -0000 http://perforce.freebsd.org/chv.cgi?CH=102564 Change 102564 by cognet@cognet on 2006/07/27 15:55:15 New toolchain patchset : this one moves all the modified bits from contrib/ to gnu/, as patches or new files, so contrib-arm.diff is no longer needed. I tested it and was able to produce both LE and BE worlds. It should just be applied to the userland bits in this branch, but I have no time to do that right now. Affected files ... .. //depot/projects/arm/contrib-arm.diff#7 delete .. //depot/projects/arm/gnu-arm.diff#18 edit Differences ... ==== //depot/projects/arm/gnu-arm.diff#18 (text+ko) ==== @@ -93,59 +93,131 @@ +#include "tc-arm.h" Index: gnu/usr.bin/binutils/ld/Makefile.arm =================================================================== -RCS file: gnu/usr.bin/binutils/ld/Makefile.arm -diff -N gnu/usr.bin/binutils/ld/Makefile.arm ---- ld.orig/Makefile.arm Tue Jul 25 11:25:14 2006 -+++ ld/Makefile.arm Tue Jul 25 11:27:44 2006 -@@ -1,6 +1,10 @@ +RCS file: /cognet/ncvs/src/gnu/usr.bin/binutils/ld/Makefile.arm,v +retrieving revision 1.1 +diff -u -p -r1.1 Makefile.arm +--- gnu/usr.bin/binutils/ld/Makefile.arm 22 Jul 2006 14:36:15 -0000 1.1 ++++ gnu/usr.bin/binutils/ld/Makefile.arm 26 Jul 2006 21:47:53 -0000 +@@ -1,12 +1,17 @@ # $FreeBSD: src/gnu/usr.bin/binutils/ld/Makefile.arm,v 1.1 2006/07/22 14:36:15 obrien Exp $ +-NATIVE_EMULATION= armelf_fbsd +.if defined(ARM_BIG_ENDIAN) -+NATIVE_EMULATION= armelfb_fbsd ++NATIVE_EMULATION= armelfb_fbsd +.else - NATIVE_EMULATION= armelf_fbsd ++NATIVE_EMULATION= armelf_fbsd +.endif SRCS+= e${NATIVE_EMULATION}.c CLEANFILES+= e${NATIVE_EMULATION}.c +-e${NATIVE_EMULATION}.c: emulparams/${NATIVE_EMULATION}.sh emultempl/elf32.em \ ++e${NATIVE_EMULATION}.c: ${.CURDIR}/${NATIVE_EMULATION}.sh emultempl/elf32.em \ + scripttempl/elf.sc genscripts.sh stringify.sed + sh ${.CURDIR}/genscripts.sh ${SRCDIR}/ld ${LIBSERACHPATH} \ + ${TOOLS_PREFIX}/usr \ + ${HOST} ${TARGET_TUPLE} ${TARGET_TUPLE} \ +- ${NATIVE_EMULATION} "" no ${NATIVE_EMULATION} ${TARGET_TUPLE} ++ ${NATIVE_EMULATION} "" no ${NATIVE_EMULATION} ${TARGET_TUPLE} \ ++ ${.CURDIR}/${NATIVE_EMULATION}.sh +Index: gnu/usr.bin/binutils/ld/armelf_fbsd.sh +=================================================================== +RCS file: gnu/usr.bin/binutils/ld/armelf_fbsd.sh +diff -N gnu/usr.bin/binutils/ld/armelf_fbsd.sh +--- /dev/null 1 Jan 1970 00:00:00 -0000 ++++ gnu/usr.bin/binutils/ld/armelf_fbsd.sh 26 Jul 2006 17:41:39 -0000 +@@ -0,0 +1,7 @@ ++. ${srcdir}/emulparams/armelf.sh ++. ${srcdir}/emulparams/elf_fbsd.sh ++MAXPAGESIZE=0x8000 ++GENERATE_PIE_SCRIPT=yes ++ ++unset STACK_ADDR ++unset EMBEDDED +Index: gnu/usr.bin/binutils/ld/armelfb_fbsd.sh +=================================================================== +RCS file: gnu/usr.bin/binutils/ld/armelfb_fbsd.sh +diff -N gnu/usr.bin/binutils/ld/armelfb_fbsd.sh +--- /dev/null 1 Jan 1970 00:00:00 -0000 ++++ gnu/usr.bin/binutils/ld/armelfb_fbsd.sh 27 Jul 2006 15:06:29 -0000 +@@ -0,0 +1,12 @@ ++#XXX: This should be used once those bits are merged back in the FSF repo. ++#. ${srcdir}/emulparams/armelf_fbsd.sh ++# ++#OUTPUT_FORMAT="elf32-bigarm" ++. ${srcdir}/emulparams/armelf.sh ++. ${srcdir}/emulparams/elf_fbsd.sh ++MAXPAGESIZE=0x8000 ++GENERATE_PIE_SCRIPT=yes ++ ++unset STACK_ADDR ++unset EMBEDDED ++OUTPUT_FORMAT="elf32-bigarm" +Index: gnu/usr.bin/binutils/ld/genscripts.sh +=================================================================== +RCS file: /cognet/ncvs/src/gnu/usr.bin/binutils/ld/genscripts.sh,v +retrieving revision 1.6 +diff -u -p -r1.6 genscripts.sh +--- gnu/usr.bin/binutils/ld/genscripts.sh 16 Jun 2004 07:09:37 -0000 1.6 ++++ gnu/usr.bin/binutils/ld/genscripts.sh 26 Jul 2006 21:52:04 -0000 +@@ -37,7 +37,12 @@ CUSTOMIZER_SCRIPT=$3 + # FSF BU ver 2.15 which allows for a more generic emulparams processing. + # To reduce the diff, I also include the ${EMULATION_NAME} parameter in uses + # of 'CUSTOMIZER_SCRIPT'. ++ ++# XXX: arm hack : until those file are merged back into the FSF repo, just ++# use the version in this directory. ++if !(test -f ${CUSTOMIZER_SCRIPT}"";) then + CUSTOMIZER_SCRIPT="${srcdir}/emulparams/${EMULATION_NAME}.sh" ++fi + + # Include the emulation-specific parameters: + . ${CUSTOMIZER_SCRIPT} ${EMULATION_NAME} Index: gnu/usr.bin/binutils/libbfd/Makefile.arm =================================================================== -RCS file: gnu/usr.bin/binutils/libbfd/Makefile.arm -diff -N gnu/usr.bin/binutils/libbfd/Makefile.arm ---- gnu/usr.bin/binutils/libbfd.orig/Makefile.arm Tue Jul 25 10:59:44 2006 -+++ gnu/usr.bin/binutils/libbfd/Makefile.arm Tue Jul 25 10:58:56 2006 -@@ -1,14 +1,47 @@ +RCS file: /cognet/ncvs/src/gnu/usr.bin/binutils/libbfd/Makefile.arm,v +retrieving revision 1.2 +diff -u -p -r1.2 Makefile.arm +--- gnu/usr.bin/binutils/libbfd/Makefile.arm 22 Jul 2006 14:55:55 -0000 1.2 ++++ gnu/usr.bin/binutils/libbfd/Makefile.arm 24 Jul 2006 20:55:48 -0000 +@@ -1,14 +1,52 @@ # $FreeBSD: src/gnu/usr.bin/binutils/libbfd/Makefile.arm,v 1.2 2006/07/22 14:55:55 obrien Exp $ --DEFAULT_VECTOR= bfd_elf32_littlearm_vec +.if defined(ARM_BIG_ENDIAN) +DEFAULT_VECTOR= bfd_elf32_bigarm_vec +ADDITIONAL_VECTOR= bfd_elf32_littlearm_vec +.else -+DEFAULT_VECTOR= bfd_elf32_littlearm_vec + DEFAULT_VECTOR= bfd_elf32_littlearm_vec +ADDITIONAL_VECTOR= bfd_elf32_bigarm_vec +.endif - SRCS+= cpu-arm.c \ - elf32.c \ +-SRCS+= cpu-arm.c \ +- elf32.c \ ++SRCS+= \ ++ cpu-arm.c \ ++ elf32.c \ elf32-arm-fbsd.c \ - elf32-gen.c \ +- elf32-gen.c \ - elf32-target.h - elfarm-nabi.c \ +- elflink.c ++ elf32-gen.c \ + elf32-target.h \ -+ elfarm-oabi.c \ - elflink.c ++ elflink.c ++VECS+= ${DEFAULT_VECTOR} \ ++ ${ADDITIONAL_VECTOR} - VECS= ${DEFAULT_VECTOR} \ +-VECS= ${DEFAULT_VECTOR} \ - bfd_elf32_bigarm_vec -+ ${ADDITIONAL_VECTOR} -+ +.if ${TARGET_ARCH} == "arm" +CFLAGS+= -DDEFAULT_VECTOR=${DEFAULT_VECTOR} +.endif + -+CLEANFILES+= elf32-arm-fbsd.c ++CLEANFILES+= elf32-arm-fbsd.c + ++# ++# XXX: We should really add the FreeBSD case in elf32_arm_nabi_grok_prstatus ++# instead of defining our own elf32_fbsd_arm_grok_prstatus. ++# +elf32-arm-fbsd.c: elfarm-nabi.c + cat ${.ALLSRC} | sed -e s/ELFOSABI_ARM/ELFOSABI_FREEBSD/g \ + -e "s/\(.*#define.*\)elf32_arm_nabi_grok_prstatus/\1elf32_fbsd_arm_grok_prstatus/" -e s/"#include.*elf32-arm.h.*//" >${.TARGET}; \ @@ -156,17 +228,18 @@ + int offset; \ + if (note->descsz != 96) \ + return (FALSE); \ -+ offset = 28; \ -+ raw_size = 68; \ -+ if (elf_tdata(abfd)->core_signal == 0) \ -+ elf_tdata (abfd)->core_signal = ((int *)(note->descdata))[5]; \ -+ elf_tdata (abfd)->core_pid = ((int *)(note->descdata))[6]; \ -+ /* Make a ".reg/999" section. */ \ -+ return _bfd_elfcore_make_pseudosection (abfd, ".reg", \ -+ raw_size, note->descpos + offset); \ -+ }' >> ${.TARGET}; \ ++ offset = 28; \ ++ raw_size = 68; \ ++ if (elf_tdata(abfd)->core_signal == 0) \ ++ elf_tdata (abfd)->core_signal = ((int *)(note->descdata))[5]; \ ++ elf_tdata (abfd)->core_pid = ((int *)(note->descdata))[6]; \ ++ /* Make a ".reg/999" section. */ \ ++ return _bfd_elfcore_make_pseudosection (abfd, ".reg", \ ++ raw_size, note->descpos + offset); \ ++}' >> ${.TARGET}; \ + echo '#include "elf32-arm.h"' >> ${.TARGET} - ++ ++ Index: gnu/usr.bin/binutils/libiberty/Makefile =================================================================== RCS file: /cognet/ncvs/src/gnu/usr.bin/binutils/libiberty/Makefile,v @@ -208,17 +281,97 @@ #define HOST_WORDS_BIG_ENDIAN 1 #endif -Index: gnu/usr.bin/binutils/libopcodes/Makefile.arm +Index: gnu/usr.bin/cc/Makefile.inc +=================================================================== +RCS file: /cognet/ncvs/src/gnu/usr.bin/cc/Makefile.inc,v +retrieving revision 1.63 +diff -u -p -r1.63 Makefile.inc +--- gnu/usr.bin/cc/Makefile.inc 4 Jun 2002 19:45:08 -0000 1.63 ++++ gnu/usr.bin/cc/Makefile.inc 26 Jul 2006 21:44:41 -0000 +@@ -11,7 +11,11 @@ GCCDIR= ${.CURDIR}/../../../../contrib/g + .include "Makefile.tgt" + + # Machine description. ++.if ${TARGET_ARCH} == "arm" ++MD_FILE= ${.OBJDIR}/arm-diked.md ++.else + MD_FILE= ${GCCDIR}/config/${GCC_CPU}/${GCC_CPU}.md ++.endif + target= ${TARGET_ARCH}-undermydesk-freebsd + + CFLAGS+= -DIN_GCC -DHAVE_CONFIG_H +@@ -47,3 +51,17 @@ LIBCC_INT= ${.CURDIR}/../cc_int/libcc_in + .endif + + .endif # !__CC_MAKEFILE_INC__ ++.if ${TARGET_ARCH} == "arm" ++CLEANFILES+= arm-diked.md ${GCC_CPU}.md.orig fpa.md cirrus.md iwmmxt.md ++.endif ++ ++.if ${TARGET_ARCH} == "arm" ++${.OBJDIR}/arm-diked.md: ++ cp ${GCCDIR}/config/${GCC_CPU}/${GCC_CPU}.md . ++#XXX: Those are not patched but are included by arm.md ++ cp ${GCCDIR}/config/${GCC_CPU}/fpa.md . ++ cp ${GCCDIR}/config/${GCC_CPU}/cirrus.md . ++ cp ${GCCDIR}/config/${GCC_CPU}/iwmmxt.md . ++ patch ${GCC_CPU}.md ${.CURDIR}/../arm.md.diff ++ mv ${GCC_CPU}.md ${.TARGET} ++.endif +Index: gnu/usr.bin/cc/arm.md.diff =================================================================== -RCS file: gnu/usr.bin/binutils/libopcodes/Makefile.arm -diff -N gnu/usr.bin/binutils/libopcodes/Makefile.arm +RCS file: gnu/usr.bin/cc/arm.md.diff +diff -N gnu/usr.bin/cc/arm.md.diff --- /dev/null 1 Jan 1970 00:00:00 -0000 -+++ gnu/usr.bin/binutils/libopcodes/Makefile.arm 6 Jul 2006 23:54:06 -0000 -@@ -0,0 +1,4 @@ -+# $FreeBSD$ -+ -+SRCS+= arm-dis.c -+CFLAGS+= -DARCH_arm ++++ gnu/usr.bin/cc/arm.md.diff 24 Jul 2006 21:44:46 -0000 +@@ -0,0 +1,47 @@ ++Index: arm.md ++=================================================================== ++RCS file: /cognet/ncvs/src/contrib/gcc/config/arm/arm.md,v ++retrieving revision 1.1.1.7 ++diff -u -p -r1.1.1.7 arm.md ++--- arm.md 3 Jun 2005 03:28:42 -0000 1.1.1.7 +++++ arm.md 29 Aug 2005 12:39:39 -0000 ++@@ -8836,12 +8836,12 @@ ++ ldm[2] = operands[4]; ++ } ++ if (GET_CODE (XEXP (operands[2], 0)) != REG) ++- val1 = INTVAL (XEXP (XEXP (operands[2], 0), 1)); +++ val1 = INTVAL (XEXP (XEXP (operands[2], 0), 1)); ++ if (GET_CODE (XEXP (operands[3], 0)) != REG) ++- val2 = INTVAL (XEXP (XEXP (operands[3], 0), 1)); +++ val2 = INTVAL (XEXP (XEXP (operands[3], 0), 1)); ++ arith[0] = operands[0]; ++ arith[3] = operands[1]; ++- if (val1 < val2) +++ if (val1 <= val2) ++ { ++ arith[1] = ldm[1]; ++ arith[2] = ldm[2]; ++@@ -8871,7 +8871,7 @@ ++ else ++ output_asm_insn (\"ldm%?ia\\t%0, {%1, %2}\", ldm); ++ } ++- else +++ else if (val2) ++ { ++ ldm[0] = XEXP (operands[2], 0); ++ if (val1 < val2) ++@@ -8879,6 +8879,14 @@ ++ else ++ output_asm_insn (\"ldm%?da\\t%0, {%1, %2}\", ldm); ++ } +++ else { +++ ldm[0] = operands[0]; +++ ldm[1] = XEXP(operands[2], 0); +++ output_asm_insn(\"ldr\\t%0, [%1]\", ldm); +++ ldm[0] = operands[4]; +++ ldm[1] = XEXP(operands[3], 0); +++ output_asm_insn(\"ldr\\t%0, [%1]\", ldm); +++ } ++ output_asm_insn (\"%I3%?\\t%0, %1, %2\", arith); ++ return \"\"; ++ }" Index: gnu/usr.bin/cc/cc_int/Makefile =================================================================== RCS file: /cognet/ncvs/src/gnu/usr.bin/cc/cc_int/Makefile,v @@ -243,7 +396,7 @@ retrieving revision 1.82 diff -u -p -r1.82 Makefile --- gnu/usr.bin/cc/cc_tools/Makefile 17 Mar 2006 18:54:23 -0000 1.82 -+++ gnu/usr.bin/cc/cc_tools/Makefile 21 Jul 2006 11:15:28 -0000 ++++ gnu/usr.bin/cc/cc_tools/Makefile 27 Jul 2006 12:34:46 -0000 @@ -216,7 +216,9 @@ CLEANFILES+= fini .if ${TARGET_ARCH} == "amd64" TARGET_INC= i386/biarch64.h @@ -254,7 +407,7 @@ .if ${TARGET_ARCH} == "i386" || ${TARGET_ARCH} == "amd64" TARGET_INC+= ${GCC_CPU}/unix.h TARGET_INC+= ${GCC_CPU}/att.h -@@ -236,6 +238,14 @@ TARGET_INC+= ${GCC_CPU}/elf.h +@@ -236,7 +238,19 @@ TARGET_INC+= ${GCC_CPU}/elf.h TARGET_INC+= ${GCC_CPU}/sysv4.h .endif .endif @@ -266,16 +419,185 @@ +CFLAGS+= -DTARGET_ENDIAN_DEFAULT=ARM_FLAG_BIG_END +. endif +.endif ++.if ${TARGET_ARCH} == "arm" ++TARGET_INC+= freebsd-diked.h ++.else TARGET_INC+= ${GCC_CPU}/freebsd.h ++.endif .if ${TARGET_ARCH} == "amd64" TARGET_INC+= ${GCC_CPU}/x86-64.h + TARGET_INC+= ${GCC_CPU}/freebsd64.h +@@ -334,6 +348,10 @@ COMMONHDRS= bconfig.h config.h configarg + gtyp-gen.h + GENSRCS+= ${COMMONHDRS} + ++.if ${TARGET_ARCH} == "arm" ++GENSRCS+= freebsd-diked.h ++.endif ++ + MFILE?= ${.CURDIR}/Makefile + ${COMMONHDRS}: ${MFILE} + +@@ -389,7 +407,11 @@ specs.h: + config.h: bconfig.h + echo '#include ' > ${.TARGET} + ++.if ${TARGET_ARCH} == "arm" ++tm.h: freebsd-diked.h ++.else + tm.h: ++.endif + echo '#ifndef GCC_TM_H' > ${.TARGET} + echo '#define GCC_TM_H' >> ${.TARGET} + .if defined(TARGET_CPU_DEFAULT) +@@ -458,12 +480,23 @@ gtyp-gen.h: + gcov-iov.h: + echo "#define GCOV_VERSION ((gcov_unsigned_t)0x33303470)" >> ${.TARGET} + ++.if ${TARGET_ARCH} == "arm" ++freebsd-diked.h: ++ cp ${GCCDIR}/config/arm/freebsd.h freebsd.h ++ patch freebsd.h ${GCCDIR}/../../gnu/usr.bin/cc/cc_tools/arm-freebsd.h.diff ++ mv freebsd.h ${.TARGET} ++.endif ++ + #----------------------------------------------------------------------- + # General things. + + SRCS+= ${GENSRCS} + CLEANFILES+= ${GENSRCS} + ++.if ${TARGET_ARCH} == "arm" ++CLEANFILES+= freebsd.h.orig ++.endif ++ + all: ${SRCS} + + .include +Index: gnu/usr.bin/cc/cc_tools/arm-freebsd.h.diff +=================================================================== +RCS file: gnu/usr.bin/cc/cc_tools/arm-freebsd.h.diff +diff -N gnu/usr.bin/cc/cc_tools/arm-freebsd.h.diff +--- /dev/null 1 Jan 1970 00:00:00 -0000 ++++ gnu/usr.bin/cc/cc_tools/arm-freebsd.h.diff 24 Jul 2006 21:33:40 -0000 +@@ -0,0 +1,110 @@ ++Index: freebsd.h ++=================================================================== ++RCS file: /cognet/ncvs/src/contrib/gcc/config/arm/freebsd.h,v ++retrieving revision 1.1.1.3 ++diff -u -p -r1.1.1.3 freebsd.h ++--- freebsd.h 28 Jul 2004 03:11:35 -0000 1.1.1.3 +++++ freebsd.h 21 Jul 2006 00:50:25 -0000 ++@@ -22,7 +22,10 @@ ++ ++ #undef SUBTARGET_EXTRA_SPECS ++ #define SUBTARGET_EXTRA_SPECS \ ++- { "fbsd_dynamic_linker", FBSD_DYNAMIC_LINKER } +++ { "fbsd_dynamic_linker", FBSD_DYNAMIC_LINKER }, \ +++ { "subtarget_extra_asm_spec", SUBTARGET_EXTRA_ASM_SPEC }, \ +++ { "subtarget_asm_float_spec", SUBTARGET_ASM_FLOAT_SPEC } +++ ++ ++ #undef SUBTARGET_CPP_SPEC ++ #define SUBTARGET_CPP_SPEC FBSD_CPP_SPEC ++@@ -39,7 +42,8 @@ ++ %{rdynamic:-export-dynamic} \ ++ %{!dynamic-linker:-dynamic-linker %(fbsd_dynamic_linker) }} \ ++ %{static:-Bstatic}} \ ++- %{symbolic:-Bsymbolic}" +++ %{symbolic:-Bsymbolic} \ +++ %{mbig-endian:-EB} %{mlittle-endian:-EL}" ++ ++ ++ /************************[ Target stuff ]***********************************/ ++@@ -67,3 +71,80 @@ ++ ++ #undef TARGET_VERSION ++ #define TARGET_VERSION fprintf (stderr, " (FreeBSD/StrongARM ELF)"); +++ +++#ifndef TARGET_ENDIAN_DEFAULT +++#define TARGET_ENDIAN_DEFAULT 0 +++#endif +++ +++#undef TARGET_DEFAULT +++#define TARGET_DEFAULT \ +++ (ARM_FLAG_APCS_32 \ +++ | ARM_FLAG_SOFT_FLOAT \ +++ | ARM_FLAG_APCS_FRAME \ +++ | ARM_FLAG_ATPCS \ +++ | ARM_FLAG_VFP \ +++ | ARM_FLAG_MMU_TRAPS \ +++ | TARGET_ENDIAN_DEFAULT) +++ +++#undef TYPE_OPERAND_FMT +++#define TYPE_OPERAND_FMT "%%%s" +++ +++#undef SUBTARGET_EXTRA_ASM_SPEC +++#define SUBTARGET_EXTRA_ASM_SPEC \ +++ "-matpcs %{fpic|fpie:-k} %{fPIC|fPIE:-k}" +++ +++ /* Default floating point model is soft-VFP. +++ * FIXME: -mhard-float currently implies FPA. */ +++#undef SUBTARGET_ASM_FLOAT_SPEC +++#define SUBTARGET_ASM_FLOAT_SPEC \ +++ "%{mhard-float:-mfpu=fpa} \ +++ %{msoft-float:-mfpu=softvfp} \ +++ %{!mhard-float: \ +++ %{!msoft-float:-mfpu=softvfp}}" +++ +++ +++/* FreeBSD does its profiling differently to the Acorn compiler. We +++ don't need a word following the mcount call; and to skip it +++ requires either an assembly stub or use of fomit-frame-pointer when +++ compiling the profiling functions. Since we break Acorn CC +++ compatibility below a little more won't hurt. */ +++ +++#undef ARM_FUNCTION_PROFILER +++#define ARM_FUNCTION_PROFILER(STREAM,LABELNO) \ +++{ \ +++ asm_fprintf (STREAM, "\tmov\t%Rip, %Rlr\n"); \ +++ asm_fprintf (STREAM, "\tbl\t_mcount%s\n", \ +++ NEED_PLT_RELOC ? "(PLT)" : ""); \ +++} +++ +++/* Emit code to set up a trampoline and synchronize the caches. */ +++#undef INITIALIZE_TRAMPOLINE +++#define INITIALIZE_TRAMPOLINE(TRAMP, FNADDR, CXT) \ +++do \ +++ { \ +++ emit_move_insn (gen_rtx (MEM, SImode, plus_constant ((TRAMP), 8)), \ +++ (CXT)); \ +++ emit_move_insn (gen_rtx (MEM, SImode, plus_constant ((TRAMP), 12)), \ +++ (FNADDR)); \ +++ emit_library_call (gen_rtx_SYMBOL_REF (Pmode, "__clear_cache"), \ +++ 0, VOIDmode, 2, TRAMP, Pmode, \ +++ plus_constant (TRAMP, TRAMPOLINE_SIZE), Pmode); \ +++ } \ +++while (0) +++ +++/* Clear the instruction cache from `BEG' to `END'. This makes a +++ call to the ARM_SYNC_ICACHE architecture specific syscall. */ +++#define CLEAR_INSN_CACHE(BEG, END) \ +++do \ +++ { \ +++ extern int sysarch(int number, void *args); \ +++ struct \ +++ { \ +++ unsigned int addr; \ +++ int len; \ +++ } s; \ +++ s.addr = (unsigned int)(BEG); \ +++ s.len = (END) - (BEG); \ +++ (void) sysarch (0, &s); \ +++ } \ +++while (0) Index: gnu/usr.bin/gdb/arch/arm/Makefile =================================================================== RCS file: gnu/usr.bin/gdb/arch/arm/Makefile diff -N gnu/usr.bin/gdb/arch/arm/Makefile --- /dev/null 1 Jan 1970 00:00:00 -0000 -+++ gnu/usr.bin/gdb/arch/arm/Makefile 7 Jul 2006 00:02:26 -0000 -@@ -0,0 +1,14 @@ ++++ gnu/usr.bin/gdb/arch/arm/Makefile 26 Jul 2006 17:56:49 -0000 +@@ -0,0 +1,17 @@ +# $FreeBSD$ + +GENSRCS+= xm.h @@ -283,20 +605,620 @@ +LIBSRCS+= arm-tdep.c armfbsd-tdep.c solib.c solib-svr4.c + +nm.h: -+ echo '#include "arm/nm-fbsd.h"' > ${.TARGET} ++#XXX this should be arm/nm-fbsd.h but won't until it's merged into the gdb repo ++ echo '#include "nm-fbsd.h"' > ${.TARGET} + +tm.h: -+ echo '#include "arm/tm-fbsd.h"' > ${.TARGET} ++#XXX this should be arm/tm-fbsd.h ++ echo '#include "tm-fbsd.h"' > ${.TARGET} + +xm.h: -+ echo '#include "arm/xm-fbsd.h"' > ${.TARGET} ++#XXX this should be arm/xm-fbsd.h ++ echo '#include "xm-fbsd.h"' > ${.TARGET} +Index: gnu/usr.bin/gdb/arch/arm/armfbsd-nat.c +=================================================================== +RCS file: gnu/usr.bin/gdb/arch/arm/armfbsd-nat.c +diff -N gnu/usr.bin/gdb/arch/arm/armfbsd-nat.c +--- /dev/null 1 Jan 1970 00:00:00 -0000 ++++ gnu/usr.bin/gdb/arch/arm/armfbsd-nat.c 19 Jul 2006 10:24:46 -0000 +@@ -0,0 +1,516 @@ ++ /* Native-dependent code for BSD Unix running on ARM's, for GDB. ++ Copyright 1988, 1989, 1991, 1992, 1994, 1996, 1999, 2002 ++ Free Software Foundation, Inc. ++ ++ This file is part of GDB. ++ ++ This program is free software; you can redistribute it and/or modify ++ it under the terms of the GNU General Public License as published by ++ the Free Software Foundation; either version 2 of the License, or ++ (at your option) any later version. ++ ++ This program is distributed in the hope that it will be useful, ++ but WITHOUT ANY WARRANTY; without even the implied warranty of ++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ GNU General Public License for more details. ++ ++ You should have received a copy of the GNU General Public License ++ along with this program; if not, write to the Free Software ++ Foundation, Inc., 59 Temple Place - Suite 330, ++ Boston, MA 02111-1307, USA. */ ++ ++#include "defs.h" ++ ++#ifndef FETCH_INFERIOR_REGISTERS ++#ifndef CROSS_DEBUGGER ++#error Not FETCH_INFERIOR_REGISTERS ++#endif ++#endif /* !FETCH_INFERIOR_REGISTERS */ ++ ++#include "arm-tdep.h" ++ ++#include ++#include ++#ifndef CROSS_DEBUGGER ++#include ++#include ++#endif ++#include "inferior.h" ++#include "regcache.h" ++#include "gdbcore.h" ++ ++extern int arm_apcs_32; ++ ++#ifdef CROSS_DEBUGGER ++struct reg { ++ unsigned int r[13]; ++ unsigned int r_sp; ++ unsigned int r_lr; ++ unsigned int r_pc; ++ unsigned int r_cpsr; ++}; ++ ++typedef struct fp_extended_precision { ++ u_int32_t fp_exponent; ++ u_int32_t fp_mantissa_hi; ++ u_int32_t fp_mantissa_lo; ++} fp_extended_precision_t; ++ ++typedef struct fp_extended_precision fp_reg_t; ++ ++struct fpreg { ++ unsigned int fpr_fpsr; ++ fp_reg_t fpr[8]; ++}; ++#endif ++ ++void ++supply_gregset (struct reg *gregset) ++{ ++ int regno; ++ CORE_ADDR r_pc; ++ ++ /* Integer registers. */ ++ for (regno = ARM_A1_REGNUM; regno < ARM_SP_REGNUM; regno++) ++ supply_register (regno, (char *) &gregset->r[regno]); ++ ++ supply_register (ARM_SP_REGNUM, (char *) &gregset->r_sp); ++ supply_register (ARM_LR_REGNUM, (char *) &gregset->r_lr); ++ /* This is ok: we're running native... */ ++ r_pc = ADDR_BITS_REMOVE (gregset->r_pc); ++ supply_register (ARM_PC_REGNUM, (char *) &r_pc); ++ ++ if (arm_apcs_32) ++ supply_register (ARM_PS_REGNUM, (char *) &gregset->r_cpsr); ++ else ++ supply_register (ARM_PS_REGNUM, (char *) &gregset->r_pc); ++} ++ ++void ++supply_fpregset (struct fpreg *fparegset) ++{ ++ int regno; ++ ++ for (regno = ARM_F0_REGNUM; regno <= ARM_F7_REGNUM; regno++) ++ supply_register ++ (regno, (char *) &fparegset->fpr[regno - ARM_F0_REGNUM]); ++ ++ supply_register (ARM_FPS_REGNUM, (char *) &fparegset->fpr_fpsr); ++} ++ ++static void ++fetch_register (int regno) ++{ ++ struct reg inferior_registers; ++#ifndef CROSS_DEBUGGER ++ int ret; ++ ++ ret = ptrace (PT_GETREGS, PIDGET (inferior_ptid), ++ (PTRACE_ARG3_TYPE) &inferior_registers, 0); ++ ++ if (ret < 0) ++ { ++ warning ("unable to fetch general register"); ++ return; ++ } ++#endif ++ ++ switch (regno) ++ { ++ case ARM_SP_REGNUM: ++ supply_register (ARM_SP_REGNUM, (char *) &inferior_registers.r_sp); ++ break; ++ ++ case ARM_LR_REGNUM: ++ supply_register (ARM_LR_REGNUM, (char *) &inferior_registers.r_lr); ++ break; ++ ++ case ARM_PC_REGNUM: ++ /* This is ok: we're running native... */ ++ inferior_registers.r_pc = ADDR_BITS_REMOVE (inferior_registers.r_pc); ++ supply_register (ARM_PC_REGNUM, (char *) &inferior_registers.r_pc); ++ break; ++ ++ case ARM_PS_REGNUM: ++ if (arm_apcs_32) ++ supply_register (ARM_PS_REGNUM, (char *) &inferior_registers.r_cpsr); ++ else ++ supply_register (ARM_PS_REGNUM, (char *) &inferior_registers.r_pc); ++ break; ++ ++ default: ++ supply_register (regno, (char *) &inferior_registers.r[regno]); ++ break; ++ } ++} ++ ++static void ++fetch_regs (void) ++{ ++ struct reg inferior_registers; ++#ifndef CROSS_DEBUGGER ++ int ret; ++#endif ++ int regno; ++ ++#ifndef CROSS_DEBUGGER ++ ret = ptrace (PT_GETREGS, PIDGET (inferior_ptid), ++ (PTRACE_ARG3_TYPE) &inferior_registers, 0); ++ ++ if (ret < 0) ++ { ++ warning ("unable to fetch general registers"); ++ return; ++ } ++#endif ++ ++ supply_gregset (&inferior_registers); ++} ++ ++static void ++fetch_fp_register (int regno) ++{ ++ struct fpreg inferior_fp_registers; ++#ifndef CROSS_DEBUGGER ++ int ret; ++ ++ ret = ptrace (PT_GETFPREGS, PIDGET (inferior_ptid), ++ (PTRACE_ARG3_TYPE) &inferior_fp_registers, 0); ++ ++ if (ret < 0) ++ { ++ warning ("unable to fetch floating-point register"); ++ return; ++ } ++#endif ++ ++ switch (regno) ++ { ++ case ARM_FPS_REGNUM: ++ supply_register (ARM_FPS_REGNUM, ++ (char *) &inferior_fp_registers.fpr_fpsr); ++ break; ++ ++ default: ++ supply_register ++ (regno, (char *) &inferior_fp_registers.fpr[regno - ARM_F0_REGNUM]); ++ break; ++ } ++} ++ ++static void ++fetch_fp_regs (void) ++{ ++ struct fpreg inferior_fp_registers; ++#ifndef CROSS_DEBUGGER ++ int ret; ++#endif ++ int regno; ++ ++#ifndef CROSS_DEBUGGER ++ ret = ptrace (PT_GETFPREGS, PIDGET (inferior_ptid), ++ (PTRACE_ARG3_TYPE) &inferior_fp_registers, 0); ++ ++ if (ret < 0) ++ { ++ warning ("unable to fetch general registers"); ++ return; ++ } ++#endif ++ ++ supply_fpregset (&inferior_fp_registers); ++} ++ ++void ++fetch_inferior_registers (int regno) ++{ ++ if (regno >= 0) ++ { ++ if (regno < ARM_F0_REGNUM || regno > ARM_FPS_REGNUM) ++ fetch_register (regno); ++ else ++ fetch_fp_register (regno); ++ } ++ else ++ { ++ fetch_regs (); ++ fetch_fp_regs (); ++ } ++} ++ ++ ++static void ++store_register (int regno) ++{ ++ struct reg inferior_registers; ++#ifndef CROSS_DEBUGGER ++ int ret; ++ ++ ret = ptrace (PT_GETREGS, PIDGET (inferior_ptid), ++ (PTRACE_ARG3_TYPE) &inferior_registers, 0); ++ ++ if (ret < 0) ++ { ++ warning ("unable to fetch general registers"); ++ return; ++ } ++#endif ++ ++ switch (regno) ++ { ++ case ARM_SP_REGNUM: ++ regcache_collect (ARM_SP_REGNUM, (char *) &inferior_registers.r_sp); ++ break; ++ ++ case ARM_LR_REGNUM: ++ regcache_collect (ARM_LR_REGNUM, (char *) &inferior_registers.r_lr); ++ break; ++ ++ case ARM_PC_REGNUM: ++ if (arm_apcs_32) ++ regcache_collect (ARM_PC_REGNUM, (char *) &inferior_registers.r_pc); ++ else ++ { ++ unsigned pc_val; ++ ++ regcache_collect (ARM_PC_REGNUM, (char *) &pc_val); ++ ++ pc_val = ADDR_BITS_REMOVE (pc_val); ++ inferior_registers.r_pc ++ ^= ADDR_BITS_REMOVE (inferior_registers.r_pc); ++ inferior_registers.r_pc |= pc_val; ++ } ++ break; ++ ++ case ARM_PS_REGNUM: ++ if (arm_apcs_32) ++ regcache_collect (ARM_PS_REGNUM, (char *) &inferior_registers.r_cpsr); ++ else ++ { ++ unsigned psr_val; ++ ++ regcache_collect (ARM_PS_REGNUM, (char *) &psr_val); ++ ++ psr_val ^= ADDR_BITS_REMOVE (psr_val); ++ inferior_registers.r_pc = ADDR_BITS_REMOVE (inferior_registers.r_pc); ++ inferior_registers.r_pc |= psr_val; ++ } ++ break; ++ ++ default: ++ regcache_collect (regno, (char *) &inferior_registers.r[regno]); ++ break; ++ } ++ ++#ifndef CROSS_DEBUGGER ++ ret = ptrace (PT_SETREGS, PIDGET (inferior_ptid), ++ (PTRACE_ARG3_TYPE) &inferior_registers, 0); ++ ++ if (ret < 0) ++ warning ("unable to write register %d to inferior", regno); ++#endif ++} ++ ++static void ++store_regs (void) ++{ ++ struct reg inferior_registers; ++ int ret; ++ int regno; ++ ++ ++ for (regno = ARM_A1_REGNUM; regno < ARM_SP_REGNUM; regno++) ++ regcache_collect (regno, (char *) &inferior_registers.r[regno]); ++ ++ regcache_collect (ARM_SP_REGNUM, (char *) &inferior_registers.r_sp); ++ regcache_collect (ARM_LR_REGNUM, (char *) &inferior_registers.r_lr); ++ ++ if (arm_apcs_32) ++ { ++ regcache_collect (ARM_PC_REGNUM, (char *) &inferior_registers.r_pc); ++ regcache_collect (ARM_PS_REGNUM, (char *) &inferior_registers.r_cpsr); ++ } ++ else ++ { ++ unsigned pc_val; ++ unsigned psr_val; ++ ++ regcache_collect (ARM_PC_REGNUM, (char *) &pc_val); ++ regcache_collect (ARM_PS_REGNUM, (char *) &psr_val); ++ ++ pc_val = ADDR_BITS_REMOVE (pc_val); ++ psr_val ^= ADDR_BITS_REMOVE (psr_val); ++ ++ inferior_registers.r_pc = pc_val | psr_val; ++ } ++ ++#ifndef CROSS_DEBUGGER ++ ret = ptrace (PT_SETREGS, PIDGET (inferior_ptid), ++ (PTRACE_ARG3_TYPE) &inferior_registers, 0); ++ ++ if (ret < 0) ++ warning ("unable to store general registers"); ++#endif ++} ++ ++static void ++store_fp_register (int regno) ++{ ++ struct fpreg inferior_fp_registers; ++#ifndef CROSS_DEBUGGER ++ int ret; ++ ++ ret = ptrace (PT_GETFPREGS, PIDGET (inferior_ptid), ++ (PTRACE_ARG3_TYPE) &inferior_fp_registers, 0); ++ ++ if (ret < 0) ++ { ++ warning ("unable to fetch floating-point registers"); ++ return; ++ } ++#endif ++ ++ switch (regno) ++ { ++ case ARM_FPS_REGNUM: ++ regcache_collect (ARM_FPS_REGNUM, ++ (char *) &inferior_fp_registers.fpr_fpsr); ++ break; ++ ++ default: ++ regcache_collect ++ (regno, (char *) &inferior_fp_registers.fpr[regno - ARM_F0_REGNUM]); ++ break; ++ } ++ ++#ifndef CROSS_DEBUGGER ++ ret = ptrace (PT_SETFPREGS, PIDGET (inferior_ptid), ++ (PTRACE_ARG3_TYPE) &inferior_fp_registers, 0); ++ ++ if (ret < 0) ++ warning ("unable to write register %d to inferior", regno); ++#endif ++} ++ ++static void ++store_fp_regs (void) ++{ ++ struct fpreg inferior_fp_registers; ++ int ret; ++ int regno; ++ ++ ++ for (regno = ARM_F0_REGNUM; regno <= ARM_F7_REGNUM; regno++) ++ regcache_collect ++ (regno, (char *) &inferior_fp_registers.fpr[regno - ARM_F0_REGNUM]); ++ ++ regcache_collect (ARM_FPS_REGNUM, (char *) &inferior_fp_registers.fpr_fpsr); ++ ++#ifndef CROSS_DEBUGGER ++ ret = ptrace (PT_SETFPREGS, PIDGET (inferior_ptid), ++ (PTRACE_ARG3_TYPE) &inferior_fp_registers, 0); ++ ++ if (ret < 0) ++ warning ("unable to store floating-point registers"); ++#endif ++} ++ ++void ++store_inferior_registers (int regno) ++{ ++ if (regno >= 0) ++ { ++ if (regno < ARM_F0_REGNUM || regno > ARM_FPS_REGNUM) ++ store_register (regno); ++ else ++ store_fp_register (regno); ++ } ++ else ++ { ++ store_regs (); ++ store_fp_regs (); ++ } ++} ++ ++ ++struct md_core ++{ ++ struct reg intreg; ++ struct fpreg freg; ++}; ++ ++static void ++fetch_core_registers (char *core_reg_sect, unsigned core_reg_size, ++ int which, CORE_ADDR ignore) ++{ ++ struct md_core *core_reg = (struct md_core *) core_reg_sect; ++ int regno; ++ CORE_ADDR r_pc; ++ ++ supply_gregset (&core_reg->intreg); ++ supply_fpregset (&core_reg->freg); ++} ++ ++static void ++fetch_elfcore_registers (char *core_reg_sect, unsigned core_reg_size, ++ int which, CORE_ADDR ignore) ++{ ++ struct reg gregset; ++ struct fpreg fparegset; ++ ++ switch (which) >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Thu Jul 27 16:12:24 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C77E716A4DD; Thu, 27 Jul 2006 16:12:24 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id A2F3B16A4DE for ; Thu, 27 Jul 2006 16:12:24 +0000 (UTC) (envelope-from cognet@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 58F4C43D46 for ; Thu, 27 Jul 2006 16:12:24 +0000 (GMT) (envelope-from cognet@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k6RGCOIN089991 for ; Thu, 27 Jul 2006 16:12:24 GMT (envelope-from cognet@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k6RGCOrn089988 for perforce@freebsd.org; Thu, 27 Jul 2006 16:12:24 GMT (envelope-from cognet@freebsd.org) Date: Thu, 27 Jul 2006 16:12:24 GMT Message-Id: <200607271612.k6RGCOrn089988@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to cognet@freebsd.org using -f From: Olivier Houchard To: Perforce Change Reviews Cc: Subject: PERFORCE change 102568 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 27 Jul 2006 16:12:25 -0000 http://perforce.freebsd.org/chv.cgi?CH=102568 Change 102568 by cognet@cognet on 2006/07/27 16:12:21 Propagate the call to setup_intr to the PCI bus parent. Affected files ... .. //depot/projects/arm/src/sys/arm/xscale/ixp425/ixp425_pci.c#6 edit Differences ... ==== //depot/projects/arm/src/sys/arm/xscale/ixp425/ixp425_pci.c#6 (text+ko) ==== @@ -184,8 +184,8 @@ int flags, driver_intr_t *intr, void *arg, void **cookiep) { - device_printf(dev, "%s called setup_intr\n", device_get_nameunit(child)); - return (0); + return (BUS_SETUP_INTR(device_get_parent(dev), child, ires, flags, + intr, arg, cookiep)); } static int From owner-p4-projects@FreeBSD.ORG Thu Jul 27 16:15:29 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 82B7216A4E7; Thu, 27 Jul 2006 16:15:29 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 59D4E16A4E5 for ; Thu, 27 Jul 2006 16:15:29 +0000 (UTC) (envelope-from piso@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id BA1D243D5A for ; Thu, 27 Jul 2006 16:15:28 +0000 (GMT) (envelope-from piso@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k6RGFSO8090147 for ; Thu, 27 Jul 2006 16:15:28 GMT (envelope-from piso@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k6RGFScw090144 for perforce@freebsd.org; Thu, 27 Jul 2006 16:15:28 GMT (envelope-from piso@freebsd.org) Date: Thu, 27 Jul 2006 16:15:28 GMT Message-Id: <200607271615.k6RGFScw090144@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to piso@freebsd.org using -f From: Paolo Pisati To: Perforce Change Reviews Cc: Subject: PERFORCE change 102569 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 27 Jul 2006 16:15:29 -0000 http://perforce.freebsd.org/chv.cgi?CH=102569 Change 102569 by piso@piso_newluxor on 2006/07/27 16:15:05 IFC Affected files ... .. //depot/projects/soc2005/libalias/sys/arm/include/db_machdep.h#2 integrate .. //depot/projects/soc2005/libalias/sys/geom/eli/g_eli.c#2 integrate Differences ... ==== //depot/projects/soc2005/libalias/sys/arm/include/db_machdep.h#2 (text+ko) ==== @@ -24,7 +24,7 @@ * the rights to redistribute these changes. * * from: FreeBSD: src/sys/i386/include/db_machdep.h,v 1.16 1999/10/04 - * $FreeBSD: src/sys/arm/include/db_machdep.h,v 1.5 2005/01/05 21:58:48 imp Exp $ + * $FreeBSD: src/sys/arm/include/db_machdep.h,v 1.6 2006/07/27 11:41:37 cognet Exp $ */ #ifndef _MACHINE_DB_MACHDEP_H_ @@ -89,4 +89,7 @@ u_int branch_taken (u_int insn, u_int pc); +#ifdef __ARMEB__ +#define BYTE_MSF (1) +#endif #endif /* !_MACHINE_DB_MACHDEP_H_ */ ==== //depot/projects/soc2005/libalias/sys/geom/eli/g_eli.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/geom/eli/g_eli.c,v 1.26 2006/06/05 21:38:54 pjd Exp $"); +__FBSDID("$FreeBSD: src/sys/geom/eli/g_eli.c,v 1.27 2006/07/27 11:52:12 yar Exp $"); #include #include @@ -1030,4 +1030,4 @@ } DECLARE_GEOM_CLASS(g_eli_class, g_eli); -MODULE_DEPEND(geom_eli, crypto, 1, 1, 1); +MODULE_DEPEND(g_eli, crypto, 1, 1, 1); From owner-p4-projects@FreeBSD.ORG Thu Jul 27 16:16:31 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 63C2D16A4E0; Thu, 27 Jul 2006 16:16:31 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 394AE16A4DD for ; Thu, 27 Jul 2006 16:16:31 +0000 (UTC) (envelope-from piso@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id B9A7543D5A for ; Thu, 27 Jul 2006 16:16:30 +0000 (GMT) (envelope-from piso@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k6RGGUIi090191 for ; Thu, 27 Jul 2006 16:16:30 GMT (envelope-from piso@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k6RGGUtl090188 for perforce@freebsd.org; Thu, 27 Jul 2006 16:16:30 GMT (envelope-from piso@freebsd.org) Date: Thu, 27 Jul 2006 16:16:30 GMT Message-Id: <200607271616.k6RGGUtl090188@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to piso@freebsd.org using -f From: Paolo Pisati To: Perforce Change Reviews Cc: Subject: PERFORCE change 102570 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 27 Jul 2006 16:16:31 -0000 http://perforce.freebsd.org/chv.cgi?CH=102570 Change 102570 by piso@piso_newluxor on 2006/07/27 16:16:12 Turn fast+taskqueue handler into filter+ithread. Affected files ... .. //depot/projects/soc2006/intr_filter/dev/aac/aac.c#5 edit Differences ... ==== //depot/projects/soc2006/intr_filter/dev/aac/aac.c#5 (text+ko) ==== @@ -75,6 +75,7 @@ /* Command Processing */ static void aac_timeout(struct aac_softc *sc); static void aac_complete(void *context, int pending); +static void aac_complete_wrapper(void *context); static int aac_bio_command(struct aac_softc *sc, struct aac_command **cmp); static void aac_bio_complete(struct aac_command *cm); static int aac_wait_command(struct aac_command *cm); @@ -313,7 +314,7 @@ } else { if (bus_setup_intr(sc->aac_dev, sc->aac_irq, INTR_TYPE_BIO, - aac_fast_intr, NULL, + aac_fast_intr, aac_complete_wrapper, sc, &sc->aac_intr)) { device_printf(sc->aac_dev, "can't set up FAST interrupt\n"); @@ -786,7 +787,7 @@ { struct aac_softc *sc; u_int16_t reason; - int flag = 0; + int ret = 0; debug_called(2); @@ -802,14 +803,12 @@ AAC_CLEAR_ISTATUS(sc, reason); /* handle completion processing */ - if (reason & AAC_DB_RESPONSE_READY) { - flag = 1; - taskqueue_enqueue_fast(taskqueue_fast, &sc->aac_task_complete); - } + if (reason & AAC_DB_RESPONSE_READY) + ret = FILTER_HANDLED | FILTER_SCHEDULE_THREAD; /* controller wants to talk to us */ if (reason & (AAC_DB_PRINTF | AAC_DB_COMMAND_READY)) { - flag = 1; + ret |= FILTER_HANDLED; /* * XXX Make sure that we don't get fooled by strange messages * that start with a NULL. @@ -827,7 +826,7 @@ */ wakeup(sc->aifthread); } - return((flag)?FILTER_HANDLED:FILTER_STRAY); + return((ret)?ret:FILTER_STRAY); } void @@ -1092,6 +1091,12 @@ mtx_unlock(&sc->aac_io_lock); } +static void +aac_complete_wrapper(void *context) +{ + aac_complete(context, 0); +} + /* * Handle a bio submitted from a disk device. */ From owner-p4-projects@FreeBSD.ORG Thu Jul 27 16:46:09 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5CD3616A4E1; Thu, 27 Jul 2006 16:46:09 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 3583716A4DE for ; Thu, 27 Jul 2006 16:46:09 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id E2C4643D46 for ; Thu, 27 Jul 2006 16:46:08 +0000 (GMT) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k6RGk8QB091886 for ; Thu, 27 Jul 2006 16:46:08 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k6RGk8Ek091883 for perforce@freebsd.org; Thu, 27 Jul 2006 16:46:08 GMT (envelope-from hselasky@FreeBSD.org) Date: Thu, 27 Jul 2006 16:46:08 GMT Message-Id: <200607271646.k6RGk8Ek091883@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to hselasky@FreeBSD.org using -f From: Hans Petter Selasky To: Perforce Change Reviews Cc: Subject: PERFORCE change 102572 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 27 Jul 2006 16:46:09 -0000 http://perforce.freebsd.org/chv.cgi?CH=102572 Change 102572 by hselasky@hselasky_mini_itx on 2006/07/27 16:45:46 Make sure that STALL is cleared before starting access to BULK/INTERRUPT endpoints and not afterwards. Affected files ... .. //depot/projects/usb/src/sys/dev/usb/ubsa.c#6 edit .. //depot/projects/usb/src/sys/dev/usb/ukbd.c#8 edit .. //depot/projects/usb/src/sys/dev/usb/ulpt.c#10 edit .. //depot/projects/usb/src/sys/dev/usb/umodem.c#8 edit .. //depot/projects/usb/src/sys/dev/usb/ums.c#8 edit .. //depot/projects/usb/src/sys/dev/usb/uplcom.c#7 edit .. //depot/projects/usb/src/sys/dev/usb/uvisor.c#6 edit .. //depot/projects/usb/src/sys/dev/usb/uvscom.c#8 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb/ubsa.c#6 (text+ko) ==== @@ -742,6 +742,12 @@ ubsa_open(struct ucom_softc *ucom) { struct ubsa_softc *sc = ucom->sc_parent; + + /* clear stall first: */ + sc->sc_flag |= (UBSA_FLAG_WRITE_STALL| + UBSA_FLAG_READ_STALL| + UBSA_FLAG_INTR_STALL); + usbd_transfer_start(sc->sc_xfer[4]); return 0; } ==== //depot/projects/usb/src/sys/dev/usb/ukbd.c#8 (text+ko) ==== @@ -136,7 +136,7 @@ #define UKBD_FLAG_COMPOSE 0x0001 #define UKBD_FLAG_POLLING 0x0002 #define UKBD_FLAG_SET_LEDS 0x0004 -#define UKBD_FLAG_PIPE_ERROR 0x0008 +#define UKBD_FLAG_INTR_STALL 0x0008 #define UKBD_FLAG_ATTACHED 0x0010 #define UKBD_FLAG_GONE 0x0020 @@ -437,42 +437,29 @@ } static void -ukbd_clear_stall_callback(struct usbd_xfer *xfer1) +ukbd_clear_stall_callback(struct usbd_xfer *xfer) { - usb_device_request_t *req = xfer1->buffer; - struct ukbd_softc *sc = xfer1->priv_sc; - struct usbd_xfer *xfer0 = sc->sc_xfer[0]; + struct ukbd_softc *sc = xfer->priv_sc; + struct usbd_xfer *xfer_other = sc->sc_xfer[0]; - USBD_CHECK_STATUS(xfer1); + USBD_CHECK_STATUS(xfer); tr_setup: + /* start clear stall */ + usbd_clear_stall_tr_setup(xfer, xfer_other); + return; - /* setup a CLEAR STALL packet */ + tr_transferred: + usbd_clear_stall_tr_transferred(xfer, xfer_other); - req->bmRequestType = UT_WRITE_ENDPOINT; - req->bRequest = UR_CLEAR_FEATURE; - USETW(req->wValue, UF_ENDPOINT_HALT); - req->wIndex[0] = xfer0->pipe->edesc->bEndpointAddress; - req->wIndex[1] = 0; - USETW(req->wLength, 0); + sc->sc_flags &= ~UKBD_FLAG_INTR_STALL; + usbd_transfer_start(xfer_other); + return; - usbd_start_hardware(xfer1); - return; - tr_error: - DPRINTF(0, "error=%s\n", usbd_errstr(xfer1->error)); - - tr_transferred: - - sc->sc_flags &= ~UKBD_FLAG_PIPE_ERROR; - - if (xfer1->error != USBD_CANCELLED) { - - xfer0->pipe->clearstall = 0; - xfer0->pipe->toggle_next = 0; - - usbd_transfer_start(xfer0); - } + /* bomb out */ + sc->sc_flags &= ~UKBD_FLAG_INTR_STALL; + DPRINTF(0, "error=%s\n", usbd_errstr(xfer->error)); return; } @@ -510,12 +497,14 @@ } tr_setup: - if (!(sc->sc_flags & UKBD_FLAG_PIPE_ERROR)) { - if (sc->sc_inputs < UKBD_IN_BUF_FULL) { - usbd_start_hardware(xfer); - } else { - DPRINTF(0, "input queue is full!\n"); - } + if (sc->sc_flags & UKBD_FLAG_INTR_STALL) { + usbd_transfer_start(sc->sc_xfer[1]); + return; + } + if (sc->sc_inputs < UKBD_IN_BUF_FULL) { + usbd_start_hardware(xfer); + } else { + DPRINTF(0, "input queue is full!\n"); } return; @@ -523,10 +512,8 @@ DPRINTF(0, "error=%s\n", usbd_errstr(xfer->error)); if (xfer->error != USBD_CANCELLED) { - - /* start clear stall */ - sc->sc_flags |= UKBD_FLAG_PIPE_ERROR; - + /* try to clear stall first */ + sc->sc_flags |= UKBD_FLAG_INTR_STALL; usbd_transfer_start(sc->sc_xfer[1]); } return; @@ -718,6 +705,10 @@ genkbd_diag(kbd, bootverbose); } + /* clear stall first */ + + sc->sc_flags |= UKBD_FLAG_INTR_STALL; + /* start the keyboard */ usbd_transfer_start(sc->sc_xfer[0]); ==== //depot/projects/usb/src/sys/dev/usb/ulpt.c#10 (text+ko) ==== @@ -452,6 +452,16 @@ struct ulpt_softc *sc = cdev->sc_priv_ptr; int32_t error = 0; + if (fflags & FREAD) { + /* clear stall first */ + sc->sc_flags |= ULPT_FLAG_READ_STALL; + } + + if (fflags & FWRITE) { + /* clear stall first */ + sc->sc_flags |= ULPT_FLAG_WRITE_STALL; + } + if (prime) { DPRINTF(0, "opening prime device (reset)\n"); ==== //depot/projects/usb/src/sys/dev/usb/umodem.c#8 (text+ko) ==== @@ -536,6 +536,11 @@ DPRINTF(0, "sc=%p\n", sc); + /* clear stall first */ + sc->sc_flag |= (UMODEM_FLAG_READ_STALL| + UMODEM_FLAG_WRITE_STALL| + UMODEM_FLAG_INTR_STALL); + if (sc->sc_xfer_intr[0]) { usbd_transfer_start(sc->sc_xfer_intr[0]); } ==== //depot/projects/usb/src/sys/dev/usb/ums.c#8 (text+ko) ==== @@ -735,6 +735,10 @@ sc->sc_status.dz = 0; /* sc->sc_status.dt = 0; */ + /* clear stall first */ + + sc->sc_flags |= UMS_FLAG_INTR_STALL; + /* start interrupt transfer */ usbd_transfer_start(sc->sc_xfer[0]); ==== //depot/projects/usb/src/sys/dev/usb/uplcom.c#7 (text+ko) ==== @@ -775,6 +775,11 @@ DPRINTF(0, "sc=%p\n", sc); + /* clear stall first */ + sc->sc_flag |= (UPLCOM_FLAG_INTR_STALL| + UPLCOM_FLAG_READ_STALL| + UPLCOM_FLAG_WRITE_STALL); + usbd_transfer_start(sc->sc_xfer_intr[0]); return (0); ==== //depot/projects/usb/src/sys/dev/usb/uvisor.c#6 (text+ko) ==== @@ -184,6 +184,9 @@ usbd_status uvisor_init(struct uvisor_softc *sc, struct usbd_device *udev, struct usbd_config *config); +static int +uvisor_open(struct ucom_softc *ucom); + static void uvisor_close(struct ucom_softc *ucom); @@ -264,6 +267,7 @@ }; static const struct ucom_callback uvisor_callback = { + .ucom_open = &uvisor_open, .ucom_close = &uvisor_close, .ucom_start_read = &uvisor_start_read, .ucom_stop_read = &uvisor_stop_read, @@ -589,6 +593,17 @@ return err; } +static int +uvisor_open(struct ucom_softc *ucom) +{ + struct uvisor_softc *sc = ucom->sc_parent; + + /* clear stall first */ + sc->sc_flag |= (UVISOR_FLAG_WRITE_STALL| + UVISOR_FLAG_READ_STALL); + return 0; +} + static void uvisor_close(struct ucom_softc *ucom) { ==== //depot/projects/usb/src/sys/dev/usb/uvscom.c#8 (text+ko) ==== @@ -473,6 +473,10 @@ goto detach; } + /* clear stall first */ + + sc->sc_flag |= UVSCOM_FLAG_INTR_STALL; + /* start interrupt pipe */ usbd_transfer_start(sc->sc_xfer[4]); @@ -971,7 +975,10 @@ DPRINTF(0, "sc = %p\n", sc); - sc->sc_flag |= UVSCOM_FLAG_OPEN; + /* clear stall first */ + sc->sc_flag |= (UVSCOM_FLAG_OPEN| + UVSCOM_FLAG_WRITE_STALL| + UVSCOM_FLAG_READ_STALL); /* check if PC card was inserted */ From owner-p4-projects@FreeBSD.ORG Thu Jul 27 16:55:21 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9602216A4DF; Thu, 27 Jul 2006 16:55:21 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 7394516A4DD for ; Thu, 27 Jul 2006 16:55:21 +0000 (UTC) (envelope-from cognet@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 3C84643D62 for ; Thu, 27 Jul 2006 16:55:21 +0000 (GMT) (envelope-from cognet@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k6RGtLuE000270 for ; Thu, 27 Jul 2006 16:55:21 GMT (envelope-from cognet@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k6RGtK9P000267 for perforce@freebsd.org; Thu, 27 Jul 2006 16:55:20 GMT (envelope-from cognet@freebsd.org) Date: Thu, 27 Jul 2006 16:55:20 GMT Message-Id: <200607271655.k6RGtK9P000267@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to cognet@freebsd.org using -f From: Olivier Houchard To: Perforce Change Reviews Cc: Subject: PERFORCE change 102573 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 27 Jul 2006 16:55:21 -0000 http://perforce.freebsd.org/chv.cgi?CH=102573 Change 102573 by cognet@cognet on 2006/07/27 16:55:20 More PCI init stuff, from NetBSD. Affected files ... .. //depot/projects/arm/src/sys/arm/xscale/ixp425/ixp425_pci.c#7 edit Differences ... ==== //depot/projects/arm/src/sys/arm/xscale/ixp425/ixp425_pci.c#7 (text+ko) ==== @@ -97,6 +97,7 @@ ixppcib_attach(device_t dev) { int rid; + uint32_t reg; struct ixppcib_softc *sc; sc = device_get_softc(dev); @@ -145,6 +146,51 @@ } device_add_child(dev, "pci", -1); + /* + * PCI->AHB address translation + * begin at the physical memory start + OFFSET + */ +#define AHB_OFFSET 0x10000000UL + reg = (AHB_OFFSET + 0x00000000) >> 0; + reg |= (AHB_OFFSET + 0x01000000) >> 8; + reg |= (AHB_OFFSET + 0x02000000) >> 16; + reg |= (AHB_OFFSET + 0x03000000) >> 24; + PCI_CSR_WRITE_4(sc, PCI_AHBMEMBASE, reg); + +#define IXPPCIB_WRITE_CONF(sc, reg, val) \ + ixppcib_write_config(dev, 0, 0, 0, (reg), (val), 4) + /* Write Mapping registers PCI Configuration Registers */ + /* Base Address 0 - 3 */ + IXPPCIB_WRITE_CONF(sc, PCI_MAPREG_BAR0, AHB_OFFSET + 0x00000000); + IXPPCIB_WRITE_CONF(sc, PCI_MAPREG_BAR1, AHB_OFFSET + 0x01000000); + IXPPCIB_WRITE_CONF(sc, PCI_MAPREG_BAR2, AHB_OFFSET + 0x02000000); + IXPPCIB_WRITE_CONF(sc, PCI_MAPREG_BAR3, AHB_OFFSET + 0x03000000); + + /* Base Address 4 */ + IXPPCIB_WRITE_CONF(sc, PCI_MAPREG_BAR4, 0xffffffff); + + /* Base Address 5 */ + IXPPCIB_WRITE_CONF(sc, PCI_MAPREG_BAR5, 0x00000000); + + /* Assert some PCI errors */ + PCI_CSR_WRITE_4(sc, PCI_ISR, ISR_AHBE | ISR_PPE | ISR_PFE | ISR_PSE); + + /* + * Set up byte lane swapping between little-endian PCI + * and the big-endian AHB bus + */ + PCI_CSR_WRITE_4(sc, PCI_CSR, CSR_IC | CSR_ABE | CSR_PDS); + + /* + * Enable bus mastering and I/O,memory access + */ + IXPPCIB_WRITE_CONF(sc, PCIR_COMMAND, + PCIM_CMD_MEMEN | PCIM_CMD_BUSMASTEREN); + + /* + * Wait some more to ensure PCI devices have stabilised. + */ + DELAY(50000); return (bus_generic_attach(dev)); } From owner-p4-projects@FreeBSD.ORG Thu Jul 27 16:59:27 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 832C916A4E0; Thu, 27 Jul 2006 16:59:27 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 40ADB16A4DD for ; Thu, 27 Jul 2006 16:59:27 +0000 (UTC) (envelope-from cognet@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 0E79443D46 for ; Thu, 27 Jul 2006 16:59:27 +0000 (GMT) (envelope-from cognet@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k6RGxQCT000418 for ; Thu, 27 Jul 2006 16:59:26 GMT (envelope-from cognet@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k6RGxQHB000415 for perforce@freebsd.org; Thu, 27 Jul 2006 16:59:26 GMT (envelope-from cognet@freebsd.org) Date: Thu, 27 Jul 2006 16:59:26 GMT Message-Id: <200607271659.k6RGxQHB000415@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to cognet@freebsd.org using -f From: Olivier Houchard To: Perforce Change Reviews Cc: Subject: PERFORCE change 102574 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 27 Jul 2006 16:59:27 -0000 http://perforce.freebsd.org/chv.cgi?CH=102574 Change 102574 by cognet@cognet on 2006/07/27 16:58:34 Only set the byte swapping bit on the PCI bus if we're running BE. Affected files ... .. //depot/projects/arm/src/sys/arm/xscale/ixp425/ixp425_pci.c#8 edit Differences ... ==== //depot/projects/arm/src/sys/arm/xscale/ixp425/ixp425_pci.c#8 (text+ko) ==== @@ -175,11 +175,13 @@ /* Assert some PCI errors */ PCI_CSR_WRITE_4(sc, PCI_ISR, ISR_AHBE | ISR_PPE | ISR_PFE | ISR_PSE); +#ifdef __ARMEB__ /* * Set up byte lane swapping between little-endian PCI * and the big-endian AHB bus */ PCI_CSR_WRITE_4(sc, PCI_CSR, CSR_IC | CSR_ABE | CSR_PDS); +#endif /* * Enable bus mastering and I/O,memory access From owner-p4-projects@FreeBSD.ORG Thu Jul 27 18:23:14 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B0A4516A4DD; Thu, 27 Jul 2006 18:23:14 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 76E2F16A4F3 for ; Thu, 27 Jul 2006 18:23:14 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 12A2A43D6B for ; Thu, 27 Jul 2006 18:23:13 +0000 (GMT) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k6RINC7I007357 for ; Thu, 27 Jul 2006 18:23:12 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k6RINC9M007354 for perforce@freebsd.org; Thu, 27 Jul 2006 18:23:12 GMT (envelope-from hselasky@FreeBSD.org) Date: Thu, 27 Jul 2006 18:23:12 GMT Message-Id: <200607271823.k6RINC9M007354@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to hselasky@FreeBSD.org using -f From: Hans Petter Selasky To: Perforce Change Reviews Cc: Subject: PERFORCE change 102576 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 27 Jul 2006 18:23:15 -0000 http://perforce.freebsd.org/chv.cgi?CH=102576 Change 102576 by hselasky@hselasky_mini_itx on 2006/07/27 18:22:38 It appears some USB devices are broken, and does not work after clearing STALL on the INTERRUPT pipe. Hence the DATA-TOGGLE bit is not important when only short packets are sent, with length less than wMaxPacketSize, only clear stall on BULK endpoints, and INTERRUPT endpoints that transfer more than wMaxPacketSize bytes, per transfer. Affected files ... .. //depot/projects/usb/src/sys/dev/usb/ubsa.c#7 edit .. //depot/projects/usb/src/sys/dev/usb/ukbd.c#9 edit .. //depot/projects/usb/src/sys/dev/usb/ulpt.c#11 edit .. //depot/projects/usb/src/sys/dev/usb/umodem.c#9 edit .. //depot/projects/usb/src/sys/dev/usb/ums.c#9 edit .. //depot/projects/usb/src/sys/dev/usb/uplcom.c#8 edit .. //depot/projects/usb/src/sys/dev/usb/usb_subr.h#13 edit .. //depot/projects/usb/src/sys/dev/usb/usb_transfer.c#11 edit .. //depot/projects/usb/src/sys/dev/usb/uvisor.c#7 edit .. //depot/projects/usb/src/sys/dev/usb/uvscom.c#9 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb/ubsa.c#7 (text+ko) ==== @@ -745,8 +745,7 @@ /* clear stall first: */ sc->sc_flag |= (UBSA_FLAG_WRITE_STALL| - UBSA_FLAG_READ_STALL| - UBSA_FLAG_INTR_STALL); + UBSA_FLAG_READ_STALL); usbd_transfer_start(sc->sc_xfer[4]); return 0; ==== //depot/projects/usb/src/sys/dev/usb/ukbd.c#9 (text+ko) ==== @@ -705,10 +705,6 @@ genkbd_diag(kbd, bootverbose); } - /* clear stall first */ - - sc->sc_flags |= UKBD_FLAG_INTR_STALL; - /* start the keyboard */ usbd_transfer_start(sc->sc_xfer[0]); ==== //depot/projects/usb/src/sys/dev/usb/ulpt.c#11 (text+ko) ==== ==== //depot/projects/usb/src/sys/dev/usb/umodem.c#9 (text+ko) ==== @@ -538,8 +538,7 @@ /* clear stall first */ sc->sc_flag |= (UMODEM_FLAG_READ_STALL| - UMODEM_FLAG_WRITE_STALL| - UMODEM_FLAG_INTR_STALL); + UMODEM_FLAG_WRITE_STALL); if (sc->sc_xfer_intr[0]) { usbd_transfer_start(sc->sc_xfer_intr[0]); ==== //depot/projects/usb/src/sys/dev/usb/ums.c#9 (text+ko) ==== @@ -735,10 +735,6 @@ sc->sc_status.dz = 0; /* sc->sc_status.dt = 0; */ - /* clear stall first */ - - sc->sc_flags |= UMS_FLAG_INTR_STALL; - /* start interrupt transfer */ usbd_transfer_start(sc->sc_xfer[0]); ==== //depot/projects/usb/src/sys/dev/usb/uplcom.c#8 (text+ko) ==== @@ -776,8 +776,7 @@ DPRINTF(0, "sc=%p\n", sc); /* clear stall first */ - sc->sc_flag |= (UPLCOM_FLAG_INTR_STALL| - UPLCOM_FLAG_READ_STALL| + sc->sc_flag |= (UPLCOM_FLAG_READ_STALL| UPLCOM_FLAG_WRITE_STALL); usbd_transfer_start(sc->sc_xfer_intr[0]); ==== //depot/projects/usb/src/sys/dev/usb/usb_subr.h#13 (text+ko) ==== ==== //depot/projects/usb/src/sys/dev/usb/usb_transfer.c#11 (text+ko) ==== ==== //depot/projects/usb/src/sys/dev/usb/uvisor.c#7 (text+ko) ==== ==== //depot/projects/usb/src/sys/dev/usb/uvscom.c#9 (text+ko) ==== @@ -473,10 +473,6 @@ goto detach; } - /* clear stall first */ - - sc->sc_flag |= UVSCOM_FLAG_INTR_STALL; - /* start interrupt pipe */ usbd_transfer_start(sc->sc_xfer[4]); From owner-p4-projects@FreeBSD.ORG Thu Jul 27 19:14:20 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 35B1A16A4E2; Thu, 27 Jul 2006 19:14:20 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id EE0E016A4E0 for ; Thu, 27 Jul 2006 19:14:19 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 9FB1C43D5A for ; Thu, 27 Jul 2006 19:14:19 +0000 (GMT) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k6RJEJC1012034 for ; Thu, 27 Jul 2006 19:14:19 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k6RJEJ1Q012031 for perforce@freebsd.org; Thu, 27 Jul 2006 19:14:19 GMT (envelope-from jhb@freebsd.org) Date: Thu, 27 Jul 2006 19:14:19 GMT Message-Id: <200607271914.k6RJEJ1Q012031@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 Cc: Subject: PERFORCE change 102581 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 27 Jul 2006 19:14:20 -0000 http://perforce.freebsd.org/chv.cgi?CH=102581 Change 102581 by jhb@jhb_mutex on 2006/07/27 19:13:24 Really fix the hw.physmem stuff. Not only do we have to not change the physmap[], we also have to make sure Maxmem retains the correct value. Affected files ... .. //depot/projects/smpng/sys/amd64/amd64/machdep.c#55 edit .. //depot/projects/smpng/sys/i386/i386/machdep.c#111 edit Differences ... ==== //depot/projects/smpng/sys/amd64/amd64/machdep.c#55 (text+ko) ==== @@ -947,6 +947,13 @@ if (TUNABLE_ULONG_FETCH("hw.physmem", &physmem_tunable)) Maxmem = atop(physmem_tunable); + /* + * Don't allow MAXMEM or hw.physmem to extend the amount of memory + * in the system. + */ + if (Maxmem > atop(physmap[physmap_idx + 1])) + Maxmem = atop(physmap[physmap_idx + 1]); + if (atop(physmap[physmap_idx + 1]) != Maxmem && (boothowto & RB_VERBOSE)) printf("Physical memory use set to %ldK\n", Maxmem * 4); ==== //depot/projects/smpng/sys/i386/i386/machdep.c#111 (text+ko) ==== @@ -1661,6 +1661,7 @@ bzero(&vmf, sizeof(vmf)); bzero(physmap, sizeof(physmap)); basemem = 0; + has_smap = 0; /* * Some newer BIOSes has broken INT 12H implementation which cause @@ -1884,16 +1885,22 @@ if (TUNABLE_ULONG_FETCH("hw.physmem", &physmem_tunable)) Maxmem = atop(physmem_tunable); + /* + * If we have an SMAP, don't allow MAXMEM or hw.physmem to extend + * the amount of memory in the system. + */ + if (has_smap && Maxmem > atop(physmap[physmap_idx + 1])) + Maxmem = atop(physmap[physmap_idx + 1]); + if (atop(physmap[physmap_idx + 1]) != Maxmem && (boothowto & RB_VERBOSE)) printf("Physical memory use set to %ldK\n", Maxmem * 4); /* - * If Maxmem has been increased beyond what the system has detected - * and we didn't get the memory layout via SMAP, extend the last - * memory segment to the new limit. + * If Maxmem has been increased beyond what the system has detected, + * extend the last memory segment to the new limit. */ - if (!has_smap && atop(physmap[physmap_idx + 1]) < Maxmem) + if (atop(physmap[physmap_idx + 1]) < Maxmem) physmap[physmap_idx + 1] = ptoa((vm_paddr_t)Maxmem); /* call pmap initialization to make new kernel address space */ From owner-p4-projects@FreeBSD.ORG Thu Jul 27 19:26:37 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1C25616A4DF; Thu, 27 Jul 2006 19:26:37 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id CF85F16A4DD for ; Thu, 27 Jul 2006 19:26:36 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 9503B43D49 for ; Thu, 27 Jul 2006 19:26:36 +0000 (GMT) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k6RJQaMu012802 for ; Thu, 27 Jul 2006 19:26:36 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k6RJQaAx012799 for perforce@freebsd.org; Thu, 27 Jul 2006 19:26:36 GMT (envelope-from jhb@freebsd.org) Date: Thu, 27 Jul 2006 19:26:36 GMT Message-Id: <200607271926.k6RJQaAx012799@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 Cc: Subject: PERFORCE change 102584 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 27 Jul 2006 19:26:37 -0000 http://perforce.freebsd.org/chv.cgi?CH=102584 Change 102584 by jhb@jhb_mutex on 2006/07/27 19:25:38 Explicitly write a trash value that will always force any mtx_lock() operations to block into a mutex when it is being destroyed. Previously, the mutex operations on the mutex would actually still work, and if a lock was destroyed while it was held, then it would look like the lock was still held by the thread that destroyed it. Affected files ... .. //depot/projects/smpng/sys/kern/kern_mutex.c#132 edit .. //depot/projects/smpng/sys/modules/crash/crash.c#33 edit .. //depot/projects/smpng/sys/sys/mutex.h#64 edit Differences ... ==== //depot/projects/smpng/sys/kern/kern_mutex.c#132 (text+ko) ==== @@ -276,6 +276,8 @@ { MPASS(curthread != NULL); + KASSERT(m->mtx_lock != MTX_DESTROYED, + ("mtx_lock() of destroyed mutex @ %s:%d", file, line)); KASSERT(LOCK_CLASS(&m->mtx_object) == &lock_class_mtx_sleep, ("mtx_lock() of spin mutex %s @ %s:%d", m->mtx_object.lo_name, file, line)); @@ -302,6 +304,8 @@ { MPASS(curthread != NULL); + KASSERT(m->mtx_lock != MTX_DESTROYED, + ("mtx_unlock() of destroyed mutex @ %s:%d", file, line)); KASSERT(LOCK_CLASS(&m->mtx_object) == &lock_class_mtx_sleep, ("mtx_unlock() of spin mutex %s @ %s:%d", m->mtx_object.lo_name, file, line)); @@ -382,6 +386,8 @@ { MPASS(curthread != NULL); + KASSERT(m->mtx_lock != MTX_DESTROYED, + ("mtx_lock_spin() of destroyed mutex @ %s:%d", file, line)); KASSERT(LOCK_CLASS(&m->mtx_object) == &lock_class_mtx_spin, ("mtx_lock_spin() of sleep mutex %s @ %s:%d", m->mtx_object.lo_name, file, line)); @@ -398,6 +404,8 @@ { MPASS(curthread != NULL); + KASSERT(m->mtx_lock != MTX_DESTROYED, + ("mtx_unlock_spin() of destroyed mutex @ %s:%d", file, line)); KASSERT(LOCK_CLASS(&m->mtx_object) == &lock_class_mtx_spin, ("mtx_unlock_spin() of sleep mutex %s @ %s:%d", m->mtx_object.lo_name, file, line)); @@ -419,6 +427,8 @@ int rval; MPASS(curthread != NULL); + KASSERT(m->mtx_lock != MTX_DESTROYED, + ("mtx_trylock() of destroyed mutex @ %s:%d", file, line)); KASSERT(LOCK_CLASS(&m->mtx_object) == &lock_class_mtx_sleep, ("mtx_trylock() of spin mutex %s @ %s:%d", m->mtx_object.lo_name, file, line)); @@ -920,6 +930,7 @@ __LINE__); } + m->mtx_lock = MTX_DESTROYED; lock_destroy(&m->mtx_object); } ==== //depot/projects/smpng/sys/modules/crash/crash.c#33 (text+ko) ==== @@ -87,6 +87,20 @@ /* Events. */ static void +lock_destroyed_mtx(void) +{ + + bzero(&test1_mtx, sizeof(test1_mtx)); + mtx_init(&test1_mtx, "test1", NULL, MTX_DEF | MTX_RECURSE); + mtx_lock(&test1_mtx); + mtx_destroy(&test1_mtx); + kdb_enter("examine test1"); + mtx_lock(&test1_mtx); + kdb_enter("examine again"); +} +CRASH_EVENT("lock destroyed mutex", lock_destroyed_mtx); + +static void upgrade_baz(void) { rw_init(&baz, "baz"); ==== //depot/projects/smpng/sys/sys/mutex.h#64 (text+ko) ==== @@ -73,6 +73,11 @@ #define MTX_UNOWNED 0x00000004 /* Cookie for free mutex */ #define MTX_FLAGMASK (MTX_RECURSED | MTX_CONTESTED | MTX_UNOWNED) +/* + * Value stored in mutex->mtx_lock to denote a destroyed mutex. + */ +#define MTX_DESTROYED (MTX_CONTESTED | MTX_UNOWNED) + #endif /* _KERNEL */ #ifndef LOCORE From owner-p4-projects@FreeBSD.ORG Thu Jul 27 19:33:53 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9F2F716A4DF; Thu, 27 Jul 2006 19:33:53 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 7C87C16A4E2 for ; Thu, 27 Jul 2006 19:33:53 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 8839143D72 for ; Thu, 27 Jul 2006 19:33:46 +0000 (GMT) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k6RJXkbY013166 for ; Thu, 27 Jul 2006 19:33:46 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k6RJXjIT013163 for perforce@freebsd.org; Thu, 27 Jul 2006 19:33:45 GMT (envelope-from hselasky@FreeBSD.org) Date: Thu, 27 Jul 2006 19:33:45 GMT Message-Id: <200607271933.k6RJXjIT013163@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to hselasky@FreeBSD.org using -f From: Hans Petter Selasky To: Perforce Change Reviews Cc: Subject: PERFORCE change 102585 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 27 Jul 2006 19:33:54 -0000 http://perforce.freebsd.org/chv.cgi?CH=102585 Change 102585 by hselasky@hselasky_mini_itx on 2006/07/27 19:33:41 Optimize UHCI and EHCI drivers by not scanning TD chains from the beginning, but rather store the position of the last checked TD and continue on from there. Affected files ... .. //depot/projects/usb/src/sys/dev/usb/ehci.c#7 edit .. //depot/projects/usb/src/sys/dev/usb/ohci.c#7 edit .. //depot/projects/usb/src/sys/dev/usb/uhci.c#7 edit .. //depot/projects/usb/src/sys/dev/usb/usb_subr.h#14 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb/ehci.c#7 (text+ko) ==== @@ -1119,7 +1119,7 @@ DPRINTFN(12, ("xfer=%p active\n", xfer)); - for(td = xfer->td_transfer_first; + for(td = xfer->td_transfer_cache; td != NULL; td = ((td == xfer->td_transfer_last) ? NULL : td->obj_next)) { @@ -1134,6 +1134,8 @@ { DPRINTFN(12, ("xfer=%p is still " "active\n", xfer)); + /* update cache */ + xfer->td_transfer_cache = td; goto done; } @@ -1429,7 +1431,8 @@ xfer->address, UE_GET_ADDR(xfer->endpoint), xfer->length, xfer->udev->speed)); - td = (xfer->td_transfer_first = xfer->td_start); + td = (xfer->td_transfer_first = + xfer->td_transfer_cache = xfer->td_start); buf_offset = 0; usbd_get_page(&(xfer->buf_data), buf_offset, &buf_res); ==== //depot/projects/usb/src/sys/dev/usb/ohci.c#7 (text+ko) ==== ==== //depot/projects/usb/src/sys/dev/usb/uhci.c#7 (text+ko) ==== @@ -969,7 +969,7 @@ DPRINTFN(12, ("xfer=%p active\n", xfer)); - for(td = xfer->td_transfer_first; + for(td = xfer->td_transfer_cache; td != NULL; td = ((td == xfer->td_transfer_last) ? NULL : td->obj_next)) { @@ -984,6 +984,9 @@ { DPRINTFN(12, ("xfer=%p is still " "active\n", xfer)); + + /* update cache */ + xfer->td_transfer_cache = td; goto done; } @@ -1229,7 +1232,8 @@ xfer->address, UE_GET_ADDR(xfer->endpoint), xfer->length, xfer->udev->speed)); - td = (xfer->td_transfer_first = xfer->td_start); + td = (xfer->td_transfer_first = + xfer->td_transfer_cache = xfer->td_start); buf_offset = 0; usbd_get_page(&(xfer->buf_data), buf_offset, &buf_res); ==== //depot/projects/usb/src/sys/dev/usb/usb_subr.h#14 (text+ko) ==== @@ -405,6 +405,7 @@ void *td_start; void *td_transfer_first; void *td_transfer_last; + void *td_transfer_cache; #ifdef USB_COMPAT_OLD struct usbd_xfer * alloc_xfer; /* the real transfer */ From owner-p4-projects@FreeBSD.ORG Thu Jul 27 20:10:39 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6841416A4E1; Thu, 27 Jul 2006 20:10:39 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 0F93016A4DD for ; Thu, 27 Jul 2006 20:10:39 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id A238C43D4C for ; Thu, 27 Jul 2006 20:10:38 +0000 (GMT) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k6RKAcOf016560 for ; Thu, 27 Jul 2006 20:10:38 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k6RKAZqW016554 for perforce@freebsd.org; Thu, 27 Jul 2006 20:10:35 GMT (envelope-from jhb@freebsd.org) Date: Thu, 27 Jul 2006 20:10:35 GMT Message-Id: <200607272010.k6RKAZqW016554@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 Cc: Subject: PERFORCE change 102592 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 27 Jul 2006 20:10:39 -0000 http://perforce.freebsd.org/chv.cgi?CH=102592 Change 102592 by jhb@jhb_mutex on 2006/07/27 20:09:45 IFC @102591. Affected files ... .. //depot/projects/smpng/sys/amd64/amd64/machdep.c#56 integrate .. //depot/projects/smpng/sys/amd64/amd64/vm_machdep.c#33 integrate .. //depot/projects/smpng/sys/amd64/ia32/ia32_syscall.c#14 integrate .. //depot/projects/smpng/sys/arm/at91/kb920x_machdep.c#8 integrate .. //depot/projects/smpng/sys/arm/include/db_machdep.h#5 integrate .. //depot/projects/smpng/sys/arm/xscale/i80321/i80321.c#6 integrate .. //depot/projects/smpng/sys/arm/xscale/i80321/iq80321.c#11 integrate .. //depot/projects/smpng/sys/boot/forth/loader.conf#42 integrate .. //depot/projects/smpng/sys/compat/svr4/svr4_stream.c#39 integrate .. //depot/projects/smpng/sys/conf/Makefile.arm#24 integrate .. //depot/projects/smpng/sys/conf/NOTES#125 integrate .. //depot/projects/smpng/sys/conf/files#182 integrate .. //depot/projects/smpng/sys/conf/files.i386#99 integrate .. //depot/projects/smpng/sys/conf/files.powerpc#30 integrate .. //depot/projects/smpng/sys/crypto/via/padlock.c#6 integrate .. //depot/projects/smpng/sys/crypto/via/padlock.h#1 branch .. //depot/projects/smpng/sys/crypto/via/padlock_cipher.c#1 branch .. //depot/projects/smpng/sys/crypto/via/padlock_hash.c#1 branch .. //depot/projects/smpng/sys/dev/acpica/acpi_thermal.c#37 integrate .. //depot/projects/smpng/sys/dev/ata/ata-chipset.c#70 integrate .. //depot/projects/smpng/sys/dev/ata/ata-pci.h#44 integrate .. //depot/projects/smpng/sys/dev/ath/ath_rate/sample/sample.h#3 integrate .. //depot/projects/smpng/sys/dev/ath/if_ath.c#42 integrate .. //depot/projects/smpng/sys/dev/em/if_em.c#70 integrate .. //depot/projects/smpng/sys/dev/iwi/if_iwi.c#18 integrate .. //depot/projects/smpng/sys/dev/mii/gentbi.c#1 branch .. //depot/projects/smpng/sys/dev/mii/ip1000phy.c#1 branch .. //depot/projects/smpng/sys/dev/mii/ip1000phyreg.h#1 branch .. //depot/projects/smpng/sys/dev/mii/miidevs#18 integrate .. //depot/projects/smpng/sys/dev/mpt/mpt_cam.c#12 integrate .. //depot/projects/smpng/sys/dev/mpt/mpt_pci.c#23 integrate .. //depot/projects/smpng/sys/dev/ral/rt2560.c#4 integrate .. //depot/projects/smpng/sys/dev/scc/scc_core.c#2 integrate .. //depot/projects/smpng/sys/dev/scc/scc_dev_z8530.c#2 integrate .. //depot/projects/smpng/sys/dev/sk/if_sk.c#5 integrate .. //depot/projects/smpng/sys/dev/sk/if_skreg.h#4 integrate .. //depot/projects/smpng/sys/dev/stge/if_stge.c#1 branch .. //depot/projects/smpng/sys/dev/stge/if_stgereg.h#1 branch .. //depot/projects/smpng/sys/dev/uart/uart_cpu_powerpc.c#2 integrate .. //depot/projects/smpng/sys/dev/uart/uart_dev_z8530.c#12 integrate .. //depot/projects/smpng/sys/dev/uart/uart_tty.c#20 integrate .. //depot/projects/smpng/sys/dev/usb/if_ural.c#17 integrate .. //depot/projects/smpng/sys/dev/usb/uplcom.c#26 integrate .. //depot/projects/smpng/sys/dev/usb/usbdevs#92 integrate .. //depot/projects/smpng/sys/fs/udf/ecma167-udf.h#6 integrate .. //depot/projects/smpng/sys/fs/udf/udf_vfsops.c#29 integrate .. //depot/projects/smpng/sys/geom/eli/g_eli.c#13 integrate .. //depot/projects/smpng/sys/geom/eli/g_eli_integrity.c#2 integrate .. //depot/projects/smpng/sys/i386/conf/GENERIC#81 integrate .. //depot/projects/smpng/sys/i386/i386/machdep.c#112 integrate .. //depot/projects/smpng/sys/ia64/ia32/ia32_trap.c#10 integrate .. //depot/projects/smpng/sys/kern/kern_malloc.c#45 integrate .. //depot/projects/smpng/sys/kern/kern_mutex.c#133 integrate .. //depot/projects/smpng/sys/kern/subr_acl_posix1e.c#3 integrate .. //depot/projects/smpng/sys/kern/sys_socket.c#24 integrate .. //depot/projects/smpng/sys/kern/uipc_domain.c#18 integrate .. //depot/projects/smpng/sys/kern/uipc_sockbuf.c#1 branch .. //depot/projects/smpng/sys/kern/uipc_socket.c#88 integrate .. //depot/projects/smpng/sys/kern/uipc_socket2.c#56 integrate .. //depot/projects/smpng/sys/kern/uipc_syscalls.c#92 integrate .. //depot/projects/smpng/sys/kern/uipc_usrreq.c#63 integrate .. //depot/projects/smpng/sys/kern/vfs_syscalls.c#114 integrate .. //depot/projects/smpng/sys/modules/Makefile#126 integrate .. //depot/projects/smpng/sys/modules/agp/Makefile#11 integrate .. //depot/projects/smpng/sys/modules/asr/Makefile#4 integrate .. //depot/projects/smpng/sys/modules/bridgestp/Makefile#1 branch .. //depot/projects/smpng/sys/modules/hwpmc/Makefile#3 integrate .. //depot/projects/smpng/sys/modules/if_bridge/Makefile#5 integrate .. //depot/projects/smpng/sys/modules/mii/Makefile#10 integrate .. //depot/projects/smpng/sys/modules/osf1/Makefile#8 delete .. //depot/projects/smpng/sys/modules/padlock/Makefile#2 integrate .. //depot/projects/smpng/sys/modules/stge/Makefile#1 branch .. //depot/projects/smpng/sys/net/bpf.c#62 integrate .. //depot/projects/smpng/sys/net/bridgestp.c#8 integrate .. //depot/projects/smpng/sys/net/bridgestp.h#1 branch .. //depot/projects/smpng/sys/net/if_bridge.c#33 integrate .. //depot/projects/smpng/sys/net/if_bridgevar.h#10 integrate .. //depot/projects/smpng/sys/net/if_enc.c#5 integrate .. //depot/projects/smpng/sys/net/if_ethersubr.c#73 integrate .. //depot/projects/smpng/sys/net/if_gif.c#36 integrate .. //depot/projects/smpng/sys/net80211/ieee80211.c#22 integrate .. //depot/projects/smpng/sys/net80211/ieee80211.h#9 integrate .. //depot/projects/smpng/sys/net80211/ieee80211_freebsd.h#7 integrate .. //depot/projects/smpng/sys/net80211/ieee80211_ioctl.c#27 integrate .. //depot/projects/smpng/sys/net80211/ieee80211_ioctl.h#12 integrate .. //depot/projects/smpng/sys/net80211/ieee80211_output.c#25 integrate .. //depot/projects/smpng/sys/net80211/ieee80211_proto.c#20 integrate .. //depot/projects/smpng/sys/net80211/ieee80211_proto.h#12 integrate .. //depot/projects/smpng/sys/net80211/ieee80211_var.h#21 integrate .. //depot/projects/smpng/sys/netgraph/bluetooth/socket/ng_btsocket_rfcomm.c#14 integrate .. //depot/projects/smpng/sys/netgraph/ng_ether.c#31 integrate .. //depot/projects/smpng/sys/netgraph/ng_ksocket.c#30 integrate .. //depot/projects/smpng/sys/netinet6/README#3 delete .. //depot/projects/smpng/sys/netinet6/icmp6.c#33 integrate .. //depot/projects/smpng/sys/netipsec/keysock.c#14 integrate .. //depot/projects/smpng/sys/netncp/ncp_sock.c#8 integrate .. //depot/projects/smpng/sys/netsmb/smb_trantcp.c#19 integrate .. //depot/projects/smpng/sys/nfsclient/nfs_socket.c#45 integrate .. //depot/projects/smpng/sys/nfsserver/nfs_srvsock.c#28 integrate .. //depot/projects/smpng/sys/powerpc/conf/GENERIC#36 integrate .. //depot/projects/smpng/sys/powerpc/conf/NOTES#3 integrate .. //depot/projects/smpng/sys/powerpc/include/md_var.h#9 integrate .. //depot/projects/smpng/sys/powerpc/include/ofw_machdep.h#3 integrate .. //depot/projects/smpng/sys/powerpc/include/pcb.h#8 integrate .. //depot/projects/smpng/sys/powerpc/powerpc/clock.c#18 integrate .. //depot/projects/smpng/sys/powerpc/powerpc/mem.c#2 integrate .. //depot/projects/smpng/sys/powerpc/powerpc/ofw_machdep.c#13 integrate .. //depot/projects/smpng/sys/powerpc/powerpc/trap.c#51 integrate .. //depot/projects/smpng/sys/powerpc/psim/sio_iobus.c#4 delete .. //depot/projects/smpng/sys/powerpc/psim/uart_iobus.c#1 branch .. //depot/projects/smpng/sys/sparc64/conf/GENERIC#72 integrate .. //depot/projects/smpng/sys/sys/_label.h#7 integrate .. //depot/projects/smpng/sys/sys/bufobj.h#7 integrate .. //depot/projects/smpng/sys/sys/extattr.h#8 integrate .. //depot/projects/smpng/sys/sys/mbuf.h#63 integrate .. //depot/projects/smpng/sys/sys/mutex.h#65 integrate .. //depot/projects/smpng/sys/sys/protosw.h#21 integrate .. //depot/projects/smpng/sys/sys/socket.h#29 integrate .. //depot/projects/smpng/sys/sys/socketvar.h#53 integrate .. //depot/projects/smpng/sys/sys/syscallsubr.h#49 integrate .. //depot/projects/smpng/sys/sys/unpcb.h#10 integrate .. //depot/projects/smpng/sys/vm/vm.h#10 integrate .. //depot/projects/smpng/sys/vm/vm_fault.c#59 integrate .. //depot/projects/smpng/sys/vm/vm_map.c#81 integrate .. //depot/projects/smpng/sys/vm/vm_meter.c#30 integrate .. //depot/projects/smpng/sys/vm/vm_object.c#82 integrate Differences ... ==== //depot/projects/smpng/sys/amd64/amd64/machdep.c#56 (text+ko) ==== @@ -39,7 +39,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/machdep.c,v 1.650 2006/06/19 22:36:01 davidxu Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/machdep.c,v 1.651 2006/07/27 19:47:22 jhb Exp $"); #include "opt_atalk.h" #include "opt_atpic.h" ==== //depot/projects/smpng/sys/amd64/amd64/vm_machdep.c#33 (text+ko) ==== @@ -41,7 +41,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/vm_machdep.c,v 1.250 2005/10/24 20:53:51 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/vm_machdep.c,v 1.251 2006/07/24 12:24:56 davidxu Exp $"); #include "opt_isa.h" #include "opt_cpu.h" @@ -328,7 +328,6 @@ td->td_frame->tf_rsp = ((register_t)stack->ss_sp + stack->ss_size) & ~0x0f; td->td_frame->tf_rsp -= 8; - td->td_frame->tf_rbp = 0; td->td_frame->tf_rip = (register_t)entry; /* ==== //depot/projects/smpng/sys/amd64/ia32/ia32_syscall.c#14 (text+ko) ==== @@ -36,7 +36,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/ia32/ia32_syscall.c,v 1.11 2006/02/08 08:09:15 phk Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/ia32/ia32_syscall.c,v 1.12 2006/07/27 19:50:16 jhb Exp $"); /* * 386 Trap and System call handling @@ -274,6 +274,8 @@ * is not the case, this code will need to be revisited. */ STOPEVENT(p, S_SCX, code); + + PTRACESTOP_SC(p, td, S_PT_SCX); PTRACESTOP_SC(p, td, S_PT_SCX); } ==== //depot/projects/smpng/sys/arm/at91/kb920x_machdep.c#8 (text) ==== @@ -48,7 +48,7 @@ #include "opt_at91.h" #include -__FBSDID("$FreeBSD: src/sys/arm/at91/kb920x_machdep.c,v 1.12 2006/07/17 21:20:00 cognet Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/at91/kb920x_machdep.c,v 1.13 2006/07/25 23:07:35 cognet Exp $"); #define _ARM32_BUS_DMA_PRIVATE #include @@ -478,7 +478,7 @@ dump_avail[2] = 0; dump_avail[3] = 0; - phys_avail[0] = freemempos - KERNVIRTADDR + KERNPHYSADDR; + phys_avail[0] = virtual_avail - KERNVIRTADDR + KERNPHYSADDR; phys_avail[1] = KERNPHYSADDR + memsize; phys_avail[2] = 0; phys_avail[3] = 0; ==== //depot/projects/smpng/sys/arm/include/db_machdep.h#5 (text+ko) ==== @@ -24,7 +24,7 @@ * the rights to redistribute these changes. * * from: FreeBSD: src/sys/i386/include/db_machdep.h,v 1.16 1999/10/04 - * $FreeBSD: src/sys/arm/include/db_machdep.h,v 1.5 2005/01/05 21:58:48 imp Exp $ + * $FreeBSD: src/sys/arm/include/db_machdep.h,v 1.6 2006/07/27 11:41:37 cognet Exp $ */ #ifndef _MACHINE_DB_MACHDEP_H_ @@ -89,4 +89,7 @@ u_int branch_taken (u_int insn, u_int pc); +#ifdef __ARMEB__ +#define BYTE_MSF (1) +#endif #endif /* !_MACHINE_DB_MACHDEP_H_ */ ==== //depot/projects/smpng/sys/arm/xscale/i80321/i80321.c#6 (text+ko) ==== @@ -40,7 +40,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/arm/xscale/i80321/i80321.c,v 1.5 2005/06/09 12:26:20 cognet Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/xscale/i80321/i80321.c,v 1.6 2006/07/25 01:08:41 kevlo Exp $"); #include #include @@ -73,23 +73,6 @@ */ struct i80321_softc *i80321_softc; -/* Built-in devices. */ -static const struct iopxs_device { - const char *id_name; - bus_addr_t id_offset; - bus_size_t id_size; -} iopxs_devices[] = { - { "iopaau", VERDE_AAU_BASE, VERDE_AAU_SIZE }, -/* { "iopdma", VERDE_DMA_BASE0, VERDE_DMA_CHSIZE }, */ -/* { "iopdma", VERDE_DMA_BASE1, VERDE_DMA_CHSIZE }, */ - { "iopiic", VERDE_I2C_BASE0, VERDE_I2C_CHSIZE }, - { "iopiic", VERDE_I2C_BASE1, VERDE_I2C_CHSIZE }, -/* { "iopssp", VERDE_SSP_BASE, VERDE_SSP_SIZE }, */ - { "iopmu", VERDE_MU_BASE, VERDE_MU_SIZE }, - { "iopwdog", 0, 0 }, - { NULL, 0, 0 } -}; - #define PCI_MAPREG_MEM_ADDR(x) ((x) & 0xfffffff0) /* * i80321_attach: ==== //depot/projects/smpng/sys/arm/xscale/i80321/iq80321.c#11 (text+ko) ==== @@ -42,7 +42,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/arm/xscale/i80321/iq80321.c,v 1.12 2006/05/05 19:14:57 cognet Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/xscale/i80321/iq80321.c,v 1.13 2006/07/25 01:08:41 kevlo Exp $"); #define _ARM32_BUS_DMA_PRIVATE #include @@ -291,7 +291,7 @@ (void) disable_interrupts(I32_bit|F32_bit); *(__volatile uint32_t *)(IQ80321_80321_VBASE + VERDE_ATU_BASE + ATU_PCSR) = PCSR_RIB | PCSR_RPB; - printf("Reset failed :'(\n"); + printf("Reset failed!\n"); for(;;); } ==== //depot/projects/smpng/sys/boot/forth/loader.conf#42 (text+ko) ==== @@ -6,7 +6,7 @@ # # All arguments must be in double quotes. # -# $FreeBSD: src/sys/boot/forth/loader.conf,v 1.106 2006/05/14 19:04:12 marius Exp $ +# $FreeBSD: src/sys/boot/forth/loader.conf,v 1.108 2006/07/26 12:59:42 ache Exp $ ############################################################## ### Basic configuration options ############################ @@ -243,6 +243,7 @@ if_sn_load="NO" # SMC 91Cxx if_sr_load="NO" # synchronous RISCom/N2 / WANic 400/405 if_ste_load="NO" # Sundance Technologies ST201 fast ethernet +if_stge_load="NO" # Sundance/Tamarack TC9021 gigabit ethernet if_ti_load="NO" # Alteon Networks Tigon 1 and Tigon 2 if_tl_load="NO" # Texas Instruments TNETE100 ("ThunderLAN") if_tx_load="NO" # SMC 83c17x fast ethernet @@ -253,7 +254,6 @@ if_vx_load="NO" # 3Com 3C590 family if_wb_load="NO" # Winbond W89C840F if_wi_load="NO" # WaveLAN/IEEE 802.11 wireless NICs -if_wx_load="NO" # Intel Gigabit Ethernet if_xe_load="NO" # Xircom CreditCard PCMCIA if_xl_load="NO" # 3Com Etherlink XL (3c900, 3c905, 3c905B) @@ -309,6 +309,7 @@ snd_csa_load="NO" # csa snd_ds1_load="NO" # ds1 snd_emu10k1_load="NO" # Creative Sound Blaster Live +snd_emu10kx_load="NO" # Creative SoundBlaster Live! and Audigy snd_es137x_load="NO" # es137x snd_ess_load="NO" # ess snd_fm801_load="NO" # fm801 ==== //depot/projects/smpng/sys/compat/svr4/svr4_stream.c#39 (text+ko) ==== @@ -36,7 +36,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/compat/svr4/svr4_stream.c,v 1.59 2006/07/21 20:40:13 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/svr4/svr4_stream.c,v 1.60 2006/07/27 19:54:41 jhb Exp $"); #include "opt_compat.h" #include "opt_ktrace.h" ==== //depot/projects/smpng/sys/conf/Makefile.arm#24 (text+ko) ==== @@ -1,7 +1,7 @@ # Makefile.arm -- with config changes. # Copyright 1990 W. Jolitz # from: @(#)Makefile.i386 7.1 5/10/91 -# $FreeBSD: src/sys/conf/Makefile.arm,v 1.30 2006/07/18 21:16:39 cognet Exp $ +# $FreeBSD: src/sys/conf/Makefile.arm,v 1.31 2006/07/24 22:09:47 cognet Exp $ # # Makefile for FreeBSD # @@ -44,12 +44,15 @@ .if !defined(DEBUG) && !defined(PROFLEVEL) -CFLAGS += -mno-apcs-frame STRIP_FLAGS = -S .endif DDB_ENABLED!= grep DDB opt_ddb.h || true +.if empty(DDB_ENABLED) +CFLAGS += -mno-apcs-frame +.endif + SYSTEM_LD_ = ${LD} -Bdynamic -T ldscript.$M.noheader \ -warn-common -export-dynamic -dynamic-linker /red/herring -o \ ${FULLKERNEL}.noheader -X ${SYSTEM_OBJS} vers.o ==== //depot/projects/smpng/sys/conf/NOTES#125 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/NOTES,v 1.1374 2006/07/17 09:07:01 phk Exp $ +# $FreeBSD: src/sys/conf/NOTES,v 1.1375 2006/07/25 00:45:54 yongari Exp $ # # NOTES -- Lines that can be cut/pasted into kernel and hints configs. # @@ -1785,6 +1785,9 @@ # SMC91C90/92/94/95 chips. # ste: Sundance Technologies ST201 PCI fast ethernet controller, includes # the D-Link DFE-550TX. +# stge: Support for gigabit ethernet adapters based on the Sundance/Tamarack +# TC9021 family of controllers, including the Sundance ST2021/ST2023, +# the Sundance/Tamarack TC9021, the D-Link DL-4000 and ASUS NX1101. # ti: Support for PCI gigabit ethernet NICs based on the Alteon Networks # Tigon 1 and Tigon 2 chipsets. This includes the Alteon AceNIC, the # 3Com 3c985, the Netgear GA620 and various others. ==== //depot/projects/smpng/sys/conf/files#182 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/files,v 1.1130 2006/07/15 20:22:40 netchild Exp $ +# $FreeBSD: src/sys/conf/files,v 1.1133 2006/07/25 02:15:28 rwatson Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -724,8 +724,10 @@ dev/mii/e1000phy.c optional miibus | e1000phy # XXX only xl cards? dev/mii/exphy.c optional miibus | exphy +dev/mii/gentbi.c optional miibus | gentbi # XXX only fxp cards? dev/mii/inphy.c optional miibus | inphy +dev/mii/ip1000phy.c optional miibus | ip1000phy dev/mii/lxtphy.c optional miibus | lxtphy dev/mii/mii.c optional miibus | mii dev/mii/mii_physubr.c optional miibus | mii @@ -950,6 +952,7 @@ dev/stg/tmc18c30_pccard.c optional stg pccard dev/stg/tmc18c30_pci.c optional stg pci dev/stg/tmc18c30_subr.c optional stg +dev/stge/if_stge.c optional stge dev/streams/streams.c optional streams dev/sym/sym_hipd.c optional sym \ dependency "$S/dev/sym/sym_{conf,defs}.h" @@ -1420,6 +1423,7 @@ kern/uipc_mqueue.c optional p1003_1b_mqueue kern/uipc_proto.c standard kern/uipc_sem.c optional p1003_1b_semaphores +kern/uipc_sockbuf.c standard kern/uipc_socket.c standard kern/uipc_socket2.c standard kern/uipc_syscalls.c standard ==== //depot/projects/smpng/sys/conf/files.i386#99 (text+ko) ==== @@ -1,7 +1,7 @@ # This file tells config what files go into building a kernel, # files marked standard are always included. # -# $FreeBSD: src/sys/conf/files.i386,v 1.562 2006/06/26 23:41:07 obrien Exp $ +# $FreeBSD: src/sys/conf/files.i386,v 1.563 2006/07/22 16:18:47 pjd Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -135,6 +135,8 @@ no-implicit-rule crypto/des/arch/i386/des_enc.S optional crypto | ipsec ipsec_esp | netsmb crypto/via/padlock.c optional padlock +crypto/via/padlock_cipher.c optional padlock +crypto/via/padlock_hash.c optional padlock dev/advansys/adv_isa.c optional adv isa dev/aic/aic_isa.c optional aic isa dev/arcmsr/arcmsr.c optional arcmsr pci ==== //depot/projects/smpng/sys/conf/files.powerpc#30 (text+ko) ==== @@ -1,7 +1,7 @@ # This file tells config what files go into building a kernel, # files marked standard are always included. # -# $FreeBSD: src/sys/conf/files.powerpc,v 1.54 2006/06/08 23:38:01 sam Exp $ +# $FreeBSD: src/sys/conf/files.powerpc,v 1.56 2006/07/26 19:44:42 marcel Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -125,8 +125,6 @@ powerpc/psim/iobus.c optional psim powerpc/psim/ata_iobus.c optional ata psim powerpc/psim/openpic_iobus.c optional psim -powerpc/psim/sio_iobus.c optional sio psim +powerpc/psim/uart_iobus.c optional uart psim dev/scc/scc_bfe_macio.c optional scc powermac -dev/zs/zs.c optional powermac zs -dev/zs/zs_macio.c optional powermac zs ==== //depot/projects/smpng/sys/crypto/via/padlock.c#6 (text+ko) ==== @@ -1,6 +1,5 @@ /*- - * Copyright (c) 2005 Pawel Jakub Dawidek - * Copyright (c) 2004 Mark R V Murray + * Copyright (c) 2005-2006 Pawel Jakub Dawidek * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -11,7 +10,7 @@ * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * + * * THIS SOFTWARE IS PROVIDED BY THE AUTHORS AND CONTRIBUTORS ``AS IS'' AND * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE @@ -25,27 +24,8 @@ * SUCH DAMAGE. */ -/* $OpenBSD: via.c,v 1.3 2004/06/15 23:36:55 deraadt Exp $ */ -/*- - * Copyright (c) 2003 Jason Wright - * Copyright (c) 2003, 2004 Theo de Raadt - * All rights reserved. - * - * Permission to use, copy, modify, and distribute this software for any - * purpose with or without fee is hereby granted, provided that the above - * copyright notice and this permission notice appear in all copies. - * - * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES - * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF - * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR - * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES - * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN - * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF - * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ - #include -__FBSDID("$FreeBSD: src/sys/crypto/via/padlock.c,v 1.6 2006/07/13 09:15:13 mr Exp $"); +__FBSDID("$FreeBSD: src/sys/crypto/via/padlock.c,v 1.10 2006/07/25 19:04:26 pjd Exp $"); #include #include @@ -63,67 +43,15 @@ #endif #include -#include /* for hmac_ipad_buffer and hmac_opad_buffer */ -#include -#include +#include -#define PADLOCK_ROUND_COUNT_AES128 10 -#define PADLOCK_ROUND_COUNT_AES192 12 -#define PADLOCK_ROUND_COUNT_AES256 14 - -#define PADLOCK_ALGORITHM_TYPE_AES 0 - -#define PADLOCK_KEY_GENERATION_HW 0 -#define PADLOCK_KEY_GENERATION_SW 1 - -#define PADLOCK_DIRECTION_ENCRYPT 0 -#define PADLOCK_DIRECTION_DECRYPT 1 - -#define PADLOCK_KEY_SIZE_128 0 -#define PADLOCK_KEY_SIZE_192 1 -#define PADLOCK_KEY_SIZE_256 2 +/* + * Technical documentation about the PadLock engine can be found here: + * + * http://www.via.com.tw/en/downloads/whitepapers/initiatives/padlock/programming_guide.pdf + */ -union padlock_cw { - uint64_t raw; - struct { - u_int round_count : 4; - u_int algorithm_type : 3; - u_int key_generation : 1; - u_int intermediate : 1; - u_int direction : 1; - u_int key_size : 2; - u_int filler0 : 20; - u_int filler1 : 32; - u_int filler2 : 32; - u_int filler3 : 32; - } __field; -}; -#define cw_round_count __field.round_count -#define cw_algorithm_type __field.algorithm_type -#define cw_key_generation __field.key_generation -#define cw_intermediate __field.intermediate -#define cw_direction __field.direction -#define cw_key_size __field.key_size -#define cw_filler0 __field.filler0 -#define cw_filler1 __field.filler1 -#define cw_filler2 __field.filler2 -#define cw_filler3 __field.filler3 - -struct padlock_session { - union padlock_cw ses_cw __aligned(16); - uint32_t ses_ekey[4 * (RIJNDAEL_MAXNR + 1) + 4] __aligned(16); /* 128 bit aligned */ - uint32_t ses_dkey[4 * (RIJNDAEL_MAXNR + 1) + 4] __aligned(16); /* 128 bit aligned */ - uint8_t ses_iv[16] __aligned(16); /* 128 bit aligned */ - struct auth_hash *ses_axf; - uint8_t *ses_ictx; - uint8_t *ses_octx; - int ses_mlen; - int ses_used; - uint32_t ses_id; - TAILQ_ENTRY(padlock_session) ses_next; -}; - struct padlock_softc { int32_t sc_cid; uint32_t sc_sid; @@ -139,47 +67,50 @@ static int padlock_process(void *arg __unused, struct cryptop *crp, int hint __unused); -static __inline void -padlock_cbc(void *in, void *out, size_t count, void *key, union padlock_cw *cw, - void *iv) -{ -#ifdef __GNUCLIKE_ASM - /* The .byte line is really VIA C3 "xcrypt-cbc" instruction */ - __asm __volatile( - "pushf \n\t" - "popf \n\t" - "rep \n\t" - ".byte 0x0f, 0xa7, 0xd0" - : "+a" (iv), "+c" (count), "+D" (out), "+S" (in) - : "b" (key), "d" (cw) - : "cc", "memory" - ); -#endif -} +MALLOC_DEFINE(M_PADLOCK, "padlock_data", "PadLock Data"); static int padlock_init(void) { struct padlock_softc *sc; + char capp[256]; + #if defined(__i386__) && !defined(PC98) + /* If there is no AES support, we has nothing to do here. */ if (!(via_feature_xcrypt & VIA_HAS_AES)) { - printf("PADLOCK: No ACE support.\n"); + printf("PadLock: No ACE support.\n"); return (EINVAL); - } else - printf("PADLOCK: HW support loaded.\n"); + } + strlcpy(capp, "AES-CBC", sizeof(capp)); +#if 0 + strlcat(capp, ",AES-EBC", sizeof(capp)); + strlcat(capp, ",AES-CFB", sizeof(capp)); + strlcat(capp, ",AES-OFB", sizeof(capp)); +#endif + if (via_feature_xcrypt & VIA_HAS_SHA) { + strlcat(capp, ",SHA1", sizeof(capp)); + strlcat(capp, ",SHA256", sizeof(capp)); + } +#if 0 + if (via_feature_xcrypt & VIA_HAS_AESCTR) + strlcat(capp, ",AES-CTR", sizeof(capp)); + if (via_feature_xcrypt & VIA_HAS_MM) + strlcat(capp, ",RSA", sizeof(capp)); +#endif + printf("PadLock: HW support loaded for %s.\n", capp); #else return (EINVAL); #endif - padlock_sc = sc = malloc(sizeof(*padlock_sc), M_DEVBUF, + padlock_sc = sc = malloc(sizeof(*padlock_sc), M_PADLOCK, M_WAITOK | M_ZERO); TAILQ_INIT(&sc->sc_sessions); sc->sc_sid = 1; sc->sc_cid = crypto_get_driverid(0); if (sc->sc_cid < 0) { - printf("PADLOCK: Could not get crypto driver id.\n"); - free(padlock_sc, M_DEVBUF); + printf("PadLock: Could not get crypto driver id.\n"); + free(padlock_sc, M_PADLOCK); padlock_sc = NULL; return (ENOMEM); } @@ -218,7 +149,7 @@ } if (active > 0) { mtx_unlock(&sc->sc_sessions_mtx); - printf("PADLOCK: Cannot destroy, %u sessions active.\n", + printf("PadLock: Cannot destroy, %u sessions active.\n", active); return (EBUSY); } @@ -226,102 +157,21 @@ for (ses = TAILQ_FIRST(&sc->sc_sessions); ses != NULL; ses = TAILQ_FIRST(&sc->sc_sessions)) { TAILQ_REMOVE(&sc->sc_sessions, ses, ses_next); - free(ses, M_DEVBUF); + free(ses, M_PADLOCK); } mtx_destroy(&sc->sc_sessions_mtx); crypto_unregister_all(sc->sc_cid); - free(sc, M_DEVBUF); + free(sc, M_PADLOCK); return (0); } -static void -padlock_setup_enckey(struct padlock_session *ses, caddr_t key, int klen) -{ - union padlock_cw *cw; - int i; - - cw = &ses->ses_cw; - if (cw->cw_key_generation == PADLOCK_KEY_GENERATION_SW) { - /* Build expanded keys for both directions */ - rijndaelKeySetupEnc(ses->ses_ekey, key, klen); - rijndaelKeySetupDec(ses->ses_dkey, key, klen); - for (i = 0; i < 4 * (RIJNDAEL_MAXNR + 1); i++) { - ses->ses_ekey[i] = ntohl(ses->ses_ekey[i]); - ses->ses_dkey[i] = ntohl(ses->ses_dkey[i]); - } - } else { - bcopy(key, ses->ses_ekey, klen); - bcopy(key, ses->ses_dkey, klen); - } -} - -static void -padlock_setup_mackey(struct padlock_session *ses, caddr_t key, int klen) -{ - struct auth_hash *axf; - int i; - - klen /= 8; - axf = ses->ses_axf; - - for (i = 0; i < klen; i++) - key[i] ^= HMAC_IPAD_VAL; - - axf->Init(ses->ses_ictx); - axf->Update(ses->ses_ictx, key, klen); - axf->Update(ses->ses_ictx, hmac_ipad_buffer, axf->blocksize - klen); - - for (i = 0; i < klen; i++) - key[i] ^= (HMAC_IPAD_VAL ^ HMAC_OPAD_VAL); - - axf->Init(ses->ses_octx); - axf->Update(ses->ses_octx, key, klen); - axf->Update(ses->ses_octx, hmac_opad_buffer, axf->blocksize - klen); - - for (i = 0; i < klen; i++) - key[i] ^= HMAC_OPAD_VAL; -} - -/* - * Compute keyed-hash authenticator. - */ static int -padlock_authcompute(struct padlock_session *ses, struct cryptodesc *crd, - caddr_t buf, int flags) -{ - u_char hash[HASH_MAX_LEN]; - struct auth_hash *axf; - union authctx ctx; - int error; - - axf = ses->ses_axf; - - bcopy(ses->ses_ictx, &ctx, axf->ctxsize); - - error = crypto_apply(flags, buf, crd->crd_skip, crd->crd_len, - (int (*)(void *, void *, unsigned int))axf->Update, (caddr_t)&ctx); - if (error != 0) - return (error); - - axf->Final(hash, &ctx); - bcopy(ses->ses_octx, &ctx, axf->ctxsize); - axf->Update(&ctx, hash, axf->hashsize); - axf->Final(hash, &ctx); - - /* Inject the authentication data */ - crypto_copyback(flags, buf, crd->crd_inject, - ses->ses_mlen == 0 ? axf->hashsize : ses->ses_mlen, hash); - return (0); -} - - -static int padlock_newsession(void *arg __unused, uint32_t *sidp, struct cryptoini *cri) { struct padlock_softc *sc = padlock_sc; struct padlock_session *ses = NULL; struct cryptoini *encini, *macini; - union padlock_cw *cw; + int error; if (sc == NULL || sidp == NULL || cri == NULL) return (EINVAL); @@ -357,10 +207,6 @@ */ if (encini == NULL) return (EINVAL); - if (encini->cri_klen != 128 && encini->cri_klen != 192 && - encini->cri_klen != 256) { - return (EINVAL); - } /* * Let's look for a free session structure. @@ -380,7 +226,7 @@ } mtx_unlock(&sc->sc_sessions_mtx); if (ses == NULL) { - ses = malloc(sizeof(*ses), M_DEVBUF, M_NOWAIT | M_ZERO); + ses = malloc(sizeof(*ses), M_PADLOCK, M_NOWAIT | M_ZERO); if (ses == NULL) return (ENOMEM); ses->ses_used = 1; @@ -390,76 +236,17 @@ mtx_unlock(&sc->sc_sessions_mtx); } - cw = &ses->ses_cw; - bzero(cw, sizeof(*cw)); - cw->cw_algorithm_type = PADLOCK_ALGORITHM_TYPE_AES; - cw->cw_key_generation = PADLOCK_KEY_GENERATION_SW; - cw->cw_intermediate = 0; - switch (encini->cri_klen) { - case 128: - cw->cw_round_count = PADLOCK_ROUND_COUNT_AES128; - cw->cw_key_size = PADLOCK_KEY_SIZE_128; -#ifdef HW_KEY_GENERATION - /* This doesn't buy us much, that's why it is commented out. */ - cw->cw_key_generation = PADLOCK_KEY_GENERATION_HW; -#endif - break; - case 192: - cw->cw_round_count = PADLOCK_ROUND_COUNT_AES192; - cw->cw_key_size = PADLOCK_KEY_SIZE_192; - break; - case 256: - cw->cw_round_count = PADLOCK_ROUND_COUNT_AES256; - cw->cw_key_size = PADLOCK_KEY_SIZE_256; - break; + error = padlock_cipher_setup(ses, encini); + if (error != 0) { + padlock_freesession(NULL, ses->ses_id); + return (error); } - if (encini->cri_key != NULL) - padlock_setup_enckey(ses, encini->cri_key, encini->cri_klen); - arc4rand(ses->ses_iv, sizeof(ses->ses_iv), 0); - if (macini != NULL) { - ses->ses_mlen = macini->cri_mlen; - - /* Find software structure which describes HMAC algorithm. */ - switch (macini->cri_alg) { - case CRYPTO_NULL_HMAC: - ses->ses_axf = &auth_hash_null; - break; - case CRYPTO_MD5_HMAC: - ses->ses_axf = &auth_hash_hmac_md5; - break; - case CRYPTO_SHA1_HMAC: - ses->ses_axf = &auth_hash_hmac_sha1; - break; - case CRYPTO_RIPEMD160_HMAC: - ses->ses_axf = &auth_hash_hmac_ripemd_160; - break; - case CRYPTO_SHA2_256_HMAC: - ses->ses_axf = &auth_hash_hmac_sha2_256; - break; - case CRYPTO_SHA2_384_HMAC: - ses->ses_axf = &auth_hash_hmac_sha2_384; - break; - case CRYPTO_SHA2_512_HMAC: - ses->ses_axf = &auth_hash_hmac_sha2_512; - break; - } - - /* Allocate memory for HMAC inner and outer contexts. */ - ses->ses_ictx = malloc(ses->ses_axf->ctxsize, M_CRYPTO_DATA, - M_NOWAIT); - ses->ses_octx = malloc(ses->ses_axf->ctxsize, M_CRYPTO_DATA, - M_NOWAIT); - if (ses->ses_ictx == NULL || ses->ses_octx == NULL) { + error = padlock_hash_setup(ses, macini); + if (error != 0) { padlock_freesession(NULL, ses->ses_id); - return (ENOMEM); - } - - /* Setup key if given. */ - if (macini->cri_key != NULL) { - padlock_setup_mackey(ses, macini->cri_key, - macini->cri_klen); + return (error); } } @@ -486,15 +273,8 @@ return (EINVAL); } TAILQ_REMOVE(&sc->sc_sessions, ses, ses_next); - if (ses->ses_ictx != NULL) { - bzero(ses->ses_ictx, sizeof(ses->ses_ictx)); - free(ses->ses_ictx, M_CRYPTO_DATA); - } - if (ses->ses_octx != NULL) { - bzero(ses->ses_octx, sizeof(ses->ses_octx)); - free(ses->ses_octx, M_CRYPTO_DATA); - } - bzero(ses, sizeof(ses)); + padlock_hash_free(ses); + bzero(ses, sizeof(*ses)); ses->ses_used = 0; TAILQ_INSERT_TAIL(&sc->sc_sessions, ses, ses_next); mtx_unlock(&sc->sc_sessions_mtx); @@ -505,15 +285,11 @@ padlock_process(void *arg __unused, struct cryptop *crp, int hint __unused) { struct padlock_softc *sc = padlock_sc; - struct padlock_session *ses; - union padlock_cw *cw; + struct padlock_session *ses = NULL; struct cryptodesc *crd, *enccrd, *maccrd; - uint32_t *key; - u_char *buf, *abuf; int error = 0; enccrd = maccrd = NULL; - buf = NULL; if (crp == NULL || crp->crp_callback == NULL || crp->crp_desc == NULL) { error = EINVAL; @@ -562,81 +338,36 @@ goto out; } - buf = malloc(enccrd->crd_len + 16, M_DEVBUF, M_NOWAIT); - if (buf == NULL) { - error = ENOMEM; - goto out; - } - /* Buffer has to be 16 bytes aligned. */ - abuf = buf + 16 - ((uintptr_t)buf % 16); - - if ((enccrd->crd_flags & CRD_F_KEY_EXPLICIT) != 0) - padlock_setup_enckey(ses, enccrd->crd_key, enccrd->crd_klen); - if (maccrd != NULL && (maccrd->crd_flags & CRD_F_KEY_EXPLICIT) != 0) - padlock_setup_mackey(ses, maccrd->crd_key, maccrd->crd_klen); - - cw = &ses->ses_cw; - cw->cw_filler0 = 0; - cw->cw_filler1 = 0; - cw->cw_filler2 = 0; - cw->cw_filler3 = 0; - if ((enccrd->crd_flags & CRD_F_ENCRYPT) != 0) { - cw->cw_direction = PADLOCK_DIRECTION_ENCRYPT; - key = ses->ses_ekey; - if ((enccrd->crd_flags & CRD_F_IV_EXPLICIT) != 0) - bcopy(enccrd->crd_iv, ses->ses_iv, 16); - - if ((enccrd->crd_flags & CRD_F_IV_PRESENT) == 0) { - crypto_copyback(crp->crp_flags, crp->crp_buf, - enccrd->crd_inject, AES_BLOCK_LEN, ses->ses_iv); - } - } else { - cw->cw_direction = PADLOCK_DIRECTION_DECRYPT; - key = ses->ses_dkey; - if ((enccrd->crd_flags & CRD_F_IV_EXPLICIT) != 0) - bcopy(enccrd->crd_iv, ses->ses_iv, AES_BLOCK_LEN); - else { - crypto_copydata(crp->crp_flags, crp->crp_buf, - enccrd->crd_inject, AES_BLOCK_LEN, ses->ses_iv); - } - } - /* Perform data authentication if requested before encryption. */ if (maccrd != NULL && maccrd->crd_next == enccrd) { - error = padlock_authcompute(ses, maccrd, crp->crp_buf, - crp->crp_flags); + error = padlock_hash_process(ses, maccrd, crp); if (error != 0) goto out; } - crypto_copydata(crp->crp_flags, crp->crp_buf, enccrd->crd_skip, - enccrd->crd_len, abuf); - - padlock_cbc(abuf, abuf, enccrd->crd_len / 16, key, cw, ses->ses_iv); + error = padlock_cipher_process(ses, enccrd, crp); + if (error != 0) + goto out; - crypto_copyback(crp->crp_flags, crp->crp_buf, enccrd->crd_skip, - enccrd->crd_len, abuf); - /* Perform data authentication if requested after encryption. */ if (maccrd != NULL && enccrd->crd_next == maccrd) { - error = padlock_authcompute(ses, maccrd, crp->crp_buf, - crp->crp_flags); + error = padlock_hash_process(ses, maccrd, crp); if (error != 0) goto out; } - /* copy out last block for use as next session IV */ - if ((enccrd->crd_flags & CRD_F_ENCRYPT) != 0) { - crypto_copydata(crp->crp_flags, crp->crp_buf, - enccrd->crd_skip + enccrd->crd_len - AES_BLOCK_LEN, - AES_BLOCK_LEN, ses->ses_iv); - } - out: - if (buf != NULL) { - bzero(buf, enccrd->crd_len + 16); - free(buf, M_DEVBUF); +#if 0 + /* + * This code is not necessary, because contexts will be freed on next + * padlock_setup_mackey() call or at padlock_freesession() call. + */ + if (ses != NULL && maccrd != NULL && >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Thu Jul 27 20:28:03 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9C21616A4E2; Thu, 27 Jul 2006 20:28:03 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 21F2916A4E1 for ; Thu, 27 Jul 2006 20:28:03 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 065FB43D5D for ; Thu, 27 Jul 2006 20:28:01 +0000 (GMT) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k6RKS0M6017622 for ; Thu, 27 Jul 2006 20:28:00 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k6RKS0E0017619 for perforce@freebsd.org; Thu, 27 Jul 2006 20:28:00 GMT (envelope-from jhb@freebsd.org) Date: Thu, 27 Jul 2006 20:28:00 GMT Message-Id: <200607272028.k6RKS0E0017619@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 Cc: Subject: PERFORCE change 102594 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 27 Jul 2006 20:28:03 -0000 http://perforce.freebsd.org/chv.cgi?CH=102594 Change 102594 by jhb@jhb_mutex on 2006/07/27 20:27:14 Update. Affected files ... .. //depot/projects/smpng/sys/notes#87 edit Differences ... ==== //depot/projects/smpng/sys/notes#87 (text+ko) ==== @@ -13,7 +13,6 @@ "cc" clobbers yet. - Fixup atomic ops so that they treat the memory pointed to as an output and don't all clobber "memory", instead, just acquire variants clobber "memory". - - alpha - amd64 - why clobber memory in disable_intr()? - eventually we should not clobber all memory for bus_space, but just @@ -62,11 +61,6 @@ buys is being able to swi_sched() from a fast handler, but that doesn't make sense because you can't actually enqueue a task onto its queue from a fast interrupt context -- Try to fix problems with stuck IPIs by raising TPR and enabling interrupts - in spin loops. Need to perhaps generalize this so that critical sections - do this. That really needs to only be done in spinlock_*() (and maybe some - frobbing in intr_execute_handlers()) and needs to happen after the - spinlock_*() changes happen. - KTR change: include __func__ along with __FILE__ and __LINE__ and display it after cpu number by default - Cheapen global stats counters via PCPU_LAZY_INC @@ -85,28 +79,22 @@ + compat32 - svr4 - svr4_stream_get() and friends - + need to see where this is called and see if all of the files - should already have f_ops set correctly and if we can just - allocate so_emuldata directly in streamsopen() - + XXX: svr4_add_socket() can add duplicates? it's ok, just - purge them all on process exit or exec - + change svr4_find_socket() to copy the sockaddr out to a - passed in sockaddr_un and return bool + - Giant will have to protect the actual stream structures for now - svr4_sys_ioctl() - svr4_sys_getmsg() - svr4_sys_putmsg() - + svr4_sys_fchroot() + linux - + linux_uselib() + ibcs2 - don't mess with td_retval in any kern_foo() functions Active child branches: -- jhb_intr - fast ithreads and MSI? (perhaps do MSI in jhb_acpipci) -- jhb_ktrace - kernel debugging stuff, possibly per-thread ktrace -- jhb_lock - rwlocks +- jhb_intr - MSI? +- jhb_intr_fast - jeff's fast ithread patches +- jhb_ktrace - kernel debugging stuff, asm constraints +- jhb_lock - synchronization primitives - jhb_needresched - scheduler fun - jhb_preemption - preemption -- jhb_proc - proc locking, ABI stuff +- jhb_proc - proc locking +- jhb_proc_slock - per-process spin lock Space reserved for child branches: From owner-p4-projects@FreeBSD.ORG Thu Jul 27 20:37:18 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 95F4916A4E5; Thu, 27 Jul 2006 20:37:18 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 5CB1816A4E1 for ; Thu, 27 Jul 2006 20:37:18 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 03FFE43D69 for ; Thu, 27 Jul 2006 20:37:13 +0000 (GMT) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k6RKbCBo018224 for ; Thu, 27 Jul 2006 20:37:12 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k6RKbCRB018220 for perforce@freebsd.org; Thu, 27 Jul 2006 20:37:12 GMT (envelope-from jhb@freebsd.org) Date: Thu, 27 Jul 2006 20:37:12 GMT Message-Id: <200607272037.k6RKbCRB018220@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 Cc: Subject: PERFORCE change 102596 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 27 Jul 2006 20:37:18 -0000 http://perforce.freebsd.org/chv.cgi?CH=102596 Change 102596 by jhb@jhb_mutex on 2006/07/27 20:37:01 Fix mismerges. Affected files ... .. //depot/projects/smpng/sys/amd64/ia32/ia32_syscall.c#15 edit .. //depot/projects/smpng/sys/ia64/ia32/ia32_trap.c#11 edit .. //depot/projects/smpng/sys/powerpc/powerpc/trap.c#52 edit Differences ... ==== //depot/projects/smpng/sys/amd64/ia32/ia32_syscall.c#15 (text+ko) ==== @@ -276,8 +276,6 @@ STOPEVENT(p, S_SCX, code); PTRACESTOP_SC(p, td, S_PT_SCX); - - PTRACESTOP_SC(p, td, S_PT_SCX); } ==== //depot/projects/smpng/sys/ia64/ia32/ia32_trap.c#11 (text+ko) ==== @@ -211,8 +211,6 @@ STOPEVENT(p, S_SCX, code); PTRACESTOP_SC(p, td, S_PT_SCX); - - PTRACESTOP_SC(p, td, S_PT_SCX); } /* ==== //depot/projects/smpng/sys/powerpc/powerpc/trap.c#52 (text+ko) ==== @@ -494,8 +494,6 @@ STOPEVENT(p, S_SCX, code); PTRACESTOP_SC(p, td, S_PT_SCX); - - PTRACESTOP_SC(p, td, S_PT_SCX); } static int From owner-p4-projects@FreeBSD.ORG Thu Jul 27 21:30:39 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3D1DB16A4FD; Thu, 27 Jul 2006 21:30:39 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 1B9E616A4FB for ; Thu, 27 Jul 2006 21:30:39 +0000 (UTC) (envelope-from gabor@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id DA66143D4C for ; Thu, 27 Jul 2006 21:30:38 +0000 (GMT) (envelope-from gabor@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k6RLUcjn030057 for ; Thu, 27 Jul 2006 21:30:38 GMT (envelope-from gabor@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k6RLUcLD030054 for perforce@freebsd.org; Thu, 27 Jul 2006 21:30:38 GMT (envelope-from gabor@FreeBSD.org) Date: Thu, 27 Jul 2006 21:30:38 GMT Message-Id: <200607272130.k6RLUcLD030054@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to gabor@FreeBSD.org using -f From: Gabor Kovesdan To: Perforce Change Reviews Cc: Subject: PERFORCE change 102605 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 27 Jul 2006 21:30:39 -0000 http://perforce.freebsd.org/chv.cgi?CH=102605 Change 102605 by gabor@gabor_spitfire on 2006/07/27 21:29:44 Add a basic infrastructure support for building binaries for debugging purposes. This change introduces WITH_DEBUG. If set DEBUG_FLAGS (-g at default) are added to CFLAGS and binaries doesn't get stripped by INSTALL_PROGRAM. Besides, each port could/should add its specific things for WITH_DEBUG. DEBUG_FLAGS can be overrided, of course. Suggested by: netchild Reviewed by: netchild Affected files ... .. //depot/projects/soc2006/gabor_ports/Mk/bsd.port.mk#63 edit .. //depot/projects/soc2006/gabor_ports/Tools/scripts/do-fetch.sh#9 edit Differences ... ==== //depot/projects/soc2006/gabor_ports/Mk/bsd.port.mk#63 (text+ko) ==== @@ -289,6 +289,14 @@ # usage inside the ports framework, and the latter are reserved for user- # settable options. (Setting USE_* in /etc/make.conf is always wrong). # +# WITH_DEBUG - If set, debugging flags are added to CFLAGS and the +# binaries don't get stripped by INSTALL_PROGRAM. +# Besides, individual ports might add their specific +# to produce binaries for debugging purposes. +# You can override the debug flags that are passed to +# the compiler by setting DEBUG_FLAGS. It is set to +# "-g" at default. +# # USE_BZIP2 - If set, this port tarballs use bzip2, not gzip, for # compression. # USE_ZIP - If set, this port distfile uses zip, not tar w/[bg]zip @@ -1602,6 +1610,12 @@ .endif .endif +.if defined(WITH_DEBUG) && ${WITH_DEBUG} != "no" +.undef STRIP +DEBUG_FLAGS?= -g +CFLAGS+= ${DEBUG_FLAGS} +.endif + .if defined(NOPORTDOCS) PLIST_SUB+= PORTDOCS="@comment " .else ==== //depot/projects/soc2006/gabor_ports/Tools/scripts/do-fetch.sh#9 (text+ko) ==== From owner-p4-projects@FreeBSD.ORG Thu Jul 27 21:42:14 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1502616A4E9; Thu, 27 Jul 2006 21:42:14 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id C6AD616A4E6 for ; Thu, 27 Jul 2006 21:42:13 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 114C643D8B for ; Thu, 27 Jul 2006 21:41:55 +0000 (GMT) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k6RLfseo030736 for ; Thu, 27 Jul 2006 21:41:54 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k6RLfsLl030733 for perforce@freebsd.org; Thu, 27 Jul 2006 21:41:54 GMT (envelope-from jhb@freebsd.org) Date: Thu, 27 Jul 2006 21:41:54 GMT Message-Id: <200607272141.k6RLfsLl030733@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 Cc: Subject: PERFORCE change 102609 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 27 Jul 2006 21:42:14 -0000 http://perforce.freebsd.org/chv.cgi?CH=102609 Change 102609 by jhb@jhb_mutex on 2006/07/27 21:41:18 IFC @102606. Affected files ... .. //depot/projects/smpng/sys/amd64/ia32/ia32_syscall.c#16 integrate .. //depot/projects/smpng/sys/dev/kbdmux/kbdmux.c#4 integrate .. //depot/projects/smpng/sys/ia64/ia32/ia32_trap.c#12 integrate .. //depot/projects/smpng/sys/ia64/ia64/trap.c#83 integrate .. //depot/projects/smpng/sys/net/if_bridge.c#34 integrate .. //depot/projects/smpng/sys/net/if_bridgevar.h#11 integrate .. //depot/projects/smpng/sys/net/if_ethersubr.c#74 integrate .. //depot/projects/smpng/sys/net/if_gif.c#37 integrate .. //depot/projects/smpng/sys/netgraph/ng_ether.c#32 integrate Differences ... ==== //depot/projects/smpng/sys/amd64/ia32/ia32_syscall.c#16 (text+ko) ==== @@ -36,7 +36,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/ia32/ia32_syscall.c,v 1.12 2006/07/27 19:50:16 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/ia32/ia32_syscall.c,v 1.13 2006/07/27 21:25:49 jhb Exp $"); /* * 386 Trap and System call handling ==== //depot/projects/smpng/sys/dev/kbdmux/kbdmux.c#4 (text+ko) ==== @@ -28,7 +28,7 @@ * SUCH DAMAGE. * * $Id: kbdmux.c,v 1.4 2005/07/14 17:38:35 max Exp $ - * $FreeBSD: src/sys/dev/kbdmux/kbdmux.c,v 1.8 2006/03/03 00:46:28 emax Exp $ + * $FreeBSD: src/sys/dev/kbdmux/kbdmux.c,v 1.9 2006/07/27 20:33:48 emax Exp $ */ #include "opt_kbd.h" @@ -657,6 +657,27 @@ /* see if there is something in the keyboard queue */ scancode = getc(&state->ks_inq); if (scancode == -1) { + if (state->ks_flags & POLLING) { + kbdmux_kbd_t *k; + + SLIST_FOREACH(k, &state->ks_kbds, next) { + while (KBDMUX_CHECK_CHAR(k->kbd)) { + scancode = KBDMUX_READ_CHAR(k->kbd, 0); + if (scancode == NOKEY) + break; + if (scancode == ERRKEY) + continue; + if (!KBD_IS_BUSY(k->kbd)) + continue; + + putc(scancode, &state->ks_inq); + } + } + + if (state->ks_inq.c_cc > 0) + goto next_code; + } + KBDMUX_UNLOCK(state); return (NOKEY); } ==== //depot/projects/smpng/sys/ia64/ia32/ia32_trap.c#12 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/ia64/ia32/ia32_trap.c,v 1.8 2006/07/27 19:50:16 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/ia64/ia32/ia32_trap.c,v 1.9 2006/07/27 21:25:49 jhb Exp $"); #include #include ==== //depot/projects/smpng/sys/ia64/ia64/trap.c#83 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/ia64/ia64/trap.c,v 1.119 2006/06/29 19:59:17 marcel Exp $"); +__FBSDID("$FreeBSD: src/sys/ia64/ia64/trap.c,v 1.120 2006/07/27 21:25:50 jhb Exp $"); #include "opt_ddb.h" #include "opt_ktrace.h" ==== //depot/projects/smpng/sys/net/if_bridge.c#34 (text+ko) ==== @@ -80,7 +80,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/net/if_bridge.c,v 1.71 2006/07/26 22:15:15 thompsa Exp $"); +__FBSDID("$FreeBSD: src/sys/net/if_bridge.c,v 1.72 2006/07/27 21:01:47 thompsa Exp $"); #include "opt_inet.h" #include "opt_inet6.h" @@ -169,6 +169,51 @@ */ #define BRIDGE_IFCAPS_MASK IFCAP_TXCSUM +/* + * Bridge interface list entry. + */ +struct bridge_iflist { + LIST_ENTRY(bridge_iflist) bif_next; + struct ifnet *bif_ifp; /* member if */ + struct bstp_port bif_stp; /* STP state */ + uint32_t bif_flags; /* member if flags */ + int bif_mutecap; /* member muted caps */ +}; + +/* + * Bridge route node. + */ +struct bridge_rtnode { + LIST_ENTRY(bridge_rtnode) brt_hash; /* hash table linkage */ + LIST_ENTRY(bridge_rtnode) brt_list; /* list linkage */ + struct ifnet *brt_ifp; /* destination if */ + unsigned long brt_expire; /* expiration time */ + uint8_t brt_flags; /* address flags */ + uint8_t brt_addr[ETHER_ADDR_LEN]; +}; + +/* + * Software state for each bridge. + */ +struct bridge_softc { + struct ifnet *sc_ifp; /* make this an interface */ + LIST_ENTRY(bridge_softc) sc_list; + struct mtx sc_mtx; + struct cv sc_cv; + uint32_t sc_brtmax; /* max # of addresses */ + uint32_t sc_brtcnt; /* cur. # of addresses */ + uint32_t sc_brttimeout; /* rt timeout in seconds */ + struct callout sc_brcallout; /* bridge callout */ + uint32_t sc_iflist_ref; /* refcount for sc_iflist */ + uint32_t sc_iflist_xcnt; /* refcount for sc_iflist */ + LIST_HEAD(, bridge_iflist) sc_iflist; /* member interface list */ + LIST_HEAD(, bridge_rtnode) *sc_rthash; /* our forwarding table */ + LIST_HEAD(, bridge_rtnode) sc_rtlist; /* list version of above */ + uint32_t sc_rthash_key; /* key for hash */ + LIST_HEAD(, bridge_iflist) sc_spanlist; /* span ports list */ + struct bstp_state sc_stp; /* STP state */ +}; + static struct mtx bridge_list_mtx; eventhandler_tag bridge_detach_cookie = NULL; @@ -189,6 +234,9 @@ static struct mbuf *bridge_input(struct ifnet *, struct mbuf *); static int bridge_output(struct ifnet *, struct mbuf *, struct sockaddr *, struct rtentry *); +static void bridge_enqueue(struct bridge_softc *, struct ifnet *, + struct mbuf *); +static void bridge_rtdelete(struct bridge_softc *, struct ifnet *ifp, int); static void bridge_forward(struct bridge_softc *, struct mbuf *m); @@ -1469,7 +1517,7 @@ * Enqueue a packet on a bridge member interface. * */ -__inline void +static void bridge_enqueue(struct bridge_softc *sc, struct ifnet *dst_ifp, struct mbuf *m) { int len, err = 0; @@ -2366,7 +2414,7 @@ * * Delete routes to a speicifc member interface. */ -void +static void bridge_rtdelete(struct bridge_softc *sc, struct ifnet *ifp, int full) { struct bridge_rtnode *brt, *nbrt; ==== //depot/projects/smpng/sys/net/if_bridgevar.h#11 (text+ko) ==== @@ -67,7 +67,7 @@ * * OpenBSD: if_bridge.h,v 1.14 2001/03/22 03:48:29 jason Exp * - * $FreeBSD: src/sys/net/if_bridgevar.h,v 1.13 2006/07/26 10:45:38 thompsa Exp $ + * $FreeBSD: src/sys/net/if_bridgevar.h,v 1.14 2006/07/27 21:01:47 thompsa Exp $ */ /* @@ -194,51 +194,6 @@ #ifdef _KERNEL -/* - * Bridge interface list entry. - */ -struct bridge_iflist { - LIST_ENTRY(bridge_iflist) bif_next; - struct ifnet *bif_ifp; /* member if */ - struct bstp_port bif_stp; /* STP state */ - uint32_t bif_flags; /* member if flags */ - int bif_mutecap; /* member muted caps */ -}; - -/* - * Bridge route node. - */ -struct bridge_rtnode { - LIST_ENTRY(bridge_rtnode) brt_hash; /* hash table linkage */ - LIST_ENTRY(bridge_rtnode) brt_list; /* list linkage */ - struct ifnet *brt_ifp; /* destination if */ - unsigned long brt_expire; /* expiration time */ - uint8_t brt_flags; /* address flags */ - uint8_t brt_addr[ETHER_ADDR_LEN]; -}; - -/* - * Software state for each bridge. - */ -struct bridge_softc { - struct ifnet *sc_ifp; /* make this an interface */ - LIST_ENTRY(bridge_softc) sc_list; - struct mtx sc_mtx; - struct cv sc_cv; - uint32_t sc_brtmax; /* max # of addresses */ - uint32_t sc_brtcnt; /* cur. # of addresses */ - uint32_t sc_brttimeout; /* rt timeout in seconds */ - struct callout sc_brcallout; /* bridge callout */ - uint32_t sc_iflist_ref; /* refcount for sc_iflist */ - uint32_t sc_iflist_xcnt; /* refcount for sc_iflist */ - LIST_HEAD(, bridge_iflist) sc_iflist; /* member interface list */ - LIST_HEAD(, bridge_rtnode) *sc_rthash; /* our forwarding table */ - LIST_HEAD(, bridge_rtnode) sc_rtlist; /* list version of above */ - uint32_t sc_rthash_key; /* key for hash */ - LIST_HEAD(, bridge_iflist) sc_spanlist; /* span ports list */ - struct bstp_state sc_stp; /* STP state */ -}; - #define BRIDGE_LOCK_INIT(_sc) do { \ mtx_init(&(_sc)->sc_mtx, "if_bridge", NULL, MTX_DEF); \ cv_init(&(_sc)->sc_cv, "if_bridge_cv"); \ @@ -291,9 +246,6 @@ _err = (*bridge_output_p)(_ifp, _m, NULL, NULL); \ } while (0) -void bridge_enqueue(struct bridge_softc *, struct ifnet *, struct mbuf *); -void bridge_rtdelete(struct bridge_softc *, struct ifnet *ifp, int); - extern struct mbuf *(*bridge_input_p)(struct ifnet *, struct mbuf *); extern int (*bridge_output_p)(struct ifnet *, struct mbuf *, struct sockaddr *, struct rtentry *); ==== //depot/projects/smpng/sys/net/if_ethersubr.c#74 (text+ko) ==== @@ -27,7 +27,7 @@ * SUCH DAMAGE. * * @(#)if_ethersubr.c 8.1 (Berkeley) 6/10/93 - * $FreeBSD: src/sys/net/if_ethersubr.c,v 1.216 2006/07/27 03:50:38 avatar Exp $ + * $FreeBSD: src/sys/net/if_ethersubr.c,v 1.217 2006/07/27 21:01:47 thompsa Exp $ */ #include "opt_atalk.h" @@ -59,7 +59,6 @@ #include #include #include -#include #include #include ==== //depot/projects/smpng/sys/net/if_gif.c#37 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/net/if_gif.c,v 1.63 2006/07/27 03:50:38 avatar Exp $ */ +/* $FreeBSD: src/sys/net/if_gif.c,v 1.64 2006/07/27 21:01:47 thompsa Exp $ */ /* $KAME: if_gif.c,v 1.87 2001/10/19 08:50:27 itojun Exp $ */ /*- @@ -81,7 +81,6 @@ #include #include -#include #include #include ==== //depot/projects/smpng/sys/netgraph/ng_ether.c#32 (text+ko) ==== @@ -39,7 +39,7 @@ * Authors: Archie Cobbs * Julian Elischer * - * $FreeBSD: src/sys/netgraph/ng_ether.c,v 1.59 2006/07/27 06:15:37 avatar Exp $ + * $FreeBSD: src/sys/netgraph/ng_ether.c,v 1.60 2006/07/27 21:01:48 thompsa Exp $ */ /* @@ -61,7 +61,6 @@ #include #include #include -#include #include #include From owner-p4-projects@FreeBSD.ORG Thu Jul 27 21:51:08 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A278D16A4DE; Thu, 27 Jul 2006 21:51:08 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 7DC0A16A4DD for ; Thu, 27 Jul 2006 21:51:08 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id F18FE43D55 for ; Thu, 27 Jul 2006 21:51:07 +0000 (GMT) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k6RLp7CS031408 for ; Thu, 27 Jul 2006 21:51:07 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k6RLp74U031405 for perforce@freebsd.org; Thu, 27 Jul 2006 21:51:07 GMT (envelope-from jhb@freebsd.org) Date: Thu, 27 Jul 2006 21:51:07 GMT Message-Id: <200607272151.k6RLp74U031405@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 Cc: Subject: PERFORCE change 102611 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 27 Jul 2006 21:51:08 -0000 http://perforce.freebsd.org/chv.cgi?CH=102611 Change 102611 by jhb@jhb_mutex on 2006/07/27 21:50:18 Let WITNESS have the first crack at checking for leaked locks as it can provide much more detailed information if it is present. Affected files ... .. //depot/projects/smpng/sys/amd64/amd64/trap.c#47 edit .. //depot/projects/smpng/sys/amd64/ia32/ia32_syscall.c#17 edit .. //depot/projects/smpng/sys/arm/arm/trap.c#20 edit .. //depot/projects/smpng/sys/i386/i386/trap.c#96 edit .. //depot/projects/smpng/sys/ia64/ia32/ia32_trap.c#13 edit .. //depot/projects/smpng/sys/ia64/ia64/trap.c#84 edit .. //depot/projects/smpng/sys/powerpc/powerpc/trap.c#53 edit .. //depot/projects/smpng/sys/sparc64/sparc64/trap.c#69 edit Differences ... ==== //depot/projects/smpng/sys/amd64/amd64/trap.c#47 (text+ko) ==== @@ -874,6 +874,8 @@ /* * Check for misbehavior. */ + WITNESS_WARN(WARN_PANIC, NULL, "System call %s returning", + (code >= 0 && code < SYS_MAXSYSCALL) ? syscallnames[code] : "???"); KASSERT(td->td_critnest == 0, ("System call %s returning in a critical section", (code >= 0 && code < SYS_MAXSYSCALL) ? syscallnames[code] : "???")); @@ -881,8 +883,6 @@ ("System call %s returning with %d locks held", (code >= 0 && code < SYS_MAXSYSCALL) ? syscallnames[code] : "???", td->td_locks)); - WITNESS_WARN(WARN_PANIC, NULL, "System call %s returning", - (code >= 0 && code < SYS_MAXSYSCALL) ? syscallnames[code] : "???"); /* * Handle reschedule and other end-of-syscall issues ==== //depot/projects/smpng/sys/amd64/ia32/ia32_syscall.c#17 (text+ko) ==== @@ -246,6 +246,8 @@ /* * Check for misbehavior. */ + WITNESS_WARN(WARN_PANIC, NULL, "System call %s returning", + (code >= 0 && code < SYS_MAXSYSCALL) ? freebsd32_syscallnames[code] : "???"); KASSERT(td->td_critnest == 0, ("System call %s returning in a critical section", (code >= 0 && code < SYS_MAXSYSCALL) ? freebsd32_syscallnames[code] : "???")); @@ -253,8 +255,6 @@ ("System call %s returning with %d locks held", (code >= 0 && code < SYS_MAXSYSCALL) ? freebsd32_syscallnames[code] : "???", td->td_locks)); - WITNESS_WARN(WARN_PANIC, NULL, "System call %s returning", - (code >= 0 && code < SYS_MAXSYSCALL) ? freebsd32_syscallnames[code] : "???"); /* * Handle reschedule and other end-of-syscall issues ==== //depot/projects/smpng/sys/arm/arm/trap.c#20 (text+ko) ==== @@ -981,6 +981,8 @@ if (locked && (callp->sy_narg & SYF_MPSAFE) == 0) mtx_unlock(&Giant); + WITNESS_WARN(WARN_PANIC, NULL, "System call %s returning", + (code >= 0 && code < SYS_MAXSYSCALL) ? syscallnames[code] : "???"); KASSERT(td->td_critnest == 0, ("System call %s returning in a critical section", (code >= 0 && code < SYS_MAXSYSCALL) ? syscallnames[code] : "???")); @@ -988,8 +990,6 @@ ("System call %s returning with %d locks held", (code >= 0 && code < SYS_MAXSYSCALL) ? syscallnames[code] : "???", td->td_locks)); - WITNESS_WARN(WARN_PANIC, NULL, "System call %s returning", - (code >= 0 && code < SYS_MAXSYSCALL) ? syscallnames[code] : "???"); userret(td, frame); CTR4(KTR_SYSC, "syscall exit thread %p pid %d proc %s code %d", td, ==== //depot/projects/smpng/sys/i386/i386/trap.c#96 (text+ko) ==== @@ -1065,6 +1065,8 @@ /* * Check for misbehavior. */ + WITNESS_WARN(WARN_PANIC, NULL, "System call %s returning", + (code >= 0 && code < SYS_MAXSYSCALL) ? syscallnames[code] : "???"); KASSERT(td->td_critnest == 0, ("System call %s returning in a critical section", (code >= 0 && code < SYS_MAXSYSCALL) ? syscallnames[code] : "???")); @@ -1072,8 +1074,6 @@ ("System call %s returning with %d locks held", (code >= 0 && code < SYS_MAXSYSCALL) ? syscallnames[code] : "???", td->td_locks)); - WITNESS_WARN(WARN_PANIC, NULL, "System call %s returning", - (code >= 0 && code < SYS_MAXSYSCALL) ? syscallnames[code] : "???"); /* * Handle reschedule and other end-of-syscall issues ==== //depot/projects/smpng/sys/ia64/ia32/ia32_trap.c#13 (text+ko) ==== @@ -183,6 +183,8 @@ /* * Check for misbehavior. */ + WITNESS_WARN(WARN_PANIC, NULL, "System call %s returning", + (code >= 0 && code < SYS_MAXSYSCALL) ? syscallnames[code] : "???"); KASSERT(td->td_critnest == 0, ("System call %s returning in a critical section", (code >= 0 && code < SYS_MAXSYSCALL) ? syscallnames[code] : "???")); @@ -190,8 +192,6 @@ ("System call %s returning with %d locks held", (code >= 0 && code < SYS_MAXSYSCALL) ? syscallnames[code] : "???", td->td_locks)); - WITNESS_WARN(WARN_PANIC, NULL, "System call %s returning", - (code >= 0 && code < SYS_MAXSYSCALL) ? syscallnames[code] : "???"); /* * End of syscall tracing. ==== //depot/projects/smpng/sys/ia64/ia64/trap.c#84 (text+ko) ==== @@ -1049,6 +1049,8 @@ /* * Check for misbehavior. */ + WITNESS_WARN(WARN_PANIC, NULL, "System call %s returning", + (code >= 0 && code < SYS_MAXSYSCALL) ? syscallnames[code] : "???"); KASSERT(td->td_critnest == 0, ("System call %s returning in a critical section", (code >= 0 && code < SYS_MAXSYSCALL) ? syscallnames[code] : "???")); @@ -1056,8 +1058,6 @@ ("System call %s returning with %d locks held", (code >= 0 && code < SYS_MAXSYSCALL) ? syscallnames[code] : "???", td->td_locks)); - WITNESS_WARN(WARN_PANIC, NULL, "System call %s returning", - (code >= 0 && code < SYS_MAXSYSCALL) ? syscallnames[code] : "???"); /* * Handle reschedule and other end-of-syscall issues ==== //depot/projects/smpng/sys/powerpc/powerpc/trap.c#53 (text+ko) ==== @@ -473,6 +473,8 @@ /* * Check for misbehavior. */ + WITNESS_WARN(WARN_PANIC, NULL, "System call %s returning", + (code >= 0 && code < SYS_MAXSYSCALL) ? syscallnames[code] : "???"); KASSERT(td->td_critnest == 0, ("System call %s returning in a critical section", (code >= 0 && code < SYS_MAXSYSCALL) ? syscallnames[code] : "???")); @@ -480,8 +482,6 @@ ("System call %s returning with %d locks held", (code >= 0 && code < SYS_MAXSYSCALL) ? syscallnames[code] : "???", td->td_locks)); - WITNESS_WARN(WARN_PANIC, NULL, "System call %s returning", - (code >= 0 && code < SYS_MAXSYSCALL) ? syscallnames[code] : "???"); #ifdef KTRACE if (KTRPOINT(td, KTR_SYSRET)) ==== //depot/projects/smpng/sys/sparc64/sparc64/trap.c#69 (text+ko) ==== @@ -650,6 +650,8 @@ /* * Check for misbehavior. */ + WITNESS_WARN(WARN_PANIC, NULL, "System call %s returning", + (code >= 0 && code < SYS_MAXSYSCALL) ? syscallnames[code] : "???"); KASSERT(td->td_critnest == 0, ("System call %s returning in a critical section", (code >= 0 && code < SYS_MAXSYSCALL) ? syscallnames[code] : "???")); @@ -657,8 +659,6 @@ ("System call %s returning with %d locks held", (code >= 0 && code < SYS_MAXSYSCALL) ? syscallnames[code] : "???", td->td_locks)); - WITNESS_WARN(WARN_PANIC, NULL, "System call %s returning", - (code >= 0 && code < SYS_MAXSYSCALL) ? syscallnames[code] : "???"); /* * Handle reschedule and other end-of-syscall issues From owner-p4-projects@FreeBSD.ORG Thu Jul 27 22:17:43 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E754D16A4E1; Thu, 27 Jul 2006 22:17:42 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id B03A016A4DF for ; Thu, 27 Jul 2006 22:17:42 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 6162A43D49 for ; Thu, 27 Jul 2006 22:17:42 +0000 (GMT) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k6RMHgtF033745 for ; Thu, 27 Jul 2006 22:17:42 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k6RMHgdF033742 for perforce@freebsd.org; Thu, 27 Jul 2006 22:17:42 GMT (envelope-from jhb@freebsd.org) Date: Thu, 27 Jul 2006 22:17:42 GMT Message-Id: <200607272217.k6RMHgdF033742@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 Cc: Subject: PERFORCE change 102612 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 27 Jul 2006 22:17:43 -0000 http://perforce.freebsd.org/chv.cgi?CH=102612 Change 102612 by jhb@jhb_mutex on 2006/07/27 22:17:19 Oof. Affected files ... .. //depot/projects/smpng/sys/i386/i386/machdep.c#113 edit Differences ... ==== //depot/projects/smpng/sys/i386/i386/machdep.c#113 (text+ko) ==== @@ -1643,6 +1643,7 @@ struct bios_smap *smap; quad_t dcons_addr, dcons_size; + has_smap = 0; #ifdef XBOX if (arch_i386_is_xbox) { /* @@ -1661,7 +1662,6 @@ bzero(&vmf, sizeof(vmf)); bzero(physmap, sizeof(physmap)); basemem = 0; - has_smap = 0; /* * Some newer BIOSes has broken INT 12H implementation which cause From owner-p4-projects@FreeBSD.ORG Thu Jul 27 22:29:05 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9111716A4E0; Thu, 27 Jul 2006 22:29:05 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 5495C16A4DE for ; Thu, 27 Jul 2006 22:29:05 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 93A2443D67 for ; Thu, 27 Jul 2006 22:28:57 +0000 (GMT) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k6RMSuuS034355 for ; Thu, 27 Jul 2006 22:28:56 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k6RMSuQg034352 for perforce@freebsd.org; Thu, 27 Jul 2006 22:28:56 GMT (envelope-from jhb@freebsd.org) Date: Thu, 27 Jul 2006 22:28:56 GMT Message-Id: <200607272228.k6RMSuQg034352@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 Cc: Subject: PERFORCE change 102614 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 27 Jul 2006 22:29:05 -0000 http://perforce.freebsd.org/chv.cgi?CH=102614 Change 102614 by jhb@jhb_mutex on 2006/07/27 22:27:59 As cute as 'kldstat' in ddb might be, on second thought I'm not sure it's really all that useful. In gdb it is useful as an aid to getting symbols loaded for kernel modules, but ddb doesn't need that. Affected files ... .. //depot/projects/smpng/sys/kern/kern_linker.c#81 edit .. //depot/projects/smpng/sys/kern/kern_module.c#23 edit .. //depot/projects/smpng/sys/sys/module.h#9 edit Differences ... ==== //depot/projects/smpng/sys/kern/kern_linker.c#81 (text+ko) ==== @@ -54,10 +54,6 @@ #include "linker_if.h" -#ifdef DDB -#include -#endif - #ifdef HWPMC_HOOKS #include #endif @@ -2016,28 +2012,3 @@ SYSCTL_PROC(_kern, OID_AUTO, function_list, CTLFLAG_RD, NULL, 0, sysctl_kern_function_list, "", "kernel function list"); - -#ifdef DDB -DB_COMMAND(kldstat, db_kldstat) -{ - linker_file_t lf; - int verbose; - - verbose = index(modif, 'v') != NULL; -#ifdef __LP64__ - db_printf("Id Refs Address Size Name\n"); -#else - db_printf("Id Refs Address Size Name\n"); -#endif - TAILQ_FOREACH(lf, &linker_files, link) { - if (db_pager_quit) - return; - db_printf("%2d %4d %p %-8zx %s\n", lf->id, lf->refs, - lf->address, lf->size, lf->filename); - if (!verbose) - continue; - db_printf(" Contains modules:\n"); - db_show_modules(lf, " "); - } -} -#endif ==== //depot/projects/smpng/sys/kern/kern_module.c#23 (text+ko) ==== @@ -25,7 +25,6 @@ */ #include "opt_compat.h" -#include "opt_ddb.h" #include __FBSDID("$FreeBSD: src/sys/kern/kern_module.c,v 1.51 2006/06/26 18:34:45 jhb Exp $"); @@ -45,10 +44,6 @@ #include #include -#ifdef DDB -#include -#endif - static MALLOC_DEFINE(M_MODULE, "module", "module data structures"); typedef TAILQ_HEAD(, module) modulelist_t; @@ -509,18 +504,3 @@ return (error); } #endif - -#ifdef DDB -void -db_show_modules(linker_file_t lf, const char *prefix) -{ - module_t mod; - - db_printf("%sId Name\n", prefix); - TAILQ_FOREACH(mod, &lf->modules, flink) { - if (db_pager_quit) - return; - db_printf("%s%-4d %s\n", prefix, mod->id, mod->name); - } -} -#endif ==== //depot/projects/smpng/sys/sys/module.h#9 (text+ko) ==== @@ -148,9 +148,6 @@ module_t module_getfnext(module_t); void module_setspecific(module_t, modspecific_t *); struct linker_file *module_file(module_t); -#ifdef DDB -void db_show_modules(struct linker_file *, const char *); -#endif #ifdef MOD_DEBUG extern int mod_debug; From owner-p4-projects@FreeBSD.ORG Fri Jul 28 00:56:04 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 69F3E16A4E1; Fri, 28 Jul 2006 00:56:04 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 31F7316A4DF for ; Fri, 28 Jul 2006 00:56:04 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 0027843D58 for ; Fri, 28 Jul 2006 00:56:03 +0000 (GMT) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k6S0u3kB051406 for ; Fri, 28 Jul 2006 00:56:03 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k6S0u39v051403 for perforce@freebsd.org; Fri, 28 Jul 2006 00:56:03 GMT (envelope-from jb@freebsd.org) Date: Fri, 28 Jul 2006 00:56:03 GMT Message-Id: <200607280056.k6S0u39v051403@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 102619 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 28 Jul 2006 00:56:04 -0000 http://perforce.freebsd.org/chv.cgi?CH=102619 Change 102619 by jb@jb_freebsd2 on 2006/07/28 00:55:46 Move the CPU register snapshot code into an include file so that it can be included as part of the cpu_snapshot_save leaf function as well as being included inline in asm code where a 'call' to a function at tl1 would end in tears. The index to the per-cpu snapshot array is the program counter when embedded in asm code and %o7 when included in the cpu_snapshot_save leaf function. The most imprtant thing to capture in this info is the index (program counter or return address) because that identifies the section of code that the CPU was last seen executing. None of this would be needed if Sun would just make the hypervisor give access to another CPU's registers. Apparently that is work in progress at Sun. Affected files ... .. //depot/projects/dtrace/src/sys/sun4v/include/cpu_snapshot_save.h#1 add Differences ... From owner-p4-projects@FreeBSD.ORG Fri Jul 28 00:58:07 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 89D9916A4E1; Fri, 28 Jul 2006 00:58:07 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 37AFF16A4DA for ; Fri, 28 Jul 2006 00:58:07 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id F420C43D4C for ; Fri, 28 Jul 2006 00:58:06 +0000 (GMT) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k6S0w6ql051528 for ; Fri, 28 Jul 2006 00:58:06 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k6S0w6iI051525 for perforce@freebsd.org; Fri, 28 Jul 2006 00:58:06 GMT (envelope-from jb@freebsd.org) Date: Fri, 28 Jul 2006 00:58:06 GMT Message-Id: <200607280058.k6S0w6iI051525@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 102620 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 28 Jul 2006 00:58:07 -0000 http://perforce.freebsd.org/chv.cgi?CH=102620 Change 102620 by jb@jb_freebsd2 on 2006/07/28 00:57:37 Move the asm code stack offsets into this file so that the asm code can be included inline in other asm code or in the cpu_snapshot_save function which is called from C source. Affected files ... .. //depot/projects/dtrace/src/sys/sun4v/include/cpu_snapshot.h#3 edit Differences ... ==== //depot/projects/dtrace/src/sys/sun4v/include/cpu_snapshot.h#3 (text+ko) ==== @@ -6,38 +6,64 @@ #define CPU_SNAPSHOT_BITS 8 #define CPU_SNAPSHOT_SIZE (1 << CPU_SNAPSHOT_BITS) -#define CPU_SNAPSHOT_COUNT 0x00 -#define CPU_SNAPSHOT_R_I0 0x08 -#define CPU_SNAPSHOT_R_I1 0x10 -#define CPU_SNAPSHOT_R_I2 0x18 -#define CPU_SNAPSHOT_R_I3 0x20 -#define CPU_SNAPSHOT_R_I4 0x28 -#define CPU_SNAPSHOT_R_I5 0x30 -#define CPU_SNAPSHOT_R_I6 0x38 -#define CPU_SNAPSHOT_R_I7 0x40 -#define CPU_SNAPSHOT_R_O0 0x48 -#define CPU_SNAPSHOT_R_O1 0x50 -#define CPU_SNAPSHOT_R_O2 0x58 -#define CPU_SNAPSHOT_R_O3 0x60 -#define CPU_SNAPSHOT_R_O4 0x68 -#define CPU_SNAPSHOT_R_O5 0x70 -#define CPU_SNAPSHOT_R_O6 0x78 -#define CPU_SNAPSHOT_R_O7 0x80 -#define CPU_SNAPSHOT_R_G1 0x88 -#define CPU_SNAPSHOT_R_G2 0x90 -#define CPU_SNAPSHOT_R_G3 0x98 -#define CPU_SNAPSHOT_R_G4 0xa0 -#define CPU_SNAPSHOT_R_G5 0xa8 -#define CPU_SNAPSHOT_R_G6 0xb0 -#define CPU_SNAPSHOT_R_G7 0xb8 -#define CPU_SNAPSHOT_PSTATE 0xc0 -#define CPU_SNAPSHOT_TL 0xc8 -#define CPU_SNAPSHOT_TICK 0xd0 -#define CPU_SNAPSHOT_PIL 0xd8 +#ifdef __ASM__ + +/* Offsets for registers saved on the stack. */ +#define STACK_G1 SPOFF +#define STACK_G2 SPOFF + 0x08 +#define STACK_G3 SPOFF + 0x10 +#define STACK_G4 SPOFF + 0x18 +#define STACK_G5 SPOFF + 0x20 +#define STACK_FREEB SPOFF + 0x28 +#define STACK_FREEA SPOFF + 0x30 +#define STACK_FREE9 SPOFF + 0x38 +#define STACK_FREE8 SPOFF + 0x40 +#define STACK_FREE7 SPOFF + 0x48 +#define STACK_FREE6 SPOFF + 0x50 +#define STACK_FREE5 SPOFF + 0x58 +#define STACK_FREE4 SPOFF + 0x60 +#define STACK_FREE3 SPOFF + 0x68 +#define STACK_FREE2 SPOFF + 0x70 +#define STACK_FREE1 SPOFF + 0x78 +#define STACK_SIZE 0x80 + +/* Offsets into struct cpu_snapshot */ +#define CPU_SNAPSHOT_INDX 0x00 +#define CPU_SNAPSHOT_COUNT 0x08 +#define CPU_SNAPSHOT_R_I0 0x10 +#define CPU_SNAPSHOT_R_I1 0x18 +#define CPU_SNAPSHOT_R_I2 0x20 +#define CPU_SNAPSHOT_R_I3 0x28 +#define CPU_SNAPSHOT_R_I4 0x30 +#define CPU_SNAPSHOT_R_I5 0x38 +#define CPU_SNAPSHOT_R_I6 0x40 +#define CPU_SNAPSHOT_R_I7 0x48 +#define CPU_SNAPSHOT_R_O0 0x50 +#define CPU_SNAPSHOT_R_O1 0x58 +#define CPU_SNAPSHOT_R_O2 0x60 +#define CPU_SNAPSHOT_R_O3 0x68 +#define CPU_SNAPSHOT_R_O4 0x70 +#define CPU_SNAPSHOT_R_O5 0x78 +#define CPU_SNAPSHOT_R_O6 0x80 +#define CPU_SNAPSHOT_R_O7 0x88 +#define CPU_SNAPSHOT_R_G1 0x90 +#define CPU_SNAPSHOT_R_G2 0x98 +#define CPU_SNAPSHOT_R_G3 0xa0 +#define CPU_SNAPSHOT_R_G4 0xa8 +#define CPU_SNAPSHOT_R_G5 0xb0 +#define CPU_SNAPSHOT_R_G6 0xb8 +#define CPU_SNAPSHOT_R_G7 0xc0 +#define CPU_SNAPSHOT_PSTATE 0xc8 +#define CPU_SNAPSHOT_TL 0xd0 +#define CPU_SNAPSHOT_TICK 0xd8 +#define CPU_SNAPSHOT_PIL 0xe0 +#define CPU_SNAPSHOT_SP 0xe8 +#define CPU_SNAPSHOT_PC 0xf0 -#ifndef __ASM__ +#else struct cpu_snapshot { + uint64_t indx; uint64_t count; uint64_t r_i0; uint64_t r_i1; @@ -66,7 +92,9 @@ uint64_t tl; uint64_t tick; uint64_t pil; - uint64_t pad[4]; + uint64_t sp; + uint64_t pc; + uint64_t pad[1]; }; #ifdef CPU_SNAPSHOT_GLOBAL From owner-p4-projects@FreeBSD.ORG Fri Jul 28 00:59:09 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8B5DA16A4E2; Fri, 28 Jul 2006 00:59:09 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 4F72C16A4DD for ; Fri, 28 Jul 2006 00:59:09 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id E52AA43D5C for ; Fri, 28 Jul 2006 00:59:08 +0000 (GMT) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k6S0x8OS051554 for ; Fri, 28 Jul 2006 00:59:08 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k6S0x8l0051550 for perforce@freebsd.org; Fri, 28 Jul 2006 00:59:08 GMT (envelope-from jb@freebsd.org) Date: Fri, 28 Jul 2006 00:59:08 GMT Message-Id: <200607280059.k6S0x8l0051550@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 102621 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 28 Jul 2006 00:59:09 -0000 http://perforce.freebsd.org/chv.cgi?CH=102621 Change 102621 by jb@jb_freebsd2 on 2006/07/28 00:58:37 Include the common asm source which is separeately included inline in other asm code. Affected files ... .. //depot/projects/dtrace/src/sys/sun4v/sun4v/cpu_snapshot_save.S#3 edit Differences ... ==== //depot/projects/dtrace/src/sys/sun4v/sun4v/cpu_snapshot_save.S#3 (text+ko) ==== @@ -2,151 +2,14 @@ #include #include #include -#ifdef _KERNEL #include "assym.s" -#endif -#define STACK_G1 SPOFF -#define STACK_G2 SPOFF + 0x08 -#define STACK_G3 SPOFF + 0x10 -#define STACK_G4 SPOFF + 0x18 -#define STACK_FREEC SPOFF + 0x20 -#define STACK_FREEB SPOFF + 0x28 -#define STACK_FREEA SPOFF + 0x30 -#define STACK_FREE9 SPOFF + 0x38 -#define STACK_FREE8 SPOFF + 0x40 -#define STACK_FREE7 SPOFF + 0x48 -#define STACK_FREE6 SPOFF + 0x50 -#define STACK_FREE5 SPOFF + 0x58 -#define STACK_FREE4 SPOFF + 0x60 -#define STACK_FREE3 SPOFF + 0x68 -#define STACK_FREE2 SPOFF + 0x70 -#define STACK_FREE1 SPOFF + 0x78 -#define STACK_SIZE 0x80 +#define CPU_SNAPSHOT_FUNC ENTRY(cpu_snapshot_save) - /* Create room on the stack for this leaf-function. */ - sub %sp, STACK_SIZE, %sp - /* Save registers used in this function on the stack. */ - stx %g1, [ %sp + STACK_G1 ] ! cpu - stx %g2, [ %sp + STACK_G2 ] ! Ptr to struct cpu_snapshot - stx %g3, [ %sp + STACK_G3 ] ! i - stx %g4, [ %sp + STACK_G4 ] ! Temporary value. - - /* Get the current CPU number. */ -#ifdef _KERNEL - lduw [ PCPU(CPUID) ], %g1 -#else - mov %g0, %g1 -#endif - - /* - * Multiply the CPU ID by the size of the per-cpu array entry - * to get the offset to the start of the CPU specific array. - */ - sllx %g1, N_CPU_SNAPSHOT_BITS + CPU_SNAPSHOT_BITS, %g1 - - /* Get the address of cpu_snapshot_data. */ - sethi %hi(cpu_snapshot_data), %g2 - or %g2, %lo(cpu_snapshot_data), %g2 - - /* - * Offset the cpu_snapshot_data point to get the address of - * cpu_snapshot_data[cpuid][0]. - */ - add %g2, %g1, %g2 - - /* Initialise the loop variable (i). */ - mov %g0, %g3 - - /* Enter a loop... */ - cmp %g3, N_CPU_SNAPSHOT - bge,pn %icc, .cpu_snapshot_save_4 - -.cpu_snapshot_save_1: - /* if p->r_o7 == 0, goto .cpu_snapshot_save_2 */ - ldx [ %g2 + CPU_SNAPSHOT_R_O7 ], %g4 - brz,pn %g4, .cpu_snapshot_save_2 - nop - - /* if p->r_o7 == %o7 goto .cpu_snapshot_save_2 */ - cmp %g4, %o7 - be,pn %icc, .cpu_snapshot_save_2 - nop - - ba,a .cpu_snapshot_save_3 - nop +#include "machine/cpu_snapshot_save.h" -.cpu_snapshot_save_2: - /* Increment the call count. */ - ldx [ %g2 + CPU_SNAPSHOT_COUNT ], %g4 - inc %g4 - stx %g4, [ %g2 + CPU_SNAPSHOT_COUNT ] - - /* Save the registers in struct cpu_snapshot. */ - stx %i0, [ %g2 + CPU_SNAPSHOT_R_I0 ] - stx %i1, [ %g2 + CPU_SNAPSHOT_R_I1 ] - stx %i2, [ %g2 + CPU_SNAPSHOT_R_I2 ] - stx %i3, [ %g2 + CPU_SNAPSHOT_R_I3 ] - stx %i4, [ %g2 + CPU_SNAPSHOT_R_I4 ] - stx %i5, [ %g2 + CPU_SNAPSHOT_R_I5 ] - stx %i6, [ %g2 + CPU_SNAPSHOT_R_I6 ] - stx %i7, [ %g2 + CPU_SNAPSHOT_R_I7 ] - stx %o0, [ %g2 + CPU_SNAPSHOT_R_O0 ] - stx %o1, [ %g2 + CPU_SNAPSHOT_R_O1 ] - stx %o2, [ %g2 + CPU_SNAPSHOT_R_O2 ] - stx %o3, [ %g2 + CPU_SNAPSHOT_R_O3 ] - stx %o4, [ %g2 + CPU_SNAPSHOT_R_O4 ] - stx %o5, [ %g2 + CPU_SNAPSHOT_R_O5 ] - stx %o6, [ %g2 + CPU_SNAPSHOT_R_O6 ] - stx %o7, [ %g2 + CPU_SNAPSHOT_R_O7 ] - stx %o7, [ %g2 + CPU_SNAPSHOT_R_O7 ] - ldx [ %sp + STACK_G1 ], %g4 - stx %g4, [ %g2 + CPU_SNAPSHOT_R_G1 ] - ldx [ %sp + STACK_G2 ], %g4 - stx %g4, [ %g2 + CPU_SNAPSHOT_R_G2 ] - ldx [ %sp + STACK_G3 ], %g4 - stx %g4, [ %g2 + CPU_SNAPSHOT_R_G3 ] - ldx [ %sp + STACK_G4 ], %g4 - stx %g4, [ %g2 + CPU_SNAPSHOT_R_G4 ] - stx %g5, [ %g2 + CPU_SNAPSHOT_R_G5 ] - stx %g6, [ %g2 + CPU_SNAPSHOT_R_G6 ] - stx %g7, [ %g2 + CPU_SNAPSHOT_R_G7 ] -#ifdef _KERNEL - rdpr %pstate, %g4 - stx %g4, [ %g2 + CPU_SNAPSHOT_PSTATE ] - rdpr %tick, %g4 - stx %g4, [ %g2 + CPU_SNAPSHOT_TICK ] - rdpr %pil, %g4 - stx %g4, [ %g2 + CPU_SNAPSHOT_PIL ] - rdpr %tl, %g4 - stx %g4, [ %g2 + CPU_SNAPSHOT_TL ] -#endif - - ba,a .cpu_snapshot_save_4 - nop - -.cpu_snapshot_save_3: - /* Increment the loop variable. */ - inc %g3 - - /* Point to the next array entry. */ - add %g2, CPU_SNAPSHOT_SIZE, %g2 - - cmp %g3, N_CPU_SNAPSHOT - bl %icc, .cpu_snapshot_save_1 - -.cpu_snapshot_save_4: - - /* Restore saved registers. */ - ldx [ %sp + STACK_G1 ], %g1 - ldx [ %sp + STACK_G2 ], %g2 - ldx [ %sp + STACK_G3 ], %g3 - ldx [ %sp + STACK_G4 ], %g4 - - /* Restore the stack before returning. */ - add %sp, STACK_SIZE, %sp retl - nop + nop END(cpu_snapshot_save) From owner-p4-projects@FreeBSD.ORG Fri Jul 28 01:02:13 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 83FB316A4E0; Fri, 28 Jul 2006 01:02:13 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 5C7E616A4DD for ; Fri, 28 Jul 2006 01:02:13 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 2965043D5C for ; Fri, 28 Jul 2006 01:02:13 +0000 (GMT) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k6S12DkQ051851 for ; Fri, 28 Jul 2006 01:02:13 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k6S12Cgp051848 for perforce@freebsd.org; Fri, 28 Jul 2006 01:02:12 GMT (envelope-from jb@freebsd.org) Date: Fri, 28 Jul 2006 01:02:12 GMT Message-Id: <200607280102.k6S12Cgp051848@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 102622 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 28 Jul 2006 01:02:13 -0000 http://perforce.freebsd.org/chv.cgi?CH=102622 Change 102622 by jb@jb_freebsd2 on 2006/07/28 01:01:47 If the kernel CPU_SNAPSHOT option is defined, then take a snapshot of the per-cpu registers for each cpu switch. Yes, this will have a performance hit. It is anly intended to help diagnose what is going on when IPI's remain unacked. Once that problem is solved this code will be removed and CVS will have no record of it. Trust me, I know these things. 8-) Affected files ... .. //depot/projects/dtrace/src/sys/sun4v/sun4v/swtch.S#2 edit Differences ... ==== //depot/projects/dtrace/src/sys/sun4v/sun4v/swtch.S#2 (text+ko) ==== @@ -27,12 +27,18 @@ #include __FBSDID("$FreeBSD: src/sys/sparc64/sparc64/swtch.S,v 1.33 2004/05/26 12:06:52 tmm Exp $"); +#include "opt_cpu_snapshot.h" + #include #include #include #include #include +#ifdef CPU_SNAPSHOT +#include +#endif + #include "assym.s" .register %g2, #ignore @@ -226,8 +232,18 @@ /* * Done. Return and load the new process's window from the stack. */ -5: ret +5: +#ifdef CPU_SNAPSHOT + restore + +#include "machine/cpu_snapshot_save.h" + + retl + nop +#else + ret restore +#endif END(cpu_switch) ENTRY(savectx) From owner-p4-projects@FreeBSD.ORG Fri Jul 28 01:04:16 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id BA48E16A4E0; Fri, 28 Jul 2006 01:04:16 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 86D9F16A4DD for ; Fri, 28 Jul 2006 01:04:16 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 5307B43D49 for ; Fri, 28 Jul 2006 01:04:16 +0000 (GMT) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k6S14Gqr053187 for ; Fri, 28 Jul 2006 01:04:16 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k6S14GYd053184 for perforce@freebsd.org; Fri, 28 Jul 2006 01:04:16 GMT (envelope-from jb@freebsd.org) Date: Fri, 28 Jul 2006 01:04:16 GMT Message-Id: <200607280104.k6S14GYd053184@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 102623 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 28 Jul 2006 01:04:17 -0000 http://perforce.freebsd.org/chv.cgi?CH=102623 Change 102623 by jb@jb_freebsd2 on 2006/07/28 01:03:53 Add the index (program counter or call address) and the program counter. Add a function for ddb to report the CPU register snapshots. Affected files ... .. //depot/projects/dtrace/src/sys/sun4v/sun4v/cpu_snapshot.c#3 edit Differences ... ==== //depot/projects/dtrace/src/sys/sun4v/sun4v/cpu_snapshot.c#3 (text+ko) ==== @@ -5,8 +5,10 @@ #include #include #else +#include "opt_ddb.h" #include #include +#include #endif #define CPU_SNAPSHOT_GLOBAL @@ -32,7 +34,7 @@ if (p->r_o7 == 0) continue; - printf("[%02d] CallAddr: 0x%jx count %jd pstate 0x%jx tl 0x%jx tick 0x%jx pil 0x%jx\n",j,p->r_o7,p->count,p->pstate,p->tl,p->tick,p->pil); + printf("[%02d] CallAddr: 0x%jx count %jd pc 0x%jx sp 0x%jx pstate 0x%jx tl 0x%jx tick 0x%jx pil 0x%jx\n",j,p->indx,p->count,p->pc,p->sp,p->pstate,p->tl,p->tick,p->pil); printf(" I: 0x%jx 0x%jx 0x%jx 0x%jx 0x%jx 0x%jx 0x%jx 0x%jx\n",p->r_i0,p->r_i1,p->r_i2,p->r_i3,p->r_i4,p->r_i5,p->r_i6,p->r_i7); printf(" O: 0x%jx 0x%jx 0x%jx 0x%jx 0x%jx 0x%jx 0x%jx 0x%jx\n",p->r_o0,p->r_o1,p->r_o2,p->r_o3,p->r_o4,p->r_o5,p->r_o6,p->r_o7); printf(" G: 0x%jx 0x%jx 0x%jx 0x%jx 0x%jx 0x%jx 0x%jx\n",p->r_g1,p->r_g2,p->r_g3,p->r_g4,p->r_g5,p->r_g6,p->r_g7); @@ -40,6 +42,13 @@ } } +#ifdef DDB +DB_SHOW_COMMAND(cpu_snapshot, db_show_cpu_snapshot) +{ + cpu_snapshot_report(-1); +} +#endif + #ifdef CPU_SNAPSHOT_TEST int main(int argc, char *argv[]) { From owner-p4-projects@FreeBSD.ORG Fri Jul 28 03:08:05 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B63A816A4DF; Fri, 28 Jul 2006 03:08:05 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 747D116A4DD for ; Fri, 28 Jul 2006 03:08:05 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id E311E43D49 for ; Fri, 28 Jul 2006 03:08:04 +0000 (GMT) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k6S384IJ061624 for ; Fri, 28 Jul 2006 03:08:04 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k6S380Ze061607 for perforce@freebsd.org; Fri, 28 Jul 2006 03:08:00 GMT (envelope-from jb@freebsd.org) Date: Fri, 28 Jul 2006 03:08:00 GMT Message-Id: <200607280308.k6S380Ze061607@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 102628 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 28 Jul 2006 03:08:06 -0000 http://perforce.freebsd.org/chv.cgi?CH=102628 Change 102628 by jb@jb_freebsd2 on 2006/07/28 03:07:22 IFC Affected files ... .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml#17 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/porters-handbook/book.sgml#15 integrate .. //depot/projects/dtrace/doc/share/sgml/man-refs.ent#10 integrate .. //depot/projects/dtrace/doc/zh_TW.Big5/books/developers-handbook/book.sgml#2 integrate .. //depot/projects/dtrace/doc/zh_TW.Big5/books/developers-handbook/introduction/chapter.sgml#2 integrate .. //depot/projects/dtrace/doc/zh_TW.Big5/books/developers-handbook/tools/chapter.sgml#2 integrate .. //depot/projects/dtrace/doc/zh_TW.Big5/share/sgml/authors.ent#1 branch .. //depot/projects/dtrace/doc/zh_TW.Big5/share/sgml/catalog#2 integrate .. //depot/projects/dtrace/doc/zh_TW.Big5/share/sgml/l10n.ent#2 integrate .. //depot/projects/dtrace/doc/zh_TW.Big5/share/sgml/trademarks.ent#2 integrate .. //depot/projects/dtrace/ports/GIDs#2 integrate .. //depot/projects/dtrace/ports/MOVED#7 integrate .. //depot/projects/dtrace/ports/Mk/bsd.php.mk#3 integrate .. //depot/projects/dtrace/ports/Mk/bsd.scons.mk#4 integrate .. //depot/projects/dtrace/ports/Mk/bsd.sites.mk#4 integrate .. //depot/projects/dtrace/ports/UIDs#2 integrate .. //depot/projects/dtrace/ports/UPDATING#7 integrate .. //depot/projects/dtrace/src/UPDATING#5 integrate .. //depot/projects/dtrace/src/bin/sh/sh.1#3 integrate .. //depot/projects/dtrace/src/bin/test/test.1#3 integrate .. //depot/projects/dtrace/src/etc/rc.d/ipfw#3 integrate .. //depot/projects/dtrace/src/etc/rc.d/mdconfig#2 integrate .. //depot/projects/dtrace/src/etc/rc.d/mdconfig2#2 integrate .. //depot/projects/dtrace/src/etc/rc.d/natd#3 integrate .. //depot/projects/dtrace/src/etc/rc.subr#7 integrate .. //depot/projects/dtrace/src/gnu/usr.bin/binutils/ld/Makefile.alpha#3 integrate .. //depot/projects/dtrace/src/gnu/usr.bin/binutils/ld/Makefile.amd64#3 integrate .. //depot/projects/dtrace/src/gnu/usr.bin/binutils/ld/Makefile.arm#1 branch .. //depot/projects/dtrace/src/gnu/usr.bin/binutils/ld/Makefile.i386#3 integrate .. //depot/projects/dtrace/src/gnu/usr.bin/binutils/ld/Makefile.ia64#3 integrate .. //depot/projects/dtrace/src/gnu/usr.bin/binutils/libbfd/Makefile.arm#1 branch .. //depot/projects/dtrace/src/gnu/usr.bin/binutils/libopcodes/Makefile.arm#1 branch .. //depot/projects/dtrace/src/gnu/usr.bin/cc/cc_tools/auto-host.h#3 integrate .. //depot/projects/dtrace/src/gnu/usr.bin/gdb/kgdb/trgt_arm.c#1 branch .. //depot/projects/dtrace/src/lib/libc/gen/tls.c#3 integrate .. //depot/projects/dtrace/src/lib/libc/net/Makefile.inc#4 integrate .. //depot/projects/dtrace/src/lib/libc/net/getaddrinfo.c#5 integrate .. //depot/projects/dtrace/src/lib/libc/net/name6.c#5 integrate .. //depot/projects/dtrace/src/lib/libc/stdlib/malloc.c#5 integrate .. //depot/projects/dtrace/src/lib/libc/sys/Symbol.map#2 integrate .. //depot/projects/dtrace/src/lib/libfetch/Makefile#3 integrate .. //depot/projects/dtrace/src/lib/libftpio/Makefile#3 integrate .. //depot/projects/dtrace/src/lib/libkvm/kvm_proc.c#4 integrate .. //depot/projects/dtrace/src/lib/libmemstat/memstat.h#4 integrate .. //depot/projects/dtrace/src/lib/libthr/pthread.map#4 integrate .. //depot/projects/dtrace/src/lib/libthr/thread/thr_init.c#6 integrate .. //depot/projects/dtrace/src/lib/libthr/thread/thr_sig.c#3 integrate .. //depot/projects/dtrace/src/lib/libthr/thread/thr_syscalls.c#3 integrate .. //depot/projects/dtrace/src/lib/libutil/Makefile#4 integrate .. //depot/projects/dtrace/src/libexec/rlogind/Makefile#3 integrate .. //depot/projects/dtrace/src/libexec/telnetd/Makefile#3 integrate .. //depot/projects/dtrace/src/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml#6 integrate .. //depot/projects/dtrace/src/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#13 integrate .. //depot/projects/dtrace/src/release/doc/share/misc/dev.archlist.txt#6 integrate .. //depot/projects/dtrace/src/rescue/librescue/Makefile#3 integrate .. //depot/projects/dtrace/src/sbin/Makefile#5 integrate .. //depot/projects/dtrace/src/sbin/ifconfig/ifconfig.8#3 integrate .. //depot/projects/dtrace/src/sbin/ifconfig/ifieee80211.c#3 integrate .. //depot/projects/dtrace/src/sbin/ipfw/ipfw.8#5 integrate .. //depot/projects/dtrace/src/sbin/ping6/Makefile#3 integrate .. //depot/projects/dtrace/src/sbin/route/Makefile#3 integrate .. //depot/projects/dtrace/src/sbin/rtsol/Makefile#3 integrate .. //depot/projects/dtrace/src/sbin/setkey/Makefile#3 integrate .. //depot/projects/dtrace/src/sbin/sysctl/sysctl.c#3 integrate .. //depot/projects/dtrace/src/share/man/man4/Makefile#11 integrate .. //depot/projects/dtrace/src/share/man/man4/acpi_thermal.4#3 integrate .. //depot/projects/dtrace/src/share/man/man4/altq.4#6 integrate .. //depot/projects/dtrace/src/share/man/man4/enc.4#2 integrate .. //depot/projects/dtrace/src/share/man/man4/miibus.4#4 integrate .. //depot/projects/dtrace/src/share/man/man4/polling.4#4 integrate .. //depot/projects/dtrace/src/share/man/man4/stge.4#1 branch .. //depot/projects/dtrace/src/share/man/man4/vlan.4#3 integrate .. //depot/projects/dtrace/src/share/man/man5/rc.conf.5#9 integrate .. //depot/projects/dtrace/src/share/man/man8/rc.subr.8#4 integrate .. //depot/projects/dtrace/src/share/man/man9/mbuf.9#3 integrate .. //depot/projects/dtrace/src/share/misc/bsd-family-tree#5 integrate .. //depot/projects/dtrace/src/sys/amd64/amd64/machdep.c#5 integrate .. //depot/projects/dtrace/src/sys/amd64/amd64/trap.c#4 integrate .. //depot/projects/dtrace/src/sys/amd64/amd64/vm_machdep.c#3 integrate .. //depot/projects/dtrace/src/sys/amd64/ia32/ia32_syscall.c#3 integrate .. //depot/projects/dtrace/src/sys/arm/arm/trap.c#4 integrate .. //depot/projects/dtrace/src/sys/arm/at91/kb920x_machdep.c#7 integrate .. //depot/projects/dtrace/src/sys/arm/include/db_machdep.h#3 integrate .. //depot/projects/dtrace/src/sys/arm/xscale/i80321/i80321.c#3 integrate .. //depot/projects/dtrace/src/sys/arm/xscale/i80321/iq80321.c#5 integrate .. //depot/projects/dtrace/src/sys/boot/forth/loader.conf#4 integrate .. //depot/projects/dtrace/src/sys/compat/svr4/svr4_stream.c#5 integrate .. //depot/projects/dtrace/src/sys/conf/Makefile.arm#5 integrate .. //depot/projects/dtrace/src/sys/conf/NOTES#13 integrate .. //depot/projects/dtrace/src/sys/conf/files#23 integrate .. //depot/projects/dtrace/src/sys/conf/files.i386#10 integrate .. //depot/projects/dtrace/src/sys/conf/files.powerpc#4 integrate .. //depot/projects/dtrace/src/sys/crypto/via/padlock.c#7 integrate .. //depot/projects/dtrace/src/sys/crypto/via/padlock.h#1 branch .. //depot/projects/dtrace/src/sys/crypto/via/padlock_cipher.c#1 branch .. //depot/projects/dtrace/src/sys/crypto/via/padlock_hash.c#1 branch .. //depot/projects/dtrace/src/sys/dev/acpica/acpi_thermal.c#3 integrate .. //depot/projects/dtrace/src/sys/dev/ata/ata-chipset.c#5 integrate .. //depot/projects/dtrace/src/sys/dev/ata/ata-pci.h#4 integrate .. //depot/projects/dtrace/src/sys/dev/ath/ath_rate/sample/sample.h#3 integrate .. //depot/projects/dtrace/src/sys/dev/ath/if_ath.c#8 integrate .. //depot/projects/dtrace/src/sys/dev/em/if_em.c#6 integrate .. //depot/projects/dtrace/src/sys/dev/iwi/if_iwi.c#6 integrate .. //depot/projects/dtrace/src/sys/dev/kbdmux/kbdmux.c#3 integrate .. //depot/projects/dtrace/src/sys/dev/mii/gentbi.c#1 branch .. //depot/projects/dtrace/src/sys/dev/mii/ip1000phy.c#1 branch .. //depot/projects/dtrace/src/sys/dev/mii/ip1000phyreg.h#1 branch .. //depot/projects/dtrace/src/sys/dev/mii/miidevs#4 integrate .. //depot/projects/dtrace/src/sys/dev/mpt/mpt_cam.c#13 integrate .. //depot/projects/dtrace/src/sys/dev/mpt/mpt_pci.c#11 integrate .. //depot/projects/dtrace/src/sys/dev/ral/rt2560.c#4 integrate .. //depot/projects/dtrace/src/sys/dev/scc/scc_core.c#2 integrate .. //depot/projects/dtrace/src/sys/dev/scc/scc_dev_z8530.c#2 integrate .. //depot/projects/dtrace/src/sys/dev/sk/if_sk.c#7 integrate .. //depot/projects/dtrace/src/sys/dev/sk/if_skreg.h#6 integrate .. //depot/projects/dtrace/src/sys/dev/stge/if_stge.c#1 branch .. //depot/projects/dtrace/src/sys/dev/stge/if_stgereg.h#1 branch .. //depot/projects/dtrace/src/sys/dev/uart/uart_cpu_powerpc.c#2 integrate .. //depot/projects/dtrace/src/sys/dev/uart/uart_dev_z8530.c#4 integrate .. //depot/projects/dtrace/src/sys/dev/uart/uart_tty.c#3 integrate .. //depot/projects/dtrace/src/sys/dev/usb/if_ural.c#6 integrate .. //depot/projects/dtrace/src/sys/dev/usb/uplcom.c#3 integrate .. //depot/projects/dtrace/src/sys/dev/usb/usbdevs#5 integrate .. //depot/projects/dtrace/src/sys/fs/udf/ecma167-udf.h#3 integrate .. //depot/projects/dtrace/src/sys/fs/udf/udf_vfsops.c#4 integrate .. //depot/projects/dtrace/src/sys/geom/eli/g_eli.c#5 integrate .. //depot/projects/dtrace/src/sys/geom/eli/g_eli_integrity.c#2 integrate .. //depot/projects/dtrace/src/sys/i386/conf/GENERIC#13 integrate .. //depot/projects/dtrace/src/sys/i386/i386/machdep.c#6 integrate .. //depot/projects/dtrace/src/sys/i386/i386/trap.c#9 integrate .. //depot/projects/dtrace/src/sys/ia64/ia32/ia32_trap.c#3 integrate .. //depot/projects/dtrace/src/sys/ia64/ia64/trap.c#5 integrate .. //depot/projects/dtrace/src/sys/kern/kern_malloc.c#3 integrate .. //depot/projects/dtrace/src/sys/kern/kern_mutex.c#7 integrate .. //depot/projects/dtrace/src/sys/kern/kern_rwlock.c#4 integrate .. //depot/projects/dtrace/src/sys/kern/kern_sx.c#3 integrate .. //depot/projects/dtrace/src/sys/kern/subr_acl_posix1e.c#2 integrate .. //depot/projects/dtrace/src/sys/kern/sys_socket.c#3 integrate .. //depot/projects/dtrace/src/sys/kern/uipc_domain.c#5 integrate .. //depot/projects/dtrace/src/sys/kern/uipc_sockbuf.c#1 branch .. //depot/projects/dtrace/src/sys/kern/uipc_socket.c#7 integrate .. //depot/projects/dtrace/src/sys/kern/uipc_socket2.c#6 integrate .. //depot/projects/dtrace/src/sys/kern/uipc_syscalls.c#7 integrate .. //depot/projects/dtrace/src/sys/kern/uipc_usrreq.c#8 integrate .. //depot/projects/dtrace/src/sys/kern/vfs_syscalls.c#6 integrate .. //depot/projects/dtrace/src/sys/modules/Makefile#13 integrate .. //depot/projects/dtrace/src/sys/modules/agp/Makefile#3 integrate .. //depot/projects/dtrace/src/sys/modules/asr/Makefile#3 integrate .. //depot/projects/dtrace/src/sys/modules/bridgestp/Makefile#1 branch .. //depot/projects/dtrace/src/sys/modules/hwpmc/Makefile#3 integrate .. //depot/projects/dtrace/src/sys/modules/if_bridge/Makefile#3 integrate .. //depot/projects/dtrace/src/sys/modules/mii/Makefile#3 integrate .. //depot/projects/dtrace/src/sys/modules/osf1/Makefile#3 delete .. //depot/projects/dtrace/src/sys/modules/padlock/Makefile#3 integrate .. //depot/projects/dtrace/src/sys/modules/stge/Makefile#1 branch .. //depot/projects/dtrace/src/sys/net/bpf.c#7 integrate .. //depot/projects/dtrace/src/sys/net/bridgestp.c#3 integrate .. //depot/projects/dtrace/src/sys/net/bridgestp.h#1 branch .. //depot/projects/dtrace/src/sys/net/if_bridge.c#8 integrate .. //depot/projects/dtrace/src/sys/net/if_bridgevar.h#3 integrate .. //depot/projects/dtrace/src/sys/net/if_enc.c#4 integrate .. //depot/projects/dtrace/src/sys/net/if_ethersubr.c#3 integrate .. //depot/projects/dtrace/src/sys/net/if_gif.c#5 integrate .. //depot/projects/dtrace/src/sys/net80211/ieee80211.c#4 integrate .. //depot/projects/dtrace/src/sys/net80211/ieee80211.h#3 integrate .. //depot/projects/dtrace/src/sys/net80211/ieee80211_freebsd.h#3 integrate .. //depot/projects/dtrace/src/sys/net80211/ieee80211_ioctl.c#4 integrate .. //depot/projects/dtrace/src/sys/net80211/ieee80211_ioctl.h#3 integrate .. //depot/projects/dtrace/src/sys/net80211/ieee80211_output.c#3 integrate .. //depot/projects/dtrace/src/sys/net80211/ieee80211_proto.c#3 integrate .. //depot/projects/dtrace/src/sys/net80211/ieee80211_proto.h#3 integrate .. //depot/projects/dtrace/src/sys/net80211/ieee80211_var.h#3 integrate .. //depot/projects/dtrace/src/sys/netgraph/bluetooth/socket/ng_btsocket_rfcomm.c#4 integrate .. //depot/projects/dtrace/src/sys/netgraph/ng_ether.c#3 integrate .. //depot/projects/dtrace/src/sys/netgraph/ng_ksocket.c#3 integrate .. //depot/projects/dtrace/src/sys/netinet6/README#3 delete .. //depot/projects/dtrace/src/sys/netinet6/icmp6.c#3 integrate .. //depot/projects/dtrace/src/sys/netipsec/keysock.c#4 integrate .. //depot/projects/dtrace/src/sys/netncp/ncp_sock.c#3 integrate .. //depot/projects/dtrace/src/sys/netsmb/smb_trantcp.c#3 integrate .. //depot/projects/dtrace/src/sys/nfsclient/nfs_socket.c#6 integrate .. //depot/projects/dtrace/src/sys/nfsserver/nfs_srvsock.c#3 integrate .. //depot/projects/dtrace/src/sys/powerpc/conf/GENERIC#3 integrate .. //depot/projects/dtrace/src/sys/powerpc/conf/NOTES#3 integrate .. //depot/projects/dtrace/src/sys/powerpc/include/md_var.h#3 integrate .. //depot/projects/dtrace/src/sys/powerpc/include/ofw_machdep.h#3 integrate .. //depot/projects/dtrace/src/sys/powerpc/include/pcb.h#3 integrate .. //depot/projects/dtrace/src/sys/powerpc/powerpc/clock.c#5 integrate .. //depot/projects/dtrace/src/sys/powerpc/powerpc/mem.c#3 integrate .. //depot/projects/dtrace/src/sys/powerpc/powerpc/ofw_machdep.c#3 integrate .. //depot/projects/dtrace/src/sys/powerpc/powerpc/trap.c#3 integrate .. //depot/projects/dtrace/src/sys/powerpc/psim/sio_iobus.c#3 delete .. //depot/projects/dtrace/src/sys/powerpc/psim/uart_iobus.c#1 branch .. //depot/projects/dtrace/src/sys/sparc64/conf/GENERIC#7 integrate .. //depot/projects/dtrace/src/sys/sparc64/sparc64/trap.c#4 integrate .. //depot/projects/dtrace/src/sys/sys/_label.h#3 integrate .. //depot/projects/dtrace/src/sys/sys/bufobj.h#4 integrate .. //depot/projects/dtrace/src/sys/sys/extattr.h#3 integrate .. //depot/projects/dtrace/src/sys/sys/mbuf.h#4 integrate .. //depot/projects/dtrace/src/sys/sys/mutex.h#4 integrate .. //depot/projects/dtrace/src/sys/sys/protosw.h#6 integrate .. //depot/projects/dtrace/src/sys/sys/socket.h#3 integrate .. //depot/projects/dtrace/src/sys/sys/socketvar.h#3 integrate .. //depot/projects/dtrace/src/sys/sys/syscallsubr.h#5 integrate .. //depot/projects/dtrace/src/sys/sys/unpcb.h#3 integrate .. //depot/projects/dtrace/src/sys/vm/vm_object.c#4 integrate .. //depot/projects/dtrace/src/tools/tools/nanobsd/FlashDevice.sub#4 integrate .. //depot/projects/dtrace/src/usr.bin/enigma/enigma.c#3 integrate .. //depot/projects/dtrace/src/usr.bin/ftp/Makefile#3 integrate .. //depot/projects/dtrace/src/usr.bin/logger/Makefile#3 integrate .. //depot/projects/dtrace/src/usr.bin/make/parse.c#3 integrate .. //depot/projects/dtrace/src/usr.bin/rpcinfo/Makefile#3 integrate .. //depot/projects/dtrace/src/usr.bin/systat/Makefile#3 integrate .. //depot/projects/dtrace/src/usr.bin/systat/mbufs.c#4 integrate .. //depot/projects/dtrace/src/usr.bin/telnet/Makefile#3 integrate .. //depot/projects/dtrace/src/usr.bin/truss/i386-fbsd.c#4 integrate .. //depot/projects/dtrace/src/usr.sbin/Makefile#6 integrate .. //depot/projects/dtrace/src/usr.sbin/inetd/Makefile#4 integrate .. //depot/projects/dtrace/src/usr.sbin/lpr/Makefile.inc#3 integrate .. //depot/projects/dtrace/src/usr.sbin/mld6query/Makefile#3 integrate .. //depot/projects/dtrace/src/usr.sbin/ndp/Makefile#3 integrate .. //depot/projects/dtrace/src/usr.sbin/rip6query/Makefile#3 integrate .. //depot/projects/dtrace/src/usr.sbin/route6d/Makefile#3 integrate .. //depot/projects/dtrace/src/usr.sbin/rrenumd/Makefile#3 integrate .. //depot/projects/dtrace/src/usr.sbin/rtadvd/Makefile#3 integrate .. //depot/projects/dtrace/src/usr.sbin/rtsold/Makefile#3 integrate .. //depot/projects/dtrace/src/usr.sbin/sysinstall/devices.c#3 integrate .. //depot/projects/dtrace/src/usr.sbin/syslogd/Makefile#3 integrate .. //depot/projects/dtrace/src/usr.sbin/traceroute6/Makefile#3 integrate .. //depot/projects/dtrace/src/usr.sbin/trpt/Makefile#3 integrate .. //depot/projects/dtrace/src/usr.sbin/trpt/trpt.c#3 integrate .. //depot/projects/dtrace/www/de/docs/books.sgml#4 integrate .. //depot/projects/dtrace/www/de/news/news.xml#10 integrate .. //depot/projects/dtrace/www/de/news/press.xml#8 integrate .. //depot/projects/dtrace/www/de/platforms/alpha.sgml#2 integrate .. //depot/projects/dtrace/www/en/cgi/Makefile#2 integrate .. //depot/projects/dtrace/www/en/cgi/cgi-style.pl#3 integrate .. //depot/projects/dtrace/www/en/cgi/gallery.cgi#2 delete .. //depot/projects/dtrace/www/en/docs/books.sgml#3 integrate .. //depot/projects/dtrace/www/en/gnome/news.xml#5 integrate .. //depot/projects/dtrace/www/en/projects/ideas/index.sgml#11 integrate .. //depot/projects/dtrace/www/en/prstats/Makefile#2 integrate .. //depot/projects/dtrace/www/en/prstats/index.sgml#2 integrate .. //depot/projects/dtrace/www/en/smp/index.sgml#3 integrate .. //depot/projects/dtrace/www/en/snapshots/index.sgml#6 integrate .. //depot/projects/dtrace/www/fr/prstats/Makefile#2 integrate .. //depot/projects/dtrace/www/fr/prstats/index.sgml#2 integrate .. //depot/projects/dtrace/www/ja/prstats/Makefile#2 integrate .. //depot/projects/dtrace/www/share/sgml/includes.header.xsl#3 integrate .. //depot/projects/dtrace/www/share/sgml/usergroups.xml#6 integrate Differences ... ==== //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml#17 (text+ko) ==== @@ -1,4 +1,4 @@ - + UIDs and GIDs + The current list of reserved UIDs and GIDs can be found + in ports/UIDs and + ports/GIDs. + If your port requires a certain user to be on the installed system, let the pkg-install script call pw to create it automatically. Look at - net/cvsup-mirror for an example. + net/cvsup-mirror for an example. + Please note that this is strongly discouraged, please register + user/group ID numbers as stated below. If your port must use the same user/group ID number when it is installed as a binary package as when it was compiled, then you must - choose a free UID from 50 to 999 and register it below. Look at + choose a free UID from 50 to 999 and register it either in + ports/UIDs (for users) or in + ports/GIDs (for groups). Look at japanese/Wnn6 for an example. Make sure you do not use a UID already used by the system or other ports. - This is the current list of UIDs between 50 and 999. - - - bind:*:53:53:Bind Sandbox:/:/sbin/nologin -majordom:*:54:54:Majordomo Pseudo User:/usr/local/majordomo:/nonexistent -rdfdb:*:55:55:rdfDB Daemon:/var/db/rdfdb:/bin/sh -spamd:*:58:58:SpamAssassin user:/var/spool/spamd:/sbin/nologin -cyrus:*:60:60:the cyrus mail server:/nonexistent:/nonexistent -gnats:*:61:1:GNATS database owner:/usr/local/share/gnats/gnats-db:/bin/sh -proxy:*:62:62:Packet Filter pseudo-user:/nonexistent:/nonexistent -uucp:*:66:66:UUCP pseudo-user:/var/spool/uucppublic:/usr/libexec/uucp/uucico -xten:*:67:67:X-10 daemon:/usr/local/xten:/nonexistent -pop:*:68:6:Post Office Owner (popper):/nonexistent:/sbin/nologin -wnn:*:69:7:Wnn:/nonexistent:/nonexistent -pgsql:*:70:70:PostgreSQL pseudo-user:/usr/local/pgsql:/bin/sh -oracle:*:71:71::0:0:Oracle:/usr/local/oracle7:/sbin/nologin -ircd:*:72:72:IRC daemon:/nonexistent:/nonexistent -ircservices:*:73:73:IRC services:/nonexistent:/nonexistent -simscan:*:74:74:Simscan User:/nonexistent:/sbin/nologin -ifmail:*:75:66:Ifmail user:/nonexistent:/nonexistent -www:*:80:80:World Wide Web Owner:/nonexistent:/sbin/nologin -alias:*:81:81:QMail user:/var/qmail/alias:/nonexistent -qmaild:*:82:81:QMail user:/var/qmail:/nonexistent -qmaill:*:83:81:QMail user:/var/qmail:/nonexistent -qmailp:*:84:81:QMail user:/var/qmail:/nonexistent -qmailq:*:85:82:QMail user:/var/qmail:/nonexistent -qmailr:*:86:82:QMail user:/var/qmail:/nonexistent -qmails:*:87:82:QMail user:/var/qmail:/nonexistent -mysql:*:88:88:MySQL Daemon:/var/db/mysql:/sbin/nologin -vpopmail:*:89:89:VPop Mail User:/usr/local/vpopmail:/nonexistent -firebird:*:90:90:Firebird Database Administrator:/usr/local/firebird:/bin/sh -mailman:*:91:91:Mailman User:/usr/local/mailman:/sbin/nologin -gdm:*:92:92:GDM Sandbox:/:/sbin/nologin -jabber:*:93:93:Jabber Daemon:/nonexistent:/nonexistent -p4admin:*:94:94:Perforce admin:/usr/local/perforce:/sbin/nologin -interch:*:95:95:Interchange user:/usr/local/interchange:/sbin/nologin -squeuer:*:96:96:SQueuer Owner:/nonexistent:/bin/sh -mud:*:97:97:MUD Owner:/nonexistent:/bin/sh -msql:*:98:98:mSQL-2 pseudo-user:/var/db/msqldb:/bin/sh -rscsi:*:99:99:Remote SCSI:/usr/local/rscsi:/usr/local/sbin/rscsi -squid:*:100:100:squid caching-proxy pseudo user:/usr/local/squid:/sbin/nologin -quagga:*:101:101:Quagga route daemon pseudo user:/usr/local/etc/quagga:/sbin/nologin -ganglia:*:102:102:Ganglia User:/nonexistent:/sbin/nologin -sgeadmin:*:103:103:Sun Grid Engine Admin:/nonexistent:/sbin/nologin -slimserv:*:104:104:Slim Devices SlimServer pseudo-user:/nonexistent:/sbin/nologin -dnetc:*:105:105:distributed.net client and proxy pseudo-user:/nonexistent:/sbin/nologin -clamav:*:106:106:Clamav Antivirus:/nonexistent:/sbin/nologin -cacti:*:107:107:Cacti Sandbox:/nonexistent:/sbin/nologin -webkit:*:108:108:WebKit Default User:/usr/local/www/webkit:/bin/sh -quickml:*:109:109:quickml Server:/nonexistent:/sbin/nologin -vscan:*:110:110:Scanning Virus Account:/var/amavis:/bin/sh -fido:*:111:111:Fido System:/usr/local/fido:/bin/sh -dcc:*:112:112:Distributed Checksum Clearinghouse:/nonexistent:/sbin/nologin -amavis:*:113:113:Amavis-stats Account:/nonexistent:/sbin/nologin -dhis:*:114:114:DHIS Daemon:/nonexistent:/sbin/nologin -_symon:*:115:115:Symon Account:/var/empty:/sbin/nologin -hplip:*:116:116:HPLIP Server:/nonexistent:/sbin/nologin -postfix:*:125:125:Postfix Mail System:/var/spool/postfix:/sbin/nologin -_bgpd:*:130:130:BGP Daemon:/var/empty:/sbin/nologin -_ospfd:*:131:131:OSPF Daemon:/var/empty:/sbin/nologin -rbldns:*:153:153:rbldnsd pseudo-user:/nonexistent:/sbin/nologin -sfs:*:171:171:Self-Certifying File System:/nonexistent:/sbin/nologin -agk:*:172:172:AquaGateKeeper:/nonexistent:/nonexistent -polipo:*:173:173:polipo web cache:/nonexistent:/sbin/nologin -bogomilter:*:174:174:milter-bogom:/nonexistent:/sbin/nologin -moinmoin:*:192:192:MoinMoin User:/nonexistent:/sbin/nologin -sympa:*:200:200:Sympa Owner:/nonexistent:/sbin/nologin -privoxy:*:201:201:Privoxy proxy user:/nonexistent:/sbin/nologin -dspam:*:202:202:Dspam:/nonexistent:/sbin/nologin -shoutcast:*:210:210:Shoutcast sandbox:/nonexistent:/bin/sh -_tor:*:256:256:Tor anonymising router:/var/db/tor:/bin/sh -smxs:*:260:260:Sendmail X SMTPS:/nonexistent:/sbin/nologin -smxq:*:261:261:Sendmail X QMGR:/nonexistent:/sbin/nologin -smxc:*:262:262:Sendmail X SMTPC:/nonexistent:/sbin/nologin -smxm:*:263:263:Sendmail X misc:/nonexistent:/sbin/nologin -smx:*:264:264:Sendmail X other:/nonexistent:/sbin/nologin -mrtg:*:279:279:MRTG daemon:/nonexistent:/sbin/nologin -ldap:*:389:389:OpenLDAP Server:/nonexistent:/sbin/nologin -drweb:*:426:426:Dr.Web Mail Scanner:/nonexistent:/sbin/nologin -courier:*:465:465:Courier Mail Server:/nonexistent:/sbin/nologin -_bbstored:*:505:505::0:0:BoxBackup Store Daemon:/nonexistent:/bin/sh -ejabberd:*:544:544::0:0:ejabberd pseudo user:/var/spool/ejabberd:/bin/sh -qtss:*:554:554:Darwin Streaming Server:/nonexistent:/sbin/nologin -ircdru:*:555:555:Russian hybrid IRC server:/nonexistent:/bin/sh -messagebus:*:556:556:D-BUS Daemon User:/nonexistent:/sbin/nologin -avahi:*:558:558:Avahi Daemon User:/nonexistent:/sbin/nologin -bnetd:*:700:700:Bnetd user:/nonexistent:/sbin/nologin -bopm:*:717:717:Blitzed Open Proxy Monitor:/nonexistent:/bin/sh -openxpki:*:777:777:OpenXPKI Owner:/nonexistent:/usr/sbin/nologin -bacula:*:910:910:Bacula Daemon:/var/db/bacula:/sbin/nologin - - This is the current list of reserved GIDs. - - - - bind:*:53: -rdfdb:*:55: -spamd:*:58: -cyrus:*:60: -proxy:*:62: -authpf:*:63: -uucp:*:66: -xten:*:67: -dialer:*:68: -network:*:69: -pgsql:*:70: -simscan:*:74: -audit:*:77: -www:*:80: -qnofiles:*:81: -qmail:*:82: -mysql:*:88: -vpopmail:*:89: -firebird:*:90: -mailman:*:91: -gdm:*:92: -jabber:*:93: -p4admin:*:94: -interch:*:95: -squeuer:*:96: -mud:*:97: -msql:*:98: -rscsi:*:99: -squid:*:100: -quagga:*:101: -ganglia:*:102: -sgeadmin:*:103: -slimserv:*:104: -dnetc:*:105: -clamav:*:106: -cacti:*:107: -webkit:*:108: -quickml:*:109: -vscan:*:110: -fido:*:111: -dcc:*:112: -amavis:*:113: -dhis:*:114: -_symon:*:115: -postfix:*:125: -maildrop:*:126: -_bgpd:*:130: -_ospfd:*:131: -rbldns:*:153: -sfs:*:171: -agk:*:172: -polipo:*:173: -moinmoin:*:192: -sympa:*:200: -dspam:*:202: -_tor:*:256: -smxs:*:260: -smxq:*:261: -smxc:*:262: -smxm:*:263: -smx:*:264: -mrtg:*:279: -ldap:*:389: -drweb:*:426: -courier:*:465: -_bbstored:*:505: -ejabberd:*:544: -qtss:*:554: -ircdru:*:555: -messagebus:*:556: -realtime:*:557: -avahi:*:558: -bnetd:*:700: -bopm:*:717: -openxpki:*:777: -bacula:*:910: - - Please include a notice when you submit a port (or an upgrade) - that reserves a new UID or GID in this range. This allows us to - keep the list of reserved IDs up to date. + Please include a patch against these two files when you + require a new user or group to be created for your + port. ==== //depot/projects/dtrace/doc/share/sgml/man-refs.ent#10 (text+ko) ==== @@ -20,7 +20,7 @@ lexicographical order by the entity (i.e., the dots used in place of special characters should not be expanded when comparing). - $FreeBSD: doc/share/sgml/man-refs.ent,v 1.390 2006/06/25 15:07:09 marck Exp $ + $FreeBSD: doc/share/sgml/man-refs.ent,v 1.393 2006/07/25 15:38:35 bmah Exp $ --> @@ -3304,6 +3304,7 @@ + @@ -3505,6 +3506,7 @@ + @@ -3601,6 +3603,7 @@ + @@ -3633,6 +3636,7 @@ + @@ -3891,6 +3895,7 @@ + ==== //depot/projects/dtrace/doc/zh_TW.Big5/books/developers-handbook/book.sgml#2 (text+ko) ==== @@ -1,7 +1,8 @@ FreeBSD Developers' Handbook - The FreeBSD Documentation Project + FreeBSD ¤å¥ó­pµe August 2000 @@ -46,25 +47,25 @@ - Welcome to the Developers' Handbook. This manual is a - work in progress and is the work of many - individuals. Many sections do not yet exist and some of those - that do exist need to be updated. If you are interested in - helping with this project, send email to the &a.doc;. - - The latest version of this document is always available - from the FreeBSD World - Wide Web server. It may also be downloaded in a - variety of formats and compression options from the FreeBSD FTP - server or one of the numerous mirror - sites. + + Åwªï¨Ï¥Î Developers' Handbook¡I + ³o¥÷¤å¥ó¬O¥Ñ³\¦h¤H ¤£Â_¼¶¼g ¦Ó¦¨ªº¡A + ¦Ó¥B³\¦h³¹¸`¤´»Ý§ó·s©ÎªÌ¤º®eÁÙ¬O¤@¤ùªÅ¥Õ¡A + ¦pªG§A·QÀ°¦£ FreeBSD ¤å¥ó­p¹º¡A + ½Ð±H«H¨ì &a.doc;¡C + + + + ³Ì·sª©ªº¤å¥ó³£¦b FreeBSD ©xºô ¤W­±¡A + ¤]¥i±q FreeBSD FTP server ¤U¸ü¤£¦P®æ¦¡ªº¸ê®Æ¡C + ·íµM¤]¥i¥H¦b¨ä¥Lªº mirror¯¸¤U¸ü¡C + + - Basics + °ò¥»·§©À &chap.introduction; &chap.tools; @@ -75,7 +76,7 @@ - Interprocess Communication + Interprocess Communication(IPC) &chap.sockets; &chap.ipv6; @@ -83,7 +84,7 @@ - Kernel + Kernel(®Ö¤ß) &chap.dma; &chap.kerneldebug; @@ -91,14 +92,14 @@ - Architectures + Architectures(¹q¸£¬[ºc) &chap.x86; - Appendices + ªþ¿ý ==== //depot/projects/dtrace/doc/zh_TW.Big5/books/developers-handbook/introduction/chapter.sgml#2 (text+ko) ==== @@ -1,7 +1,8 @@ @@ -18,83 +19,65 @@ - Introduction + ²¤¶ - Developing on FreeBSD + ¦b FreeBSD ¶}µoµ{¦¡ + ¦n¤F§Ú­Ì¶}©l§a¡I§Ú·Q§Aªº FreeBSD ¤w¸g¦w¸Ë¦n¤F¡A¦Ó¥B¤w¸g·Ç³Æ¦n­n¥Î¥¦¼gÂIµ{¦¡¤F§a¡H + ¦ý¬O­n±q­þ¸Ì¶}©l©O¡H&os; ¦³´£¨Ñ¼gµ{¦¡ªºµ{¦¡©ÎÀô¹Ò¶Ü¡H + ¨­¬° programer ªº§Ú¥i¥H°µ¤°»ò©O¡H - So here we are. System all installed and you are ready to - start programming. But where to start? What does FreeBSD - provide? What can it do for me, as a programmer? - - These are some questions which this chapter tries to answer. - Of course, programming has different levels of proficiency like - any other trade. For some it is a hobby, for others it is their - profession. The information in this chapter might be aimed - toward the beginning programmer; indeed, it could serve useful - for the programmer unfamiliar with the &os; platform. - + ¥»³¹¸ÕµÛ¦^µª§A¤@¨Ç°ÝÃD¡A·íµM¡A³æ´N programming µ{«×¨Ó»¡¥i¤À«Ü¦hºØ¼h¦¸¡A + ¦³ªº¤H¥u¬O³æ¯Â·í¿³½ì¡A¦³ªº«h¬O¥Lªº±M·~¡A + ¥»³¹¥D­n¤º®e¬O°w¹ïµ{¦¡ªì¾ÇªÌ¡A + ·íµM¡A¹ï©ó¨º¨Ç¤£¼ô &os; ªºµ{¦¡¶}µoªÌ¦Ó¨¥¡A¥»¤å¥ó¤º®e¤]¬O¤Q¤À¹ê¥Îªº¡C The BSD Vision - To produce the best &unix; like operating system package - possible, with due respect to the original software tools - ideology as well as usability, performance and - stability. + ¬°¤FÅý§A¼g¥X¨Óªºµ{¦¡¦b &unix; like¨t²Î¤W¨ã¦³¨}¦nªº¨Ï¥Î©Ê¡B®Ä¯à©Mí©w©Ê¡A + §Ú­Ì¥²¶·¸ò§A¤¶²Ð¤@¨Çµ{¦¡·§©À(original software tools ideology)¡C - Architectural Guidelines + µ{¦¡¬[ºc«ü«n - Our ideology can be described by the following - guidelines + §Ú­Ì·Q¤¶²Ðªº·§©À¦p¤U - Do not add new functionality unless an - implementor cannot complete a real application without - it. + ¦b¾ã­Óµ{¦¡ÁÙ¨S¼g§¹«e¡A¤£­n¼W¥[·sªº¥\¯à¡C - It is as important to decide what a system is - not as to decide what it is. Do not serve all the world's - needs; rather, make the system extensible so that additional - needs can be met in an upwardly compatible - fashion. + ¥t¥~¤@­Ó­«ÂI´N¬O¡AÅý§A¦Û¤v¿ï¾Ü§Aªºµ{¦¡±N·|¨ã¦³¦óºØ¥\¯à¡A + ¦Ó¤£¬OÅý§O¤H¨M©w¡A¤£·Q­n¥hº¡¨¬¥þ¥@¬Éªº»Ý¨D¡A°£«D§A·QÅý§Aªºµ{¦¡¨ã¦³ÂX¥R©Ê©Î¬Û®e©Ê¡C - The only thing worse than generalizing from one - example is generalizing from no examples at - all. + ¤d¸U°O¦í¡G¦b¨S¦³¬ÛÃö¸gÅç®É¡A°Ñ¦Ò½d¨Òµ{¦¡½X©Ò¼g¥X¨Óªºµ{¦¡¡A + ·|¤ñ¦Û¤v¾ÌªÅ¼g¥X¨Óªº¦n¡C - If a problem is not completely understood, it is - probably best to provide no solution at all. + ·í§A¼gªºµ{¦¡¨S¿ìªk§¹¥þ¸Ñ¨M°ÝÃD®É¡A³Ì¦nªº¤èªk´N¬O¤£­n¸ÕµÛ­n¥h¸Ñ¨M¥¦¡C - If you can get 90 percent of the desired effect - for 10 percent of the work, use the simpler - solution. + ­Y¥Î 10% ªº¤ß¤O´N¯à»´ÃP§¹¦¨ 90% ªº¤u§@¥÷¶q¡A´N¥Î³o­Ó²³æªk¤l§a¡C - Isolate complexity as much as - possible. + ºÉ¥i¯à¦a²¤Æ°ÝÃDªº½ÆÂø¡C - Provide mechanism, rather than policy. In - particular, place user interface policy in the client's - hands. + ´£¨Ñ¾÷¨î(mechanism)¡A¦Ó«D­ì«h(policy)¡C + ¤ñ¤è»¡¡A§â¨Ï¥ÎªÌ¤¶­±¿ï¾ÜÅv¥æ¥Ñ¨Ï¥ÎªÌ¨Ó¨M©w¡C - From Scheifler & Gettys: "X Window System" + ¥H¤WºK¦Û Scheifler & Gettys ªº "X Window System" ½×¤å - The Layout of - <filename class="directory">/usr/src</filename> + <filename class="directory">/usr/src</filename> ªº¬[ºc - The complete source code to FreeBSD is available from our - public CVS repository. The source code is normally installed in - /usr/src which contains the - following subdirectories: + + §¹¾ãªº FreeBSD ­ì©l½X³£¦b¤½¶}ªº CVS repository ¤¤¡C + ³q±` FreeBSD ­ì©l½X³£·|¸Ë¦b /usr/src¡A + ¦Ó¥B¥]§t¤U¦C¤l¥Ø¿ý¡G + ==== //depot/projects/dtrace/doc/zh_TW.Big5/books/developers-handbook/tools/chapter.sgml#2 (text+ko) ==== @@ -1,7 +1,8 @@ @@ -19,127 +20,111 @@ - Programming Tools - Synopsis + µ{¦¡¶}µo¤u¨ã + ·§±Ô - This chapter is an introduction to using some of the - programming tools supplied with FreeBSD, although much of it - will be applicable to many other versions of &unix;. It does - not attempt to describe coding in any - detail. Most of the chapter assumes little or no previous - programming knowledge, although it is hoped that most - programmers will find something of value in it. + + ¥»³¹±N¤¶²Ð¦p¦ó¨Ï¥Î¤@¨Ç FreeBSD ©Ò´£¨Ñªºµ{¦¡¶}µo¤u¨ã(programing tools)¡A + ¥»³¹©Ò¤¶²Ðªº¤u¨ãµ{¦¡¦b¨ä¥Lª©¥»ªº &unix; ¤W¤]¥i¨Ï¥Î¡A + ¦b¦¹ ¨Ã¤£·| ¹Á¸Õ´y­z¼gµ{¦¡®Éªº¨C­Ó²Ó¸`¡A + ¥»³¹¤j³¡¤À½g´T³£¬O°²³]§A¥H«e¨S¦³©Î¥u¦³¤Ö¼Æªº¼gµ{¦¡¸gÅç¡A + ¤£¹L¡AÁÙ¬O§Æ±æ¤j¦h¼Æªºµ{¦¡¶}µo¤H­û³£¯à±q¤¤­«·s±o¨ì¤@¨Ç±Òµo¡C + - Introduction + ²¤¶ - FreeBSD offers an excellent development environment. - Compilers for C, C++, and Fortran and an assembler come with the - basic system, not to mention a Perl interpreter and classic &unix; - tools such as sed and awk. - If that is not enough, there are many more compilers and - interpreters in the Ports collection. FreeBSD is very - compatible with standards such as &posix; and - ANSI C, as well with its own BSD heritage, so - it is possible to write applications that will compile and run - with little or no modification on a wide range of - platforms. + + FreeBSD ´£¨Ñ¤@­Ó«D±`´Îªº¶}µoÀô¹Ò¡A + ¤ñ¦p»¡¹³¬O C¡BC++¡BFortran ©M assembler(²Õ¦X»y¨¥)ªº½sĶ¾¹(compiler), + ¦b FreeBSD ¤¤³£¤w¸g¥]§t¦b°ò¥»ªº¨t²Î¤¤¤F + §ó§O´£ Perl ©M¨ä¥L¼Ð·Ç &unix; ¤u¨ã¡A¹³¬Osed ¥H¤Î awk¡A + ¦pªG§AÁÙ¬Oı±o¤£°÷¡AFreeBSD¦b Ports collection ¤¤ÁÙ´£¨Ñ¨ä¥Lªº½sĶ¾¹©Mª½Ä¶¾¹(interpreter), + FreeBSD ¬Û®e³\¦h¼Ð·Ç¡A¹³¬O &posix; ©M ANSI C¡A + ·íµMÁÙ¦³¥¦©ÒÄ~©Óªº BSD ¶Ç²Î¡C + ©Ò¥H¦b FreeBSD ¤W¼gªºµ{¦¡¤£»Ý­×§ï©Î³»¦hµy·L­×§ï¡A´N¥i¥H¦b³\¦h¥­¥x¤W½sĶ¡B°õ¦æ¡C + - However, all this power can be rather overwhelming at first - if you have never written programs on a &unix; platform before. - This document aims to help you get up and running, without - getting too deeply into more advanced topics. The intention is - that this document should give you enough of the basics to be - able to make some sense of the documentation. + + µL½×¦p¦ó¡A´Nºâ§A±q¨Ó¨S¦b &unix; ¥­¥x¤W¼g¹Lµ{¦¡¡A¤]¥i¥H¹ý©³·P¨ü¨ìFreeBSD ¥O¤HµLªk§Ü©Úªº°g¤HÅ]¤O¡C + ¥»³¹ªº¥Ø¼Ð´N¬O¨ó§U§A§Ö³t¤W¤â¡A¦Ó¼È®É¤£»Ý²`¤J¤Ó¦h¶i¶¥¥DÃD¡A + ¨Ã¥BÁ¿¸Ñ¤@¨Ç°ò¦·§©À¡A¥HÅý§A¥i¥HÁA¸Ñ§Ú­Ì¦bÁ¿¨Ç¤°»ò¡C + - Most of the document requires little or no knowledge of - programming, although it does assume a basic competence with - using &unix; and a willingness to learn! + + ¥»³¹¤º®e¨Ã¤£­n¨D§A±o¦³µ{¦¡¶}µo¸gÅç¡A©ÎªÌ§A¥u¦³¤@ÂIÂIªº¸gÅç¦Ó¤w¡C + ¤£¹L¡A§Ú­Ì°²³]§A¤w¸g·| &unix; ¨t²Îªº°ò¥»¾Þ§@¡A + ¦Ó¥B§ó­«­nªº¬O¡A½Ð«O«ù¼Ö©ó¾Ç²ßªº¤ßºA¡I + - Introduction to Programming + Programming ·§©À - A program is a set of instructions that tell the computer to - do various things; sometimes the instruction it has to perform - depends on what happened when it performed a previous - instruction. This section gives an overview of the two main - ways in which you can give these instructions, or - commands as they are usually called. One way - uses an interpreter, the other a - compiler. As human languages are too - difficult for a computer to understand in an unambiguous way, - commands are usually written in one or other languages specially - designed for the purpose. + + ²³æªº»¡¡Aµ{¦¡¥u¬O¤@°ï«ü¥Oªº¶°¦XÅé¡F¦Ó³o¨Ç«ü¥O¬O¥Î¨Ó§i¶D¹q¸£À³¸Ó­n§@¨º¨Ç¨Æ±¡¡C + ¦³®É­Ô¡A«ü¥Oªº°õ¦æ¨ú¨M©ó«e¤@­Ó«ü¥Oªºµ²ªG¦Ó©w¡C + ¥»³¹±N·|§i¶D§A¦³ 2 ­Ó¥D­nªº¤èªk¡AÅý§A¥i¥H¹ï¹q¸£¤U¹F³o¨Ç«ü¥Ü(instruction) ©Î ©R¥O(commands)¡C + ²Ä¤@­Ó¤èªk´N¬O ª½Ä¶¾¹(interpreter)¡A + ¦Ó²Ä¤G­Ó¤èªk¬O ½sĶ¾¹(compiler)¡C + ¥Ñ©ó¹ï©ó¹q¸£¦Ó¨¥¡A¤HÃþ»y¨¥ªº»y·N¹L©ó¼Ò½k¦Ó¤ÓÃø²z¸Ñ¡A + ¦]¦¹©R¥O(commands)´N±`·|¥H¤@ºØ(©Î¦hºØ)µ{¦¡»y¨¥¼g¦¨¡A¥Î¨Ó«ü¥Ü¹q¸£©Ò­n°õ¦æªº¯S©w°Ê§@¬°¦ó¡C + - Interpreters + ª½Ä¶¾¹ - With an interpreter, the language comes as an environment, - where you type in commands at a prompt and the environment - executes them for you. For more complicated programs, you can - type the commands into a file and get the interpreter to load - the file and execute the commands in it. If anything goes - wrong, many interpreters will drop you into a debugger to help - you track down the problem. + + ¨Ï¥Îª½Ä¶¾¹®É¡A©Ò¨Ï¥Îªºµ{¦¡»y¨¥´N¹³Åܦ¨¤@­Ó·|©M§A¤¬°ÊªºÀô¹Ò¡C + ·í¦b©R¥O´£¥Ü¦C¤W¥´¤W©R¥O®É¡Aª½Ä¶¾¹·|§Y®É°õ¦æ¸Ó©R¥O¡C + ¦b¤ñ¸û½ÆÂøªºµ{¦¡¤¤¡A¥i¥H§â©Ò¦³·Q¤U¹Fªº©R¥O²Î²Î¿é¤J¨ì¬YÀɮ׸̭±¥h¡A + µM«á©I¥sª½Ä¶¾¹¥hŪ¨ú¸ÓÀɮסA¨Ã¥B°õ¦æ§A¼g¦b³o­ÓÀɮפ¤ªº«ü¥O¡C + ¦pªG©Ò¤Uªº«ü¥O¦³¿ù»~²£¥Í¡A¤j¦h¼Æªºª½Ä¶¾¹·|¶i¤J°»¿ù¼Ò¦¡(debugger)¡A + ¨Ã¥BÅã¥Ü¬ÛÃö¿ù»~°T®§¡A¥H«K¹ïµ{¦¡°£¿ù¡C + - The advantage of this is that you can see the results of - your commands immediately, and mistakes can be corrected - readily. The biggest disadvantage comes when you want to - share your programs with someone. They must have the same - interpreter, or you must have some way of giving it to them, - and they need to understand how to use it. Also users may not - appreciate being thrown into a debugger if they press the - wrong key! From a performance point of view, interpreters can - use up a lot of memory, and generally do not generate code as - efficiently as compilers. + + ³oºØ¤è¦¡¦n³B¦b©ó¡G¥i¥H¥ß¨è¬Ý¨ì«ü¥Oªº°õ¦æµ²ªG¡A¥H¤Î¿ù»~¤]¥i¨³³t­×¥¿¡C + ¬Û¹ïªº¡A³Ì¤jªºÃa³B«K¬O·í§A·Q§â§A¼gªºµ{¦¡¤À¨Éµ¹¨ä¥L¤H®É¡A³o¨Ç¤H¥²¶·­n¦³¸ò§A¤@¼Ëªºª½Ä¶¾¹¡C + ¦Ó¥B§O§Ñ¤F¡A¥L­Ì¤]­n·|¨Ï¥Îª½Ä¶¾¹ª½Ä¶µ{¦¡¤~¦æ¡C + ·íµM¨Ï¥ÎªÌ¤]¤£§Æ±æ¤£¤p¤ß«ö¿ùÁä¡A´N¶i¤J°»¿ù¼Ò¦¡¦Ó¤£ª¾©Ò±¹¡C + ´N°õ¦æ®Ä²v¦Ó¨¥¡Aª½Ä¶¾¹·|¨Ï¥Î¨ì«Ü¦hªº°O¾ÐÅé¡A + ¦Ó¥B³oÃþª½Ä¶¦¡µ{¦¡¡A³q±`¨Ã¤£·|¤ñ½sĶ¾¹©Ò½sĶªºµ{¦¡ªº§ó¦³®Ä²v¡C + - In my opinion, interpreted languages are the best way to - start if you have not done any programming before. This kind - of environment is typically found with languages like Lisp, - Smalltalk, Perl and Basic. It could also be argued that the - &unix; shell (sh, csh) is itself an - interpreter, and many people do in fact write shell - scripts to help with various - housekeeping tasks on their machine. Indeed, part - of the original &unix; philosophy was to provide lots of small - utility programs that could be linked together in shell - scripts to perform useful tasks. + + µ§ªÌ­Ó¤H»{¬°¡A¦pªG§A¤§«e¨S¦³¾Ç¹L¥ô¦óµ{¦¡»y¨¥¡A³Ì¦n¥ý¾Ç¾Ç²ßª½Ä¶¦¡»y¨¥(interpreted languages)¡A + ¹³¬O Lisp¡ASmalltalk¡APerl ©M Basic ³£¬O¡A&unix; ªº shell ¹³¬O sh ©M csh + ¥¦­Ì¥»¨­´N¬Oª½Ä¶¾¹¡A¨Æ¹ê¤W¡A«Ü¦h¤H³£¦b¥¦­Ì¦Û¤v¾÷¾¹¤W¼¶¼g¦U¦¡ªº shell script¡A + ¨Ó¶¶§Q§¹¦¨¦U¶µ housekeeping(ºûÅ@) ¥ô°È¡C + &unix; ¨Ï¥Î­õ¾Ç¤§¤@´N¬O´£¨Ñ¤j¶qªº¤p¤u¨ã¡A + ¨Ã¨Ï¥Î shell script ¨Ó²Õ¦X¹B¥Î³o¨Ç¤p¤u¨ã¡A¥H«K¤u§@§ó¦³®Ä²v¡C - Interpreters available with FreeBSD + FreeBSD ´£¨Ñªºª½Ä¶¾¹ - Here is a list of interpreters that are available from - the &os; Ports Collection, with a brief discussion of - some of the more popular interpreted languages. + + ¤U­±³oÃ䦳¥÷ &os; Ports Collection ©Ò´£¨Ñªºª½Ä¶¾¹²M³æ¡AÁÙ¦³°Q½×¤@¨Ç¤ñ¸û¨üÅwªïªºª½Ä¶¦¡»y¨¥ - Instructions on how to get and install applications - from the Ports Collection can be found in the - - Ports section of the handbook. - + + ¦Ü©ó¦p¦ó¨Ï¥Î Ports Collection ¦w¸Ëªº»¡©ú¡A¥i°Ñ¾\ FreeBSD Handbook ¤¤ªº + Ports³¹¸`¡C BASIC - Short for Beginner's All-purpose Symbolic - Instruction Code. Developed in the 1950s for teaching - University students to program and provided with every - self-respecting personal computer in the 1980s, - BASIC has been the first programming - language for many programmers. It is also the foundation - for Visual Basic. + BASIC ¬O Beginner's ALL-purpose Symbolic Instruction Code ªºÁY¼g¡C + BASIC ©ó 1950 ¦~¥N¶}©lµo®i¡A³Ìªì¶}µo³o®M»y¨¥ªº¥Øªº¬O¬°¤F±Ð¾É·í®Éªº¤j¾Ç¾Ç¥Í¦p¦ó¼gµ{¦¡¡C + ¨ì¤F 1980¡ABASIC¤w¸g¬O«Ü¦h programmer ²Ä¤@­Ó¾Ç²ßªºµ{¦¡»y¨¥¤F¡C + ¦¹¥~¡ABASIC ¤]¬O Visual Basic ªº°ò¦¡C - The Bywater Basic Interpreter can be found in the - Ports Collection as - lang/bwbasic - and the Phil Cockroft's Basic Interpreter - (formerly Rabbit Basic) is available as - lang/pbasic. + FreeBSD Ports Collection ¤]¦³¦¬¿ý¬ÛÃöªº BASIC ª½Ä¶¾¹¡C + Bywater Basic ª½Ä¶¾¹©ñ¦b lang/bwbasic¡C + ¦Ó Phil Cockroft's Basic ª½Ä¶¾¹(¦­´Á¤]¥s Rabbit Basic)©ñ¦b lang/pbasic¡C @@ -147,29 +132,22 @@ Lisp - A language that was developed in the late 1950s as - an alternative to the number-crunching >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Fri Jul 28 10:29:26 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9494916A4DE; Fri, 28 Jul 2006 10:29:26 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 55DA216A4DF for ; Fri, 28 Jul 2006 10:29:26 +0000 (UTC) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id E26E343D58 for ; Fri, 28 Jul 2006 10:29:25 +0000 (GMT) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k6SATPjb016050 for ; Fri, 28 Jul 2006 10:29:25 GMT (envelope-from rdivacky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k6SATPZK016047 for perforce@freebsd.org; Fri, 28 Jul 2006 10:29:25 GMT (envelope-from rdivacky@FreeBSD.org) Date: Fri, 28 Jul 2006 10:29:25 GMT Message-Id: <200607281029.k6SATPZK016047@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rdivacky@FreeBSD.org using -f From: Roman Divacky To: Perforce Change Reviews Cc: Subject: PERFORCE change 102638 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 28 Jul 2006 10:29:26 -0000 http://perforce.freebsd.org/chv.cgi?CH=102638 Change 102638 by rdivacky@rdivacky_witten on 2006/07/28 10:28:44 Add linux_getppid() to syscalls.master. Affected files ... .. //depot/projects/soc2006/rdivacky_linuxolator/i386/linux/syscalls.master#17 edit Differences ... ==== //depot/projects/soc2006/rdivacky_linuxolator/i386/linux/syscalls.master#17 (text+ko) ==== @@ -126,7 +126,7 @@ 62 AUE_NULL MSTD { int linux_ustat(l_dev_t dev, \ struct l_ustat *ubuf); } 63 AUE_DUP2 MNOPROTO { int dup2(u_int from, u_int to); } -64 AUE_GETPPID MNOPROTO { int getppid(void); } +64 AUE_GETPPID MSTD { int linux_getppid(void); } 65 AUE_GETPGRP MNOPROTO { int getpgrp(void); } 66 AUE_SETSID MNOPROTO { int setsid(void); } 67 AUE_NULL MSTD { int linux_sigaction(l_int sig, \ From owner-p4-projects@FreeBSD.ORG Fri Jul 28 10:30:28 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4F80B16A4E6; Fri, 28 Jul 2006 10:30:28 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 2B8DA16A4E2 for ; Fri, 28 Jul 2006 10:30:28 +0000 (UTC) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id B890943D5F for ; Fri, 28 Jul 2006 10:30:27 +0000 (GMT) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k6SAURTQ016137 for ; Fri, 28 Jul 2006 10:30:27 GMT (envelope-from rdivacky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k6SAURoq016134 for perforce@freebsd.org; Fri, 28 Jul 2006 10:30:27 GMT (envelope-from rdivacky@FreeBSD.org) Date: Fri, 28 Jul 2006 10:30:27 GMT Message-Id: <200607281030.k6SAURoq016134@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rdivacky@FreeBSD.org using -f From: Roman Divacky To: Perforce Change Reviews Cc: Subject: PERFORCE change 102639 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 28 Jul 2006 10:30:28 -0000 http://perforce.freebsd.org/chv.cgi?CH=102639 Change 102639 by rdivacky@rdivacky_witten on 2006/07/28 10:29:29 Regen after syscalls.master update. Affected files ... .. //depot/projects/soc2006/rdivacky_linuxolator/i386/linux/linux_proto.h#17 edit .. //depot/projects/soc2006/rdivacky_linuxolator/i386/linux/linux_syscall.h#17 edit .. //depot/projects/soc2006/rdivacky_linuxolator/i386/linux/linux_sysent.c#17 edit Differences ... ==== //depot/projects/soc2006/rdivacky_linuxolator/i386/linux/linux_proto.h#17 (text+ko) ==== @@ -201,6 +201,9 @@ char dev_l_[PADL_(l_dev_t)]; l_dev_t dev; char dev_r_[PADR_(l_dev_t)]; char ubuf_l_[PADL_(struct l_ustat *)]; struct l_ustat * ubuf; char ubuf_r_[PADR_(struct l_ustat *)]; }; +struct linux_getppid_args { + register_t dummy; +}; struct linux_sigaction_args { char sig_l_[PADL_(l_int)]; l_int sig; char sig_r_[PADR_(l_int)]; char nsa_l_[PADL_(l_osigaction_t *)]; l_osigaction_t * nsa; char nsa_r_[PADR_(l_osigaction_t *)]; @@ -959,6 +962,7 @@ int linux_fcntl(struct thread *, struct linux_fcntl_args *); int linux_olduname(struct thread *, struct linux_olduname_args *); int linux_ustat(struct thread *, struct linux_ustat_args *); +int linux_getppid(struct thread *, struct linux_getppid_args *); int linux_sigaction(struct thread *, struct linux_sigaction_args *); int linux_sgetmask(struct thread *, struct linux_sgetmask_args *); int linux_ssetmask(struct thread *, struct linux_ssetmask_args *); ==== //depot/projects/soc2006/rdivacky_linuxolator/i386/linux/linux_syscall.h#17 (text+ko) ==== @@ -61,7 +61,7 @@ #define LINUX_SYS_chroot 61 #define LINUX_SYS_linux_ustat 62 #define LINUX_SYS_dup2 63 -#define LINUX_SYS_getppid 64 +#define LINUX_SYS_linux_getppid 64 #define LINUX_SYS_getpgrp 65 #define LINUX_SYS_setsid 66 #define LINUX_SYS_linux_sigaction 67 ==== //depot/projects/soc2006/rdivacky_linuxolator/i386/linux/linux_sysent.c#17 (text+ko) ==== @@ -83,7 +83,7 @@ { SYF_MPSAFE | AS(chroot_args), (sy_call_t *)chroot, AUE_CHROOT }, /* 61 = chroot */ { SYF_MPSAFE | AS(linux_ustat_args), (sy_call_t *)linux_ustat, AUE_NULL }, /* 62 = linux_ustat */ { SYF_MPSAFE | AS(dup2_args), (sy_call_t *)dup2, AUE_DUP2 }, /* 63 = dup2 */ - { SYF_MPSAFE | 0, (sy_call_t *)getppid, AUE_GETPPID }, /* 64 = getppid */ + { SYF_MPSAFE | 0, (sy_call_t *)linux_getppid, AUE_GETPPID }, /* 64 = linux_getppid */ { SYF_MPSAFE | 0, (sy_call_t *)getpgrp, AUE_GETPGRP }, /* 65 = getpgrp */ { SYF_MPSAFE | 0, (sy_call_t *)setsid, AUE_SETSID }, /* 66 = setsid */ { SYF_MPSAFE | AS(linux_sigaction_args), (sy_call_t *)linux_sigaction, AUE_NULL }, /* 67 = linux_sigaction */ From owner-p4-projects@FreeBSD.ORG Fri Jul 28 10:30:28 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C20B416A4DD; Fri, 28 Jul 2006 10:30:28 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 8424416A566 for ; Fri, 28 Jul 2006 10:30:28 +0000 (UTC) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 380A043D5A for ; Fri, 28 Jul 2006 10:30:28 +0000 (GMT) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k6SAUSvH016143 for ; Fri, 28 Jul 2006 10:30:28 GMT (envelope-from rdivacky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k6SAUR06016140 for perforce@freebsd.org; Fri, 28 Jul 2006 10:30:27 GMT (envelope-from rdivacky@FreeBSD.org) Date: Fri, 28 Jul 2006 10:30:27 GMT Message-Id: <200607281030.k6SAUR06016140@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rdivacky@FreeBSD.org using -f From: Roman Divacky To: Perforce Change Reviews Cc: Subject: PERFORCE change 102640 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 28 Jul 2006 10:30:29 -0000 http://perforce.freebsd.org/chv.cgi?CH=102640 Change 102640 by rdivacky@rdivacky_witten on 2006/07/28 10:30:25 Add linux_getppid() and change linux_getpid() to work with group_pid. Affected files ... .. //depot/projects/soc2006/rdivacky_linuxolator/compat/linux/linux_misc.c#4 edit .. //depot/projects/soc2006/rdivacky_linuxolator/i386/linux/linux.h#13 edit .. //depot/projects/soc2006/rdivacky_linuxolator/i386/linux/linux_machdep.c#24 edit Differences ... ==== //depot/projects/soc2006/rdivacky_linuxolator/compat/linux/linux_misc.c#4 (text+ko) ==== @@ -93,6 +93,9 @@ #define BSD_TO_LINUX_SIGNAL(sig) \ (((sig) <= LINUX_SIGTBLSZ) ? bsd_to_linux_signal[_SIG_IDX(sig)] : sig) +struct linux_emuldata *em_find(pid_t pid, int locked); +extern struct rwlock emul_lock; + static unsigned int linux_to_bsd_resource[LINUX_RLIM_NLIMITS] = { RLIMIT_CPU, RLIMIT_FSIZE, RLIMIT_DATA, RLIMIT_STACK, RLIMIT_CORE, RLIMIT_RSS, RLIMIT_NPROC, RLIMIT_NOFILE, @@ -1327,11 +1330,77 @@ * linux_getuid() - MP SAFE */ +/* XXX: getppid must be changed too */ + int linux_getpid(struct thread *td, struct linux_getpid_args *args) { + struct linux_emuldata *em; + + em = em_find(td->td_proc->p_pid, EMUL_UNLOCKED); + + if (em == NULL) { +#ifdef DEBUG + printf(LMSG("emuldata not found.\n")); +#endif + EMUL_RUNLOCK(&emul_lock); + return (0); + } + + td->td_retval[0] = em->shared->group_pid; + EMUL_RUNLOCK(&emul_lock); + return (0); +} + +int +linux_getppid(struct thread *td, struct linux_getppid_args *args) +{ + struct linux_emuldata *em; + struct proc *p, *pp; - td->td_retval[0] = td->td_proc->p_pid; + em = em_find(td->td_proc->p_pid, EMUL_UNLOCKED); + + if (em == NULL) { +#ifdef DEBUG + printf(LMSG("emuldata not found.\n")); +#endif + EMUL_RUNLOCK(&emul_lock); + return (0); + } + + /* find the group leader */ + p = pfind(em->shared->group_pid); + + if (p == NULL) { +#ifdef DEBUG + printf(LMSG("parent process not found.\n")); +#endif + return (0); + } + + pp = p->p_pptr; /* switch to parent */ + PROC_LOCK(pp); + PROC_UNLOCK(p); + + em = em_find(pp->p_pid, EMUL_UNLOCKED); + + if (em == NULL) { +#ifdef DEBUG + printf(LMSG("emuldata not found.\n")); +#endif + EMUL_RUNLOCK(&emul_lock); + return (0); + } + + /* if its also linux process */ + if (pp->p_sysent == &elf_linux_sysvec) + td->td_retval[0] = em->shared->group_pid; + else + td->td_retval[0] = pp->p_pid; + + EMUL_RUNLOCK(&emul_lock); + PROC_UNLOCK(pp); + return (0); } ==== //depot/projects/soc2006/rdivacky_linuxolator/i386/linux/linux.h#13 (text+ko) ==== @@ -780,6 +780,11 @@ #define GET_PRESENT(desc) (((desc)->b >> ENTRY_B_SEG_NOT_PRESENT) & 1) #define GET_USEABLE(desc) (((desc)->b >> ENTRY_B_USEABLE) & 1) +struct linux_emuldata_shared { + int refs; + pid_t group_pid; +}; + /* modeled after similar structure in NetBSD * this will be extended as we need more functionality */ @@ -789,6 +794,8 @@ int *child_set_tid; /* in clone(): Child's TID to set on clone */ int *child_clear_tid; /* in clone(): Child's TID to clear on exit */ + struct linux_emuldata_shared *shared; + SLIST_ENTRY(linux_emuldata) emuldatas; }; ==== //depot/projects/soc2006/rdivacky_linuxolator/i386/linux/linux_machdep.c#24 (text+ko) ==== @@ -68,11 +68,11 @@ struct linux_emuldata *emuldata_headp; /* where we store the emulation data */ struct rwlock emul_lock; -static int linux_proc_init(struct thread *, pid_t); +static int linux_proc_init(struct thread *, pid_t, int); void linux_proc_exit(void *, struct proc *); void linux_schedtail(void *, struct proc *); void linux_proc_exec(void *, struct proc *, struct image_params *); -static struct linux_emuldata *em_find(pid_t pid, int locked); +struct linux_emuldata *em_find(pid_t pid, int locked); struct l_descriptor { l_uint entry_number; @@ -138,7 +138,7 @@ if (error == 0) error = kern_execve(td, &eargs, NULL); if (error == 0) - error = linux_proc_init(td, 0); + error = linux_proc_init(td, 0, 0); return (error); } @@ -290,7 +290,7 @@ } /* this returns locked reference to the emuldata entry (if found) */ -static struct linux_emuldata * +struct linux_emuldata * em_find(pid_t pid, int locked) { struct linux_emuldata *em; @@ -323,7 +323,7 @@ if (td->td_retval[1] == 1) td->td_retval[0] = 0; - error = linux_proc_init(td, td->td_retval[0]); + error = linux_proc_init(td, td->td_retval[0], 0); if (error) return (error); @@ -345,7 +345,7 @@ /* Are we the child? */ if (td->td_retval[1] == 1) td->td_retval[0] = 0; - error = linux_proc_init(td, td->td_retval[0]); + error = linux_proc_init(td, td->td_retval[0], 0); if (error) return (error); return (0); @@ -419,7 +419,7 @@ return (error); /* create the emuldata */ - error = linux_proc_init(td, p2->p_pid); + error = linux_proc_init(td, p2->p_pid, args->flags); /* reference it - no need to check this */ em = em_find(p2->p_pid, EMUL_UNLOCKED); KASSERT(em != NULL, "no emuldata after proc_init()!\n"); @@ -1130,9 +1130,9 @@ } static int -linux_proc_init(struct thread *td, pid_t child) +linux_proc_init(struct thread *td, pid_t child, int flags) { - struct linux_emuldata *em; + struct linux_emuldata *em, *p_em; /* XXX: locking? */ if (child != 0) { @@ -1156,7 +1156,31 @@ em->child_clear_tid = NULL; em->child_set_tid = NULL; + em->shared = NULL; + + if (flags & CLONE_VM) { + printf("CLONE_VM!!!!!\n"); + /* lookup the parent */ + p_em = em_find(td->td_proc->p_pptr->p_pid, EMUL_LOCKED); + if (p_em == NULL) { +#ifdef DEBUG + printf(LMSG("parent emuldata not found for CLONE_VM.\n")); +#endif + } else { + em->shared = p_em->shared; + em->shared->refs++; +#ifdef DEBUG +#endif + } + } else { + struct linux_emuldata_shared *s; + MALLOC(s, struct linux_emuldata_shared *, sizeof *s, M_LINUX, M_WAITOK | M_ZERO); + em->shared = s; + s->refs = 1; + s->group_pid = td->td_proc->p_pid; + } + if (child != 0) EMUL_WUNLOCK(&emul_lock); else @@ -1209,6 +1233,10 @@ printf(LMSG("futex stuff in proc_exit failed.\n")); } + em->shared->refs--; + if (em->shared->refs == 0); + FREE(em->shared, M_LINUX); + EMUL_RUNLOCK(&emul_lock); /* XXX: there is a race but I think we can ommit that * because its not very possible that the same process @@ -1231,7 +1259,7 @@ { if (__predict_false(imgp->sysent == &elf_linux_sysvec && p->p_sysent == &elf32_freebsd_sysvec)) - linux_proc_init(FIRST_THREAD_IN_PROC(p), p->p_pid); + linux_proc_init(FIRST_THREAD_IN_PROC(p), p->p_pid, 0); if (__predict_false(imgp->sysent == &elf32_freebsd_sysvec && p->p_sysent == &elf_linux_sysvec)) { struct linux_emuldata *em; From owner-p4-projects@FreeBSD.ORG Fri Jul 28 11:09:19 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id AA12A16A4E1; Fri, 28 Jul 2006 11:09:19 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 8681916A4DF for ; Fri, 28 Jul 2006 11:09:19 +0000 (UTC) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 541DA43D46 for ; Fri, 28 Jul 2006 11:09:19 +0000 (GMT) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k6SB9Jn4019263 for ; Fri, 28 Jul 2006 11:09:19 GMT (envelope-from rdivacky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k6SB9Ihc019260 for perforce@freebsd.org; Fri, 28 Jul 2006 11:09:18 GMT (envelope-from rdivacky@FreeBSD.org) Date: Fri, 28 Jul 2006 11:09:18 GMT Message-Id: <200607281109.k6SB9Ihc019260@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rdivacky@FreeBSD.org using -f From: Roman Divacky To: Perforce Change Reviews Cc: Subject: PERFORCE change 102642 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 28 Jul 2006 11:09:19 -0000 http://perforce.freebsd.org/chv.cgi?CH=102642 Change 102642 by rdivacky@rdivacky_witten on 2006/07/28 11:08:20 Fix the linux_getppid() to not panic immediately. Affected files ... .. //depot/projects/soc2006/rdivacky_linuxolator/compat/linux/linux_misc.c#5 edit Differences ... ==== //depot/projects/soc2006/rdivacky_linuxolator/compat/linux/linux_misc.c#5 (text+ko) ==== @@ -1330,8 +1330,6 @@ * linux_getuid() - MP SAFE */ -/* XXX: getppid must be changed too */ - int linux_getpid(struct thread *td, struct linux_getpid_args *args) { @@ -1382,20 +1380,20 @@ PROC_LOCK(pp); PROC_UNLOCK(p); - em = em_find(pp->p_pid, EMUL_UNLOCKED); - - if (em == NULL) { + /* if its also linux process */ + if (pp->p_sysent == &elf_linux_sysvec) { + em = em_find(pp->p_pid, EMUL_LOCKED); + if (em == NULL) { + printf("this happens!\n"); #ifdef DEBUG - printf(LMSG("emuldata not found.\n")); + printf(LMSG("emuldata not found.\n")); #endif - EMUL_RUNLOCK(&emul_lock); - return (0); - } - - /* if its also linux process */ - if (pp->p_sysent == &elf_linux_sysvec) + PROC_UNLOCK(pp); + EMUL_RUNLOCK(&emul_lock); + return (0); + } td->td_retval[0] = em->shared->group_pid; - else + } else td->td_retval[0] = pp->p_pid; EMUL_RUNLOCK(&emul_lock); From owner-p4-projects@FreeBSD.ORG Fri Jul 28 11:52:13 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 94F0016A4DE; Fri, 28 Jul 2006 11:52:13 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 7123B16A4DD for ; Fri, 28 Jul 2006 11:52:13 +0000 (UTC) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 3C5F343D4C for ; Fri, 28 Jul 2006 11:52:13 +0000 (GMT) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k6SBqD9O021391 for ; Fri, 28 Jul 2006 11:52:13 GMT (envelope-from rdivacky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k6SBqC8M021388 for perforce@freebsd.org; Fri, 28 Jul 2006 11:52:12 GMT (envelope-from rdivacky@FreeBSD.org) Date: Fri, 28 Jul 2006 11:52:12 GMT Message-Id: <200607281152.k6SBqC8M021388@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rdivacky@FreeBSD.org using -f From: Roman Divacky To: Perforce Change Reviews Cc: Subject: PERFORCE change 102643 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 28 Jul 2006 11:52:13 -0000 http://perforce.freebsd.org/chv.cgi?CH=102643 Change 102643 by rdivacky@rdivacky_witten on 2006/07/28 11:51:42 Dont leak linux_emuldata_shared on every execve() call. Also remove trailing ; in if(). Affected files ... .. //depot/projects/soc2006/rdivacky_linuxolator/i386/linux/linux_machdep.c#25 edit Differences ... ==== //depot/projects/soc2006/rdivacky_linuxolator/i386/linux/linux_machdep.c#25 (text+ko) ==== @@ -1156,29 +1156,31 @@ em->child_clear_tid = NULL; em->child_set_tid = NULL; - em->shared = NULL; - if (flags & CLONE_VM) { - printf("CLONE_VM!!!!!\n"); - /* lookup the parent */ - p_em = em_find(td->td_proc->p_pptr->p_pid, EMUL_LOCKED); - if (p_em == NULL) { + /* allocate the shared struct only in non-exec cases */ + if (child != 0) { + em->shared = NULL; + if (flags & CLONE_VM) { + /* lookup the parent */ + p_em = em_find(td->td_proc->p_pptr->p_pid, EMUL_LOCKED); + if (p_em == NULL) { #ifdef DEBUG - printf(LMSG("parent emuldata not found for CLONE_VM.\n")); + printf(LMSG("parent emuldata not found for CLONE_VM.\n")); #endif - } else { - em->shared = p_em->shared; - em->shared->refs++; + } else { + em->shared = p_em->shared; + em->shared->refs++; #ifdef DEBUG #endif + } + } else { + struct linux_emuldata_shared *s; + + MALLOC(s, struct linux_emuldata_shared *, sizeof *s, M_LINUX, M_WAITOK | M_ZERO); + em->shared = s; + s->refs = 1; + s->group_pid = td->td_proc->p_pid; } - } else { - struct linux_emuldata_shared *s; - - MALLOC(s, struct linux_emuldata_shared *, sizeof *s, M_LINUX, M_WAITOK | M_ZERO); - em->shared = s; - s->refs = 1; - s->group_pid = td->td_proc->p_pid; } if (child != 0) @@ -1234,7 +1236,7 @@ } em->shared->refs--; - if (em->shared->refs == 0); + if (em->shared->refs == 0) FREE(em->shared, M_LINUX); EMUL_RUNLOCK(&emul_lock); From owner-p4-projects@FreeBSD.ORG Fri Jul 28 13:41:43 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id AEFB616A4DE; Fri, 28 Jul 2006 13:41:43 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 85CA516A4EB for ; Fri, 28 Jul 2006 13:41:43 +0000 (UTC) (envelope-from wkoszek@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id E223E43D49 for ; Fri, 28 Jul 2006 13:41:42 +0000 (GMT) (envelope-from wkoszek@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k6SDfg3f038725 for ; Fri, 28 Jul 2006 13:41:42 GMT (envelope-from wkoszek@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k6SDfT4A038705 for perforce@freebsd.org; Fri, 28 Jul 2006 13:41:29 GMT (envelope-from wkoszek@FreeBSD.org) Date: Fri, 28 Jul 2006 13:41:29 GMT Message-Id: <200607281341.k6SDfT4A038705@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to wkoszek@FreeBSD.org using -f From: "Wojciech A. Koszek" To: Perforce Change Reviews Cc: Subject: PERFORCE change 102644 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 28 Jul 2006 13:41:44 -0000 http://perforce.freebsd.org/chv.cgi?CH=102644 Change 102644 by wkoszek@wkoszek_sledge on 2006/07/28 13:40:42 IFC. Affected files ... .. //depot/projects/mips2/src/MAINTAINERS#3 integrate .. //depot/projects/mips2/src/ObsoleteFiles.inc#2 integrate .. //depot/projects/mips2/src/UPDATING#2 integrate .. //depot/projects/mips2/src/bin/dd/Makefile#2 integrate .. //depot/projects/mips2/src/bin/sh/sh.1#2 integrate .. //depot/projects/mips2/src/bin/test/test.1#2 integrate .. //depot/projects/mips2/src/contrib/texinfo/FREEBSD-upgrade#2 integrate .. //depot/projects/mips2/src/etc/defaults/rc.conf#2 integrate .. //depot/projects/mips2/src/etc/rc.d/archdep#2 integrate .. //depot/projects/mips2/src/etc/rc.d/dhclient#2 integrate .. //depot/projects/mips2/src/etc/rc.d/ipfw#2 integrate .. //depot/projects/mips2/src/etc/rc.d/mdconfig#2 integrate .. //depot/projects/mips2/src/etc/rc.d/mdconfig2#2 integrate .. //depot/projects/mips2/src/etc/rc.d/mountcritlocal#2 integrate .. //depot/projects/mips2/src/etc/rc.d/mountlate#1 branch .. //depot/projects/mips2/src/etc/rc.d/natd#2 integrate .. //depot/projects/mips2/src/etc/rc.d/ntpdate#2 integrate .. //depot/projects/mips2/src/etc/rc.subr#2 integrate .. //depot/projects/mips2/src/games/fortune/datfiles/Makefile#2 integrate .. //depot/projects/mips2/src/games/fortune/datfiles/fortunes#2 integrate .. //depot/projects/mips2/src/gnu/usr.bin/binutils/ld/Makefile.alpha#2 integrate .. //depot/projects/mips2/src/gnu/usr.bin/binutils/ld/Makefile.amd64#2 integrate .. //depot/projects/mips2/src/gnu/usr.bin/binutils/ld/Makefile.i386#2 integrate .. //depot/projects/mips2/src/gnu/usr.bin/binutils/ld/Makefile.ia64#2 integrate .. //depot/projects/mips2/src/gnu/usr.bin/cc/cc_tools/auto-host.h#3 integrate .. //depot/projects/mips2/src/gnu/usr.bin/send-pr/categories#2 integrate .. //depot/projects/mips2/src/kerberos5/Makefile.inc#2 integrate .. //depot/projects/mips2/src/lib/libc/gen/getgrent.c#2 integrate .. //depot/projects/mips2/src/lib/libc/gen/tls.c#2 integrate .. //depot/projects/mips2/src/lib/libc/net/Makefile.inc#2 integrate .. //depot/projects/mips2/src/lib/libc/net/getaddrinfo.c#2 integrate .. //depot/projects/mips2/src/lib/libc/net/name6.c#2 integrate .. //depot/projects/mips2/src/lib/libc/net/resolver.3#2 integrate .. //depot/projects/mips2/src/lib/libc/posix1e/Makefile.inc#2 integrate .. //depot/projects/mips2/src/lib/libc/posix1e/mac_is_present.3#2 integrate .. //depot/projects/mips2/src/lib/libc/posix1e/mac_is_present_np.3#2 delete .. //depot/projects/mips2/src/lib/libc/posix1e/mac_prepare.3#2 integrate .. //depot/projects/mips2/src/lib/libc/posix1e/mac_set.3#2 integrate .. //depot/projects/mips2/src/lib/libc/posix1e/mac_text.3#2 integrate .. //depot/projects/mips2/src/lib/libc/stdlib/malloc.c#2 integrate .. //depot/projects/mips2/src/lib/libc/sys/Symbol.map#2 integrate .. //depot/projects/mips2/src/lib/libdevinfo/devinfo.c#2 integrate .. //depot/projects/mips2/src/lib/libfetch/Makefile#2 integrate .. //depot/projects/mips2/src/lib/libftpio/Makefile#2 integrate .. //depot/projects/mips2/src/lib/libkvm/kvm_proc.c#2 integrate .. //depot/projects/mips2/src/lib/libmemstat/memstat.h#2 integrate .. //depot/projects/mips2/src/lib/libpam/libpam/security/pam_mod_misc.h#2 integrate .. //depot/projects/mips2/src/lib/libthr/pthread.map#2 integrate .. //depot/projects/mips2/src/lib/libthr/sys/thr_error.c#2 integrate .. //depot/projects/mips2/src/lib/libthr/thread/thr_attr.c#2 integrate .. //depot/projects/mips2/src/lib/libthr/thread/thr_create.c#2 integrate .. //depot/projects/mips2/src/lib/libthr/thread/thr_getschedparam.c#2 integrate .. //depot/projects/mips2/src/lib/libthr/thread/thr_init.c#2 integrate .. //depot/projects/mips2/src/lib/libthr/thread/thr_list.c#2 integrate .. //depot/projects/mips2/src/lib/libthr/thread/thr_mutex.c#2 integrate .. //depot/projects/mips2/src/lib/libthr/thread/thr_private.h#2 integrate .. //depot/projects/mips2/src/lib/libthr/thread/thr_setprio.c#2 integrate .. //depot/projects/mips2/src/lib/libthr/thread/thr_setschedparam.c#2 integrate .. //depot/projects/mips2/src/lib/libthr/thread/thr_sig.c#2 integrate .. //depot/projects/mips2/src/lib/libthr/thread/thr_syscalls.c#2 integrate .. //depot/projects/mips2/src/lib/libutil/Makefile#2 integrate .. //depot/projects/mips2/src/lib/libutil/humanize_number.3#2 integrate .. //depot/projects/mips2/src/lib/libutil/kld.3#2 integrate .. //depot/projects/mips2/src/lib/libypclnt/ypclnt.h#2 integrate .. //depot/projects/mips2/src/lib/msun/src/e_log.c#2 integrate .. //depot/projects/mips2/src/lib/msun/src/e_logf.c#2 integrate .. //depot/projects/mips2/src/lib/msun/src/s_tanh.c#2 integrate .. //depot/projects/mips2/src/libexec/rlogind/Makefile#2 integrate .. //depot/projects/mips2/src/libexec/telnetd/Makefile#2 integrate .. //depot/projects/mips2/src/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml#2 integrate .. //depot/projects/mips2/src/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#2 integrate .. //depot/projects/mips2/src/release/doc/share/misc/dev.archlist.txt#2 integrate .. //depot/projects/mips2/src/rescue/librescue/Makefile#2 integrate .. //depot/projects/mips2/src/sbin/Makefile#2 integrate .. //depot/projects/mips2/src/sbin/gpt/gpt.c#2 integrate .. //depot/projects/mips2/src/sbin/growfs/growfs.c#2 integrate .. //depot/projects/mips2/src/sbin/ifconfig/ifclone.c#2 integrate .. //depot/projects/mips2/src/sbin/ifconfig/ifconfig.8#2 integrate .. //depot/projects/mips2/src/sbin/ifconfig/ifconfig.c#2 integrate .. //depot/projects/mips2/src/sbin/ifconfig/ifconfig.h#2 integrate .. //depot/projects/mips2/src/sbin/ifconfig/ifieee80211.c#2 integrate .. //depot/projects/mips2/src/sbin/ifconfig/ifvlan.c#2 integrate .. //depot/projects/mips2/src/sbin/ipfw/ipfw.8#2 integrate .. //depot/projects/mips2/src/sbin/mount/mount.8#2 integrate .. //depot/projects/mips2/src/sbin/mount/mount.c#2 integrate .. //depot/projects/mips2/src/sbin/mount_udf/Makefile#2 integrate .. //depot/projects/mips2/src/sbin/ping6/Makefile#2 integrate .. //depot/projects/mips2/src/sbin/route/Makefile#2 integrate .. //depot/projects/mips2/src/sbin/rtsol/Makefile#2 integrate .. //depot/projects/mips2/src/sbin/setkey/Makefile#2 integrate .. //depot/projects/mips2/src/sbin/sysctl/sysctl.c#2 integrate .. //depot/projects/mips2/src/secure/lib/libcrypto/Makefile.inc#2 integrate .. //depot/projects/mips2/src/share/examples/etc/make.conf#2 integrate .. //depot/projects/mips2/src/share/man/man4/Makefile#2 integrate .. //depot/projects/mips2/src/share/man/man4/acpi_thermal.4#2 integrate .. //depot/projects/mips2/src/share/man/man4/altq.4#2 integrate .. //depot/projects/mips2/src/share/man/man4/enc.4#2 integrate .. //depot/projects/mips2/src/share/man/man4/ipw.4#2 integrate .. //depot/projects/mips2/src/share/man/man4/iwi.4#2 integrate .. //depot/projects/mips2/src/share/man/man4/man4.i386/padlock.4#2 integrate .. //depot/projects/mips2/src/share/man/man4/miibus.4#2 integrate .. //depot/projects/mips2/src/share/man/man4/pcn.4#2 integrate .. //depot/projects/mips2/src/share/man/man4/polling.4#2 integrate .. //depot/projects/mips2/src/share/man/man4/random.4#2 integrate .. //depot/projects/mips2/src/share/man/man4/snd_emu10kx.4#1 branch .. //depot/projects/mips2/src/share/man/man4/stge.4#1 branch .. //depot/projects/mips2/src/share/man/man4/vlan.4#2 integrate .. //depot/projects/mips2/src/share/man/man5/rc.conf.5#2 integrate .. //depot/projects/mips2/src/share/man/man7/security.7#2 integrate .. //depot/projects/mips2/src/share/man/man8/rc.subr.8#2 integrate .. //depot/projects/mips2/src/share/man/man9/Makefile#2 integrate .. //depot/projects/mips2/src/share/man/man9/mac.9#2 integrate .. //depot/projects/mips2/src/share/man/man9/mbuf.9#2 integrate .. //depot/projects/mips2/src/share/man/man9/mutex.9#2 integrate .. //depot/projects/mips2/src/share/man/man9/rwlock.9#2 integrate .. //depot/projects/mips2/src/share/man/man9/sx.9#2 integrate .. //depot/projects/mips2/src/share/misc/bsd-family-tree#2 integrate .. //depot/projects/mips2/src/share/mk/bsd.cpu.mk#3 integrate .. //depot/projects/mips2/src/share/mklocale/UTF-8.src#2 integrate .. //depot/projects/mips2/src/sys/amd64/amd64/db_trace.c#2 integrate .. //depot/projects/mips2/src/sys/amd64/amd64/identcpu.c#2 integrate .. //depot/projects/mips2/src/sys/amd64/amd64/intr_machdep.c#2 integrate .. //depot/projects/mips2/src/sys/amd64/amd64/local_apic.c#2 integrate .. //depot/projects/mips2/src/sys/amd64/amd64/machdep.c#2 integrate .. //depot/projects/mips2/src/sys/amd64/amd64/pmap.c#4 integrate .. //depot/projects/mips2/src/sys/amd64/amd64/trap.c#2 integrate .. //depot/projects/mips2/src/sys/amd64/amd64/vm_machdep.c#2 integrate .. //depot/projects/mips2/src/sys/amd64/conf/GENERIC#3 integrate .. //depot/projects/mips2/src/sys/amd64/ia32/ia32_syscall.c#2 integrate .. //depot/projects/mips2/src/sys/amd64/include/specialreg.h#2 integrate .. //depot/projects/mips2/src/sys/amd64/linux32/linux32_proto.h#2 integrate .. //depot/projects/mips2/src/sys/amd64/linux32/linux32_syscall.h#2 integrate .. //depot/projects/mips2/src/sys/amd64/linux32/linux32_sysent.c#2 integrate .. //depot/projects/mips2/src/sys/amd64/linux32/syscalls.master#2 integrate .. //depot/projects/mips2/src/sys/arm/arm/db_trace.c#2 integrate .. //depot/projects/mips2/src/sys/arm/arm/gdb_machdep.c#1 branch .. //depot/projects/mips2/src/sys/arm/arm/in_cksum.c#2 integrate .. //depot/projects/mips2/src/sys/arm/arm/pmap.c#2 integrate .. //depot/projects/mips2/src/sys/arm/arm/trap.c#2 integrate .. //depot/projects/mips2/src/sys/arm/arm/vm_machdep.c#2 integrate .. //depot/projects/mips2/src/sys/arm/at91/at91_pio.c#2 integrate .. //depot/projects/mips2/src/sys/arm/at91/at91_piovar.h#2 integrate .. //depot/projects/mips2/src/sys/arm/at91/at91_pmc.c#2 integrate .. //depot/projects/mips2/src/sys/arm/at91/at91_rtc.c#2 integrate .. //depot/projects/mips2/src/sys/arm/at91/at91_rtcreg.h#2 integrate .. //depot/projects/mips2/src/sys/arm/at91/at91_spi.c#2 integrate .. //depot/projects/mips2/src/sys/arm/at91/at91_spiio.h#2 delete .. //depot/projects/mips2/src/sys/arm/at91/at91_spireg.h#2 integrate .. //depot/projects/mips2/src/sys/arm/at91/at91_ssc.c#2 integrate .. //depot/projects/mips2/src/sys/arm/at91/at91_st.c#2 integrate .. //depot/projects/mips2/src/sys/arm/at91/at91_twi.c#2 integrate .. //depot/projects/mips2/src/sys/arm/at91/files.at91#2 integrate .. //depot/projects/mips2/src/sys/arm/at91/if_ate.c#2 integrate .. //depot/projects/mips2/src/sys/arm/at91/kb920x_machdep.c#2 integrate .. //depot/projects/mips2/src/sys/arm/at91/std.at91#2 integrate .. //depot/projects/mips2/src/sys/arm/at91/std.kb920x#2 integrate .. //depot/projects/mips2/src/sys/arm/at91/uart_dev_at91usart.c#2 integrate .. //depot/projects/mips2/src/sys/arm/conf/KB920X#2 integrate .. //depot/projects/mips2/src/sys/arm/include/db_machdep.h#2 integrate .. //depot/projects/mips2/src/sys/arm/include/gdb_machdep.h#1 branch .. //depot/projects/mips2/src/sys/arm/xscale/i80321/i80321.c#2 integrate .. //depot/projects/mips2/src/sys/arm/xscale/i80321/i80321_timer.c#2 integrate .. //depot/projects/mips2/src/sys/arm/xscale/i80321/iq80321.c#2 integrate .. //depot/projects/mips2/src/sys/boot/forth/loader.conf#2 integrate .. //depot/projects/mips2/src/sys/cam/scsi/scsi_cd.c#2 integrate .. //depot/projects/mips2/src/sys/cam/scsi/scsi_da.c#2 integrate .. //depot/projects/mips2/src/sys/compat/freebsd32/freebsd32_misc.c#2 integrate .. //depot/projects/mips2/src/sys/compat/freebsd32/syscalls.master#2 integrate .. //depot/projects/mips2/src/sys/compat/linux/linux_file.c#2 integrate .. //depot/projects/mips2/src/sys/compat/linux/linux_ioctl.c#2 integrate .. //depot/projects/mips2/src/sys/compat/linux/linux_ipc.c#2 integrate .. //depot/projects/mips2/src/sys/compat/linux/linux_misc.c#2 integrate .. //depot/projects/mips2/src/sys/compat/linux/linux_socket.c#2 integrate .. //depot/projects/mips2/src/sys/compat/svr4/svr4_ipc.c#2 integrate .. //depot/projects/mips2/src/sys/compat/svr4/svr4_misc.c#2 integrate .. //depot/projects/mips2/src/sys/compat/svr4/svr4_proto.h#2 integrate .. //depot/projects/mips2/src/sys/compat/svr4/svr4_socket.c#2 integrate .. //depot/projects/mips2/src/sys/compat/svr4/svr4_socket.h#2 integrate .. //depot/projects/mips2/src/sys/compat/svr4/svr4_stream.c#2 integrate .. //depot/projects/mips2/src/sys/compat/svr4/svr4_syscall.h#2 integrate .. //depot/projects/mips2/src/sys/compat/svr4/svr4_syscallnames.c#2 integrate .. //depot/projects/mips2/src/sys/compat/svr4/svr4_sysent.c#2 integrate .. //depot/projects/mips2/src/sys/compat/svr4/svr4_sysvec.c#2 integrate .. //depot/projects/mips2/src/sys/compat/svr4/svr4_util.h#2 integrate .. //depot/projects/mips2/src/sys/compat/svr4/syscalls.master#2 integrate .. //depot/projects/mips2/src/sys/conf/Makefile.arm#2 integrate .. //depot/projects/mips2/src/sys/conf/NOTES#2 integrate .. //depot/projects/mips2/src/sys/conf/files#2 integrate .. //depot/projects/mips2/src/sys/conf/files.arm#2 integrate .. //depot/projects/mips2/src/sys/conf/files.i386#2 integrate .. //depot/projects/mips2/src/sys/conf/files.ia64#2 integrate .. //depot/projects/mips2/src/sys/conf/files.powerpc#2 integrate .. //depot/projects/mips2/src/sys/conf/kern.pre.mk#2 integrate .. //depot/projects/mips2/src/sys/conf/options#2 integrate .. //depot/projects/mips2/src/sys/conf/options.arm#2 integrate .. //depot/projects/mips2/src/sys/contrib/ia64/libuwx/src.diff#2 delete .. //depot/projects/mips2/src/sys/contrib/ia64/libuwx/src/Makefile#2 integrate .. //depot/projects/mips2/src/sys/contrib/ia64/libuwx/src/uwx.h#2 integrate .. //depot/projects/mips2/src/sys/contrib/ia64/libuwx/src/uwx_bstream.c#2 integrate .. //depot/projects/mips2/src/sys/contrib/ia64/libuwx/src/uwx_bstream.h#2 integrate .. //depot/projects/mips2/src/sys/contrib/ia64/libuwx/src/uwx_context.c#2 integrate .. //depot/projects/mips2/src/sys/contrib/ia64/libuwx/src/uwx_context.h#2 integrate .. //depot/projects/mips2/src/sys/contrib/ia64/libuwx/src/uwx_env.c#2 integrate .. //depot/projects/mips2/src/sys/contrib/ia64/libuwx/src/uwx_env.h#2 integrate .. //depot/projects/mips2/src/sys/contrib/ia64/libuwx/src/uwx_scoreboard.c#2 integrate .. //depot/projects/mips2/src/sys/contrib/ia64/libuwx/src/uwx_scoreboard.h#2 integrate .. //depot/projects/mips2/src/sys/contrib/ia64/libuwx/src/uwx_self-new.c#2 delete .. //depot/projects/mips2/src/sys/contrib/ia64/libuwx/src/uwx_self.c#2 integrate .. //depot/projects/mips2/src/sys/contrib/ia64/libuwx/src/uwx_self.h#2 integrate .. //depot/projects/mips2/src/sys/contrib/ia64/libuwx/src/uwx_self_context.s#2 integrate .. //depot/projects/mips2/src/sys/contrib/ia64/libuwx/src/uwx_self_info.h#1 branch .. //depot/projects/mips2/src/sys/contrib/ia64/libuwx/src/uwx_step.c#2 integrate .. //depot/projects/mips2/src/sys/contrib/ia64/libuwx/src/uwx_step.h#2 integrate .. //depot/projects/mips2/src/sys/contrib/ia64/libuwx/src/uwx_str.c#2 integrate .. //depot/projects/mips2/src/sys/contrib/ia64/libuwx/src/uwx_str.h#2 integrate .. //depot/projects/mips2/src/sys/contrib/ia64/libuwx/src/uwx_swap.c#2 integrate .. //depot/projects/mips2/src/sys/contrib/ia64/libuwx/src/uwx_swap.h#2 integrate .. //depot/projects/mips2/src/sys/contrib/ia64/libuwx/src/uwx_symbols.c#1 branch .. //depot/projects/mips2/src/sys/contrib/ia64/libuwx/src/uwx_symbols.h#1 branch .. //depot/projects/mips2/src/sys/contrib/ia64/libuwx/src/uwx_trace.c#2 integrate .. //depot/projects/mips2/src/sys/contrib/ia64/libuwx/src/uwx_trace.h#2 integrate .. //depot/projects/mips2/src/sys/contrib/ia64/libuwx/src/uwx_ttrace.c#2 delete .. //depot/projects/mips2/src/sys/contrib/ia64/libuwx/src/uwx_ttrace.h#2 delete .. //depot/projects/mips2/src/sys/contrib/ia64/libuwx/src/uwx_uinfo.c#2 integrate .. //depot/projects/mips2/src/sys/contrib/ia64/libuwx/src/uwx_uinfo.h#2 integrate .. //depot/projects/mips2/src/sys/contrib/ia64/libuwx/src/uwx_utable.c#2 integrate .. //depot/projects/mips2/src/sys/contrib/ia64/libuwx/src/uwx_utable.h#2 integrate .. //depot/projects/mips2/src/sys/contrib/pf/net/if_pflog.c#2 integrate .. //depot/projects/mips2/src/sys/contrib/pf/net/if_pfsync.c#2 integrate .. //depot/projects/mips2/src/sys/contrib/pf/net/pf_ioctl.c#2 integrate .. //depot/projects/mips2/src/sys/crypto/via/padlock.c#2 integrate .. //depot/projects/mips2/src/sys/crypto/via/padlock.h#1 branch .. //depot/projects/mips2/src/sys/crypto/via/padlock_cipher.c#1 branch .. //depot/projects/mips2/src/sys/crypto/via/padlock_hash.c#1 branch .. //depot/projects/mips2/src/sys/ddb/db_command.c#2 integrate .. //depot/projects/mips2/src/sys/ddb/db_output.c#2 integrate .. //depot/projects/mips2/src/sys/ddb/db_output.h#2 integrate .. //depot/projects/mips2/src/sys/ddb/db_ps.c#2 integrate .. //depot/projects/mips2/src/sys/ddb/db_thread.c#2 integrate .. //depot/projects/mips2/src/sys/ddb/ddb.h#2 integrate .. //depot/projects/mips2/src/sys/dev/aac/aac_cam.c#2 integrate .. //depot/projects/mips2/src/sys/dev/acpica/acpi_perf.c#2 integrate .. //depot/projects/mips2/src/sys/dev/acpica/acpi_thermal.c#2 integrate .. //depot/projects/mips2/src/sys/dev/amr/amr.c#2 integrate .. //depot/projects/mips2/src/sys/dev/asr/MAINTAINER#2 delete .. //depot/projects/mips2/src/sys/dev/ata/ata-chipset.c#3 integrate .. //depot/projects/mips2/src/sys/dev/ata/ata-pci.h#3 integrate .. //depot/projects/mips2/src/sys/dev/ata/ata-queue.c#2 integrate .. //depot/projects/mips2/src/sys/dev/ath/ath_rate/sample/sample.h#2 integrate .. //depot/projects/mips2/src/sys/dev/ath/if_ath.c#2 integrate .. //depot/projects/mips2/src/sys/dev/bce/if_bce.c#2 integrate .. //depot/projects/mips2/src/sys/dev/em/if_em.c#2 integrate .. //depot/projects/mips2/src/sys/dev/em/if_em.h#2 integrate .. //depot/projects/mips2/src/sys/dev/fdc/fdc.c#2 integrate .. //depot/projects/mips2/src/sys/dev/ic/nec765.h#2 integrate .. //depot/projects/mips2/src/sys/dev/iicbus/iic.c#2 integrate .. //depot/projects/mips2/src/sys/dev/iicbus/iic.h#2 integrate .. //depot/projects/mips2/src/sys/dev/iicbus/iicbus.c#2 integrate .. //depot/projects/mips2/src/sys/dev/iicbus/iicbus.h#2 integrate .. //depot/projects/mips2/src/sys/dev/iicbus/iicbus_if.m#2 integrate .. //depot/projects/mips2/src/sys/dev/iicbus/iiconf.c#2 integrate .. //depot/projects/mips2/src/sys/dev/iicbus/iiconf.h#2 integrate .. //depot/projects/mips2/src/sys/dev/isp/isp.c#3 integrate .. //depot/projects/mips2/src/sys/dev/isp/isp_freebsd.c#2 integrate .. //depot/projects/mips2/src/sys/dev/isp/isp_freebsd.h#2 integrate .. //depot/projects/mips2/src/sys/dev/isp/isp_library.c#2 integrate .. //depot/projects/mips2/src/sys/dev/isp/isp_pci.c#3 integrate .. //depot/projects/mips2/src/sys/dev/isp/isp_sbus.c#2 integrate .. //depot/projects/mips2/src/sys/dev/isp/isp_target.c#2 integrate .. //depot/projects/mips2/src/sys/dev/ispfw/asm_1040.h#2 integrate .. //depot/projects/mips2/src/sys/dev/ispfw/asm_1080.h#2 integrate .. //depot/projects/mips2/src/sys/dev/ispfw/asm_12160.h#2 integrate .. //depot/projects/mips2/src/sys/dev/ispfw/ispfw.c#3 integrate .. //depot/projects/mips2/src/sys/dev/iwi/if_iwi.c#2 integrate .. //depot/projects/mips2/src/sys/dev/kbdmux/kbdmux.c#2 integrate .. //depot/projects/mips2/src/sys/dev/lmc/if_lmc.c#2 integrate .. //depot/projects/mips2/src/sys/dev/lmc/if_lmc.h#2 integrate .. //depot/projects/mips2/src/sys/dev/mii/gentbi.c#1 branch .. //depot/projects/mips2/src/sys/dev/mii/ip1000phy.c#1 branch .. //depot/projects/mips2/src/sys/dev/mii/ip1000phyreg.h#1 branch .. //depot/projects/mips2/src/sys/dev/mii/miidevs#2 integrate .. //depot/projects/mips2/src/sys/dev/mpt/mpt.c#2 integrate .. //depot/projects/mips2/src/sys/dev/mpt/mpt.h#2 integrate .. //depot/projects/mips2/src/sys/dev/mpt/mpt_cam.c#2 integrate .. //depot/projects/mips2/src/sys/dev/mpt/mpt_debug.c#2 integrate .. //depot/projects/mips2/src/sys/dev/mpt/mpt_pci.c#2 integrate .. //depot/projects/mips2/src/sys/dev/mpt/mpt_raid.c#2 integrate .. //depot/projects/mips2/src/sys/dev/mpt/mpt_raid.h#2 integrate .. //depot/projects/mips2/src/sys/dev/mxge/if_mxge.c#2 integrate .. //depot/projects/mips2/src/sys/dev/ncv/ncr53c500_pccard.c#2 integrate .. //depot/projects/mips2/src/sys/dev/pccard/pccarddevs#2 integrate .. //depot/projects/mips2/src/sys/dev/pci/pci.c#2 integrate .. //depot/projects/mips2/src/sys/dev/ral/rt2560.c#2 integrate .. //depot/projects/mips2/src/sys/dev/random/probe.c#2 integrate .. //depot/projects/mips2/src/sys/dev/scc/scc_core.c#2 integrate .. //depot/projects/mips2/src/sys/dev/scc/scc_dev_z8530.c#2 integrate .. //depot/projects/mips2/src/sys/dev/sio/sio.c#2 integrate .. //depot/projects/mips2/src/sys/dev/sk/if_sk.c#3 integrate .. //depot/projects/mips2/src/sys/dev/sk/if_skreg.h#2 integrate .. //depot/projects/mips2/src/sys/dev/sound/driver.c#2 integrate .. //depot/projects/mips2/src/sys/dev/sound/midi/sequencer.c#2 integrate .. //depot/projects/mips2/src/sys/dev/sound/pci/cmi.c#2 integrate .. //depot/projects/mips2/src/sys/dev/sound/pci/emu10k1.c#2 integrate .. //depot/projects/mips2/src/sys/dev/sound/pci/emu10kx-midi.c#1 branch .. //depot/projects/mips2/src/sys/dev/sound/pci/emu10kx-pcm.c#1 branch .. //depot/projects/mips2/src/sys/dev/sound/pci/emu10kx.c#1 branch .. //depot/projects/mips2/src/sys/dev/sound/pci/emu10kx.h#1 branch .. //depot/projects/mips2/src/sys/dev/sound/pci/solo.c#2 integrate .. //depot/projects/mips2/src/sys/dev/sound/pcm/buffer.c#2 integrate .. //depot/projects/mips2/src/sys/dev/sound/pcm/buffer.h#2 integrate .. //depot/projects/mips2/src/sys/dev/sound/pcm/mixer.h#2 integrate .. //depot/projects/mips2/src/sys/dev/sound/pcm/sound.c#2 integrate .. //depot/projects/mips2/src/sys/dev/sound/pcm/sound.h#2 integrate .. //depot/projects/mips2/src/sys/dev/spibus/spi.h#1 branch .. //depot/projects/mips2/src/sys/dev/spibus/spibus.c#1 branch .. //depot/projects/mips2/src/sys/dev/spibus/spibus_if.m#1 branch .. //depot/projects/mips2/src/sys/dev/spibus/spibusvar.h#1 branch .. //depot/projects/mips2/src/sys/dev/stg/tmc18c30_subr.c#2 integrate .. //depot/projects/mips2/src/sys/dev/stge/if_stge.c#1 branch .. //depot/projects/mips2/src/sys/dev/stge/if_stgereg.h#1 branch .. //depot/projects/mips2/src/sys/dev/streams/streams.c#2 integrate .. //depot/projects/mips2/src/sys/dev/uart/uart_cpu_powerpc.c#2 integrate .. //depot/projects/mips2/src/sys/dev/uart/uart_dev_z8530.c#2 integrate .. //depot/projects/mips2/src/sys/dev/uart/uart_tty.c#2 integrate .. //depot/projects/mips2/src/sys/dev/usb/if_ural.c#2 integrate .. //depot/projects/mips2/src/sys/dev/usb/uplcom.c#2 integrate .. //depot/projects/mips2/src/sys/dev/usb/usbdevs#2 integrate .. //depot/projects/mips2/src/sys/doc/Doxyfile#2 delete .. //depot/projects/mips2/src/sys/doc/Makefile#2 delete .. //depot/projects/mips2/src/sys/doc/subsys/Dependencies#2 delete .. //depot/projects/mips2/src/sys/doc/subsys/Doxyfile-cam#2 delete .. //depot/projects/mips2/src/sys/doc/subsys/Doxyfile-crypto#2 delete .. //depot/projects/mips2/src/sys/doc/subsys/Doxyfile-dev_pci#2 delete .. //depot/projects/mips2/src/sys/doc/subsys/Doxyfile-dev_sound#2 delete .. //depot/projects/mips2/src/sys/doc/subsys/Doxyfile-dev_usb#2 delete .. //depot/projects/mips2/src/sys/doc/subsys/Doxyfile-geom#2 delete .. //depot/projects/mips2/src/sys/doc/subsys/Doxyfile-i4b#2 delete .. //depot/projects/mips2/src/sys/doc/subsys/Doxyfile-kern#2 delete .. //depot/projects/mips2/src/sys/doc/subsys/Doxyfile-libkern#2 delete .. //depot/projects/mips2/src/sys/doc/subsys/Doxyfile-linux#2 delete .. //depot/projects/mips2/src/sys/doc/subsys/Doxyfile-net80211#2 delete .. //depot/projects/mips2/src/sys/doc/subsys/Doxyfile-netgraph#2 delete .. //depot/projects/mips2/src/sys/doc/subsys/Doxyfile-netinet#2 delete .. //depot/projects/mips2/src/sys/doc/subsys/Doxyfile-netinet6#2 delete .. //depot/projects/mips2/src/sys/doc/subsys/Doxyfile-netipsec#2 delete .. //depot/projects/mips2/src/sys/doc/subsys/Doxyfile-opencrypto#2 delete .. //depot/projects/mips2/src/sys/doc/subsys/Doxyfile-vm#2 delete .. //depot/projects/mips2/src/sys/doc/subsys/Makefile#2 delete .. //depot/projects/mips2/src/sys/doc/subsys/README#2 delete .. //depot/projects/mips2/src/sys/doc/subsys/common-Doxyfile#2 delete .. //depot/projects/mips2/src/sys/doc/subsys/notreviewed.dox#2 delete .. //depot/projects/mips2/src/sys/fs/devfs/devfs_devs.c#2 integrate .. //depot/projects/mips2/src/sys/fs/devfs/devfs_rule.c#2 integrate .. //depot/projects/mips2/src/sys/fs/devfs/devfs_vfsops.c#2 integrate .. //depot/projects/mips2/src/sys/fs/devfs/devfs_vnops.c#2 integrate .. //depot/projects/mips2/src/sys/fs/portalfs/portal_vnops.c#2 integrate .. //depot/projects/mips2/src/sys/fs/smbfs/smbfs_vfsops.c#2 integrate .. //depot/projects/mips2/src/sys/fs/udf/ecma167-udf.h#2 integrate .. //depot/projects/mips2/src/sys/fs/udf/udf_vfsops.c#2 integrate .. //depot/projects/mips2/src/sys/fs/unionfs/union_vnops.c#2 integrate .. //depot/projects/mips2/src/sys/geom/eli/g_eli.c#2 integrate .. //depot/projects/mips2/src/sys/geom/eli/g_eli_integrity.c#2 integrate .. //depot/projects/mips2/src/sys/geom/geom.h#2 integrate .. //depot/projects/mips2/src/sys/geom/mirror/g_mirror.c#3 integrate .. //depot/projects/mips2/src/sys/geom/mirror/g_mirror_ctl.c#2 integrate .. //depot/projects/mips2/src/sys/geom/raid3/g_raid3.c#3 integrate .. //depot/projects/mips2/src/sys/geom/raid3/g_raid3_ctl.c#2 integrate .. //depot/projects/mips2/src/sys/gnu/dev/sound/pci/emu10k1-ac97.h#2 delete .. //depot/projects/mips2/src/sys/gnu/dev/sound/pci/emu10k1-alsa.h#2 integrate .. //depot/projects/mips2/src/sys/gnu/dev/sound/pci/emu10k1.h#2 delete .. //depot/projects/mips2/src/sys/gnu/dev/sound/pci/p16v-alsa.h#1 branch .. //depot/projects/mips2/src/sys/gnu/dev/sound/pci/p17v-alsa.h#1 branch .. //depot/projects/mips2/src/sys/i386/conf/GENERIC#3 integrate .. //depot/projects/mips2/src/sys/i386/conf/PAE#2 integrate .. //depot/projects/mips2/src/sys/i386/i386/db_trace.c#2 integrate .. //depot/projects/mips2/src/sys/i386/i386/identcpu.c#2 integrate .. //depot/projects/mips2/src/sys/i386/i386/initcpu.c#2 integrate .. //depot/projects/mips2/src/sys/i386/i386/intr_machdep.c#2 integrate .. //depot/projects/mips2/src/sys/i386/i386/local_apic.c#2 integrate .. //depot/projects/mips2/src/sys/i386/i386/machdep.c#2 integrate .. //depot/projects/mips2/src/sys/i386/i386/pmap.c#3 integrate .. //depot/projects/mips2/src/sys/i386/i386/trap.c#2 integrate .. //depot/projects/mips2/src/sys/i386/ibcs2/ibcs2_ipc.c#2 integrate .. //depot/projects/mips2/src/sys/i386/ibcs2/ibcs2_ipc.h#2 integrate .. //depot/projects/mips2/src/sys/i386/ibcs2/ibcs2_isc_syscall.h#2 integrate .. //depot/projects/mips2/src/sys/i386/ibcs2/ibcs2_isc_sysent.c#2 integrate .. //depot/projects/mips2/src/sys/i386/ibcs2/ibcs2_misc.c#2 integrate .. //depot/projects/mips2/src/sys/i386/ibcs2/ibcs2_msg.c#2 integrate .. //depot/projects/mips2/src/sys/i386/ibcs2/ibcs2_other.c#2 integrate .. //depot/projects/mips2/src/sys/i386/ibcs2/ibcs2_poll.h#2 delete .. //depot/projects/mips2/src/sys/i386/ibcs2/ibcs2_proto.h#2 integrate .. //depot/projects/mips2/src/sys/i386/ibcs2/ibcs2_syscall.h#2 integrate .. //depot/projects/mips2/src/sys/i386/ibcs2/ibcs2_sysent.c#2 integrate .. //depot/projects/mips2/src/sys/i386/ibcs2/ibcs2_util.h#2 integrate .. //depot/projects/mips2/src/sys/i386/ibcs2/ibcs2_xenix.c#2 integrate .. //depot/projects/mips2/src/sys/i386/ibcs2/ibcs2_xenix.h#2 integrate .. //depot/projects/mips2/src/sys/i386/ibcs2/ibcs2_xenix_syscall.h#2 integrate .. //depot/projects/mips2/src/sys/i386/ibcs2/ibcs2_xenix_sysent.c#2 integrate .. //depot/projects/mips2/src/sys/i386/ibcs2/imgact_coff.c#2 integrate .. //depot/projects/mips2/src/sys/i386/ibcs2/syscalls.isc#2 integrate .. //depot/projects/mips2/src/sys/i386/ibcs2/syscalls.master#2 integrate .. //depot/projects/mips2/src/sys/i386/ibcs2/syscalls.xenix#2 integrate .. //depot/projects/mips2/src/sys/i386/include/i4b_ioctl.h#2 integrate .. //depot/projects/mips2/src/sys/i386/include/md_var.h#2 integrate .. //depot/projects/mips2/src/sys/i386/include/specialreg.h#2 integrate .. //depot/projects/mips2/src/sys/i386/linux/linux_proto.h#2 integrate .. //depot/projects/mips2/src/sys/i386/linux/linux_syscall.h#2 integrate .. //depot/projects/mips2/src/sys/i386/linux/linux_sysent.c#2 integrate .. //depot/projects/mips2/src/sys/i386/linux/syscalls.master#2 integrate .. //depot/projects/mips2/src/sys/i4b/layer4/i4b_l4mgmt.c#2 integrate .. //depot/projects/mips2/src/sys/ia64/conf/DEFAULTS#2 integrate .. //depot/projects/mips2/src/sys/ia64/conf/GENERIC#2 integrate .. //depot/projects/mips2/src/sys/ia64/ia32/ia32_trap.c#2 integrate .. //depot/projects/mips2/src/sys/ia64/ia64/db_machdep.c#2 integrate .. //depot/projects/mips2/src/sys/ia64/ia64/trap.c#2 integrate .. //depot/projects/mips2/src/sys/isa/isahint.c#2 integrate .. //depot/projects/mips2/src/sys/kern/bus_if.m#2 integrate .. //depot/projects/mips2/src/sys/kern/init_sysent.c#3 integrate .. //depot/projects/mips2/src/sys/kern/kern_acl.c#2 integrate .. //depot/projects/mips2/src/sys/kern/kern_descrip.c#2 integrate .. //depot/projects/mips2/src/sys/kern/kern_environment.c#2 integrate .. //depot/projects/mips2/src/sys/kern/kern_intr.c#2 integrate .. //depot/projects/mips2/src/sys/kern/kern_ktr.c#2 integrate .. //depot/projects/mips2/src/sys/kern/kern_linker.c#2 integrate .. //depot/projects/mips2/src/sys/kern/kern_lock.c#2 integrate .. //depot/projects/mips2/src/sys/kern/kern_mac.c#2 integrate .. //depot/projects/mips2/src/sys/kern/kern_malloc.c#2 integrate .. //depot/projects/mips2/src/sys/kern/kern_mutex.c#2 integrate .. //depot/projects/mips2/src/sys/kern/kern_prot.c#2 integrate .. //depot/projects/mips2/src/sys/kern/kern_rwlock.c#2 integrate .. //depot/projects/mips2/src/sys/kern/kern_sx.c#2 integrate .. //depot/projects/mips2/src/sys/kern/kern_thr.c#2 integrate .. //depot/projects/mips2/src/sys/kern/kern_uuid.c#2 integrate .. //depot/projects/mips2/src/sys/kern/link_elf.c#2 integrate .. //depot/projects/mips2/src/sys/kern/subr_acl_posix1e.c#2 integrate .. //depot/projects/mips2/src/sys/kern/subr_autoconf.c#2 integrate .. //depot/projects/mips2/src/sys/kern/subr_bus.c#2 integrate .. //depot/projects/mips2/src/sys/kern/subr_hints.c#2 integrate .. //depot/projects/mips2/src/sys/kern/subr_prf.c#2 integrate .. //depot/projects/mips2/src/sys/kern/subr_turnstile.c#2 integrate .. //depot/projects/mips2/src/sys/kern/sys_generic.c#2 integrate .. //depot/projects/mips2/src/sys/kern/sys_socket.c#2 integrate .. //depot/projects/mips2/src/sys/kern/syscalls.c#3 integrate .. //depot/projects/mips2/src/sys/kern/syscalls.master#3 integrate .. //depot/projects/mips2/src/sys/kern/sysv_sem.c#2 integrate .. //depot/projects/mips2/src/sys/kern/uipc_domain.c#2 integrate .. //depot/projects/mips2/src/sys/kern/uipc_sockbuf.c#1 branch .. //depot/projects/mips2/src/sys/kern/uipc_socket.c#2 integrate .. //depot/projects/mips2/src/sys/kern/uipc_socket2.c#2 integrate .. //depot/projects/mips2/src/sys/kern/uipc_syscalls.c#2 integrate .. //depot/projects/mips2/src/sys/kern/uipc_usrreq.c#2 integrate .. //depot/projects/mips2/src/sys/kern/vfs_bio.c#4 integrate .. //depot/projects/mips2/src/sys/kern/vfs_subr.c#3 integrate .. //depot/projects/mips2/src/sys/kern/vfs_syscalls.c#2 integrate .. //depot/projects/mips2/src/sys/modules/Makefile#2 integrate .. //depot/projects/mips2/src/sys/modules/agp/Makefile#2 integrate .. //depot/projects/mips2/src/sys/modules/asr/Makefile#2 integrate .. //depot/projects/mips2/src/sys/modules/bridgestp/Makefile#1 branch .. //depot/projects/mips2/src/sys/modules/hwpmc/Makefile#2 integrate .. //depot/projects/mips2/src/sys/modules/if_bridge/Makefile#2 integrate .. //depot/projects/mips2/src/sys/modules/ispfw/Makefile#2 integrate .. //depot/projects/mips2/src/sys/modules/ispfw/isp_1000/Makefile#1 branch .. //depot/projects/mips2/src/sys/modules/ispfw/isp_1040/Makefile#1 branch .. //depot/projects/mips2/src/sys/modules/ispfw/isp_1040_it/Makefile#1 branch .. //depot/projects/mips2/src/sys/modules/ispfw/isp_1080/Makefile#1 branch .. //depot/projects/mips2/src/sys/modules/ispfw/isp_1080_it/Makefile#1 branch .. //depot/projects/mips2/src/sys/modules/ispfw/isp_12160/Makefile#1 branch .. //depot/projects/mips2/src/sys/modules/ispfw/isp_12160_it/Makefile#1 branch .. //depot/projects/mips2/src/sys/modules/ispfw/isp_2100/Makefile#1 branch .. //depot/projects/mips2/src/sys/modules/ispfw/isp_2200/Makefile#1 branch .. //depot/projects/mips2/src/sys/modules/ispfw/isp_2300/Makefile#1 branch .. //depot/projects/mips2/src/sys/modules/ispfw/isp_2322/Makefile#1 branch .. //depot/projects/mips2/src/sys/modules/ispfw/ispfw/Makefile#1 branch .. //depot/projects/mips2/src/sys/modules/mii/Makefile#2 integrate .. //depot/projects/mips2/src/sys/modules/osf1/Makefile#2 delete .. //depot/projects/mips2/src/sys/modules/padlock/Makefile#2 integrate .. //depot/projects/mips2/src/sys/modules/sound/driver/Makefile#2 integrate .. //depot/projects/mips2/src/sys/modules/sound/driver/emu10kx/Makefile#1 branch .. //depot/projects/mips2/src/sys/modules/stge/Makefile#1 branch .. //depot/projects/mips2/src/sys/net/bpf.c#3 integrate .. //depot/projects/mips2/src/sys/net/bridgestp.c#2 integrate .. //depot/projects/mips2/src/sys/net/bridgestp.h#1 branch .. //depot/projects/mips2/src/sys/net/if.c#2 integrate .. //depot/projects/mips2/src/sys/net/if_bridge.c#2 integrate .. //depot/projects/mips2/src/sys/net/if_bridgevar.h#2 integrate .. //depot/projects/mips2/src/sys/net/if_clone.c#2 integrate .. //depot/projects/mips2/src/sys/net/if_clone.h#2 integrate .. //depot/projects/mips2/src/sys/net/if_disc.c#2 integrate .. //depot/projects/mips2/src/sys/net/if_enc.c#3 integrate .. //depot/projects/mips2/src/sys/net/if_ethersubr.c#2 integrate .. //depot/projects/mips2/src/sys/net/if_faith.c#2 integrate .. //depot/projects/mips2/src/sys/net/if_gif.c#2 integrate .. //depot/projects/mips2/src/sys/net/if_gre.c#2 integrate .. //depot/projects/mips2/src/sys/net/if_loop.c#2 integrate .. //depot/projects/mips2/src/sys/net/if_ppp.c#2 integrate .. //depot/projects/mips2/src/sys/net/if_spppsubr.c#2 integrate .. //depot/projects/mips2/src/sys/net/if_stf.c#2 integrate .. //depot/projects/mips2/src/sys/net/if_tap.c#2 integrate .. //depot/projects/mips2/src/sys/net/if_vlan.c#2 integrate .. //depot/projects/mips2/src/sys/net/raw_usrreq.c#2 integrate .. //depot/projects/mips2/src/sys/net/rtsock.c#2 integrate .. //depot/projects/mips2/src/sys/net80211/ieee80211.c#2 integrate .. //depot/projects/mips2/src/sys/net80211/ieee80211.h#2 integrate .. //depot/projects/mips2/src/sys/net80211/ieee80211_freebsd.h#2 integrate .. //depot/projects/mips2/src/sys/net80211/ieee80211_input.c#2 integrate .. //depot/projects/mips2/src/sys/net80211/ieee80211_ioctl.c#2 integrate .. //depot/projects/mips2/src/sys/net80211/ieee80211_ioctl.h#2 integrate .. //depot/projects/mips2/src/sys/net80211/ieee80211_output.c#2 integrate .. //depot/projects/mips2/src/sys/net80211/ieee80211_proto.c#2 integrate .. //depot/projects/mips2/src/sys/net80211/ieee80211_proto.h#2 integrate .. //depot/projects/mips2/src/sys/net80211/ieee80211_var.h#2 integrate .. //depot/projects/mips2/src/sys/netatalk/ddp_usrreq.c#2 integrate .. //depot/projects/mips2/src/sys/netatm/atm_aal5.c#2 integrate .. //depot/projects/mips2/src/sys/netatm/atm_usrreq.c#2 integrate .. //depot/projects/mips2/src/sys/netgraph/bluetooth/include/ng_btsocket_hci_raw.h#2 integrate .. //depot/projects/mips2/src/sys/netgraph/bluetooth/include/ng_btsocket_l2cap.h#2 integrate .. //depot/projects/mips2/src/sys/netgraph/bluetooth/include/ng_btsocket_rfcomm.h#2 integrate .. //depot/projects/mips2/src/sys/netgraph/bluetooth/socket/ng_btsocket.c#2 integrate .. //depot/projects/mips2/src/sys/netgraph/bluetooth/socket/ng_btsocket_hci_raw.c#2 integrate .. //depot/projects/mips2/src/sys/netgraph/bluetooth/socket/ng_btsocket_l2cap.c#2 integrate .. //depot/projects/mips2/src/sys/netgraph/bluetooth/socket/ng_btsocket_l2cap_raw.c#2 integrate .. //depot/projects/mips2/src/sys/netgraph/bluetooth/socket/ng_btsocket_rfcomm.c#2 integrate .. //depot/projects/mips2/src/sys/netgraph/ng_ether.c#2 integrate .. //depot/projects/mips2/src/sys/netgraph/ng_ksocket.c#2 integrate .. //depot/projects/mips2/src/sys/netgraph/ng_socket.c#2 integrate .. //depot/projects/mips2/src/sys/netinet/in_pcb.c#2 integrate .. //depot/projects/mips2/src/sys/netinet/in_pcb.h#2 integrate .. //depot/projects/mips2/src/sys/netinet/in_rmx.c#2 integrate .. //depot/projects/mips2/src/sys/netinet/ip_carp.c#2 integrate .. //depot/projects/mips2/src/sys/netinet/ip_divert.c#2 integrate .. //depot/projects/mips2/src/sys/netinet/ip_ipsec.c#2 integrate .. //depot/projects/mips2/src/sys/netinet/raw_ip.c#2 integrate .. //depot/projects/mips2/src/sys/netinet/tcp_subr.c#2 integrate .. //depot/projects/mips2/src/sys/netinet/tcp_usrreq.c#2 integrate .. //depot/projects/mips2/src/sys/netinet/udp_usrreq.c#2 integrate .. //depot/projects/mips2/src/sys/netinet6/README#2 delete .. //depot/projects/mips2/src/sys/netinet6/icmp6.c#2 integrate .. //depot/projects/mips2/src/sys/netinet6/in6_pcb.c#2 integrate .. //depot/projects/mips2/src/sys/netinet6/in6_rmx.c#2 integrate .. //depot/projects/mips2/src/sys/netinet6/raw_ip6.c#2 integrate .. //depot/projects/mips2/src/sys/netinet6/udp6_usrreq.c#2 integrate .. //depot/projects/mips2/src/sys/netipsec/keysock.c#2 integrate .. //depot/projects/mips2/src/sys/netipx/ipx_usrreq.c#2 integrate .. //depot/projects/mips2/src/sys/netipx/spx_usrreq.c#2 integrate .. //depot/projects/mips2/src/sys/netkey/keysock.c#2 integrate .. //depot/projects/mips2/src/sys/netnatm/natm.c#2 integrate .. //depot/projects/mips2/src/sys/netncp/ncp_sock.c#2 integrate .. //depot/projects/mips2/src/sys/netsmb/smb_conn.c#2 integrate .. //depot/projects/mips2/src/sys/netsmb/smb_trantcp.c#2 integrate .. //depot/projects/mips2/src/sys/nfs4client/nfs4_vnops.c#2 integrate .. //depot/projects/mips2/src/sys/nfsclient/nfs_socket.c#2 integrate .. //depot/projects/mips2/src/sys/nfsclient/nfs_vnops.c#2 integrate .. //depot/projects/mips2/src/sys/nfsserver/nfs_srvsock.c#2 integrate .. //depot/projects/mips2/src/sys/pc98/conf/GENERIC#2 integrate .. //depot/projects/mips2/src/sys/pc98/pc98/machdep.c#2 integrate .. //depot/projects/mips2/src/sys/posix4/ksched.c#2 integrate .. //depot/projects/mips2/src/sys/posix4/p1003_1b.c#2 integrate .. //depot/projects/mips2/src/sys/posix4/posix4.h#2 integrate .. //depot/projects/mips2/src/sys/powerpc/conf/GENERIC#2 integrate .. //depot/projects/mips2/src/sys/powerpc/conf/NOTES#2 integrate .. //depot/projects/mips2/src/sys/powerpc/include/md_var.h#2 integrate .. //depot/projects/mips2/src/sys/powerpc/include/ofw_machdep.h#2 integrate .. //depot/projects/mips2/src/sys/powerpc/include/pcb.h#2 integrate .. //depot/projects/mips2/src/sys/powerpc/powerpc/clock.c#2 integrate .. //depot/projects/mips2/src/sys/powerpc/powerpc/db_trace.c#2 integrate .. //depot/projects/mips2/src/sys/powerpc/powerpc/mem.c#2 integrate .. //depot/projects/mips2/src/sys/powerpc/powerpc/mmu_oea.c#2 integrate .. //depot/projects/mips2/src/sys/powerpc/powerpc/ofw_machdep.c#2 integrate .. //depot/projects/mips2/src/sys/powerpc/powerpc/trap.c#2 integrate .. //depot/projects/mips2/src/sys/powerpc/psim/sio_iobus.c#2 delete .. //depot/projects/mips2/src/sys/powerpc/psim/uart_iobus.c#1 branch .. //depot/projects/mips2/src/sys/security/audit/audit_bsm.c#2 integrate .. //depot/projects/mips2/src/sys/security/mac/mac_vfs.c#2 integrate .. //depot/projects/mips2/src/sys/security/mac_biba/mac_biba.c#2 integrate .. //depot/projects/mips2/src/sys/sparc64/conf/GENERIC#2 integrate .. //depot/projects/mips2/src/sys/sparc64/include/pmap.h#2 integrate .. //depot/projects/mips2/src/sys/sparc64/sparc64/db_trace.c#2 integrate .. //depot/projects/mips2/src/sys/sparc64/sparc64/trap.c#2 integrate .. //depot/projects/mips2/src/sys/sys/_label.h#2 integrate .. //depot/projects/mips2/src/sys/sys/bufobj.h#2 integrate .. //depot/projects/mips2/src/sys/sys/bus.h#2 integrate .. //depot/projects/mips2/src/sys/sys/extattr.h#2 integrate .. //depot/projects/mips2/src/sys/sys/libkern.h#2 integrate .. //depot/projects/mips2/src/sys/sys/mbuf.h#2 integrate .. //depot/projects/mips2/src/sys/sys/mutex.h#2 integrate .. //depot/projects/mips2/src/sys/sys/param.h#2 integrate .. //depot/projects/mips2/src/sys/sys/protosw.h#2 integrate .. //depot/projects/mips2/src/sys/sys/socket.h#2 integrate .. //depot/projects/mips2/src/sys/sys/socketvar.h#2 integrate .. //depot/projects/mips2/src/sys/sys/sockio.h#2 integrate .. //depot/projects/mips2/src/sys/sys/syscall.h#3 integrate .. //depot/projects/mips2/src/sys/sys/syscall.mk#3 integrate .. //depot/projects/mips2/src/sys/sys/syscallsubr.h#2 integrate .. //depot/projects/mips2/src/sys/sys/sysctl.h#2 integrate .. //depot/projects/mips2/src/sys/sys/sysproto.h#3 integrate .. //depot/projects/mips2/src/sys/sys/systm.h#2 integrate .. //depot/projects/mips2/src/sys/sys/thr.h#2 integrate .. //depot/projects/mips2/src/sys/sys/unpcb.h#2 integrate .. //depot/projects/mips2/src/sys/ufs/ffs/ffs_alloc.c#2 integrate .. //depot/projects/mips2/src/sys/ufs/ffs/ffs_vfsops.c#2 integrate .. //depot/projects/mips2/src/sys/ufs/ufs/ufs_lookup.c#2 integrate .. //depot/projects/mips2/src/sys/vm/pmap.h#2 integrate .. //depot/projects/mips2/src/sys/vm/uma_core.c#2 integrate .. //depot/projects/mips2/src/sys/vm/vm.h#2 integrate .. //depot/projects/mips2/src/sys/vm/vm_fault.c#2 integrate .. //depot/projects/mips2/src/sys/vm/vm_map.c#2 integrate .. //depot/projects/mips2/src/sys/vm/vm_meter.c#2 integrate .. //depot/projects/mips2/src/sys/vm/vm_object.c#2 integrate .. //depot/projects/mips2/src/sys/vm/vm_object.h#2 integrate .. //depot/projects/mips2/src/sys/vm/vm_page.c#2 integrate .. //depot/projects/mips2/src/tools/kerneldoc/Doxyfile#2 integrate .. //depot/projects/mips2/src/tools/kerneldoc/Makefile#2 integrate .. //depot/projects/mips2/src/tools/kerneldoc/subsys/Dependencies#2 integrate .. //depot/projects/mips2/src/tools/kerneldoc/subsys/Doxyfile-cam#2 integrate .. //depot/projects/mips2/src/tools/kerneldoc/subsys/Doxyfile-crypto#2 integrate .. //depot/projects/mips2/src/tools/kerneldoc/subsys/Doxyfile-dev_pci#2 integrate .. //depot/projects/mips2/src/tools/kerneldoc/subsys/Doxyfile-dev_sound#2 integrate .. //depot/projects/mips2/src/tools/kerneldoc/subsys/Doxyfile-dev_usb#2 integrate .. //depot/projects/mips2/src/tools/kerneldoc/subsys/Doxyfile-geom#2 integrate .. //depot/projects/mips2/src/tools/kerneldoc/subsys/Doxyfile-i4b#2 integrate .. //depot/projects/mips2/src/tools/kerneldoc/subsys/Doxyfile-kern#2 integrate .. //depot/projects/mips2/src/tools/kerneldoc/subsys/Doxyfile-libkern#2 integrate .. //depot/projects/mips2/src/tools/kerneldoc/subsys/Doxyfile-linux#2 integrate .. //depot/projects/mips2/src/tools/kerneldoc/subsys/Doxyfile-net80211#2 integrate .. //depot/projects/mips2/src/tools/kerneldoc/subsys/Doxyfile-netgraph#2 integrate .. //depot/projects/mips2/src/tools/kerneldoc/subsys/Doxyfile-netinet#2 integrate .. //depot/projects/mips2/src/tools/kerneldoc/subsys/Doxyfile-netinet6#2 integrate .. //depot/projects/mips2/src/tools/kerneldoc/subsys/Doxyfile-netipsec#2 integrate .. //depot/projects/mips2/src/tools/kerneldoc/subsys/Doxyfile-opencrypto#2 integrate .. //depot/projects/mips2/src/tools/kerneldoc/subsys/Doxyfile-vm#2 integrate .. //depot/projects/mips2/src/tools/kerneldoc/subsys/Makefile#2 integrate .. //depot/projects/mips2/src/tools/kerneldoc/subsys/README#2 integrate .. //depot/projects/mips2/src/tools/kerneldoc/subsys/common-Doxyfile#2 integrate .. //depot/projects/mips2/src/tools/kerneldoc/subsys/notreviewed.dox#2 integrate .. //depot/projects/mips2/src/tools/regression/fifo/fifo_create/Makefile#2 integrate .. //depot/projects/mips2/src/tools/regression/fifo/fifo_io/Makefile#2 integrate .. //depot/projects/mips2/src/tools/regression/fifo/fifo_misc/Makefile#2 integrate .. //depot/projects/mips2/src/tools/regression/fifo/fifo_open/Makefile#2 integrate .. //depot/projects/mips2/src/tools/regression/file/ftruncate/Makefile#1 branch .. //depot/projects/mips2/src/tools/regression/file/ftruncate/ftruncate.c#1 branch .. //depot/projects/mips2/src/tools/regression/ia64/emulated/brl.t#1 branch .. //depot/projects/mips2/src/tools/regression/ia64/emulated/test.c#1 branch .. //depot/projects/mips2/src/tools/regression/netinet/msocket_ifnet_remove/Makefile#2 integrate .. //depot/projects/mips2/src/tools/regression/netinet/tcpdrop/Makefile#2 integrate .. //depot/projects/mips2/src/tools/regression/netinet/tcpsockclosebeforeaccept/Makefile#2 integrate .. //depot/projects/mips2/src/tools/regression/netinet/tcpsocktimewait/Makefile#2 integrate .. //depot/projects/mips2/src/tools/regression/netinet6/ip6_sockets/Makefile#1 branch .. //depot/projects/mips2/src/tools/regression/netinet6/ip6_sockets/ip6_sockets.c#1 branch .. //depot/projects/mips2/src/tools/regression/netipx/ipxdgramloopback/Makefile#2 integrate .. //depot/projects/mips2/src/tools/regression/netipx/spxabort/Makefile#2 integrate .. //depot/projects/mips2/src/tools/regression/netipx/spxloopback/Makefile#2 integrate .. //depot/projects/mips2/src/tools/regression/sockets/listen_backlog/Makefile#2 integrate .. //depot/projects/mips2/src/tools/regression/sockets/rtsocket/Makefile#2 integrate .. //depot/projects/mips2/src/tools/regression/sockets/sendfile/Makefile#2 integrate .. //depot/projects/mips2/src/tools/regression/sockets/socketpair/Makefile#2 integrate .. //depot/projects/mips2/src/tools/regression/sockets/unix_bindconnect/Makefile#2 integrate .. //depot/projects/mips2/src/tools/regression/sockets/unix_passfd/Makefile#2 integrate .. //depot/projects/mips2/src/tools/regression/sockets/unix_socket/Makefile#2 integrate .. //depot/projects/mips2/src/tools/regression/ufs/uprintf/Makefile#2 integrate .. //depot/projects/mips2/src/tools/tools/nanobsd/FlashDevice.sub#2 integrate .. //depot/projects/mips2/src/tools/tools/nanobsd/nanobsd.sh#2 integrate .. //depot/projects/mips2/src/usr.bin/calendar/day.c#2 integrate .. //depot/projects/mips2/src/usr.bin/col/col.c#2 integrate .. //depot/projects/mips2/src/usr.bin/ctags/ctags.c#2 integrate .. //depot/projects/mips2/src/usr.bin/enigma/enigma.c#2 integrate .. //depot/projects/mips2/src/usr.bin/find/find.1#2 integrate .. //depot/projects/mips2/src/usr.bin/ftp/Makefile#2 integrate .. //depot/projects/mips2/src/usr.bin/kdump/kdump.c#2 integrate .. //depot/projects/mips2/src/usr.bin/kdump/mksubr#2 integrate .. //depot/projects/mips2/src/usr.bin/logger/Makefile#2 integrate .. //depot/projects/mips2/src/usr.bin/look/look.c#2 integrate .. //depot/projects/mips2/src/usr.bin/make/main.c#2 integrate .. //depot/projects/mips2/src/usr.bin/make/parse.c#2 integrate .. //depot/projects/mips2/src/usr.bin/make/var.c#2 integrate .. //depot/projects/mips2/src/usr.bin/netstat/inet6.c#2 integrate .. //depot/projects/mips2/src/usr.bin/netstat/route.c#2 integrate .. //depot/projects/mips2/src/usr.bin/rpcinfo/Makefile#2 integrate .. //depot/projects/mips2/src/usr.bin/systat/Makefile#2 integrate .. //depot/projects/mips2/src/usr.bin/systat/mbufs.c#2 integrate .. //depot/projects/mips2/src/usr.bin/telnet/Makefile#2 integrate .. //depot/projects/mips2/src/usr.bin/truss/i386-fbsd.c#2 integrate .. //depot/projects/mips2/src/usr.sbin/Makefile#2 integrate .. //depot/projects/mips2/src/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_device_tbl.c#2 integrate .. //depot/projects/mips2/src/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_diskstorage_tbl.c#2 integrate .. //depot/projects/mips2/src/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_fs_tbl.c#2 integrate .. //depot/projects/mips2/src/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_network_tbl.c#2 integrate .. //depot/projects/mips2/src/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_partition_tbl.c#2 integrate .. //depot/projects/mips2/src/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_printer_tbl.c#2 integrate .. //depot/projects/mips2/src/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_processor_tbl.c#2 integrate .. //depot/projects/mips2/src/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_snmp.h#2 integrate .. //depot/projects/mips2/src/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_storage_tbl.c#2 integrate .. //depot/projects/mips2/src/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_swinstalled_tbl.c#2 integrate .. //depot/projects/mips2/src/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_swrun_tbl.c#2 integrate .. //depot/projects/mips2/src/usr.sbin/config/config.y#2 integrate .. //depot/projects/mips2/src/usr.sbin/config/mkmakefile.c#2 integrate .. //depot/projects/mips2/src/usr.sbin/cron/cron/cron.c#2 integrate .. //depot/projects/mips2/src/usr.sbin/fdread/fdread.c#2 integrate .. //depot/projects/mips2/src/usr.sbin/i4b/isdnd/controller.c#2 integrate .. //depot/projects/mips2/src/usr.sbin/i4b/isdnd/main.c#2 integrate .. //depot/projects/mips2/src/usr.sbin/i4b/isdndebug/main.c#2 integrate .. //depot/projects/mips2/src/usr.sbin/i4b/isdnmonitor/main.c#2 integrate .. //depot/projects/mips2/src/usr.sbin/i4b/isdnphone/main.c#2 integrate .. //depot/projects/mips2/src/usr.sbin/i4b/isdntelctl/main.c#2 integrate .. //depot/projects/mips2/src/usr.sbin/i4b/isdntest/main.c#2 integrate .. //depot/projects/mips2/src/usr.sbin/inetd/Makefile#2 integrate .. //depot/projects/mips2/src/usr.sbin/lpr/Makefile.inc#2 integrate .. //depot/projects/mips2/src/usr.sbin/lpr/lpd/printjob.c#2 integrate .. //depot/projects/mips2/src/usr.sbin/mld6query/Makefile#2 integrate .. //depot/projects/mips2/src/usr.sbin/mountd/mountd.c#2 integrate .. //depot/projects/mips2/src/usr.sbin/moused/moused.c#2 integrate .. //depot/projects/mips2/src/usr.sbin/ndp/Makefile#2 integrate .. //depot/projects/mips2/src/usr.sbin/newsyslog/newsyslog.c#2 integrate .. //depot/projects/mips2/src/usr.sbin/newsyslog/newsyslog.conf.5#2 integrate .. //depot/projects/mips2/src/usr.sbin/ngctl/config.c#2 integrate .. //depot/projects/mips2/src/usr.sbin/ngctl/debug.c#2 integrate .. //depot/projects/mips2/src/usr.sbin/ngctl/mkpeer.c#2 integrate .. //depot/projects/mips2/src/usr.sbin/ngctl/name.c#2 integrate .. //depot/projects/mips2/src/usr.sbin/ngctl/status.c#2 integrate .. //depot/projects/mips2/src/usr.sbin/ngctl/types.c#2 integrate .. //depot/projects/mips2/src/usr.sbin/pkg_install/lib/url.c#2 integrate .. //depot/projects/mips2/src/usr.sbin/rip6query/Makefile#2 integrate .. //depot/projects/mips2/src/usr.sbin/route6d/Makefile#2 integrate .. //depot/projects/mips2/src/usr.sbin/rrenumd/Makefile#2 integrate .. //depot/projects/mips2/src/usr.sbin/rtadvd/Makefile#2 integrate .. //depot/projects/mips2/src/usr.sbin/rtsold/Makefile#2 integrate .. //depot/projects/mips2/src/usr.sbin/sysinstall/devices.c#2 integrate .. //depot/projects/mips2/src/usr.sbin/sysinstall/install.c#2 integrate .. //depot/projects/mips2/src/usr.sbin/sysinstall/main.c#2 integrate .. //depot/projects/mips2/src/usr.sbin/sysinstall/misc.c#2 integrate .. //depot/projects/mips2/src/usr.sbin/sysinstall/sysinstall.h#2 integrate .. //depot/projects/mips2/src/usr.sbin/syslogd/Makefile#2 integrate .. //depot/projects/mips2/src/usr.sbin/traceroute6/Makefile#2 integrate .. //depot/projects/mips2/src/usr.sbin/trpt/Makefile#2 integrate .. //depot/projects/mips2/src/usr.sbin/trpt/trpt.c#2 integrate Differences ... ==== //depot/projects/mips2/src/MAINTAINERS#3 (text+ko) ==== @@ -1,4 +1,4 @@ -$FreeBSD: src/MAINTAINERS,v 1.137 2006/07/04 02:01:48 brooks Exp $ +$FreeBSD: src/MAINTAINERS,v 1.139 2006/07/11 06:09:54 mjacob Exp $ Please note that the content of this file is strictly advisory. No locks listed here are valid. The only strict review requirements @@ -51,7 +51,6 @@ pass(4) ken Pre-commit review requested. ch(4) ken Pre-commit review requested. isp(4) mjacob Pre-commit review requested. -mpt(4) mjacob Pre-commit review requested. em(4) tackerman Pre-commit review requested. tdfx(4) cokane Just keep me informed of changes, try not to break it. sendmail gshapiro Pre-commit review requested. @@ -135,11 +134,7 @@ List below generated with: $ cd /usr/src; find */* -type f|xargs egrep 'MAINTAINER[ ]*=' -bin/dd/Makefile:MAINTAINER= green@FreeBSD.org -games/fortune/datfiles/Makefile:MAINTAINER= jkh -gnu/usr.bin/man/apropos/Makefile:MAINTAINER= wosch sys/modules/3dfx/Makefile:MAINTAINER= cokane@FreeBSD.org sys/modules/urio/Makefile:MAINTAINER= Iwasa Kazmi tools/tools/sysdoc/Makefile:MAINTAINER= trhodes@FreeBSD.org -usr.bin/locate/Makefile:MAINTAINER= wosch usr.sbin/zic/Makefile:MAINTAINER= wollman@FreeBSD.org ==== //depot/projects/mips2/src/ObsoleteFiles.inc#2 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/ObsoleteFiles.inc,v 1.37 2006/05/20 00:30:06 marcel Exp $ +# $FreeBSD: src/ObsoleteFiles.inc,v 1.41 2006/07/08 03:22:44 avatar Exp $ # # This file lists old files (OLD_FILES), libraries (OLD_LIBS) and # directories (OLD_DIRS) which should get removed at an update. Recently @@ -594,6 +594,8 @@ OLD_FILES+=usr/share/man/man1aout/strip.1aout.gz OLD_FILES+=bin/mountd OLD_FILES+=bin/nfsd +# 20020707 sbin/nfsd -> usr.sbin/nfsd +OLD_FILES+=sbin/nfsd # 200206XX OLD_FILES+=usr/lib/libpam_ssh.a OLD_FILES+=usr/lib/libpam_ssh_p.a @@ -622,6 +624,9 @@ OLD_FILES+=usr/bin/find2perl OLD_FILES+=usr/sbin/pkg_update OLD_FILES+=usr/sbin/scriptdump +# 20020409 GC kget(1), userconfig is long dead. +OLD_FILES+=sbin/kget +OLD_FILES+=usr/share/man/man8/kget.8.gz # 200203XX OLD_FILES+=usr/lib/libss.a OLD_FILES+=usr/lib/libss_p.a @@ -649,6 +654,9 @@ OLD_FILES+=usr/sbin/stlstty OLD_FILES+=usr/sbin/ispppcontrol OLD_FILES+=usr/sbin/rndcontrol +# 20010523 mount_portal -> mount_portalfs +OLD_FILES+=sbin/mount_portal +OLD_FILES+=usr/share/man/man8/mount_portal.8.gz # 200104XX OLD_FILES+=usr/lib/libdescrypt.a OLD_FILES+=usr/lib/libscrypt.a @@ -2717,6 +2725,11 @@ OLD_FILES+=usr/games/worms OLD_FILES+=usr/games/wump +# 20060521: gethostbyaddr(3) ABI change +OLD_LIBS+=usr/lib/libroken.so.8 +OLD_LIBS+=lib/libatm.so.3 +OLD_LIBS+=lib/libc.so.6 +OLD_LIBS+=lib/libutil.so.5 # 20060413: shared library moved to /usr/lib OLD_LIBS+=lib/libgpib.so.1 # 20060127: revert libdisk to static-only ==== //depot/projects/mips2/src/UPDATING#2 (text+ko) ==== @@ -21,6 +21,19 @@ developers choose to disable these features on build machines to maximize performance. +20060725: + enigma(1)/crypt(1) utility has been changed on 64 bit architectures. + Now it can decrypt files created from different architectures. + Unfortunately, it is no longer able to decrypt a cipher text + generated with an older version on 64 bit architectures. + If you have such a file, you need old utility to decrypt it. + +20060709: + The interface version of the i4b kernel part has changed. So + after updating the kernel sources and compiling a new kernel, + the i4b user space tools in "/usr/src/usr.sbin/i4b" must also + be rebuilt, and vice versa. + 20060627: The XBOX kernel now defaults to the nfe(4) driver instead of the nve(4) driver. Please update your configuration @@ -585,4 +598,4 @@ Contact Warner Losh if you have any questions about your use of this document. -$FreeBSD: src/UPDATING,v 1.450 2006/06/27 20:22:32 rink Exp $ +$FreeBSD: src/UPDATING,v 1.452 2006/07/26 16:31:10 jkim Exp $ ==== //depot/projects/mips2/src/bin/dd/Makefile#2 (text+ko) ==== @@ -1,7 +1,5 @@ # @(#)Makefile 8.1 (Berkeley) 5/31/93 -# $FreeBSD: src/bin/dd/Makefile,v 1.18 2004/04/09 07:13:27 njl Exp $ - -MAINTAINER= green@FreeBSD.org +# $FreeBSD: src/bin/dd/Makefile,v 1.19 2006/07/09 21:47:37 markm Exp $ PROG= dd SRCS= args.c conv.c conv_tab.c dd.c misc.c position.c ==== //depot/projects/mips2/src/bin/sh/sh.1#2 (text+ko) ==== @@ -30,9 +30,9 @@ .\" SUCH DAMAGE. .\" .\" from: @(#)sh.1 8.6 (Berkeley) 5/4/95 -.\" $FreeBSD: src/bin/sh/sh.1,v 1.120 2006/06/21 12:01:52 yar Exp $ +.\" $FreeBSD: src/bin/sh/sh.1,v 1.121 2006/07/26 06:48:18 yar Exp $ .\" -.Dd June 21, 2006 +.Dd July 26, 2006 .Dt SH 1 .Os .Sh NAME @@ -1361,9 +1361,8 @@ are built-in because they need to perform some operation that cannot be performed by a separate process. In addition to -these, a built-in version of the -.Xr test 1 -command is provided for efficiency. +these, built-in versions of essential utilities +are provided for efficiency. .Bl -tag -width indent .It Ic \&: A null command that returns a 0 (true) exit value. @@ -1385,6 +1384,9 @@ If it is not found in the .Ev PATH , it is sought in the current working directory. +.It Ic \&[ +A built-in equivalent of +.Xr test 1 . .It Ic alias Oo Ar name Ns Oo = Ns Ar string Oc ... Oc If .Ar name Ns = Ns Ar string @@ -1961,6 +1963,9 @@ the value of $2 to the value of $3, and so on, decreasing the value of $# by one. If there are zero positional parameters, shifting does not do anything. +.It Ic test +A built-in equivalent of +.Xr test 1 . .It Ic times Print the amount of time spent executing the shell and its children. The first output line shows the user and system times for the shell ==== //depot/projects/mips2/src/bin/test/test.1#2 (text+ko) ==== @@ -30,9 +30,9 @@ .\" SUCH DAMAGE. .\" .\" @(#)test.1 8.1 (Berkeley) 5/31/93 -.\" $FreeBSD: src/bin/test/test.1,v 1.23 2005/01/10 08:39:26 imp Exp $ +.\" $FreeBSD: src/bin/test/test.1,v 1.24 2006/07/27 19:08:21 yar Exp $ .\" -.Dd July 3, 2004 +.Dd July 27, 2006 .Dt TEST 1 .Os .Sh NAME @@ -332,3 +332,10 @@ utility implements a superset of the .St -p1003.2 specification. +.Sh BUGS +Both sides are always evaluated in +.Fl a +and +.Fl o , +unlike in the logical operators of +.Xr sh 1 . ==== //depot/projects/mips2/src/contrib/texinfo/FREEBSD-upgrade#2 (text+ko) ==== @@ -1,5 +1,5 @@ # ex:ts=8 -$FreeBSD: src/contrib/texinfo/FREEBSD-upgrade,v 1.6 2005/05/23 10:55:29 ru Exp $ +$FreeBSD: src/contrib/texinfo/FREEBSD-upgrade,v 1.7 2006/07/08 07:32:41 cperciva Exp $ GNU Texinfo 4.8 originals can be found at: ftp://ftp.gnu.org/gnu/texinfo/ @@ -36,3 +36,7 @@ ru@FreeBSD.org 23-May-2005 + +NOTE: The upstream fix to util/texindex.c which fixes CVE-2005-3011 +(FreeBSD-SA-06:01.texindex) causes temporary files to not be removed +when handling very large inputs. FreeBSD's fix works. ==== //depot/projects/mips2/src/etc/defaults/rc.conf#2 (text+ko) ==== @@ -15,7 +15,7 @@ # For a more detailed explanation of all the rc.conf variables, please # refer to the rc.conf(5) manual page. # -# $FreeBSD: src/etc/defaults/rc.conf,v 1.288 2006/06/07 17:14:27 brueffer Exp $ +# $FreeBSD: src/etc/defaults/rc.conf,v 1.290 2006/07/21 15:55:18 yar Exp $ ############################################################## ### Important initial Boot-time options #################### @@ -261,6 +261,8 @@ ntpdate_enable="NO" # Run ntpdate to sync time on boot (or NO). ntpdate_program="/usr/sbin/ntpdate" # path to ntpdate, if you want a different one. ntpdate_flags="-b" # Flags to ntpdate (if enabled). +ntpdate_config="/etc/ntp.conf" # ntpdate(8) configuration file +ntpdate_hosts="" # Whitespace-separated list of ntpdate(8) servers. ntpd_enable="NO" # Run ntpd Network Time Protocol (or NO). ntpd_program="/usr/sbin/ntpd" # path to ntpd, if you want a different one. ntpd_config="/etc/ntp.conf" # ntpd(8) configuration file @@ -480,7 +482,6 @@ linux_enable="NO" # Linux binary compatibility loaded at startup (or NO). svr4_enable="NO" # SysVR4 emulation loaded at startup (or NO). -osf1_enable="NO" # Alpha OSF/1 emulation loaded at startup (or NO). clear_tmp_enable="NO" # Clear /tmp at startup. clear_tmp_X="YES" # Clear and recreate X11-related directories in /tmp ldconfig_insecure="NO" # Set to YES to disable ldconfig security checks @@ -500,7 +501,6 @@ # in the system booting with securelevel set to 1, as # init(8) will raise the level when rc(8) completes. update_motd="YES" # update version info in /etc/motd (or NO) -unaligned_print="YES" # print unaligned access warnings on the alpha (or NO). entropy_file="/entropy" # Set to NO to disable caching entropy through reboots. # /var/db/entropy-file is preferred if / is not avail. entropy_dir="/var/db/entropy" # Set to NO to disable caching entropy via cron. ==== //depot/projects/mips2/src/etc/rc.d/archdep#2 (text+ko) ==== @@ -1,6 +1,6 @@ #!/bin/sh # -# $FreeBSD: src/etc/rc.d/archdep,v 1.11 2006/02/19 08:18:48 dougb Exp $ +# $FreeBSD: src/etc/rc.d/archdep,v 1.12 2006/07/21 15:55:18 yar Exp $ # >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Fri Jul 28 14:34:39 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id ED9FF16A4E8; Fri, 28 Jul 2006 14:34:38 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id B7FBB16A4E2 for ; Fri, 28 Jul 2006 14:34:38 +0000 (UTC) (envelope-from piso@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 76D6B43D6A for ; Fri, 28 Jul 2006 14:34:12 +0000 (GMT) (envelope-from piso@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k6SEXpf7043083 for ; Fri, 28 Jul 2006 14:33:51 GMT (envelope-from piso@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k6SEXpJg043080 for perforce@freebsd.org; Fri, 28 Jul 2006 14:33:51 GMT (envelope-from piso@freebsd.org) Date: Fri, 28 Jul 2006 14:33:51 GMT Message-Id: <200607281433.k6SEXpJg043080@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to piso@freebsd.org using -f From: Paolo Pisati To: Perforce Change Reviews Cc: Subject: PERFORCE change 102647 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 28 Jul 2006 14:34:39 -0000 http://perforce.freebsd.org/chv.cgi?CH=102647 Change 102647 by piso@piso_newluxor on 2006/07/28 14:33:06 When the list is empty, add the entry at the head. Affected files ... .. //depot/projects/soc2005/libalias/sys/netinet/libalias/alias_mod.c#17 edit Differences ... ==== //depot/projects/soc2005/libalias/sys/netinet/libalias/alias_mod.c#17 (text+ko) ==== @@ -168,7 +168,7 @@ static int _attach_handler(struct proto_handler *p) { - struct proto_handler *b; + struct proto_handler *b = NULL; LIBALIAS_WLOCK_ASSERT(); LIST_FOREACH(b, &handler_chain, entries) { @@ -182,7 +182,10 @@ } } /* End of list or found right position, inserts here. */ - LIST_INSERT_AFTER(b, p, entries); + if (b) + LIST_INSERT_AFTER(b, p, entries); + else + LIST_INSERT_HEAD(&handler_chain, p, entries); return (0); } From owner-p4-projects@FreeBSD.ORG Fri Jul 28 15:18:54 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7681116A4DF; Fri, 28 Jul 2006 15:18:54 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 35EB016A4DD for ; Fri, 28 Jul 2006 15:18:54 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 3256C43D58 for ; Fri, 28 Jul 2006 15:18:53 +0000 (GMT) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k6SFIrMv047302 for ; Fri, 28 Jul 2006 15:18:53 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k6SFIqAD047299 for perforce@freebsd.org; Fri, 28 Jul 2006 15:18:52 GMT (envelope-from jhb@freebsd.org) Date: Fri, 28 Jul 2006 15:18:52 GMT Message-Id: <200607281518.k6SFIqAD047299@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 Cc: Subject: PERFORCE change 102653 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 28 Jul 2006 15:18:54 -0000 http://perforce.freebsd.org/chv.cgi?CH=102653 Change 102653 by jhb@jhb_mutex on 2006/07/28 15:18:05 IFC @102650. Affected files ... .. //depot/projects/smpng/sys/amd64/amd64/trap.c#48 integrate .. //depot/projects/smpng/sys/amd64/ia32/ia32_syscall.c#18 integrate .. //depot/projects/smpng/sys/arm/arm/trap.c#21 integrate .. //depot/projects/smpng/sys/conf/files#183 integrate .. //depot/projects/smpng/sys/crypto/via/padlock.c#7 integrate .. //depot/projects/smpng/sys/crypto/via/padlock.h#2 integrate .. //depot/projects/smpng/sys/i386/i386/machdep.c#114 integrate .. //depot/projects/smpng/sys/i386/i386/trap.c#97 integrate .. //depot/projects/smpng/sys/ia64/ia32/ia32_trap.c#14 integrate .. //depot/projects/smpng/sys/ia64/ia64/trap.c#85 integrate .. //depot/projects/smpng/sys/kern/kern_mutex.c#134 integrate .. //depot/projects/smpng/sys/kern/kern_rwlock.c#8 integrate .. //depot/projects/smpng/sys/kern/kern_sx.c#35 integrate .. //depot/projects/smpng/sys/powerpc/powerpc/trap.c#54 integrate .. //depot/projects/smpng/sys/sparc64/sparc64/trap.c#70 integrate Differences ... ==== //depot/projects/smpng/sys/amd64/amd64/trap.c#48 (text+ko) ==== @@ -38,7 +38,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/trap.c,v 1.304 2006/06/20 12:44:21 yar Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/trap.c,v 1.305 2006/07/27 22:32:28 jhb Exp $"); /* * AMD64 Trap and System call handling ==== //depot/projects/smpng/sys/amd64/ia32/ia32_syscall.c#18 (text+ko) ==== @@ -36,7 +36,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/ia32/ia32_syscall.c,v 1.13 2006/07/27 21:25:49 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/ia32/ia32_syscall.c,v 1.14 2006/07/27 22:32:29 jhb Exp $"); /* * 386 Trap and System call handling ==== //depot/projects/smpng/sys/arm/arm/trap.c#21 (text+ko) ==== @@ -82,7 +82,7 @@ #include "opt_ktrace.h" #include -__FBSDID("$FreeBSD: src/sys/arm/arm/trap.c,v 1.24 2006/04/09 20:16:47 cognet Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/arm/trap.c,v 1.25 2006/07/27 22:32:29 jhb Exp $"); #include ==== //depot/projects/smpng/sys/conf/files#183 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/files,v 1.1133 2006/07/25 02:15:28 rwatson Exp $ +# $FreeBSD: src/sys/conf/files,v 1.1134 2006/07/27 22:32:29 jhb Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and ==== //depot/projects/smpng/sys/crypto/via/padlock.c#7 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/crypto/via/padlock.c,v 1.10 2006/07/25 19:04:26 pjd Exp $"); +__FBSDID("$FreeBSD: src/sys/crypto/via/padlock.c,v 1.11 2006/07/28 14:48:30 pjd Exp $"); #include #include @@ -113,7 +113,7 @@ free(padlock_sc, M_PADLOCK); padlock_sc = NULL; return (ENOMEM); - } + } mtx_init(&sc->sc_sessions_mtx, "padlock_mtx", NULL, MTX_DEF); crypto_register(sc->sc_cid, CRYPTO_AES_CBC, 0, 0, padlock_newsession, ==== //depot/projects/smpng/sys/crypto/via/padlock.h#2 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/crypto/via/padlock.h,v 1.3 2006/07/25 19:06:54 pjd Exp $ + * $FreeBSD: src/sys/crypto/via/padlock.h,v 1.4 2006/07/28 14:46:19 pjd Exp $ */ #ifndef _PADLOCK_H_ @@ -72,7 +72,7 @@ TAILQ_ENTRY(padlock_session) ses_next; }; -#define PADLOCK_ALIGN(p) (void *)((uintptr_t)(p) - (((uintptr_t)(p) - 1) % 16) + 15) +#define PADLOCK_ALIGN(p) (void *)(roundup2((uintptr_t)(p), 16)) int padlock_cipher_setup(struct padlock_session *ses, struct cryptoini *encini); ==== //depot/projects/smpng/sys/i386/i386/machdep.c#114 (text+ko) ==== @@ -38,7 +38,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/i386/i386/machdep.c,v 1.631 2006/07/27 19:47:22 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/i386/i386/machdep.c,v 1.632 2006/07/27 22:19:02 jhb Exp $"); #include "opt_apic.h" #include "opt_atalk.h" ==== //depot/projects/smpng/sys/i386/i386/trap.c#97 (text+ko) ==== @@ -38,7 +38,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/i386/i386/trap.c,v 1.292 2006/06/20 12:44:20 yar Exp $"); +__FBSDID("$FreeBSD: src/sys/i386/i386/trap.c,v 1.293 2006/07/27 22:32:29 jhb Exp $"); /* * 386 Trap and System call handling ==== //depot/projects/smpng/sys/ia64/ia32/ia32_trap.c#14 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/ia64/ia32/ia32_trap.c,v 1.9 2006/07/27 21:25:49 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/ia64/ia32/ia32_trap.c,v 1.10 2006/07/27 22:32:29 jhb Exp $"); #include #include ==== //depot/projects/smpng/sys/ia64/ia64/trap.c#85 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/ia64/ia64/trap.c,v 1.120 2006/07/27 21:25:50 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/ia64/ia64/trap.c,v 1.121 2006/07/27 22:32:29 jhb Exp $"); #include "opt_ddb.h" #include "opt_ktrace.h" ==== //depot/projects/smpng/sys/kern/kern_mutex.c#134 (text+ko) ==== @@ -34,7 +34,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/kern_mutex.c,v 1.174 2006/07/27 19:58:18 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/kern_mutex.c,v 1.175 2006/07/27 21:45:55 jhb Exp $"); #include "opt_adaptive_mutexes.h" #include "opt_ddb.h" ==== //depot/projects/smpng/sys/kern/kern_rwlock.c#8 (text+ko) ==== @@ -32,7 +32,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/kern_rwlock.c,v 1.9 2006/04/19 21:06:52 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/kern_rwlock.c,v 1.10 2006/07/27 21:45:55 jhb Exp $"); #include "opt_ddb.h" ==== //depot/projects/smpng/sys/kern/kern_sx.c#35 (text+ko) ==== @@ -34,7 +34,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/kern_sx.c,v 1.28 2006/01/17 16:55:16 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/kern_sx.c,v 1.29 2006/07/27 21:45:55 jhb Exp $"); #include "opt_ddb.h" ==== //depot/projects/smpng/sys/powerpc/powerpc/trap.c#54 (text+ko) ==== @@ -32,7 +32,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/powerpc/powerpc/trap.c,v 1.58 2006/07/27 19:50:16 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/powerpc/powerpc/trap.c,v 1.59 2006/07/27 22:32:30 jhb Exp $"); #include "opt_ktrace.h" ==== //depot/projects/smpng/sys/sparc64/sparc64/trap.c#70 (text+ko) ==== @@ -40,7 +40,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/sparc64/sparc64/trap.c,v 1.82 2006/05/16 14:32:17 phk Exp $"); +__FBSDID("$FreeBSD: src/sys/sparc64/sparc64/trap.c,v 1.83 2006/07/27 22:32:30 jhb Exp $"); #include "opt_ddb.h" #include "opt_ktr.h" From owner-p4-projects@FreeBSD.ORG Fri Jul 28 16:24:21 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id DE84816A510; Fri, 28 Jul 2006 16:24:20 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id B765A16A50D for ; Fri, 28 Jul 2006 16:24:20 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id F1B2E43D7C for ; Fri, 28 Jul 2006 16:24:15 +0000 (GMT) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k6SGOFEL052781 for ; Fri, 28 Jul 2006 16:24:15 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k6SGOFjp052778 for perforce@freebsd.org; Fri, 28 Jul 2006 16:24:15 GMT (envelope-from jhb@freebsd.org) Date: Fri, 28 Jul 2006 16:24:15 GMT Message-Id: <200607281624.k6SGOFjp052778@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 Cc: Subject: PERFORCE change 102658 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 28 Jul 2006 16:24:21 -0000 http://perforce.freebsd.org/chv.cgi?CH=102658 Change 102658 by jhb@jhb_mutex on 2006/07/28 16:24:09 - Explicitly lock Giant to protect all of the fields in the stream structure except st_family (read-only field only set when the stream structure is created). This does mean holding it a lot in getmsg() since it wants to read the previous command from putmsg() and then set a new one when it's done. - Mark svr4_sys_ioctl(), svr4_sys_getmsg(), and svr4_sys_putmsg() MPSAFE. Affected files ... .. //depot/projects/smpng/sys/compat/svr4/svr4_stream.c#40 edit .. //depot/projects/smpng/sys/compat/svr4/svr4_stropts.h#4 edit .. //depot/projects/smpng/sys/compat/svr4/syscalls.master#23 edit Differences ... ==== //depot/projects/smpng/sys/compat/svr4/svr4_stream.c#40 (text+ko) ==== @@ -1041,13 +1041,16 @@ return EINVAL; } + mtx_lock(&Giant); if (st->s_afd == -1) { DPRINTF(("fdinsert: accept fd not found\n")); + mtx_unlock(&Giant); return ENOENT; } if ((error = copyin(dat, &fdi, sizeof(fdi))) != 0) { DPRINTF(("fdinsert: copyin failed %d\n", error)); + mtx_unlock(&Giant); return error; } @@ -1057,16 +1060,19 @@ if ((error = dup2(td, &d2p)) != 0) { DPRINTF(("fdinsert: dup2(%d, %d) failed %d\n", st->s_afd, fdi.fd, error)); + mtx_unlock(&Giant); return error; } if ((error = kern_close(td, st->s_afd)) != 0) { DPRINTF(("fdinsert: close(%d) failed %d\n", st->s_afd, error)); + mtx_unlock(&Giant); return error; } st->s_afd = -1; + mtx_unlock(&Giant); *retval = 0; return 0; @@ -1194,6 +1200,7 @@ oflags = td->td_retval[0]; /* update the flags */ + mtx_lock(&Giant); if (dat != NULL) { int mask; @@ -1212,6 +1219,7 @@ flags = oflags & ~O_ASYNC; st->s_eventmask = 0; } + mtx_unlock(&Giant); /* set the new flags, if changed */ if (flags != oflags) { @@ -1236,7 +1244,7 @@ u_long cmd; caddr_t dat; { - int error; + int error, eventmask; if (dat != NULL) { struct svr4_strm *st = svr4_stream_get(fp); @@ -1245,8 +1253,11 @@ DPRINTF(("i_getsig: bad file descriptor\n")); return EINVAL; } - if ((error = copyout(&st->s_eventmask, dat, - sizeof(st->s_eventmask))) != 0) { + mtx_lock(&Giant); + eventmask = st->s_eventmask; + mtx_unlock(&Giant); + if ((error = copyout(&eventmask, dat, + sizeof(eventmask))) != 0) { DPRINTF(("i_getsig: bad eventmask pointer\n")); return error; } @@ -1569,7 +1580,10 @@ return ENOSYS; } - switch (st->s_cmd = sc.cmd) { + mtx_lock(&Giant); + st->s_cmd = sc.cmd; + mtx_unlock(&Giant); + switch (sc.cmd) { case SVR4_TI_CONNECT_REQUEST: /* connect */ { @@ -1701,6 +1715,7 @@ return ENOSYS; } + mtx_lock(&Giant); switch (st->s_cmd) { case SVR4_TI_CONNECT_REQUEST: DPRINTF(("getmsg: TI_CONNECT_REQUEST\n")); @@ -1726,6 +1741,7 @@ error = kern_getpeername(td, uap->fd, &sa, &sasize); if (error) { + mtx_unlock(&Giant); DPRINTF(("getmsg: getpeername failed %d\n", error)); return error; } @@ -1748,6 +1764,7 @@ break; default: + mtx_unlock(&Giant); free(sa, M_SONAME); return ENOSYS; } @@ -1782,6 +1799,7 @@ error = kern_accept(td, uap->fd, &sa, &sasize, &afp); if (error) { + mtx_unlock(&Giant); DPRINTF(("getmsg: accept failed %d\n", error)); return error; } @@ -1814,6 +1832,7 @@ fdclose(td->td_proc->p_fd, afp, st->s_afd, td); fdrop(afp, td); st->s_afd = -1; + mtx_unlock(&Giant); free(sa, M_SONAME); return ENOSYS; } @@ -1832,8 +1851,10 @@ if (ctl.len > sizeof(sc)) ctl.len = sizeof(sc); - if ((error = copyin(ctl.buf, &sc, ctl.len)) != 0) + if ((error = copyin(ctl.buf, &sc, ctl.len)) != 0) { + mtx_unlock(&Giant); return error; + } switch (st->s_family) { case AF_INET: @@ -1847,6 +1868,7 @@ break; default: + mtx_unlock(&Giant); return ENOSYS; } @@ -1862,6 +1884,7 @@ error = kern_recvit(td, uap->fd, &msg, UIO_SYSSPACE, NULL); if (error) { + mtx_unlock(&Giant); DPRINTF(("getmsg: recvit failed %d\n", error)); return error; } @@ -1880,6 +1903,7 @@ break; default: + mtx_unlock(&Giant); return ENOSYS; } @@ -1908,6 +1932,7 @@ ra.buf = dat.buf; ra.nbyte = dat.maxlen; if ((error = read(td, &ra)) != 0) { + mtx_unlock(&Giant); return error; } dat.len = *retval; @@ -1915,6 +1940,7 @@ st->s_cmd = SVR4_TI_SENDTO_REQUEST; break; } + mtx_unlock(&Giant); DPRINTF(("getmsg: Unknown state %x\n", st->s_cmd)); return EINVAL; } @@ -1945,8 +1971,10 @@ fdrop(afp, td); st->s_afd = -1; } + mtx_unlock(&Giant); return (error); } + mtx_unlock(&Giant); if (afp) fdrop(afp, td); ==== //depot/projects/smpng/sys/compat/svr4/svr4_stropts.h#4 (text+ko) ==== @@ -116,12 +116,16 @@ * Our internal state for the stream * For now we keep almost nothing... In the future we can keep more * streams state. + * + * Locking key: + * r - Read only field only set during creation + * G - Giant */ struct svr4_strm { - int s_family; /* socket family */ - int s_cmd; /* last getmsg reply or putmsg request */ - int s_afd; /* last accepted fd; [for fd_insert] */ - int s_eventmask; /* state info from I_SETSIG et al */ + int s_family; /* (r) socket family */ + int s_cmd; /* (G) last getmsg reply or putmsg request */ + int s_afd; /* (G) last accepted fd; [for fd_insert] */ + int s_eventmask; /* (G) state info from I_SETSIG et al */ }; /* ==== //depot/projects/smpng/sys/compat/svr4/syscalls.master#23 (text+ko) ==== @@ -104,7 +104,7 @@ int a3, int a4, int a5); } 53 AUE_NULL MSTD { int svr4_sys_semsys(int what, int a2, \ int a3, int a4, int a5); } -54 AUE_NULL STD { int svr4_sys_ioctl(int fd, u_long com, \ +54 AUE_NULL MSTD { int svr4_sys_ioctl(int fd, u_long com, \ caddr_t data); } 55 AUE_NULL UNIMPL uadmin 56 AUE_NULL UNIMPL exch @@ -141,10 +141,10 @@ 82 AUE_NULL UNIMPL libattach 83 AUE_NULL UNIMPL libdetach 84 AUE_NULL UNIMPL sysfs -85 AUE_NULL STD { int svr4_sys_getmsg(int fd, \ +85 AUE_NULL MSTD { int svr4_sys_getmsg(int fd, \ struct svr4_strbuf *ctl, \ struct svr4_strbuf *dat, int *flags); } -86 AUE_NULL STD { int svr4_sys_putmsg(int fd, \ +86 AUE_NULL MSTD { int svr4_sys_putmsg(int fd, \ struct svr4_strbuf *ctl, \ struct svr4_strbuf *dat, int flags); } 87 AUE_NULL MSTD { int svr4_sys_poll(struct pollfd *fds, \ From owner-p4-projects@FreeBSD.ORG Fri Jul 28 16:30:24 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9B1AB16A50A; Fri, 28 Jul 2006 16:30:24 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 709F816A4DE for ; Fri, 28 Jul 2006 16:30:24 +0000 (UTC) (envelope-from gabor@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 0107543D49 for ; Fri, 28 Jul 2006 16:30:24 +0000 (GMT) (envelope-from gabor@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k6SGUNlY053143 for ; Fri, 28 Jul 2006 16:30:23 GMT (envelope-from gabor@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k6SGUNvY053140 for perforce@freebsd.org; Fri, 28 Jul 2006 16:30:23 GMT (envelope-from gabor@FreeBSD.org) Date: Fri, 28 Jul 2006 16:30:23 GMT Message-Id: <200607281630.k6SGUNvY053140@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to gabor@FreeBSD.org using -f From: Gabor Kovesdan To: Perforce Change Reviews Cc: Subject: PERFORCE change 102659 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 28 Jul 2006 16:30:24 -0000 http://perforce.freebsd.org/chv.cgi?CH=102659 Change 102659 by gabor@gabor_spitfire on 2006/07/28 16:30:03 Add IS_JAILED variable to indicate if we are jailed. PR: 63716 Submitted by: clement (with fixes from me) Affected files ... .. //depot/projects/soc2006/gabor_ports/Mk/bsd.port.mk#64 edit Differences ... ==== //depot/projects/soc2006/gabor_ports/Mk/bsd.port.mk#64 (text+ko) ==== @@ -1157,6 +1157,10 @@ .endif .endif +.if !defined(IS_JAILED) && ${OSVERSION} >= 502104 +IS_JAILED!= if [ `${SYSCTL} -n security.jail.jailed` = "1" ] ; then echo YES; fi; +.endif + # Get the object format. .if !defined(PORTOBJFORMAT) PORTOBJFORMAT!= ${TEST} -x /usr/bin/objformat && /usr/bin/objformat || ${ECHO_CMD} aout From owner-p4-projects@FreeBSD.ORG Fri Jul 28 16:45:51 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E095D16A4F4; Fri, 28 Jul 2006 16:45:50 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 6210416A4DA for ; Fri, 28 Jul 2006 16:45:50 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 9458C43D88 for ; Fri, 28 Jul 2006 16:45:44 +0000 (GMT) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k6SGjiRt053952 for ; Fri, 28 Jul 2006 16:45:44 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k6SGjhc3053949 for perforce@freebsd.org; Fri, 28 Jul 2006 16:45:43 GMT (envelope-from jhb@freebsd.org) Date: Fri, 28 Jul 2006 16:45:43 GMT Message-Id: <200607281645.k6SGjhc3053949@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 Cc: Subject: PERFORCE change 102661 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 28 Jul 2006 16:45:51 -0000 http://perforce.freebsd.org/chv.cgi?CH=102661 Change 102661 by jhb@jhb_mutex on 2006/07/28 16:45:40 Update. Affected files ... .. //depot/projects/smpng/sys/notes#88 edit Differences ... ==== //depot/projects/smpng/sys/notes#88 (text+ko) ==== @@ -74,18 +74,12 @@ version of the current WITNESS check that doesn't bog the system down quite as bad. - compat ABI cleanups - - push Giant down and mark all remaining syscalls MPSAFE - + freebsd - + compat32 - - svr4 - - svr4_stream_get() and friends - - Giant will have to protect the actual stream structures for now - - svr4_sys_ioctl() - - svr4_sys_getmsg() - - svr4_sys_putmsg() - + linux - + ibcs2 - - don't mess with td_retval in any kern_foo() functions + + push Giant down and mark all remaining syscalls MPSAFE + - remove SYF_MPSAFE + - stop conditionally acquiring Giant in syscall() functions + - remove all the 'M's from the syscall files + - remove support for the 'M' prefix from the syscall scripts + - retire SYF_ARGMASK, sy_narg is now back to just being an argument count Active child branches: - jhb_intr - MSI? From owner-p4-projects@FreeBSD.ORG Fri Jul 28 17:09:15 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0790D16A4DF; Fri, 28 Jul 2006 17:09:15 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id D8C9616A4DD for ; Fri, 28 Jul 2006 17:09:14 +0000 (UTC) (envelope-from gabor@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 5E7C443D5F for ; Fri, 28 Jul 2006 17:09:14 +0000 (GMT) (envelope-from gabor@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k6SH9EfI064819 for ; Fri, 28 Jul 2006 17:09:14 GMT (envelope-from gabor@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k6SH9EDR064816 for perforce@freebsd.org; Fri, 28 Jul 2006 17:09:14 GMT (envelope-from gabor@FreeBSD.org) Date: Fri, 28 Jul 2006 17:09:14 GMT Message-Id: <200607281709.k6SH9EDR064816@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to gabor@FreeBSD.org using -f From: Gabor Kovesdan To: Perforce Change Reviews Cc: Subject: PERFORCE change 102664 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 28 Jul 2006 17:09:15 -0000 http://perforce.freebsd.org/chv.cgi?CH=102664 Change 102664 by gabor@gabor_spitfire on 2006/07/28 17:08:30 Document WITH_DEBUG. Affected files ... .. //depot/projects/soc2006/gabor_docs/porters-handbook/book.sgml#11 edit Differences ... ==== //depot/projects/soc2006/gabor_docs/porters-handbook/book.sgml#11 (text+ko) ==== @@ -4117,6 +4117,25 @@ Building mechanisms + + Building binaries for debugging purposes with + <makevar>WITH_DEBUG</makevar> + + If you need to build binaries with debug symbols, you can set + WITH_DEBUG. This adds DEBUG_FLAGS + to CFLAGS and prevents INSTALL_PROGRAM + from stripping binaries when installing. DEBUG_FLAGS is + set to "-g" at default, but you can override this if necessary. Furthermore, + ports could (and should) add their own specific things to build for + debugging. + + Note, that there are ports that do not respect our + INSTALL_PROGRAM variable, so they will be still + stripped even if WITH_DEBUG is set. In these + cases, you have to manually patch the port to work as intended. + + + <command>make</command>, <command>gmake</command>, and <command>imake</command> From owner-p4-projects@FreeBSD.ORG Fri Jul 28 17:10:17 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0424D16A4DD; Fri, 28 Jul 2006 17:10:17 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id BB5D016A4ED for ; Fri, 28 Jul 2006 17:10:16 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 371FF43D46 for ; Fri, 28 Jul 2006 17:10:16 +0000 (GMT) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k6SHAGY1064904 for ; Fri, 28 Jul 2006 17:10:16 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k6SHAFoR064901 for perforce@freebsd.org; Fri, 28 Jul 2006 17:10:15 GMT (envelope-from jhb@freebsd.org) Date: Fri, 28 Jul 2006 17:10:15 GMT Message-Id: <200607281710.k6SHAFoR064901@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 Cc: Subject: PERFORCE change 102665 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 28 Jul 2006 17:10:17 -0000 http://perforce.freebsd.org/chv.cgi?CH=102665 Change 102665 by jhb@jhb_mutex on 2006/07/28 17:09:59 IFC @102663 - loopback. Affected files ... .. //depot/projects/smpng/sys/compat/svr4/svr4_proto.h#16 integrate .. //depot/projects/smpng/sys/compat/svr4/svr4_stream.c#41 integrate .. //depot/projects/smpng/sys/compat/svr4/svr4_stropts.h#5 integrate .. //depot/projects/smpng/sys/compat/svr4/svr4_syscall.h#15 integrate .. //depot/projects/smpng/sys/compat/svr4/svr4_syscallnames.c#15 integrate .. //depot/projects/smpng/sys/compat/svr4/svr4_sysent.c#15 integrate .. //depot/projects/smpng/sys/compat/svr4/syscalls.master#24 integrate Differences ... ==== //depot/projects/smpng/sys/compat/svr4/svr4_proto.h#16 (text+ko) ==== @@ -2,8 +2,8 @@ * System call prototypes. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/compat/svr4/svr4_proto.h,v 1.24 2006/07/21 20:41:33 jhb Exp $ - * created from FreeBSD: src/sys/compat/svr4/syscalls.master,v 1.26 2006/07/21 20:28:56 jhb Exp + * $FreeBSD: src/sys/compat/svr4/svr4_proto.h,v 1.25 2006/07/28 16:56:44 jhb Exp $ + * created from FreeBSD: src/sys/compat/svr4/syscalls.master,v 1.27 2006/07/28 16:56:17 jhb Exp */ #ifndef _SVR4_SYSPROTO_H_ ==== //depot/projects/smpng/sys/compat/svr4/svr4_stream.c#41 (text+ko) ==== @@ -36,7 +36,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/compat/svr4/svr4_stream.c,v 1.60 2006/07/27 19:54:41 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/svr4/svr4_stream.c,v 1.61 2006/07/28 16:56:17 jhb Exp $"); #include "opt_compat.h" #include "opt_ktrace.h" ==== //depot/projects/smpng/sys/compat/svr4/svr4_stropts.h#5 (text+ko) ==== @@ -25,7 +25,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/compat/svr4/svr4_stropts.h,v 1.5 2005/01/05 22:34:37 imp Exp $ + * $FreeBSD: src/sys/compat/svr4/svr4_stropts.h,v 1.6 2006/07/28 16:56:17 jhb Exp $ */ #ifndef _SVR4_STROPTS_H_ ==== //depot/projects/smpng/sys/compat/svr4/svr4_syscall.h#15 (text+ko) ==== @@ -2,8 +2,8 @@ * System call numbers. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/compat/svr4/svr4_syscall.h,v 1.22 2006/07/21 20:41:33 jhb Exp $ - * created from FreeBSD: src/sys/compat/svr4/syscalls.master,v 1.26 2006/07/21 20:28:56 jhb Exp + * $FreeBSD: src/sys/compat/svr4/svr4_syscall.h,v 1.23 2006/07/28 16:56:44 jhb Exp $ + * created from FreeBSD: src/sys/compat/svr4/syscalls.master,v 1.27 2006/07/28 16:56:17 jhb Exp */ #define SVR4_SYS_exit 1 ==== //depot/projects/smpng/sys/compat/svr4/svr4_syscallnames.c#15 (text+ko) ==== @@ -2,8 +2,8 @@ * System call names. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/compat/svr4/svr4_syscallnames.c,v 1.22 2006/07/21 20:41:33 jhb Exp $ - * created from FreeBSD: src/sys/compat/svr4/syscalls.master,v 1.26 2006/07/21 20:28:56 jhb Exp + * $FreeBSD: src/sys/compat/svr4/svr4_syscallnames.c,v 1.23 2006/07/28 16:56:44 jhb Exp $ + * created from FreeBSD: src/sys/compat/svr4/syscalls.master,v 1.27 2006/07/28 16:56:17 jhb Exp */ const char *svr4_syscallnames[] = { ==== //depot/projects/smpng/sys/compat/svr4/svr4_sysent.c#15 (text+ko) ==== @@ -2,8 +2,8 @@ * System call switch table. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/compat/svr4/svr4_sysent.c,v 1.23 2006/07/21 20:41:33 jhb Exp $ - * created from FreeBSD: src/sys/compat/svr4/syscalls.master,v 1.26 2006/07/21 20:28:56 jhb Exp + * $FreeBSD: src/sys/compat/svr4/svr4_sysent.c,v 1.24 2006/07/28 16:56:44 jhb Exp $ + * created from FreeBSD: src/sys/compat/svr4/syscalls.master,v 1.27 2006/07/28 16:56:17 jhb Exp */ #include @@ -74,7 +74,7 @@ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 51 = acct */ { SYF_MPSAFE | AS(svr4_sys_shmsys_args), (sy_call_t *)svr4_sys_shmsys, AUE_NULL }, /* 52 = svr4_sys_shmsys */ { SYF_MPSAFE | AS(svr4_sys_semsys_args), (sy_call_t *)svr4_sys_semsys, AUE_NULL }, /* 53 = svr4_sys_semsys */ - { AS(svr4_sys_ioctl_args), (sy_call_t *)svr4_sys_ioctl, AUE_NULL }, /* 54 = svr4_sys_ioctl */ + { SYF_MPSAFE | AS(svr4_sys_ioctl_args), (sy_call_t *)svr4_sys_ioctl, AUE_NULL }, /* 54 = svr4_sys_ioctl */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 55 = uadmin */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 56 = exch */ { SYF_MPSAFE | AS(svr4_sys_utssys_args), (sy_call_t *)svr4_sys_utssys, AUE_NULL }, /* 57 = svr4_sys_utssys */ @@ -105,8 +105,8 @@ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 82 = libattach */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 83 = libdetach */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 84 = sysfs */ - { AS(svr4_sys_getmsg_args), (sy_call_t *)svr4_sys_getmsg, AUE_NULL }, /* 85 = svr4_sys_getmsg */ - { AS(svr4_sys_putmsg_args), (sy_call_t *)svr4_sys_putmsg, AUE_NULL }, /* 86 = svr4_sys_putmsg */ + { SYF_MPSAFE | AS(svr4_sys_getmsg_args), (sy_call_t *)svr4_sys_getmsg, AUE_NULL }, /* 85 = svr4_sys_getmsg */ + { SYF_MPSAFE | AS(svr4_sys_putmsg_args), (sy_call_t *)svr4_sys_putmsg, AUE_NULL }, /* 86 = svr4_sys_putmsg */ { SYF_MPSAFE | AS(svr4_sys_poll_args), (sy_call_t *)svr4_sys_poll, AUE_NULL }, /* 87 = svr4_sys_poll */ { SYF_MPSAFE | AS(svr4_sys_lstat_args), (sy_call_t *)svr4_sys_lstat, AUE_NULL }, /* 88 = svr4_sys_lstat */ { SYF_MPSAFE | AS(symlink_args), (sy_call_t *)symlink, AUE_NULL }, /* 89 = symlink */ ==== //depot/projects/smpng/sys/compat/svr4/syscalls.master#24 (text+ko) ==== @@ -1,4 +1,4 @@ - $FreeBSD: src/sys/compat/svr4/syscalls.master,v 1.26 2006/07/21 20:28:56 jhb Exp $ + $FreeBSD: src/sys/compat/svr4/syscalls.master,v 1.27 2006/07/28 16:56:17 jhb Exp $ ; from: @(#)syscalls.master 8.1 (Berkeley) 7/19/93 ; ; System call name/number master file (or rather, slave, from SVR4). From owner-p4-projects@FreeBSD.ORG Fri Jul 28 17:17:27 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 44F9A16A4E1; Fri, 28 Jul 2006 17:17:27 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 2364F16A4DE for ; Fri, 28 Jul 2006 17:17:27 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id CB76843D46 for ; Fri, 28 Jul 2006 17:17:26 +0000 (GMT) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k6SHHQ39066736 for ; Fri, 28 Jul 2006 17:17:26 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k6SHHQjb066733 for perforce@freebsd.org; Fri, 28 Jul 2006 17:17:26 GMT (envelope-from jhb@freebsd.org) Date: Fri, 28 Jul 2006 17:17:26 GMT Message-Id: <200607281717.k6SHHQjb066733@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 Cc: Subject: PERFORCE change 102666 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 28 Jul 2006 17:17:27 -0000 http://perforce.freebsd.org/chv.cgi?CH=102666 Change 102666 by jhb@jhb_mutex on 2006/07/28 17:16:56 Stop conditionally acquiring Giant based on SYF_MPSAFE, it's effectively always true now. Affected files ... .. //depot/projects/smpng/sys/amd64/amd64/trap.c#49 edit .. //depot/projects/smpng/sys/amd64/ia32/ia32_syscall.c#19 edit .. //depot/projects/smpng/sys/arm/arm/trap.c#22 edit .. //depot/projects/smpng/sys/i386/i386/trap.c#98 edit .. //depot/projects/smpng/sys/i386/ibcs2/ibcs2_isc.c#7 edit .. //depot/projects/smpng/sys/i386/ibcs2/ibcs2_xenix.c#19 edit .. //depot/projects/smpng/sys/ia64/ia32/ia32_trap.c#15 edit .. //depot/projects/smpng/sys/ia64/ia64/trap.c#86 edit .. //depot/projects/smpng/sys/notes#89 edit .. //depot/projects/smpng/sys/powerpc/powerpc/trap.c#55 edit .. //depot/projects/smpng/sys/sparc64/sparc64/trap.c#71 edit Differences ... ==== //depot/projects/smpng/sys/amd64/amd64/trap.c#49 (text+ko) ==== @@ -812,17 +812,9 @@ PTRACESTOP_SC(p, td, S_PT_SCE); - if ((callp->sy_narg & SYF_MPSAFE) == 0) { - mtx_lock(&Giant); - AUDIT_SYSCALL_ENTER(code, td); - error = (*callp->sy_call)(td, argp); - AUDIT_SYSCALL_EXIT(error, td); - mtx_unlock(&Giant); - } else { - AUDIT_SYSCALL_ENTER(code, td); - error = (*callp->sy_call)(td, argp); - AUDIT_SYSCALL_EXIT(error, td); - } + AUDIT_SYSCALL_ENTER(code, td); + error = (*callp->sy_call)(td, argp); + AUDIT_SYSCALL_EXIT(error, td); } switch (error) { ==== //depot/projects/smpng/sys/amd64/ia32/ia32_syscall.c#19 (text+ko) ==== @@ -175,13 +175,6 @@ CTR4(KTR_SYSC, "syscall enter thread %p pid %d proc %s code %d", td, td->td_proc->p_pid, td->td_proc->p_comm, code); - /* - * Try to run the syscall without Giant if the syscall - * is MP safe. - */ - if ((callp->sy_narg & SYF_MPSAFE) == 0) - mtx_lock(&Giant); - if (error == 0) { td->td_retval[0] = 0; td->td_retval[1] = frame.tf_rdx; @@ -226,12 +219,6 @@ } /* - * Release Giant if we previously set it. - */ - if ((callp->sy_narg & SYF_MPSAFE) == 0) - mtx_unlock(&Giant); - - /* * Traced syscall. */ if (orig_tf_rflags & PSL_T) { ==== //depot/projects/smpng/sys/arm/arm/trap.c#22 (text+ko) ==== @@ -878,7 +878,6 @@ u_int nap, nargs; register_t *ap, *args, copyargs[MAXARGS]; struct sysent *callp; - int locked = 0; PCPU_LAZY_INC(cnt.v_syscall); td->td_pticks = 0; @@ -928,9 +927,6 @@ CTR4(KTR_SYSC, "syscall enter thread %p pid %d proc %s code %d", td, td->td_proc->p_pid, td->td_proc->p_comm, code); - if ((callp->sy_narg & SYF_MPSAFE) == 0) - mtx_lock(&Giant); - locked = 1; if (error == 0) { td->td_retval[0] = 0; td->td_retval[1] = 0; @@ -978,8 +974,6 @@ frame->tf_spsr |= PSR_C_bit; /* carry bit */ break; } - if (locked && (callp->sy_narg & SYF_MPSAFE) == 0) - mtx_unlock(&Giant); WITNESS_WARN(WARN_PANIC, NULL, "System call %s returning", (code >= 0 && code < SYS_MAXSYSCALL) ? syscallnames[code] : "???"); ==== //depot/projects/smpng/sys/i386/i386/trap.c#98 (text+ko) ==== @@ -994,13 +994,6 @@ CTR4(KTR_SYSC, "syscall enter thread %p pid %d proc %s code %d", td, td->td_proc->p_pid, td->td_proc->p_comm, code); - /* - * Try to run the syscall without Giant if the syscall - * is MP safe. - */ - if ((callp->sy_narg & SYF_MPSAFE) == 0) - mtx_lock(&Giant); - if (error == 0) { td->td_retval[0] = 0; td->td_retval[1] = frame.tf_edx; @@ -1045,12 +1038,6 @@ } /* - * Release Giant if we previously set it. - */ - if ((callp->sy_narg & SYF_MPSAFE) == 0) - mtx_unlock(&Giant); - - /* * Traced syscall. */ if ((orig_tf_eflags & PSL_T) && !(orig_tf_eflags & PSL_VM)) { ==== //depot/projects/smpng/sys/i386/ibcs2/ibcs2_isc.c#7 (text+ko) ==== @@ -58,13 +58,9 @@ code = (tf->tf_eax & 0xffffff00) >> 8; callp = &isc_sysent[code]; - if (code < IBCS2_ISC_MAXSYSCALL) { - if ((callp->sy_narg & SYF_MPSAFE) == 0) - mtx_lock(&Giant); + if (code < IBCS2_ISC_MAXSYSCALL) error = (*callp->sy_call)(td, (void *)uap); - if ((callp->sy_narg & SYF_MPSAFE) == 0) - mtx_unlock(&Giant); - } else + else error = ENOSYS; return (error); } ==== //depot/projects/smpng/sys/i386/ibcs2/ibcs2_xenix.c#19 (text+ko) ==== @@ -69,13 +69,9 @@ code = (tf->tf_eax & 0xff00) >> 8; callp = &xenix_sysent[code]; - if (code < IBCS2_XENIX_MAXSYSCALL) { - if ((callp->sy_narg & SYF_MPSAFE) == 0) - mtx_lock(&Giant); + if (code < IBCS2_XENIX_MAXSYSCALL) error = ((*callp->sy_call)(td, (void *)uap)); - if ((callp->sy_narg & SYF_MPSAFE) == 0) - mtx_unlock(&Giant); - } else + else error = ENOSYS; return (error); } ==== //depot/projects/smpng/sys/ia64/ia32/ia32_trap.c#15 (text+ko) ==== @@ -114,13 +114,6 @@ CTR4(KTR_SYSC, "syscall enter thread %p pid %d proc %s code %d", td, td->td_proc->p_pid, td->td_proc->p_comm, code); - /* - * Try to run the syscall without Giant if the syscall - * is MP safe. - */ - if ((callp->sy_narg & SYF_MPSAFE) == 0) - mtx_lock(&Giant); - if (error == 0) { td->td_retval[0] = 0; td->td_retval[1] = tf->tf_scratch.gr10; /* edx */ @@ -163,12 +156,6 @@ } /* - * Release Giant if we previously set it. - */ - if ((callp->sy_narg & SYF_MPSAFE) == 0) - mtx_unlock(&Giant); - - /* * Traced syscall. */ if ((eflags & PSL_T) && !(eflags & PSL_VM)) { ==== //depot/projects/smpng/sys/ia64/ia64/trap.c#86 (text+ko) ==== @@ -1016,15 +1016,7 @@ PTRACESTOP_SC(p, td, S_PT_SCE); - /* - * Grab Giant if the syscall is not flagged as MP safe. - */ - if ((callp->sy_narg & SYF_MPSAFE) == 0) { - mtx_lock(&Giant); - error = (*callp->sy_call)(td, args); - mtx_unlock(&Giant); - } else - error = (*callp->sy_call)(td, args); + error = (*callp->sy_call)(td, args); if (error != EJUSTRETURN) { /* ==== //depot/projects/smpng/sys/notes#89 (text+ko) ==== @@ -76,7 +76,7 @@ - compat ABI cleanups + push Giant down and mark all remaining syscalls MPSAFE - remove SYF_MPSAFE - - stop conditionally acquiring Giant in syscall() functions + + stop conditionally acquiring Giant in syscall() functions - remove all the 'M's from the syscall files - remove support for the 'M' prefix from the syscall scripts - retire SYF_ARGMASK, sy_narg is now back to just being an argument count ==== //depot/projects/smpng/sys/powerpc/powerpc/trap.c#55 (text+ko) ==== @@ -409,11 +409,6 @@ if (KTRPOINT(td, KTR_SYSCALL)) ktrsyscall(code, narg, (register_t *)params); #endif - /* - * Try to run the syscall without Giant if the syscall is MP safe. - */ - if ((callp->sy_narg & SYF_MPSAFE) == 0) - mtx_lock(&Giant); if (error == 0) { td->td_retval[0] = 0; @@ -466,10 +461,6 @@ break; } - - if ((callp->sy_narg & SYF_MPSAFE) == 0) - mtx_unlock(&Giant); - /* * Check for misbehavior. */ ==== //depot/projects/smpng/sys/sparc64/sparc64/trap.c#71 (text+ko) ==== @@ -578,13 +578,6 @@ CTR5(KTR_SYSC, "syscall: td=%p %s(%#lx, %#lx, %#lx)", td, syscallnames[code], argp[0], argp[1], argp[2]); - /* - * Try to run the syscall without the MP lock if the syscall - * is MP safe. - */ - if ((callp->sy_narg & SYF_MPSAFE) == 0) - mtx_lock(&Giant); - #ifdef KTRACE if (KTRPOINT(td, KTR_SYSCALL)) ktrsyscall(code, narg, argp); @@ -641,13 +634,6 @@ } /* - * Release Giant if we had to get it. Don't use mtx_owned(), - * we want to catch broken syscalls. - */ - if ((callp->sy_narg & SYF_MPSAFE) == 0) - mtx_unlock(&Giant); - - /* * Check for misbehavior. */ WITNESS_WARN(WARN_PANIC, NULL, "System call %s returning", From owner-p4-projects@FreeBSD.ORG Fri Jul 28 18:22:51 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3F7EC16A4DF; Fri, 28 Jul 2006 18:22:51 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 1C0C716A4DD for ; Fri, 28 Jul 2006 18:22:51 +0000 (UTC) (envelope-from gabor@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id E5AC443D55 for ; Fri, 28 Jul 2006 18:22:49 +0000 (GMT) (envelope-from gabor@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k6SIMnmN071551 for ; Fri, 28 Jul 2006 18:22:49 GMT (envelope-from gabor@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k6SIMn0Z071548 for perforce@freebsd.org; Fri, 28 Jul 2006 18:22:49 GMT (envelope-from gabor@FreeBSD.org) Date: Fri, 28 Jul 2006 18:22:49 GMT Message-Id: <200607281822.k6SIMn0Z071548@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to gabor@FreeBSD.org using -f From: Gabor Kovesdan To: Perforce Change Reviews Cc: Subject: PERFORCE change 102670 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 28 Jul 2006 18:22:51 -0000 http://perforce.freebsd.org/chv.cgi?CH=102670 Change 102670 by gabor@gabor_spitfire on 2006/07/28 18:22:10 - s/echo/${ECHO_CMD} - Document IS_JAILED in the header Affected files ... .. //depot/projects/soc2006/gabor_ports/Mk/bsd.port.mk#65 edit Differences ... ==== //depot/projects/soc2006/gabor_ports/Mk/bsd.port.mk#65 (text+ko) ==== @@ -1013,6 +1013,10 @@ # has been specified in distinfo. This is useful # when using an alternate FETCH_CMD. # +# IS_JAILED - You can test this variable to test if the build +# is running in a jailed environment. It can be +# overridden for testing purposes. +# # End of the list of all variables that need to be defined in a port. # Most port authors should not need to understand anything after this point. # @@ -1158,7 +1162,7 @@ .endif .if !defined(IS_JAILED) && ${OSVERSION} >= 502104 -IS_JAILED!= if [ `${SYSCTL} -n security.jail.jailed` = "1" ] ; then echo YES; fi; +IS_JAILED!= if [ `${SYSCTL} -n security.jail.jailed` = "1" ] ; then ${ECHO_CMD} YES; fi; .endif # Get the object format. From owner-p4-projects@FreeBSD.ORG Fri Jul 28 18:31:01 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 203E616A4E0; Fri, 28 Jul 2006 18:31:01 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id D2E8216A4DE for ; Fri, 28 Jul 2006 18:31:00 +0000 (UTC) (envelope-from gabor@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 9FE0243D46 for ; Fri, 28 Jul 2006 18:31:00 +0000 (GMT) (envelope-from gabor@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k6SIV0sp072011 for ; Fri, 28 Jul 2006 18:31:00 GMT (envelope-from gabor@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k6SIV0SZ072006 for perforce@freebsd.org; Fri, 28 Jul 2006 18:31:00 GMT (envelope-from gabor@FreeBSD.org) Date: Fri, 28 Jul 2006 18:31:00 GMT Message-Id: <200607281831.k6SIV0SZ072006@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to gabor@FreeBSD.org using -f From: Gabor Kovesdan To: Perforce Change Reviews Cc: Subject: PERFORCE change 102671 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 28 Jul 2006 18:31:01 -0000 http://perforce.freebsd.org/chv.cgi?CH=102671 Change 102671 by gabor@gabor_spitfire on 2006/07/28 18:30:37 Revert suexec change since it is not used for building, just for a static path at runtime. Reported by: clement Affected files ... .. //depot/projects/soc2006/gabor_ports/Mk/bsd.apache.mk#5 edit Differences ... ==== //depot/projects/soc2006/gabor_ports/Mk/bsd.apache.mk#5 (text+ko) ==== @@ -175,7 +175,7 @@ --${SUEXEC_CONFARGS}-safepath="${SUEXEC_SAFEPATH}" \ --${SUEXEC_CONFARGS}-logfile="${SUEXEC_LOGFILE}" .if ${USE_APACHE:Mcommon2*} != "" -CONFIGURE_ARGS+= --${SUEXEC_CONFARGS}-bin="${TARGETDIR}/sbin/suexec" +CONFIGURE_ARGS+= --${SUEXEC_CONFARGS}-bin="${PREFIX}/sbin/suexec" .endif . if defined(WITH_SUEXEC_UMASK) From owner-p4-projects@FreeBSD.ORG Fri Jul 28 18:36:08 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A704E16A4DE; Fri, 28 Jul 2006 18:36:08 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 80C1A16A4E1 for ; Fri, 28 Jul 2006 18:36:08 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id C57AB43D49 for ; Fri, 28 Jul 2006 18:36:07 +0000 (GMT) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k6SIa7KH073176 for ; Fri, 28 Jul 2006 18:36:07 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k6SIa7YE073173 for perforce@freebsd.org; Fri, 28 Jul 2006 18:36:07 GMT (envelope-from jhb@freebsd.org) Date: Fri, 28 Jul 2006 18:36:07 GMT Message-Id: <200607281836.k6SIa7YE073173@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 Cc: Subject: PERFORCE change 102672 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 28 Jul 2006 18:36:08 -0000 http://perforce.freebsd.org/chv.cgi?CH=102672 Change 102672 by jhb@jhb_mutex on 2006/07/28 18:35:32 Remove all the 'M' prefixes (and some other minor cleanups to comments). Affected files ... .. //depot/projects/smpng/sys/amd64/linux32/syscalls.master#17 edit .. //depot/projects/smpng/sys/compat/freebsd32/syscalls.master#35 edit .. //depot/projects/smpng/sys/compat/svr4/syscalls.master#25 edit .. //depot/projects/smpng/sys/i386/ibcs2/syscalls.isc#9 edit .. //depot/projects/smpng/sys/i386/ibcs2/syscalls.master#20 edit .. //depot/projects/smpng/sys/i386/ibcs2/syscalls.xenix#9 edit .. //depot/projects/smpng/sys/i386/linux/syscalls.master#37 edit .. //depot/projects/smpng/sys/kern/syscalls.master#78 edit Differences ... ==== //depot/projects/smpng/sys/amd64/linux32/syscalls.master#17 (text+ko) ==== @@ -14,20 +14,15 @@ ; type one of STD, OBSOL, UNIMPL ; name psuedo-prototype of syscall routine ; If one of the following alts is different, then all appear: -; audit the audit event associated with the system call -; A value of AUE_NULL means no auditing, but it also means that -; there is no audit event for the call at this time. For the -; case where the event exists, but we don't want auditing, the -; event should be #defined to AUE_NULL in audit_kevents.h. ; altname name of system call if different ; alttag name of args struct tag if different from [o]`name'"_args" ; altrtyp return type if not int (bogus - syscalls always return int) ; for UNIMPL/OBSOL, name continues with comments ; types: -; AUE_NULL STD always included +; STD always included ; OBSOL obsolete, not included in system, only specifies name -; AUE_NULL UNIMPL not implemented, placeholder only +; UNIMPL not implemented, placeholder only #include "opt_compat.h" #include @@ -43,365 +38,365 @@ ; #ifdef's, etc. may be included, and are copied to the output files. 0 AUE_NULL UNIMPL setup -1 AUE_EXIT MNOPROTO { void sys_exit(int rval); } exit \ +1 AUE_EXIT NOPROTO { void sys_exit(int rval); } exit \ sys_exit_args void -2 AUE_FORK MSTD { int linux_fork(void); } -3 AUE_NULL MNOPROTO { int read(int fd, char *buf, \ +2 AUE_FORK STD { int linux_fork(void); } +3 AUE_NULL NOPROTO { int read(int fd, char *buf, \ u_int nbyte); } -4 AUE_NULL MNOPROTO { int write(int fd, char *buf, \ +4 AUE_NULL NOPROTO { int write(int fd, char *buf, \ u_int nbyte); } -5 AUE_OPEN_RWTC MSTD { int linux_open(char *path, l_int flags, \ +5 AUE_OPEN_RWTC STD { int linux_open(char *path, l_int flags, \ l_int mode); } -6 AUE_CLOSE MNOPROTO { int close(int fd); } -7 AUE_WAIT4 MSTD { int linux_waitpid(l_pid_t pid, \ +6 AUE_CLOSE NOPROTO { int close(int fd); } +7 AUE_WAIT4 STD { int linux_waitpid(l_pid_t pid, \ l_int *status, l_int options); } -8 AUE_O_CREAT MSTD { int linux_creat(char *path, \ +8 AUE_O_CREAT STD { int linux_creat(char *path, \ l_int mode); } -9 AUE_LINK MSTD { int linux_link(char *path, char *to); } -10 AUE_UNLINK MSTD { int linux_unlink(char *path); } -11 AUE_EXECVE MSTD { int linux_execve(char *path, char **argp, \ +9 AUE_LINK STD { int linux_link(char *path, char *to); } +10 AUE_UNLINK STD { int linux_unlink(char *path); } +11 AUE_EXECVE STD { int linux_execve(char *path, char **argp, \ char **envp); } -12 AUE_CHDIR MSTD { int linux_chdir(char *path); } -13 AUE_NULL MSTD { int linux_time(l_time_t *tm); } -14 AUE_MKNOD MSTD { int linux_mknod(char *path, l_int mode, \ +12 AUE_CHDIR STD { int linux_chdir(char *path); } +13 AUE_NULL STD { int linux_time(l_time_t *tm); } +14 AUE_MKNOD STD { int linux_mknod(char *path, l_int mode, \ l_dev_t dev); } -15 AUE_CHMOD MSTD { int linux_chmod(char *path, \ +15 AUE_CHMOD STD { int linux_chmod(char *path, \ l_mode_t mode); } -16 AUE_LCHOWN MSTD { int linux_lchown16(char *path, \ +16 AUE_LCHOWN STD { int linux_lchown16(char *path, \ l_uid16_t uid, l_gid16_t gid); } 17 AUE_NULL UNIMPL break -18 AUE_STAT MSTD { int linux_stat(char *path, \ +18 AUE_STAT STD { int linux_stat(char *path, \ struct linux_stat *up); } -19 AUE_LSEEK MSTD { int linux_lseek(l_uint fdes, l_off_t off, \ +19 AUE_LSEEK STD { int linux_lseek(l_uint fdes, l_off_t off, \ l_int whence); } -20 AUE_GETPID MSTD { int linux_getpid(void); } -21 AUE_MOUNT MSTD { int linux_mount(char *specialfile, \ +20 AUE_GETPID STD { int linux_getpid(void); } +21 AUE_MOUNT STD { int linux_mount(char *specialfile, \ char *dir, char *filesystemtype, \ l_ulong rwflag, void *data); } -22 AUE_UMOUNT MSTD { int linux_oldumount(char *path); } -23 AUE_SETUID MSTD { int linux_setuid16(l_uid16_t uid); } -24 AUE_GETUID MSTD { int linux_getuid16(void); } -25 AUE_SETTIMEOFDAY MSTD { int linux_stime(void); } -26 AUE_PTRACE MSTD { int linux_ptrace(l_long req, l_long pid, \ +22 AUE_UMOUNT STD { int linux_oldumount(char *path); } +23 AUE_SETUID STD { int linux_setuid16(l_uid16_t uid); } +24 AUE_GETUID STD { int linux_getuid16(void); } +25 AUE_SETTIMEOFDAY STD { int linux_stime(void); } +26 AUE_PTRACE STD { int linux_ptrace(l_long req, l_long pid, \ l_long addr, l_long data); } -27 AUE_NULL MSTD { int linux_alarm(l_uint secs); } +27 AUE_NULL STD { int linux_alarm(l_uint secs); } 28 AUE_NULL UNIMPL fstat -29 AUE_NULL MSTD { int linux_pause(void); } -30 AUE_UTIME MSTD { int linux_utime(char *fname, \ +29 AUE_NULL STD { int linux_pause(void); } +30 AUE_UTIME STD { int linux_utime(char *fname, \ struct l_utimbuf *times); } 31 AUE_NULL UNIMPL stty 32 AUE_NULL UNIMPL gtty -33 AUE_ACCESS MSTD { int linux_access(char *path, l_int flags); } -34 AUE_NICE MSTD { int linux_nice(l_int inc); } +33 AUE_ACCESS STD { int linux_access(char *path, l_int flags); } +34 AUE_NICE STD { int linux_nice(l_int inc); } 35 AUE_NULL UNIMPL ftime -36 AUE_SYNC MNOPROTO { int sync(void); } -37 AUE_KILL MSTD { int linux_kill(l_int pid, l_int signum); } -38 AUE_RENAME MSTD { int linux_rename(char *from, char *to); } -39 AUE_MKDIR MSTD { int linux_mkdir(char *path, l_int mode); } -40 AUE_RMDIR MSTD { int linux_rmdir(char *path); } -41 AUE_DUP MNOPROTO { int dup(u_int fd); } -42 AUE_PIPE MSTD { int linux_pipe(l_ulong *pipefds); } -43 AUE_NULL MSTD { int linux_times(struct l_times_argv *buf); } +36 AUE_SYNC NOPROTO { int sync(void); } +37 AUE_KILL STD { int linux_kill(l_int pid, l_int signum); } +38 AUE_RENAME STD { int linux_rename(char *from, char *to); } +39 AUE_MKDIR STD { int linux_mkdir(char *path, l_int mode); } +40 AUE_RMDIR STD { int linux_rmdir(char *path); } +41 AUE_DUP NOPROTO { int dup(u_int fd); } +42 AUE_PIPE STD { int linux_pipe(l_ulong *pipefds); } +43 AUE_NULL STD { int linux_times(struct l_times_argv *buf); } 44 AUE_NULL UNIMPL prof -45 AUE_NULL MSTD { int linux_brk(l_ulong dsend); } -46 AUE_SETGID MSTD { int linux_setgid16(l_gid16_t gid); } -47 AUE_GETGID MSTD { int linux_getgid16(void); } -48 AUE_NULL MSTD { int linux_signal(l_int sig, \ +45 AUE_NULL STD { int linux_brk(l_ulong dsend); } +46 AUE_SETGID STD { int linux_setgid16(l_gid16_t gid); } +47 AUE_GETGID STD { int linux_getgid16(void); } +48 AUE_NULL STD { int linux_signal(l_int sig, \ l_handler_t handler); } -49 AUE_GETEUID MSTD { int linux_geteuid16(void); } -50 AUE_GETEGID MSTD { int linux_getegid16(void); } -51 AUE_ACCT MNOPROTO { int acct(char *path); } -52 AUE_UMOUNT MSTD { int linux_umount(char *path, l_int flags); } +49 AUE_GETEUID STD { int linux_geteuid16(void); } +50 AUE_GETEGID STD { int linux_getegid16(void); } +51 AUE_ACCT NOPROTO { int acct(char *path); } +52 AUE_UMOUNT STD { int linux_umount(char *path, l_int flags); } 53 AUE_NULL UNIMPL lock -54 AUE_IOCTL MSTD { int linux_ioctl(l_uint fd, l_uint cmd, \ +54 AUE_IOCTL STD { int linux_ioctl(l_uint fd, l_uint cmd, \ uintptr_t arg); } -55 AUE_FCNTL MSTD { int linux_fcntl(l_uint fd, l_uint cmd, \ +55 AUE_FCNTL STD { int linux_fcntl(l_uint fd, l_uint cmd, \ uintptr_t arg); } 56 AUE_NULL UNIMPL mpx -57 AUE_SETPGRP MNOPROTO { int setpgid(int pid, int pgid); } +57 AUE_SETPGRP NOPROTO { int setpgid(int pid, int pgid); } 58 AUE_NULL UNIMPL ulimit -59 AUE_NULL MSTD { int linux_olduname(void); } -60 AUE_UMASK MNOPROTO { int umask(int newmask); } -61 AUE_CHROOT MNOPROTO { int chroot(char *path); } -62 AUE_NULL MSTD { int linux_ustat(l_dev_t dev, \ +59 AUE_NULL STD { int linux_olduname(void); } +60 AUE_UMASK NOPROTO { int umask(int newmask); } +61 AUE_CHROOT NOPROTO { int chroot(char *path); } +62 AUE_NULL STD { int linux_ustat(l_dev_t dev, \ struct l_ustat *ubuf); } -63 AUE_DUP2 MNOPROTO { int dup2(u_int from, u_int to); } -64 AUE_GETPPID MNOPROTO { int getppid(void); } -65 AUE_GETPGRP MNOPROTO { int getpgrp(void); } -66 AUE_SETSID MNOPROTO { int setsid(void); } -67 AUE_NULL MSTD { int linux_sigaction(l_int sig, \ +63 AUE_DUP2 NOPROTO { int dup2(u_int from, u_int to); } +64 AUE_GETPPID NOPROTO { int getppid(void); } +65 AUE_GETPGRP NOPROTO { int getpgrp(void); } +66 AUE_SETSID NOPROTO { int setsid(void); } +67 AUE_NULL STD { int linux_sigaction(l_int sig, \ l_osigaction_t *nsa, \ l_osigaction_t *osa); } -68 AUE_NULL MSTD { int linux_sgetmask(void); } -69 AUE_NULL MSTD { int linux_ssetmask(l_osigset_t mask); } -70 AUE_SETREUID MSTD { int linux_setreuid16(l_uid16_t ruid, \ +68 AUE_NULL STD { int linux_sgetmask(void); } +69 AUE_NULL STD { int linux_ssetmask(l_osigset_t mask); } +70 AUE_SETREUID STD { int linux_setreuid16(l_uid16_t ruid, \ l_uid16_t euid); } -71 AUE_SETREGID MSTD { int linux_setregid16(l_gid16_t rgid, \ +71 AUE_SETREGID STD { int linux_setregid16(l_gid16_t rgid, \ l_gid16_t egid); } -72 AUE_NULL MSTD { int linux_sigsuspend(l_int hist0, \ +72 AUE_NULL STD { int linux_sigsuspend(l_int hist0, \ l_int hist1, l_osigset_t mask); } -73 AUE_NULL MSTD { int linux_sigpending(l_osigset_t *mask); } -74 AUE_SYSCTL MSTD { int linux_sethostname(char *hostname, \ +73 AUE_NULL STD { int linux_sigpending(l_osigset_t *mask); } +74 AUE_SYSCTL STD { int linux_sethostname(char *hostname, \ u_int len); } -75 AUE_SETRLIMIT MSTD { int linux_setrlimit(l_uint resource, \ +75 AUE_SETRLIMIT STD { int linux_setrlimit(l_uint resource, \ struct l_rlimit *rlim); } -76 AUE_GETRLIMIT MSTD { int linux_old_getrlimit(l_uint resource, \ +76 AUE_GETRLIMIT STD { int linux_old_getrlimit(l_uint resource, \ struct l_rlimit *rlim); } -77 AUE_GETRUSAGE MSTD { int linux_getrusage(int who, \ +77 AUE_GETRUSAGE STD { int linux_getrusage(int who, \ struct l_rusage *rusage); } -78 AUE_NULL MSTD { int linux_gettimeofday( \ +78 AUE_NULL STD { int linux_gettimeofday( \ struct l_timeval *tp, \ struct timezone *tzp); } -79 AUE_SETTIMEOFDAY MSTD { int linux_settimeofday( \ +79 AUE_SETTIMEOFDAY STD { int linux_settimeofday( \ struct l_timeval *tp, \ struct timezone *tzp); } -80 AUE_GETGROUPS MSTD { int linux_getgroups16(l_uint gidsetsize, \ +80 AUE_GETGROUPS STD { int linux_getgroups16(l_uint gidsetsize, \ l_gid16_t *gidset); } -81 AUE_SETGROUPS MSTD { int linux_setgroups16(l_uint gidsetsize, \ +81 AUE_SETGROUPS STD { int linux_setgroups16(l_uint gidsetsize, \ l_gid16_t *gidset); } -82 AUE_SELECT MSTD { int linux_old_select( \ +82 AUE_SELECT STD { int linux_old_select( \ struct l_old_select_argv *ptr); } -83 AUE_SYMLINK MSTD { int linux_symlink(char *path, char *to); } -84 AUE_LSTAT MSTD { int linux_lstat(char *path, struct linux_lstat *up); } -85 AUE_READLINK MSTD { int linux_readlink(char *name, char *buf, \ +83 AUE_SYMLINK STD { int linux_symlink(char *path, char *to); } +84 AUE_LSTAT STD { int linux_lstat(char *path, struct linux_lstat *up); } +85 AUE_READLINK STD { int linux_readlink(char *name, char *buf, \ l_int count); } 86 AUE_NULL UNIMPL linux_uselib -87 AUE_SWAPON MNOPROTO { int swapon(char *name); } -88 AUE_REBOOT MSTD { int linux_reboot(l_int magic1, \ +87 AUE_SWAPON NOPROTO { int swapon(char *name); } +88 AUE_REBOOT STD { int linux_reboot(l_int magic1, \ l_int magic2, l_uint cmd, void *arg); } -89 AUE_O_GETDENTS MSTD { int linux_readdir(l_uint fd, \ +89 AUE_O_GETDENTS STD { int linux_readdir(l_uint fd, \ struct l_dirent *dent, l_uint count); } -90 AUE_MMAP MSTD { int linux_mmap(struct l_mmap_argv *ptr); } -91 AUE_MUNMAP MNOPROTO { int munmap(caddr_t addr, int len); } -92 AUE_TRUNCATE MSTD { int linux_truncate(char *path, \ +90 AUE_MMAP STD { int linux_mmap(struct l_mmap_argv *ptr); } +91 AUE_MUNMAP NOPROTO { int munmap(caddr_t addr, int len); } +92 AUE_TRUNCATE STD { int linux_truncate(char *path, \ l_ulong length); } -93 AUE_FTRUNCATE MSTD { int linux_ftruncate(int fd, long length); } -94 AUE_FCHMOD MNOPROTO { int fchmod(int fd, int mode); } -95 AUE_FCHOWN MNOPROTO { int fchown(int fd, int uid, int gid); } -96 AUE_GETPRIORITY MSTD { int linux_getpriority(int which, int who); } -97 AUE_SETPRIORITY MNOPROTO { int setpriority(int which, int who, \ +93 AUE_FTRUNCATE STD { int linux_ftruncate(int fd, long length); } +94 AUE_FCHMOD NOPROTO { int fchmod(int fd, int mode); } +95 AUE_FCHOWN NOPROTO { int fchown(int fd, int uid, int gid); } +96 AUE_GETPRIORITY STD { int linux_getpriority(int which, int who); } +97 AUE_SETPRIORITY NOPROTO { int setpriority(int which, int who, \ int prio); } 98 AUE_AUE_PROFILE UNIMPL profil -99 AUE_STATFS MSTD { int linux_statfs(char *path, \ +99 AUE_STATFS STD { int linux_statfs(char *path, \ struct l_statfs_buf *buf); } -100 AUE_FSTATFS MSTD { int linux_fstatfs(l_uint fd, \ +100 AUE_FSTATFS STD { int linux_fstatfs(l_uint fd, \ struct l_statfs_buf *buf); } 101 AUE_NULL UNIMPL ioperm -102 AUE_NULL MSTD { int linux_socketcall(l_int what, \ +102 AUE_NULL STD { int linux_socketcall(l_int what, \ l_ulong args); } -103 AUE_NULL MSTD { int linux_syslog(l_int type, char *buf, \ +103 AUE_NULL STD { int linux_syslog(l_int type, char *buf, \ l_int len); } -104 AUE_SETITIMER MSTD { int linux_setitimer(l_int which, \ +104 AUE_SETITIMER STD { int linux_setitimer(l_int which, \ struct l_itimerval *itv, \ struct l_itimerval *oitv); } -105 AUE_GETITIMER MSTD { int linux_getitimer(l_int which, \ +105 AUE_GETITIMER STD { int linux_getitimer(l_int which, \ struct l_itimerval *itv); } -106 AUE_STAT MSTD { int linux_newstat(char *path, \ +106 AUE_STAT STD { int linux_newstat(char *path, \ struct l_newstat *buf); } -107 AUE_LSTAT MSTD { int linux_newlstat(char *path, \ +107 AUE_LSTAT STD { int linux_newlstat(char *path, \ struct l_newstat *buf); } -108 AUE_FSTAT MSTD { int linux_newfstat(l_uint fd, \ +108 AUE_FSTAT STD { int linux_newfstat(l_uint fd, \ struct l_newstat *buf); } -109 AUE_NULL MSTD { int linux_uname(void); } +109 AUE_NULL STD { int linux_uname(void); } 110 AUE_NULL UNIMPL iopl -111 AUE_NULL MSTD { int linux_vhangup(void); } +111 AUE_NULL STD { int linux_vhangup(void); } 112 AUE_NULL UNIMPL idle 113 AUE_NULL UNIMPL vm86old -114 AUE_WAIT4 MSTD { int linux_wait4(l_pid_t pid, \ +114 AUE_WAIT4 STD { int linux_wait4(l_pid_t pid, \ l_uint *status, l_int options, \ struct l_rusage *rusage); } -115 AUE_SWAPOFF MSTD { int linux_swapoff(void); } -116 AUE_NULL MSTD { int linux_sysinfo(struct l_sysinfo *info); } -117 AUE_NULL MSTD { int linux_ipc(l_uint what, l_int arg1, \ +115 AUE_SWAPOFF STD { int linux_swapoff(void); } +116 AUE_NULL STD { int linux_sysinfo(struct l_sysinfo *info); } +117 AUE_NULL STD { int linux_ipc(l_uint what, l_int arg1, \ l_int arg2, l_int arg3, void *ptr, \ l_long arg5); } -118 AUE_FSYNC MNOPROTO { int fsync(int fd); } -119 AUE_SIGRETURN MSTD { int linux_sigreturn( \ +118 AUE_FSYNC NOPROTO { int fsync(int fd); } +119 AUE_SIGRETURN STD { int linux_sigreturn( \ struct l_sigframe *sfp); } -120 AUE_RFORK MSTD { int linux_clone(l_int flags, void *stack); } -121 AUE_SYSCTL MNOPROTO { int setdomainname(char *name, \ +120 AUE_RFORK STD { int linux_clone(l_int flags, void *stack); } +121 AUE_SYSCTL NOPROTO { int setdomainname(char *name, \ int len); } -122 AUE_NULL MSTD { int linux_newuname( \ +122 AUE_NULL STD { int linux_newuname( \ struct l_new_utsname *buf); } 123 AUE_NULL UNIMPL modify_ldt -124 AUE_ADJTIME MSTD { int linux_adjtimex(void); } -125 AUE_MPROTECT MSTD { int linux_mprotect(caddr_t addr, int len, \ +124 AUE_ADJTIME STD { int linux_adjtimex(void); } +125 AUE_MPROTECT STD { int linux_mprotect(caddr_t addr, int len, \ int prot); } -126 AUE_SIGPROCMASK MSTD { int linux_sigprocmask(l_int how, \ +126 AUE_SIGPROCMASK STD { int linux_sigprocmask(l_int how, \ l_osigset_t *mask, l_osigset_t *omask); } -127 AUE_NULL MSTD { int linux_create_module(void); } -128 AUE_NULL MSTD { int linux_init_module(void); } -129 AUE_NULL MSTD { int linux_delete_module(void); } -130 AUE_NULL MSTD { int linux_get_kernel_syms(void); } -131 AUE_QUOTACTL MSTD { int linux_quotactl(void); } -132 AUE_GETPGID MNOPROTO { int getpgid(int pid); } -133 AUE_FCHDIR MNOPROTO { int fchdir(int fd); } -134 AUE_BDFLUSH MSTD { int linux_bdflush(void); } -135 AUE_NULL MSTD { int linux_sysfs(l_int option, \ +127 AUE_NULL STD { int linux_create_module(void); } +128 AUE_NULL STD { int linux_init_module(void); } +129 AUE_NULL STD { int linux_delete_module(void); } +130 AUE_NULL STD { int linux_get_kernel_syms(void); } +131 AUE_QUOTACTL STD { int linux_quotactl(void); } +132 AUE_GETPGID NOPROTO { int getpgid(int pid); } +133 AUE_FCHDIR NOPROTO { int fchdir(int fd); } +134 AUE_BDFLUSH STD { int linux_bdflush(void); } +135 AUE_NULL STD { int linux_sysfs(l_int option, \ l_ulong arg1, l_ulong arg2); } -136 AUE_PERSONALITY MSTD { int linux_personality(l_ulong per); } +136 AUE_PERSONALITY STD { int linux_personality(l_ulong per); } 137 AUE_NULL UNIMPL afs_syscall -138 AUE_SETFSUID MSTD { int linux_setfsuid16(l_uid16_t uid); } -139 AUE_SETFSGID MSTD { int linux_setfsgid16(l_gid16_t gid); } -140 AUE_LSEEK MSTD { int linux_llseek(l_int fd, l_ulong ohigh, \ +138 AUE_SETFSUID STD { int linux_setfsuid16(l_uid16_t uid); } +139 AUE_SETFSGID STD { int linux_setfsgid16(l_gid16_t gid); } +140 AUE_LSEEK STD { int linux_llseek(l_int fd, l_ulong ohigh, \ l_ulong olow, l_loff_t *res, \ l_uint whence); } -141 AUE_O_GETDENTS MSTD { int linux_getdents(l_uint fd, void *dent, \ +141 AUE_O_GETDENTS STD { int linux_getdents(l_uint fd, void *dent, \ l_uint count); } -142 AUE_SELECT MSTD { int linux_select(l_int nfds, \ +142 AUE_SELECT STD { int linux_select(l_int nfds, \ l_fd_set *readfds, l_fd_set *writefds, \ l_fd_set *exceptfds, \ struct l_timeval *timeout); } -143 AUE_FLOCK MNOPROTO { int flock(int fd, int how); } -144 AUE_MSYNC MSTD { int linux_msync(l_ulong addr, \ +143 AUE_FLOCK NOPROTO { int flock(int fd, int how); } +144 AUE_MSYNC STD { int linux_msync(l_ulong addr, \ l_size_t len, l_int fl); } -145 AUE_READV MSTD { int linux_readv(int fd, struct iovec32 *iovp, \ +145 AUE_READV STD { int linux_readv(int fd, struct iovec32 *iovp, \ u_int iovcnt); } -146 AUE_WRITEV MSTD { int linux_writev(int fd, struct iovec32 *iovp, \ +146 AUE_WRITEV STD { int linux_writev(int fd, struct iovec32 *iovp, \ u_int iovcnt); } -147 AUE_GETSID MSTD { int linux_getsid(l_pid_t pid); } -148 AUE_NULL MSTD { int linux_fdatasync(l_uint fd); } -149 AUE_SYSCTL MSTD { int linux_sysctl( \ +147 AUE_GETSID STD { int linux_getsid(l_pid_t pid); } +148 AUE_NULL STD { int linux_fdatasync(l_uint fd); } +149 AUE_SYSCTL STD { int linux_sysctl( \ struct l___sysctl_args *args); } -150 AUE_MLOCK MNOPROTO { int mlock(const void *addr, size_t len); } -151 AUE_MUNLOCK MNOPROTO { int munlock(const void *addr, size_t len); } -152 AUE_MLOCKALL MNOPROTO { int mlockall(int how); } -153 AUE_MUNLOCKALL MNOPROTO { int munlockall(void); } -154 AUE_SCHED_SETPARAM MNOPROTO { int sched_setparam(pid_t pid, \ +150 AUE_MLOCK NOPROTO { int mlock(const void *addr, size_t len); } +151 AUE_MUNLOCK NOPROTO { int munlock(const void *addr, size_t len); } +152 AUE_MLOCKALL NOPROTO { int mlockall(int how); } +153 AUE_MUNLOCKALL NOPROTO { int munlockall(void); } +154 AUE_SCHED_SETPARAM NOPROTO { int sched_setparam(pid_t pid, \ const struct sched_param *param); } -155 AUE_SCHED_GETPARAM MNOPROTO { int sched_getparam(pid_t pid, \ +155 AUE_SCHED_GETPARAM NOPROTO { int sched_getparam(pid_t pid, \ struct sched_param *param); } -156 AUE_SCHED_SETSCHEDULER MSTD { int linux_sched_setscheduler(l_pid_t pid, \ +156 AUE_SCHED_SETSCHEDULER STD { int linux_sched_setscheduler(l_pid_t pid, \ l_int policy, \ struct l_sched_param *param); } -157 AUE_SCHED_GETSCHEDULER MSTD { int linux_sched_getscheduler(l_pid_t pid); } -158 AUE_NULL MNOPROTO { int sched_yield(void); } -159 AUE_SCHED_GET_PRIORITY_MAX MSTD { int linux_sched_get_priority_max( \ +157 AUE_SCHED_GETSCHEDULER STD { int linux_sched_getscheduler(l_pid_t pid); } +158 AUE_NULL NOPROTO { int sched_yield(void); } +159 AUE_SCHED_GET_PRIORITY_MAX STD { int linux_sched_get_priority_max( \ l_int policy); } -160 AUE_SCHED_GET_PRIORITY_MIN MSTD { int linux_sched_get_priority_min( \ +160 AUE_SCHED_GET_PRIORITY_MIN STD { int linux_sched_get_priority_min( \ l_int policy); } -161 AUE_SCHED_RR_GET_INTERVAL MSTD { int linux_sched_rr_get_interval(l_pid_t pid, \ +161 AUE_SCHED_RR_GET_INTERVAL STD { int linux_sched_rr_get_interval(l_pid_t pid, \ struct l_timespec *interval); } -162 AUE_NULL MSTD { int linux_nanosleep( \ +162 AUE_NULL STD { int linux_nanosleep( \ const struct l_timespec *rqtp, \ struct l_timespec *rmtp); } -163 AUE_NULL MSTD { int linux_mremap(l_ulong addr, \ +163 AUE_NULL STD { int linux_mremap(l_ulong addr, \ l_ulong old_len, l_ulong new_len, \ l_ulong flags, l_ulong new_addr); } -164 AUE_SETRESUID MSTD { int linux_setresuid16(l_uid16_t ruid, \ +164 AUE_SETRESUID STD { int linux_setresuid16(l_uid16_t ruid, \ l_uid16_t euid, l_uid16_t suid); } -165 AUE_GETRESUID MSTD { int linux_getresuid16(l_uid16_t *ruid, \ +165 AUE_GETRESUID STD { int linux_getresuid16(l_uid16_t *ruid, \ l_uid16_t *euid, l_uid16_t *suid); } 166 AUE_NULL UNIMPL vm86 -167 AUE_NULL MSTD { int linux_query_module(void); } -168 AUE_POLL MNOPROTO { int poll(struct pollfd*, \ +167 AUE_NULL STD { int linux_query_module(void); } +168 AUE_POLL NOPROTO { int poll(struct pollfd*, \ unsigned int nfds, int timeout); } -169 AUE_NULL MSTD { int linux_nfsservctl(void); } -170 AUE_SETRESGID MSTD { int linux_setresgid16(l_gid16_t rgid, \ +169 AUE_NULL STD { int linux_nfsservctl(void); } +170 AUE_SETRESGID STD { int linux_setresgid16(l_gid16_t rgid, \ l_gid16_t egid, l_gid16_t sgid); } -171 AUE_GETRESGID MSTD { int linux_getresgid16(l_gid16_t *rgid, \ +171 AUE_GETRESGID STD { int linux_getresgid16(l_gid16_t *rgid, \ l_gid16_t *egid, l_gid16_t *sgid); } -172 AUE_PRCTL MSTD { int linux_prctl(void); } -173 AUE_NULL MSTD { int linux_rt_sigreturn( \ +172 AUE_PRCTL STD { int linux_prctl(void); } +173 AUE_NULL STD { int linux_rt_sigreturn( \ struct l_ucontext *ucp); } -174 AUE_NULL MSTD { int linux_rt_sigaction(l_int sig, \ +174 AUE_NULL STD { int linux_rt_sigaction(l_int sig, \ l_sigaction_t *act, l_sigaction_t *oact, \ l_size_t sigsetsize); } -175 AUE_NULL MSTD { int linux_rt_sigprocmask(l_int how, \ +175 AUE_NULL STD { int linux_rt_sigprocmask(l_int how, \ l_sigset_t *mask, l_sigset_t *omask, \ l_size_t sigsetsize); } -176 AUE_NULL MSTD { int linux_rt_sigpending(l_sigset_t *set, \ +176 AUE_NULL STD { int linux_rt_sigpending(l_sigset_t *set, \ l_size_t sigsetsize); } -177 AUE_NULL MSTD { int linux_rt_sigtimedwait(void); } -178 AUE_NULL MSTD { int linux_rt_sigqueueinfo(void); } -179 AUE_NULL MSTD { int linux_rt_sigsuspend( \ +177 AUE_NULL STD { int linux_rt_sigtimedwait(void); } +178 AUE_NULL STD { int linux_rt_sigqueueinfo(void); } +179 AUE_NULL STD { int linux_rt_sigsuspend( \ l_sigset_t *newset, \ l_size_t sigsetsize); } -180 AUE_PREAD MSTD { int linux_pread(l_uint fd, char *buf, \ +180 AUE_PREAD STD { int linux_pread(l_uint fd, char *buf, \ l_size_t nbyte, l_loff_t offset); } -181 AUE_PWRITE MSTD { int linux_pwrite(l_uint fd, char *buf, \ +181 AUE_PWRITE STD { int linux_pwrite(l_uint fd, char *buf, \ l_size_t nbyte, l_loff_t offset); } -182 AUE_CHOWN MSTD { int linux_chown16(char *path, \ +182 AUE_CHOWN STD { int linux_chown16(char *path, \ l_uid16_t uid, l_gid16_t gid); } -183 AUE_GETCWD MSTD { int linux_getcwd(char *buf, \ +183 AUE_GETCWD STD { int linux_getcwd(char *buf, \ l_ulong bufsize); } -184 AUE_CAPGET MSTD { int linux_capget(void); } -185 AUE_CAPSET MSTD { int linux_capset(void); } -186 AUE_NULL MSTD { int linux_sigaltstack(l_stack_t *uss, \ +184 AUE_CAPGET STD { int linux_capget(void); } +185 AUE_CAPSET STD { int linux_capset(void); } +186 AUE_NULL STD { int linux_sigaltstack(l_stack_t *uss, \ l_stack_t *uoss); } -187 AUE_SENDFILE MSTD { int linux_sendfile(void); } +187 AUE_SENDFILE STD { int linux_sendfile(void); } 188 AUE_GETPMSG UNIMPL getpmsg 189 AUE_PUTPMSG UNIMPL putpmsg -190 AUE_VFORK MSTD { int linux_vfork(void); } -191 AUE_GETRLIMIT MSTD { int linux_getrlimit(l_uint resource, \ +190 AUE_VFORK STD { int linux_vfork(void); } +191 AUE_GETRLIMIT STD { int linux_getrlimit(l_uint resource, \ struct l_rlimit *rlim); } -192 AUE_MMAP MSTD { int linux_mmap2(l_ulong addr, l_ulong len, \ +192 AUE_MMAP STD { int linux_mmap2(l_ulong addr, l_ulong len, \ l_ulong prot, l_ulong flags, l_ulong fd, \ l_ulong pgoff); } -193 AUE_TRUNCATE MSTD { int linux_truncate64(char *path, \ +193 AUE_TRUNCATE STD { int linux_truncate64(char *path, \ l_loff_t length); } -194 AUE_FTRUNCATE MSTD { int linux_ftruncate64(l_uint fd, \ +194 AUE_FTRUNCATE STD { int linux_ftruncate64(l_uint fd, \ l_loff_t length); } -195 AUE_STAT MSTD { int linux_stat64(char *filename, \ +195 AUE_STAT STD { int linux_stat64(char *filename, \ struct l_stat64 *statbuf, l_long flags); } -196 AUE_LSTAT MSTD { int linux_lstat64(char *filename, \ +196 AUE_LSTAT STD { int linux_lstat64(char *filename, \ struct l_stat64 *statbuf, l_long flags); } -197 AUE_FSTAT MSTD { int linux_fstat64(l_ulong fd, \ +197 AUE_FSTAT STD { int linux_fstat64(l_ulong fd, \ struct l_stat64 *statbuf, l_long flags); } -198 AUE_LCHOWN MSTD { int linux_lchown(char *path, l_uid_t uid, \ +198 AUE_LCHOWN STD { int linux_lchown(char *path, l_uid_t uid, \ l_gid_t gid); } -199 AUE_GETUID MSTD { int linux_getuid(void); } -200 AUE_GETGID MSTD { int linux_getgid(void); } -201 AUE_GETEUID MNOPROTO { int geteuid(void); } -202 AUE_GETEGID MNOPROTO { int getegid(void); } -203 AUE_SETREUID MNOPROTO { int setreuid(uid_t ruid, uid_t euid); } -204 AUE_SETREGID MNOPROTO { int setregid(gid_t rgid, gid_t egid); } -205 AUE_GETGROUPS MSTD { int linux_getgroups(l_int gidsetsize, \ +199 AUE_GETUID STD { int linux_getuid(void); } +200 AUE_GETGID STD { int linux_getgid(void); } +201 AUE_GETEUID NOPROTO { int geteuid(void); } +202 AUE_GETEGID NOPROTO { int getegid(void); } +203 AUE_SETREUID NOPROTO { int setreuid(uid_t ruid, uid_t euid); } +204 AUE_SETREGID NOPROTO { int setregid(gid_t rgid, gid_t egid); } +205 AUE_GETGROUPS STD { int linux_getgroups(l_int gidsetsize, \ l_gid_t *grouplist); } -206 AUE_SETGROUPS MSTD { int linux_setgroups(l_int gidsetsize, \ +206 AUE_SETGROUPS STD { int linux_setgroups(l_int gidsetsize, \ l_gid_t *grouplist); } 207 AUE_FCHOWN NODEF fchown fchown fchown_args int -208 AUE_SETRESUID MNOPROTO { int setresuid(uid_t ruid, uid_t euid, \ +208 AUE_SETRESUID NOPROTO { int setresuid(uid_t ruid, uid_t euid, \ uid_t suid); } -209 AUE_GETRESUID MNOPROTO { int getresuid(uid_t *ruid, uid_t *euid, \ +209 AUE_GETRESUID NOPROTO { int getresuid(uid_t *ruid, uid_t *euid, \ uid_t *suid); } -210 AUE_SETRESGID MNOPROTO { int setresgid(gid_t rgid, gid_t egid, \ +210 AUE_SETRESGID NOPROTO { int setresgid(gid_t rgid, gid_t egid, \ gid_t sgid); } -211 AUE_GETRESGID MNOPROTO { int getresgid(gid_t *rgid, gid_t *egid, \ +211 AUE_GETRESGID NOPROTO { int getresgid(gid_t *rgid, gid_t *egid, \ gid_t *sgid); } -212 AUE_CHOWN MSTD { int linux_chown(char *path, l_uid_t uid, \ +212 AUE_CHOWN STD { int linux_chown(char *path, l_uid_t uid, \ l_gid_t gid); } -213 AUE_SETUID MNOPROTO { int setuid(uid_t uid); } -214 AUE_SETGID MNOPROTO { int setgid(gid_t gid); } -215 AUE_SETFSUID MSTD { int linux_setfsuid(l_uid_t uid); } -216 AUE_SETFSGID MSTD { int linux_setfsgid(l_gid_t gid); } -217 AUE_PIVOT_ROOT MSTD { int linux_pivot_root(char *new_root, \ +213 AUE_SETUID NOPROTO { int setuid(uid_t uid); } +214 AUE_SETGID NOPROTO { int setgid(gid_t gid); } +215 AUE_SETFSUID STD { int linux_setfsuid(l_uid_t uid); } +216 AUE_SETFSGID STD { int linux_setfsgid(l_gid_t gid); } +217 AUE_PIVOT_ROOT STD { int linux_pivot_root(char *new_root, \ char *put_old); } -218 AUE_MINCORE MSTD { int linux_mincore(l_ulong start, \ +218 AUE_MINCORE STD { int linux_mincore(l_ulong start, \ l_size_t len, u_char *vec); } -219 AUE_MADVISE MNOPROTO { int madvise(void *addr, size_t len, \ +219 AUE_MADVISE NOPROTO { int madvise(void *addr, size_t len, \ int behav); } -220 AUE_O_GETDENTS MSTD { int linux_getdents64(l_uint fd, \ +220 AUE_O_GETDENTS STD { int linux_getdents64(l_uint fd, \ void *dirent, l_uint count); } -221 AUE_FCNTL MSTD { int linux_fcntl64(l_uint fd, l_uint cmd, \ +221 AUE_FCNTL STD { int linux_fcntl64(l_uint fd, l_uint cmd, \ uintptr_t arg); } 222 AUE_NULL UNIMPL 223 AUE_NULL UNIMPL -224 AUE_NULL MNOPROTO { long linux_getpid(void); } gettid \ +224 AUE_NULL NOPROTO { long linux_getpid(void); } gettid \ linux_getpid_args void 225 AUE_NULL UNIMPL linux_readahead -226 AUE_NULL MSTD { int linux_setxattr(void); } -227 AUE_NULL MSTD { int linux_lsetxattr(void); } -228 AUE_NULL MSTD { int linux_fsetxattr(void); } -229 AUE_NULL MSTD { int linux_getxattr(void); } -230 AUE_NULL MSTD { int linux_lgetxattr(void); } -231 AUE_NULL MSTD { int linux_fgetxattr(void); } -232 AUE_NULL MSTD { int linux_listxattr(void); } -233 AUE_NULL MSTD { int linux_llistxattr(void); } -234 AUE_NULL MSTD { int linux_flistxattr(void); } -235 AUE_NULL MSTD { int linux_removexattr(void); } -236 AUE_NULL MSTD { int linux_lremovexattr(void); } -237 AUE_NULL MSTD { int linux_fremovexattr(void); } +226 AUE_NULL STD { int linux_setxattr(void); } +227 AUE_NULL STD { int linux_lsetxattr(void); } +228 AUE_NULL STD { int linux_fsetxattr(void); } +229 AUE_NULL STD { int linux_getxattr(void); } +230 AUE_NULL STD { int linux_lgetxattr(void); } +231 AUE_NULL STD { int linux_fgetxattr(void); } +232 AUE_NULL STD { int linux_listxattr(void); } +233 AUE_NULL STD { int linux_llistxattr(void); } +234 AUE_NULL STD { int linux_flistxattr(void); } +235 AUE_NULL STD { int linux_removexattr(void); } +236 AUE_NULL STD { int linux_lremovexattr(void); } +237 AUE_NULL STD { int linux_fremovexattr(void); } 238 AUE_NULL UNIMPL linux_tkill 239 AUE_SENDFILE UNIMPL linux_sendfile64 240 AUE_NULL UNIMPL linux_futex @@ -414,65 +409,65 @@ 247 AUE_NULL UNIMPL linux_io_getevents 248 AUE_NULL UNIMPL linux_io_submit 249 AUE_NULL UNIMPL linux_io_cancel -250 AUE_NULL MSTD { int linux_fadvise64(void); } +250 AUE_NULL STD { int linux_fadvise64(void); } 251 AUE_NULL UNIMPL -252 AUE_EXIT MNOPROTO { void sys_exit(int rval); } exit_group \ +252 AUE_EXIT NOPROTO { void sys_exit(int rval); } exit_group \ sys_exit_args void -253 AUE_NULL MSTD { int linux_lookup_dcookie(void); } -254 AUE_NULL MSTD { int linux_epoll_create(void); } -255 AUE_NULL MSTD { int linux_epoll_ctl(void); } -256 AUE_NULL MSTD { int linux_epoll_wait(void); } -257 AUE_NULL MSTD { int linux_remap_file_pages(void); } -258 AUE_NULL MSTD { int linux_set_tid_address(void); } -259 AUE_NULL MSTD { int linux_timer_create(void); } -260 AUE_NULL MSTD { int linux_timer_settime(void); } -261 AUE_NULL MSTD { int linux_timer_gettime(void); } -262 AUE_NULL MSTD { int linux_timer_getoverrun(void); } -263 AUE_NULL MSTD { int linux_timer_delete(void); } -264 AUE_CLOCK_SETTIME MSTD { int linux_clock_settime(void); } -265 AUE_NULL MSTD { int linux_clock_gettime(void); } -266 AUE_NULL MSTD { int linux_clock_getres(void); } -267 AUE_NULL MSTD { int linux_clock_nanosleep(void); } -268 AUE_NULL MSTD { int linux_statfs64(void); } -269 AUE_NULL MSTD { int linux_fstatfs64(void); } -270 AUE_NULL MSTD { int linux_tgkill(void); } -271 AUE_NULL MSTD { int linux_utimes(void); } -272 AUE_NULL MSTD { int linux_fadvise64_64(void); } +253 AUE_NULL STD { int linux_lookup_dcookie(void); } +254 AUE_NULL STD { int linux_epoll_create(void); } +255 AUE_NULL STD { int linux_epoll_ctl(void); } +256 AUE_NULL STD { int linux_epoll_wait(void); } +257 AUE_NULL STD { int linux_remap_file_pages(void); } +258 AUE_NULL STD { int linux_set_tid_address(void); } +259 AUE_NULL STD { int linux_timer_create(void); } +260 AUE_NULL STD { int linux_timer_settime(void); } +261 AUE_NULL STD { int linux_timer_gettime(void); } +262 AUE_NULL STD { int linux_timer_getoverrun(void); } +263 AUE_NULL STD { int linux_timer_delete(void); } +264 AUE_CLOCK_SETTIME STD { int linux_clock_settime(void); } +265 AUE_NULL STD { int linux_clock_gettime(void); } +266 AUE_NULL STD { int linux_clock_getres(void); } +267 AUE_NULL STD { int linux_clock_nanosleep(void); } +268 AUE_NULL STD { int linux_statfs64(void); } +269 AUE_NULL STD { int linux_fstatfs64(void); } +270 AUE_NULL STD { int linux_tgkill(void); } +271 AUE_NULL STD { int linux_utimes(void); } +272 AUE_NULL STD { int linux_fadvise64_64(void); } 273 AUE_NULL UNIMPL -274 AUE_NULL MSTD { int linux_mbind(void); } -275 AUE_NULL MSTD { int linux_get_mempolicy(void); } -276 AUE_NULL MSTD { int linux_set_mempolicy(void); } -277 AUE_NULL MSTD { int linux_mq_open(void); } -278 AUE_NULL MSTD { int linux_mq_unlink(void); } -279 AUE_NULL MSTD { int linux_mq_timedsend(void); } -280 AUE_NULL MSTD { int linux_mq_timedreceive(void); } -281 AUE_NULL MSTD { int linux_mq_notify(void); } -282 AUE_NULL MSTD { int linux_mq_getsetattr(void); } -283 AUE_NULL MSTD { int linux_kexec_load(void); } -284 AUE_NULL MSTD { int linux_waitid(void); } +274 AUE_NULL STD { int linux_mbind(void); } +275 AUE_NULL STD { int linux_get_mempolicy(void); } +276 AUE_NULL STD { int linux_set_mempolicy(void); } +277 AUE_NULL STD { int linux_mq_open(void); } +278 AUE_NULL STD { int linux_mq_unlink(void); } +279 AUE_NULL STD { int linux_mq_timedsend(void); } +280 AUE_NULL STD { int linux_mq_timedreceive(void); } +281 AUE_NULL STD { int linux_mq_notify(void); } +282 AUE_NULL STD { int linux_mq_getsetattr(void); } +283 AUE_NULL STD { int linux_kexec_load(void); } +284 AUE_NULL STD { int linux_waitid(void); } 285 AUE_NULL UNIMPL -286 AUE_NULL MSTD { int linux_add_key(void); } -287 AUE_NULL MSTD { int linux_request_key(void); } -288 AUE_NULL MSTD { int linux_keyctl(void); } -289 AUE_NULL MSTD { int linux_ioprio_set(void); } -290 AUE_NULL MSTD { int linux_ioprio_get(void); } -291 AUE_NULL MSTD { int linux_inotify_init(void); } -292 AUE_NULL MSTD { int linux_inotify_add_watch(void); } -293 AUE_NULL MSTD { int linux_inotify_rm_watch(void); } -294 AUE_NULL MSTD { int linux_migrate_pages(void); } -295 AUE_NULL MSTD { int linux_openat(void); } -296 AUE_NULL MSTD { int linux_mkdirat(void); } -297 AUE_NULL MSTD { int linux_mknodat(void); } -298 AUE_NULL MSTD { int linux_fchownat(void); } -299 AUE_NULL MSTD { int linux_futimesat(void); } -300 AUE_NULL MSTD { int linux_fstatat64(void); } -301 AUE_NULL MSTD { int linux_unlinkat(void); } -302 AUE_NULL MSTD { int linux_renameat(void); } -303 AUE_NULL MSTD { int linux_linkat(void); } -304 AUE_NULL MSTD { int linux_symlinkat(void); } -305 AUE_NULL MSTD { int linux_readlinkat(void); } -306 AUE_NULL MSTD { int linux_fchmodat(void); } -307 AUE_NULL MSTD { int linux_faccessat(void); } -308 AUE_NULL MSTD { int linux_pselect6(void); } -309 AUE_NULL MSTD { int linux_ppoll(void); } -310 AUE_NULL MSTD { int linux_unshare(void); } +286 AUE_NULL STD { int linux_add_key(void); } +287 AUE_NULL STD { int linux_request_key(void); } +288 AUE_NULL STD { int linux_keyctl(void); } +289 AUE_NULL STD { int linux_ioprio_set(void); } +290 AUE_NULL STD { int linux_ioprio_get(void); } +291 AUE_NULL STD { int linux_inotify_init(void); } +292 AUE_NULL STD { int linux_inotify_add_watch(void); } +293 AUE_NULL STD { int linux_inotify_rm_watch(void); } +294 AUE_NULL STD { int linux_migrate_pages(void); } +295 AUE_NULL STD { int linux_openat(void); } +296 AUE_NULL STD { int linux_mkdirat(void); } +297 AUE_NULL STD { int linux_mknodat(void); } +298 AUE_NULL STD { int linux_fchownat(void); } +299 AUE_NULL STD { int linux_futimesat(void); } +300 AUE_NULL STD { int linux_fstatat64(void); } +301 AUE_NULL STD { int linux_unlinkat(void); } +302 AUE_NULL STD { int linux_renameat(void); } +303 AUE_NULL STD { int linux_linkat(void); } +304 AUE_NULL STD { int linux_symlinkat(void); } +305 AUE_NULL STD { int linux_readlinkat(void); } +306 AUE_NULL STD { int linux_fchmodat(void); } +307 AUE_NULL STD { int linux_faccessat(void); } +308 AUE_NULL STD { int linux_pselect6(void); } +309 AUE_NULL STD { int linux_ppoll(void); } +310 AUE_NULL STD { int linux_unshare(void); } ==== //depot/projects/smpng/sys/compat/freebsd32/syscalls.master#35 (text+ko) ==== @@ -5,16 +5,15 @@ ; System call name/number master file. ; Processed to created init_sysent.c, syscalls.c and syscall.h. -; Columns: number audit [M]type nargs name alt{name,tag,rtyp}/comments +; Columns: number audit type nargs name alt{name,tag,rtyp}/comments ; number system call number, must be in order ; audit the audit event associated with the system call ; A value of AUE_NULL means no auditing, but it also means that ; there is no audit event for the call at this time. For the ; case where the event exists, but we don't want auditing, the ; event should be #defined to AUE_NULL in audit_kevents.h. -; type one of [M]STD, [M]OBSOL, [M]UNIMPL, [M]COMPAT, [M]CPT_NOA, -; [M]LIBCOMPAT, [M]NODEF, [M]NOARGS, [M]NOPROTO, [M]NOIMPL, -; [M]NOSTD +; type one of STD, OBSOL, UNIMPL, COMPAT, CPT_NOA, LIBCOMPAT, +; NODEF, NOARGS, NOPROTO, NOIMPL, NOSTD, COMPAT4 ; name psuedo-prototype of syscall routine ; If one of the following alts is different, then all appear: ; altname name of system call if different @@ -23,17 +22,15 @@ ; for UNIMPL/OBSOL, name continues with comments ; types: -; [M] e.g. like MSTD -- means the system call is MP-safe. If no -; M prefix is used, the syscall wrapper will obtain the Giant -; lock for the syscall. ; STD always included ; COMPAT included on COMPAT #ifdef +; COMPAT4 included on COMPAT4 #ifdef (FreeBSD 4 compat) ; LIBCOMPAT included on COMPAT #ifdef, and placed in syscall.h ; OBSOL obsolete, not included in system, only specifies name ; UNIMPL not implemented, placeholder only ; NOSTD implemented but as a lkm that can be statically -; compiled in sysent entry will be filled with lkmsys -; so the SYSCALL_MODULE macro works +; compiled in; sysent entry will be filled with lkmsys +; so the SYSCALL_MODULE macro works ; #ifdef's, etc. may be included, and are copied to the output files. @@ -50,213 +47,213 @@ ; redistributions should be placed in the reserved range at the end ; of the current calls. -0 AUE_NULL MNOPROTO { int nosys(void); } syscall nosys_args int -1 AUE_EXIT MNOPROTO { void sys_exit(int rval); } exit \ +0 AUE_NULL NOPROTO { int nosys(void); } syscall nosys_args int +1 AUE_EXIT NOPROTO { void sys_exit(int rval); } exit \ sys_exit_args void -2 AUE_FORK MNOPROTO { int fork(void); } -3 AUE_READ MNOPROTO { ssize_t read(int fd, void *buf, \ +2 AUE_FORK NOPROTO { int fork(void); } +3 AUE_READ NOPROTO { ssize_t read(int fd, void *buf, \ size_t nbyte); } -4 AUE_WRITE MNOPROTO { ssize_t write(int fd, const void *buf, \ +4 AUE_WRITE NOPROTO { ssize_t write(int fd, const void *buf, \ size_t nbyte); } -5 AUE_OPEN_RWTC MNOPROTO { int open(char *path, int flags, \ +5 AUE_OPEN_RWTC NOPROTO { int open(char *path, int flags, \ int mode); } -6 AUE_CLOSE MNOPROTO { int close(int fd); } -7 AUE_WAIT4 MSTD { int freebsd32_wait4(int pid, int *status, \ +6 AUE_CLOSE NOPROTO { int close(int fd); } +7 AUE_WAIT4 STD { int freebsd32_wait4(int pid, int *status, \ int options, struct rusage32 *rusage); } 8 AUE_CREAT OBSOL old creat -9 AUE_LINK MNOPROTO { int link(char *path, char *link); } -10 AUE_UNLINK MNOPROTO { int unlink(char *path); } +9 AUE_LINK NOPROTO { int link(char *path, char *link); } +10 AUE_UNLINK NOPROTO { int unlink(char *path); } 11 AUE_NULL OBSOL execv -12 AUE_CHDIR MNOPROTO { int chdir(char *path); } -13 AUE_FCHDIR MNOPROTO { int fchdir(int fd); } -14 AUE_MKNOD MNOPROTO { int mknod(char *path, int mode, int dev); } -15 AUE_CHMOD MNOPROTO { int chmod(char *path, int mode); } -16 AUE_CHOWN MNOPROTO { int chown(char *path, int uid, int gid); } -17 AUE_NULL MNOPROTO { int obreak(char *nsize); } break \ +12 AUE_CHDIR NOPROTO { int chdir(char *path); } +13 AUE_FCHDIR NOPROTO { int fchdir(int fd); } +14 AUE_MKNOD NOPROTO { int mknod(char *path, int mode, int dev); } +15 AUE_CHMOD NOPROTO { int chmod(char *path, int mode); } +16 AUE_CHOWN NOPROTO { int chown(char *path, int uid, int gid); } +17 AUE_NULL NOPROTO { int obreak(char *nsize); } break \ obreak_args int -18 AUE_GETFSSTAT MCOMPAT4 { int freebsd32_getfsstat( \ +18 AUE_GETFSSTAT COMPAT4 { int freebsd32_getfsstat( \ struct statfs32 *buf, long bufsize, \ int flags); } 19 AUE_LSEEK OBSOL olseek -20 AUE_GETPID MNOPROTO { pid_t getpid(void); } -21 AUE_MOUNT MNOPROTO { int mount(char *type, char *path, \ +20 AUE_GETPID NOPROTO { pid_t getpid(void); } +21 AUE_MOUNT NOPROTO { int mount(char *type, char *path, \ int flags, caddr_t data); } -22 AUE_UMOUNT MNOPROTO { int unmount(char *path, int flags); } -23 AUE_SETUID MNOPROTO { int setuid(uid_t uid); } -24 AUE_GETUID MNOPROTO { uid_t getuid(void); } -25 AUE_GETEUID MNOPROTO { uid_t geteuid(void); } -26 AUE_PTRACE MNOPROTO { int ptrace(int req, pid_t pid, \ +22 AUE_UMOUNT NOPROTO { int unmount(char *path, int flags); } +23 AUE_SETUID NOPROTO { int setuid(uid_t uid); } +24 AUE_GETUID NOPROTO { uid_t getuid(void); } +25 AUE_GETEUID NOPROTO { uid_t geteuid(void); } +26 AUE_PTRACE NOPROTO { int ptrace(int req, pid_t pid, \ caddr_t addr, int data); } ; XXX implement -27 AUE_RECVMSG MSTD { int freebsd32_recvmsg(int s, struct msghdr32 *msg, \ +27 AUE_RECVMSG STD { int freebsd32_recvmsg(int s, struct msghdr32 *msg, \ int flags); } -28 AUE_SENDMSG MSTD { int freebsd32_sendmsg(int s, struct msghdr32 *msg, \ +28 AUE_SENDMSG STD { int freebsd32_sendmsg(int s, struct msghdr32 *msg, \ int flags); } -29 AUE_RECVFROM MSTD { int freebsd32_recvfrom(int s, u_int32_t buf, \ +29 AUE_RECVFROM STD { int freebsd32_recvfrom(int s, u_int32_t buf, \ u_int32_t len, int flags, u_int32_t from, \ u_int32_t fromlenaddr); } -30 AUE_ACCEPT MNOPROTO { int accept(int s, caddr_t name, \ +30 AUE_ACCEPT NOPROTO { int accept(int s, caddr_t name, \ int *anamelen); } -31 AUE_GETPEERNAME MNOPROTO { int getpeername(int fdes, caddr_t asa, \ +31 AUE_GETPEERNAME NOPROTO { int getpeername(int fdes, caddr_t asa, \ int *alen); } -32 AUE_GETSOCKNAME MNOPROTO { int getsockname(int fdes, caddr_t asa, \ +32 AUE_GETSOCKNAME NOPROTO { int getsockname(int fdes, caddr_t asa, \ int *alen); } -33 AUE_ACCESS MNOPROTO { int access(char *path, int flags); } -34 AUE_CHFLAGS MNOPROTO { int chflags(char *path, int flags); } -35 AUE_FCHFLAGS MNOPROTO { int fchflags(int fd, int flags); } -36 AUE_SYNC MNOPROTO { int sync(void); } -37 AUE_KILL MNOPROTO { int kill(int pid, int signum); } +33 AUE_ACCESS NOPROTO { int access(char *path, int flags); } +34 AUE_CHFLAGS NOPROTO { int chflags(char *path, int flags); } +35 AUE_FCHFLAGS NOPROTO { int fchflags(int fd, int flags); } +36 AUE_SYNC NOPROTO { int sync(void); } +37 AUE_KILL NOPROTO { int kill(int pid, int signum); } 38 AUE_STAT UNIMPL ostat -39 AUE_GETPPID MNOPROTO { pid_t getppid(void); } +39 AUE_GETPPID NOPROTO { pid_t getppid(void); } 40 AUE_LSTAT UNIMPL olstat -41 AUE_DUP MNOPROTO { int dup(u_int fd); } -42 AUE_PIPE MNOPROTO { int pipe(void); } -43 AUE_GETEGID MNOPROTO { gid_t getegid(void); } -44 AUE_PROFILE MNOPROTO { int profil(caddr_t samples, size_t size, \ +41 AUE_DUP NOPROTO { int dup(u_int fd); } +42 AUE_PIPE NOPROTO { int pipe(void); } +43 AUE_GETEGID NOPROTO { gid_t getegid(void); } +44 AUE_PROFILE NOPROTO { int profil(caddr_t samples, size_t size, \ size_t offset, u_int scale); } -45 AUE_KTRACE MNOPROTO { int ktrace(const char *fname, int ops, \ +45 AUE_KTRACE NOPROTO { int ktrace(const char *fname, int ops, \ int facs, int pid); } -46 AUE_SIGACTION MCOMPAT { int freebsd32_sigaction( int signum, \ +46 AUE_SIGACTION COMPAT { int freebsd32_sigaction( int signum, \ struct osigaction32 *nsa, \ struct osigaction32 *osa); } -47 AUE_GETGID MNOPROTO { gid_t getgid(void); } -48 AUE_SIGPROCMASK MCOMPAT { int freebsd32_sigprocmask(int how, \ +47 AUE_GETGID NOPROTO { gid_t getgid(void); } +48 AUE_SIGPROCMASK COMPAT { int freebsd32_sigprocmask(int how, \ osigset_t mask); } -49 AUE_GETLOGIN MNOPROTO { int getlogin(char *namebuf, \ +49 AUE_GETLOGIN NOPROTO { int getlogin(char *namebuf, \ u_int namelen); } -50 AUE_SETLOGIN MNOPROTO { int setlogin(char *namebuf); } -51 AUE_ACCT MNOPROTO { int acct(char *path); } -52 AUE_SIGPENDING MCOMPAT { int freebsd32_sigpending(void); } -53 AUE_SIGPENDING MSTD { int freebsd32_sigaltstack( \ +50 AUE_SETLOGIN NOPROTO { int setlogin(char *namebuf); } +51 AUE_ACCT NOPROTO { int acct(char *path); } +52 AUE_SIGPENDING COMPAT { int freebsd32_sigpending(void); } +53 AUE_SIGPENDING STD { int freebsd32_sigaltstack( \ struct sigaltstack32 *ss, \ struct sigaltstack32 *oss); } -54 AUE_IOCTL MNOPROTO { int ioctl(int fd, u_long com, \ +54 AUE_IOCTL NOPROTO { int ioctl(int fd, u_long com, \ caddr_t data); } -55 AUE_REBOOT MNOPROTO { int reboot(int opt); } -56 AUE_REVOKE MNOPROTO { int revoke(char *path); } -57 AUE_SYMLINK MNOPROTO { int symlink(char *path, char *link); } -58 AUE_READLINK MNOPROTO { int readlink(char *path, char *buf, \ +55 AUE_REBOOT NOPROTO { int reboot(int opt); } +56 AUE_REVOKE NOPROTO { int revoke(char *path); } +57 AUE_SYMLINK NOPROTO { int symlink(char *path, char *link); } +58 AUE_READLINK NOPROTO { int readlink(char *path, char *buf, \ int count); } -59 AUE_EXECVE MSTD { int freebsd32_execve(char *fname, \ +59 AUE_EXECVE STD { int freebsd32_execve(char *fname, \ u_int32_t *argv, u_int32_t *envv); } -60 AUE_UMASK MNOPROTO { int umask(int newmask); } umask \ +60 AUE_UMASK NOPROTO { int umask(int newmask); } umask \ umask_args int -61 AUE_CHROOT MNOPROTO { int chroot(char *path); } +61 AUE_CHROOT NOPROTO { int chroot(char *path); } 62 AUE_FSTAT OBSOL ofstat 63 AUE_NULL OBSOL ogetkerninfo 64 AUE_GETPAGESIZE OBSOL ogetpagesize ; XXX implement (not OBSOL at all) -65 AUE_MSYNC MNOPROTO { int msync(void *addr, size_t len, \ +65 AUE_MSYNC NOPROTO { int msync(void *addr, size_t len, \ int flags); } -66 AUE_VFORK MNOPROTO { int vfork(void); } +66 AUE_VFORK NOPROTO { int vfork(void); } 67 AUE_NULL OBSOL vread 68 AUE_NULL OBSOL vwrite -69 AUE_SBRK MNOPROTO { int sbrk(int incr); } -70 AUE_SSTK MNOPROTO { int sstk(int incr); } +69 AUE_SBRK NOPROTO { int sbrk(int incr); } +70 AUE_SSTK NOPROTO { int sstk(int incr); } 71 AUE_MMAP OBSOL ommap -72 AUE_O_VADVISE MNOPROTO { int ovadvise(int anom); } vadvise \ +72 AUE_O_VADVISE NOPROTO { int ovadvise(int anom); } vadvise \ ovadvise_args int -73 AUE_MUNMAP MNOPROTO { int munmap(void *addr, size_t len); } -74 AUE_MPROTECT MNOPROTO { int mprotect(const void *addr, \ +73 AUE_MUNMAP NOPROTO { int munmap(void *addr, size_t len); } +74 AUE_MPROTECT NOPROTO { int mprotect(const void *addr, \ size_t len, int prot); } -75 AUE_MADVISE MNOPROTO { int madvise(void *addr, size_t len, \ +75 AUE_MADVISE NOPROTO { int madvise(void *addr, size_t len, \ int behav); } 76 AUE_NULL OBSOL vhangup 77 AUE_NULL OBSOL vlimit -78 AUE_MINCORE MNOPROTO { int mincore(const void *addr, size_t len, \ +78 AUE_MINCORE NOPROTO { int mincore(const void *addr, size_t len, \ char *vec); } -79 AUE_GETGROUPS MNOPROTO { int getgroups(u_int gidsetsize, \ +79 AUE_GETGROUPS NOPROTO { int getgroups(u_int gidsetsize, \ gid_t *gidset); } -80 AUE_SETGROUPS MNOPROTO { int setgroups(u_int gidsetsize, \ +80 AUE_SETGROUPS NOPROTO { int setgroups(u_int gidsetsize, \ gid_t *gidset); } -81 AUE_GETPGRP MNOPROTO { int getpgrp(void); } -82 AUE_SETPGRP MNOPROTO { int setpgid(int pid, int pgid); } -83 AUE_SETITIMER MSTD { int freebsd32_setitimer(u_int which, \ +81 AUE_GETPGRP NOPROTO { int getpgrp(void); } +82 AUE_SETPGRP NOPROTO { int setpgid(int pid, int pgid); } +83 AUE_SETITIMER STD { int freebsd32_setitimer(u_int which, \ struct itimerval32 *itv, \ struct itimerval32 *oitv); } 84 AUE_NULL OBSOL owait ; XXX implement 85 AUE_SWAPON OBSOL oswapon -86 AUE_GETITIMER MSTD { int freebsd32_getitimer(u_int which, \ +86 AUE_GETITIMER STD { int freebsd32_getitimer(u_int which, \ struct itimerval32 *itv); } 87 AUE_O_GETHOSTNAME OBSOL ogethostname 88 AUE_O_SETHOSTNAME OBSOL osethostname -89 AUE_GETDTABLESIZE MNOPROTO { int getdtablesize(void); } -90 AUE_DUP2 MNOPROTO { int dup2(u_int from, u_int to); } +89 AUE_GETDTABLESIZE NOPROTO { int getdtablesize(void); } >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Fri Jul 28 18:36:09 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 140F916A55B; Fri, 28 Jul 2006 18:36:09 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 8936C16A4E2 for ; Fri, 28 Jul 2006 18:36:08 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 2D28043D46 for ; Fri, 28 Jul 2006 18:36:08 +0000 (GMT) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k6SIa8Xc073182 for ; Fri, 28 Jul 2006 18:36:08 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k6SIa7pN073179 for perforce@freebsd.org; Fri, 28 Jul 2006 18:36:07 GMT (envelope-from jhb@freebsd.org) Date: Fri, 28 Jul 2006 18:36:07 GMT Message-Id: <200607281836.k6SIa7pN073179@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 Cc: Subject: PERFORCE change 102673 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 28 Jul 2006 18:36:09 -0000 http://perforce.freebsd.org/chv.cgi?CH=102673 Change 102673 by jhb@jhb_mutex on 2006/07/28 18:35:47 Remove support for the 'M' prefix. Affected files ... .. //depot/projects/smpng/sys/kern/makesyscalls.sh#17 edit Differences ... ==== //depot/projects/smpng/sys/kern/makesyscalls.sh#17 (text+ko) ==== @@ -288,38 +288,6 @@ auditev = $2; } - # The 'M' type prefix - # - { - mpsafe = "SYF_MPSAFE | "; - if ($3 == "MSTD") { - $3 = "STD"; - } else if ($3 == "MNODEF") { - $3 = "NODEF"; - } else if ($3 == "MNOARGS") { - $3 = "NOARGS"; - } else if ($3 == "MNOPROTO") { - $3 = "NOPROTO"; - } else if ($3 == "MNOIMPL") { - $3 = "NOIMPL"; - } else if ($3 == "MNOSTD") { - $3 = "NOSTD"; - } else if ($3 == "MCOMPAT") { - $3 = "COMPAT"; - } else if ($3 == "MCOMPAT4") { - $3 = "COMPAT4"; - } else if ($3 == "MCPT_NOA") { - $3 = "CPT_NOA"; - } else if ($3 == "MLIBCOMPAT") { - $3 = "LIBCOMPAT"; - } else if ($3 == "MOBSOL") { - $3 = "OBSOL"; - } else if ($3 == "MUNIMPL") { - $3 = "UNIMPL"; - } else { - mpsafe = ""; - } - } $3 == "STD" || $3 == "NODEF" || $3 == "NOARGS" || $3 == "NOPROTO" \ || $3 == "NOIMPL" || $3 == "NOSTD" { parseline() @@ -352,8 +320,8 @@ nosys = 1 if (funcname == "lkmnosys") lkmnosys = 1 - printf("\t{ %s%s, (sy_call_t *)", mpsafe, argssize) > sysent - column = 8 + 2 + length(mpsafe) + length(argssize) + 15 + printf("\t{ %s, (sy_call_t *)", argssize) > sysent + column = 8 + 2 + length(argssize) + 15 if ($3 == "NOIMPL") { printf("%s },", "nosys, AUE_NULL") > sysent column = column + length("nosys") + 3 @@ -406,9 +374,9 @@ argalias) > sysarg printf("%s\t%s%s(struct thread *, struct %s *);\n", rettype, prefix, funcname, argalias) > outdcl - printf("\t{ %s(%s%s,%s), %s },", - wrap, mpsafe, argssize, funcname, auditev) > sysent - align_sysent_comment(8 + 9 + length(mpsafe) + \ + printf("\t{ %s(%s,%s), %s },", + wrap, argssize, funcname, auditev) > sysent + align_sysent_comment(8 + 9 + \ length(argssize) + 1 + length(funcname) + length(auditev) + 4) printf("/* %d = old %s */\n", syscall, funcalias) > sysent printf("\t\"old.%s\",\t\t/* %d = old %s */\n", @@ -422,9 +390,9 @@ ncompat++ parseline() printf("%s\to%s();\n", rettype, funcname) > syscompatdcl - printf("\t{ compat(%s%s,%s), %s },", - mpsafe, argssize, funcname, auditev) > sysent - align_sysent_comment(8 + 9 + length(mpsafe) + \ + printf("\t{ compat(%s,%s), %s },", + argssize, funcname, auditev) > sysent + align_sysent_comment(8 + 9 + \ length(argssize) + 1 + length(funcname) + length(auditev) + 4) printf("/* %d = old %s */\n", syscall, funcalias) > sysent printf("\t\"old.%s\",\t\t/* %d = old %s */\n", From owner-p4-projects@FreeBSD.ORG Fri Jul 28 18:42:16 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C42D516A4E0; Fri, 28 Jul 2006 18:42:16 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 886CB16A4DD for ; Fri, 28 Jul 2006 18:42:16 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 5578843D45 for ; Fri, 28 Jul 2006 18:42:16 +0000 (GMT) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k6SIgGKO073609 for ; Fri, 28 Jul 2006 18:42:16 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k6SIgFJY073606 for perforce@freebsd.org; Fri, 28 Jul 2006 18:42:15 GMT (envelope-from jhb@freebsd.org) Date: Fri, 28 Jul 2006 18:42:15 GMT Message-Id: <200607281842.k6SIgFJY073606@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 Cc: Subject: PERFORCE change 102674 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 28 Jul 2006 18:42:17 -0000 http://perforce.freebsd.org/chv.cgi?CH=102674 Change 102674 by jhb@jhb_mutex on 2006/07/28 18:41:26 Another instance of SYF_MPSAFE. This should really be using the real functions for this stuff in kern_syscalls.c. Affected files ... .. //depot/projects/smpng/sys/nfsserver/nfs_srvsubs.c#31 edit Differences ... ==== //depot/projects/smpng/sys/nfsserver/nfs_srvsubs.c#31 (text+ko) ==== @@ -554,8 +554,9 @@ NFSD_UNLOCK(); nfsrv_timer(0); + /* XXX: Should use SYSCALL_MODULE() */ nfs_prev_nfssvc_sy_narg = sysent[SYS_nfssvc].sy_narg; - sysent[SYS_nfssvc].sy_narg = 2 | SYF_MPSAFE; + sysent[SYS_nfssvc].sy_narg = 2; nfs_prev_nfssvc_sy_call = sysent[SYS_nfssvc].sy_call; sysent[SYS_nfssvc].sy_call = (sy_call_t *)nfssvc; break; From owner-p4-projects@FreeBSD.ORG Fri Jul 28 18:44:20 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2F70716A4E2; Fri, 28 Jul 2006 18:44:20 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id EBC3C16A4DA for ; Fri, 28 Jul 2006 18:44:19 +0000 (UTC) (envelope-from gabor@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id B49D843D49 for ; Fri, 28 Jul 2006 18:44:19 +0000 (GMT) (envelope-from gabor@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k6SIiJMx073710 for ; Fri, 28 Jul 2006 18:44:19 GMT (envelope-from gabor@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k6SIiJkj073707 for perforce@freebsd.org; Fri, 28 Jul 2006 18:44:19 GMT (envelope-from gabor@FreeBSD.org) Date: Fri, 28 Jul 2006 18:44:19 GMT Message-Id: <200607281844.k6SIiJkj073707@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to gabor@FreeBSD.org using -f From: Gabor Kovesdan To: Perforce Change Reviews Cc: Subject: PERFORCE change 102675 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 28 Jul 2006 18:44:20 -0000 http://perforce.freebsd.org/chv.cgi?CH=102675 Change 102675 by gabor@gabor_spitfire on 2006/07/28 18:43:49 Document the IS_JAILED macro and the changed OSVERSION behavior, I changed for the DESTDIR support. Affected files ... .. //depot/projects/soc2006/gabor_docs/porters-handbook/book.sgml#12 edit Differences ... ==== //depot/projects/soc2006/gabor_docs/porters-handbook/book.sgml#12 (text+ko) ==== @@ -3941,6 +3941,25 @@ There are some more things you have to take into account when you create a port. This section explains the most common of those. + + Building in jails + + There might be cases where you want to know if the build is + running from a jailed environment or not. There is the + IS_JAILED variable for this case. It is defined + in bsd.port.mk when you are jailed. For + debugging purposes, you can manually define IS_JAILED + to pretend that you are imprisoned. + + Note, that the behavior of OSVERSION has been + changed recently. Now, it gets the __FreeBSD_version + from the userland, since it makes more sense for the ports, than the + kernel. You can still override it, if you really have to get it from + the kernel. + + + Shared Libraries From owner-p4-projects@FreeBSD.ORG Fri Jul 28 18:59:41 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1EB0916A4E6; Fri, 28 Jul 2006 18:59:41 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id D6E6216A4E2 for ; Fri, 28 Jul 2006 18:59:40 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 2076443D53 for ; Fri, 28 Jul 2006 18:59:40 +0000 (GMT) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k6SIxd3k074516 for ; Fri, 28 Jul 2006 18:59:39 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k6SIxdor074513 for perforce@freebsd.org; Fri, 28 Jul 2006 18:59:39 GMT (envelope-from jhb@freebsd.org) Date: Fri, 28 Jul 2006 18:59:39 GMT Message-Id: <200607281859.k6SIxdor074513@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 Cc: Subject: PERFORCE change 102677 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 28 Jul 2006 18:59:41 -0000 http://perforce.freebsd.org/chv.cgi?CH=102677 Change 102677 by jhb@jhb_mutex on 2006/07/28 18:59:07 IFC @102676 - loopback. Affected files ... .. //depot/projects/smpng/sys/amd64/linux32/syscalls.master#18 integrate .. //depot/projects/smpng/sys/compat/freebsd32/syscalls.master#36 integrate .. //depot/projects/smpng/sys/dev/sound/pci/envy24.c#2 integrate .. //depot/projects/smpng/sys/i386/linux/syscalls.master#38 integrate .. //depot/projects/smpng/sys/kern/syscalls.master#79 integrate .. //depot/projects/smpng/sys/notes#90 edit Differences ... ==== //depot/projects/smpng/sys/amd64/linux32/syscalls.master#18 (text+ko) ==== @@ -1,4 +1,4 @@ - $FreeBSD: src/sys/amd64/linux32/syscalls.master,v 1.16 2006/07/11 20:52:07 jhb Exp $ + $FreeBSD: src/sys/amd64/linux32/syscalls.master,v 1.17 2006/07/28 18:55:18 jhb Exp $ ; @(#)syscalls.master 8.1 (Berkeley) 7/19/93 ; System call name/number master file (or rather, slave, from LINUX). ==== //depot/projects/smpng/sys/compat/freebsd32/syscalls.master#36 (text+ko) ==== @@ -1,4 +1,4 @@ - $FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.68 2006/07/14 01:57:09 davidxu Exp $ + $FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.69 2006/07/28 18:55:18 jhb Exp $ ; from: @(#)syscalls.master 8.2 (Berkeley) 1/13/94 ; from: src/sys/kern/syscalls.master 1.107 ; ==== //depot/projects/smpng/sys/dev/sound/pci/envy24.c#2 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THEPOSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/sound/pci/envy24.c,v 1.2 2006/06/17 15:11:36 netchild Exp $ + * $FreeBSD: src/sys/dev/sound/pci/envy24.c,v 1.3 2006/07/28 18:06:39 netchild Exp $ */ #include @@ -781,9 +781,9 @@ if (buff == NULL) return NULL; - if (dir == PCMDIR_PLAY && sc->adc[num] != NULL) + if (dir == PCMDIR_REC && sc->adc[num] != NULL) buff->info = ((struct envy24_delta_ak4524_codec *)sc->adc[num])->info; - else if (dir == PCMDIR_REC && sc->dac[num] != NULL) + else if (dir == PCMDIR_PLAY && sc->dac[num] != NULL) buff->info = ((struct envy24_delta_ak4524_codec *)sc->dac[num])->info; else buff->info = ak452x_create(dev, buff, num, envy24_delta_ak4524_ctl); @@ -810,11 +810,11 @@ #endif if (ptr->dir == PCMDIR_PLAY) { - if (ptr->parent->adc[ptr->num] == NULL) + if (ptr->parent->adc[ptr->num] != NULL) ak452x_destroy(ptr->info); } else { - if (ptr->parent->dac[ptr->num] == NULL) + if (ptr->parent->dac[ptr->num] != NULL) ak452x_destroy(ptr->info); } @@ -1591,9 +1591,9 @@ struct sc_info *sc = ch->parent; u_int32_t ptr; int slot; +#if 0 int i; -#if(0) device_printf(sc->dev, "envy24chan_trigger(obj, data, %d)\n", go); #endif snd_mtxlock(sc->lock); @@ -1667,6 +1667,7 @@ envy24_stop(sc, ch->dir); sc->intr[slot] = 0; } +#if 0 else if (ch->blk == sc->blk[slot]) { sc->blk[slot] = ENVY24_SAMPLE_NUM / 2; for (i = 0; i < ENVY24_CHAN_NUM; i++) { @@ -1678,6 +1679,7 @@ if (ch->blk != sc->blk[slot]) envy24_updintr(sc, ch->dir); } +#endif break; } snd_mtxunlock(sc->lock); @@ -2432,6 +2434,12 @@ envy24_dmafree(sc); if (sc->dmat) bus_dma_tag_destroy(sc->dmat); + if (sc->cfg->codec->destroy != NULL) { + for (i = 0; i < sc->adcn; i++) + sc->cfg->codec->destroy(sc->adc[i]); + for (i = 0; i < sc->dacn; i++) + sc->cfg->codec->destroy(sc->dac[i]); + } envy24_cfgfree(sc->cfg); if (sc->cs) bus_release_resource(dev, SYS_RES_IOPORT, sc->csid, sc->cs); ==== //depot/projects/smpng/sys/i386/linux/syscalls.master#38 (text+ko) ==== @@ -1,4 +1,4 @@ - $FreeBSD: src/sys/i386/linux/syscalls.master,v 1.74 2006/07/21 20:22:13 jhb Exp $ + $FreeBSD: src/sys/i386/linux/syscalls.master,v 1.75 2006/07/28 18:55:18 jhb Exp $ ; @(#)syscalls.master 8.1 (Berkeley) 7/19/93 ; System call name/number master file (or rather, slave, from LINUX). ==== //depot/projects/smpng/sys/kern/syscalls.master#79 (text+ko) ==== @@ -1,4 +1,4 @@ - $FreeBSD: src/sys/kern/syscalls.master,v 1.219 2006/07/13 06:26:43 davidxu Exp $ + $FreeBSD: src/sys/kern/syscalls.master,v 1.220 2006/07/28 18:55:18 jhb Exp $ ; from: @(#)syscalls.master 8.2 (Berkeley) 1/13/94 ; ; System call name/number master file. ==== //depot/projects/smpng/sys/notes#90 (text+ko) ==== @@ -77,8 +77,8 @@ + push Giant down and mark all remaining syscalls MPSAFE - remove SYF_MPSAFE + stop conditionally acquiring Giant in syscall() functions - - remove all the 'M's from the syscall files - - remove support for the 'M' prefix from the syscall scripts + + remove all the 'M's from the syscall files + + remove support for the 'M' prefix from the syscall scripts - retire SYF_ARGMASK, sy_narg is now back to just being an argument count Active child branches: From owner-p4-projects@FreeBSD.ORG Fri Jul 28 19:22:26 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5984116A4E6; Fri, 28 Jul 2006 19:22:26 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id E165316A4DD for ; Fri, 28 Jul 2006 19:22:25 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 9A46643D67 for ; Fri, 28 Jul 2006 19:22:11 +0000 (GMT) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k6SJMBmX077608 for ; Fri, 28 Jul 2006 19:22:11 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k6SJM9EI077605 for perforce@freebsd.org; Fri, 28 Jul 2006 19:22:09 GMT (envelope-from jhb@freebsd.org) Date: Fri, 28 Jul 2006 19:22:09 GMT Message-Id: <200607281922.k6SJM9EI077605@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 Cc: Subject: PERFORCE change 102680 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 28 Jul 2006 19:22:26 -0000 http://perforce.freebsd.org/chv.cgi?CH=102680 Change 102680 by jhb@jhb_mutex on 2006/07/28 19:21:58 IFC @102679 - loopback. Affected files ... .. //depot/projects/smpng/sys/amd64/amd64/trap.c#50 integrate .. //depot/projects/smpng/sys/amd64/ia32/ia32_syscall.c#20 integrate .. //depot/projects/smpng/sys/amd64/linux32/linux32_proto.h#13 integrate .. //depot/projects/smpng/sys/amd64/linux32/linux32_syscall.h#13 integrate .. //depot/projects/smpng/sys/amd64/linux32/linux32_sysent.c#13 integrate .. //depot/projects/smpng/sys/amd64/linux32/syscalls.master#19 integrate .. //depot/projects/smpng/sys/arm/arm/trap.c#23 integrate .. //depot/projects/smpng/sys/compat/freebsd32/freebsd32_proto.h#31 integrate .. //depot/projects/smpng/sys/compat/freebsd32/freebsd32_syscall.h#31 integrate .. //depot/projects/smpng/sys/compat/freebsd32/freebsd32_syscalls.c#31 integrate .. //depot/projects/smpng/sys/compat/freebsd32/freebsd32_sysent.c#31 integrate .. //depot/projects/smpng/sys/compat/freebsd32/syscalls.master#37 integrate .. //depot/projects/smpng/sys/compat/svr4/svr4_proto.h#17 integrate .. //depot/projects/smpng/sys/compat/svr4/svr4_syscall.h#16 integrate .. //depot/projects/smpng/sys/compat/svr4/svr4_syscallnames.c#16 integrate .. //depot/projects/smpng/sys/compat/svr4/svr4_sysent.c#16 integrate .. //depot/projects/smpng/sys/compat/svr4/syscalls.master#26 integrate .. //depot/projects/smpng/sys/i386/i386/trap.c#99 integrate .. //depot/projects/smpng/sys/i386/ibcs2/ibcs2_isc.c#8 integrate .. //depot/projects/smpng/sys/i386/ibcs2/ibcs2_isc_syscall.h#8 integrate .. //depot/projects/smpng/sys/i386/ibcs2/ibcs2_isc_sysent.c#9 integrate .. //depot/projects/smpng/sys/i386/ibcs2/ibcs2_proto.h#16 integrate .. //depot/projects/smpng/sys/i386/ibcs2/ibcs2_syscall.h#15 integrate .. //depot/projects/smpng/sys/i386/ibcs2/ibcs2_sysent.c#17 integrate .. //depot/projects/smpng/sys/i386/ibcs2/ibcs2_xenix.c#20 integrate .. //depot/projects/smpng/sys/i386/ibcs2/ibcs2_xenix.h#11 integrate .. //depot/projects/smpng/sys/i386/ibcs2/ibcs2_xenix_syscall.h#10 integrate .. //depot/projects/smpng/sys/i386/ibcs2/ibcs2_xenix_sysent.c#11 integrate .. //depot/projects/smpng/sys/i386/ibcs2/syscalls.isc#10 integrate .. //depot/projects/smpng/sys/i386/ibcs2/syscalls.master#21 integrate .. //depot/projects/smpng/sys/i386/ibcs2/syscalls.xenix#10 integrate .. //depot/projects/smpng/sys/i386/linux/linux_proto.h#32 integrate .. //depot/projects/smpng/sys/i386/linux/linux_syscall.h#31 integrate .. //depot/projects/smpng/sys/i386/linux/linux_sysent.c#32 integrate .. //depot/projects/smpng/sys/i386/linux/syscalls.master#39 integrate .. //depot/projects/smpng/sys/ia64/ia32/ia32_trap.c#16 integrate .. //depot/projects/smpng/sys/ia64/ia64/trap.c#87 integrate .. //depot/projects/smpng/sys/kern/init_sysent.c#72 integrate .. //depot/projects/smpng/sys/kern/makesyscalls.sh#18 integrate .. //depot/projects/smpng/sys/kern/syscalls.c#72 integrate .. //depot/projects/smpng/sys/kern/syscalls.master#80 integrate .. //depot/projects/smpng/sys/nfsserver/nfs_srvsubs.c#32 integrate .. //depot/projects/smpng/sys/powerpc/powerpc/trap.c#56 integrate .. //depot/projects/smpng/sys/sparc64/sparc64/trap.c#72 integrate .. //depot/projects/smpng/sys/sys/syscall.h#71 integrate .. //depot/projects/smpng/sys/sys/syscall.mk#71 integrate .. //depot/projects/smpng/sys/sys/sysproto.h#74 integrate Differences ... ==== //depot/projects/smpng/sys/amd64/amd64/trap.c#50 (text+ko) ==== @@ -38,7 +38,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/trap.c,v 1.305 2006/07/27 22:32:28 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/trap.c,v 1.306 2006/07/28 19:05:26 jhb Exp $"); /* * AMD64 Trap and System call handling ==== //depot/projects/smpng/sys/amd64/ia32/ia32_syscall.c#20 (text+ko) ==== @@ -36,7 +36,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/ia32/ia32_syscall.c,v 1.14 2006/07/27 22:32:29 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/ia32/ia32_syscall.c,v 1.15 2006/07/28 19:05:26 jhb Exp $"); /* * 386 Trap and System call handling ==== //depot/projects/smpng/sys/amd64/linux32/linux32_proto.h#13 (text+ko) ==== @@ -2,8 +2,8 @@ * System call prototypes. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/amd64/linux32/linux32_proto.h,v 1.18 2006/07/11 20:55:22 jhb Exp $ - * created from FreeBSD: src/sys/amd64/linux32/syscalls.master,v 1.16 2006/07/11 20:52:07 jhb Exp + * $FreeBSD: src/sys/amd64/linux32/linux32_proto.h,v 1.19 2006/07/28 19:08:35 jhb Exp $ + * created from FreeBSD: src/sys/amd64/linux32/syscalls.master,v 1.18 2006/07/28 19:05:26 jhb Exp */ #ifndef _LINUX_SYSPROTO_H_ ==== //depot/projects/smpng/sys/amd64/linux32/linux32_syscall.h#13 (text+ko) ==== @@ -2,8 +2,8 @@ * System call numbers. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/amd64/linux32/linux32_syscall.h,v 1.18 2006/07/11 20:55:22 jhb Exp $ - * created from FreeBSD: src/sys/amd64/linux32/syscalls.master,v 1.16 2006/07/11 20:52:07 jhb Exp + * $FreeBSD: src/sys/amd64/linux32/linux32_syscall.h,v 1.19 2006/07/28 19:08:35 jhb Exp $ + * created from FreeBSD: src/sys/amd64/linux32/syscalls.master,v 1.18 2006/07/28 19:05:26 jhb Exp */ #define LINUX_SYS_exit 1 ==== //depot/projects/smpng/sys/amd64/linux32/linux32_sysent.c#13 (text+ko) ==== @@ -2,8 +2,8 @@ * System call switch table. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/amd64/linux32/linux32_sysent.c,v 1.18 2006/07/11 20:55:22 jhb Exp $ - * created from FreeBSD: src/sys/amd64/linux32/syscalls.master,v 1.16 2006/07/11 20:52:07 jhb Exp + * $FreeBSD: src/sys/amd64/linux32/linux32_sysent.c,v 1.19 2006/07/28 19:08:35 jhb Exp $ + * created from FreeBSD: src/sys/amd64/linux32/syscalls.master,v 1.18 2006/07/28 19:05:26 jhb Exp */ #include @@ -21,243 +21,243 @@ struct sysent linux_sysent[] = { #define nosys linux_nosys { 0, (sy_call_t *)nosys, AUE_NULL }, /* 0 = setup */ - { SYF_MPSAFE | AS(sys_exit_args), (sy_call_t *)sys_exit, AUE_EXIT }, /* 1 = exit */ - { SYF_MPSAFE | 0, (sy_call_t *)linux_fork, AUE_FORK }, /* 2 = linux_fork */ - { SYF_MPSAFE | AS(read_args), (sy_call_t *)read, AUE_NULL }, /* 3 = read */ - { SYF_MPSAFE | AS(write_args), (sy_call_t *)write, AUE_NULL }, /* 4 = write */ - { SYF_MPSAFE | AS(linux_open_args), (sy_call_t *)linux_open, AUE_OPEN_RWTC }, /* 5 = linux_open */ - { SYF_MPSAFE | AS(close_args), (sy_call_t *)close, AUE_CLOSE }, /* 6 = close */ - { SYF_MPSAFE | AS(linux_waitpid_args), (sy_call_t *)linux_waitpid, AUE_WAIT4 }, /* 7 = linux_waitpid */ - { SYF_MPSAFE | AS(linux_creat_args), (sy_call_t *)linux_creat, AUE_O_CREAT }, /* 8 = linux_creat */ - { SYF_MPSAFE | AS(linux_link_args), (sy_call_t *)linux_link, AUE_LINK }, /* 9 = linux_link */ - { SYF_MPSAFE | AS(linux_unlink_args), (sy_call_t *)linux_unlink, AUE_UNLINK }, /* 10 = linux_unlink */ - { SYF_MPSAFE | AS(linux_execve_args), (sy_call_t *)linux_execve, AUE_EXECVE }, /* 11 = linux_execve */ - { SYF_MPSAFE | AS(linux_chdir_args), (sy_call_t *)linux_chdir, AUE_CHDIR }, /* 12 = linux_chdir */ - { SYF_MPSAFE | AS(linux_time_args), (sy_call_t *)linux_time, AUE_NULL }, /* 13 = linux_time */ - { SYF_MPSAFE | AS(linux_mknod_args), (sy_call_t *)linux_mknod, AUE_MKNOD }, /* 14 = linux_mknod */ - { SYF_MPSAFE | AS(linux_chmod_args), (sy_call_t *)linux_chmod, AUE_CHMOD }, /* 15 = linux_chmod */ - { SYF_MPSAFE | AS(linux_lchown16_args), (sy_call_t *)linux_lchown16, AUE_LCHOWN }, /* 16 = linux_lchown16 */ + { AS(sys_exit_args), (sy_call_t *)sys_exit, AUE_EXIT }, /* 1 = exit */ + { 0, (sy_call_t *)linux_fork, AUE_FORK }, /* 2 = linux_fork */ + { AS(read_args), (sy_call_t *)read, AUE_NULL }, /* 3 = read */ + { AS(write_args), (sy_call_t *)write, AUE_NULL }, /* 4 = write */ + { AS(linux_open_args), (sy_call_t *)linux_open, AUE_OPEN_RWTC }, /* 5 = linux_open */ + { AS(close_args), (sy_call_t *)close, AUE_CLOSE }, /* 6 = close */ + { AS(linux_waitpid_args), (sy_call_t *)linux_waitpid, AUE_WAIT4 }, /* 7 = linux_waitpid */ + { AS(linux_creat_args), (sy_call_t *)linux_creat, AUE_O_CREAT }, /* 8 = linux_creat */ + { AS(linux_link_args), (sy_call_t *)linux_link, AUE_LINK }, /* 9 = linux_link */ + { AS(linux_unlink_args), (sy_call_t *)linux_unlink, AUE_UNLINK }, /* 10 = linux_unlink */ + { AS(linux_execve_args), (sy_call_t *)linux_execve, AUE_EXECVE }, /* 11 = linux_execve */ + { AS(linux_chdir_args), (sy_call_t *)linux_chdir, AUE_CHDIR }, /* 12 = linux_chdir */ + { AS(linux_time_args), (sy_call_t *)linux_time, AUE_NULL }, /* 13 = linux_time */ + { AS(linux_mknod_args), (sy_call_t *)linux_mknod, AUE_MKNOD }, /* 14 = linux_mknod */ + { AS(linux_chmod_args), (sy_call_t *)linux_chmod, AUE_CHMOD }, /* 15 = linux_chmod */ + { AS(linux_lchown16_args), (sy_call_t *)linux_lchown16, AUE_LCHOWN }, /* 16 = linux_lchown16 */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 17 = break */ - { SYF_MPSAFE | AS(linux_stat_args), (sy_call_t *)linux_stat, AUE_STAT }, /* 18 = linux_stat */ - { SYF_MPSAFE | AS(linux_lseek_args), (sy_call_t *)linux_lseek, AUE_LSEEK }, /* 19 = linux_lseek */ - { SYF_MPSAFE | 0, (sy_call_t *)linux_getpid, AUE_GETPID }, /* 20 = linux_getpid */ - { SYF_MPSAFE | AS(linux_mount_args), (sy_call_t *)linux_mount, AUE_MOUNT }, /* 21 = linux_mount */ - { SYF_MPSAFE | AS(linux_oldumount_args), (sy_call_t *)linux_oldumount, AUE_UMOUNT }, /* 22 = linux_oldumount */ - { SYF_MPSAFE | AS(linux_setuid16_args), (sy_call_t *)linux_setuid16, AUE_SETUID }, /* 23 = linux_setuid16 */ - { SYF_MPSAFE | 0, (sy_call_t *)linux_getuid16, AUE_GETUID }, /* 24 = linux_getuid16 */ - { SYF_MPSAFE | 0, (sy_call_t *)linux_stime, AUE_SETTIMEOFDAY }, /* 25 = linux_stime */ - { SYF_MPSAFE | AS(linux_ptrace_args), (sy_call_t *)linux_ptrace, AUE_PTRACE }, /* 26 = linux_ptrace */ - { SYF_MPSAFE | AS(linux_alarm_args), (sy_call_t *)linux_alarm, AUE_NULL }, /* 27 = linux_alarm */ + { AS(linux_stat_args), (sy_call_t *)linux_stat, AUE_STAT }, /* 18 = linux_stat */ + { AS(linux_lseek_args), (sy_call_t *)linux_lseek, AUE_LSEEK }, /* 19 = linux_lseek */ + { 0, (sy_call_t *)linux_getpid, AUE_GETPID }, /* 20 = linux_getpid */ + { AS(linux_mount_args), (sy_call_t *)linux_mount, AUE_MOUNT }, /* 21 = linux_mount */ + { AS(linux_oldumount_args), (sy_call_t *)linux_oldumount, AUE_UMOUNT }, /* 22 = linux_oldumount */ + { AS(linux_setuid16_args), (sy_call_t *)linux_setuid16, AUE_SETUID }, /* 23 = linux_setuid16 */ + { 0, (sy_call_t *)linux_getuid16, AUE_GETUID }, /* 24 = linux_getuid16 */ + { 0, (sy_call_t *)linux_stime, AUE_SETTIMEOFDAY }, /* 25 = linux_stime */ + { AS(linux_ptrace_args), (sy_call_t *)linux_ptrace, AUE_PTRACE }, /* 26 = linux_ptrace */ + { AS(linux_alarm_args), (sy_call_t *)linux_alarm, AUE_NULL }, /* 27 = linux_alarm */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 28 = fstat */ - { SYF_MPSAFE | 0, (sy_call_t *)linux_pause, AUE_NULL }, /* 29 = linux_pause */ - { SYF_MPSAFE | AS(linux_utime_args), (sy_call_t *)linux_utime, AUE_UTIME }, /* 30 = linux_utime */ + { 0, (sy_call_t *)linux_pause, AUE_NULL }, /* 29 = linux_pause */ + { AS(linux_utime_args), (sy_call_t *)linux_utime, AUE_UTIME }, /* 30 = linux_utime */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 31 = stty */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 32 = gtty */ - { SYF_MPSAFE | AS(linux_access_args), (sy_call_t *)linux_access, AUE_ACCESS }, /* 33 = linux_access */ - { SYF_MPSAFE | AS(linux_nice_args), (sy_call_t *)linux_nice, AUE_NICE }, /* 34 = linux_nice */ + { AS(linux_access_args), (sy_call_t *)linux_access, AUE_ACCESS }, /* 33 = linux_access */ + { AS(linux_nice_args), (sy_call_t *)linux_nice, AUE_NICE }, /* 34 = linux_nice */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 35 = ftime */ - { SYF_MPSAFE | 0, (sy_call_t *)sync, AUE_SYNC }, /* 36 = sync */ - { SYF_MPSAFE | AS(linux_kill_args), (sy_call_t *)linux_kill, AUE_KILL }, /* 37 = linux_kill */ - { SYF_MPSAFE | AS(linux_rename_args), (sy_call_t *)linux_rename, AUE_RENAME }, /* 38 = linux_rename */ - { SYF_MPSAFE | AS(linux_mkdir_args), (sy_call_t *)linux_mkdir, AUE_MKDIR }, /* 39 = linux_mkdir */ - { SYF_MPSAFE | AS(linux_rmdir_args), (sy_call_t *)linux_rmdir, AUE_RMDIR }, /* 40 = linux_rmdir */ - { SYF_MPSAFE | AS(dup_args), (sy_call_t *)dup, AUE_DUP }, /* 41 = dup */ - { SYF_MPSAFE | AS(linux_pipe_args), (sy_call_t *)linux_pipe, AUE_PIPE }, /* 42 = linux_pipe */ - { SYF_MPSAFE | AS(linux_times_args), (sy_call_t *)linux_times, AUE_NULL }, /* 43 = linux_times */ + { 0, (sy_call_t *)sync, AUE_SYNC }, /* 36 = sync */ + { AS(linux_kill_args), (sy_call_t *)linux_kill, AUE_KILL }, /* 37 = linux_kill */ + { AS(linux_rename_args), (sy_call_t *)linux_rename, AUE_RENAME }, /* 38 = linux_rename */ + { AS(linux_mkdir_args), (sy_call_t *)linux_mkdir, AUE_MKDIR }, /* 39 = linux_mkdir */ + { AS(linux_rmdir_args), (sy_call_t *)linux_rmdir, AUE_RMDIR }, /* 40 = linux_rmdir */ + { AS(dup_args), (sy_call_t *)dup, AUE_DUP }, /* 41 = dup */ + { AS(linux_pipe_args), (sy_call_t *)linux_pipe, AUE_PIPE }, /* 42 = linux_pipe */ + { AS(linux_times_args), (sy_call_t *)linux_times, AUE_NULL }, /* 43 = linux_times */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 44 = prof */ - { SYF_MPSAFE | AS(linux_brk_args), (sy_call_t *)linux_brk, AUE_NULL }, /* 45 = linux_brk */ - { SYF_MPSAFE | AS(linux_setgid16_args), (sy_call_t *)linux_setgid16, AUE_SETGID }, /* 46 = linux_setgid16 */ - { SYF_MPSAFE | 0, (sy_call_t *)linux_getgid16, AUE_GETGID }, /* 47 = linux_getgid16 */ - { SYF_MPSAFE | AS(linux_signal_args), (sy_call_t *)linux_signal, AUE_NULL }, /* 48 = linux_signal */ - { SYF_MPSAFE | 0, (sy_call_t *)linux_geteuid16, AUE_GETEUID }, /* 49 = linux_geteuid16 */ - { SYF_MPSAFE | 0, (sy_call_t *)linux_getegid16, AUE_GETEGID }, /* 50 = linux_getegid16 */ - { SYF_MPSAFE | AS(acct_args), (sy_call_t *)acct, AUE_ACCT }, /* 51 = acct */ - { SYF_MPSAFE | AS(linux_umount_args), (sy_call_t *)linux_umount, AUE_UMOUNT }, /* 52 = linux_umount */ + { AS(linux_brk_args), (sy_call_t *)linux_brk, AUE_NULL }, /* 45 = linux_brk */ + { AS(linux_setgid16_args), (sy_call_t *)linux_setgid16, AUE_SETGID }, /* 46 = linux_setgid16 */ + { 0, (sy_call_t *)linux_getgid16, AUE_GETGID }, /* 47 = linux_getgid16 */ + { AS(linux_signal_args), (sy_call_t *)linux_signal, AUE_NULL }, /* 48 = linux_signal */ + { 0, (sy_call_t *)linux_geteuid16, AUE_GETEUID }, /* 49 = linux_geteuid16 */ + { 0, (sy_call_t *)linux_getegid16, AUE_GETEGID }, /* 50 = linux_getegid16 */ + { AS(acct_args), (sy_call_t *)acct, AUE_ACCT }, /* 51 = acct */ + { AS(linux_umount_args), (sy_call_t *)linux_umount, AUE_UMOUNT }, /* 52 = linux_umount */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 53 = lock */ - { SYF_MPSAFE | AS(linux_ioctl_args), (sy_call_t *)linux_ioctl, AUE_IOCTL }, /* 54 = linux_ioctl */ - { SYF_MPSAFE | AS(linux_fcntl_args), (sy_call_t *)linux_fcntl, AUE_FCNTL }, /* 55 = linux_fcntl */ + { AS(linux_ioctl_args), (sy_call_t *)linux_ioctl, AUE_IOCTL }, /* 54 = linux_ioctl */ + { AS(linux_fcntl_args), (sy_call_t *)linux_fcntl, AUE_FCNTL }, /* 55 = linux_fcntl */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 56 = mpx */ - { SYF_MPSAFE | AS(setpgid_args), (sy_call_t *)setpgid, AUE_SETPGRP }, /* 57 = setpgid */ + { AS(setpgid_args), (sy_call_t *)setpgid, AUE_SETPGRP }, /* 57 = setpgid */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 58 = ulimit */ - { SYF_MPSAFE | 0, (sy_call_t *)linux_olduname, AUE_NULL }, /* 59 = linux_olduname */ - { SYF_MPSAFE | AS(umask_args), (sy_call_t *)umask, AUE_UMASK }, /* 60 = umask */ - { SYF_MPSAFE | AS(chroot_args), (sy_call_t *)chroot, AUE_CHROOT }, /* 61 = chroot */ - { SYF_MPSAFE | AS(linux_ustat_args), (sy_call_t *)linux_ustat, AUE_NULL }, /* 62 = linux_ustat */ - { SYF_MPSAFE | AS(dup2_args), (sy_call_t *)dup2, AUE_DUP2 }, /* 63 = dup2 */ - { SYF_MPSAFE | 0, (sy_call_t *)getppid, AUE_GETPPID }, /* 64 = getppid */ - { SYF_MPSAFE | 0, (sy_call_t *)getpgrp, AUE_GETPGRP }, /* 65 = getpgrp */ - { SYF_MPSAFE | 0, (sy_call_t *)setsid, AUE_SETSID }, /* 66 = setsid */ - { SYF_MPSAFE | AS(linux_sigaction_args), (sy_call_t *)linux_sigaction, AUE_NULL }, /* 67 = linux_sigaction */ - { SYF_MPSAFE | 0, (sy_call_t *)linux_sgetmask, AUE_NULL }, /* 68 = linux_sgetmask */ - { SYF_MPSAFE | AS(linux_ssetmask_args), (sy_call_t *)linux_ssetmask, AUE_NULL }, /* 69 = linux_ssetmask */ - { SYF_MPSAFE | AS(linux_setreuid16_args), (sy_call_t *)linux_setreuid16, AUE_SETREUID }, /* 70 = linux_setreuid16 */ - { SYF_MPSAFE | AS(linux_setregid16_args), (sy_call_t *)linux_setregid16, AUE_SETREGID }, /* 71 = linux_setregid16 */ - { SYF_MPSAFE | AS(linux_sigsuspend_args), (sy_call_t *)linux_sigsuspend, AUE_NULL }, /* 72 = linux_sigsuspend */ - { SYF_MPSAFE | AS(linux_sigpending_args), (sy_call_t *)linux_sigpending, AUE_NULL }, /* 73 = linux_sigpending */ - { SYF_MPSAFE | AS(linux_sethostname_args), (sy_call_t *)linux_sethostname, AUE_SYSCTL }, /* 74 = linux_sethostname */ - { SYF_MPSAFE | AS(linux_setrlimit_args), (sy_call_t *)linux_setrlimit, AUE_SETRLIMIT }, /* 75 = linux_setrlimit */ - { SYF_MPSAFE | AS(linux_old_getrlimit_args), (sy_call_t *)linux_old_getrlimit, AUE_GETRLIMIT }, /* 76 = linux_old_getrlimit */ - { SYF_MPSAFE | AS(linux_getrusage_args), (sy_call_t *)linux_getrusage, AUE_GETRUSAGE }, /* 77 = linux_getrusage */ - { SYF_MPSAFE | AS(linux_gettimeofday_args), (sy_call_t *)linux_gettimeofday, AUE_NULL }, /* 78 = linux_gettimeofday */ - { SYF_MPSAFE | AS(linux_settimeofday_args), (sy_call_t *)linux_settimeofday, AUE_SETTIMEOFDAY }, /* 79 = linux_settimeofday */ - { SYF_MPSAFE | AS(linux_getgroups16_args), (sy_call_t *)linux_getgroups16, AUE_GETGROUPS }, /* 80 = linux_getgroups16 */ - { SYF_MPSAFE | AS(linux_setgroups16_args), (sy_call_t *)linux_setgroups16, AUE_SETGROUPS }, /* 81 = linux_setgroups16 */ - { SYF_MPSAFE | AS(linux_old_select_args), (sy_call_t *)linux_old_select, AUE_SELECT }, /* 82 = linux_old_select */ - { SYF_MPSAFE | AS(linux_symlink_args), (sy_call_t *)linux_symlink, AUE_SYMLINK }, /* 83 = linux_symlink */ - { SYF_MPSAFE | AS(linux_lstat_args), (sy_call_t *)linux_lstat, AUE_LSTAT }, /* 84 = linux_lstat */ - { SYF_MPSAFE | AS(linux_readlink_args), (sy_call_t *)linux_readlink, AUE_READLINK }, /* 85 = linux_readlink */ + { 0, (sy_call_t *)linux_olduname, AUE_NULL }, /* 59 = linux_olduname */ + { AS(umask_args), (sy_call_t *)umask, AUE_UMASK }, /* 60 = umask */ + { AS(chroot_args), (sy_call_t *)chroot, AUE_CHROOT }, /* 61 = chroot */ + { AS(linux_ustat_args), (sy_call_t *)linux_ustat, AUE_NULL }, /* 62 = linux_ustat */ + { AS(dup2_args), (sy_call_t *)dup2, AUE_DUP2 }, /* 63 = dup2 */ + { 0, (sy_call_t *)getppid, AUE_GETPPID }, /* 64 = getppid */ + { 0, (sy_call_t *)getpgrp, AUE_GETPGRP }, /* 65 = getpgrp */ + { 0, (sy_call_t *)setsid, AUE_SETSID }, /* 66 = setsid */ + { AS(linux_sigaction_args), (sy_call_t *)linux_sigaction, AUE_NULL }, /* 67 = linux_sigaction */ + { 0, (sy_call_t *)linux_sgetmask, AUE_NULL }, /* 68 = linux_sgetmask */ + { AS(linux_ssetmask_args), (sy_call_t *)linux_ssetmask, AUE_NULL }, /* 69 = linux_ssetmask */ + { AS(linux_setreuid16_args), (sy_call_t *)linux_setreuid16, AUE_SETREUID }, /* 70 = linux_setreuid16 */ + { AS(linux_setregid16_args), (sy_call_t *)linux_setregid16, AUE_SETREGID }, /* 71 = linux_setregid16 */ + { AS(linux_sigsuspend_args), (sy_call_t *)linux_sigsuspend, AUE_NULL }, /* 72 = linux_sigsuspend */ + { AS(linux_sigpending_args), (sy_call_t *)linux_sigpending, AUE_NULL }, /* 73 = linux_sigpending */ + { AS(linux_sethostname_args), (sy_call_t *)linux_sethostname, AUE_SYSCTL }, /* 74 = linux_sethostname */ + { AS(linux_setrlimit_args), (sy_call_t *)linux_setrlimit, AUE_SETRLIMIT }, /* 75 = linux_setrlimit */ + { AS(linux_old_getrlimit_args), (sy_call_t *)linux_old_getrlimit, AUE_GETRLIMIT }, /* 76 = linux_old_getrlimit */ + { AS(linux_getrusage_args), (sy_call_t *)linux_getrusage, AUE_GETRUSAGE }, /* 77 = linux_getrusage */ + { AS(linux_gettimeofday_args), (sy_call_t *)linux_gettimeofday, AUE_NULL }, /* 78 = linux_gettimeofday */ + { AS(linux_settimeofday_args), (sy_call_t *)linux_settimeofday, AUE_SETTIMEOFDAY }, /* 79 = linux_settimeofday */ + { AS(linux_getgroups16_args), (sy_call_t *)linux_getgroups16, AUE_GETGROUPS }, /* 80 = linux_getgroups16 */ + { AS(linux_setgroups16_args), (sy_call_t *)linux_setgroups16, AUE_SETGROUPS }, /* 81 = linux_setgroups16 */ + { AS(linux_old_select_args), (sy_call_t *)linux_old_select, AUE_SELECT }, /* 82 = linux_old_select */ + { AS(linux_symlink_args), (sy_call_t *)linux_symlink, AUE_SYMLINK }, /* 83 = linux_symlink */ + { AS(linux_lstat_args), (sy_call_t *)linux_lstat, AUE_LSTAT }, /* 84 = linux_lstat */ + { AS(linux_readlink_args), (sy_call_t *)linux_readlink, AUE_READLINK }, /* 85 = linux_readlink */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 86 = linux_uselib */ - { SYF_MPSAFE | AS(swapon_args), (sy_call_t *)swapon, AUE_SWAPON }, /* 87 = swapon */ - { SYF_MPSAFE | AS(linux_reboot_args), (sy_call_t *)linux_reboot, AUE_REBOOT }, /* 88 = linux_reboot */ - { SYF_MPSAFE | AS(linux_readdir_args), (sy_call_t *)linux_readdir, AUE_O_GETDENTS }, /* 89 = linux_readdir */ - { SYF_MPSAFE | AS(linux_mmap_args), (sy_call_t *)linux_mmap, AUE_MMAP }, /* 90 = linux_mmap */ - { SYF_MPSAFE | AS(munmap_args), (sy_call_t *)munmap, AUE_MUNMAP }, /* 91 = munmap */ - { SYF_MPSAFE | AS(linux_truncate_args), (sy_call_t *)linux_truncate, AUE_TRUNCATE }, /* 92 = linux_truncate */ - { SYF_MPSAFE | AS(linux_ftruncate_args), (sy_call_t *)linux_ftruncate, AUE_FTRUNCATE }, /* 93 = linux_ftruncate */ - { SYF_MPSAFE | AS(fchmod_args), (sy_call_t *)fchmod, AUE_FCHMOD }, /* 94 = fchmod */ - { SYF_MPSAFE | AS(fchown_args), (sy_call_t *)fchown, AUE_FCHOWN }, /* 95 = fchown */ - { SYF_MPSAFE | AS(linux_getpriority_args), (sy_call_t *)linux_getpriority, AUE_GETPRIORITY }, /* 96 = linux_getpriority */ - { SYF_MPSAFE | AS(setpriority_args), (sy_call_t *)setpriority, AUE_SETPRIORITY }, /* 97 = setpriority */ + { AS(swapon_args), (sy_call_t *)swapon, AUE_SWAPON }, /* 87 = swapon */ + { AS(linux_reboot_args), (sy_call_t *)linux_reboot, AUE_REBOOT }, /* 88 = linux_reboot */ + { AS(linux_readdir_args), (sy_call_t *)linux_readdir, AUE_O_GETDENTS }, /* 89 = linux_readdir */ + { AS(linux_mmap_args), (sy_call_t *)linux_mmap, AUE_MMAP }, /* 90 = linux_mmap */ + { AS(munmap_args), (sy_call_t *)munmap, AUE_MUNMAP }, /* 91 = munmap */ + { AS(linux_truncate_args), (sy_call_t *)linux_truncate, AUE_TRUNCATE }, /* 92 = linux_truncate */ + { AS(linux_ftruncate_args), (sy_call_t *)linux_ftruncate, AUE_FTRUNCATE }, /* 93 = linux_ftruncate */ + { AS(fchmod_args), (sy_call_t *)fchmod, AUE_FCHMOD }, /* 94 = fchmod */ + { AS(fchown_args), (sy_call_t *)fchown, AUE_FCHOWN }, /* 95 = fchown */ + { AS(linux_getpriority_args), (sy_call_t *)linux_getpriority, AUE_GETPRIORITY }, /* 96 = linux_getpriority */ + { AS(setpriority_args), (sy_call_t *)setpriority, AUE_SETPRIORITY }, /* 97 = setpriority */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 98 = profil */ - { SYF_MPSAFE | AS(linux_statfs_args), (sy_call_t *)linux_statfs, AUE_STATFS }, /* 99 = linux_statfs */ - { SYF_MPSAFE | AS(linux_fstatfs_args), (sy_call_t *)linux_fstatfs, AUE_FSTATFS }, /* 100 = linux_fstatfs */ + { AS(linux_statfs_args), (sy_call_t *)linux_statfs, AUE_STATFS }, /* 99 = linux_statfs */ + { AS(linux_fstatfs_args), (sy_call_t *)linux_fstatfs, AUE_FSTATFS }, /* 100 = linux_fstatfs */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 101 = ioperm */ - { SYF_MPSAFE | AS(linux_socketcall_args), (sy_call_t *)linux_socketcall, AUE_NULL }, /* 102 = linux_socketcall */ - { SYF_MPSAFE | AS(linux_syslog_args), (sy_call_t *)linux_syslog, AUE_NULL }, /* 103 = linux_syslog */ - { SYF_MPSAFE | AS(linux_setitimer_args), (sy_call_t *)linux_setitimer, AUE_SETITIMER }, /* 104 = linux_setitimer */ - { SYF_MPSAFE | AS(linux_getitimer_args), (sy_call_t *)linux_getitimer, AUE_GETITIMER }, /* 105 = linux_getitimer */ - { SYF_MPSAFE | AS(linux_newstat_args), (sy_call_t *)linux_newstat, AUE_STAT }, /* 106 = linux_newstat */ - { SYF_MPSAFE | AS(linux_newlstat_args), (sy_call_t *)linux_newlstat, AUE_LSTAT }, /* 107 = linux_newlstat */ - { SYF_MPSAFE | AS(linux_newfstat_args), (sy_call_t *)linux_newfstat, AUE_FSTAT }, /* 108 = linux_newfstat */ - { SYF_MPSAFE | 0, (sy_call_t *)linux_uname, AUE_NULL }, /* 109 = linux_uname */ + { AS(linux_socketcall_args), (sy_call_t *)linux_socketcall, AUE_NULL }, /* 102 = linux_socketcall */ + { AS(linux_syslog_args), (sy_call_t *)linux_syslog, AUE_NULL }, /* 103 = linux_syslog */ + { AS(linux_setitimer_args), (sy_call_t *)linux_setitimer, AUE_SETITIMER }, /* 104 = linux_setitimer */ + { AS(linux_getitimer_args), (sy_call_t *)linux_getitimer, AUE_GETITIMER }, /* 105 = linux_getitimer */ + { AS(linux_newstat_args), (sy_call_t *)linux_newstat, AUE_STAT }, /* 106 = linux_newstat */ + { AS(linux_newlstat_args), (sy_call_t *)linux_newlstat, AUE_LSTAT }, /* 107 = linux_newlstat */ + { AS(linux_newfstat_args), (sy_call_t *)linux_newfstat, AUE_FSTAT }, /* 108 = linux_newfstat */ + { 0, (sy_call_t *)linux_uname, AUE_NULL }, /* 109 = linux_uname */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 110 = iopl */ - { SYF_MPSAFE | 0, (sy_call_t *)linux_vhangup, AUE_NULL }, /* 111 = linux_vhangup */ + { 0, (sy_call_t *)linux_vhangup, AUE_NULL }, /* 111 = linux_vhangup */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 112 = idle */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 113 = vm86old */ - { SYF_MPSAFE | AS(linux_wait4_args), (sy_call_t *)linux_wait4, AUE_WAIT4 }, /* 114 = linux_wait4 */ - { SYF_MPSAFE | 0, (sy_call_t *)linux_swapoff, AUE_SWAPOFF }, /* 115 = linux_swapoff */ - { SYF_MPSAFE | AS(linux_sysinfo_args), (sy_call_t *)linux_sysinfo, AUE_NULL }, /* 116 = linux_sysinfo */ - { SYF_MPSAFE | AS(linux_ipc_args), (sy_call_t *)linux_ipc, AUE_NULL }, /* 117 = linux_ipc */ - { SYF_MPSAFE | AS(fsync_args), (sy_call_t *)fsync, AUE_FSYNC }, /* 118 = fsync */ - { SYF_MPSAFE | AS(linux_sigreturn_args), (sy_call_t *)linux_sigreturn, AUE_SIGRETURN }, /* 119 = linux_sigreturn */ - { SYF_MPSAFE | AS(linux_clone_args), (sy_call_t *)linux_clone, AUE_RFORK }, /* 120 = linux_clone */ - { SYF_MPSAFE | AS(setdomainname_args), (sy_call_t *)setdomainname, AUE_SYSCTL }, /* 121 = setdomainname */ - { SYF_MPSAFE | AS(linux_newuname_args), (sy_call_t *)linux_newuname, AUE_NULL }, /* 122 = linux_newuname */ + { AS(linux_wait4_args), (sy_call_t *)linux_wait4, AUE_WAIT4 }, /* 114 = linux_wait4 */ + { 0, (sy_call_t *)linux_swapoff, AUE_SWAPOFF }, /* 115 = linux_swapoff */ + { AS(linux_sysinfo_args), (sy_call_t *)linux_sysinfo, AUE_NULL }, /* 116 = linux_sysinfo */ + { AS(linux_ipc_args), (sy_call_t *)linux_ipc, AUE_NULL }, /* 117 = linux_ipc */ + { AS(fsync_args), (sy_call_t *)fsync, AUE_FSYNC }, /* 118 = fsync */ + { AS(linux_sigreturn_args), (sy_call_t *)linux_sigreturn, AUE_SIGRETURN }, /* 119 = linux_sigreturn */ + { AS(linux_clone_args), (sy_call_t *)linux_clone, AUE_RFORK }, /* 120 = linux_clone */ + { AS(setdomainname_args), (sy_call_t *)setdomainname, AUE_SYSCTL }, /* 121 = setdomainname */ + { AS(linux_newuname_args), (sy_call_t *)linux_newuname, AUE_NULL }, /* 122 = linux_newuname */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 123 = modify_ldt */ - { SYF_MPSAFE | 0, (sy_call_t *)linux_adjtimex, AUE_ADJTIME }, /* 124 = linux_adjtimex */ - { SYF_MPSAFE | AS(linux_mprotect_args), (sy_call_t *)linux_mprotect, AUE_MPROTECT }, /* 125 = linux_mprotect */ - { SYF_MPSAFE | AS(linux_sigprocmask_args), (sy_call_t *)linux_sigprocmask, AUE_SIGPROCMASK }, /* 126 = linux_sigprocmask */ - { SYF_MPSAFE | 0, (sy_call_t *)linux_create_module, AUE_NULL }, /* 127 = linux_create_module */ - { SYF_MPSAFE | 0, (sy_call_t *)linux_init_module, AUE_NULL }, /* 128 = linux_init_module */ - { SYF_MPSAFE | 0, (sy_call_t *)linux_delete_module, AUE_NULL }, /* 129 = linux_delete_module */ - { SYF_MPSAFE | 0, (sy_call_t *)linux_get_kernel_syms, AUE_NULL }, /* 130 = linux_get_kernel_syms */ - { SYF_MPSAFE | 0, (sy_call_t *)linux_quotactl, AUE_QUOTACTL }, /* 131 = linux_quotactl */ - { SYF_MPSAFE | AS(getpgid_args), (sy_call_t *)getpgid, AUE_GETPGID }, /* 132 = getpgid */ - { SYF_MPSAFE | AS(fchdir_args), (sy_call_t *)fchdir, AUE_FCHDIR }, /* 133 = fchdir */ - { SYF_MPSAFE | 0, (sy_call_t *)linux_bdflush, AUE_BDFLUSH }, /* 134 = linux_bdflush */ - { SYF_MPSAFE | AS(linux_sysfs_args), (sy_call_t *)linux_sysfs, AUE_NULL }, /* 135 = linux_sysfs */ - { SYF_MPSAFE | AS(linux_personality_args), (sy_call_t *)linux_personality, AUE_PERSONALITY }, /* 136 = linux_personality */ + { 0, (sy_call_t *)linux_adjtimex, AUE_ADJTIME }, /* 124 = linux_adjtimex */ + { AS(linux_mprotect_args), (sy_call_t *)linux_mprotect, AUE_MPROTECT }, /* 125 = linux_mprotect */ + { AS(linux_sigprocmask_args), (sy_call_t *)linux_sigprocmask, AUE_SIGPROCMASK }, /* 126 = linux_sigprocmask */ + { 0, (sy_call_t *)linux_create_module, AUE_NULL }, /* 127 = linux_create_module */ + { 0, (sy_call_t *)linux_init_module, AUE_NULL }, /* 128 = linux_init_module */ + { 0, (sy_call_t *)linux_delete_module, AUE_NULL }, /* 129 = linux_delete_module */ + { 0, (sy_call_t *)linux_get_kernel_syms, AUE_NULL }, /* 130 = linux_get_kernel_syms */ + { 0, (sy_call_t *)linux_quotactl, AUE_QUOTACTL }, /* 131 = linux_quotactl */ + { AS(getpgid_args), (sy_call_t *)getpgid, AUE_GETPGID }, /* 132 = getpgid */ + { AS(fchdir_args), (sy_call_t *)fchdir, AUE_FCHDIR }, /* 133 = fchdir */ + { 0, (sy_call_t *)linux_bdflush, AUE_BDFLUSH }, /* 134 = linux_bdflush */ + { AS(linux_sysfs_args), (sy_call_t *)linux_sysfs, AUE_NULL }, /* 135 = linux_sysfs */ + { AS(linux_personality_args), (sy_call_t *)linux_personality, AUE_PERSONALITY }, /* 136 = linux_personality */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 137 = afs_syscall */ - { SYF_MPSAFE | AS(linux_setfsuid16_args), (sy_call_t *)linux_setfsuid16, AUE_SETFSUID }, /* 138 = linux_setfsuid16 */ - { SYF_MPSAFE | AS(linux_setfsgid16_args), (sy_call_t *)linux_setfsgid16, AUE_SETFSGID }, /* 139 = linux_setfsgid16 */ - { SYF_MPSAFE | AS(linux_llseek_args), (sy_call_t *)linux_llseek, AUE_LSEEK }, /* 140 = linux_llseek */ - { SYF_MPSAFE | AS(linux_getdents_args), (sy_call_t *)linux_getdents, AUE_O_GETDENTS }, /* 141 = linux_getdents */ - { SYF_MPSAFE | AS(linux_select_args), (sy_call_t *)linux_select, AUE_SELECT }, /* 142 = linux_select */ - { SYF_MPSAFE | AS(flock_args), (sy_call_t *)flock, AUE_FLOCK }, /* 143 = flock */ - { SYF_MPSAFE | AS(linux_msync_args), (sy_call_t *)linux_msync, AUE_MSYNC }, /* 144 = linux_msync */ - { SYF_MPSAFE | AS(linux_readv_args), (sy_call_t *)linux_readv, AUE_READV }, /* 145 = linux_readv */ - { SYF_MPSAFE | AS(linux_writev_args), (sy_call_t *)linux_writev, AUE_WRITEV }, /* 146 = linux_writev */ - { SYF_MPSAFE | AS(linux_getsid_args), (sy_call_t *)linux_getsid, AUE_GETSID }, /* 147 = linux_getsid */ - { SYF_MPSAFE | AS(linux_fdatasync_args), (sy_call_t *)linux_fdatasync, AUE_NULL }, /* 148 = linux_fdatasync */ - { SYF_MPSAFE | AS(linux_sysctl_args), (sy_call_t *)linux_sysctl, AUE_SYSCTL }, /* 149 = linux_sysctl */ - { SYF_MPSAFE | AS(mlock_args), (sy_call_t *)mlock, AUE_MLOCK }, /* 150 = mlock */ - { SYF_MPSAFE | AS(munlock_args), (sy_call_t *)munlock, AUE_MUNLOCK }, /* 151 = munlock */ - { SYF_MPSAFE | AS(mlockall_args), (sy_call_t *)mlockall, AUE_MLOCKALL }, /* 152 = mlockall */ - { SYF_MPSAFE | 0, (sy_call_t *)munlockall, AUE_MUNLOCKALL }, /* 153 = munlockall */ - { SYF_MPSAFE | AS(sched_setparam_args), (sy_call_t *)sched_setparam, AUE_SCHED_SETPARAM }, /* 154 = sched_setparam */ - { SYF_MPSAFE | AS(sched_getparam_args), (sy_call_t *)sched_getparam, AUE_SCHED_GETPARAM }, /* 155 = sched_getparam */ - { SYF_MPSAFE | AS(linux_sched_setscheduler_args), (sy_call_t *)linux_sched_setscheduler, AUE_SCHED_SETSCHEDULER }, /* 156 = linux_sched_setscheduler */ - { SYF_MPSAFE | AS(linux_sched_getscheduler_args), (sy_call_t *)linux_sched_getscheduler, AUE_SCHED_GETSCHEDULER }, /* 157 = linux_sched_getscheduler */ - { SYF_MPSAFE | 0, (sy_call_t *)sched_yield, AUE_NULL }, /* 158 = sched_yield */ - { SYF_MPSAFE | AS(linux_sched_get_priority_max_args), (sy_call_t *)linux_sched_get_priority_max, AUE_SCHED_GET_PRIORITY_MAX }, /* 159 = linux_sched_get_priority_max */ - { SYF_MPSAFE | AS(linux_sched_get_priority_min_args), (sy_call_t *)linux_sched_get_priority_min, AUE_SCHED_GET_PRIORITY_MIN }, /* 160 = linux_sched_get_priority_min */ - { SYF_MPSAFE | AS(linux_sched_rr_get_interval_args), (sy_call_t *)linux_sched_rr_get_interval, AUE_SCHED_RR_GET_INTERVAL }, /* 161 = linux_sched_rr_get_interval */ - { SYF_MPSAFE | AS(linux_nanosleep_args), (sy_call_t *)linux_nanosleep, AUE_NULL }, /* 162 = linux_nanosleep */ - { SYF_MPSAFE | AS(linux_mremap_args), (sy_call_t *)linux_mremap, AUE_NULL }, /* 163 = linux_mremap */ - { SYF_MPSAFE | AS(linux_setresuid16_args), (sy_call_t *)linux_setresuid16, AUE_SETRESUID }, /* 164 = linux_setresuid16 */ - { SYF_MPSAFE | AS(linux_getresuid16_args), (sy_call_t *)linux_getresuid16, AUE_GETRESUID }, /* 165 = linux_getresuid16 */ + { AS(linux_setfsuid16_args), (sy_call_t *)linux_setfsuid16, AUE_SETFSUID }, /* 138 = linux_setfsuid16 */ + { AS(linux_setfsgid16_args), (sy_call_t *)linux_setfsgid16, AUE_SETFSGID }, /* 139 = linux_setfsgid16 */ + { AS(linux_llseek_args), (sy_call_t *)linux_llseek, AUE_LSEEK }, /* 140 = linux_llseek */ + { AS(linux_getdents_args), (sy_call_t *)linux_getdents, AUE_O_GETDENTS }, /* 141 = linux_getdents */ + { AS(linux_select_args), (sy_call_t *)linux_select, AUE_SELECT }, /* 142 = linux_select */ + { AS(flock_args), (sy_call_t *)flock, AUE_FLOCK }, /* 143 = flock */ + { AS(linux_msync_args), (sy_call_t *)linux_msync, AUE_MSYNC }, /* 144 = linux_msync */ + { AS(linux_readv_args), (sy_call_t *)linux_readv, AUE_READV }, /* 145 = linux_readv */ + { AS(linux_writev_args), (sy_call_t *)linux_writev, AUE_WRITEV }, /* 146 = linux_writev */ + { AS(linux_getsid_args), (sy_call_t *)linux_getsid, AUE_GETSID }, /* 147 = linux_getsid */ + { AS(linux_fdatasync_args), (sy_call_t *)linux_fdatasync, AUE_NULL }, /* 148 = linux_fdatasync */ + { AS(linux_sysctl_args), (sy_call_t *)linux_sysctl, AUE_SYSCTL }, /* 149 = linux_sysctl */ + { AS(mlock_args), (sy_call_t *)mlock, AUE_MLOCK }, /* 150 = mlock */ + { AS(munlock_args), (sy_call_t *)munlock, AUE_MUNLOCK }, /* 151 = munlock */ + { AS(mlockall_args), (sy_call_t *)mlockall, AUE_MLOCKALL }, /* 152 = mlockall */ + { 0, (sy_call_t *)munlockall, AUE_MUNLOCKALL }, /* 153 = munlockall */ + { AS(sched_setparam_args), (sy_call_t *)sched_setparam, AUE_SCHED_SETPARAM }, /* 154 = sched_setparam */ + { AS(sched_getparam_args), (sy_call_t *)sched_getparam, AUE_SCHED_GETPARAM }, /* 155 = sched_getparam */ + { AS(linux_sched_setscheduler_args), (sy_call_t *)linux_sched_setscheduler, AUE_SCHED_SETSCHEDULER }, /* 156 = linux_sched_setscheduler */ + { AS(linux_sched_getscheduler_args), (sy_call_t *)linux_sched_getscheduler, AUE_SCHED_GETSCHEDULER }, /* 157 = linux_sched_getscheduler */ + { 0, (sy_call_t *)sched_yield, AUE_NULL }, /* 158 = sched_yield */ + { AS(linux_sched_get_priority_max_args), (sy_call_t *)linux_sched_get_priority_max, AUE_SCHED_GET_PRIORITY_MAX }, /* 159 = linux_sched_get_priority_max */ + { AS(linux_sched_get_priority_min_args), (sy_call_t *)linux_sched_get_priority_min, AUE_SCHED_GET_PRIORITY_MIN }, /* 160 = linux_sched_get_priority_min */ + { AS(linux_sched_rr_get_interval_args), (sy_call_t *)linux_sched_rr_get_interval, AUE_SCHED_RR_GET_INTERVAL }, /* 161 = linux_sched_rr_get_interval */ + { AS(linux_nanosleep_args), (sy_call_t *)linux_nanosleep, AUE_NULL }, /* 162 = linux_nanosleep */ + { AS(linux_mremap_args), (sy_call_t *)linux_mremap, AUE_NULL }, /* 163 = linux_mremap */ + { AS(linux_setresuid16_args), (sy_call_t *)linux_setresuid16, AUE_SETRESUID }, /* 164 = linux_setresuid16 */ + { AS(linux_getresuid16_args), (sy_call_t *)linux_getresuid16, AUE_GETRESUID }, /* 165 = linux_getresuid16 */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 166 = vm86 */ - { SYF_MPSAFE | 0, (sy_call_t *)linux_query_module, AUE_NULL }, /* 167 = linux_query_module */ - { SYF_MPSAFE | AS(poll_args), (sy_call_t *)poll, AUE_POLL }, /* 168 = poll */ - { SYF_MPSAFE | 0, (sy_call_t *)linux_nfsservctl, AUE_NULL }, /* 169 = linux_nfsservctl */ - { SYF_MPSAFE | AS(linux_setresgid16_args), (sy_call_t *)linux_setresgid16, AUE_SETRESGID }, /* 170 = linux_setresgid16 */ - { SYF_MPSAFE | AS(linux_getresgid16_args), (sy_call_t *)linux_getresgid16, AUE_GETRESGID }, /* 171 = linux_getresgid16 */ - { SYF_MPSAFE | 0, (sy_call_t *)linux_prctl, AUE_PRCTL }, /* 172 = linux_prctl */ - { SYF_MPSAFE | AS(linux_rt_sigreturn_args), (sy_call_t *)linux_rt_sigreturn, AUE_NULL }, /* 173 = linux_rt_sigreturn */ - { SYF_MPSAFE | AS(linux_rt_sigaction_args), (sy_call_t *)linux_rt_sigaction, AUE_NULL }, /* 174 = linux_rt_sigaction */ - { SYF_MPSAFE | AS(linux_rt_sigprocmask_args), (sy_call_t *)linux_rt_sigprocmask, AUE_NULL }, /* 175 = linux_rt_sigprocmask */ - { SYF_MPSAFE | AS(linux_rt_sigpending_args), (sy_call_t *)linux_rt_sigpending, AUE_NULL }, /* 176 = linux_rt_sigpending */ - { SYF_MPSAFE | 0, (sy_call_t *)linux_rt_sigtimedwait, AUE_NULL }, /* 177 = linux_rt_sigtimedwait */ - { SYF_MPSAFE | 0, (sy_call_t *)linux_rt_sigqueueinfo, AUE_NULL }, /* 178 = linux_rt_sigqueueinfo */ - { SYF_MPSAFE | AS(linux_rt_sigsuspend_args), (sy_call_t *)linux_rt_sigsuspend, AUE_NULL }, /* 179 = linux_rt_sigsuspend */ - { SYF_MPSAFE | AS(linux_pread_args), (sy_call_t *)linux_pread, AUE_PREAD }, /* 180 = linux_pread */ - { SYF_MPSAFE | AS(linux_pwrite_args), (sy_call_t *)linux_pwrite, AUE_PWRITE }, /* 181 = linux_pwrite */ - { SYF_MPSAFE | AS(linux_chown16_args), (sy_call_t *)linux_chown16, AUE_CHOWN }, /* 182 = linux_chown16 */ - { SYF_MPSAFE | AS(linux_getcwd_args), (sy_call_t *)linux_getcwd, AUE_GETCWD }, /* 183 = linux_getcwd */ - { SYF_MPSAFE | 0, (sy_call_t *)linux_capget, AUE_CAPGET }, /* 184 = linux_capget */ - { SYF_MPSAFE | 0, (sy_call_t *)linux_capset, AUE_CAPSET }, /* 185 = linux_capset */ - { SYF_MPSAFE | AS(linux_sigaltstack_args), (sy_call_t *)linux_sigaltstack, AUE_NULL }, /* 186 = linux_sigaltstack */ - { SYF_MPSAFE | 0, (sy_call_t *)linux_sendfile, AUE_SENDFILE }, /* 187 = linux_sendfile */ + { 0, (sy_call_t *)linux_query_module, AUE_NULL }, /* 167 = linux_query_module */ + { AS(poll_args), (sy_call_t *)poll, AUE_POLL }, /* 168 = poll */ + { 0, (sy_call_t *)linux_nfsservctl, AUE_NULL }, /* 169 = linux_nfsservctl */ + { AS(linux_setresgid16_args), (sy_call_t *)linux_setresgid16, AUE_SETRESGID }, /* 170 = linux_setresgid16 */ + { AS(linux_getresgid16_args), (sy_call_t *)linux_getresgid16, AUE_GETRESGID }, /* 171 = linux_getresgid16 */ + { 0, (sy_call_t *)linux_prctl, AUE_PRCTL }, /* 172 = linux_prctl */ + { AS(linux_rt_sigreturn_args), (sy_call_t *)linux_rt_sigreturn, AUE_NULL }, /* 173 = linux_rt_sigreturn */ + { AS(linux_rt_sigaction_args), (sy_call_t *)linux_rt_sigaction, AUE_NULL }, /* 174 = linux_rt_sigaction */ + { AS(linux_rt_sigprocmask_args), (sy_call_t *)linux_rt_sigprocmask, AUE_NULL }, /* 175 = linux_rt_sigprocmask */ + { AS(linux_rt_sigpending_args), (sy_call_t *)linux_rt_sigpending, AUE_NULL }, /* 176 = linux_rt_sigpending */ + { 0, (sy_call_t *)linux_rt_sigtimedwait, AUE_NULL }, /* 177 = linux_rt_sigtimedwait */ + { 0, (sy_call_t *)linux_rt_sigqueueinfo, AUE_NULL }, /* 178 = linux_rt_sigqueueinfo */ + { AS(linux_rt_sigsuspend_args), (sy_call_t *)linux_rt_sigsuspend, AUE_NULL }, /* 179 = linux_rt_sigsuspend */ + { AS(linux_pread_args), (sy_call_t *)linux_pread, AUE_PREAD }, /* 180 = linux_pread */ + { AS(linux_pwrite_args), (sy_call_t *)linux_pwrite, AUE_PWRITE }, /* 181 = linux_pwrite */ + { AS(linux_chown16_args), (sy_call_t *)linux_chown16, AUE_CHOWN }, /* 182 = linux_chown16 */ + { AS(linux_getcwd_args), (sy_call_t *)linux_getcwd, AUE_GETCWD }, /* 183 = linux_getcwd */ + { 0, (sy_call_t *)linux_capget, AUE_CAPGET }, /* 184 = linux_capget */ + { 0, (sy_call_t *)linux_capset, AUE_CAPSET }, /* 185 = linux_capset */ + { AS(linux_sigaltstack_args), (sy_call_t *)linux_sigaltstack, AUE_NULL }, /* 186 = linux_sigaltstack */ + { 0, (sy_call_t *)linux_sendfile, AUE_SENDFILE }, /* 187 = linux_sendfile */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 188 = getpmsg */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 189 = putpmsg */ - { SYF_MPSAFE | 0, (sy_call_t *)linux_vfork, AUE_VFORK }, /* 190 = linux_vfork */ - { SYF_MPSAFE | AS(linux_getrlimit_args), (sy_call_t *)linux_getrlimit, AUE_GETRLIMIT }, /* 191 = linux_getrlimit */ - { SYF_MPSAFE | AS(linux_mmap2_args), (sy_call_t *)linux_mmap2, AUE_MMAP }, /* 192 = linux_mmap2 */ - { SYF_MPSAFE | AS(linux_truncate64_args), (sy_call_t *)linux_truncate64, AUE_TRUNCATE }, /* 193 = linux_truncate64 */ - { SYF_MPSAFE | AS(linux_ftruncate64_args), (sy_call_t *)linux_ftruncate64, AUE_FTRUNCATE }, /* 194 = linux_ftruncate64 */ - { SYF_MPSAFE | AS(linux_stat64_args), (sy_call_t *)linux_stat64, AUE_STAT }, /* 195 = linux_stat64 */ - { SYF_MPSAFE | AS(linux_lstat64_args), (sy_call_t *)linux_lstat64, AUE_LSTAT }, /* 196 = linux_lstat64 */ - { SYF_MPSAFE | AS(linux_fstat64_args), (sy_call_t *)linux_fstat64, AUE_FSTAT }, /* 197 = linux_fstat64 */ - { SYF_MPSAFE | AS(linux_lchown_args), (sy_call_t *)linux_lchown, AUE_LCHOWN }, /* 198 = linux_lchown */ - { SYF_MPSAFE | 0, (sy_call_t *)linux_getuid, AUE_GETUID }, /* 199 = linux_getuid */ - { SYF_MPSAFE | 0, (sy_call_t *)linux_getgid, AUE_GETGID }, /* 200 = linux_getgid */ - { SYF_MPSAFE | 0, (sy_call_t *)geteuid, AUE_GETEUID }, /* 201 = geteuid */ - { SYF_MPSAFE | 0, (sy_call_t *)getegid, AUE_GETEGID }, /* 202 = getegid */ - { SYF_MPSAFE | AS(setreuid_args), (sy_call_t *)setreuid, AUE_SETREUID }, /* 203 = setreuid */ - { SYF_MPSAFE | AS(setregid_args), (sy_call_t *)setregid, AUE_SETREGID }, /* 204 = setregid */ - { SYF_MPSAFE | AS(linux_getgroups_args), (sy_call_t *)linux_getgroups, AUE_GETGROUPS }, /* 205 = linux_getgroups */ - { SYF_MPSAFE | AS(linux_setgroups_args), (sy_call_t *)linux_setgroups, AUE_SETGROUPS }, /* 206 = linux_setgroups */ + { 0, (sy_call_t *)linux_vfork, AUE_VFORK }, /* 190 = linux_vfork */ + { AS(linux_getrlimit_args), (sy_call_t *)linux_getrlimit, AUE_GETRLIMIT }, /* 191 = linux_getrlimit */ + { AS(linux_mmap2_args), (sy_call_t *)linux_mmap2, AUE_MMAP }, /* 192 = linux_mmap2 */ + { AS(linux_truncate64_args), (sy_call_t *)linux_truncate64, AUE_TRUNCATE }, /* 193 = linux_truncate64 */ + { AS(linux_ftruncate64_args), (sy_call_t *)linux_ftruncate64, AUE_FTRUNCATE }, /* 194 = linux_ftruncate64 */ + { AS(linux_stat64_args), (sy_call_t *)linux_stat64, AUE_STAT }, /* 195 = linux_stat64 */ + { AS(linux_lstat64_args), (sy_call_t *)linux_lstat64, AUE_LSTAT }, /* 196 = linux_lstat64 */ + { AS(linux_fstat64_args), (sy_call_t *)linux_fstat64, AUE_FSTAT }, /* 197 = linux_fstat64 */ + { AS(linux_lchown_args), (sy_call_t *)linux_lchown, AUE_LCHOWN }, /* 198 = linux_lchown */ + { 0, (sy_call_t *)linux_getuid, AUE_GETUID }, /* 199 = linux_getuid */ + { 0, (sy_call_t *)linux_getgid, AUE_GETGID }, /* 200 = linux_getgid */ + { 0, (sy_call_t *)geteuid, AUE_GETEUID }, /* 201 = geteuid */ + { 0, (sy_call_t *)getegid, AUE_GETEGID }, /* 202 = getegid */ + { AS(setreuid_args), (sy_call_t *)setreuid, AUE_SETREUID }, /* 203 = setreuid */ + { AS(setregid_args), (sy_call_t *)setregid, AUE_SETREGID }, /* 204 = setregid */ + { AS(linux_getgroups_args), (sy_call_t *)linux_getgroups, AUE_GETGROUPS }, /* 205 = linux_getgroups */ + { AS(linux_setgroups_args), (sy_call_t *)linux_setgroups, AUE_SETGROUPS }, /* 206 = linux_setgroups */ { AS(fchown_args), (sy_call_t *)fchown, AUE_NULL }, /* 207 = fchown */ - { SYF_MPSAFE | AS(setresuid_args), (sy_call_t *)setresuid, AUE_SETRESUID }, /* 208 = setresuid */ - { SYF_MPSAFE | AS(getresuid_args), (sy_call_t *)getresuid, AUE_GETRESUID }, /* 209 = getresuid */ - { SYF_MPSAFE | AS(setresgid_args), (sy_call_t *)setresgid, AUE_SETRESGID }, /* 210 = setresgid */ - { SYF_MPSAFE | AS(getresgid_args), (sy_call_t *)getresgid, AUE_GETRESGID }, /* 211 = getresgid */ - { SYF_MPSAFE | AS(linux_chown_args), (sy_call_t *)linux_chown, AUE_CHOWN }, /* 212 = linux_chown */ - { SYF_MPSAFE | AS(setuid_args), (sy_call_t *)setuid, AUE_SETUID }, /* 213 = setuid */ - { SYF_MPSAFE | AS(setgid_args), (sy_call_t *)setgid, AUE_SETGID }, /* 214 = setgid */ - { SYF_MPSAFE | AS(linux_setfsuid_args), (sy_call_t *)linux_setfsuid, AUE_SETFSUID }, /* 215 = linux_setfsuid */ - { SYF_MPSAFE | AS(linux_setfsgid_args), (sy_call_t *)linux_setfsgid, AUE_SETFSGID }, /* 216 = linux_setfsgid */ - { SYF_MPSAFE | AS(linux_pivot_root_args), (sy_call_t *)linux_pivot_root, AUE_PIVOT_ROOT }, /* 217 = linux_pivot_root */ - { SYF_MPSAFE | AS(linux_mincore_args), (sy_call_t *)linux_mincore, AUE_MINCORE }, /* 218 = linux_mincore */ - { SYF_MPSAFE | AS(madvise_args), (sy_call_t *)madvise, AUE_MADVISE }, /* 219 = madvise */ - { SYF_MPSAFE | AS(linux_getdents64_args), (sy_call_t *)linux_getdents64, AUE_O_GETDENTS }, /* 220 = linux_getdents64 */ - { SYF_MPSAFE | AS(linux_fcntl64_args), (sy_call_t *)linux_fcntl64, AUE_FCNTL }, /* 221 = linux_fcntl64 */ + { AS(setresuid_args), (sy_call_t *)setresuid, AUE_SETRESUID }, /* 208 = setresuid */ + { AS(getresuid_args), (sy_call_t *)getresuid, AUE_GETRESUID }, /* 209 = getresuid */ + { AS(setresgid_args), (sy_call_t *)setresgid, AUE_SETRESGID }, /* 210 = setresgid */ + { AS(getresgid_args), (sy_call_t *)getresgid, AUE_GETRESGID }, /* 211 = getresgid */ + { AS(linux_chown_args), (sy_call_t *)linux_chown, AUE_CHOWN }, /* 212 = linux_chown */ + { AS(setuid_args), (sy_call_t *)setuid, AUE_SETUID }, /* 213 = setuid */ + { AS(setgid_args), (sy_call_t *)setgid, AUE_SETGID }, /* 214 = setgid */ + { AS(linux_setfsuid_args), (sy_call_t *)linux_setfsuid, AUE_SETFSUID }, /* 215 = linux_setfsuid */ + { AS(linux_setfsgid_args), (sy_call_t *)linux_setfsgid, AUE_SETFSGID }, /* 216 = linux_setfsgid */ + { AS(linux_pivot_root_args), (sy_call_t *)linux_pivot_root, AUE_PIVOT_ROOT }, /* 217 = linux_pivot_root */ + { AS(linux_mincore_args), (sy_call_t *)linux_mincore, AUE_MINCORE }, /* 218 = linux_mincore */ + { AS(madvise_args), (sy_call_t *)madvise, AUE_MADVISE }, /* 219 = madvise */ + { AS(linux_getdents64_args), (sy_call_t *)linux_getdents64, AUE_O_GETDENTS }, /* 220 = linux_getdents64 */ + { AS(linux_fcntl64_args), (sy_call_t *)linux_fcntl64, AUE_FCNTL }, /* 221 = linux_fcntl64 */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 222 = */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 223 = */ - { SYF_MPSAFE | 0, (sy_call_t *)linux_getpid, AUE_NULL }, /* 224 = gettid */ + { 0, (sy_call_t *)linux_getpid, AUE_NULL }, /* 224 = gettid */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 225 = linux_readahead */ - { SYF_MPSAFE | 0, (sy_call_t *)linux_setxattr, AUE_NULL }, /* 226 = linux_setxattr */ - { SYF_MPSAFE | 0, (sy_call_t *)linux_lsetxattr, AUE_NULL }, /* 227 = linux_lsetxattr */ - { SYF_MPSAFE | 0, (sy_call_t *)linux_fsetxattr, AUE_NULL }, /* 228 = linux_fsetxattr */ - { SYF_MPSAFE | 0, (sy_call_t *)linux_getxattr, AUE_NULL }, /* 229 = linux_getxattr */ - { SYF_MPSAFE | 0, (sy_call_t *)linux_lgetxattr, AUE_NULL }, /* 230 = linux_lgetxattr */ - { SYF_MPSAFE | 0, (sy_call_t *)linux_fgetxattr, AUE_NULL }, /* 231 = linux_fgetxattr */ - { SYF_MPSAFE | 0, (sy_call_t *)linux_listxattr, AUE_NULL }, /* 232 = linux_listxattr */ - { SYF_MPSAFE | 0, (sy_call_t *)linux_llistxattr, AUE_NULL }, /* 233 = linux_llistxattr */ - { SYF_MPSAFE | 0, (sy_call_t *)linux_flistxattr, AUE_NULL }, /* 234 = linux_flistxattr */ - { SYF_MPSAFE | 0, (sy_call_t *)linux_removexattr, AUE_NULL }, /* 235 = linux_removexattr */ - { SYF_MPSAFE | 0, (sy_call_t *)linux_lremovexattr, AUE_NULL }, /* 236 = linux_lremovexattr */ - { SYF_MPSAFE | 0, (sy_call_t *)linux_fremovexattr, AUE_NULL }, /* 237 = linux_fremovexattr */ + { 0, (sy_call_t *)linux_setxattr, AUE_NULL }, /* 226 = linux_setxattr */ + { 0, (sy_call_t *)linux_lsetxattr, AUE_NULL }, /* 227 = linux_lsetxattr */ + { 0, (sy_call_t *)linux_fsetxattr, AUE_NULL }, /* 228 = linux_fsetxattr */ + { 0, (sy_call_t *)linux_getxattr, AUE_NULL }, /* 229 = linux_getxattr */ + { 0, (sy_call_t *)linux_lgetxattr, AUE_NULL }, /* 230 = linux_lgetxattr */ + { 0, (sy_call_t *)linux_fgetxattr, AUE_NULL }, /* 231 = linux_fgetxattr */ + { 0, (sy_call_t *)linux_listxattr, AUE_NULL }, /* 232 = linux_listxattr */ + { 0, (sy_call_t *)linux_llistxattr, AUE_NULL }, /* 233 = linux_llistxattr */ + { 0, (sy_call_t *)linux_flistxattr, AUE_NULL }, /* 234 = linux_flistxattr */ + { 0, (sy_call_t *)linux_removexattr, AUE_NULL }, /* 235 = linux_removexattr */ + { 0, (sy_call_t *)linux_lremovexattr, AUE_NULL }, /* 236 = linux_lremovexattr */ + { 0, (sy_call_t *)linux_fremovexattr, AUE_NULL }, /* 237 = linux_fremovexattr */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 238 = linux_tkill */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 239 = linux_sendfile64 */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 240 = linux_futex */ @@ -270,65 +270,65 @@ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 247 = linux_io_getevents */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 248 = linux_io_submit */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 249 = linux_io_cancel */ - { SYF_MPSAFE | 0, (sy_call_t *)linux_fadvise64, AUE_NULL }, /* 250 = linux_fadvise64 */ + { 0, (sy_call_t *)linux_fadvise64, AUE_NULL }, /* 250 = linux_fadvise64 */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 251 = */ - { SYF_MPSAFE | AS(sys_exit_args), (sy_call_t *)sys_exit, AUE_EXIT }, /* 252 = exit_group */ - { SYF_MPSAFE | 0, (sy_call_t *)linux_lookup_dcookie, AUE_NULL }, /* 253 = linux_lookup_dcookie */ - { SYF_MPSAFE | 0, (sy_call_t *)linux_epoll_create, AUE_NULL }, /* 254 = linux_epoll_create */ - { SYF_MPSAFE | 0, (sy_call_t *)linux_epoll_ctl, AUE_NULL }, /* 255 = linux_epoll_ctl */ - { SYF_MPSAFE | 0, (sy_call_t *)linux_epoll_wait, AUE_NULL }, /* 256 = linux_epoll_wait */ - { SYF_MPSAFE | 0, (sy_call_t *)linux_remap_file_pages, AUE_NULL }, /* 257 = linux_remap_file_pages */ - { SYF_MPSAFE | 0, (sy_call_t *)linux_set_tid_address, AUE_NULL }, /* 258 = linux_set_tid_address */ - { SYF_MPSAFE | 0, (sy_call_t *)linux_timer_create, AUE_NULL }, /* 259 = linux_timer_create */ - { SYF_MPSAFE | 0, (sy_call_t *)linux_timer_settime, AUE_NULL }, /* 260 = linux_timer_settime */ - { SYF_MPSAFE | 0, (sy_call_t *)linux_timer_gettime, AUE_NULL }, /* 261 = linux_timer_gettime */ - { SYF_MPSAFE | 0, (sy_call_t *)linux_timer_getoverrun, AUE_NULL }, /* 262 = linux_timer_getoverrun */ - { SYF_MPSAFE | 0, (sy_call_t *)linux_timer_delete, AUE_NULL }, /* 263 = linux_timer_delete */ - { SYF_MPSAFE | 0, (sy_call_t *)linux_clock_settime, AUE_CLOCK_SETTIME }, /* 264 = linux_clock_settime */ - { SYF_MPSAFE | 0, (sy_call_t *)linux_clock_gettime, AUE_NULL }, /* 265 = linux_clock_gettime */ - { SYF_MPSAFE | 0, (sy_call_t *)linux_clock_getres, AUE_NULL }, /* 266 = linux_clock_getres */ - { SYF_MPSAFE | 0, (sy_call_t *)linux_clock_nanosleep, AUE_NULL }, /* 267 = linux_clock_nanosleep */ - { SYF_MPSAFE | 0, (sy_call_t *)linux_statfs64, AUE_NULL }, /* 268 = linux_statfs64 */ - { SYF_MPSAFE | 0, (sy_call_t *)linux_fstatfs64, AUE_NULL }, /* 269 = linux_fstatfs64 */ - { SYF_MPSAFE | 0, (sy_call_t *)linux_tgkill, AUE_NULL }, /* 270 = linux_tgkill */ - { SYF_MPSAFE | 0, (sy_call_t *)linux_utimes, AUE_NULL }, /* 271 = linux_utimes */ - { SYF_MPSAFE | 0, (sy_call_t *)linux_fadvise64_64, AUE_NULL }, /* 272 = linux_fadvise64_64 */ + { AS(sys_exit_args), (sy_call_t *)sys_exit, AUE_EXIT }, /* 252 = exit_group */ + { 0, (sy_call_t *)linux_lookup_dcookie, AUE_NULL }, /* 253 = linux_lookup_dcookie */ + { 0, (sy_call_t *)linux_epoll_create, AUE_NULL }, /* 254 = linux_epoll_create */ + { 0, (sy_call_t *)linux_epoll_ctl, AUE_NULL }, /* 255 = linux_epoll_ctl */ + { 0, (sy_call_t *)linux_epoll_wait, AUE_NULL }, /* 256 = linux_epoll_wait */ + { 0, (sy_call_t *)linux_remap_file_pages, AUE_NULL }, /* 257 = linux_remap_file_pages */ + { 0, (sy_call_t *)linux_set_tid_address, AUE_NULL }, /* 258 = linux_set_tid_address */ + { 0, (sy_call_t *)linux_timer_create, AUE_NULL }, /* 259 = linux_timer_create */ + { 0, (sy_call_t *)linux_timer_settime, AUE_NULL }, /* 260 = linux_timer_settime */ + { 0, (sy_call_t *)linux_timer_gettime, AUE_NULL }, /* 261 = linux_timer_gettime */ + { 0, (sy_call_t *)linux_timer_getoverrun, AUE_NULL }, /* 262 = linux_timer_getoverrun */ + { 0, (sy_call_t *)linux_timer_delete, AUE_NULL }, /* 263 = linux_timer_delete */ + { 0, (sy_call_t *)linux_clock_settime, AUE_CLOCK_SETTIME }, /* 264 = linux_clock_settime */ + { 0, (sy_call_t *)linux_clock_gettime, AUE_NULL }, /* 265 = linux_clock_gettime */ + { 0, (sy_call_t *)linux_clock_getres, AUE_NULL }, /* 266 = linux_clock_getres */ + { 0, (sy_call_t *)linux_clock_nanosleep, AUE_NULL }, /* 267 = linux_clock_nanosleep */ + { 0, (sy_call_t *)linux_statfs64, AUE_NULL }, /* 268 = linux_statfs64 */ + { 0, (sy_call_t *)linux_fstatfs64, AUE_NULL }, /* 269 = linux_fstatfs64 */ + { 0, (sy_call_t *)linux_tgkill, AUE_NULL }, /* 270 = linux_tgkill */ + { 0, (sy_call_t *)linux_utimes, AUE_NULL }, /* 271 = linux_utimes */ + { 0, (sy_call_t *)linux_fadvise64_64, AUE_NULL }, /* 272 = linux_fadvise64_64 */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 273 = */ - { SYF_MPSAFE | 0, (sy_call_t *)linux_mbind, AUE_NULL }, /* 274 = linux_mbind */ - { SYF_MPSAFE | 0, (sy_call_t *)linux_get_mempolicy, AUE_NULL }, /* 275 = linux_get_mempolicy */ - { SYF_MPSAFE | 0, (sy_call_t *)linux_set_mempolicy, AUE_NULL }, /* 276 = linux_set_mempolicy */ - { SYF_MPSAFE | 0, (sy_call_t *)linux_mq_open, AUE_NULL }, /* 277 = linux_mq_open */ - { SYF_MPSAFE | 0, (sy_call_t *)linux_mq_unlink, AUE_NULL }, /* 278 = linux_mq_unlink */ - { SYF_MPSAFE | 0, (sy_call_t *)linux_mq_timedsend, AUE_NULL }, /* 279 = linux_mq_timedsend */ - { SYF_MPSAFE | 0, (sy_call_t *)linux_mq_timedreceive, AUE_NULL }, /* 280 = linux_mq_timedreceive */ - { SYF_MPSAFE | 0, (sy_call_t *)linux_mq_notify, AUE_NULL }, /* 281 = linux_mq_notify */ - { SYF_MPSAFE | 0, (sy_call_t *)linux_mq_getsetattr, AUE_NULL }, /* 282 = linux_mq_getsetattr */ - { SYF_MPSAFE | 0, (sy_call_t *)linux_kexec_load, AUE_NULL }, /* 283 = linux_kexec_load */ - { SYF_MPSAFE | 0, (sy_call_t *)linux_waitid, AUE_NULL }, /* 284 = linux_waitid */ + { 0, (sy_call_t *)linux_mbind, AUE_NULL }, /* 274 = linux_mbind */ + { 0, (sy_call_t *)linux_get_mempolicy, AUE_NULL }, /* 275 = linux_get_mempolicy */ + { 0, (sy_call_t *)linux_set_mempolicy, AUE_NULL }, /* 276 = linux_set_mempolicy */ + { 0, (sy_call_t *)linux_mq_open, AUE_NULL }, /* 277 = linux_mq_open */ + { 0, (sy_call_t *)linux_mq_unlink, AUE_NULL }, /* 278 = linux_mq_unlink */ + { 0, (sy_call_t *)linux_mq_timedsend, AUE_NULL }, /* 279 = linux_mq_timedsend */ + { 0, (sy_call_t *)linux_mq_timedreceive, AUE_NULL }, /* 280 = linux_mq_timedreceive */ + { 0, (sy_call_t *)linux_mq_notify, AUE_NULL }, /* 281 = linux_mq_notify */ + { 0, (sy_call_t *)linux_mq_getsetattr, AUE_NULL }, /* 282 = linux_mq_getsetattr */ + { 0, (sy_call_t *)linux_kexec_load, AUE_NULL }, /* 283 = linux_kexec_load */ + { 0, (sy_call_t *)linux_waitid, AUE_NULL }, /* 284 = linux_waitid */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 285 = */ - { SYF_MPSAFE | 0, (sy_call_t *)linux_add_key, AUE_NULL }, /* 286 = linux_add_key */ - { SYF_MPSAFE | 0, (sy_call_t *)linux_request_key, AUE_NULL }, /* 287 = linux_request_key */ - { SYF_MPSAFE | 0, (sy_call_t *)linux_keyctl, AUE_NULL }, /* 288 = linux_keyctl */ - { SYF_MPSAFE | 0, (sy_call_t *)linux_ioprio_set, AUE_NULL }, /* 289 = linux_ioprio_set */ - { SYF_MPSAFE | 0, (sy_call_t *)linux_ioprio_get, AUE_NULL }, /* 290 = linux_ioprio_get */ - { SYF_MPSAFE | 0, (sy_call_t *)linux_inotify_init, AUE_NULL }, /* 291 = linux_inotify_init */ - { SYF_MPSAFE | 0, (sy_call_t *)linux_inotify_add_watch, AUE_NULL }, /* 292 = linux_inotify_add_watch */ - { SYF_MPSAFE | 0, (sy_call_t *)linux_inotify_rm_watch, AUE_NULL }, /* 293 = linux_inotify_rm_watch */ - { SYF_MPSAFE | 0, (sy_call_t *)linux_migrate_pages, AUE_NULL }, /* 294 = linux_migrate_pages */ - { SYF_MPSAFE | 0, (sy_call_t *)linux_openat, AUE_NULL }, /* 295 = linux_openat */ - { SYF_MPSAFE | 0, (sy_call_t *)linux_mkdirat, AUE_NULL }, /* 296 = linux_mkdirat */ - { SYF_MPSAFE | 0, (sy_call_t *)linux_mknodat, AUE_NULL }, /* 297 = linux_mknodat */ - { SYF_MPSAFE | 0, (sy_call_t *)linux_fchownat, AUE_NULL }, /* 298 = linux_fchownat */ - { SYF_MPSAFE | 0, (sy_call_t *)linux_futimesat, AUE_NULL }, /* 299 = linux_futimesat */ - { SYF_MPSAFE | 0, (sy_call_t *)linux_fstatat64, AUE_NULL }, /* 300 = linux_fstatat64 */ - { SYF_MPSAFE | 0, (sy_call_t *)linux_unlinkat, AUE_NULL }, /* 301 = linux_unlinkat */ - { SYF_MPSAFE | 0, (sy_call_t *)linux_renameat, AUE_NULL }, /* 302 = linux_renameat */ - { SYF_MPSAFE | 0, (sy_call_t *)linux_linkat, AUE_NULL }, /* 303 = linux_linkat */ - { SYF_MPSAFE | 0, (sy_call_t *)linux_symlinkat, AUE_NULL }, /* 304 = linux_symlinkat */ - { SYF_MPSAFE | 0, (sy_call_t *)linux_readlinkat, AUE_NULL }, /* 305 = linux_readlinkat */ - { SYF_MPSAFE | 0, (sy_call_t *)linux_fchmodat, AUE_NULL }, /* 306 = linux_fchmodat */ - { SYF_MPSAFE | 0, (sy_call_t *)linux_faccessat, AUE_NULL }, /* 307 = linux_faccessat */ - { SYF_MPSAFE | 0, (sy_call_t *)linux_pselect6, AUE_NULL }, /* 308 = linux_pselect6 */ - { SYF_MPSAFE | 0, (sy_call_t *)linux_ppoll, AUE_NULL }, /* 309 = linux_ppoll */ - { SYF_MPSAFE | 0, (sy_call_t *)linux_unshare, AUE_NULL }, /* 310 = linux_unshare */ + { 0, (sy_call_t *)linux_add_key, AUE_NULL }, /* 286 = linux_add_key */ + { 0, (sy_call_t *)linux_request_key, AUE_NULL }, /* 287 = linux_request_key */ + { 0, (sy_call_t *)linux_keyctl, AUE_NULL }, /* 288 = linux_keyctl */ + { 0, (sy_call_t *)linux_ioprio_set, AUE_NULL }, /* 289 = linux_ioprio_set */ + { 0, (sy_call_t *)linux_ioprio_get, AUE_NULL }, /* 290 = linux_ioprio_get */ + { 0, (sy_call_t *)linux_inotify_init, AUE_NULL }, /* 291 = linux_inotify_init */ + { 0, (sy_call_t *)linux_inotify_add_watch, AUE_NULL }, /* 292 = linux_inotify_add_watch */ + { 0, (sy_call_t *)linux_inotify_rm_watch, AUE_NULL }, /* 293 = linux_inotify_rm_watch */ + { 0, (sy_call_t *)linux_migrate_pages, AUE_NULL }, /* 294 = linux_migrate_pages */ + { 0, (sy_call_t *)linux_openat, AUE_NULL }, /* 295 = linux_openat */ + { 0, (sy_call_t *)linux_mkdirat, AUE_NULL }, /* 296 = linux_mkdirat */ + { 0, (sy_call_t *)linux_mknodat, AUE_NULL }, /* 297 = linux_mknodat */ + { 0, (sy_call_t *)linux_fchownat, AUE_NULL }, /* 298 = linux_fchownat */ + { 0, (sy_call_t *)linux_futimesat, AUE_NULL }, /* 299 = linux_futimesat */ + { 0, (sy_call_t *)linux_fstatat64, AUE_NULL }, /* 300 = linux_fstatat64 */ + { 0, (sy_call_t *)linux_unlinkat, AUE_NULL }, /* 301 = linux_unlinkat */ + { 0, (sy_call_t *)linux_renameat, AUE_NULL }, /* 302 = linux_renameat */ + { 0, (sy_call_t *)linux_linkat, AUE_NULL }, /* 303 = linux_linkat */ + { 0, (sy_call_t *)linux_symlinkat, AUE_NULL }, /* 304 = linux_symlinkat */ + { 0, (sy_call_t *)linux_readlinkat, AUE_NULL }, /* 305 = linux_readlinkat */ + { 0, (sy_call_t *)linux_fchmodat, AUE_NULL }, /* 306 = linux_fchmodat */ + { 0, (sy_call_t *)linux_faccessat, AUE_NULL }, /* 307 = linux_faccessat */ + { 0, (sy_call_t *)linux_pselect6, AUE_NULL }, /* 308 = linux_pselect6 */ + { 0, (sy_call_t *)linux_ppoll, AUE_NULL }, /* 309 = linux_ppoll */ + { 0, (sy_call_t *)linux_unshare, AUE_NULL }, /* 310 = linux_unshare */ }; ==== //depot/projects/smpng/sys/amd64/linux32/syscalls.master#19 (text+ko) ==== @@ -1,4 +1,4 @@ - $FreeBSD: src/sys/amd64/linux32/syscalls.master,v 1.17 2006/07/28 18:55:18 jhb Exp $ + $FreeBSD: src/sys/amd64/linux32/syscalls.master,v 1.18 2006/07/28 19:05:26 jhb Exp $ ; @(#)syscalls.master 8.1 (Berkeley) 7/19/93 ; System call name/number master file (or rather, slave, from LINUX). ==== //depot/projects/smpng/sys/arm/arm/trap.c#23 (text+ko) ==== @@ -82,7 +82,7 @@ #include "opt_ktrace.h" #include -__FBSDID("$FreeBSD: src/sys/arm/arm/trap.c,v 1.25 2006/07/27 22:32:29 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/arm/trap.c,v 1.26 2006/07/28 19:05:26 jhb Exp $"); #include ==== //depot/projects/smpng/sys/compat/freebsd32/freebsd32_proto.h#31 (text+ko) ==== @@ -2,8 +2,8 @@ * System call prototypes. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/compat/freebsd32/freebsd32_proto.h,v 1.56 2006/06/27 14:47:07 jhb Exp $ - * created from FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.67 2006/06/27 14:46:30 jhb Exp + * $FreeBSD: src/sys/compat/freebsd32/freebsd32_proto.h,v 1.57 2006/07/28 19:08:35 jhb Exp $ + * created from FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.70 2006/07/28 19:05:26 jhb Exp */ #ifndef _FREEBSD32_SYSPROTO_H_ ==== //depot/projects/smpng/sys/compat/freebsd32/freebsd32_syscall.h#31 (text+ko) ==== @@ -2,8 +2,8 @@ * System call numbers. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/compat/freebsd32/freebsd32_syscall.h,v 1.54 2006/06/27 14:47:07 jhb Exp $ - * created from FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.67 2006/06/27 14:46:30 jhb Exp + * $FreeBSD: src/sys/compat/freebsd32/freebsd32_syscall.h,v 1.55 2006/07/28 19:08:35 jhb Exp $ + * created from FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.70 2006/07/28 19:05:26 jhb Exp */ #define FREEBSD32_SYS_syscall 0 @@ -311,4 +311,4 @@ #define FREEBSD32_SYS_thr_wake 443 #define FREEBSD32_SYS_kldunloadf 444 #define FREEBSD32_SYS_abort2 463 -#define FREEBSD32_SYS_MAXSYSCALL 464 +#define FREEBSD32_SYS_MAXSYSCALL 469 ==== //depot/projects/smpng/sys/compat/freebsd32/freebsd32_syscalls.c#31 (text+ko) ==== @@ -2,8 +2,8 @@ * System call names. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/compat/freebsd32/freebsd32_syscalls.c,v 1.45 2006/06/27 14:47:08 jhb Exp $ - * created from FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.67 2006/06/27 14:46:30 jhb Exp + * $FreeBSD: src/sys/compat/freebsd32/freebsd32_syscalls.c,v 1.46 2006/07/28 19:08:35 jhb Exp $ + * created from FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.70 2006/07/28 19:05:26 jhb Exp */ const char *freebsd32_syscallnames[] = { @@ -464,11 +464,16 @@ "#454", /* 454 = _umtx_op */ "#455", /* 455 = thr_new */ "#456", /* 456 = sigqueue */ - "#457", /* 457 = mq_open */ - "#458", /* 458 = mq_setattr */ - "#459", /* 459 = mq_timedreceive */ - "#460", /* 460 = mq_timedsend */ - "#461", /* 461 = mq_notify */ - "#462", /* 462 = mq_unlink */ + "#457", /* 457 = kmq_open */ + "#458", /* 458 = kmq_setattr */ + "#459", /* 459 = kmq_timedreceive */ + "#460", /* 460 = kmq_timedsend */ + "#461", /* 461 = kmq_notify */ + "#462", /* 462 = kmq_unlink */ "abort2", /* 463 = abort2 */ + "#464", /* 464 = thr_set_name */ + "#465", /* 465 = aio_fsync */ + "#466", /* 466 = thr_setscheduler */ + "#467", /* 467 = thr_getscheduler */ + "#468", /* 468 = thr_setschedparam */ }; ==== //depot/projects/smpng/sys/compat/freebsd32/freebsd32_sysent.c#31 (text+ko) ==== @@ -2,8 +2,8 @@ * System call switch table. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/compat/freebsd32/freebsd32_sysent.c,v 1.55 2006/06/27 14:47:08 jhb Exp $ - * created from FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.67 2006/06/27 14:46:30 jhb Exp + * $FreeBSD: src/sys/compat/freebsd32/freebsd32_sysent.c,v 1.56 2006/07/28 19:08:35 jhb Exp $ + * created from FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.70 2006/07/28 19:05:26 jhb Exp */ #include "opt_compat.h" @@ -32,155 +32,155 @@ /* The casts are bogus but will do for now. */ struct sysent freebsd32_sysent[] = { - { SYF_MPSAFE | 0, (sy_call_t *)nosys, AUE_NULL }, /* 0 = syscall */ - { SYF_MPSAFE | AS(sys_exit_args), (sy_call_t *)sys_exit, AUE_EXIT }, /* 1 = exit */ - { SYF_MPSAFE | 0, (sy_call_t *)fork, AUE_FORK }, /* 2 = fork */ - { SYF_MPSAFE | AS(read_args), (sy_call_t *)read, AUE_READ }, /* 3 = read */ - { SYF_MPSAFE | AS(write_args), (sy_call_t *)write, AUE_WRITE }, /* 4 = write */ - { SYF_MPSAFE | AS(open_args), (sy_call_t *)open, AUE_OPEN_RWTC }, /* 5 = open */ - { SYF_MPSAFE | AS(close_args), (sy_call_t *)close, AUE_CLOSE }, /* 6 = close */ - { SYF_MPSAFE | AS(freebsd32_wait4_args), (sy_call_t *)freebsd32_wait4, AUE_WAIT4 }, /* 7 = freebsd32_wait4 */ + { 0, (sy_call_t *)nosys, AUE_NULL }, /* 0 = syscall */ + { AS(sys_exit_args), (sy_call_t *)sys_exit, AUE_EXIT }, /* 1 = exit */ + { 0, (sy_call_t *)fork, AUE_FORK }, /* 2 = fork */ + { AS(read_args), (sy_call_t *)read, AUE_READ }, /* 3 = read */ + { AS(write_args), (sy_call_t *)write, AUE_WRITE }, /* 4 = write */ + { AS(open_args), (sy_call_t *)open, AUE_OPEN_RWTC }, /* 5 = open */ + { AS(close_args), (sy_call_t *)close, AUE_CLOSE }, /* 6 = close */ + { AS(freebsd32_wait4_args), (sy_call_t *)freebsd32_wait4, AUE_WAIT4 }, /* 7 = freebsd32_wait4 */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 8 = obsolete old creat */ - { SYF_MPSAFE | AS(link_args), (sy_call_t *)link, AUE_LINK }, /* 9 = link */ - { SYF_MPSAFE | AS(unlink_args), (sy_call_t *)unlink, AUE_UNLINK }, /* 10 = unlink */ + { AS(link_args), (sy_call_t *)link, AUE_LINK }, /* 9 = link */ + { AS(unlink_args), (sy_call_t *)unlink, AUE_UNLINK }, /* 10 = unlink */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 11 = obsolete execv */ - { SYF_MPSAFE | AS(chdir_args), (sy_call_t *)chdir, AUE_CHDIR }, /* 12 = chdir */ - { SYF_MPSAFE | AS(fchdir_args), (sy_call_t *)fchdir, AUE_FCHDIR }, /* 13 = fchdir */ - { SYF_MPSAFE | AS(mknod_args), (sy_call_t *)mknod, AUE_MKNOD }, /* 14 = mknod */ - { SYF_MPSAFE | AS(chmod_args), (sy_call_t *)chmod, AUE_CHMOD }, /* 15 = chmod */ - { SYF_MPSAFE | AS(chown_args), (sy_call_t *)chown, AUE_CHOWN }, /* 16 = chown */ - { SYF_MPSAFE | AS(obreak_args), (sy_call_t *)obreak, AUE_NULL }, /* 17 = break */ - { compat4(SYF_MPSAFE | AS(freebsd4_freebsd32_getfsstat_args),freebsd32_getfsstat), AUE_GETFSSTAT }, /* 18 = old freebsd32_getfsstat */ + { AS(chdir_args), (sy_call_t *)chdir, AUE_CHDIR }, /* 12 = chdir */ + { AS(fchdir_args), (sy_call_t *)fchdir, AUE_FCHDIR }, /* 13 = fchdir */ + { AS(mknod_args), (sy_call_t *)mknod, AUE_MKNOD }, /* 14 = mknod */ + { AS(chmod_args), (sy_call_t *)chmod, AUE_CHMOD }, /* 15 = chmod */ + { AS(chown_args), (sy_call_t *)chown, AUE_CHOWN }, /* 16 = chown */ + { AS(obreak_args), (sy_call_t *)obreak, AUE_NULL }, /* 17 = break */ + { compat4(AS(freebsd4_freebsd32_getfsstat_args),freebsd32_getfsstat), AUE_GETFSSTAT }, /* 18 = old freebsd32_getfsstat */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 19 = obsolete olseek */ - { SYF_MPSAFE | 0, (sy_call_t *)getpid, AUE_GETPID }, /* 20 = getpid */ - { SYF_MPSAFE | AS(mount_args), (sy_call_t *)mount, AUE_MOUNT }, /* 21 = mount */ - { SYF_MPSAFE | AS(unmount_args), (sy_call_t *)unmount, AUE_UMOUNT }, /* 22 = unmount */ - { SYF_MPSAFE | AS(setuid_args), (sy_call_t *)setuid, AUE_SETUID }, /* 23 = setuid */ - { SYF_MPSAFE | 0, (sy_call_t *)getuid, AUE_GETUID }, /* 24 = getuid */ - { SYF_MPSAFE | 0, (sy_call_t *)geteuid, AUE_GETEUID }, /* 25 = geteuid */ - { SYF_MPSAFE | AS(ptrace_args), (sy_call_t *)ptrace, AUE_PTRACE }, /* 26 = ptrace */ - { SYF_MPSAFE | AS(freebsd32_recvmsg_args), (sy_call_t *)freebsd32_recvmsg, AUE_RECVMSG }, /* 27 = freebsd32_recvmsg */ - { SYF_MPSAFE | AS(freebsd32_sendmsg_args), (sy_call_t *)freebsd32_sendmsg, AUE_SENDMSG }, /* 28 = freebsd32_sendmsg */ - { SYF_MPSAFE | AS(freebsd32_recvfrom_args), (sy_call_t *)freebsd32_recvfrom, AUE_RECVFROM }, /* 29 = freebsd32_recvfrom */ - { SYF_MPSAFE | AS(accept_args), (sy_call_t *)accept, AUE_ACCEPT }, /* 30 = accept */ - { SYF_MPSAFE | AS(getpeername_args), (sy_call_t *)getpeername, AUE_GETPEERNAME }, /* 31 = getpeername */ - { SYF_MPSAFE | AS(getsockname_args), (sy_call_t *)getsockname, AUE_GETSOCKNAME }, /* 32 = getsockname */ - { SYF_MPSAFE | AS(access_args), (sy_call_t *)access, AUE_ACCESS }, /* 33 = access */ - { SYF_MPSAFE | AS(chflags_args), (sy_call_t *)chflags, AUE_CHFLAGS }, /* 34 = chflags */ - { SYF_MPSAFE | AS(fchflags_args), (sy_call_t *)fchflags, AUE_FCHFLAGS }, /* 35 = fchflags */ - { SYF_MPSAFE | 0, (sy_call_t *)sync, AUE_SYNC }, /* 36 = sync */ - { SYF_MPSAFE | AS(kill_args), (sy_call_t *)kill, AUE_KILL }, /* 37 = kill */ + { 0, (sy_call_t *)getpid, AUE_GETPID }, /* 20 = getpid */ + { AS(mount_args), (sy_call_t *)mount, AUE_MOUNT }, /* 21 = mount */ + { AS(unmount_args), (sy_call_t *)unmount, AUE_UMOUNT }, /* 22 = unmount */ + { AS(setuid_args), (sy_call_t *)setuid, AUE_SETUID }, /* 23 = setuid */ + { 0, (sy_call_t *)getuid, AUE_GETUID }, /* 24 = getuid */ + { 0, (sy_call_t *)geteuid, AUE_GETEUID }, /* 25 = geteuid */ + { AS(ptrace_args), (sy_call_t *)ptrace, AUE_PTRACE }, /* 26 = ptrace */ + { AS(freebsd32_recvmsg_args), (sy_call_t *)freebsd32_recvmsg, AUE_RECVMSG }, /* 27 = freebsd32_recvmsg */ + { AS(freebsd32_sendmsg_args), (sy_call_t *)freebsd32_sendmsg, AUE_SENDMSG }, /* 28 = freebsd32_sendmsg */ + { AS(freebsd32_recvfrom_args), (sy_call_t *)freebsd32_recvfrom, AUE_RECVFROM }, /* 29 = freebsd32_recvfrom */ + { AS(accept_args), (sy_call_t *)accept, AUE_ACCEPT }, /* 30 = accept */ + { AS(getpeername_args), (sy_call_t *)getpeername, AUE_GETPEERNAME }, /* 31 = getpeername */ + { AS(getsockname_args), (sy_call_t *)getsockname, AUE_GETSOCKNAME }, /* 32 = getsockname */ + { AS(access_args), (sy_call_t *)access, AUE_ACCESS }, /* 33 = access */ + { AS(chflags_args), (sy_call_t *)chflags, AUE_CHFLAGS }, /* 34 = chflags */ + { AS(fchflags_args), (sy_call_t *)fchflags, AUE_FCHFLAGS }, /* 35 = fchflags */ + { 0, (sy_call_t *)sync, AUE_SYNC }, /* 36 = sync */ + { AS(kill_args), (sy_call_t *)kill, AUE_KILL }, /* 37 = kill */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 38 = ostat */ - { SYF_MPSAFE | 0, (sy_call_t *)getppid, AUE_GETPPID }, /* 39 = getppid */ + { 0, (sy_call_t *)getppid, AUE_GETPPID }, /* 39 = getppid */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 40 = olstat */ - { SYF_MPSAFE | AS(dup_args), (sy_call_t *)dup, AUE_DUP }, /* 41 = dup */ - { SYF_MPSAFE | 0, (sy_call_t *)pipe, AUE_PIPE }, /* 42 = pipe */ - { SYF_MPSAFE | 0, (sy_call_t *)getegid, AUE_GETEGID }, /* 43 = getegid */ - { SYF_MPSAFE | AS(profil_args), (sy_call_t *)profil, AUE_PROFILE }, /* 44 = profil */ - { SYF_MPSAFE | AS(ktrace_args), (sy_call_t *)ktrace, AUE_KTRACE }, /* 45 = ktrace */ - { compat(SYF_MPSAFE | AS(ofreebsd32_sigaction_args),freebsd32_sigaction), AUE_SIGACTION }, /* 46 = old freebsd32_sigaction */ - { SYF_MPSAFE | 0, (sy_call_t *)getgid, AUE_GETGID }, /* 47 = getgid */ - { compat(SYF_MPSAFE | AS(ofreebsd32_sigprocmask_args),freebsd32_sigprocmask), AUE_SIGPROCMASK }, /* 48 = old freebsd32_sigprocmask */ - { SYF_MPSAFE | AS(getlogin_args), (sy_call_t *)getlogin, AUE_GETLOGIN }, /* 49 = getlogin */ - { SYF_MPSAFE | AS(setlogin_args), (sy_call_t *)setlogin, AUE_SETLOGIN }, /* 50 = setlogin */ - { SYF_MPSAFE | AS(acct_args), (sy_call_t *)acct, AUE_ACCT }, /* 51 = acct */ - { compat(SYF_MPSAFE | 0,freebsd32_sigpending), AUE_SIGPENDING }, /* 52 = old freebsd32_sigpending */ - { SYF_MPSAFE | AS(freebsd32_sigaltstack_args), (sy_call_t *)freebsd32_sigaltstack, AUE_SIGPENDING }, /* 53 = freebsd32_sigaltstack */ - { SYF_MPSAFE | AS(ioctl_args), (sy_call_t *)ioctl, AUE_IOCTL }, /* 54 = ioctl */ - { SYF_MPSAFE | AS(reboot_args), (sy_call_t *)reboot, AUE_REBOOT }, /* 55 = reboot */ - { SYF_MPSAFE | AS(revoke_args), (sy_call_t *)revoke, AUE_REVOKE }, /* 56 = revoke */ - { SYF_MPSAFE | AS(symlink_args), (sy_call_t *)symlink, AUE_SYMLINK }, /* 57 = symlink */ - { SYF_MPSAFE | AS(readlink_args), (sy_call_t *)readlink, AUE_READLINK }, /* 58 = readlink */ - { SYF_MPSAFE | AS(freebsd32_execve_args), (sy_call_t *)freebsd32_execve, AUE_EXECVE }, /* 59 = freebsd32_execve */ - { SYF_MPSAFE | AS(umask_args), (sy_call_t *)umask, AUE_UMASK }, /* 60 = umask */ - { SYF_MPSAFE | AS(chroot_args), (sy_call_t *)chroot, AUE_CHROOT }, /* 61 = chroot */ + { AS(dup_args), (sy_call_t *)dup, AUE_DUP }, /* 41 = dup */ + { 0, (sy_call_t *)pipe, AUE_PIPE }, /* 42 = pipe */ + { 0, (sy_call_t *)getegid, AUE_GETEGID }, /* 43 = getegid */ + { AS(profil_args), (sy_call_t *)profil, AUE_PROFILE }, /* 44 = profil */ + { AS(ktrace_args), (sy_call_t *)ktrace, AUE_KTRACE }, /* 45 = ktrace */ + { compat(AS(ofreebsd32_sigaction_args),freebsd32_sigaction), AUE_SIGACTION }, /* 46 = old freebsd32_sigaction */ + { 0, (sy_call_t *)getgid, AUE_GETGID }, /* 47 = getgid */ + { compat(AS(ofreebsd32_sigprocmask_args),freebsd32_sigprocmask), AUE_SIGPROCMASK }, /* 48 = old freebsd32_sigprocmask */ + { AS(getlogin_args), (sy_call_t *)getlogin, AUE_GETLOGIN }, /* 49 = getlogin */ + { AS(setlogin_args), (sy_call_t *)setlogin, AUE_SETLOGIN }, /* 50 = setlogin */ + { AS(acct_args), (sy_call_t *)acct, AUE_ACCT }, /* 51 = acct */ + { compat(0,freebsd32_sigpending), AUE_SIGPENDING }, /* 52 = old freebsd32_sigpending */ + { AS(freebsd32_sigaltstack_args), (sy_call_t *)freebsd32_sigaltstack, AUE_SIGPENDING }, /* 53 = freebsd32_sigaltstack */ + { AS(ioctl_args), (sy_call_t *)ioctl, AUE_IOCTL }, /* 54 = ioctl */ + { AS(reboot_args), (sy_call_t *)reboot, AUE_REBOOT }, /* 55 = reboot */ + { AS(revoke_args), (sy_call_t *)revoke, AUE_REVOKE }, /* 56 = revoke */ + { AS(symlink_args), (sy_call_t *)symlink, AUE_SYMLINK }, /* 57 = symlink */ + { AS(readlink_args), (sy_call_t *)readlink, AUE_READLINK }, /* 58 = readlink */ + { AS(freebsd32_execve_args), (sy_call_t *)freebsd32_execve, AUE_EXECVE }, /* 59 = freebsd32_execve */ + { AS(umask_args), (sy_call_t *)umask, AUE_UMASK }, /* 60 = umask */ + { AS(chroot_args), (sy_call_t *)chroot, AUE_CHROOT }, /* 61 = chroot */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 62 = obsolete ofstat */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 63 = obsolete ogetkerninfo */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 64 = obsolete ogetpagesize */ - { SYF_MPSAFE | AS(msync_args), (sy_call_t *)msync, AUE_MSYNC }, /* 65 = msync */ - { SYF_MPSAFE | 0, (sy_call_t *)vfork, AUE_VFORK }, /* 66 = vfork */ + { AS(msync_args), (sy_call_t *)msync, AUE_MSYNC }, /* 65 = msync */ + { 0, (sy_call_t *)vfork, AUE_VFORK }, /* 66 = vfork */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 67 = obsolete vread */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 68 = obsolete vwrite */ - { SYF_MPSAFE | AS(sbrk_args), (sy_call_t *)sbrk, AUE_SBRK }, /* 69 = sbrk */ - { SYF_MPSAFE | AS(sstk_args), (sy_call_t *)sstk, AUE_SSTK }, /* 70 = sstk */ + { AS(sbrk_args), (sy_call_t *)sbrk, AUE_SBRK }, /* 69 = sbrk */ + { AS(sstk_args), (sy_call_t *)sstk, AUE_SSTK }, /* 70 = sstk */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 71 = obsolete ommap */ - { SYF_MPSAFE | AS(ovadvise_args), (sy_call_t *)ovadvise, AUE_O_VADVISE }, /* 72 = vadvise */ - { SYF_MPSAFE | AS(munmap_args), (sy_call_t *)munmap, AUE_MUNMAP }, /* 73 = munmap */ - { SYF_MPSAFE | AS(mprotect_args), (sy_call_t *)mprotect, AUE_MPROTECT }, /* 74 = mprotect */ - { SYF_MPSAFE | AS(madvise_args), (sy_call_t *)madvise, AUE_MADVISE }, /* 75 = madvise */ + { AS(ovadvise_args), (sy_call_t *)ovadvise, AUE_O_VADVISE }, /* 72 = vadvise */ + { AS(munmap_args), (sy_call_t *)munmap, AUE_MUNMAP }, /* 73 = munmap */ + { AS(mprotect_args), (sy_call_t *)mprotect, AUE_MPROTECT }, /* 74 = mprotect */ + { AS(madvise_args), (sy_call_t *)madvise, AUE_MADVISE }, /* 75 = madvise */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 76 = obsolete vhangup */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 77 = obsolete vlimit */ - { SYF_MPSAFE | AS(mincore_args), (sy_call_t *)mincore, AUE_MINCORE }, /* 78 = mincore */ - { SYF_MPSAFE | AS(getgroups_args), (sy_call_t *)getgroups, AUE_GETGROUPS }, /* 79 = getgroups */ - { SYF_MPSAFE | AS(setgroups_args), (sy_call_t *)setgroups, AUE_SETGROUPS }, /* 80 = setgroups */ - { SYF_MPSAFE | 0, (sy_call_t *)getpgrp, AUE_GETPGRP }, /* 81 = getpgrp */ - { SYF_MPSAFE | AS(setpgid_args), (sy_call_t *)setpgid, AUE_SETPGRP }, /* 82 = setpgid */ - { SYF_MPSAFE | AS(freebsd32_setitimer_args), (sy_call_t *)freebsd32_setitimer, AUE_SETITIMER }, /* 83 = freebsd32_setitimer */ + { AS(mincore_args), (sy_call_t *)mincore, AUE_MINCORE }, /* 78 = mincore */ + { AS(getgroups_args), (sy_call_t *)getgroups, AUE_GETGROUPS }, /* 79 = getgroups */ + { AS(setgroups_args), (sy_call_t *)setgroups, AUE_SETGROUPS }, /* 80 = setgroups */ + { 0, (sy_call_t *)getpgrp, AUE_GETPGRP }, /* 81 = getpgrp */ + { AS(setpgid_args), (sy_call_t *)setpgid, AUE_SETPGRP }, /* 82 = setpgid */ + { AS(freebsd32_setitimer_args), (sy_call_t *)freebsd32_setitimer, AUE_SETITIMER }, /* 83 = freebsd32_setitimer */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 84 = obsolete owait */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 85 = obsolete oswapon */ - { SYF_MPSAFE | AS(freebsd32_getitimer_args), (sy_call_t *)freebsd32_getitimer, AUE_GETITIMER }, /* 86 = freebsd32_getitimer */ + { AS(freebsd32_getitimer_args), (sy_call_t *)freebsd32_getitimer, AUE_GETITIMER }, /* 86 = freebsd32_getitimer */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 87 = obsolete ogethostname */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 88 = obsolete osethostname */ - { SYF_MPSAFE | 0, (sy_call_t *)getdtablesize, AUE_GETDTABLESIZE }, /* 89 = getdtablesize */ - { SYF_MPSAFE | AS(dup2_args), (sy_call_t *)dup2, AUE_DUP2 }, /* 90 = dup2 */ + { 0, (sy_call_t *)getdtablesize, AUE_GETDTABLESIZE }, /* 89 = getdtablesize */ + { AS(dup2_args), (sy_call_t *)dup2, AUE_DUP2 }, /* 90 = dup2 */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 91 = getdopt */ - { SYF_MPSAFE | AS(fcntl_args), (sy_call_t *)fcntl, AUE_FCNTL }, /* 92 = fcntl */ - { SYF_MPSAFE | AS(freebsd32_select_args), (sy_call_t *)freebsd32_select, AUE_SELECT }, /* 93 = freebsd32_select */ + { AS(fcntl_args), (sy_call_t *)fcntl, AUE_FCNTL }, /* 92 = fcntl */ + { AS(freebsd32_select_args), (sy_call_t *)freebsd32_select, AUE_SELECT }, /* 93 = freebsd32_select */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 94 = setdopt */ - { SYF_MPSAFE | AS(fsync_args), (sy_call_t *)fsync, AUE_FSYNC }, /* 95 = fsync */ - { SYF_MPSAFE | AS(setpriority_args), (sy_call_t *)setpriority, AUE_SETPRIORITY }, /* 96 = setpriority */ - { SYF_MPSAFE | AS(socket_args), (sy_call_t *)socket, AUE_SOCKET }, /* 97 = socket */ - { SYF_MPSAFE | AS(connect_args), (sy_call_t *)connect, AUE_CONNECT }, /* 98 = connect */ + { AS(fsync_args), (sy_call_t *)fsync, AUE_FSYNC }, /* 95 = fsync */ + { AS(setpriority_args), (sy_call_t *)setpriority, AUE_SETPRIORITY }, /* 96 = setpriority */ + { AS(socket_args), (sy_call_t *)socket, AUE_SOCKET }, /* 97 = socket */ + { AS(connect_args), (sy_call_t *)connect, AUE_CONNECT }, /* 98 = connect */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 99 = obsolete oaccept */ - { SYF_MPSAFE | AS(getpriority_args), (sy_call_t *)getpriority, AUE_GETPRIORITY }, /* 100 = getpriority */ + { AS(getpriority_args), (sy_call_t *)getpriority, AUE_GETPRIORITY }, /* 100 = getpriority */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 101 = obsolete osend */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 102 = obsolete orecv */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 103 = obsolete osigreturn */ - { SYF_MPSAFE | AS(bind_args), (sy_call_t *)bind, AUE_BIND }, /* 104 = bind */ - { SYF_MPSAFE | AS(setsockopt_args), (sy_call_t *)setsockopt, AUE_SETSOCKOPT }, /* 105 = setsockopt */ - { SYF_MPSAFE | AS(listen_args), (sy_call_t *)listen, AUE_LISTEN }, /* 106 = listen */ >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Fri Jul 28 20:11:13 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 566A616A4DE; Fri, 28 Jul 2006 20:11:13 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 1A87816A4DA for ; Fri, 28 Jul 2006 20:11:13 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id D5F3243D46 for ; Fri, 28 Jul 2006 20:11:12 +0000 (GMT) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k6SKBCoN081232 for ; Fri, 28 Jul 2006 20:11:12 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k6SKBCUb081229 for perforce@freebsd.org; Fri, 28 Jul 2006 20:11:12 GMT (envelope-from jhb@freebsd.org) Date: Fri, 28 Jul 2006 20:11:12 GMT Message-Id: <200607282011.k6SKBCUb081229@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 Cc: Subject: PERFORCE change 102681 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 28 Jul 2006 20:11:13 -0000 http://perforce.freebsd.org/chv.cgi?CH=102681 Change 102681 by jhb@jhb_mutex on 2006/07/28 20:10:27 Use NOSTD / syscall_register() to register nfssvc. Fix audit event (its AUE_NFS_SVC rather than AUE_NFSSVC). Affected files ... .. //depot/projects/smpng/sys/kern/syscalls.master#81 edit .. //depot/projects/smpng/sys/nfsserver/nfs_srvsubs.c#33 edit Differences ... ==== //depot/projects/smpng/sys/kern/syscalls.master#81 (text+ko) ==== @@ -299,7 +299,7 @@ 153 AUE_NULL UNIMPL asyncdaemon (BSD/OS 2.x) 154 AUE_NULL UNIMPL nosys ; 155 is initialized by the NFS code, if present. -155 AUE_NFSSVC NOIMPL { int nfssvc(int flag, caddr_t argp); } +155 AUE_NFS_SVC NOSTD { int nfssvc(int flag, caddr_t argp); } 156 AUE_GETDIRENTRIES COMPAT { int getdirentries(int fd, char *buf, \ u_int count, long *basep); } 157 AUE_STATFS COMPAT4 { int statfs(char *path, \ ==== //depot/projects/smpng/sys/nfsserver/nfs_srvsubs.c#33 (text+ko) ==== @@ -98,8 +98,13 @@ struct nfsd_head nfsd_head; int nfsd_head_flag; -static int nfs_prev_nfssvc_sy_narg; -static sy_call_t *nfs_prev_nfssvc_sy_call; +static int nfssvc_offset = SYS_nfssvc; +static struct sysent nfssvc_prev_sysent; +static struct sysent nfssvc_sysent = { + sizeof(struct nfssvc_args) / sizeof(register_t), + (sy_call_t *)&nfssvc, + AUE_NFS_SVC +}; struct mtx nfsd_mtx; @@ -554,11 +559,8 @@ NFSD_UNLOCK(); nfsrv_timer(0); - /* XXX: Should use SYSCALL_MODULE() */ - nfs_prev_nfssvc_sy_narg = sysent[SYS_nfssvc].sy_narg; - sysent[SYS_nfssvc].sy_narg = 2; - nfs_prev_nfssvc_sy_call = sysent[SYS_nfssvc].sy_call; - sysent[SYS_nfssvc].sy_call = (sy_call_t *)nfssvc; + (void)syscall_register(&nfssvc_offset, &nfssvc_sysent, + &nfssvc_prev_sysent); break; case MOD_UNLOAD: @@ -568,8 +570,7 @@ } callout_stop(&nfsrv_callout); - sysent[SYS_nfssvc].sy_narg = nfs_prev_nfssvc_sy_narg; - sysent[SYS_nfssvc].sy_call = nfs_prev_nfssvc_sy_call; + syscall_deregister(&nfssvc_offset, &nfssvc_prev_sysent); mtx_destroy(&nfsd_mtx); break; default: From owner-p4-projects@FreeBSD.ORG Fri Jul 28 20:12:15 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6268016A4DE; Fri, 28 Jul 2006 20:12:15 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 28D1616A4DA for ; Fri, 28 Jul 2006 20:12:15 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id E045C43D45 for ; Fri, 28 Jul 2006 20:12:14 +0000 (GMT) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k6SKCEQP081298 for ; Fri, 28 Jul 2006 20:12:14 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k6SKCElo081295 for perforce@freebsd.org; Fri, 28 Jul 2006 20:12:14 GMT (envelope-from jhb@freebsd.org) Date: Fri, 28 Jul 2006 20:12:14 GMT Message-Id: <200607282012.k6SKCElo081295@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 Cc: Subject: PERFORCE change 102682 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 28 Jul 2006 20:12:15 -0000 http://perforce.freebsd.org/chv.cgi?CH=102682 Change 102682 by jhb@jhb_mutex on 2006/07/28 20:11:51 Include a new set of macros: SYS_AUE_foo in sysproto.h which resolve to the audit event for syscall 'foo' and make use of this in SYSCALL_MODULE_HELPER to define the correct audit events for system calls in loadable modules (e.g. sysv IPC). Affected files ... .. //depot/projects/smpng/sys/kern/makesyscalls.sh#19 edit .. //depot/projects/smpng/sys/sys/sysent.h#15 edit Differences ... ==== //depot/projects/smpng/sys/kern/makesyscalls.sh#19 (text+ko) ==== @@ -20,6 +20,7 @@ namesname="syscallnames" # tmp files: +sysaue="sysent.aue.$$" sysdcl="sysent.dcl.$$" syscompat="sysent.compat.$$" syscompatdcl="sysent.compatdcl.$$" @@ -30,9 +31,9 @@ sysarg="sysarg.switch.$$" sysprotoend="sysprotoend.$$" -trap "rm $sysdcl $syscompat $syscompatdcl $syscompat4 $syscompat4dcl $sysent $sysinc $sysarg $sysprotoend" 0 +trap "rm $sysaue $sysdcl $syscompat $syscompatdcl $syscompat4 $syscompat4dcl $sysent $sysinc $sysarg $sysprotoend" 0 -touch $sysdcl $syscompat $syscompatdcl $syscompat4 $syscompat4dcl $sysent $sysinc $sysarg $sysprotoend +touch $sysaue $sysdcl $syscompat $syscompatdcl $syscompat4 $syscompat4dcl $sysent $sysinc $sysarg $sysprotoend case $# in 0) echo "usage: $0 input-file " 1>&2 @@ -58,6 +59,7 @@ } ' < $1 | awk " BEGIN { + sysaue = \"$sysaue\" sysdcl = \"$sysdcl\" sysproto = \"$sysproto\" sysprotoend = \"$sysprotoend\" @@ -121,6 +123,7 @@ printf "#include \n" > sysarg printf "#include \n\n" > sysarg printf "#include \n\n" > sysarg + printf "#include \n\n" > sysarg printf "struct proc;\n\n" > sysarg printf "struct thread;\n\n" > sysarg printf "#define\tPAD_(t)\t(sizeof(register_t) <= sizeof(t) ? \\\n" > sysarg @@ -315,6 +318,8 @@ printf("%s\t%s(struct thread *, struct %s *)", rettype, funcname, argalias) > sysdcl printf(";\n") > sysdcl + printf("#define\t%sAUE_%s\t%s\n", syscallprefix, + funcalias, auditev) > sysaue } if (funcname == "nosys") nosys = 1 @@ -453,7 +458,7 @@ printf("\n#endif /* %s */\n\n", compat4) > syscompat4dcl - printf("#undef PAD_\n") > sysprotoend + printf("\n#undef PAD_\n") > sysprotoend printf("#undef PADL_\n") > sysprotoend printf("#undef PADR_\n") > sysprotoend printf("\n#endif /* !%s */\n", sysproto_h) > sysprotoend @@ -469,5 +474,5 @@ cat $sysarg $sysdcl \ $syscompat $syscompatdcl \ $syscompat4 $syscompat4dcl \ - $sysprotoend > $sysproto + $sysaue $sysprotoend > $sysproto ==== //depot/projects/smpng/sys/sys/sysent.h#15 (text+ko) ==== @@ -118,12 +118,13 @@ }; \ DECLARE_MODULE(name, name##_mod, SI_SUB_DRIVERS, SI_ORDER_MIDDLE) -#define SYSCALL_MODULE_HELPER(syscallname) \ +#define SYSCALL_MODULE_HELPER(syscallname) \ static int syscallname##_syscall = SYS_##syscallname; \ static struct sysent syscallname##_sysent = { \ (sizeof(struct syscallname ## _args ) \ / sizeof(register_t)), \ - (sy_call_t *)& syscallname \ + (sy_call_t *)& syscallname, \ + SYS_AUE_##syscallname \ }; \ SYSCALL_MODULE(syscallname, \ & syscallname##_syscall, & syscallname##_sysent, \ From owner-p4-projects@FreeBSD.ORG Fri Jul 28 20:20:26 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 34F9B16A4DF; Fri, 28 Jul 2006 20:20:26 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 0B32416A4DD for ; Fri, 28 Jul 2006 20:20:26 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id AF57E43D49 for ; Fri, 28 Jul 2006 20:20:25 +0000 (GMT) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k6SKKPNH082953 for ; Fri, 28 Jul 2006 20:20:25 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k6SKKPeR082939 for perforce@freebsd.org; Fri, 28 Jul 2006 20:20:25 GMT (envelope-from jhb@freebsd.org) Date: Fri, 28 Jul 2006 20:20:25 GMT Message-Id: <200607282020.k6SKKPeR082939@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 Cc: Subject: PERFORCE change 102683 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 28 Jul 2006 20:20:26 -0000 http://perforce.freebsd.org/chv.cgi?CH=102683 Change 102683 by jhb@jhb_mutex on 2006/07/28 20:19:55 Retire SYF_ARGMASK and remove SYF_MPSAFE and SYF_ARGMASK. Affected files ... .. //depot/projects/smpng/sys/amd64/amd64/trap.c#51 edit .. //depot/projects/smpng/sys/amd64/ia32/ia32_syscall.c#21 edit .. //depot/projects/smpng/sys/arm/arm/trap.c#24 edit .. //depot/projects/smpng/sys/i386/i386/trap.c#100 edit .. //depot/projects/smpng/sys/ia64/ia32/ia32_trap.c#17 edit .. //depot/projects/smpng/sys/ia64/ia64/trap.c#88 edit .. //depot/projects/smpng/sys/notes#91 edit .. //depot/projects/smpng/sys/powerpc/powerpc/trap.c#57 edit .. //depot/projects/smpng/sys/sparc64/sparc64/trap.c#73 edit .. //depot/projects/smpng/sys/sys/sysent.h#16 edit Differences ... ==== //depot/projects/smpng/sys/amd64/amd64/trap.c#51 (text+ko) ==== @@ -778,7 +778,7 @@ else callp = &p->p_sysent->sv_table[code]; - narg = callp->sy_narg & SYF_ARGMASK; + narg = callp->sy_narg; /* * copyin and the ktrsyscall()/ktrsysret() code is MP-aware ==== //depot/projects/smpng/sys/amd64/ia32/ia32_syscall.c#21 (text+ko) ==== @@ -154,7 +154,7 @@ else callp = &p->p_sysent->sv_table[code]; - narg = callp->sy_narg & SYF_ARGMASK; + narg = callp->sy_narg; /* * copyin and the ktrsyscall()/ktrsysret() code is MP-aware ==== //depot/projects/smpng/sys/arm/arm/trap.c#24 (text+ko) ==== @@ -910,7 +910,7 @@ callp = &p->p_sysent->sv_table[0]; else callp = &p->p_sysent->sv_table[code]; - nargs = callp->sy_narg & SYF_ARGMASK; + nargs = callp->sy_narg; memcpy(copyargs, ap, nap * sizeof(register_t)); if (nargs > nap) { error = copyin((void *)frame->tf_usr_sp, copyargs + nap, @@ -930,7 +930,7 @@ if (error == 0) { td->td_retval[0] = 0; td->td_retval[1] = 0; - STOPEVENT(p, S_SCE, (callp->sy_narg & SYF_ARGMASK)); + STOPEVENT(p, S_SCE, callp->sy_narg); PTRACESTOP_SC(p, td, S_PT_SCE); AUDIT_SYSCALL_ENTER(code, td); error = (*callp->sy_call)(td, args); ==== //depot/projects/smpng/sys/i386/i386/trap.c#100 (text+ko) ==== @@ -975,7 +975,7 @@ else callp = &p->p_sysent->sv_table[code]; - narg = callp->sy_narg & SYF_ARGMASK; + narg = callp->sy_narg; /* * copyin and the ktrsyscall()/ktrsysret() code is MP-aware ==== //depot/projects/smpng/sys/ia64/ia32/ia32_trap.c#17 (text+ko) ==== @@ -96,7 +96,7 @@ else callp = &p->p_sysent->sv_table[code]; - narg = callp->sy_narg & SYF_ARGMASK; + narg = callp->sy_narg; /* copyin and the ktrsyscall()/ktrsysret() code is MP-aware */ if (params != NULL && narg != 0) ==== //depot/projects/smpng/sys/ia64/ia64/trap.c#88 (text+ko) ==== @@ -1003,7 +1003,7 @@ #ifdef KTRACE if (KTRPOINT(td, KTR_SYSCALL)) - ktrsyscall(code, (callp->sy_narg & SYF_ARGMASK), args); + ktrsyscall(code, callp->sy_narg, args); #endif CTR4(KTR_SYSC, "syscall enter thread %p pid %d proc %s code %d", td, td->td_proc->p_pid, td->td_proc->p_comm, code); @@ -1012,7 +1012,7 @@ td->td_retval[1] = 0; tf->tf_scratch.gr10 = EJUSTRETURN; - STOPEVENT(p, S_SCE, (callp->sy_narg & SYF_ARGMASK)); + STOPEVENT(p, S_SCE, callp->sy_narg); PTRACESTOP_SC(p, td, S_PT_SCE); ==== //depot/projects/smpng/sys/notes#91 (text+ko) ==== @@ -75,11 +75,11 @@ as bad. - compat ABI cleanups + push Giant down and mark all remaining syscalls MPSAFE - - remove SYF_MPSAFE + + remove SYF_MPSAFE + stop conditionally acquiring Giant in syscall() functions + remove all the 'M's from the syscall files + remove support for the 'M' prefix from the syscall scripts - - retire SYF_ARGMASK, sy_narg is now back to just being an argument count + + retire SYF_ARGMASK, sy_narg is now back to just being an argument count Active child branches: - jhb_intr - MSI? ==== //depot/projects/smpng/sys/powerpc/powerpc/trap.c#57 (text+ko) ==== @@ -389,7 +389,7 @@ else callp = &p->p_sysent->sv_table[code]; - narg = callp->sy_narg & SYF_ARGMASK; + narg = callp->sy_narg; if (narg > n) { bcopy(params, args, n * sizeof(register_t)); ==== //depot/projects/smpng/sys/sparc64/sparc64/trap.c#73 (text+ko) ==== @@ -560,7 +560,7 @@ else callp = &p->p_sysent->sv_table[code]; - narg = callp->sy_narg & SYF_ARGMASK; + narg = callp->sy_narg; if (narg <= regcnt) { argp = &tf->tf_out[reg]; ==== //depot/projects/smpng/sys/sys/sysent.h#16 (text+ko) ==== @@ -46,9 +46,6 @@ au_event_t sy_auevent; /* audit event associated with syscall */ }; -#define SYF_ARGMASK 0x0000FFFF -#define SYF_MPSAFE 0x00010000 - struct image_params; struct __sigset; struct trapframe; From owner-p4-projects@FreeBSD.ORG Fri Jul 28 20:24:31 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 70BF016A4E5; Fri, 28 Jul 2006 20:24:31 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 4DDDC16A4DF for ; Fri, 28 Jul 2006 20:24:31 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 0E61F43D45 for ; Fri, 28 Jul 2006 20:24:31 +0000 (GMT) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k6SKOUhj083522 for ; Fri, 28 Jul 2006 20:24:30 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k6SKOU5l083519 for perforce@freebsd.org; Fri, 28 Jul 2006 20:24:30 GMT (envelope-from jhb@freebsd.org) Date: Fri, 28 Jul 2006 20:24:30 GMT Message-Id: <200607282024.k6SKOU5l083519@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 Cc: Subject: PERFORCE change 102684 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 28 Jul 2006 20:24:31 -0000 http://perforce.freebsd.org/chv.cgi?CH=102684 Change 102684 by jhb@jhb_mutex on 2006/07/28 20:24:02 Update. Affected files ... .. //depot/projects/smpng/sys/notes#92 edit Differences ... ==== //depot/projects/smpng/sys/notes#92 (text+ko) ==== @@ -73,13 +73,13 @@ recursion) and panic if we try to sleep with any held to provide a cheaper version of the current WITNESS check that doesn't bog the system down quite as bad. -- compat ABI cleanups - + push Giant down and mark all remaining syscalls MPSAFE - + remove SYF_MPSAFE - + stop conditionally acquiring Giant in syscall() functions - + remove all the 'M's from the syscall files - + remove support for the 'M' prefix from the syscall scripts - + retire SYF_ARGMASK, sy_narg is now back to just being an argument count +- syscall fixes + - make nfssvc less hackish + + done + - untested + - fix audit events for syscalls in modules + + done + - untested Active child branches: - jhb_intr - MSI? From owner-p4-projects@FreeBSD.ORG Fri Jul 28 20:27:36 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7F55E16A4DE; Fri, 28 Jul 2006 20:27:36 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 5A91116A4DA for ; Fri, 28 Jul 2006 20:27:36 +0000 (UTC) (envelope-from cdjones@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id F316543D5F for ; Fri, 28 Jul 2006 20:27:35 +0000 (GMT) (envelope-from cdjones@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k6SKRZW8083774 for ; Fri, 28 Jul 2006 20:27:35 GMT (envelope-from cdjones@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k6SKRZZI083771 for perforce@freebsd.org; Fri, 28 Jul 2006 20:27:35 GMT (envelope-from cdjones@FreeBSD.org) Date: Fri, 28 Jul 2006 20:27:35 GMT Message-Id: <200607282027.k6SKRZZI083771@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to cdjones@FreeBSD.org using -f From: Chris Jones To: Perforce Change Reviews Cc: Subject: PERFORCE change 102686 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 28 Jul 2006 20:27:36 -0000 http://perforce.freebsd.org/chv.cgi?CH=102686 Change 102686 by cdjones@cdjones_igneous on 2006/07/28 20:27:19 Add quick debugging output to console to track the scheduler & pager threads. Affected files ... .. //depot/projects/soc2006/cdjones_jail/src/sys/kern/kern_jail.c#15 edit Differences ... ==== //depot/projects/soc2006/cdjones_jail/src/sys/kern/kern_jail.c#15 (text+ko) ==== @@ -105,14 +105,19 @@ struct prison *pr; pr = arg; + printf("Starting jsched_td\n"); + for (;;) { if (pr->pr_scheduler_flags & J_SCHED_TD_DIE) break; /* Scheduling stuff goes here. */ + printf("jsched_td running\n"); tsleep(pr, 0, "-", hz); } + printf("Exiting jsched_td\n"); + pr->pr_scheduler_flags = J_SCHED_TD_DEAD; kthread_exit(0); } @@ -128,7 +133,11 @@ pr = arg; + printf("Starting jpager_td\n"); + for (;;) { + printf("jpager_td running\n"); + if (pr->pr_pager_flags & J_PAGER_TD_DIE) break; @@ -199,8 +208,11 @@ } /* TODO --- make interval into a sysctl? */ + printf("jpager_td sleeping\n"); tsleep(pr, 0, "-", hz); } + + printf("Exiting jpager_td\n"); pr->pr_pager_flags = J_PAGER_TD_DEAD; kthread_exit(0); From owner-p4-projects@FreeBSD.ORG Fri Jul 28 21:19:43 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4247216A4E2; Fri, 28 Jul 2006 21:19:43 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 0675016A4DD for ; Fri, 28 Jul 2006 21:19:43 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id B09C043D46 for ; Fri, 28 Jul 2006 21:19:42 +0000 (GMT) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k6SLJgQU096764 for ; Fri, 28 Jul 2006 21:19:42 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k6SLJgRc096761 for perforce@freebsd.org; Fri, 28 Jul 2006 21:19:42 GMT (envelope-from jb@freebsd.org) Date: Fri, 28 Jul 2006 21:19:42 GMT Message-Id: <200607282119.k6SLJgRc096761@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 102689 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 28 Jul 2006 21:19:43 -0000 http://perforce.freebsd.org/chv.cgi?CH=102689 Change 102689 by jb@jb_freebsd2 on 2006/07/28 21:19:34 Remove a stray definition that was sucked in by one of the many cross branch integrations. It doesn't exist in -current. Affected files ... .. //depot/projects/dtrace/src/sys/sys/socket.h#4 edit Differences ... ==== //depot/projects/dtrace/src/sys/sys/socket.h#4 (text+ko) ==== @@ -294,7 +294,6 @@ #define PF_SCLUSTER AF_SCLUSTER #define PF_ARP AF_ARP #define PF_BLUETOOTH AF_BLUETOOTH -#define PF_STUB AF_STUB #define PF_MAX AF_MAX From owner-p4-projects@FreeBSD.ORG Fri Jul 28 21:31:59 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id F17F716A4E0; Fri, 28 Jul 2006 21:31:58 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id CD3AF16A4DD for ; Fri, 28 Jul 2006 21:31:58 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 95CB343D49 for ; Fri, 28 Jul 2006 21:31:58 +0000 (GMT) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k6SLVweW097790 for ; Fri, 28 Jul 2006 21:31:58 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k6SLVw11097787 for perforce@freebsd.org; Fri, 28 Jul 2006 21:31:58 GMT (envelope-from jb@freebsd.org) Date: Fri, 28 Jul 2006 21:31:58 GMT Message-Id: <200607282131.k6SLVw11097787@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 102692 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 28 Jul 2006 21:31:59 -0000 http://perforce.freebsd.org/chv.cgi?CH=102692 Change 102692 by jb@jb_freebsd2 on 2006/07/28 21:31:15 Back out the previous change. Affected files ... .. //depot/projects/dtrace/src/sys/dev/em/if_em.c#7 edit Differences ... ==== //depot/projects/dtrace/src/sys/dev/em/if_em.c#7 (text+ko) ==== @@ -31,7 +31,7 @@ ***************************************************************************/ -/*$FreeBSD: src/sys/dev/em/if_em.c,v 1.122 2006/07/27 00:43:34 yongari Exp $*/ +/*$FreeBSD: src/sys/dev/em/if_em.c,v 1.119 2006/07/20 04:18:45 yongari Exp $*/ #ifdef HAVE_KERNEL_OPTION_HEADERS #include "opt_device_polling.h" @@ -1453,18 +1453,21 @@ m_head = m_pullup(m_head, sizeof(eh)); if (m_head == NULL) { *m_headp = NULL; - return (ENOBUFS); + error = ENOBUFS; + goto encap_fail; } eh = *mtod(m_head, struct ether_header *); M_PREPEND(m_head, sizeof(*evl), M_DONTWAIT); if (m_head == NULL) { *m_headp = NULL; - return (ENOBUFS); + error = ENOBUFS; + goto encap_fail; } m_head = m_pullup(m_head, sizeof(*evl)); if (m_head == NULL) { *m_headp = NULL; - return (ENOBUFS); + error = ENOBUFS; + goto encap_fail; } evl = mtod(m_head, struct ether_vlan_header *); bcopy(&eh, evl, sizeof(*evl)); @@ -1476,31 +1479,6 @@ *m_headp = m_head; } - /* - * Map the packet for DMA. - */ - tx_buffer = &sc->tx_buffer_area[sc->next_avail_tx_desc]; - tx_buffer_last = tx_buffer; - map = tx_buffer->map; - error = bus_dmamap_load_mbuf_sg(sc->txtag, map, m_head, segs, &nsegs, - BUS_DMA_NOWAIT); - if (error != 0) { - sc->no_tx_dma_setup++; - return (error); - } - KASSERT(nsegs != 0, ("em_encap: empty packet")); - - if (nsegs > sc->num_tx_desc_avail) { - sc->no_tx_desc_avail2++; - error = ENOBUFS; - goto encap_fail; - } - - if (ifp->if_hwassist > 0) - em_transmit_checksum_setup(sc, m_head, &txd_upper, &txd_lower); - else - txd_upper = txd_lower = 0; - i = sc->next_avail_tx_desc; if (sc->pcix_82544) { txd_saved = i; From owner-p4-projects@FreeBSD.ORG Sat Jul 29 00:40:23 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5461616A4E0; Sat, 29 Jul 2006 00:40:23 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 263EE16A4DD for ; Sat, 29 Jul 2006 00:40:23 +0000 (UTC) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id B677C43D45 for ; Sat, 29 Jul 2006 00:40:22 +0000 (GMT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k6T0eMRj012534 for ; Sat, 29 Jul 2006 00:40:22 GMT (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k6T0e42H012491 for perforce@freebsd.org; Sat, 29 Jul 2006 00:40:04 GMT (envelope-from marcel@freebsd.org) Date: Sat, 29 Jul 2006 00:40:04 GMT Message-Id: <200607290040.k6T0e42H012491@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Cc: Subject: PERFORCE change 102695 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 29 Jul 2006 00:40:23 -0000 http://perforce.freebsd.org/chv.cgi?CH=102695 Change 102695 by marcel@marcel_nfs on 2006/07/29 00:39:58 IFC @102694 Affected files ... .. //depot/projects/uart/amd64/amd64/db_trace.c#11 integrate .. //depot/projects/uart/amd64/amd64/identcpu.c#10 integrate .. //depot/projects/uart/amd64/amd64/intr_machdep.c#9 integrate .. //depot/projects/uart/amd64/amd64/local_apic.c#10 integrate .. //depot/projects/uart/amd64/amd64/machdep.c#21 integrate .. //depot/projects/uart/amd64/amd64/pmap.c#41 integrate .. //depot/projects/uart/amd64/amd64/trap.c#13 integrate .. //depot/projects/uart/amd64/amd64/vm_machdep.c#12 integrate .. //depot/projects/uart/amd64/conf/GENERIC#23 integrate .. //depot/projects/uart/amd64/ia32/ia32_syscall.c#9 integrate .. //depot/projects/uart/amd64/include/specialreg.h#6 integrate .. //depot/projects/uart/amd64/linux32/linux32_proto.h#9 integrate .. //depot/projects/uart/amd64/linux32/linux32_syscall.h#9 integrate .. //depot/projects/uart/amd64/linux32/linux32_sysent.c#9 integrate .. //depot/projects/uart/amd64/linux32/syscalls.master#9 integrate .. //depot/projects/uart/arm/arm/db_trace.c#7 integrate .. //depot/projects/uart/arm/arm/gdb_machdep.c#1 branch .. //depot/projects/uart/arm/arm/in_cksum.c#7 integrate .. //depot/projects/uart/arm/arm/pmap.c#18 integrate .. //depot/projects/uart/arm/arm/trap.c#13 integrate .. //depot/projects/uart/arm/arm/vm_machdep.c#12 integrate .. //depot/projects/uart/arm/at91/at91_pio.c#3 integrate .. //depot/projects/uart/arm/at91/at91_piovar.h#2 integrate .. //depot/projects/uart/arm/at91/at91_pmc.c#3 integrate .. //depot/projects/uart/arm/at91/at91_rtc.c#2 integrate .. //depot/projects/uart/arm/at91/at91_rtcreg.h#2 integrate .. //depot/projects/uart/arm/at91/at91_spi.c#2 integrate .. //depot/projects/uart/arm/at91/at91_spiio.h#2 delete .. //depot/projects/uart/arm/at91/at91_spireg.h#2 integrate .. //depot/projects/uart/arm/at91/at91_ssc.c#2 integrate .. //depot/projects/uart/arm/at91/at91_st.c#4 integrate .. //depot/projects/uart/arm/at91/at91_twi.c#3 integrate .. //depot/projects/uart/arm/at91/files.at91#4 integrate .. //depot/projects/uart/arm/at91/if_ate.c#6 integrate .. //depot/projects/uart/arm/at91/kb920x_machdep.c#5 integrate .. //depot/projects/uart/arm/at91/std.at91#2 integrate .. //depot/projects/uart/arm/at91/std.kb920x#3 integrate .. //depot/projects/uart/arm/at91/uart_dev_at91usart.c#7 integrate .. //depot/projects/uart/arm/conf/KB920X#5 integrate .. //depot/projects/uart/arm/include/db_machdep.h#5 integrate .. //depot/projects/uart/arm/include/gdb_machdep.h#1 branch .. //depot/projects/uart/arm/xscale/i80321/i80321.c#6 integrate .. //depot/projects/uart/arm/xscale/i80321/i80321_timer.c#8 integrate .. //depot/projects/uart/arm/xscale/i80321/iq80321.c#10 integrate .. //depot/projects/uart/boot/forth/loader.conf#11 integrate .. //depot/projects/uart/cam/scsi/scsi_cd.c#13 integrate .. //depot/projects/uart/cam/scsi/scsi_da.c#19 integrate .. //depot/projects/uart/compat/freebsd32/freebsd32_misc.c#16 integrate .. //depot/projects/uart/compat/freebsd32/freebsd32_proto.h#16 integrate .. //depot/projects/uart/compat/freebsd32/freebsd32_syscall.h#16 integrate .. //depot/projects/uart/compat/freebsd32/freebsd32_syscalls.c#16 integrate .. //depot/projects/uart/compat/freebsd32/freebsd32_sysent.c#16 integrate .. //depot/projects/uart/compat/freebsd32/syscalls.master#15 integrate .. //depot/projects/uart/compat/linux/linux_file.c#8 integrate .. //depot/projects/uart/compat/linux/linux_ipc.c#8 integrate .. //depot/projects/uart/compat/linux/linux_misc.c#17 integrate .. //depot/projects/uart/compat/linux/linux_socket.c#13 integrate .. //depot/projects/uart/compat/svr4/svr4_ipc.c#7 integrate .. //depot/projects/uart/compat/svr4/svr4_misc.c#11 integrate .. //depot/projects/uart/compat/svr4/svr4_proto.h#6 integrate .. //depot/projects/uart/compat/svr4/svr4_socket.c#5 integrate .. //depot/projects/uart/compat/svr4/svr4_socket.h#4 integrate .. //depot/projects/uart/compat/svr4/svr4_stream.c#9 integrate .. //depot/projects/uart/compat/svr4/svr4_stropts.h#3 integrate .. //depot/projects/uart/compat/svr4/svr4_syscall.h#6 integrate .. //depot/projects/uart/compat/svr4/svr4_syscallnames.c#6 integrate .. //depot/projects/uart/compat/svr4/svr4_sysent.c#6 integrate .. //depot/projects/uart/compat/svr4/svr4_sysvec.c#7 integrate .. //depot/projects/uart/compat/svr4/svr4_util.h#6 integrate .. //depot/projects/uart/compat/svr4/syscalls.master#6 integrate .. //depot/projects/uart/conf/Makefile.arm#12 integrate .. //depot/projects/uart/conf/NOTES#42 integrate .. //depot/projects/uart/conf/files#74 integrate .. //depot/projects/uart/conf/files.arm#7 integrate .. //depot/projects/uart/conf/files.i386#30 integrate .. //depot/projects/uart/conf/files.ia64#19 integrate .. //depot/projects/uart/conf/files.powerpc#11 integrate .. //depot/projects/uart/conf/kern.pre.mk#13 integrate .. //depot/projects/uart/conf/options#40 integrate .. //depot/projects/uart/conf/options.arm#9 integrate .. //depot/projects/uart/contrib/ia64/libuwx/src.diff#2 delete .. //depot/projects/uart/contrib/ia64/libuwx/src/Makefile#4 integrate .. //depot/projects/uart/contrib/ia64/libuwx/src/uwx.h#4 integrate .. //depot/projects/uart/contrib/ia64/libuwx/src/uwx_bstream.c#3 integrate .. //depot/projects/uart/contrib/ia64/libuwx/src/uwx_bstream.h#3 integrate .. //depot/projects/uart/contrib/ia64/libuwx/src/uwx_context.c#4 integrate .. //depot/projects/uart/contrib/ia64/libuwx/src/uwx_context.h#3 integrate .. //depot/projects/uart/contrib/ia64/libuwx/src/uwx_env.c#3 integrate .. //depot/projects/uart/contrib/ia64/libuwx/src/uwx_env.h#4 integrate .. //depot/projects/uart/contrib/ia64/libuwx/src/uwx_scoreboard.c#4 integrate .. //depot/projects/uart/contrib/ia64/libuwx/src/uwx_scoreboard.h#3 integrate .. //depot/projects/uart/contrib/ia64/libuwx/src/uwx_self-new.c#2 delete .. //depot/projects/uart/contrib/ia64/libuwx/src/uwx_self.c#4 integrate .. //depot/projects/uart/contrib/ia64/libuwx/src/uwx_self.h#3 integrate .. //depot/projects/uart/contrib/ia64/libuwx/src/uwx_self_context.s#3 integrate .. //depot/projects/uart/contrib/ia64/libuwx/src/uwx_self_info.h#1 branch .. //depot/projects/uart/contrib/ia64/libuwx/src/uwx_step.c#4 integrate .. //depot/projects/uart/contrib/ia64/libuwx/src/uwx_step.h#3 integrate .. //depot/projects/uart/contrib/ia64/libuwx/src/uwx_str.c#3 integrate .. //depot/projects/uart/contrib/ia64/libuwx/src/uwx_str.h#3 integrate .. //depot/projects/uart/contrib/ia64/libuwx/src/uwx_swap.c#3 integrate .. //depot/projects/uart/contrib/ia64/libuwx/src/uwx_swap.h#3 integrate .. //depot/projects/uart/contrib/ia64/libuwx/src/uwx_symbols.c#1 branch .. //depot/projects/uart/contrib/ia64/libuwx/src/uwx_symbols.h#1 branch .. //depot/projects/uart/contrib/ia64/libuwx/src/uwx_trace.c#5 integrate .. //depot/projects/uart/contrib/ia64/libuwx/src/uwx_trace.h#5 integrate .. //depot/projects/uart/contrib/ia64/libuwx/src/uwx_ttrace.c#4 delete .. //depot/projects/uart/contrib/ia64/libuwx/src/uwx_ttrace.h#3 delete .. //depot/projects/uart/contrib/ia64/libuwx/src/uwx_uinfo.c#5 integrate .. //depot/projects/uart/contrib/ia64/libuwx/src/uwx_uinfo.h#3 integrate .. //depot/projects/uart/contrib/ia64/libuwx/src/uwx_utable.c#3 integrate .. //depot/projects/uart/contrib/ia64/libuwx/src/uwx_utable.h#3 integrate .. //depot/projects/uart/contrib/pf/net/if_pflog.c#7 integrate .. //depot/projects/uart/contrib/pf/net/if_pfsync.c#8 integrate .. //depot/projects/uart/contrib/pf/net/pf_ioctl.c#9 integrate .. //depot/projects/uart/crypto/via/padlock.c#5 integrate .. //depot/projects/uart/crypto/via/padlock.h#1 branch .. //depot/projects/uart/crypto/via/padlock_cipher.c#1 branch .. //depot/projects/uart/crypto/via/padlock_hash.c#1 branch .. //depot/projects/uart/ddb/db_command.c#11 integrate .. //depot/projects/uart/ddb/db_output.c#7 integrate .. //depot/projects/uart/ddb/db_output.h#3 integrate .. //depot/projects/uart/ddb/db_ps.c#11 integrate .. //depot/projects/uart/ddb/db_thread.c#6 integrate .. //depot/projects/uart/ddb/ddb.h#10 integrate .. //depot/projects/uart/dev/aac/aac_cam.c#8 integrate .. //depot/projects/uart/dev/acpica/acpi_perf.c#4 integrate .. //depot/projects/uart/dev/acpica/acpi_thermal.c#10 integrate .. //depot/projects/uart/dev/amr/amr.c#16 integrate .. //depot/projects/uart/dev/asr/MAINTAINER#2 delete .. //depot/projects/uart/dev/ata/ata-chipset.c#22 integrate .. //depot/projects/uart/dev/ata/ata-pci.h#16 integrate .. //depot/projects/uart/dev/ata/ata-queue.c#19 integrate .. //depot/projects/uart/dev/ath/ath_rate/sample/sample.h#3 integrate .. //depot/projects/uart/dev/ath/if_ath.c#33 integrate .. //depot/projects/uart/dev/bce/if_bce.c#3 integrate .. //depot/projects/uart/dev/em/if_em.c#23 integrate .. //depot/projects/uart/dev/em/if_em.h#19 integrate .. //depot/projects/uart/dev/fdc/fdc.c#12 integrate .. //depot/projects/uart/dev/iicbus/iic.c#6 integrate .. //depot/projects/uart/dev/iicbus/iic.h#2 integrate .. //depot/projects/uart/dev/iicbus/iicbus.c#5 integrate .. //depot/projects/uart/dev/iicbus/iicbus.h#3 integrate .. //depot/projects/uart/dev/iicbus/iicbus_if.m#3 integrate .. //depot/projects/uart/dev/iicbus/iiconf.c#3 integrate .. //depot/projects/uart/dev/iicbus/iiconf.h#2 integrate .. //depot/projects/uart/dev/isp/isp.c#14 integrate .. //depot/projects/uart/dev/isp/isp_freebsd.c#17 integrate .. //depot/projects/uart/dev/isp/isp_freebsd.h#13 integrate .. //depot/projects/uart/dev/isp/isp_library.c#4 integrate .. //depot/projects/uart/dev/isp/isp_pci.c#15 integrate .. //depot/projects/uart/dev/isp/isp_sbus.c#11 integrate .. //depot/projects/uart/dev/isp/isp_target.c#9 integrate .. //depot/projects/uart/dev/ispfw/asm_1040.h#3 integrate .. //depot/projects/uart/dev/ispfw/asm_1080.h#3 integrate .. //depot/projects/uart/dev/ispfw/asm_12160.h#4 integrate .. //depot/projects/uart/dev/ispfw/ispfw.c#7 integrate .. //depot/projects/uart/dev/iwi/if_iwi.c#11 integrate .. //depot/projects/uart/dev/kbdmux/kbdmux.c#4 integrate .. //depot/projects/uart/dev/lmc/if_lmc.c#7 integrate .. //depot/projects/uart/dev/lmc/if_lmc.h#3 integrate .. //depot/projects/uart/dev/mii/gentbi.c#1 branch .. //depot/projects/uart/dev/mii/ip1000phy.c#1 branch .. //depot/projects/uart/dev/mii/ip1000phyreg.h#1 branch .. //depot/projects/uart/dev/mii/miidevs#9 integrate .. //depot/projects/uart/dev/mpt/mpt.c#19 integrate .. //depot/projects/uart/dev/mpt/mpt.h#17 integrate .. //depot/projects/uart/dev/mpt/mpt_cam.c#18 integrate .. //depot/projects/uart/dev/mpt/mpt_debug.c#13 integrate .. //depot/projects/uart/dev/mpt/mpt_pci.c#22 integrate .. //depot/projects/uart/dev/mpt/mpt_raid.c#6 integrate .. //depot/projects/uart/dev/mpt/mpt_raid.h#3 integrate .. //depot/projects/uart/dev/mxge/if_mxge.c#3 integrate .. //depot/projects/uart/dev/ncv/ncr53c500_pccard.c#9 integrate .. //depot/projects/uart/dev/pccard/pccarddevs#19 integrate .. //depot/projects/uart/dev/pci/pci.c#24 integrate .. //depot/projects/uart/dev/ral/rt2560.c#5 integrate .. //depot/projects/uart/dev/random/probe.c#4 integrate .. //depot/projects/uart/dev/scc/scc_core.c#24 integrate .. //depot/projects/uart/dev/scc/scc_dev_z8530.c#13 integrate .. //depot/projects/uart/dev/sio/sio.c#18 integrate .. //depot/projects/uart/dev/sk/if_sk.c#10 integrate .. //depot/projects/uart/dev/sk/if_skreg.h#6 integrate .. //depot/projects/uart/dev/sound/driver.c#7 integrate .. //depot/projects/uart/dev/sound/midi/sequencer.c#5 integrate .. //depot/projects/uart/dev/sound/pci/cmi.c#12 integrate .. //depot/projects/uart/dev/sound/pci/emu10k1.c#11 integrate .. //depot/projects/uart/dev/sound/pci/emu10kx-midi.c#1 branch .. //depot/projects/uart/dev/sound/pci/emu10kx-pcm.c#1 branch .. //depot/projects/uart/dev/sound/pci/emu10kx.c#1 branch .. //depot/projects/uart/dev/sound/pci/emu10kx.h#1 branch .. //depot/projects/uart/dev/sound/pci/envy24.c#2 integrate .. //depot/projects/uart/dev/sound/pcm/buffer.c#6 integrate .. //depot/projects/uart/dev/sound/pcm/buffer.h#5 integrate .. //depot/projects/uart/dev/sound/pcm/mixer.h#5 integrate .. //depot/projects/uart/dev/sound/pcm/sound.c#12 integrate .. //depot/projects/uart/dev/sound/pcm/sound.h#11 integrate .. //depot/projects/uart/dev/spibus/spi.h#1 branch .. //depot/projects/uart/dev/spibus/spibus.c#1 branch .. //depot/projects/uart/dev/spibus/spibus_if.m#1 branch .. //depot/projects/uart/dev/spibus/spibusvar.h#1 branch .. //depot/projects/uart/dev/stg/tmc18c30_subr.c#6 integrate .. //depot/projects/uart/dev/stge/if_stge.c#1 branch .. //depot/projects/uart/dev/stge/if_stgereg.h#1 branch .. //depot/projects/uart/dev/streams/streams.c#7 integrate .. //depot/projects/uart/dev/uart/uart_cpu_powerpc.c#2 integrate .. //depot/projects/uart/dev/uart/uart_dev_z8530.c#32 integrate .. //depot/projects/uart/dev/uart/uart_tty.c#30 integrate .. //depot/projects/uart/dev/usb/if_ural.c#10 integrate .. //depot/projects/uart/dev/usb/uplcom.c#16 integrate .. //depot/projects/uart/dev/usb/usbdevs#25 integrate .. //depot/projects/uart/doc/Doxyfile#2 delete .. //depot/projects/uart/doc/Makefile#2 delete .. //depot/projects/uart/doc/subsys/Dependencies#2 delete .. //depot/projects/uart/doc/subsys/Doxyfile-cam#2 delete .. //depot/projects/uart/doc/subsys/Doxyfile-crypto#2 delete .. //depot/projects/uart/doc/subsys/Doxyfile-dev_pci#2 delete .. //depot/projects/uart/doc/subsys/Doxyfile-dev_sound#2 delete .. //depot/projects/uart/doc/subsys/Doxyfile-dev_usb#2 delete .. //depot/projects/uart/doc/subsys/Doxyfile-geom#2 delete .. //depot/projects/uart/doc/subsys/Doxyfile-i4b#2 delete .. //depot/projects/uart/doc/subsys/Doxyfile-kern#2 delete .. //depot/projects/uart/doc/subsys/Doxyfile-libkern#2 delete .. //depot/projects/uart/doc/subsys/Doxyfile-linux#2 delete .. //depot/projects/uart/doc/subsys/Doxyfile-net80211#2 delete .. //depot/projects/uart/doc/subsys/Doxyfile-netgraph#2 delete .. //depot/projects/uart/doc/subsys/Doxyfile-netinet#2 delete .. //depot/projects/uart/doc/subsys/Doxyfile-netinet6#2 delete .. //depot/projects/uart/doc/subsys/Doxyfile-netipsec#2 delete .. //depot/projects/uart/doc/subsys/Doxyfile-opencrypto#2 delete .. //depot/projects/uart/doc/subsys/Doxyfile-vm#2 delete .. //depot/projects/uart/doc/subsys/Makefile#2 delete .. //depot/projects/uart/doc/subsys/README#2 delete .. //depot/projects/uart/doc/subsys/common-Doxyfile#2 delete .. //depot/projects/uart/doc/subsys/notreviewed.dox#2 delete .. //depot/projects/uart/fs/devfs/devfs_devs.c#9 integrate .. //depot/projects/uart/fs/devfs/devfs_rule.c#7 integrate .. //depot/projects/uart/fs/devfs/devfs_vfsops.c#11 integrate .. //depot/projects/uart/fs/devfs/devfs_vnops.c#16 integrate .. //depot/projects/uart/fs/portalfs/portal_vnops.c#6 integrate .. //depot/projects/uart/fs/smbfs/smbfs_vfsops.c#11 integrate .. //depot/projects/uart/fs/udf/ecma167-udf.h#4 integrate .. //depot/projects/uart/fs/udf/udf_vfsops.c#15 integrate .. //depot/projects/uart/geom/eli/g_eli.c#9 integrate .. //depot/projects/uart/geom/eli/g_eli_integrity.c#2 integrate .. //depot/projects/uart/geom/geom.h#12 integrate .. //depot/projects/uart/geom/mirror/g_mirror.c#17 integrate .. //depot/projects/uart/geom/mirror/g_mirror_ctl.c#9 integrate .. //depot/projects/uart/geom/raid3/g_raid3.c#20 integrate .. //depot/projects/uart/geom/raid3/g_raid3_ctl.c#9 integrate .. //depot/projects/uart/gnu/dev/sound/pci/emu10k1-ac97.h#3 delete .. //depot/projects/uart/gnu/dev/sound/pci/emu10k1-alsa.h#4 integrate .. //depot/projects/uart/gnu/dev/sound/pci/emu10k1.h#4 delete .. //depot/projects/uart/gnu/dev/sound/pci/p16v-alsa.h#1 branch .. //depot/projects/uart/gnu/dev/sound/pci/p17v-alsa.h#1 branch .. //depot/projects/uart/i386/conf/GENERIC#22 integrate .. //depot/projects/uart/i386/conf/PAE#12 integrate .. //depot/projects/uart/i386/i386/db_trace.c#11 integrate .. //depot/projects/uart/i386/i386/identcpu.c#20 integrate .. //depot/projects/uart/i386/i386/initcpu.c#9 integrate .. //depot/projects/uart/i386/i386/intr_machdep.c#7 integrate .. //depot/projects/uart/i386/i386/local_apic.c#11 integrate .. //depot/projects/uart/i386/i386/machdep.c#24 integrate .. //depot/projects/uart/i386/i386/pmap.c#42 integrate .. //depot/projects/uart/i386/i386/trap.c#14 integrate .. //depot/projects/uart/i386/ibcs2/ibcs2_ipc.c#4 integrate .. //depot/projects/uart/i386/ibcs2/ibcs2_ipc.h#4 integrate .. //depot/projects/uart/i386/ibcs2/ibcs2_isc.c#3 integrate .. //depot/projects/uart/i386/ibcs2/ibcs2_isc_syscall.h#5 integrate .. //depot/projects/uart/i386/ibcs2/ibcs2_isc_sysent.c#5 integrate .. //depot/projects/uart/i386/ibcs2/ibcs2_misc.c#10 integrate .. //depot/projects/uart/i386/ibcs2/ibcs2_other.c#4 integrate .. //depot/projects/uart/i386/ibcs2/ibcs2_proto.h#7 integrate .. //depot/projects/uart/i386/ibcs2/ibcs2_syscall.h#7 integrate .. //depot/projects/uart/i386/ibcs2/ibcs2_sysent.c#7 integrate .. //depot/projects/uart/i386/ibcs2/ibcs2_util.h#5 integrate .. //depot/projects/uart/i386/ibcs2/ibcs2_xenix.c#5 integrate .. //depot/projects/uart/i386/ibcs2/ibcs2_xenix.h#6 integrate .. //depot/projects/uart/i386/ibcs2/ibcs2_xenix_syscall.h#6 integrate .. //depot/projects/uart/i386/ibcs2/ibcs2_xenix_sysent.c#6 integrate .. //depot/projects/uart/i386/ibcs2/imgact_coff.c#7 integrate .. //depot/projects/uart/i386/ibcs2/syscalls.isc#5 integrate .. //depot/projects/uart/i386/ibcs2/syscalls.master#7 integrate .. //depot/projects/uart/i386/ibcs2/syscalls.xenix#6 integrate .. //depot/projects/uart/i386/include/i4b_ioctl.h#3 integrate .. //depot/projects/uart/i386/include/md_var.h#10 integrate .. //depot/projects/uart/i386/include/specialreg.h#7 integrate .. //depot/projects/uart/i386/linux/linux_proto.h#11 integrate .. //depot/projects/uart/i386/linux/linux_syscall.h#11 integrate .. //depot/projects/uart/i386/linux/linux_sysent.c#11 integrate .. //depot/projects/uart/i386/linux/syscalls.master#11 integrate .. //depot/projects/uart/i4b/layer4/i4b_l4mgmt.c#3 integrate .. //depot/projects/uart/ia64/conf/DEFAULTS#5 integrate .. //depot/projects/uart/ia64/conf/GENERIC#14 integrate .. //depot/projects/uart/ia64/ia32/ia32_trap.c#6 integrate .. //depot/projects/uart/ia64/ia64/db_machdep.c#2 integrate .. //depot/projects/uart/ia64/ia64/trap.c#17 integrate .. //depot/projects/uart/isa/isahint.c#5 integrate .. //depot/projects/uart/kern/bus_if.m#5 integrate .. //depot/projects/uart/kern/init_sysent.c#18 integrate .. //depot/projects/uart/kern/kern_descrip.c#24 integrate .. //depot/projects/uart/kern/kern_environment.c#10 integrate .. //depot/projects/uart/kern/kern_intr.c#12 integrate .. //depot/projects/uart/kern/kern_ktr.c#11 integrate .. //depot/projects/uart/kern/kern_linker.c#11 integrate .. //depot/projects/uart/kern/kern_lock.c#12 integrate .. //depot/projects/uart/kern/kern_mac.c#13 integrate .. //depot/projects/uart/kern/kern_malloc.c#14 integrate .. //depot/projects/uart/kern/kern_mutex.c#15 integrate .. //depot/projects/uart/kern/kern_rwlock.c#6 integrate .. //depot/projects/uart/kern/kern_sx.c#7 integrate .. //depot/projects/uart/kern/kern_thr.c#13 integrate .. //depot/projects/uart/kern/kern_uuid.c#5 integrate .. //depot/projects/uart/kern/link_elf.c#9 integrate .. //depot/projects/uart/kern/makesyscalls.sh#4 integrate .. //depot/projects/uart/kern/subr_acl_posix1e.c#2 integrate .. //depot/projects/uart/kern/subr_autoconf.c#5 integrate .. //depot/projects/uart/kern/subr_bus.c#16 integrate .. //depot/projects/uart/kern/subr_hints.c#6 integrate .. //depot/projects/uart/kern/subr_prf.c#10 integrate .. //depot/projects/uart/kern/subr_turnstile.c#10 integrate .. //depot/projects/uart/kern/sys_generic.c#13 integrate .. //depot/projects/uart/kern/sys_socket.c#8 integrate .. //depot/projects/uart/kern/syscalls.c#18 integrate .. //depot/projects/uart/kern/syscalls.master#19 integrate .. //depot/projects/uart/kern/sysv_sem.c#12 integrate .. //depot/projects/uart/kern/uipc_domain.c#10 integrate .. //depot/projects/uart/kern/uipc_sockbuf.c#1 branch .. //depot/projects/uart/kern/uipc_socket.c#21 integrate .. //depot/projects/uart/kern/uipc_socket2.c#16 integrate .. //depot/projects/uart/kern/uipc_syscalls.c#22 integrate .. //depot/projects/uart/kern/uipc_usrreq.c#16 integrate .. //depot/projects/uart/kern/vfs_bio.c#24 integrate .. //depot/projects/uart/kern/vfs_subr.c#34 integrate .. //depot/projects/uart/kern/vfs_syscalls.c#27 integrate .. //depot/projects/uart/modules/Makefile#40 integrate .. //depot/projects/uart/modules/agp/Makefile#6 integrate .. //depot/projects/uart/modules/asr/Makefile#4 integrate .. //depot/projects/uart/modules/bridgestp/Makefile#1 branch .. //depot/projects/uart/modules/hwpmc/Makefile#3 integrate .. //depot/projects/uart/modules/if_bridge/Makefile#5 integrate .. //depot/projects/uart/modules/ispfw/Makefile#2 integrate .. //depot/projects/uart/modules/ispfw/isp_1000/Makefile#1 branch .. //depot/projects/uart/modules/ispfw/isp_1040/Makefile#1 branch .. //depot/projects/uart/modules/ispfw/isp_1040_it/Makefile#1 branch .. //depot/projects/uart/modules/ispfw/isp_1080/Makefile#1 branch .. //depot/projects/uart/modules/ispfw/isp_1080_it/Makefile#1 branch .. //depot/projects/uart/modules/ispfw/isp_12160/Makefile#1 branch .. //depot/projects/uart/modules/ispfw/isp_12160_it/Makefile#1 branch .. //depot/projects/uart/modules/ispfw/isp_2100/Makefile#1 branch .. //depot/projects/uart/modules/ispfw/isp_2200/Makefile#1 branch .. //depot/projects/uart/modules/ispfw/isp_2300/Makefile#1 branch .. //depot/projects/uart/modules/ispfw/isp_2322/Makefile#1 branch .. //depot/projects/uart/modules/ispfw/ispfw/Makefile#1 branch .. //depot/projects/uart/modules/mii/Makefile#5 integrate .. //depot/projects/uart/modules/osf1/Makefile#5 delete .. //depot/projects/uart/modules/padlock/Makefile#2 integrate .. //depot/projects/uart/modules/sound/driver/Makefile#5 integrate .. //depot/projects/uart/modules/sound/driver/emu10kx/Makefile#1 branch .. //depot/projects/uart/modules/stge/Makefile#1 branch .. //depot/projects/uart/net/bpf.c#17 integrate .. //depot/projects/uart/net/bridgestp.c#6 integrate .. //depot/projects/uart/net/bridgestp.h#1 branch .. //depot/projects/uart/net/if.c#22 integrate .. //depot/projects/uart/net/if_bridge.c#12 integrate .. //depot/projects/uart/net/if_bridgevar.h#6 integrate .. //depot/projects/uart/net/if_clone.c#6 integrate .. //depot/projects/uart/net/if_clone.h#4 integrate .. //depot/projects/uart/net/if_disc.c#9 integrate .. //depot/projects/uart/net/if_enc.c#2 integrate .. //depot/projects/uart/net/if_ethersubr.c#16 integrate .. //depot/projects/uart/net/if_faith.c#9 integrate .. //depot/projects/uart/net/if_gif.c#10 integrate .. //depot/projects/uart/net/if_gre.c#10 integrate .. //depot/projects/uart/net/if_loop.c#10 integrate .. //depot/projects/uart/net/if_ppp.c#9 integrate .. //depot/projects/uart/net/if_spppsubr.c#7 integrate .. //depot/projects/uart/net/if_stf.c#11 integrate .. //depot/projects/uart/net/if_tap.c#11 integrate .. //depot/projects/uart/net/if_vlan.c#17 integrate .. //depot/projects/uart/net/raw_usrreq.c#9 integrate .. //depot/projects/uart/net/rtsock.c#13 integrate .. //depot/projects/uart/net80211/ieee80211.c#14 integrate .. //depot/projects/uart/net80211/ieee80211.h#6 integrate .. //depot/projects/uart/net80211/ieee80211_freebsd.h#4 integrate .. //depot/projects/uart/net80211/ieee80211_input.c#18 integrate .. //depot/projects/uart/net80211/ieee80211_ioctl.c#17 integrate .. //depot/projects/uart/net80211/ieee80211_ioctl.h#9 integrate .. //depot/projects/uart/net80211/ieee80211_output.c#18 integrate .. //depot/projects/uart/net80211/ieee80211_proto.c#13 integrate .. //depot/projects/uart/net80211/ieee80211_proto.h#10 integrate .. //depot/projects/uart/net80211/ieee80211_var.h#15 integrate .. //depot/projects/uart/netatalk/ddp_usrreq.c#8 integrate .. //depot/projects/uart/netatm/atm_aal5.c#7 integrate .. //depot/projects/uart/netatm/atm_usrreq.c#8 integrate .. //depot/projects/uart/netgraph/bluetooth/include/ng_btsocket_hci_raw.h#5 integrate .. //depot/projects/uart/netgraph/bluetooth/include/ng_btsocket_l2cap.h#6 integrate .. //depot/projects/uart/netgraph/bluetooth/include/ng_btsocket_rfcomm.h#7 integrate .. //depot/projects/uart/netgraph/bluetooth/socket/ng_btsocket.c#8 integrate .. //depot/projects/uart/netgraph/bluetooth/socket/ng_btsocket_hci_raw.c#8 integrate .. //depot/projects/uart/netgraph/bluetooth/socket/ng_btsocket_l2cap.c#8 integrate .. //depot/projects/uart/netgraph/bluetooth/socket/ng_btsocket_l2cap_raw.c#7 integrate .. //depot/projects/uart/netgraph/bluetooth/socket/ng_btsocket_rfcomm.c#9 integrate .. //depot/projects/uart/netgraph/ng_ether.c#8 integrate .. //depot/projects/uart/netgraph/ng_ksocket.c#10 integrate .. //depot/projects/uart/netgraph/ng_socket.c#13 integrate .. //depot/projects/uart/netinet/in_pcb.c#20 integrate .. //depot/projects/uart/netinet/in_pcb.h#11 integrate .. //depot/projects/uart/netinet/ip_carp.c#7 integrate .. //depot/projects/uart/netinet/ip_divert.c#14 integrate .. //depot/projects/uart/netinet/raw_ip.c#17 integrate .. //depot/projects/uart/netinet/tcp_subr.c#22 integrate .. //depot/projects/uart/netinet/tcp_usrreq.c#16 integrate .. //depot/projects/uart/netinet/udp_usrreq.c#20 integrate .. //depot/projects/uart/netinet6/README#3 delete .. //depot/projects/uart/netinet6/icmp6.c#11 integrate .. //depot/projects/uart/netinet6/in6_pcb.c#15 integrate .. //depot/projects/uart/netinet6/raw_ip6.c#13 integrate .. //depot/projects/uart/netinet6/udp6_usrreq.c#14 integrate .. //depot/projects/uart/netipsec/keysock.c#10 integrate .. //depot/projects/uart/netipx/ipx_usrreq.c#9 integrate .. //depot/projects/uart/netipx/spx_usrreq.c#13 integrate .. //depot/projects/uart/netkey/keysock.c#10 integrate .. //depot/projects/uart/netnatm/natm.c#12 integrate .. //depot/projects/uart/netncp/ncp_sock.c#3 integrate .. //depot/projects/uart/netsmb/smb_conn.c#7 integrate .. //depot/projects/uart/netsmb/smb_trantcp.c#4 integrate .. //depot/projects/uart/nfs4client/nfs4_vnops.c#7 integrate .. //depot/projects/uart/nfsclient/nfs_socket.c#14 integrate .. //depot/projects/uart/nfsclient/nfs_vnops.c#17 integrate .. //depot/projects/uart/nfsserver/nfs_srvsock.c#10 integrate .. //depot/projects/uart/nfsserver/nfs_srvsubs.c#11 integrate .. //depot/projects/uart/pc98/conf/GENERIC#17 integrate .. //depot/projects/uart/pc98/pc98/machdep.c#10 integrate .. //depot/projects/uart/posix4/ksched.c#7 integrate .. //depot/projects/uart/posix4/p1003_1b.c#6 integrate .. //depot/projects/uart/posix4/posix4.h#2 integrate .. //depot/projects/uart/powerpc/conf/GENERIC#12 integrate .. //depot/projects/uart/powerpc/conf/NOTES#2 integrate .. //depot/projects/uart/powerpc/include/md_var.h#3 integrate .. //depot/projects/uart/powerpc/include/ofw_machdep.h#3 integrate .. //depot/projects/uart/powerpc/include/pcb.h#3 integrate .. //depot/projects/uart/powerpc/powerpc/clock.c#9 integrate .. //depot/projects/uart/powerpc/powerpc/db_trace.c#8 integrate .. //depot/projects/uart/powerpc/powerpc/mem.c#2 integrate .. //depot/projects/uart/powerpc/powerpc/mmu_oea.c#5 integrate .. //depot/projects/uart/powerpc/powerpc/ofw_machdep.c#5 integrate .. //depot/projects/uart/powerpc/powerpc/trap.c#9 integrate .. //depot/projects/uart/powerpc/psim/sio_iobus.c#4 delete .. //depot/projects/uart/powerpc/psim/uart_iobus.c#1 branch .. //depot/projects/uart/security/mac/mac_vfs.c#7 integrate .. //depot/projects/uart/security/mac_biba/mac_biba.c#10 integrate .. //depot/projects/uart/sparc64/conf/GENERIC#23 integrate .. //depot/projects/uart/sparc64/include/pmap.h#8 integrate .. //depot/projects/uart/sparc64/sparc64/db_trace.c#8 integrate .. //depot/projects/uart/sparc64/sparc64/trap.c#14 integrate .. //depot/projects/uart/sys/_label.h#3 integrate .. //depot/projects/uart/sys/bufobj.h#8 integrate .. //depot/projects/uart/sys/bus.h#12 integrate .. //depot/projects/uart/sys/extattr.h#2 integrate .. //depot/projects/uart/sys/libkern.h#7 integrate .. //depot/projects/uart/sys/mbuf.h#13 integrate .. //depot/projects/uart/sys/mutex.h#13 integrate .. //depot/projects/uart/sys/param.h#27 integrate .. //depot/projects/uart/sys/protosw.h#11 integrate .. //depot/projects/uart/sys/socket.h#7 integrate .. //depot/projects/uart/sys/socketvar.h#14 integrate .. //depot/projects/uart/sys/sockio.h#6 integrate .. //depot/projects/uart/sys/syscall.h#17 integrate .. //depot/projects/uart/sys/syscall.mk#17 integrate .. //depot/projects/uart/sys/syscallsubr.h#13 integrate .. //depot/projects/uart/sys/sysctl.h#12 integrate .. //depot/projects/uart/sys/sysent.h#6 integrate .. //depot/projects/uart/sys/sysproto.h#18 integrate .. //depot/projects/uart/sys/systm.h#16 integrate .. //depot/projects/uart/sys/thr.h#6 integrate .. //depot/projects/uart/sys/unpcb.h#5 integrate .. //depot/projects/uart/ufs/ffs/ffs_alloc.c#9 integrate .. //depot/projects/uart/ufs/ffs/ffs_vfsops.c#26 integrate .. //depot/projects/uart/ufs/ufs/ufs_lookup.c#8 integrate .. //depot/projects/uart/vm/pmap.h#15 integrate .. //depot/projects/uart/vm/uma_core.c#23 integrate .. //depot/projects/uart/vm/vm.h#5 integrate .. //depot/projects/uart/vm/vm_fault.c#17 integrate .. //depot/projects/uart/vm/vm_map.c#23 integrate .. //depot/projects/uart/vm/vm_meter.c#8 integrate .. //depot/projects/uart/vm/vm_object.c#22 integrate .. //depot/projects/uart/vm/vm_object.h#8 integrate .. //depot/projects/uart/vm/vm_page.c#23 integrate Differences ... ==== //depot/projects/uart/amd64/amd64/db_trace.c#11 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/db_trace.c,v 1.74 2006/03/13 23:56:44 peter Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/db_trace.c,v 1.75 2006/07/12 21:22:42 jhb Exp $"); #include #include @@ -390,16 +390,14 @@ long *argp; db_expr_t offset; c_db_sym_t sym; - int narg, quit; + int narg; boolean_t first; if (count == -1) count = 1024; first = TRUE; - quit = 0; - db_setup_paging(db_simple_pager, &quit, db_lines_per_page); - while (count-- && !quit) { + while (count-- && !db_pager_quit) { sym = db_search_symbol(pc, DB_STGY_ANY, &offset); db_symbol_values(sym, &name, NULL); ==== //depot/projects/uart/amd64/amd64/identcpu.c#10 (text+ko) ==== @@ -39,7 +39,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/identcpu.c,v 1.146 2006/04/24 22:56:57 jkim Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/identcpu.c,v 1.147 2006/07/12 06:04:11 jkim Exp $"); #include "opt_cpu.h" @@ -306,8 +306,8 @@ "\020" "\001LAHF" /* LAHF/SAHF in long mode */ "\002CMP" /* CMP legacy */ - "\003" - "\004" + "\003SVM" /* Secure Virtual Mode */ + "\004ExtAPIC" /* Extended APIC register */ "\005CR8" /* CR8 in legacy mode */ "\006" "\007" ==== //depot/projects/uart/amd64/amd64/intr_machdep.c#9 (text+ko) ==== @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/amd64/amd64/intr_machdep.c,v 1.19 2006/02/28 22:24:54 jhb Exp $ + * $FreeBSD: src/sys/amd64/amd64/intr_machdep.c,v 1.20 2006/07/12 21:22:42 jhb Exp $ */ /* @@ -338,16 +338,14 @@ DB_SHOW_COMMAND(irqs, db_show_irqs) { struct intsrc **isrc; - int i, quit, verbose; + int i, verbose; - quit = 0; if (strcmp(modif, "v") == 0) verbose = 1; else verbose = 0; isrc = interrupt_sources; - db_setup_paging(db_simple_pager, &quit, db_lines_per_page); - for (i = 0; i < NUM_IO_INTS && !quit; i++, isrc++) + for (i = 0; i < NUM_IO_INTS && !db_pager_quit; i++, isrc++) if (*isrc != NULL) db_dump_intr_event((*isrc)->is_event, verbose); } ==== //depot/projects/uart/amd64/amd64/local_apic.c#10 (text+ko) ==== @@ -32,7 +32,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/local_apic.c,v 1.25 2006/03/20 19:39:07 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/local_apic.c,v 1.26 2006/07/12 21:22:42 jhb Exp $"); #include "opt_hwpmc_hooks.h" @@ -755,18 +755,16 @@ DB_SHOW_COMMAND(apic, db_show_apic) { struct intsrc *isrc; - int quit, i, verbose; + int i, verbose; u_int irq; - quit = 0; if (strcmp(modif, "vv") == 0) verbose = 2; else if (strcmp(modif, "v") == 0) verbose = 1; else verbose = 0; - db_setup_paging(db_simple_pager, &quit, db_lines_per_page); - for (i = 0; i < APIC_NUM_IOINTS + 1 && !quit; i++) { + for (i = 0; i < APIC_NUM_IOINTS + 1 && !db_pager_quit; i++) { irq = ioint_irqs[i]; if (irq != 0 && irq != IRQ_SYSCALL) { db_printf("vec 0x%2x -> ", i + APIC_IO_INTS); ==== //depot/projects/uart/amd64/amd64/machdep.c#21 (text+ko) ==== @@ -39,7 +39,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/machdep.c,v 1.650 2006/06/19 22:36:01 davidxu Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/machdep.c,v 1.651 2006/07/27 19:47:22 jhb Exp $"); #include "opt_atalk.h" #include "opt_atpic.h" @@ -947,17 +947,17 @@ if (TUNABLE_ULONG_FETCH("hw.physmem", &physmem_tunable)) Maxmem = atop(physmem_tunable); + /* + * Don't allow MAXMEM or hw.physmem to extend the amount of memory + * in the system. + */ + if (Maxmem > atop(physmap[physmap_idx + 1])) + Maxmem = atop(physmap[physmap_idx + 1]); + if (atop(physmap[physmap_idx + 1]) != Maxmem && (boothowto & RB_VERBOSE)) printf("Physical memory use set to %ldK\n", Maxmem * 4); - /* - * If Maxmem has been increased beyond what the system has detected, - * extend the last memory segment to the new limit. - */ - if (atop(physmap[physmap_idx + 1]) < Maxmem) - physmap[physmap_idx + 1] = ptoa((vm_paddr_t)Maxmem); - /* call pmap initialization to make new kernel address space */ pmap_bootstrap(&first); ==== //depot/projects/uart/amd64/amd64/pmap.c#41 (text+ko) ==== @@ -77,7 +77,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.565 2006/07/06 06:17:08 alc Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.567 2006/07/20 17:48:40 alc Exp $"); /* * Manages physical address maps. @@ -207,7 +207,6 @@ static void free_pv_entry(pmap_t pmap, pv_entry_t pv); static pv_entry_t get_pv_entry(pmap_t locked_pmap, int try); -static void pmap_clear_write(vm_page_t m); static vm_page_t pmap_enter_quick_locked(pmap_t pmap, vm_offset_t va, vm_page_t m, vm_prot_t prot, vm_page_t mpte); @@ -1627,6 +1626,7 @@ int idx, field, bit; mtx_assert(&vm_page_queue_mtx, MA_OWNED); + PMAP_LOCK_ASSERT(pmap, MA_OWNED); PV_STAT(pv_entry_frees++); PV_STAT(pv_entry_spare++); pv_entry_count--; @@ -2015,8 +2015,8 @@ TAILQ_REMOVE(&m->md.pv_list, pv, pv_list); m->md.pv_list_count--; pmap_unuse_pt(pmap, pv->pv_va, ptepde); + free_pv_entry(pmap, pv); PMAP_UNLOCK(pmap); - free_pv_entry(pmap, pv); } vm_page_flag_clear(m, PG_WRITEABLE); } @@ -2971,7 +2971,7 @@ /* * Clear the write and modified bits in each of the given page's mappings. */ -static __inline void +void pmap_clear_write(vm_page_t m) { pv_entry_t pv; ==== //depot/projects/uart/amd64/amd64/trap.c#13 (text+ko) ==== @@ -38,7 +38,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/trap.c,v 1.304 2006/06/20 12:44:21 yar Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/trap.c,v 1.307 2006/07/28 20:22:57 jhb Exp $"); /* * AMD64 Trap and System call handling @@ -145,9 +145,7 @@ SYSCTL_INT(_machdep, OID_AUTO, panic_on_nmi, CTLFLAG_RW, &panic_on_nmi, 0, "Panic on NMI"); -#ifdef WITNESS extern char *syscallnames[]; -#endif /* * Exception, fault, and trap interface to the FreeBSD kernel. @@ -780,7 +778,7 @@ else callp = &p->p_sysent->sv_table[code]; - narg = callp->sy_narg & SYF_ARGMASK; + narg = callp->sy_narg; /* * copyin and the ktrsyscall()/ktrsysret() code is MP-aware @@ -814,17 +812,9 @@ PTRACESTOP_SC(p, td, S_PT_SCE); - if ((callp->sy_narg & SYF_MPSAFE) == 0) { - mtx_lock(&Giant); - AUDIT_SYSCALL_ENTER(code, td); - error = (*callp->sy_call)(td, argp); - AUDIT_SYSCALL_EXIT(error, td); - mtx_unlock(&Giant); - } else { - AUDIT_SYSCALL_ENTER(code, td); - error = (*callp->sy_call)(td, argp); - AUDIT_SYSCALL_EXIT(error, td); - } + AUDIT_SYSCALL_ENTER(code, td); + error = (*callp->sy_call)(td, argp); + AUDIT_SYSCALL_EXIT(error, td); } switch (error) { @@ -874,6 +864,19 @@ } /* + * Check for misbehavior. + */ + WITNESS_WARN(WARN_PANIC, NULL, "System call %s returning", + (code >= 0 && code < SYS_MAXSYSCALL) ? syscallnames[code] : "???"); + KASSERT(td->td_critnest == 0, + ("System call %s returning in a critical section", + (code >= 0 && code < SYS_MAXSYSCALL) ? syscallnames[code] : "???")); + KASSERT(td->td_locks == 0, + ("System call %s returning with %d locks held", + (code >= 0 && code < SYS_MAXSYSCALL) ? syscallnames[code] : "???", + td->td_locks)); + + /* * Handle reschedule and other end-of-syscall issues */ userret(td, &frame); @@ -894,9 +897,4 @@ STOPEVENT(p, S_SCX, code); PTRACESTOP_SC(p, td, S_PT_SCX); - - WITNESS_WARN(WARN_PANIC, NULL, "System call %s returning", - (code >= 0 && code < SYS_MAXSYSCALL) ? syscallnames[code] : "???"); - mtx_assert(&sched_lock, MA_NOTOWNED); - mtx_assert(&Giant, MA_NOTOWNED); } ==== //depot/projects/uart/amd64/amd64/vm_machdep.c#12 (text+ko) ==== @@ -41,7 +41,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/vm_machdep.c,v 1.250 2005/10/24 20:53:51 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/vm_machdep.c,v 1.251 2006/07/24 12:24:56 davidxu Exp $"); #include "opt_isa.h" #include "opt_cpu.h" @@ -328,7 +328,6 @@ td->td_frame->tf_rsp = ((register_t)stack->ss_sp + stack->ss_size) & ~0x0f; td->td_frame->tf_rsp -= 8; - td->td_frame->tf_rbp = 0; td->td_frame->tf_rip = (register_t)entry; /* ==== //depot/projects/uart/amd64/conf/GENERIC#23 (text+ko) ==== @@ -16,7 +16,7 @@ # If you are in doubt as to the purpose or necessity of a line, check first # in NOTES. # -# $FreeBSD: src/sys/amd64/conf/GENERIC,v 1.463 2006/07/05 02:32:55 davidxu Exp $ +# $FreeBSD: src/sys/amd64/conf/GENERIC,v 1.464 2006/07/09 16:39:21 mjacob Exp $ cpu HAMMER ident GENERIC @@ -251,6 +251,7 @@ device md # Memory "disks" device gif # IPv6 and IPv4 tunneling device faith # IPv6-to-IPv4 relaying (translation) +device firmware # firmware assist module # The `bpf' device enables the Berkeley Packet Filter. # Be aware of the administrative consequences of enabling this! ==== //depot/projects/uart/amd64/ia32/ia32_syscall.c#9 (text+ko) ==== @@ -36,7 +36,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/ia32/ia32_syscall.c,v 1.11 2006/02/08 08:09:15 phk Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/ia32/ia32_syscall.c,v 1.16 2006/07/28 20:22:57 jhb Exp $"); /* * 386 Trap and System call handling @@ -56,6 +56,7 @@ #include #include #include +#include #include #include #include @@ -153,7 +154,7 @@ else callp = &p->p_sysent->sv_table[code]; - narg = callp->sy_narg & SYF_ARGMASK; + narg = callp->sy_narg; /* * copyin and the ktrsyscall()/ktrsysret() code is MP-aware @@ -171,12 +172,8 @@ if (KTRPOINT(td, KTR_SYSCALL)) ktrsyscall(code, narg, args64); #endif - /* - * Try to run the syscall without Giant if the syscall - * is MP safe. - */ - if ((callp->sy_narg & SYF_MPSAFE) == 0) - mtx_lock(&Giant); + CTR4(KTR_SYSC, "syscall enter thread %p pid %d proc %s code %d", td, + td->td_proc->p_pid, td->td_proc->p_comm, code); if (error == 0) { td->td_retval[0] = 0; @@ -184,6 +181,8 @@ STOPEVENT(p, S_SCE, narg); + PTRACESTOP_SC(p, td, S_PT_SCE); + AUDIT_SYSCALL_ENTER(code, td); error = (*callp->sy_call)(td, args64); AUDIT_SYSCALL_EXIT(error, td); @@ -220,12 +219,6 @@ } /* - * Release Giant if we previously set it. - */ - if ((callp->sy_narg & SYF_MPSAFE) == 0) - mtx_unlock(&Giant); - - /* * Traced syscall. */ if (orig_tf_rflags & PSL_T) { @@ -238,10 +231,25 @@ } /* + * Check for misbehavior. + */ + WITNESS_WARN(WARN_PANIC, NULL, "System call %s returning", + (code >= 0 && code < SYS_MAXSYSCALL) ? freebsd32_syscallnames[code] : "???"); + KASSERT(td->td_critnest == 0, + ("System call %s returning in a critical section", + (code >= 0 && code < SYS_MAXSYSCALL) ? freebsd32_syscallnames[code] : "???")); + KASSERT(td->td_locks == 0, + ("System call %s returning with %d locks held", + (code >= 0 && code < SYS_MAXSYSCALL) ? freebsd32_syscallnames[code] : "???", + td->td_locks)); + + /* * Handle reschedule and other end-of-syscall issues */ userret(td, &frame); + CTR4(KTR_SYSC, "syscall exit thread %p pid %d proc %s code %d", td, + td->td_proc->p_pid, td->td_proc->p_comm, code); #ifdef KTRACE if (KTRPOINT(td, KTR_SYSRET)) ktrsysret(code, error, td->td_retval[0]); @@ -253,11 +261,8 @@ * is not the case, this code will need to be revisited. */ STOPEVENT(p, S_SCX, code); - - WITNESS_WARN(WARN_PANIC, NULL, "System call %s returning", - (code >= 0 && code < SYS_MAXSYSCALL) ? freebsd32_syscallnames[code] : "???"); - mtx_assert(&sched_lock, MA_NOTOWNED); - mtx_assert(&Giant, MA_NOTOWNED); + + PTRACESTOP_SC(p, td, S_PT_SCX); } ==== //depot/projects/uart/amd64/include/specialreg.h#6 (text+ko) ==== @@ -27,7 +27,7 @@ * SUCH DAMAGE. * * from: @(#)specialreg.h 7.1 (Berkeley) 5/9/91 - * $FreeBSD: src/sys/amd64/include/specialreg.h,v 1.33 2006/05/01 22:07:00 jhb Exp $ + * $FreeBSD: src/sys/amd64/include/specialreg.h,v 1.35 2006/07/13 16:09:40 jkim Exp $ */ #ifndef _MACHINE_SPECIALREG_H_ @@ -109,16 +109,18 @@ #define CPUID_SS 0x08000000 #define CPUID_HTT 0x10000000 #define CPUID_TM 0x20000000 -#define CPUID_B30 0x40000000 +#define CPUID_IA64 0x40000000 #define CPUID_PBE 0x80000000 #define CPUID2_SSE3 0x00000001 #define CPUID2_MON 0x00000008 #define CPUID2_DS_CPL 0x00000010 +#define CPUID2_VMX 0x00000020 #define CPUID2_EST 0x00000080 #define CPUID2_TM2 0x00000100 #define CPUID2_CNTXID 0x00000400 #define CPUID2_CX16 0x00002000 +#define CPUID2_XTPR 0x00004000 /* * Important bits in the AMD extended cpuid flags @@ -135,6 +137,8 @@ #define AMDID2_LAHF 0x00000001 #define AMDID2_CMP 0x00000002 +#define AMDID2_SVM 0x00000004 +#define AMDID2_EXT_APIC 0x00000008 #define AMDID2_CR8 0x00000010 /* @@ -188,6 +192,7 @@ #define MSR_THERM_CONTROL 0x19a #define MSR_THERM_INTERRUPT 0x19b #define MSR_THERM_STATUS 0x19c +#define MSR_IA32_MISC_ENABLE 0x1a0 #define MSR_DEBUGCTLMSR 0x1d9 #define MSR_LASTBRANCHFROMIP 0x1db #define MSR_LASTBRANCHTOIP 0x1dc @@ -356,7 +361,7 @@ #define AMD_WT_ALLOC_PRE 0x20000 /* programmable range enable */ #define AMD_WT_ALLOC_FRE 0x10000 /* fixed (A0000-FFFFF) range enable */ -/* X86-64 MSR's */ +/* AMD64 MSR's */ #define MSR_EFER 0xc0000080 /* extended features */ #define MSR_STAR 0xc0000081 /* legacy mode SYSCALL target/cs/ss */ #define MSR_LSTAR 0xc0000082 /* long mode SYSCALL target rip */ ==== //depot/projects/uart/amd64/linux32/linux32_proto.h#9 (text+ko) ==== @@ -2,8 +2,8 @@ * System call prototypes. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/amd64/linux32/linux32_proto.h,v 1.17 2006/07/06 21:43:14 jhb Exp $ - * created from FreeBSD: src/sys/amd64/linux32/syscalls.master,v 1.15 2006/07/06 21:42:35 jhb Exp + * $FreeBSD: src/sys/amd64/linux32/linux32_proto.h,v 1.19 2006/07/28 19:08:35 jhb Exp $ + * created from FreeBSD: src/sys/amd64/linux32/syscalls.master,v 1.18 2006/07/28 19:05:26 jhb Exp */ #ifndef _LINUX_SYSPROTO_H_ >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sat Jul 29 09:33:42 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 35EC916A4E0; Sat, 29 Jul 2006 09:33:42 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id EDE0A16A4DD for ; Sat, 29 Jul 2006 09:33:41 +0000 (UTC) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 9BE5943D49 for ; Sat, 29 Jul 2006 09:33:41 +0000 (GMT) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k6T9Xf7a073751 for ; Sat, 29 Jul 2006 09:33:41 GMT (envelope-from rdivacky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k6T9XfVf073748 for perforce@freebsd.org; Sat, 29 Jul 2006 09:33:41 GMT (envelope-from rdivacky@FreeBSD.org) Date: Sat, 29 Jul 2006 09:33:41 GMT Message-Id: <200607290933.k6T9XfVf073748@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rdivacky@FreeBSD.org using -f From: Roman Divacky To: Perforce Change Reviews Cc: Subject: PERFORCE change 102710 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 29 Jul 2006 09:33:42 -0000 http://perforce.freebsd.org/chv.cgi?CH=102710 Change 102710 by rdivacky@rdivacky_witten on 2006/07/29 09:32:54 Fix the handling of td in linux_proc_init(). td points to parent proc/thread. This fixes panic with realplay. Also, dont leak emul_shared in a case of linux -> fbsd exec. Affected files ... .. //depot/projects/soc2006/rdivacky_linuxolator/compat/linux/linux_misc.c#6 edit .. //depot/projects/soc2006/rdivacky_linuxolator/i386/linux/linux_machdep.c#26 edit Differences ... ==== //depot/projects/soc2006/rdivacky_linuxolator/compat/linux/linux_misc.c#6 (text+ko) ==== @@ -1384,7 +1384,6 @@ if (pp->p_sysent == &elf_linux_sysvec) { em = em_find(pp->p_pid, EMUL_LOCKED); if (em == NULL) { - printf("this happens!\n"); #ifdef DEBUG printf(LMSG("emuldata not found.\n")); #endif ==== //depot/projects/soc2006/rdivacky_linuxolator/i386/linux/linux_machdep.c#26 (text+ko) ==== @@ -74,6 +74,8 @@ void linux_proc_exec(void *, struct proc *, struct image_params *); struct linux_emuldata *em_find(pid_t pid, int locked); +extern struct sysentvec elf32_freebsd_sysvec; /* defined in i386/i386/elf_machdep.c */ + struct l_descriptor { l_uint entry_number; l_ulong base_addr; @@ -1157,21 +1159,23 @@ em->child_clear_tid = NULL; em->child_set_tid = NULL; - /* allocate the shared struct only in non-exec cases */ + /* allocate the shared struct only in clone()/fork cases + * in the case of clone() td = calling proc and child = pid of + * the newly created proc + */ if (child != 0) { em->shared = NULL; if (flags & CLONE_VM) { /* lookup the parent */ - p_em = em_find(td->td_proc->p_pptr->p_pid, EMUL_LOCKED); + p_em = em_find(td->td_proc->p_pid, EMUL_LOCKED); if (p_em == NULL) { #ifdef DEBUG - printf(LMSG("parent emuldata not found for CLONE_VM.\n")); #endif + printf(LMSG("parent emuldata not found for CLONE_VM.\n")); + panic("impossible to continue\n"); } else { - em->shared = p_em->shared; + em->shared = p_em->shared; em->shared->refs++; -#ifdef DEBUG -#endif } } else { struct linux_emuldata_shared *s; @@ -1179,7 +1183,7 @@ MALLOC(s, struct linux_emuldata_shared *, sizeof *s, M_LINUX, M_WAITOK | M_ZERO); em->shared = s; s->refs = 1; - s->group_pid = td->td_proc->p_pid; + s->group_pid = child; } } @@ -1252,7 +1256,6 @@ FREE(em, M_LINUX); } -extern struct sysentvec elf32_freebsd_sysvec; /* defined in i386/i386/elf_machdep.c */ /* This is used in a case of transition from FreeBSD binary execing to linux binary * in this case we create linux emuldata proc entry with the pid of the currently running * process. @@ -1275,6 +1278,10 @@ #endif return; } + + em->shared->refs--; + if (em->shared->refs == 0) + FREE(em->shared, M_LINUX); EMUL_RUNLOCK(&emul_lock); /* XXX: there is a race but I think we can ommit that From owner-p4-projects@FreeBSD.ORG Sat Jul 29 11:16:22 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 65D2C16A4E0; Sat, 29 Jul 2006 11:16:22 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 2CE9116A4DA for ; Sat, 29 Jul 2006 11:16:22 +0000 (UTC) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id EEA4F43D45 for ; Sat, 29 Jul 2006 11:16:21 +0000 (GMT) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k6TBGL1D082496 for ; Sat, 29 Jul 2006 11:16:21 GMT (envelope-from rdivacky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k6TBGLtv082493 for perforce@freebsd.org; Sat, 29 Jul 2006 11:16:21 GMT (envelope-from rdivacky@FreeBSD.org) Date: Sat, 29 Jul 2006 11:16:21 GMT Message-Id: <200607291116.k6TBGLtv082493@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rdivacky@FreeBSD.org using -f From: Roman Divacky To: Perforce Change Reviews Cc: Subject: PERFORCE change 102717 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 29 Jul 2006 11:16:22 -0000 http://perforce.freebsd.org/chv.cgi?CH=102717 Change 102717 by rdivacky@rdivacky_witten on 2006/07/29 11:15:59 Add exit_group() syscall. Affected files ... .. //depot/projects/soc2006/rdivacky_linuxolator/i386/linux/syscalls.master#18 edit Differences ... ==== //depot/projects/soc2006/rdivacky_linuxolator/i386/linux/syscalls.master#18 (text+ko) ==== @@ -419,8 +419,7 @@ 249 AUE_NULL UNIMPL linux_io_cancel 250 AUE_NULL MSTD { int linux_fadvise64(void); } 251 AUE_NULL UNIMPL -252 AUE_EXIT MNOPROTO { void sys_exit(int rval); } exit_group \ - sys_exit_args void +252 AUE_EXIT MSTD { int linux_exit_group(int error_code); } 253 AUE_NULL MSTD { int linux_lookup_dcookie(void); } 254 AUE_NULL MSTD { int linux_epoll_create(void); } 255 AUE_NULL MSTD { int linux_epoll_ctl(void); } From owner-p4-projects@FreeBSD.ORG Sat Jul 29 11:17:24 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C2F9F16A4E7; Sat, 29 Jul 2006 11:17:24 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 9CF2C16A4E5 for ; Sat, 29 Jul 2006 11:17:24 +0000 (UTC) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 044E843D60 for ; Sat, 29 Jul 2006 11:17:23 +0000 (GMT) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k6TBHNLm082562 for ; Sat, 29 Jul 2006 11:17:23 GMT (envelope-from rdivacky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k6TBHNhi082559 for perforce@freebsd.org; Sat, 29 Jul 2006 11:17:23 GMT (envelope-from rdivacky@FreeBSD.org) Date: Sat, 29 Jul 2006 11:17:23 GMT Message-Id: <200607291117.k6TBHNhi082559@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rdivacky@FreeBSD.org using -f From: Roman Divacky To: Perforce Change Reviews Cc: Subject: PERFORCE change 102718 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 29 Jul 2006 11:17:25 -0000 http://perforce.freebsd.org/chv.cgi?CH=102718 Change 102718 by rdivacky@rdivacky_witten on 2006/07/29 11:16:33 Regen after syscalls.master update. Affected files ... .. //depot/projects/soc2006/rdivacky_linuxolator/i386/linux/linux_proto.h#18 edit .. //depot/projects/soc2006/rdivacky_linuxolator/i386/linux/linux_syscall.h#18 edit .. //depot/projects/soc2006/rdivacky_linuxolator/i386/linux/linux_sysent.c#18 edit Differences ... ==== //depot/projects/soc2006/rdivacky_linuxolator/i386/linux/linux_proto.h#18 (text+ko) ==== @@ -724,6 +724,9 @@ struct linux_fadvise64_args { register_t dummy; }; +struct linux_exit_group_args { + char error_code_l_[PADL_(int)]; int error_code; char error_code_r_[PADR_(int)]; +}; struct linux_lookup_dcookie_args { register_t dummy; }; @@ -1093,6 +1096,7 @@ int linux_set_thread_area(struct thread *, struct linux_set_thread_area_args *); int linux_get_thread_area(struct thread *, struct linux_get_thread_area_args *); int linux_fadvise64(struct thread *, struct linux_fadvise64_args *); +int linux_exit_group(struct thread *, struct linux_exit_group_args *); int linux_lookup_dcookie(struct thread *, struct linux_lookup_dcookie_args *); int linux_epoll_create(struct thread *, struct linux_epoll_create_args *); int linux_epoll_ctl(struct thread *, struct linux_epoll_ctl_args *); ==== //depot/projects/soc2006/rdivacky_linuxolator/i386/linux/linux_syscall.h#18 (text+ko) ==== @@ -231,7 +231,7 @@ #define LINUX_SYS_linux_set_thread_area 243 #define LINUX_SYS_linux_get_thread_area 244 #define LINUX_SYS_linux_fadvise64 250 -#define LINUX_SYS_exit_group 252 +#define LINUX_SYS_linux_exit_group 252 #define LINUX_SYS_linux_lookup_dcookie 253 #define LINUX_SYS_linux_epoll_create 254 #define LINUX_SYS_linux_epoll_ctl 255 ==== //depot/projects/soc2006/rdivacky_linuxolator/i386/linux/linux_sysent.c#18 (text+ko) ==== @@ -271,7 +271,7 @@ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 249 = linux_io_cancel */ { SYF_MPSAFE | 0, (sy_call_t *)linux_fadvise64, AUE_NULL }, /* 250 = linux_fadvise64 */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 251 = */ - { SYF_MPSAFE | AS(sys_exit_args), (sy_call_t *)sys_exit, AUE_EXIT }, /* 252 = exit_group */ + { SYF_MPSAFE | AS(linux_exit_group_args), (sy_call_t *)linux_exit_group, AUE_EXIT }, /* 252 = linux_exit_group */ { SYF_MPSAFE | 0, (sy_call_t *)linux_lookup_dcookie, AUE_NULL }, /* 253 = linux_lookup_dcookie */ { SYF_MPSAFE | 0, (sy_call_t *)linux_epoll_create, AUE_NULL }, /* 254 = linux_epoll_create */ { SYF_MPSAFE | 0, (sy_call_t *)linux_epoll_ctl, AUE_NULL }, /* 255 = linux_epoll_ctl */ From owner-p4-projects@FreeBSD.ORG Sat Jul 29 13:15:56 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3FC3C16A4E1; Sat, 29 Jul 2006 13:15:56 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 1830C16A4DF for ; Sat, 29 Jul 2006 13:15:56 +0000 (UTC) (envelope-from gabor@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id C83D943D53 for ; Sat, 29 Jul 2006 13:15:55 +0000 (GMT) (envelope-from gabor@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k6TDFtDP098158 for ; Sat, 29 Jul 2006 13:15:55 GMT (envelope-from gabor@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k6TDFtvo098155 for perforce@freebsd.org; Sat, 29 Jul 2006 13:15:55 GMT (envelope-from gabor@FreeBSD.org) Date: Sat, 29 Jul 2006 13:15:55 GMT Message-Id: <200607291315.k6TDFtvo098155@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to gabor@FreeBSD.org using -f From: Gabor Kovesdan To: Perforce Change Reviews Cc: Subject: PERFORCE change 102720 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 29 Jul 2006 13:15:56 -0000 http://perforce.freebsd.org/chv.cgi?CH=102720 Change 102720 by gabor@gabor_spitfire on 2006/07/29 13:15:39 ${SED}-ify make :S and :C substitutions. Affected files ... .. //depot/projects/soc2006/gabor_ports/Tools/scripts/do-fetch.sh#10 edit Differences ... ==== //depot/projects/soc2006/gabor_ports/Tools/scripts/do-fetch.sh#10 (text+ko) ==== @@ -11,7 +11,7 @@ ${ECHO_MSG} "used in group definitions. Please fix your MASTER_SITES." exit 1 fi - _MASTER_SITES_${_group}+= ${_S:C@^(.*/):[^/:]+$@\1@} + _MASTER_SITES_${_group}+= `${ECHO_CMD} ${_S} | ${SED} "s/@^(.*/):[^/:]+$@\1@"` done else _MASTER_SITES_DEFAULT+= ${_S:C@^(.*/):[^/:]+$@\1@} @@ -28,12 +28,12 @@ exit 1 fi if [ -n "${_MASTER_SITES_${_group}}" ] ; then - _MASTER_SITE_SUBDIR_${_group}+= ${_S:C@^(.*)/:[^/:]+$@\1@} + _MASTER_SITE_SUBDIR_${_group}+= `${ECHO_CMD} ${_S} | ${SED} "s@^(.*)/:[^/:]+$@\1@"` fi done else if [ -n "${_MASTER_SITES_DEFAULT}" ] ; then - _MASTER_SITE_SUBDIR_DEFAULT+= ${_S:C@^(.*)/:[^/:]+$@\1@} + _MASTER_SITE_SUBDIR_DEFAULT+= `${ECHO_CMD} ${_S} | ${SED} "@^(.*)/:[^/:]+$@\1@"` fi fi done @@ -42,9 +42,9 @@ if [ -n "${_S_TEMP}" ] ; then for _group in `${ECHO_CMD} ${_S_TEMP} | ${SED} "s/,/ /g"`; do if [ -z "$${_MASTER_SITE_SUBDIR_${_group}}" ] ; then - MASTER_SITES_TMP= ${_MASTER_SITES_${_group}:S^%SUBDIR%/^^} + MASTER_SITES_TMP= `${ECHO_CMD} $${_MASTER_SITES_${_group}} | ${SED} "s^%SUBDIR%/^^"` else - _S_TEMP_TEMP= ${_MASTER_SITES_${_group}:M*%SUBDIR%/*} + _S_TEMP_TEMP= $${_MASTER_SITES_${_group}:M*%SUBDIR%/*} if [ -z "${_S_TEMP_TEMP}" ] ; then MASTER_SITES_TMP= $${_MASTER_SITES_${_group}} else @@ -55,7 +55,7 @@ MASTER_SITES_TMP+= ${site} else for dir in $${_MASTER_SITE_SUBDIR_${_group}}; do - MASTER_SITES_TMP+= ${site:S^%SUBDIR%^\${dir}^} + MASTER_SITES_TMP+= `${ECHO_CMD} ${site} | ${SED} "s^%SUBDIR%^\${dir}^"` done fi done @@ -77,22 +77,22 @@ MASTER_SITES_TMP+= ${site} else for dir in ${_MASTER_SITE_SUBDIR_DEFAULT}; do - MASTER_SITES_TMP+= ${site:S^%SUBDIR%^\${dir}^} + MASTER_SITES_TMP+= `${ECHO_CMD} ${site} | ${SED} "s^%SUBDIR%^\${dir}^" done fi done fi else - MASTER_SITES_TMP= ${_MASTER_SITES_DEFAULT:S^%SUBDIR%/^^} + MASTER_SITES_TMP= `${ECHO_CMD} ${_MASTER_SITES_DEFAULT} | ${SED} "s^%SUBDIR%/^^"` fi -_MASTER_SITES_DEFAULT:= ${MASTER_SITES_TMP} +_MASTER_SITES_DEFAULT:= ${MASTER_SITES_TMP} MASTER_SITES_TMP= # The primary backup site. if [ -z "${MASTER_SITE_BACKUP}" ] ; then MASTER_SITE_BACKUP= ftp://ftp.FreeBSD.org/pub/FreeBSD/ports/distfiles/${DIST_SUBDIR}/ fi -MASTER_SITE_BACKUP:= ${MASTER_SITE_BACKUP:S^\${DIST_SUBDIR}/^^} +MASTER_SITE_BACKUP:= `${ECHO_CMD} ${MASTER_SITE_BACKUP} | ${SED} "s^\${DIST_SUBDIR}/^^"` # If the user has MASTER_SITE_FREEBSD set, go to the FreeBSD repository # for everything, but don't search it twice by appending it to the end. @@ -134,11 +134,11 @@ _G_TEMP_TEMP= ${_G_TEMP:M/${_group}/} if [ -z "${_G_TEMP_TEMP}" ; then _G_TEMP+= ${_group} - _MASTER_SITES_ALL+= ${_MASTER_SITES_${_group}} + _MASTER_SITES_ALL+= $${_MASTER_SITES_${_group}} fi fi done - _DISTFILES+= ${_D:C/:[^:]+$//} + _DISTFILES+= `${ECHO_CMD} ${_D} | ${SED} "s/:[^:]+$//"` else _DISTFILES+= ${_D} fi @@ -150,7 +150,7 @@ # # Sort the master site list according to the patterns in MASTER_SORT # -MASTER_SORT_REGEX+= ${MASTER_SORT:S|.|\\.|g:S|^|://[^/]*|:S|$|/|} +MASTER_SORT_REGEX+= `${ECHO_CMD} ${MASTER_SORT} | ${SED} -e "s|.|\\.|g" -e "s|^|://[^/]*|" -e "s|$|/|"` MASTER_SORT_AWK= BEGIN { RS = " "; ORS = " "; IGNORECASE = 1 ; gl = "${MASTER_SORT_REGEX:S|\\|\\\\|g}"; } .for srt in ${MASTER_SORT_REGEX} MASTER_SORT_AWK+= /${srt:S|/|\\/|g}/ { good["${srt:S|\\|\\\\|g}"] = good["${srt:S|\\|\\\\|g}"] " " $$0 ; next; } @@ -254,10 +254,10 @@ ${ECHO_MSG} "used in group definitions. Please fix your PATCH_SITES" exit 1 fi - _PATCH_SITES_${_group}+= ${_S:C@^(.*/):[^/:]+$@\1@} + _PATCH_SITES_${_group}+= `${ECHO_CMD} ${_S} | ${SED} "s@^(.*/):[^/:]+$@\1@"` done else - _PATCH_SITES_DEFAULT+= ${_S:C@^(.*/):[^/:]+$@\1@} + _PATCH_SITES_DEFAULT+= `${ECHO_CMD} ${_S} | ${SED} "s@^(.*/):[^/:]+$@\1@"` fi done for _S in ${PATCH_SITE_SUBDIR}; do @@ -271,12 +271,12 @@ exit 1 fi if [ -n "${_PATCH_SITES_${_group}}" ] ; then - _PATCH_SITE_SUBDIR_${_group}+= ${_S:C@^(.*)/:[^/:]+$@\1@} + _PATCH_SITE_SUBDIR_${_group}+= `${ECHO_CMD} ${_S} | ${SED} "s@^(.*)/:[^/:]+$@\1@"` fi done else if [ -n "${_PATCH_SITES_DEFAULT}" ] ; then - _PATCH_SITE_SUBDIR_DEFAULT+= ${_S:C@^(.*)/:[^/:]+$@\1@} + _PATCH_SITE_SUBDIR_DEFAULT+= `${ECHO_CMD} ${_S} | ${SED} "s@^(.*)/:[^/:]+$@\1@"` fi fi done @@ -296,7 +296,7 @@ PATCH_SITES_TMP+= ${site} else for dir in $${_PATCH_SITE_SUBDIR_${_group}}; do - PATCH_SITES_TMP+= ${site:S^%SUBDIR%^\${dir}^} + PATCH_SITES_TMP+= `${ECHO_CMD} ${site} | ${SED} "s^%SUBDIR%^\${dir}^"` dine fi done @@ -318,13 +318,13 @@ PATCH_SITES_TMP+= ${site} else for dir in ${_PATCH_SITE_SUBDIR_DEFAULT}; do - PATCH_SITES_TMP+= ${site:S^%SUBDIR%^\${dir}^} + PATCH_SITES_TMP+= `${ECHO_CMD} ${site} | ${SED} "s^%SUBDIR%^\${dir}^"` done fi done fi else - PATCH_SITES_TMP= ${_PATCH_SITES_DEFAULT:S^%SUBDIR%/^^} + PATCH_SITES_TMP= `${ECHO_CMD} ${_PATCH_SITES_DEFAULT} | ${SED} "s^%SUBDIR%/^^"` fi _PATCH_SITES_DEFAULT:= ${PATCH_SITES_TMP} PATCH_SITES_TMP= @@ -333,7 +333,7 @@ for _P in ${PATCHFILES}; do _P_TEMP= ${_P:S/^${_P:C/:[^:]+$//}//} if [ -n "${_P_TEMP}" ] ; then - for _group in ${_P_TEMP:S/^://:S/,/ /g}; do + for _group in `${ECHO_CMD} ${_P_TEMP} | ${SED} -e "s/^://" -e "s/,/ /g"`; do if [ -z "$${_PATCH_SITES_${_group}}" ] ; then _G_TEMP_TEMP= ${_G_TEMP:M/${_group}/} if [ -z "${_G_TEMP_TEMP}" ] ; then @@ -342,7 +342,7 @@ fi fi done - _PATCHFILES+= ${_P:C/:[^:]+$//} + _PATCHFILES+= `${ECHO_CMD} ${_P} | ${SED} "s/:[^:]+$//"` else _PATCHFILES+= ${_P} fi From owner-p4-projects@FreeBSD.ORG Sat Jul 29 13:34:19 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 86A9416A4E1; Sat, 29 Jul 2006 13:34:19 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 264BB16A4DD for ; Sat, 29 Jul 2006 13:34:19 +0000 (UTC) (envelope-from gabor@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id C047843D45 for ; Sat, 29 Jul 2006 13:34:18 +0000 (GMT) (envelope-from gabor@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k6TDYIT9098959 for ; Sat, 29 Jul 2006 13:34:18 GMT (envelope-from gabor@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k6TDYIsa098956 for perforce@freebsd.org; Sat, 29 Jul 2006 13:34:18 GMT (envelope-from gabor@FreeBSD.org) Date: Sat, 29 Jul 2006 13:34:18 GMT Message-Id: <200607291334.k6TDYIsa098956@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to gabor@FreeBSD.org using -f From: Gabor Kovesdan To: Perforce Change Reviews Cc: Subject: PERFORCE change 102721 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 29 Jul 2006 13:34:19 -0000 http://perforce.freebsd.org/chv.cgi?CH=102721 Change 102721 by gabor@gabor_spitfire on 2006/07/29 13:33:30 Whitespace cleanup. One tab in each variable assignation. Affected files ... .. //depot/projects/soc2006/gabor_ports/Tools/scripts/do-fetch.sh#11 edit Differences ... ==== //depot/projects/soc2006/gabor_ports/Tools/scripts/do-fetch.sh#11 (text+ko) ==== @@ -11,7 +11,7 @@ ${ECHO_MSG} "used in group definitions. Please fix your MASTER_SITES." exit 1 fi - _MASTER_SITES_${_group}+= `${ECHO_CMD} ${_S} | ${SED} "s/@^(.*/):[^/:]+$@\1@"` + _MASTER_SITES_${_group}+= `${ECHO_CMD} ${_S} | ${SED} "s/@^(.*/):[^/:]+$@\1@"` done else _MASTER_SITES_DEFAULT+= ${_S:C@^(.*/):[^/:]+$@\1@} @@ -21,19 +21,19 @@ _S_TEMP= ${_S:S/^${_S:C@/:[^/:]+$@/@}//:S/^://} if [ -n "${_S_TEMP}" ] ; then for _group in `${ECHO_CMD} ${_S_TEMP} | ${SED} "s/,/ /g"`; do - _G_TEMP= ${_group} + _G_TEMP= ${_group} if ${_G_TEMP} == all || ${_G_TEMP} == ALL || ${_G_TEMP} == default; then ${ECHO_MSG} "Makefile error: the words all, ALL and default are reserved and cannot be" ${ECHO_MSG} "used in group definitions. Please fix your MASTER_SITES." exit 1 fi if [ -n "${_MASTER_SITES_${_group}}" ] ; then - _MASTER_SITE_SUBDIR_${_group}+= `${ECHO_CMD} ${_S} | ${SED} "s@^(.*)/:[^/:]+$@\1@"` + _MASTER_SITE_SUBDIR_${_group}+= `${ECHO_CMD} ${_S} | ${SED} "s@^(.*)/:[^/:]+$@\1@"` fi done else if [ -n "${_MASTER_SITES_DEFAULT}" ] ; then - _MASTER_SITE_SUBDIR_DEFAULT+= `${ECHO_CMD} ${_S} | ${SED} "@^(.*)/:[^/:]+$@\1@"` + _MASTER_SITE_SUBDIR_DEFAULT+= `${ECHO_CMD} ${_S} | ${SED} "@^(.*)/:[^/:]+$@\1@"` fi fi done @@ -42,7 +42,7 @@ if [ -n "${_S_TEMP}" ] ; then for _group in `${ECHO_CMD} ${_S_TEMP} | ${SED} "s/,/ /g"`; do if [ -z "$${_MASTER_SITE_SUBDIR_${_group}}" ] ; then - MASTER_SITES_TMP= `${ECHO_CMD} $${_MASTER_SITES_${_group}} | ${SED} "s^%SUBDIR%/^^"` + MASTER_SITES_TMP= `${ECHO_CMD} $${_MASTER_SITES_${_group}} | ${SED} "s^%SUBDIR%/^^"` else _S_TEMP_TEMP= $${_MASTER_SITES_${_group}:M*%SUBDIR%/*} if [ -z "${_S_TEMP_TEMP}" ] ; then @@ -55,7 +55,7 @@ MASTER_SITES_TMP+= ${site} else for dir in $${_MASTER_SITE_SUBDIR_${_group}}; do - MASTER_SITES_TMP+= `${ECHO_CMD} ${site} | ${SED} "s^%SUBDIR%^\${dir}^"` + MASTER_SITES_TMP+= `${ECHO_CMD} ${site} | ${SED} "s^%SUBDIR%^\${dir}^"` done fi done @@ -77,27 +77,27 @@ MASTER_SITES_TMP+= ${site} else for dir in ${_MASTER_SITE_SUBDIR_DEFAULT}; do - MASTER_SITES_TMP+= `${ECHO_CMD} ${site} | ${SED} "s^%SUBDIR%^\${dir}^" + MASTER_SITES_TMP+= `${ECHO_CMD} ${site} | ${SED} "s^%SUBDIR%^\${dir}^" done fi done fi else - MASTER_SITES_TMP= `${ECHO_CMD} ${_MASTER_SITES_DEFAULT} | ${SED} "s^%SUBDIR%/^^"` + MASTER_SITES_TMP= `${ECHO_CMD} ${_MASTER_SITES_DEFAULT} | ${SED} "s^%SUBDIR%/^^"` fi -_MASTER_SITES_DEFAULT:= ${MASTER_SITES_TMP} +_MASTER_SITES_DEFAULT:= ${MASTER_SITES_TMP} MASTER_SITES_TMP= # The primary backup site. if [ -z "${MASTER_SITE_BACKUP}" ] ; then MASTER_SITE_BACKUP= ftp://ftp.FreeBSD.org/pub/FreeBSD/ports/distfiles/${DIST_SUBDIR}/ fi -MASTER_SITE_BACKUP:= `${ECHO_CMD} ${MASTER_SITE_BACKUP} | ${SED} "s^\${DIST_SUBDIR}/^^"` +MASTER_SITE_BACKUP:= `${ECHO_CMD} ${MASTER_SITE_BACKUP} | ${SED} "s^\${DIST_SUBDIR}/^^"` # If the user has MASTER_SITE_FREEBSD set, go to the FreeBSD repository # for everything, but don't search it twice by appending it to the end. if [ -n "${MASTER_SITE_FREEBSD}" ] ; then - _MASTER_SITE_OVERRIDE= ${MASTER_SITE_BACKUP} + _MASTER_SITE_OVERRIDE= ${MASTER_SITE_BACKUP} _MASTER_SITE_BACKUP= else _MASTER_SITE_OVERRIDE= ${MASTER_SITE_OVERRIDE} @@ -125,7 +125,7 @@ DISTFILES= ${DISTNAME}${EXTRACT_SUFX} fi _MASTER_SITES_ALL= ${_MASTER_SITES_DEFAULT} -_G_TEMP= DEFAULT +_G_TEMP= DEFAULT for _D in ${DISTFILES}; do _D_TEMP= ${_D:S/^${_D:C/:[^:]+$//}//} if [ -n "${_D_TEMP}" ] ; then @@ -138,7 +138,7 @@ fi fi done - _DISTFILES+= `${ECHO_CMD} ${_D} | ${SED} "s/:[^:]+$//"` + _DISTFILES+= `${ECHO_CMD} ${_D} | ${SED} "s/:[^:]+$//"` else _DISTFILES+= ${_D} fi @@ -150,17 +150,17 @@ # # Sort the master site list according to the patterns in MASTER_SORT # -MASTER_SORT_REGEX+= `${ECHO_CMD} ${MASTER_SORT} | ${SED} -e "s|.|\\.|g" -e "s|^|://[^/]*|" -e "s|$|/|"` -MASTER_SORT_AWK= BEGIN { RS = " "; ORS = " "; IGNORECASE = 1 ; gl = "${MASTER_SORT_REGEX:S|\\|\\\\|g}"; } +MASTER_SORT_REGEX+= `${ECHO_CMD} ${MASTER_SORT} | ${SED} -e "s|.|\\.|g" -e "s|^|://[^/]*|" -e "s|$|/|"` +MASTER_SORT_AWK= BEGIN { RS = " "; ORS = " "; IGNORECASE = 1 ; gl = "${MASTER_SORT_REGEX:S|\\|\\\\|g}"; } .for srt in ${MASTER_SORT_REGEX} -MASTER_SORT_AWK+= /${srt:S|/|\\/|g}/ { good["${srt:S|\\|\\\\|g}"] = good["${srt:S|\\|\\\\|g}"] " " $$0 ; next; } +MASTER_SORT_AWK+= /${srt:S|/|\\/|g}/ { good["${srt:S|\\|\\\\|g}"] = good["${srt:S|\\|\\\\|g}"] " " $$0 ; next; } .endfor -MASTER_SORT_AWK+= { rest = rest " " $$0; } END { n=split(gl, gla); for(i=1;i<=n;i++) { print good[gla[i]]; } print rest; } +MASTER_SORT_AWK+= { rest = rest " " $$0; } END { n=split(gl, gla); for(i=1;i<=n;i++) { print good[gla[i]]; } print rest; } -SORTED_MASTER_SITES_DEFAULT_CMD= cd ${.CURDIR} && ${MAKE} ${__softMAKEFLAGS} master-sites-DEFAULT -SORTED_PATCH_SITES_DEFAULT_CMD= cd ${.CURDIR} && ${MAKE} ${__softMAKEFLAGS} patch-sites-DEFAULT -SORTED_MASTER_SITES_ALL_CMD= cd ${.CURDIR} && ${MAKE} ${__softMAKEFLAGS} master-sites-ALL -SORTED_PATCH_SITES_ALL_CMD= cd ${.CURDIR} && ${MAKE} ${__softMAKEFLAGS} patch-sites-ALL +SORTED_MASTER_SITES_DEFAULT_CMD= cd ${.CURDIR} && ${MAKE} ${__softMAKEFLAGS} master-sites-DEFAULT +SORTED_PATCH_SITES_DEFAULT_CMD= cd ${.CURDIR} && ${MAKE} ${__softMAKEFLAGS} patch-sites-DEFAULT +SORTED_MASTER_SITES_ALL_CMD= cd ${.CURDIR} && ${MAKE} ${__softMAKEFLAGS} master-sites-ALL +SORTED_PATCH_SITES_ALL_CMD= cd ${.CURDIR} && ${MAKE} ${__softMAKEFLAGS} patch-sites-ALL # Sort the master site list according to the patterns in MASTER_SORT # according to grouping rules (:something) @@ -177,19 +177,19 @@ done for _file in ${DISTFILES}; do - file=`${ECHO_CMD} $_file | ${SED} -E -e 's/:[^:]+$//'` - select=`${ECHO_CMD} ${_file#${file}} | ${SED} -e 's/^://' -e 's/,/ /g'` - force_fetch=false - filebasename=`${BASENAME} $file` + file= `${ECHO_CMD} $_file | ${SED} -E -e 's/:[^:]+$//'` + select= `${ECHO_CMD} ${_file#${file}} | ${SED} -e 's/^://' -e 's/,/ /g'` + force_fetch= false + filebasename= `${BASENAME} $file` for afile in ${FORCE_FETCH}; do afile=`${BASENAME} $afile` if [ "x$afile" = "x$filebasename" ]; then - force_fetch=true + force_fetch= true fi done if [ ! -f $file -a ! -f $filebasename -o "$force_fetch" = "true" ]; then - DIR=${DIST_SUBDIR} - pattern="${DIR:+$DIR/}`${ECHO_CMD} $file | ${SED} -e 's/\./\\\\./g'`" + DIR= ${DIST_SUBDIR} + pattern= "${DIR:+$DIR/}`${ECHO_CMD} $file | ${SED} -e 's/\./\\\\./g'`" if [ -L $file -o -L $filebasename ]; then ${ECHO_MSG} "=> ${_DISTDIR}/$file is a broken symlink." ${ECHO_MSG} "=> Perhaps a filesystem (most likely a CD) isn't mounted?" @@ -213,25 +213,25 @@ ___MASTER_SITES_TMP= for group in $select; do if [ ! -z "$${_MASTER_SITES_${group}n" ] ; then - eval ___MASTER_SITES_TMP="$${_MASTER_SITES_${group}}" - __MASTER_SITES_TMP="${__MASTER_SITES_TMP} ${___MASTER_SITES_TMP}" + eval ___MASTER_SITES_TMP= "$${_MASTER_SITES_${group}}" + __MASTER_SITES_TMP= "${__MASTER_SITES_TMP} ${___MASTER_SITES_TMP}" fi done ___MASTER_SITES_TMP= - SORTED_MASTER_SITES_CMD_TMP="${ECHO_CMD} ${_MASTER_SITE_OVERRIDE} `${ECHO_CMD} ${__MASTER_SITES_TMP} | ${AWK} '${MASTER_SORT_AWK:S|\\|\\\\|g}'` ${_MASTER_SITE_BACKUP}" + SORTED_MASTER_SITES_CMD_TMP= "${ECHO_CMD} ${_MASTER_SITE_OVERRIDE} `${ECHO_CMD} ${__MASTER_SITES_TMP} | ${AWK} '${MASTER_SORT_AWK:S|\\|\\\\|g}'` ${_MASTER_SITE_BACKUP}" else - SORTED_MASTER_SITES_CMD_TMP="${SORTED_MASTER_SITES_DEFAULT_CMD}" + SORTED_MASTER_SITES_CMD_TMP= "${SORTED_MASTER_SITES_DEFAULT_CMD}" fi for site in `eval $SORTED_MASTER_SITES_CMD_TMP ${_RANDOMIZE_SITES}`; do ${ECHO_MSG} "=> Attempting to fetch from ${site}." - DIR=${DIST_SUBDIR} - CKSIZE=`${GREP} "^SIZE (${DIR:+$DIR/}$file)" ${MD5_FILE} | ${AWK} '{print $4}'` + DIR= ${DIST_SUBDIR} + CKSIZE= `${GREP} "^SIZE (${DIR:+$DIR/}$file)" ${MD5_FILE} | ${AWK} '{print $4}'` case ${file} in */*) ${MKDIR} ${file%/*}; \ - args="-o ${file} ${site}${file}";; + args= "-o ${file} ${site}${file}";; *) - args=${site}${file};; + args= ${site}${file};; esac if ${SETENV} ${FETCH_ENV} ${FETCH_CMD} ${FETCH_BEFORE_ARGS} ${args} ${FETCH_AFTER_ARGS}; then continue 2 @@ -245,38 +245,38 @@ if [ -z "${PATCHFILES}" ] ; then for _S in ${PATCH_SITES}; do - _S_TEMP= ${_S:S/^${_S:C@/:[^/:]+$@/@}//:S/^://} + _S_TEMP= ${_S:S/^${_S:C@/:[^/:]+$@/@}//:S/^://} if [ -n "${_S_TEMP}" ; then \ for _group in `${ECHO_CMD} ${_S_TEMP} | ${SED} "s/,/ /g"`; do - _G_TEMP= ${_group} + _G_TEMP= ${_group} if ${_G_TEMP} == all || ${_G_TEMP} == ALL || ${_G_TEMP} == default; then ${ECHO_MSG} "The words all, ALL and default are reserved and cannot be" ${ECHO_MSG} "used in group definitions. Please fix your PATCH_SITES" exit 1 fi - _PATCH_SITES_${_group}+= `${ECHO_CMD} ${_S} | ${SED} "s@^(.*/):[^/:]+$@\1@"` + _PATCH_SITES_${_group}+= `${ECHO_CMD} ${_S} | ${SED} "s@^(.*/):[^/:]+$@\1@"` done else - _PATCH_SITES_DEFAULT+= `${ECHO_CMD} ${_S} | ${SED} "s@^(.*/):[^/:]+$@\1@"` + _PATCH_SITES_DEFAULT+= `${ECHO_CMD} ${_S} | ${SED} "s@^(.*/):[^/:]+$@\1@"` fi done for _S in ${PATCH_SITE_SUBDIR}; do - _S_TEMP= ${_S:S/^${_S:C@/:[^/:]+$@/@}//:S/^://} + _S_TEMP= ${_S:S/^${_S:C@/:[^/:]+$@/@}//:S/^://} if [ -n "${_S_TEMP}" ] ; then for _group in `${ECHO_CMD} ${_S_TEMP} | ${SED} "s/,/ /g"`; do - _G_TEMP= ${_group} + _G_TEMP= ${_group} if ${_G_TEMP} == all || ${_G_TEMP} == ALL || ${_G_TEMP} == default; then ${ECHO_MSG} "Makefile error: the words all, ALL and default are reserved and cannot be" ${ECHO_MSG} "used in group definitions. Please fix your PATCH_SITE_SUBDIR" exit 1 fi if [ -n "${_PATCH_SITES_${_group}}" ] ; then - _PATCH_SITE_SUBDIR_${_group}+= `${ECHO_CMD} ${_S} | ${SED} "s@^(.*)/:[^/:]+$@\1@"` + _PATCH_SITE_SUBDIR_${_group}+= `${ECHO_CMD} ${_S} | ${SED} "s@^(.*)/:[^/:]+$@\1@"` fi done else if [ -n "${_PATCH_SITES_DEFAULT}" ] ; then - _PATCH_SITE_SUBDIR_DEFAULT+= `${ECHO_CMD} ${_S} | ${SED} "s@^(.*)/:[^/:]+$@\1@"` + _PATCH_SITE_SUBDIR_DEFAULT+= `${ECHO_CMD} ${_S} | ${SED} "s@^(.*)/:[^/:]+$@\1@"` fi fi done @@ -296,7 +296,7 @@ PATCH_SITES_TMP+= ${site} else for dir in $${_PATCH_SITE_SUBDIR_${_group}}; do - PATCH_SITES_TMP+= `${ECHO_CMD} ${site} | ${SED} "s^%SUBDIR%^\${dir}^"` + PATCH_SITES_TMP+= `${ECHO_CMD} ${site} | ${SED} "s^%SUBDIR%^\${dir}^"` dine fi done @@ -315,16 +315,16 @@ for site in ${_PATCH_SITES_DEFAULT}; do _S_TEMP_TEMP= ${site:M*%SUBDIR%/*} if [ -z "${_S_TEMP_TEMP}" ] ; then - PATCH_SITES_TMP+= ${site} + PATCH_SITES_TMP+= ${site} else for dir in ${_PATCH_SITE_SUBDIR_DEFAULT}; do - PATCH_SITES_TMP+= `${ECHO_CMD} ${site} | ${SED} "s^%SUBDIR%^\${dir}^"` + PATCH_SITES_TMP+= `${ECHO_CMD} ${site} | ${SED} "s^%SUBDIR%^\${dir}^"` done fi done fi else - PATCH_SITES_TMP= `${ECHO_CMD} ${_PATCH_SITES_DEFAULT} | ${SED} "s^%SUBDIR%/^^"` + PATCH_SITES_TMP= `${ECHO_CMD} ${_PATCH_SITES_DEFAULT} | ${SED} "s^%SUBDIR%/^^"` fi _PATCH_SITES_DEFAULT:= ${PATCH_SITES_TMP} PATCH_SITES_TMP= @@ -337,14 +337,14 @@ if [ -z "$${_PATCH_SITES_${_group}}" ] ; then _G_TEMP_TEMP= ${_G_TEMP:M/${_group}/} if [ -z "${_G_TEMP_TEMP}" ] ; then - _G_TEMP+= ${_group} - _PATCH_SITES_ALL+= $${_PATCH_SITES_${_group}} + _G_TEMP+= ${_group} + _PATCH_SITES_ALL+= $${_PATCH_SITES_${_group}} fi fi done - _PATCHFILES+= `${ECHO_CMD} ${_P} | ${SED} "s/:[^:]+$//"` + _PATCHFILES+= `${ECHO_CMD} ${_P} | ${SED} "s/:[^:]+$//"` else - _PATCHFILES+= ${_P} + _PATCHFILES+= ${_P} fi done for _S in ${PATCH_SITES}; do @@ -359,14 +359,14 @@ cd ${_DISTDIR} for _file in ${PATCHFILES}; do - file=`${ECHO_CMD} $_file | ${SED} -E -e 's/:[^:]+$$//'` - select=`${ECHO_CMD} ${_file#${file}} | ${SED} -e 's/^://' -e 's/,/ /g'` - force_fetch=false - filebasename=`${BASENAME} $file` + file= `${ECHO_CMD} $_file | ${SED} -E -e 's/:[^:]+$$//'` + select= `${ECHO_CMD} ${_file#${file}} | ${SED} -e 's/^://' -e 's/,/ /g'` + force_fetch= false + filebasename= `${BASENAME} $file` for afile in ${FORCE_FETCH}; do - afile=`${BASENAME} $afile` + afile= `${BASENAME} $afile` if [ "x$afile" = "x$filebasename" ]; then - force_fetch=true + force_fetch =true fi done if [ ! -f $file -a ! -f $filebasename -o "$force_fetch" = "true" ]; then @@ -381,26 +381,26 @@ __PATCH_SITES_TMP= for group in $select; do if [ ! -z $${_PATCH_SITES_${group}} ] ; then - eval ___PATCH_SITES_TMP="$${_PATCH_SITES_${group}}" - __PATCH_SITES_TMP="${__PATCH_SITES_TMP} ${___PATCH_SITES_TMP}" + eval ___PATCH_SITES_TMP= "$${_PATCH_SITES_${group}}" + __PATCH_SITES_TMP= "${__PATCH_SITES_TMP} ${___PATCH_SITES_TMP}" fi done ___PATCH_SITES_TMP= - SORTED_PATCH_SITES_CMD_TMP="${ECHO_CMD} ${_MASTER_SITE_OVERRIDE} `${ECHO_CMD} ${__PATCH_SITES_TMP} | ${AWK} '${MASTER_SORT_AWK:S|\\|\\\\|g}'` ${_MASTER_SITE_BACKUP}" + SORTED_PATCH_SITES_CMD_TMP= "${ECHO_CMD} ${_MASTER_SITE_OVERRIDE} `${ECHO_CMD} ${__PATCH_SITES_TMP} | ${AWK} '${MASTER_SORT_AWK:S|\\|\\\\|g}'` ${_MASTER_SITE_BACKUP}" else - SORTED_PATCH_SITES_CMD_TMP="${SORTED_PATCH_SITES_DEFAULT_CMD}" + SORTED_PATCH_SITES_CMD_TMP= "${SORTED_PATCH_SITES_DEFAULT_CMD}" fi for site in `eval $SORTED_PATCH_SITES_CMD_TMP`; do ${ECHO_MSG} "=> Attempting to fetch from ${site}." - DIR=${DIST_SUBDIR} - pattern="${DIR:+$DIR/}`${ECHO_CMD} $file | ${SED} -e 's/\./\\\\./g'`" - CKSIZE=`${GREP} "^SIZE ($pattern)" ${MD5_FILE} | ${AWK} '{print $4}'` + DIR= ${DIST_SUBDIR} + pattern= "${DIR:+$DIR/}`${ECHO_CMD} $file | ${SED} -e 's/\./\\\\./g'`" + CKSIZE= `${GREP} "^SIZE ($pattern)" ${MD5_FILE} | ${AWK} '{print $4}'` case ${file} in */*) ${MKDIR} ${file%/*}; \ - args="-o ${file} ${site}${file}";; + args= "-o ${file} ${site}${file}";; *) - args=${site}${file};; + args= ${site}${file};; esac if ${SETENV} ${FETCH_ENV} ${FETCH_CMD} ${FETCH_BEFORE_ARGS} ${args} ${FETCH_AFTER_ARGS}; then continue 2 From owner-p4-projects@FreeBSD.ORG Sat Jul 29 14:11:05 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 797C316A4ED; Sat, 29 Jul 2006 14:11:05 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 511C116A4E7 for ; Sat, 29 Jul 2006 14:11:05 +0000 (UTC) (envelope-from gabor@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id B5E6743D4C for ; Sat, 29 Jul 2006 14:11:04 +0000 (GMT) (envelope-from gabor@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k6TEB4jZ002033 for ; Sat, 29 Jul 2006 14:11:04 GMT (envelope-from gabor@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k6TEB4mC002030 for perforce@freebsd.org; Sat, 29 Jul 2006 14:11:04 GMT (envelope-from gabor@FreeBSD.org) Date: Sat, 29 Jul 2006 14:11:04 GMT Message-Id: <200607291411.k6TEB4mC002030@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to gabor@FreeBSD.org using -f From: Gabor Kovesdan To: Perforce Change Reviews Cc: Subject: PERFORCE change 102722 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 29 Jul 2006 14:11:05 -0000 http://perforce.freebsd.org/chv.cgi?CH=102722 Change 102722 by gabor@gabor_spitfire on 2006/07/29 14:10:55 Use brackets {} around variables when referencing to them as suggested by sh(1). Affected files ... .. //depot/projects/soc2006/gabor_ports/Tools/scripts/do-fetch.sh#12 edit Differences ... ==== //depot/projects/soc2006/gabor_ports/Tools/scripts/do-fetch.sh#12 (text+ko) ==== @@ -177,34 +177,34 @@ done for _file in ${DISTFILES}; do - file= `${ECHO_CMD} $_file | ${SED} -E -e 's/:[^:]+$//'` + file= `${ECHO_CMD} ${_file} | ${SED} -E -e 's/:[^:]+$//'` select= `${ECHO_CMD} ${_file#${file}} | ${SED} -e 's/^://' -e 's/,/ /g'` force_fetch= false - filebasename= `${BASENAME} $file` + filebasename= `${BASENAME} ${file}` for afile in ${FORCE_FETCH}; do - afile=`${BASENAME} $afile` - if [ "x$afile" = "x$filebasename" ]; then + afile=`${BASENAME} ${afile}` + if [ "x${afile}" = "x${filebasename}" ]; then force_fetch= true fi done - if [ ! -f $file -a ! -f $filebasename -o "$force_fetch" = "true" ]; then + if [ ! -f ${file} -a ! -f ${filebasename} -o "${force_fetch}" = "true" ]; then DIR= ${DIST_SUBDIR} - pattern= "${DIR:+$DIR/}`${ECHO_CMD} $file | ${SED} -e 's/\./\\\\./g'`" - if [ -L $file -o -L $filebasename ]; then - ${ECHO_MSG} "=> ${_DISTDIR}/$file is a broken symlink." + pattern= "${DIR:+$DIR/}`${ECHO_CMD} ${file} | ${SED} -e 's/\./\\\\./g'`" + if [ -L ${file} -o -L ${filebasename} ]; then + ${ECHO_MSG} "=> ${_DISTDIR}/${file} is a broken symlink." ${ECHO_MSG} "=> Perhaps a filesystem (most likely a CD) isn't mounted?" ${ECHO_MSG} "=> Please correct this problem and try again." exit 1 fi if [ -f ${MD5_FILE} -a "x${NO_CHECKSUM}" = "x" ]; then if ! ${GREP} -q "^MD5 ($pattern)" ${MD5_FILE}; then - ${ECHO_MSG} "=> ${DIR:+$DIR/}$file is not in ${MD5_FILE}." + ${ECHO_MSG} "=> ${DIR:+$DIR/}${file} is not in ${MD5_FILE}." ${ECHO_MSG} "=> Either ${MD5_FILE} is out of date, or" - ${ECHO_MSG} "=> ${DIR:+$DIR/}$file is spelled incorrectly." + ${ECHO_MSG} "=> ${DIR:+$DIR/}${file} is spelled incorrectly." exit 1 fi fi - ${ECHO_MSG} "=> $file doesn't seem to exist in ${_DISTDIR}." + ${ECHO_MSG} "=> ${file} doesn't seem to exist in ${_DISTDIR}." if [ ! -w ${DISTDIR} ]; then ${ECHO_MSG} "=> ${DISTDIR} is not writable by you; cannot fetch." exit 1 @@ -225,7 +225,7 @@ for site in `eval $SORTED_MASTER_SITES_CMD_TMP ${_RANDOMIZE_SITES}`; do ${ECHO_MSG} "=> Attempting to fetch from ${site}." DIR= ${DIST_SUBDIR} - CKSIZE= `${GREP} "^SIZE (${DIR:+$DIR/}$file)" ${MD5_FILE} | ${AWK} '{print $4}'` + CKSIZE= `${GREP} "^SIZE (${DIR:+$DIR/}${file})" ${MD5_FILE} | ${AWK} '{print $4}'` case ${file} in */*) ${MKDIR} ${file%/*}; \ @@ -359,19 +359,19 @@ cd ${_DISTDIR} for _file in ${PATCHFILES}; do - file= `${ECHO_CMD} $_file | ${SED} -E -e 's/:[^:]+$$//'` + file= `${ECHO_CMD} ${_file} | ${SED} -E -e 's/:[^:]+$$//'` select= `${ECHO_CMD} ${_file#${file}} | ${SED} -e 's/^://' -e 's/,/ /g'` force_fetch= false - filebasename= `${BASENAME} $file` + filebasename= `${BASENAME} ${file}` for afile in ${FORCE_FETCH}; do - afile= `${BASENAME} $afile` - if [ "x$afile" = "x$filebasename" ]; then - force_fetch =true + afile= `${BASENAME} ${afile}` + if [ "x${afile}" = "x${filebasename}" ]; then + force_fetch= true fi done - if [ ! -f $file -a ! -f $filebasename -o "$force_fetch" = "true" ]; then - if [ -L $file -o -L `${BASENAME} $file` ]; then - ${ECHO_MSG} "=> ${_DISTDIR}/$file is a broken symlink." + if [ ! -f ${file} -a ! -f ${filebasename} -o "${force_fetch}" = "true" ]; then + if [ -L ${file} -o -L `${BASENAME} ${file}` ]; then + ${ECHO_MSG} "=> ${_DISTDIR}/${file} is a broken symlink." ${ECHO_MSG} "=> Perhaps a filesystem (most likely a CD) isn't mounted?" ${ECHO_MSG} "=> Please correct this problem and try again." exit 1 @@ -379,7 +379,7 @@ ${ECHO_MSG} "=> $file doesn't seem to exist in ${_DISTDIR}." if [ ! -z "${select}" ] ; then __PATCH_SITES_TMP= - for group in $select; do + for group in ${select}; do if [ ! -z $${_PATCH_SITES_${group}} ] ; then eval ___PATCH_SITES_TMP= "$${_PATCH_SITES_${group}}" __PATCH_SITES_TMP= "${__PATCH_SITES_TMP} ${___PATCH_SITES_TMP}" @@ -393,8 +393,8 @@ for site in `eval $SORTED_PATCH_SITES_CMD_TMP`; do ${ECHO_MSG} "=> Attempting to fetch from ${site}." DIR= ${DIST_SUBDIR} - pattern= "${DIR:+$DIR/}`${ECHO_CMD} $file | ${SED} -e 's/\./\\\\./g'`" - CKSIZE= `${GREP} "^SIZE ($pattern)" ${MD5_FILE} | ${AWK} '{print $4}'` + pattern= "${DIR:+$DIR/}`${ECHO_CMD} ${file} | ${SED} -e 's/\./\\\\./g'`" + CKSIZE= `${GREP} "^SIZE (${pattern})" ${MD5_FILE} | ${AWK} '{print $4}'` case ${file} in */*) ${MKDIR} ${file%/*}; \ From owner-p4-projects@FreeBSD.ORG Sat Jul 29 14:50:57 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D8FBB16A4E8; Sat, 29 Jul 2006 14:50:56 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id B2D9716A4E6 for ; Sat, 29 Jul 2006 14:50:56 +0000 (UTC) (envelope-from gabor@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 710AE43D45 for ; Sat, 29 Jul 2006 14:50:56 +0000 (GMT) (envelope-from gabor@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k6TEouPI004084 for ; Sat, 29 Jul 2006 14:50:56 GMT (envelope-from gabor@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k6TEouMH004081 for perforce@freebsd.org; Sat, 29 Jul 2006 14:50:56 GMT (envelope-from gabor@FreeBSD.org) Date: Sat, 29 Jul 2006 14:50:56 GMT Message-Id: <200607291450.k6TEouMH004081@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to gabor@FreeBSD.org using -f From: Gabor Kovesdan To: Perforce Change Reviews Cc: Subject: PERFORCE change 102724 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 29 Jul 2006 14:50:57 -0000 http://perforce.freebsd.org/chv.cgi?CH=102724 Change 102724 by gabor@gabor_spitfire on 2006/07/29 14:50:55 IFC Affected files ... .. //depot/projects/soc2006/gabor_ports/GIDs#2 integrate .. //depot/projects/soc2006/gabor_ports/MOVED#9 integrate .. //depot/projects/soc2006/gabor_ports/Mk/bsd.php.mk#3 integrate .. //depot/projects/soc2006/gabor_ports/UIDs#2 integrate .. //depot/projects/soc2006/gabor_ports/UPDATING#10 integrate Differences ... ==== //depot/projects/soc2006/gabor_ports/GIDs#2 (text+ko) ==== @@ -1,4 +1,4 @@ -$FreeBSD: ports/GIDs,v 1.6 2006/07/26 12:27:09 lth Exp $ +$FreeBSD: ports/GIDs,v 1.9 2006/07/29 07:16:00 ume Exp $ # Please keep this file sorted by GID! bind:*:53: rdfdb:*:55: @@ -66,10 +66,13 @@ smxm:*:263: smx:*:264: mrtg:*:279: +dkfilter:*:325: ldap:*:389: +tiarra:*:398: drweb:*:426: courier:*:465: _bbstored:*:505: +dkimproxy:*:525: ejabberd:*:544: qtss:*:554: ircdru:*:555: ==== //depot/projects/soc2006/gabor_ports/MOVED#9 (text+ko) ==== @@ -1,7 +1,7 @@ # # MOVED - a list of (recently) moved or removed ports # -# $FreeBSD: ports/MOVED,v 1.1103 2006/07/26 08:59:38 itetcu Exp $ +# $FreeBSD: ports/MOVED,v 1.1104 2006/07/26 19:44:32 mnag Exp $ # # Each entry consists of a single line containing the following four # fields in the order named, separated with the pipe (`|') character: @@ -2424,4 +2424,5 @@ games/quake3-q3base|games/q3base|2006-07-22|the "quake3-" prefix is used by modifications and the like, not engines lang/fpc-demo||2006-07-24|Removed because it's not necessary anymore www/horde-php5||2006-07-24|Removed: this port is redundant now that php5 is the default -ports/sysutils/e17-module-devian|ports/x11/e17-module-devian|2006-07-26|Move e17-module-devian from sysutils to x11 +sysutils/e17-module-devian|x11/e17-module-devian|2006-07-26|Move e17-module-devian from sysutils to x11 +devel/viewcvs|devel/viewvc|2006-07-26|Project name has changed ==== //depot/projects/soc2006/gabor_ports/Mk/bsd.php.mk#3 (text+ko) ==== @@ -7,7 +7,7 @@ # Please send all suggested changes to the maintainer instead of committing # them to CVS yourself. # -# $FreeBSD: ports/Mk/bsd.php.mk,v 1.31 2006/07/05 02:18:08 linimon Exp $ +# $FreeBSD: ports/Mk/bsd.php.mk,v 1.32 2006/07/27 06:21:15 ale Exp $ # # Adding 'USE_PHP=yes' to a port includes this Makefile after bsd.ports.pre.mk. # If the port requires a predefined set of PHP extensions, they can be @@ -169,6 +169,7 @@ @${INSTALL_DATA} ${WRKSRC}/${header}/*.h \ ${PREFIX}/include/php/ext/${PHP_MODNAME}/${header} . endfor + @${RM} -f ${PREFIX}/include/php/ext/${PHP_MODNAME}/config.h @${GREP} "#define \(COMPILE\|HAVE\|USE\)_" ${WRKSRC}/config.h \ > ${PREFIX}/include/php/ext/${PHP_MODNAME}/config.h @${ECHO_CMD} \#include \"ext/${PHP_MODNAME}/config.h\" \ ==== //depot/projects/soc2006/gabor_ports/UIDs#2 (text+ko) ==== @@ -1,4 +1,4 @@ -$FreeBSD: ports/UIDs,v 1.7 2006/07/26 12:27:09 lth Exp $ +$FreeBSD: ports/UIDs,v 1.10 2006/07/29 07:16:00 ume Exp $ # Please keep this file sorted by UID! bind:*:53:53:Bind Sandbox:/:/sbin/nologin majordom:*:54:54:Majordomo Pseudo User:/usr/local/majordomo:/nonexistent @@ -78,10 +78,13 @@ smxm:*:263:263:Sendmail X misc:/nonexistent:/sbin/nologin smx:*:264:264:Sendmail X other:/nonexistent:/sbin/nologin mrtg:*:279:279:MRTG daemon:/nonexistent:/sbin/nologin +dkfilter:*:325:325:DK Filter Owner:/nonexistent:/sbin/nologin ldap:*:389:389:OpenLDAP Server:/nonexistent:/sbin/nologin +tiarra:*:398:398:Tiarra IRC Proxy:/nonexistent:/usr/sbin/nologin drweb:*:426:426:Dr.Web Mail Scanner:/nonexistent:/sbin/nologin courier:*:465:465:Courier Mail Server:/nonexistent:/sbin/nologin _bbstored:*:505:505::0:0:BoxBackup Store Daemon:/nonexistent:/bin/sh +dkimproxy:*:525:525:DKIM Proxy Owner:/nonexistent:/sbin/nologin ejabberd:*:544:544::0:0:ejabberd pseudo user:/var/spool/ejabberd:/bin/sh qtss:*:554:554:Darwin Streaming Server:/nonexistent:/sbin/nologin ircdru:*:555:555:Russian hybrid IRC server:/nonexistent:/bin/sh ==== //depot/projects/soc2006/gabor_ports/UPDATING#10 (text+ko) ==== @@ -6,6 +6,15 @@ time you update your ports collection, before attempting any port upgrades. +20060728: + AFFECTS: users of polish/ekg and polish/ibgadu + AUTHOR: mwisnicki+freebsd@gmail.com + + If you have installed both ekg-1.6,2 and libgadu-20051229_1 then you should + first deinstall them and install polish/ekg after that, eg: + pkg_deinstall -f pl-ekg-\* pl-libgadu-\* + portinstall polish/ekg + 20060723: AFFECTS: users of www/dillo-i18n AUTHOR: tmseck@netcologne.de @@ -3905,4 +3914,4 @@ 2) Update all p5-* modules. portupgrade -f p5-\* -$FreeBSD: ports/UPDATING,v 1.370 2006/07/25 07:52:13 blackend Exp $ +$FreeBSD: ports/UPDATING,v 1.371 2006/07/28 17:19:34 itetcu Exp $ From owner-p4-projects@FreeBSD.ORG Sat Jul 29 20:07:45 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 64AEF16A4DE; Sat, 29 Jul 2006 20:07:45 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 2AC5A16A4E1 for ; Sat, 29 Jul 2006 20:07:45 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id E51DE43D6B for ; Sat, 29 Jul 2006 20:07:37 +0000 (GMT) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k6TK7bU6041530 for ; Sat, 29 Jul 2006 20:07:37 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k6TK7bTt041527 for perforce@freebsd.org; Sat, 29 Jul 2006 20:07:37 GMT (envelope-from jb@freebsd.org) Date: Sat, 29 Jul 2006 20:07:37 GMT Message-Id: <200607292007.k6TK7bTt041527@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 102732 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 29 Jul 2006 20:07:45 -0000 http://perforce.freebsd.org/chv.cgi?CH=102732 Change 102732 by jb@jb_freebsd2 on 2006/07/29 20:06:39 Add a kernel option for Hypervisor trap tracing. Affected files ... .. //depot/projects/dtrace/src/sys/conf/files.sun4v#3 edit .. //depot/projects/dtrace/src/sys/conf/options.sun4v#3 edit .. //depot/projects/dtrace/src/sys/sun4v/conf/GENERIC#7 edit .. //depot/projects/dtrace/src/sys/sun4v/include/hypervisor_api.h#2 edit .. //depot/projects/dtrace/src/sys/sun4v/sun4v/mp_machdep.c#3 edit .. //depot/projects/dtrace/src/sys/sun4v/sun4v/pmap.c#9 edit .. //depot/projects/dtrace/src/sys/sun4v/sun4v/trap_trace.S#1 add Differences ... ==== //depot/projects/dtrace/src/sys/conf/files.sun4v#3 (text+ko) ==== @@ -43,6 +43,7 @@ sun4v/sun4v/counter.c standard sun4v/sun4v/cpu_snapshot.c optional cpu_snapshot sun4v/sun4v/cpu_snapshot_save.S optional cpu_snapshot +sun4v/sun4v/trap_trace.S optional trap_tracing sun4v/sun4v/db_disasm.c optional ddb sun4v/sun4v/db_interface.c optional ddb sun4v/sun4v/db_trace.c optional ddb ==== //depot/projects/dtrace/src/sys/conf/options.sun4v#3 (text+ko) ==== @@ -17,3 +17,6 @@ DTRACE opt_global.h CPU_SNAPSHOT opt_cpu_snapshot.h + +TRAP_TRACING opt_trap_trace.h +TRAP_TRACE_ENTRIES opt_trap_trace.h ==== //depot/projects/dtrace/src/sys/sun4v/conf/GENERIC#7 (text+ko) ==== @@ -66,7 +66,9 @@ options KDB_TRACE options DDB # Support DDB. options KDTRACE # Support for DTrace. -options CPU_SNAPSHOT # CPU register snapshots +options TRAP_TRACING # Enable trap tracing. +options TRAP_TRACE_ENTRIES=256 # Trap trace buffer entries. +options DIAGNOSTIC #options GDB # Support remote GDB. #options INVARIANTS # Enable calls of extra sanity checking #options INVARIANT_SUPPORT # Extra sanity checks of internal structures, required by INVARIANTS @@ -102,7 +104,7 @@ #device ahc # AHA2940 and onboard AIC7xxx devices #device isp # Qlogic family #device ispfw # Firmware module for Qlogic host adapters -device mpt # LSI-Logic MPT-Fusion (not yet) +device mpt # LSI-Logic MPT-Fusion #device ncr # NCR/Symbios Logic #device sym # NCR/Symbios Logic (newer chipsets + those of `ncr') #device esp # NCR53c9x (FEPS/FAS366) ==== //depot/projects/dtrace/src/sys/sun4v/include/hypervisor_api.h#2 (text+ko) ==== @@ -62,6 +62,22 @@ typedef uint64_t r_addr_t; typedef uint64_t io_addr_t; +typedef struct trap_trace_entry { + uint8_t tte_type; /* Hypervisor or guest entry. */ + uint8_t tte_hpstat; /* Hyper-privileged state. */ + uint8_t tte_tl; /* Trap level. */ + uint8_t tte_gl; /* Global register level. */ + uint16_t tte_tt; /* Trap type.*/ + uint16_t tte_tag; /* Extended trap identifier. */ + uint64_t tte_tstate; /* Trap state. */ + uint64_t tte_tick; /* Tick. */ + uint64_t tte_tpc; /* Trap PC. */ + uint64_t tte_f1; /* Entry specific. */ + uint64_t tte_f2; /* Entry specific. */ + uint64_t tte_f3; /* Entry specific. */ + uint64_t tte_f4; /* Entry specific. */ +} trap_trace_entry_t; + extern uint64_t hv_mmu_map_perm_addr(void *, int, uint64_t, int); extern uint64_t hv_mmu_unmap_perm_addr(void *, int, int); extern uint64_t hv_set_ctx0(uint64_t, uint64_t); ==== //depot/projects/dtrace/src/sys/sun4v/sun4v/mp_machdep.c#3 (text+ko) ==== @@ -57,6 +57,8 @@ #include __FBSDID("$FreeBSD: src/sys/sparc64/sparc64/mp_machdep.c,v 1.31 2006/02/07 21:22:02 phk Exp $"); +#include "opt_trap_trace.h" + #include #include #include @@ -116,6 +118,59 @@ void cpu_mp_unleash(void *); SYSINIT(cpu_mp_unleash, SI_SUB_SMP, SI_ORDER_FIRST, cpu_mp_unleash, NULL); +#ifdef TRAP_TRACING +#ifndef TRAP_TRACE_ENTRIES +#define TRAP_TRACE_ENTRIES 64 +#endif +extern trap_trace_entry_t trap_trace_entry[MAXCPU][TRAP_TRACE_ENTRIES]; + +static void +mp_trap_trace_init(void) +{ + uint64_t ret, ret1; + + printf("curcpu %d trap_trace_entry %p TRAP_TRACE_ENTRIES %d\n", curcpu, &trap_trace_entry[curcpu][0], TRAP_TRACE_ENTRIES); + + /* Configure the trap trace buffer for the current CPU. */ + if ((ret = hv_ttrace_buf_conf((uint64_t) vtophys(&trap_trace_entry[curcpu][0]), + (uint64_t) TRAP_TRACE_ENTRIES, &ret1)) != 0) + printf("%s: hv_ttrace_buf_conf error %lu\n", __FUNCTION__, ret); + + /* Enable trap tracing for the current CPU. */ + else if ((ret = hv_ttrace_enable((uint64_t) -1, &ret1)) != 0) + printf("%s: hv_ttrace_enable error %lu\n", __FUNCTION__, ret); +} + +void trap_trace_report(int); + +static int trace_trap_lock; + +void +trap_trace_report(int cpuid) +{ + int i, j; + + while (!atomic_cmpset_acq_int(&trace_trap_lock, 0, 1)) + DELAY(10000); + + for (i = 0; i < MAXCPU; i++) { + if (cpuid != -1 && cpuid != i) + continue; + + for (j = 0; j < TRAP_TRACE_ENTRIES; j++) { + trap_trace_entry_t *p = &trap_trace_entry[i][j]; + + printf("0x%08jx [%02d][%04d] tpc 0x%jx type 0x%x hpstat 0x%x tl %u gl %u tt 0x%hx tag 0x%hx tstate 0x%jx f1 0x%jx f2 0x%jx f3 0x%jx f4 0x%jx\n", + p->tte_tick, i, j, p->tte_tpc,p->tte_type,p->tte_hpstat, + p->tte_tl,p->tte_gl,p->tte_tt,p->tte_tag,p->tte_tstate, + p->tte_f1,p->tte_f2,p->tte_f3,p->tte_f4); + } + } + + atomic_store_rel_int(&trace_trap_lock, 0); +} +#endif + vm_offset_t mp_tramp_alloc(void) { @@ -327,6 +382,11 @@ trap_init(); cpu_intrq_init(); tick_start(); + +#ifdef TRAP_TRACING + mp_trap_trace_init(); +#endif + /* * enable interrupts now that we have our trap table set */ ==== //depot/projects/dtrace/src/sys/sun4v/sun4v/pmap.c#9 (text+ko) ==== @@ -25,10 +25,10 @@ * * $ Exp $ */ -#include "opt_cpu_snapshot.h" #include "opt_kstack_pages.h" #include "opt_msgbuf.h" #include "opt_pmap.h" +#include "opt_trap_trace.h" #include #include @@ -75,8 +75,8 @@ #include -#ifdef CPU_SNAPSHOT -#include +#ifdef TRAP_TRACING +void trap_trace_report(int); #endif #if 1 @@ -1280,10 +1280,19 @@ membar(Sync); i++; if (i > 10000000) { +#ifdef TRAP_TRACING + int j; +#endif uint64_t cpu_state; printf("cpu with cpumask=0x%x appears to not be responding to ipis\n", curactive & ~ackmask); +#ifdef TRAP_TRACING + for (j = 0; j < MAXCPU; j++) + if (((1 << j) & curactive & ~ackmask) != 0) + trap_trace_report(j); +#endif + hv_cpu_state((uint64_t)ffs64(curactive & ~ackmask), &cpu_state); printf("cpu_state of %ld is %ld\n", ffs64(curactive & ~ackmask), cpu_state); if (!retried) { @@ -1294,10 +1303,6 @@ goto retry; } -#ifdef CPU_SNAPSHOT - cpu_snapshot_report(-1); -#endif - panic(" ackmask=0x%x active=0x%x\n", ackmask, curactive); } } From owner-p4-projects@FreeBSD.ORG Sat Jul 29 21:47:56 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 994B316A58D; Sat, 29 Jul 2006 21:47:56 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 59D7B16A589 for ; Sat, 29 Jul 2006 21:47:56 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 2287743D49 for ; Sat, 29 Jul 2006 21:47:56 +0000 (GMT) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k6TLluRa059148 for ; Sat, 29 Jul 2006 21:47:56 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k6TLlteV059145 for perforce@freebsd.org; Sat, 29 Jul 2006 21:47:55 GMT (envelope-from jb@freebsd.org) Date: Sat, 29 Jul 2006 21:47:55 GMT Message-Id: <200607292147.k6TLlteV059145@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 102737 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 29 Jul 2006 21:47:56 -0000 http://perforce.freebsd.org/chv.cgi?CH=102737 Change 102737 by jb@jb_freebsd2 on 2006/07/29 21:47:22 Integrate (from kmacy_sun4v) the change to panic if the mmu_tsb_ctxnon0 hypervisor trap returns an error. With hypervisor trap tracing enabled, the last sensible trap I'm seeing reported before a rogue CPU goes of into the weeds (and doesn't respond to IPIs) is mmu_tsb_ctxnon0. Perhaps the args to that trap aren't valid. Affected files ... .. //depot/projects/dtrace/src/sys/sun4v/sun4v/swtch.S#3 integrate Differences ... ==== //depot/projects/dtrace/src/sys/sun4v/sun4v/swtch.S#3 (text+ko) ==== @@ -27,18 +27,13 @@ #include __FBSDID("$FreeBSD: src/sys/sparc64/sparc64/swtch.S,v 1.33 2004/05/26 12:06:52 tmm Exp $"); -#include "opt_cpu_snapshot.h" - #include #include #include #include +#include #include -#ifdef CPU_SNAPSHOT -#include -#endif - #include "assym.s" .register %g2, #ignore @@ -220,30 +215,19 @@ cmp %g0, %o0 be %xcc, 4f nop - MAGIC_TRAP_ON - MAGIC_EXIT - + call pmap_set_ctx_panic + mov %i2, %o2 4: /* * install the new secondary context number in the cpu. */ - + sethi %hi(FLUSH_ADDR), %l2 SET_MMU_CONTEXT(%l6, %l5) - membar #Sync + flush %l2 /* * Done. Return and load the new process's window from the stack. */ -5: -#ifdef CPU_SNAPSHOT - restore - -#include "machine/cpu_snapshot_save.h" - - retl - nop -#else - ret +5: ret restore -#endif END(cpu_switch) ENTRY(savectx) From owner-p4-projects@FreeBSD.ORG Sat Jul 29 23:41:38 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 820D216A4E0; Sat, 29 Jul 2006 23:41:38 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 2C94216A4DF for ; Sat, 29 Jul 2006 23:41:38 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id EF01D43D62 for ; Sat, 29 Jul 2006 23:41:37 +0000 (GMT) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k6TNfbET068836 for ; Sat, 29 Jul 2006 23:41:37 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k6TNfbFN068833 for perforce@freebsd.org; Sat, 29 Jul 2006 23:41:37 GMT (envelope-from jb@freebsd.org) Date: Sat, 29 Jul 2006 23:41:37 GMT Message-Id: <200607292341.k6TNfbFN068833@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 102745 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 29 Jul 2006 23:41:38 -0000 http://perforce.freebsd.org/chv.cgi?CH=102745 Change 102745 by jb@jb_freebsd2 on 2006/07/29 23:41:19 Now that a mutex is used instead of an sx lock, the malloc has to be performed without wait to avoid panicing if it tries to block. Witness points this out. So, loop and retry in low memory situations. Affected files ... .. //depot/projects/dtrace/src/sys/kern/kern_environment.c#5 edit Differences ... ==== //depot/projects/dtrace/src/sys/kern/kern_environment.c#5 (text+ko) ==== @@ -289,17 +289,18 @@ int len; if (dynamic_kenv) { - mtx_lock(&kenv_lock); - cp = _getenv_dynamic(name, NULL); - if (cp != NULL) { - len = strlen(cp) + 1; - ret = malloc(len, M_KENV, M_WAITOK); - strcpy(ret, cp); + do { + mtx_lock(&kenv_lock); + cp = _getenv_dynamic(name, NULL); + if (cp != NULL) { + len = strlen(cp) + 1; + ret = malloc(len, M_KENV, M_NOWAIT); + if (ret != NULL) + strcpy(ret, cp); + } else + ret = NULL; mtx_unlock(&kenv_lock); - } else { - mtx_unlock(&kenv_lock); - ret = NULL; - } + } while (cp != NULL && ret == NULL); } else ret = _getenv_static(name); return (ret); From owner-p4-projects@FreeBSD.ORG Sat Jul 29 23:43:48 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B76DA16A4E0; Sat, 29 Jul 2006 23:43:48 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 8B4F616A4DF for ; Sat, 29 Jul 2006 23:43:48 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 7F3F943D5A for ; Sat, 29 Jul 2006 23:43:41 +0000 (GMT) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k6TNhfPx068943 for ; Sat, 29 Jul 2006 23:43:41 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k6TNhfrS068940 for perforce@freebsd.org; Sat, 29 Jul 2006 23:43:41 GMT (envelope-from jb@freebsd.org) Date: Sat, 29 Jul 2006 23:43:41 GMT Message-Id: <200607292343.k6TNhfrS068940@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 102746 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 29 Jul 2006 23:43:49 -0000 http://perforce.freebsd.org/chv.cgi?CH=102746 Change 102746 by jb@jb_freebsd2 on 2006/07/29 23:43:03 Check if the kernel DTrace option is enabled. Affected files ... .. //depot/projects/dtrace/src/sys/kern/sched_4bsd.c#9 edit Differences ... ==== //depot/projects/dtrace/src/sys/kern/sched_4bsd.c#9 (text+ko) ==== @@ -36,6 +36,7 @@ __FBSDID("$FreeBSD: src/sys/kern/sched_4bsd.c,v 1.86 2006/07/02 20:53:52 maxim Exp $"); #include "opt_hwpmc_hooks.h" +#include "opt_kdtrace.h" #define kse td_sched From owner-p4-projects@FreeBSD.ORG Sat Jul 29 23:45:45 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id F089E16A4E0; Sat, 29 Jul 2006 23:45:44 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id CC68316A4DD for ; Sat, 29 Jul 2006 23:45:44 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 848F243D45 for ; Sat, 29 Jul 2006 23:45:44 +0000 (GMT) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k6TNjiZJ069080 for ; Sat, 29 Jul 2006 23:45:44 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k6TNjh5c069077 for perforce@freebsd.org; Sat, 29 Jul 2006 23:45:43 GMT (envelope-from jb@freebsd.org) Date: Sat, 29 Jul 2006 23:45:43 GMT Message-Id: <200607292345.k6TNjh5c069077@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 102747 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 29 Jul 2006 23:45:45 -0000 http://perforce.freebsd.org/chv.cgi?CH=102747 Change 102747 by jb@jb_freebsd2 on 2006/07/29 23:45:22 Remove trailing whitespace Affected files ... .. //depot/projects/dtrace/src/sys/sun4v/sun4v/locore.S#2 edit Differences ... ==== //depot/projects/dtrace/src/sys/sun4v/sun4v/locore.S#2 (text+ko) ==== @@ -40,7 +40,7 @@ .globl nwin_minus_one .set nwin_minus_one,7 - + /* * void _start(caddr_t metadata, u_long o1, u_long o2, u_long o3, * u_long ofw_vec) From owner-p4-projects@FreeBSD.ORG Sat Jul 29 23:46:46 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id AF50A16A4DE; Sat, 29 Jul 2006 23:46:46 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 8893D16A4DA for ; Sat, 29 Jul 2006 23:46:46 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 568B743D45 for ; Sat, 29 Jul 2006 23:46:46 +0000 (GMT) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k6TNkkXs069196 for ; Sat, 29 Jul 2006 23:46:46 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k6TNkk0C069193 for perforce@freebsd.org; Sat, 29 Jul 2006 23:46:46 GMT (envelope-from jb@freebsd.org) Date: Sat, 29 Jul 2006 23:46:46 GMT Message-Id: <200607292346.k6TNkk0C069193@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 102748 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 29 Jul 2006 23:46:46 -0000 http://perforce.freebsd.org/chv.cgi?CH=102748 Change 102748 by jb@jb_freebsd2 on 2006/07/29 23:46:45 Remove the register snapshots. Affected files ... .. //depot/projects/dtrace/src/sys/sun4v/sun4v/interrupt.S#3 edit Differences ... ==== //depot/projects/dtrace/src/sys/sun4v/sun4v/interrupt.S#3 (text+ko) ==== @@ -28,7 +28,6 @@ #include __FBSDID("$FreeBSD: src/sys/sparc64/sparc64/interrupt.S,v 1.8 2005/04/16 15:05:56 marius Exp $"); -#include "opt_cpu_snapshot.h" #include "opt_simulator.h" #include #include @@ -36,10 +35,6 @@ #include #include -#ifdef CPU_SNAPSHOT -#include -#endif - #include "assym.s" @@ -59,10 +54,6 @@ 2: wrpr %g0, PSTATE_NORMAL, %pstate -#ifdef CPU_SNAPSHOT - call cpu_snapshot_save -#endif - ldx [%l0 + IR_NEXT], %l1 brnz,pt %l1, 3f stx %l1, [PCPU(IRHEAD)] @@ -89,10 +80,6 @@ stx %l1, [%l0 + IR_NEXT] stx %l0, [PCPU(IRFREE)] -#ifdef CPU_SNAPSHOT - call cpu_snapshot_save -#endif - wrpr %g0, PSTATE_KERNEL, %pstate call %o0 From owner-p4-projects@FreeBSD.ORG Sat Jul 29 23:50:52 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 383EA16A4E1; Sat, 29 Jul 2006 23:50:52 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 1395B16A4DA for ; Sat, 29 Jul 2006 23:50:52 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id D3D5C43D49 for ; Sat, 29 Jul 2006 23:50:51 +0000 (GMT) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k6TNopUN069472 for ; Sat, 29 Jul 2006 23:50:51 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k6TNopdh069467 for perforce@freebsd.org; Sat, 29 Jul 2006 23:50:51 GMT (envelope-from jb@freebsd.org) Date: Sat, 29 Jul 2006 23:50:51 GMT Message-Id: <200607292350.k6TNopdh069467@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 102749 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 29 Jul 2006 23:50:52 -0000 http://perforce.freebsd.org/chv.cgi?CH=102749 Change 102749 by jb@jb_freebsd2 on 2006/07/29 23:50:38 Add a console method to allow atomic writes of strings to reduce the amount of interleaving of console output. Affected files ... .. //depot/projects/dtrace/src/sys/sys/cons.h#3 edit Differences ... ==== //depot/projects/dtrace/src/sys/sys/cons.h#3 (text+ko) ==== @@ -45,6 +45,7 @@ typedef int cn_getc_t(struct consdev *); typedef int cn_checkc_t(struct consdev *); typedef void cn_putc_t(struct consdev *, int); +typedef void cn_puts_t(struct consdev *, char *, int); struct consdev { cn_probe_t *cn_probe; @@ -59,6 +60,8 @@ /* kernel "return char if available" interface */ cn_putc_t *cn_putc; /* kernel putchar interface */ + cn_puts_t *cn_puts; + /* write one or more characters */ struct tty *cn_tp; /* tty structure for console device */ short cn_pri; /* pecking order; the higher the better */ void *cn_arg; /* drivers method argument */ @@ -80,9 +83,10 @@ #ifdef _KERNEL -#define CONS_DRIVER(name, probe, init, term, getc, checkc, putc, dbctl) \ +#define CONS_DRIVER(name, probe, init, term, getc, checkc, putc, puts, \ + dbctl) \ static struct consdev name##_consdev = { \ - probe, init, term, getc, checkc, putc \ + probe, init, term, getc, checkc, putc, puts \ }; \ DATA_SET(cons_set, name##_consdev) @@ -93,6 +97,7 @@ .cn_term = name##_cnterm, \ .cn_getc = name##_cngetc, \ .cn_putc = name##_cnputc, \ + .cn_puts = name##_cnputs, \ }; \ DATA_SET(cons_set, name##_consdev) @@ -106,6 +111,7 @@ int cncheckc(void); int cngetc(void); void cnputc(int); +void cnputs(char *, int); int cnunavailable(void); #endif /* _KERNEL */ From owner-p4-projects@FreeBSD.ORG Sat Jul 29 23:57:00 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8638B16A4E1; Sat, 29 Jul 2006 23:57:00 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 6258A16A4DE for ; Sat, 29 Jul 2006 23:57:00 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 103B743D45 for ; Sat, 29 Jul 2006 23:57:00 +0000 (GMT) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k6TNuxOa069864 for ; Sat, 29 Jul 2006 23:56:59 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k6TNuxFi069861 for perforce@freebsd.org; Sat, 29 Jul 2006 23:56:59 GMT (envelope-from jb@freebsd.org) Date: Sat, 29 Jul 2006 23:56:59 GMT Message-Id: <200607292356.k6TNuxFi069861@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 102750 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 29 Jul 2006 23:57:00 -0000 http://perforce.freebsd.org/chv.cgi?CH=102750 Change 102750 by jb@jb_freebsd2 on 2006/07/29 23:56:06 Add a method to write strings to the console, making them atomic by using a lock. On sun4v this is important because 32 processors potentially writing can generate complete gobbledy-gook if allowed to write on a character by character basis. This change ensures that a printf (for example) which formats it's string in a stack buffer can write the string uninterrupted. Strings like these generally have a new-line character at the end, so string writes via the new method will write the rest of the line with any other writes interleaved before it. Affected files ... .. //depot/projects/dtrace/src/sys/sun4v/sun4v/hvcons.c#2 edit Differences ... ==== //depot/projects/dtrace/src/sys/sun4v/sun4v/hvcons.c#2 (text+ko) ==== @@ -43,12 +43,12 @@ #include "opt_simulator.h" +#include #include #include #define HVCN_POLL_FREQ 10 - static d_open_t hvcn_open; static d_close_t hvcn_close; @@ -76,22 +76,24 @@ static int alt_break_state; #endif +static int cons_lock; + static void hvcn_tty_start(struct tty *); static int hvcn_tty_param(struct tty *, struct termios *); static void hvcn_tty_stop(struct tty *, int); static void hvcn_timeout(void *); +void hvcn_rawputc(int); static cn_probe_t hvcnprobe; static cn_init_t hvcninit; static cn_getc_t hvcngetc; static cn_checkc_t hvcncheckc; static cn_putc_t hvcnputc; +static cn_puts_t hvcnputs; - CONS_DRIVER(hvcn, hvcnprobe, hvcninit, NULL, hvcngetc, - hvcncheckc, hvcnputc, NULL); + hvcncheckc, hvcnputc, hvcnputs, NULL); - static int hvcn_open(struct cdev *dev, int flag, int mode, struct thread *td) { @@ -126,6 +128,7 @@ int polltime; polltime = hz / HVCN_POLL_FREQ; +polltime = 100; if (polltime < 1) { polltime = 1; } @@ -239,14 +242,11 @@ return (-1); } - -static void -hvcnputc(struct consdev *cp, int c) +void +hvcn_rawputc(int c) { + int error = 0; - int error; - - error = 0; do { if (c == '\n') error = hv_cnputchar('\r'); @@ -256,6 +256,29 @@ } while (error == H_EWOULDBLOCK); } +static void +hvcnputs(struct consdev *cp, char *p, int num) +{ + int i; + + while (!atomic_cmpset_acq_int(&cons_lock, 0, 1)) + DELAY(100); + + for (i = 0; i < num; i++) + hvcn_rawputc(p[i]); + + atomic_store_rel_int(&cons_lock, 0); +} + + +static void +hvcnputc(struct consdev *cp, int c) +{ + char x = c & 0xff; + + hvcnputs(cp, &x, 1); +} + static int hvcn_tty_param(struct tty *tp, struct termios *t) { From owner-p4-projects@FreeBSD.ORG Sat Jul 29 23:59:03 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 770A016A4E1; Sat, 29 Jul 2006 23:59:03 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 52FAE16A4DF for ; Sat, 29 Jul 2006 23:59:03 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 159D843D45 for ; Sat, 29 Jul 2006 23:59:03 +0000 (GMT) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k6TNx2Ie069973 for ; Sat, 29 Jul 2006 23:59:02 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k6TNx2GC069970 for perforce@freebsd.org; Sat, 29 Jul 2006 23:59:02 GMT (envelope-from jb@freebsd.org) Date: Sat, 29 Jul 2006 23:59:02 GMT Message-Id: <200607292359.k6TNx2GC069970@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 102751 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 29 Jul 2006 23:59:03 -0000 http://perforce.freebsd.org/chv.cgi?CH=102751 Change 102751 by jb@jb_freebsd2 on 2006/07/29 23:58:04 Add a function to put a string to the console using the new console method. Affected files ... .. //depot/projects/dtrace/src/sys/kern/tty_cons.c#4 edit Differences ... ==== //depot/projects/dtrace/src/sys/kern/tty_cons.c#4 (text+ko) ==== @@ -611,6 +611,23 @@ } void +cnputs(char *p, int num) +{ + struct cn_device *cnd; + struct consdev *cn; + + if (cn_mute || num == 0) + return; + + STAILQ_FOREACH(cnd, &cn_devlist, cnd_next) { + cn = cnd->cnd_cn; + if (!kdb_active || !(cn->cn_flags & CN_FLAG_NODEBUG)) { + cn->cn_puts(cn, p, num); + } + } +} + +void cnputc(int c) { struct cn_device *cnd;