From owner-p4-projects@FreeBSD.ORG Sun Oct 26 00:09:50 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0621E1065673; Sun, 26 Oct 2008 00:09:50 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id BDB571065671 for ; Sun, 26 Oct 2008 00:09:49 +0000 (UTC) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id AB72E8FC1E for ; Sun, 26 Oct 2008 00:09:49 +0000 (UTC) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id m9Q09ncb047632 for ; Sun, 26 Oct 2008 00:09:49 GMT (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m9Q09npQ047630 for perforce@freebsd.org; Sun, 26 Oct 2008 00:09:49 GMT (envelope-from marcel@freebsd.org) Date: Sun, 26 Oct 2008 00:09:49 GMT Message-Id: <200810260009.m9Q09npQ047630@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 151931 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, 26 Oct 2008 00:09:50 -0000 http://perforce.freebsd.org/chv.cgi?CH=151931 Change 151931 by marcel@marcel_xcllnt on 2008/10/26 00:09:05 More merge fodder: use lbc(4) from SVN as-is. Affected files ... .. //depot/projects/e500/sys/dev/cfi/cfi_reg.h#6 edit .. //depot/projects/e500/sys/dev/cfi/cfi_var.h#6 edit .. //depot/projects/e500/sys/powerpc/mpc85xx/lbc.c#4 edit .. //depot/projects/e500/sys/powerpc/mpc85xx/lbc.h#4 edit .. //depot/projects/e500/sys/sys/cfictl.h#3 edit Differences ... ==== //depot/projects/e500/sys/dev/cfi/cfi_reg.h#6 (text+ko) ==== @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: head/sys/dev/cfi/cfi_reg.h,v 1.1 2008/10/25 06:18:12 marcel Exp $ + * $FreeBSD: src/sys/dev/cfi/cfi_reg.h,v 1.1 2008/10/25 06:18:12 marcel Exp $ */ #ifndef _DEV_CFI_REG_H_ ==== //depot/projects/e500/sys/dev/cfi/cfi_var.h#6 (text+ko) ==== @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: head/sys/dev/cfi/cfi_var.h,v 1.1 2008/10/25 06:18:12 marcel Exp $ + * $FreeBSD: src/sys/dev/cfi/cfi_var.h,v 1.1 2008/10/25 06:18:12 marcel Exp $ */ #ifndef _DEV_CFI_VAR_H_ ==== //depot/projects/e500/sys/powerpc/mpc85xx/lbc.c#4 (text+ko) ==== @@ -1,5 +1,6 @@ /*- - * Copyright 2006 by Juniper Networks. All rights reserved. + * Copyright (c) 2006-2008, Juniper Networks, Inc. + * All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -23,42 +24,37 @@ * 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/psim/iobus.c,v 1.8 2005/01/07 02:29:21 imp Exp $ */ +#include +__FBSDID("$FreeBSD: src/sys/powerpc/mpc85xx/lbc.c,v 1.1 2008/10/25 06:03:40 marcel Exp $"); + #include #include #include #include +#include #include #include #include +#include +#include + #include #include -#include -#include -#include -#include -#include -#include #include -#include "pic_if.h" -#include "lb_if.h" +struct lbc_softc { + device_t sc_dev; + + struct resource *sc_res; + bus_space_handle_t sc_bsh; + bus_space_tag_t sc_bst; + int sc_rid; -struct lbc_softc { - /* Currently only 1 */ - device_t lb_dev; - /* Acquired from OCP bus & basically used for CCSR */ - struct resource *lb_memr; - bus_space_handle_t lb_bsh; - bus_space_tag_t lb_bst; - int lb_rid; - /* Now for the children */ - struct rman lbc_memregion; - bus_addr_t lbc_iomem_va; + struct rman sc_rman; + uintptr_t sc_kva; }; struct lbc_devinfo { @@ -71,25 +67,14 @@ static int lbc_probe(device_t); static int lbc_attach(device_t); static int lbc_shutdown(device_t); -#if 0 static int lbc_get_resource(device_t, device_t, int, int, u_long *, u_long *); -#endif static struct resource *lbc_alloc_resource(device_t, device_t, int, int *, u_long, u_long, u_long, u_int); -#if 0 static int lbc_print_child(device_t, device_t); -#endif static int lbc_release_resource(device_t, device_t, int, int, struct resource *); static int lbc_read_ivar(device_t, device_t, int, uintptr_t *); -static void lbc_write_reg(device_t , uint32_t , uint32_t , uint32_t ); -static uint32_t lbc_read_reg(device_t , uint32_t , uint32_t ); -#if 0 -static int lbc_setup_intr(device_t, device_t, struct resource *, int, - driver_intr_t *, void *, void **); -static int lbc_teardown_intr(device_t, device_t, struct resource *, void *); -#endif /* * Bus interface definition @@ -101,79 +86,28 @@ DEVMETHOD(device_shutdown, lbc_shutdown), /* Bus interface */ -#if 0 DEVMETHOD(bus_print_child, lbc_print_child), -#endif - DEVMETHOD(bus_print_child, NULL), DEVMETHOD(bus_read_ivar, lbc_read_ivar), - DEVMETHOD(bus_setup_intr, NULL), + DEVMETHOD(bus_setup_intr, bus_generic_setup_intr), DEVMETHOD(bus_teardown_intr, NULL), DEVMETHOD(bus_get_resource, NULL), DEVMETHOD(bus_alloc_resource, lbc_alloc_resource), DEVMETHOD(bus_release_resource, lbc_release_resource), - DEVMETHOD(bus_activate_resource, bus_generic_activate_resource), - DEVMETHOD(bus_deactivate_resource, bus_generic_deactivate_resource), + DEVMETHOD(bus_activate_resource, bus_generic_activate_resource), + DEVMETHOD(bus_deactivate_resource, bus_generic_deactivate_resource), - /* local bus CCSR access functions for child */ - DEVMETHOD(lb_write_reg, lbc_write_reg), - DEVMETHOD(lb_read_reg, lbc_read_reg), - { 0, 0 } }; static driver_t lbc_driver = { "lbc", lbc_methods, - sizeof (struct lbc_softc) + sizeof(struct lbc_softc) }; - devclass_t lbc_devclass; - DRIVER_MODULE(lbc, ocpbus, lbc_driver, lbc_devclass, 0, 0); -static void -lbc_write_reg(device_t dev, uint32_t offset, uint32_t val, uint32_t bytes) -{ - struct lbc_softc *sc = device_get_softc(dev); - - switch (bytes) { - case 1: - bus_space_write_1(sc->lb_bst, sc->lb_bsh, offset, val); - - break; - case 2: - bus_space_write_2(sc->lb_bst, sc->lb_bsh, offset, val); - - break; - case 4: - bus_space_write_4(sc->lb_bst, sc->lb_bsh, offset, val); - - break; - } -} - -static uint32_t -lbc_read_reg(device_t dev, uint32_t offset, uint32_t bytes) -{ - struct lbc_softc *sc = device_get_softc(dev); - uint32_t data = 0; - - switch (bytes) { - case 1: - data = bus_space_read_1(sc->lb_bst, sc->lb_bsh, offset); - break; - case 2: - data = bus_space_read_2(sc->lb_bst, sc->lb_bsh, offset); - break; - case 4: - data = bus_space_read_4(sc->lb_bst, sc->lb_bsh, offset); - break; - } - - return (data); -} - static device_t lbc_mk_child(device_t dev, int type, int mtype, int unit) { @@ -185,7 +119,7 @@ device_printf(dev, "could not add child device\n"); return (NULL); } - dinfo = malloc(sizeof (struct lbc_devinfo), M_DEVBUF, M_WAITOK|M_ZERO); + dinfo = malloc(sizeof(struct lbc_devinfo), M_DEVBUF, M_WAITOK | M_ZERO); dinfo->lbc_devtype = type; dinfo->lbc_memtype = mtype; dinfo->lbc_unit = unit; @@ -196,7 +130,6 @@ static int lbc_probe(device_t dev) { - struct lbc_softc *sc; device_t parent; uintptr_t devtype; int error; @@ -208,137 +141,105 @@ if (devtype != OCPBUS_DEVTYPE_LBC) return (ENXIO); - sc = device_get_softc(dev); - - device_set_desc(dev, "Freescale 8533 Local Bus Controller"); + device_set_desc(dev, "Freescale MPC85xx Local Bus Controller"); return (BUS_PROBE_DEFAULT); } static int -lbc_attach (device_t dev) +lbc_attach(device_t dev) { struct lbc_softc *sc; - u_long start, end, size; - struct rman *rp; + struct rman *rm; + u_long start, size; int error; sc = device_get_softc(dev); - sc->lb_dev = dev; + sc->sc_dev = dev; - sc->lb_rid = 0; - sc->lb_memr = bus_alloc_resource_any(dev, SYS_RES_MEMORY, &sc->lb_rid, + sc->sc_rid = 0; + sc->sc_res = bus_alloc_resource_any(dev, SYS_RES_MEMORY, &sc->sc_rid, RF_ACTIVE); - if (sc->lb_memr == NULL) + if (sc->sc_res == NULL) return (ENXIO); - sc->lb_bst = rman_get_bustag(sc->lb_memr); - sc->lb_bsh = rman_get_bushandle(sc->lb_memr); + sc->sc_bst = rman_get_bustag(sc->sc_res); + sc->sc_bsh = rman_get_bushandle(sc->sc_res); error = bus_get_resource(dev, SYS_RES_MEMORY, 1, &start, &size); - if (error) { - bus_release_resource(dev, SYS_RES_MEMORY, sc->lb_rid, sc->lb_memr); - return (error); - } + if (error) + goto fail; - /* Initialize the LBC registers */ - /* Boot Flash */ - LB_WRITE_REG(dev,LBC85XX_BR(0), 0xff801001, 4); - LB_WRITE_REG(dev,LBC85XX_OR(0), 0xff801040, 4); + rm = &sc->sc_rman; + rm->rm_type = RMAN_ARRAY; + rm->rm_descr = "MPC85XX Local Bus Space"; + rm->rm_start = start; + rm->rm_end = start + size - 1; + error = rman_init(rm); + if (error) + goto fail; - /* SYSPLD */ - LB_WRITE_REG(dev,LBC85XX_BR(1), 0xea001001, 4); - LB_WRITE_REG(dev,LBC85XX_OR(1), 0xffff1040, 4); - -#if 0 - /* LCD */ - LB_WRITE_REG(dev,LBC85XX_BR(2), 0xeb000801, 4); - LB_WRITE_REG(dev,LBC85XX_OR(2), 0xffff1100, 4); -#endif - - LB_WRITE_REG(dev,LBC85XX_LBCR, 0x00000000, 4); - LB_WRITE_REG(dev,LBC85XX_LCRR, 0x00030008, 4); - - /* - * The unit argument will serve as the bar number. Logic is - * that there are only that much banks as there are bars and - * there can only be as many devices as there are banks. - */ - - lbc_mk_child(dev, LBC_DEVTYPE_LCD, LB_GPCM_TYPE, 0); -#if 0 - lbc_mk_child(dev, LBC_DEVTYPE_FLASH, 0); -#endif - - end = start + size - 1; - - rp = &sc->lbc_memregion; - rp->rm_type = RMAN_ARRAY; - rp->rm_descr = "MPC8533 Localbus Device Memory"; - /* Not sure below 2 lines are needed */ - rp->rm_start = start; - rp->rm_end = end; - error = rman_init(rp); + error = rman_manage_region(rm, rm->rm_start, rm->rm_end); if (error) { - device_printf(dev, "rman_init() failed. error = %d\n", error); - return (error); + rman_fini(rm); + goto fail; } - error = rman_manage_region(rp, start, end); - if (error) { - device_printf(dev, "rman_manage_region() failed. error = %d\n", - error); - return (error); - } + sc->sc_kva = (uintptr_t)pmap_mapdev(start, size); - sc->lbc_iomem_va = (uintptr_t)pmap_mapdev(start, size); + lbc_mk_child(dev, LBC_DEVTYPE_CFI, 0, 0); return (bus_generic_attach(dev)); + fail: + bus_release_resource(dev, SYS_RES_MEMORY, sc->sc_rid, sc->sc_res); + return (error); } static int lbc_shutdown(device_t dev) { + + /* TODO */ return(0); } -/* - * The calling convention should be local_bus_alloc_resource and - * if it succeeds then call lb_write_reg to program the BARS. - */ static struct resource * -lbc_alloc_resource (device_t dev, device_t child, int type, int *rid, +lbc_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 lbc_softc *sc; struct resource *rv; - struct rman *rp; + struct rman *rm; + int error; sc = device_get_softc(dev); - if (type != SYS_RES_MEMORY) + if (type != SYS_RES_MEMORY && type != SYS_RES_IRQ) return (NULL); - /* For now don't allow *_alloc_any */ - if (start == 0ul || end == ~0ul) + + /* We only support default allocations. */ + if (start != 0ul || end != ~0ul) return (NULL); - rp = &sc->lbc_memregion; - end = start + count - 1; - rv = rman_reserve_resource(rp, start, end, count, flags, child); - if (rv == NULL) + if (type == SYS_RES_IRQ) + return (bus_alloc_resource(dev, type, rid, start, end, count, + flags)); + + error = lbc_get_resource(dev, child, type, *rid, &start, &count); + if (error) return (NULL); -#if 0 - /* TODO: Check this out later */ - rman_set_bustag(rv, PPC_BUS_SPACE_MEM | PPC_BUS_SPACE_BE); -#endif - rman_set_bustag(rv, &bs_be_tag); - rman_set_bushandle(rv, sc->lbc_iomem_va + - rman_get_start(rv) - rp->rm_start); + rm = &sc->sc_rman; + end = start + count - 1; + rv = rman_reserve_resource(rm, start, end, count, flags, child); + if (rv != NULL) { + rman_set_bustag(rv, &bs_be_tag); + rman_set_bushandle(rv, sc->sc_kva + rman_get_start(rv) - + rm->rm_start); + } return (rv); } -#if 0 static int lbc_print_child(device_t dev, device_t child) { @@ -360,39 +261,9 @@ rid++; } - /* - * The SYS_RES_IOPORT resource of the PCIB has rid 1 because the - * the SYS_RES_MEMORY resource related to the decoding window also - * has rid 1. This is friendlier for the PCIB child... - */ - rid = 1; - while (1) { - error = lbc_get_resource(dev, child, SYS_RES_IOPORT, rid, - &start, &size); - if (error) - break; - retval += (rid == 1) ? printf(" ioport ") : printf(","); - retval += printf("%#lx", start); - if (size > 1) - retval += printf("-%#lx", start + size - 1); - rid++; - } - - rid = 0; - while (1) { - error = lbc_get_resource(dev, child, SYS_RES_IRQ, rid, - &start, &size); - if (error) - break; - retval += (rid == 0) ? printf(" irq ") : printf(","); - retval += printf("%ld", start); - rid++; - } - retval += bus_print_child_footer(dev, child); return (retval); } -#endif static int lbc_read_ivar(device_t dev, device_t child, int index, uintptr_t *result) @@ -408,17 +279,50 @@ case LBC_IVAR_DEVTYPE: *result = dinfo->lbc_devtype; return (0); - + case LBC_IVAR_CLOCK: + *result = 1843200; + return (0); + case LBC_IVAR_REGSHIFT: + *result = 0; + return (0); default: break; } - return (EINVAL); } static int -lbc_release_resource (device_t dev, device_t child, int type, int rid, +lbc_release_resource(device_t dev, device_t child, int type, int rid, struct resource *res) { + return (rman_release_resource(res)); } + +static int +lbc_get_resource(device_t dev, device_t child, int type, int rid, + u_long *startp, u_long *countp) +{ + struct lbc_softc *sc; + struct lbc_devinfo *dinfo; + + if (type != SYS_RES_MEMORY) + return (ENOENT); + + /* Currently all devices have a single RID per type. */ + if (rid != 0) + return (ENOENT); + + sc = device_get_softc(dev); + dinfo = device_get_ivars(child); + + switch (dinfo->lbc_devtype) { + case LBC_DEVTYPE_CFI: + *startp = sc->sc_rman.rm_start; + *countp = sc->sc_rman.rm_end - sc->sc_rman.rm_start + 1; + break; + default: + return(EDOOFUS); + } + return(0); +} ==== //depot/projects/e500/sys/powerpc/mpc85xx/lbc.h#4 (text+ko) ==== @@ -1,5 +1,5 @@ /*- - * Copyright (c) 2006 Juniper Networks + * Copyright (c) 2006-2008, Juniper Networks, Inc. * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -23,48 +23,19 @@ * (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$ + * $FreeBSD: src/sys/powerpc/mpc85xx/lbc.h,v 1.1 2008/10/25 06:03:40 marcel Exp +$ */ -#ifndef _MACHINE_LOCALBUS_H_ -#define _MACHINE_LOCALBUS_H_ +#ifndef _MACHINE_LBC_H_ +#define _MACHINE_LBC_H_ #define LBC_IVAR_DEVTYPE 1 -#define LBC_IVAR_CLOCK 2 +#define LBC_IVAR_CLOCK 2 +#define LBC_IVAR_REGSHIFT 3 /* Device types. */ -#define LBC_DEVTYPE_LCD 1 -#define LBC_DEVTYPE_FLASH 2 +#define LBC_DEVTYPE_CFI 1 +#define LBC_DEVTYPE_UART 2 -#define LB_SDRAM_TYPE 0x01 -#define LB_GPCM_TYPE 0x02 -#define LB_UPM_TYPE 0x04 - -#define LBC85XX_START (0x5000) -#define LBC85XX_SIZE 0x1000 -#define LBC85XX_END (LBC85XX_START + LBC85XX_SIZE) - -/* - * Local access registers. - */ -#define LBC85XX_BR(n) (LBC85XX_START + (8 * n)) /* Base Registers */ -#define LBC85XX_OR(n) (LBC85XX_START + 4 + (8 * n)) /* Options Registers */ - -#define LBC85XX_MAR (LBC85XX_START + 0x68) -#define LBC85XX_MAMR (LBC85XX_START + 0x70) -#define LBC85XX_MBMR (LBC85XX_START + 0x74) -#define LBC85XX_MCMR (LBC85XX_START + 0x78) -#define LBC85XX_MRTPR (LBC85XX_START + 0x84) -#define LBC85XX_MDR (LBC85XX_START + 0x88) -#define LBC85XX_LSDMR (LBC85XX_START + 0x94) -#define LBC85XX_LURT (LBC85XX_START + 0xA0) -#define LBC85XX_LSRT (LBC85XX_START + 0xA4) -#define LBC85XX_LTESR (LBC85XX_START + 0xB0) -#define LBC85XX_LTEDR (LBC85XX_START + 0xB4) -#define LBC85XX_LTEIR (LBC85XX_START + 0xB8) -#define LBC85XX_LTEATR (LBC85XX_START + 0xBC) -#define LBC85XX_LTEAR (LBC85XX_START + 0xC0) -#define LBC85XX_LBCR (LBC85XX_START + 0xD0) -#define LBC85XX_LCRR (LBC85XX_START + 0xD4) - -#endif /* _MACHINE_LOCALBUS_H */ +#endif /* _MACHINE_LBC_H_ */ ==== //depot/projects/e500/sys/sys/cfictl.h#3 (text+ko) ==== @@ -25,6 +25,8 @@ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF * THE POSSIBILITY OF SUCH DAMAGE. + * + * $FreeBSD: src/sys/sys/cfictl.h,v 1.1 2008/10/25 06:18:12 marcel Exp $ */ #ifndef _SYS_CFICTL_H_ From owner-p4-projects@FreeBSD.ORG Sun Oct 26 00:12:53 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3E5E81065670; Sun, 26 Oct 2008 00:12:53 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 029111065672 for ; Sun, 26 Oct 2008 00:12:53 +0000 (UTC) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id E60478FC1C for ; Sun, 26 Oct 2008 00:12:52 +0000 (UTC) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id m9Q0Cqdw048023 for ; Sun, 26 Oct 2008 00:12:52 GMT (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m9Q0CqaR048021 for perforce@freebsd.org; Sun, 26 Oct 2008 00:12:52 GMT (envelope-from marcel@freebsd.org) Date: Sun, 26 Oct 2008 00:12:52 GMT Message-Id: <200810260012.m9Q0CqaR048021@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 151932 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, 26 Oct 2008 00:12:53 -0000 http://perforce.freebsd.org/chv.cgi?CH=151932 Change 151932 by marcel@marcel_xcllnt on 2008/10/26 00:11:58 Diff reduction. Affected files ... .. //depot/projects/e500/sys/powerpc/mpc85xx/lbc.h#5 edit Differences ... ==== //depot/projects/e500/sys/powerpc/mpc85xx/lbc.h#5 (text+ko) ==== @@ -23,8 +23,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/powerpc/mpc85xx/lbc.h,v 1.1 2008/10/25 06:03:40 marcel Exp -$ + * $FreeBSD: src/sys/powerpc/mpc85xx/lbc.h,v 1.1 2008/10/25 06:03:40 marcel Exp $ */ #ifndef _MACHINE_LBC_H_ From owner-p4-projects@FreeBSD.ORG Sun Oct 26 00:21:08 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 708BA106567A; Sun, 26 Oct 2008 00:21:08 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 3322A1065674 for ; Sun, 26 Oct 2008 00:21:08 +0000 (UTC) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 202F98FC1B for ; Sun, 26 Oct 2008 00:21:08 +0000 (UTC) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id m9Q0L7dJ048911 for ; Sun, 26 Oct 2008 00:21:07 GMT (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m9Q0L119048897 for perforce@freebsd.org; Sun, 26 Oct 2008 00:21:01 GMT (envelope-from marcel@freebsd.org) Date: Sun, 26 Oct 2008 00:21:01 GMT Message-Id: <200810260021.m9Q0L119048897@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 151933 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, 26 Oct 2008 00:21:08 -0000 http://perforce.freebsd.org/chv.cgi?CH=151933 Change 151933 by marcel@marcel_xcllnt on 2008/10/26 00:20:50 IFC @151923 Affected files ... .. //depot/projects/powerpc/Makefile.inc1#16 integrate .. //depot/projects/powerpc/etc/periodic/security/200.chkmounts#2 integrate .. //depot/projects/powerpc/lib/libc/sys/mmap.2#3 integrate .. //depot/projects/powerpc/lib/libfetch/http.c#6 integrate .. //depot/projects/powerpc/share/man/man4/snd_hda.4#10 integrate .. //depot/projects/powerpc/share/man/man9/Makefile#17 integrate .. //depot/projects/powerpc/share/man/man9/malloc.9#3 integrate .. //depot/projects/powerpc/sys/arm/arm/undefined.c#3 integrate .. //depot/projects/powerpc/sys/cam/scsi/scsi_target.c#8 integrate .. //depot/projects/powerpc/sys/compat/linux/linux_ioctl.c#8 integrate .. //depot/projects/powerpc/sys/compat/linux/linux_socket.c#9 integrate .. //depot/projects/powerpc/sys/compat/linux/linux_util.c#8 integrate .. //depot/projects/powerpc/sys/conf/NOTES#27 integrate .. //depot/projects/powerpc/sys/conf/files#33 integrate .. //depot/projects/powerpc/sys/conf/files.powerpc#21 integrate .. //depot/projects/powerpc/sys/conf/options#29 integrate .. //depot/projects/powerpc/sys/contrib/altq/altq/altq_cbq.c#3 integrate .. //depot/projects/powerpc/sys/contrib/altq/altq/altq_cdnr.c#2 integrate .. //depot/projects/powerpc/sys/contrib/altq/altq/altq_hfsc.c#3 integrate .. //depot/projects/powerpc/sys/contrib/altq/altq/altq_priq.c#3 integrate .. //depot/projects/powerpc/sys/contrib/altq/altq/altq_red.c#3 integrate .. //depot/projects/powerpc/sys/contrib/altq/altq/altq_rio.c#2 integrate .. //depot/projects/powerpc/sys/contrib/altq/altq/altq_rmclass.c#2 integrate .. //depot/projects/powerpc/sys/contrib/altq/altq/altq_subr.c#5 integrate .. //depot/projects/powerpc/sys/contrib/ipfilter/netinet/ip_compat.h#7 integrate .. //depot/projects/powerpc/sys/dev/ar/if_ar.c#5 integrate .. //depot/projects/powerpc/sys/dev/ce/if_ce.c#6 integrate .. //depot/projects/powerpc/sys/dev/cfi/cfi_bus_lbc.c#1 branch .. //depot/projects/powerpc/sys/dev/cfi/cfi_core.c#1 branch .. //depot/projects/powerpc/sys/dev/cfi/cfi_dev.c#1 branch .. //depot/projects/powerpc/sys/dev/cfi/cfi_reg.h#1 branch .. //depot/projects/powerpc/sys/dev/cfi/cfi_var.h#1 branch .. //depot/projects/powerpc/sys/dev/drm/drm_drv.c#4 integrate .. //depot/projects/powerpc/sys/dev/drm/drm_fops.c#3 integrate .. //depot/projects/powerpc/sys/dev/drm/drm_lock.c#3 integrate .. //depot/projects/powerpc/sys/dev/drm/i915_dma.c#5 integrate .. //depot/projects/powerpc/sys/dev/hwpmc/hwpmc_amd.c#5 integrate .. //depot/projects/powerpc/sys/dev/hwpmc/hwpmc_logging.c#5 integrate .. //depot/projects/powerpc/sys/dev/hwpmc/hwpmc_mod.c#8 integrate .. //depot/projects/powerpc/sys/dev/hwpmc/hwpmc_piv.c#5 integrate .. //depot/projects/powerpc/sys/dev/hwpmc/hwpmc_ppro.c#4 integrate .. //depot/projects/powerpc/sys/dev/hwpmc/hwpmc_x86.c#4 integrate .. //depot/projects/powerpc/sys/dev/iwn/if_iwn.c#2 integrate .. //depot/projects/powerpc/sys/dev/lmc/if_lmc.c#7 integrate .. //depot/projects/powerpc/sys/dev/mii/atphy.c#2 integrate .. //depot/projects/powerpc/sys/dev/mxge/eth_z8e.h#4 integrate .. //depot/projects/powerpc/sys/dev/mxge/ethp_z8e.h#4 integrate .. //depot/projects/powerpc/sys/dev/mxge/rss_eth_z8e.h#4 integrate .. //depot/projects/powerpc/sys/dev/mxge/rss_ethp_z8e.h#4 integrate .. //depot/projects/powerpc/sys/dev/puc/pucdata.c#6 integrate .. //depot/projects/powerpc/sys/dev/ray/if_ray.c#6 integrate .. //depot/projects/powerpc/sys/dev/ray/if_rayvar.h#4 integrate .. //depot/projects/powerpc/sys/dev/sound/pci/hda/hdac.c#18 integrate .. //depot/projects/powerpc/sys/dev/sr/if_sr.c#5 integrate .. //depot/projects/powerpc/sys/dev/uart/uart_tty.c#3 integrate .. //depot/projects/powerpc/sys/dev/usb/u3g.c#2 integrate .. //depot/projects/powerpc/sys/dev/usb/ucom.c#7 integrate .. //depot/projects/powerpc/sys/dev/usb/udbp.c#5 integrate .. //depot/projects/powerpc/sys/dev/usb/ufoma.c#6 integrate .. //depot/projects/powerpc/sys/fs/cd9660/cd9660_node.c#3 integrate .. //depot/projects/powerpc/sys/fs/cd9660/cd9660_vfsops.c#7 integrate .. //depot/projects/powerpc/sys/fs/cd9660/cd9660_vnops.c#3 integrate .. //depot/projects/powerpc/sys/fs/fdescfs/fdesc_vfsops.c#9 integrate .. //depot/projects/powerpc/sys/fs/fdescfs/fdesc_vnops.c#11 integrate .. //depot/projects/powerpc/sys/fs/fifofs/fifo_vnops.c#12 integrate .. //depot/projects/powerpc/sys/fs/hpfs/hpfs_subr.c#4 integrate .. //depot/projects/powerpc/sys/fs/hpfs/hpfs_vfsops.c#11 integrate .. //depot/projects/powerpc/sys/fs/hpfs/hpfs_vnops.c#8 integrate .. //depot/projects/powerpc/sys/fs/msdosfs/msdosfs_denode.c#9 integrate .. //depot/projects/powerpc/sys/fs/msdosfs/msdosfs_vnops.c#13 integrate .. //depot/projects/powerpc/sys/fs/ntfs/ntfs_subr.c#9 integrate .. //depot/projects/powerpc/sys/fs/ntfs/ntfs_vfsops.c#11 integrate .. //depot/projects/powerpc/sys/fs/ntfs/ntfs_vnops.c#8 integrate .. //depot/projects/powerpc/sys/fs/nullfs/null_subr.c#9 integrate .. //depot/projects/powerpc/sys/fs/nullfs/null_vnops.c#13 integrate .. //depot/projects/powerpc/sys/fs/nwfs/nwfs_node.c#10 integrate .. //depot/projects/powerpc/sys/fs/nwfs/nwfs_vfsops.c#7 integrate .. //depot/projects/powerpc/sys/fs/portalfs/portal_vfsops.c#8 integrate .. //depot/projects/powerpc/sys/fs/portalfs/portal_vnops.c#8 integrate .. //depot/projects/powerpc/sys/fs/pseudofs/pseudofs.c#9 integrate .. //depot/projects/powerpc/sys/fs/pseudofs/pseudofs_vncache.c#12 integrate .. //depot/projects/powerpc/sys/fs/smbfs/smbfs_node.c#11 integrate .. //depot/projects/powerpc/sys/fs/smbfs/smbfs_vfsops.c#7 integrate .. //depot/projects/powerpc/sys/fs/udf/udf_vfsops.c#11 integrate .. //depot/projects/powerpc/sys/fs/udf/udf_vnops.c#9 integrate .. //depot/projects/powerpc/sys/fs/unionfs/union_subr.c#16 integrate .. //depot/projects/powerpc/sys/geom/part/g_part_bsd.c#6 integrate .. //depot/projects/powerpc/sys/gnu/fs/ext2fs/ext2_inode.c#3 integrate .. //depot/projects/powerpc/sys/gnu/fs/ext2fs/ext2_lookup.c#3 integrate .. //depot/projects/powerpc/sys/gnu/fs/ext2fs/ext2_vfsops.c#10 integrate .. //depot/projects/powerpc/sys/gnu/fs/reiserfs/reiserfs_inode.c#5 integrate .. //depot/projects/powerpc/sys/gnu/fs/reiserfs/reiserfs_vfsops.c#6 integrate .. //depot/projects/powerpc/sys/i386/conf/NOTES#16 integrate .. //depot/projects/powerpc/sys/i386/i386/sys_machdep.c#10 integrate .. //depot/projects/powerpc/sys/i386/include/apicvar.h#6 integrate .. //depot/projects/powerpc/sys/i386/include/smp.h#9 integrate .. //depot/projects/powerpc/sys/i386/xen/clock.c#2 integrate .. //depot/projects/powerpc/sys/i386/xen/mp_machdep.c#2 integrate .. //depot/projects/powerpc/sys/i386/xen/xen_machdep.c#2 integrate .. //depot/projects/powerpc/sys/ia64/ia64/sscdisk.c#7 integrate .. //depot/projects/powerpc/sys/kern/kern_descrip.c#22 integrate .. //depot/projects/powerpc/sys/kern/kern_event.c#14 integrate .. //depot/projects/powerpc/sys/kern/kern_jail.c#14 integrate .. //depot/projects/powerpc/sys/kern/kern_linker.c#15 integrate .. //depot/projects/powerpc/sys/kern/kern_lockf.c#10 integrate .. //depot/projects/powerpc/sys/kern/kern_mtxpool.c#4 integrate .. //depot/projects/powerpc/sys/kern/kern_proc.c#14 integrate .. //depot/projects/powerpc/sys/kern/kern_prot.c#10 integrate .. //depot/projects/powerpc/sys/kern/kern_resource.c#19 integrate .. //depot/projects/powerpc/sys/kern/subr_blist.c#5 integrate .. //depot/projects/powerpc/sys/kern/subr_sleepqueue.c#14 integrate .. //depot/projects/powerpc/sys/kern/subr_witness.c#24 integrate .. //depot/projects/powerpc/sys/kern/uipc_accf.c#4 integrate .. //depot/projects/powerpc/sys/kern/uipc_mqueue.c#9 integrate .. //depot/projects/powerpc/sys/kern/uipc_syscalls.c#19 integrate .. //depot/projects/powerpc/sys/kern/uipc_usrreq.c#15 integrate .. //depot/projects/powerpc/sys/kern/vfs_export.c#8 integrate .. //depot/projects/powerpc/sys/kern/vfs_syscalls.c#18 integrate .. //depot/projects/powerpc/sys/modules/u3g/Makefile#2 integrate .. //depot/projects/powerpc/sys/net/bpf.c#16 integrate .. //depot/projects/powerpc/sys/net/bsd_comp.c#5 integrate .. //depot/projects/powerpc/sys/net/if.c#17 integrate .. //depot/projects/powerpc/sys/net/if_arcsubr.c#3 integrate .. //depot/projects/powerpc/sys/net/if_ethersubr.c#17 integrate .. //depot/projects/powerpc/sys/net/if_fddisubr.c#7 integrate .. //depot/projects/powerpc/sys/net/if_iso88025subr.c#8 integrate .. //depot/projects/powerpc/sys/net/if_ppp.c#9 integrate .. //depot/projects/powerpc/sys/net/if_sl.c#6 integrate .. //depot/projects/powerpc/sys/net/if_tap.c#9 integrate .. //depot/projects/powerpc/sys/net/if_tun.c#8 integrate .. //depot/projects/powerpc/sys/net/ppp_deflate.c#4 integrate .. //depot/projects/powerpc/sys/net/rtsock.c#10 integrate .. //depot/projects/powerpc/sys/net80211/_ieee80211.h#8 integrate .. //depot/projects/powerpc/sys/net80211/ieee80211_acl.c#4 integrate .. //depot/projects/powerpc/sys/net80211/ieee80211_adhoc.c#3 integrate .. //depot/projects/powerpc/sys/net80211/ieee80211_crypto.c#6 integrate .. //depot/projects/powerpc/sys/net80211/ieee80211_crypto_ccmp.c#5 integrate .. //depot/projects/powerpc/sys/net80211/ieee80211_crypto_tkip.c#5 integrate .. //depot/projects/powerpc/sys/net80211/ieee80211_crypto_wep.c#5 integrate .. //depot/projects/powerpc/sys/net80211/ieee80211_freebsd.c#7 integrate .. //depot/projects/powerpc/sys/net80211/ieee80211_hostap.c#3 integrate .. //depot/projects/powerpc/sys/net80211/ieee80211_input.c#10 integrate .. //depot/projects/powerpc/sys/net80211/ieee80211_ioctl.c#7 integrate .. //depot/projects/powerpc/sys/net80211/ieee80211_node.c#9 integrate .. //depot/projects/powerpc/sys/net80211/ieee80211_output.c#10 integrate .. //depot/projects/powerpc/sys/net80211/ieee80211_power.c#4 integrate .. //depot/projects/powerpc/sys/net80211/ieee80211_proto.c#9 integrate .. //depot/projects/powerpc/sys/net80211/ieee80211_regdomain.c#4 integrate .. //depot/projects/powerpc/sys/net80211/ieee80211_scan.c#5 integrate .. //depot/projects/powerpc/sys/net80211/ieee80211_scan_sta.c#8 integrate .. //depot/projects/powerpc/sys/net80211/ieee80211_sta.c#3 integrate .. //depot/projects/powerpc/sys/netatalk/ddp_pcb.c#3 integrate .. //depot/projects/powerpc/sys/netgraph/atm/sscfu/ng_sscfu_cust.h#2 integrate .. //depot/projects/powerpc/sys/netgraph/bluetooth/drivers/h4/ng_h4.c#3 integrate .. //depot/projects/powerpc/sys/netgraph/bluetooth/hci/ng_hci_main.c#2 integrate .. //depot/projects/powerpc/sys/netgraph/bluetooth/hci/ng_hci_misc.c#2 integrate .. //depot/projects/powerpc/sys/netgraph/bluetooth/l2cap/ng_l2cap_main.c#2 integrate .. //depot/projects/powerpc/sys/netgraph/bluetooth/l2cap/ng_l2cap_misc.c#2 integrate .. //depot/projects/powerpc/sys/netgraph/bluetooth/l2cap/ng_l2cap_misc.h#2 integrate .. //depot/projects/powerpc/sys/netgraph/bluetooth/socket/ng_btsocket_hci_raw.c#3 integrate .. //depot/projects/powerpc/sys/netgraph/bluetooth/socket/ng_btsocket_l2cap.c#7 integrate .. //depot/projects/powerpc/sys/netgraph/bluetooth/socket/ng_btsocket_l2cap_raw.c#3 integrate .. //depot/projects/powerpc/sys/netgraph/bluetooth/socket/ng_btsocket_rfcomm.c#6 integrate .. //depot/projects/powerpc/sys/netgraph/bluetooth/socket/ng_btsocket_sco.c#2 integrate .. //depot/projects/powerpc/sys/netgraph/netflow/netflow.c#5 integrate .. //depot/projects/powerpc/sys/netgraph/netflow/ng_netflow.c#6 integrate .. //depot/projects/powerpc/sys/netgraph/netgraph.h#11 integrate .. //depot/projects/powerpc/sys/netgraph/ng_UI.c#4 integrate .. //depot/projects/powerpc/sys/netgraph/ng_async.c#4 integrate .. //depot/projects/powerpc/sys/netgraph/ng_atmllc.c#2 integrate .. //depot/projects/powerpc/sys/netgraph/ng_base.c#21 integrate .. //depot/projects/powerpc/sys/netgraph/ng_bpf.c#7 integrate .. //depot/projects/powerpc/sys/netgraph/ng_bridge.c#5 integrate .. //depot/projects/powerpc/sys/netgraph/ng_cisco.c#5 integrate .. //depot/projects/powerpc/sys/netgraph/ng_device.c#4 integrate .. //depot/projects/powerpc/sys/netgraph/ng_eiface.c#7 integrate .. //depot/projects/powerpc/sys/netgraph/ng_etf.c#3 integrate .. //depot/projects/powerpc/sys/netgraph/ng_ether.c#7 integrate .. //depot/projects/powerpc/sys/netgraph/ng_fec.c#3 integrate .. //depot/projects/powerpc/sys/netgraph/ng_frame_relay.c#4 integrate .. //depot/projects/powerpc/sys/netgraph/ng_gif.c#5 integrate .. //depot/projects/powerpc/sys/netgraph/ng_gif_demux.c#4 integrate .. //depot/projects/powerpc/sys/netgraph/ng_hole.c#4 integrate .. //depot/projects/powerpc/sys/netgraph/ng_iface.c#6 integrate .. //depot/projects/powerpc/sys/netgraph/ng_ipfw.c#2 integrate .. //depot/projects/powerpc/sys/netgraph/ng_ksocket.c#7 integrate .. //depot/projects/powerpc/sys/netgraph/ng_l2tp.c#8 integrate .. //depot/projects/powerpc/sys/netgraph/ng_lmi.c#4 integrate .. //depot/projects/powerpc/sys/netgraph/ng_message.h#4 integrate .. //depot/projects/powerpc/sys/netgraph/ng_mppc.c#6 integrate .. //depot/projects/powerpc/sys/netgraph/ng_nat.c#7 integrate .. //depot/projects/powerpc/sys/netgraph/ng_one2many.c#4 integrate .. //depot/projects/powerpc/sys/netgraph/ng_parse.c#6 integrate .. //depot/projects/powerpc/sys/netgraph/ng_pipe.c#2 integrate .. //depot/projects/powerpc/sys/netgraph/ng_ppp.c#11 integrate .. //depot/projects/powerpc/sys/netgraph/ng_pptpgre.c#6 integrate .. //depot/projects/powerpc/sys/netgraph/ng_rfc1490.c#4 integrate .. //depot/projects/powerpc/sys/netgraph/ng_sample.c#4 integrate .. //depot/projects/powerpc/sys/netgraph/ng_split.c#4 integrate .. //depot/projects/powerpc/sys/netgraph/ng_sppp.c#3 integrate .. //depot/projects/powerpc/sys/netgraph/ng_tag.c#2 integrate .. //depot/projects/powerpc/sys/netgraph/ng_tcpmss.c#3 integrate .. //depot/projects/powerpc/sys/netgraph/ng_tee.c#7 integrate .. //depot/projects/powerpc/sys/netgraph/ng_tty.c#6 integrate .. //depot/projects/powerpc/sys/netgraph/ng_vjc.c#4 integrate .. //depot/projects/powerpc/sys/netgraph/ng_vlan.c#3 integrate .. //depot/projects/powerpc/sys/netinet/igmp.c#7 integrate .. //depot/projects/powerpc/sys/netinet/in_mcast.c#5 integrate .. //depot/projects/powerpc/sys/netinet/in_pcb.c#18 integrate .. //depot/projects/powerpc/sys/netinet/ip_carp.c#8 integrate .. //depot/projects/powerpc/sys/netinet/sctp_os_bsd.h#14 integrate .. //depot/projects/powerpc/sys/netinet/tcp_syncache.c#19 integrate .. //depot/projects/powerpc/sys/netinet6/in6.c#15 integrate .. //depot/projects/powerpc/sys/netinet6/in6_pcb.c#13 integrate .. //depot/projects/powerpc/sys/netinet6/in6_src.c#15 integrate .. //depot/projects/powerpc/sys/netinet6/raw_ip6.c#14 integrate .. //depot/projects/powerpc/sys/netipsec/keysock.c#6 integrate .. //depot/projects/powerpc/sys/netipsec/xform_ah.c#5 integrate .. //depot/projects/powerpc/sys/netipx/ipx_pcb.c#7 integrate .. //depot/projects/powerpc/sys/netipx/spx_usrreq.c#7 integrate .. //depot/projects/powerpc/sys/netnatm/natm.c#5 integrate .. //depot/projects/powerpc/sys/netnatm/natm_pcb.c#5 integrate .. //depot/projects/powerpc/sys/netncp/ncp_conn.c#10 integrate .. //depot/projects/powerpc/sys/netncp/ncp_rq.c#5 integrate .. //depot/projects/powerpc/sys/netncp/ncp_sock.c#8 integrate .. //depot/projects/powerpc/sys/netncp/ncp_subr.c#4 integrate .. //depot/projects/powerpc/sys/netsmb/smb_rq.c#5 integrate .. //depot/projects/powerpc/sys/netsmb/smb_trantcp.c#7 integrate .. //depot/projects/powerpc/sys/nfs4client/nfs4_dev.c#2 integrate .. //depot/projects/powerpc/sys/nfs4client/nfs4_idmap.c#4 integrate .. //depot/projects/powerpc/sys/nfs4client/nfs4_socket.c#3 integrate .. //depot/projects/powerpc/sys/nfs4client/nfs4_vfsops.c#9 integrate .. //depot/projects/powerpc/sys/nfs4client/nfs4_vn_subs.c#2 integrate .. //depot/projects/powerpc/sys/nfs4client/nfs4_vnops.c#9 integrate .. //depot/projects/powerpc/sys/nfsclient/krpc_subr.c#7 integrate .. //depot/projects/powerpc/sys/nfsclient/nfs_lock.c#8 integrate .. //depot/projects/powerpc/sys/nfsclient/nfs_node.c#9 integrate .. //depot/projects/powerpc/sys/nfsclient/nfs_socket.c#15 integrate .. //depot/projects/powerpc/sys/nfsclient/nfs_subs.c#13 integrate .. //depot/projects/powerpc/sys/nfsclient/nfs_vfsops.c#17 integrate .. //depot/projects/powerpc/sys/nfsclient/nfs_vnops.c#15 integrate .. //depot/projects/powerpc/sys/nfsserver/nfs_serv.c#13 integrate .. //depot/projects/powerpc/sys/nfsserver/nfs_srvcache.c#7 integrate .. //depot/projects/powerpc/sys/nfsserver/nfs_srvsock.c#12 integrate .. //depot/projects/powerpc/sys/nfsserver/nfs_syscalls.c#12 integrate .. //depot/projects/powerpc/sys/opencrypto/cryptodev.c#7 integrate .. //depot/projects/powerpc/sys/opencrypto/cryptosoft.c#4 integrate .. //depot/projects/powerpc/sys/opencrypto/deflate.c#2 integrate .. //depot/projects/powerpc/sys/opencrypto/xform.c#3 integrate .. //depot/projects/powerpc/sys/pci/if_rl.c#12 integrate .. //depot/projects/powerpc/sys/pci/if_rlreg.h#14 integrate .. //depot/projects/powerpc/sys/powerpc/booke/pmap.c#4 integrate .. //depot/projects/powerpc/sys/powerpc/conf/MPC85XX#5 integrate .. //depot/projects/powerpc/sys/powerpc/mpc85xx/lbc.c#1 branch .. //depot/projects/powerpc/sys/powerpc/mpc85xx/lbc.h#1 branch .. //depot/projects/powerpc/sys/powerpc/mpc85xx/ocpbus.c#4 integrate .. //depot/projects/powerpc/sys/rpc/rpcclnt.c#7 integrate .. //depot/projects/powerpc/sys/security/mac_bsdextended/mac_bsdextended.c#9 integrate .. //depot/projects/powerpc/sys/security/mac_lomac/mac_lomac.c#9 integrate .. //depot/projects/powerpc/sys/sys/cfictl.h#1 branch .. //depot/projects/powerpc/sys/sys/malloc.h#6 integrate .. //depot/projects/powerpc/sys/sys/param.h#22 integrate .. //depot/projects/powerpc/sys/ufs/ffs/ffs_inode.c#9 integrate .. //depot/projects/powerpc/sys/ufs/ffs/ffs_snapshot.c#15 integrate .. //depot/projects/powerpc/sys/ufs/ffs/ffs_softdep.c#18 integrate .. //depot/projects/powerpc/sys/ufs/ffs/ffs_vfsops.c#15 integrate .. //depot/projects/powerpc/sys/ufs/ufs/ufs_dirhash.c#7 integrate .. //depot/projects/powerpc/sys/ufs/ufs/ufs_extattr.c#10 integrate .. //depot/projects/powerpc/sys/ufs/ufs/ufs_vnops.c#15 integrate .. //depot/projects/powerpc/sys/xen/evtchn/evtchn.c#2 integrate Differences ... ==== //depot/projects/powerpc/Makefile.inc1#16 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/Makefile.inc1,v 1.611 2008/09/19 16:14:42 obrien Exp $ +# $FreeBSD: src/Makefile.inc1,v 1.613 2008/10/23 16:06:49 des Exp $ # # Make command line options: # -DNO_CLEANDIR run ${MAKE} clean, instead of ${MAKE} cleandir ==== //depot/projects/powerpc/etc/periodic/security/200.chkmounts#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/etc/periodic/security/200.chkmounts,v 1.5 2002/10/25 15:14:16 thomas Exp $ +# $FreeBSD: src/etc/periodic/security/200.chkmounts,v 1.6 2008/10/25 18:45:40 ed Exp $ # # Show changes in the way filesystems are mounted @@ -50,7 +50,7 @@ ignore="${ignore}|^amd:" esac [ -n "$ignore" ] && cmd="egrep -v ${ignore#|}" || cmd=cat - mount -p | ${cmd} | + mount -p | sort | ${cmd} | check_diff mount - "${host} changes in mounted filesystems:" rc=$?;; *) rc=0;; ==== //depot/projects/powerpc/lib/libc/sys/mmap.2#3 (text+ko) ==== @@ -26,9 +26,9 @@ .\" SUCH DAMAGE. .\" .\" @(#)mmap.2 8.4 (Berkeley) 5/11/95 -.\" $FreeBSD: src/lib/libc/sys/mmap.2,v 1.56 2007/01/09 00:28:15 imp Exp $ +.\" $FreeBSD: src/lib/libc/sys/mmap.2,v 1.57 2008/10/24 14:40:13 alc Exp $ .\" -.Dd April 21, 2006 +.Dd October 24, 2008 .Dt MMAP 2 .Os .Sh NAME @@ -252,6 +252,11 @@ in which the file descriptor argument specifies a file or device to which swapping should be done. +.Sh NOTES +Although this implementation does not impose any alignment restrictions on +the +.Fa offset +argument, a portable program must only use page-aligned values. .Sh RETURN VALUES Upon successful completion, .Fn mmap @@ -307,13 +312,6 @@ was specified and the .Fa fd argument was not -1. -The -.Fa offset -argument -was not page-aligned. -(See -.Sx BUGS -below.) .It Bq Er ENODEV .Dv MAP_ANON has not been specified and ==== //depot/projects/powerpc/lib/libfetch/http.c#6 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/lib/libfetch/http.c,v 1.84 2008/02/08 09:48:48 des Exp $"); +__FBSDID("$FreeBSD: src/lib/libfetch/http.c,v 1.85 2008/10/24 07:56:01 ru Exp $"); /* * The following copyright applies to the base64 code: @@ -1064,6 +1064,7 @@ if (url->offset == size && url->length == 0) { /* asked for 0 bytes; fake it */ offset = url->offset; + clength = -1; conn->err = HTTP_OK; break; } else { ==== //depot/projects/powerpc/share/man/man4/snd_hda.4#10 (text+ko) ==== @@ -23,9 +23,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man4/snd_hda.4,v 1.21 2008/10/03 09:19:07 mav Exp $ +.\" $FreeBSD: src/share/man/man4/snd_hda.4,v 1.23 2008/10/24 18:57:11 mav Exp $ .\" -.Dd Sep 17, 2008 +.Dd October 24, 2008 .Dt SND_HDA 4 .Os .Sh NAME @@ -129,6 +129,8 @@ GPIO combination required for your system. ivrefX/ovrefX options controls voltage used to power external microphones and so on. +.It Va hint.hdac.%d.msi +Controls MSI (Message Signaled Interrupts) support. .It Va hint.hdac.%d.cad%d.nid%d.config Overrides codec pin configuration set by BIOS. May be specified as a 32bit HEX value with a leading "0x" or as a set of ==== //depot/projects/powerpc/share/man/man9/Makefile#17 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/share/man/man9/Makefile,v 1.342 2008/09/28 20:15:45 ed Exp $ +# $FreeBSD: src/share/man/man9/Makefile,v 1.343 2008/10/23 15:53:51 des Exp $ MAN= accept_filter.9 \ accf_data.9 \ @@ -741,9 +741,7 @@ MLINKS+=make_dev.9 destroy_dev.9 \ make_dev.9 dev_depends.9 \ make_dev.9 make_dev_alias.9 -MLINKS+=malloc.9 FREE.9 \ - malloc.9 free.9 \ - malloc.9 MALLOC.9 \ +MLINKS+=malloc.9 free.9 \ malloc.9 MALLOC_DECLARE.9 \ malloc.9 MALLOC_DEFINE.9 \ malloc.9 realloc.9 \ ==== //depot/projects/powerpc/share/man/man9/malloc.9#3 (text+ko) ==== @@ -34,16 +34,14 @@ .\" POSSIBILITY OF SUCH DAMAGE. .\" .\" $NetBSD: malloc.9,v 1.3 1996/11/11 00:05:11 lukem Exp $ -.\" $FreeBSD: src/share/man/man9/malloc.9,v 1.43 2008/03/25 15:44:49 ru Exp $ +.\" $FreeBSD: src/share/man/man9/malloc.9,v 1.44 2008/10/23 15:53:51 des Exp $ .\" -.Dd June 12, 2003 +.Dd October 23, 2008 .Dt MALLOC 9 .Os .Sh NAME .Nm malloc , -.Nm MALLOC , .Nm free , -.Nm FREE , .Nm realloc , .Nm reallocf , .Nm MALLOC_DEFINE , @@ -54,10 +52,8 @@ .In sys/malloc.h .Ft void * .Fn malloc "unsigned long size" "struct malloc_type *type" "int flags" -.Fn MALLOC space cast "unsigned long size" "struct malloc_type *type" "int flags" .Ft void .Fn free "void *addr" "struct malloc_type *type" -.Fn FREE "void *addr" "struct malloc_type *type" .Ft void * .Fn realloc "void *addr" "unsigned long size" "struct malloc_type *type" "int flags" .Ft void * @@ -123,20 +119,6 @@ except that it will free the passed pointer when the requested memory cannot be allocated. .Pp -The -.Fn MALLOC -macro variant is functionally equivalent to -.Bd -literal -offset indent -(space) = (cast)malloc((u_long)(size), type, flags) -.Ed -.Pp -and the -.Fn FREE -macro variant is equivalent to -.Bd -literal -offset indent -free((addr), type) -.Ed -.Pp Unlike its standard C library counterpart .Pq Xr malloc 3 , the kernel version takes two more arguments. @@ -219,7 +201,7 @@ /* sys/something/foo_subr.c */ \&... -MALLOC(buf, struct foo_buf *, sizeof *buf, M_FOOBUF, M_NOWAIT); +buf = malloc(sizeof *buf, M_FOOBUF, M_NOWAIT); .Ed .Pp ==== //depot/projects/powerpc/sys/arm/arm/undefined.c#3 (text+ko) ==== @@ -48,7 +48,7 @@ #include "opt_ddb.h" #include -__FBSDID("$FreeBSD: src/sys/arm/arm/undefined.c,v 1.15 2007/06/04 21:38:45 attilio Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/arm/undefined.c,v 1.16 2008/10/23 15:53:51 des Exp $"); #include #include @@ -106,7 +106,7 @@ KASSERT(handler != NULL, ("handler is NULL")); /* Used to be legal. */ /* XXX: M_TEMP??? */ - MALLOC(uh, struct undefined_handler *, sizeof(*uh), M_TEMP, M_WAITOK); + uh = malloc(sizeof(*uh), M_TEMP, M_WAITOK); uh->uh_handler = handler; install_coproc_handler_static(coproc, uh); return uh; @@ -125,7 +125,7 @@ struct undefined_handler *uh = cookie; LIST_REMOVE(uh, uh_link); - FREE(uh, M_TEMP); + free(uh, M_TEMP); } ==== //depot/projects/powerpc/sys/cam/scsi/scsi_target.c#8 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_target.c,v 1.75 2008/09/27 08:51:18 ed Exp $"); +__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_target.c,v 1.76 2008/10/23 15:53:51 des Exp $"); #include @@ -183,7 +183,7 @@ make_dev(&targ_cdevsw, dev2unit(dev), UID_ROOT, GID_WHEEL, 0600, "targ%d", dev2unit(dev)); } - MALLOC(softc, struct targ_softc *, sizeof(*softc), M_TARG, + softc = malloc(sizeof(*softc), M_TARG, M_WAITOK | M_ZERO); dev->si_drv1 = softc; softc->state = TARG_STATE_OPENED; @@ -211,7 +211,7 @@ if ((softc->periph == NULL) || (softc->state & TARG_STATE_LUN_ENABLED) == 0) { destroy_dev(dev); - FREE(softc, M_TARG); + free(softc, M_TARG); return (0); } @@ -230,7 +230,7 @@ softc->periph = NULL; } destroy_dev(dev); - FREE(softc, M_TARG); + free(softc, M_TARG); } cam_periph_unlock(periph); cam_periph_release(periph); @@ -531,7 +531,7 @@ } while ((descr = TAILQ_FIRST(&softc->abort_queue)) != NULL) { TAILQ_REMOVE(&softc->abort_queue, descr, tqe); - FREE(descr, M_TARG); + free(descr, M_TARG); } softc->periph = NULL; @@ -966,7 +966,7 @@ int ccb_len; ccb_len = targccblen(type); - MALLOC(ccb, union ccb *, ccb_len, M_TARG, M_WAITOK); + ccb = malloc(ccb_len, M_TARG, M_WAITOK); CAM_DEBUG(softc->path, CAM_DEBUG_PERIPH, ("getccb %p\n", ccb)); xpt_setup_ccb(&ccb->ccb_h, softc->path, priority); @@ -981,13 +981,13 @@ { CAM_DEBUG_PRINT(CAM_DEBUG_PERIPH, ("targfreeccb descr %p and\n", ccb->ccb_h.targ_descr)); - FREE(ccb->ccb_h.targ_descr, M_TARG); + free(ccb->ccb_h.targ_descr, M_TARG); switch (ccb->ccb_h.func_code) { case XPT_ACCEPT_TARGET_IO: case XPT_IMMED_NOTIFY: CAM_DEBUG_PRINT(CAM_DEBUG_PERIPH, ("freeing ccb %p\n", ccb)); - FREE(ccb, M_TARG); + free(ccb, M_TARG); break; default: /* Send back CCB if we got it from the periph */ @@ -998,7 +998,7 @@ } else { CAM_DEBUG_PRINT(CAM_DEBUG_PERIPH, ("freeing ccb %p\n", ccb)); - FREE(ccb, M_TARG); + free(ccb, M_TARG); } break; } @@ -1009,7 +1009,7 @@ { struct targ_cmd_descr *descr; - MALLOC(descr, struct targ_cmd_descr *, sizeof(*descr), M_TARG, + descr = malloc(sizeof(*descr), M_TARG, M_WAITOK); descr->mapinfo.num_bufs_used = 0; return (descr); ==== //depot/projects/powerpc/sys/compat/linux/linux_ioctl.c#8 (text+ko) ==== @@ -29,7 +29,7 @@ #include "opt_compat.h" #include -__FBSDID("$FreeBSD: src/sys/compat/linux/linux_ioctl.c,v 1.144 2008/10/02 15:37:58 zec Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/linux/linux_ioctl.c,v 1.145 2008/10/23 15:53:51 des Exp $"); #include #include @@ -2673,7 +2673,7 @@ break; } if (he == NULL) { - MALLOC(he, struct handler_element *, sizeof(*he), + he = malloc(sizeof(*he), M_LINUX, M_WAITOK); he->func = h->func; } else @@ -2711,7 +2711,7 @@ if (he->func == h->func) { TAILQ_REMOVE(&handlers, he, list); sx_xunlock(&linux_ioctl_sx); - FREE(he, M_LINUX); + free(he, M_LINUX); return (0); } } ==== //depot/projects/powerpc/sys/compat/linux/linux_socket.c#9 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/compat/linux/linux_socket.c,v 1.77 2008/10/02 15:37:58 zec Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/linux/linux_socket.c,v 1.78 2008/10/23 15:53:51 des Exp $"); /* XXX we use functions that might not exist. */ #include "opt_compat.h" @@ -120,7 +120,7 @@ } #endif - MALLOC(kosa, struct osockaddr *, alloclen, mtype, M_WAITOK); + kosa = malloc(alloclen, mtype, M_WAITOK); if ((error = copyin(osa, kosa, *osalen))) goto out; @@ -168,7 +168,7 @@ return (0); out: - FREE(kosa, mtype); + free(kosa, mtype); return (error); } @@ -458,7 +458,7 @@ bad: if (to) - FREE(to, M_SONAME); + free(to, M_SONAME); return (error); } ==== //depot/projects/powerpc/sys/compat/linux/linux_util.c#8 (text+ko) ==== @@ -30,7 +30,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/compat/linux/linux_util.c,v 1.35 2008/06/02 08:40:06 ed Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/linux/linux_util.c,v 1.36 2008/10/23 15:53:51 des Exp $"); #include "opt_compat.h" @@ -165,7 +165,7 @@ char formated[256]; int current_size = 0, string_size = 1024; - MALLOC(string, char *, string_size, M_LINUX, M_WAITOK); + string = malloc(string_size, M_LINUX, M_WAITOK); string[0] = '\000'; last = ""; TAILQ_FOREACH(de, &devices, list) { @@ -181,10 +181,10 @@ if (strlen(formated) + current_size >= string_size) { string_size *= 2; - MALLOC(string, char *, string_size, + string = malloc(string_size, M_LINUX, M_WAITOK); bcopy(temp, string, current_size); - FREE(temp, M_LINUX); + free(temp, M_LINUX); } strcat(string, formated); current_size = strlen(string); @@ -197,7 +197,7 @@ void linux_free_get_char_devices(char *string) { - FREE(string, M_LINUX); + free(string, M_LINUX); } static int linux_major_starting = 200; @@ -210,7 +210,7 @@ if (d == NULL) return (EINVAL); - MALLOC(de, struct device_element *, sizeof(*de), + de = malloc(sizeof(*de), M_LINUX, M_WAITOK); if (d->linux_major < 0) { d->linux_major = linux_major_starting++; @@ -234,7 +234,7 @@ TAILQ_FOREACH(de, &devices, list) { if (bcmp(d, &de->entry, sizeof(*d)) == 0) { TAILQ_REMOVE(&devices, de, list); - FREE(de, M_LINUX); + free(de, M_LINUX); return (0); } } ==== //depot/projects/powerpc/sys/conf/NOTES#27 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/NOTES,v 1.1510 2008/10/22 17:50:45 obrien Exp $ +# $FreeBSD: src/sys/conf/NOTES,v 1.1511 2008/10/24 07:16:13 n_hibma Exp $ # # NOTES -- Lines that can be cut/pasted into kernel and hints configs. # @@ -2419,7 +2419,7 @@ # # USB serial support device ucom -# USB support for 3G modem cards by Option, Huawei and Sierra +# USB support for 3G modem cards by Option, Novatel, Huawei and Sierra device u3g # USB support for Technologies ARK3116 based serial adapters device uark @@ -2486,6 +2486,7 @@ # debugging options for the USB subsystem # options USB_DEBUG +options U3G_DEBUG # options for ukbd: options UKBD_DFLT_KEYMAP # specify the built-in keymap ==== //depot/projects/powerpc/sys/conf/files#33 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/files,v 1.1339 2008/10/21 20:33:40 mav Exp $ +# $FreeBSD: src/sys/conf/files,v 1.1340 2008/10/25 06:18:12 marcel Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -532,6 +532,8 @@ dev/cardbus/cardbus.c optional cardbus dev/cardbus/cardbus_cis.c optional cardbus dev/cardbus/cardbus_device.c optional cardbus +dev/cfi/cfi_core.c optional cfi +dev/cfi/cfi_dev.c optional cfi dev/ciss/ciss.c optional ciss dev/cm/smc90cx6.c optional cm dev/cmx/cmx.c optional cmx ==== //depot/projects/powerpc/sys/conf/files.powerpc#21 (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.82 2008/10/14 14:54:14 nwhitehorn Exp $ +# $FreeBSD: src/sys/conf/files.powerpc,v 1.84 2008/10/25 06:18:12 marcel Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -28,6 +28,7 @@ crypto/blowfish/bf_enc.c optional crypto | ipsec crypto/des/des_enc.c optional crypto | ipsec | netsmb dev/bm/if_bm.c optional bm powermac +dev/cfi/cfi_bus_lbc.c optional cfi dev/fb/fb.c optional sc dev/hwpmc/hwpmc_powerpc.c optional hwpmc dev/kbd/kbd.c optional sc @@ -99,6 +100,7 @@ powerpc/fpu/fpu_mul.c optional fpu_emu powerpc/fpu/fpu_sqrt.c optional fpu_emu powerpc/fpu/fpu_subr.c optional fpu_emu +powerpc/mpc85xx/lbc.c optional mpc85xx powerpc/mpc85xx/mpc85xx.c optional mpc85xx powerpc/mpc85xx/nexus.c optional mpc85xx powerpc/mpc85xx/ocpbus.c optional mpc85xx ==== //depot/projects/powerpc/sys/conf/options#29 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/options,v 1.642 2008/10/01 19:24:16 jhb Exp $ +# $FreeBSD: src/sys/conf/options,v 1.643 2008/10/24 07:16:13 n_hibma Exp $ # # On the handling of kernel options # @@ -618,6 +618,7 @@ # options for USB support USB_DEBUG opt_usb.h USBVERBOSE opt_usb.h +U3G_DEBUG opt_u3g.h UKBD_DFLT_KEYMAP opt_ukbd.h UPLCOM_INTR_INTERVAL opt_uplcom.h UVSCOM_DEFAULT_OPKTSIZE opt_uvscom.h ==== //depot/projects/powerpc/sys/contrib/altq/altq/altq_cbq.c#3 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/contrib/altq/altq/altq_cbq.c,v 1.5 2007/07/03 12:46:05 mlaier Exp $ */ +/* $FreeBSD: src/sys/contrib/altq/altq/altq_cbq.c,v 1.6 2008/10/23 15:53:51 des Exp $ */ /* $KAME: altq_cbq.c,v 1.19 2003/09/17 14:23:25 kjc Exp $ */ /* @@ -273,7 +273,7 @@ return (ENODEV); /* allocate and initialize cbq_state_t */ - MALLOC(cbqp, cbq_state_t *, sizeof(cbq_state_t), M_DEVBUF, M_WAITOK); + cbqp = malloc(sizeof(cbq_state_t), M_DEVBUF, M_WAITOK); if (cbqp == NULL) return (ENOMEM); bzero(cbqp, sizeof(cbq_state_t)); @@ -304,7 +304,7 @@ cbq_class_destroy(cbqp, cbqp->ifnp.root_); /* deallocate cbq_state_t */ - FREE(cbqp, M_DEVBUF); + free(cbqp, M_DEVBUF); return (0); } @@ -927,7 +927,7 @@ return (ENXIO); /* allocate and initialize cbq_state_t */ - MALLOC(new_cbqp, cbq_state_t *, sizeof(cbq_state_t), M_DEVBUF, M_WAITOK); + new_cbqp = malloc(sizeof(cbq_state_t), M_DEVBUF, M_WAITOK); if (new_cbqp == NULL) return (ENOMEM); bzero(new_cbqp, sizeof(cbq_state_t)); @@ -943,7 +943,7 @@ cbq_enqueue, cbq_dequeue, cbq_request, &new_cbqp->cbq_classifier, acc_classify); if (error) { - FREE(new_cbqp, M_DEVBUF); + free(new_cbqp, M_DEVBUF); return (error); } @@ -987,7 +987,7 @@ } /* deallocate cbq_state_t */ - FREE(cbqp, M_DEVBUF); + free(cbqp, M_DEVBUF); return (0); } ==== //depot/projects/powerpc/sys/contrib/altq/altq/altq_cdnr.c#2 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/contrib/altq/altq/altq_cdnr.c,v 1.3 2006/11/06 13:41:50 rwatson Exp $ */ +/* $FreeBSD: src/sys/contrib/altq/altq/altq_cdnr.c,v 1.4 2008/10/23 15:53:51 des Exp $ */ /* $KAME: altq_cdnr.c,v 1.14 2003/09/05 22:40:36 itojun Exp $ */ /* @@ -274,7 +274,7 @@ return (NULL); } - MALLOC(cb, struct cdnr_block *, size, M_DEVBUF, M_WAITOK); + cb = malloc(size, M_DEVBUF, M_WAITOK); if (cb == NULL) return (NULL); bzero(cb, size); @@ -319,7 +319,7 @@ if (cb->cb_top != cblock) LIST_REMOVE(cb, cb_next); - FREE(cb, M_DEVBUF); + free(cb, M_DEVBUF); } /* ==== //depot/projects/powerpc/sys/contrib/altq/altq/altq_hfsc.c#3 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/contrib/altq/altq/altq_hfsc.c,v 1.4 2007/07/03 12:46:05 mlaier Exp $ */ +/* $FreeBSD: src/sys/contrib/altq/altq/altq_hfsc.c,v 1.6 2008/10/23 20:26:15 des Exp $ */ /* $KAME: altq_hfsc.c,v 1.24 2003/12/05 05:40:46 kjc Exp $ */ /* @@ -202,15 +202,14 @@ if (!ALTQ_IS_READY(&ifp->if_snd)) return (ENODEV); - MALLOC(hif, struct hfsc_if *, sizeof(struct hfsc_if), - M_DEVBUF, M_WAITOK); + hif = malloc(sizeof(struct hfsc_if), M_DEVBUF, M_WAITOK); if (hif == NULL) return (ENOMEM); bzero(hif, sizeof(struct hfsc_if)); hif->hif_eligible = ellist_alloc(); if (hif->hif_eligible == NULL) { - FREE(hif, M_DEVBUF); + free(hif, M_DEVBUF); return (ENOMEM); } @@ -236,7 +235,7 @@ ellist_destroy(hif->hif_eligible); - FREE(hif, M_DEVBUF); + free(hif, M_DEVBUF); return (0); } @@ -404,14 +403,12 @@ } #endif - MALLOC(cl, struct hfsc_class *, sizeof(struct hfsc_class), - M_DEVBUF, M_WAITOK); + cl = malloc(sizeof(struct hfsc_class), M_DEVBUF, M_WAITOK); if (cl == NULL) return (NULL); bzero(cl, sizeof(struct hfsc_class)); - MALLOC(cl->cl_q, class_queue_t *, sizeof(class_queue_t), - M_DEVBUF, M_WAITOK); + cl->cl_q = malloc(sizeof(class_queue_t), M_DEVBUF, M_WAITOK); if (cl->cl_q == NULL) goto err_ret; bzero(cl->cl_q, sizeof(class_queue_t)); @@ -471,8 +468,8 @@ #endif /* ALTQ_RED */ if (rsc != NULL && (rsc->m1 != 0 || rsc->m2 != 0)) { - MALLOC(cl->cl_rsc, struct internal_sc *, - sizeof(struct internal_sc), M_DEVBUF, M_WAITOK); + cl->cl_rsc = malloc(sizeof(struct internal_sc), + M_DEVBUF, M_WAITOK); if (cl->cl_rsc == NULL) goto err_ret; sc2isc(rsc, cl->cl_rsc); @@ -480,16 +477,16 @@ rtsc_init(&cl->cl_eligible, cl->cl_rsc, 0, 0); } if (fsc != NULL && (fsc->m1 != 0 || fsc->m2 != 0)) { - MALLOC(cl->cl_fsc, struct internal_sc *, - sizeof(struct internal_sc), M_DEVBUF, M_WAITOK); + cl->cl_fsc = malloc(sizeof(struct internal_sc), + M_DEVBUF, M_WAITOK); if (cl->cl_fsc == NULL) goto err_ret; sc2isc(fsc, cl->cl_fsc); rtsc_init(&cl->cl_virtual, cl->cl_fsc, 0, 0); } if (usc != NULL && (usc->m1 != 0 || usc->m2 != 0)) { - MALLOC(cl->cl_usc, struct internal_sc *, - sizeof(struct internal_sc), M_DEVBUF, M_WAITOK); + cl->cl_usc = malloc(sizeof(struct internal_sc), + M_DEVBUF, M_WAITOK); if (cl->cl_usc == NULL) goto err_ret; sc2isc(usc, cl->cl_usc); @@ -565,14 +562,14 @@ #endif } if (cl->cl_fsc != NULL) - FREE(cl->cl_fsc, M_DEVBUF); + free(cl->cl_fsc, M_DEVBUF); if (cl->cl_rsc != NULL) - FREE(cl->cl_rsc, M_DEVBUF); + free(cl->cl_rsc, M_DEVBUF); if (cl->cl_usc != NULL) - FREE(cl->cl_usc, M_DEVBUF); + free(cl->cl_usc, M_DEVBUF); if (cl->cl_q != NULL) - FREE(cl->cl_q, M_DEVBUF); - FREE(cl, M_DEVBUF); + free(cl->cl_q, M_DEVBUF); + free(cl, M_DEVBUF); >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sun Oct 26 08:18:12 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 645BF106566C; Sun, 26 Oct 2008 08:18:12 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 1C0AF1065676 for ; Sun, 26 Oct 2008 08:18:12 +0000 (UTC) (envelope-from andrew@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 09AD98FC0C for ; Sun, 26 Oct 2008 08:18:12 +0000 (UTC) (envelope-from andrew@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id m9Q8IB0M015507 for ; Sun, 26 Oct 2008 08:18:11 GMT (envelope-from andrew@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m9Q8IBsM015505 for perforce@freebsd.org; Sun, 26 Oct 2008 08:18:11 GMT (envelope-from andrew@freebsd.org) Date: Sun, 26 Oct 2008 08:18:11 GMT Message-Id: <200810260818.m9Q8IBsM015505@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to andrew@freebsd.org using -f From: Andrew Turner To: Perforce Change Reviews Cc: Subject: PERFORCE change 151940 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, 26 Oct 2008 08:18:12 -0000 http://perforce.freebsd.org/chv.cgi?CH=151940 Change 151940 by andrew@andrew_bender on 2008/10/26 08:17:42 Disable interrupts in s3c24x0_mci_fini Implement MMC/SD writing Affected files ... .. //depot/projects/arm/src/sys/arm/s3c2xx0/s3c24x0_mci.c#2 edit Differences ... ==== //depot/projects/arm/src/sys/arm/s3c2xx0/s3c24x0_mci.c#2 (text+ko) ==== @@ -120,6 +120,10 @@ static void s3c24x0_mci_fini(device_t dev) { + struct s3c24x0_mci_softc *sc; + + sc = device_get_softc(dev); + WR4(sc, SDI_IMSK, 0x0); /* Disable all interrupts */ } static int @@ -231,7 +235,8 @@ { uint32_t cmdr, dcon; struct mmc_data *data; - int fifo_cnt, read_cnt; + uint32_t *vaddr; + int read_cnt, write_cnt; sc->curcmd = cmd; data = cmd->data; @@ -276,14 +281,22 @@ WR4(sc, SDI_CCON, cmdr); - if (data && (data->flags & MMC_DATA_READ)) { - uint32_t *vaddr = cmd->data->data; - read_cnt = cmd->data->len; - fifo_cnt = 0; - while(read_cnt) { - *(vaddr++) = RD4(sc, SDI_DAT); - read_cnt -= 4; - fifo_cnt++; + if (data) { + if (data->flags & MMC_DATA_WRITE) { + vaddr = cmd->data->data; + write_cnt = cmd->data->len; + while (write_cnt > 0) { + WR4(sc, SDI_DAT, *(vaddr++)); + write_cnt -= 4; + } + } + if (data->flags & MMC_DATA_READ) { + vaddr = cmd->data->data; + read_cnt = cmd->data->len; + while (read_cnt > 0) { + *(vaddr++) = RD4(sc, SDI_DAT); + read_cnt -= 4; + } } } } @@ -338,7 +351,7 @@ static int s3c24x0_mci_get_ro(device_t brdev, device_t reqdev) { - return (-1); + return (0); } static int From owner-p4-projects@FreeBSD.ORG Sun Oct 26 10:10:13 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 24CDC1065671; Sun, 26 Oct 2008 10:10:13 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id C48C1106566B for ; Sun, 26 Oct 2008 10:10:12 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id B1CD78FC1E for ; Sun, 26 Oct 2008 10:10:12 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id m9QAACRd035851 for ; Sun, 26 Oct 2008 10:10:12 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m9QAACHZ035849 for perforce@freebsd.org; Sun, 26 Oct 2008 10:10:12 GMT (envelope-from hselasky@FreeBSD.org) Date: Sun, 26 Oct 2008 10:10:12 GMT Message-Id: <200810261010.m9QAACHZ035849@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 151943 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, 26 Oct 2008 10:10:13 -0000 http://perforce.freebsd.org/chv.cgi?CH=151943 Change 151943 by hselasky@hselasky_laptop001 on 2008/10/26 10:09:56 Add support for dynamic USB quirks - step one. Affected files ... .. //depot/projects/usb/src/lib/libusb20/libusb20.3#3 edit .. //depot/projects/usb/src/lib/libusb20/libusb20.c#6 edit .. //depot/projects/usb/src/lib/libusb20/libusb20.h#5 edit .. //depot/projects/usb/src/lib/libusb20/libusb20_int.h#5 edit .. //depot/projects/usb/src/lib/libusb20/libusb20_ugen20.c#5 edit .. //depot/projects/usb/src/usr.sbin/usbconfig/dump.c#5 edit .. //depot/projects/usb/src/usr.sbin/usbconfig/dump.h#3 edit .. //depot/projects/usb/src/usr.sbin/usbconfig/usbconfig.c#2 edit Differences ... ==== //depot/projects/usb/src/lib/libusb20/libusb20.3#3 (text+ko) ==== @@ -674,6 +674,58 @@ . .Sh USB BACKEND OPERATIONS . +.Fn libusb20_be_get_dev_quirk +This function will return the device quirk according to +.Fa index +into the libusb20_quirk structure pointed to by +.Fa pq . +This function returns zero on success else a LIBUSB20_ERROR value is +returned. +. +If the given quirk does not exist LIBUSB20_ERROR_NOT_FOUND is +returned. +. +.Pp +. +.Fn libusb20_be_get_quirk_name +This function will return the quirk name according to +.Fa index +into the libusb20_quirk structure pointed to by +.Fa pq . +This function returns zero on success else a LIBUSB20_ERROR value is +returned. +. +If the given quirk does not exist LIBUSB20_ERROR_NOT_FOUND is +returned. +. +.Pp +. +.Fn libusb20_be_add_dev_quirk +This function will add the libusb20_quirk structure pointed to by the +.Fa pq +argument into the device quirk list. +. +This function returns zero on success else a LIBUSB20_ERROR value is +returned. +. +If the given quirk cannot be added LIBUSB20_ERROR_NO_MEM is +returned. +. +.Pp +. +.Fn libusb20_be_remove_dev_quirk +This function will remove the quirk matching the libusb20_quirk structure pointed to by the +.Fa pq +argument from the device quirk list. +. +This function returns zero on success else a LIBUSB20_ERROR value is +returned. +. +If the given quirk does not exist LIBUSB20_ERROR_NOT_FOUND is +returned. +. +.Pp +. .Fn libusb20_be_set_owner This function will set the ownership for the given backend. . ==== //depot/projects/usb/src/lib/libusb20/libusb20.c#6 (text+ko) ==== @@ -1070,6 +1070,34 @@ /* USB backend operations */ int +libusb20_be_get_dev_quirk(struct libusb20_backend *pbe, + uint16_t index, struct libusb20_quirk *pq) +{ + return ((pbe->methods->root_get_dev_quirk) (pbe, index, pq)); +} + +int +libusb20_be_get_quirk_name(struct libusb20_backend *pbe, + uint16_t index, struct libusb20_quirk *pq) +{ + return ((pbe->methods->root_get_quirk_name) (pbe, index, pq)); +} + +int +libusb20_be_add_dev_quirk(struct libusb20_backend *pbe, + struct libusb20_quirk *pq) +{ + return ((pbe->methods->root_add_dev_quirk) (pbe, pq)); +} + +int +libusb20_be_remove_dev_quirk(struct libusb20_backend *pbe, + struct libusb20_quirk *pq) +{ + return ((pbe->methods->root_remove_dev_quirk) (pbe, pq)); +} + +int libusb20_be_set_owner(struct libusb20_backend *pbe, uid_t user, gid_t group) { return ((pbe->methods->root_set_owner) (pbe, user, group)); ==== //depot/projects/usb/src/lib/libusb20/libusb20.h#5 (text+ko) ==== @@ -186,6 +186,14 @@ typedef void (libusb20_tr_callback_t)(struct libusb20_transfer *xfer); +struct libusb20_quirk { + uint16_t vid; /* vendor ID */ + uint16_t pid; /* product ID */ + uint16_t reserved[2]; /* for the future */ + char quirkname[64 - 8]; /* quirk name including terminating + * zero */ +}; + /* USB transfer operations */ int libusb20_tr_close(struct libusb20_transfer *xfer); @@ -272,6 +280,10 @@ /* USB global operations */ +int libusb20_be_get_dev_quirk(struct libusb20_backend *pbe, uint16_t index, struct libusb20_quirk *pq); +int libusb20_be_get_quirk_name(struct libusb20_backend *pbe, uint16_t index, struct libusb20_quirk *pq); +int libusb20_be_add_dev_quirk(struct libusb20_backend *pbe, struct libusb20_quirk *pq); +int libusb20_be_remove_dev_quirk(struct libusb20_backend *pbe, struct libusb20_quirk *pq); int libusb20_be_set_owner(struct libusb20_backend *be, uid_t user, gid_t group); int libusb20_be_set_perm(struct libusb20_backend *be, mode_t mode); int libusb20_be_get_owner(struct libusb20_backend *be, uid_t *user, gid_t *group); ==== //depot/projects/usb/src/lib/libusb20/libusb20_int.h#5 (text+ko) ==== @@ -34,6 +34,7 @@ struct libusb20_device; struct libusb20_backend; struct libusb20_transfer; +struct libusb20_quirk; union libusb20_session_data { unsigned long session_data; @@ -43,6 +44,10 @@ /* USB backend specific */ typedef const char *(libusb20_get_backend_name_t)(void); +typedef int (libusb20_root_get_dev_quirk_t)(struct libusb20_backend *pbe, uint16_t index, struct libusb20_quirk *pq); +typedef int (libusb20_root_get_quirk_name_t)(struct libusb20_backend *pbe, uint16_t index, struct libusb20_quirk *pq); +typedef int (libusb20_root_add_dev_quirk_t)(struct libusb20_backend *pbe, struct libusb20_quirk *pq); +typedef int (libusb20_root_remove_dev_quirk_t)(struct libusb20_backend *pbe, struct libusb20_quirk *pq); typedef int (libusb20_bus_get_owner_t)(struct libusb20_backend *pbe, uint8_t bus, uid_t *user, gid_t *group); typedef int (libusb20_bus_get_perm_t)(struct libusb20_backend *pbe, uint8_t bus, mode_t *mode); typedef int (libusb20_bus_set_owner_t)(struct libusb20_backend *pbe, uint8_t bus, uid_t user, gid_t group); @@ -88,6 +93,10 @@ m(n, dev_set_iface_perm) \ m(n, dev_set_owner) \ m(n, dev_set_perm) \ + m(n, root_get_dev_quirk) \ + m(n, root_get_quirk_name) \ + m(n, root_add_dev_quirk) \ + m(n, root_remove_dev_quirk) \ m(n, root_set_owner) \ m(n, root_get_owner) \ m(n, root_set_perm) \ ==== //depot/projects/usb/src/lib/libusb20/libusb20_ugen20.c#5 (text+ko) ==== @@ -62,6 +62,10 @@ static libusb20_dev_set_iface_perm_t ugen20_dev_set_iface_perm; static libusb20_dev_set_owner_t ugen20_dev_set_owner; static libusb20_dev_set_perm_t ugen20_dev_set_perm; +static libusb20_root_get_dev_quirk_t ugen20_root_get_dev_quirk; +static libusb20_root_get_quirk_name_t ugen20_root_get_quirk_name; +static libusb20_root_add_dev_quirk_t ugen20_root_add_dev_quirk; +static libusb20_root_remove_dev_quirk_t ugen20_root_remove_dev_quirk; static libusb20_root_set_owner_t ugen20_root_set_owner; static libusb20_root_get_owner_t ugen20_root_get_owner; static libusb20_root_set_perm_t ugen20_root_set_perm; @@ -929,6 +933,34 @@ } static int +ugen20_root_get_dev_quirk(struct libusb20_backend *pbe, + uint16_t index, struct libusb20_quirk *pq) +{ + return (LIBUSB20_ERROR_NOT_SUPPORTED); +} + +static int +ugen20_root_get_quirk_name(struct libusb20_backend *pbe, uint16_t index, + struct libusb20_quirk *pq) +{ + return (LIBUSB20_ERROR_NOT_SUPPORTED); +} + +static int +ugen20_root_add_dev_quirk(struct libusb20_backend *pbe, + struct libusb20_quirk *pq) +{ + return (LIBUSB20_ERROR_NOT_SUPPORTED); +} + +static int +ugen20_root_remove_dev_quirk(struct libusb20_backend *pbe, + struct libusb20_quirk *pq) +{ + return (LIBUSB20_ERROR_NOT_SUPPORTED); +} + +static int ugen20_dev_set_owner(struct libusb20_device *pdev, uid_t user, gid_t group) { ==== //depot/projects/usb/src/usr.sbin/usbconfig/dump.c#5 (text+ko) ==== @@ -240,6 +240,63 @@ } void +dump_be_quirk_names(struct libusb20_backend *pbe) +{ + struct libusb20_quirk q; + uint16_t x; + int err; + + memset(&q, 0, sizeof(q)); + + printf("\nDumping list of supported quirks:\n\n"); + + for (x = 0; x != 0xFFFF; x++) { + + err = libusb20_be_get_quirk_name(pbe, x, &q); + if (err) { + if (x == 0) { + printf("No quirk names - maybe the USB quirk " + "module has not been loaded.\n"); + } + break; + } + printf("%s\n", q.quirkname); + } + printf("\n"); + return; +} + +void +dump_be_dev_quirks(struct libusb20_backend *pbe) +{ + struct libusb20_quirk q; + uint16_t x; + int err; + + memset(&q, 0, sizeof(q)); + + printf("\nDumping current device quirks:\n\n"); + + for (x = 0; x != 0xFFFF; x++) { + + err = libusb20_be_get_dev_quirk(pbe, x, &q); + if (err == LIBUSB20_ERROR_NOT_FOUND) { + continue; + } else if (err) { + if (x == 0) { + printf("No device quirks - maybe the USB quirk " + "module has not been loaded.\n"); + } + break; + } + printf("VID=0x%04x PID=0x%04x QUIRK=%s\n", + q.vid, q.pid, q.quirkname); + } + printf("\n"); + return; +} + +void dump_be_access(struct libusb20_backend *pbe) { struct group *gr; ==== //depot/projects/usb/src/usr.sbin/usbconfig/dump.h#3 (text+ko) ==== @@ -29,6 +29,8 @@ const char *dump_power_mode(uint8_t value); void dump_device_info(struct libusb20_device *pdev); void dump_be_access(struct libusb20_backend *pbe); +void dump_be_quirk_names(struct libusb20_backend *pbe); +void dump_be_dev_quirks(struct libusb20_backend *pbe); void dump_device_access(struct libusb20_device *pdev, uint8_t iface); int dump_device_iface_access(struct libusb20_device *pdev, uint8_t iface); void dump_device_desc(struct libusb20_device *pdev); ==== //depot/projects/usb/src/usr.sbin/usbconfig/usbconfig.c#2 (text+ko) ==== @@ -39,17 +39,19 @@ #include "dump.h" struct options { + const char *quirkname; gid_t gid; uid_t uid; mode_t mode; + uint32_t got_any; uint16_t bus; uint16_t addr; uint16_t iface; + uint16_t vid; + uint16_t pid; uint8_t config_index; uint8_t alt_index; - uint8_t got_list:1; - uint8_t got_any:1; uint8_t got_bus:1; uint8_t got_addr:1; uint8_t got_iface:1; @@ -63,11 +65,15 @@ uint8_t got_power_off:1; uint8_t got_power_save:1; uint8_t got_power_on:1; + uint8_t got_dump_device_quirks:1; + uint8_t got_dump_quirk_names:1; uint8_t got_dump_device_desc:1; uint8_t got_dump_curr_config:1; uint8_t got_dump_all_config:1; uint8_t got_dump_info:1; uint8_t got_dump_access:1; + uint8_t got_remove_device_quirk:1; + uint8_t got_add_device_quirk:1; }; struct token { @@ -84,6 +90,10 @@ T_SET_ALT, T_SET_OWNER, T_SET_PERM, + T_ADD_DEVICE_QUIRK, + T_REMOVE_DEVICE_QUIRK, + T_DUMP_QUIRK_NAMES, + T_DUMP_DEVICE_QUIRKS, T_DUMP_DEVICE_DESC, T_DUMP_CURR_CONFIG_DESC, T_DUMP_ALL_CONFIG_DESC, @@ -108,6 +118,10 @@ {"set_alt", T_SET_ALT, 1}, {"set_owner", T_SET_OWNER, 1}, {"set_perm", T_SET_PERM, 1}, + {"add_dev_quirk", T_ADD_DEVICE_QUIRK, 3}, + {"remove_dev_quirk", T_REMOVE_DEVICE_QUIRK, 3}, + {"dump_quirk_names", T_DUMP_QUIRK_NAMES, 0}, + {"dump_device_quirks", T_DUMP_DEVICE_QUIRKS, 0}, {"dump_device_desc", T_DUMP_DEVICE_DESC, 0}, {"dump_curr_config_desc", T_DUMP_CURR_CONFIG_DESC, 0}, {"dump_all_config_desc", T_DUMP_ALL_CONFIG_DESC, 0}, @@ -122,6 +136,44 @@ {"list", T_LIST, 0}, }; +static void +be_dev_remove_quirk(struct libusb20_backend *pbe, uint16_t vid, uint16_t pid, const char *str) +{ + struct libusb20_quirk q; + int err; + + memset(&q, 0, sizeof(q)); + + q.vid = vid; + q.pid = pid; + strlcpy(q.quirkname, str, sizeof(q.quirkname)); + + err = libusb20_be_remove_dev_quirk(pbe, &q); + if (err) { + printf("Removing quirk '%s' failed, continuing.\n", str); + } + return; +} + +static void +be_dev_add_quirk(struct libusb20_backend *pbe, uint16_t vid, uint16_t pid, const char *str) +{ + struct libusb20_quirk q; + int err; + + memset(&q, 0, sizeof(q)); + + q.vid = vid; + q.pid = pid; + strlcpy(q.quirkname, str, sizeof(q.quirkname)); + + err = libusb20_be_add_dev_quirk(pbe, &q); + if (err) { + printf("Adding quirk '%s' failed, continuing.\n", str); + } + return; +} + static uint8_t get_token(const char *str, uint8_t narg) { @@ -146,7 +198,7 @@ char *ep; errno = 0; - val = strtoul(name, &ep, 10); + val = strtoul(name, &ep, 0); if (errno) { err(1, "%s", name); } @@ -208,6 +260,10 @@ " set_alt " "\n" " set_owner " "\n" " set_perm " "\n" + " add_dev_quirk " "\n" + " remove_dev_quirk " "\n" + " dump_quirk_names" "\n" + " dump_device_quirks" "\n" " dump_device_desc" "\n" " dump_curr_config_desc" "\n" " dump_all_config_desc" "\n" @@ -253,8 +309,32 @@ "at the same time!"); } if (opt->got_dump_access) { + opt->got_any--; dump_be_access(pbe); } + if (opt->got_dump_quirk_names) { + opt->got_any--; + dump_be_quirk_names(pbe); + } + if (opt->got_dump_device_quirks) { + opt->got_any--; + dump_be_dev_quirks(pbe); + } + if (opt->got_remove_device_quirk) { + opt->got_any--; + be_dev_remove_quirk(pbe, opt->vid, opt->pid, opt->quirkname); + } + if (opt->got_add_device_quirk) { + opt->got_any--; + be_dev_add_quirk(pbe, opt->vid, opt->pid, opt->quirkname); + } + if (opt->got_any == 0) { + /* + * do not scan through all the devices if there are no valid + * options + */ + goto done; + } while ((pdev = libusb20_be_device_foreach(pbe, pdev))) { if (opt->got_bus && @@ -404,6 +484,7 @@ if (matches == 0) { printf("No device match\n"); } +done: reset_options(opt); return; @@ -432,6 +513,42 @@ if (t > 255) t = 255; switch (get_token(argv[n], t)) { + case T_ADD_DEVICE_QUIRK: + if (opt->got_add_device_quirk) { + flush_command(pbe, opt); + } + opt->vid = num_id(argv[n + 1], "Vendor ID"); + opt->pid = num_id(argv[n + 2], "Product ID"); + opt->quirkname = argv[n + 3]; + n += 3; + + opt->got_add_device_quirk = 1; + opt->got_any++; + break; + + case T_REMOVE_DEVICE_QUIRK: + if (opt->got_remove_device_quirk) { + flush_command(pbe, opt); + } + opt->vid = num_id(argv[n + 1], "Vendor ID"); + opt->pid = num_id(argv[n + 2], "Product ID"); + opt->quirkname = argv[n + 3]; + n += 3; + + opt->got_remove_device_quirk = 1; + opt->got_any++; + break; + + case T_DUMP_QUIRK_NAMES: + opt->got_dump_quirk_names = 1; + opt->got_any++; + break; + + case T_DUMP_DEVICE_QUIRKS: + opt->got_dump_device_quirks = 1; + opt->got_any++; + break; + case T_UNIT: if (opt->got_any) { /* allow multiple commands on the same line */ @@ -454,13 +571,13 @@ case T_SET_CONFIG: opt->config_index = num_id(argv[n + 1], "confindex"); opt->got_set_config = 1; - opt->got_any = 1; + opt->got_any++; n++; break; case T_SET_ALT: opt->alt_index = num_id(argv[n + 1], "confindex"); opt->got_set_alt = 1; - opt->got_any = 1; + opt->got_any++; n++; break; case T_SET_OWNER: @@ -473,62 +590,62 @@ opt->gid = a_gid(cp); opt->uid = a_uid(argv[n + 1]); opt->got_set_owner = 1; - opt->got_any = 1; + opt->got_any++; n++; break; case T_SET_PERM: opt->mode = a_mode(argv[n + 1]); opt->got_set_perm = 1; - opt->got_any = 1; + opt->got_any++; n++; break; case T_DUMP_DEVICE_DESC: opt->got_dump_device_desc = 1; - opt->got_any = 1; + opt->got_any++; break; case T_DUMP_CURR_CONFIG_DESC: opt->got_dump_curr_config = 1; - opt->got_any = 1; + opt->got_any++; break; case T_DUMP_ALL_CONFIG_DESC: opt->got_dump_all_config = 1; - opt->got_any = 1; + opt->got_any++; break; case T_DUMP_INFO: opt->got_dump_info = 1; - opt->got_any = 1; + opt->got_any++; break; case T_DUMP_ACCESS: opt->got_dump_access = 1; - opt->got_any = 1; + opt->got_any++; break; case T_SUSPEND: opt->got_suspend = 1; - opt->got_any = 1; + opt->got_any++; break; case T_RESUME: opt->got_resume = 1; - opt->got_any = 1; + opt->got_any++; break; case T_POWER_OFF: opt->got_power_off = 1; - opt->got_any = 1; + opt->got_any++; break; case T_POWER_SAVE: opt->got_power_save = 1; - opt->got_any = 1; + opt->got_any++; break; case T_POWER_ON: opt->got_power_on = 1; - opt->got_any = 1; + opt->got_any++; break; case T_RESET: opt->got_reset = 1; - opt->got_any = 1; + opt->got_any++; break; case T_LIST: opt->got_list = 1; - opt->got_any = 1; + opt->got_any++; break; default: usage(); @@ -541,6 +658,7 @@ } else { /* list all the devices */ opt->got_list = 1; + opt->got_any++; flush_command(pbe, opt); } /* release data */ From owner-p4-projects@FreeBSD.ORG Sun Oct 26 13:28:34 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 117831065681; Sun, 26 Oct 2008 13:28:34 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id C8C851065671 for ; Sun, 26 Oct 2008 13:28:33 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id B6A458FC16 for ; Sun, 26 Oct 2008 13:28:33 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id m9QDSXZD063838 for ; Sun, 26 Oct 2008 13:28:33 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m9QDSXr9063836 for perforce@freebsd.org; Sun, 26 Oct 2008 13:28:33 GMT (envelope-from hselasky@FreeBSD.org) Date: Sun, 26 Oct 2008 13:28:33 GMT Message-Id: <200810261328.m9QDSXr9063836@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 151947 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, 26 Oct 2008 13:28:34 -0000 http://perforce.freebsd.org/chv.cgi?CH=151947 Change 151947 by hselasky@hselasky_laptop001 on 2008/10/26 13:28:23 Add support for dynamic USB quirks - final step. Affected files ... .. //depot/projects/usb/src/lib/libusb20/libusb20.h#6 edit .. //depot/projects/usb/src/lib/libusb20/libusb20_ugen20.c#6 edit .. //depot/projects/usb/src/sys/dev/usb2/core/usb2_dev.c#37 edit .. //depot/projects/usb/src/sys/dev/usb2/core/usb2_dynamic.c#4 edit .. //depot/projects/usb/src/sys/dev/usb2/core/usb2_dynamic.h#4 edit .. //depot/projects/usb/src/sys/dev/usb2/include/usb2_ioctl.h#21 edit .. //depot/projects/usb/src/sys/dev/usb2/quirk/usb2_quirk.c#7 edit .. //depot/projects/usb/src/usr.sbin/usbconfig/dump.c#6 edit .. //depot/projects/usb/src/usr.sbin/usbconfig/usbconfig.c#3 edit Differences ... ==== //depot/projects/usb/src/lib/libusb20/libusb20.h#6 (text+ko) ==== @@ -189,9 +189,11 @@ struct libusb20_quirk { uint16_t vid; /* vendor ID */ uint16_t pid; /* product ID */ + uint16_t bcdDeviceLow; /* low revision value, inclusive */ + uint16_t bcdDeviceHigh; /* high revision value, inclusive */ uint16_t reserved[2]; /* for the future */ - char quirkname[64 - 8]; /* quirk name including terminating - * zero */ + /* quirk name, UQ_XXX, including terminating zero */ + char quirkname[64 - 12]; }; /* USB transfer operations */ ==== //depot/projects/usb/src/lib/libusb20/libusb20_ugen20.c#6 (text+ko) ==== @@ -936,28 +936,98 @@ ugen20_root_get_dev_quirk(struct libusb20_backend *pbe, uint16_t index, struct libusb20_quirk *pq) { - return (LIBUSB20_ERROR_NOT_SUPPORTED); + struct usb2_gen_quirk q; + int err; + + memset(&q, 0, sizeof(q)); + + q.index = index; + + err = ugen20_be_ioctl(USB_DEV_QUIRK_GET, &q); + + if (err) { + if (errno == EINVAL) { + return (LIBUSB20_ERROR_NOT_FOUND); + } + } else { + pq->vid = q.vid; + pq->pid = q.pid; + pq->bcdDeviceLow = q.bcdDeviceLow; + pq->bcdDeviceHigh = q.bcdDeviceHigh; + strlcpy(pq->quirkname, q.quirkname, sizeof(pq->quirkname)); + } + return (err); } static int ugen20_root_get_quirk_name(struct libusb20_backend *pbe, uint16_t index, struct libusb20_quirk *pq) { - return (LIBUSB20_ERROR_NOT_SUPPORTED); + struct usb2_gen_quirk q; + int err; + + memset(&q, 0, sizeof(q)); + + q.index = index; + + err = ugen20_be_ioctl(USB_QUIRK_NAME_GET, &q); + + if (err) { + if (errno == EINVAL) { + return (LIBUSB20_ERROR_NOT_FOUND); + } + } else { + strlcpy(pq->quirkname, q.quirkname, sizeof(pq->quirkname)); + } + return (err); } static int ugen20_root_add_dev_quirk(struct libusb20_backend *pbe, struct libusb20_quirk *pq) { - return (LIBUSB20_ERROR_NOT_SUPPORTED); + struct usb2_gen_quirk q; + int err; + + memset(&q, 0, sizeof(q)); + + q.vid = pq->vid; + q.pid = pq->pid; + q.bcdDeviceLow = pq->bcdDeviceLow; + q.bcdDeviceHigh = pq->bcdDeviceHigh; + strlcpy(q.quirkname, pq->quirkname, sizeof(q.quirkname)); + + err = ugen20_be_ioctl(USB_DEV_QUIRK_ADD, &q); + if (err) { + if (errno == ENOMEM) { + return (LIBUSB20_ERROR_NO_MEM); + } + } + return (err); } static int ugen20_root_remove_dev_quirk(struct libusb20_backend *pbe, struct libusb20_quirk *pq) { - return (LIBUSB20_ERROR_NOT_SUPPORTED); + struct usb2_gen_quirk q; + int err; + + memset(&q, 0, sizeof(q)); + + q.vid = pq->vid; + q.pid = pq->pid; + q.bcdDeviceLow = pq->bcdDeviceLow; + q.bcdDeviceHigh = pq->bcdDeviceHigh; + strlcpy(q.quirkname, pq->quirkname, sizeof(q.quirkname)); + + err = ugen20_be_ioctl(USB_DEV_QUIRK_REMOVE, &q); + if (err) { + if (errno == EINVAL) { + return (LIBUSB20_ERROR_NOT_FOUND); + } + } + return (err); } static int ==== //depot/projects/usb/src/sys/dev/usb2/core/usb2_dev.c#37 (text+ko) ==== @@ -1302,6 +1302,12 @@ case USB_GET_ROOT_PERM: err = usb2_get_perm(u.udp, 0); break; + case USB_DEV_QUIRK_GET: + case USB_QUIRK_NAME_GET: + case USB_DEV_QUIRK_ADD: + case USB_DEV_QUIRK_REMOVE: + err = usb2_quirk_ioctl_p(cmd, data, fflag, td); + break; default: err = ENOTTY; break; ==== //depot/projects/usb/src/sys/dev/usb2/core/usb2_dynamic.c#4 (text+ko) ==== @@ -39,12 +39,14 @@ static usb2_temp_setup_by_index_t usb2_temp_setup_by_index_w; static usb2_temp_unsetup_t usb2_temp_unsetup_w; static usb2_test_quirk_t usb2_test_quirk_w; +static usb2_quirk_ioctl_t usb2_quirk_ioctl_w; /* global variables */ usb2_temp_get_desc_t *usb2_temp_get_desc_p = &usb2_temp_get_desc_w; usb2_temp_setup_by_index_t *usb2_temp_setup_by_index_p = &usb2_temp_setup_by_index_w; usb2_temp_unsetup_t *usb2_temp_unsetup_p = &usb2_temp_unsetup_w; usb2_test_quirk_t *usb2_test_quirk_p = &usb2_test_quirk_w; +usb2_quirk_ioctl_t *usb2_quirk_ioctl_p = &usb2_quirk_ioctl_w; devclass_t usb2_devclass_ptr = NULL; static usb2_error_t @@ -59,6 +61,12 @@ return (0); /* no match */ } +static int +usb2_quirk_ioctl_w(unsigned long cmd, caddr_t data, int fflag, struct thread *td) +{ + return (ENOIOCTL); +} + static void usb2_temp_get_desc_w(struct usb2_device *udev, struct usb2_device_request *req, const void **pPtr, uint16_t *pLength) { @@ -86,6 +94,7 @@ /* reset function pointers */ usb2_test_quirk_p = &usb2_test_quirk_w; + usb2_quirk_ioctl_p = &usb2_quirk_ioctl_w; /* wait for CPU to exit the loaded functions, if any */ ==== //depot/projects/usb/src/sys/dev/usb2/core/usb2_dynamic.h#4 (text+ko) ==== @@ -37,6 +37,7 @@ typedef usb2_error_t (usb2_temp_setup_by_index_t)(struct usb2_device *udev, uint16_t index); typedef uint8_t (usb2_test_quirk_t)(const struct usb2_lookup_info *info, uint16_t quirk); +typedef int (usb2_quirk_ioctl_t)(unsigned long cmd, caddr_t data, int fflag, struct thread *td); typedef void (usb2_temp_get_desc_t)(struct usb2_device *udev, struct usb2_device_request *req, const void **pPtr, uint16_t *pLength); typedef void (usb2_temp_unsetup_t)(struct usb2_device *udev); @@ -46,6 +47,7 @@ extern usb2_temp_setup_by_index_t *usb2_temp_setup_by_index_p; extern usb2_temp_unsetup_t *usb2_temp_unsetup_p; extern usb2_test_quirk_t *usb2_test_quirk_p; +extern usb2_quirk_ioctl_t *usb2_quirk_ioctl_p; extern devclass_t usb2_devclass_ptr; /* function prototypes */ ==== //depot/projects/usb/src/sys/dev/usb2/include/usb2_ioctl.h#21 (text+ko) ==== @@ -202,6 +202,20 @@ uint16_t iface_index; }; +struct usb2_gen_quirk { + uint16_t index; /* Quirk Index */ + uint16_t vid; /* Vendor ID */ + uint16_t pid; /* Product ID */ + uint16_t bcdDeviceLow; /* Low Device Revision */ + uint16_t bcdDeviceHigh; /* High Device Revision */ + uint16_t reserved[2]; + /* + * String version of quirk including terminating zero. See UQ_XXX in + * "usb2_quirk.h". + */ + char quirkname[64 - 14]; +}; + /* USB controller */ #define USB_REQUEST _IOWR('U', 1, struct usb2_ctl_request) #define USB_SETDEBUG _IOW ('U', 2, int) @@ -278,4 +292,10 @@ #define USB_FS_CLOSE _IOW ('U', 198, struct usb2_fs_close) #define USB_FS_CLEAR_STALL_SYNC _IOW ('U', 199, struct usb2_fs_clear_stall_sync) +/* USB quirk system interface */ +#define USB_DEV_QUIRK_GET _IOWR('Q', 0, struct usb2_gen_quirk) +#define USB_QUIRK_NAME_GET _IOWR('Q', 1, struct usb2_gen_quirk) +#define USB_DEV_QUIRK_ADD _IOW ('Q', 2, struct usb2_gen_quirk) +#define USB_DEV_QUIRK_REMOVE _IOW ('Q', 3, struct usb2_gen_quirk) + #endif /* _USB2_IOCTL_H_ */ ==== //depot/projects/usb/src/sys/dev/usb2/quirk/usb2_quirk.c#7 (text+ko) ==== @@ -26,6 +26,8 @@ * SUCH DAMAGE. */ +#include +#include #include #include @@ -42,68 +44,70 @@ MODULE_VERSION(usb2_quirk, 1); /* - * The following macro adds a quirk for any revision of a device: + * The following macro adds one or more quirks for a USB device: */ -#define USB_VPA(v,p,r,...) \ - USB_VPI(v,p,((const uint16_t []){__VA_ARGS__})) +#define USB_QUIRK_ENTRY(v,p,l,h,...) \ + .vid = (v), .pid = (p), .lo_rev = (l), .hi_rev = (h), .quirks = { __VA_ARGS__ } + +#define USB_DEV_QUIRKS_MAX 128 +#define USB_SUB_QUIRKS_MAX 8 + +struct usb2_quirk_entry { + uint16_t vid; + uint16_t pid; + uint16_t lo_rev; + uint16_t hi_rev; + uint16_t quirks[USB_SUB_QUIRKS_MAX]; +}; -/* - * The following macro adds a quirk for a specific revision of a - * device: - */ -#define USB_VPR(v,p,r,...) \ - USB_VPI(v,p, ((const uint16_t []){__VA_ARGS__})), \ - USB_DEV_BCD_LTEQ(r), \ - USB_DEV_BCD_GTEQ(r) +static struct mtx usb2_quirk_mtx; -/* try to keep the quirks on one line, hence grepping becomes easier */ +static struct usb2_quirk_entry usb2_quirks[USB_DEV_QUIRKS_MAX] = { + {USB_QUIRK_ENTRY(USB_VENDOR_ASUS, USB_PRODUCT_ASUS_LCM, 0x0000, 0xFFFF, UQ_HID_IGNORE, UQ_NONE)}, + {USB_QUIRK_ENTRY(USB_VENDOR_INSIDEOUT, USB_PRODUCT_INSIDEOUT_EDGEPORT4, 0x094, 0x094, UQ_SWAP_UNICODE, UQ_NONE)}, + {USB_QUIRK_ENTRY(USB_VENDOR_DALLAS, USB_PRODUCT_DALLAS_J6502, 0x0a2, 0x0a2, UQ_BAD_ADC, UQ_NONE)}, + {USB_QUIRK_ENTRY(USB_VENDOR_DALLAS, USB_PRODUCT_DALLAS_J6502, 0x0a2, 0x0a2, UQ_AU_NO_XU, UQ_NONE)}, + {USB_QUIRK_ENTRY(USB_VENDOR_ALTEC, USB_PRODUCT_ALTEC_ADA70, 0x103, 0x103, UQ_BAD_ADC, UQ_NONE)}, + {USB_QUIRK_ENTRY(USB_VENDOR_ALTEC, USB_PRODUCT_ALTEC_ASC495, 0x000, 0x000, UQ_BAD_AUDIO, UQ_NONE)}, + {USB_QUIRK_ENTRY(USB_VENDOR_QTRONIX, USB_PRODUCT_QTRONIX_980N, 0x110, 0x110, UQ_SPUR_BUT_UP, UQ_NONE)}, + {USB_QUIRK_ENTRY(USB_VENDOR_ALCOR2, USB_PRODUCT_ALCOR2_KBD_HUB, 0x001, 0x001, UQ_SPUR_BUT_UP, UQ_NONE)}, + {USB_QUIRK_ENTRY(USB_VENDOR_MCT, USB_PRODUCT_MCT_HUB0100, 0x102, 0x102, UQ_BUS_POWERED, UQ_NONE)}, + {USB_QUIRK_ENTRY(USB_VENDOR_MCT, USB_PRODUCT_MCT_USB232, 0x102, 0x102, UQ_BUS_POWERED, UQ_NONE)}, + {USB_QUIRK_ENTRY(USB_VENDOR_TI, USB_PRODUCT_TI_UTUSB41, 0x110, 0x110, UQ_POWER_CLAIM, UQ_NONE)}, + {USB_QUIRK_ENTRY(USB_VENDOR_TELEX, USB_PRODUCT_TELEX_MIC1, 0x009, 0x009, UQ_AU_NO_FRAC, UQ_NONE)}, + {USB_QUIRK_ENTRY(USB_VENDOR_SILICONPORTALS, USB_PRODUCT_SILICONPORTALS_YAPPHONE, 0x100, 0x100, UQ_AU_INP_ASYNC, UQ_NONE)}, + {USB_QUIRK_ENTRY(USB_VENDOR_LOGITECH, USB_PRODUCT_LOGITECH_UN53B, 0x0000, 0xFFFF, UQ_NO_STRINGS, UQ_NONE)}, -static const struct usb2_device_id usb2_quirks[] = { - {USB_VPA(USB_VENDOR_ASUS, USB_PRODUCT_ASUS_LCM, 0x000, UQ_HID_IGNORE, UQ_NONE)}, - {USB_VPR(USB_VENDOR_INSIDEOUT, USB_PRODUCT_INSIDEOUT_EDGEPORT4, 0x094, UQ_SWAP_UNICODE, UQ_NONE)}, - {USB_VPR(USB_VENDOR_DALLAS, USB_PRODUCT_DALLAS_J6502, 0x0a2, UQ_BAD_ADC, UQ_NONE)}, - {USB_VPR(USB_VENDOR_DALLAS, USB_PRODUCT_DALLAS_J6502, 0x0a2, UQ_AU_NO_XU, UQ_NONE)}, - {USB_VPR(USB_VENDOR_ALTEC, USB_PRODUCT_ALTEC_ADA70, 0x103, UQ_BAD_ADC, UQ_NONE)}, - {USB_VPR(USB_VENDOR_ALTEC, USB_PRODUCT_ALTEC_ASC495, 0x000, UQ_BAD_AUDIO, UQ_NONE)}, - {USB_VPR(USB_VENDOR_QTRONIX, USB_PRODUCT_QTRONIX_980N, 0x110, UQ_SPUR_BUT_UP, UQ_NONE)}, - {USB_VPR(USB_VENDOR_ALCOR2, USB_PRODUCT_ALCOR2_KBD_HUB, 0x001, UQ_SPUR_BUT_UP, UQ_NONE)}, - {USB_VPR(USB_VENDOR_MCT, USB_PRODUCT_MCT_HUB0100, 0x102, UQ_BUS_POWERED, UQ_NONE)}, - {USB_VPR(USB_VENDOR_MCT, USB_PRODUCT_MCT_USB232, 0x102, UQ_BUS_POWERED, UQ_NONE)}, - {USB_VPR(USB_VENDOR_TI, USB_PRODUCT_TI_UTUSB41, 0x110, UQ_POWER_CLAIM, UQ_NONE)}, - {USB_VPR(USB_VENDOR_TELEX, USB_PRODUCT_TELEX_MIC1, 0x009, UQ_AU_NO_FRAC, UQ_NONE)}, - {USB_VPR(USB_VENDOR_SILICONPORTALS, USB_PRODUCT_SILICONPORTALS_YAPPHONE, 0x100, UQ_AU_INP_ASYNC, UQ_NONE)}, - {USB_VPA(USB_VENDOR_LOGITECH, USB_PRODUCT_LOGITECH_UN53B, 0x000, UQ_NO_STRINGS, UQ_NONE)}, /* - * XXX These should have a revision number, but I don't know what - * they are. + * XXX The following quirks should have a more specific revision + * number: */ - {USB_VPA(USB_VENDOR_HP, USB_PRODUCT_HP_895C, 0x000, UQ_BROKEN_BIDIR, UQ_NONE)}, - {USB_VPA(USB_VENDOR_HP, USB_PRODUCT_HP_880C, 0x000, UQ_BROKEN_BIDIR, UQ_NONE)}, - {USB_VPA(USB_VENDOR_HP, USB_PRODUCT_HP_815C, 0x000, UQ_BROKEN_BIDIR, UQ_NONE)}, - {USB_VPA(USB_VENDOR_HP, USB_PRODUCT_HP_810C, 0x000, UQ_BROKEN_BIDIR, UQ_NONE)}, - {USB_VPA(USB_VENDOR_HP, USB_PRODUCT_HP_830C, 0x000, UQ_BROKEN_BIDIR, UQ_NONE)}, - {USB_VPA(USB_VENDOR_HP, USB_PRODUCT_HP_1220C, 0x000, UQ_BROKEN_BIDIR, UQ_NONE)}, - {USB_VPA(USB_VENDOR_XEROX, USB_PRODUCT_XEROX_WCM15, 0x000, UQ_BROKEN_BIDIR, UQ_NONE)}, + {USB_QUIRK_ENTRY(USB_VENDOR_HP, USB_PRODUCT_HP_895C, 0x0000, 0xFFFF, UQ_BROKEN_BIDIR, UQ_NONE)}, + {USB_QUIRK_ENTRY(USB_VENDOR_HP, USB_PRODUCT_HP_880C, 0x0000, 0xFFFF, UQ_BROKEN_BIDIR, UQ_NONE)}, + {USB_QUIRK_ENTRY(USB_VENDOR_HP, USB_PRODUCT_HP_815C, 0x0000, 0xFFFF, UQ_BROKEN_BIDIR, UQ_NONE)}, + {USB_QUIRK_ENTRY(USB_VENDOR_HP, USB_PRODUCT_HP_810C, 0x0000, 0xFFFF, UQ_BROKEN_BIDIR, UQ_NONE)}, + {USB_QUIRK_ENTRY(USB_VENDOR_HP, USB_PRODUCT_HP_830C, 0x0000, 0xFFFF, UQ_BROKEN_BIDIR, UQ_NONE)}, + {USB_QUIRK_ENTRY(USB_VENDOR_HP, USB_PRODUCT_HP_1220C, 0x0000, 0xFFFF, UQ_BROKEN_BIDIR, UQ_NONE)}, + {USB_QUIRK_ENTRY(USB_VENDOR_XEROX, USB_PRODUCT_XEROX_WCM15, 0x0000, 0xFFFF, UQ_BROKEN_BIDIR, UQ_NONE)}, /* Devices which should be ignored by uhid */ - {USB_VPA(USB_VENDOR_APC, USB_PRODUCT_APC_UPS, 0x000, UQ_HID_IGNORE, UQ_NONE)}, - {USB_VPA(USB_VENDOR_BELKIN, USB_PRODUCT_BELKIN_F6C550AVR, 0x000, UQ_HID_IGNORE, UQ_NONE)}, - {USB_VPA(USB_VENDOR_CYBERPOWER, USB_PRODUCT_CYBERPOWER_1500CAVRLCD, 0x000, UQ_HID_IGNORE, UQ_NONE)}, - {USB_VPA(USB_VENDOR_DELORME, USB_PRODUCT_DELORME_EARTHMATE, 0x000, UQ_HID_IGNORE, UQ_NONE)}, - {USB_VPA(USB_VENDOR_ITUNERNET, USB_PRODUCT_ITUNERNET_USBLCD2X20, 0x000, UQ_HID_IGNORE, UQ_NONE)}, - {USB_VPA(USB_VENDOR_MGE, USB_PRODUCT_MGE_UPS1, 0x000, UQ_HID_IGNORE, UQ_NONE)}, - {USB_VPA(USB_VENDOR_MGE, USB_PRODUCT_MGE_UPS2, 0x000, UQ_HID_IGNORE, UQ_NONE)}, - {USB_VPA(USB_VENDOR_APPLE, USB_PRODUCT_APPLE_IPHONE, 0x000, UQ_HID_IGNORE, UQ_NONE)}, - {USB_VPA(USB_VENDOR_APPLE, USB_PRODUCT_APPLE_IPHONE_3G, 0x000, UQ_HID_IGNORE, UQ_NONE)}, + {USB_QUIRK_ENTRY(USB_VENDOR_APC, USB_PRODUCT_APC_UPS, 0x0000, 0xFFFF, UQ_HID_IGNORE, UQ_NONE)}, + {USB_QUIRK_ENTRY(USB_VENDOR_BELKIN, USB_PRODUCT_BELKIN_F6C550AVR, 0x0000, 0xFFFF, UQ_HID_IGNORE, UQ_NONE)}, + {USB_QUIRK_ENTRY(USB_VENDOR_CYBERPOWER, USB_PRODUCT_CYBERPOWER_1500CAVRLCD, 0x0000, 0xFFFF, UQ_HID_IGNORE, UQ_NONE)}, + {USB_QUIRK_ENTRY(USB_VENDOR_DELORME, USB_PRODUCT_DELORME_EARTHMATE, 0x0000, 0xFFFF, UQ_HID_IGNORE, UQ_NONE)}, + {USB_QUIRK_ENTRY(USB_VENDOR_ITUNERNET, USB_PRODUCT_ITUNERNET_USBLCD2X20, 0x0000, 0xFFFF, UQ_HID_IGNORE, UQ_NONE)}, + {USB_QUIRK_ENTRY(USB_VENDOR_MGE, USB_PRODUCT_MGE_UPS1, 0x0000, 0xFFFF, UQ_HID_IGNORE, UQ_NONE)}, + {USB_QUIRK_ENTRY(USB_VENDOR_MGE, USB_PRODUCT_MGE_UPS2, 0x0000, 0xFFFF, UQ_HID_IGNORE, UQ_NONE)}, + {USB_QUIRK_ENTRY(USB_VENDOR_APPLE, USB_PRODUCT_APPLE_IPHONE, 0x0000, 0xFFFF, UQ_HID_IGNORE, UQ_NONE)}, + {USB_QUIRK_ENTRY(USB_VENDOR_APPLE, USB_PRODUCT_APPLE_IPHONE_3G, 0x0000, 0xFFFF, UQ_HID_IGNORE, UQ_NONE)}, /* Devices which should be ignored by both ukbd and uhid */ - {USB_VPA(USB_VENDOR_CYPRESS, USB_PRODUCT_CYPRESS_WISPY1A, 0x000, UQ_KBD_IGNORE, UQ_HID_IGNORE, UQ_NONE)}, - {USB_VPA(USB_VENDOR_METAGEEK, USB_PRODUCT_METAGEEK_WISPY1B, 0x000, UQ_KBD_IGNORE, UQ_HID_IGNORE, UQ_NONE)}, - {USB_VPR(USB_VENDOR_TENX, USB_PRODUCT_TENX_UAUDIO0, 0x0101, UQ_AUDIO_SWAP_LR, UQ_NONE)}, - + {USB_QUIRK_ENTRY(USB_VENDOR_CYPRESS, USB_PRODUCT_CYPRESS_WISPY1A, 0x0000, 0xFFFF, UQ_KBD_IGNORE, UQ_HID_IGNORE, UQ_NONE)}, + {USB_QUIRK_ENTRY(USB_VENDOR_METAGEEK, USB_PRODUCT_METAGEEK_WISPY1B, 0x0000, 0xFFFF, UQ_KBD_IGNORE, UQ_HID_IGNORE, UQ_NONE)}, + {USB_QUIRK_ENTRY(USB_VENDOR_TENX, USB_PRODUCT_TENX_UAUDIO0, 0x0101, 0x0101, UQ_AUDIO_SWAP_LR, UQ_NONE)}, /* MS keyboards do weird things */ - {USB_VPA(USB_VENDOR_MICROSOFT, USB_PRODUCT_MICROSOFT_WLNOTEBOOK, 0x000, UQ_MS_BAD_CLASS, UQ_MS_LEADING_BYTE, UQ_NONE)}, - {USB_VPA(USB_VENDOR_MICROSOFT, USB_PRODUCT_MICROSOFT_WLNOTEBOOK2, 0x000, UQ_MS_BAD_CLASS, UQ_MS_LEADING_BYTE, UQ_NONE)}, - {USB_VPA(USB_VENDOR_MICROSOFT, USB_PRODUCT_MICROSOFT_WLINTELLIMOUSE, 0x000, UQ_MS_LEADING_BYTE, UQ_NONE)}, - {USB_VPA(USB_VENDOR_METAGEEK, USB_PRODUCT_METAGEEK_WISPY24X, 0x000, UQ_KBD_IGNORE, UQ_HID_IGNORE, UQ_NONE)}, + {USB_QUIRK_ENTRY(USB_VENDOR_MICROSOFT, USB_PRODUCT_MICROSOFT_WLNOTEBOOK, 0x0000, 0xFFFF, UQ_MS_BAD_CLASS, UQ_MS_LEADING_BYTE, UQ_NONE)}, + {USB_QUIRK_ENTRY(USB_VENDOR_MICROSOFT, USB_PRODUCT_MICROSOFT_WLNOTEBOOK2, 0x0000, 0xFFFF, UQ_MS_BAD_CLASS, UQ_MS_LEADING_BYTE, UQ_NONE)}, + {USB_QUIRK_ENTRY(USB_VENDOR_MICROSOFT, USB_PRODUCT_MICROSOFT_WLINTELLIMOUSE, 0x0000, 0xFFFF, UQ_MS_LEADING_BYTE, UQ_NONE)}, + {USB_QUIRK_ENTRY(USB_VENDOR_METAGEEK, USB_PRODUCT_METAGEEK_WISPY24X, 0x0000, 0xFFFF, UQ_KBD_IGNORE, UQ_HID_IGNORE, UQ_NONE)}, }; USB_MAKE_DEBUG_TABLE(USB_QUIRK); @@ -130,36 +134,239 @@ static uint8_t usb2_test_quirk_by_info(const struct usb2_lookup_info *info, uint16_t quirk) { - const struct usb2_device_id *pe; - const uint16_t *px; + uint16_t x; + uint16_t y; if (quirk == UQ_NONE) { return (0); } - pe = usb2_lookup_id_by_info(usb2_quirks, sizeof(usb2_quirks), info); - if (pe && pe->driver_info) { - px = pe->driver_info; - while (1) { - if (*px == quirk) { + mtx_lock(&usb2_quirk_mtx); + + for (x = 0; x != USB_DEV_QUIRKS_MAX; x++) { + /* see if quirk information does not match */ + if ((usb2_quirks[x].vid != info->idVendor) || + (usb2_quirks[x].pid != info->idProduct) || + (usb2_quirks[x].lo_rev > info->bcdDevice) || + (usb2_quirks[x].hi_rev < info->bcdDevice)) { + continue; + } + /* lookup quirk */ + for (y = 0; y != USB_SUB_QUIRKS_MAX; y++) { + if (usb2_quirks[x].quirks[y] == quirk) { + mtx_unlock(&usb2_quirk_mtx); DPRINTF("Found quirk '%s'.\n", usb2_quirkstr(quirk)); return (1); } - if (*px == UQ_NONE) { - return (0); + } + /* no quirk found */ + break; + } + mtx_unlock(&usb2_quirk_mtx); + return (0); +} + +static struct usb2_quirk_entry * +usb2_quirk_get_entry(uint16_t vid, uint16_t pid, + uint16_t lo_rev, uint16_t hi_rev, uint8_t do_alloc) +{ + uint16_t x; + + mtx_assert(&usb2_quirk_mtx, MA_OWNED); + + if ((vid | pid | lo_rev | hi_rev) == 0) { + /* all zero - special case */ + return (usb2_quirks + USB_DEV_QUIRKS_MAX - 1); + } + /* search for an existing entry */ + for (x = 0; x != USB_DEV_QUIRKS_MAX; x++) { + /* see if quirk information does not match */ + if ((usb2_quirks[x].vid != vid) || + (usb2_quirks[x].pid != pid) || + (usb2_quirks[x].lo_rev != lo_rev) || + (usb2_quirks[x].hi_rev != hi_rev)) { + continue; + } + return (usb2_quirks + x); + } + + if (do_alloc == 0) { + /* no match */ + return (NULL); + } + /* search for a free entry */ + for (x = 0; x != USB_DEV_QUIRKS_MAX; x++) { + /* see if quirk information does not match */ + if ((usb2_quirks[x].vid | + usb2_quirks[x].pid | + usb2_quirks[x].lo_rev | + usb2_quirks[x].hi_rev) != 0) { + continue; + } + usb2_quirks[x].vid = vid; + usb2_quirks[x].pid = pid; + usb2_quirks[x].lo_rev = lo_rev; + usb2_quirks[x].hi_rev = hi_rev; + + return (usb2_quirks + x); + } + + /* no entry found */ + return (NULL); +} + +/*------------------------------------------------------------------------* + * usb2_quirk_ioctl - handle quirk IOCTLs + * + * Returns: + * 0: Success + * Else: Failure + *------------------------------------------------------------------------*/ +static int +usb2_quirk_ioctl(unsigned long cmd, caddr_t data, + int fflag, struct thread *td) +{ + struct usb2_gen_quirk *pgq; + struct usb2_quirk_entry *pqe; + uint32_t x; + uint32_t y; + int err; + + switch (cmd) { + case USB_DEV_QUIRK_GET: + pgq = (void *)data; + x = pgq->index % USB_SUB_QUIRKS_MAX; + y = pgq->index / USB_SUB_QUIRKS_MAX; + if (y >= USB_DEV_QUIRKS_MAX) { + return (EINVAL); + } + mtx_lock(&usb2_quirk_mtx); + /* copy out data */ + pgq->vid = usb2_quirks[y].vid; + pgq->pid = usb2_quirks[y].pid; + pgq->bcdDeviceLow = usb2_quirks[y].lo_rev; + pgq->bcdDeviceHigh = usb2_quirks[y].hi_rev; + strlcpy(pgq->quirkname, + usb2_quirkstr(usb2_quirks[y].quirks[x]), + sizeof(pgq->quirkname)); + mtx_unlock(&usb2_quirk_mtx); + return (0); /* success */ + + case USB_QUIRK_NAME_GET: + pgq = (void *)data; + x = pgq->index; + if (x >= USB_QUIRK_MAX) { + return (EINVAL); + } + strlcpy(pgq->quirkname, + usb2_quirkstr(x), sizeof(pgq->quirkname)); + return (0); /* success */ + + case USB_DEV_QUIRK_ADD: + pgq = (void *)data; + + /* check privileges */ + err = priv_check(curthread, PRIV_DRIVER); + if (err) { + return (err); + } + /* convert quirk string into numerical */ + for (y = 0; y != USB_DEV_QUIRKS_MAX; y++) { + if (strcmp(pgq->quirkname, usb2_quirkstr(y)) == 0) { + break; + } + } + if (y == USB_DEV_QUIRKS_MAX) { + return (EINVAL); + } + if (y == UQ_NONE) { + return (EINVAL); + } + mtx_lock(&usb2_quirk_mtx); + pqe = usb2_quirk_get_entry(pgq->vid, pgq->pid, + pgq->bcdDeviceLow, pgq->bcdDeviceHigh, 1); + for (x = 0; x != USB_SUB_QUIRKS_MAX; x++) { + if (pqe->quirks[x] == UQ_NONE) { + pqe->quirks[x] = y; + break; + } + } + mtx_unlock(&usb2_quirk_mtx); + if (x == USB_SUB_QUIRKS_MAX) { + return (ENOMEM); + } + return (0); /* success */ + + case USB_DEV_QUIRK_REMOVE: + pgq = (void *)data; + /* check privileges */ + err = priv_check(curthread, PRIV_DRIVER); + if (err) { + return (err); + } + /* convert quirk string into numerical */ + for (y = 0; y != USB_DEV_QUIRKS_MAX; y++) { + if (strcmp(pgq->quirkname, usb2_quirkstr(y)) == 0) { + break; + } + } + if (y == USB_DEV_QUIRKS_MAX) { + return (EINVAL); + } + if (y == UQ_NONE) { + return (EINVAL); + } + mtx_lock(&usb2_quirk_mtx); + pqe = usb2_quirk_get_entry(pgq->vid, pgq->pid, + pgq->bcdDeviceLow, pgq->bcdDeviceHigh, 0); + for (x = 0; x != USB_SUB_QUIRKS_MAX; x++) { + if (pqe->quirks[x] == y) { + pqe->quirks[x] = UQ_NONE; + break; + } + } + if (x == USB_SUB_QUIRKS_MAX) { + mtx_unlock(&usb2_quirk_mtx); + return (ENOMEM); + } + for (x = 0; x != USB_SUB_QUIRKS_MAX; x++) { + if (pqe->quirks[x] != UQ_NONE) { + break; } - px++; + } + if (x == USB_SUB_QUIRKS_MAX) { + /* all quirk entries are unused - release */ + memset(pqe, 0, sizeof(pqe)); } + mtx_unlock(&usb2_quirk_mtx); + return (0); /* success */ + + default: + break; } - return (0); + return (ENOIOCTL); } static void usb2_quirk_init(void *arg) { + /* initialize mutex */ + mtx_init(&usb2_quirk_mtx, "USB quirk", NULL, MTX_DEF); + /* register our function */ usb2_test_quirk_p = &usb2_test_quirk_by_info; + usb2_quirk_ioctl_p = &usb2_quirk_ioctl; return; } +static void +usb2_quirk_uninit(void *arg) +{ + usb2_quirk_unload(arg); + + /* destroy mutex */ + mtx_destroy(&usb2_quirk_mtx); + return; +} + SYSINIT(usb2_quirk_init, SI_SUB_LOCK, SI_ORDER_FIRST, usb2_quirk_init, NULL); -SYSUNINIT(usb2_quirk_unload, SI_SUB_LOCK, SI_ORDER_ANY, usb2_quirk_unload, NULL); +SYSUNINIT(usb2_quirk_uninit, SI_SUB_LOCK, SI_ORDER_ANY, usb2_quirk_uninit, NULL); ==== //depot/projects/usb/src/usr.sbin/usbconfig/dump.c#6 (text+ko) ==== @@ -260,7 +260,8 @@ } break; } - printf("%s\n", q.quirkname); + if (strcmp(q.quirkname, "UQ_NONE")) + printf("%s\n", q.quirkname); } printf("\n"); return; @@ -280,17 +281,19 @@ for (x = 0; x != 0xFFFF; x++) { err = libusb20_be_get_dev_quirk(pbe, x, &q); - if (err == LIBUSB20_ERROR_NOT_FOUND) { - continue; - } else if (err) { + if (err) { if (x == 0) { printf("No device quirks - maybe the USB quirk " "module has not been loaded.\n"); } break; } - printf("VID=0x%04x PID=0x%04x QUIRK=%s\n", - q.vid, q.pid, q.quirkname); + if (strcmp(q.quirkname, "UQ_NONE")) { + printf("VID=0x%04x PID=0x%04x REVLO=0x%04x " + "REVHI=0x%04x QUIRK=%s\n", + q.vid, q.pid, q.bcdDeviceLow, + q.bcdDeviceHigh, q.quirkname); + } } printf("\n"); return; ==== //depot/projects/usb/src/usr.sbin/usbconfig/usbconfig.c#3 (text+ko) ==== @@ -49,6 +49,8 @@ uint16_t iface; uint16_t vid; uint16_t pid; + uint16_t lo_rev; /* inclusive */ + uint16_t hi_rev; /* inclusive */ uint8_t config_index; uint8_t alt_index; uint8_t got_list:1; @@ -118,8 +120,8 @@ {"set_alt", T_SET_ALT, 1}, {"set_owner", T_SET_OWNER, 1}, {"set_perm", T_SET_PERM, 1}, - {"add_dev_quirk", T_ADD_DEVICE_QUIRK, 3}, - {"remove_dev_quirk", T_REMOVE_DEVICE_QUIRK, 3}, + {"add_dev_quirk_vplh", T_ADD_DEVICE_QUIRK, 5}, + {"remove_dev_quirk_vplh", T_REMOVE_DEVICE_QUIRK, 5}, {"dump_quirk_names", T_DUMP_QUIRK_NAMES, 0}, {"dump_device_quirks", T_DUMP_DEVICE_QUIRKS, 0}, {"dump_device_desc", T_DUMP_DEVICE_DESC, 0}, @@ -137,7 +139,9 @@ }; static void -be_dev_remove_quirk(struct libusb20_backend *pbe, uint16_t vid, uint16_t pid, const char *str) +be_dev_remove_quirk(struct libusb20_backend *pbe, + uint16_t vid, uint16_t pid, uint16_t lorev, uint16_t hirev, + const char *str) { struct libusb20_quirk q; int err; @@ -146,6 +150,8 @@ q.vid = vid; q.pid = pid; + q.bcdDeviceLow = lorev; + q.bcdDeviceHigh = hirev; strlcpy(q.quirkname, str, sizeof(q.quirkname)); err = libusb20_be_remove_dev_quirk(pbe, &q); @@ -156,7 +162,9 @@ } static void -be_dev_add_quirk(struct libusb20_backend *pbe, uint16_t vid, uint16_t pid, const char *str) +be_dev_add_quirk(struct libusb20_backend *pbe, + uint16_t vid, uint16_t pid, uint16_t lorev, uint16_t hirev, + const char *str) { struct libusb20_quirk q; int err; @@ -165,6 +173,8 @@ q.vid = vid; q.pid = pid; + q.bcdDeviceLow = lorev; + q.bcdDeviceHigh = hirev; strlcpy(q.quirkname, str, sizeof(q.quirkname)); err = libusb20_be_add_dev_quirk(pbe, &q); @@ -260,8 +270,8 @@ " set_alt " "\n" " set_owner " "\n" " set_perm " "\n" - " add_dev_quirk " "\n" - " remove_dev_quirk " "\n" + " add_dev_quirk_vplh " "\n" + " remove_dev_quirk_vplh " "\n" " dump_quirk_names" "\n" " dump_device_quirks" "\n" " dump_device_desc" "\n" @@ -322,11 +332,13 @@ } if (opt->got_remove_device_quirk) { opt->got_any--; - be_dev_remove_quirk(pbe, opt->vid, opt->pid, opt->quirkname); + be_dev_remove_quirk(pbe, + opt->vid, opt->pid, opt->lo_rev, opt->hi_rev, opt->quirkname); } if (opt->got_add_device_quirk) { opt->got_any--; - be_dev_add_quirk(pbe, opt->vid, opt->pid, opt->quirkname); + be_dev_add_quirk(pbe, + opt->vid, opt->pid, opt->lo_rev, opt->hi_rev, opt->quirkname); } if (opt->got_any == 0) { /* @@ -519,8 +531,10 @@ } opt->vid = num_id(argv[n + 1], "Vendor ID"); opt->pid = num_id(argv[n + 2], "Product ID"); - opt->quirkname = argv[n + 3]; - n += 3; + opt->lo_rev = num_id(argv[n + 3], "Low Revision"); + opt->hi_rev = num_id(argv[n + 4], "High Revision"); + opt->quirkname = argv[n + 5]; + n += 5; opt->got_add_device_quirk = 1; opt->got_any++; @@ -532,9 +546,10 @@ } opt->vid = num_id(argv[n + 1], "Vendor ID"); opt->pid = num_id(argv[n + 2], "Product ID"); - opt->quirkname = argv[n + 3]; - n += 3; - + opt->lo_rev = num_id(argv[n + 3], "Low Revision"); + opt->hi_rev = num_id(argv[n + 4], "High Revision"); + opt->quirkname = argv[n + 5]; + n += 5; opt->got_remove_device_quirk = 1; opt->got_any++; break; From owner-p4-projects@FreeBSD.ORG Sun Oct 26 13:30:36 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3F51F1065671; Sun, 26 Oct 2008 13:30:36 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 02FCA1065676 for ; Sun, 26 Oct 2008 13:30:36 +0000 (UTC) (envelope-from ed@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id E6D778FC14 for ; Sun, 26 Oct 2008 13:30:35 +0000 (UTC) (envelope-from ed@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id m9QDUZ6l064020 for ; Sun, 26 Oct 2008 13:30:35 GMT (envelope-from ed@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m9QDUZCD064018 for perforce@freebsd.org; Sun, 26 Oct 2008 13:30:35 GMT (envelope-from ed@FreeBSD.org) Date: Sun, 26 Oct 2008 13:30:35 GMT Message-Id: <200810261330.m9QDUZCD064018@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to ed@FreeBSD.org using -f From: Ed Schouten To: Perforce Change Reviews Cc: Subject: PERFORCE change 151948 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, 26 Oct 2008 13:30:36 -0000 http://perforce.freebsd.org/chv.cgi?CH=151948 Change 151948 by ed@ed_dull on 2008/10/26 13:30:10 Commit my work in progress /dev/console-replacement. Affected files ... .. //depot/projects/mpsafetty/sys/kern/subr_prf.c#3 edit .. //depot/projects/mpsafetty/sys/kern/tty.c#55 edit Differences ... ==== //depot/projects/mpsafetty/sys/kern/subr_prf.c#3 (text+ko) ==== @@ -259,15 +259,17 @@ { int c, i, error, nl; char *consbuffer; - int pri; + int pri = LOG_INFO | LOG_CONSOLE; + if (!log_console_output) return; - pri = LOG_INFO | LOG_CONSOLE; uio = cloneuio(uio); consbuffer = malloc(CONSCHUNK, M_TEMP, M_WAITOK); + mtx_lock(&Giant); + nl = 0; while (uio->uio_resid > 0) { c = imin(uio->uio_resid, CONSCHUNK); @@ -285,9 +287,11 @@ if (!nl) msglogchar('\n', pri); msgbuftrigger = 1; + + mtx_unlock(&Giant); + free(uio, M_IOV); free(consbuffer, M_TEMP); - return; } int ==== //depot/projects/mpsafetty/sys/kern/tty.c#55 (text+ko) ==== @@ -73,6 +73,9 @@ SX_SYSINIT(tty_list, &tty_list_sx, "tty list"); static unsigned int tty_list_count = 0; +/* Character device of /dev/console. */ +static struct cdev dev_console; + /* * Flags that are supported and stored by this implementation. */ @@ -86,7 +89,8 @@ HUPCL|CLOCAL|CCTS_OFLOW|CRTS_IFLOW|CDTR_IFLOW|\ CDSR_OFLOW|CCAR_OFLOW) -#define TTY_CALLOUT(tp,d) ((tp)->t_dev != (d)) +#define TTY_CONSOLE(d) ((d) == dev_console) +#define TTY_CALLOUT(tp,d) ((d) != (tp)->t_dev && !TTY_CONSOLE(d)) /* * Set TTY buffer sizes. @@ -220,6 +224,10 @@ return (EPERM); } + /* /dev/console without associated TTY. */ + if (tp == NULL) + return (ENXIO); + tty_lock(tp); if (tty_gone(tp)) { /* Device is already gone. */ @@ -412,6 +420,9 @@ struct tty *tp = dev->si_drv1; int error; + if (TTY_CONSOLE(dev)) + log_console(uio); + error = ttydev_enter(tp); if (error) return (error); @@ -1122,6 +1133,10 @@ dev->si_drv2 = &tp->t_termios_lock_out; } } + + /* XXX: console hardcoding! */ + if (strcmp(tty_devname(tp), "ttyv0") == 0) + dev_console->si_drv1 = tp; } /* @@ -1662,6 +1677,10 @@ ttydevsw_inwakeup(tp); } +/* + * TTY hooks interface. + */ + static int ttyhook_defrint(struct tty *tp, char c, int flags) { @@ -1745,6 +1764,20 @@ tty_rel_free(tp); } +/* + * /dev/console handling. + */ + +static void +ttyconsdev_init(void *unused) +{ + + dev_console = make_dev(&ttydev_cdevsw, 0, UID_ROOT, GID_WHEEL, + 0600, "konzole"); +} + +SYSINIT(tty, SI_SUB_DRIVERS, SI_ORDER_FIRST, ttyconsdev_init, NULL); + #include "opt_ddb.h" #ifdef DDB #include From owner-p4-projects@FreeBSD.ORG Sun Oct 26 13:39:52 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7A4151065671; Sun, 26 Oct 2008 13:39:52 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 3D0D4106566B for ; Sun, 26 Oct 2008 13:39:52 +0000 (UTC) (envelope-from ed@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 2AB508FC13 for ; Sun, 26 Oct 2008 13:39:52 +0000 (UTC) (envelope-from ed@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id m9QDdqr0064703 for ; Sun, 26 Oct 2008 13:39:52 GMT (envelope-from ed@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m9QDdjdj064697 for perforce@freebsd.org; Sun, 26 Oct 2008 13:39:45 GMT (envelope-from ed@FreeBSD.org) Date: Sun, 26 Oct 2008 13:39:45 GMT Message-Id: <200810261339.m9QDdjdj064697@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to ed@FreeBSD.org using -f From: Ed Schouten To: Perforce Change Reviews Cc: Subject: PERFORCE change 151949 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, 26 Oct 2008 13:39:52 -0000 http://perforce.freebsd.org/chv.cgi?CH=151949 Change 151949 by ed@ed_dull on 2008/10/26 13:39:20 IFC. Affected files ... .. //depot/projects/mpsafetty/Makefile.inc1#5 integrate .. //depot/projects/mpsafetty/etc/periodic/security/200.chkmounts#2 integrate .. //depot/projects/mpsafetty/lib/libc/sys/mmap.2#2 integrate .. //depot/projects/mpsafetty/lib/libfetch/http.c#2 integrate .. //depot/projects/mpsafetty/share/man/man4/snd_hda.4#6 integrate .. //depot/projects/mpsafetty/share/man/man9/Makefile#10 integrate .. //depot/projects/mpsafetty/share/man/man9/malloc.9#2 integrate .. //depot/projects/mpsafetty/sys/arm/arm/undefined.c#2 integrate .. //depot/projects/mpsafetty/sys/cam/scsi/scsi_target.c#4 integrate .. //depot/projects/mpsafetty/sys/compat/linux/linux_ioctl.c#9 integrate .. //depot/projects/mpsafetty/sys/compat/linux/linux_socket.c#5 integrate .. //depot/projects/mpsafetty/sys/compat/linux/linux_util.c#2 integrate .. //depot/projects/mpsafetty/sys/conf/NOTES#14 integrate .. //depot/projects/mpsafetty/sys/conf/files#21 integrate .. //depot/projects/mpsafetty/sys/conf/files.powerpc#5 integrate .. //depot/projects/mpsafetty/sys/conf/options#12 integrate .. //depot/projects/mpsafetty/sys/contrib/altq/altq/altq_cbq.c#2 integrate .. //depot/projects/mpsafetty/sys/contrib/altq/altq/altq_cdnr.c#2 integrate .. //depot/projects/mpsafetty/sys/contrib/altq/altq/altq_hfsc.c#2 integrate .. //depot/projects/mpsafetty/sys/contrib/altq/altq/altq_priq.c#2 integrate .. //depot/projects/mpsafetty/sys/contrib/altq/altq/altq_red.c#2 integrate .. //depot/projects/mpsafetty/sys/contrib/altq/altq/altq_rio.c#2 integrate .. //depot/projects/mpsafetty/sys/contrib/altq/altq/altq_rmclass.c#2 integrate .. //depot/projects/mpsafetty/sys/contrib/altq/altq/altq_subr.c#5 integrate .. //depot/projects/mpsafetty/sys/contrib/ipfilter/netinet/ip_compat.h#4 integrate .. //depot/projects/mpsafetty/sys/dev/ar/if_ar.c#2 integrate .. //depot/projects/mpsafetty/sys/dev/ce/if_ce.c#3 integrate .. //depot/projects/mpsafetty/sys/dev/cfi/cfi_bus_lbc.c#1 branch .. //depot/projects/mpsafetty/sys/dev/cfi/cfi_core.c#1 branch .. //depot/projects/mpsafetty/sys/dev/cfi/cfi_dev.c#1 branch .. //depot/projects/mpsafetty/sys/dev/cfi/cfi_reg.h#1 branch .. //depot/projects/mpsafetty/sys/dev/cfi/cfi_var.h#1 branch .. //depot/projects/mpsafetty/sys/dev/drm/drm_drv.c#7 integrate .. //depot/projects/mpsafetty/sys/dev/drm/drm_fops.c#6 integrate .. //depot/projects/mpsafetty/sys/dev/drm/drm_lock.c#5 integrate .. //depot/projects/mpsafetty/sys/dev/drm/i915_dma.c#5 integrate .. //depot/projects/mpsafetty/sys/dev/hwpmc/hwpmc_amd.c#3 integrate .. //depot/projects/mpsafetty/sys/dev/hwpmc/hwpmc_logging.c#2 integrate .. //depot/projects/mpsafetty/sys/dev/hwpmc/hwpmc_mod.c#4 integrate .. //depot/projects/mpsafetty/sys/dev/hwpmc/hwpmc_piv.c#3 integrate .. //depot/projects/mpsafetty/sys/dev/hwpmc/hwpmc_ppro.c#4 integrate .. //depot/projects/mpsafetty/sys/dev/hwpmc/hwpmc_x86.c#3 integrate .. //depot/projects/mpsafetty/sys/dev/iwn/if_iwn.c#2 integrate .. //depot/projects/mpsafetty/sys/dev/lmc/if_lmc.c#3 integrate .. //depot/projects/mpsafetty/sys/dev/mii/atphy.c#3 integrate .. //depot/projects/mpsafetty/sys/dev/mxge/eth_z8e.h#3 integrate .. //depot/projects/mpsafetty/sys/dev/mxge/ethp_z8e.h#3 integrate .. //depot/projects/mpsafetty/sys/dev/mxge/rss_eth_z8e.h#3 integrate .. //depot/projects/mpsafetty/sys/dev/mxge/rss_ethp_z8e.h#3 integrate .. //depot/projects/mpsafetty/sys/dev/puc/pucdata.c#4 integrate .. //depot/projects/mpsafetty/sys/dev/ray/if_ray.c#2 integrate .. //depot/projects/mpsafetty/sys/dev/ray/if_rayvar.h#2 integrate .. //depot/projects/mpsafetty/sys/dev/sound/pci/hda/hdac.c#8 integrate .. //depot/projects/mpsafetty/sys/dev/sr/if_sr.c#2 integrate .. //depot/projects/mpsafetty/sys/dev/uart/uart_tty.c#5 integrate .. //depot/projects/mpsafetty/sys/dev/usb/u3g.c#4 integrate .. //depot/projects/mpsafetty/sys/dev/usb/ucom.c#10 integrate .. //depot/projects/mpsafetty/sys/dev/usb/udbp.c#2 integrate .. //depot/projects/mpsafetty/sys/dev/usb/ufoma.c#7 integrate .. //depot/projects/mpsafetty/sys/fs/cd9660/cd9660_node.c#3 integrate .. //depot/projects/mpsafetty/sys/fs/cd9660/cd9660_vfsops.c#3 integrate .. //depot/projects/mpsafetty/sys/fs/cd9660/cd9660_vnops.c#3 integrate .. //depot/projects/mpsafetty/sys/fs/fdescfs/fdesc_vfsops.c#2 integrate .. //depot/projects/mpsafetty/sys/fs/fdescfs/fdesc_vnops.c#5 integrate .. //depot/projects/mpsafetty/sys/fs/fifofs/fifo_vnops.c#2 integrate .. //depot/projects/mpsafetty/sys/fs/hpfs/hpfs_subr.c#2 integrate .. //depot/projects/mpsafetty/sys/fs/hpfs/hpfs_vfsops.c#3 integrate .. //depot/projects/mpsafetty/sys/fs/hpfs/hpfs_vnops.c#4 integrate .. //depot/projects/mpsafetty/sys/fs/msdosfs/msdosfs_denode.c#2 integrate .. //depot/projects/mpsafetty/sys/fs/msdosfs/msdosfs_vnops.c#4 integrate .. //depot/projects/mpsafetty/sys/fs/ntfs/ntfs_subr.c#2 integrate .. //depot/projects/mpsafetty/sys/fs/ntfs/ntfs_vfsops.c#3 integrate .. //depot/projects/mpsafetty/sys/fs/ntfs/ntfs_vnops.c#3 integrate .. //depot/projects/mpsafetty/sys/fs/nullfs/null_subr.c#2 integrate .. //depot/projects/mpsafetty/sys/fs/nullfs/null_vnops.c#3 integrate .. //depot/projects/mpsafetty/sys/fs/nwfs/nwfs_node.c#2 integrate .. //depot/projects/mpsafetty/sys/fs/nwfs/nwfs_vfsops.c#2 integrate .. //depot/projects/mpsafetty/sys/fs/portalfs/portal_vfsops.c#2 integrate .. //depot/projects/mpsafetty/sys/fs/portalfs/portal_vnops.c#6 integrate .. //depot/projects/mpsafetty/sys/fs/pseudofs/pseudofs.c#2 integrate .. //depot/projects/mpsafetty/sys/fs/pseudofs/pseudofs_vncache.c#2 integrate .. //depot/projects/mpsafetty/sys/fs/smbfs/smbfs_node.c#4 integrate .. //depot/projects/mpsafetty/sys/fs/smbfs/smbfs_vfsops.c#2 integrate .. //depot/projects/mpsafetty/sys/fs/udf/udf_vfsops.c#3 integrate .. //depot/projects/mpsafetty/sys/fs/udf/udf_vnops.c#3 integrate .. //depot/projects/mpsafetty/sys/fs/unionfs/union_subr.c#3 integrate .. //depot/projects/mpsafetty/sys/geom/part/g_part_bsd.c#3 integrate .. //depot/projects/mpsafetty/sys/gnu/fs/ext2fs/ext2_inode.c#3 integrate .. //depot/projects/mpsafetty/sys/gnu/fs/ext2fs/ext2_lookup.c#2 integrate .. //depot/projects/mpsafetty/sys/gnu/fs/ext2fs/ext2_vfsops.c#4 integrate .. //depot/projects/mpsafetty/sys/gnu/fs/reiserfs/reiserfs_inode.c#2 integrate .. //depot/projects/mpsafetty/sys/gnu/fs/reiserfs/reiserfs_vfsops.c#2 integrate .. //depot/projects/mpsafetty/sys/i386/conf/NOTES#7 integrate .. //depot/projects/mpsafetty/sys/i386/i386/sys_machdep.c#4 integrate .. //depot/projects/mpsafetty/sys/i386/include/apicvar.h#3 integrate .. //depot/projects/mpsafetty/sys/i386/include/smp.h#6 integrate .. //depot/projects/mpsafetty/sys/i386/xen/clock.c#5 integrate .. //depot/projects/mpsafetty/sys/i386/xen/mp_machdep.c#7 integrate .. //depot/projects/mpsafetty/sys/i386/xen/xen_machdep.c#11 integrate .. //depot/projects/mpsafetty/sys/ia64/ia64/sscdisk.c#2 integrate .. //depot/projects/mpsafetty/sys/kern/kern_descrip.c#6 integrate .. //depot/projects/mpsafetty/sys/kern/kern_event.c#2 integrate .. //depot/projects/mpsafetty/sys/kern/kern_jail.c#4 integrate .. //depot/projects/mpsafetty/sys/kern/kern_linker.c#3 integrate .. //depot/projects/mpsafetty/sys/kern/kern_lockf.c#2 integrate .. //depot/projects/mpsafetty/sys/kern/kern_mtxpool.c#2 integrate .. //depot/projects/mpsafetty/sys/kern/kern_proc.c#8 integrate .. //depot/projects/mpsafetty/sys/kern/kern_prot.c#3 integrate .. //depot/projects/mpsafetty/sys/kern/kern_resource.c#5 integrate .. //depot/projects/mpsafetty/sys/kern/subr_blist.c#2 integrate .. //depot/projects/mpsafetty/sys/kern/subr_sleepqueue.c#7 integrate .. //depot/projects/mpsafetty/sys/kern/subr_witness.c#11 integrate .. //depot/projects/mpsafetty/sys/kern/uipc_accf.c#2 integrate .. //depot/projects/mpsafetty/sys/kern/uipc_mqueue.c#5 integrate .. //depot/projects/mpsafetty/sys/kern/uipc_syscalls.c#2 integrate .. //depot/projects/mpsafetty/sys/kern/uipc_usrreq.c#4 integrate .. //depot/projects/mpsafetty/sys/kern/vfs_export.c#2 integrate .. //depot/projects/mpsafetty/sys/kern/vfs_syscalls.c#6 integrate .. //depot/projects/mpsafetty/sys/modules/u3g/Makefile#2 integrate .. //depot/projects/mpsafetty/sys/net/bpf.c#6 integrate .. //depot/projects/mpsafetty/sys/net/bsd_comp.c#2 integrate .. //depot/projects/mpsafetty/sys/net/if.c#8 integrate .. //depot/projects/mpsafetty/sys/net/if_arcsubr.c#2 integrate .. //depot/projects/mpsafetty/sys/net/if_ethersubr.c#5 integrate .. //depot/projects/mpsafetty/sys/net/if_fddisubr.c#2 integrate .. //depot/projects/mpsafetty/sys/net/if_iso88025subr.c#3 integrate .. //depot/projects/mpsafetty/sys/net/if_ppp.c#2 integrate .. //depot/projects/mpsafetty/sys/net/if_sl.c#2 integrate .. //depot/projects/mpsafetty/sys/net/if_tap.c#5 integrate .. //depot/projects/mpsafetty/sys/net/if_tun.c#5 integrate .. //depot/projects/mpsafetty/sys/net/ppp_deflate.c#2 integrate .. //depot/projects/mpsafetty/sys/net/rtsock.c#5 integrate .. //depot/projects/mpsafetty/sys/net80211/_ieee80211.h#2 integrate .. //depot/projects/mpsafetty/sys/net80211/ieee80211.c#4 integrate .. //depot/projects/mpsafetty/sys/net80211/ieee80211_acl.c#2 integrate .. //depot/projects/mpsafetty/sys/net80211/ieee80211_adhoc.c#3 integrate .. //depot/projects/mpsafetty/sys/net80211/ieee80211_crypto.c#3 integrate .. //depot/projects/mpsafetty/sys/net80211/ieee80211_crypto_ccmp.c#2 integrate .. //depot/projects/mpsafetty/sys/net80211/ieee80211_crypto_tkip.c#3 integrate .. //depot/projects/mpsafetty/sys/net80211/ieee80211_crypto_wep.c#2 integrate .. //depot/projects/mpsafetty/sys/net80211/ieee80211_freebsd.c#4 integrate .. //depot/projects/mpsafetty/sys/net80211/ieee80211_freebsd.h#4 integrate .. //depot/projects/mpsafetty/sys/net80211/ieee80211_hostap.c#5 integrate .. //depot/projects/mpsafetty/sys/net80211/ieee80211_ht.c#5 integrate .. //depot/projects/mpsafetty/sys/net80211/ieee80211_ht.h#4 integrate .. //depot/projects/mpsafetty/sys/net80211/ieee80211_input.c#3 integrate .. //depot/projects/mpsafetty/sys/net80211/ieee80211_ioctl.c#5 integrate .. //depot/projects/mpsafetty/sys/net80211/ieee80211_node.c#4 integrate .. //depot/projects/mpsafetty/sys/net80211/ieee80211_node.h#4 integrate .. //depot/projects/mpsafetty/sys/net80211/ieee80211_output.c#3 integrate .. //depot/projects/mpsafetty/sys/net80211/ieee80211_power.c#2 integrate .. //depot/projects/mpsafetty/sys/net80211/ieee80211_power.h#2 integrate .. //depot/projects/mpsafetty/sys/net80211/ieee80211_proto.c#2 integrate .. //depot/projects/mpsafetty/sys/net80211/ieee80211_proto.h#2 integrate .. //depot/projects/mpsafetty/sys/net80211/ieee80211_regdomain.c#2 integrate .. //depot/projects/mpsafetty/sys/net80211/ieee80211_scan.c#2 integrate .. //depot/projects/mpsafetty/sys/net80211/ieee80211_scan_sta.c#3 integrate .. //depot/projects/mpsafetty/sys/net80211/ieee80211_sta.c#4 integrate .. //depot/projects/mpsafetty/sys/net80211/ieee80211_var.h#3 integrate .. //depot/projects/mpsafetty/sys/netatalk/ddp_pcb.c#2 integrate .. //depot/projects/mpsafetty/sys/netgraph/atm/sscfu/ng_sscfu_cust.h#2 integrate .. //depot/projects/mpsafetty/sys/netgraph/bluetooth/drivers/h4/ng_h4.c#2 integrate .. //depot/projects/mpsafetty/sys/netgraph/bluetooth/hci/ng_hci_main.c#2 integrate .. //depot/projects/mpsafetty/sys/netgraph/bluetooth/hci/ng_hci_misc.c#2 integrate .. //depot/projects/mpsafetty/sys/netgraph/bluetooth/l2cap/ng_l2cap_main.c#2 integrate .. //depot/projects/mpsafetty/sys/netgraph/bluetooth/l2cap/ng_l2cap_misc.c#2 integrate .. //depot/projects/mpsafetty/sys/netgraph/bluetooth/l2cap/ng_l2cap_misc.h#2 integrate .. //depot/projects/mpsafetty/sys/netgraph/bluetooth/socket/ng_btsocket_hci_raw.c#3 integrate .. //depot/projects/mpsafetty/sys/netgraph/bluetooth/socket/ng_btsocket_l2cap.c#3 integrate .. //depot/projects/mpsafetty/sys/netgraph/bluetooth/socket/ng_btsocket_l2cap_raw.c#3 integrate .. //depot/projects/mpsafetty/sys/netgraph/bluetooth/socket/ng_btsocket_rfcomm.c#3 integrate .. //depot/projects/mpsafetty/sys/netgraph/bluetooth/socket/ng_btsocket_sco.c#2 integrate .. //depot/projects/mpsafetty/sys/netgraph/netflow/netflow.c#3 integrate .. //depot/projects/mpsafetty/sys/netgraph/netflow/ng_netflow.c#3 integrate .. //depot/projects/mpsafetty/sys/netgraph/netgraph.h#4 integrate .. //depot/projects/mpsafetty/sys/netgraph/ng_UI.c#2 integrate .. //depot/projects/mpsafetty/sys/netgraph/ng_async.c#2 integrate .. //depot/projects/mpsafetty/sys/netgraph/ng_atmllc.c#2 integrate .. //depot/projects/mpsafetty/sys/netgraph/ng_base.c#7 integrate .. //depot/projects/mpsafetty/sys/netgraph/ng_bpf.c#3 integrate .. //depot/projects/mpsafetty/sys/netgraph/ng_bridge.c#3 integrate .. //depot/projects/mpsafetty/sys/netgraph/ng_cisco.c#2 integrate .. //depot/projects/mpsafetty/sys/netgraph/ng_device.c#3 integrate .. //depot/projects/mpsafetty/sys/netgraph/ng_eiface.c#4 integrate .. //depot/projects/mpsafetty/sys/netgraph/ng_etf.c#2 integrate .. //depot/projects/mpsafetty/sys/netgraph/ng_ether.c#3 integrate .. //depot/projects/mpsafetty/sys/netgraph/ng_fec.c#2 integrate .. //depot/projects/mpsafetty/sys/netgraph/ng_frame_relay.c#2 integrate .. //depot/projects/mpsafetty/sys/netgraph/ng_gif.c#4 integrate .. //depot/projects/mpsafetty/sys/netgraph/ng_gif_demux.c#2 integrate .. //depot/projects/mpsafetty/sys/netgraph/ng_hole.c#2 integrate .. //depot/projects/mpsafetty/sys/netgraph/ng_iface.c#6 integrate .. //depot/projects/mpsafetty/sys/netgraph/ng_ipfw.c#2 integrate .. //depot/projects/mpsafetty/sys/netgraph/ng_ksocket.c#2 integrate .. //depot/projects/mpsafetty/sys/netgraph/ng_l2tp.c#3 integrate .. //depot/projects/mpsafetty/sys/netgraph/ng_lmi.c#2 integrate .. //depot/projects/mpsafetty/sys/netgraph/ng_message.h#2 integrate .. //depot/projects/mpsafetty/sys/netgraph/ng_mppc.c#2 integrate .. //depot/projects/mpsafetty/sys/netgraph/ng_nat.c#2 integrate .. //depot/projects/mpsafetty/sys/netgraph/ng_one2many.c#2 integrate .. //depot/projects/mpsafetty/sys/netgraph/ng_parse.c#2 integrate .. //depot/projects/mpsafetty/sys/netgraph/ng_pipe.c#2 integrate .. //depot/projects/mpsafetty/sys/netgraph/ng_ppp.c#2 integrate .. //depot/projects/mpsafetty/sys/netgraph/ng_pptpgre.c#2 integrate .. //depot/projects/mpsafetty/sys/netgraph/ng_rfc1490.c#2 integrate .. //depot/projects/mpsafetty/sys/netgraph/ng_sample.c#2 integrate .. //depot/projects/mpsafetty/sys/netgraph/ng_split.c#2 integrate .. //depot/projects/mpsafetty/sys/netgraph/ng_sppp.c#2 integrate .. //depot/projects/mpsafetty/sys/netgraph/ng_tag.c#2 integrate .. //depot/projects/mpsafetty/sys/netgraph/ng_tcpmss.c#2 integrate .. //depot/projects/mpsafetty/sys/netgraph/ng_tee.c#2 integrate .. //depot/projects/mpsafetty/sys/netgraph/ng_tty.c#10 integrate .. //depot/projects/mpsafetty/sys/netgraph/ng_vjc.c#2 integrate .. //depot/projects/mpsafetty/sys/netgraph/ng_vlan.c#2 integrate .. //depot/projects/mpsafetty/sys/netinet/igmp.c#4 integrate .. //depot/projects/mpsafetty/sys/netinet/in_mcast.c#4 integrate .. //depot/projects/mpsafetty/sys/netinet/in_pcb.c#11 integrate .. //depot/projects/mpsafetty/sys/netinet/ip_carp.c#5 integrate .. //depot/projects/mpsafetty/sys/netinet/sctp_os_bsd.h#4 integrate .. //depot/projects/mpsafetty/sys/netinet/tcp_syncache.c#11 integrate .. //depot/projects/mpsafetty/sys/netinet6/in6.c#5 integrate .. //depot/projects/mpsafetty/sys/netinet6/in6_pcb.c#8 integrate .. //depot/projects/mpsafetty/sys/netinet6/in6_src.c#8 integrate .. //depot/projects/mpsafetty/sys/netinet6/raw_ip6.c#8 integrate .. //depot/projects/mpsafetty/sys/netipsec/keysock.c#5 integrate .. //depot/projects/mpsafetty/sys/netipsec/xform_ah.c#4 integrate .. //depot/projects/mpsafetty/sys/netipx/ipx_pcb.c#2 integrate .. //depot/projects/mpsafetty/sys/netipx/spx_usrreq.c#2 integrate .. //depot/projects/mpsafetty/sys/netnatm/natm.c#2 integrate .. //depot/projects/mpsafetty/sys/netnatm/natm_pcb.c#2 integrate .. //depot/projects/mpsafetty/sys/netncp/ncp_conn.c#2 integrate .. //depot/projects/mpsafetty/sys/netncp/ncp_rq.c#2 integrate .. //depot/projects/mpsafetty/sys/netncp/ncp_sock.c#2 integrate .. //depot/projects/mpsafetty/sys/netncp/ncp_subr.c#2 integrate .. //depot/projects/mpsafetty/sys/netsmb/smb_rq.c#2 integrate .. //depot/projects/mpsafetty/sys/netsmb/smb_trantcp.c#2 integrate .. //depot/projects/mpsafetty/sys/nfs4client/nfs4_dev.c#2 integrate .. //depot/projects/mpsafetty/sys/nfs4client/nfs4_idmap.c#2 integrate .. //depot/projects/mpsafetty/sys/nfs4client/nfs4_socket.c#3 integrate .. //depot/projects/mpsafetty/sys/nfs4client/nfs4_vfsops.c#3 integrate .. //depot/projects/mpsafetty/sys/nfs4client/nfs4_vn_subs.c#2 integrate .. //depot/projects/mpsafetty/sys/nfs4client/nfs4_vnops.c#3 integrate .. //depot/projects/mpsafetty/sys/nfsclient/krpc_subr.c#2 integrate .. //depot/projects/mpsafetty/sys/nfsclient/nfs_lock.c#2 integrate .. //depot/projects/mpsafetty/sys/nfsclient/nfs_node.c#2 integrate .. //depot/projects/mpsafetty/sys/nfsclient/nfs_socket.c#3 integrate .. //depot/projects/mpsafetty/sys/nfsclient/nfs_subs.c#2 integrate .. //depot/projects/mpsafetty/sys/nfsclient/nfs_vfsops.c#9 integrate .. //depot/projects/mpsafetty/sys/nfsclient/nfs_vnops.c#7 integrate .. //depot/projects/mpsafetty/sys/nfsserver/nfs_serv.c#6 integrate .. //depot/projects/mpsafetty/sys/nfsserver/nfs_srvcache.c#2 integrate .. //depot/projects/mpsafetty/sys/nfsserver/nfs_srvsock.c#3 integrate .. //depot/projects/mpsafetty/sys/nfsserver/nfs_syscalls.c#3 integrate .. //depot/projects/mpsafetty/sys/opencrypto/cryptodev.c#2 integrate .. //depot/projects/mpsafetty/sys/opencrypto/cryptosoft.c#2 integrate .. //depot/projects/mpsafetty/sys/opencrypto/deflate.c#2 integrate .. //depot/projects/mpsafetty/sys/opencrypto/xform.c#2 integrate .. //depot/projects/mpsafetty/sys/pci/if_rl.c#2 integrate .. //depot/projects/mpsafetty/sys/pci/if_rlreg.h#4 integrate .. //depot/projects/mpsafetty/sys/powerpc/booke/pmap.c#4 integrate .. //depot/projects/mpsafetty/sys/powerpc/conf/MPC85XX#4 integrate .. //depot/projects/mpsafetty/sys/powerpc/mpc85xx/lbc.c#1 branch .. //depot/projects/mpsafetty/sys/powerpc/mpc85xx/lbc.h#1 branch .. //depot/projects/mpsafetty/sys/powerpc/mpc85xx/ocpbus.c#2 integrate .. //depot/projects/mpsafetty/sys/rpc/rpcclnt.c#4 integrate .. //depot/projects/mpsafetty/sys/security/mac_bsdextended/mac_bsdextended.c#7 integrate .. //depot/projects/mpsafetty/sys/security/mac_lomac/mac_lomac.c#6 integrate .. //depot/projects/mpsafetty/sys/sys/cfictl.h#1 branch .. //depot/projects/mpsafetty/sys/sys/malloc.h#2 integrate .. //depot/projects/mpsafetty/sys/sys/param.h#16 integrate .. //depot/projects/mpsafetty/sys/ufs/ffs/ffs_inode.c#4 integrate .. //depot/projects/mpsafetty/sys/ufs/ffs/ffs_snapshot.c#5 integrate .. //depot/projects/mpsafetty/sys/ufs/ffs/ffs_softdep.c#5 integrate .. //depot/projects/mpsafetty/sys/ufs/ffs/ffs_vfsops.c#9 integrate .. //depot/projects/mpsafetty/sys/ufs/ufs/ufs_dirhash.c#4 integrate .. //depot/projects/mpsafetty/sys/ufs/ufs/ufs_extattr.c#3 integrate .. //depot/projects/mpsafetty/sys/ufs/ufs/ufs_vnops.c#6 integrate .. //depot/projects/mpsafetty/sys/xen/evtchn/evtchn.c#5 integrate Differences ... ==== //depot/projects/mpsafetty/Makefile.inc1#5 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/Makefile.inc1,v 1.611 2008/09/19 16:14:42 obrien Exp $ +# $FreeBSD: src/Makefile.inc1,v 1.613 2008/10/23 16:06:49 des Exp $ # # Make command line options: # -DNO_CLEANDIR run ${MAKE} clean, instead of ${MAKE} cleandir ==== //depot/projects/mpsafetty/etc/periodic/security/200.chkmounts#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/etc/periodic/security/200.chkmounts,v 1.5 2002/10/25 15:14:16 thomas Exp $ +# $FreeBSD: src/etc/periodic/security/200.chkmounts,v 1.6 2008/10/25 18:45:40 ed Exp $ # # Show changes in the way filesystems are mounted @@ -50,7 +50,7 @@ ignore="${ignore}|^amd:" esac [ -n "$ignore" ] && cmd="egrep -v ${ignore#|}" || cmd=cat - mount -p | ${cmd} | + mount -p | sort | ${cmd} | check_diff mount - "${host} changes in mounted filesystems:" rc=$?;; *) rc=0;; ==== //depot/projects/mpsafetty/lib/libc/sys/mmap.2#2 (text+ko) ==== @@ -26,9 +26,9 @@ .\" SUCH DAMAGE. .\" .\" @(#)mmap.2 8.4 (Berkeley) 5/11/95 -.\" $FreeBSD: src/lib/libc/sys/mmap.2,v 1.56 2007/01/09 00:28:15 imp Exp $ +.\" $FreeBSD: src/lib/libc/sys/mmap.2,v 1.57 2008/10/24 14:40:13 alc Exp $ .\" -.Dd April 21, 2006 +.Dd October 24, 2008 .Dt MMAP 2 .Os .Sh NAME @@ -252,6 +252,11 @@ in which the file descriptor argument specifies a file or device to which swapping should be done. +.Sh NOTES +Although this implementation does not impose any alignment restrictions on +the +.Fa offset +argument, a portable program must only use page-aligned values. .Sh RETURN VALUES Upon successful completion, .Fn mmap @@ -307,13 +312,6 @@ was specified and the .Fa fd argument was not -1. -The -.Fa offset -argument -was not page-aligned. -(See -.Sx BUGS -below.) .It Bq Er ENODEV .Dv MAP_ANON has not been specified and ==== //depot/projects/mpsafetty/lib/libfetch/http.c#2 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/lib/libfetch/http.c,v 1.84 2008/02/08 09:48:48 des Exp $"); +__FBSDID("$FreeBSD: src/lib/libfetch/http.c,v 1.85 2008/10/24 07:56:01 ru Exp $"); /* * The following copyright applies to the base64 code: @@ -1064,6 +1064,7 @@ if (url->offset == size && url->length == 0) { /* asked for 0 bytes; fake it */ offset = url->offset; + clength = -1; conn->err = HTTP_OK; break; } else { ==== //depot/projects/mpsafetty/share/man/man4/snd_hda.4#6 (text+ko) ==== @@ -23,9 +23,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man4/snd_hda.4,v 1.21 2008/10/03 09:19:07 mav Exp $ +.\" $FreeBSD: src/share/man/man4/snd_hda.4,v 1.23 2008/10/24 18:57:11 mav Exp $ .\" -.Dd Sep 17, 2008 +.Dd October 24, 2008 .Dt SND_HDA 4 .Os .Sh NAME @@ -129,6 +129,8 @@ GPIO combination required for your system. ivrefX/ovrefX options controls voltage used to power external microphones and so on. +.It Va hint.hdac.%d.msi +Controls MSI (Message Signaled Interrupts) support. .It Va hint.hdac.%d.cad%d.nid%d.config Overrides codec pin configuration set by BIOS. May be specified as a 32bit HEX value with a leading "0x" or as a set of ==== //depot/projects/mpsafetty/share/man/man9/Makefile#10 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/share/man/man9/Makefile,v 1.342 2008/09/28 20:15:45 ed Exp $ +# $FreeBSD: src/share/man/man9/Makefile,v 1.343 2008/10/23 15:53:51 des Exp $ MAN= accept_filter.9 \ accf_data.9 \ @@ -745,9 +745,7 @@ MLINKS+=make_dev.9 destroy_dev.9 \ make_dev.9 dev_depends.9 \ make_dev.9 make_dev_alias.9 -MLINKS+=malloc.9 FREE.9 \ - malloc.9 free.9 \ - malloc.9 MALLOC.9 \ +MLINKS+=malloc.9 free.9 \ malloc.9 MALLOC_DECLARE.9 \ malloc.9 MALLOC_DEFINE.9 \ malloc.9 realloc.9 \ ==== //depot/projects/mpsafetty/share/man/man9/malloc.9#2 (text+ko) ==== @@ -34,16 +34,14 @@ .\" POSSIBILITY OF SUCH DAMAGE. .\" .\" $NetBSD: malloc.9,v 1.3 1996/11/11 00:05:11 lukem Exp $ -.\" $FreeBSD: src/share/man/man9/malloc.9,v 1.43 2008/03/25 15:44:49 ru Exp $ +.\" $FreeBSD: src/share/man/man9/malloc.9,v 1.44 2008/10/23 15:53:51 des Exp $ .\" -.Dd June 12, 2003 +.Dd October 23, 2008 .Dt MALLOC 9 .Os .Sh NAME .Nm malloc , -.Nm MALLOC , .Nm free , -.Nm FREE , .Nm realloc , .Nm reallocf , .Nm MALLOC_DEFINE , @@ -54,10 +52,8 @@ .In sys/malloc.h .Ft void * .Fn malloc "unsigned long size" "struct malloc_type *type" "int flags" -.Fn MALLOC space cast "unsigned long size" "struct malloc_type *type" "int flags" .Ft void .Fn free "void *addr" "struct malloc_type *type" -.Fn FREE "void *addr" "struct malloc_type *type" .Ft void * .Fn realloc "void *addr" "unsigned long size" "struct malloc_type *type" "int flags" .Ft void * @@ -123,20 +119,6 @@ except that it will free the passed pointer when the requested memory cannot be allocated. .Pp -The -.Fn MALLOC -macro variant is functionally equivalent to -.Bd -literal -offset indent -(space) = (cast)malloc((u_long)(size), type, flags) -.Ed -.Pp -and the -.Fn FREE -macro variant is equivalent to -.Bd -literal -offset indent -free((addr), type) -.Ed -.Pp Unlike its standard C library counterpart .Pq Xr malloc 3 , the kernel version takes two more arguments. @@ -219,7 +201,7 @@ /* sys/something/foo_subr.c */ \&... -MALLOC(buf, struct foo_buf *, sizeof *buf, M_FOOBUF, M_NOWAIT); +buf = malloc(sizeof *buf, M_FOOBUF, M_NOWAIT); .Ed .Pp ==== //depot/projects/mpsafetty/sys/arm/arm/undefined.c#2 (text+ko) ==== @@ -48,7 +48,7 @@ #include "opt_ddb.h" #include -__FBSDID("$FreeBSD: src/sys/arm/arm/undefined.c,v 1.15 2007/06/04 21:38:45 attilio Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/arm/undefined.c,v 1.16 2008/10/23 15:53:51 des Exp $"); #include #include @@ -106,7 +106,7 @@ KASSERT(handler != NULL, ("handler is NULL")); /* Used to be legal. */ /* XXX: M_TEMP??? */ - MALLOC(uh, struct undefined_handler *, sizeof(*uh), M_TEMP, M_WAITOK); + uh = malloc(sizeof(*uh), M_TEMP, M_WAITOK); uh->uh_handler = handler; install_coproc_handler_static(coproc, uh); return uh; @@ -125,7 +125,7 @@ struct undefined_handler *uh = cookie; LIST_REMOVE(uh, uh_link); - FREE(uh, M_TEMP); + free(uh, M_TEMP); } ==== //depot/projects/mpsafetty/sys/cam/scsi/scsi_target.c#4 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_target.c,v 1.75 2008/09/27 08:51:18 ed Exp $"); +__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_target.c,v 1.76 2008/10/23 15:53:51 des Exp $"); #include @@ -183,7 +183,7 @@ make_dev(&targ_cdevsw, dev2unit(dev), UID_ROOT, GID_WHEEL, 0600, "targ%d", dev2unit(dev)); } - MALLOC(softc, struct targ_softc *, sizeof(*softc), M_TARG, + softc = malloc(sizeof(*softc), M_TARG, M_WAITOK | M_ZERO); dev->si_drv1 = softc; softc->state = TARG_STATE_OPENED; @@ -211,7 +211,7 @@ if ((softc->periph == NULL) || (softc->state & TARG_STATE_LUN_ENABLED) == 0) { destroy_dev(dev); - FREE(softc, M_TARG); + free(softc, M_TARG); return (0); } @@ -230,7 +230,7 @@ softc->periph = NULL; } destroy_dev(dev); - FREE(softc, M_TARG); + free(softc, M_TARG); } cam_periph_unlock(periph); cam_periph_release(periph); @@ -531,7 +531,7 @@ } while ((descr = TAILQ_FIRST(&softc->abort_queue)) != NULL) { TAILQ_REMOVE(&softc->abort_queue, descr, tqe); - FREE(descr, M_TARG); + free(descr, M_TARG); } softc->periph = NULL; @@ -966,7 +966,7 @@ int ccb_len; ccb_len = targccblen(type); - MALLOC(ccb, union ccb *, ccb_len, M_TARG, M_WAITOK); + ccb = malloc(ccb_len, M_TARG, M_WAITOK); CAM_DEBUG(softc->path, CAM_DEBUG_PERIPH, ("getccb %p\n", ccb)); xpt_setup_ccb(&ccb->ccb_h, softc->path, priority); @@ -981,13 +981,13 @@ { CAM_DEBUG_PRINT(CAM_DEBUG_PERIPH, ("targfreeccb descr %p and\n", ccb->ccb_h.targ_descr)); - FREE(ccb->ccb_h.targ_descr, M_TARG); + free(ccb->ccb_h.targ_descr, M_TARG); switch (ccb->ccb_h.func_code) { case XPT_ACCEPT_TARGET_IO: case XPT_IMMED_NOTIFY: CAM_DEBUG_PRINT(CAM_DEBUG_PERIPH, ("freeing ccb %p\n", ccb)); - FREE(ccb, M_TARG); + free(ccb, M_TARG); break; default: /* Send back CCB if we got it from the periph */ @@ -998,7 +998,7 @@ } else { CAM_DEBUG_PRINT(CAM_DEBUG_PERIPH, ("freeing ccb %p\n", ccb)); - FREE(ccb, M_TARG); + free(ccb, M_TARG); } break; } @@ -1009,7 +1009,7 @@ { struct targ_cmd_descr *descr; - MALLOC(descr, struct targ_cmd_descr *, sizeof(*descr), M_TARG, + descr = malloc(sizeof(*descr), M_TARG, M_WAITOK); descr->mapinfo.num_bufs_used = 0; return (descr); ==== //depot/projects/mpsafetty/sys/compat/linux/linux_ioctl.c#9 (text+ko) ==== @@ -29,7 +29,7 @@ #include "opt_compat.h" #include -__FBSDID("$FreeBSD: src/sys/compat/linux/linux_ioctl.c,v 1.144 2008/10/02 15:37:58 zec Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/linux/linux_ioctl.c,v 1.145 2008/10/23 15:53:51 des Exp $"); #include #include @@ -2673,7 +2673,7 @@ break; } if (he == NULL) { - MALLOC(he, struct handler_element *, sizeof(*he), + he = malloc(sizeof(*he), M_LINUX, M_WAITOK); he->func = h->func; } else @@ -2711,7 +2711,7 @@ if (he->func == h->func) { TAILQ_REMOVE(&handlers, he, list); sx_xunlock(&linux_ioctl_sx); - FREE(he, M_LINUX); + free(he, M_LINUX); return (0); } } ==== //depot/projects/mpsafetty/sys/compat/linux/linux_socket.c#5 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/compat/linux/linux_socket.c,v 1.77 2008/10/02 15:37:58 zec Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/linux/linux_socket.c,v 1.78 2008/10/23 15:53:51 des Exp $"); /* XXX we use functions that might not exist. */ #include "opt_compat.h" @@ -120,7 +120,7 @@ } #endif - MALLOC(kosa, struct osockaddr *, alloclen, mtype, M_WAITOK); + kosa = malloc(alloclen, mtype, M_WAITOK); if ((error = copyin(osa, kosa, *osalen))) goto out; @@ -168,7 +168,7 @@ return (0); out: - FREE(kosa, mtype); + free(kosa, mtype); return (error); } @@ -458,7 +458,7 @@ bad: if (to) - FREE(to, M_SONAME); + free(to, M_SONAME); return (error); } ==== //depot/projects/mpsafetty/sys/compat/linux/linux_util.c#2 (text+ko) ==== @@ -30,7 +30,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/compat/linux/linux_util.c,v 1.35 2008/06/02 08:40:06 ed Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/linux/linux_util.c,v 1.36 2008/10/23 15:53:51 des Exp $"); #include "opt_compat.h" @@ -165,7 +165,7 @@ char formated[256]; int current_size = 0, string_size = 1024; - MALLOC(string, char *, string_size, M_LINUX, M_WAITOK); + string = malloc(string_size, M_LINUX, M_WAITOK); string[0] = '\000'; last = ""; TAILQ_FOREACH(de, &devices, list) { @@ -181,10 +181,10 @@ if (strlen(formated) + current_size >= string_size) { string_size *= 2; - MALLOC(string, char *, string_size, + string = malloc(string_size, M_LINUX, M_WAITOK); bcopy(temp, string, current_size); - FREE(temp, M_LINUX); + free(temp, M_LINUX); } strcat(string, formated); current_size = strlen(string); @@ -197,7 +197,7 @@ void linux_free_get_char_devices(char *string) { - FREE(string, M_LINUX); + free(string, M_LINUX); } static int linux_major_starting = 200; @@ -210,7 +210,7 @@ if (d == NULL) return (EINVAL); - MALLOC(de, struct device_element *, sizeof(*de), + de = malloc(sizeof(*de), M_LINUX, M_WAITOK); if (d->linux_major < 0) { d->linux_major = linux_major_starting++; @@ -234,7 +234,7 @@ TAILQ_FOREACH(de, &devices, list) { if (bcmp(d, &de->entry, sizeof(*d)) == 0) { TAILQ_REMOVE(&devices, de, list); - FREE(de, M_LINUX); + free(de, M_LINUX); return (0); } } ==== //depot/projects/mpsafetty/sys/conf/NOTES#14 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/NOTES,v 1.1510 2008/10/22 17:50:45 obrien Exp $ +# $FreeBSD: src/sys/conf/NOTES,v 1.1511 2008/10/24 07:16:13 n_hibma Exp $ # # NOTES -- Lines that can be cut/pasted into kernel and hints configs. # @@ -2419,7 +2419,7 @@ # # USB serial support device ucom -# USB support for 3G modem cards by Option, Huawei and Sierra +# USB support for 3G modem cards by Option, Novatel, Huawei and Sierra device u3g # USB support for Technologies ARK3116 based serial adapters device uark @@ -2486,6 +2486,7 @@ # debugging options for the USB subsystem # options USB_DEBUG +options U3G_DEBUG # options for ukbd: options UKBD_DFLT_KEYMAP # specify the built-in keymap ==== //depot/projects/mpsafetty/sys/conf/files#21 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/files,v 1.1339 2008/10/21 20:33:40 mav Exp $ +# $FreeBSD: src/sys/conf/files,v 1.1340 2008/10/25 06:18:12 marcel Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -532,6 +532,8 @@ dev/cardbus/cardbus.c optional cardbus dev/cardbus/cardbus_cis.c optional cardbus dev/cardbus/cardbus_device.c optional cardbus +dev/cfi/cfi_core.c optional cfi +dev/cfi/cfi_dev.c optional cfi dev/ciss/ciss.c optional ciss dev/cm/smc90cx6.c optional cm dev/cmx/cmx.c optional cmx ==== //depot/projects/mpsafetty/sys/conf/files.powerpc#5 (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.82 2008/10/14 14:54:14 nwhitehorn Exp $ +# $FreeBSD: src/sys/conf/files.powerpc,v 1.84 2008/10/25 06:18:12 marcel Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -28,6 +28,7 @@ crypto/blowfish/bf_enc.c optional crypto | ipsec crypto/des/des_enc.c optional crypto | ipsec | netsmb dev/bm/if_bm.c optional bm powermac +dev/cfi/cfi_bus_lbc.c optional cfi dev/fb/fb.c optional sc dev/hwpmc/hwpmc_powerpc.c optional hwpmc dev/kbd/kbd.c optional sc @@ -99,6 +100,7 @@ powerpc/fpu/fpu_mul.c optional fpu_emu powerpc/fpu/fpu_sqrt.c optional fpu_emu powerpc/fpu/fpu_subr.c optional fpu_emu +powerpc/mpc85xx/lbc.c optional mpc85xx powerpc/mpc85xx/mpc85xx.c optional mpc85xx powerpc/mpc85xx/nexus.c optional mpc85xx powerpc/mpc85xx/ocpbus.c optional mpc85xx ==== //depot/projects/mpsafetty/sys/conf/options#12 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/options,v 1.642 2008/10/01 19:24:16 jhb Exp $ +# $FreeBSD: src/sys/conf/options,v 1.643 2008/10/24 07:16:13 n_hibma Exp $ # # On the handling of kernel options # @@ -618,6 +618,7 @@ # options for USB support USB_DEBUG opt_usb.h USBVERBOSE opt_usb.h +U3G_DEBUG opt_u3g.h UKBD_DFLT_KEYMAP opt_ukbd.h UPLCOM_INTR_INTERVAL opt_uplcom.h UVSCOM_DEFAULT_OPKTSIZE opt_uvscom.h ==== //depot/projects/mpsafetty/sys/contrib/altq/altq/altq_cbq.c#2 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/contrib/altq/altq/altq_cbq.c,v 1.5 2007/07/03 12:46:05 mlaier Exp $ */ +/* $FreeBSD: src/sys/contrib/altq/altq/altq_cbq.c,v 1.6 2008/10/23 15:53:51 des Exp $ */ /* $KAME: altq_cbq.c,v 1.19 2003/09/17 14:23:25 kjc Exp $ */ /* @@ -273,7 +273,7 @@ return (ENODEV); /* allocate and initialize cbq_state_t */ - MALLOC(cbqp, cbq_state_t *, sizeof(cbq_state_t), M_DEVBUF, M_WAITOK); + cbqp = malloc(sizeof(cbq_state_t), M_DEVBUF, M_WAITOK); if (cbqp == NULL) return (ENOMEM); bzero(cbqp, sizeof(cbq_state_t)); @@ -304,7 +304,7 @@ cbq_class_destroy(cbqp, cbqp->ifnp.root_); /* deallocate cbq_state_t */ - FREE(cbqp, M_DEVBUF); + free(cbqp, M_DEVBUF); return (0); } @@ -927,7 +927,7 @@ return (ENXIO); /* allocate and initialize cbq_state_t */ - MALLOC(new_cbqp, cbq_state_t *, sizeof(cbq_state_t), M_DEVBUF, M_WAITOK); + new_cbqp = malloc(sizeof(cbq_state_t), M_DEVBUF, M_WAITOK); if (new_cbqp == NULL) return (ENOMEM); bzero(new_cbqp, sizeof(cbq_state_t)); @@ -943,7 +943,7 @@ cbq_enqueue, cbq_dequeue, cbq_request, &new_cbqp->cbq_classifier, acc_classify); if (error) { - FREE(new_cbqp, M_DEVBUF); + free(new_cbqp, M_DEVBUF); return (error); } @@ -987,7 +987,7 @@ } /* deallocate cbq_state_t */ - FREE(cbqp, M_DEVBUF); + free(cbqp, M_DEVBUF); return (0); } ==== //depot/projects/mpsafetty/sys/contrib/altq/altq/altq_cdnr.c#2 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/contrib/altq/altq/altq_cdnr.c,v 1.3 2006/11/06 13:41:50 rwatson Exp $ */ +/* $FreeBSD: src/sys/contrib/altq/altq/altq_cdnr.c,v 1.4 2008/10/23 15:53:51 des Exp $ */ /* $KAME: altq_cdnr.c,v 1.14 2003/09/05 22:40:36 itojun Exp $ */ /* @@ -274,7 +274,7 @@ return (NULL); } - MALLOC(cb, struct cdnr_block *, size, M_DEVBUF, M_WAITOK); + cb = malloc(size, M_DEVBUF, M_WAITOK); if (cb == NULL) return (NULL); bzero(cb, size); @@ -319,7 +319,7 @@ if (cb->cb_top != cblock) LIST_REMOVE(cb, cb_next); - FREE(cb, M_DEVBUF); + free(cb, M_DEVBUF); } /* ==== //depot/projects/mpsafetty/sys/contrib/altq/altq/altq_hfsc.c#2 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/contrib/altq/altq/altq_hfsc.c,v 1.4 2007/07/03 12:46:05 mlaier Exp $ */ +/* $FreeBSD: src/sys/contrib/altq/altq/altq_hfsc.c,v 1.6 2008/10/23 20:26:15 des Exp $ */ /* $KAME: altq_hfsc.c,v 1.24 2003/12/05 05:40:46 kjc Exp $ */ /* @@ -202,15 +202,14 @@ if (!ALTQ_IS_READY(&ifp->if_snd)) return (ENODEV); - MALLOC(hif, struct hfsc_if *, sizeof(struct hfsc_if), - M_DEVBUF, M_WAITOK); + hif = malloc(sizeof(struct hfsc_if), M_DEVBUF, M_WAITOK); if (hif == NULL) return (ENOMEM); bzero(hif, sizeof(struct hfsc_if)); hif->hif_eligible = ellist_alloc(); if (hif->hif_eligible == NULL) { - FREE(hif, M_DEVBUF); + free(hif, M_DEVBUF); return (ENOMEM); } @@ -236,7 +235,7 @@ ellist_destroy(hif->hif_eligible); - FREE(hif, M_DEVBUF); + free(hif, M_DEVBUF); return (0); } @@ -404,14 +403,12 @@ } #endif - MALLOC(cl, struct hfsc_class *, sizeof(struct hfsc_class), - M_DEVBUF, M_WAITOK); + cl = malloc(sizeof(struct hfsc_class), M_DEVBUF, M_WAITOK); if (cl == NULL) return (NULL); bzero(cl, sizeof(struct hfsc_class)); - MALLOC(cl->cl_q, class_queue_t *, sizeof(class_queue_t), - M_DEVBUF, M_WAITOK); + cl->cl_q = malloc(sizeof(class_queue_t), M_DEVBUF, M_WAITOK); if (cl->cl_q == NULL) goto err_ret; bzero(cl->cl_q, sizeof(class_queue_t)); @@ -471,8 +468,8 @@ #endif /* ALTQ_RED */ if (rsc != NULL && (rsc->m1 != 0 || rsc->m2 != 0)) { - MALLOC(cl->cl_rsc, struct internal_sc *, - sizeof(struct internal_sc), M_DEVBUF, M_WAITOK); + cl->cl_rsc = malloc(sizeof(struct internal_sc), + M_DEVBUF, M_WAITOK); if (cl->cl_rsc == NULL) goto err_ret; sc2isc(rsc, cl->cl_rsc); @@ -480,16 +477,16 @@ rtsc_init(&cl->cl_eligible, cl->cl_rsc, 0, 0); } if (fsc != NULL && (fsc->m1 != 0 || fsc->m2 != 0)) { - MALLOC(cl->cl_fsc, struct internal_sc *, - sizeof(struct internal_sc), M_DEVBUF, M_WAITOK); + cl->cl_fsc = malloc(sizeof(struct internal_sc), + M_DEVBUF, M_WAITOK); if (cl->cl_fsc == NULL) goto err_ret; sc2isc(fsc, cl->cl_fsc); rtsc_init(&cl->cl_virtual, cl->cl_fsc, 0, 0); } if (usc != NULL && (usc->m1 != 0 || usc->m2 != 0)) { - MALLOC(cl->cl_usc, struct internal_sc *, - sizeof(struct internal_sc), M_DEVBUF, M_WAITOK); + cl->cl_usc = malloc(sizeof(struct internal_sc), + M_DEVBUF, M_WAITOK); if (cl->cl_usc == NULL) goto err_ret; sc2isc(usc, cl->cl_usc); @@ -565,14 +562,14 @@ #endif } if (cl->cl_fsc != NULL) - FREE(cl->cl_fsc, M_DEVBUF); + free(cl->cl_fsc, M_DEVBUF); if (cl->cl_rsc != NULL) - FREE(cl->cl_rsc, M_DEVBUF); + free(cl->cl_rsc, M_DEVBUF); >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sun Oct 26 13:41:54 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id AC71E1065685; Sun, 26 Oct 2008 13:41:54 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 56FA4106566B for ; Sun, 26 Oct 2008 13:41:54 +0000 (UTC) (envelope-from ed@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 45B988FC1D for ; Sun, 26 Oct 2008 13:41:54 +0000 (UTC) (envelope-from ed@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id m9QDfs63064904 for ; Sun, 26 Oct 2008 13:41:54 GMT (envelope-from ed@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m9QDfsuA064902 for perforce@freebsd.org; Sun, 26 Oct 2008 13:41:54 GMT (envelope-from ed@FreeBSD.org) Date: Sun, 26 Oct 2008 13:41:54 GMT Message-Id: <200810261341.m9QDfsuA064902@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to ed@FreeBSD.org using -f From: Ed Schouten To: Perforce Change Reviews Cc: Subject: PERFORCE change 151950 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, 26 Oct 2008 13:41:54 -0000 http://perforce.freebsd.org/chv.cgi?CH=151950 Change 151950 by ed@ed_dull on 2008/10/26 13:41:32 Revert clist changes. I've decided to keep it as it is now. Affected files ... .. //depot/projects/mpsafetty/sys/dev/dcons/dcons_os.c#4 integrate .. //depot/projects/mpsafetty/sys/dev/kbd/kbd.c#6 integrate .. //depot/projects/mpsafetty/sys/dev/kbdmux/kbdmux.c#6 integrate .. //depot/projects/mpsafetty/sys/dev/usb/ugen.c#6 integrate .. //depot/projects/mpsafetty/sys/dev/usb/uhid.c#6 integrate .. //depot/projects/mpsafetty/sys/kern/subr_clist.c#9 integrate .. //depot/projects/mpsafetty/sys/sys/clist.h#8 integrate .. //depot/projects/mpsafetty/sys/sys/param.h#17 integrate Differences ... ==== //depot/projects/mpsafetty/sys/dev/dcons/dcons_os.c#4 (text+ko) ==== @@ -126,13 +126,11 @@ extern struct gdb_dbgport *gdb_cur; #endif -static tsw_outwakeup_t dcons_outwakeup; -static tsw_free_t dcons_free; +static tsw_outwakeup_t dcons_outwakeup; static struct ttydevsw dcons_ttydevsw = { .tsw_flags = TF_NOPREFIX, .tsw_outwakeup = dcons_outwakeup, - .tsw_free = dcons_free, }; #if (defined(GDB) || defined(DDB)) && defined(ALT_BREAK_TO_DEBUGGER) @@ -221,16 +219,6 @@ } static void -dcons_free(void *arg) -{ - - /* - * XXX: dcons(4) should not reuse the device name before this - * function has been called! - */ -} - -static void dcons_timeout(void *v) { struct tty *tp; ==== //depot/projects/mpsafetty/sys/dev/kbd/kbd.c#6 (text+ko) ==== @@ -558,7 +558,7 @@ #if 0 bzero(&sc->gkb_q, sizeof(sc->gkb_q)); #endif - clist_alloc(&sc->gkb_q, KB_QSIZE); + clist_alloc_cblocks(&sc->gkb_q, KB_QSIZE, KB_QSIZE/2); /* XXX */ splx(s); return (0); @@ -608,7 +608,7 @@ splx(s); return (ENXIO); } - while (clist_usage(&sc->gkb_q) == 0) { + while (sc->gkb_q.c_cc == 0) { if (flag & O_NONBLOCK) { splx(s); return (EWOULDBLOCK); @@ -632,7 +632,7 @@ error = 0; while (uio->uio_resid > 0) { len = imin(uio->uio_resid, sizeof(buffer)); - len = clist_read(&sc->gkb_q, buffer, len); + len = q_to_b(&sc->gkb_q, buffer, len); if (len <= 0) break; error = uiomove(buffer, len, uio); @@ -684,7 +684,7 @@ if ((sc == NULL) || (kbd == NULL) || !KBD_IS_VALID(kbd)) { revents = POLLHUP; /* the keyboard has gone */ } else if (events & (POLLIN | POLLRDNORM)) { - if (clist_usage(&sc->gkb_q) > 0) + if (sc->gkb_q.c_cc > 0) revents = events & (POLLIN | POLLRDNORM); else selrecord(td, &sc->gkb_rsel); @@ -701,7 +701,6 @@ u_char *cp; int mode; int c; - char cq[3]; /* assert(KBD_IS_VALID(kbd)) */ sc = (genkbd_softc_t *)arg; @@ -739,8 +738,7 @@ /* store the byte as is for K_RAW and K_CODE modes */ if (mode != K_XLATE) { - cq[0] = KEYCHAR(c); - clist_write(&sc->gkb_q, cq, 1); + putc(KEYCHAR(c), &sc->gkb_q); continue; } @@ -755,10 +753,9 @@ /* ignore them... */ continue; case BTAB: /* a backtab: ESC [ Z */ - cq[0] = 0x1b; - cq[1] = '['; - cq[2] = 'Z'; - clist_write(&sc->gkb_q, cq, 3); + putc(0x1b, &sc->gkb_q); + putc('[', &sc->gkb_q); + putc('Z', &sc->gkb_q); continue; } } @@ -766,24 +763,24 @@ /* normal chars, normal chars with the META, function keys */ switch (KEYFLAGS(c)) { case 0: /* a normal char */ - cq[0] = KEYCHAR(c); - clist_write(&sc->gkb_q, cq, 1); + putc(KEYCHAR(c), &sc->gkb_q); break; case MKEY: /* the META flag: prepend ESC */ - cq[0] = 0x1b; - cq[1] = KEYCHAR(c); - clist_write(&sc->gkb_q, cq, 2); + putc(0x1b, &sc->gkb_q); + putc(KEYCHAR(c), &sc->gkb_q); break; case FKEY | SPCLKEY: /* a function key, return string */ cp = kbdd_get_fkeystr(kbd, KEYCHAR(c), &len); - if (cp != NULL) - clist_write(&sc->gkb_q, cp, len); + if (cp != NULL) { + while (len-- > 0) + putc(*cp++, &sc->gkb_q); + } break; } } /* wake up sleeping/polling processes */ - if (clist_usage(&sc->gkb_q) > 0) { + if (sc->gkb_q.c_cc > 0) { if (sc->gkb_flags & KB_ASLEEP) { sc->gkb_flags &= ~KB_ASLEEP; wakeup(sc); ==== //depot/projects/mpsafetty/sys/dev/kbdmux/kbdmux.c#6 (text+ko) ==== @@ -205,7 +205,7 @@ callout_deactivate(&state->ks_timo); /* queue interrupt task if needed */ - if (clist_usage(&state->ks_inq) > 0 && !(state->ks_flags & TASK) && + if (state->ks_inq.c_cc > 0 && !(state->ks_flags & TASK) && KBDMUX_QUEUE_INTR(state) == 0) state->ks_flags |= TASK; @@ -224,7 +224,6 @@ switch (event) { case KBDIO_KEYINPUT: { int c; - char cq; KBDMUX_LOCK(state); @@ -247,13 +246,12 @@ if (!KBD_IS_BUSY(kbd)) continue; /* not open - discard the input */ - cq = c; - clist_write(&state->ks_inq, &cq, 1); + putc(c, &state->ks_inq); } /* queue interrupt task if needed */ - if (clist_usage(&state->ks_inq) > 0 && - !(state->ks_flags & TASK) && KBDMUX_QUEUE_INTR(state) == 0) + if (state->ks_inq.c_cc > 0 && !(state->ks_flags & TASK) && + KBDMUX_QUEUE_INTR(state) == 0) state->ks_flags |= TASK; KBDMUX_UNLOCK(state); @@ -386,7 +384,8 @@ } KBDMUX_LOCK_INIT(state); - clist_alloc(&state->ks_inq, KBDMUX_Q_SIZE); + clist_alloc_cblocks(&state->ks_inq, + KBDMUX_Q_SIZE, KBDMUX_Q_SIZE / 2); TASK_INIT(&state->ks_task, 0, kbdmux_kbd_intr, (void *) kbd); KBDMUX_CALLOUT_INIT(state); SLIST_INIT(&state->ks_kbds); @@ -450,7 +449,7 @@ bad: if (needfree) { if (state != NULL) { - clist_free(&state->ks_inq); + clist_free_cblocks(&state->ks_inq); free(state, M_KBDMUX); } if (keymap != NULL) @@ -497,7 +496,8 @@ } /* flush input queue */ - clist_free(&state->ks_inq); + ndflush(&state->ks_inq, state->ks_inq.c_cc); + clist_free_cblocks(&state->ks_inq); KBDMUX_UNLOCK(state); @@ -574,15 +574,14 @@ kbdmux_read(keyboard_t *kbd, int wait) { kbdmux_state_t *state = (kbdmux_state_t *) kbd->kb_data; - char c; + int c; KBDMUX_LOCK(state); - if (clist_read(&state->ks_inq, &c, 1) != 1) { - KBDMUX_UNLOCK(state); - return (-1); - } + c = getc(&state->ks_inq); KBDMUX_UNLOCK(state); - kbd->kb_count++; + + if (c != -1) + kbd->kb_count ++; return (KBD_IS_ACTIVE(kbd)? c : -1); } @@ -600,7 +599,7 @@ return (FALSE); KBDMUX_LOCK(state); - ready = clist_usage(&state->ks_inq) > 0 ? TRUE : FALSE; + ready = (state->ks_inq.c_cc > 0)? TRUE : FALSE; KBDMUX_UNLOCK(state); return (ready); @@ -614,8 +613,7 @@ { kbdmux_state_t *state = (kbdmux_state_t *) kbd->kb_data; u_int action; - int scancode = -1, keycode; - char cq; + int scancode, keycode; KBDMUX_LOCK(state); @@ -637,7 +635,8 @@ } /* see if there is something in the keyboard queue */ - if (clist_read(&state->ks_inq, &cq, 1) == 1) { + scancode = getc(&state->ks_inq); + if (scancode == -1) { if (state->ks_flags & POLLING) { kbdmux_kbd_t *k; @@ -651,12 +650,11 @@ if (!KBD_IS_BUSY(k->kbd)) continue; - cq = scancode; - clist_write(&state->ks_inq, &cq, 1); + putc(scancode, &state->ks_inq); } } - if (clist_usage(&state->ks_inq) > 0) + if (state->ks_inq.c_cc > 0) goto next_code; } @@ -897,7 +895,7 @@ if (!(state->ks_flags & COMPOSE) && (state->ks_composed_char != 0)) ready = TRUE; else - ready = clist_usage(&state->ks_inq) > 0 ? TRUE : FALSE; + ready = (state->ks_inq.c_cc > 0)? TRUE : FALSE; KBDMUX_UNLOCK(state); @@ -1222,7 +1220,7 @@ state->ks_composed_char = 0; /* state->ks_prefix = 0; XXX */ - clist_flush(&state->ks_inq); + ndflush(&state->ks_inq, state->ks_inq.c_cc); } static void ==== //depot/projects/mpsafetty/sys/dev/usb/ugen.c#6 (text+ko) ==== @@ -529,7 +529,9 @@ sce->ibuf = malloc(isize, M_USBDEV, M_WAITOK); DPRINTFN(5, ("ugenopen: intr endpt=%d,isize=%d\n", endpt, isize)); - clist_alloc(&sce->q, UGEN_IBSIZE); + if ((clist_alloc_cblocks(&sce->q, UGEN_IBSIZE, + UGEN_IBSIZE), 0) == -1) + return (ENOMEM); err = usbd_open_pipe_intr(sce->iface, edesc->bEndpointAddress, USBD_SHORT_XFER_OK, &sce->pipeh, sce, @@ -537,7 +539,7 @@ USBD_DEFAULT_INTERVAL); if (err) { free(sce->ibuf, M_USBDEV); - clist_free(&sce->q); + clist_free_cblocks(&sce->q); return (EIO); } DPRINTFN(5, ("ugenopen: interrupt open done\n")); @@ -647,7 +649,8 @@ switch (sce->edesc->bmAttributes & UE_XFERTYPE) { case UE_INTERRUPT: - clist_free(&sce->q); + ndflush(&sce->q, sce->q.c_cc); + clist_free_cblocks(&sce->q); break; case UE_ISOCHRONOUS: for (i = 0; i < UGEN_NISOREQS; ++i) @@ -660,7 +663,7 @@ if (sce->ibuf != NULL) { free(sce->ibuf, M_USBDEV); sce->ibuf = NULL; - clist_free(&sce->q); + clist_free_cblocks(&sce->q); } } sc->sc_is_open[endpt] = 0; @@ -704,7 +707,7 @@ case UE_INTERRUPT: /* Block until activity occurred. */ s = splusb(); - while (clist_usage(&sce->q) == 0) { + while (sce->q.c_cc == 0) { if (flag & O_NONBLOCK) { splx(s); return (EWOULDBLOCK); @@ -727,14 +730,13 @@ splx(s); /* Transfer as many chunks as possible. */ - while ((n = clist_usage(&sce->q)) > 0 && - uio->uio_resid > 0 && !error) { - n = min(n, uio->uio_resid); + while (sce->q.c_cc > 0 && uio->uio_resid > 0 && !error) { + n = min(sce->q.c_cc, uio->uio_resid); if (n > sizeof(buffer)) n = sizeof(buffer); /* Remove a small chunk from the input queue. */ - clist_read(&sce->q, buffer, n); + q_to_b(&sce->q, buffer, n); DPRINTFN(5, ("ugenread: got %d chars\n", n)); /* Copy the data to the user process. */ @@ -1025,7 +1027,7 @@ DPRINTFN(5, (" data = %02x %02x %02x\n", ibuf[0], ibuf[1], ibuf[2])); - clist_write(&sce->q, ibuf, count); + (void)b_to_q(ibuf, count, &sce->q); if (sce->state & UGEN_ASLP) { sce->state &= ~UGEN_ASLP; @@ -1539,13 +1541,13 @@ switch (edesc->bmAttributes & UE_XFERTYPE) { case UE_INTERRUPT: if (sce_in != NULL && (events & (POLLIN | POLLRDNORM))) { - if (clist_usage(&sce_in->q) > 0) + if (sce_in->q.c_cc > 0) revents |= events & (POLLIN | POLLRDNORM); else selrecord(p, &sce_in->rsel); } if (sce_out != NULL && (events & (POLLOUT | POLLWRNORM))) { - if (clist_usage(&sce_out->q) > 0) + if (sce_out->q.c_cc > 0) revents |= events & (POLLOUT | POLLWRNORM); else selrecord(p, &sce_out->rsel); ==== //depot/projects/mpsafetty/sys/dev/usb/uhid.c#6 (text+ko) ==== @@ -390,7 +390,7 @@ return; } - clist_write(&sc->sc_q, sc->sc_ibuf, sc->sc_isize); + (void) b_to_q(sc->sc_ibuf, sc->sc_isize, &sc->sc_q); if (sc->sc_state & UHID_ASLP) { sc->sc_state &= ~UHID_ASLP; @@ -425,7 +425,7 @@ return (EBUSY); sc->sc_state |= UHID_OPEN; - clist_alloc(&sc->sc_q, UHID_BSIZE); + clist_alloc_cblocks(&sc->sc_q, UHID_BSIZE, UHID_BSIZE); sc->sc_ibuf = malloc(sc->sc_isize, M_USBDEV, M_WAITOK); sc->sc_obuf = malloc(sc->sc_osize, M_USBDEV, M_WAITOK); @@ -465,7 +465,8 @@ usbd_close_pipe(sc->sc_intrpipe); sc->sc_intrpipe = 0; - clist_free(&sc->sc_q); + ndflush(&sc->sc_q, sc->sc_q.c_cc); + clist_free_cblocks(&sc->sc_q); free(sc->sc_ibuf, M_USBDEV); free(sc->sc_obuf, M_USBDEV); @@ -499,7 +500,7 @@ } s = splusb(); - while (clist_usage(&sc->sc_q) == 0) { + while (sc->sc_q.c_cc == 0) { if (flag & O_NONBLOCK) { splx(s); return (EWOULDBLOCK); @@ -523,14 +524,13 @@ splx(s); /* Transfer as many chunks as possible. */ - while ((length = clist_usage(&sc->sc_q)) > 0 && - uio->uio_resid > 0 && !error) { - length = min(length, uio->uio_resid); + while (sc->sc_q.c_cc > 0 && uio->uio_resid > 0 && !error) { + length = min(sc->sc_q.c_cc, uio->uio_resid); if (length > sizeof(buffer)) length = sizeof(buffer); /* Remove a small chunk from the input queue. */ - clist_read(&sc->sc_q, buffer, length); + (void) q_to_b(&sc->sc_q, buffer, length); DPRINTFN(5, ("uhidread: got %lu chars\n", (u_long)length)); /* Copy the data to the user process. */ @@ -744,7 +744,7 @@ if (events & (POLLOUT | POLLWRNORM)) revents |= events & (POLLOUT | POLLWRNORM); if (events & (POLLIN | POLLRDNORM)) { - if (clist_usage(&sc->sc_q) > 0) + if (sc->sc_q.c_cc > 0) revents |= events & (POLLIN | POLLRDNORM); else selrecord(p, &sc->sc_rsel); ==== //depot/projects/mpsafetty/sys/kern/subr_clist.c#9 (text+ko) ==== @@ -1,12 +1,13 @@ /*- - * Copyright (c) 2008 Ed Schouten + * Copyright (c) 1994, David Greenman * All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. + * notice unmodified, this list of conditions, and the following + * disclaimer. * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. @@ -24,43 +25,509 @@ * SUCH DAMAGE. */ +/* + * clist support routines + */ + #include -__FBSDID("$FreeBSD$"); +__FBSDID("$FreeBSD: src/sys/kern/subr_clist.c,v 1.48 2008/09/21 18:12:18 ed Exp $"); +#include +#include +#include +#include #include +static void clist_init(void *); +SYSINIT(clist, SI_SUB_CLIST, SI_ORDER_FIRST, clist_init, NULL); + +static MALLOC_DEFINE(M_CLIST, "clist", "clist queue blocks"); + +static struct cblock *cfreelist = 0; +int cfreecount = 0; +static int cslushcount; +static int ctotcount; + +#ifndef INITIAL_CBLOCKS +#define INITIAL_CBLOCKS 50 +#endif + +static struct cblock *cblock_alloc(void); +static void cblock_alloc_cblocks(int number); +static void cblock_free(struct cblock *cblockp); +static void cblock_free_cblocks(int number); + +#include "opt_ddb.h" +#ifdef DDB +#include + +DB_SHOW_COMMAND(cbstat, cbstat) +{ + int cbsize = CBSIZE; + + printf( + "tot = %d (active = %d, free = %d (reserved = %d, slush = %d))\n", + ctotcount * cbsize, ctotcount * cbsize - cfreecount, cfreecount, + cfreecount - cslushcount * cbsize, cslushcount * cbsize); +} +#endif /* DDB */ + +/* + * Called from init_main.c + */ +/* ARGSUSED*/ +static void +clist_init(void *dummy) +{ + /* + * Allocate an initial base set of cblocks as a 'slush'. + * We allocate non-slush cblocks with each initial tty_open() and + * deallocate them with each tty_close(). + * We should adjust the slush allocation. This can't be done in + * the i/o routines because they are sometimes called from + * interrupt handlers when it may be unsafe to call malloc(). + */ + cblock_alloc_cblocks(cslushcount = INITIAL_CBLOCKS); +} + +/* + * Remove a cblock from the cfreelist queue and return a pointer + * to it. + */ +static __inline struct cblock * +cblock_alloc(void) +{ + struct cblock *cblockp; + + cblockp = cfreelist; + if (cblockp == NULL) + panic("clist reservation botch"); + cfreelist = cblockp->c_next; + cblockp->c_next = NULL; + cfreecount -= CBSIZE; + return (cblockp); +} + +/* + * Add a cblock to the cfreelist queue. + */ +static __inline void +cblock_free(struct cblock *cblockp) +{ + cblockp->c_next = cfreelist; + cfreelist = cblockp; + cfreecount += CBSIZE; +} + +/* + * Allocate some cblocks for the cfreelist queue. + */ +static void +cblock_alloc_cblocks(int number) +{ + int i; + struct cblock *cbp; + + for (i = 0; i < number; ++i) { + cbp = malloc(sizeof *cbp, M_CLIST, M_NOWAIT); + if (cbp == NULL) { + printf( +"cblock_alloc_cblocks: M_NOWAIT malloc failed, trying M_WAITOK\n"); + cbp = malloc(sizeof *cbp, M_CLIST, M_WAITOK); + } + /* + * Freed cblocks have zero quotes and garbage elsewhere. + * Set the may-have-quote bit to force zeroing the quotes. + */ + cblock_free(cbp); + } + ctotcount += number; +} + +/* + * Set the cblock allocation policy for a clist. + * Must be called in process context at spltty(). + */ void -clist_alloc(struct clist *cl, size_t len) +clist_alloc_cblocks(struct clist *clistp, int ccmax, int ccreserved) +{ + int dcbr; + + /* + * Allow for wasted space at the head. + */ + if (ccmax != 0) + ccmax += CBSIZE - 1; + if (ccreserved != 0) + ccreserved += CBSIZE - 1; + + clistp->c_cbmax = roundup(ccmax, CBSIZE) / CBSIZE; + dcbr = roundup(ccreserved, CBSIZE) / CBSIZE - clistp->c_cbreserved; + if (dcbr >= 0) + cblock_alloc_cblocks(dcbr); + else { + if (clistp->c_cbreserved + dcbr < clistp->c_cbcount) + dcbr = clistp->c_cbcount - clistp->c_cbreserved; + cblock_free_cblocks(-dcbr); + } + clistp->c_cbreserved += dcbr; +} + +/* + * Free some cblocks from the cfreelist queue back to the + * system malloc pool. + */ +static void +cblock_free_cblocks(int number) { + int i; + + for (i = 0; i < number; ++i) + free(cblock_alloc(), M_CLIST); + ctotcount -= number; } +/* + * Free the cblocks reserved for a clist. + * Must be called at spltty(). + */ void -clist_free(struct clist *cl) +clist_free_cblocks(struct clist *clistp) +{ + if (clistp->c_cbcount != 0) + panic("freeing active clist cblocks"); + cblock_free_cblocks(clistp->c_cbreserved); + clistp->c_cbmax = 0; + clistp->c_cbreserved = 0; +} + +/* + * Get a character from the head of a clist. + */ +int +getc(struct clist *clistp) { + int chr = -1; + int s; + struct cblock *cblockp; + + s = spltty(); + + /* If there are characters in the list, get one */ + if (clistp->c_cc) { + cblockp = (struct cblock *)((intptr_t)clistp->c_cf & ~CROUND); + chr = (u_char)*clistp->c_cf; + + /* + * Advance to next character. + */ + clistp->c_cf++; + clistp->c_cc--; + /* + * If we have advanced the 'first' character pointer + * past the end of this cblock, advance to the next one. + * If there are no more characters, set the first and + * last pointers to NULL. In either case, free the + * current cblock. + */ + if ((clistp->c_cf >= (char *)(cblockp+1)) || (clistp->c_cc == 0)) { + if (clistp->c_cc > 0) { + clistp->c_cf = cblockp->c_next->c_info; + } else { + clistp->c_cf = clistp->c_cl = NULL; + } + cblock_free(cblockp); + if (--clistp->c_cbcount >= clistp->c_cbreserved) + ++cslushcount; + } + } + + splx(s); + return (chr); } -size_t -clist_read(struct clist *cl, void *buf, size_t len) +/* + * Copy 'amount' of chars, beginning at head of clist 'clistp' to + * destination linear buffer 'dest'. Return number of characters + * actually copied. + */ +int +q_to_b(struct clist *clistp, char *dest, int amount) +{ + struct cblock *cblockp; + struct cblock *cblockn; + char *dest_orig = dest; + int numc; + int s; + + s = spltty(); + + while (clistp && amount && (clistp->c_cc > 0)) { + cblockp = (struct cblock *)((intptr_t)clistp->c_cf & ~CROUND); + cblockn = cblockp + 1; /* pointer arithmetic! */ + numc = min(amount, (char *)cblockn - clistp->c_cf); + numc = min(numc, clistp->c_cc); + bcopy(clistp->c_cf, dest, numc); + amount -= numc; + clistp->c_cf += numc; + clistp->c_cc -= numc; + dest += numc; + /* + * If this cblock has been emptied, advance to the next + * one. If there are no more characters, set the first + * and last pointer to NULL. In either case, free the + * current cblock. + */ + if ((clistp->c_cf >= (char *)cblockn) || (clistp->c_cc == 0)) { + if (clistp->c_cc > 0) { + clistp->c_cf = cblockp->c_next->c_info; + } else { + clistp->c_cf = clistp->c_cl = NULL; + } + cblock_free(cblockp); + if (--clistp->c_cbcount >= clistp->c_cbreserved) + ++cslushcount; + } + } + + splx(s); + return (dest - dest_orig); +} + +/* + * Flush 'amount' of chars, beginning at head of clist 'clistp'. + */ +void +ndflush(struct clist *clistp, int amount) { + struct cblock *cblockp; + struct cblock *cblockn; + int numc; + int s; + + s = spltty(); + + while (amount && (clistp->c_cc > 0)) { + cblockp = (struct cblock *)((intptr_t)clistp->c_cf & ~CROUND); + cblockn = cblockp + 1; /* pointer arithmetic! */ + numc = min(amount, (char *)cblockn - clistp->c_cf); + numc = min(numc, clistp->c_cc); + amount -= numc; + clistp->c_cf += numc; + clistp->c_cc -= numc; + /* + * If this cblock has been emptied, advance to the next + * one. If there are no more characters, set the first + * and last pointer to NULL. In either case, free the + * current cblock. + */ + if ((clistp->c_cf >= (char *)cblockn) || (clistp->c_cc == 0)) { + if (clistp->c_cc > 0) { + clistp->c_cf = cblockp->c_next->c_info; + } else { + clistp->c_cf = clistp->c_cl = NULL; + } + cblock_free(cblockp); + if (--clistp->c_cbcount >= clistp->c_cbreserved) + ++cslushcount; + } + } - return (0); + splx(s); } -size_t -clist_write(struct clist *cl, const void *buf, size_t len) +/* + * Add a character to the end of a clist. Return -1 is no + * more clists, or 0 for success. + */ +int +putc(char chr, struct clist *clistp) { + struct cblock *cblockp; + int s; + + s = spltty(); + + if (clistp->c_cl == NULL) { + if (clistp->c_cbreserved < 1) { + splx(s); + printf("putc to a clist with no reserved cblocks\n"); + return (-1); /* nothing done */ + } + cblockp = cblock_alloc(); + clistp->c_cbcount = 1; + clistp->c_cf = clistp->c_cl = cblockp->c_info; + clistp->c_cc = 0; + } else { + cblockp = (struct cblock *)((intptr_t)clistp->c_cl & ~CROUND); + if (((intptr_t)clistp->c_cl & CROUND) == 0) { + struct cblock *prev = (cblockp - 1); + + if (clistp->c_cbcount >= clistp->c_cbreserved) { + if (clistp->c_cbcount >= clistp->c_cbmax + || cslushcount <= 0) { + splx(s); + return (-1); + } + --cslushcount; + } + cblockp = cblock_alloc(); + clistp->c_cbcount++; + prev->c_next = cblockp; + clistp->c_cl = cblockp->c_info; + } + } + + *clistp->c_cl++ = chr; + clistp->c_cc++; + splx(s); return (0); } -size_t -clist_usage(struct clist *cl) +/* + * Copy data from linear buffer to clist chain. Return the + * number of characters not copied. + */ +int +b_to_q(char *src, int amount, struct clist *clistp) { + struct cblock *cblockp; + int numc, s; + + /* + * Avoid allocating an initial cblock and then not using it. + * c_cc == 0 must imply c_cbount == 0. + */ + if (amount <= 0) + return (amount); + + s = spltty(); + + /* + * If there are no cblocks assigned to this clist yet, + * then get one. + */ + if (clistp->c_cl == NULL) { + if (clistp->c_cbreserved < 1) { + splx(s); + printf("b_to_q to a clist with no reserved cblocks.\n"); + return (amount); /* nothing done */ + } + cblockp = cblock_alloc(); + clistp->c_cbcount = 1; + clistp->c_cf = clistp->c_cl = cblockp->c_info; + clistp->c_cc = 0; + } else { + cblockp = (struct cblock *)((intptr_t)clistp->c_cl & ~CROUND); + } + + while (amount) { + /* + * Get another cblock if needed. + */ + if (((intptr_t)clistp->c_cl & CROUND) == 0) { + struct cblock *prev = cblockp - 1; + + if (clistp->c_cbcount >= clistp->c_cbreserved) { + if (clistp->c_cbcount >= clistp->c_cbmax + || cslushcount <= 0) { + splx(s); + return (amount); + } + --cslushcount; + } + cblockp = cblock_alloc(); + clistp->c_cbcount++; + prev->c_next = cblockp; + clistp->c_cl = cblockp->c_info; + } + + /* + * Copy a chunk of the linear buffer up to the end + * of this cblock. + */ + numc = min(amount, (char *)(cblockp + 1) - clistp->c_cl); + bcopy(src, clistp->c_cl, numc); + + /* + * ...and update pointer for the next chunk. + */ + src += numc; + clistp->c_cl += numc; + clistp->c_cc += numc; + amount -= numc; + /* + * If we go through the loop again, it's always + * for data in the next cblock, so by adding one (cblock), + * (which makes the pointer 1 beyond the end of this + * cblock) we prepare for the assignment of 'prev' + * above. + */ + cblockp += 1; + + } - return (0); + splx(s); + return (amount); } -void -clist_flush(struct clist *cl) +/* + * "Unput" a character from a clist. + */ +int +unputc(struct clist *clistp) { + struct cblock *cblockp = 0, *cbp = 0; + int s; + int chr = -1; + + + s = spltty(); + + if (clistp->c_cc) { + --clistp->c_cc; + --clistp->c_cl; + + chr = (u_char)*clistp->c_cl; + + cblockp = (struct cblock *)((intptr_t)clistp->c_cl & ~CROUND); + + /* + * If all of the characters have been unput in this + * cblock, then find the previous one and free this + * one. + */ + if (clistp->c_cc && (clistp->c_cl <= (char *)cblockp->c_info)) { + cbp = (struct cblock *)((intptr_t)clistp->c_cf & ~CROUND); + + while (cbp->c_next != cblockp) + cbp = cbp->c_next; + + /* + * When the previous cblock is at the end, the 'last' + * pointer always points (invalidly) one past. + */ + clistp->c_cl = (char *)(cbp+1); + cblock_free(cblockp); + if (--clistp->c_cbcount >= clistp->c_cbreserved) + ++cslushcount; + cbp->c_next = NULL; + } + } + + /* + * If there are no more characters on the list, then + * free the last cblock. + */ + if ((clistp->c_cc == 0) && clistp->c_cl) { + cblockp = (struct cblock *)((intptr_t)clistp->c_cl & ~CROUND); + cblock_free(cblockp); + if (--clistp->c_cbcount >= clistp->c_cbreserved) >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sun Oct 26 13:46:01 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1E8F11065670; Sun, 26 Oct 2008 13:45:58 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id AC39C1065673 for ; Sun, 26 Oct 2008 13:45:58 +0000 (UTC) (envelope-from ed@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 82ED28FC0A for ; Sun, 26 Oct 2008 13:45:58 +0000 (UTC) (envelope-from ed@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id m9QDjwJO065222 for ; Sun, 26 Oct 2008 13:45:58 GMT (envelope-from ed@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m9QDjwgk065220 for perforce@freebsd.org; Sun, 26 Oct 2008 13:45:58 GMT (envelope-from ed@FreeBSD.org) Date: Sun, 26 Oct 2008 13:45:58 GMT Message-Id: <200810261345.m9QDjwgk065220@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to ed@FreeBSD.org using -f From: Ed Schouten To: Perforce Change Reviews Cc: Subject: PERFORCE change 151951 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, 26 Oct 2008 13:46:01 -0000 http://perforce.freebsd.org/chv.cgi?CH=151951 Change 151951 by ed@ed_mekker on 2008/10/26 13:45:22 Small typo. Affected files ... .. //depot/projects/mpsafetty/sys/kern/tty.c#56 edit Differences ... ==== //depot/projects/mpsafetty/sys/kern/tty.c#56 (text+ko) ==== @@ -74,7 +74,7 @@ static unsigned int tty_list_count = 0; /* Character device of /dev/console. */ -static struct cdev dev_console; +static struct cdev *dev_console; /* * Flags that are supported and stored by this implementation. From owner-p4-projects@FreeBSD.ORG Sun Oct 26 14:02:15 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 980B51065682; Sun, 26 Oct 2008 14:02:15 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 43D3F106567A for ; Sun, 26 Oct 2008 14:02:15 +0000 (UTC) (envelope-from ed@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 339F18FC1A for ; Sun, 26 Oct 2008 14:02:15 +0000 (UTC) (envelope-from ed@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id m9QE2F8Y066409 for ; Sun, 26 Oct 2008 14:02:15 GMT (envelope-from ed@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m9QE2EK7066407 for perforce@freebsd.org; Sun, 26 Oct 2008 14:02:14 GMT (envelope-from ed@FreeBSD.org) Date: Sun, 26 Oct 2008 14:02:14 GMT Message-Id: <200810261402.m9QE2EK7066407@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to ed@FreeBSD.org using -f From: Ed Schouten To: Perforce Change Reviews Cc: Subject: PERFORCE change 151952 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, 26 Oct 2008 14:02:15 -0000 http://perforce.freebsd.org/chv.cgi?CH=151952 Change 151952 by ed@ed_mekker on 2008/10/26 14:01:20 Step 2: nuke /dev/console and rename my new /dev/konzole to /dev/console. My system still boots. :-) Affected files ... .. //depot/projects/mpsafetty/sys/kern/tty.c#57 edit .. //depot/projects/mpsafetty/sys/kern/tty_cons.c#3 edit Differences ... ==== //depot/projects/mpsafetty/sys/kern/tty.c#57 (text+ko) ==== @@ -311,6 +311,9 @@ { struct tty *tp = dev->si_drv1; + if (TTY_CONSOLE(dev)) + return (0); + tty_lock(tp); /* @@ -1773,7 +1776,7 @@ { dev_console = make_dev(&ttydev_cdevsw, 0, UID_ROOT, GID_WHEEL, - 0600, "konzole"); + 0600, "console"); } SYSINIT(tty, SI_SUB_DRIVERS, SI_ORDER_FIRST, ttyconsdev_init, NULL); ==== //depot/projects/mpsafetty/sys/kern/tty_cons.c#3 (text+ko) ==== @@ -70,25 +70,7 @@ static d_open_t cnopen; static d_close_t cnclose; -static d_read_t cnread; -static d_write_t cnwrite; -static d_ioctl_t cnioctl; -static d_poll_t cnpoll; -static d_kqfilter_t cnkqfilter; -static struct cdevsw cn_cdevsw = { - .d_version = D_VERSION, - .d_open = cnopen, - .d_close = cnclose, - .d_read = cnread, - .d_write = cnwrite, - .d_ioctl = cnioctl, - .d_poll = cnpoll, - .d_name = "console", - .d_flags = D_TTY | D_NEEDGIANT, - .d_kqfilter = cnkqfilter, -}; - struct cn_device { STAILQ_ENTRY(cn_device) cnd_next; struct vnode *cnd_vp; @@ -447,131 +429,6 @@ return (0); } -static int -cnread(struct cdev *dev, struct uio *uio, int flag) -{ - struct cn_device *cnd; - struct cdevsw *csw; - int error; - - cnd = STAILQ_FIRST(&cn_devlist); - if (cn_mute || CND_INVALID(cnd, curthread)) - return (0); - dev = cnd->cnd_vp->v_rdev; - csw = dev_refthread(dev); - if (csw == NULL) - return (ENXIO); - error = (csw->d_read)(dev, uio, flag); - dev_relthread(dev); - return (error); -} - -static int -cnwrite(struct cdev *dev, struct uio *uio, int flag) -{ - struct cn_device *cnd; - struct cdevsw *csw; - int error; - - cnd = STAILQ_FIRST(&cn_devlist); - if (cn_mute || CND_INVALID(cnd, curthread)) - goto done; - if (constty) - dev = constty->t_dev; - else - dev = cnd->cnd_vp->v_rdev; - if (dev != NULL) { - log_console(uio); - csw = dev_refthread(dev); - if (csw == NULL) - return (ENXIO); - error = (csw->d_write)(dev, uio, flag); - dev_relthread(dev); - return (error); - } -done: - uio->uio_resid = 0; /* dump the data */ - return (0); -} - -static int -cnioctl(struct cdev *dev, u_long cmd, caddr_t data, int flag, struct thread *td) -{ - struct cn_device *cnd; - struct cdevsw *csw; - int error; - - cnd = STAILQ_FIRST(&cn_devlist); - if (cn_mute || CND_INVALID(cnd, td)) - return (0); - /* - * Superuser can always use this to wrest control of console - * output from the "virtual" console. - */ - if (cmd == TIOCCONS && constty) { - error = priv_check(td, PRIV_TTY_CONSOLE); - if (error) - return (error); - constty = NULL; - return (0); - } - dev = cnd->cnd_vp->v_rdev; - if (dev == NULL) - return (0); /* XXX : ENOTTY ? */ - csw = dev_refthread(dev); - if (csw == NULL) - return (ENXIO); - error = (csw->d_ioctl)(dev, cmd, data, flag, td); - dev_relthread(dev); - return (error); -} - -/* - * XXX - * poll/kqfilter do not appear to be correct - */ -static int -cnpoll(struct cdev *dev, int events, struct thread *td) -{ - struct cn_device *cnd; - struct cdevsw *csw; - int error; - - cnd = STAILQ_FIRST(&cn_devlist); - if (cn_mute || CND_INVALID(cnd, td)) - return (0); - dev = cnd->cnd_vp->v_rdev; - if (dev == NULL) - return (0); - csw = dev_refthread(dev); - if (csw == NULL) - return (ENXIO); - error = (csw->d_poll)(dev, events, td); - dev_relthread(dev); - return (error); -} - -static int -cnkqfilter(struct cdev *dev, struct knote *kn) -{ - struct cn_device *cnd; - struct cdevsw *csw; - int error; - - cnd = STAILQ_FIRST(&cn_devlist); - if (cn_mute || CND_INVALID(cnd, curthread)) - return (EINVAL); - dev = cnd->cnd_vp->v_rdev; - if (dev == NULL) - return (ENXIO); - csw = dev_refthread(dev); - if (csw == NULL) - return (ENXIO); - error = (csw->d_kqfilter)(dev, kn); - dev_relthread(dev); - return (error); -} - /* * Low level console routines. */ @@ -737,7 +594,7 @@ cn_drvinit(void *unused) { - make_dev(&cn_cdevsw, 0, UID_ROOT, GID_WHEEL, 0600, "console"); + /*make_dev(&cn_cdevsw, 0, UID_ROOT, GID_WHEEL, 0600, "console");*/ mtx_init(&cnputs_mtx, "cnputs_mtx", NULL, MTX_SPIN | MTX_NOWITNESS); use_cnputs_mtx = 1; From owner-p4-projects@FreeBSD.ORG Sun Oct 26 14:10:27 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E80551065673; Sun, 26 Oct 2008 14:10:26 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id ABD43106567B for ; Sun, 26 Oct 2008 14:10:26 +0000 (UTC) (envelope-from ed@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 9BA148FC0A for ; Sun, 26 Oct 2008 14:10:26 +0000 (UTC) (envelope-from ed@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id m9QEAQhd068199 for ; Sun, 26 Oct 2008 14:10:26 GMT (envelope-from ed@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m9QEAQYM068197 for perforce@freebsd.org; Sun, 26 Oct 2008 14:10:26 GMT (envelope-from ed@FreeBSD.org) Date: Sun, 26 Oct 2008 14:10:26 GMT Message-Id: <200810261410.m9QEAQYM068197@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to ed@FreeBSD.org using -f From: Ed Schouten To: Perforce Change Reviews Cc: Subject: PERFORCE change 151954 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, 26 Oct 2008 14:10:27 -0000 http://perforce.freebsd.org/chv.cgi?CH=151954 Change 151954 by ed@ed_mekker on 2008/10/26 14:09:48 Give /dev/console its own cdevsw, instead of putting all the conditional checks inside the regular TTY routines. Affected files ... .. //depot/projects/mpsafetty/sys/kern/tty.c#58 edit Differences ... ==== //depot/projects/mpsafetty/sys/kern/tty.c#58 (text+ko) ==== @@ -224,10 +224,6 @@ return (EPERM); } - /* /dev/console without associated TTY. */ - if (tp == NULL) - return (ENXIO); - tty_lock(tp); if (tty_gone(tp)) { /* Device is already gone. */ @@ -311,9 +307,6 @@ { struct tty *tp = dev->si_drv1; - if (TTY_CONSOLE(dev)) - return (0); - tty_lock(tp); /* @@ -423,9 +416,6 @@ struct tty *tp = dev->si_drv1; int error; - if (TTY_CONSOLE(dev)) - log_console(uio); - error = ttydev_enter(tp); if (error) return (error); @@ -1771,11 +1761,50 @@ * /dev/console handling. */ +static int +ttyconsdev_open(struct cdev *dev, int oflags, int devtype, struct thread *td) +{ + struct tty *tp = dev->si_drv1; + + /* /dev/console without associated TTY. */ + if (tp == NULL) + return (ENXIO); + + return (ttydev_open(dev, oflags, devtype, td)); +} + +static int +ttyconsdev_write(struct cdev *dev, struct uio *uio, int ioflag) +{ + + log_console(uio); + + return (ttydev_write(dev, uio, ioflag)); +} + +/* + * /dev/console is a little different than normal TTY's. Unlike regular + * TTY device nodes, this device node will not revoke the entire TTY + * upon closure and all data written to it will be logged. + */ +static struct cdevsw ttyconsdev_cdevsw = { + .d_version = D_VERSION, + .d_open = ttyconsdev_open, + .d_read = ttydev_read, + .d_write = ttyconsdev_write, + .d_ioctl = ttydev_ioctl, + .d_kqfilter = ttydev_kqfilter, + .d_poll = ttydev_poll, + .d_mmap = ttydev_mmap, + .d_name = "ttyconsdev", + .d_flags = D_TTY, +}; + static void ttyconsdev_init(void *unused) { - dev_console = make_dev(&ttydev_cdevsw, 0, UID_ROOT, GID_WHEEL, + dev_console = make_dev(&ttyconsdev_cdevsw, 0, UID_ROOT, GID_WHEEL, 0600, "console"); } From owner-p4-projects@FreeBSD.ORG Sun Oct 26 14:14:31 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 604831065672; Sun, 26 Oct 2008 14:14:31 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 24A4A106566B for ; Sun, 26 Oct 2008 14:14:31 +0000 (UTC) (envelope-from ed@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 148178FC08 for ; Sun, 26 Oct 2008 14:14:31 +0000 (UTC) (envelope-from ed@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id m9QEEUnk068489 for ; Sun, 26 Oct 2008 14:14:30 GMT (envelope-from ed@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m9QEEUUb068487 for perforce@freebsd.org; Sun, 26 Oct 2008 14:14:30 GMT (envelope-from ed@FreeBSD.org) Date: Sun, 26 Oct 2008 14:14:30 GMT Message-Id: <200810261414.m9QEEUUb068487@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to ed@FreeBSD.org using -f From: Ed Schouten To: Perforce Change Reviews Cc: Subject: PERFORCE change 151955 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, 26 Oct 2008 14:14:31 -0000 http://perforce.freebsd.org/chv.cgi?CH=151955 Change 151955 by ed@ed_mekker on 2008/10/26 14:14:18 Recursive locking inside the TTY layer is now gone. Affected files ... .. //depot/projects/mpsafetty/sys/kern/tty.c#59 edit .. //depot/projects/mpsafetty/sys/kern/tty_cons.c#4 edit Differences ... ==== //depot/projects/mpsafetty/sys/kern/tty.c#59 (text+ko) ==== @@ -1197,11 +1197,7 @@ int error; int revokecnt = tp->t_revokecnt; -#if 0 - /* XXX: /dev/console also picks up Giant. */ tty_lock_assert(tp, MA_OWNED|MA_NOTRECURSED); -#endif - tty_lock_assert(tp, MA_OWNED); MPASS(!tty_gone(tp)); error = cv_wait_sig(cv, tp->t_mtx); @@ -1223,11 +1219,7 @@ int error; int revokecnt = tp->t_revokecnt; -#if 0 - /* XXX: /dev/console also picks up Giant. */ tty_lock_assert(tp, MA_OWNED|MA_NOTRECURSED); -#endif - tty_lock_assert(tp, MA_OWNED); MPASS(!tty_gone(tp)); error = cv_timedwait_sig(cv, tp->t_mtx, hz); ==== //depot/projects/mpsafetty/sys/kern/tty_cons.c#4 (text+ko) ==== @@ -594,8 +594,6 @@ cn_drvinit(void *unused) { - /*make_dev(&cn_cdevsw, 0, UID_ROOT, GID_WHEEL, 0600, "console");*/ - mtx_init(&cnputs_mtx, "cnputs_mtx", NULL, MTX_SPIN | MTX_NOWITNESS); use_cnputs_mtx = 1; } From owner-p4-projects@FreeBSD.ORG Sun Oct 26 14:22:39 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B96FE106567B; Sun, 26 Oct 2008 14:22:39 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 7C9491065670 for ; Sun, 26 Oct 2008 14:22:39 +0000 (UTC) (envelope-from ed@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 6C0E08FC16 for ; Sun, 26 Oct 2008 14:22:39 +0000 (UTC) (envelope-from ed@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id m9QEMd1j069117 for ; Sun, 26 Oct 2008 14:22:39 GMT (envelope-from ed@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m9QEMdRb069115 for perforce@freebsd.org; Sun, 26 Oct 2008 14:22:39 GMT (envelope-from ed@FreeBSD.org) Date: Sun, 26 Oct 2008 14:22:39 GMT Message-Id: <200810261422.m9QEMdRb069115@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to ed@FreeBSD.org using -f From: Ed Schouten To: Perforce Change Reviews Cc: Subject: PERFORCE change 151956 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, 26 Oct 2008 14:22:40 -0000 http://perforce.freebsd.org/chv.cgi?CH=151956 Change 151956 by ed@ed_mekker on 2008/10/26 14:22:00 Strip more dead code from tty_cons.c. Affected files ... .. //depot/projects/mpsafetty/sys/kern/tty_cons.c#5 edit Differences ... ==== //depot/projects/mpsafetty/sys/kern/tty_cons.c#5 (text+ko) ==== @@ -68,12 +68,8 @@ static MALLOC_DEFINE(M_TTYCONS, "tty console", "tty console handling"); -static d_open_t cnopen; -static d_close_t cnclose; - struct cn_device { STAILQ_ENTRY(cn_device) cnd_next; - struct vnode *cnd_vp; struct consdev *cnd_cn; }; @@ -83,10 +79,6 @@ static STAILQ_HEAD(, cn_device) cn_devlist = STAILQ_HEAD_INITIALIZER(cn_devlist); -#define CND_INVALID(cnd, td) \ - (cnd == NULL || cnd->cnd_vp == NULL || \ - (cnd->cnd_vp->v_type == VBAD && !cn_devopen(cnd, td, 1))) - static dev_t cn_udev_t; SYSCTL_OPAQUE(_machdep, OID_AUTO, consdev, CTLFLAG_RD, &cn_udev_t, sizeof cn_udev_t, "T,struct cdev *", ""); @@ -97,8 +89,6 @@ * this bit cleared. */ static int cn_mute; -static int openflag; /* how /dev/console was opened */ -static int cn_is_open; static char *consbuf; /* buffer used by `consmsgbuf' */ static struct callout conscallout; /* callout for outputting to constty */ struct msgbuf consmsgbuf; /* message buffer for console tty */ @@ -213,9 +203,6 @@ if (cnd->cnd_cn != cn) continue; STAILQ_REMOVE(&cn_devlist, cnd, cn_device, cnd_next); - if (cnd->cnd_vp != NULL) - vn_close(cnd->cnd_vp, openflag, NOCRED, NULL); - cnd->cnd_vp = NULL; cnd->cnd_cn = NULL; /* Remove this device from available mask. */ @@ -350,85 +337,12 @@ error = sysctl_handle_int(oidp, &cn_mute, 0, req); if (error != 0 || req->newptr == NULL) return (error); - if (ocn_mute && !cn_mute && cn_is_open) - error = cnopen(NULL, openflag, 0, curthread); - else if (!ocn_mute && cn_mute && cn_is_open) { - error = cnclose(NULL, openflag, 0, curthread); - cn_is_open = 1; /* XXX hack */ - } return (error); } SYSCTL_PROC(_kern, OID_AUTO, consmute, CTLTYPE_INT|CTLFLAG_RW, 0, sizeof(cn_mute), sysctl_kern_consmute, "I", ""); -static int -cn_devopen(struct cn_device *cnd, struct thread *td, int forceopen) -{ - char path[CNDEVPATHMAX]; - struct nameidata nd; - struct vnode *vp; - struct cdev *dev; - struct cdevsw *csw; - int error; - - if ((vp = cnd->cnd_vp) != NULL) { - if (!forceopen && vp->v_type != VBAD) { - dev = vp->v_rdev; - csw = dev_refthread(dev); - if (csw == NULL) - return (ENXIO); - error = (*csw->d_open)(dev, openflag, 0, td); - dev_relthread(dev); - return (error); - } - cnd->cnd_vp = NULL; - vn_close(vp, openflag, td->td_ucred, td); - } - snprintf(path, sizeof(path), "/dev/%s", cnd->cnd_cn->cn_name); - NDINIT(&nd, LOOKUP, FOLLOW, UIO_SYSSPACE, path, td); - error = vn_open(&nd, &openflag, 0, NULL); - if (error == 0) { - NDFREE(&nd, NDF_ONLY_PNBUF); - VOP_UNLOCK(nd.ni_vp, 0); - if (nd.ni_vp->v_type == VCHR) - cnd->cnd_vp = nd.ni_vp; - else - vn_close(nd.ni_vp, openflag, td->td_ucred, td); - } - return (cnd->cnd_vp != NULL); -} - -static int -cnopen(struct cdev *dev, int flag, int mode, struct thread *td) -{ - struct cn_device *cnd; - - openflag = flag | FWRITE; /* XXX */ - cn_is_open = 1; /* console is logically open */ - if (cn_mute) - return (0); - STAILQ_FOREACH(cnd, &cn_devlist, cnd_next) - cn_devopen(cnd, td, 0); - return (0); -} - -static int -cnclose(struct cdev *dev, int flag, int mode, struct thread *td) -{ - struct cn_device *cnd; - struct vnode *vp; - - STAILQ_FOREACH(cnd, &cn_devlist, cnd_next) { - if ((vp = cnd->cnd_vp) == NULL) - continue; - cnd->cnd_vp = NULL; - vn_close(vp, openflag, td->td_ucred, td); - } - cn_is_open = 0; - return (0); -} - /* * Low level console routines. */ From owner-p4-projects@FreeBSD.ORG Sun Oct 26 15:14:32 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 72BB81065675; Sun, 26 Oct 2008 15:14:32 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 36CB71065673 for ; Sun, 26 Oct 2008 15:14:32 +0000 (UTC) (envelope-from ed@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 263F78FC1B for ; Sun, 26 Oct 2008 15:14:32 +0000 (UTC) (envelope-from ed@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id m9QFEV0h074115 for ; Sun, 26 Oct 2008 15:14:31 GMT (envelope-from ed@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m9QFEV1k074113 for perforce@freebsd.org; Sun, 26 Oct 2008 15:14:31 GMT (envelope-from ed@FreeBSD.org) Date: Sun, 26 Oct 2008 15:14:31 GMT Message-Id: <200810261514.m9QFEV1k074113@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to ed@FreeBSD.org using -f From: Ed Schouten To: Perforce Change Reviews Cc: Subject: PERFORCE change 151957 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, 26 Oct 2008 15:14:32 -0000 http://perforce.freebsd.org/chv.cgi?CH=151957 Change 151957 by ed@ed_mekker on 2008/10/26 15:13:40 Don't hardcode "ttyv0" in TTY selection. I've introduced a new function that is called from our low-level console code. This function is called each time the first entry in cn_devlist is changed. Each time /dev/console is being opened, it will iterate the list of TTY's on the system to look up the TTY by that name. It is not possible to perform the lookup when cn_devlist changes, because cn_devlist is already being filled very early during boot. Affected files ... .. //depot/projects/mpsafetty/sys/kern/tty.c#60 edit .. //depot/projects/mpsafetty/sys/kern/tty_cons.c#6 edit .. //depot/projects/mpsafetty/sys/sys/tty.h#23 edit Differences ... ==== //depot/projects/mpsafetty/sys/kern/tty.c#60 (text+ko) ==== @@ -74,7 +74,8 @@ static unsigned int tty_list_count = 0; /* Character device of /dev/console. */ -static struct cdev *dev_console; +static struct cdev *dev_console; +static const char *dev_console_filename; /* * Flags that are supported and stored by this implementation. @@ -1126,10 +1127,6 @@ dev->si_drv2 = &tp->t_termios_lock_out; } } - - /* XXX: console hardcoding! */ - if (strcmp(tty_devname(tp), "ttyv0") == 0) - dev_console->si_drv1 = tp; } /* @@ -1756,10 +1753,20 @@ static int ttyconsdev_open(struct cdev *dev, int oflags, int devtype, struct thread *td) { - struct tty *tp = dev->si_drv1; + struct tty *tp; + + /* Look up corresponding TTY by device name. */ + sx_slock(&tty_list_sx); + TAILQ_FOREACH(tp, &tty_list, t_list) { + if (strcmp(dev_console_filename, tty_devname(tp)) == 0) { + dev_console->si_drv1 = tp; + break; + } + } + sx_sunlock(&tty_list_sx); - /* /dev/console without associated TTY. */ - if (tp == NULL) + /* Still no TTY associated by that name. */ + if (dev_console->si_drv1 == NULL) return (ENXIO); return (ttydev_open(dev, oflags, devtype, td)); @@ -1802,6 +1809,13 @@ SYSINIT(tty, SI_SUB_DRIVERS, SI_ORDER_FIRST, ttyconsdev_init, NULL); +void +ttyconsdev_select(const char *name) +{ + + dev_console_filename = name; +} + #include "opt_ddb.h" #ifdef DDB #include ==== //depot/projects/mpsafetty/sys/kern/tty_cons.c#6 (text+ko) ==== @@ -186,6 +186,8 @@ printf("WARNING: console at %p has no name\n", cn); } STAILQ_INSERT_TAIL(&cn_devlist, cnd, cnd_next); + if (STAILQ_FIRST(&cn_devlist) == cnd) + ttyconsdev_select(cnd->cnd_cn->cn_name); /* Add device to the active mask. */ cnavailable(cn, (cn->cn_flags & CN_FLAG_NOAVAIL) == 0); @@ -236,6 +238,7 @@ return; STAILQ_REMOVE(&cn_devlist, cnd, cn_device, cnd_next); STAILQ_INSERT_HEAD(&cn_devlist, cnd, cnd_next); + ttyconsdev_select(cnd->cnd_cn->cn_name); return; } } ==== //depot/projects/mpsafetty/sys/sys/tty.h#23 (text+ko) ==== @@ -192,6 +192,9 @@ /* Status line printing. */ void tty_info(struct tty *tp); +/* /dev/console selection. */ +void ttyconsdev_select(const char *name); + /* Pseudo-terminal hooks. */ int pts_alloc_external(int fd, struct thread *td, struct file *fp, struct cdev *dev, const char *name); From owner-p4-projects@FreeBSD.ORG Sun Oct 26 17:16:44 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 09683106567B; Sun, 26 Oct 2008 17:16:44 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id A88121065676 for ; Sun, 26 Oct 2008 17:16:43 +0000 (UTC) (envelope-from trasz@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 94F4D8FC13 for ; Sun, 26 Oct 2008 17:16:43 +0000 (UTC) (envelope-from trasz@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id m9QHGhhI096278 for ; Sun, 26 Oct 2008 17:16:43 GMT (envelope-from trasz@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m9QHGaK9096268 for perforce@freebsd.org; Sun, 26 Oct 2008 17:16:36 GMT (envelope-from trasz@freebsd.org) Date: Sun, 26 Oct 2008 17:16:36 GMT Message-Id: <200810261716.m9QHGaK9096268@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to trasz@freebsd.org using -f From: Edward Tomasz Napierala To: Perforce Change Reviews Cc: Subject: PERFORCE change 151964 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, 26 Oct 2008 17:16:44 -0000 http://perforce.freebsd.org/chv.cgi?CH=151964 Change 151964 by trasz@trasz_victim7 on 2008/10/26 17:15:39 IFC. Affected files ... .. //depot/projects/soc2008/trasz_nfs4acl/Makefile.inc1#7 integrate .. //depot/projects/soc2008/trasz_nfs4acl/etc/periodic/security/200.chkmounts#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/gen/posix_spawn.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/sys/mmap.2#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libfetch/http.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/share/man/man4/snd_hda.4#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/share/man/man9/Makefile#8 integrate .. //depot/projects/soc2008/trasz_nfs4acl/share/man/man9/malloc.9#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/arm/arm/undefined.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/cam/scsi/scsi_target.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/compat/linux/linux_ioctl.c#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/compat/linux/linux_socket.c#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/compat/linux/linux_util.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/conf/NOTES#16 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/conf/files#17 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/conf/files.powerpc#6 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/conf/options#8 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/contrib/altq/altq/altq_cbq.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/contrib/altq/altq/altq_cdnr.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/contrib/altq/altq/altq_hfsc.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/contrib/altq/altq/altq_priq.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/contrib/altq/altq/altq_red.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/contrib/altq/altq/altq_rio.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/contrib/altq/altq/altq_rmclass.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/contrib/altq/altq/altq_subr.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/contrib/ipfilter/netinet/ip_compat.h#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/ar/if_ar.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/ce/if_ce.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/cfi/cfi_bus_lbc.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/cfi/cfi_core.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/cfi/cfi_dev.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/cfi/cfi_reg.h#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/cfi/cfi_var.h#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/drm/drm_drv.c#6 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/drm/drm_fops.c#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/drm/drm_lock.c#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/drm/i915_dma.c#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/hwpmc/hwpmc_amd.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/hwpmc/hwpmc_logging.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/hwpmc/hwpmc_mod.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/hwpmc/hwpmc_piv.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/hwpmc/hwpmc_ppro.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/hwpmc/hwpmc_x86.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/iwn/if_iwn.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/lmc/if_lmc.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/mii/atphy.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/mxge/eth_z8e.h#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/mxge/ethp_z8e.h#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/mxge/rss_eth_z8e.h#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/mxge/rss_ethp_z8e.h#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/puc/pucdata.c#6 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/ray/if_ray.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/ray/if_rayvar.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/sound/pci/hda/hdac.c#7 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/sr/if_sr.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/uart/uart_tty.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/u3g.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/ucom.c#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/udbp.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/ufoma.c#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/fs/cd9660/cd9660_node.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/fs/cd9660/cd9660_vfsops.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/fs/cd9660/cd9660_vnops.c#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/fs/fdescfs/fdesc_vfsops.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/fs/fdescfs/fdesc_vnops.c#7 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/fs/fifofs/fifo_vnops.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/fs/hpfs/hpfs_subr.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/fs/hpfs/hpfs_vfsops.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/fs/hpfs/hpfs_vnops.c#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/fs/msdosfs/msdosfs_denode.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/fs/msdosfs/msdosfs_vnops.c#6 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/fs/ntfs/ntfs_subr.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/fs/ntfs/ntfs_vfsops.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/fs/ntfs/ntfs_vnops.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/fs/nullfs/null_subr.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/fs/nullfs/null_vnops.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/fs/nwfs/nwfs_node.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/fs/nwfs/nwfs_vfsops.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/fs/portalfs/portal_vfsops.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/fs/portalfs/portal_vnops.c#6 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/fs/pseudofs/pseudofs.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/fs/pseudofs/pseudofs_vncache.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/fs/smbfs/smbfs_node.c#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/fs/smbfs/smbfs_vfsops.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/fs/udf/udf_vfsops.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/fs/udf/udf_vnops.c#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/fs/unionfs/union_subr.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/geom/part/g_part_bsd.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/gnu/fs/ext2fs/ext2_inode.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/gnu/fs/ext2fs/ext2_lookup.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/gnu/fs/ext2fs/ext2_vfsops.c#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/gnu/fs/reiserfs/reiserfs_inode.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/gnu/fs/reiserfs/reiserfs_vfsops.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/i386/conf/NOTES#7 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/i386/i386/sys_machdep.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/i386/include/apicvar.h#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/i386/include/smp.h#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/i386/xen/clock.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/i386/xen/mp_machdep.c#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/i386/xen/xen_machdep.c#6 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/ia64/ia64/sscdisk.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/kern_descrip.c#7 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/kern_event.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/kern_jail.c#7 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/kern_linker.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/kern_lockf.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/kern_mtxpool.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/kern_proc.c#7 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/kern_prot.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/kern_resource.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/subr_blist.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/subr_sleepqueue.c#7 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/subr_witness.c#9 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/uipc_accf.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/uipc_mqueue.c#7 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/uipc_syscalls.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/uipc_usrreq.c#7 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/vfs_export.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/vfs_syscalls.c#8 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/modules/u3g/Makefile#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/net/bpf.c#7 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/net/bsd_comp.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/net/if.c#7 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/net/if_arcsubr.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/net/if_ethersubr.c#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/net/if_fddisubr.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/net/if_iso88025subr.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/net/if_ppp.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/net/if_sl.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/net/if_tap.c#6 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/net/if_tun.c#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/net/ppp_deflate.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/net/rtsock.c#6 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/net80211/_ieee80211.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/net80211/ieee80211.c#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/net80211/ieee80211_acl.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/net80211/ieee80211_adhoc.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/net80211/ieee80211_crypto.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/net80211/ieee80211_crypto_ccmp.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/net80211/ieee80211_crypto_tkip.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/net80211/ieee80211_crypto_wep.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/net80211/ieee80211_freebsd.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/net80211/ieee80211_freebsd.h#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/net80211/ieee80211_hostap.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/net80211/ieee80211_ht.c#6 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/net80211/ieee80211_ht.h#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/net80211/ieee80211_input.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/net80211/ieee80211_ioctl.c#6 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/net80211/ieee80211_node.c#6 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/net80211/ieee80211_node.h#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/net80211/ieee80211_output.c#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/net80211/ieee80211_power.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/net80211/ieee80211_power.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/net80211/ieee80211_proto.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/net80211/ieee80211_proto.h#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/net80211/ieee80211_regdomain.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/net80211/ieee80211_scan.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/net80211/ieee80211_scan_sta.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/net80211/ieee80211_sta.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/net80211/ieee80211_var.h#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netatalk/ddp_pcb.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netgraph/atm/sscfu/ng_sscfu_cust.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netgraph/bluetooth/drivers/h4/ng_h4.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netgraph/bluetooth/hci/ng_hci_main.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netgraph/bluetooth/hci/ng_hci_misc.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netgraph/bluetooth/l2cap/ng_l2cap_main.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netgraph/bluetooth/l2cap/ng_l2cap_misc.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netgraph/bluetooth/l2cap/ng_l2cap_misc.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netgraph/bluetooth/socket/ng_btsocket_hci_raw.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netgraph/bluetooth/socket/ng_btsocket_l2cap.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netgraph/bluetooth/socket/ng_btsocket_l2cap_raw.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netgraph/bluetooth/socket/ng_btsocket_rfcomm.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netgraph/bluetooth/socket/ng_btsocket_sco.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netgraph/netflow/netflow.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netgraph/netflow/ng_netflow.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netgraph/netgraph.h#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netgraph/ng_UI.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netgraph/ng_async.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netgraph/ng_atmllc.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netgraph/ng_base.c#6 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netgraph/ng_bpf.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netgraph/ng_bridge.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netgraph/ng_cisco.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netgraph/ng_device.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netgraph/ng_eiface.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netgraph/ng_etf.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netgraph/ng_ether.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netgraph/ng_fec.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netgraph/ng_frame_relay.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netgraph/ng_gif.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netgraph/ng_gif_demux.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netgraph/ng_hole.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netgraph/ng_iface.c#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netgraph/ng_ipfw.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netgraph/ng_ksocket.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netgraph/ng_l2tp.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netgraph/ng_lmi.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netgraph/ng_message.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netgraph/ng_mppc.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netgraph/ng_nat.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netgraph/ng_one2many.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netgraph/ng_parse.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netgraph/ng_pipe.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netgraph/ng_ppp.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netgraph/ng_pptpgre.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netgraph/ng_rfc1490.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netgraph/ng_sample.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netgraph/ng_split.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netgraph/ng_sppp.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netgraph/ng_tag.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netgraph/ng_tcpmss.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netgraph/ng_tee.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netgraph/ng_tty.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netgraph/ng_vjc.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netgraph/ng_vlan.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet/igmp.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet/in_mcast.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet/in_pcb.c#8 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet/ip_carp.c#6 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet/sctp_os_bsd.h#6 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet/tcp_syncache.c#9 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet6/in6.c#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet6/in6_pcb.c#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet6/in6_src.c#6 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet6/raw_ip6.c#9 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netipsec/keysock.c#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netipsec/xform_ah.c#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netipx/ipx_pcb.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netipx/spx_usrreq.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netnatm/natm.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netnatm/natm_pcb.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netncp/ncp_conn.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netncp/ncp_rq.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netncp/ncp_sock.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netncp/ncp_subr.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netsmb/smb_rq.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netsmb/smb_trantcp.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/nfs4client/nfs4_dev.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/nfs4client/nfs4_idmap.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/nfs4client/nfs4_socket.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/nfs4client/nfs4_vfsops.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/nfs4client/nfs4_vn_subs.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/nfs4client/nfs4_vnops.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/nfsclient/krpc_subr.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/nfsclient/nfs_lock.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/nfsclient/nfs_node.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/nfsclient/nfs_socket.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/nfsclient/nfs_subs.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/nfsclient/nfs_vfsops.c#10 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/nfsclient/nfs_vnops.c#8 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/nfsserver/nfs_serv.c#7 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/nfsserver/nfs_srvcache.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/nfsserver/nfs_srvsock.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/nfsserver/nfs_syscalls.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/opencrypto/cryptodev.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/opencrypto/cryptosoft.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/opencrypto/deflate.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/opencrypto/xform.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/pci/if_rl.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/pci/if_rlreg.h#6 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/powerpc/booke/pmap.c#6 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/powerpc/conf/MPC85XX#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/powerpc/mpc85xx/lbc.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/sys/powerpc/mpc85xx/lbc.h#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/sys/powerpc/mpc85xx/ocpbus.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/rpc/rpcclnt.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/security/mac_bsdextended/mac_bsdextended.c#8 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/security/mac_lomac/mac_lomac.c#9 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/sys/cfictl.h#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/sys/sys/malloc.h#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/sys/param.h#8 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/ufs/ffs/ffs_inode.c#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/ufs/ffs/ffs_snapshot.c#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/ufs/ffs/ffs_softdep.c#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/ufs/ffs/ffs_vfsops.c#14 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/ufs/ufs/ufs_dirhash.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/ufs/ufs/ufs_extattr.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/ufs/ufs/ufs_vnops.c#21 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/xen/evtchn/evtchn.c#4 integrate Differences ... ==== //depot/projects/soc2008/trasz_nfs4acl/Makefile.inc1#7 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/Makefile.inc1,v 1.611 2008/09/19 16:14:42 obrien Exp $ +# $FreeBSD: src/Makefile.inc1,v 1.613 2008/10/23 16:06:49 des Exp $ # # Make command line options: # -DNO_CLEANDIR run ${MAKE} clean, instead of ${MAKE} cleandir ==== //depot/projects/soc2008/trasz_nfs4acl/etc/periodic/security/200.chkmounts#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/etc/periodic/security/200.chkmounts,v 1.5 2002/10/25 15:14:16 thomas Exp $ +# $FreeBSD: src/etc/periodic/security/200.chkmounts,v 1.6 2008/10/25 18:45:40 ed Exp $ # # Show changes in the way filesystems are mounted @@ -50,7 +50,7 @@ ignore="${ignore}|^amd:" esac [ -n "$ignore" ] && cmd="egrep -v ${ignore#|}" || cmd=cat - mount -p | ${cmd} | + mount -p | sort | ${cmd} | check_diff mount - "${host} changes in mounted filesystems:" rc=$?;; *) rc=0;; ==== //depot/projects/soc2008/trasz_nfs4acl/lib/libc/gen/posix_spawn.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/lib/libc/gen/posix_spawn.c,v 1.5 2008/06/23 05:22:06 ed Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/gen/posix_spawn.c,v 1.6 2008/10/23 15:32:06 rdivacky Exp $"); #include "namespace.h" #include @@ -444,7 +444,7 @@ } int -posix_spawnattr_setschedparam(posix_spawnattr_t *sa __restrict, +posix_spawnattr_setschedparam(posix_spawnattr_t * __restrict sa, const struct sched_param * __restrict schedparam) { (*sa)->sa_schedparam = *schedparam; ==== //depot/projects/soc2008/trasz_nfs4acl/lib/libc/sys/mmap.2#2 (text+ko) ==== @@ -26,9 +26,9 @@ .\" SUCH DAMAGE. .\" .\" @(#)mmap.2 8.4 (Berkeley) 5/11/95 -.\" $FreeBSD: src/lib/libc/sys/mmap.2,v 1.56 2007/01/09 00:28:15 imp Exp $ +.\" $FreeBSD: src/lib/libc/sys/mmap.2,v 1.57 2008/10/24 14:40:13 alc Exp $ .\" -.Dd April 21, 2006 +.Dd October 24, 2008 .Dt MMAP 2 .Os .Sh NAME @@ -252,6 +252,11 @@ in which the file descriptor argument specifies a file or device to which swapping should be done. +.Sh NOTES +Although this implementation does not impose any alignment restrictions on +the +.Fa offset +argument, a portable program must only use page-aligned values. .Sh RETURN VALUES Upon successful completion, .Fn mmap @@ -307,13 +312,6 @@ was specified and the .Fa fd argument was not -1. -The -.Fa offset -argument -was not page-aligned. -(See -.Sx BUGS -below.) .It Bq Er ENODEV .Dv MAP_ANON has not been specified and ==== //depot/projects/soc2008/trasz_nfs4acl/lib/libfetch/http.c#2 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/lib/libfetch/http.c,v 1.84 2008/02/08 09:48:48 des Exp $"); +__FBSDID("$FreeBSD: src/lib/libfetch/http.c,v 1.85 2008/10/24 07:56:01 ru Exp $"); /* * The following copyright applies to the base64 code: @@ -1064,6 +1064,7 @@ if (url->offset == size && url->length == 0) { /* asked for 0 bytes; fake it */ offset = url->offset; + clength = -1; conn->err = HTTP_OK; break; } else { ==== //depot/projects/soc2008/trasz_nfs4acl/share/man/man4/snd_hda.4#4 (text+ko) ==== @@ -23,9 +23,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man4/snd_hda.4,v 1.21 2008/10/03 09:19:07 mav Exp $ +.\" $FreeBSD: src/share/man/man4/snd_hda.4,v 1.23 2008/10/24 18:57:11 mav Exp $ .\" -.Dd Sep 17, 2008 +.Dd October 24, 2008 .Dt SND_HDA 4 .Os .Sh NAME @@ -129,6 +129,8 @@ GPIO combination required for your system. ivrefX/ovrefX options controls voltage used to power external microphones and so on. +.It Va hint.hdac.%d.msi +Controls MSI (Message Signaled Interrupts) support. .It Va hint.hdac.%d.cad%d.nid%d.config Overrides codec pin configuration set by BIOS. May be specified as a 32bit HEX value with a leading "0x" or as a set of ==== //depot/projects/soc2008/trasz_nfs4acl/share/man/man9/Makefile#8 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/share/man/man9/Makefile,v 1.342 2008/09/28 20:15:45 ed Exp $ +# $FreeBSD: src/share/man/man9/Makefile,v 1.343 2008/10/23 15:53:51 des Exp $ MAN= accept_filter.9 \ accf_data.9 \ @@ -742,9 +742,7 @@ MLINKS+=make_dev.9 destroy_dev.9 \ make_dev.9 dev_depends.9 \ make_dev.9 make_dev_alias.9 -MLINKS+=malloc.9 FREE.9 \ - malloc.9 free.9 \ - malloc.9 MALLOC.9 \ +MLINKS+=malloc.9 free.9 \ malloc.9 MALLOC_DECLARE.9 \ malloc.9 MALLOC_DEFINE.9 \ malloc.9 realloc.9 \ ==== //depot/projects/soc2008/trasz_nfs4acl/share/man/man9/malloc.9#2 (text+ko) ==== @@ -34,16 +34,14 @@ .\" POSSIBILITY OF SUCH DAMAGE. .\" .\" $NetBSD: malloc.9,v 1.3 1996/11/11 00:05:11 lukem Exp $ -.\" $FreeBSD: src/share/man/man9/malloc.9,v 1.43 2008/03/25 15:44:49 ru Exp $ +.\" $FreeBSD: src/share/man/man9/malloc.9,v 1.44 2008/10/23 15:53:51 des Exp $ .\" -.Dd June 12, 2003 +.Dd October 23, 2008 .Dt MALLOC 9 .Os .Sh NAME .Nm malloc , -.Nm MALLOC , .Nm free , -.Nm FREE , .Nm realloc , .Nm reallocf , .Nm MALLOC_DEFINE , @@ -54,10 +52,8 @@ .In sys/malloc.h .Ft void * .Fn malloc "unsigned long size" "struct malloc_type *type" "int flags" -.Fn MALLOC space cast "unsigned long size" "struct malloc_type *type" "int flags" .Ft void .Fn free "void *addr" "struct malloc_type *type" -.Fn FREE "void *addr" "struct malloc_type *type" .Ft void * .Fn realloc "void *addr" "unsigned long size" "struct malloc_type *type" "int flags" .Ft void * @@ -123,20 +119,6 @@ except that it will free the passed pointer when the requested memory cannot be allocated. .Pp -The -.Fn MALLOC -macro variant is functionally equivalent to -.Bd -literal -offset indent -(space) = (cast)malloc((u_long)(size), type, flags) -.Ed -.Pp -and the -.Fn FREE -macro variant is equivalent to -.Bd -literal -offset indent -free((addr), type) -.Ed -.Pp Unlike its standard C library counterpart .Pq Xr malloc 3 , the kernel version takes two more arguments. @@ -219,7 +201,7 @@ /* sys/something/foo_subr.c */ \&... -MALLOC(buf, struct foo_buf *, sizeof *buf, M_FOOBUF, M_NOWAIT); +buf = malloc(sizeof *buf, M_FOOBUF, M_NOWAIT); .Ed .Pp ==== //depot/projects/soc2008/trasz_nfs4acl/sys/arm/arm/undefined.c#2 (text+ko) ==== @@ -48,7 +48,7 @@ #include "opt_ddb.h" #include -__FBSDID("$FreeBSD: src/sys/arm/arm/undefined.c,v 1.15 2007/06/04 21:38:45 attilio Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/arm/undefined.c,v 1.16 2008/10/23 15:53:51 des Exp $"); #include #include @@ -106,7 +106,7 @@ KASSERT(handler != NULL, ("handler is NULL")); /* Used to be legal. */ /* XXX: M_TEMP??? */ - MALLOC(uh, struct undefined_handler *, sizeof(*uh), M_TEMP, M_WAITOK); + uh = malloc(sizeof(*uh), M_TEMP, M_WAITOK); uh->uh_handler = handler; install_coproc_handler_static(coproc, uh); return uh; @@ -125,7 +125,7 @@ struct undefined_handler *uh = cookie; LIST_REMOVE(uh, uh_link); - FREE(uh, M_TEMP); + free(uh, M_TEMP); } ==== //depot/projects/soc2008/trasz_nfs4acl/sys/cam/scsi/scsi_target.c#4 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_target.c,v 1.75 2008/09/27 08:51:18 ed Exp $"); +__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_target.c,v 1.76 2008/10/23 15:53:51 des Exp $"); #include @@ -183,7 +183,7 @@ make_dev(&targ_cdevsw, dev2unit(dev), UID_ROOT, GID_WHEEL, 0600, "targ%d", dev2unit(dev)); } - MALLOC(softc, struct targ_softc *, sizeof(*softc), M_TARG, + softc = malloc(sizeof(*softc), M_TARG, M_WAITOK | M_ZERO); dev->si_drv1 = softc; softc->state = TARG_STATE_OPENED; @@ -211,7 +211,7 @@ if ((softc->periph == NULL) || (softc->state & TARG_STATE_LUN_ENABLED) == 0) { destroy_dev(dev); - FREE(softc, M_TARG); + free(softc, M_TARG); return (0); } @@ -230,7 +230,7 @@ softc->periph = NULL; } destroy_dev(dev); - FREE(softc, M_TARG); + free(softc, M_TARG); } cam_periph_unlock(periph); cam_periph_release(periph); @@ -531,7 +531,7 @@ } while ((descr = TAILQ_FIRST(&softc->abort_queue)) != NULL) { TAILQ_REMOVE(&softc->abort_queue, descr, tqe); - FREE(descr, M_TARG); + free(descr, M_TARG); } softc->periph = NULL; @@ -966,7 +966,7 @@ int ccb_len; ccb_len = targccblen(type); - MALLOC(ccb, union ccb *, ccb_len, M_TARG, M_WAITOK); + ccb = malloc(ccb_len, M_TARG, M_WAITOK); CAM_DEBUG(softc->path, CAM_DEBUG_PERIPH, ("getccb %p\n", ccb)); xpt_setup_ccb(&ccb->ccb_h, softc->path, priority); @@ -981,13 +981,13 @@ { CAM_DEBUG_PRINT(CAM_DEBUG_PERIPH, ("targfreeccb descr %p and\n", ccb->ccb_h.targ_descr)); - FREE(ccb->ccb_h.targ_descr, M_TARG); + free(ccb->ccb_h.targ_descr, M_TARG); switch (ccb->ccb_h.func_code) { case XPT_ACCEPT_TARGET_IO: case XPT_IMMED_NOTIFY: CAM_DEBUG_PRINT(CAM_DEBUG_PERIPH, ("freeing ccb %p\n", ccb)); - FREE(ccb, M_TARG); + free(ccb, M_TARG); break; default: /* Send back CCB if we got it from the periph */ @@ -998,7 +998,7 @@ } else { CAM_DEBUG_PRINT(CAM_DEBUG_PERIPH, ("freeing ccb %p\n", ccb)); - FREE(ccb, M_TARG); + free(ccb, M_TARG); } break; } @@ -1009,7 +1009,7 @@ { struct targ_cmd_descr *descr; - MALLOC(descr, struct targ_cmd_descr *, sizeof(*descr), M_TARG, + descr = malloc(sizeof(*descr), M_TARG, M_WAITOK); descr->mapinfo.num_bufs_used = 0; return (descr); ==== //depot/projects/soc2008/trasz_nfs4acl/sys/compat/linux/linux_ioctl.c#5 (text+ko) ==== @@ -29,7 +29,7 @@ #include "opt_compat.h" #include -__FBSDID("$FreeBSD: src/sys/compat/linux/linux_ioctl.c,v 1.144 2008/10/02 15:37:58 zec Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/linux/linux_ioctl.c,v 1.145 2008/10/23 15:53:51 des Exp $"); #include #include @@ -2673,7 +2673,7 @@ break; } if (he == NULL) { - MALLOC(he, struct handler_element *, sizeof(*he), + he = malloc(sizeof(*he), M_LINUX, M_WAITOK); he->func = h->func; } else @@ -2711,7 +2711,7 @@ if (he->func == h->func) { TAILQ_REMOVE(&handlers, he, list); sx_xunlock(&linux_ioctl_sx); - FREE(he, M_LINUX); + free(he, M_LINUX); return (0); } } ==== //depot/projects/soc2008/trasz_nfs4acl/sys/compat/linux/linux_socket.c#5 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/compat/linux/linux_socket.c,v 1.77 2008/10/02 15:37:58 zec Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/linux/linux_socket.c,v 1.78 2008/10/23 15:53:51 des Exp $"); /* XXX we use functions that might not exist. */ #include "opt_compat.h" @@ -120,7 +120,7 @@ } #endif - MALLOC(kosa, struct osockaddr *, alloclen, mtype, M_WAITOK); + kosa = malloc(alloclen, mtype, M_WAITOK); if ((error = copyin(osa, kosa, *osalen))) goto out; @@ -168,7 +168,7 @@ return (0); out: - FREE(kosa, mtype); + free(kosa, mtype); return (error); } @@ -458,7 +458,7 @@ bad: if (to) - FREE(to, M_SONAME); + free(to, M_SONAME); return (error); } ==== //depot/projects/soc2008/trasz_nfs4acl/sys/compat/linux/linux_util.c#3 (text+ko) ==== @@ -30,7 +30,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/compat/linux/linux_util.c,v 1.35 2008/06/02 08:40:06 ed Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/linux/linux_util.c,v 1.36 2008/10/23 15:53:51 des Exp $"); #include "opt_compat.h" @@ -165,7 +165,7 @@ char formated[256]; int current_size = 0, string_size = 1024; - MALLOC(string, char *, string_size, M_LINUX, M_WAITOK); + string = malloc(string_size, M_LINUX, M_WAITOK); string[0] = '\000'; last = ""; TAILQ_FOREACH(de, &devices, list) { @@ -181,10 +181,10 @@ if (strlen(formated) + current_size >= string_size) { string_size *= 2; - MALLOC(string, char *, string_size, + string = malloc(string_size, M_LINUX, M_WAITOK); bcopy(temp, string, current_size); - FREE(temp, M_LINUX); + free(temp, M_LINUX); } strcat(string, formated); current_size = strlen(string); @@ -197,7 +197,7 @@ void linux_free_get_char_devices(char *string) { - FREE(string, M_LINUX); + free(string, M_LINUX); } static int linux_major_starting = 200; @@ -210,7 +210,7 @@ if (d == NULL) return (EINVAL); - MALLOC(de, struct device_element *, sizeof(*de), + de = malloc(sizeof(*de), M_LINUX, M_WAITOK); if (d->linux_major < 0) { d->linux_major = linux_major_starting++; @@ -234,7 +234,7 @@ TAILQ_FOREACH(de, &devices, list) { if (bcmp(d, &de->entry, sizeof(*d)) == 0) { TAILQ_REMOVE(&devices, de, list); - FREE(de, M_LINUX); + free(de, M_LINUX); return (0); } } ==== //depot/projects/soc2008/trasz_nfs4acl/sys/conf/NOTES#16 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/NOTES,v 1.1510 2008/10/22 17:50:45 obrien Exp $ +# $FreeBSD: src/sys/conf/NOTES,v 1.1511 2008/10/24 07:16:13 n_hibma Exp $ # # NOTES -- Lines that can be cut/pasted into kernel and hints configs. # @@ -2419,7 +2419,7 @@ # # USB serial support device ucom -# USB support for 3G modem cards by Option, Huawei and Sierra +# USB support for 3G modem cards by Option, Novatel, Huawei and Sierra device u3g # USB support for Technologies ARK3116 based serial adapters device uark @@ -2486,6 +2486,7 @@ # debugging options for the USB subsystem # options USB_DEBUG +options U3G_DEBUG # options for ukbd: options UKBD_DFLT_KEYMAP # specify the built-in keymap ==== //depot/projects/soc2008/trasz_nfs4acl/sys/conf/files#17 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/files,v 1.1339 2008/10/21 20:33:40 mav Exp $ +# $FreeBSD: src/sys/conf/files,v 1.1340 2008/10/25 06:18:12 marcel Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -532,6 +532,8 @@ dev/cardbus/cardbus.c optional cardbus dev/cardbus/cardbus_cis.c optional cardbus dev/cardbus/cardbus_device.c optional cardbus +dev/cfi/cfi_core.c optional cfi +dev/cfi/cfi_dev.c optional cfi dev/ciss/ciss.c optional ciss dev/cm/smc90cx6.c optional cm dev/cmx/cmx.c optional cmx ==== //depot/projects/soc2008/trasz_nfs4acl/sys/conf/files.powerpc#6 (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.82 2008/10/14 14:54:14 nwhitehorn Exp $ +# $FreeBSD: src/sys/conf/files.powerpc,v 1.84 2008/10/25 06:18:12 marcel Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -28,6 +28,7 @@ crypto/blowfish/bf_enc.c optional crypto | ipsec crypto/des/des_enc.c optional crypto | ipsec | netsmb dev/bm/if_bm.c optional bm powermac +dev/cfi/cfi_bus_lbc.c optional cfi dev/fb/fb.c optional sc dev/hwpmc/hwpmc_powerpc.c optional hwpmc dev/kbd/kbd.c optional sc @@ -99,6 +100,7 @@ powerpc/fpu/fpu_mul.c optional fpu_emu powerpc/fpu/fpu_sqrt.c optional fpu_emu powerpc/fpu/fpu_subr.c optional fpu_emu +powerpc/mpc85xx/lbc.c optional mpc85xx powerpc/mpc85xx/mpc85xx.c optional mpc85xx powerpc/mpc85xx/nexus.c optional mpc85xx powerpc/mpc85xx/ocpbus.c optional mpc85xx ==== //depot/projects/soc2008/trasz_nfs4acl/sys/conf/options#8 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/options,v 1.642 2008/10/01 19:24:16 jhb Exp $ +# $FreeBSD: src/sys/conf/options,v 1.643 2008/10/24 07:16:13 n_hibma Exp $ # # On the handling of kernel options # @@ -618,6 +618,7 @@ # options for USB support USB_DEBUG opt_usb.h USBVERBOSE opt_usb.h +U3G_DEBUG opt_u3g.h UKBD_DFLT_KEYMAP opt_ukbd.h UPLCOM_INTR_INTERVAL opt_uplcom.h UVSCOM_DEFAULT_OPKTSIZE opt_uvscom.h ==== //depot/projects/soc2008/trasz_nfs4acl/sys/contrib/altq/altq/altq_cbq.c#2 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/contrib/altq/altq/altq_cbq.c,v 1.5 2007/07/03 12:46:05 mlaier Exp $ */ +/* $FreeBSD: src/sys/contrib/altq/altq/altq_cbq.c,v 1.6 2008/10/23 15:53:51 des Exp $ */ /* $KAME: altq_cbq.c,v 1.19 2003/09/17 14:23:25 kjc Exp $ */ /* @@ -273,7 +273,7 @@ return (ENODEV); /* allocate and initialize cbq_state_t */ - MALLOC(cbqp, cbq_state_t *, sizeof(cbq_state_t), M_DEVBUF, M_WAITOK); + cbqp = malloc(sizeof(cbq_state_t), M_DEVBUF, M_WAITOK); if (cbqp == NULL) return (ENOMEM); bzero(cbqp, sizeof(cbq_state_t)); @@ -304,7 +304,7 @@ cbq_class_destroy(cbqp, cbqp->ifnp.root_); /* deallocate cbq_state_t */ - FREE(cbqp, M_DEVBUF); + free(cbqp, M_DEVBUF); return (0); } @@ -927,7 +927,7 @@ return (ENXIO); /* allocate and initialize cbq_state_t */ - MALLOC(new_cbqp, cbq_state_t *, sizeof(cbq_state_t), M_DEVBUF, M_WAITOK); + new_cbqp = malloc(sizeof(cbq_state_t), M_DEVBUF, M_WAITOK); if (new_cbqp == NULL) return (ENOMEM); bzero(new_cbqp, sizeof(cbq_state_t)); @@ -943,7 +943,7 @@ cbq_enqueue, cbq_dequeue, cbq_request, &new_cbqp->cbq_classifier, acc_classify); if (error) { - FREE(new_cbqp, M_DEVBUF); + free(new_cbqp, M_DEVBUF); return (error); } @@ -987,7 +987,7 @@ } /* deallocate cbq_state_t */ - FREE(cbqp, M_DEVBUF); + free(cbqp, M_DEVBUF); return (0); } ==== //depot/projects/soc2008/trasz_nfs4acl/sys/contrib/altq/altq/altq_cdnr.c#2 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/contrib/altq/altq/altq_cdnr.c,v 1.3 2006/11/06 13:41:50 rwatson Exp $ */ +/* $FreeBSD: src/sys/contrib/altq/altq/altq_cdnr.c,v 1.4 2008/10/23 15:53:51 des Exp $ */ /* $KAME: altq_cdnr.c,v 1.14 2003/09/05 22:40:36 itojun Exp $ */ /* @@ -274,7 +274,7 @@ return (NULL); } - MALLOC(cb, struct cdnr_block *, size, M_DEVBUF, M_WAITOK); + cb = malloc(size, M_DEVBUF, M_WAITOK); if (cb == NULL) return (NULL); bzero(cb, size); @@ -319,7 +319,7 @@ if (cb->cb_top != cblock) LIST_REMOVE(cb, cb_next); - FREE(cb, M_DEVBUF); + free(cb, M_DEVBUF); } /* ==== //depot/projects/soc2008/trasz_nfs4acl/sys/contrib/altq/altq/altq_hfsc.c#2 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/contrib/altq/altq/altq_hfsc.c,v 1.4 2007/07/03 12:46:05 mlaier Exp $ */ +/* $FreeBSD: src/sys/contrib/altq/altq/altq_hfsc.c,v 1.6 2008/10/23 20:26:15 des Exp $ */ /* $KAME: altq_hfsc.c,v 1.24 2003/12/05 05:40:46 kjc Exp $ */ /* @@ -202,15 +202,14 @@ if (!ALTQ_IS_READY(&ifp->if_snd)) return (ENODEV); - MALLOC(hif, struct hfsc_if *, sizeof(struct hfsc_if), - M_DEVBUF, M_WAITOK); + hif = malloc(sizeof(struct hfsc_if), M_DEVBUF, M_WAITOK); if (hif == NULL) return (ENOMEM); bzero(hif, sizeof(struct hfsc_if)); hif->hif_eligible = ellist_alloc(); if (hif->hif_eligible == NULL) { - FREE(hif, M_DEVBUF); + free(hif, M_DEVBUF); return (ENOMEM); } @@ -236,7 +235,7 @@ ellist_destroy(hif->hif_eligible); - FREE(hif, M_DEVBUF); + free(hif, M_DEVBUF); return (0); } @@ -404,14 +403,12 @@ } #endif - MALLOC(cl, struct hfsc_class *, sizeof(struct hfsc_class), - M_DEVBUF, M_WAITOK); + cl = malloc(sizeof(struct hfsc_class), M_DEVBUF, M_WAITOK); if (cl == NULL) return (NULL); bzero(cl, sizeof(struct hfsc_class)); - MALLOC(cl->cl_q, class_queue_t *, sizeof(class_queue_t), - M_DEVBUF, M_WAITOK); + cl->cl_q = malloc(sizeof(class_queue_t), M_DEVBUF, M_WAITOK); if (cl->cl_q == NULL) goto err_ret; bzero(cl->cl_q, sizeof(class_queue_t)); @@ -471,8 +468,8 @@ #endif /* ALTQ_RED */ if (rsc != NULL && (rsc->m1 != 0 || rsc->m2 != 0)) { - MALLOC(cl->cl_rsc, struct internal_sc *, - sizeof(struct internal_sc), M_DEVBUF, M_WAITOK); + cl->cl_rsc = malloc(sizeof(struct internal_sc), + M_DEVBUF, M_WAITOK); if (cl->cl_rsc == NULL) goto err_ret; sc2isc(rsc, cl->cl_rsc); @@ -480,16 +477,16 @@ rtsc_init(&cl->cl_eligible, cl->cl_rsc, 0, 0); } if (fsc != NULL && (fsc->m1 != 0 || fsc->m2 != 0)) { - MALLOC(cl->cl_fsc, struct internal_sc *, - sizeof(struct internal_sc), M_DEVBUF, M_WAITOK); + cl->cl_fsc = malloc(sizeof(struct internal_sc), + M_DEVBUF, M_WAITOK); >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sun Oct 26 17:57:25 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 47CC51065671; Sun, 26 Oct 2008 17:57:25 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 0B9AF106566B for ; Sun, 26 Oct 2008 17:57:25 +0000 (UTC) (envelope-from trasz@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id EE1FA8FC14 for ; Sun, 26 Oct 2008 17:57:24 +0000 (UTC) (envelope-from trasz@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id m9QHvOMJ021585 for ; Sun, 26 Oct 2008 17:57:24 GMT (envelope-from trasz@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m9QHvOD2021583 for perforce@freebsd.org; Sun, 26 Oct 2008 17:57:24 GMT (envelope-from trasz@freebsd.org) Date: Sun, 26 Oct 2008 17:57:24 GMT Message-Id: <200810261757.m9QHvOD2021583@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to trasz@freebsd.org using -f From: Edward Tomasz Napierala To: Perforce Change Reviews Cc: Subject: PERFORCE change 151966 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, 26 Oct 2008 17:57:25 -0000 http://perforce.freebsd.org/chv.cgi?CH=151966 Change 151966 by trasz@trasz_victim7 on 2008/10/26 17:56:47 Integrate in order to fix this binary thing. Affected files ... .. //depot/projects/soc2008/trasz_nfs4acl/sys/contrib/dev/ath/public/mipsisa32-be-elf.hal.o.uu#4 integrate Differences ... ==== //depot/projects/soc2008/trasz_nfs4acl/sys/contrib/dev/ath/public/mipsisa32-be-elf.hal.o.uu#4 (text+ko) ==== @@ -3203,7 +3203,7 @@ M"0.@,"T00`'H)`,``X^D`5`PAO__CJ) Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id CA90C1065679; Sun, 26 Oct 2008 18:02:30 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 8E3311065671 for ; Sun, 26 Oct 2008 18:02:30 +0000 (UTC) (envelope-from trasz@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 7C8CD8FC1C for ; Sun, 26 Oct 2008 18:02:30 +0000 (UTC) (envelope-from trasz@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id m9QI2UMW022119 for ; Sun, 26 Oct 2008 18:02:30 GMT (envelope-from trasz@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m9QI2UeT022117 for perforce@freebsd.org; Sun, 26 Oct 2008 18:02:30 GMT (envelope-from trasz@freebsd.org) Date: Sun, 26 Oct 2008 18:02:30 GMT Message-Id: <200810261802.m9QI2UeT022117@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to trasz@freebsd.org using -f From: Edward Tomasz Napierala To: Perforce Change Reviews Cc: Subject: PERFORCE change 151967 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, 26 Oct 2008 18:02:31 -0000 http://perforce.freebsd.org/chv.cgi?CH=151967 Change 151967 by trasz@trasz_victim7 on 2008/10/26 18:01:49 Second try. Affected files ... .. //depot/projects/soc2008/trasz_nfs4acl/sys/contrib/dev/ath/public/mipsisa32-be-elf.hal.o.uu#5 integrate Differences ... ==== //depot/projects/soc2008/trasz_nfs4acl/sys/contrib/dev/ath/public/mipsisa32-be-elf.hal.o.uu#5 (text/text+ko) ==== @@ -3203,7 +3203,7 @@ M"0.@,"T00`'H)`,``X^D`5`PAO__CJ) Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id AA2881065676; Sun, 26 Oct 2008 18:03:31 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 6C6B81065680 for ; Sun, 26 Oct 2008 18:03:31 +0000 (UTC) (envelope-from trasz@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 5801D8FC19 for ; Sun, 26 Oct 2008 18:03:31 +0000 (UTC) (envelope-from trasz@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id m9QI3VHk023372 for ; Sun, 26 Oct 2008 18:03:31 GMT (envelope-from trasz@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m9QI3V47023370 for perforce@freebsd.org; Sun, 26 Oct 2008 18:03:31 GMT (envelope-from trasz@freebsd.org) Date: Sun, 26 Oct 2008 18:03:31 GMT Message-Id: <200810261803.m9QI3V47023370@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to trasz@freebsd.org using -f From: Edward Tomasz Napierala To: Perforce Change Reviews Cc: Subject: PERFORCE change 151968 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, 26 Oct 2008 18:03:32 -0000 http://perforce.freebsd.org/chv.cgi?CH=151968 Change 151968 by trasz@trasz_victim7 on 2008/10/26 18:03:30 IFC. Affected files ... .. //depot/projects/soc2008/trasz_nfs4acl/sys/geom/vinum/geom_vinum.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/geom/vinum/geom_vinum.h#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/geom/vinum/geom_vinum_drive.c#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/geom/vinum/geom_vinum_init.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/geom/vinum/geom_vinum_plex.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/geom/vinum/geom_vinum_raid5.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/geom/vinum/geom_vinum_rm.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/geom/vinum/geom_vinum_state.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/geom/vinum/geom_vinum_subr.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/geom/vinum/geom_vinum_volume.c#2 integrate Differences ... ==== //depot/projects/soc2008/trasz_nfs4acl/sys/geom/vinum/geom_vinum.c#2 (text+ko) ==== @@ -26,7 +26,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/geom/vinum/geom_vinum.c,v 1.21 2006/03/30 14:01:25 le Exp $"); +__FBSDID("$FreeBSD: src/sys/geom/vinum/geom_vinum.c,v 1.22 2008/10/26 17:20:37 lulf Exp $"); #include #include @@ -35,6 +35,7 @@ #include #include #include +#include #include #include @@ -42,12 +43,12 @@ #include #include -#if 0 SYSCTL_DECL(_kern_geom); SYSCTL_NODE(_kern_geom, OID_AUTO, vinum, CTLFLAG_RW, 0, "GEOM_VINUM stuff"); -SYSCTL_UINT(_kern_geom_vinum, OID_AUTO, debug, CTLFLAG_RW, &gv_debug, 0, +u_int g_vinum_debug = 0; +TUNABLE_INT("kern.geom.vinum.debug", &g_vinum_debug); +SYSCTL_UINT(_kern_geom_vinum, OID_AUTO, debug, CTLFLAG_RW, &g_vinum_debug, 0, "Debug level"); -#endif int gv_create(struct g_geom *, struct gctl_req *); @@ -363,7 +364,7 @@ */ pp = g_provider_by_name(d->device); if (pp == NULL) { - printf("geom_vinum: %s: drive disapeared?\n", + G_VINUM_DEBUG(0, "%s: drive disappeared?", d->device); continue; } ==== //depot/projects/soc2008/trasz_nfs4acl/sys/geom/vinum/geom_vinum.h#3 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/geom/vinum/geom_vinum.h,v 1.14 2008/10/01 14:50:36 lulf Exp $ + * $FreeBSD: src/sys/geom/vinum/geom_vinum.h,v 1.15 2008/10/26 17:20:37 lulf Exp $ */ #ifndef _GEOM_VINUM_H_ @@ -96,4 +96,30 @@ off_t gv_vol_size(struct gv_volume *); off_t gv_plex_size(struct gv_plex *); +extern u_int g_vinum_debug; + +#define G_VINUM_DEBUG(lvl, ...) do { \ + if (g_vinum_debug >= (lvl)) { \ + printf("GEOM_VINUM"); \ + if (g_vinum_debug > 0) \ + printf("[%u]", lvl); \ + printf(": "); \ + printf(__VA_ARGS__); \ + printf("\n"); \ + } \ +} while (0) + +#define G_VINUM_LOGREQ(lvl, bp, ...) do { \ + if (g_vinum_debug >= (lvl)) { \ + printf("GEOM_VINUM"); \ + if (g_vinum_debug > 0) \ + printf("[%u]", lvl); \ + printf(": "); \ + printf(__VA_ARGS__); \ + printf(" "); \ + g_print_bio(bp); \ + printf("\n"); \ + } \ +} while (0) + #endif /* !_GEOM_VINUM_H_ */ ==== //depot/projects/soc2008/trasz_nfs4acl/sys/geom/vinum/geom_vinum_drive.c#5 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/geom/vinum/geom_vinum_drive.c,v 1.31 2008/10/02 09:35:47 lulf Exp $"); +__FBSDID("$FreeBSD: src/sys/geom/vinum/geom_vinum_drive.c,v 1.32 2008/10/26 17:20:37 lulf Exp $"); #include #include @@ -172,7 +172,7 @@ g_free(d_hdr); return (-1); } else if (gv_legacy_header_type(d_hdr, be) == GV_LEGACY_SPARC64) { - printf("VINUM: detected legacy sparc64 header\n"); + G_VINUM_DEBUG(1, "detected legacy sparc64 header"); m_hdr->magic = GV_MAGIC; /* Legacy sparc64 on-disk header */ m_hdr->config_length = GV_GET64(be); @@ -186,7 +186,7 @@ m_hdr->label.last_update.tv_usec = GV_GET64(be); m_hdr->label.drive_size = GV_GET64(be); } else if (gv_legacy_header_type(d_hdr, be) == GV_LEGACY_POWERPC) { - printf("VINUM: detected legacy PowerPC header\n"); + G_VINUM_DEBUG(1, "detected legacy PowerPC header"); m_hdr->magic = GV_MAGIC; /* legacy 32-bit big endian on-disk header */ m_hdr->config_length = GV_GET32(be); @@ -200,7 +200,7 @@ m_hdr->label.last_update.tv_usec = GV_GET32(be); m_hdr->label.drive_size = GV_GET64(be); } else if (gv_legacy_header_type(d_hdr, be) == GV_LEGACY_I386) { - printf("VINUM: detected legacy i386 header\n"); + G_VINUM_DEBUG(1, "detected legacy i386 header"); m_hdr->magic = GV_MAGIC; /* legacy i386 on-disk header */ m_hdr->config_length = GV_GET32(le); @@ -214,7 +214,7 @@ m_hdr->label.last_update.tv_usec = GV_GET32(le); m_hdr->label.drive_size = GV_GET64(le); } else { - printf("VINUM: detected legacy amd64 header\n"); + G_VINUM_DEBUG(1, "detected legacy amd64 header"); m_hdr->magic = GV_MAGIC; /* legacy amd64 on-disk header */ m_hdr->config_length = GV_GET64(le); @@ -354,7 +354,7 @@ hdr = d->hdr; if (hdr == NULL) { - printf("GEOM_VINUM: drive %s has NULL hdr\n", d->name); + G_VINUM_DEBUG(0, "drive %s has NULL hdr", d->name); g_free(vhdr); return; } @@ -367,7 +367,7 @@ error = g_access(cp2, 0, 1, 0); if (error) { - printf("GEOM_VINUM: g_access failed on drive %s, errno %d\n", + G_VINUM_DEBUG(0, "g_access failed on drive %s, errno %d", d->name, error); sbuf_delete(sb); g_free(vhdr); @@ -378,7 +378,7 @@ do { error = gv_write_header(cp2, vhdr); if (error) { - printf("GEOM_VINUM: writing vhdr failed on drive %s, " + G_VINUM_DEBUG(0, "writing vhdr failed on drive %s, " "errno %d", d->name, error); break; } @@ -386,7 +386,7 @@ error = g_write_data(cp2, GV_CFG_OFFSET, sbuf_data(sb), GV_CFG_LEN); if (error) { - printf("GEOM_VINUM: writing first config copy failed " + G_VINUM_DEBUG(0, "writing first config copy failed " "on drive %s, errno %d", d->name, error); break; } @@ -394,7 +394,7 @@ error = g_write_data(cp2, GV_CFG_OFFSET + GV_CFG_LEN, sbuf_data(sb), GV_CFG_LEN); if (error) - printf("GEOM_VINUM: writing second config copy failed " + G_VINUM_DEBUG(0, "writing second config copy failed " "on drive %s, errno %d", d->name, error); } while (0); @@ -836,8 +836,8 @@ LIST_FOREACH(cp, &gp->consumer, consumer) { if (cp->nstart != cp->nend) { - printf("GEOM_VINUM: dead drive '%s' has still " - "active requests, can't detach consumer\n", + G_VINUM_DEBUG(0, "dead drive '%s' still has " + "active requests, cannot detach consumer", d->name); g_post_event(gv_drive_dead, d, M_WAITOK, d, NULL); @@ -847,7 +847,7 @@ g_access(cp, -cp->acr, -cp->acw, -cp->ace); } - printf("GEOM_VINUM: lost drive '%s'\n", d->name); + G_VINUM_DEBUG(1, "lost drive '%s'", d->name); d->geom = NULL; LIST_FOREACH(s, &d->subdisks, from_drive) { s->provider = NULL; ==== //depot/projects/soc2008/trasz_nfs4acl/sys/geom/vinum/geom_vinum_init.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/geom/vinum/geom_vinum_init.c,v 1.12 2007/10/20 23:23:20 julian Exp $"); +__FBSDID("$FreeBSD: src/sys/geom/vinum/geom_vinum_init.c,v 1.13 2008/10/26 17:20:37 lulf Exp $"); #include #include @@ -420,15 +420,15 @@ error = g_access(cp, 1, 1, 0); if (error) { g_topology_unlock(); - printf("GEOM_VINUM: rebuild of %s failed to access consumer: " - "%d\n", p->name, error); + G_VINUM_DEBUG(0, "rebuild of %s failed to access consumer: " + "%d", p->name, error); kproc_exit(error); } g_topology_unlock(); buf = g_malloc(sync->syncsize, M_WAITOK); - printf("GEOM_VINUM: rebuild of %s started\n", p->name); + G_VINUM_DEBUG(1, "rebuild of %s started", p->name); i = 0; for (i = 0; i < p->size; i += (p->stripesize * (p->sdcount - 1))) { /* @@ -437,8 +437,8 @@ */ bp = g_new_bio(); if (bp == NULL) { - printf("GEOM_VINUM: rebuild of %s failed creating bio: " - "out of memory\n", p->name); + G_VINUM_DEBUG(0, "rebuild of %s failed creating bio: " + "out of memory", p->name); break; } bp->bio_cmd = BIO_WRITE; @@ -454,8 +454,8 @@ /* ... and wait for the result. */ error = biowait(bp, "gwrite"); if (error) { - printf("GEOM_VINUM: rebuild of %s failed at offset %jd " - "errno: %d\n", p->name, i, error); + G_VINUM_DEBUG(0, "rebuild of %s failed at offset %jd " + "errno: %d", p->name, i, error); break; } g_destroy_bio(bp); @@ -477,7 +477,7 @@ /* Successful initialization. */ if (!error) - printf("GEOM_VINUM: rebuild of %s finished\n", p->name); + G_VINUM_DEBUG(1, "rebuild of %s finished", p->name); g_free(sync); kproc_exit(error); @@ -508,8 +508,8 @@ error = g_access(from, 1, 0, 0); if (error) { g_topology_unlock(); - printf("GEOM_VINUM: sync from '%s' failed to access " - "consumer: %d\n", sync->from->name, error); + G_VINUM_DEBUG(0, "sync from '%s' failed to access " + "consumer: %d", sync->from->name, error); g_free(sync); kproc_exit(error); } @@ -517,21 +517,21 @@ if (error) { g_access(from, -1, 0, 0); g_topology_unlock(); - printf("GEOM_VINUM: sync to '%s' failed to access " - "consumer: %d\n", p->name, error); + G_VINUM_DEBUG(0, "sync to '%s' failed to access " + "consumer: %d", p->name, error); g_free(sync); kproc_exit(error); } g_topology_unlock(); - printf("GEOM_VINUM: plex sync %s -> %s started\n", sync->from->name, + G_VINUM_DEBUG(1, "plex sync %s -> %s started", sync->from->name, sync->to->name); for (i = 0; i < p->size; i+= sync->syncsize) { /* Read some bits from the good plex. */ buf = g_read_data(from, i, sync->syncsize, &error); if (buf == NULL) { - printf("GEOM_VINUM: sync read from '%s' failed at " - "offset %jd; errno: %d\n", sync->from->name, i, + G_VINUM_DEBUG(0, "sync read from '%s' failed at " + "offset %jd; errno: %d", sync->from->name, i, error); break; } @@ -544,8 +544,8 @@ */ bp = g_new_bio(); if (bp == NULL) { - printf("GEOM_VINUM: sync write to '%s' failed at " - "offset %jd; out of memory\n", p->name, i); + G_VINUM_DEBUG(0, "sync write to '%s' failed at " + "offset %jd; out of memory", p->name, i); g_free(buf); break; } @@ -569,7 +569,7 @@ g_destroy_bio(bp); g_free(buf); if (error) { - printf("GEOM_VINUM: sync write to '%s' failed at " + G_VINUM_DEBUG(0, "sync write to '%s' failed at " "offset %jd; errno: %d\n", p->name, i, error); break; } @@ -586,7 +586,7 @@ /* Successful initialization. */ if (!error) - printf("GEOM_VINUM: plex sync %s -> %s finished\n", + G_VINUM_DEBUG(1, "plex sync %s -> %s finished", sync->from->name, sync->to->name); p->flags &= ~GV_PLEX_SYNCING; @@ -630,8 +630,8 @@ if (error) { s->init_error = error; g_topology_unlock(); - printf("GEOM_VINUM: subdisk '%s' init: failed to access " - "consumer; error: %d\n", s->name, error); + G_VINUM_DEBUG(0, "subdisk '%s' init: failed to access " + "consumer; error: %d", s->name, error); kproc_exit(error); } g_topology_unlock(); @@ -639,8 +639,8 @@ for (i = start; i < offset + length; i += init_size) { error = g_write_data(cp, i, buf, init_size); if (error) { - printf("GEOM_VINUM: subdisk '%s' init: write failed" - " at offset %jd (drive offset %jd); error %d\n", + G_VINUM_DEBUG(0, "subdisk '%s' init: write failed" + " at offset %jd (drive offset %jd); error %d", s->name, (intmax_t)s->initialized, (intmax_t)i, error); break; @@ -664,7 +664,7 @@ gv_set_sd_state(s, GV_SD_UP, GV_SETSTATE_CONFIG); g_topology_unlock(); s->initialized = 0; - printf("GEOM_VINUM: subdisk '%s' init: finished successfully\n", + G_VINUM_DEBUG(1, "subdisk '%s' init: finished successfully", s->name); } kproc_exit(error); ==== //depot/projects/soc2008/trasz_nfs4acl/sys/geom/vinum/geom_vinum_plex.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/geom/vinum/geom_vinum_plex.c,v 1.18 2007/10/20 23:23:20 julian Exp $"); +__FBSDID("$FreeBSD: src/sys/geom/vinum/geom_vinum_plex.c,v 1.19 2008/10/26 17:20:37 lulf Exp $"); #include #include @@ -189,7 +189,7 @@ if (!(bp->bio_cflags & GV_BIO_SYNCREQ)) return (ENXIO); - printf("GEOM_VINUM: sd %s is initializing\n", s->name); + G_VINUM_DEBUG(1, "sd %s is initializing", s->name); gv_set_sd_state(s, GV_SD_INITIALIZING, GV_SETSTATE_FORCE); break; @@ -558,9 +558,7 @@ * clean up a lot. */ if (err) { - printf("GEOM_VINUM: plex request failed for "); - g_print_bio(bp); - printf("\n"); + G_VINUM_LOGREQ(0, bp, "plex request failed."); TAILQ_FOREACH_SAFE(bq, &wp->bits, queue, bq2) { TAILQ_REMOVE(&wp->bits, bq, queue); g_free(bq); @@ -620,9 +618,7 @@ /* Building the sub-request failed. */ if (err) { - printf("GEOM_VINUM: plex request failed for "); - g_print_bio(bp); - printf("\n"); + G_VINUM_LOGREQ(0, bp, "plex request failed."); cbp = bp->bio_driver1; while (cbp != NULL) { pbp = cbp->bio_caller1; @@ -719,7 +715,7 @@ /* Now find the correct plex where this subdisk belongs to. */ p = gv_find_plex(sc, s->plex); if (p == NULL) { - printf("gv_plex_taste: NULL p for '%s'\n", s->name); + G_VINUM_DEBUG(0, "%s: NULL p for '%s'", __func__, s->name); return (NULL); } @@ -740,7 +736,7 @@ cp = g_new_consumer(gp); error = g_attach(cp, pp); if (error) { - printf("geom_vinum: couldn't attach consumer to %s\n", + G_VINUM_DEBUG(0, "unable to attach consumer to %s", pp->name); g_destroy_consumer(cp); return (NULL); @@ -749,8 +745,8 @@ if ((cp2 != NULL) && (cp2->acr || cp2->acw || cp2->ace)) { error = g_access(cp, cp2->acr, cp2->acw, cp2->ace); if (error) { - printf("geom_vinum: couldn't set access counts" - " for consumer on %s\n", pp->name); + G_VINUM_DEBUG(0, "unable to set access counts" + " for consumer on %s", pp->name); g_detach(cp); g_destroy_consumer(cp); return (NULL); ==== //depot/projects/soc2008/trasz_nfs4acl/sys/geom/vinum/geom_vinum_raid5.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/geom/vinum/geom_vinum_raid5.c,v 1.10 2004/11/26 11:59:51 le Exp $"); +__FBSDID("$FreeBSD: src/sys/geom/vinum/geom_vinum_raid5.c,v 1.11 2008/10/26 17:20:37 lulf Exp $"); #include #include @@ -208,7 +208,7 @@ if (!(bp->bio_cflags & GV_BIO_REBUILD)) return (ENXIO); - printf("GEOM_VINUM: sd %s is reviving\n", broken->name); + G_VINUM_DEBUG(1, "sd %s is reviving", broken->name); gv_set_sd_state(broken, GV_SD_REVIVING, GV_SETSTATE_FORCE); break; ==== //depot/projects/soc2008/trasz_nfs4acl/sys/geom/vinum/geom_vinum_rm.c#3 (text+ko) ==== @@ -26,7 +26,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/geom/vinum/geom_vinum_rm.c,v 1.14 2008/10/02 10:01:05 lulf Exp $"); +__FBSDID("$FreeBSD: src/sys/geom/vinum/geom_vinum_rm.c,v 1.15 2008/10/26 17:20:37 lulf Exp $"); #include #include @@ -351,8 +351,8 @@ cp = LIST_FIRST(&gp->consumer); err = g_access(cp, 0, 1, 0); if (err) { - printf("GEOM_VINUM: gv_rm_drive: couldn't access '%s', errno: " - "%d\n", cp->provider->name, err); + G_VINUM_DEBUG(0, "%s: unable to access '%s', errno: " + "%d", __func__, cp->provider->name, err); return (err); } @@ -361,8 +361,8 @@ g_topology_unlock(); err = gv_write_header(cp, d->hdr); if (err) { - printf("GEOM_VINUM: gv_rm_drive: couldn't write header to '%s'" - ", errno: %d\n", cp->provider->name, err); + G_VINUM_DEBUG(0, "%s: unable to write header to '%s'" + ", errno: %d", __func__, cp->provider->name, err); d->hdr->magic = GV_MAGIC; } g_topology_lock(); ==== //depot/projects/soc2008/trasz_nfs4acl/sys/geom/vinum/geom_vinum_state.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/geom/vinum/geom_vinum_state.c,v 1.8 2006/03/30 14:01:25 le Exp $"); +__FBSDID("$FreeBSD: src/sys/geom/vinum/geom_vinum_state.c,v 1.9 2008/10/26 17:20:37 lulf Exp $"); #include #include @@ -280,8 +280,8 @@ s->state = GV_SD_UP; if (s->state != oldstate) - printf("GEOM_VINUM: subdisk %s state change: %s -> %s\n", - s->name, gv_sdstate(oldstate), gv_sdstate(s->state)); + G_VINUM_DEBUG(1, "subdisk %s state change: %s -> %s", s->name, + gv_sdstate(oldstate), gv_sdstate(s->state)); /* Update the plex, if we have one. */ if (s->plex_sc != NULL) @@ -324,7 +324,7 @@ p->state = GV_PLEX_DOWN; if (p->state != oldstate) - printf("GEOM_VINUM: plex %s state change: %s -> %s\n", p->name, + G_VINUM_DEBUG(1, "plex %s state change: %s -> %s", p->name, gv_plexstate(oldstate), gv_plexstate(p->state)); /* Update our volume, if we have one. */ ==== //depot/projects/soc2008/trasz_nfs4acl/sys/geom/vinum/geom_vinum_subr.c#3 (text+ko) ==== @@ -39,7 +39,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/geom/vinum/geom_vinum_subr.c,v 1.17 2008/07/11 16:46:29 lulf Exp $"); +__FBSDID("$FreeBSD: src/sys/geom/vinum/geom_vinum_subr.c,v 1.18 2008/10/26 17:20:37 lulf Exp $"); #include #include @@ -113,7 +113,7 @@ if (!strcmp(token[0], "volume")) { v = gv_new_volume(tokens, token); if (v == NULL) { - printf("geom_vinum: failed volume\n"); + G_VINUM_DEBUG(0, "failed volume"); break; } @@ -132,7 +132,7 @@ } else if (!strcmp(token[0], "plex")) { p = gv_new_plex(tokens, token); if (p == NULL) { - printf("geom_vinum: failed plex\n"); + G_VINUM_DEBUG(0, "failed plex"); break; } @@ -152,7 +152,7 @@ s = gv_new_sd(tokens, token); if (s == NULL) { - printf("geom_vinum: failed subdisk\n"); + G_VINUM_DEBUG(0, "failed subdisk"); break; } @@ -265,8 +265,8 @@ /* Check correct size of this subdisk. */ s2 = LIST_FIRST(&p->subdisks); if (s2 != NULL && gv_is_striped(p) && (s2->size != s->size)) { - printf("GEOM_VINUM: need equal sized subdisks for " - "this plex organisation - %s (%jd) <-> %s (%jd)\n", + G_VINUM_DEBUG(0, "need equal sized subdisks for " + "this plex organisation - %s (%jd) <-> %s (%jd)", s2->name, s2->size, s->name, s->size); return (-1); } @@ -439,8 +439,8 @@ s = LIST_FIRST(&p->subdisks); LIST_FOREACH(s2, &p->subdisks, in_plex) { if (s->size != s2->size) { - printf("geom_vinum: subdisk size mismatch " - "%s (%jd) <> %s (%jd)\n", s->name, s->size, + G_VINUM_DEBUG(0, "subdisk size mismatch %s" + "(%jd) <> %s (%jd)", s->name, s->size, s2->name, s2->size); state = GV_PLEX_DOWN; } @@ -450,10 +450,9 @@ LIST_FOREACH(s, &p->subdisks, in_plex) { remainder = s->size % p->stripesize; if (remainder) { - printf("gvinum: size of sd %s is not a " + G_VINUM_DEBUG(1, "size of sd %s is not a " "multiple of plex stripesize, taking off " - "%jd bytes\n", s->name, - (intmax_t)remainder); + "%jd bytes", s->name, (intmax_t)remainder); gv_adjust_freespace(s, remainder); } } @@ -544,7 +543,7 @@ /* No good slot found? */ if (s->size == -1) { - snprintf(errstr, errlen, "couldn't autosize '%s' on " + snprintf(errstr, errlen, "could not autosize '%s' on " "'%s'", s->name, d->name); return (-1); } ==== //depot/projects/soc2008/trasz_nfs4acl/sys/geom/vinum/geom_vinum_volume.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/geom/vinum/geom_vinum_volume.c,v 1.12 2007/10/20 23:23:20 julian Exp $"); +__FBSDID("$FreeBSD: src/sys/geom/vinum/geom_vinum_volume.c,v 1.13 2008/10/26 17:20:37 lulf Exp $"); #include #include @@ -385,8 +385,8 @@ if ((ocp != NULL) && (ocp->acr > 0 || ocp->acw > 0 || ocp->ace > 0)) { error = g_access(cp, ocp->acr, ocp->acw, ocp->ace); if (error) { - printf("GEOM_VINUM: failed g_access %s -> %s; " - "errno %d\n", v->name, p->name, error); + G_VINUM_DEBUG(0, "failed g_access %s -> %s; " + "errno %d", v->name, p->name, error); g_detach(cp); g_destroy_consumer(cp); if (first) From owner-p4-projects@FreeBSD.ORG Sun Oct 26 20:57:33 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5580C1065683; Sun, 26 Oct 2008 20:57:33 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 17DAC106567B for ; Sun, 26 Oct 2008 20:57:33 +0000 (UTC) (envelope-from bz@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id E0E468FC08 for ; Sun, 26 Oct 2008 20:57:32 +0000 (UTC) (envelope-from bz@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id m9QKvWm0055370 for ; Sun, 26 Oct 2008 20:57:32 GMT (envelope-from bz@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m9QKvWnR055368 for perforce@freebsd.org; Sun, 26 Oct 2008 20:57:32 GMT (envelope-from bz@freebsd.org) Date: Sun, 26 Oct 2008 20:57:32 GMT Message-Id: <200810262057.m9QKvWnR055368@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bz@freebsd.org using -f From: "Bjoern A. Zeeb" To: Perforce Change Reviews Cc: Subject: PERFORCE change 151977 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, 26 Oct 2008 20:57:33 -0000 http://perforce.freebsd.org/chv.cgi?CH=151977 Change 151977 by bz@bz_dumpster on 2008/10/26 20:57:04 IFC -d Affected files ... .. //depot/projects/s390/share/man/man4/lmc.4#4 branch Differences ... From owner-p4-projects@FreeBSD.ORG Sun Oct 26 22:08:44 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id DD9411065673; Sun, 26 Oct 2008 22:08:43 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id A10751065670 for ; Sun, 26 Oct 2008 22:08:43 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 8D2988FC18 for ; Sun, 26 Oct 2008 22:08:43 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id m9QM8hXU066568 for ; Sun, 26 Oct 2008 22:08:43 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m9QM8aWl066557 for perforce@freebsd.org; Sun, 26 Oct 2008 22:08:36 GMT (envelope-from sam@freebsd.org) Date: Sun, 26 Oct 2008 22:08:36 GMT Message-Id: <200810262208.m9QM8aWl066557@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 151984 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, 26 Oct 2008 22:08:44 -0000 http://perforce.freebsd.org/chv.cgi?CH=151984 Change 151984 by sam@sam_ebb on 2008/10/26 22:08:32 IFC @ 151983 Affected files ... .. //depot/projects/vap/Makefile.inc1#17 integrate .. //depot/projects/vap/etc/periodic/security/200.chkmounts#3 integrate .. //depot/projects/vap/lib/libc/gen/__xuname.c#3 integrate .. //depot/projects/vap/lib/libc/gen/posix_spawn.c#3 integrate .. //depot/projects/vap/lib/libc/sys/mmap.2#3 integrate .. //depot/projects/vap/lib/libfetch/http.c#5 integrate .. //depot/projects/vap/release/Makefile#7 integrate .. //depot/projects/vap/release/doc/en_US.ISO8859-1/hardware/article.sgml#8 integrate .. //depot/projects/vap/share/man/man4/mmc.4#4 integrate .. //depot/projects/vap/share/man/man4/mmcsd.4#3 integrate .. //depot/projects/vap/share/man/man4/sdhci.4#1 branch .. //depot/projects/vap/share/man/man4/snd_hda.4#8 integrate .. //depot/projects/vap/share/man/man4/umodem.4#3 integrate .. //depot/projects/vap/share/man/man9/Makefile#16 integrate .. //depot/projects/vap/share/man/man9/malloc.9#4 integrate .. //depot/projects/vap/sys/amd64/amd64/identcpu.c#12 integrate .. //depot/projects/vap/sys/amd64/amd64/local_apic.c#9 integrate .. //depot/projects/vap/sys/amd64/include/specialreg.h#11 integrate .. //depot/projects/vap/sys/arm/arm/undefined.c#6 integrate .. //depot/projects/vap/sys/arm/conf/BWCT#6 integrate .. //depot/projects/vap/sys/arm/conf/CRB#6 integrate .. //depot/projects/vap/sys/arm/conf/DB-78XXX#2 integrate .. //depot/projects/vap/sys/arm/conf/DB-88F5XXX#2 integrate .. //depot/projects/vap/sys/arm/conf/DB-88F6XXX#2 integrate .. //depot/projects/vap/sys/arm/conf/DEFAULTS#1 branch .. //depot/projects/vap/sys/arm/conf/EP80219#6 integrate .. //depot/projects/vap/sys/arm/conf/GUMSTIX#2 integrate .. //depot/projects/vap/sys/arm/conf/HL200#8 integrate .. //depot/projects/vap/sys/arm/conf/IQ31244#8 integrate .. //depot/projects/vap/sys/arm/conf/KB920X#10 integrate .. //depot/projects/vap/sys/arm/conf/NSLU#3 integrate .. //depot/projects/vap/sys/arm/conf/SIMICS#8 integrate .. //depot/projects/vap/sys/arm/conf/SKYEYE#6 integrate .. //depot/projects/vap/sys/cam/scsi/scsi_target.c#7 integrate .. //depot/projects/vap/sys/compat/freebsd32/freebsd32_misc.c#10 integrate .. //depot/projects/vap/sys/compat/freebsd32/freebsd32_proto.h#15 integrate .. //depot/projects/vap/sys/compat/freebsd32/freebsd32_syscall.h#15 integrate .. //depot/projects/vap/sys/compat/freebsd32/freebsd32_syscalls.c#15 integrate .. //depot/projects/vap/sys/compat/freebsd32/freebsd32_sysent.c#15 integrate .. //depot/projects/vap/sys/compat/freebsd32/syscalls.master#15 integrate .. //depot/projects/vap/sys/compat/linux/linux_ioctl.c#9 integrate .. //depot/projects/vap/sys/compat/linux/linux_socket.c#9 integrate .. //depot/projects/vap/sys/compat/linux/linux_util.c#9 integrate .. //depot/projects/vap/sys/conf/NOTES#30 integrate .. //depot/projects/vap/sys/conf/files.mips#4 integrate .. //depot/projects/vap/sys/conf/files.powerpc#17 integrate .. //depot/projects/vap/sys/contrib/altq/altq/altq_cbq.c#5 integrate .. //depot/projects/vap/sys/contrib/altq/altq/altq_cdnr.c#5 integrate .. //depot/projects/vap/sys/contrib/altq/altq/altq_hfsc.c#5 integrate .. //depot/projects/vap/sys/contrib/altq/altq/altq_priq.c#5 integrate .. //depot/projects/vap/sys/contrib/altq/altq/altq_red.c#5 integrate .. //depot/projects/vap/sys/contrib/altq/altq/altq_rio.c#5 integrate .. //depot/projects/vap/sys/contrib/altq/altq/altq_rmclass.c#3 integrate .. //depot/projects/vap/sys/contrib/altq/altq/altq_subr.c#8 integrate .. //depot/projects/vap/sys/contrib/dev/ath/public/wisoc.opt_ah.h#1 branch .. //depot/projects/vap/sys/contrib/ipfilter/netinet/ip_compat.h#8 integrate .. //depot/projects/vap/sys/dev/adb/adb.h#1 branch .. //depot/projects/vap/sys/dev/adb/adb_bus.c#1 branch .. //depot/projects/vap/sys/dev/adb/adb_hb_if.m#1 branch .. //depot/projects/vap/sys/dev/adb/adb_if.m#1 branch .. //depot/projects/vap/sys/dev/adb/adb_kbd.c#1 branch .. //depot/projects/vap/sys/dev/adb/adb_mouse.c#1 branch .. //depot/projects/vap/sys/dev/adb/adbvar.h#1 branch .. //depot/projects/vap/sys/dev/ar/if_ar.c#6 integrate .. //depot/projects/vap/sys/dev/ata/ata-dma.c#11 integrate .. //depot/projects/vap/sys/dev/ce/if_ce.c#5 integrate .. //depot/projects/vap/sys/dev/cfi/cfi_bus_lbc.c#1 branch .. //depot/projects/vap/sys/dev/cfi/cfi_core.c#1 branch .. //depot/projects/vap/sys/dev/cfi/cfi_dev.c#1 branch .. //depot/projects/vap/sys/dev/cfi/cfi_reg.h#1 branch .. //depot/projects/vap/sys/dev/cfi/cfi_var.h#1 branch .. //depot/projects/vap/sys/dev/drm/drm_drv.c#10 integrate .. //depot/projects/vap/sys/dev/drm/drm_fops.c#8 integrate .. //depot/projects/vap/sys/dev/drm/drm_lock.c#8 integrate .. //depot/projects/vap/sys/dev/drm/i915_dma.c#9 integrate .. //depot/projects/vap/sys/dev/hwpmc/hwpmc_amd.c#8 integrate .. //depot/projects/vap/sys/dev/hwpmc/hwpmc_logging.c#4 integrate .. //depot/projects/vap/sys/dev/hwpmc/hwpmc_mod.c#8 integrate .. //depot/projects/vap/sys/dev/hwpmc/hwpmc_piv.c#7 integrate .. //depot/projects/vap/sys/dev/hwpmc/hwpmc_ppro.c#8 integrate .. //depot/projects/vap/sys/dev/hwpmc/hwpmc_x86.c#5 integrate .. //depot/projects/vap/sys/dev/iwn/if_iwn.c#25 integrate .. //depot/projects/vap/sys/dev/lmc/if_lmc.c#5 integrate .. //depot/projects/vap/sys/dev/mii/atphy.c#3 integrate .. //depot/projects/vap/sys/dev/mii/ciphy.c#8 integrate .. //depot/projects/vap/sys/dev/mii/miidevs#16 integrate .. //depot/projects/vap/sys/dev/mxge/eth_z8e.h#5 integrate .. //depot/projects/vap/sys/dev/mxge/ethp_z8e.h#5 integrate .. //depot/projects/vap/sys/dev/mxge/rss_eth_z8e.h#4 integrate .. //depot/projects/vap/sys/dev/mxge/rss_ethp_z8e.h#4 integrate .. //depot/projects/vap/sys/dev/pci/pci.c#11 integrate .. //depot/projects/vap/sys/dev/pci/pcireg.h#7 integrate .. //depot/projects/vap/sys/dev/ppbus/if_plip.c#7 integrate .. //depot/projects/vap/sys/dev/ppbus/immio.c#5 integrate .. //depot/projects/vap/sys/dev/ppbus/lpbb.c#6 integrate .. //depot/projects/vap/sys/dev/ppbus/lpt.c#7 integrate .. //depot/projects/vap/sys/dev/ppbus/pcfclock.c#4 integrate .. //depot/projects/vap/sys/dev/ppbus/ppb_base.c#3 integrate .. //depot/projects/vap/sys/dev/ppbus/ppb_msq.c#3 integrate .. //depot/projects/vap/sys/dev/ppbus/ppbconf.c#8 integrate .. //depot/projects/vap/sys/dev/ppbus/ppbconf.h#5 integrate .. //depot/projects/vap/sys/dev/ppbus/ppi.c#6 integrate .. //depot/projects/vap/sys/dev/ppbus/pps.c#7 integrate .. //depot/projects/vap/sys/dev/ppbus/vpo.c#5 integrate .. //depot/projects/vap/sys/dev/ppbus/vpoio.c#5 integrate .. //depot/projects/vap/sys/dev/ppbus/vpoio.h#3 integrate .. //depot/projects/vap/sys/dev/ppc/ppc.c#8 integrate .. //depot/projects/vap/sys/dev/ppc/ppcreg.h#7 integrate .. //depot/projects/vap/sys/dev/puc/pucdata.c#11 integrate .. //depot/projects/vap/sys/dev/ray/if_ray.c#6 integrate .. //depot/projects/vap/sys/dev/ray/if_rayvar.h#6 integrate .. //depot/projects/vap/sys/dev/sbni/if_sbni.c#6 branch .. //depot/projects/vap/sys/dev/sbni/if_sbni_isa.c#6 branch .. //depot/projects/vap/sys/dev/sbni/if_sbni_pci.c#6 branch .. //depot/projects/vap/sys/dev/sbni/if_sbnireg.h#4 branch .. //depot/projects/vap/sys/dev/sbni/if_sbnivar.h#6 branch .. //depot/projects/vap/sys/dev/sdhci/sdhci.c#1 branch .. //depot/projects/vap/sys/dev/sdhci/sdhci.h#1 branch .. //depot/projects/vap/sys/dev/sound/pci/hda/hdac.c#13 integrate .. //depot/projects/vap/sys/dev/sr/if_sr.c#6 integrate .. //depot/projects/vap/sys/dev/uart/uart_tty.c#6 integrate .. //depot/projects/vap/sys/dev/usb/u3g.c#2 integrate .. //depot/projects/vap/sys/dev/usb/ubsa.c#13 integrate .. //depot/projects/vap/sys/dev/usb/ucom.c#11 integrate .. //depot/projects/vap/sys/dev/usb/udbp.c#5 integrate .. //depot/projects/vap/sys/dev/usb/ufoma.c#6 integrate .. //depot/projects/vap/sys/fs/cd9660/cd9660_node.c#4 integrate .. //depot/projects/vap/sys/fs/cd9660/cd9660_vfsops.c#6 integrate .. //depot/projects/vap/sys/fs/cd9660/cd9660_vnops.c#5 integrate .. //depot/projects/vap/sys/fs/fdescfs/fdesc_vfsops.c#8 integrate .. //depot/projects/vap/sys/fs/fdescfs/fdesc_vnops.c#13 integrate .. //depot/projects/vap/sys/fs/fifofs/fifo_vnops.c#9 integrate .. //depot/projects/vap/sys/fs/hpfs/hpfs_subr.c#3 integrate .. //depot/projects/vap/sys/fs/hpfs/hpfs_vfsops.c#9 integrate .. //depot/projects/vap/sys/fs/hpfs/hpfs_vnops.c#9 integrate .. //depot/projects/vap/sys/fs/msdosfs/msdosfs_denode.c#7 integrate .. //depot/projects/vap/sys/fs/msdosfs/msdosfs_vnops.c#12 integrate .. //depot/projects/vap/sys/fs/ntfs/ntfs_subr.c#10 integrate .. //depot/projects/vap/sys/fs/ntfs/ntfs_vfsops.c#8 integrate .. //depot/projects/vap/sys/fs/ntfs/ntfs_vnops.c#8 integrate .. //depot/projects/vap/sys/fs/nullfs/null_subr.c#8 integrate .. //depot/projects/vap/sys/fs/nullfs/null_vnops.c#10 integrate .. //depot/projects/vap/sys/fs/nwfs/nwfs_node.c#10 integrate .. //depot/projects/vap/sys/fs/nwfs/nwfs_vfsops.c#7 integrate .. //depot/projects/vap/sys/fs/portalfs/portal_vfsops.c#7 integrate .. //depot/projects/vap/sys/fs/portalfs/portal_vnops.c#10 integrate .. //depot/projects/vap/sys/fs/pseudofs/pseudofs.c#6 integrate .. //depot/projects/vap/sys/fs/pseudofs/pseudofs_vncache.c#8 integrate .. //depot/projects/vap/sys/fs/smbfs/smbfs_node.c#13 integrate .. //depot/projects/vap/sys/fs/smbfs/smbfs_vfsops.c#8 integrate .. //depot/projects/vap/sys/fs/udf/udf_vfsops.c#9 integrate .. //depot/projects/vap/sys/fs/udf/udf_vnops.c#9 integrate .. //depot/projects/vap/sys/fs/unionfs/union_subr.c#12 integrate .. //depot/projects/vap/sys/geom/geom_disk.c#8 integrate .. //depot/projects/vap/sys/geom/part/g_part_bsd.c#7 integrate .. //depot/projects/vap/sys/geom/part/g_part_vtoc8.c#5 integrate .. //depot/projects/vap/sys/geom/vinum/geom_vinum.c#6 integrate .. //depot/projects/vap/sys/geom/vinum/geom_vinum.h#6 integrate .. //depot/projects/vap/sys/geom/vinum/geom_vinum_drive.c#10 integrate .. //depot/projects/vap/sys/geom/vinum/geom_vinum_init.c#6 integrate .. //depot/projects/vap/sys/geom/vinum/geom_vinum_plex.c#6 integrate .. //depot/projects/vap/sys/geom/vinum/geom_vinum_raid5.c#3 integrate .. //depot/projects/vap/sys/geom/vinum/geom_vinum_rm.c#6 integrate .. //depot/projects/vap/sys/geom/vinum/geom_vinum_state.c#6 integrate .. //depot/projects/vap/sys/geom/vinum/geom_vinum_subr.c#7 integrate .. //depot/projects/vap/sys/geom/vinum/geom_vinum_volume.c#6 integrate .. //depot/projects/vap/sys/gnu/fs/ext2fs/ext2_inode.c#4 integrate .. //depot/projects/vap/sys/gnu/fs/ext2fs/ext2_lookup.c#4 integrate .. //depot/projects/vap/sys/gnu/fs/ext2fs/ext2_vfsops.c#8 integrate .. //depot/projects/vap/sys/gnu/fs/reiserfs/reiserfs_inode.c#5 integrate .. //depot/projects/vap/sys/gnu/fs/reiserfs/reiserfs_vfsops.c#4 integrate .. //depot/projects/vap/sys/i386/conf/NOTES#19 integrate .. //depot/projects/vap/sys/i386/i386/identcpu.c#12 integrate .. //depot/projects/vap/sys/i386/i386/local_apic.c#10 integrate .. //depot/projects/vap/sys/i386/i386/sys_machdep.c#9 integrate .. //depot/projects/vap/sys/i386/include/apicvar.h#7 integrate .. //depot/projects/vap/sys/i386/include/pcpu.h#9 integrate .. //depot/projects/vap/sys/i386/include/smp.h#10 integrate .. //depot/projects/vap/sys/i386/include/specialreg.h#10 integrate .. //depot/projects/vap/sys/i386/include/xen/xen-os.h#4 integrate .. //depot/projects/vap/sys/i386/include/xen/xen_intr.h#3 integrate .. //depot/projects/vap/sys/i386/xen/clock.c#4 integrate .. //depot/projects/vap/sys/i386/xen/exception.s#4 integrate .. //depot/projects/vap/sys/i386/xen/mp_machdep.c#5 integrate .. //depot/projects/vap/sys/i386/xen/xen_machdep.c#8 integrate .. //depot/projects/vap/sys/ia64/ia64/sscdisk.c#7 integrate .. //depot/projects/vap/sys/kern/kern_descrip.c#20 integrate .. //depot/projects/vap/sys/kern/kern_event.c#11 integrate .. //depot/projects/vap/sys/kern/kern_jail.c#15 integrate .. //depot/projects/vap/sys/kern/kern_linker.c#12 integrate .. //depot/projects/vap/sys/kern/kern_lockf.c#11 integrate .. //depot/projects/vap/sys/kern/kern_mtxpool.c#6 integrate .. //depot/projects/vap/sys/kern/kern_proc.c#14 integrate .. //depot/projects/vap/sys/kern/kern_prot.c#7 integrate .. //depot/projects/vap/sys/kern/kern_resource.c#10 integrate .. //depot/projects/vap/sys/kern/kern_sig.c#15 integrate .. //depot/projects/vap/sys/kern/kern_thr.c#10 integrate .. //depot/projects/vap/sys/kern/kern_thread.c#16 integrate .. //depot/projects/vap/sys/kern/subr_blist.c#4 integrate .. //depot/projects/vap/sys/kern/subr_rman.c#8 integrate .. //depot/projects/vap/sys/kern/subr_sleepqueue.c#17 integrate .. //depot/projects/vap/sys/kern/subr_witness.c#22 integrate .. //depot/projects/vap/sys/kern/sys_process.c#9 integrate .. //depot/projects/vap/sys/kern/uipc_accf.c#6 integrate .. //depot/projects/vap/sys/kern/uipc_mqueue.c#8 integrate .. //depot/projects/vap/sys/kern/uipc_syscalls.c#14 integrate .. //depot/projects/vap/sys/kern/uipc_usrreq.c#11 integrate .. //depot/projects/vap/sys/kern/vfs_export.c#8 integrate .. //depot/projects/vap/sys/kern/vfs_syscalls.c#13 integrate .. //depot/projects/vap/sys/mips/conf/ADM5120#4 integrate .. //depot/projects/vap/sys/mips/conf/DEFAULTS#1 branch .. //depot/projects/vap/sys/mips/conf/IDT#6 integrate .. //depot/projects/vap/sys/mips/conf/MALTA#4 integrate .. //depot/projects/vap/sys/mips/conf/QEMU#3 integrate .. //depot/projects/vap/sys/mips/conf/SENTRY5#6 integrate .. //depot/projects/vap/sys/modules/Makefile#42 integrate .. //depot/projects/vap/sys/modules/sbni/Makefile#4 branch .. //depot/projects/vap/sys/modules/sdhci/Makefile#1 branch .. //depot/projects/vap/sys/modules/u3g/Makefile#2 integrate .. //depot/projects/vap/sys/net/bpf.c#21 integrate .. //depot/projects/vap/sys/net/bsd_comp.c#5 integrate .. //depot/projects/vap/sys/net/if.c#18 integrate .. //depot/projects/vap/sys/net/if_arcsubr.c#5 integrate .. //depot/projects/vap/sys/net/if_ethersubr.c#13 integrate .. //depot/projects/vap/sys/net/if_fddisubr.c#7 integrate .. //depot/projects/vap/sys/net/if_iso88025subr.c#8 integrate .. //depot/projects/vap/sys/net/if_ppp.c#9 integrate .. //depot/projects/vap/sys/net/if_sl.c#6 integrate .. //depot/projects/vap/sys/net/if_tap.c#11 integrate .. //depot/projects/vap/sys/net/if_tun.c#10 integrate .. //depot/projects/vap/sys/net/ppp_deflate.c#5 integrate .. //depot/projects/vap/sys/net/rtsock.c#13 integrate .. //depot/projects/vap/sys/net80211/_ieee80211.h#12 integrate .. //depot/projects/vap/sys/net80211/ieee80211.c#53 integrate .. //depot/projects/vap/sys/net80211/ieee80211_acl.c#11 integrate .. //depot/projects/vap/sys/net80211/ieee80211_adhoc.c#19 integrate .. //depot/projects/vap/sys/net80211/ieee80211_crypto.c#22 integrate .. //depot/projects/vap/sys/net80211/ieee80211_crypto_ccmp.c#14 integrate .. //depot/projects/vap/sys/net80211/ieee80211_crypto_tkip.c#17 integrate .. //depot/projects/vap/sys/net80211/ieee80211_crypto_wep.c#14 integrate .. //depot/projects/vap/sys/net80211/ieee80211_freebsd.c#36 integrate .. //depot/projects/vap/sys/net80211/ieee80211_freebsd.h#38 integrate .. //depot/projects/vap/sys/net80211/ieee80211_hostap.c#27 integrate .. //depot/projects/vap/sys/net80211/ieee80211_ht.c#55 integrate .. //depot/projects/vap/sys/net80211/ieee80211_ht.h#24 integrate .. //depot/projects/vap/sys/net80211/ieee80211_input.c#34 integrate .. //depot/projects/vap/sys/net80211/ieee80211_ioctl.c#68 integrate .. //depot/projects/vap/sys/net80211/ieee80211_node.c#51 integrate .. //depot/projects/vap/sys/net80211/ieee80211_node.h#31 integrate .. //depot/projects/vap/sys/net80211/ieee80211_output.c#63 integrate .. //depot/projects/vap/sys/net80211/ieee80211_power.c#14 integrate .. //depot/projects/vap/sys/net80211/ieee80211_power.h#9 integrate .. //depot/projects/vap/sys/net80211/ieee80211_proto.c#35 integrate .. //depot/projects/vap/sys/net80211/ieee80211_proto.h#27 integrate .. //depot/projects/vap/sys/net80211/ieee80211_regdomain.c#15 integrate .. //depot/projects/vap/sys/net80211/ieee80211_scan.c#25 integrate .. //depot/projects/vap/sys/net80211/ieee80211_scan_sta.c#29 integrate .. //depot/projects/vap/sys/net80211/ieee80211_sta.c#22 integrate .. //depot/projects/vap/sys/net80211/ieee80211_var.h#54 integrate .. //depot/projects/vap/sys/netatalk/ddp_pcb.c#5 integrate .. //depot/projects/vap/sys/netgraph/atm/sscfu/ng_sscfu_cust.h#3 integrate .. //depot/projects/vap/sys/netgraph/bluetooth/drivers/h4/ng_h4.c#5 integrate .. //depot/projects/vap/sys/netgraph/bluetooth/hci/ng_hci_main.c#3 integrate .. //depot/projects/vap/sys/netgraph/bluetooth/hci/ng_hci_misc.c#3 integrate .. //depot/projects/vap/sys/netgraph/bluetooth/l2cap/ng_l2cap_main.c#3 integrate .. //depot/projects/vap/sys/netgraph/bluetooth/l2cap/ng_l2cap_misc.c#5 integrate .. //depot/projects/vap/sys/netgraph/bluetooth/l2cap/ng_l2cap_misc.h#5 integrate .. //depot/projects/vap/sys/netgraph/bluetooth/socket/ng_btsocket_hci_raw.c#6 integrate .. //depot/projects/vap/sys/netgraph/bluetooth/socket/ng_btsocket_l2cap.c#7 integrate .. //depot/projects/vap/sys/netgraph/bluetooth/socket/ng_btsocket_l2cap_raw.c#6 integrate .. //depot/projects/vap/sys/netgraph/bluetooth/socket/ng_btsocket_rfcomm.c#7 integrate .. //depot/projects/vap/sys/netgraph/bluetooth/socket/ng_btsocket_sco.c#2 integrate .. //depot/projects/vap/sys/netgraph/netflow/netflow.c#10 integrate .. //depot/projects/vap/sys/netgraph/netflow/ng_netflow.c#10 integrate .. //depot/projects/vap/sys/netgraph/netgraph.h#12 integrate .. //depot/projects/vap/sys/netgraph/ng_UI.c#3 integrate .. //depot/projects/vap/sys/netgraph/ng_async.c#3 integrate .. //depot/projects/vap/sys/netgraph/ng_atmllc.c#3 integrate .. //depot/projects/vap/sys/netgraph/ng_base.c#24 integrate .. //depot/projects/vap/sys/netgraph/ng_bpf.c#8 integrate .. //depot/projects/vap/sys/netgraph/ng_bridge.c#5 integrate .. //depot/projects/vap/sys/netgraph/ng_cisco.c#6 integrate .. //depot/projects/vap/sys/netgraph/ng_device.c#7 integrate .. //depot/projects/vap/sys/netgraph/ng_eiface.c#8 integrate .. //depot/projects/vap/sys/netgraph/ng_etf.c#4 integrate .. //depot/projects/vap/sys/netgraph/ng_ether.c#7 integrate .. //depot/projects/vap/sys/netgraph/ng_fec.c#6 integrate .. //depot/projects/vap/sys/netgraph/ng_frame_relay.c#5 integrate .. //depot/projects/vap/sys/netgraph/ng_gif.c#8 integrate .. //depot/projects/vap/sys/netgraph/ng_gif_demux.c#3 integrate .. //depot/projects/vap/sys/netgraph/ng_hole.c#5 integrate .. //depot/projects/vap/sys/netgraph/ng_iface.c#10 integrate .. //depot/projects/vap/sys/netgraph/ng_ipfw.c#5 integrate .. //depot/projects/vap/sys/netgraph/ng_ksocket.c#7 integrate .. //depot/projects/vap/sys/netgraph/ng_l2tp.c#9 integrate .. //depot/projects/vap/sys/netgraph/ng_lmi.c#5 integrate .. //depot/projects/vap/sys/netgraph/ng_message.h#6 integrate .. //depot/projects/vap/sys/netgraph/ng_mppc.c#5 integrate .. //depot/projects/vap/sys/netgraph/ng_nat.c#5 integrate .. //depot/projects/vap/sys/netgraph/ng_one2many.c#4 integrate .. //depot/projects/vap/sys/netgraph/ng_parse.c#6 integrate .. //depot/projects/vap/sys/netgraph/ng_pipe.c#2 integrate .. //depot/projects/vap/sys/netgraph/ng_ppp.c#7 integrate .. //depot/projects/vap/sys/netgraph/ng_pptpgre.c#7 integrate .. //depot/projects/vap/sys/netgraph/ng_rfc1490.c#3 integrate .. //depot/projects/vap/sys/netgraph/ng_sample.c#4 integrate .. //depot/projects/vap/sys/netgraph/ng_split.c#6 integrate .. //depot/projects/vap/sys/netgraph/ng_sppp.c#6 integrate .. //depot/projects/vap/sys/netgraph/ng_tag.c#3 integrate .. //depot/projects/vap/sys/netgraph/ng_tcpmss.c#3 integrate .. //depot/projects/vap/sys/netgraph/ng_tee.c#7 integrate .. //depot/projects/vap/sys/netgraph/ng_tty.c#6 integrate .. //depot/projects/vap/sys/netgraph/ng_vjc.c#5 integrate .. //depot/projects/vap/sys/netgraph/ng_vlan.c#6 integrate .. //depot/projects/vap/sys/netinet/igmp.c#8 integrate .. //depot/projects/vap/sys/netinet/in.c#10 integrate .. //depot/projects/vap/sys/netinet/in_mcast.c#7 integrate .. //depot/projects/vap/sys/netinet/in_pcb.c#22 integrate .. //depot/projects/vap/sys/netinet/ip_carp.c#10 integrate .. //depot/projects/vap/sys/netinet/sctp_os_bsd.h#8 integrate .. //depot/projects/vap/sys/netinet/tcp_input.c#16 integrate .. //depot/projects/vap/sys/netinet/tcp_sack.c#9 integrate .. //depot/projects/vap/sys/netinet/tcp_syncache.c#17 integrate .. //depot/projects/vap/sys/netinet6/in6.c#12 integrate .. //depot/projects/vap/sys/netinet6/in6_pcb.c#13 integrate .. //depot/projects/vap/sys/netinet6/in6_src.c#13 integrate .. //depot/projects/vap/sys/netinet6/raw_ip6.c#16 integrate .. //depot/projects/vap/sys/netipsec/keysock.c#8 integrate .. //depot/projects/vap/sys/netipsec/xform_ah.c#8 integrate .. //depot/projects/vap/sys/netipx/ipx_pcb.c#5 integrate .. //depot/projects/vap/sys/netipx/spx_usrreq.c#7 integrate .. //depot/projects/vap/sys/netnatm/natm.c#5 integrate .. //depot/projects/vap/sys/netnatm/natm_pcb.c#5 integrate .. //depot/projects/vap/sys/netncp/ncp_conn.c#8 integrate .. //depot/projects/vap/sys/netncp/ncp_rq.c#6 integrate .. //depot/projects/vap/sys/netncp/ncp_sock.c#7 integrate .. //depot/projects/vap/sys/netncp/ncp_subr.c#3 integrate .. //depot/projects/vap/sys/netsmb/smb_rq.c#6 integrate .. //depot/projects/vap/sys/netsmb/smb_trantcp.c#7 integrate .. //depot/projects/vap/sys/nfs4client/nfs4_dev.c#5 integrate .. //depot/projects/vap/sys/nfs4client/nfs4_idmap.c#5 integrate .. //depot/projects/vap/sys/nfs4client/nfs4_socket.c#4 integrate .. //depot/projects/vap/sys/nfs4client/nfs4_vfsops.c#12 integrate .. //depot/projects/vap/sys/nfs4client/nfs4_vn_subs.c#5 integrate .. //depot/projects/vap/sys/nfs4client/nfs4_vnops.c#14 integrate .. //depot/projects/vap/sys/nfsclient/krpc_subr.c#7 integrate .. //depot/projects/vap/sys/nfsclient/nfs_lock.c#7 integrate .. //depot/projects/vap/sys/nfsclient/nfs_node.c#9 integrate .. //depot/projects/vap/sys/nfsclient/nfs_socket.c#10 integrate .. //depot/projects/vap/sys/nfsclient/nfs_subs.c#12 integrate .. //depot/projects/vap/sys/nfsclient/nfs_vfsops.c#19 integrate .. //depot/projects/vap/sys/nfsclient/nfs_vnops.c#18 integrate .. //depot/projects/vap/sys/nfsserver/nfs_serv.c#14 integrate .. //depot/projects/vap/sys/nfsserver/nfs_srvcache.c#6 integrate .. //depot/projects/vap/sys/nfsserver/nfs_srvsock.c#9 integrate .. //depot/projects/vap/sys/nfsserver/nfs_syscalls.c#9 integrate .. //depot/projects/vap/sys/opencrypto/cryptodev.c#7 integrate .. //depot/projects/vap/sys/opencrypto/cryptosoft.c#6 integrate .. //depot/projects/vap/sys/opencrypto/deflate.c#5 integrate .. //depot/projects/vap/sys/opencrypto/xform.c#6 integrate .. //depot/projects/vap/sys/pci/if_rl.c#9 integrate .. //depot/projects/vap/sys/pci/if_rlreg.h#14 integrate .. //depot/projects/vap/sys/powerpc/booke/pmap.c#7 integrate .. //depot/projects/vap/sys/powerpc/conf/GENERIC#14 integrate .. //depot/projects/vap/sys/powerpc/conf/MPC85XX#5 integrate .. //depot/projects/vap/sys/powerpc/mpc85xx/lbc.c#1 branch .. //depot/projects/vap/sys/powerpc/mpc85xx/lbc.h#1 branch .. //depot/projects/vap/sys/powerpc/mpc85xx/ocpbus.c#4 integrate .. //depot/projects/vap/sys/powerpc/powermac/cuda.c#1 branch .. //depot/projects/vap/sys/powerpc/powermac/cudavar.h#1 branch .. //depot/projects/vap/sys/powerpc/powermac/macgpio.c#1 branch .. //depot/projects/vap/sys/powerpc/powermac/macgpiovar.h#1 branch .. //depot/projects/vap/sys/powerpc/powermac/macio.c#9 integrate .. //depot/projects/vap/sys/powerpc/powermac/pmu.c#1 branch .. //depot/projects/vap/sys/powerpc/powermac/pmuvar.h#1 branch .. //depot/projects/vap/sys/powerpc/powermac/viareg.h#1 branch .. //depot/projects/vap/sys/rpc/rpcclnt.c#9 integrate .. //depot/projects/vap/sys/security/mac_bsdextended/mac_bsdextended.c#11 integrate .. //depot/projects/vap/sys/security/mac_lomac/mac_lomac.c#11 integrate .. //depot/projects/vap/sys/sys/cdefs.h#10 integrate .. //depot/projects/vap/sys/sys/cfictl.h#1 branch .. //depot/projects/vap/sys/sys/malloc.h#6 integrate .. //depot/projects/vap/sys/sys/param.h#32 integrate .. //depot/projects/vap/sys/sys/proc.h#24 integrate .. //depot/projects/vap/sys/sys/syscallsubr.h#10 integrate .. //depot/projects/vap/sys/ufs/ffs/ffs_inode.c#9 integrate .. //depot/projects/vap/sys/ufs/ffs/ffs_snapshot.c#13 integrate .. //depot/projects/vap/sys/ufs/ffs/ffs_softdep.c#14 integrate .. //depot/projects/vap/sys/ufs/ffs/ffs_vfsops.c#19 integrate .. //depot/projects/vap/sys/ufs/ufs/ufs_dirhash.c#8 integrate .. //depot/projects/vap/sys/ufs/ufs/ufs_extattr.c#10 integrate .. //depot/projects/vap/sys/ufs/ufs/ufs_vnops.c#12 integrate .. //depot/projects/vap/sys/vm/vm_mmap.c#15 integrate .. //depot/projects/vap/sys/xen/evtchn/evtchn.c#4 integrate .. //depot/projects/vap/usr.sbin/nscd/agents/group.c#3 integrate .. //depot/projects/vap/usr.sbin/nscd/agents/passwd.c#3 integrate .. //depot/projects/vap/usr.sbin/nscd/agents/services.c#3 integrate .. //depot/projects/vap/usr.sbin/nscd/cachelib.c#4 integrate .. //depot/projects/vap/usr.sbin/nscd/nscd.c#4 integrate .. //depot/projects/vap/usr.sbin/nscd/nscdcli.c#4 integrate .. //depot/projects/vap/usr.sbin/pciconf/pciconf.c#4 integrate .. //depot/projects/vap/usr.sbin/sysinstall/package.c#5 integrate Differences ... ==== //depot/projects/vap/Makefile.inc1#17 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/Makefile.inc1,v 1.611 2008/09/19 16:14:42 obrien Exp $ +# $FreeBSD: src/Makefile.inc1,v 1.613 2008/10/23 16:06:49 des Exp $ # # Make command line options: # -DNO_CLEANDIR run ${MAKE} clean, instead of ${MAKE} cleandir ==== //depot/projects/vap/etc/periodic/security/200.chkmounts#3 (text+ko) ==== @@ -24,7 +24,7 @@ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # -# $FreeBSD: src/etc/periodic/security/200.chkmounts,v 1.5 2002/10/25 15:14:16 thomas Exp $ +# $FreeBSD: src/etc/periodic/security/200.chkmounts,v 1.6 2008/10/25 18:45:40 ed Exp $ # # Show changes in the way filesystems are mounted @@ -50,7 +50,7 @@ ignore="${ignore}|^amd:" esac [ -n "$ignore" ] && cmd="egrep -v ${ignore#|}" || cmd=cat - mount -p | ${cmd} | + mount -p | sort | ${cmd} | check_diff mount - "${host} changes in mounted filesystems:" rc=$?;; *) rc=0;; ==== //depot/projects/vap/lib/libc/gen/__xuname.c#3 (text+ko) ==== @@ -31,7 +31,7 @@ /*static char sccsid[] = "From: @(#)uname.c 8.1 (Berkeley) 1/4/94";*/ #endif /* LIBC_SCCS and not lint */ #include -__FBSDID("$FreeBSD: src/lib/libc/gen/__xuname.c,v 1.13 2007/01/09 00:27:52 imp Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/gen/__xuname.c,v 1.15 2008/10/22 21:56:57 kib Exp $"); #include #include @@ -45,94 +45,102 @@ { int mib[2], rval; size_t len; - char *p; + char *p, *q; int oerrno; - struct xutsname { - char sysname[namesize]; /* Name of this OS. */ - char nodename[namesize]; /* Name of this network node. */ - char release[namesize]; /* Release level. */ - char version[namesize]; /* Version level. */ - char machine[namesize]; /* Hardware type. */ - } *name; - name = (struct xutsname *)namebuf; rval = 0; + q = (char *)namebuf; mib[0] = CTL_KERN; - mib[1] = KERN_OSTYPE; - len = sizeof(name->sysname); - oerrno = errno; - if (sysctl(mib, 2, &name->sysname, &len, NULL, 0) == -1) { - if(errno == ENOMEM) - errno = oerrno; - else - rval = -1; + + if ((p = getenv("UNAME_s"))) + strlcpy(q, p, namesize); + else { + mib[1] = KERN_OSTYPE; + len = namesize; + oerrno = errno; + if (sysctl(mib, 2, q, &len, NULL, 0) == -1) { + if (errno == ENOMEM) + errno = oerrno; + else + rval = -1; + } + q[namesize - 1] = '\0'; } - name->sysname[sizeof(name->sysname) - 1] = '\0'; - if ((p = getenv("UNAME_s"))) - strlcpy(name->sysname, p, sizeof(name->sysname)); + q += namesize; - mib[0] = CTL_KERN; mib[1] = KERN_HOSTNAME; - len = sizeof(name->nodename); + len = namesize; oerrno = errno; - if (sysctl(mib, 2, &name->nodename, &len, NULL, 0) == -1) { - if(errno == ENOMEM) + if (sysctl(mib, 2, q, &len, NULL, 0) == -1) { + if (errno == ENOMEM) errno = oerrno; else rval = -1; } - name->nodename[sizeof(name->nodename) - 1] = '\0'; + q[namesize - 1] = '\0'; + q += namesize; - mib[0] = CTL_KERN; - mib[1] = KERN_OSRELEASE; - len = sizeof(name->release); - oerrno = errno; - if (sysctl(mib, 2, &name->release, &len, NULL, 0) == -1) { - if(errno == ENOMEM) - errno = oerrno; - else - rval = -1; - } - name->release[sizeof(name->release) - 1] = '\0'; if ((p = getenv("UNAME_r"))) - strlcpy(name->release, p, sizeof(name->release)); - - /* The version may have newlines in it, turn them into spaces. */ - mib[0] = CTL_KERN; - mib[1] = KERN_VERSION; - len = sizeof(name->version); - oerrno = errno; - if (sysctl(mib, 2, &name->version, &len, NULL, 0) == -1) { - if (errno == ENOMEM) - errno = oerrno; - else - rval = -1; - } - name->version[sizeof(name->version) - 1] = '\0'; - for (p = name->version; len--; ++p) { - if (*p == '\n' || *p == '\t') { - if (len > 1) - *p = ' '; + strlcpy(q, p, namesize); + else { + mib[1] = KERN_OSRELEASE; + len = namesize; + oerrno = errno; + if (sysctl(mib, 2, q, &len, NULL, 0) == -1) { + if (errno == ENOMEM) + errno = oerrno; else - *p = '\0'; + rval = -1; } + q[namesize - 1] = '\0'; } + q += namesize; + if ((p = getenv("UNAME_v"))) - strlcpy(name->version, p, sizeof(name->version)); + strlcpy(q, p, namesize); + else { - mib[0] = CTL_HW; - mib[1] = HW_MACHINE; - len = sizeof(name->machine); - oerrno = errno; - if (sysctl(mib, 2, &name->machine, &len, NULL, 0) == -1) { - if (errno == ENOMEM) - errno = oerrno; - else - rval = -1; + /* + * The version may have newlines in it, turn them into + * spaces. + */ + mib[1] = KERN_VERSION; + len = namesize; + oerrno = errno; + if (sysctl(mib, 2, q, &len, NULL, 0) == -1) { + if (errno == ENOMEM) + errno = oerrno; + else + rval = -1; + } + q[namesize - 1] = '\0'; + for (p = q; len--; ++p) { + if (*p == '\n' || *p == '\t') { + if (len > 1) + *p = ' '; + else + *p = '\0'; + } + } } - name->machine[sizeof(name->machine) - 1] = '\0'; + q += namesize; + if ((p = getenv("UNAME_m"))) - strlcpy(name->machine, p, sizeof(name->machine)); + strlcpy(q, p, namesize); + else { + mib[0] = CTL_HW; + mib[1] = HW_MACHINE; + len = namesize; + oerrno = errno; + if (sysctl(mib, 2, q, &len, NULL, 0) == -1) { + if (errno == ENOMEM) + errno = oerrno; + else + rval = -1; + } + q[namesize - 1] = '\0'; + } + return (rval); } ==== //depot/projects/vap/lib/libc/gen/posix_spawn.c#3 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/lib/libc/gen/posix_spawn.c,v 1.5 2008/06/23 05:22:06 ed Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/gen/posix_spawn.c,v 1.6 2008/10/23 15:32:06 rdivacky Exp $"); #include "namespace.h" #include @@ -444,7 +444,7 @@ } int -posix_spawnattr_setschedparam(posix_spawnattr_t *sa __restrict, +posix_spawnattr_setschedparam(posix_spawnattr_t * __restrict sa, const struct sched_param * __restrict schedparam) { (*sa)->sa_schedparam = *schedparam; ==== //depot/projects/vap/lib/libc/sys/mmap.2#3 (text+ko) ==== @@ -26,9 +26,9 @@ .\" SUCH DAMAGE. .\" .\" @(#)mmap.2 8.4 (Berkeley) 5/11/95 -.\" $FreeBSD: src/lib/libc/sys/mmap.2,v 1.56 2007/01/09 00:28:15 imp Exp $ +.\" $FreeBSD: src/lib/libc/sys/mmap.2,v 1.57 2008/10/24 14:40:13 alc Exp $ .\" -.Dd April 21, 2006 +.Dd October 24, 2008 .Dt MMAP 2 .Os .Sh NAME @@ -252,6 +252,11 @@ in which the file descriptor argument specifies a file or device to which swapping should be done. +.Sh NOTES +Although this implementation does not impose any alignment restrictions on +the +.Fa offset +argument, a portable program must only use page-aligned values. .Sh RETURN VALUES Upon successful completion, .Fn mmap @@ -307,13 +312,6 @@ was specified and the .Fa fd argument was not -1. -The -.Fa offset -argument -was not page-aligned. -(See -.Sx BUGS -below.) .It Bq Er ENODEV .Dv MAP_ANON has not been specified and ==== //depot/projects/vap/lib/libfetch/http.c#5 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/lib/libfetch/http.c,v 1.84 2008/02/08 09:48:48 des Exp $"); +__FBSDID("$FreeBSD: src/lib/libfetch/http.c,v 1.85 2008/10/24 07:56:01 ru Exp $"); /* * The following copyright applies to the base64 code: @@ -1064,6 +1064,7 @@ if (url->offset == size && url->length == 0) { /* asked for 0 bytes; fake it */ offset = url->offset; + clength = -1; conn->err = HTTP_OK; break; } else { ==== //depot/projects/vap/release/Makefile#7 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/release/Makefile,v 1.935 2008/10/14 02:13:12 kensmith Exp $ +# $FreeBSD: src/release/Makefile,v 1.937 2008/10/21 23:36:28 kensmith Exp $ # # make release [BUILDNAME=somename] CHROOTDIR=/some/dir CVSROOT=/cvs/dir \ # [RELEASETAG=tag] @@ -957,13 +957,13 @@ @rm -f ${CD_LIVEFS}/boot/device.hints @cp ${RD}/trees/base/boot/device.hints ${CD_LIVEFS}/boot/device.hints .endif + @echo "CD_VERSION = ${BUILDNAME}" > ${CD_LIVEFS}/cdrom.inf .if defined(MAKE_DVD) @cp -Rp ${RD}/kernels/GENERIC/ ${CD_DVD1}/boot/kernel @rm -f ${CD_DVD1}/boot/kernel/*.symbols @rm -f ${CD_DVD1}/.profile @cp ${.CURDIR}/fixit.profile ${CD_DVD1}/.profile @ln -sf /rescue ${CD_DVD1}/stand - @echo "CD_VERSION = ${BUILDNAME}" > ${CD_LIVEFS}/cdrom.inf @echo "CD_VERSION = ${BUILDNAME}" > ${CD_DVD1}/cdrom.inf @rm -f ${CD_DVD1}/boot/loader.conf @cp ${RD}/mfsroot/mfsroot.gz ${CD_DVD1}/boot/mfsroot.gz @@ -1033,7 +1033,7 @@ @echo "CD_VOLUME = 1" >> ${CD_DVD1}/cdrom.inf .endif .if !defined(NODOC) - echo "Building CDROM docs filesystem image" + @echo "Building CDROM docs filesystem image" @mkdir -p ${CD_DOCS} @echo "CD_VERSION = ${BUILDNAME}" > ${CD_DOCS}/cdrom.inf @mkdir -p ${CD_DOCS}/usr/share/doc ==== //depot/projects/vap/release/doc/en_US.ISO8859-1/hardware/article.sgml#8 (text+ko) ==== @@ -17,7 +17,7 @@ The &os; Documentation Project - $FreeBSD: src/release/doc/en_US.ISO8859-1/hardware/article.sgml,v 1.340 2008/10/13 21:02:19 brueffer Exp $ + $FreeBSD: src/release/doc/en_US.ISO8859-1/hardware/article.sgml,v 1.341 2008/10/23 10:38:04 marck Exp $ 2000 @@ -90,7 +90,7 @@ - &intel; 64-bit &xeon; (Nacona). This + &intel; 64-bit &xeon; (Nocona). This processor is fabricated on 90nm process technology, and operates with 2.80 to 3.60 GHz (FSB 800MHz) and &intel; E7520/E7525/E7320 chipsets. ==== //depot/projects/vap/share/man/man4/mmc.4#4 (text+ko) ==== @@ -22,7 +22,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man4/mmc.4,v 1.2 2008/10/08 18:27:54 mav Exp $ +.\" $FreeBSD: src/share/man/man4/mmc.4,v 1.3 2008/10/22 09:04:05 mav Exp $ .\" .Dd October 8, 2008 .Dt MMC 4 @@ -48,7 +48,8 @@ SD Cards exist as memory, I/O, or combination cards. .Sh SEE ALSO .Xr mmcsd 4 , -.Xr at91_mci 4 +.Xr at91_mci 4 , +.Xr sdhci 4 .Rs .%T "SD Specifications, Part 1, Physical Layer, Simplified Specification" .Re ==== //depot/projects/vap/share/man/man4/mmcsd.4#3 (text+ko) ==== @@ -22,30 +22,27 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man4/mmcsd.4,v 1.1 2007/05/27 05:01:19 imp Exp $ +.\" $FreeBSD: src/share/man/man4/mmcsd.4,v 1.4 2008/10/22 09:11:35 mav Exp $ .\" -.Dd May 26, 2007 +.Dd October 22, 2008 .Dt MMCSD 4 .Os .Sh NAME .Nm mmcsd -.Nd MMC and SD card driver. +.Nd MMC and SD memory card driver. .Sh SYNOPSIS .Cd device mmcsd .Sh DESCRIPTION The .Nm -driver implements the MMC and SD memory cards. +driver implements direct access block device for MMC and SD memory cards. .Sh SEE ALSO .Xr mmc 4 , -.Xr at91_mci 4 +.Xr at91_mci 4 , +.Xr sdhci 4 .Rs .%T "SD Specifications, Part 1, Physical Layer, Simplified Specification" .Re .Rs .%T "The MultiMediaCard System Specification" .Re -.Sh BUGS -Memory MultMediaCards do not currently work. -SDIO cards currently do not work. -SDHC cards currently do not work. ==== //depot/projects/vap/share/man/man4/snd_hda.4#8 (text+ko) ==== @@ -23,9 +23,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man4/snd_hda.4,v 1.21 2008/10/03 09:19:07 mav Exp $ +.\" $FreeBSD: src/share/man/man4/snd_hda.4,v 1.23 2008/10/24 18:57:11 mav Exp $ .\" -.Dd Sep 17, 2008 +.Dd October 24, 2008 .Dt SND_HDA 4 .Os .Sh NAME @@ -129,6 +129,8 @@ GPIO combination required for your system. ivrefX/ovrefX options controls voltage used to power external microphones and so on. +.It Va hint.hdac.%d.msi +Controls MSI (Message Signaled Interrupts) support. .It Va hint.hdac.%d.cad%d.nid%d.config Overrides codec pin configuration set by BIOS. May be specified as a 32bit HEX value with a leading "0x" or as a set of ==== //depot/projects/vap/share/man/man4/umodem.4#3 (text+ko) ==== @@ -34,7 +34,7 @@ .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\" POSSIBILITY OF SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man4/umodem.4,v 1.10 2007/08/21 13:20:13 sanpei Exp $ +.\" $FreeBSD: src/share/man/man4/umodem.4,v 1.11 2008/10/22 21:46:59 n_hibma Exp $ .\" .Dd November 22, 2006 .Dt UMODEM 4 @@ -96,6 +96,8 @@ Yamaha Broadband Wireless Router RTW65b .It ELSA MicroLink 56k USB modem +.It +Sony Ericsson W810i phone .El .Sh SEE ALSO .Xr tty 4 , ==== //depot/projects/vap/share/man/man9/Makefile#16 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/share/man/man9/Makefile,v 1.342 2008/09/28 20:15:45 ed Exp $ +# $FreeBSD: src/share/man/man9/Makefile,v 1.343 2008/10/23 15:53:51 des Exp $ MAN= accept_filter.9 \ accf_data.9 \ @@ -741,9 +741,7 @@ MLINKS+=make_dev.9 destroy_dev.9 \ make_dev.9 dev_depends.9 \ make_dev.9 make_dev_alias.9 -MLINKS+=malloc.9 FREE.9 \ - malloc.9 free.9 \ - malloc.9 MALLOC.9 \ +MLINKS+=malloc.9 free.9 \ malloc.9 MALLOC_DECLARE.9 \ malloc.9 MALLOC_DEFINE.9 \ malloc.9 realloc.9 \ ==== //depot/projects/vap/share/man/man9/malloc.9#4 (text+ko) ==== @@ -34,16 +34,14 @@ .\" POSSIBILITY OF SUCH DAMAGE. .\" .\" $NetBSD: malloc.9,v 1.3 1996/11/11 00:05:11 lukem Exp $ -.\" $FreeBSD: src/share/man/man9/malloc.9,v 1.43 2008/03/25 15:44:49 ru Exp $ +.\" $FreeBSD: src/share/man/man9/malloc.9,v 1.44 2008/10/23 15:53:51 des Exp $ .\" -.Dd June 12, 2003 +.Dd October 23, 2008 .Dt MALLOC 9 .Os .Sh NAME .Nm malloc , -.Nm MALLOC , .Nm free , -.Nm FREE , .Nm realloc , .Nm reallocf , .Nm MALLOC_DEFINE , @@ -54,10 +52,8 @@ .In sys/malloc.h .Ft void * .Fn malloc "unsigned long size" "struct malloc_type *type" "int flags" -.Fn MALLOC space cast "unsigned long size" "struct malloc_type *type" "int flags" .Ft void .Fn free "void *addr" "struct malloc_type *type" -.Fn FREE "void *addr" "struct malloc_type *type" .Ft void * .Fn realloc "void *addr" "unsigned long size" "struct malloc_type *type" "int flags" .Ft void * @@ -123,20 +119,6 @@ except that it will free the passed pointer when the requested memory cannot be allocated. .Pp -The -.Fn MALLOC -macro variant is functionally equivalent to -.Bd -literal -offset indent -(space) = (cast)malloc((u_long)(size), type, flags) -.Ed -.Pp -and the -.Fn FREE -macro variant is equivalent to -.Bd -literal -offset indent -free((addr), type) -.Ed -.Pp Unlike its standard C library counterpart .Pq Xr malloc 3 , the kernel version takes two more arguments. @@ -219,7 +201,7 @@ /* sys/something/foo_subr.c */ \&... -MALLOC(buf, struct foo_buf *, sizeof *buf, M_FOOBUF, M_NOWAIT); +buf = malloc(sizeof *buf, M_FOOBUF, M_NOWAIT); .Ed .Pp ==== //depot/projects/vap/sys/amd64/amd64/identcpu.c#12 (text+ko) ==== @@ -39,7 +39,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/identcpu.c,v 1.162 2008/10/21 00:38:00 jkim Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/identcpu.c,v 1.164 2008/10/22 17:30:37 jkim Exp $"); #include "opt_cpu.h" @@ -347,10 +347,17 @@ "AuthenticAMD") == 0) cpu_feature &= ~CPUID_HTT; + /* + * If this CPU supports P-state invariant TSC then + * mention the capability. + */ if (!tsc_is_invariant && - (amd_pminfo & AMDPM_TSC_INVARIANT)) { + (strcmp(cpu_vendor, "AuthenticAMD") == 0 && + ((amd_pminfo & AMDPM_TSC_INVARIANT) != 0 || + AMD64_CPU_FAMILY(cpu_id) >= 0x10 || + cpu_id == 0x60fb2))) { tsc_is_invariant = 1; - printf("\n P-state invariant TSC"); + printf("\n TSC: P-state invariant"); } /* ==== //depot/projects/vap/sys/amd64/amd64/local_apic.c#9 (text+ko) ==== @@ -32,7 +32,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/local_apic.c,v 1.46 2008/08/23 12:35:43 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/local_apic.c,v 1.47 2008/10/26 18:58:04 sobomax Exp $"); #include "opt_hwpmc_hooks.h" #include "opt_kdtrace.h" @@ -401,7 +401,11 @@ lapic_timer_hz = hz * 2; else lapic_timer_hz = hz * 4; - stathz = lapic_timer_hz / (lapic_timer_hz / 128); + if (lapic_timer_hz < 128) { + stathz = 128; >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sun Oct 26 22:10:46 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 17765106567A; Sun, 26 Oct 2008 22:10:46 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id CF9CE1065672 for ; Sun, 26 Oct 2008 22:10:45 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id BD76D8FC19 for ; Sun, 26 Oct 2008 22:10:45 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id m9QMAjBR066762 for ; Sun, 26 Oct 2008 22:10:45 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m9QMAjZC066760 for perforce@freebsd.org; Sun, 26 Oct 2008 22:10:45 GMT (envelope-from sam@freebsd.org) Date: Sun, 26 Oct 2008 22:10:45 GMT Message-Id: <200810262210.m9QMAjZC066760@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 151985 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, 26 Oct 2008 22:10:46 -0000 http://perforce.freebsd.org/chv.cgi?CH=151985 Change 151985 by sam@sam_ebb on 2008/10/26 22:10:23 IFC Affected files ... .. //depot/projects/vap/sys/conf/files#52 integrate .. //depot/projects/vap/sys/conf/files.arm#7 integrate .. //depot/projects/vap/sys/conf/options#29 integrate Differences ... ==== //depot/projects/vap/sys/conf/files#52 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/files,v 1.1338 2008/10/09 21:25:01 n_hibma Exp $ +# $FreeBSD: src/sys/conf/files,v 1.1340 2008/10/25 06:18:12 marcel Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -536,6 +536,8 @@ dev/cardbus/cardbus.c optional cardbus dev/cardbus/cardbus_cis.c optional cardbus dev/cardbus/cardbus_device.c optional cardbus +dev/cfi/cfi_core.c optional cfi +dev/cfi/cfi_dev.c optional cfi dev/ciss/ciss.c optional ciss dev/cm/smc90cx6.c optional cm dev/cmx/cmx.c optional cmx @@ -1144,6 +1146,7 @@ dev/scc/scc_dev_z8530.c optional scc dev/scd/scd.c optional scd isa dev/scd/scd_isa.c optional scd isa +dev/sdhci/sdhci.c optional sdhci pci dev/sf/if_sf.c optional sf pci dev/si/si.c optional si dev/si/si2_z280.c optional si ==== //depot/projects/vap/sys/conf/files.arm#7 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/files.arm,v 1.19 2007/12/02 20:40:31 rwatson Exp $ +# $FreeBSD: src/sys/conf/files.arm,v 1.20 2008/10/23 01:51:55 marcel Exp $ crypto/blowfish/bf_enc.c optional crypto | ipsec crypto/des/des_enc.c optional crypto | ipsec | netsmb arm/arm/autoconf.c standard @@ -46,10 +46,10 @@ arm/fpe-arm/armfpe_glue.S optional armfpe arm/fpe-arm/armfpe_init.c optional armfpe arm/fpe-arm/armfpe.S optional armfpe -geom/geom_bsd.c standard -geom/geom_bsd_enc.c standard -geom/geom_mbr.c standard -geom/geom_mbr_enc.c standard +geom/geom_bsd.c optional geom_bsd +geom/geom_bsd_enc.c optional geom_bsd +geom/geom_mbr.c optional geom_mbr +geom/geom_mbr_enc.c optional geom_mbr hal.o optional ath_hal \ compile-with "ATH_HAL_CPU=`echo ${CONF_CFLAGS}|sed 's/.*-mcpu=\([a-zA-Z0-9]*\).*/\1/'`; ATH_ENDIAN=`if (echo ${CC}|grep mbig-endian>/dev/null); then echo be; else echo le; fi;`; uudecode < $S/contrib/dev/ath/public/$$ATH_HAL_CPU-$$ATH_ENDIAN-elf.hal.o.uu" \ no-implicit-rule ==== //depot/projects/vap/sys/conf/options#29 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/options,v 1.642 2008/10/01 19:24:16 jhb Exp $ +# $FreeBSD: src/sys/conf/options,v 1.643 2008/10/24 07:16:13 n_hibma Exp $ # # On the handling of kernel options # @@ -618,6 +618,7 @@ # options for USB support USB_DEBUG opt_usb.h USBVERBOSE opt_usb.h +U3G_DEBUG opt_u3g.h UKBD_DFLT_KEYMAP opt_ukbd.h UPLCOM_INTR_INTERVAL opt_uplcom.h UVSCOM_DEFAULT_OPKTSIZE opt_uvscom.h From owner-p4-projects@FreeBSD.ORG Sun Oct 26 22:39:15 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 22518106569F; Sun, 26 Oct 2008 22:39:15 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id C0D3A1065685 for ; Sun, 26 Oct 2008 22:39:14 +0000 (UTC) (envelope-from rene@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id ACD488FC33 for ; Sun, 26 Oct 2008 22:39:14 +0000 (UTC) (envelope-from rene@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id m9QMdE7v069183 for ; Sun, 26 Oct 2008 22:39:14 GMT (envelope-from rene@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m9QMdEPE069180 for perforce@freebsd.org; Sun, 26 Oct 2008 22:39:14 GMT (envelope-from rene@FreeBSD.org) Date: Sun, 26 Oct 2008 22:39:14 GMT Message-Id: <200810262239.m9QMdEPE069180@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rene@FreeBSD.org using -f From: Rene Ladan To: Perforce Change Reviews Cc: Subject: PERFORCE change 151987 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, 26 Oct 2008 22:39:15 -0000 http://perforce.freebsd.org/chv.cgi?CH=151987 Change 151987 by rene@rene_self on 2008/10/26 22:38:21 Translate 'explaining-bsd' up to section 2.4.3 (70%). Checked build. Affected files ... .. //depot/projects/docproj_nl/nl_NL.ISO8859-1/articles/explaining-bsd/article.sgml#5 edit Differences ... ==== //depot/projects/docproj_nl/nl_NL.ISO8859-1/articles/explaining-bsd/article.sgml#5 (text+ko) ==== @@ -48,7 +48,7 @@ url="http://www.yahoo.com/">Yahoo!, draaien BSD. De drukste FTP-server van de wereld van 1999 (nu buiten werking), ftp.cdrom.com, - gebruikt BSD om 1.4 TB aan gegevens per dag over te + gebruikte BSD om 1.4 TB aan gegevens per dag over te brengen. Het is duidelijk dat dit geen nichemarkt is: BSD is een goed bewaard geheim. @@ -66,7 +66,7 @@ BSD is een afkorting van Berkeley Software Distribution. Het is de naam van broncodedistributies van de universiteit van California te Berkeley, wat origineel - uitbreidingen waren van het besturingssysteem &unix; van AT&T + uitbreidingen waren van het besturingssysteem &unix; van AT&T Research. Verschillende projecten over open-source besturingssystemen zijn gebaseerd op een uitgave van deze broncode die bekend staat als 4.4BSD-Lite. Ze omvatten ook een aantal @@ -119,9 +119,9 @@ - + - Wat, een echte &unix;? + Wat, een echte &unix;? De BSD-besturingssystemen zijn geen klonen, maar open-source afgeleiden van AT&T's Research &unix; besturingssysteem, wat @@ -177,7 +177,7 @@ url="http://www.bsdi.com/">Berkeley Software Design Inc. en gaf een betaversie van een besturingssysteem genaamd BSD/386 uit, welke op - dezelfde bronnen was gebaseerd. De naam van he besturingssysteem + dezelfde bronnen was gebaseerd. De naam van het besturingssysteem werd later veranderd in BSD/OS. 386BSD werd nooit een stabiel besturingssysteem. In plaats @@ -194,236 +194,259 @@ splitste OpenBSD zich af van NetBSD, en in 2003 splitste DragonFlyBSD zich af - van FreeBSD. + van &os;. - + - Why is BSD not better known? + Waarom is BSD niet bekender? - For a number of reasons, BSD is relatively unknown: + Om een aantal redenen is BSD relatief onbekend: - The BSD developers are often more interested in polishing their - code than marketing it. + De BSD-ontwikkelaars zijn vaak meer geïnteresseerd in + het verbeteren van hun code dan het aan de man brengen. - Much of Linux's popularity is due to factors external to the - Linux projects, such as the press, and to companies formed to - provide Linux services. Until recently, the open source BSDs had no - such proponents. + Veel van de populariteit van Linux komt door factoren + buiten de Linux-projecten, zoals de pers, en door bedrijven + die zijn opgericht om Linux-diensten aan te bieden. Tot voor + kort hadden de open-source BSDs zulke voorstanders niet. - BSD developers tend to be more experienced than Linux - developers, and have less interest in making the system easy to use. - Newcomers tend to feel more comfortable with Linux. + BSD-ontwikkelaars zijn vaak meer ervaren dan + Linux-ontwikkelaars, en hebben minder interessse in het + systeem gemakkelijk in gebruik te maken. Nieuwelingen voelen + zich vaak meer op hun gemak met Linux. - In 1992, AT&T sued - BSDI, - the vendor of BSD/386, alleging that the product contained - AT&T-copyrighted code. The case was settled out of court in - 1994, but the spectre of the litigation continues to haunt people. - As recently as March 2000 an article published on the web claimed - that the court case had been recently settled. + In 1992 klaagde AT&T BSDI, de verkoper van + BSD/386, aan op verdenking dat het product code bevatte + waarover AT&T copyright had. De zaak werd buiten de + rechtbank om in 1994 beslist, maar het spook van de rechtzaak + blijft mensen achtervolgen. In een recent uit maart 2000 dat + op het web werd gepubliceerd claimde dat de zaak + recentelijk beslist was. - One detail that the lawsuit did clarify is the naming: in the - 1980s, BSD was known as BSD &unix;. With the - elimination of the last vestige of AT&T code from BSD, it - also lost the right to the name &unix;. Thus you will see - references in book titles to the 4.3BSD &unix; operating - system and the 4.4BSD operating - system. + Eén detail dat de rechtzaak ophelderde is de + naamgeving: in de jaren 80 stond BSD bekend als BSD + &unix;. Met het nemen van de laatste vestiging van + AT&T-code van BSD, verloor het ook het recht op de naam + &unix;. U zult dus verwijzingen in boektitels zien naar + het besturingssysteem 4.3BSD &unix; en + het besturingssysteem 4.4BSD. - There is a perception that the BSD projects are fragmented and - belligerent. The - Wall Street - Journal spoke of balkanization of the - BSD projects. Like the law suit, this perception bases mainly - on ancient history. + De indruk heerst dat de BSD-projecten gefragmenteerd en + oorlogvoerend zijn. De Wall Street + Journal sprak van balkanizatie van de + BSD-projecten. Net als de rechtzaak is dit beeld voornamelijk + op een oude geschiedenis gebaseerd. - Comparing BSD and Linux + BSD en Linux vergelijken - So what is really the difference between, say, Debian Linux and - FreeBSD? For the average user, the difference is surprisingly small: - Both are &unix; like operating systems. Both are developed by - non-commercial projects (this does not apply to many other Linux - distributions, of course). In the following section, we will look at BSD - and compare it to Linux. The description applies most closely to - FreeBSD, which accounts for an estimated 80% of the BSD installations, - but the differences from NetBSD, OpenBSD and DragonFlyBSD are small. - + Wat is nou echt het verschil tussen bijvoorbeeld Debian Linux + en &os;? Voor de gemiddelde gebruiker is het verschil verassend + klein: beiden zijn &unix;-achtige besturingssystemen. Beiden + worden ontwikkeld door niet-commerciële projecten (dit geldt + uiteraard niet voor vele andere distributies van Linux). In de + volgende sectie wordt BSD bekeken en vergeleken met Linux. De + beschrijving is het beste van toepassing op &os;, dat een + geschatte 80% van alle BSD-installaties voor rekening neemt, maar + de verschillen van NetBSD, OpenBSD, en DragonFlyBSD zijn + klein. - Who owns BSD? + Wie bezit BSD? - No one person or corporation owns BSD. It is created and - distributed by a community of highly technical and committed - contributors all over the world. Some of the components of BSD are - Open Source projects in their own right and managed by different - project maintainers. + Geen enkel persoon of bedrijf bezit BSD. Het wordt + ontwikkeld en verspreid door een gemeenschap van zeer technische + en toegewijde wereldwijde contribuanten. Sommige onderdelen van + BSD zijn open-source projecten op zichzelf en worden beheerd + door verschillende projectbeheerders. - How is BSD developed and updated? + Hoe wordt BSD ontwikkeld en bijgewerkt? - The BSD kernels are developed and updated following the Open - Source development model. Each project maintains a publicly - accessible source tree under the - Concurrent Versions - System (CVS), which contains all source files for the - project, including documentation and other incidental files. CVS - allows users to check out (in other words, to - extract a copy of) any desired version of the system. + De BSD-kernels worden ontwikkeld en bijgewerkt volgens het + Open Source ontwikkelmodel. Elk project beheerst een publiek + toegankelijke broncodeboom onder het Concurrent Versions + System (CVS), wat alle bronbestanden voor het project + bevat, inclusief documentatie en andere toevallige bestanden. + CVS stelt gebruikers in staat om een check out te + doen (met andere woorden, om een kopie te maken) van elke + gewenste versie van het systeem. - A large number of developers worldwide contribute to improvements - to BSD. They are divided into three kinds: + Een grote groep van wereldwijde ontwikkelaars dragen bij aan + verbeteringen aan BSD. Ze zijn verdeeld in drie soorten: - Contributors write code or documentation. - They are not permitted to commit (add code) directly to the source - tree. In order for their code to be included in the system, it - must be reviewed and checked in by a registered developer, known - as a committer. + Contributors schrijven code of + documentatie. Ze hebbben geen toestemming om direct naar de + broncodeboom te committen (code toe te voegen). Om hun code + aan het systeem toe te voegen, moet het herzien en + ingecheckt worden door een geregistreerde ontwikkelaar, + die een committer wordt genoemd. - Committers are developers with write - access to the source tree. In order to become a committer, an - individual must show ability in the area in which he is - active. + Committers zijn ontwikkelaars met + schrijftoegang tot de broncodeboom. Om committer te worden, + moet een individu kennis en kunde laten zien in het gebied + waarin hij actief is. - - It is at the individual committer's discretion whether he should - obtain authority before committing changes to the source tree. In - general, an experienced committer may make changes which are - obviously correct without obtaining consensus. For example, a - documentation project committer may correct typographical or - grammatical errors without review. On the other hand, developers - making far-reaching or complicated changes are expected to submit - their changes for review before committing them. In extreme - cases, a core team member with a function such as Principal - Architect may order that changes be removed from the tree, a - process known as backing out. All committers - receive mail describing each individual commit, so it is not - possible to commit secretly. + Het is aan de discretie van de individuele committer of + hij instemming moet krijgen voordat er veranderingen naar de + broncodeboom worden gecommit. In het algemeen mag een + ervaren committer veranderingen maken waarvan duidelijk is + dat ze correct zijn zonder hiervoor consensus te + verkrijgen. Een committer van het documentatieproject + bijvoorbeeld mag typografische of grammaticale fouten + verbeteren zonder dat deze herzien worden. Van de andere + kant wordt van ontwikkelaars die verreikende of + gecompliceerde veranderingen maken verwacht dat ze hun + veranderingen ter herziening insturen voordat ze deze + committen. In het uiterste geval kan een lid van het + coreteam met een functie als Principal Architect eisen dat + de veranderingen uit de boom verwijderd worden, een proces + dat bekend staat als backing out. + Alle committers ontvangen email die elke individuele commit + beschrijft, het is dus niet mogelijk om heimelijk te + committen. - The Core team. FreeBSD and - NetBSD each have a core team which manages the project. The - core teams developed in the course of the projects, and their role - is not always well-defined. It is not necessary to be a developer - in order to be a core team member, though it is normal. The rules - for the core team vary from one project to the other, but in - general they have more say in the direction of the project than - non-core team members have. + Het Coreteam. &os; en NetBSD + hebben elk een coreteam dat het project beheert. De + coreteams zijn in de loop van de projecten ontstaan, en hun + rol is niet altijd eenduidig gedefinieerd. Het is niet + nodig om ontwikkelaar te zijn om lid te zijn van het + coreteam, hoewel het normaal is. De regels voor het + coreteam verschillen per project, maar in het algemeen + hebben ze een grotere inspraak in de richting van het + project dan niet-leden van het coreteam hebben. - This arrangement differs from Linux in a number of ways: + Deze opstelling verschilt in een aantal opzichten van die + van Linux: - No one person controls the content of the system. In - practice, this difference is overrated, since the Principal Architect - can require that code be backed out, and even in the Linux project - several people are permitted to make changes. + Geen enkel persoon heerst over de inhoud van het + systeem. In de praktijk is dit verschil overdreven, + aangezien de Principal Architect kan eisen dat code + gebacked-out wordt, en zelfs in het Linux-project mogen + meerdere mensen veranderingen maken. - On the other hand, there is a central - repository, a single place where you can find the entire operating - system sources, including all older versions. + Van de andere kant is er een + centraal repository, een enkele plaats waar u de gehele + broncode van het besturingssysteem kunt vinden, inclusief + alle oudere versies. - BSD projects maintain the entire Operating - System, not only the kernel. This distinction is only - marginally useful: neither BSD nor Linux is useful without - applications. The applications used under BSD are frequently the - same as the applications used under Linux. + BSD-projecten beheren het gehele + Besturingssysteem, niet alleen de kernel. + Dit onderscheid is slechts van beperkt nut: noch BSD noch + Linux is nuttig zonder applicaties. De applicaties die + onder BSD gebruikt worden zijn vaak dezelfde als de + applicaties die onder Linux gebruikt worden. - As a result of the formalized maintenance of a single CVS - source tree, BSD development is clear, and it is possible to - access any version of the system by release number or by date. - CVS also allows incremental updates to the system: for example, - the FreeBSD repository is updated about 100 times a day. Most of - these changes are small. + Een gevolg van het formele beheer van een enkele + CVS- broncodeboom is dat de BSD-ontwikkeling helder is, en + dat het mogelijk is om elke versie van het systeem aan de + hand van het uitgavenummer of datum te benaderen. CVS staat + ook incrementele wijzigingen aan het systeem toe: het + repository van &os; bijvoorbeeld wordt ongeveer 100 keer per + dag bijgewerkt. De meeste van deze veranderingen zijn + klein. - BSD releases + BSD-uitgaven - FreeBSD, NetBSD and OpenBSD provide the system in three different - releases. As with Linux, releases are assigned a - number such as 1.4.1 or 3.5. In addition, the version number has a - suffix indicating its purpose: + &os;, NetBSD, en OpenBSD bieden het systeem in drie + verschillende uitgaven aan. Net als bij Linux + worden aan uitgaven nummers zoals 1.4.1 of 3.5 toegekend. Als + aanvulling heeft het versienummer een achtervoegsel die het doel + aangeeft: - The development version of the system is called - CURRENT. FreeBSD assigns a number to - CURRENT, for example FreeBSD 5.0-CURRENT. NetBSD uses a slightly - different naming scheme and appends a single-letter suffix which - indicates changes in the internal interfaces, for example NetBSD - 1.4.3G. OpenBSD does not assign a number ("OpenBSD-current"). - All new development on the system goes into this branch. + De ontwikkelversie van het systeem wordt + CURRENT genoemd. &os; kent een + nummer aan CURRENT toe, bijvoorbeeld &os; 5.0-CURRENT. + NetBSD hanteert een lichtelijk ander schema voor de + naamgeveing en voegt een achtervoegsel van een enkele letter + toe welke veranderingen aan de interne interfaces aangeeft, + bijvoorbeeld NetBSD 1.4.3G. OpenBSD kent geen nummer toe + ("OpenBSD-currnet"). Alle nieuwe ontwikkelingen aan het + systeem komen in deze tak terecht. - At regular intervals, between two and four times a year, the - projects bring out a RELEASE version of the - system, which is available on CD-ROM and for free download from - FTP sites, for example OpenBSD 2.6-RELEASE or NetBSD 1.4-RELEASE. - The RELEASE version is intended for end users and is the normal - version of the system. NetBSD also provides patch - releases with a third digit, for example NetBSD - 1.4.2. + De projecten brengen met regelmatige tussenpozen, tussen + twee en vier keer per jaar, een + RELEASE-versie van het systeem uit, + welke beschikbaar is op CD-ROM en vrij te downloaden is van + FTP-sites, bijvoorbeeld OpenBSD 2.6-RELEASE of NetBSD + 1.4-RELEASE. De RELEASE-versie is bedoeld voor + eindgebruikers en is de normale versie van het systeem. + NetBSD biedt ook patch-uitgaven aan met + een derde cijfer, bijvoorbeeld NetBSD 1.4.2. - As bugs are found in a RELEASE version, they are fixed, and - the fixes are added to the CVS tree. In FreeBSD, the resultant - version is called the STABLE version, while in NetBSD and OpenBSD - it continues to be called the RELEASE version. Smaller new - features can also be added to this branch after a period of test - in the CURRENT branch. + Wanneer er bugs in een RELEASE-versie worden gevonden, + worden ze gemaakt, en worden de reparaties toegevoegd aan de + CVS-boom. In &os; wordt de resulterende versie de + STABLE-versie genoemd, terwijl het in + NetBSD en OpenBSD de RELEASE-versie blijft heten. Kleinere + nieuwe eigenschappen kunnen ook aan deze tak worden + toegevoegd na een testperiode in de CURRENT-tak. - By contrast, Linux maintains two separate code trees: - the stable version and the development version. Stable versions - have an even minor version number, such as 2.0, 2.2 or 2.4. - Development versions have an odd minor version number, such as 2.1, - 2.3 or 2.5. In each case, the number is followed by a further - number designating the exact release. In addition, each vendor adds - their own userland programs and utilities, so the name of the - distribution is also important. Each distribution vendor also - assigns version numbers to the distribution, so a complete - description might be something like TurboLinux 6.0 with kernel - 2.2.14 + In contrast hiermee onderhoudt Linux twee + gescheiden codebomen: de stabiele versie en de + ontwikkelversie. Stabiele versies hebben een even klein + versienummer, zoals 2.0, 2.2, of 2.4. Ontwikkelversies hebben + een oneven klein versienummer, zoals 2.1, 2.3, of 2.5. In + alle gevallen wordt het nummer gevolgd door een nog een nummer + dat de exacte uitgave aangeeft. Verder voegt elke verkoper + zijn eigen gebruikersprogramma's en gereedschappen toe, dus is + de naam van de distributie ook belangrijk. Elke verkoper van + distributies kent ook versienummers aan de distributie toe, + dus kan een volledige omschrijving iets zijn als + TurboLinux 6.0 met kernel 2.2.14 + zijn. What versions of BSD are available? In contrast to the numerous Linux distributions, there are only - four major open source BSDs. Each BSD project maintains its own source + four major open source BSDs. Each BSD project maintains its own source tree and its own kernel. In practice, though, there appear to be fewer divergences between the userland code of the projects than there is in Linux. @@ -601,7 +624,7 @@ - - Linux is available under the - GNU General Public - License (GPL), which is designed to eliminate closed - source software. In particular, any derivative work of a product - released under the GPL must also be supplied with source code if - requested. By contrast, the - BSD - license is less restrictive: binary-only distributions are - allowed. This is particularly attractive for embedded - applications. + Linux is beschikbaar onder de GNU General Public + License (GPL), welke ontwikkeld is om closed-source + software te elimineren. In het bijzonder moet elk afgeleid werk + van een product dat onder de GPL is vrijgegeven ook met de + broncode geleverd worden indien dat gevraagd wordt. In + tegenstelling hiermee is de BSD-licentie + minder beperkend: distributies met alleen binairen zijn + toegestaan. Dit is in het bijzonder aantrekkelijk voor embedded + applicaties. - What else should I know? + Wat moet ik nog meer weten? - Since fewer applications are available for BSD than Linux, the BSD - developers created a Linux compatibility package, which allows Linux - programs to run under BSD. The package includes both kernel - modifications, in order to correctly perform Linux system calls, and - Linux compatibility files such as the C library. There is no - noticeable difference in execution speed between a Linux application - running on a Linux machine and a Linux application running on a BSD - machine of the same speed. + Aangezien er minder applicaties beschikbaar zijn voor BSD + dan voor Linux, hebben de ontwikkelaars van BSD een + Linux-compatibiliteitspakket onttwikkeld, wat het mogelijk maakt + om Linux-programma's onder BSD te draaien. Het pakket bevat + zowel kernelwijzigingen, om Linux-systeemaanroepen correct uit + te voeren, en Linux-compatibiliteitsbestanden zoals de + C-bibliotheek. Er is geen merkbaar verschil in uitvoersnelheid + tussen een Linux-applicatie die op een Linux-machine draait en + een Linux-applicatie die op een BSD-machine die dezelfde + snelheid heeft draait. - The all from one supplier nature of BSD means that - upgrades are much easier to handle than is frequently the case with - Linux. BSD handles library version upgrades by providing - compatibility modules for earlier library versions, so it is possible - to run binaries which are several years old with no problems. + De alles van één + leverancier-natuur van BSD dat upgrades veel + makkelijker af te handelen zijn dan dat vaak met Linux het geval + is. BSD handelt upgrades aan bibliotheekversies af door + compatibiliteitsmodulen voor eerdere bibliotheekversies aan te + bieden, dus is het mogelijk om binairen die enige jaren oud zijn + zonder problemen te draaien. - Which should I use, BSD or Linux? + Wat zou ik moeten gebruiken, BSD of Linux? - What does this all mean in practice? Who should use BSD, who - should use Linux? + Wat betekent dit allemaal in de praktijk? Wie zou BSD + moeten gebruiken, en wie Linux? - This is a very difficult question to answer. Here are some - guidelines: + Dit is een erg moeilijke vraag om te beantwoorden. Hier + zijn wat richtlijnen: - If it ain't broke, don't fix it: If you already - use an open source operating system, and you are happy with it, - there is probably no good reason to change. + If it ain't broke, don't fix it: als u al + een open-source besturingssysteem gebruikt, en u er tevreden + mee bent, dan is er waarschijnlijk geen goede reden om over + te schakelen. - BSD systems, in particular FreeBSD, can have notably higher - performance than Linux. But this is not across the board. In many - cases, there is little or no difference in performance. In some - cases, Linux may perform better than FreeBSD. + BSD-systemen, in het bijzonder &os;, kunnen merkbaar + beter presteren dan Linux. Maar dit geldt niet voor alles. + In veel gevallen zijn er weinig of geen + prestatieverschillen. In sommige gevallen kan Linux beter + presteren dan &os;. - In general, BSD systems have a better reputation for - reliability, mainly as a result of the more mature code - base. + In het algemeen hebben BSD-systemen een betere naam qua + betrouwbaarheid, voornamelijk als het resultaat van een + volwassenere codebase. - BSD projects have a better reputation for the quality and - completeness of their documentation. The various documentation - projects aim to provide actively updated documentation, in many - languages, and covering all aspects of the system. + BSD-projecten hebben een betere naam qua kwaliteit en + volledigheid van hun documentatie. De verschillende + documentatieprojecten richten zich op het bieden van actief + bijgewerkte documentatie, in vele talen, en op het + behandelen van alle aspecten van het systeem. - The BSD license may be more attractive than the GPL. + De BSD-licentie kan aantrekkelijker zijn dan de GPL. - BSD can execute most Linux binaries, while Linux can not execute BSD - binaries. Many BSD implementations can also execute binaries - from other &unix; like systems. As a result, BSD may present an - easier migration route from other systems than - Linux would. + BSD kan de meeste Linux-binairen uitvoeren, terwijl + Linux geen BSD-binairen kan uitvoeren. Vele implementaties + van BSD kunnen ook binairen van andere &unix;-achtige + systemen uitvoeren. Als gevolg kan BSD een eenvoudigere + migratieroute zijn van andere systemen dan dat Linux zou + zijn. - Who provides support, service, and training for BSD? + Wie biedt ondersteuning, diensten, en training voor BSD + aan? - BSDi / FreeBSD - Mall, Inc. have been providing support contracts for - FreeBSD for nearly a decade. + BSDi / &os; Mall, + Inc. bieden sinds bijna een decennium + ondersteuningscontracten aan voor &os;. - In addition, each of the projects has a list of consultants for - hire: - FreeBSD, + Verder heeft elk project een lijst van huurbare consultants: + &os;, NetBSD, - and OpenBSD. + en OpenBSD. From owner-p4-projects@FreeBSD.ORG Mon Oct 27 22:59:49 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6D9BE10656A1; Mon, 27 Oct 2008 22:59:49 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 1871D1065684 for ; Mon, 27 Oct 2008 22:59:49 +0000 (UTC) (envelope-from peter-gmail@wemm.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 049AC8FC0C for ; Mon, 27 Oct 2008 22:59:49 +0000 (UTC) (envelope-from peter-gmail@wemm.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id m9RMxmHX086573 for ; Mon, 27 Oct 2008 22:59:48 GMT (envelope-from peter-gmail@wemm.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m9RMxmxJ086571 for perforce@freebsd.org; Mon, 27 Oct 2008 22:59:48 GMT (envelope-from peter-gmail@wemm.org) Date: Mon, 27 Oct 2008 22:59:48 GMT Message-Id: <200810272259.m9RMxmxJ086571@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter-gmail@wemm.org using -f From: Peter Wemm To: Perforce Change Reviews Cc: Subject: PERFORCE change 152065 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, 27 Oct 2008 22:59:49 -0000 http://perforce.freebsd.org/chv.cgi?CH=152065 Change 152065 by peter@peter_overcee on 2008/10/27 22:59:25 Initial update to get this to compile/link in amd64 on 8.x Affected files ... .. //depot/projects/valgrind/Makefile.am#6 edit .. //depot/projects/valgrind/coregrind/m_aspacemgr/aspacemgr-freebsd.c#6 edit .. //depot/projects/valgrind/coregrind/m_debuginfo/debuginfo.c#5 edit .. //depot/projects/valgrind/coregrind/m_machine.c#5 edit .. //depot/projects/valgrind/coregrind/m_sigframe/sigframe-amd64-freebsd.c#2 edit .. //depot/projects/valgrind/coregrind/m_syswrap/syscall-amd64-freebsd.S#2 edit .. //depot/projects/valgrind/coregrind/m_syswrap/syswrap-amd64-freebsd.c#3 edit .. //depot/projects/valgrind/include/vki/vki-amd64-freebsd.h#2 edit Differences ... ==== //depot/projects/valgrind/Makefile.am#6 (text+ko) ==== @@ -221,9 +221,9 @@ valt_load_address_amd64_freebsd.lds: Makefile $(CC) -m64 -Wl,--verbose -nostdlib 2>&1 | sed \ - -e '1,/^=====+$$/d' \ - -e '/^=====+$$/d' \ - -e '/\. = 0x[0-9A-Fa-f]+ \+ SIZEOF_HEADERS/s/0x[0-9A-Fa-f]+/valt_load_address/g' > $@ \ + -e '1,/^=====\+$$/d' \ + -e '/^=====\+$$/d' \ + -e '/\. = 0x[0-9A-Fa-f]\+ + SIZEOF_HEADERS/s/0x[0-9A-Fa-f]\+/valt_load_address/g' > $@ \ || rm -f $@ valt_load_address_x86_linux.lds: Makefile ==== //depot/projects/valgrind/coregrind/m_aspacemgr/aspacemgr-freebsd.c#6 (text+ko) ==== @@ -358,7 +358,7 @@ Int i; /* Callback function for parsing map */ - static void get_name_for_addr_callback(Addr addr, SizeT len, UInt prot, + void get_name_for_addr_callback(Addr addr, SizeT len, UInt prot, ULong dev, ULong ino, ULong offset, const UChar* filename ) { ==== //depot/projects/valgrind/coregrind/m_debuginfo/debuginfo.c#5 (text+ko) ==== @@ -647,7 +647,7 @@ # if defined(VGP_x86_linux) || defined(VGP_x86_freebsd) is_rx_map = seg->hasR && seg->hasX; is_rw_map = seg->hasR && seg->hasW; -# elif defined(VGP_amd64_linux) \ +# elif defined(VGP_amd64_linux) || defined(VGP_amd64_freebsd) \ || defined(VGP_ppc32_linux) || defined(VGP_ppc64_linux) is_rx_map = seg->hasR && seg->hasX && !seg->hasW; is_rw_map = seg->hasR && seg->hasW && !seg->hasX; ==== //depot/projects/valgrind/coregrind/m_machine.c#5 (text+ko) ==== @@ -104,6 +104,10 @@ VG_(threads)[tid].arch.vex_shadow1.guest_EAX = s1res; VG_(threads)[tid].arch.vex_shadow2.guest_EAX = s2res; /* QQQ: this is very incomplete. EDX and EFL are affected */ +# elif defined(VGP_amd64_freebsd) + VG_(threads)[tid].arch.vex_shadow1.guest_RAX = s1res; + VG_(threads)[tid].arch.vex_shadow2.guest_RAX = s2res; + /* QQQ: this is very incomplete. EDX and EFL are affected */ # else # error "Unknown plat" # endif ==== //depot/projects/valgrind/coregrind/m_sigframe/sigframe-amd64-freebsd.c#2 (text+ko) ==== @@ -30,6 +30,7 @@ */ #include "pub_core_basics.h" +#include "pub_core_vki.h" #include "pub_core_threadstate.h" #include "pub_core_aspacemgr.h" #include "pub_core_libcbase.h" @@ -37,10 +38,10 @@ #include "pub_core_libcprint.h" #include "pub_core_machine.h" #include "pub_core_options.h" -#include "pub_core_sigframe.h" #include "pub_core_signals.h" #include "pub_core_tooliface.h" #include "pub_core_trampoline.h" +#include "pub_core_sigframe.h" /* self */ /* This module creates and removes signal frames for signal deliveries @@ -93,7 +94,8 @@ /* XXX This is wrong. Surely we should store the shadow values into the shadow memory behind the actual values? */ - VexGuestAMD64State vex_shadow; + VexGuestAMD64State vex_shadow1; + VexGuestAMD64State vex_shadow2; /* HACK ALERT */ VexGuestAMD64State vex; @@ -382,7 +384,7 @@ static Bool extend ( ThreadState *tst, Addr addr, SizeT size ) { ThreadId tid = tst->tid; - NSegment *stackseg = NULL; + const NSegment *stackseg = NULL; if (VG_(extend_stack)(addr, tst->client_stack_szB)) { stackseg = VG_(am_find_nsegment)(addr); @@ -413,7 +415,7 @@ /* For tracking memory events, indicate the entire frame has been allocated. */ VG_TRACK( new_mem_stack_signal, addr - VG_STACK_REDZONE_SZB, - size + VG_STACK_REDZONE_SZB ); + size + VG_STACK_REDZONE_SZB, tid ); return True; } @@ -429,7 +431,8 @@ { frame->sigNo_private = sigNo; frame->magicPI = 0x31415927; - frame->vex_shadow = tst->arch.vex_shadow; + frame->vex_shadow1 = tst->arch.vex_shadow1; + frame->vex_shadow2 = tst->arch.vex_shadow2; /* HACK ALERT */ frame->vex = tst->arch.vex; /* end HACK ALERT */ @@ -492,6 +495,7 @@ void VG_(sigframe_create)( ThreadId tid, Addr rsp_top_of_frame, const vki_siginfo_t *siginfo, + const struct vki_ucontext *uc, void *handler, UInt flags, const vki_sigset_t *mask, @@ -547,7 +551,8 @@ } tst->sig_mask = frame->mask; tst->tmp_sig_mask = frame->mask; - tst->arch.vex_shadow = frame->vex_shadow; + tst->arch.vex_shadow1 = frame->vex_shadow1; + tst->arch.vex_shadow2 = frame->vex_shadow2; /* HACK ALERT */ tst->arch.vex = frame->vex; /* end HACK ALERT */ ==== //depot/projects/valgrind/coregrind/m_syswrap/syscall-amd64-freebsd.S#2 (text+ko) ==== @@ -29,7 +29,7 @@ */ #include "pub_core_basics_asm.h" -#include "vki_unistd.h" +#include "pub_core_vkiscnums.h" #include "libvex_guest_offsets.h" ==== //depot/projects/valgrind/coregrind/m_syswrap/syswrap-amd64-freebsd.c#3 (text+ko) ==== @@ -34,6 +34,8 @@ */ #include "pub_core_basics.h" +#include "pub_core_vki.h" +#include "pub_core_vkiscnums.h" #include "pub_core_threadstate.h" #include "pub_core_debuginfo.h" // VG_(di_notify_mmap) #include "pub_core_aspacemgr.h" @@ -43,6 +45,7 @@ #include "pub_core_libcprint.h" #include "pub_core_libcproc.h" #include "pub_core_libcsignal.h" +#include "pub_core_machine.h" #include "pub_core_mallocfree.h" #include "pub_core_options.h" #include "pub_core_scheduler.h" @@ -51,14 +54,13 @@ #include "pub_core_syscall.h" #include "pub_core_syswrap.h" #include "pub_core_tooliface.h" +#include "pub_core_stacks.h" // VG_(register_stack) #include "priv_types_n_macros.h" #include "priv_syswrap-generic.h" /* for decls of generic wrappers */ #include "priv_syswrap-freebsd.h" /* for decls of freebsd-ish wrappers */ #include "priv_syswrap-main.h" -#include "vki_unistd.h" /* for the __NR_* constants */ - /* Simulate C-style return values for pipe(2). This does not belong here at all, it should be in m_libcfile.c. */ @@ -217,7 +219,7 @@ { SysRes r; - PRINT("sys_mmap ( %p, %lu, %d, %d, %d, pad%d, 0x%lx)", + PRINT("sys_mmap ( %#lx, %lu, %ld, %ld, %ld, pad%ld, 0x%lx)", ARG1, (UWord)ARG2, ARG3, ARG4, ARG5, ARG6, ARG7 ); PRE_REG_READ7(long, "mmap", char *, addr, unsigned long, len, int, prot, int, flags, @@ -232,7 +234,7 @@ { SysRes r; - PRINT("sys_mmap ( %p, %lu, %d, %d, %d, 0x%lx)", + PRINT("sys_mmap ( %#lx, %lu, %ld, %ld, %ld, 0x%lx)", ARG1, (UWord)ARG2, ARG3, ARG4, ARG5, ARG6 ); PRE_REG_READ6(long, "mmap", char *, addr, unsigned long, len, int, prot, int, flags, @@ -244,7 +246,7 @@ PRE(sys_lseek) { - PRINT("sys_lseek ( %d, 0x%x, %p, %d )", ARG1,ARG3,ARG4); + PRINT("sys_lseek ( %ld, 0x%lx, %#lx, %ld )", ARG1,ARG2,ARG3,ARG4); PRE_REG_READ4(long, "lseek", unsigned int, fd, int, pad, unsigned long, offset, unsigned int, whence); @@ -252,7 +254,7 @@ PRE(sys_lseek7) { - PRINT("sys_lseek ( %d, 0x%lx, %d )", ARG1,ARG2,ARG3); + PRINT("sys_lseek ( %ld, 0x%lx, %ld )", ARG1,ARG2,ARG3); PRE_REG_READ3(long, "lseek", unsigned int, fd, unsigned long, offset, unsigned int, whence); @@ -261,7 +263,7 @@ PRE(sys_pread) { *flags |= SfMayBlock; - PRINT("sys_read ( %d, %p, %lu, %lu, %lu )", ARG1, ARG2, ARG3, ARG5); + PRINT("sys_read ( %ld, %#lx, %lu, %lu, %lu )", ARG1, ARG2, ARG3, ARG4, ARG5); PRE_REG_READ5(ssize_t, "read", unsigned int, fd, char *, buf, vki_size_t, count, int, pad, unsigned long, off); @@ -281,7 +283,7 @@ PRE(sys_pread7) { *flags |= SfMayBlock; - PRINT("sys_read ( %d, %p, %lu, %lu, %lu )", ARG1, ARG2, ARG3, ARG4); + PRINT("sys_read ( %ld, %#lx, %lu, %lu )", ARG1, ARG2, ARG3, ARG4); PRE_REG_READ4(ssize_t, "read", unsigned int, fd, char *, buf, vki_size_t, count, unsigned long, off); @@ -302,7 +304,7 @@ { Bool ok; *flags |= SfMayBlock; - PRINT("sys_write ( %d, %p, %lu, %lu, %lu )", ARG1, ARG2, ARG3, ARG5); + PRINT("sys_write ( %ld, %#lx, %lu, %lu, %lu )", ARG1, ARG2, ARG3, ARG4, ARG5); PRE_REG_READ5(ssize_t, "write", unsigned int, fd, const char *, buf, vki_size_t, count, int, pad, unsigned long, off); @@ -322,7 +324,7 @@ { Bool ok; *flags |= SfMayBlock; - PRINT("sys_write ( %d, %p, %lu, %lu )", ARG1, ARG2, ARG3, ARG4); + PRINT("sys_write ( %ld, %#lx, %lu, %lu )", ARG1, ARG2, ARG3, ARG4); PRE_REG_READ4(ssize_t, "write", unsigned int, fd, const char *, buf, vki_size_t, count, unsigned long, off); @@ -341,7 +343,7 @@ PRE(sys_ftruncate) { *flags |= SfMayBlock; - PRINT("sys_ftruncate ( %d, %lu )", ARG1,ARG3); + PRINT("sys_ftruncate ( %ld, %lu )", ARG1,ARG3); PRE_REG_READ3(long, "ftruncate", unsigned int, fd, int, pad, unsigned int, length); } @@ -349,7 +351,7 @@ PRE(sys_ftruncate7) { *flags |= SfMayBlock; - PRINT("sys_ftruncate ( %d, %lu )", ARG1,ARG2); + PRINT("sys_ftruncate ( %ld, %lu )", ARG1,ARG2); PRE_REG_READ2(long, "ftruncate", unsigned int, fd, unsigned long, length); } @@ -357,7 +359,7 @@ PRE(sys_truncate) { *flags |= SfMayBlock; - PRINT("sys_truncate ( %p(%s), %lu )", ARG1,ARG1,ARG3); + PRINT("sys_truncate ( %#lx(%s), %lu )", ARG1,(char *)ARG1,ARG3); PRE_REG_READ3(long, "truncate", const char *, path, int, pad, unsigned int, length); PRE_MEM_RASCIIZ( "truncate(path)", ARG1 ); @@ -366,12 +368,49 @@ PRE(sys_truncate7) { *flags |= SfMayBlock; - PRINT("sys_truncate ( %p(%s), %lu )", ARG1,ARG1,ARG2); + PRINT("sys_truncate ( %#lx(%s), %lu )", ARG1,(char *)ARG1,ARG2); PRE_REG_READ2(long, "truncate", const char *, path, unsigned long, length); PRE_MEM_RASCIIZ( "truncate(path)", ARG1 ); } +PRE(sys_sysarch) +{ + ThreadState *tst; + void **p; + + PRINT("sys_sysarch ( %ld, %#lx )", ARG1, ARG2); + PRE_REG_READ2(int, "sysarch", + int, number, void *, args); + switch (ARG1) { + case VKI_AMD64_SET_FSBASE: + PRINT("sys_amd64_set_fsbase ( %#lx )", ARG2); + PRE_REG_READ1(long, "amd64_set_fsbase", void *, base) + + /* On FreeBSD, the syscall loads the %gs selector for us, so do it now. */ + tst = VG_(get_ThreadState)(tid); + p = (void**)ARG2; + tst->arch.vex.guest_FS_ZERO = *p; + /* "do" the syscall ourselves; the kernel never sees it */ + SET_STATUS_Success2(*p, tst->arch.vex.guest_RDX ); + + break; + case VKI_AMD64_GET_FSBASE: + PRINT("sys_amd64_get_fsbase ( %#lx )", ARG2); + PRE_REG_READ1(int, "amd64_get_fsbase", void *, basep) + PRE_MEM_WRITE( "amd64_get_fsbase(basep)", ARG2, sizeof(void *) ); + + /* "do" the syscall ourselves; the kernel never sees it */ + SET_STATUS_Success2( tst->arch.vex.guest_FS_ZERO, tst->arch.vex.guest_RDX ); + POST_MEM_WRITE( ARG2, sizeof(void *) ); + break; + default: + VG_(message) (Vg_UserMsg, "unhandled sysarch cmd %ld", ARG1); + VG_(unimplemented) ("unhandled sysarch cmd"); + break; + } +} + #undef PRE #undef POST ==== //depot/projects/valgrind/include/vki/vki-amd64-freebsd.h#2 (text+ko) ==== @@ -42,6 +42,8 @@ /* PAGE_SHIFT determines the page size */ #define VKI_PAGE_SHIFT 12 #define VKI_PAGE_SIZE (1UL << VKI_PAGE_SHIFT) +#define VKI_MAX_PAGE_SHIFT VKI_PAGE_SHIFT +#define VKI_MAX_PAGE_SIZE VKI_PAGE_SIZE //---------------------------------------------------------------------- // From sys/signal.h @@ -135,43 +137,18 @@ // From linux-2.6.8.1/include/asm-i386/sigcontext.h //---------------------------------------------------------------------- -/* QQQ not right */ -struct _vki_fpreg { - unsigned short significand[4]; - unsigned short exponent; -}; - -/* QQQ not right */ -struct _vki_fpxreg { - unsigned short significand[4]; - unsigned short exponent; - unsigned short padding[3]; -}; - -struct _vki_xmmreg { - unsigned long element[4]; -}; - struct _vki_fpstate { - /* Regular FPU environment */ - unsigned long cw; - unsigned long sw; - unsigned long tag; - unsigned long ipoff; - unsigned long cssel; - unsigned long dataoff; - unsigned long datasel; - struct _vki_fpreg _st[8]; - unsigned short status; - unsigned short magic; /* 0xffff = regular FPU data only */ - - /* FXSR FPU environment */ - unsigned long _fxsr_env[6]; /* FXSR FPU env is ignored */ - unsigned long mxcsr; - unsigned long reserved; - struct _vki_fpxreg _fxsr_st[8]; /* FXSR FPU reg data is ignored */ - struct _vki_xmmreg _xmm[8]; - unsigned long padding[56]; + unsigned short cwd; + unsigned short swd; + unsigned short twd; + unsigned short fop; + unsigned long rip; + unsigned long rdp; + unsigned int mxcsr; + unsigned int mxcsr_mask; + unsigned int st_space[32]; /* 8*16 bytes for each FP-reg */ + unsigned int xmm_space[64]; /* 16*16 bytes for each XMM-reg */ + unsigned int reserved2[24]; }; struct vki_sigcontext { @@ -208,38 +185,23 @@ long spare2[8]; }; -#if 0 //---------------------------------------------------------------------- // From linux-2.6.8.1/include/asm-i386/user.h //---------------------------------------------------------------------- struct vki_user_i387_struct { - long cwd; - long swd; - long twd; - long fip; - long fcs; - long foo; - long fos; - long st_space[20]; /* 8*10 bytes for each FP-reg = 80 bytes */ -}; - -struct vki_user_fxsr_struct { unsigned short cwd; unsigned short swd; unsigned short twd; unsigned short fop; - long fip; - long fcs; - long foo; - long fos; - long mxcsr; - long reserved; - long st_space[32]; /* 8*16 bytes for each FP-reg = 128 bytes */ - long xmm_space[32]; /* 8*16 bytes for each XMM-reg = 128 bytes */ - long padding[56]; + unsigned long fip; + unsigned long fdp; + unsigned int mxcsr; + unsigned int mxcsr_mask; + unsigned int st_space[32]; /* 8*16 bytes for each FP-reg = 128 bytes */ + unsigned int xmm_space[64]; /* 16*16 bytes for each XMM-reg = 128 bytes */ + unsigned int padding[24]; }; -#endif /* AAA check that this linux layout is appropriate */ @@ -252,7 +214,6 @@ unsigned long ds,es,fs,gs; }; -#if 0 //---------------------------------------------------------------------- // From linux-2.6.8.1/include/asm-i386/elf.h //---------------------------------------------------------------------- @@ -263,10 +224,8 @@ typedef vki_elf_greg_t vki_elf_gregset_t[VKI_ELF_NGREG]; typedef struct vki_user_i387_struct vki_elf_fpregset_t; -typedef struct vki_user_fxsr_struct vki_elf_fpxregset_t; #define VKI_AT_SYSINFO 32 -#endif //---------------------------------------------------------------------- // From linux-2.6.8.1/include/asm-i386/ucontext.h @@ -323,39 +282,6 @@ int __spare__[4]; }; -#if 0 - -//---------------------------------------------------------------------- -// From linux-2.6.8.1/include/asm-i386/ldt.h -//---------------------------------------------------------------------- - -/* [[Nb: This is the structure passed to the modify_ldt syscall. Just so as - to confuse and annoy everyone, this is _not_ the same as an - VgLdtEntry and has to be translated into such. The logic for doing - so, in vg_ldt.c, is copied from the kernel sources.]] */ -struct vki_user_desc { - unsigned int entry_number; - unsigned long base_addr; - unsigned int limit; - unsigned int seg_32bit:1; - unsigned int contents:2; - unsigned int read_exec_only:1; - unsigned int limit_in_pages:1; - unsigned int seg_not_present:1; - unsigned int useable:1; - // [[Nb: this field is not in the kernel sources, but it has always - // been in the Valgrind sources so I will keep it there in case it's - // important... this is an x86-defined data structure so who - // knows; maybe it's important to set this field to zero at some - // point. --njn]] - unsigned int reserved:25; -}; - -// [[Nb: for our convenience within Valgrind, use a more specific name]] -typedef struct vki_user_desc vki_modify_ldt_t; - -#endif - //---------------------------------------------------------------------- // And that's it! //---------------------------------------------------------------------- From owner-p4-projects@FreeBSD.ORG Mon Oct 27 23:25:15 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7415F1065699; Mon, 27 Oct 2008 23:25:15 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 37520106567C for ; Mon, 27 Oct 2008 23:25:15 +0000 (UTC) (envelope-from peter-gmail@wemm.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 2532F8FC08 for ; Mon, 27 Oct 2008 23:25:15 +0000 (UTC) (envelope-from peter-gmail@wemm.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id m9RNPFqb089689 for ; Mon, 27 Oct 2008 23:25:15 GMT (envelope-from peter-gmail@wemm.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m9RNPFLk089687 for perforce@freebsd.org; Mon, 27 Oct 2008 23:25:15 GMT (envelope-from peter-gmail@wemm.org) Date: Mon, 27 Oct 2008 23:25:15 GMT Message-Id: <200810272325.m9RNPFLk089687@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter-gmail@wemm.org using -f From: Peter Wemm To: Perforce Change Reviews Cc: Subject: PERFORCE change 152067 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, 27 Oct 2008 23:25:15 -0000 http://perforce.freebsd.org/chv.cgi?CH=152067 Change 152067 by peter@peter_overcee on 2008/10/27 23:25:11 Sigh. That serves me right for trying to be too smart. gcc tries to execute this nested function on the stack and valgrind has done funky things with signal handlers at this point that causes recursion. Affected files ... .. //depot/projects/valgrind/coregrind/m_aspacemgr/aspacemgr-freebsd.c#7 edit Differences ... ==== //depot/projects/valgrind/coregrind/m_aspacemgr/aspacemgr-freebsd.c#7 (text+ko) ==== @@ -352,24 +352,33 @@ /* Given a memory address, attempt to deduce its filename. To do this, we use /proc/curproc/map. If this fails, return false. */ +static Addr search_addr; +static HChar *search_buf; +static Int search_nbuf; + +/* Callback function for parsing map */ +static void get_name_for_addr_callback(Addr addr, SizeT len, UInt prot, + ULong dev, ULong ino, ULong offset, + const UChar* filename ) +{ + if (search_buf[0] == '/') + return; + if (search_addr < addr) + return; + if (search_addr > (addr + len - 1)) + return; + VG_(strncpy)( search_buf, filename, search_nbuf - 1); +} + static -Bool get_name_for_addr ( Addr search_addr, HChar* buf, Int nbuf ) +Bool get_name_for_addr ( Addr addr, HChar* buf, Int nbuf ) { Int i; - /* Callback function for parsing map */ - void get_name_for_addr_callback(Addr addr, SizeT len, UInt prot, - ULong dev, ULong ino, ULong offset, - const UChar* filename ) - { - if (search_addr < addr) - return; - if (search_addr > (addr + len - 1)) - return; - VG_(strncpy)( buf, filename, nbuf - 1); - } - for (i = 0; i < nbuf; i++) buf[i] = 0; + search_addr = addr; + search_buf = buf; + search_nbuf = nbuf; parse_procselfmaps( get_name_for_addr_callback, 0); if (buf[0] == '/') return True; From owner-p4-projects@FreeBSD.ORG Tue Oct 28 00:09:00 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 08F4D106569C; Tue, 28 Oct 2008 00:09:00 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id C07F81065681 for ; Tue, 28 Oct 2008 00:08:59 +0000 (UTC) (envelope-from peter-gmail@wemm.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id AE8008FC13 for ; Tue, 28 Oct 2008 00:08:59 +0000 (UTC) (envelope-from peter-gmail@wemm.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id m9S08xO1094134 for ; Tue, 28 Oct 2008 00:08:59 GMT (envelope-from peter-gmail@wemm.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m9S08xch094132 for perforce@freebsd.org; Tue, 28 Oct 2008 00:08:59 GMT (envelope-from peter-gmail@wemm.org) Date: Tue, 28 Oct 2008 00:08:59 GMT Message-Id: <200810280008.m9S08xch094132@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter-gmail@wemm.org using -f From: Peter Wemm To: Perforce Change Reviews Cc: Subject: PERFORCE change 152068 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, 28 Oct 2008 00:09:00 -0000 http://perforce.freebsd.org/chv.cgi?CH=152068 Change 152068 by peter@peter_overcee on 2008/10/28 00:08:49 Convert pipe wrapper back to C, using res/res2 Affected files ... .. //depot/projects/valgrind/coregrind/m_libcfile.c#7 edit .. //depot/projects/valgrind/coregrind/m_syswrap/syswrap-amd64-freebsd.c#4 edit .. //depot/projects/valgrind/coregrind/m_syswrap/syswrap-x86-freebsd.c#9 edit Differences ... ==== //depot/projects/valgrind/coregrind/m_libcfile.c#7 (text+ko) ==== @@ -155,13 +155,20 @@ return ret; } -#if !defined(VGO_freebsd) Int VG_(pipe) ( Int fd[2] ) { - SysRes res = VG_(do_syscall1)(__NR_pipe, (UWord)fd); + SysRes res; +#if defined(VGO_freebsd) + res = VG_(do_syscall0)(__NR_pipe); + if (!res.isError) { + fd[0] = res.res; + fd[1] = res.res2; + } +#else + res = VG_(do_syscall1)(__NR_pipe, (UWord)fd); +#endif return res.isError ? -1 : 0; } -#endif OffT VG_(lseek) ( Int fd, OffT offset, Int whence ) { ==== //depot/projects/valgrind/coregrind/m_syswrap/syswrap-amd64-freebsd.c#4 (text+ko) ==== @@ -61,27 +61,6 @@ #include "priv_syswrap-freebsd.h" /* for decls of freebsd-ish wrappers */ #include "priv_syswrap-main.h" -/* Simulate C-style return values for pipe(2). This does not belong - here at all, it should be in m_libcfile.c. -*/ -// AAA: fix this wrapper. has to preserve C-style arg1 pointer. -asm( -".text\n" -".globl vgPlain_pipe\n" -"vgPlain_pipe:\n" -" mov $42,%eax\n" /* SYS_pipe */ -" syscall\n" -" jb 1f\n" -" movq 8(%rsp),%rcx\n" -" movq %rax,(%rcx)\n" -" movq %rdx,8(%rcx)\n" -" movl $0,%eax\n" -" ret\n" -"1: negl %eax\n" -" ret\n" -); - - /* --------------------------------------------------------------------- clone() handling ------------------------------------------------------------------ */ ==== //depot/projects/valgrind/coregrind/m_syswrap/syswrap-x86-freebsd.c#9 (text+ko) ==== @@ -60,26 +60,6 @@ #include "priv_syswrap-freebsd.h" /* for decls of linux-ish wrappers */ #include "priv_syswrap-main.h" -/* Simulate C-style return values for pipe(2). This does not belong - here at all, it should be in m_libcfile.c. -*/ -asm( -".text\n" -".globl vgPlain_pipe\n" -"vgPlain_pipe:\n" -" mov $42,%eax\n" /* SYS_pipe */ -" int $0x80\n" -" jb 1f\n" -" movl 4(%esp),%ecx\n" -" movl %eax,(%ecx)\n" -" movl %edx,4(%ecx)\n" -" movl $0,%eax\n" -" ret\n" -"1: negl %eax\n" -" ret\n" -); - - /* --------------------------------------------------------------------- clone() handling ------------------------------------------------------------------ */ From owner-p4-projects@FreeBSD.ORG Tue Oct 28 00:12:03 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3EB1A1065676; Tue, 28 Oct 2008 00:12:03 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 02C831065670 for ; Tue, 28 Oct 2008 00:12:03 +0000 (UTC) (envelope-from peter-gmail@wemm.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id E50188FC19 for ; Tue, 28 Oct 2008 00:12:02 +0000 (UTC) (envelope-from peter-gmail@wemm.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id m9S0C29O094473 for ; Tue, 28 Oct 2008 00:12:02 GMT (envelope-from peter-gmail@wemm.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m9S0C2O1094471 for perforce@freebsd.org; Tue, 28 Oct 2008 00:12:02 GMT (envelope-from peter-gmail@wemm.org) Date: Tue, 28 Oct 2008 00:12:02 GMT Message-Id: <200810280012.m9S0C2O1094471@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter-gmail@wemm.org using -f From: Peter Wemm To: Perforce Change Reviews Cc: Subject: PERFORCE change 152069 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, 28 Oct 2008 00:12:03 -0000 http://perforce.freebsd.org/chv.cgi?CH=152069 Change 152069 by peter@peter_overcee on 2008/10/28 00:11:34 Make this almost run. Throws a fault while firing up ld-elf, but at least gets somewhere. Affected files ... .. //depot/projects/valgrind/coregrind/m_syscall.c#6 edit Differences ... ==== //depot/projects/valgrind/coregrind/m_syscall.c#6 (text+ko) ==== @@ -160,11 +160,12 @@ if (res.isError) { res.err = val; res.res = 0; + res.res2 = 0; } else { res.err = 0; res.res = val; + res.res2 = val2; } - res.res2 = val2; return res; } #else @@ -320,24 +321,37 @@ */ // AAA: fix 7th arg! extern UWord do_syscall_WRK ( - UWord syscall_no, - UWord a1, UWord a2, UWord a3, - UWord a4, UWord a5, UWord a6, - UWord a7, UWord a8, UInt *flags, UWord rv2 + UWord syscall_no, /* %rdi */ + UWord a1, /* %rsi */ + UWord a2, /* %rdx */ + UWord a3, /* %rcx */ + UWord a4, /* %r8 */ + UWord a5, /* %r9 */ + UWord a6, /* 8(%rsp) */ + UWord a7, /* 16(%rsp) */ + UWord a8, /* 24(%rsp) */ + UInt *flags, /* 32(%rsp) */ + UWord *rv2 /* 40(%rsp) */ ); asm( ".text\n" "do_syscall_WRK:\n" /* Convert function calling convention --> syscall calling convention */ -" movq %rdi, %rax\n" -" movq %rsi, %rdi\n" -" movq %rdx, %rsi\n" -" movq %rcx, %rdx\n" -" movq %r8, %r10\n" -" movq %r9, %r8\n" -" movq 8(%rsp), %r9\n" /* last arg from stack */ +" movq %rdi, %rax\n" /* syscall_no */ +" movq %rsi, %rdi\n" /* a1 */ +" movq %rdx, %rsi\n" /* a2 */ +" movq %rcx, %rdx\n" /* a3 */ +" movq %r8, %r10\n" /* a4 */ +" movq %r9, %r8\n" /* a5 */ +" movq 8(%rsp), %r9\n" /* a6 last arg from stack */ " syscall\n" +" jb 1f\n" +" movq 40(%rsp),%rsi\n" +" movq %rdx, (%rsi)\n" +" ret\n" +"1: movq 32(%rsp), %rsi\n" +" movl $1,(%rsi)\n" " ret\n" ".previous\n" ); @@ -578,10 +592,9 @@ ULong val = do_syscall_WRK(sysno,a1,a2,a3,a4,a5,a6,a7,a8,&flags,rv2); return VG_(mk_SysRes_x86_freebsd)( (UInt)val, (UInt)(val>>32), flags ); #elif defined(VGP_amd64_freebsd) - // AAA: collect second return value!! this calling convention doesn't work - // AAA: cheat for now and return old rv2 value - ULong val = do_syscall_WRK(sysno,a1,a2,a3,a4,a5,a6,a7,a8,&flags,rv2); - return VG_(mk_SysRes_amd64_freebsd)( (ULong)val, rv2, flags ); + ULong val2 = -10; + ULong val = do_syscall_WRK(sysno,a1,a2,a3,a4,a5,a6,a7,a8,&flags,&val2); + return VG_(mk_SysRes_amd64_freebsd)( val, val2, flags ); #else # error Unknown platform #endif From owner-p4-projects@FreeBSD.ORG Tue Oct 28 03:34:29 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 76FE31065676; Tue, 28 Oct 2008 03:34:29 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 3ABCE1065672 for ; Tue, 28 Oct 2008 03:34:29 +0000 (UTC) (envelope-from gonzo@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 066538FC1C for ; Tue, 28 Oct 2008 03:34:29 +0000 (UTC) (envelope-from gonzo@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id m9S3YS4a029819 for ; Tue, 28 Oct 2008 03:34:28 GMT (envelope-from gonzo@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m9S3YSeB029817 for perforce@freebsd.org; Tue, 28 Oct 2008 03:34:28 GMT (envelope-from gonzo@FreeBSD.org) Date: Tue, 28 Oct 2008 03:34:28 GMT Message-Id: <200810280334.m9S3YSeB029817@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 152071 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, 28 Oct 2008 03:34:29 -0000 http://perforce.freebsd.org/chv.cgi?CH=152071 Change 152071 by gonzo@gonzo_jeeves on 2008/10/28 03:34:23 There is no reason to print version manually SYSINIT will do it for us Affected files ... .. //depot/projects/mips2/src/sys/mips/mips/machdep.c#44 edit Differences ... ==== //depot/projects/mips2/src/sys/mips/mips/machdep.c#44 (text+ko) ==== @@ -165,11 +165,6 @@ if (boothowto & RB_VERBOSE) bootverbose++; - /* - * Good {morning,afternoon,evening,night}. - */ - printf("%s", version); - printf("real memory = %lu (%luK bytes)\n", ptoa(Maxmem), ptoa(Maxmem) / 1024); realmem = Maxmem; From owner-p4-projects@FreeBSD.ORG Tue Oct 28 03:42:38 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 57CF2106567A; Tue, 28 Oct 2008 03:42:38 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 10593106566B for ; Tue, 28 Oct 2008 03:42:38 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id F1CC88FC17 for ; Tue, 28 Oct 2008 03:42:37 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id m9S3gbm6030403 for ; Tue, 28 Oct 2008 03:42:37 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m9S3gb6M030401 for perforce@freebsd.org; Tue, 28 Oct 2008 03:42:37 GMT (envelope-from sam@freebsd.org) Date: Tue, 28 Oct 2008 03:42:37 GMT Message-Id: <200810280342.m9S3gb6M030401@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 152072 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, 28 Oct 2008 03:42:38 -0000 http://perforce.freebsd.org/chv.cgi?CH=152072 Change 152072 by sam@sam_ebb on 2008/10/28 03:42:21 checkpoint rewrite Affected files ... .. //depot/projects/vap/sys/dev/ath/ath_rate/sample/sample.c#17 edit .. //depot/projects/vap/sys/dev/ath/ath_rate/sample/sample.h#8 edit Differences ... ==== //depot/projects/vap/sys/dev/ath/ath_rate/sample/sample.c#17 (text+ko) ==== @@ -105,33 +105,35 @@ static void ath_rate_ctl_reset(struct ath_softc *, struct ieee80211_node *); +static const int packet_size_bins[NUM_PACKET_SIZE_BINS] = { 250, 1600 }; + static __inline int size_to_bin(int size) { - int x = 0; - for (x = 0; x < NUM_PACKET_SIZE_BINS; x++) { - if (size <= packet_size_bins[x]) { - return x; - } - } +#if NUM_PACKET_SIZE_BINS > 1 + if (size <= packet_size_bins[0]) + return 0; +#endif +#if NUM_PACKET_SIZE_BINS > 2 + if (size <= packet_size_bins[1]) + return 1; +#endif +#if NUM_PACKET_SIZE_BINS > 3 + if (size <= packet_size_bins[2]) + return 2; +#endif +#if NUM_PACKET_SIZE_BINS > 4 +#error "add support for more packet sizes" +#endif return NUM_PACKET_SIZE_BINS-1; } + static __inline int -bin_to_size(int index) { +bin_to_size(int index) +{ return packet_size_bins[index]; } -static __inline int -rate_to_ndx(struct sample_node *sn, int rate) { - int x = 0; - for (x = 0; x < sn->num_rates; x++) { - if (sn->rates[x].rate == rate) { - return x; - } - } - return -1; -} - void ath_rate_node_init(struct ath_softc *sc, struct ath_node *an) { @@ -143,205 +145,202 @@ { } - /* - * returns the ndx with the lowest average_tx_time, + * returns the rix with the lowest average_tx_time, * or -1 if all the average_tx_times are 0. */ -static __inline int best_rate_ndx(struct sample_node *sn, int size_bin, - int require_acked_before) +static __inline int +pick_best_rate(struct sample_node *sn, const HAL_RATE_TABLE *rt, + int size_bin, int require_acked_before) { - int x = 0; - int best_rate_ndx = 0; - int best_rate_tt = 0; - for (x = 0; x < sn->num_rates; x++) { - int tt = sn->stats[size_bin][x].average_tx_time; - if (tt <= 0 || (require_acked_before && - !sn->stats[size_bin][x].packets_acked)) { + int best_rate_rix, best_rate_tt; + uint32_t mask; + int rix, tt; + + best_rate_rix = 0; + best_rate_tt = 0; + for (mask = sn->ratemask, rix = 0; mask != 0; mask >>= 1, rix++) { + if ((mask & 1) == 0) /* not a supported rate */ continue; - } - /* 9 megabits never works better than 12 */ - if (sn->rates[x].rate == 18) + tt = sn->stats[size_bin][rix].average_tx_time; + if (tt <= 0 || + (require_acked_before && + !sn->stats[size_bin][rix].packets_acked)) continue; /* don't use a bit-rate that has been failing */ - if (sn->stats[size_bin][x].successive_failures > 3) + if (sn->stats[size_bin][rix].successive_failures > 3) continue; if (!best_rate_tt || best_rate_tt > tt) { best_rate_tt = tt; - best_rate_ndx = x; + best_rate_rix = rix; } } - return (best_rate_tt) ? best_rate_ndx : -1; + return (best_rate_tt ? best_rate_rix : -1); } /* * pick a good "random" bit-rate to sample other than the current one */ static __inline int -pick_sample_ndx(struct sample_node *sn, int size_bin) +pick_sample_rate(struct sample_node *sn, const HAL_RATE_TABLE *rt, int size_bin) { - int x = 0; - int current_ndx = 0; - unsigned current_tt = 0; +#define RATE(ix) (rt->info[ix].dot11Rate & IEEE80211_RATE_VAL) + int current_rix, rix; + unsigned current_tt; + uint32_t mask; - current_ndx = sn->current_rate[size_bin]; - if (current_ndx < 0) { + current_rix = sn->current_rix[size_bin]; + if (current_rix < 0) { /* no successes yet, send at the lowest bit-rate */ return 0; } - current_tt = sn->stats[size_bin][current_ndx].average_tx_time; + current_tt = sn->stats[size_bin][current_rix].average_tx_time; - for (x = 0; x < sn->num_rates; x++) { - int ndx = (sn->last_sample_ndx[size_bin]+1+x) % sn->num_rates; - - /* don't sample the current bit-rate */ - if (ndx == current_ndx) + rix = sn->last_sample_rix[size_bin]+1; /* next sample rate */ + mask = sn->ratemask >> rix; /* clear all rates below */ + for (; mask != 0; mask >>= 1, rix++) { + if ((mask & 1) == 0) /* not a supported rate */ continue; /* this bit-rate is always worse than the current one */ - if (sn->stats[size_bin][ndx].perfect_tx_time > current_tt) + if (sn->stats[size_bin][rix].perfect_tx_time > current_tt) continue; /* rarely sample bit-rates that fail a lot */ - if (ticks - sn->stats[size_bin][ndx].last_tx < ((hz * STALE_FAILURE_TIMEOUT_MS)/1000) && - sn->stats[size_bin][ndx].successive_failures > 3) + if (ticks - sn->stats[size_bin][rix].last_tx < ((hz * STALE_FAILURE_TIMEOUT_MS)/1000) && + sn->stats[size_bin][rix].successive_failures > 3) continue; /* don't sample more than 2 indexes higher * for rates higher than 11 megabits */ - if (sn->rates[ndx].rate > 22 && ndx > current_ndx + 2) + if (RATE(rix) > 2*11 && rix > current_rix + 2) continue; - /* 9 megabits never works better than 12 */ - if (sn->rates[ndx].rate == 18) + /* if we're using 11 megabits, only sample up to 12 megabits */ + if (RATE(current_rix) == 2*11 && rix > current_rix + 1) continue; - /* if we're using 11 megabits, only sample up to 12 megabits - */ - if (sn->rates[current_ndx].rate == 22 && ndx > current_ndx + 1) - continue; - - sn->last_sample_ndx[size_bin] = ndx; - return ndx; + sn->last_sample_rix[size_bin] = rix; + return rix; } - return current_ndx; + return current_rix; +#undef RATE } void ath_rate_findrate(struct ath_softc *sc, struct ath_node *an, int shortPreamble, size_t frameLen, - u_int8_t *rix, int *try0, u_int8_t *txrate) + u_int8_t *rix0, int *try0, u_int8_t *txrate) { +#define RATE(ix) (rt->info[ix].dot11Rate & IEEE80211_RATE_VAL) struct sample_node *sn = ATH_NODE_SAMPLE(an); struct sample_softc *ssc = ATH_SOFTC_SAMPLE(sc); struct ifnet *ifp = sc->sc_ifp; struct ieee80211com *ic = ifp->if_l2com; - int ndx, size_bin, mrr, best_ndx, change_rates; + const HAL_RATE_TABLE *rt = sc->sc_currates; + const int size_bin = size_to_bin(frameLen); + int rix, mrr, best_rix, change_rates; unsigned average_tx_time; + if (sn->static_rix != -1) { + rix = sn->static_rix; + *try0 = ATH_TXMAXTRY; + goto done; + } + mrr = sc->sc_mrretry && !(ic->ic_flags & IEEE80211_F_USEPROT); - size_bin = size_to_bin(frameLen); - best_ndx = best_rate_ndx(sn, size_bin, !mrr); + *try0 = mrr ? 2 : ATH_TXMAXTRY; - if (best_ndx >= 0) { - average_tx_time = sn->stats[size_bin][best_ndx].average_tx_time; + best_rix = pick_best_rate(sn, rt, size_bin, !mrr); + if (best_rix >= 0) { + average_tx_time = sn->stats[size_bin][best_rix].average_tx_time; } else { average_tx_time = 0; } - - if (sn->static_rate_ndx != -1) { - ndx = sn->static_rate_ndx; - *try0 = ATH_TXMAXTRY; + if (sn->sample_tt[size_bin] < average_tx_time * (sn->packets_since_sample[size_bin]*ssc->ath_sample_rate/100)) { + /* + * we want to limit the time measuring the performance + * of other bit-rates to ath_sample_rate% of the + * total transmission time. + */ + rix = pick_sample_rate(sn, rt, size_bin); + if (rix != sn->current_rix[size_bin]) { + sn->current_sample_rix[size_bin] = rix; + } else { + sn->current_sample_rix[size_bin] = -1; + } + sn->packets_since_sample[size_bin] = 0; + } else { - *try0 = mrr ? 2 : ATH_TXMAXTRY; - - if (sn->sample_tt[size_bin] < average_tx_time * (sn->packets_since_sample[size_bin]*ssc->ath_sample_rate/100)) { - /* - * we want to limit the time measuring the performance - * of other bit-rates to ath_sample_rate% of the - * total transmission time. - */ - ndx = pick_sample_ndx(sn, size_bin); - if (ndx != sn->current_rate[size_bin]) { - sn->current_sample_ndx[size_bin] = ndx; - } else { - sn->current_sample_ndx[size_bin] = -1; - } - sn->packets_since_sample[size_bin] = 0; - - } else { - change_rates = 0; - if (!sn->packets_sent[size_bin] || best_ndx == -1) { - /* no packet has been sent successfully yet */ - for (ndx = sn->num_rates-1; ndx > 0; ndx--) { - /* - * pick the highest rate <= 36 Mbps - * that hasn't failed. - */ - if (sn->rates[ndx].rate <= 72 && - sn->stats[size_bin][ndx].successive_failures == 0) { - break; - } + change_rates = 0; + if (!sn->packets_sent[size_bin] || best_rix == -1) { + /* no packet has been sent successfully yet */ + for (rix = rt->rateCount-1; rix > 0; rix--) { + /* + * pick the highest rate <= 36 Mbps + * that hasn't failed. + */ + if (RATE(rix) <= 72 && + sn->stats[size_bin][rix].successive_failures == 0) { + break; } - change_rates = 1; - best_ndx = ndx; - } else if (sn->packets_sent[size_bin] < 20) { - /* let the bit-rate switch quickly during the first few packets */ - change_rates = 1; - } else if (ticks - ((hz*MIN_SWITCH_MS)/1000) > sn->ticks_since_switch[size_bin]) { - /* 2 seconds have gone by */ - change_rates = 1; - } else if (average_tx_time * 2 < sn->stats[size_bin][sn->current_rate[size_bin]].average_tx_time) { - /* the current bit-rate is twice as slow as the best one */ - change_rates = 1; } + change_rates = 1; + best_rix = rix; + } else if (sn->packets_sent[size_bin] < 20) { + /* let the bit-rate switch quickly during the first few packets */ + change_rates = 1; + } else if (ticks - ((hz*MIN_SWITCH_MS)/1000) > sn->ticks_since_switch[size_bin]) { + /* 2 seconds have gone by */ + change_rates = 1; + } else if (average_tx_time * 2 < sn->stats[size_bin][sn->current_rix[size_bin]].average_tx_time) { + /* the current bit-rate is twice as slow as the best one */ + change_rates = 1; + } - sn->packets_since_sample[size_bin]++; - - if (change_rates) { - if (best_ndx != sn->current_rate[size_bin]) { - IEEE80211_NOTE(an->an_node.ni_vap, - IEEE80211_MSG_RATECTL, - &an->an_node, + sn->packets_since_sample[size_bin]++; + + if (change_rates) { + if (best_rix != sn->current_rix[size_bin]) { + IEEE80211_NOTE(an->an_node.ni_vap, + IEEE80211_MSG_RATECTL, + &an->an_node, "%s: size %d switch rate %d (%d/%d) -> %d (%d/%d) after %d packets mrr %d", - __func__, - packet_size_bins[size_bin], - sn->rates[sn->current_rate[size_bin]].rate, - sn->stats[size_bin][sn->current_rate[size_bin]].average_tx_time, - sn->stats[size_bin][sn->current_rate[size_bin]].perfect_tx_time, - sn->rates[best_ndx].rate, - sn->stats[size_bin][best_ndx].average_tx_time, - sn->stats[size_bin][best_ndx].perfect_tx_time, - sn->packets_since_switch[size_bin], - mrr); - } - sn->packets_since_switch[size_bin] = 0; - sn->current_rate[size_bin] = best_ndx; - sn->ticks_since_switch[size_bin] = ticks; - /* - * Set the visible txrate for this node. - */ - an->an_node.ni_txrate = sn->rates[best_ndx].rate; + __func__, + packet_size_bins[size_bin], + RATE(sn->current_rix[size_bin]), + sn->stats[size_bin][sn->current_rix[size_bin]].average_tx_time, + sn->stats[size_bin][sn->current_rix[size_bin]].perfect_tx_time, + RATE(best_rix), + sn->stats[size_bin][best_rix].average_tx_time, + sn->stats[size_bin][best_rix].perfect_tx_time, + sn->packets_since_switch[size_bin], + mrr); } - ndx = sn->current_rate[size_bin]; - sn->packets_since_switch[size_bin]++; + sn->packets_since_switch[size_bin] = 0; + sn->current_rix[size_bin] = best_rix; + sn->ticks_since_switch[size_bin] = ticks; + /* + * Set the visible txrate for this node. + */ + an->an_node.ni_txrate = RATE(best_rix); } + rix = sn->current_rix[size_bin]; + sn->packets_since_switch[size_bin]++; } +done: + KASSERT(rix >= 0 && rix < rt->rateCount, ("rix is %d", rix)); - KASSERT(ndx >= 0 && ndx < sn->num_rates, ("ndx is %d", ndx)); - - *rix = sn->rates[ndx].rix; - if (shortPreamble) { - *txrate = sn->rates[ndx].shortPreambleRateCode; - } else { - *txrate = sn->rates[ndx].rateCode; - } + *rix0 = rix; + *txrate = rt->info[rix].rateCode + | (shortPreamble ? rt->info[rix].shortPreamble : 0); sn->packets_sent[size_bin]++; +#undef RATE } void @@ -349,26 +348,21 @@ struct ath_desc *ds, int shortPreamble, u_int8_t rix) { struct sample_node *sn = ATH_NODE_SAMPLE(an); - int rateCode = -1; - int frame_size = 0; - int size_bin = 0; - int ndx = 0; + const HAL_RATE_TABLE *rt = sc->sc_currates; + const int size_bin = 0; /*XXX*/ + uint8_t rix1, s1code, rix2, s2code; - size_bin = size_to_bin(frame_size); // TODO: it's correct that frame_size alway 0 ? - ndx = sn->current_rate[size_bin]; /* retry at the current bit-rate */ - - if (!sn->stats[size_bin][ndx].packets_acked) { - ndx = 0; /* use the lowest bit-rate */ - } - - if (shortPreamble) { - rateCode = sn->rates[ndx].shortPreambleRateCode; - } else { - rateCode = sn->rates[ndx].rateCode; - } + rix1 = sn->current_rix[size_bin]; /* retry at the current bit-rate */ + if (!sn->stats[size_bin][rix1].packets_acked) + rix1 = rt->info[rix].controlRate; /* next lowest basic rate */ + s1code = rt->info[rix1].rateCode + | (shortPreamble ? rt->info[rix1].shortPreamble : 0); + rix2 = rt->info[rix1].controlRate; + s2code = rt->info[rix2].rateCode + | (shortPreamble ? rt->info[rix2].shortPreamble : 0); ath_hal_setupxtxdesc(sc->sc_ah, ds - , rateCode, 3 /* series 1 */ - , sn->rates[0].rateCode, 3 /* series 2 */ + , s1code, 3 /* series 1 */ + , s2code, 3 /* series 2 */ , 0, 0 /* series 3 */ ); } @@ -376,44 +370,38 @@ static void update_stats(struct ath_softc *sc, struct ath_node *an, int frame_size, - int ndx0, int tries0, - int ndx1, int tries1, - int ndx2, int tries2, - int ndx3, int tries3, + int rix0, int tries0, + int rix1, int tries1, + int rix2, int tries2, + int rix3, int tries3, int short_tries, int tries, int status) { struct sample_node *sn = ATH_NODE_SAMPLE(an); struct sample_softc *ssc = ATH_SOFTC_SAMPLE(sc); - int tt = 0; - int tries_so_far = 0; - int size_bin = 0; - int size = 0; - int rate = 0; + const int size_bin = size_to_bin(frame_size); + const int size = bin_to_size(size_bin); + int tt, tries_so_far; - size_bin = size_to_bin(frame_size); - size = bin_to_size(size_bin); - - if (!(0 <= ndx0 && ndx0 < sn->num_rates)) + if (!IS_RATE_DEFINED(sn, rix0)) return; - rate = sn->rates[ndx0].rate; - tt += calc_usecs_unicast_packet(sc, size, sn->rates[ndx0].rix, + tt = calc_usecs_unicast_packet(sc, size, rix0, short_tries, MIN(tries0, tries) - 1); - tries_so_far += tries0; + tries_so_far = tries0; if (tries1 && tries0 < tries) { - if (!(0 <= ndx1 && ndx1 < sn->num_rates)) + if (!IS_RATE_DEFINED(sn, rix1)) return; - tt += calc_usecs_unicast_packet(sc, size, sn->rates[ndx1].rix, + tt += calc_usecs_unicast_packet(sc, size, rix1, short_tries, MIN(tries1 + tries_so_far, tries) - tries_so_far - 1); } tries_so_far += tries1; if (tries2 && tries0 + tries1 < tries) { - if (!(0 <= ndx2 && ndx2 < sn->num_rates)) + if (!IS_RATE_DEFINED(sn, rix2)) return; - tt += calc_usecs_unicast_packet(sc, size, sn->rates[ndx2].rix, + tt += calc_usecs_unicast_packet(sc, size, rix2, short_tries, MIN(tries2 + tries_so_far, tries) - tries_so_far - 1); } @@ -421,58 +409,58 @@ tries_so_far += tries2; if (tries3 && tries0 + tries1 + tries2 < tries) { - if (!(0 <= ndx3 && ndx3 < sn->num_rates)) + if (!IS_RATE_DEFINED(sn, rix3)) return; - tt += calc_usecs_unicast_packet(sc, size, sn->rates[ndx3].rix, + tt += calc_usecs_unicast_packet(sc, size, rix3, short_tries, MIN(tries3 + tries_so_far, tries) - tries_so_far - 1); } - if (sn->stats[size_bin][ndx0].total_packets < (100 / (100 - ssc->ath_smoothing_rate))) { + if (sn->stats[size_bin][rix0].total_packets < (100 / (100 - ssc->ath_smoothing_rate))) { /* just average the first few packets */ - int avg_tx = sn->stats[size_bin][ndx0].average_tx_time; - int packets = sn->stats[size_bin][ndx0].total_packets; - sn->stats[size_bin][ndx0].average_tx_time = (tt+(avg_tx*packets))/(packets+1); + int avg_tx = sn->stats[size_bin][rix0].average_tx_time; + int packets = sn->stats[size_bin][rix0].total_packets; + sn->stats[size_bin][rix0].average_tx_time = (tt+(avg_tx*packets))/(packets+1); } else { /* use a ewma */ - sn->stats[size_bin][ndx0].average_tx_time = - ((sn->stats[size_bin][ndx0].average_tx_time * ssc->ath_smoothing_rate) + + sn->stats[size_bin][rix0].average_tx_time = + ((sn->stats[size_bin][rix0].average_tx_time * ssc->ath_smoothing_rate) + (tt * (100 - ssc->ath_smoothing_rate))) / 100; } if (status) { int y; - sn->stats[size_bin][ndx0].successive_failures++; + sn->stats[size_bin][rix0].successive_failures++; for (y = size_bin+1; y < NUM_PACKET_SIZE_BINS; y++) { /* also say larger packets failed since we * assume if a small packet fails at a lower * bit-rate then a larger one will also. */ - sn->stats[y][ndx0].successive_failures++; - sn->stats[y][ndx0].last_tx = ticks; - sn->stats[y][ndx0].tries += tries; - sn->stats[y][ndx0].total_packets++; + sn->stats[y][rix0].successive_failures++; + sn->stats[y][rix0].last_tx = ticks; + sn->stats[y][rix0].tries += tries; + sn->stats[y][rix0].total_packets++; } } else { - sn->stats[size_bin][ndx0].packets_acked++; - sn->stats[size_bin][ndx0].successive_failures = 0; + sn->stats[size_bin][rix0].packets_acked++; + sn->stats[size_bin][rix0].successive_failures = 0; } - sn->stats[size_bin][ndx0].tries += tries; - sn->stats[size_bin][ndx0].last_tx = ticks; - sn->stats[size_bin][ndx0].total_packets++; + sn->stats[size_bin][rix0].tries += tries; + sn->stats[size_bin][rix0].last_tx = ticks; + sn->stats[size_bin][rix0].total_packets++; - if (ndx0 == sn->current_sample_ndx[size_bin]) { + if (rix0 == sn->current_sample_rix[size_bin]) { IEEE80211_NOTE(an->an_node.ni_vap, IEEE80211_MSG_RATECTL, &an->an_node, "%s: size %d %s sample rate %d tries (%d/%d) tt %d avg_tt (%d/%d)", __func__, size, status ? "FAIL" : "OK", - rate, short_tries, tries, tt, - sn->stats[size_bin][ndx0].average_tx_time, - sn->stats[size_bin][ndx0].perfect_tx_time); + rix0, short_tries, tries, tt, + sn->stats[size_bin][rix0].average_tx_time, + sn->stats[size_bin][rix0].perfect_tx_time); sn->sample_tt[size_bin] = tt; - sn->current_sample_ndx[size_bin] = -1; + sn->current_sample_rix[size_bin] = -1; } } @@ -492,19 +480,18 @@ struct sample_node *sn = ATH_NODE_SAMPLE(an); const struct ath_tx_status *ts = &bf->bf_status.ds_txstat; const struct ath_desc *ds0 = &bf->bf_desc[0]; - int final_rate, short_tries, long_tries, frame_size; + int final_rix, short_tries, long_tries, frame_size; const HAL_RATE_TABLE *rt = sc->sc_currates; int mrr; - final_rate = sc->sc_hwmap[ - rt->rateCodeToIndex[ts->ts_rate &~ HAL_TXSTAT_ALTRATE]].ieeerate; + final_rix = rt->rateCodeToIndex[ts->ts_rate &~ HAL_TXSTAT_ALTRATE]; short_tries = ts->ts_shortretry; long_tries = ts->ts_longretry + 1; frame_size = ds0->ds_ctl0 & 0x0fff; /* low-order 12 bits of ds_ctl0 */ if (frame_size == 0) /* NB: should not happen */ frame_size = 1500; - if (sn->num_rates <= 0) { + if (sn->ratemask == 0) { IEEE80211_NOTE(an->an_node.ni_vap, IEEE80211_MSG_RATECTL, &an->an_node, "%s: size %d %s rate/try %d/%d no rates yet", @@ -516,9 +503,7 @@ } mrr = sc->sc_mrretry && !(ic->ic_flags & IEEE80211_F_USEPROT); if (!mrr || !(ts->ts_rate & HAL_TXSTAT_ALTRATE)) { - int ndx = rate_to_ndx(sn, final_rate); - - if (ndx < 0) { + if (!IS_RATE_DEFINED(sn, final_rix)) { badrate(ifp, 0, ts->ts_rate, long_tries, ts->ts_status); return; } @@ -530,18 +515,18 @@ __func__, bin_to_size(size_to_bin(frame_size)), ts->ts_status ? "FAIL" : "OK", - final_rate, short_tries, long_tries); + final_rix, short_tries, long_tries); update_stats(sc, an, frame_size, - ndx, long_tries, + final_rix, long_tries, 0, 0, 0, 0, 0, 0, short_tries, long_tries, ts->ts_status); } else { - int hwrate0, rate0, tries0, ndx0; - int hwrate1, rate1, tries1, ndx1; - int hwrate2, rate2, tries2, ndx2; - int hwrate3, rate3, tries3, ndx3; + int hwrate0, rix0, tries0; + int hwrate1, rix1, tries1; + int hwrate2, rix2, tries2; + int hwrate3, rix3, tries3; int finalTSIdx = ts->ts_finaltsi; /* @@ -559,30 +544,17 @@ hwrate3 = MS(ds0->ds_ctl3, AR5416_XmitRate3); } - rate0 = sc->sc_hwmap[rt->rateCodeToIndex[hwrate0]].ieeerate; + rix0 = rt->rateCodeToIndex[hwrate0]; tries0 = MS(ds0->ds_ctl2, AR_XmitDataTries0); - ndx0 = rate_to_ndx(sn, rate0); - rate1 = sc->sc_hwmap[rt->rateCodeToIndex[hwrate1]].ieeerate; + rix1 = rt->rateCodeToIndex[hwrate1]; tries1 = MS(ds0->ds_ctl2, AR_XmitDataTries1); - ndx1 = rate_to_ndx(sn, rate1); - rate2 = sc->sc_hwmap[rt->rateCodeToIndex[hwrate2]].ieeerate; + rix2 = rt->rateCodeToIndex[hwrate2]; tries2 = MS(ds0->ds_ctl2, AR_XmitDataTries2); - ndx2 = rate_to_ndx(sn, rate2); - rate3 = sc->sc_hwmap[rt->rateCodeToIndex[hwrate3]].ieeerate; + rix3 = rt->rateCodeToIndex[hwrate3]; tries3 = MS(ds0->ds_ctl2, AR_XmitDataTries3); - ndx3 = rate_to_ndx(sn, rate3); - - if (tries0 && ndx0 < 0) - badrate(ifp, 0, hwrate0, tries0, ts->ts_status); - if (tries1 && ndx1 < 0) - badrate(ifp, 1, hwrate1, tries1, ts->ts_status); - if (tries2 && ndx2 < 0) - badrate(ifp, 2, hwrate2, tries2, ts->ts_status); - if (tries3 && ndx3 < 0) - badrate(ifp, 3, hwrate3, tries3, ts->ts_status); IEEE80211_NOTE(an->an_node.ni_vap, IEEE80211_MSG_RATECTL, &an->an_node, @@ -592,10 +564,19 @@ finalTSIdx, long_tries, ts->ts_status ? "FAIL" : "OK", - rate0, tries0, - rate1, tries1, - rate2, tries2, - rate3, tries3); + rix0, tries0, + rix1, tries1, + rix2, tries2, + rix3, tries3); + + if (tries0 && !IS_RATE_DEFINED(sn, rix0)) + badrate(ifp, 0, hwrate0, tries0, ts->ts_status); + if (tries1 && !IS_RATE_DEFINED(sn, rix1)) + badrate(ifp, 1, hwrate1, tries1, ts->ts_status); + if (tries2 && !IS_RATE_DEFINED(sn, rix2)) + badrate(ifp, 2, hwrate2, tries2, ts->ts_status); + if (tries3 && !IS_RATE_DEFINED(sn, rix3)) + badrate(ifp, 3, hwrate3, tries3, ts->ts_status); /* * NB: series > 0 are not penalized for failure @@ -606,10 +587,10 @@ */ if (tries0) { update_stats(sc, an, frame_size, - ndx0, tries0, - ndx1, tries1, - ndx2, tries2, - ndx3, tries3, + rix0, tries0, + rix1, tries1, + rix2, tries2, + rix3, tries3, short_tries, long_tries, long_tries > tries0); long_tries -= tries0; @@ -617,9 +598,9 @@ if (tries1 && finalTSIdx > 0) { update_stats(sc, an, frame_size, - ndx1, tries1, - ndx2, tries2, - ndx3, tries3, + rix1, tries1, + rix2, tries2, + rix3, tries3, 0, 0, short_tries, long_tries, ts->ts_status); @@ -628,8 +609,8 @@ if (tries2 && finalTSIdx > 1) { update_stats(sc, an, frame_size, - ndx2, tries2, - ndx3, tries3, + rix2, tries2, + rix3, tries3, 0, 0, 0, 0, short_tries, long_tries, @@ -639,7 +620,7 @@ if (tries3 && finalTSIdx > 2) { update_stats(sc, an, frame_size, - ndx3, tries3, + rix3, tries3, 0, 0, 0, 0, 0, 0, @@ -663,14 +644,16 @@ ath_rate_ctl_reset(struct ath_softc *sc, struct ieee80211_node *ni) { #define RATE(_ix) (ni->ni_rates.rs_rates[(_ix)] & IEEE80211_RATE_VAL) +#define INFORATE(_ix) (rt->info[(_ix)].dot11Rate & IEEE80211_RATE_VAL) struct ath_node *an = ATH_NODE(ni); const struct ieee80211_txparam *tp = ni->ni_txparms; struct sample_node *sn = ATH_NODE_SAMPLE(an); const HAL_RATE_TABLE *rt = sc->sc_currates; - int x, y, srate; + int x, y, srate, rix; + uint32_t mask; KASSERT(rt != NULL, ("no rate table, mode %u", sc->sc_curmode)); - sn->static_rate_ndx = -1; + sn->static_rix = -1; if (tp != NULL && tp->ucastrate != IEEE80211_FIXED_RATE_NONE) { /* * A fixed rate is to be used; ic_fixed_rate is the @@ -689,86 +672,135 @@ * can fail. */ if (srate >= 0) - sn->static_rate_ndx = srate; + sn->static_rix = sc->sc_rixmap[srate]; } - sn->num_rates = ni->ni_rates.rs_nrates; - for (x = 0; x < ni->ni_rates.rs_nrates; x++) { - sn->rates[x].rate = ni->ni_rates.rs_rates[x] & IEEE80211_RATE_VAL; - sn->rates[x].rix = sc->sc_rixmap[sn->rates[x].rate]; - if (sn->rates[x].rix == 0xff) { - IEEE80211_NOTE(ni->ni_vap, IEEE80211_MSG_RATECTL, ni, - "%s: ignore bogus rix at %d", __func__, x); + /* + * Construct a bitmask of usable rates. This has all + * negotiated rates minus those marked by the hal as + * to be ignored for doing rate control. + */ + sn->ratemask = 0; + for (x = 0; x < ni->ni_rates.rs_nrates; x++) { + rix = sc->sc_rixmap[RATE(x)]; + if (rix == 0xff) + continue; + /* skip rates marked broken by hal */ + if (!rt->info[rix].valid) continue; - } - sn->rates[x].rateCode = rt->info[sn->rates[x].rix].rateCode; - sn->rates[x].shortPreambleRateCode = - rt->info[sn->rates[x].rix].rateCode | - rt->info[sn->rates[x].rix].shortPreamble; + KASSERT(rix < SAMPLE_MAXRATES, + ("rate %u has rix %d", RATE(x), rix)); + sn->ratemask |= 1<ni_vap, IEEE80211_MSG_RATECTL)) { ieee80211_note(ni->ni_vap, "[%6D] %s: size 1600 rate/tt", - __func__, ni->ni_macaddr, ":"); - for (x = 0; x < sn->num_rates; x++) { - if (sn->rates[x].rix == 0xff) + ni->ni_macaddr, ":", __func__); + for (mask = sn->ratemask, rix = 0; mask != 0; mask >>= 1, rix++) { + if ((mask & 1) == 0) continue; - printf(" %d/%d", sn->rates[x].rate, - calc_usecs_unicast_packet(sc, 1600, - sn->rates[x].rix, 0,0)); + printf(" %d/%d", INFORATE(rix), + calc_usecs_unicast_packet(sc, 1600, rix, 0,0)); } printf("\n"); } #endif for (y = 0; y < NUM_PACKET_SIZE_BINS; y++) { int size = bin_to_size(y); - int ndx = 0; + uint32_t mask; + sn->packets_sent[y] = 0; - sn->current_sample_ndx[y] = -1; - sn->last_sample_ndx[y] = 0; + sn->current_sample_rix[y] = -1; + sn->last_sample_rix[y] = 0; + /* XXX start with first valid rate */ + sn->current_rix[y] = ffs(sn->ratemask)-1; - for (x = 0; x < ni->ni_rates.rs_nrates; x++) { - sn->stats[y][x].successive_failures = 0; - sn->stats[y][x].tries = 0; - sn->stats[y][x].total_packets = 0; - sn->stats[y][x].packets_acked = 0; - sn->stats[y][x].last_tx = 0; + /* + * Initialize the statistics buckets; these are + * indexed by the rate code index. + */ + for (rix = 0, mask = sn->ratemask; mask != 0; rix++, mask >>= 1) { + if ((mask & 1) == 0) /* not a valid rate */ + continue; + sn->stats[y][rix].successive_failures = 0; + sn->stats[y][rix].tries = 0; + sn->stats[y][rix].total_packets = 0; + sn->stats[y][rix].packets_acked = 0; + sn->stats[y][rix].last_tx = 0; - sn->stats[y][x].perfect_tx_time = - calc_usecs_unicast_packet(sc, size, - sn->rates[x].rix, - 0, 0); - sn->stats[y][x].average_tx_time = sn->stats[y][x].perfect_tx_time; - } - - /* set the initial rate */ - for (ndx = sn->num_rates-1; ndx > 0; ndx--) { - if (sn->rates[ndx].rate <= 72) { - break; - } + sn->stats[y][rix].perfect_tx_time = + calc_usecs_unicast_packet(sc, size, rix, 0, 0); + sn->stats[y][rix].average_tx_time = + sn->stats[y][rix].perfect_tx_time; } - sn->current_rate[y] = ndx; } - +#if 0 + /* XXX 0, num_rates-1 are wrong */ IEEE80211_NOTE(ni->ni_vap, IEEE80211_MSG_RATECTL, ni, "%s: %d rates %d%sMbps (%dus)- %d%sMbps (%dus)", __func__, sn->num_rates, - sn->rates[0].rate/2, sn->rates[0].rate % 0x1 ? ".5" : "", + INFORATE(0)/2, INFORATE(0) % 1 ? ".5" : "", sn->stats[1][0].perfect_tx_time, - sn->rates[sn->num_rates-1].rate/2, - sn->rates[sn->num_rates-1].rate % 0x1 ? ".5" : "", + INFORATE(sn->num_rates-1)/2, INFORATE(sn->num_rates-1) % 1 ? ".5" : "", sn->stats[1][sn->num_rates-1].perfect_tx_time ); - +#endif /* set the visible bit-rate */ - if (sn->static_rate_ndx != -1) - ni->ni_txrate = sn->rates[sn->static_rate_ndx].rate; + if (sn->static_rix != -1) + ni->ni_txrate = INFORATE(sn->static_rix); else - ni->ni_txrate = sn->rates[0].rate; + ni->ni_txrate = RATE(0); #undef RATE +#undef INFORATE } static void +sample_stats(void *arg, struct ieee80211_node *ni) +{ + struct ath_softc *sc = arg; + const HAL_RATE_TABLE *rt = sc->sc_currates; + struct sample_node *sn = ATH_NODE_SAMPLE(ATH_NODE(ni)); + uint32_t mask; + int rix, y; + + printf("\n[%s] refcnt %d\n", + ether_sprintf(ni->ni_macaddr), ieee80211_node_refcnt(ni)); + for (mask = sn->ratemask, rix = 0; mask != 0; mask >>= 1, rix++) { + if ((mask & 1) == 0) + continue; + for (y = 0; y < NUM_PACKET_SIZE_BINS; y++) { + if (sn->stats[y][rix].total_packets == 0) + continue; + printf("[%2u:%4u] %6d:%-6d (%3d%%) T %6d F %2d avg_tx_time %u\n", + (rt->info[rix].dot11Rate & IEEE80211_RATE_VAL)/2, + bin_to_size(y), + sn->stats[y][rix].total_packets, + sn->stats[y][rix].packets_acked, + (100*sn->stats[y][rix].packets_acked)/sn->stats[y][rix].total_packets, + sn->stats[y][rix].tries, + sn->stats[y][rix].successive_failures, + sn->stats[y][rix].average_tx_time); + } + } +} + +static int +ath_rate_sysctl_stats(SYSCTL_HANDLER_ARGS) +{ + struct ath_softc *sc = arg1; + struct ifnet *ifp = sc->sc_ifp; + struct ieee80211com *ic = ifp->if_l2com; + int error, v; + + v = 0; + error = sysctl_handle_int(oidp, &v, 0, req); + if (error || !req->newptr) + return error; + ieee80211_iterate_nodes(&ic->ic_sta, sample_stats, sc); + return 0; +} + +static void ath_rate_sysctlattach(struct ath_softc *sc, struct sample_softc *osc) { struct sysctl_ctx_list *ctx = device_get_sysctl_ctx(sc->sc_dev); @@ -782,6 +814,9 @@ SYSCTL_ADD_INT(ctx, SYSCTL_CHILDREN(tree), OID_AUTO, "sample_rate", CTLFLAG_RW, &osc->ath_sample_rate,0, "rate control: # good periods before raising rate"); + SYSCTL_ADD_PROC(ctx, SYSCTL_CHILDREN(tree), OID_AUTO, + "sample_stats", CTLTYPE_INT | CTLFLAG_RW, sc, 0, + ath_rate_sysctl_stats, "I", "print statistics"); } struct ath_ratectrl * ==== //depot/projects/vap/sys/dev/ath/ath_rate/sample/sample.h#8 (text+ko) ==== @@ -50,14 +50,6 @@ }; #define ATH_SOFTC_SAMPLE(sc) ((struct sample_softc *)sc->sc_rc) -struct rate_info { - int rate; - int rix; - int rateCode; - int shortPreambleRateCode; -}; - - struct rate_stats { unsigned average_tx_time; int successive_failures; @@ -72,30 +64,29 @@ * for now, we track performance for three different packet * size buckets */ -#define NUM_PACKET_SIZE_BINS 3 -static int packet_size_bins[NUM_PACKET_SIZE_BINS] = {250, 1600, 3000}; +#define NUM_PACKET_SIZE_BINS 2 /* per-node state */ struct sample_node { - int static_rate_ndx; - int num_rates; + int static_rix; /* rate index of fixed tx rate */ +#define SAMPLE_MAXRATES 32 /* NB: corresponds to hal info[32] */ + uint32_t ratemask; /* bit mask of valid rate indices */ - struct rate_info rates[IEEE80211_RATE_MAXSIZE]; - - struct rate_stats stats[NUM_PACKET_SIZE_BINS][IEEE80211_RATE_MAXSIZE]; - int last_sample_ndx[NUM_PACKET_SIZE_BINS]; + struct rate_stats stats[NUM_PACKET_SIZE_BINS][SAMPLE_MAXRATES]; + int last_sample_rix[NUM_PACKET_SIZE_BINS]; >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Tue Oct 28 03:52:48 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B8B3B106567A; Tue, 28 Oct 2008 03:52:48 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 7C1E8106566B for ; Tue, 28 Oct 2008 03:52:48 +0000 (UTC) (envelope-from gonzo@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 5139D8FC14 for ; Tue, 28 Oct 2008 03:52:48 +0000 (UTC) (envelope-from gonzo@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id m9S3qm8x031206 for ; Tue, 28 Oct 2008 03:52:48 GMT (envelope-from gonzo@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m9S3qmKB031204 for perforce@freebsd.org; Tue, 28 Oct 2008 03:52:48 GMT (envelope-from gonzo@FreeBSD.org) Date: Tue, 28 Oct 2008 03:52:48 GMT Message-Id: <200810280352.m9S3qmKB031204@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 152073 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, 28 Oct 2008 03:52:49 -0000 http://perforce.freebsd.org/chv.cgi?CH=152073 Change 152073 by gonzo@gonzo_jeeves on 2008/10/28 03:51:53 Poor man's ELF loader. This is simplified version of elf_trampoline stuff from arm tree. Life in MIPS world is much easier with directly mapped KSEG0/KSEG1 segments, so a lot of code has been axed. No compression support/symbol tables yet. One thing at a time. Affected files ... .. //depot/projects/mips2/src/sys/mips/mips/elf_trampoline.c#1 add .. //depot/projects/mips2/src/sys/mips/mips/inckern.S#1 add Differences ... From owner-p4-projects@FreeBSD.ORG Tue Oct 28 04:08:18 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A51D5106566C; Tue, 28 Oct 2008 04:08:18 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 66E67106567B for ; Tue, 28 Oct 2008 04:08:18 +0000 (UTC) (envelope-from peter-gmail@wemm.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 52A338FC1D for ; Tue, 28 Oct 2008 04:08:18 +0000 (UTC) (envelope-from peter-gmail@wemm.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id m9S48IYf033517 for ; Tue, 28 Oct 2008 04:08:18 GMT (envelope-from peter-gmail@wemm.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m9S4831W033507 for perforce@freebsd.org; Tue, 28 Oct 2008 04:08:03 GMT (envelope-from peter-gmail@wemm.org) Date: Tue, 28 Oct 2008 04:08:03 GMT Message-Id: <200810280408.m9S4831W033507@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter-gmail@wemm.org using -f From: Peter Wemm To: Perforce Change Reviews Cc: Subject: PERFORCE change 152074 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, 28 Oct 2008 04:08:18 -0000 http://perforce.freebsd.org/chv.cgi?CH=152074 Change 152074 by peter@peter_overcee on 2008/10/28 04:07:48 IFC @152071 Affected files ... .. //depot/projects/hammer/Makefile.inc1#141 integrate .. //depot/projects/hammer/UPDATING#123 integrate .. //depot/projects/hammer/bin/cp/utils.c#14 integrate .. //depot/projects/hammer/contrib/tcsh/sh.c#6 integrate .. //depot/projects/hammer/contrib/tcsh/tc.const.c#6 integrate .. //depot/projects/hammer/crypto/openssh/loginrec.c#14 integrate .. //depot/projects/hammer/crypto/openssh/sshd.c#16 integrate .. //depot/projects/hammer/etc/Makefile#65 integrate .. //depot/projects/hammer/etc/devd.conf#34 integrate .. //depot/projects/hammer/etc/etc.mips/ttys#3 integrate .. //depot/projects/hammer/etc/mtree/BSD.usr.dist#43 integrate .. //depot/projects/hammer/etc/network.subr#25 integrate .. //depot/projects/hammer/etc/periodic/security/200.chkmounts#4 integrate .. //depot/projects/hammer/etc/rc.subr#45 integrate .. //depot/projects/hammer/etc/remote#8 integrate .. //depot/projects/hammer/games/fortune/datfiles/fortunes#85 integrate .. //depot/projects/hammer/gnu/usr.bin/gdb/arch/amd64/Makefile#5 integrate .. //depot/projects/hammer/gnu/usr.bin/gdb/arch/i386/Makefile#6 integrate .. //depot/projects/hammer/gnu/usr.bin/gdb/kgdb/kld.c#5 integrate .. //depot/projects/hammer/gnu/usr.bin/man/man/man.c#9 integrate .. //depot/projects/hammer/lib/libarchive/archive_read_support_format_zip.c#21 integrate .. //depot/projects/hammer/lib/libarchive/archive_util.c#18 integrate .. //depot/projects/hammer/lib/libarchive/archive_write_disk.c#19 integrate .. //depot/projects/hammer/lib/libarchive/test/Makefile#15 integrate .. //depot/projects/hammer/lib/libarchive/test/test_acl_basic.c#6 integrate .. //depot/projects/hammer/lib/libarchive/test/test_acl_freebsd.c#1 branch .. //depot/projects/hammer/lib/libarchive/test/test_read_format_zip.c#6 integrate .. //depot/projects/hammer/lib/libarchive/test/test_read_format_zip.zip.uu#2 integrate .. //depot/projects/hammer/lib/libc/arm/gen/_setjmp.S#4 integrate .. //depot/projects/hammer/lib/libc/gen/__xuname.c#4 integrate .. //depot/projects/hammer/lib/libc/gen/posix_spawn.c#3 integrate .. //depot/projects/hammer/lib/libc/stdlib/Makefile.inc#19 integrate .. //depot/projects/hammer/lib/libc/string/strlcpy.c#6 integrate .. //depot/projects/hammer/lib/libc/string/strxfrm.c#3 integrate .. //depot/projects/hammer/lib/libc/sys/mmap.2#12 integrate .. //depot/projects/hammer/lib/libcam/camlib.c#6 integrate .. //depot/projects/hammer/lib/libfetch/http.c#17 integrate .. //depot/projects/hammer/lib/libkvm/kvm.c#13 integrate .. //depot/projects/hammer/lib/libkvm/kvm_minidump_amd64.c#3 integrate .. //depot/projects/hammer/lib/libkvm/kvm_minidump_i386.c#3 integrate .. //depot/projects/hammer/lib/libpmc/Makefile#6 integrate .. //depot/projects/hammer/lib/libpmc/libpmc.c#11 integrate .. //depot/projects/hammer/lib/libpmc/pmc.3#18 integrate .. //depot/projects/hammer/lib/libpmc/pmc.atom.3#1 branch .. //depot/projects/hammer/lib/libpmc/pmc.core.3#1 branch .. //depot/projects/hammer/lib/libpmc/pmc.core2.3#1 branch .. //depot/projects/hammer/lib/libpmc/pmc.iaf.3#1 branch .. //depot/projects/hammer/lib/libpmc/pmc.k7.3#2 integrate .. //depot/projects/hammer/lib/libpmc/pmc.k8.3#2 integrate .. //depot/projects/hammer/lib/libpmc/pmc.p4.3#2 integrate .. //depot/projects/hammer/lib/libpmc/pmc.p5.3#2 integrate .. //depot/projects/hammer/lib/libpmc/pmc.p6.3#2 integrate .. //depot/projects/hammer/lib/libpmc/pmc.tsc.3#2 integrate .. //depot/projects/hammer/lib/libstand/Makefile#22 integrate .. //depot/projects/hammer/lib/libutil/flopen.3#4 integrate .. //depot/projects/hammer/lib/libutil/flopen.c#3 integrate .. //depot/projects/hammer/lib/libutil/login_cap.h#5 integrate .. //depot/projects/hammer/lib/libutil/login_class.3#8 integrate .. //depot/projects/hammer/lib/libutil/login_class.c#9 integrate .. //depot/projects/hammer/lib/libutil/login_times.3#4 integrate .. //depot/projects/hammer/lib/libutil/login_times.c#4 integrate .. //depot/projects/hammer/lib/libutil/logwtmp.c#6 integrate .. //depot/projects/hammer/lib/libutil/pidfile.3#7 integrate .. //depot/projects/hammer/lib/libutil/pidfile.c#7 integrate .. //depot/projects/hammer/lib/libutil/pty.c#10 integrate .. //depot/projects/hammer/lib/libutil/realhostname.c#5 integrate .. //depot/projects/hammer/libexec/rtld-elf/mips/reloc.c#2 integrate .. //depot/projects/hammer/libexec/rtld-elf/rtld.c#43 integrate .. //depot/projects/hammer/release/Makefile#102 integrate .. //depot/projects/hammer/release/doc/en_US.ISO8859-1/hardware/article.sgml#13 integrate .. //depot/projects/hammer/release/doc/en_US.ISO8859-1/relnotes/article.sgml#37 integrate .. //depot/projects/hammer/release/doc/ja_JP.eucJP/hardware/common/dev.sgml#22 integrate .. //depot/projects/hammer/release/doc/ru_RU.KOI8-R/hardware/common/dev.sgml#16 integrate .. //depot/projects/hammer/release/doc/share/misc/dev.archlist.txt#52 integrate .. //depot/projects/hammer/release/doc/share/misc/man2hwnotes.pl#10 integrate .. //depot/projects/hammer/release/scripts/package-trees.sh#3 integrate .. //depot/projects/hammer/sbin/dhclient/dhclient.c#16 integrate .. //depot/projects/hammer/sbin/dhclient/dhcp.h#4 integrate .. //depot/projects/hammer/sbin/dhclient/tables.c#5 integrate .. //depot/projects/hammer/sbin/fsck_ffs/pass5.c#13 integrate .. //depot/projects/hammer/sbin/geom/class/part/geom_part.c#6 integrate .. //depot/projects/hammer/sbin/geom/class/part/gpart.8#4 integrate .. //depot/projects/hammer/sbin/ifconfig/ifconfig.8#54 integrate .. //depot/projects/hammer/sbin/ifconfig/ifvlan.c#11 integrate .. //depot/projects/hammer/sbin/ipfw/ipfw2.c#67 integrate .. //depot/projects/hammer/share/Makefile#13 integrate .. //depot/projects/hammer/share/man/man4/Makefile#110 integrate .. //depot/projects/hammer/share/man/man4/ae.4#1 branch .. //depot/projects/hammer/share/man/man4/ata.4#33 integrate .. //depot/projects/hammer/share/man/man4/bce.4#5 integrate .. //depot/projects/hammer/share/man/man4/ddb.4#21 integrate .. //depot/projects/hammer/share/man/man4/em.4#16 integrate .. //depot/projects/hammer/share/man/man4/igb.4#1 branch .. //depot/projects/hammer/share/man/man4/jme.4#2 integrate .. //depot/projects/hammer/share/man/man4/mmc.4#2 integrate .. //depot/projects/hammer/share/man/man4/mmcsd.4#2 integrate .. //depot/projects/hammer/share/man/man4/nfe.4#8 integrate .. //depot/projects/hammer/share/man/man4/ng_netflow.4#14 integrate .. //depot/projects/hammer/share/man/man4/ng_tty.4#5 integrate .. //depot/projects/hammer/share/man/man4/sdhci.4#1 branch .. //depot/projects/hammer/share/man/man4/snd_hda.4#12 integrate .. //depot/projects/hammer/share/man/man4/u3g.4#1 branch .. //depot/projects/hammer/share/man/man4/ubsa.4#11 integrate .. //depot/projects/hammer/share/man/man4/umass.4#20 integrate .. //depot/projects/hammer/share/man/man4/umodem.4#9 integrate .. //depot/projects/hammer/share/man/man4/vlan.4#21 integrate .. //depot/projects/hammer/share/man/man4/vr.4#15 integrate .. //depot/projects/hammer/share/man/man4/wpi.4#4 integrate .. //depot/projects/hammer/share/man/man5/Makefile#25 integrate .. //depot/projects/hammer/share/man/man5/nullfs.5#1 branch .. //depot/projects/hammer/share/man/man9/Makefile#88 integrate .. //depot/projects/hammer/share/man/man9/malloc.9#14 integrate .. //depot/projects/hammer/share/man/man9/vinvalbuf.9#4 integrate .. //depot/projects/hammer/share/misc/committers-src.dot#16 integrate .. //depot/projects/hammer/share/mk/bsd.kmod.mk#4 integrate .. //depot/projects/hammer/share/syscons/keymaps/INDEX.keymaps#12 integrate .. //depot/projects/hammer/share/syscons/keymaps/eee_nordic.kbd#1 branch .. //depot/projects/hammer/share/zoneinfo/Makefile#6 integrate .. //depot/projects/hammer/share/zoneinfo/africa#11 integrate .. //depot/projects/hammer/share/zoneinfo/asia#17 integrate .. //depot/projects/hammer/share/zoneinfo/southamerica#19 integrate .. //depot/projects/hammer/share/zoneinfo/zone.tab#16 integrate .. //depot/projects/hammer/sys/amd64/amd64/dump_machdep.c#30 integrate .. //depot/projects/hammer/sys/amd64/amd64/identcpu.c#62 integrate .. //depot/projects/hammer/sys/amd64/amd64/initcpu.c#18 integrate .. //depot/projects/hammer/sys/amd64/amd64/local_apic.c#82 integrate .. //depot/projects/hammer/sys/amd64/amd64/minidump_machdep.c#9 integrate .. //depot/projects/hammer/sys/amd64/amd64/prof_machdep.c#9 integrate .. //depot/projects/hammer/sys/amd64/amd64/tsc.c#18 integrate .. //depot/projects/hammer/sys/amd64/amd64/vm_machdep.c#95 integrate .. //depot/projects/hammer/sys/amd64/conf/GENERIC#114 integrate .. //depot/projects/hammer/sys/amd64/include/clock.h#30 integrate .. //depot/projects/hammer/sys/amd64/include/md_var.h#41 integrate .. //depot/projects/hammer/sys/amd64/include/param.h#37 integrate .. //depot/projects/hammer/sys/amd64/include/specialreg.h#31 integrate .. //depot/projects/hammer/sys/amd64/linux32/linux.h#9 integrate .. //depot/projects/hammer/sys/amd64/linux32/linux32_sysvec.c#24 integrate .. //depot/projects/hammer/sys/arm/arm/busdma_machdep.c#29 integrate .. //depot/projects/hammer/sys/arm/arm/cpufunc.c#18 integrate .. //depot/projects/hammer/sys/arm/arm/cpufunc_asm_feroceon.S#1 branch .. //depot/projects/hammer/sys/arm/arm/dump_machdep.c#6 integrate .. //depot/projects/hammer/sys/arm/arm/elf_machdep.c#9 integrate .. //depot/projects/hammer/sys/arm/arm/elf_trampoline.c#13 integrate .. //depot/projects/hammer/sys/arm/arm/genassym.c#11 integrate .. //depot/projects/hammer/sys/arm/arm/identcpu.c#12 integrate .. //depot/projects/hammer/sys/arm/arm/locore.S#19 integrate .. //depot/projects/hammer/sys/arm/arm/pmap.c#53 integrate .. //depot/projects/hammer/sys/arm/arm/swtch.S#22 integrate .. //depot/projects/hammer/sys/arm/arm/undefined.c#12 integrate .. //depot/projects/hammer/sys/arm/at91/at91.c#10 integrate .. //depot/projects/hammer/sys/arm/at91/at91_mci.c#7 integrate .. //depot/projects/hammer/sys/arm/at91/at91_spi.c#4 integrate .. //depot/projects/hammer/sys/arm/at91/if_ate.c#14 integrate .. //depot/projects/hammer/sys/arm/at91/uart_dev_at91usart.c#11 integrate .. //depot/projects/hammer/sys/arm/conf/AVILA#13 integrate .. //depot/projects/hammer/sys/arm/conf/BWCT#5 integrate .. //depot/projects/hammer/sys/arm/conf/CRB#6 integrate .. //depot/projects/hammer/sys/arm/conf/DB-78XXX#1 branch .. //depot/projects/hammer/sys/arm/conf/DB-88F5XXX#1 branch .. //depot/projects/hammer/sys/arm/conf/DB-88F6XXX#1 branch .. //depot/projects/hammer/sys/arm/conf/DEFAULTS#1 branch .. //depot/projects/hammer/sys/arm/conf/EP80219#7 integrate .. //depot/projects/hammer/sys/arm/conf/GUMSTIX#2 integrate .. //depot/projects/hammer/sys/arm/conf/HL200#5 integrate .. //depot/projects/hammer/sys/arm/conf/IQ31244#17 integrate .. //depot/projects/hammer/sys/arm/conf/KB920X#11 integrate .. //depot/projects/hammer/sys/arm/conf/NSLU#3 integrate .. //depot/projects/hammer/sys/arm/conf/SIMICS#14 integrate .. //depot/projects/hammer/sys/arm/conf/SKYEYE#7 integrate .. //depot/projects/hammer/sys/arm/include/armreg.h#7 integrate .. //depot/projects/hammer/sys/arm/include/bootinfo.h#1 branch .. //depot/projects/hammer/sys/arm/include/cpufunc.h#13 integrate .. //depot/projects/hammer/sys/arm/include/intr.h#11 integrate .. //depot/projects/hammer/sys/arm/include/metadata.h#3 integrate .. //depot/projects/hammer/sys/arm/include/resource.h#3 integrate .. //depot/projects/hammer/sys/arm/mv/bus_space.c#1 branch .. //depot/projects/hammer/sys/arm/mv/common.c#1 branch .. //depot/projects/hammer/sys/arm/mv/discovery/db78xxx.c#1 branch .. //depot/projects/hammer/sys/arm/mv/discovery/discovery.c#1 branch .. //depot/projects/hammer/sys/arm/mv/discovery/files.db78xxx#1 branch .. //depot/projects/hammer/sys/arm/mv/discovery/std.db78xxx#1 branch .. //depot/projects/hammer/sys/arm/mv/files.mv#1 branch .. //depot/projects/hammer/sys/arm/mv/gpio.c#1 branch .. //depot/projects/hammer/sys/arm/mv/ic.c#1 branch .. //depot/projects/hammer/sys/arm/mv/kirkwood/db88f6xxx.c#1 branch .. //depot/projects/hammer/sys/arm/mv/kirkwood/files.db88f6xxx#1 branch .. //depot/projects/hammer/sys/arm/mv/kirkwood/kirkwood.c#1 branch .. //depot/projects/hammer/sys/arm/mv/kirkwood/std.db88f6xxx#1 branch .. //depot/projects/hammer/sys/arm/mv/mv_machdep.c#1 branch .. //depot/projects/hammer/sys/arm/mv/mvreg.h#1 branch .. //depot/projects/hammer/sys/arm/mv/mvvar.h#1 branch .. //depot/projects/hammer/sys/arm/mv/obio.c#1 branch .. //depot/projects/hammer/sys/arm/mv/orion/db88f5xxx.c#1 branch .. //depot/projects/hammer/sys/arm/mv/orion/files.db88f5xxx#1 branch .. //depot/projects/hammer/sys/arm/mv/orion/orion.c#1 branch .. //depot/projects/hammer/sys/arm/mv/orion/std.db88f5xxx#1 branch .. //depot/projects/hammer/sys/arm/mv/rtc.c#1 branch .. //depot/projects/hammer/sys/arm/mv/std.mv#1 branch .. //depot/projects/hammer/sys/arm/mv/timer.c#1 branch .. //depot/projects/hammer/sys/arm/mv/twsi.c#1 branch .. //depot/projects/hammer/sys/arm/xscale/ixp425/avila_machdep.c#8 integrate .. //depot/projects/hammer/sys/arm/xscale/ixp425/if_npe.c#8 integrate .. //depot/projects/hammer/sys/boot/Makefile#23 integrate .. //depot/projects/hammer/sys/boot/arm/Makefile#2 integrate .. //depot/projects/hammer/sys/boot/arm/at91/boot2/boot2.c#7 integrate .. //depot/projects/hammer/sys/boot/arm/at91/boot2/centipad_board.c#2 integrate .. //depot/projects/hammer/sys/boot/arm/at91/boot2/kb920x_board.c#3 integrate .. //depot/projects/hammer/sys/boot/arm/ixp425/Makefile.inc#1 branch .. //depot/projects/hammer/sys/boot/arm/ixp425/boot2/Makefile#1 branch .. //depot/projects/hammer/sys/boot/arm/ixp425/boot2/arm_init.S#1 branch .. //depot/projects/hammer/sys/boot/arm/ixp425/boot2/boot2.c#1 branch .. //depot/projects/hammer/sys/boot/arm/ixp425/boot2/cf_ata.h#1 branch .. //depot/projects/hammer/sys/boot/arm/ixp425/boot2/ixp425_board.c#1 branch .. //depot/projects/hammer/sys/boot/arm/ixp425/boot2/lib.h#1 branch .. //depot/projects/hammer/sys/boot/arm/uboot/Makefile#1 branch .. //depot/projects/hammer/sys/boot/arm/uboot/conf.c#1 branch .. //depot/projects/hammer/sys/boot/arm/uboot/help.uboot#1 branch .. //depot/projects/hammer/sys/boot/arm/uboot/ldscript.arm#1 branch .. //depot/projects/hammer/sys/boot/arm/uboot/start.S#1 branch .. //depot/projects/hammer/sys/boot/arm/uboot/version#1 branch .. //depot/projects/hammer/sys/boot/common/Makefile.inc#13 integrate .. //depot/projects/hammer/sys/boot/common/load_elf.c#20 integrate .. //depot/projects/hammer/sys/boot/ficl/Makefile#16 integrate .. //depot/projects/hammer/sys/boot/forth/loader.conf#43 integrate .. //depot/projects/hammer/sys/boot/i386/libi386/bootinfo64.c#11 integrate .. //depot/projects/hammer/sys/boot/ofw/libofw/ofw_disk.c#8 integrate .. //depot/projects/hammer/sys/boot/powerpc/Makefile#4 integrate .. //depot/projects/hammer/sys/boot/powerpc/boot1.chrp/Makefile#1 branch .. //depot/projects/hammer/sys/boot/powerpc/boot1.chrp/Makefile.hfs#1 branch .. //depot/projects/hammer/sys/boot/powerpc/boot1.chrp/boot1.c#1 branch .. //depot/projects/hammer/sys/boot/powerpc/boot1.chrp/bootinfo.txt#1 branch .. //depot/projects/hammer/sys/boot/powerpc/boot1.chrp/generate-hfs.sh#1 branch .. //depot/projects/hammer/sys/boot/powerpc/boot1.chrp/hfs.tmpl.bz2.uu#1 branch .. //depot/projects/hammer/sys/boot/sparc64/loader/main.c#18 integrate .. //depot/projects/hammer/sys/boot/uboot/lib/api_public.h#3 integrate .. //depot/projects/hammer/sys/boot/uboot/lib/glue.c#4 integrate .. //depot/projects/hammer/sys/boot/uboot/lib/glue.h#4 integrate .. //depot/projects/hammer/sys/boot/uboot/lib/net.c#4 integrate .. //depot/projects/hammer/sys/cam/scsi/scsi_target.c#22 integrate .. //depot/projects/hammer/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_znode.c#5 integrate .. //depot/projects/hammer/sys/compat/freebsd32/freebsd32_misc.c#59 integrate .. //depot/projects/hammer/sys/compat/freebsd32/freebsd32_proto.h#59 integrate .. //depot/projects/hammer/sys/compat/freebsd32/freebsd32_syscall.h#56 integrate .. //depot/projects/hammer/sys/compat/freebsd32/freebsd32_syscalls.c#56 integrate .. //depot/projects/hammer/sys/compat/freebsd32/freebsd32_sysent.c#56 integrate .. //depot/projects/hammer/sys/compat/freebsd32/syscalls.master#61 integrate .. //depot/projects/hammer/sys/compat/linprocfs/linprocfs.c#44 integrate .. //depot/projects/hammer/sys/compat/linux/linux_futex.c#8 integrate .. //depot/projects/hammer/sys/compat/linux/linux_futex.h#5 integrate .. //depot/projects/hammer/sys/compat/linux/linux_ioctl.c#35 integrate .. //depot/projects/hammer/sys/compat/linux/linux_misc.c#55 integrate .. //depot/projects/hammer/sys/compat/linux/linux_signal.c#17 integrate .. //depot/projects/hammer/sys/compat/linux/linux_signal.h#3 integrate .. //depot/projects/hammer/sys/compat/linux/linux_socket.c#33 integrate .. //depot/projects/hammer/sys/compat/linux/linux_util.c#16 integrate .. //depot/projects/hammer/sys/compat/svr4/svr4_sockio.c#10 integrate .. //depot/projects/hammer/sys/conf/Makefile.arm#27 integrate .. //depot/projects/hammer/sys/conf/NOTES#152 integrate .. //depot/projects/hammer/sys/conf/files#189 integrate .. //depot/projects/hammer/sys/conf/files.arm#12 integrate .. //depot/projects/hammer/sys/conf/files.mips#4 integrate .. //depot/projects/hammer/sys/conf/files.powerpc#34 integrate .. //depot/projects/hammer/sys/conf/kmod.mk#68 integrate .. //depot/projects/hammer/sys/conf/ldscript.mips.cfe#3 integrate .. //depot/projects/hammer/sys/conf/newvers.sh#23 integrate .. //depot/projects/hammer/sys/conf/options#133 integrate .. //depot/projects/hammer/sys/conf/options.arm#15 integrate .. //depot/projects/hammer/sys/contrib/altq/altq/altq_cbq.c#5 integrate .. //depot/projects/hammer/sys/contrib/altq/altq/altq_cdnr.c#3 integrate .. //depot/projects/hammer/sys/contrib/altq/altq/altq_hfsc.c#4 integrate .. //depot/projects/hammer/sys/contrib/altq/altq/altq_priq.c#4 integrate .. //depot/projects/hammer/sys/contrib/altq/altq/altq_red.c#4 integrate .. //depot/projects/hammer/sys/contrib/altq/altq/altq_rio.c#4 integrate .. //depot/projects/hammer/sys/contrib/altq/altq/altq_rmclass.c#2 integrate .. //depot/projects/hammer/sys/contrib/altq/altq/altq_subr.c#9 integrate .. //depot/projects/hammer/sys/contrib/ipfilter/netinet/ip_auth.c#14 integrate .. //depot/projects/hammer/sys/contrib/ipfilter/netinet/ip_compat.h#18 integrate .. //depot/projects/hammer/sys/contrib/pf/net/pf.c#41 integrate .. //depot/projects/hammer/sys/contrib/pf/net/pf_if.c#14 integrate .. //depot/projects/hammer/sys/contrib/pf/net/pf_ioctl.c#33 integrate .. //depot/projects/hammer/sys/contrib/pf/net/pf_subr.c#6 integrate .. //depot/projects/hammer/sys/contrib/pf/net/pfvar.h#15 integrate .. //depot/projects/hammer/sys/contrib/rdma/rdma_cma.c#3 integrate .. //depot/projects/hammer/sys/ddb/db_textdump.c#6 integrate .. //depot/projects/hammer/sys/dev/adb/adb.h#1 branch .. //depot/projects/hammer/sys/dev/adb/adb_bus.c#1 branch .. //depot/projects/hammer/sys/dev/adb/adb_hb_if.m#1 branch .. //depot/projects/hammer/sys/dev/adb/adb_if.m#1 branch .. //depot/projects/hammer/sys/dev/adb/adb_kbd.c#1 branch .. //depot/projects/hammer/sys/dev/adb/adb_mouse.c#1 branch .. //depot/projects/hammer/sys/dev/adb/adbvar.h#1 branch .. //depot/projects/hammer/sys/dev/ae/if_ae.c#1 branch .. //depot/projects/hammer/sys/dev/ae/if_aereg.h#1 branch .. //depot/projects/hammer/sys/dev/ae/if_aevar.h#1 branch .. //depot/projects/hammer/sys/dev/age/if_age.c#5 integrate .. //depot/projects/hammer/sys/dev/age/if_agevar.h#2 integrate .. //depot/projects/hammer/sys/dev/agp/agp_i810.c#6 integrate .. //depot/projects/hammer/sys/dev/agp/agpreg.h#2 integrate .. //depot/projects/hammer/sys/dev/aha/aha_isa.c#17 integrate .. //depot/projects/hammer/sys/dev/aha/aha_mca.c#13 integrate .. //depot/projects/hammer/sys/dev/ar/if_ar.c#21 integrate .. //depot/projects/hammer/sys/dev/ata/ata-all.c#72 integrate .. //depot/projects/hammer/sys/dev/ata/ata-all.h#51 integrate .. //depot/projects/hammer/sys/dev/ata/ata-chipset.c#92 delete .. //depot/projects/hammer/sys/dev/ata/ata-dma.c#32 integrate .. //depot/projects/hammer/sys/dev/ata/ata-pci.c#49 integrate .. //depot/projects/hammer/sys/dev/ata/ata-pci.h#57 integrate .. //depot/projects/hammer/sys/dev/ata/ata-queue.c#40 integrate .. //depot/projects/hammer/sys/dev/ata/ata-sata.c#1 branch .. //depot/projects/hammer/sys/dev/ata/chipsets/ata-acard.c#1 branch .. //depot/projects/hammer/sys/dev/ata/chipsets/ata-acerlabs.c#1 branch .. //depot/projects/hammer/sys/dev/ata/chipsets/ata-adaptec.c#1 branch .. //depot/projects/hammer/sys/dev/ata/chipsets/ata-ahci.c#1 branch .. //depot/projects/hammer/sys/dev/ata/chipsets/ata-amd.c#1 branch .. //depot/projects/hammer/sys/dev/ata/chipsets/ata-ati.c#1 branch .. //depot/projects/hammer/sys/dev/ata/chipsets/ata-cenatek.c#1 branch .. //depot/projects/hammer/sys/dev/ata/chipsets/ata-cypress.c#1 branch .. //depot/projects/hammer/sys/dev/ata/chipsets/ata-cyrix.c#1 branch .. //depot/projects/hammer/sys/dev/ata/chipsets/ata-highpoint.c#1 branch .. //depot/projects/hammer/sys/dev/ata/chipsets/ata-intel.c#1 branch .. //depot/projects/hammer/sys/dev/ata/chipsets/ata-ite.c#1 branch .. //depot/projects/hammer/sys/dev/ata/chipsets/ata-jmicron.c#1 branch .. //depot/projects/hammer/sys/dev/ata/chipsets/ata-marvell.c#1 branch .. //depot/projects/hammer/sys/dev/ata/chipsets/ata-micron.c#1 branch .. //depot/projects/hammer/sys/dev/ata/chipsets/ata-national.c#1 branch .. //depot/projects/hammer/sys/dev/ata/chipsets/ata-netcell.c#1 branch .. //depot/projects/hammer/sys/dev/ata/chipsets/ata-nvidia.c#1 branch .. //depot/projects/hammer/sys/dev/ata/chipsets/ata-promise.c#1 branch .. //depot/projects/hammer/sys/dev/ata/chipsets/ata-serverworks.c#1 branch .. //depot/projects/hammer/sys/dev/ata/chipsets/ata-siliconimage.c#1 branch .. //depot/projects/hammer/sys/dev/ata/chipsets/ata-sis.c#1 branch .. //depot/projects/hammer/sys/dev/ata/chipsets/ata-via.c#1 branch .. //depot/projects/hammer/sys/dev/ath/ah_osdep.c#5 integrate .. //depot/projects/hammer/sys/dev/ath/ath_rate/amrr/amrr.c#14 integrate .. //depot/projects/hammer/sys/dev/ath/ath_rate/onoe/onoe.c#16 integrate .. //depot/projects/hammer/sys/dev/ath/ath_rate/sample/sample.c#14 integrate .. //depot/projects/hammer/sys/dev/ath/if_ath.c#62 integrate .. //depot/projects/hammer/sys/dev/ath/if_athrate.h#7 integrate .. //depot/projects/hammer/sys/dev/ath/if_athvar.h#34 integrate .. //depot/projects/hammer/sys/dev/atkbdc/psm.c#14 integrate .. //depot/projects/hammer/sys/dev/bge/if_bge.c#85 integrate .. //depot/projects/hammer/sys/dev/bge/if_bgereg.h#45 integrate .. //depot/projects/hammer/sys/dev/bm/if_bm.c#5 integrate .. //depot/projects/hammer/sys/dev/ce/if_ce.c#9 integrate .. //depot/projects/hammer/sys/dev/cfe/cfe_console.c#2 integrate .. //depot/projects/hammer/sys/dev/cfi/cfi_bus_lbc.c#1 branch .. //depot/projects/hammer/sys/dev/cfi/cfi_core.c#1 branch .. //depot/projects/hammer/sys/dev/cfi/cfi_dev.c#1 branch .. //depot/projects/hammer/sys/dev/cfi/cfi_reg.h#1 branch .. //depot/projects/hammer/sys/dev/cfi/cfi_var.h#1 branch .. //depot/projects/hammer/sys/dev/cxgb/cxgb_sge.c#24 integrate .. //depot/projects/hammer/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb.c#4 integrate .. //depot/projects/hammer/sys/dev/cxgb/ulp/tom/cxgb_cpl_io.c#12 integrate .. //depot/projects/hammer/sys/dev/cxgb/ulp/tom/cxgb_cpl_socket.c#12 integrate .. //depot/projects/hammer/sys/dev/cxgb/ulp/tom/cxgb_ddp.c#8 integrate .. //depot/projects/hammer/sys/dev/cxgb/ulp/tom/cxgb_vm.c#3 integrate .. //depot/projects/hammer/sys/dev/cxgb/ulp/tom/cxgb_vm.h#2 integrate .. //depot/projects/hammer/sys/dev/drm/ati_pcigart.c#6 integrate .. //depot/projects/hammer/sys/dev/drm/drm.h#13 integrate .. //depot/projects/hammer/sys/dev/drm/drmP.h#18 integrate .. //depot/projects/hammer/sys/dev/drm/drm_agpsupport.c#9 integrate .. //depot/projects/hammer/sys/dev/drm/drm_atomic.h#3 integrate .. //depot/projects/hammer/sys/dev/drm/drm_auth.c#4 integrate .. //depot/projects/hammer/sys/dev/drm/drm_bufs.c#6 integrate .. //depot/projects/hammer/sys/dev/drm/drm_context.c#4 integrate .. //depot/projects/hammer/sys/dev/drm/drm_dma.c#4 integrate .. //depot/projects/hammer/sys/dev/drm/drm_drawable.c#4 integrate .. //depot/projects/hammer/sys/dev/drm/drm_drv.c#8 integrate .. //depot/projects/hammer/sys/dev/drm/drm_fops.c#5 integrate .. //depot/projects/hammer/sys/dev/drm/drm_ioctl.c#4 integrate .. //depot/projects/hammer/sys/dev/drm/drm_irq.c#5 integrate .. //depot/projects/hammer/sys/dev/drm/drm_linux_list.h#5 integrate .. //depot/projects/hammer/sys/dev/drm/drm_lock.c#4 integrate .. //depot/projects/hammer/sys/dev/drm/drm_memory.c#4 integrate .. //depot/projects/hammer/sys/dev/drm/drm_pci.c#5 integrate .. //depot/projects/hammer/sys/dev/drm/drm_pciids.h#10 integrate .. //depot/projects/hammer/sys/dev/drm/drm_scatter.c#5 integrate .. //depot/projects/hammer/sys/dev/drm/drm_sysctl.c#4 integrate .. //depot/projects/hammer/sys/dev/drm/drm_vm.c#4 integrate .. //depot/projects/hammer/sys/dev/drm/i915_dma.c#10 integrate .. //depot/projects/hammer/sys/dev/drm/i915_drm.h#6 integrate .. //depot/projects/hammer/sys/dev/drm/i915_drv.c#6 integrate .. //depot/projects/hammer/sys/dev/drm/i915_drv.h#6 integrate .. //depot/projects/hammer/sys/dev/drm/i915_irq.c#6 integrate .. //depot/projects/hammer/sys/dev/drm/i915_suspend.c#2 integrate .. //depot/projects/hammer/sys/dev/drm/mach64_drv.c#5 integrate .. //depot/projects/hammer/sys/dev/drm/mga_drv.c#12 integrate .. //depot/projects/hammer/sys/dev/drm/r128_drv.c#11 integrate .. //depot/projects/hammer/sys/dev/drm/radeon_cp.c#17 integrate .. //depot/projects/hammer/sys/dev/drm/radeon_drv.c#12 integrate .. //depot/projects/hammer/sys/dev/drm/radeon_drv.h#15 integrate .. //depot/projects/hammer/sys/dev/drm/savage_drv.c#5 integrate .. //depot/projects/hammer/sys/dev/drm/sis_drv.c#9 integrate .. //depot/projects/hammer/sys/dev/drm/tdfx_drv.c#11 integrate .. //depot/projects/hammer/sys/dev/firewire/firewire.c#43 integrate .. //depot/projects/hammer/sys/dev/hptiop/hptiop.h#3 integrate .. //depot/projects/hammer/sys/dev/hwpmc/hwpmc_amd.c#13 integrate .. //depot/projects/hammer/sys/dev/hwpmc/hwpmc_logging.c#10 integrate .. //depot/projects/hammer/sys/dev/hwpmc/hwpmc_mod.c#25 integrate .. //depot/projects/hammer/sys/dev/hwpmc/hwpmc_piv.c#13 integrate .. //depot/projects/hammer/sys/dev/hwpmc/hwpmc_ppro.c#9 integrate .. //depot/projects/hammer/sys/dev/hwpmc/hwpmc_x86.c#9 integrate .. //depot/projects/hammer/sys/dev/hwpmc/pmc_events.h#3 integrate .. //depot/projects/hammer/sys/dev/if_ndis/if_ndis.c#65 integrate .. //depot/projects/hammer/sys/dev/if_ndis/if_ndisvar.h#26 integrate .. //depot/projects/hammer/sys/dev/iwn/if_iwn.c#4 integrate .. //depot/projects/hammer/sys/dev/jme/if_jme.c#5 integrate .. //depot/projects/hammer/sys/dev/jme/if_jmereg.h#4 integrate .. //depot/projects/hammer/sys/dev/lmc/if_lmc.c#13 integrate .. //depot/projects/hammer/sys/dev/mge/if_mge.c#1 branch .. //depot/projects/hammer/sys/dev/mge/if_mgevar.h#1 branch .. //depot/projects/hammer/sys/dev/mii/atphy.c#2 integrate .. //depot/projects/hammer/sys/dev/mii/ciphy.c#10 integrate .. //depot/projects/hammer/sys/dev/mii/e1000phy.c#15 integrate .. //depot/projects/hammer/sys/dev/mii/miidevs#28 integrate .. //depot/projects/hammer/sys/dev/mmc/bridge.h#3 integrate .. //depot/projects/hammer/sys/dev/mmc/mmc.c#4 integrate .. //depot/projects/hammer/sys/dev/mmc/mmcbrvar.h#4 integrate .. //depot/projects/hammer/sys/dev/mmc/mmcreg.h#4 integrate .. //depot/projects/hammer/sys/dev/mmc/mmcsd.c#6 integrate .. //depot/projects/hammer/sys/dev/mmc/mmcvar.h#4 integrate .. //depot/projects/hammer/sys/dev/mxge/eth_z8e.h#4 integrate .. //depot/projects/hammer/sys/dev/mxge/ethp_z8e.h#4 integrate .. //depot/projects/hammer/sys/dev/mxge/mxge_mcp.h#8 integrate .. //depot/projects/hammer/sys/dev/mxge/rss_eth_z8e.h#2 integrate .. //depot/projects/hammer/sys/dev/mxge/rss_ethp_z8e.h#2 integrate .. //depot/projects/hammer/sys/dev/nfe/if_nfe.c#12 integrate .. //depot/projects/hammer/sys/dev/nfe/if_nfereg.h#6 integrate .. //depot/projects/hammer/sys/dev/nfe/if_nfevar.h#6 integrate .. //depot/projects/hammer/sys/dev/ofw/ofw_console.c#26 integrate .. //depot/projects/hammer/sys/dev/pccbb/pccbb_pci.c#19 integrate .. //depot/projects/hammer/sys/dev/pci/pci.c#68 integrate .. //depot/projects/hammer/sys/dev/pci/pcireg.h#21 integrate .. //depot/projects/hammer/sys/dev/powermac_nvram/powermac_nvram.c#4 integrate .. //depot/projects/hammer/sys/dev/ppbus/if_plip.c#19 integrate .. //depot/projects/hammer/sys/dev/ppbus/immio.c#4 integrate .. //depot/projects/hammer/sys/dev/ppbus/lpbb.c#6 integrate .. //depot/projects/hammer/sys/dev/ppbus/lpt.c#17 integrate .. //depot/projects/hammer/sys/dev/ppbus/pcfclock.c#12 integrate .. //depot/projects/hammer/sys/dev/ppbus/ppb_base.c#3 integrate .. //depot/projects/hammer/sys/dev/ppbus/ppb_msq.c#3 integrate .. //depot/projects/hammer/sys/dev/ppbus/ppbconf.c#8 integrate .. //depot/projects/hammer/sys/dev/ppbus/ppbconf.h#5 integrate .. //depot/projects/hammer/sys/dev/ppbus/ppi.c#14 integrate .. //depot/projects/hammer/sys/dev/ppbus/pps.c#16 integrate .. //depot/projects/hammer/sys/dev/ppbus/vpo.c#11 integrate .. //depot/projects/hammer/sys/dev/ppbus/vpoio.c#5 integrate .. //depot/projects/hammer/sys/dev/ppbus/vpoio.h#2 integrate .. //depot/projects/hammer/sys/dev/ppc/ppc.c#15 integrate .. //depot/projects/hammer/sys/dev/ppc/ppcreg.h#5 integrate .. //depot/projects/hammer/sys/dev/puc/pucdata.c#34 integrate .. //depot/projects/hammer/sys/dev/ral/rt2560.c#16 integrate .. //depot/projects/hammer/sys/dev/ral/rt2661.c#15 integrate .. //depot/projects/hammer/sys/dev/ray/if_ray.c#26 integrate .. //depot/projects/hammer/sys/dev/ray/if_rayvar.h#7 integrate .. //depot/projects/hammer/sys/dev/sdhci/sdhci.c#1 branch .. //depot/projects/hammer/sys/dev/sdhci/sdhci.h#1 branch .. //depot/projects/hammer/sys/dev/sio/sio.c#62 integrate .. //depot/projects/hammer/sys/dev/sound/pci/hda/hdac.c#22 integrate .. //depot/projects/hammer/sys/dev/sr/if_sr.c#22 integrate .. //depot/projects/hammer/sys/dev/sym/sym_hipd.c#30 integrate .. //depot/projects/hammer/sys/dev/twa/tw_osl_freebsd.c#10 integrate .. //depot/projects/hammer/sys/dev/uart/uart_bus_mbus.c#1 branch .. //depot/projects/hammer/sys/dev/uart/uart_cpu_mv.c#1 branch .. //depot/projects/hammer/sys/dev/uart/uart_tty.c#24 integrate .. //depot/projects/hammer/sys/dev/usb/ehci.c#37 integrate .. //depot/projects/hammer/sys/dev/usb/ehci_mbus.c#1 branch .. //depot/projects/hammer/sys/dev/usb/ehci_pci.c#30 integrate .. //depot/projects/hammer/sys/dev/usb/ehcivar.h#15 integrate .. //depot/projects/hammer/sys/dev/usb/if_zyd.c#16 integrate .. //depot/projects/hammer/sys/dev/usb/ohci_pci.c#20 integrate .. //depot/projects/hammer/sys/dev/usb/slhci_pccard.c#5 integrate .. //depot/projects/hammer/sys/dev/usb/u3g.c#1 branch .. //depot/projects/hammer/sys/dev/usb/uark.c#5 integrate .. //depot/projects/hammer/sys/dev/usb/ubsa.c#25 integrate .. //depot/projects/hammer/sys/dev/usb/ucom.c#29 integrate .. //depot/projects/hammer/sys/dev/usb/udbp.c#14 integrate .. //depot/projects/hammer/sys/dev/usb/ufoma.c#8 integrate .. //depot/projects/hammer/sys/dev/usb/uhci_pci.c#20 integrate .. //depot/projects/hammer/sys/dev/usb/ukbd.c#23 integrate .. //depot/projects/hammer/sys/dev/usb/umass.c#52 integrate .. //depot/projects/hammer/sys/dev/usb/umct.c#12 integrate .. //depot/projects/hammer/sys/dev/usb/usb_quirks.c#25 integrate .. //depot/projects/hammer/sys/dev/usb/usbdevs#111 integrate .. //depot/projects/hammer/sys/dev/wpi/if_wpi.c#12 integrate .. //depot/projects/hammer/sys/dev/xen/console/console.c#3 integrate .. //depot/projects/hammer/sys/fs/cd9660/cd9660_node.c#3 integrate .. //depot/projects/hammer/sys/fs/cd9660/cd9660_rrip.c#5 integrate .. //depot/projects/hammer/sys/fs/cd9660/cd9660_vfsops.c#7 integrate .. //depot/projects/hammer/sys/fs/cd9660/cd9660_vnops.c#5 integrate .. //depot/projects/hammer/sys/fs/fdescfs/fdesc_vfsops.c#20 integrate .. //depot/projects/hammer/sys/fs/fdescfs/fdesc_vnops.c#27 integrate .. //depot/projects/hammer/sys/fs/fifofs/fifo_vnops.c#45 integrate .. //depot/projects/hammer/sys/fs/hpfs/hpfs_subr.c#4 integrate .. //depot/projects/hammer/sys/fs/hpfs/hpfs_vfsops.c#28 integrate .. //depot/projects/hammer/sys/fs/hpfs/hpfs_vnops.c#28 integrate .. //depot/projects/hammer/sys/fs/msdosfs/msdosfs_denode.c#30 integrate .. //depot/projects/hammer/sys/fs/msdosfs/msdosfs_vfsops.c#54 integrate .. //depot/projects/hammer/sys/fs/msdosfs/msdosfs_vnops.c#41 integrate .. //depot/projects/hammer/sys/fs/ntfs/ntfs_subr.c#19 integrate .. //depot/projects/hammer/sys/fs/ntfs/ntfs_vfsops.c#36 integrate .. //depot/projects/hammer/sys/fs/ntfs/ntfs_vnops.c#25 integrate .. //depot/projects/hammer/sys/fs/nullfs/null_subr.c#20 integrate .. //depot/projects/hammer/sys/fs/nullfs/null_vnops.c#33 integrate .. //depot/projects/hammer/sys/fs/nwfs/nwfs_io.c#20 integrate .. //depot/projects/hammer/sys/fs/nwfs/nwfs_node.c#19 integrate .. //depot/projects/hammer/sys/fs/nwfs/nwfs_vfsops.c#21 integrate .. //depot/projects/hammer/sys/fs/portalfs/portal_vfsops.c#19 integrate .. //depot/projects/hammer/sys/fs/portalfs/portal_vnops.c#19 integrate .. //depot/projects/hammer/sys/fs/procfs/procfs_map.c#13 integrate .. //depot/projects/hammer/sys/fs/pseudofs/pseudofs.c#16 integrate .. //depot/projects/hammer/sys/fs/pseudofs/pseudofs_vncache.c#20 integrate .. //depot/projects/hammer/sys/fs/smbfs/smbfs_io.c#23 integrate .. //depot/projects/hammer/sys/fs/smbfs/smbfs_node.c#29 integrate .. //depot/projects/hammer/sys/fs/smbfs/smbfs_vfsops.c#28 integrate .. //depot/projects/hammer/sys/fs/udf/udf_vfsops.c#34 integrate .. //depot/projects/hammer/sys/fs/udf/udf_vnops.c#42 integrate .. //depot/projects/hammer/sys/fs/unionfs/union_subr.c#33 integrate .. //depot/projects/hammer/sys/geom/geom_disk.c#41 integrate .. //depot/projects/hammer/sys/geom/geom_vfs.c#10 integrate .. //depot/projects/hammer/sys/geom/geom_vfs.h#4 integrate .. //depot/projects/hammer/sys/geom/part/g_part_bsd.c#8 integrate .. //depot/projects/hammer/sys/geom/part/g_part_pc98.c#6 integrate .. //depot/projects/hammer/sys/geom/part/g_part_vtoc8.c#5 integrate .. //depot/projects/hammer/sys/geom/vinum/geom_vinum.c#17 integrate .. //depot/projects/hammer/sys/geom/vinum/geom_vinum.h#12 integrate .. //depot/projects/hammer/sys/geom/vinum/geom_vinum_drive.c#22 integrate .. //depot/projects/hammer/sys/geom/vinum/geom_vinum_init.c#12 integrate .. //depot/projects/hammer/sys/geom/vinum/geom_vinum_plex.c#16 integrate .. //depot/projects/hammer/sys/geom/vinum/geom_vinum_raid5.c#9 integrate .. //depot/projects/hammer/sys/geom/vinum/geom_vinum_rm.c#12 integrate .. //depot/projects/hammer/sys/geom/vinum/geom_vinum_state.c#9 integrate .. //depot/projects/hammer/sys/geom/vinum/geom_vinum_subr.c#16 integrate .. //depot/projects/hammer/sys/geom/vinum/geom_vinum_var.h#12 integrate .. //depot/projects/hammer/sys/geom/vinum/geom_vinum_volume.c#13 integrate .. //depot/projects/hammer/sys/gnu/fs/ext2fs/ext2_inode.c#6 integrate .. //depot/projects/hammer/sys/gnu/fs/ext2fs/ext2_lookup.c#7 integrate .. //depot/projects/hammer/sys/gnu/fs/ext2fs/ext2_vfsops.c#20 integrate .. //depot/projects/hammer/sys/gnu/fs/reiserfs/reiserfs_inode.c#6 integrate .. //depot/projects/hammer/sys/gnu/fs/reiserfs/reiserfs_vfsops.c#10 integrate .. //depot/projects/hammer/sys/gnu/fs/xfs/FreeBSD/xfs_buf.c#4 integrate .. //depot/projects/hammer/sys/gnu/fs/xfs/FreeBSD/xfs_mountops.c#10 integrate .. //depot/projects/hammer/sys/gnu/fs/xfs/FreeBSD/xfs_super.c#6 integrate .. //depot/projects/hammer/sys/i386/conf/GENERIC#73 integrate .. //depot/projects/hammer/sys/i386/conf/NOTES#108 integrate .. //depot/projects/hammer/sys/i386/cpufreq/powernow.c#6 integrate .. //depot/projects/hammer/sys/i386/i386/apic_vector.s#20 integrate .. //depot/projects/hammer/sys/i386/i386/dump_machdep.c#15 integrate .. //depot/projects/hammer/sys/i386/i386/identcpu.c#46 integrate .. //depot/projects/hammer/sys/i386/i386/initcpu.c#20 integrate .. //depot/projects/hammer/sys/i386/i386/local_apic.c#39 integrate .. //depot/projects/hammer/sys/i386/i386/minidump_machdep.c#7 integrate .. //depot/projects/hammer/sys/i386/i386/sys_machdep.c#29 integrate .. //depot/projects/hammer/sys/i386/i386/trap.c#63 integrate .. //depot/projects/hammer/sys/i386/i386/tsc.c#12 integrate .. //depot/projects/hammer/sys/i386/i386/vm_machdep.c#64 integrate .. //depot/projects/hammer/sys/i386/include/apicvar.h#23 integrate .. //depot/projects/hammer/sys/i386/include/clock.h#20 integrate .. //depot/projects/hammer/sys/i386/include/cpufunc.h#16 integrate .. //depot/projects/hammer/sys/i386/include/md_var.h#21 integrate .. //depot/projects/hammer/sys/i386/include/param.h#16 integrate .. //depot/projects/hammer/sys/i386/include/pcpu.h#20 integrate .. //depot/projects/hammer/sys/i386/include/smp.h#21 integrate .. //depot/projects/hammer/sys/i386/include/specialreg.h#20 integrate .. //depot/projects/hammer/sys/i386/include/trap.h#5 integrate .. //depot/projects/hammer/sys/i386/include/xen/evtchn.h#3 integrate .. //depot/projects/hammer/sys/i386/include/xen/xen-os.h#2 integrate .. //depot/projects/hammer/sys/i386/include/xen/xen_intr.h#2 integrate .. //depot/projects/hammer/sys/i386/include/xen/xenfunc.h#2 integrate .. //depot/projects/hammer/sys/i386/isa/prof_machdep.c#12 integrate .. //depot/projects/hammer/sys/i386/linux/linux.h#12 integrate .. //depot/projects/hammer/sys/i386/linux/linux_sysvec.c#35 integrate .. //depot/projects/hammer/sys/i386/xen/clock.c#2 integrate .. //depot/projects/hammer/sys/i386/xen/exception.s#2 integrate .. //depot/projects/hammer/sys/i386/xen/locore.s#2 integrate .. //depot/projects/hammer/sys/i386/xen/mp_machdep.c#3 integrate .. //depot/projects/hammer/sys/i386/xen/xen_machdep.c#5 integrate .. //depot/projects/hammer/sys/ia64/ia64/dump_machdep.c#12 integrate .. //depot/projects/hammer/sys/ia64/ia64/mp_machdep.c#24 integrate .. //depot/projects/hammer/sys/ia64/ia64/sscdisk.c#14 integrate .. //depot/projects/hammer/sys/kern/imgact_elf.c#49 integrate .. //depot/projects/hammer/sys/kern/kern_descrip.c#85 integrate .. //depot/projects/hammer/sys/kern/kern_event.c#54 integrate .. //depot/projects/hammer/sys/kern/kern_exit.c#75 integrate .. //depot/projects/hammer/sys/kern/kern_fork.c#74 integrate .. //depot/projects/hammer/sys/kern/kern_jail.c#34 integrate .. //depot/projects/hammer/sys/kern/kern_linker.c#39 integrate .. //depot/projects/hammer/sys/kern/kern_lockf.c#22 integrate .. //depot/projects/hammer/sys/kern/kern_mib.c#23 integrate .. //depot/projects/hammer/sys/kern/kern_mtxpool.c#7 integrate .. //depot/projects/hammer/sys/kern/kern_proc.c#72 integrate .. //depot/projects/hammer/sys/kern/kern_prot.c#32 integrate .. //depot/projects/hammer/sys/kern/kern_resource.c#42 integrate .. //depot/projects/hammer/sys/kern/kern_shutdown.c#56 integrate .. //depot/projects/hammer/sys/kern/kern_sig.c#93 integrate .. //depot/projects/hammer/sys/kern/kern_synch.c#71 integrate .. //depot/projects/hammer/sys/kern/kern_thr.c#43 integrate .. //depot/projects/hammer/sys/kern/kern_thread.c#110 integrate .. //depot/projects/hammer/sys/kern/kern_time.c#31 integrate .. //depot/projects/hammer/sys/kern/kern_timeout.c#32 integrate .. //depot/projects/hammer/sys/kern/kern_uuid.c#14 integrate .. //depot/projects/hammer/sys/kern/kern_xxx.c#18 integrate .. //depot/projects/hammer/sys/kern/subr_blist.c#7 integrate .. //depot/projects/hammer/sys/kern/subr_bus.c#63 integrate .. //depot/projects/hammer/sys/kern/subr_firmware.c#7 integrate .. //depot/projects/hammer/sys/kern/subr_param.c#19 integrate .. //depot/projects/hammer/sys/kern/subr_rman.c#27 integrate .. //depot/projects/hammer/sys/kern/subr_sleepqueue.c#34 integrate .. //depot/projects/hammer/sys/kern/subr_stack.c#6 integrate .. //depot/projects/hammer/sys/kern/subr_trap.c#45 integrate .. //depot/projects/hammer/sys/kern/subr_witness.c#78 integrate .. //depot/projects/hammer/sys/kern/sys_process.c#45 integrate .. //depot/projects/hammer/sys/kern/sys_socket.c#24 integrate .. //depot/projects/hammer/sys/kern/tty.c#64 integrate .. //depot/projects/hammer/sys/kern/uipc_accf.c#10 integrate .. //depot/projects/hammer/sys/kern/uipc_mqueue.c#18 integrate .. //depot/projects/hammer/sys/kern/uipc_sockbuf.c#11 integrate .. //depot/projects/hammer/sys/kern/uipc_socket.c#87 integrate .. //depot/projects/hammer/sys/kern/uipc_syscalls.c#74 integrate .. //depot/projects/hammer/sys/kern/uipc_usrreq.c#59 integrate .. //depot/projects/hammer/sys/kern/vfs_bio.c#92 integrate .. //depot/projects/hammer/sys/kern/vfs_export.c#20 integrate .. //depot/projects/hammer/sys/kern/vfs_lookup.c#38 integrate .. //depot/projects/hammer/sys/kern/vfs_mount.c#99 integrate .. //depot/projects/hammer/sys/kern/vfs_subr.c#135 integrate .. //depot/projects/hammer/sys/kern/vfs_syscalls.c#84 integrate .. //depot/projects/hammer/sys/kern/vfs_vnops.c#59 integrate .. //depot/projects/hammer/sys/kern/vnode_if.src#29 integrate .. //depot/projects/hammer/sys/libkern/qdivrem.c#4 integrate .. //depot/projects/hammer/sys/mips/conf/ADM5120#4 integrate .. //depot/projects/hammer/sys/mips/conf/DEFAULTS#1 branch .. //depot/projects/hammer/sys/mips/conf/IDT#5 integrate .. //depot/projects/hammer/sys/mips/conf/MALTA#4 integrate .. //depot/projects/hammer/sys/mips/conf/QEMU#3 integrate .. //depot/projects/hammer/sys/mips/conf/SENTRY5#4 integrate .. //depot/projects/hammer/sys/mips/mips/machdep.c#4 integrate .. //depot/projects/hammer/sys/mips/mips/pmap.c#6 integrate .. //depot/projects/hammer/sys/modules/Makefile#133 integrate .. //depot/projects/hammer/sys/modules/ae/Makefile#1 branch .. //depot/projects/hammer/sys/modules/ata/Makefile#3 integrate .. //depot/projects/hammer/sys/modules/ata/ata/Makefile#2 delete .. //depot/projects/hammer/sys/modules/ata/atacore/Makefile#1 branch .. //depot/projects/hammer/sys/modules/ata/atadevel/Makefile#1 branch .. //depot/projects/hammer/sys/modules/ata/atadevel/ata-devel.c#1 branch .. //depot/projects/hammer/sys/modules/ata/atapci/Makefile#2 integrate .. //depot/projects/hammer/sys/modules/ata/atapci/Makefile.inc#1 branch .. //depot/projects/hammer/sys/modules/ata/atapci/chipsets/Makefile#1 branch .. //depot/projects/hammer/sys/modules/ata/atapci/chipsets/Makefile.inc#1 branch .. //depot/projects/hammer/sys/modules/ata/atapci/chipsets/ataacard/Makefile#1 branch .. //depot/projects/hammer/sys/modules/ata/atapci/chipsets/ataacerlabs/Makefile#1 branch .. //depot/projects/hammer/sys/modules/ata/atapci/chipsets/ataadaptec/Makefile#1 branch .. //depot/projects/hammer/sys/modules/ata/atapci/chipsets/ataahci/Makefile#1 branch .. //depot/projects/hammer/sys/modules/ata/atapci/chipsets/ataamd/Makefile#1 branch .. //depot/projects/hammer/sys/modules/ata/atapci/chipsets/ataati/Makefile#1 branch .. //depot/projects/hammer/sys/modules/ata/atapci/chipsets/atacenatek/Makefile#1 branch .. //depot/projects/hammer/sys/modules/ata/atapci/chipsets/atacypress/Makefile#1 branch .. //depot/projects/hammer/sys/modules/ata/atapci/chipsets/atacyrix/Makefile#1 branch .. //depot/projects/hammer/sys/modules/ata/atapci/chipsets/atahighpoint/Makefile#1 branch .. //depot/projects/hammer/sys/modules/ata/atapci/chipsets/ataintel/Makefile#1 branch .. //depot/projects/hammer/sys/modules/ata/atapci/chipsets/ataite/Makefile#1 branch .. //depot/projects/hammer/sys/modules/ata/atapci/chipsets/atajmicron/Makefile#1 branch .. //depot/projects/hammer/sys/modules/ata/atapci/chipsets/atamarvell/Makefile#1 branch .. //depot/projects/hammer/sys/modules/ata/atapci/chipsets/atamicron/Makefile#1 branch .. //depot/projects/hammer/sys/modules/ata/atapci/chipsets/atanational/Makefile#1 branch .. //depot/projects/hammer/sys/modules/ata/atapci/chipsets/atanetcell/Makefile#1 branch .. //depot/projects/hammer/sys/modules/ata/atapci/chipsets/atanvidia/Makefile#1 branch .. //depot/projects/hammer/sys/modules/ata/atapci/chipsets/atapromise/Makefile#1 branch .. //depot/projects/hammer/sys/modules/ata/atapci/chipsets/ataserverworks/Makefile#1 branch .. //depot/projects/hammer/sys/modules/ata/atapci/chipsets/atasiliconimage/Makefile#1 branch .. //depot/projects/hammer/sys/modules/ata/atapci/chipsets/atasis/Makefile#1 branch .. //depot/projects/hammer/sys/modules/ata/atapci/chipsets/atavia/Makefile#1 branch .. //depot/projects/hammer/sys/modules/ehci/Makefile#1 branch .. //depot/projects/hammer/sys/modules/mac_bsdextended/Makefile#2 integrate .. //depot/projects/hammer/sys/modules/ohci/Makefile#1 branch .. //depot/projects/hammer/sys/modules/sdhci/Makefile#1 branch .. //depot/projects/hammer/sys/modules/slhci/Makefile#3 integrate .. //depot/projects/hammer/sys/modules/u3g/Makefile#1 branch .. //depot/projects/hammer/sys/modules/uhci/Makefile#1 branch .. //depot/projects/hammer/sys/modules/usb/Makefile#9 integrate .. //depot/projects/hammer/sys/modules/wpifw/Makefile#2 integrate .. //depot/projects/hammer/sys/net/bpf.c#65 integrate .. //depot/projects/hammer/sys/net/bridgestp.c#19 integrate .. //depot/projects/hammer/sys/net/bsd_comp.c#9 integrate .. //depot/projects/hammer/sys/net/if.c#80 integrate .. //depot/projects/hammer/sys/net/if_arcsubr.c#21 integrate .. //depot/projects/hammer/sys/net/if_bridge.c#44 integrate .. //depot/projects/hammer/sys/net/if_ef.c#19 integrate .. //depot/projects/hammer/sys/net/if_ethersubr.c#75 integrate .. //depot/projects/hammer/sys/net/if_faith.c#26 integrate .. //depot/projects/hammer/sys/net/if_fddisubr.c#24 integrate .. //depot/projects/hammer/sys/net/if_gif.c#32 integrate .. //depot/projects/hammer/sys/net/if_gif.h#11 integrate .. //depot/projects/hammer/sys/net/if_gre.c#40 integrate .. //depot/projects/hammer/sys/net/if_iso88025subr.c#24 integrate .. //depot/projects/hammer/sys/net/if_loop.c#38 integrate .. //depot/projects/hammer/sys/net/if_mib.c#10 integrate .. //depot/projects/hammer/sys/net/if_ppp.c#33 integrate .. //depot/projects/hammer/sys/net/if_sl.c#28 integrate .. //depot/projects/hammer/sys/net/if_spppsubr.c#28 integrate .. //depot/projects/hammer/sys/net/if_stf.c#32 integrate .. //depot/projects/hammer/sys/net/if_tap.c#37 integrate .. //depot/projects/hammer/sys/net/if_tun.c#35 integrate .. //depot/projects/hammer/sys/net/if_var.h#50 integrate .. //depot/projects/hammer/sys/net/if_vlan.c#45 integrate .. //depot/projects/hammer/sys/net/ppp_deflate.c#6 integrate .. //depot/projects/hammer/sys/net/raw_cb.c#16 integrate .. //depot/projects/hammer/sys/net/raw_usrreq.c#20 integrate .. //depot/projects/hammer/sys/net/route.c#39 integrate .. //depot/projects/hammer/sys/net/rtsock.c#41 integrate .. //depot/projects/hammer/sys/net/vnet.h#1 branch .. //depot/projects/hammer/sys/net80211/_ieee80211.h#14 integrate .. //depot/projects/hammer/sys/net80211/ieee80211.c#37 integrate .. //depot/projects/hammer/sys/net80211/ieee80211_acl.c#7 integrate .. //depot/projects/hammer/sys/net80211/ieee80211_adhoc.c#4 integrate .. //depot/projects/hammer/sys/net80211/ieee80211_crypto.c#17 integrate .. //depot/projects/hammer/sys/net80211/ieee80211_crypto_ccmp.c#11 integrate .. //depot/projects/hammer/sys/net80211/ieee80211_crypto_tkip.c#12 integrate .. //depot/projects/hammer/sys/net80211/ieee80211_crypto_wep.c#10 integrate .. //depot/projects/hammer/sys/net80211/ieee80211_ddb.c#6 integrate .. //depot/projects/hammer/sys/net80211/ieee80211_freebsd.c#19 integrate .. //depot/projects/hammer/sys/net80211/ieee80211_freebsd.h#18 integrate .. //depot/projects/hammer/sys/net80211/ieee80211_hostap.c#4 integrate .. //depot/projects/hammer/sys/net80211/ieee80211_ht.c#14 integrate .. //depot/projects/hammer/sys/net80211/ieee80211_ht.h#9 integrate .. //depot/projects/hammer/sys/net80211/ieee80211_input.c#44 integrate .. //depot/projects/hammer/sys/net80211/ieee80211_ioctl.c#41 integrate .. //depot/projects/hammer/sys/net80211/ieee80211_node.c#50 integrate .. //depot/projects/hammer/sys/net80211/ieee80211_node.h#29 integrate .. //depot/projects/hammer/sys/net80211/ieee80211_output.c#39 integrate .. //depot/projects/hammer/sys/net80211/ieee80211_power.c#4 integrate .. //depot/projects/hammer/sys/net80211/ieee80211_power.h#3 integrate .. //depot/projects/hammer/sys/net80211/ieee80211_proto.c#36 integrate .. //depot/projects/hammer/sys/net80211/ieee80211_proto.h#23 integrate .. //depot/projects/hammer/sys/net80211/ieee80211_regdomain.c#4 integrate .. //depot/projects/hammer/sys/net80211/ieee80211_scan.c#7 integrate .. //depot/projects/hammer/sys/net80211/ieee80211_scan_sta.c#10 integrate .. //depot/projects/hammer/sys/net80211/ieee80211_sta.c#4 integrate .. //depot/projects/hammer/sys/net80211/ieee80211_var.h#37 integrate .. //depot/projects/hammer/sys/netatalk/ddp_pcb.c#11 integrate .. //depot/projects/hammer/sys/netgraph/atm/ng_atm.c#16 integrate .. //depot/projects/hammer/sys/netgraph/atm/sscfu/ng_sscfu_cust.h#3 integrate .. //depot/projects/hammer/sys/netgraph/bluetooth/drivers/h4/ng_h4.c#16 integrate .. //depot/projects/hammer/sys/netgraph/bluetooth/drivers/ubt/ng_ubt.c#24 integrate .. //depot/projects/hammer/sys/netgraph/bluetooth/hci/ng_hci_main.c#7 integrate .. //depot/projects/hammer/sys/netgraph/bluetooth/hci/ng_hci_misc.c#10 integrate .. //depot/projects/hammer/sys/netgraph/bluetooth/l2cap/ng_l2cap_main.c#6 integrate .. //depot/projects/hammer/sys/netgraph/bluetooth/l2cap/ng_l2cap_misc.c#12 integrate .. //depot/projects/hammer/sys/netgraph/bluetooth/l2cap/ng_l2cap_misc.h#7 integrate .. //depot/projects/hammer/sys/netgraph/bluetooth/socket/ng_btsocket_hci_raw.c#20 integrate .. //depot/projects/hammer/sys/netgraph/bluetooth/socket/ng_btsocket_l2cap.c#22 integrate .. //depot/projects/hammer/sys/netgraph/bluetooth/socket/ng_btsocket_l2cap_raw.c#18 integrate .. //depot/projects/hammer/sys/netgraph/bluetooth/socket/ng_btsocket_rfcomm.c#21 integrate .. //depot/projects/hammer/sys/netgraph/bluetooth/socket/ng_btsocket_sco.c#2 integrate .. //depot/projects/hammer/sys/netgraph/netflow/netflow.c#19 integrate .. //depot/projects/hammer/sys/netgraph/netflow/ng_netflow.c#13 integrate .. //depot/projects/hammer/sys/netgraph/netflow/ng_netflow.h#8 integrate .. //depot/projects/hammer/sys/netgraph/netgraph.h#37 integrate .. //depot/projects/hammer/sys/netgraph/ng_UI.c#6 integrate .. //depot/projects/hammer/sys/netgraph/ng_async.c#5 integrate .. //depot/projects/hammer/sys/netgraph/ng_atmllc.c#4 integrate .. //depot/projects/hammer/sys/netgraph/ng_base.c#64 integrate .. //depot/projects/hammer/sys/netgraph/ng_bpf.c#9 integrate .. //depot/projects/hammer/sys/netgraph/ng_bridge.c#17 integrate .. //depot/projects/hammer/sys/netgraph/ng_cisco.c#12 integrate .. //depot/projects/hammer/sys/netgraph/ng_device.c#21 integrate .. //depot/projects/hammer/sys/netgraph/ng_eiface.c#28 integrate .. //depot/projects/hammer/sys/netgraph/ng_etf.c#9 integrate .. //depot/projects/hammer/sys/netgraph/ng_ether.c#31 integrate .. //depot/projects/hammer/sys/netgraph/ng_fec.c#22 integrate .. //depot/projects/hammer/sys/netgraph/ng_frame_relay.c#7 integrate .. //depot/projects/hammer/sys/netgraph/ng_gif.c#14 integrate .. //depot/projects/hammer/sys/netgraph/ng_gif_demux.c#6 integrate .. //depot/projects/hammer/sys/netgraph/ng_hole.c#6 integrate .. //depot/projects/hammer/sys/netgraph/ng_iface.c#27 integrate .. //depot/projects/hammer/sys/netgraph/ng_ipfw.c#5 integrate .. //depot/projects/hammer/sys/netgraph/ng_ksocket.c#25 integrate .. //depot/projects/hammer/sys/netgraph/ng_l2tp.c#17 integrate .. //depot/projects/hammer/sys/netgraph/ng_lmi.c#10 integrate .. //depot/projects/hammer/sys/netgraph/ng_message.h#15 integrate .. //depot/projects/hammer/sys/netgraph/ng_mppc.c#10 integrate .. //depot/projects/hammer/sys/netgraph/ng_nat.c#7 integrate .. //depot/projects/hammer/sys/netgraph/ng_one2many.c#11 integrate .. //depot/projects/hammer/sys/netgraph/ng_parse.c#13 integrate .. //depot/projects/hammer/sys/netgraph/ng_pipe.c#2 integrate .. //depot/projects/hammer/sys/netgraph/ng_ppp.c#22 integrate .. //depot/projects/hammer/sys/netgraph/ng_pptpgre.c#17 integrate .. //depot/projects/hammer/sys/netgraph/ng_rfc1490.c#8 integrate .. //depot/projects/hammer/sys/netgraph/ng_sample.c#9 integrate .. //depot/projects/hammer/sys/netgraph/ng_split.c#6 integrate .. //depot/projects/hammer/sys/netgraph/ng_sppp.c#12 integrate .. //depot/projects/hammer/sys/netgraph/ng_tag.c#2 integrate .. //depot/projects/hammer/sys/netgraph/ng_tcpmss.c#4 integrate .. //depot/projects/hammer/sys/netgraph/ng_tee.c#12 integrate .. //depot/projects/hammer/sys/netgraph/ng_tty.c#15 integrate .. //depot/projects/hammer/sys/netgraph/ng_tty.h#4 integrate .. //depot/projects/hammer/sys/netgraph/ng_vjc.c#6 integrate .. //depot/projects/hammer/sys/netgraph/ng_vlan.c#6 integrate .. //depot/projects/hammer/sys/netinet/if_ether.c#50 integrate .. //depot/projects/hammer/sys/netinet/igmp.c#17 integrate .. //depot/projects/hammer/sys/netinet/in.c#32 integrate .. //depot/projects/hammer/sys/netinet/in.h#29 integrate .. //depot/projects/hammer/sys/netinet/in_gif.c#22 integrate .. //depot/projects/hammer/sys/netinet/in_mcast.c#7 integrate .. //depot/projects/hammer/sys/netinet/in_pcb.c#62 integrate .. //depot/projects/hammer/sys/netinet/in_pcb.h#44 integrate .. //depot/projects/hammer/sys/netinet/in_rmx.c#19 integrate .. //depot/projects/hammer/sys/netinet/ip6.h#10 integrate .. //depot/projects/hammer/sys/netinet/ip_carp.c#31 integrate .. //depot/projects/hammer/sys/netinet/ip_divert.c#45 integrate .. //depot/projects/hammer/sys/netinet/ip_fastfwd.c#35 integrate .. //depot/projects/hammer/sys/netinet/ip_fw.h#38 integrate .. //depot/projects/hammer/sys/netinet/ip_fw2.c#101 integrate .. //depot/projects/hammer/sys/netinet/ip_fw_nat.c#4 integrate .. //depot/projects/hammer/sys/netinet/ip_icmp.c#42 integrate .. //depot/projects/hammer/sys/netinet/ip_input.c#76 integrate .. //depot/projects/hammer/sys/netinet/ip_ipsec.c#11 integrate .. //depot/projects/hammer/sys/netinet/ip_mroute.c#44 integrate .. //depot/projects/hammer/sys/netinet/ip_options.c#10 integrate .. //depot/projects/hammer/sys/netinet/raw_ip.c#57 integrate .. //depot/projects/hammer/sys/netinet/sctp_crc32.c#5 integrate .. //depot/projects/hammer/sys/netinet/sctp_os_bsd.h#19 integrate .. //depot/projects/hammer/sys/netinet/sctp_output.c#27 integrate .. //depot/projects/hammer/sys/netinet/sctp_sysctl.c#13 integrate .. //depot/projects/hammer/sys/netinet/sctp_timer.c#20 integrate .. //depot/projects/hammer/sys/netinet/sctp_timer.h#9 integrate .. //depot/projects/hammer/sys/netinet/sctp_uio.h#15 integrate .. //depot/projects/hammer/sys/netinet/sctp_usrreq.c#25 integrate .. //depot/projects/hammer/sys/netinet/sctputil.c#30 integrate .. //depot/projects/hammer/sys/netinet/tcp_hostcache.c#16 integrate .. //depot/projects/hammer/sys/netinet/tcp_input.c#89 integrate .. //depot/projects/hammer/sys/netinet/tcp_offload.c#4 integrate .. //depot/projects/hammer/sys/netinet/tcp_output.c#54 integrate .. //depot/projects/hammer/sys/netinet/tcp_reass.c#5 integrate .. //depot/projects/hammer/sys/netinet/tcp_sack.c#31 integrate .. //depot/projects/hammer/sys/netinet/tcp_subr.c#86 integrate .. //depot/projects/hammer/sys/netinet/tcp_syncache.c#65 integrate .. //depot/projects/hammer/sys/netinet/tcp_timer.c#35 integrate .. //depot/projects/hammer/sys/netinet/tcp_timewait.c#6 integrate .. //depot/projects/hammer/sys/netinet/tcp_usrreq.c#59 integrate .. //depot/projects/hammer/sys/netinet/udp_usrreq.c#60 integrate .. //depot/projects/hammer/sys/netinet/vinet.h#1 branch .. //depot/projects/hammer/sys/netinet6/dest6.c#8 integrate .. //depot/projects/hammer/sys/netinet6/frag6.c#16 integrate .. //depot/projects/hammer/sys/netinet6/icmp6.c#38 integrate .. //depot/projects/hammer/sys/netinet6/in6.c#35 integrate .. //depot/projects/hammer/sys/netinet6/in6.h#21 integrate .. //depot/projects/hammer/sys/netinet6/in6_gif.c#17 integrate .. //depot/projects/hammer/sys/netinet6/in6_ifattach.c#26 integrate .. //depot/projects/hammer/sys/netinet6/in6_pcb.c#40 integrate .. //depot/projects/hammer/sys/netinet6/in6_proto.c#24 integrate .. //depot/projects/hammer/sys/netinet6/in6_rmx.c#17 integrate .. //depot/projects/hammer/sys/netinet6/in6_src.c#31 integrate .. //depot/projects/hammer/sys/netinet6/ip6_forward.c#23 integrate .. //depot/projects/hammer/sys/netinet6/ip6_input.c#38 integrate .. //depot/projects/hammer/sys/netinet6/ip6_ipsec.c#8 integrate .. //depot/projects/hammer/sys/netinet6/ip6_mroute.c#25 integrate .. //depot/projects/hammer/sys/netinet6/ip6_output.c#53 integrate .. //depot/projects/hammer/sys/netinet6/ip6_var.h#25 integrate .. //depot/projects/hammer/sys/netinet6/mld6.c#25 integrate .. //depot/projects/hammer/sys/netinet6/nd6.c#38 integrate .. //depot/projects/hammer/sys/netinet6/nd6.h#11 integrate .. //depot/projects/hammer/sys/netinet6/nd6_nbr.c#28 integrate .. //depot/projects/hammer/sys/netinet6/nd6_rtr.c#21 integrate .. //depot/projects/hammer/sys/netinet6/raw_ip6.c#40 integrate .. //depot/projects/hammer/sys/netinet6/route6.c#11 integrate .. //depot/projects/hammer/sys/netinet6/scope6.c#12 integrate .. //depot/projects/hammer/sys/netinet6/udp6_usrreq.c#42 integrate .. //depot/projects/hammer/sys/netinet6/vinet6.h#1 branch .. //depot/projects/hammer/sys/netipsec/ipsec.c#25 integrate .. //depot/projects/hammer/sys/netipsec/ipsec.h#17 integrate .. //depot/projects/hammer/sys/netipsec/ipsec_input.c#17 integrate .. //depot/projects/hammer/sys/netipsec/ipsec_mbuf.c#10 integrate .. //depot/projects/hammer/sys/netipsec/ipsec_output.c#17 integrate .. //depot/projects/hammer/sys/netipsec/key.c#24 integrate .. //depot/projects/hammer/sys/netipsec/keysock.c#19 integrate .. //depot/projects/hammer/sys/netipsec/vipsec.h#1 branch .. //depot/projects/hammer/sys/netipsec/xform_ah.c#16 integrate .. //depot/projects/hammer/sys/netipsec/xform_esp.c#17 integrate .. //depot/projects/hammer/sys/netipsec/xform_ipcomp.c#13 integrate .. //depot/projects/hammer/sys/netipsec/xform_ipip.c#16 integrate .. //depot/projects/hammer/sys/netipx/ipx_pcb.c#12 integrate .. //depot/projects/hammer/sys/netipx/spx_usrreq.c#23 integrate .. //depot/projects/hammer/sys/netnatm/natm.c#23 integrate .. //depot/projects/hammer/sys/netnatm/natm_pcb.c#9 integrate .. //depot/projects/hammer/sys/netncp/ncp_conn.c#14 integrate .. //depot/projects/hammer/sys/netncp/ncp_rq.c#8 integrate .. //depot/projects/hammer/sys/netncp/ncp_sock.c#10 integrate .. //depot/projects/hammer/sys/netncp/ncp_subr.c#7 integrate .. //depot/projects/hammer/sys/netsmb/smb_rq.c#11 integrate .. //depot/projects/hammer/sys/netsmb/smb_trantcp.c#14 integrate .. //depot/projects/hammer/sys/nfs4client/nfs4_dev.c#7 integrate .. //depot/projects/hammer/sys/nfs4client/nfs4_idmap.c#7 integrate .. //depot/projects/hammer/sys/nfs4client/nfs4_socket.c#6 integrate .. //depot/projects/hammer/sys/nfs4client/nfs4_vfsops.c#29 integrate .. //depot/projects/hammer/sys/nfs4client/nfs4_vn_subs.c#6 integrate .. //depot/projects/hammer/sys/nfs4client/nfs4_vnops.c#35 integrate .. //depot/projects/hammer/sys/nfsclient/krpc_subr.c#13 integrate .. //depot/projects/hammer/sys/nfsclient/nfs_bio.c#47 integrate .. //depot/projects/hammer/sys/nfsclient/nfs_diskless.c#19 integrate .. //depot/projects/hammer/sys/nfsclient/nfs_lock.c#19 integrate .. //depot/projects/hammer/sys/nfsclient/nfs_node.c#28 integrate .. //depot/projects/hammer/sys/nfsclient/nfs_socket.c#48 integrate .. //depot/projects/hammer/sys/nfsclient/nfs_subs.c#36 integrate .. //depot/projects/hammer/sys/nfsclient/nfs_vfsops.c#63 integrate .. //depot/projects/hammer/sys/nfsclient/nfs_vnops.c#65 integrate .. //depot/projects/hammer/sys/nfsserver/nfs_serv.c#45 integrate .. //depot/projects/hammer/sys/nfsserver/nfs_srvcache.c#12 integrate .. //depot/projects/hammer/sys/nfsserver/nfs_srvsock.c#27 integrate .. //depot/projects/hammer/sys/nfsserver/nfs_syscalls.c#28 integrate .. //depot/projects/hammer/sys/opencrypto/cryptodev.c#27 integrate .. //depot/projects/hammer/sys/opencrypto/cryptosoft.c#14 integrate .. //depot/projects/hammer/sys/opencrypto/deflate.c#5 integrate .. //depot/projects/hammer/sys/opencrypto/xform.c#8 integrate .. //depot/projects/hammer/sys/pc98/pc98/pc98_machdep.c#8 integrate .. //depot/projects/hammer/sys/pc98/pc98/pc98_machdep.h#5 integrate .. //depot/projects/hammer/sys/pci/if_rl.c#62 integrate .. //depot/projects/hammer/sys/pci/if_rlreg.h#37 integrate .. //depot/projects/hammer/sys/powerpc/aim/locore.S#5 integrate .. //depot/projects/hammer/sys/powerpc/aim/nexus.c#3 integrate .. //depot/projects/hammer/sys/powerpc/aim/ofw_machdep.c#4 integrate .. //depot/projects/hammer/sys/powerpc/booke/locore.S#3 integrate .. //depot/projects/hammer/sys/powerpc/booke/pmap.c#6 integrate .. //depot/projects/hammer/sys/powerpc/booke/trap.c#3 integrate .. //depot/projects/hammer/sys/powerpc/conf/GENERIC#44 integrate .. //depot/projects/hammer/sys/powerpc/conf/MPC85XX#4 integrate .. //depot/projects/hammer/sys/powerpc/include/cpu.h#12 integrate .. //depot/projects/hammer/sys/powerpc/include/nexusvar.h#3 delete .. //depot/projects/hammer/sys/powerpc/include/profile.h#7 integrate .. //depot/projects/hammer/sys/powerpc/mpc85xx/lbc.c#1 branch .. //depot/projects/hammer/sys/powerpc/mpc85xx/lbc.h#1 branch .. //depot/projects/hammer/sys/powerpc/mpc85xx/ocpbus.c#4 integrate .. //depot/projects/hammer/sys/powerpc/ofw/ofw_pci.c#5 delete .. //depot/projects/hammer/sys/powerpc/ofw/ofw_pci.h#3 delete .. //depot/projects/hammer/sys/powerpc/ofw/ofw_pcib_pci.c#6 integrate .. //depot/projects/hammer/sys/powerpc/ofw/ofw_pcibus.c#1 branch .. //depot/projects/hammer/sys/powerpc/ofw/ofw_syscons.c#11 integrate .. //depot/projects/hammer/sys/powerpc/powermac/ata_kauai.c#13 integrate .. //depot/projects/hammer/sys/powerpc/powermac/cuda.c#1 branch .. //depot/projects/hammer/sys/powerpc/powermac/cudavar.h#1 branch .. //depot/projects/hammer/sys/powerpc/powermac/dbdma.c#3 integrate .. //depot/projects/hammer/sys/powerpc/powermac/dbdmavar.h#3 integrate .. //depot/projects/hammer/sys/powerpc/powermac/grackle.c#12 integrate .. //depot/projects/hammer/sys/powerpc/powermac/hrowpic.c#16 integrate .. //depot/projects/hammer/sys/powerpc/powermac/macgpio.c#1 branch .. //depot/projects/hammer/sys/powerpc/powermac/macgpiovar.h#1 branch .. //depot/projects/hammer/sys/powerpc/powermac/macio.c#16 integrate .. //depot/projects/hammer/sys/powerpc/powermac/openpic_macio.c#11 integrate .. //depot/projects/hammer/sys/powerpc/powermac/pmu.c#1 branch .. //depot/projects/hammer/sys/powerpc/powermac/pmuvar.h#1 branch .. //depot/projects/hammer/sys/powerpc/powermac/uninorth.c#17 integrate .. //depot/projects/hammer/sys/powerpc/powermac/uninorthvar.h#5 integrate .. //depot/projects/hammer/sys/powerpc/powermac/viareg.h#1 branch .. //depot/projects/hammer/sys/powerpc/psim/iobus.c#10 integrate .. //depot/projects/hammer/sys/powerpc/psim/openpic_iobus.c#11 integrate .. //depot/projects/hammer/sys/rpc/authunix_prot.c#6 integrate .. //depot/projects/hammer/sys/rpc/rpcclnt.c#20 integrate .. //depot/projects/hammer/sys/security/mac/mac_framework.h#15 integrate .. //depot/projects/hammer/sys/security/mac/mac_inet.c#12 integrate .. //depot/projects/hammer/sys/security/mac/mac_inet6.c#2 integrate .. //depot/projects/hammer/sys/security/mac/mac_policy.h#16 integrate .. //depot/projects/hammer/sys/security/mac_biba/mac_biba.c#51 integrate .. //depot/projects/hammer/sys/security/mac_bsdextended/mac_bsdextended.c#33 integrate .. //depot/projects/hammer/sys/security/mac_bsdextended/ugidfw_internal.h#1 branch .. //depot/projects/hammer/sys/security/mac_bsdextended/ugidfw_system.c#1 branch .. //depot/projects/hammer/sys/security/mac_bsdextended/ugidfw_vnode.c#1 branch .. //depot/projects/hammer/sys/security/mac_lomac/mac_lomac.c#37 integrate .. //depot/projects/hammer/sys/security/mac_mls/mac_mls.c#50 integrate .. //depot/projects/hammer/sys/security/mac_partition/mac_partition.c#17 integrate .. //depot/projects/hammer/sys/security/mac_seeotheruids/mac_seeotheruids.c#16 integrate .. //depot/projects/hammer/sys/security/mac_stub/mac_stub.c#33 integrate .. //depot/projects/hammer/sys/security/mac_test/mac_test.c#52 integrate .. //depot/projects/hammer/sys/sparc64/conf/GENERIC#66 integrate .. //depot/projects/hammer/sys/sparc64/sparc64/db_trace.c#15 integrate .. //depot/projects/hammer/sys/sparc64/sparc64/dump_machdep.c#12 integrate .. //depot/projects/hammer/sys/sparc64/sparc64/stack_machdep.c#3 integrate .. //depot/projects/hammer/sys/sun4v/sun4v/db_trace.c#3 integrate .. //depot/projects/hammer/sys/sun4v/sun4v/dump_machdep.c#5 integrate .. //depot/projects/hammer/sys/sun4v/sun4v/stack_machdep.c#2 integrate .. //depot/projects/hammer/sys/sys/bufobj.h#12 integrate .. //depot/projects/hammer/sys/sys/cdefs.h#27 integrate .. //depot/projects/hammer/sys/sys/cfictl.h#1 branch .. //depot/projects/hammer/sys/sys/conf.h#48 integrate .. //depot/projects/hammer/sys/sys/cons.h#11 integrate .. //depot/projects/hammer/sys/sys/kerneldump.h#10 integrate .. //depot/projects/hammer/sys/sys/malloc.h#16 integrate .. //depot/projects/hammer/sys/sys/param.h#120 integrate .. //depot/projects/hammer/sys/sys/pmc.h#13 integrate .. //depot/projects/hammer/sys/sys/proc.h#124 integrate .. //depot/projects/hammer/sys/sys/protosw.h#16 integrate .. //depot/projects/hammer/sys/sys/syscallsubr.h#33 integrate .. //depot/projects/hammer/sys/sys/sysctl.h#44 integrate .. //depot/projects/hammer/sys/sys/systm.h#58 integrate .. //depot/projects/hammer/sys/sys/tty.h#26 integrate .. //depot/projects/hammer/sys/sys/un.h#7 integrate >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Tue Oct 28 06:11:23 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id AE8B41065685; Tue, 28 Oct 2008 06:11:23 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 7124C1065680 for ; Tue, 28 Oct 2008 06:11:23 +0000 (UTC) (envelope-from gonzo@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 5FBAE8FC20 for ; Tue, 28 Oct 2008 06:11:23 +0000 (UTC) (envelope-from gonzo@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id m9S6BNQ8056373 for ; Tue, 28 Oct 2008 06:11:23 GMT (envelope-from gonzo@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m9S6BNTp056371 for perforce@freebsd.org; Tue, 28 Oct 2008 06:11:23 GMT (envelope-from gonzo@FreeBSD.org) Date: Tue, 28 Oct 2008 06:11:23 GMT Message-Id: <200810280611.m9S6BNTp056371@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 152076 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, 28 Oct 2008 06:11:23 -0000 http://perforce.freebsd.org/chv.cgi?CH=152076 Change 152076 by gonzo@gonzo_jeeves on 2008/10/28 06:11:05 KERNVIRADDR is not required by ADM5120, MALTA, QEMU Affected files ... .. //depot/projects/mips2/src/sys/mips/conf/ADM5120#8 edit .. //depot/projects/mips2/src/sys/mips/conf/MALTA#23 edit .. //depot/projects/mips2/src/sys/mips/conf/QEMU#9 edit Differences ... ==== //depot/projects/mips2/src/sys/mips/conf/ADM5120#8 (text+ko) ==== @@ -26,7 +26,6 @@ # Don't build any modules yet. makeoptions MODULES_OVERRIDE="" -options KERNVIRTADDR=0x80100000 include "../adm5120/std.adm5120" hints "ADM5120.hints" #Default places to look for devices. ==== //depot/projects/mips2/src/sys/mips/conf/MALTA#23 (text+ko) ==== @@ -28,7 +28,6 @@ # Don't build any modules yet. makeoptions MODULES_OVERRIDE="" -options KERNVIRTADDR=0x80100000 options TICK_USE_YAMON_FREQ=defined #options TICK_USE_MALTA_RTC=defined ==== //depot/projects/mips2/src/sys/mips/conf/QEMU#9 (text+ko) ==== @@ -28,7 +28,6 @@ # Don't build any modules yet. makeoptions MODULES_OVERRIDE="" -options KERNVIRTADDR=0x80100000 include "../adm5120/std.adm5120" #hints "GENERIC.hints" #Default places to look for devices. From owner-p4-projects@FreeBSD.ORG Tue Oct 28 06:55:08 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 79BB21065670; Tue, 28 Oct 2008 06:55:08 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 25C441065672 for ; Tue, 28 Oct 2008 06:55:08 +0000 (UTC) (envelope-from gonzo@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 0A5B08FC1B for ; Tue, 28 Oct 2008 06:55:08 +0000 (UTC) (envelope-from gonzo@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id m9S6t7VY059747 for ; Tue, 28 Oct 2008 06:55:07 GMT (envelope-from gonzo@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m9S6t7rd059745 for perforce@freebsd.org; Tue, 28 Oct 2008 06:55:07 GMT (envelope-from gonzo@FreeBSD.org) Date: Tue, 28 Oct 2008 06:55:07 GMT Message-Id: <200810280655.m9S6t7rd059745@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 152078 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, 28 Oct 2008 06:55:08 -0000 http://perforce.freebsd.org/chv.cgi?CH=152078 Change 152078 by gonzo@gonzo_jeeves on 2008/10/28 06:54:49 Add some trampoline magic for MIPS: CFE on WRT160n does not support ELF binaries, so we should use ELF trampoline to load kernel: - .text start address is configurable like in arm tree - KERNVIRTADDR is not really relevant to MIPS because KSEG0 where kernel is usually loaded is directly mapped. So there is no sense in [KERNPHYS/KERNVIRT]ADDR. These two variables are converted to KERNLOADADDR and TRAMPLOADADDR - Default for KERNLOADADDR is 0x80001000. It's de-facto standard for MIPS loaders. Previous value 0x80010000 was chosen by me with extra-precautions in order not to overlap exception vectors. - No compressed kernel support (yet) Affected files ... .. //depot/projects/mips2/src/sys/conf/Makefile.mips#15 edit .. //depot/projects/mips2/src/sys/conf/ldscript.mips#10 edit .. //depot/projects/mips2/src/sys/conf/options.mips#10 edit Differences ... ==== //depot/projects/mips2/src/sys/conf/Makefile.mips#15 (text+ko) ==== @@ -28,35 +28,73 @@ .endif .include "$S/conf/kern.pre.mk" +SYSTEM_LD:= ${SYSTEM_LD:$S/conf/ldscript.$M=ldscript.$M} +SYSTEM_DEP:= ${SYSTEM_DEP:$S/conf/ldscript.$M=ldscript.$M} + # XXX: Such sweeping assumptions... MACHINE=mips MACHINE_ARCH=mips +KERNLOADADDR?=0x80001000 +# This obscure value is defined by CFE for WR160N +# To be changed later +TRAMPLOADADDR?=0x807963c0 MKMODULESENV+= MACHINE=${MACHINE} MACHINE_ARCH=${MACHINE_ARCH} # We default to the MIPS32 ISA, if none specified in the # kernel configuration file. ARCH_FLAGS?=-march=mips32 +EXTRA_FLAGS=-fno-pic -mno-abicalls -mno-dsp -G0 HACK_EXTRA_FLAGS=-shared .if defined(TARGET_BIG_ENDIAN) CFLAGS+=-EB SYSTEM_LD+=-EB +EXTRA_FLAGS+=-EB +TRAMP_LDFLAGS+=-Wl,-EB HACK_EXTRA_FLAGS+=-EB -Wl,-EB .else CFLAGS+=-EL SYSTEM_LD+=-EL +EXTRA_FLAGS+=-EL +TRAMP_LDFLAGS+=-Wl,-EL HACK_EXTRA_FLAGS+=-EL -Wl,-EL .endif # We add the -fno-pic flag to kernels because otherwise performance # is extremely poor, as well as -mno-abicalls to force no ABI usage. -CFLAGS+=-fno-pic -mno-abicalls -G0 $(ARCH_FLAGS) -HACK_EXTRA_FLAGS+=-fno-pic -mno-abicalls -G0 $(ARCH_FLAGS) +CFLAGS+=${EXTRA_FLAGS} $(ARCH_FLAGS) +HACK_EXTRA_FLAGS+=${EXTRA_FLAGS} $(ARCH_FLAGS) # XXX hardcoded kernel entry point ASM_CFLAGS+=${CFLAGS} -D_LOCORE -DLOCORE +KERNEL_EXTRA=trampoline +trampoline: ${KERNEL_KO}.tramp.bin +${KERNEL_KO}.tramp.bin: ${KERNEL_KO} $S/$M/$M/elf_trampoline.c \ + $S/$M/$M/inckern.S + ${OBJCOPY} --strip-symbol '$$d' --strip-symbol '$$a' \ + -g --strip-symbol '$$t' ${FULLKERNEL} ${KERNEL_KO}.tmp + sed s/${KERNLOADADDR}/${TRAMPLOADADDR}/ ldscript.$M | \ + sed s/" + SIZEOF_HEADERS"// > ldscript.$M.tramp.noheader + # Generate .S file that setups stack and jumps to trampoline + echo "#include " >tmphack.S + echo "ENTRY(_start)" >>tmphack.S + echo "la t0, kernel_end" >>tmphack.S + echo "move sp, t0" >>tmphack.S + echo "add sp, 0x2000" >>tmphack.S + echo "and sp, ~0x7" >>tmphack.S + echo "la t0, _startC" >>tmphack.S + echo "j t0" >>tmphack.S + echo "END(_start)" >>tmphack.S + echo "#define KERNNAME \"${KERNEL_KO}.tmp\"" >opt_kernname.h + ${CC} -O -nostdlib -I. -I$S ${EXTRA_FLAGS} ${TRAMP_LDFLAGS} -Xlinker \ + -T -Xlinker ldscript.$M.tramp.noheader tmphack.S \ + $S/$M/$M/elf_trampoline.c $S/$M/$M/inckern.S \ + -o ${KERNEL_KO}.tramp.noheader + ${OBJCOPY} -S -O binary ${KERNEL_KO}.tramp.noheader \ + ${KERNEL_KO}.tramp.bin \ + %BEFORE_DEPEND %OBJS @@ -69,6 +107,12 @@ %CLEAN +CLEAN+= ldscript.$M ldscript.$M.tramp.noheader \ + ${KERNEL_KO}.tramp.noheader ${KERNEL_KO}.tramp.bin + +ldscript.$M: $S/conf/ldscript.$M + cat $S/conf/ldscript.$M|sed s/KERNLOADADDR/${KERNLOADADDR}/g \ + > ldscript.$M %RULES .include "$S/conf/kern.post.mk" ==== //depot/projects/mips2/src/sys/conf/ldscript.mips#10 (text+ko) ==== @@ -43,7 +43,7 @@ SECTIONS { /* Read-only sections, merged into text segment: */ - . = 0x80100000 + SIZEOF_HEADERS; + . = KERNLOADADDR + SIZEOF_HEADERS; .interp : { *(.interp) } .hash : { *(.hash) } .dynsym : { *(.dynsym) } ==== //depot/projects/mips2/src/sys/conf/options.mips#10 (text+ko) ==== @@ -45,8 +45,8 @@ CFE opt_global.h CFE_CONSOLE opt_global.h -KERNPHYSADDR opt_global.h -KERNVIRTADDR opt_global.h +KERNLOADADDR opt_global.h +TRAMPLOADADDR opt_global.h PHYSADDR opt_global.h SOFTFLOAT opt_global.h From owner-p4-projects@FreeBSD.ORG Tue Oct 28 06:56:09 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 61A611065672; Tue, 28 Oct 2008 06:56:09 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 25EA91065670 for ; Tue, 28 Oct 2008 06:56:09 +0000 (UTC) (envelope-from gonzo@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id F07E78FC19 for ; Tue, 28 Oct 2008 06:56:08 +0000 (UTC) (envelope-from gonzo@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id m9S6u8u8059838 for ; Tue, 28 Oct 2008 06:56:08 GMT (envelope-from gonzo@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m9S6u8UD059836 for perforce@freebsd.org; Tue, 28 Oct 2008 06:56:08 GMT (envelope-from gonzo@FreeBSD.org) Date: Tue, 28 Oct 2008 06:56:08 GMT Message-Id: <200810280656.m9S6u8UD059836@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 152079 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, 28 Oct 2008 06:56:09 -0000 http://perforce.freebsd.org/chv.cgi?CH=152079 Change 152079 by gonzo@gonzo_jeeves on 2008/10/28 06:55:58 Add stubs and config file for BCM47xx CPU. Based on sentry5 code Affected files ... .. //depot/projects/mips2/src/sys/mips/bcm47xx/bcm47xx_machdep.c#1 add .. //depot/projects/mips2/src/sys/mips/bcm47xx/files.bcm47xx#1 add .. //depot/projects/mips2/src/sys/mips/conf/BCM4704#1 add Differences ... From owner-p4-projects@FreeBSD.ORG Tue Oct 28 09:31:04 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1D6491065673; Tue, 28 Oct 2008 09:31:04 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id D2958106569B; Tue, 28 Oct 2008 09:31:03 +0000 (UTC) (envelope-from bms@FreeBSD.org) Received: from out1.smtp.messagingengine.com (out1.smtp.messagingengine.com [66.111.4.25]) by mx1.freebsd.org (Postfix) with ESMTP id A9B148FC0C; Tue, 28 Oct 2008 09:31:03 +0000 (UTC) (envelope-from bms@FreeBSD.org) Received: from compute1.internal (compute1.internal [10.202.2.41]) by out1.messagingengine.com (Postfix) with ESMTP id 196C21864BB; Tue, 28 Oct 2008 05:13:42 -0400 (EDT) Received: from heartbeat1.messagingengine.com ([10.202.2.160]) by compute1.internal (MEProxy); Tue, 28 Oct 2008 05:13:42 -0400 X-Sasl-enc: KUMIl283YFIH1aUarWlJ5AJBeFgG/BJXQOjNAa+komlW 1225185221 Received: from empiric.lon.incunabulum.net (82-35-112-254.cable.ubr07.dals.blueyonder.co.uk [82.35.112.254]) by mail.messagingengine.com (Postfix) with ESMTPSA id 98A40822A; Tue, 28 Oct 2008 05:13:41 -0400 (EDT) Message-ID: <4906D7C4.5020202@FreeBSD.org> Date: Tue, 28 Oct 2008 09:13:40 +0000 From: "Bruce M. Simpson" User-Agent: Thunderbird 2.0.0.14 (X11/20080514) MIME-Version: 1.0 To: Oleksandr Tymoshenko References: <200810280656.m9S6u8UD059836@repoman.freebsd.org> In-Reply-To: <200810280656.m9S6u8UD059836@repoman.freebsd.org> X-Enigmail-Version: 0.95.6 Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Cc: Perforce Change Reviews Subject: Re: PERFORCE change 152079 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, 28 Oct 2008 09:31:04 -0000 Oleksandr Tymoshenko wrote: > http://perforce.freebsd.org/chv.cgi?CH=152079 > > Change 152079 by gonzo@gonzo_jeeves on 2008/10/28 06:55:58 > > Add stubs and config file for BCM47xx CPU. Based on sentry5 code > > Affected files ... > > .. //depot/projects/mips2/src/sys/mips/bcm47xx/bcm47xx_machdep.c#1 add > .. //depot/projects/mips2/src/sys/mips/bcm47xx/files.bcm47xx#1 add > .. //depot/projects/mips2/src/sys/mips/conf/BCM4704#1 add > > Differences ... > I'm still trying to get the native UARTs up on Sentry5 -- which is a problem, because the CFE console is polled, making it difficult to break into DDB when the system is wedged. From owner-p4-projects@FreeBSD.ORG Tue Oct 28 09:31:05 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8539E1065748; Tue, 28 Oct 2008 09:31:05 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 47D801065743; Tue, 28 Oct 2008 09:31:05 +0000 (UTC) (envelope-from bms@FreeBSD.org) Received: from out1.smtp.messagingengine.com (out1.smtp.messagingengine.com [66.111.4.25]) by mx1.freebsd.org (Postfix) with ESMTP id 1CE0A8FC17; Tue, 28 Oct 2008 09:31:05 +0000 (UTC) (envelope-from bms@FreeBSD.org) Received: from compute1.internal (compute1.internal [10.202.2.41]) by out1.messagingengine.com (Postfix) with ESMTP id 76089186175; Tue, 28 Oct 2008 05:11:41 -0400 (EDT) Received: from heartbeat2.messagingengine.com ([10.202.2.161]) by compute1.internal (MEProxy); Tue, 28 Oct 2008 05:11:41 -0400 X-Sasl-enc: 8McKAzqPhEIWnsDLQuHJEgQILAKFf5bd0fsrweqlXpYs 1225185101 Received: from empiric.lon.incunabulum.net (82-35-112-254.cable.ubr07.dals.blueyonder.co.uk [82.35.112.254]) by mail.messagingengine.com (Postfix) with ESMTPSA id E641B189B5; Tue, 28 Oct 2008 05:11:40 -0400 (EDT) Message-ID: <4906D74B.4090108@FreeBSD.org> Date: Tue, 28 Oct 2008 09:11:39 +0000 From: "Bruce M. Simpson" User-Agent: Thunderbird 2.0.0.14 (X11/20080514) MIME-Version: 1.0 To: Oleksandr Tymoshenko References: <200810280334.m9S3YSeB029817@repoman.freebsd.org> In-Reply-To: <200810280334.m9S3YSeB029817@repoman.freebsd.org> X-Enigmail-Version: 0.95.6 Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Cc: Perforce Change Reviews Subject: Re: PERFORCE change 152071 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, 28 Oct 2008 09:31:05 -0000 Oleksandr Tymoshenko wrote: > http://perforce.freebsd.org/chv.cgi?CH=152071 > > Change 152071 by gonzo@gonzo_jeeves on 2008/10/28 03:34:23 > > There is no reason to print version manually SYSINIT will do it for us > Thanks, I wondered where that was coming from :-) From owner-p4-projects@FreeBSD.ORG Tue Oct 28 10:12:29 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 71DD0106569B; Tue, 28 Oct 2008 10:12:29 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 36005106567F for ; Tue, 28 Oct 2008 10:12:29 +0000 (UTC) (envelope-from ed@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 25DAA8FC13 for ; Tue, 28 Oct 2008 10:12:29 +0000 (UTC) (envelope-from ed@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id m9SACS0b090472 for ; Tue, 28 Oct 2008 10:12:28 GMT (envelope-from ed@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m9SACS0s090470 for perforce@freebsd.org; Tue, 28 Oct 2008 10:12:28 GMT (envelope-from ed@FreeBSD.org) Date: Tue, 28 Oct 2008 10:12:28 GMT Message-Id: <200810281012.m9SACS0s090470@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to ed@FreeBSD.org using -f From: Ed Schouten To: Perforce Change Reviews Cc: Subject: PERFORCE change 152087 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, 28 Oct 2008 10:12:29 -0000 http://perforce.freebsd.org/chv.cgi?CH=152087 Change 152087 by ed@ed_dull on 2008/10/28 10:12:04 tty_cons.c contains no TTY bits anymore. Rename it to kern_cons.c. Affected files ... .. //depot/projects/mpsafetty/sys/conf/files#23 edit .. //depot/projects/mpsafetty/sys/kern/kern_cons.c#1 branch .. //depot/projects/mpsafetty/sys/kern/tty_cons.c#8 delete Differences ... ==== //depot/projects/mpsafetty/sys/conf/files#23 (text+ko) ==== @@ -1596,6 +1596,7 @@ kern/kern_clock.c standard kern/kern_condvar.c standard kern/kern_conf.c standard +kern/kern_cons.c standard kern/kern_cpu.c standard kern/kern_cpuset.c standard kern/kern_context.c standard @@ -1708,7 +1709,6 @@ kern/sysv_shm.c optional sysvshm kern/tty.c standard kern/tty_compat.c optional compat_43tty -kern/tty_cons.c standard kern/tty_info.c standard kern/tty_inq.c standard kern/tty_outq.c standard From owner-p4-projects@FreeBSD.ORG Tue Oct 28 10:52:10 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id EFBBE1065682; Tue, 28 Oct 2008 10:52:09 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id B3F841065676 for ; Tue, 28 Oct 2008 10:52:09 +0000 (UTC) (envelope-from ed@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id A43198FC2A for ; Tue, 28 Oct 2008 10:52:09 +0000 (UTC) (envelope-from ed@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id m9SAq9eM093523 for ; Tue, 28 Oct 2008 10:52:09 GMT (envelope-from ed@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m9SAq9sm093521 for perforce@freebsd.org; Tue, 28 Oct 2008 10:52:09 GMT (envelope-from ed@FreeBSD.org) Date: Tue, 28 Oct 2008 10:52:09 GMT Message-Id: <200810281052.m9SAq9sm093521@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to ed@FreeBSD.org using -f From: Ed Schouten To: Perforce Change Reviews Cc: Subject: PERFORCE change 152090 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, 28 Oct 2008 10:52:10 -0000 http://perforce.freebsd.org/chv.cgi?CH=152090 Change 152090 by ed@ed_dull on 2008/10/28 10:51:10 It turns out we have console devices on our system that may have no TTY associated with them. Don't panic when our primary console device has no TTY associated. Affected files ... .. //depot/projects/mpsafetty/sys/kern/tty.c#62 edit Differences ... ==== //depot/projects/mpsafetty/sys/kern/tty.c#62 (text+ko) ==== @@ -1769,8 +1769,9 @@ } sx_sunlock(&tty_list_sx); + /* System console has no TTY associated. */ if (dev_console->si_drv1 == NULL) - panic("Device driver uses name of nonexistent TTY"); + return (ENXIO); return (ttydev_open(dev, oflags, devtype, td)); } From owner-p4-projects@FreeBSD.ORG Tue Oct 28 11:35:55 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id EC46C10656AA; Tue, 28 Oct 2008 11:35:54 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 61A461065671 for ; Tue, 28 Oct 2008 11:35:54 +0000 (UTC) (envelope-from peter-gmail@wemm.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 51E068FC1C for ; Tue, 28 Oct 2008 11:35:54 +0000 (UTC) (envelope-from peter-gmail@wemm.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id m9SBZsdL098087 for ; Tue, 28 Oct 2008 11:35:54 GMT (envelope-from peter-gmail@wemm.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m9SBZsnB098085 for perforce@freebsd.org; Tue, 28 Oct 2008 11:35:54 GMT (envelope-from peter-gmail@wemm.org) Date: Tue, 28 Oct 2008 11:35:54 GMT Message-Id: <200810281135.m9SBZsnB098085@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter-gmail@wemm.org using -f From: Peter Wemm To: Perforce Change Reviews Cc: Subject: PERFORCE change 152093 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, 28 Oct 2008 11:35:55 -0000 http://perforce.freebsd.org/chv.cgi?CH=152093 Change 152093 by peter@peter_overcee on 2008/10/28 11:35:38 Check right ABI Affected files ... .. //depot/projects/valgrind/coregrind/launcher-freebsd.c#3 edit Differences ... ==== //depot/projects/valgrind/coregrind/launcher-freebsd.c#3 (text+ko) ==== @@ -149,7 +149,7 @@ if (header[EI_DATA] == ELFDATA2LSB) { if (ehdr->e_machine == EM_386 && - ehdr->e_ident[EI_OSABI] == ELFOSABI_SYSV) { + ehdr->e_ident[EI_OSABI] == ELFOSABI_FREEBSD) { platform = "x86-freebsd"; } } @@ -158,7 +158,7 @@ if (header[EI_DATA] == ELFDATA2LSB) { if (ehdr->e_machine == EM_X86_64 && - ehdr->e_ident[EI_OSABI] == ELFOSABI_SYSV) { + ehdr->e_ident[EI_OSABI] == ELFOSABI_FREEBSD) { platform = "amd64-freebsd"; } } From owner-p4-projects@FreeBSD.ORG Tue Oct 28 11:36:56 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id DEA88106567D; Tue, 28 Oct 2008 11:36:55 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id A183E1065679 for ; Tue, 28 Oct 2008 11:36:55 +0000 (UTC) (envelope-from peter-gmail@wemm.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 916038FC0C for ; Tue, 28 Oct 2008 11:36:55 +0000 (UTC) (envelope-from peter-gmail@wemm.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id m9SBatY8098153 for ; Tue, 28 Oct 2008 11:36:55 GMT (envelope-from peter-gmail@wemm.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m9SBatKU098151 for perforce@freebsd.org; Tue, 28 Oct 2008 11:36:55 GMT (envelope-from peter-gmail@wemm.org) Date: Tue, 28 Oct 2008 11:36:55 GMT Message-Id: <200810281136.m9SBatKU098151@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter-gmail@wemm.org using -f From: Peter Wemm To: Perforce Change Reviews Cc: Subject: PERFORCE change 152094 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, 28 Oct 2008 11:36:56 -0000 http://perforce.freebsd.org/chv.cgi?CH=152094 Change 152094 by peter@peter_overcee on 2008/10/28 11:36:10 Fix (?) mmap offset truncation. Affected files ... .. //depot/projects/valgrind/coregrind/m_aspacemgr/aspacemgr-common.c#3 edit Differences ... ==== //depot/projects/valgrind/coregrind/m_aspacemgr/aspacemgr-common.c#3 (text+ko) ==== @@ -159,11 +159,14 @@ || defined(VGP_ppc32_aix5) || defined(VGP_ppc64_aix5) res = VG_(do_syscall6)(__NR_mmap, (UWord)start, length, prot, flags, fd, offset); -# elif defined(VGO_freebsd) +# elif defined(VGP_x86_freebsd) + if (flags & VKI_MAP_ANONYMOUS && fd == 0) + fd = -1; + res = VG_(do_syscall8)(__NR_mmap, (UWord)start, length, + prot, flags, fd, 0, offset, offset >> 32ul); +# elif defined(VGP_amd64_freebsd) if (flags & VKI_MAP_ANONYMOUS && fd == 0) fd = -1; - // AAA: fix 64 bit start - // QQQ: truncates to 32 bit offset!! res = VG_(do_syscall7)(__NR_mmap, (UWord)start, length, prot, flags, fd, 0, offset); # else From owner-p4-projects@FreeBSD.ORG Tue Oct 28 11:37:57 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 12BA91065675; Tue, 28 Oct 2008 11:37:57 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id CA722106566B for ; Tue, 28 Oct 2008 11:37:56 +0000 (UTC) (envelope-from peter-gmail@wemm.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id BA7C28FC0C for ; Tue, 28 Oct 2008 11:37:56 +0000 (UTC) (envelope-from peter-gmail@wemm.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id m9SBbu8o098215 for ; Tue, 28 Oct 2008 11:37:56 GMT (envelope-from peter-gmail@wemm.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m9SBbuIU098213 for perforce@freebsd.org; Tue, 28 Oct 2008 11:37:56 GMT (envelope-from peter-gmail@wemm.org) Date: Tue, 28 Oct 2008 11:37:56 GMT Message-Id: <200810281137.m9SBbuIU098213@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter-gmail@wemm.org using -f From: Peter Wemm To: Perforce Change Reviews Cc: Subject: PERFORCE change 152095 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, 28 Oct 2008 11:37:57 -0000 http://perforce.freebsd.org/chv.cgi?CH=152095 Change 152095 by peter@peter_overcee on 2008/10/28 11:37:13 Get syscall encode/decode a little closer to reality. Affected files ... .. //depot/projects/valgrind/coregrind/m_syswrap/syswrap-main.c#8 edit Differences ... ==== //depot/projects/valgrind/coregrind/m_syswrap/syswrap-main.c#8 (text+ko) ==== @@ -334,16 +334,32 @@ // AAA: missing 7th arg for freebsd/amd64 #elif defined(VGP_amd64_linux) || defined(VGP_amd64_freebsd) VexGuestAMD64State* gst = (VexGuestAMD64State*)gst_vanilla; - canonical->sysno = gst->guest_RAX; - canonical->arg1 = gst->guest_RDI; - canonical->arg2 = gst->guest_RSI; - canonical->arg3 = gst->guest_RDX; - canonical->arg4 = gst->guest_R10; - canonical->arg5 = gst->guest_R8; - canonical->arg6 = gst->guest_R9; - canonical->arg7 = 0; - canonical->arg8 = 0; - + ULong *argv = (void *)(ULong)gst->guest_RSP; + switch (gst->guest_RAX) { + default: + canonical->sysno = gst->guest_RAX; + canonical->arg1 = gst->guest_RDI; + canonical->arg2 = gst->guest_RSI; + canonical->arg3 = gst->guest_RDX; + canonical->arg4 = gst->guest_R10; + canonical->arg5 = gst->guest_R8; + canonical->arg6 = gst->guest_R9; + canonical->arg7 = argv[1]; + canonical->arg8 = argv[2]; + break; + case 198: + case 0: + canonical->sysno = gst->guest_RDI; + canonical->arg1 = gst->guest_RSI; + canonical->arg2 = gst->guest_RDX; + canonical->arg3 = gst->guest_R10; + canonical->arg4 = gst->guest_R8; + canonical->arg5 = gst->guest_R9; + canonical->arg6 = argv[1]; + canonical->arg7 = argv[2]; + canonical->arg8 = argv[2]; + break; + } #elif defined(VGP_ppc32_linux) VexGuestPPC32State* gst = (VexGuestPPC32State*)gst_vanilla; @@ -668,8 +684,7 @@ layout->o_arg8 = -1; /* impossible value */ layout->o_retval = OFFSET_x86_EAX; -// AAA: missing 7th arg for freebsd 64 bit (eg: mmap) -#elif defined(VGP_amd64_linux) || defined(VGP_amd64_freebsd) +#elif defined(VGP_amd64_linux) layout->o_sysno = OFFSET_amd64_RAX; layout->o_arg1 = OFFSET_amd64_RDI; layout->o_arg2 = OFFSET_amd64_RSI; @@ -742,6 +757,19 @@ layout->o_retval = OFFSET_x86_EAX; layout->o_retval2 = OFFSET_x86_EDX; +#elif defined(VGP_amd64_freebsd) + layout->o_sysno = OFFSET_amd64_RAX; + layout->o_arg1 = OFFSET_amd64_RDI; + layout->o_arg2 = OFFSET_amd64_RSI; + layout->o_arg3 = OFFSET_amd64_RDX; + layout->o_arg4 = OFFSET_amd64_R10; + layout->o_arg5 = OFFSET_amd64_R8; + layout->o_arg6 = OFFSET_amd64_R9; + layout->o_arg7 = 8; /* on stack */ + layout->o_arg8 = 16; /* on stack */ + layout->o_retval = OFFSET_amd64_RAX; + layout->o_retval2 = OFFSET_amd64_RDX; + #else # error "getSyscallLayout: unknown arch" #endif From owner-p4-projects@FreeBSD.ORG Tue Oct 28 11:38:58 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3C5F91065672; Tue, 28 Oct 2008 11:38:58 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id F41D3106566C for ; Tue, 28 Oct 2008 11:38:57 +0000 (UTC) (envelope-from peter-gmail@wemm.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id E3F608FC0C for ; Tue, 28 Oct 2008 11:38:57 +0000 (UTC) (envelope-from peter-gmail@wemm.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id m9SBcvJM098282 for ; Tue, 28 Oct 2008 11:38:57 GMT (envelope-from peter-gmail@wemm.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m9SBcvGJ098280 for perforce@freebsd.org; Tue, 28 Oct 2008 11:38:57 GMT (envelope-from peter-gmail@wemm.org) Date: Tue, 28 Oct 2008 11:38:57 GMT Message-Id: <200810281138.m9SBcvGJ098280@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter-gmail@wemm.org using -f From: Peter Wemm To: Perforce Change Reviews Cc: Subject: PERFORCE change 152096 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, 28 Oct 2008 11:38:58 -0000 http://perforce.freebsd.org/chv.cgi?CH=152096 Change 152096 by peter@peter_overcee on 2008/10/28 11:38:08 Attempt to pass arg7 and arg8 to the syscall. Affected files ... .. //depot/projects/valgrind/coregrind/m_syscall.c#7 edit Differences ... ==== //depot/projects/valgrind/coregrind/m_syscall.c#7 (text+ko) ==== @@ -345,12 +345,19 @@ " movq %r8, %r10\n" /* a4 */ " movq %r9, %r8\n" /* a5 */ " movq 8(%rsp), %r9\n" /* a6 last arg from stack */ +" movq 16(%rsp), %r11\n" /* a7 from stack */ +" movq 24(%rsp), %rcx\n" /* a8 from stack */ +" pushq %rcx\n" +" pushq %r11\n" " syscall\n" " jb 1f\n" +" addq $16,%rsp\n" " movq 40(%rsp),%rsi\n" " movq %rdx, (%rsi)\n" " ret\n" -"1: movq 32(%rsp), %rsi\n" +"1:\n" +" addq $16,%rsp\n" +" movq 32(%rsp), %rsi\n" " movl $1,(%rsi)\n" " ret\n" ".previous\n" From owner-p4-projects@FreeBSD.ORG Tue Oct 28 11:41:00 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6D23B106567A; Tue, 28 Oct 2008 11:41:00 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 306C3106566B for ; Tue, 28 Oct 2008 11:41:00 +0000 (UTC) (envelope-from peter-gmail@wemm.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 203208FC17 for ; Tue, 28 Oct 2008 11:41:00 +0000 (UTC) (envelope-from peter-gmail@wemm.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id m9SBf02u098493 for ; Tue, 28 Oct 2008 11:41:00 GMT (envelope-from peter-gmail@wemm.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m9SBf0OY098491 for perforce@freebsd.org; Tue, 28 Oct 2008 11:41:00 GMT (envelope-from peter-gmail@wemm.org) Date: Tue, 28 Oct 2008 11:41:00 GMT Message-Id: <200810281141.m9SBf0OY098491@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter-gmail@wemm.org using -f From: Peter Wemm To: Perforce Change Reviews Cc: Subject: PERFORCE change 152097 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, 28 Oct 2008 11:41:00 -0000 http://perforce.freebsd.org/chv.cgi?CH=152097 Change 152097 by peter@peter_overcee on 2008/10/28 11:40:55 Stop the debug reader from choking when it finds a 64 bit memcheck instance in procfs. Our procfs doesn't have file offsets, and procstat doesn't either. Tweaking the alignment here causes binutils to generate a single PT_LOAD segment and that fools valgrind into not thinking that it might be an elf binary. (!) Affected files ... .. //depot/projects/valgrind/Makefile.am#7 edit Differences ... ==== //depot/projects/valgrind/Makefile.am#7 (text+ko) ==== @@ -223,6 +223,7 @@ $(CC) -m64 -Wl,--verbose -nostdlib 2>&1 | sed \ -e '1,/^=====\+$$/d' \ -e '/^=====\+$$/d' \ + -e '/ALIGN/s/0x100000/0x1000/g' \ -e '/\. = 0x[0-9A-Fa-f]\+ + SIZEOF_HEADERS/s/0x[0-9A-Fa-f]\+/valt_load_address/g' > $@ \ || rm -f $@ From owner-p4-projects@FreeBSD.ORG Tue Oct 28 20:49:23 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2C63B1065674; Tue, 28 Oct 2008 20:49:23 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id E4C23106564A for ; Tue, 28 Oct 2008 20:49:22 +0000 (UTC) (envelope-from rene@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id D29408FE56 for ; Tue, 28 Oct 2008 20:49:22 +0000 (UTC) (envelope-from rene@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id m9SKnM0c082215 for ; Tue, 28 Oct 2008 20:49:22 GMT (envelope-from rene@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m9SKnMGM082213 for perforce@freebsd.org; Tue, 28 Oct 2008 20:49:22 GMT (envelope-from rene@FreeBSD.org) Date: Tue, 28 Oct 2008 20:49:22 GMT Message-Id: <200810282049.m9SKnMGM082213@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rene@FreeBSD.org using -f From: Rene Ladan To: Perforce Change Reviews Cc: Subject: PERFORCE change 152123 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, 28 Oct 2008 20:49:23 -0000 http://perforce.freebsd.org/chv.cgi?CH=152123 Change 152123 by rene@rene_self on 2008/10/28 20:48:57 IFC Affected files ... .. //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/x11/chapter.sgml#4 integrate .. //depot/projects/docproj_nl/en_US.ISO8859-1/books/porters-handbook/book.sgml#11 integrate Differences ... ==== //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/x11/chapter.sgml#4 (text+ko) ==== @@ -1,7 +1,7 @@ @@ -412,8 +412,21 @@ &prompt.user; startx If this does not work, or if the default configuration is - not acceptable, then X11 must be configured manually. - Configuration of X11 is + not acceptable, then X11 must be configured manually. + + + Desktop environments like + GNOME, + KDE or + XFce have tools allowing the user + to easily set the screen parameters such as the resolution. + So if the default configuration is not acceptable and you + planned to install a desktop environment then just continue + with the installation of the desktop environment and use the + appropriate screen settings tool. + + + Configuration of X11 is a multi-step process. The first step is to build an initial configuration file. As the super user, simply ==== //depot/projects/docproj_nl/en_US.ISO8859-1/books/porters-handbook/book.sgml#11 (text+ko) ==== @@ -1,7 +1,7 @@ 800051 + + 8.0-CURRENT after the introduction of accmode_t + and renaming of VOP_ACCESS 'a_mode' argument + to 'a_accmode'. + 800052 + From owner-p4-projects@FreeBSD.ORG Tue Oct 28 20:53:26 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6C3ED10656E3; Tue, 28 Oct 2008 20:53:26 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 25C9810656AB for ; Tue, 28 Oct 2008 20:53:26 +0000 (UTC) (envelope-from ed@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 7E78490A56 for ; Tue, 28 Oct 2008 20:13:46 +0000 (UTC) (envelope-from ed@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id m9SKDkBV069550 for ; Tue, 28 Oct 2008 20:13:46 GMT (envelope-from ed@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m9SKDk6m069548 for perforce@freebsd.org; Tue, 28 Oct 2008 20:13:46 GMT (envelope-from ed@FreeBSD.org) Date: Tue, 28 Oct 2008 20:13:46 GMT Message-Id: <200810282013.m9SKDk6m069548@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to ed@FreeBSD.org using -f From: Ed Schouten To: Perforce Change Reviews Cc: Subject: PERFORCE change 152121 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, 28 Oct 2008 20:53:29 -0000 http://perforce.freebsd.org/chv.cgi?CH=152121 Change 152121 by ed@ed_dull on 2008/10/28 20:12:54 Remove unneeded TTY_CONSOLE(). Affected files ... .. //depot/projects/mpsafetty/sys/kern/tty.c#63 edit Differences ... ==== //depot/projects/mpsafetty/sys/kern/tty.c#63 (text+ko) ==== @@ -90,8 +90,7 @@ HUPCL|CLOCAL|CCTS_OFLOW|CRTS_IFLOW|CDTR_IFLOW|\ CDSR_OFLOW|CCAR_OFLOW) -#define TTY_CONSOLE(d) ((d) == dev_console) -#define TTY_CALLOUT(tp,d) ((d) != (tp)->t_dev && !TTY_CONSOLE(d)) +#define TTY_CALLOUT(tp,d) ((d) != (tp)->t_dev && (d) != dev_console) /* * Set TTY buffer sizes. From owner-p4-projects@FreeBSD.ORG Tue Oct 28 20:59:33 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C7FED1065674; Tue, 28 Oct 2008 20:59:33 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 8C2E61065686 for ; Tue, 28 Oct 2008 20:59:33 +0000 (UTC) (envelope-from rene@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 79A5F8FE58 for ; Tue, 28 Oct 2008 20:59:33 +0000 (UTC) (envelope-from rene@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id m9SKxXkC083016 for ; Tue, 28 Oct 2008 20:59:33 GMT (envelope-from rene@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m9SKxXkI083014 for perforce@freebsd.org; Tue, 28 Oct 2008 20:59:33 GMT (envelope-from rene@FreeBSD.org) Date: Tue, 28 Oct 2008 20:59:33 GMT Message-Id: <200810282059.m9SKxXkI083014@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rene@FreeBSD.org using -f From: Rene Ladan To: Perforce Change Reviews Cc: Subject: PERFORCE change 152124 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, 28 Oct 2008 20:59:34 -0000 http://perforce.freebsd.org/chv.cgi?CH=152124 Change 152124 by rene@rene_self on 2008/10/28 20:59:27 MFen handbook/x11 1.189 -> 1.190 Checked build, spelling Affected files ... .. //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/x11/chapter.sgml#7 edit Differences ... ==== //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/x11/chapter.sgml#7 (text+ko) ==== @@ -4,7 +4,7 @@ $FreeBSD: doc/nl_NL.ISO8859-1/books/handbook/x11/chapter.sgml,v 1.16 2008/10/18 14:22:45 remko Exp $ $FreeBSDnl: doc/nl_NL.ISO8859-1/books/handbook/x11/chapter.sgml,v 1.43 2006/08/25 12:00:28 remko Exp $ %SOURCE% en_US.ISO8859-1/books/handbook/x11/chapter.sgml - %SRCID% 1.189 + %SRCID% 1.190 --> @@ -446,14 +446,29 @@ &prompt.user; startx Als dit niet werkt, of als de standaardconfiguratie niet - acceptabel is, dient X11 handmatig geconfigureerd te worden. - Het instellen van X11 bestaat uit meerdere stappen. De eerste - stap is het bouwen van een instellingenbestand. Dit kan met: + acceptabel is, dient X11 handmatig geconfigureerd te + worden. + + + Bureaubladomgevingen als GNOME, + KDE, of + XFce hebben gereedschappen waarmee + de gebruiker eenvoudig de schermparameters zoals de resolutie + kan instellen. Dus als de standaardconfiguratie niet + acceptabel is en u van plan bent om een bureaubladomgeving te + installeren kunt u gewoon doorgaan met de installatie van de + bureaubladomgeving en het juiste scherminstelgereedschap + gebruiken. + + + Het instellen van X11 bestaat uit meerdere stappen. De + eerste stap is het bouwen van een instellingenbestand. Dit kan + als de supergebruiker met: &prompt.root; Xorg -configure - Dit genereert een kaal X11 instellingenbestand in de map + Dit genereert een kaal X11-instellingenbestand in de map /root met de naam xorg.conf.new. Feitelijk wordt bepaald waar de map staat door hoe er superuser rechten zijn verkregen. From owner-p4-projects@FreeBSD.ORG Tue Oct 28 21:13:48 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6B7DC1065678; Tue, 28 Oct 2008 21:13:48 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 2ED3D1065675 for ; Tue, 28 Oct 2008 21:13:48 +0000 (UTC) (envelope-from trasz@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 0304B8FC1C for ; Tue, 28 Oct 2008 21:13:48 +0000 (UTC) (envelope-from trasz@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id m9SLDlXY085348 for ; Tue, 28 Oct 2008 21:13:47 GMT (envelope-from trasz@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m9SLDlWb085346 for perforce@freebsd.org; Tue, 28 Oct 2008 21:13:47 GMT (envelope-from trasz@freebsd.org) Date: Tue, 28 Oct 2008 21:13:47 GMT Message-Id: <200810282113.m9SLDlWb085346@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to trasz@freebsd.org using -f From: Edward Tomasz Napierala To: Perforce Change Reviews Cc: Subject: PERFORCE change 152125 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, 28 Oct 2008 21:13:48 -0000 http://perforce.freebsd.org/chv.cgi?CH=152125 Change 152125 by trasz@trasz_victim7 on 2008/10/28 21:13:19 These two variables are not really access modes; roll back to vendor. Affected files ... .. //depot/projects/soc2008/trasz_nfs4acl/sys/fs/unionfs/union_vfsops.c#4 edit Differences ... ==== //depot/projects/soc2008/trasz_nfs4acl/sys/fs/unionfs/union_vfsops.c#4 (text+ko) ==== @@ -84,8 +84,8 @@ int below; uid_t uid; gid_t gid; - vaccess_t udir; - vaccess_t ufile; + u_short udir; + u_short ufile; unionfs_copymode copymode; unionfs_whitemode whitemode; struct componentname fakecn; From owner-p4-projects@FreeBSD.ORG Tue Oct 28 21:22:58 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 01977106567D; Tue, 28 Oct 2008 21:22:58 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id B7E4F1065692 for ; Tue, 28 Oct 2008 21:22:57 +0000 (UTC) (envelope-from trasz@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id A35308FC1A for ; Tue, 28 Oct 2008 21:22:57 +0000 (UTC) (envelope-from trasz@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id m9SLMvl5086165 for ; Tue, 28 Oct 2008 21:22:57 GMT (envelope-from trasz@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m9SLMv6u086163 for perforce@freebsd.org; Tue, 28 Oct 2008 21:22:57 GMT (envelope-from trasz@freebsd.org) Date: Tue, 28 Oct 2008 21:22:57 GMT Message-Id: <200810282122.m9SLMv6u086163@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to trasz@freebsd.org using -f From: Edward Tomasz Napierala To: Perforce Change Reviews Cc: Subject: PERFORCE change 152126 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, 28 Oct 2008 21:22:58 -0000 http://perforce.freebsd.org/chv.cgi?CH=152126 Change 152126 by trasz@trasz_victim7 on 2008/10/28 21:22:08 IFC, replacing vaccess_t with accmode_t. Note: untested, might not even compile. Affected files ... .. //depot/projects/soc2008/trasz_nfs4acl/TODO#50 edit .. //depot/projects/soc2008/trasz_nfs4acl/UPDATING#10 integrate .. //depot/projects/soc2008/trasz_nfs4acl/bin/cp/utils.c#6 integrate .. //depot/projects/soc2008/trasz_nfs4acl/etc/Makefile#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/etc/devd.conf#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/etc/rc.subr#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/etc/remote#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libcam/camlib.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libutil/pty.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/share/man/man9/VOP_ACCESS.9#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/share/man/man9/vaccess.9#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/share/man/man9/vaccess_acl_nfs4.9#3 edit .. //depot/projects/soc2008/trasz_nfs4acl/share/man/man9/vaccess_acl_posix1e.9#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/share/zoneinfo/southamerica#6 integrate .. //depot/projects/soc2008/trasz_nfs4acl/share/zoneinfo/zone.tab#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/amd64/amd64/local_apic.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/arm/at91/at91.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/cddl/compat/opensolaris/kern/opensolaris_policy.c#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/cddl/compat/opensolaris/sys/policy.h#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ctldir.c#6 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c#9 edit .. //depot/projects/soc2008/trasz_nfs4acl/sys/compat/linux/linux_getcwd.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/conf/files#18 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/conf/files.powerpc#7 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/adb/adb.h#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/adb/adb_bus.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/adb/adb_hb_if.m#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/adb/adb_if.m#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/adb/adb_kbd.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/adb/adb_mouse.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/adb/adbvar.h#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/ata/ata-queue.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/ath/ah_osdep.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/ath/ath_rate/amrr/amrr.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/ath/ath_rate/onoe/onoe.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/ath/ath_rate/sample/sample.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/ath/if_ath.c#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/ath/if_athrate.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/ath/if_athvar.h#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/bge/if_bge.c#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/cfe/cfe_console.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/drm/i915_dma.c#6 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/drm/radeon_cp.c#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/drm/radeon_drv.h#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/iwn/if_iwn.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/ofw/ofw_console.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/ral/rt2560.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/ral/rt2661.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/if_zyd.c#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/u3g.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/wpi/if_wpi.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/xen/console/console.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/fs/cd9660/cd9660_vfsops.c#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/fs/cd9660/cd9660_vnops.c#6 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/fs/coda/coda_vnops.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/fs/devfs/devfs_vnops.c#7 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/fs/hpfs/hpfs_vnops.c#6 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/fs/msdosfs/msdosfs_vfsops.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/fs/msdosfs/msdosfs_vnops.c#7 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/fs/ntfs/ntfs_vnops.c#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/fs/nullfs/null_vnops.c#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/fs/nwfs/nwfs_vnops.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/fs/pseudofs/pseudofs_vnops.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/fs/smbfs/smbfs_vnops.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/fs/tmpfs/tmpfs_vnops.c#6 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/fs/udf/udf_vnops.c#6 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/fs/unionfs/union_vnops.c#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/gnu/fs/ext2fs/ext2_vfsops.c#6 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/gnu/fs/ext2fs/ext2_vnops.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/gnu/fs/reiserfs/reiserfs_vfsops.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/gnu/fs/reiserfs/reiserfs_vnops.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/gnu/fs/xfs/FreeBSD/xfs_super.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/gnu/fs/xfs/FreeBSD/xfs_vnops.c#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/i386/i386/local_apic.c#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/i386/isa/pmtimer.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/init_main.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/kern_timeout.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/subr_acl_nfs4.c#33 edit .. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/subr_acl_posix1e.c#8 edit .. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/subr_param.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/uipc_mqueue.c#8 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/uipc_shm.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/vfs_subr.c#17 edit .. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/vfs_syscalls.c#9 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/vfs_vnops.c#9 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/vnode_if.src#8 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/modules/mac_bsdextended/Makefile#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/net80211/ieee80211_adhoc.c#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/net80211/ieee80211_node.c#7 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/net80211/ieee80211_scan_sta.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/net80211/ieee80211_sta.c#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet/in.c#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet/ip_dummynet.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet/sctp_os_bsd.h#7 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet/sctp_output.c#9 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet/sctp_timer.c#7 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet/sctp_timer.h#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet/tcp_input.c#8 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet/tcp_sack.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet/tcp_syncache.c#10 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet6/frag6.c#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet6/ip6_var.h#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/nfs4client/nfs4_vnops.c#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/nfsclient/nfs_vnops.c#9 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/nfsserver/nfs_serv.c#8 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/nfsserver/nfs_srvsock.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/pc98/pc98/pc98_machdep.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/pc98/pc98/pc98_machdep.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/powerpc/aim/locore.S#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/powerpc/booke/locore.S#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/powerpc/booke/trap.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/powerpc/conf/GENERIC#7 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/powerpc/include/cpu.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/powerpc/include/profile.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/powerpc/powermac/ata_kauai.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/powerpc/powermac/cuda.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/sys/powerpc/powermac/cudavar.h#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/sys/powerpc/powermac/dbdma.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/powerpc/powermac/dbdmavar.h#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/powerpc/powermac/macgpio.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/sys/powerpc/powermac/macgpiovar.h#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/sys/powerpc/powermac/macio.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/powerpc/powermac/pmu.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/sys/powerpc/powermac/pmuvar.h#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/sys/powerpc/powermac/viareg.h#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/sys/security/mac/mac_framework.h#7 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/security/mac/mac_inet6.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/security/mac/mac_policy.h#7 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/security/mac/mac_process.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/security/mac/mac_syscalls.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/security/mac/mac_vfs.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/security/mac_biba/mac_biba.c#9 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/security/mac_bsdextended/mac_bsdextended.c#9 edit .. //depot/projects/soc2008/trasz_nfs4acl/sys/security/mac_bsdextended/ugidfw_internal.h#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/sys/security/mac_bsdextended/ugidfw_system.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/sys/security/mac_bsdextended/ugidfw_vnode.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/sys/security/mac_lomac/mac_lomac.c#10 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/security/mac_mls/mac_mls.c#9 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/security/mac_partition/mac_partition.c#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/security/mac_stub/mac_stub.c#7 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/security/mac_test/mac_test.c#7 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/sparc64/sparc64/db_trace.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/sparc64/sparc64/stack_machdep.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/sun4v/sun4v/db_trace.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/sun4v/sun4v/stack_machdep.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/sys/_types.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/sys/cons.h#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/sys/extattr.h#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/sys/types.h#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/sys/vnode.h#13 edit .. //depot/projects/soc2008/trasz_nfs4acl/sys/ufs/ffs/ffs_vfsops.c#15 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/ufs/ufs/ufs_vnops.c#22 integrate .. //depot/projects/soc2008/trasz_nfs4acl/tools/tools/ath/athdebug/athdebug.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/tools/tools/ath/athstats/Makefile#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/tools/tools/ath/athstats/athstats.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/tools/tools/ath/athstats/main.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/Makefile#9 integrate Differences ... ==== //depot/projects/soc2008/trasz_nfs4acl/TODO#50 (text+ko) ==== @@ -4,10 +4,6 @@ - MFP4 of the above. -- Use vaccess_t (mostly done). - -- MFP4 of the above. - - Decide how VAPPEND is supposed to work - always OR-ed with VWRITE, or used alone. Fix stuff accordingly. ==== //depot/projects/soc2008/trasz_nfs4acl/UPDATING#10 (text+ko) ==== @@ -22,6 +22,9 @@ to maximize performance. (To disable malloc debugging, run ln -s aj /etc/malloc.conf.) +20081028: + dummynet(4) ABI has changed. ipfw(8) needs to be recompiled. + 20081009: The uhci, ohci, ehci and slhci USB Host controller drivers have been put into separate modules. If you load the usb module @@ -1146,4 +1149,4 @@ Contact Warner Losh if you have any questions about your use of this document. -$FreeBSD: src/UPDATING,v 1.545 2008/10/10 06:37:51 n_hibma Exp $ +$FreeBSD: src/UPDATING,v 1.546 2008/10/28 14:14:57 oleg Exp $ ==== //depot/projects/soc2008/trasz_nfs4acl/bin/cp/utils.c#6 (text+ko) ==== @@ -33,7 +33,7 @@ #endif #endif /* not lint */ #include -__FBSDID("$FreeBSD: src/bin/cp/utils.c,v 1.55 2008/09/09 12:31:42 trasz Exp $"); +__FBSDID("$FreeBSD: src/bin/cp/utils.c,v 1.56 2008/10/27 15:21:15 dds Exp $"); #include #include @@ -137,41 +137,39 @@ * Mmap and write if less than 8M (the limit is so we don't totally * trash memory on big files. This is really a minor hack, but it * wins some CPU back. + * Some filesystems, such as smbnetfs, don't support mmap, + * so this is a best-effort attempt. */ #ifdef VM_AND_BUFFER_CACHE_SYNCHRONIZED if (S_ISREG(fs->st_mode) && fs->st_size > 0 && - fs->st_size <= 8 * 1048576) { - if ((p = mmap(NULL, (size_t)fs->st_size, PROT_READ, - MAP_SHARED, from_fd, (off_t)0)) == MAP_FAILED) { + fs->st_size <= 8 * 1024 * 1024 && + (p = mmap(NULL, (size_t)fs->st_size, PROT_READ, + MAP_SHARED, from_fd, (off_t)0)) != MAP_FAILED) { + wtotal = 0; + for (bufp = p, wresid = fs->st_size; ; + bufp += wcount, wresid -= (size_t)wcount) { + wcount = write(to_fd, bufp, wresid); + if (wcount <= 0) + break; + wtotal += wcount; + if (info) { + info = 0; + (void)fprintf(stderr, + "%s -> %s %3d%%\n", + entp->fts_path, to.p_path, + cp_pct(wtotal, fs->st_size)); + } + if (wcount >= (ssize_t)wresid) + break; + } + if (wcount != (ssize_t)wresid) { + warn("%s", to.p_path); + rval = 1; + } + /* Some systems don't unmap on close(2). */ + if (munmap(p, fs->st_size) < 0) { warn("%s", entp->fts_path); rval = 1; - } else { - wtotal = 0; - for (bufp = p, wresid = fs->st_size; ; - bufp += wcount, wresid -= (size_t)wcount) { - wcount = write(to_fd, bufp, wresid); - if (wcount <= 0) - break; - wtotal += wcount; - if (info) { - info = 0; - (void)fprintf(stderr, - "%s -> %s %3d%%\n", - entp->fts_path, to.p_path, - cp_pct(wtotal, fs->st_size)); - } - if (wcount >= (ssize_t)wresid) - break; - } - if (wcount != (ssize_t)wresid) { - warn("%s", to.p_path); - rval = 1; - } - /* Some systems don't unmap on close(2). */ - if (munmap(p, fs->st_size) < 0) { - warn("%s", entp->fts_path); - rval = 1; - } } } else #endif ==== //depot/projects/soc2008/trasz_nfs4acl/etc/Makefile#5 (text+ko) ==== @@ -1,5 +1,5 @@ # from: @(#)Makefile 5.11 (Berkeley) 5/21/91 -# $FreeBSD: src/etc/Makefile,v 1.371 2008/10/08 13:28:02 des Exp $ +# $FreeBSD: src/etc/Makefile,v 1.372 2008/10/27 16:13:28 sam Exp $ .include @@ -8,7 +8,7 @@ .endif BIN1= auth.conf \ - crontab csh.cshrc csh.login csh.logout devd.conf devfs.conf \ + crontab devd.conf devfs.conf \ ddb.conf dhclient.conf disktab fbtab \ ftpusers gettytab group \ hosts hosts.allow hosts.equiv \ @@ -84,6 +84,10 @@ BIN1+= pf.os .endif +.if ${MK_TCSH} != "no" +BIN1+= csh.cshrc csh.login csh.logout +.endif + .if ${MK_WIRELESS} != "no" BIN1+= regdomain.xml .endif @@ -148,9 +152,12 @@ ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 755 \ ${BIN2} ${DESTDIR}/etc; \ ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 600 \ - master.passwd nsmb.conf opieaccess ${DESTDIR}/etc; \ - pwd_mkdb ${PWD_MKDB_ENDIAN} -i -p -d ${DESTDIR}/etc \ - ${DESTDIR}/etc/master.passwd + master.passwd nsmb.conf opieaccess ${DESTDIR}/etc; +.if ${MK_TCSH} == "no" + sed -i "" -e 's;/bin/csh;;' ${DESTDIR}/etc/master.passwd +.endif + pwd_mkdb ${PWD_MKDB_ENDIAN} -i -p -d ${DESTDIR}/etc \ + ${DESTDIR}/etc/master.passwd .if ${MK_BLUETOOTH} != "no" ${_+_}cd ${.CURDIR}/bluetooth; ${MAKE} install .endif @@ -195,14 +202,18 @@ .endif cd ${.CURDIR}/root; \ ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 644 \ + dot.profile ${DESTDIR}/root/.profile; \ + rm -f ${DESTDIR}/.profile; \ + ln ${DESTDIR}/root/.profile ${DESTDIR}/.profile +.if ${MK_TCSH} != "no" + cd ${.CURDIR}/root; \ + ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 644 \ dot.cshrc ${DESTDIR}/root/.cshrc; \ ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 644 \ dot.login ${DESTDIR}/root/.login; \ - ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 644 \ - dot.profile ${DESTDIR}/root/.profile; \ - rm -f ${DESTDIR}/.cshrc ${DESTDIR}/.profile; \ - ln ${DESTDIR}/root/.cshrc ${DESTDIR}/.cshrc; \ - ln ${DESTDIR}/root/.profile ${DESTDIR}/.profile + rm -f ${DESTDIR}/.cshrc; \ + ln ${DESTDIR}/root/.cshrc ${DESTDIR}/.cshrc +.endif cd ${.CURDIR}/mtree; ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 444 \ ${MTREE} ${DESTDIR}/etc/mtree .if ${MK_PPP} != "no" ==== //depot/projects/soc2008/trasz_nfs4acl/etc/devd.conf#4 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/etc/devd.conf,v 1.42 2008/06/27 12:04:36 rpaulo Exp $ +# $FreeBSD: src/etc/devd.conf,v 1.43 2008/10/27 16:20:40 thompsa Exp $ # # Refer to devd.conf(5) and devd(8) man pages for the details on how to # run and configure devd. @@ -256,6 +256,7 @@ }; # The next blocks enable volume hotkeys that can be found on the Asus EeePC +# The four keys above the keyboard notify 0x1a through to 0x1d respectively notify 0 { match "system" "ACPI"; match "subsystem" "ASUS-Eee"; ==== //depot/projects/soc2008/trasz_nfs4acl/etc/rc.subr#3 (text+ko) ==== @@ -1,5 +1,5 @@ # $NetBSD: rc.subr,v 1.67 2006/10/07 11:25:15 elad Exp $ -# $FreeBSD: src/etc/rc.subr,v 1.86 2008/06/23 05:09:10 mtm Exp $ +# $FreeBSD: src/etc/rc.subr,v 1.87 2008/10/27 01:05:09 thompsa Exp $ # # Copyright (c) 1997-2004 The NetBSD Foundation, Inc. # All rights reserved. @@ -913,6 +913,7 @@ else ( trap "echo Script $_file interrupted; kill -QUIT $$" 3 trap "echo Script $_file interrupted; exit 1" 2 + trap "echo Script $_file running" 29 set $_arg; . $_file ) fi fi ==== //depot/projects/soc2008/trasz_nfs4acl/etc/remote#4 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/etc/remote,v 1.18 2008/07/21 22:38:00 marcel Exp $ +# $FreeBSD: src/etc/remote,v 1.19 2008/10/27 17:19:14 thompsa Exp $ # # @(#)remote 5.2 (Berkeley) 6/30/90 # @@ -66,3 +66,11 @@ uart5|com6:dv=/dev/cuau5:br#9600:pa=none: uart6|com7:dv=/dev/cuau6:br#9600:pa=none: uart7|com8:dv=/dev/cuau7:br#9600:pa=none: +ucom1:dv=/dev/cuaU0:br#9600:pa=none: +ucom2:dv=/dev/cuaU1:br#9600:pa=none: +ucom3:dv=/dev/cuaU2:br#9600:pa=none: +ucom4:dv=/dev/cuaU3:br#9600:pa=none: +ucom5:dv=/dev/cuaU4:br#9600:pa=none: +ucom6:dv=/dev/cuaU5:br#9600:pa=none: +ucom7:dv=/dev/cuaU6:br#9600:pa=none: +ucom8:dv=/dev/cuaU7:br#9600:pa=none: ==== //depot/projects/soc2008/trasz_nfs4acl/lib/libcam/camlib.c#2 (text+ko) ==== @@ -24,7 +24,7 @@ */ #include -__FBSDID("$FreeBSD: src/lib/libcam/camlib.c,v 1.16 2006/11/02 00:54:32 mjacob Exp $"); +__FBSDID("$FreeBSD: src/lib/libcam/camlib.c,v 1.17 2008/10/27 21:46:58 marius Exp $"); #include #include @@ -346,6 +346,9 @@ bzero(&ccb, sizeof(union ccb)); ccb.ccb_h.func_code = XPT_DEV_MATCH; + ccb.ccb_h.path_id = CAM_XPT_PATH_ID; + ccb.ccb_h.target_id = CAM_TARGET_WILDCARD; + ccb.ccb_h.target_lun = CAM_LUN_WILDCARD; /* Setup the result buffer */ bufsize = sizeof(struct dev_match_result); ==== //depot/projects/soc2008/trasz_nfs4acl/lib/libutil/pty.c#3 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/lib/libutil/pty.c,v 1.23 2008/10/03 09:42:50 ed Exp $"); +__FBSDID("$FreeBSD: src/lib/libutil/pty.c,v 1.24 2008/10/28 06:00:13 ed Exp $"); #if defined(LIBC_SCCS) && !defined(lint) #if 0 @@ -47,7 +47,6 @@ #include #include #include -#include int openpty(int *amaster, int *aslave, char *name, struct termios *termp, @@ -70,9 +69,6 @@ if (slavename == NULL) goto bad; - if (revoke(slavename) == -1) - goto bad; - slave = open(slavename, O_RDWR); if (slave == -1) goto bad; ==== //depot/projects/soc2008/trasz_nfs4acl/share/man/man9/VOP_ACCESS.9#3 (text+ko) ==== @@ -27,7 +27,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/share/man/man9/VOP_ACCESS.9,v 1.21 2005/06/28 20:15:18 hmp Exp $ +.\" $FreeBSD: src/share/man/man9/VOP_ACCESS.9,v 1.22 2008/10/28 13:44:11 trasz Exp $ .\" .Dd July 24, 1996 .Os @@ -39,16 +39,16 @@ .In sys/param.h .In sys/vnode.h .Ft int -.Fn VOP_ACCESS "struct vnode *vp" "vaccess_t mode" "struct ucred *cred" "struct thread *td" +.Fn VOP_ACCESS "struct vnode *vp" "accmode_t accmode" "struct ucred *cred" "struct thread *td" .Sh DESCRIPTION This entry point checks the access permissions of the file against the given credentials. .Pp Its arguments are: -.Bl -tag -width mode +.Bl -tag -width accmode .It Fa vp The vnode of the file to check. -.It Fa mode +.It Fa accmode The type of access required. .It Fa cred The user credentials to check. @@ -57,8 +57,12 @@ .El .Pp The -.Fa mode -is a mask which can contain flags described in . +.Fa accmode +is a mask which can contain flags described in , e.g. +.Dv VREAD , +.Dv VWRITE +or +.Dv VEXEC . .Sh LOCKS The vnode will be locked on entry and should remain locked on return. .Sh RETURN VALUES @@ -67,7 +71,7 @@ .Sh PSEUDOCODE .Bd -literal int -vop_access(struct vnode *vp, vaccess_t mode, struct ucred *cred, struct thread *td) +vop_access(struct vnode *vp, accmode_t accmode, struct ucred *cred, struct thread *td) { int error; @@ -82,7 +86,7 @@ * unless the file is a socket, fifo, or a block or * character device resident on the filesystem. */ - if (mode & VWRITE) { + if (accmode & VWRITE) { switch (vp->v_type) { case VDIR: case VLNK: @@ -95,7 +99,7 @@ } /* If immutable bit set, nobody gets to write it. */ - if ((mode & VWRITE) && vp has immutable bit set) + if ((accmode & VWRITE) && vp has immutable bit set) return EPERM; /* Otherwise, user id 0 always gets access. */ @@ -106,11 +110,11 @@ /* Otherwise, check the owner. */ if (cred->cr_uid == owner of vp) { - if (mode & VEXEC) + if (accmode & VEXEC) mask |= S_IXUSR; - if (mode & VREAD) + if (accmode & VREAD) mask |= S_IRUSR; - if (mode & VWRITE) + if (accmode & VWRITE) mask |= S_IWUSR; return (((mode of vp) & mask) == mask ? 0 : EACCES); } @@ -118,21 +122,21 @@ /* Otherwise, check the groups. */ for (i = 0, gp = cred->cr_groups; i < cred->cr_ngroups; i++, gp++) if (group of vp == *gp) { - if (mode & VEXEC) + if (accmode & VEXEC) mask |= S_IXGRP; - if (mode & VREAD) + if (accmode & VREAD) mask |= S_IRGRP; - if (mode & VWRITE) + if (accmode & VWRITE) mask |= S_IWGRP; return (((mode of vp) & mask) == mask ? 0 : EACCES); } /* Otherwise, check everyone else. */ - if (mode & VEXEC) + if (accmode & VEXEC) mask |= S_IXOTH; - if (mode & VREAD) + if (accmode & VREAD) mask |= S_IROTH; - if (mode & VWRITE) + if (accmode & VWRITE) mask |= S_IWOTH; return (((mode of vp) & mask) == mask ? 0 : EACCES); } ==== //depot/projects/soc2008/trasz_nfs4acl/share/man/man9/vaccess.9#3 (text+ko) ==== @@ -23,7 +23,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man9/vaccess.9,v 1.9 2005/06/28 20:15:18 hmp Exp $ +.\" $FreeBSD: src/share/man/man9/vaccess.9,v 1.10 2008/10/28 13:44:11 trasz Exp $ .\" .Dd August 22, 2001 .Os @@ -40,7 +40,7 @@ .Fa "mode_t file_mode" .Fa "uid_t file_uid" .Fa "gid_t file_gid" -.Fa "vaccess_t acc_mode" +.Fa "accmode_t accmode" .Fa "struct ucred *cred" .Fa "int *privused" .Fc @@ -59,7 +59,7 @@ owning GID .Fa file_gid , desired access mode -.Fa acc_mode , +.Fa accmode , requesting credential .Fa cred , and an optional call-by-reference ==== //depot/projects/soc2008/trasz_nfs4acl/share/man/man9/vaccess_acl_nfs4.9#3 (text+ko) ==== @@ -41,7 +41,7 @@ .Fa "uid_t file_uid" .Fa "gid_t file_gid" .Fa "struct acl *acl" -.Fa "vaccess_t acc_mode" +.Fa "accmode_t accmode" .Fa "struct ucred *cred" .Fa "int *privused" .Fc @@ -59,7 +59,7 @@ access ACL for the file .Fa acl , desired access mode -.Fa acc_mode , +.Fa accmode , requesting credential .Fa cred , and an optional call-by-reference ==== //depot/projects/soc2008/trasz_nfs4acl/share/man/man9/vaccess_acl_posix1e.9#3 (text+ko) ==== @@ -23,7 +23,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man9/vaccess_acl_posix1e.9,v 1.5 2005/06/28 20:15:18 hmp Exp $ +.\" $FreeBSD: src/share/man/man9/vaccess_acl_posix1e.9,v 1.6 2008/10/28 13:44:11 trasz Exp $ .\" .Dd August 22, 2001 .Os @@ -41,7 +41,7 @@ .Fa "uid_t file_uid" .Fa "gid_t file_gid" .Fa "struct acl *acl" -.Fa "vaccess_t acc_mode" +.Fa "accmode_t accmode" .Fa "struct ucred *cred" .Fa "int *privused" .Fc @@ -59,7 +59,7 @@ access ACL for the file .Fa acl , desired access mode -.Fa acc_mode , +.Fa accmode , requesting credential .Fa cred , and an optional call-by-reference ==== //depot/projects/soc2008/trasz_nfs4acl/share/zoneinfo/southamerica#6 (text+ko) ==== @@ -1,4 +1,4 @@ -# @(#)southamerica 8.30 +# @(#)southamerica 8.33 # 
 
 # This data is by no means authoritative; if you think you know better,
@@ -193,6 +193,26 @@
 # 
 # So there is no summer time in Argentina for now.
 
+# From Mariano Absatz (2008-10-20):
+# Decree 1693/2008 applies Law 26.350 for the summer 2008/2009 establishing DST in Argentina
+# From 2008-10-19 until 2009-03-15
+# 
+# http://www.boletinoficial.gov.ar/Bora.Portal/CustomControls/PdfContent.aspx?fp=16102008&pi=3&pf=4&s=0&sec=01
+# 
+#
+# Decree 1705/2008 excepting 12 Provinces from applying DST in the summer 2008/2009:
+# Catamarca, La Rioja, Mendoza, Salta, San Juan, San Luis, La Pampa, Neuquen, Rio Negro, Chubut, Santa Cruz
+# and Tierra del Fuego
+# 
+# http://www.boletinoficial.gov.ar/Bora.Portal/CustomControls/PdfContent.aspx?fp=17102008&pi=1&pf=1&s=0&sec=01
+# 
+#
+# Press release 235 dated Saturday October 18th, from the Government of the Province of Jujuy saying
+# it will not apply DST either (even when it was not included in Decree 1705/2008)
+# 
+# http://www.jujuy.gov.ar/index2/partes_prensa/18_10_08/235-181008.doc
+# 
+
 Rule	Arg	2007	only	-	Dec	30	0:00	1:00	S
 Rule	Arg	2008	max	-	Mar	Sun>=15	0:00	0	-
 Rule	Arg	2008	max	-	Oct	Sun>=15	0:00	1:00	S
@@ -343,9 +363,8 @@
 			-4:00	Arg	AR%sT	2000 Mar  3
 			-3:00	Arg	AR%sT
 #
-# Santa Fe (SF), Entre Rios (ER), Corrientes (CN), Misiones (MN), Chaco (CC),
-# Formosa (FM), Salta (SA), Santiago del Estero (SE), Cordoba (CB),
-# La Pampa (LP), Neuquen (NQ), Rio Negro (RN)
+# Cordoba (CB), Santa Fe (SF), Entre Rios (ER), Corrientes (CN), Misiones (MN),
+# Chaco (CC), Formosa (FM), Santiago del Estero (SE)
 #
 # Shanks & Pottenger also make the following claims, which we haven't verified:
 # - Formosa switched to -3:00 on 1991-01-07.
@@ -364,6 +383,18 @@
 			-4:00	Arg	AR%sT	2000 Mar  3
 			-3:00	Arg	AR%sT
 #
+# Salta (SA), La Pampa (LP), Neuquen (NQ), Rio Negro (RN)
+Zone America/Argentina/Salta -4:21:40 - LMT	1894 Oct 31
+			-4:16:48 -	CMT	1920 May
+			-4:00	-	ART	1930 Dec
+			-4:00	Arg	AR%sT	1969 Oct  5
+			-3:00	Arg	AR%sT	1991 Mar  3
+			-4:00	-	WART	1991 Oct 20
+			-3:00	Arg	AR%sT	1999 Oct  3
+			-4:00	Arg	AR%sT	2000 Mar  3
+			-3:00	Arg	AR%sT	2008 Oct 18
+			-3:00	-	ART
+#
 # Tucuman (TM)
 Zone America/Argentina/Tucuman -4:20:52 - LMT	1894 Oct 31
 			-4:16:48 -	CMT	1920 May
@@ -388,7 +419,8 @@
 			-4:00	Arg	AR%sT	2000 Mar  3
 			-3:00	-	ART	2004 Jun  1
 			-4:00	-	WART	2004 Jun 20
-			-3:00	Arg	AR%sT
+			-3:00	Arg	AR%sT	2008 Oct 18
+			-3:00	-	ART
 #
 # San Juan (SJ)
 Zone America/Argentina/San_Juan -4:34:04 - LMT	1894 Oct 31
@@ -401,7 +433,8 @@
 			-4:00	Arg	AR%sT	2000 Mar  3
 			-3:00	-	ART	2004 May 31
 			-4:00	-	WART	2004 Jul 25
-			-3:00	Arg	AR%sT
+			-3:00	Arg	AR%sT	2008 Oct 18
+			-3:00	-	ART
 #
 # Jujuy (JY)
 Zone America/Argentina/Jujuy -4:21:12 -	LMT	1894 Oct 31
@@ -415,7 +448,8 @@
 			-3:00	1:00	ARST	1992
 			-3:00	Arg	AR%sT	1999 Oct  3
 			-4:00	Arg	AR%sT	2000 Mar  3
-			-3:00	Arg	AR%sT
+			-3:00	Arg	AR%sT	2008 Oct 18
+			-3:00	-	ART
 #
 # Catamarca (CT), Chubut (CH)
 Zone America/Argentina/Catamarca -4:23:08 - LMT	1894 Oct 31
@@ -428,7 +462,8 @@
 			-4:00	Arg	AR%sT	2000 Mar  3
 			-3:00	-	ART	2004 Jun  1
 			-4:00	-	WART	2004 Jun 20
-			-3:00	Arg	AR%sT
+			-3:00	Arg	AR%sT	2008 Oct 18
+			-3:00	-	ART
 #
 # Mendoza (MZ)
 Zone America/Argentina/Mendoza -4:35:16 - LMT	1894 Oct 31
@@ -445,7 +480,8 @@
 			-4:00	Arg	AR%sT	2000 Mar  3
 			-3:00	-	ART	2004 May 23
 			-4:00	-	WART	2004 Sep 26
-			-3:00	Arg	AR%sT
+			-3:00	Arg	AR%sT	2008 Oct 18
+			-3:00	-	ART
 #
 # San Luis (SL)
 Zone America/Argentina/San_Luis -4:25:24 - LMT	1894 Oct 31
@@ -473,7 +509,8 @@
 			-4:00	Arg	AR%sT	2000 Mar  3
 			-3:00	-	ART	2004 Jun  1
 			-4:00	-	WART	2004 Jun 20
-			-3:00	Arg	AR%sT
+			-3:00	Arg	AR%sT	2008 Oct 18
+			-3:00	-	ART
 #
 # Tierra del Fuego, Antartida e Islas del Atlantico Sur (TF)
 Zone America/Argentina/Ushuaia -4:33:12 - LMT 1894 Oct 31
@@ -484,7 +521,8 @@
 			-4:00	Arg	AR%sT	2000 Mar  3
 			-3:00	-	ART	2004 May 30
 			-4:00	-	WART	2004 Jun 20
-			-3:00	Arg	AR%sT
+			-3:00	Arg	AR%sT	2008 Oct 18
+			-3:00	-	ART
 
 # Aruba
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]

==== //depot/projects/soc2008/trasz_nfs4acl/share/zoneinfo/zone.tab#4 (text+ko) ====

@@ -1,4 +1,4 @@
-# @(#)zone.tab	8.19
+# @(#)zone.tab	8.21
 #
 # TZ zone descriptions
 #
@@ -42,14 +42,15 @@
 AQ	-6640+14001	Antarctica/DumontDUrville	Dumont-d'Urville Station, Terre Adelie
 AQ	-690022+0393524	Antarctica/Syowa	Syowa Station, E Ongul I
 AR	-3436-05827	America/Argentina/Buenos_Aires	Buenos Aires (BA, CF)
-AR	-3124-06411	America/Argentina/Cordoba	most locations (CB, CC, CN, ER, FM, LP, MN, NQ, RN, SA, SE, SF)
-AR	-3319-06621	America/Argentina/San_Luis	San Luis (SL)
+AR	-3124-06411	America/Argentina/Cordoba	most locations (CB, CC, CN, ER, FM, MN, SE, SF)
+AR	-2447-06525	America/Argentina/Salta	(SA, LP, NQ, RN)
 AR	-2411-06518	America/Argentina/Jujuy	Jujuy (JY)
 AR	-2649-06513	America/Argentina/Tucuman	Tucuman (TM)
 AR	-2828-06547	America/Argentina/Catamarca	Catamarca (CT), Chubut (CH)
 AR	-2926-06651	America/Argentina/La_Rioja	La Rioja (LR)
 AR	-3132-06831	America/Argentina/San_Juan	San Juan (SJ)
 AR	-3253-06849	America/Argentina/Mendoza	Mendoza (MZ)
+AR	-3319-06621	America/Argentina/San_Luis	San Luis (SL)
 AR	-5138-06913	America/Argentina/Rio_Gallegos	Santa Cruz (SC)
 AR	-5448-06818	America/Argentina/Ushuaia	Tierra del Fuego (TF)
 AS	-1416-17042	Pacific/Pago_Pago
@@ -384,13 +385,13 @@
 US	+364947-0845057	America/Kentucky/Monticello	Eastern Time - Kentucky - Wayne County
 US	+394606-0860929	America/Indiana/Indianapolis	Eastern Time - Indiana - most locations
 US	+384038-0873143	America/Indiana/Vincennes	Eastern Time - Indiana - Daviess, Dubois, Knox & Martin Counties
-US	+411745-0863730	America/Indiana/Knox	Eastern Time - Indiana - Starke County
 US	+410305-0863611	America/Indiana/Winamac	Eastern Time - Indiana - Pulaski County
 US	+382232-0862041	America/Indiana/Marengo	Eastern Time - Indiana - Crawford County
+US	+382931-0871643	America/Indiana/Petersburg	Eastern Time - Indiana - Pike County
 US	+384452-0850402	America/Indiana/Vevay	Eastern Time - Indiana - Switzerland County
 US	+415100-0873900	America/Chicago	Central Time
 US	+375711-0864541	America/Indiana/Tell_City	Central Time - Indiana - Perry County
-US	+382931-0871643	America/Indiana/Petersburg	Central Time - Indiana - Pike County
+US	+411745-0863730	America/Indiana/Knox	Central Time - Indiana - Starke County
 US	+450628-0873651	America/Menominee	Central Time - Michigan - Dickinson, Gogebic, Iron & Menominee Counties
 US	+470659-1011757	America/North_Dakota/Center	Central Time - North Dakota - Oliver County
 US	+465042-1012439	America/North_Dakota/New_Salem	Central Time - North Dakota - Morton County (except Mandan area)

==== //depot/projects/soc2008/trasz_nfs4acl/sys/amd64/amd64/local_apic.c#4 (text+ko) ====

@@ -32,7 +32,7 @@
  */
 
 #include 
-__FBSDID("$FreeBSD: src/sys/amd64/amd64/local_apic.c,v 1.46 2008/08/23 12:35:43 jhb Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/local_apic.c,v 1.48 2008/10/27 21:45:18 sobomax Exp $");
 
 #include "opt_hwpmc_hooks.h"
 #include "opt_kdtrace.h"
@@ -401,7 +401,10 @@
 		lapic_timer_hz = hz * 2;
 	else
 		lapic_timer_hz = hz * 4;
-	stathz = lapic_timer_hz / (lapic_timer_hz / 128);
+	if (lapic_timer_hz < 128)
+		stathz = lapic_timer_hz;
+	else
+		stathz = lapic_timer_hz / (lapic_timer_hz / 128);
 	profhz = lapic_timer_hz;
 	lapic_timer_period = value / lapic_timer_hz;
 

==== //depot/projects/soc2008/trasz_nfs4acl/sys/arm/at91/at91.c#4 (text) ====

@@ -23,7 +23,7 @@
  */
 
 #include 
-__FBSDID("$FreeBSD: src/sys/arm/at91/at91.c,v 1.18 2008/09/05 22:27:10 imp Exp $");
+__FBSDID("$FreeBSD: src/sys/arm/at91/at91.c,v 1.20 2008/10/26 22:53:59 stas Exp $");
 
 #include 
 #include 
@@ -168,6 +168,42 @@
 	generic_armv4_bs_c_2,
 	NULL,
 	NULL,
+
+	/* read (single) stream */
+	generic_bs_r_1,
+	generic_armv4_bs_r_2,
+	generic_bs_r_4,
+	NULL,
+
+	/* read multiple stream */
+	generic_bs_rm_1,
+	generic_armv4_bs_rm_2,
+	generic_bs_rm_4,
+	NULL,
+
+	/* read region stream */
+	generic_bs_rr_1,
+	generic_armv4_bs_rr_2,
+	generic_bs_rr_4,
+	NULL,
+
+	/* write (single) stream */
+	generic_bs_w_1,
+	generic_armv4_bs_w_2,
+	generic_bs_w_4,
+	NULL,
+
+	/* write multiple stream */
+	generic_bs_wm_1,
+	generic_armv4_bs_wm_2,
+	generic_bs_wm_4,
+	NULL,
+
+	/* write region stream */
+	NULL,
+	generic_armv4_bs_wr_2,
+	generic_bs_wr_4,
+	NULL,
 };
 
 static int
@@ -534,8 +570,10 @@
 	case SYS_RES_MEMORY:
 		rle->res = rman_reserve_resource(&sc->sc_mem_rman,
 		    start, end, count, flags, child);
-		rman_set_bustag(rle->res, &at91_bs_tag);
-		rman_set_bushandle(rle->res, start);
+		if (rle->res != NULL) {
+			rman_set_bustag(rle->res, &at91_bs_tag);
+			rman_set_bushandle(rle->res, start);
+		}
 		break;
 	}
 	if (rle->res) {

==== //depot/projects/soc2008/trasz_nfs4acl/sys/cddl/compat/opensolaris/kern/opensolaris_policy.c#5 (text+ko) ====

@@ -25,7 +25,7 @@
  */
 
 #include 
-__FBSDID("$FreeBSD: src/sys/cddl/compat/opensolaris/kern/opensolaris_policy.c,v 1.3 2008/03/28 22:16:05 jb Exp $");
+__FBSDID("$FreeBSD: src/sys/cddl/compat/opensolaris/kern/opensolaris_policy.c,v 1.4 2008/10/28 13:44:11 trasz Exp $");
 
 #include 
 #include 
@@ -91,17 +91,17 @@
 
 int
 secpolicy_vnode_access(struct ucred *cred, struct vnode *vp, uint64_t owner,
-    vaccess_t mode)
+    accmode_t accmode)
 {
 
-	if ((mode & VREAD) && priv_check_cred(cred, PRIV_VFS_READ, 0) != 0) {
+	if ((accmode & VREAD) && priv_check_cred(cred, PRIV_VFS_READ, 0) != 0) {
 		return (EACCES);
 	}
-	if ((mode & VWRITE) &&
+	if ((accmode & VWRITE) &&
 	    priv_check_cred(cred, PRIV_VFS_WRITE, 0) != 0) {
 		return (EACCES);
 	}
-	if (mode & VEXEC) {
+	if (accmode & VEXEC) {
 		if (vp->v_type == VDIR) {
 			if (priv_check_cred(cred, PRIV_VFS_LOOKUP, 0) != 0) {
 				return (EACCES);

==== //depot/projects/soc2008/trasz_nfs4acl/sys/cddl/compat/opensolaris/sys/policy.h#3 (text+ko) ====

@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- $ $FreeBSD: src/sys/cddl/compat/opensolaris/sys/policy.h,v 1.2 2008/03/28 22:16:06 jb Exp $
+ $ $FreeBSD: src/sys/cddl/compat/opensolaris/sys/policy.h,v 1.3 2008/10/28 13:44:11 trasz Exp $
  */
 
 #ifndef _OPENSOLARIS_SYS_POLICY_H_
@@ -46,7 +46,7 @@
 int	secpolicy_vnode_stky_modify(struct ucred *cred);
 int	secpolicy_vnode_remove(struct ucred *cred);
 int	secpolicy_vnode_access(struct ucred *cred, struct vnode *vp,
-	    uint64_t owner, vaccess_t mode);
+	    uint64_t owner, accmode_t accmode);
 int	secpolicy_vnode_setdac(struct ucred *cred, uid_t owner);
 int	secpolicy_vnode_setattr(struct ucred *cred, struct vnode *vp,
 	    struct vattr *vap, const struct vattr *ovap, int flags,

==== //depot/projects/soc2008/trasz_nfs4acl/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ctldir.c#6 (text+ko) ====

@@ -237,14 +237,14 @@
 zfsctl_common_access(ap)
 	struct vop_access_args /* {
 		struct vnode *a_vp;
-		vaccess_t a_mode;
+		accmode_t a_accmode;
 		struct ucred *a_cred;
 		struct thread *a_td;
 	} */ *ap;
 {
-	vaccess_t mode = ap->a_mode;
+	accmode_t accmode = ap->a_accmode;

>>> TRUNCATED FOR MAIL (1000 lines) <<<

From owner-p4-projects@FreeBSD.ORG  Tue Oct 28 21:26:01 2008
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 4EF7F106567C; Tue, 28 Oct 2008 21:26:01 +0000 (UTC)
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id EDF9D1065676
	for ; Tue, 28 Oct 2008 21:26:00 +0000 (UTC)
	(envelope-from rene@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id DA0F58FC0A
	for ; Tue, 28 Oct 2008 21:26:00 +0000 (UTC)
	(envelope-from rene@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id m9SLQ0qI086425
	for ; Tue, 28 Oct 2008 21:26:00 GMT
	(envelope-from rene@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m9SLQ0K4086423
	for perforce@freebsd.org; Tue, 28 Oct 2008 21:26:00 GMT
	(envelope-from rene@FreeBSD.org)
Date: Tue, 28 Oct 2008 21:26:00 GMT
Message-Id: <200810282126.m9SLQ0K4086423@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	rene@FreeBSD.org using -f
From: Rene Ladan 
To: Perforce Change Reviews 
Cc: 
Subject: PERFORCE change 152127 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, 28 Oct 2008 21:26:01 -0000

http://perforce.freebsd.org/chv.cgi?CH=152127

Change 152127 by rene@rene_self on 2008/10/28 21:25:32

	'explaining-bsd' is now ready for commit (review).

Affected files ...

.. //depot/projects/docproj_nl/nl_NL.ISO8859-1/articles/explaining-bsd/article.sgml#7 edit

Differences ...

==== //depot/projects/docproj_nl/nl_NL.ISO8859-1/articles/explaining-bsd/article.sgml#7 (text+ko) ====

@@ -101,15 +101,16 @@
       
 
       
-	Het X Window-systeem, wat grafisch afbeelden afhandelt.
+	Het X Window-systeem, wat grafisch afbeelden
+	  afhandelt.
 
 	Het X Window-systeem dat in de meeste versies van BSD
-	  wordt gegbruikt wordt onderhouden door één van
+	  wordt gebruikt wordt onderhouden door één van
 	  twee aparte projecten, ofwel het &xfree86; project, of
 	  het X.Org project.  Linux
-	  gebruikt dezelfde code.  BSD specificeert normialiter geen
+	  gebruikt dezelfde code.  BSD specificeert normaliter geen
 	  grafisch bureaublad zoals GNOME of KDE, deze
 	  zijn wel beschikbaar.
       
@@ -126,8 +127,8 @@
     De BSD-besturingssystemen zijn geen klonen, maar open-source
       afgeleiden van AT&T's Research &unix; besturingssysteem, wat
       ook de voorouder is van het moderne &unix; System V.  Dit kan als
-      een verassing komen.  Hoe kon dit gebeuren als AT&T nooit zijn
-      code als open-source heeft uitgegeven?
+      een verrassing komen.  Hoe kon dit gebeuren als AT&T nooit
+      zijn code als open-source heeft uitgegeven?
 
     Het is waar dat AT&T &unix; niet open-source is, en wat
       betreft copyright is BSD zeer zeker niet
@@ -136,16 +137,17 @@
       Science Research Group van de University of California in
       Berkeley, CA.  In 1976 is de CSRG begonnen met het uitgeven van
       tapes van hun software, die ze Berkeley Software
-	Distribution of BSD noemden.
+	Distribution of BSD
+      noemden.
 
     Initiële BSD-uitgaven bestonden grotendeels uit
-      gebruikersprogramma's, maar dat veranderede enorm toen CSRG in een
+      gebruikersprogramma's, maar dat veranderde enorm toen CSRG in een
       contract belandde met het Defense Advanced Projects Research
       Agency (DARPA) om de communicatieprotocollen in hun netwerk,
       ARPANET, te vernieuwen.  De nieuwe protocollen stonden bekend als
       Internet Protocols, later
       TCP/IP na de belangrijkste protocollen.  De
-      eerste wijdverspreide implementatie die gedistribueerd werd was
+      eerste wijdverbreide implementatie die gedistribueerd werd was
       deel van 4.2BSD, in 1982.
 
     In de loop van de jaren 80 ontsproten er een aantal nieuwe
@@ -217,7 +219,7 @@
 
       
 	BSD-ontwikkelaars zijn vaak meer ervaren dan
-	  Linux-ontwikkelaars, en hebben minder interessse in het
+	  Linux-ontwikkelaars, en hebben minder interesse in het
 	  systeem gemakkelijk in gebruik te maken.  Nieuwelingen voelen
 	  zich vaak meer op hun gemak met Linux.
       
@@ -227,12 +229,12 @@
 	    url="http://www.bsdi.com/">BSDI, de verkoper van
 	  BSD/386, aan op verdenking dat het product code bevatte
 	  waarover AT&T copyright had.  De zaak werd buiten de
-	  rechtbank om in 1994 beslist, maar het spook van de rechtzaak
+	  rechtbank om in 1994 beslist, maar het spook van de rechtszaak
 	  blijft mensen achtervolgen.  In een recent uit maart 2000 dat
 	  op het web werd gepubliceerd claimde dat de zaak
 	  recentelijk beslist was.
 
-	Eén detail dat de rechtzaak ophelderde is de
+	Eén detail dat de rechtszaak ophelderde is de
 	  naamgeving: in de jaren 80 stond BSD bekend als BSD
 	    &unix;.  Met het nemen van de laatste vestiging van
 	  AT&T-code van BSD, verloor het ook het recht op de naam
@@ -246,8 +248,8 @@
 	  oorlogvoerend zijn.  De Wall Street
 	    Journal sprak van balkanizatie van de
-	  BSD-projecten.  Net als de rechtzaak is dit beeld voornamelijk
-	  op een oude geschiedenis gebaseerd.
+	  BSD-projecten.  Net als de rechtszaak is dit beeld
+	  voornamelijk op een oude geschiedenis gebaseerd.
       
     
   
@@ -256,7 +258,7 @@
     BSD en Linux vergelijken
 
     Wat is nou echt het verschil tussen bijvoorbeeld Debian Linux
-      en &os;?  Voor de gemiddelde gebruiker is het verschil verassend
+      en &os;?  Voor de gemiddelde gebruiker is het verschil verrassend
       klein: beiden zijn &unix;-achtige besturingssystemen.  Beiden
       worden ontwikkeld door niet-commerciële projecten (dit geldt
       uiteraard niet voor vele andere distributies van Linux).  In de
@@ -295,7 +297,7 @@
       
 	
 	  Contributors schrijven code of
-	    documentatie.  Ze hebbben geen toestemming om direct naar de
+	    documentatie.  Ze hebben geen toestemming om direct naar de
 	    broncodeboom te committen (code toe te voegen).  Om hun code
 	    aan het systeem toe te voegen, moet het herzien en
 	    ingecheckt worden door een geregistreerde ontwikkelaar,
@@ -397,10 +399,10 @@
 	    CURRENT genoemd.  &os; kent een
 	    nummer aan CURRENT toe, bijvoorbeeld &os; 5.0-CURRENT.
 	    NetBSD hanteert een lichtelijk ander schema voor de
-	    naamgeveing en voegt een achtervoegsel van een enkele letter
+	    naamgeving en voegt een achtervoegsel van een enkele letter
 	    toe welke veranderingen aan de interne interfaces aangeeft,
 	    bijvoorbeeld NetBSD 1.4.3G.  OpenBSD kent geen nummer toe
-	    ("OpenBSD-currnet").  Alle nieuwe ontwikkelingen aan het
+	    ("OpenBSD-current").  Alle nieuwe ontwikkelingen aan het
 	    systeem komen in deze tak terecht.
 	
 
@@ -481,7 +483,7 @@
 	
 	  OpenBSD gaat voor beveiliging en code-puurheid: het
 	    gebruikt een combinatie van het open-source concept en
-	    rigoreuze codeherzieningen om een systeem te maken dat
+	    rigoureuze codeherzieningen om een systeem te maken dat
 	    aantoonbaar correct is, waardoor het de keuze is van
 	    beveiligingsbewuste organisaties zoals banken, beurzen, en
 	    afdelingen van de Amerikaanse overheid.  Net als NetBSD
@@ -492,7 +494,7 @@
 	  DragonFlyBSD gaat voor hoge prestaties en schaalbaarheid
 	    variërend van een UP-systeem van een enkele computer
 	    tot een reusachtig geclusterd systeem.  DragonFlyBSD heeft
-	    verscheidene langetermijns technische doelen, maar de focus
+	    verscheidene technische langetermijndoelen, maar de focus
 	    ligt op het bieden van een SMP-capabele infrastructuur dat
 	    eenvoudig te begrijpen en te onderhouden is, en waarvoor
 	    eenvoudig te ontwikkelen is.
@@ -533,8 +535,8 @@
     
 
     
-      Hoe verschilt de BSD-licentie van de GNU Public
-	License?
+      Hoe verschilt de BSD-licentie van de licentie van GNU
+	Public?
 
       Linux is beschikbaar onder de GNU General Public
@@ -543,7 +545,7 @@
 	van een product dat onder de GPL is vrijgegeven ook met de
 	broncode geleverd worden indien dat gevraagd wordt.  In
 	tegenstelling hiermee is de  BSD-licentie
+	 url="http://www.opensource.org/licenses/bsd-license.html">BSD-licentie
 	minder beperkend: distributies met alleen binairen zijn
 	toegestaan.  Dit is in het bijzonder aantrekkelijk voor embedded
 	applicaties.
@@ -554,7 +556,7 @@
 
       Aangezien er minder applicaties beschikbaar zijn voor BSD
 	dan voor Linux, hebben de ontwikkelaars van BSD een
-	Linux-compatibiliteitspakket onttwikkeld, wat het mogelijk maakt
+	Linux-compatibiliteitspakket ontwikkeld, wat het mogelijk maakt
 	om Linux-programma's onder BSD te draaien.  Het pakket bevat
 	zowel kernelwijzigingen, om Linux-systeemaanroepen correct uit
 	te voeren, en Linux-compatibiliteitsbestanden zoals de
@@ -612,7 +614,8 @@
 	
 
 	
-	  De BSD-licentie kan aantrekkelijker zijn dan de GPL.
+	  De BSD-licentie kan aantrekkelijker zijn dan de
+	    GPL.
 	
 
 	

From owner-p4-projects@FreeBSD.ORG  Tue Oct 28 22:44:21 2008
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 2B1D91065676; Tue, 28 Oct 2008 22:44:21 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id E2DC6106564A
	for ; Tue, 28 Oct 2008 22:44:20 +0000 (UTC)
	(envelope-from trasz@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id CF6728FC0C
	for ; Tue, 28 Oct 2008 22:44:20 +0000 (UTC)
	(envelope-from trasz@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id m9SMiKsn093558
	for ; Tue, 28 Oct 2008 22:44:20 GMT
	(envelope-from trasz@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m9SMiKAI093556
	for perforce@freebsd.org; Tue, 28 Oct 2008 22:44:20 GMT
	(envelope-from trasz@freebsd.org)
Date: Tue, 28 Oct 2008 22:44:20 GMT
Message-Id: <200810282244.m9SMiKAI093556@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	trasz@freebsd.org using -f
From: Edward Tomasz Napierala 
To: Perforce Change Reviews 
Cc: 
Subject: PERFORCE change 152132 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, 28 Oct 2008 22:44:21 -0000

http://perforce.freebsd.org/chv.cgi?CH=152132

Change 152132 by trasz@trasz_victim7 on 2008/10/28 22:43:39

	Fix typo.

Affected files ...

.. //depot/projects/soc2008/trasz_nfs4acl/sbin/mount/mount.8#4 edit

Differences ...

==== //depot/projects/soc2008/trasz_nfs4acl/sbin/mount/mount.8#4 (text+ko) ====

@@ -125,7 +125,7 @@
 and
 .Xr getfacl 1
 commands.
-This flag is mutially exlusive with
+This flag is mutually exclusive with
 .Cm nfs4acls
 flag.
 .It Cm async
@@ -186,7 +186,7 @@
 and
 .Xr getfacl 1
 commands.
-This flag is mutially exlusive with
+This flag is mutually exclusive with
 .Cm acls
 flag.
 .It Cm noasync

From owner-p4-projects@FreeBSD.ORG  Tue Oct 28 23:32:09 2008
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id B3799106567B; Tue, 28 Oct 2008 23:32:09 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 774F2106564A
	for ; Tue, 28 Oct 2008 23:32:09 +0000 (UTC)
	(envelope-from trasz@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 62CA28FC1A
	for ; Tue, 28 Oct 2008 23:32:09 +0000 (UTC)
	(envelope-from trasz@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id m9SNW9si098193
	for ; Tue, 28 Oct 2008 23:32:09 GMT
	(envelope-from trasz@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m9SNW9A6098191
	for perforce@freebsd.org; Tue, 28 Oct 2008 23:32:09 GMT
	(envelope-from trasz@freebsd.org)
Date: Tue, 28 Oct 2008 23:32:09 GMT
Message-Id: <200810282332.m9SNW9A6098191@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	trasz@freebsd.org using -f
From: Edward Tomasz Napierala 
To: Perforce Change Reviews 
Cc: 
Subject: PERFORCE change 152133 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, 28 Oct 2008 23:32:10 -0000

http://perforce.freebsd.org/chv.cgi?CH=152133

Change 152133 by trasz@trasz_victim7 on 2008/10/28 23:31:44

	Remove unneeded differences relative to SVN.

Affected files ...

.. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/vfs_subr.c#18 edit
.. //depot/projects/soc2008/trasz_nfs4acl/sys/security/mac_biba/mac_biba.c#10 edit
.. //depot/projects/soc2008/trasz_nfs4acl/sys/security/mac_bsdextended/mac_bsdextended.c#10 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/security/mac_lomac/mac_lomac.c#11 edit
.. //depot/projects/soc2008/trasz_nfs4acl/sys/security/mac_mls/mac_mls.c#10 edit
.. //depot/projects/soc2008/trasz_nfs4acl/sys/security/mac_stub/mac_stub.c#8 edit
.. //depot/projects/soc2008/trasz_nfs4acl/sys/ufs/ffs/ffs_vnops.c#6 edit

Differences ...

==== //depot/projects/soc2008/trasz_nfs4acl/sys/kern/vfs_subr.c#18 (text+ko) ====

@@ -53,7 +53,6 @@
 #include 
 #include 
 #include 
-#include 
 #include 
 #include 
 #include 
@@ -72,6 +71,7 @@
 #include 
 #include 
 #include 
+#include 
 
 #include 
 

==== //depot/projects/soc2008/trasz_nfs4acl/sys/security/mac_biba/mac_biba.c#10 (text+ko) ====

@@ -46,7 +46,6 @@
 
 #include 
 #include 
-#include 
 #include 
 #include 
 #include 
@@ -60,6 +59,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 

==== //depot/projects/soc2008/trasz_nfs4acl/sys/security/mac_bsdextended/mac_bsdextended.c#10 (text+ko) ====

@@ -225,8 +225,7 @@
 
 static int
 ugidfw_rulecheck(struct mac_bsdextended_rule *rule,
-    struct ucred *cred, struct vnode *vp, struct vattr *vap,
-    accmode_t accmode)
+    struct ucred *cred, struct vnode *vp, struct vattr *vap, int acc_mode)
 {
 	int mac_granted, match, priv_granted;
 	int i;
@@ -384,30 +383,30 @@
 	 */
 	priv_granted = 0;
 	mac_granted = rule->mbr_mode;
-	if ((accmode & MBI_ADMIN) && (mac_granted & MBI_ADMIN) == 0 &&
+	if ((acc_mode & MBI_ADMIN) && (mac_granted & MBI_ADMIN) == 0 &&
 	    priv_check_cred(cred, PRIV_VFS_ADMIN, 0) == 0)
 		priv_granted |= MBI_ADMIN;
-	if ((accmode & MBI_EXEC) && (mac_granted & MBI_EXEC) == 0 &&
+	if ((acc_mode & MBI_EXEC) && (mac_granted & MBI_EXEC) == 0 &&
 	    priv_check_cred(cred, (vap->va_type == VDIR) ? PRIV_VFS_LOOKUP :
 	    PRIV_VFS_EXEC, 0) == 0)
 		priv_granted |= MBI_EXEC;
-	if ((accmode & MBI_READ) && (mac_granted & MBI_READ) == 0 &&
+	if ((acc_mode & MBI_READ) && (mac_granted & MBI_READ) == 0 &&
 	    priv_check_cred(cred, PRIV_VFS_READ, 0) == 0)
 		priv_granted |= MBI_READ;
-	if ((accmode & MBI_STAT) && (mac_granted & MBI_STAT) == 0 &&
+	if ((acc_mode & MBI_STAT) && (mac_granted & MBI_STAT) == 0 &&
 	    priv_check_cred(cred, PRIV_VFS_STAT, 0) == 0)
 		priv_granted |= MBI_STAT;
-	if ((accmode & MBI_WRITE) && (mac_granted & MBI_WRITE) == 0 &&
+	if ((acc_mode & MBI_WRITE) && (mac_granted & MBI_WRITE) == 0 &&
 	    priv_check_cred(cred, PRIV_VFS_WRITE, 0) == 0)
 		priv_granted |= MBI_WRITE;
 	/*
 	 * Is the access permitted?
 	 */
-	if (((mac_granted | priv_granted) & accmode) != accmode) {
+	if (((mac_granted | priv_granted) & acc_mode) != acc_mode) {
 		if (ugidfw_logging)
 			log(LOG_AUTHPRIV, "mac_bsdextended: %d:%d request %d"
 			    " on %d:%d failed. \n", cred->cr_ruid,
-			    cred->cr_rgid, accmode, vap->va_uid,
+			    cred->cr_rgid, acc_mode, vap->va_uid,
 			    vap->va_gid);
 		return (EACCES);
 	}
@@ -424,23 +423,23 @@
 
 int
 ugidfw_check(struct ucred *cred, struct vnode *vp, struct vattr *vap,
-    accmode_t accmode)
+    int acc_mode)
 {
 	int error, i;
 
 	/*
 	 * Since we do not separately handle append, map append to write.
 	 */
-	if (accmode & MBI_APPEND) {
-		accmode &= ~MBI_APPEND;
-		accmode |= MBI_WRITE;
+	if (acc_mode & MBI_APPEND) {
+		acc_mode &= ~MBI_APPEND;
+		acc_mode |= MBI_WRITE;
 	}
 	mtx_lock(&ugidfw_mtx);
 	for (i = 0; i < rule_slots; i++) {
 		if (rules[i] == NULL)
 			continue;
 		error = ugidfw_rulecheck(rules[i], cred,
-		    vp, vap, accmode);
+		    vp, vap, acc_mode);
 		if (error == EJUSTRETURN)
 			break;
 		if (error) {
@@ -453,7 +452,7 @@
 }
 
 int
-ugidfw_check_vp(struct ucred *cred, struct vnode *vp, int accmode)
+ugidfw_check_vp(struct ucred *cred, struct vnode *vp, int acc_mode)
 {
 	int error;
 	struct vattr vap;
@@ -463,7 +462,7 @@
 	error = VOP_GETATTR(vp, &vap, cred);
 	if (error)
 		return (error);
-	return (ugidfw_check(cred, vp, &vap, accmode));
+	return (ugidfw_check(cred, vp, &vap, acc_mode));
 }
 
 static struct mac_policy_ops ugidfw_ops =

==== //depot/projects/soc2008/trasz_nfs4acl/sys/security/mac_lomac/mac_lomac.c#11 (text+ko) ====

@@ -48,7 +48,6 @@
 #include 
 #include 
 #include 
-#include 
 #include 
 #include 
 #include 
@@ -61,6 +60,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 

==== //depot/projects/soc2008/trasz_nfs4acl/sys/security/mac_mls/mac_mls.c#10 (text+ko) ====

@@ -48,7 +48,6 @@
 #include 
 #include 
 #include 
-#include 
 #include 
 #include 
 #include 
@@ -61,6 +60,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 

==== //depot/projects/soc2008/trasz_nfs4acl/sys/security/mac_stub/mac_stub.c#8 (text+ko) ====

@@ -50,7 +50,6 @@
 #include 
 #include 
 #include 
-#include 
 #include 
 #include 
 #include 
@@ -59,6 +58,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 

==== //depot/projects/soc2008/trasz_nfs4acl/sys/ufs/ffs/ffs_vnops.c#6 (text+ko) ====

@@ -69,7 +69,6 @@
 #include 
 #include 
 #include 
-#include 
 #include 
 #include 
 #include 
@@ -81,6 +80,7 @@
 #include 
 #include 
 #include 
+#include 
 
 #include 
 #include 

From owner-p4-projects@FreeBSD.ORG  Tue Oct 28 23:49:27 2008
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 9A016106567D; Tue, 28 Oct 2008 23:49:27 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 5E0D6106567B
	for ; Tue, 28 Oct 2008 23:49:27 +0000 (UTC)
	(envelope-from sam@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 49D2E8FC17
	for ; Tue, 28 Oct 2008 23:49:27 +0000 (UTC)
	(envelope-from sam@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id m9SNnR1H099477
	for ; Tue, 28 Oct 2008 23:49:27 GMT
	(envelope-from sam@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m9SNnR4V099475
	for perforce@freebsd.org; Tue, 28 Oct 2008 23:49:27 GMT
	(envelope-from sam@freebsd.org)
Date: Tue, 28 Oct 2008 23:49:27 GMT
Message-Id: <200810282349.m9SNnR4V099475@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 152134 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, 28 Oct 2008 23:49:27 -0000

http://perforce.freebsd.org/chv.cgi?CH=152134

Change 152134 by sam@sam_ebb on 2008/10/28 23:49:03

	be more intelligent selecting tx schedules

Affected files ...

.. //depot/projects/vap/sys/dev/ath/ath_rate/sample/sample.c#18 edit
.. //depot/projects/vap/sys/dev/ath/ath_rate/sample/sample.h#9 edit

Differences ...

==== //depot/projects/vap/sys/dev/ath/ath_rate/sample/sample.c#18 (text+ko) ====

@@ -254,7 +254,6 @@
 	}
 
 	mrr = sc->sc_mrretry && !(ic->ic_flags & IEEE80211_F_USEPROT);
-	*try0 = mrr ? 2 : ATH_TXMAXTRY;
 
 	best_rix = pick_best_rate(sn, rt, size_bin, !mrr);
 	if (best_rix >= 0) {
@@ -333,6 +332,7 @@
 		rix = sn->current_rix[size_bin];
 		sn->packets_since_switch[size_bin]++;
 	}
+	*try0 = mrr ? sn->sched[rix].t0 : ATH_TXMAXTRY;
 done:
 	KASSERT(rix >= 0 && rix < rt->rateCount, ("rix is %d", rix));
 
@@ -343,28 +343,64 @@
 #undef RATE
 }
 
+#define A(_r) \
+    (((_r) == 6)   ? 0 : (((_r) == 9)   ? 1 : (((_r) == 12)  ? 2 : \
+    (((_r) == 18)  ? 3 : (((_r) == 24)  ? 4 : (((_r) == 36)  ? 5 : \
+    (((_r) == 48)  ? 6 : (((_r) == 54)  ? 7 : 0))))))))
+static const struct txschedule series_11a[] = {
+	{ 3,A( 6), 3,A(  6), 0,A(  6), 0,A( 6) },	/*   6Mb/s */
+	{ 4,A( 9), 3,A(  6), 4,A(  6), 0,A( 6) },	/*   9Mb/s */
+	{ 4,A(12), 3,A(  6), 4,A(  6), 0,A( 6) },	/*  12Mb/s */
+	{ 4,A(18), 3,A( 12), 4,A(  6), 2,A( 6) },	/*  18Mb/s */
+	{ 4,A(24), 3,A( 18), 4,A( 12), 2,A( 6) },	/*  24Mb/s */
+	{ 4,A(36), 3,A( 24), 4,A( 18), 2,A( 6) },	/*  36Mb/s */
+	{ 4,A(48), 3,A( 36), 4,A( 24), 2,A(12) },	/*  48Mb/s */
+	{ 4,A(54), 3,A( 48), 4,A( 36), 2,A(24) }	/*  54Mb/s */
+};
+
+#define G(_r) \
+    (((_r) == 1)   ? 0 : (((_r) == 2)   ? 1 : (((_r) == 5.5) ? 2 : \
+    (((_r) == 11)  ? 3 : (((_r) == 6)   ? 4 : (((_r) == 9)   ? 5 : \
+    (((_r) == 12)  ? 6 : (((_r) == 18)  ? 7 : (((_r) == 24)  ? 8 : \
+    (((_r) == 36)  ? 9 : (((_r) == 48)  ? 10 : (((_r) == 54)  ? 11 : 0))))))))))))
+static const struct txschedule series_11g[] = {
+	{ 3,G( 1), 3,G(  1), 0,G(  1), 0,G( 1) },	/*   1Mb/s */
+	{ 4,G( 2), 3,G(  1), 4,G(  1), 0,G( 1) },	/*   2Mb/s */
+	{ 4,G(5.5),3,G(  2), 4,G(  1), 2,G( 1) },	/* 5.5Mb/s */
+	{ 4,G(11), 3,G(5.5), 4,G(  2), 2,G( 1) },	/*  11Mb/s */
+	{ 4,G( 6), 3,G(5.5), 4,G(  2), 2,G( 1) },	/*   6Mb/s */
+	{ 4,G( 9), 3,G(  6), 4,G(5.5), 2,G( 1) },	/*   9Mb/s */
+	{ 4,G(12), 3,G( 11), 4,G(5.5), 2,G( 1) },	/*  12Mb/s */
+	{ 4,G(18), 3,G( 12), 4,G( 11), 2,G( 1) },	/*  18Mb/s */
+	{ 4,G(24), 3,G( 18), 4,G( 12), 2,G( 1) },	/*  24Mb/s */
+	{ 4,G(36), 3,G( 24), 4,G( 18), 2,G( 1) },	/*  36Mb/s */
+	{ 4,G(48), 3,G( 36), 4,G( 24), 2,G( 1) },	/*  48Mb/s */
+	{ 4,G(54), 3,G( 48), 4,G( 36), 2,G( 1) }	/*  54Mb/s */
+};
+
 void
 ath_rate_setupxtxdesc(struct ath_softc *sc, struct ath_node *an,
 		      struct ath_desc *ds, int shortPreamble, u_int8_t rix)
 {
 	struct sample_node *sn = ATH_NODE_SAMPLE(an);
+	const struct txschedule *sched = &sn->sched[rix];
 	const HAL_RATE_TABLE *rt = sc->sc_currates;
-	const int size_bin = 0;		/*XXX*/
-	uint8_t rix1, s1code, rix2, s2code;
+	uint8_t rix1, s1code, rix2, s2code, rix3, s3code;
 
-	rix1 = sn->current_rix[size_bin]; /* retry at the current bit-rate */
-	if (!sn->stats[size_bin][rix1].packets_acked)
-		rix1 = rt->info[rix].controlRate;  /* next lowest basic rate */
+	/* XXX precalculate short preamble tables */
+	rix1 = sched->r1;
 	s1code = rt->info[rix1].rateCode
 	       | (shortPreamble ? rt->info[rix1].shortPreamble : 0);
-	rix2 = rt->info[rix1].controlRate;
+	rix2 = sched->r2;
 	s2code = rt->info[rix2].rateCode
 	       | (shortPreamble ? rt->info[rix2].shortPreamble : 0);
-	ath_hal_setupxtxdesc(sc->sc_ah, ds
-			     , s1code, 3	        /* series 1 */
-			     , s2code, 3		/* series 2 */
-			     , 0, 0	                /* series 3 */
-			     );
+	rix3 = sched->r3;
+	s3code = rt->info[rix3].rateCode
+	       | (shortPreamble ? rt->info[rix3].shortPreamble : 0);
+	ath_hal_setupxtxdesc(sc->sc_ah, ds,
+	    s1code, sched->t1,		/* series 1 */
+	    s2code, sched->t2,		/* series 2 */
+	    s3code, sched->t3);		/* series 3 */
 }
 
 static void
@@ -637,6 +673,19 @@
 		ath_rate_ctl_reset(sc, &an->an_node);
 }
 
+static const struct txschedule *mrr_schedules[IEEE80211_MODE_MAX] = {
+	NULL,		/* IEEE80211_MODE_AUTO */
+	series_11a,	/* IEEE80211_MODE_11A */
+	series_11g,	/* IEEE80211_MODE_11B */
+	series_11g,	/* IEEE80211_MODE_11G */
+	NULL,		/* IEEE80211_MODE_FH */
+	series_11a,	/* IEEE80211_MODE_TURBO_A */
+	series_11g,	/* IEEE80211_MODE_TURBO_G */
+	series_11a,	/* IEEE80211_MODE_STURBO_A */
+	series_11a,	/* IEEE80211_MODE_11NA */
+	series_11g,	/* IEEE80211_MODE_11NG */
+};
+
 /*
  * Initialize the tables for a node.
  */
@@ -653,6 +702,13 @@
 	uint32_t mask;
 
 	KASSERT(rt != NULL, ("no rate table, mode %u", sc->sc_curmode));
+
+	KASSERT(sc->sc_curmode < IEEE80211_MODE_MAX,
+	    ("curmode %u", sc->sc_curmode));
+	sn->sched = mrr_schedules[sc->sc_curmode];
+	KASSERT(sn->sched != NULL,
+	    ("no mrr schedule for mode %u", sc->sc_curmode));
+
         sn->static_rix = -1;
 	if (tp != NULL && tp->ucastrate != IEEE80211_FIXED_RATE_NONE) {
 		/*

==== //depot/projects/vap/sys/dev/ath/ath_rate/sample/sample.h#9 (text+ko) ====

@@ -60,6 +60,13 @@
 	int last_tx;
 };
 
+struct txschedule {
+	uint8_t	t0, r0;		/* series 0: tries, rate code */
+	uint8_t	t1, r1;		/* series 1: tries, rate code */
+	uint8_t	t2, r2;		/* series 2: tries, rate code */
+	uint8_t	t3, r3;		/* series 3: tries, rate code */
+};
+
 /*
  * for now, we track performance for three different packet
  * size buckets
@@ -71,6 +78,7 @@
 	int static_rix;			/* rate index of fixed tx rate */
 #define	SAMPLE_MAXRATES	32		/* NB: corresponds to hal info[32] */
 	uint32_t ratemask;		/* bit mask of valid rate indices */
+	const struct txschedule *sched;	/* tx schedule table */
 
 	struct rate_stats stats[NUM_PACKET_SIZE_BINS][SAMPLE_MAXRATES];
 	int last_sample_rix[NUM_PACKET_SIZE_BINS];

From owner-p4-projects@FreeBSD.ORG  Wed Oct 29 00:55:35 2008
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id EFF581065688; Wed, 29 Oct 2008 00:55:34 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id B30D01065680
	for ; Wed, 29 Oct 2008 00:55:34 +0000 (UTC)
	(envelope-from peter-gmail@wemm.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 9F0688FC19
	for ; Wed, 29 Oct 2008 00:55:34 +0000 (UTC)
	(envelope-from peter-gmail@wemm.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id m9T0tYsU015479
	for ; Wed, 29 Oct 2008 00:55:34 GMT
	(envelope-from peter-gmail@wemm.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m9T0tYGA015477
	for perforce@freebsd.org; Wed, 29 Oct 2008 00:55:34 GMT
	(envelope-from peter-gmail@wemm.org)
Date: Wed, 29 Oct 2008 00:55:34 GMT
Message-Id: <200810290055.m9T0tYGA015477@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	peter-gmail@wemm.org using -f
From: Peter Wemm 
To: Perforce Change Reviews 
Cc: 
Subject: PERFORCE change 152135 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, 29 Oct 2008 00:55:35 -0000

http://perforce.freebsd.org/chv.cgi?CH=152135

Change 152135 by peter@peter_overcee on 2008/10/29 00:55:04

	Export the object offset to procstat.

Affected files ...

.. //depot/projects/hammer/sys/kern/kern_proc.c#73 edit
.. //depot/projects/hammer/sys/sys/user.h#28 edit

Differences ...

==== //depot/projects/hammer/sys/kern/kern_proc.c#73 (text+ko) ====

@@ -1451,6 +1451,7 @@
 
 		kve->kve_start = (void*)entry->start;
 		kve->kve_end = (void*)entry->end;
+		kve->kve_offset = (off_t)entry->offset;
 
 		if (entry->protection & VM_PROT_READ)
 			kve->kve_protection |= KVME_PROT_READ;

==== //depot/projects/hammer/sys/sys/user.h#28 (text+ko) ====

@@ -325,7 +325,11 @@
 	int	 kve_ref_count;			/* VM obj ref count. */
 	int	 kve_shadow_count;		/* VM obj shadow count. */
 	char	 kve_path[PATH_MAX];		/* Path to VM obj, if any. */
-	void	*_kve_pspare[8];		/* Space for more stuff. */
+	off_t	 kve_offset;			/* Mapping offset within object */
+	/* Similar hack to struct stat.  See notes there. */
+	unsigned int :(8 / 2) * ((2 * (int)sizeof(void *)) - (int)sizeof(off_t));
+	unsigned int :(8 / 2) * ((2 * (int)sizeof(void *)) - (int)sizeof(off_t));
+	void	*_kve_pspare[6];		/* Space for more stuff. */
 	int	 _kve_ispare[8];		/* Space for more stuff. */
 };
 

From owner-p4-projects@FreeBSD.ORG  Wed Oct 29 01:28:08 2008
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 2FB84106567B; Wed, 29 Oct 2008 01:28:08 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id CF68A1065691
	for ; Wed, 29 Oct 2008 01:28:07 +0000 (UTC)
	(envelope-from peter-gmail@wemm.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id BAF4E8FC14
	for ; Wed, 29 Oct 2008 01:28:07 +0000 (UTC)
	(envelope-from peter-gmail@wemm.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id m9T1S7GO019145
	for ; Wed, 29 Oct 2008 01:28:07 GMT
	(envelope-from peter-gmail@wemm.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m9T1S7aQ019143
	for perforce@freebsd.org; Wed, 29 Oct 2008 01:28:07 GMT
	(envelope-from peter-gmail@wemm.org)
Date: Wed, 29 Oct 2008 01:28:07 GMT
Message-Id: <200810290128.m9T1S7aQ019143@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	peter-gmail@wemm.org using -f
From: Peter Wemm 
To: Perforce Change Reviews 
Cc: 
Subject: PERFORCE change 152136 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, 29 Oct 2008 01:28:08 -0000

http://perforce.freebsd.org/chv.cgi?CH=152136

Change 152136 by peter@peter_overcee on 2008/10/29 01:27:40

	Report object offsets in -v output

Affected files ...

.. //depot/projects/hammer/usr.bin/procstat/procstat_vm.c#3 edit

Differences ...

==== //depot/projects/hammer/usr.bin/procstat/procstat_vm.c#3 (text+ko) ====

@@ -41,16 +41,17 @@
 procstat_vm(pid_t pid, struct kinfo_proc *kipp __unused)
 {
 	struct kinfo_vmentry *freep, *kve;
-	int error, name[4], ptrwidth;
+	int error, name[4], ptrwidth, offwidth;
 	unsigned int i;
 	const char *str;
 	size_t len;
 
 	ptrwidth = 2*sizeof(void *) + 2;
+	offwidth = 2*sizeof(off_t) + 2;
 	if (!hflag)
-		printf("%5s %*s %*s %3s %4s %4s %3s %3s %2s %-2s %-s\n",
+		printf("%5s %*s %*s %3s %4s %4s %3s %3s %2s %-2s %*s %-s\n",
 		    "PID", ptrwidth, "START", ptrwidth, "END", "PRT", "RES",
-		    "PRES", "REF", "SHD", "FL", "TP", "PATH");
+		    "PRES", "REF", "SHD", "FL", "TP", offwidth, "OFFSET", "PATH");
 
 	name[0] = CTL_KERN;
 	name[1] = KERN_PROC;
@@ -125,6 +126,7 @@
 			break;
 		}
 		printf("%-2s ", str);
+		printf("%#*llx ", offwidth, (unsigned long long)kve->kve_offset);
 		printf("%-s\n", kve->kve_path);
 	}
 	free(freep);

From owner-p4-projects@FreeBSD.ORG  Wed Oct 29 08:13:59 2008
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id B0D6F1065675; Wed, 29 Oct 2008 08:13:59 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 68B3F1065670
	for ; Wed, 29 Oct 2008 08:13:59 +0000 (UTC)
	(envelope-from trasz@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 1A9CF8FC23
	for ; Wed, 29 Oct 2008 08:13:59 +0000 (UTC)
	(envelope-from trasz@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id m9T8DxwB071568
	for ; Wed, 29 Oct 2008 08:13:59 GMT
	(envelope-from trasz@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m9T8DxJT071566
	for perforce@freebsd.org; Wed, 29 Oct 2008 08:13:59 GMT
	(envelope-from trasz@freebsd.org)
Date: Wed, 29 Oct 2008 08:13:59 GMT
Message-Id: <200810290813.m9T8DxJT071566@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	trasz@freebsd.org using -f
From: Edward Tomasz Napierala 
To: Perforce Change Reviews 
Cc: 
Subject: PERFORCE change 152139 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, 29 Oct 2008 08:14:00 -0000

http://perforce.freebsd.org/chv.cgi?CH=152139

Change 152139 by trasz@trasz_victim7 on 2008/10/29 08:13:10

	IFC.

Affected files ...

.. //depot/projects/soc2008/trasz_nfs4acl/bin/rcp/rcp.c#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/conf/files#19 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/u3g.c#5 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/usbdevs#11 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/subr_acl_posix1e.c#9 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/powerpc/powermac/ata_dbdma.c#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/security/mac/mac_cred.c#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/sys/security/mac/mac_process.c#4 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/security/mac_stub/mac_stub.c#9 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/sparc64/pci/schizo.c#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/sys/param.h#9 integrate

Differences ...

==== //depot/projects/soc2008/trasz_nfs4acl/bin/rcp/rcp.c#2 (text+ko) ====

@@ -46,7 +46,7 @@
 #endif /* not lint */
 #endif
 #include 
-__FBSDID("$FreeBSD: src/bin/rcp/rcp.c,v 1.46 2007/05/22 04:21:00 cperciva Exp $");
+__FBSDID("$FreeBSD: src/bin/rcp/rcp.c,v 1.47 2008/10/28 17:15:46 rdivacky Exp $");
 
 #include 
 #include 
@@ -789,6 +789,4 @@
 		vwarnx(fmt, ap);
 		va_end(ap);
 	}
-
-	va_end(ap);
 }

==== //depot/projects/soc2008/trasz_nfs4acl/sys/conf/files#19 (text+ko) ====

@@ -1,4 +1,4 @@
-# $FreeBSD: src/sys/conf/files,v 1.1341 2008/10/27 17:57:03 bz Exp $
+# $FreeBSD: src/sys/conf/files,v 1.1342 2008/10/28 21:53:10 rwatson Exp $
 #
 # The long compile-with and dependency lines are required because of
 # limitations in config: backslash-newline doesn't work in strings, and
@@ -2176,6 +2176,7 @@
 security/audit/audit_worker.c	optional audit
 security/mac/mac_atalk.c	optional mac netatalk
 security/mac/mac_audit.c	optional mac audit
+security/mac/mac_cred.c		optional mac
 security/mac/mac_framework.c	optional mac
 security/mac/mac_inet.c		optional mac inet
 security/mac/mac_inet6.c	optional mac inet6

==== //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/u3g.c#5 (text+ko) ====

@@ -16,7 +16,7 @@
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  *
- * $FreeBSD: src/sys/dev/usb/u3g.c,v 1.14 2008/10/28 09:45:07 bz Exp $
+ * $FreeBSD: src/sys/dev/usb/u3g.c,v 1.15 2008/10/29 08:08:55 n_hibma Exp $
  */
 
 /*
@@ -51,14 +51,12 @@
 #endif
 #include "usbdevs.h"
 
-//#define U3G_DEBUG
+#define U3G_DEBUG
 #ifdef U3G_DEBUG
 #define DPRINTF(x...)		do { if (u3gdebug) device_printf(sc->sc_dev, ##x); } while (0)
-#define DPRINTFN(n, x...)	do { if (u3gdebug > (n)) device_printf(self, ##x); } while (0)
 int	u3gdebug = 1;
 #else
 #define DPRINTF(x...)		/* nop */
-#define DPRINTFN(n, x...)	/* nop */
 #endif
 
 #define U3G_MAXPORTS		4
@@ -135,7 +133,8 @@
 	{{ USB_VENDOR_OPTION, USB_PRODUCT_OPTION_GTMAXHSUPA },		U3GSP_HSDPA,	U3GFL_NONE },
 	{{ USB_VENDOR_OPTION, USB_PRODUCT_OPTION_VODAFONEMC3G },	U3GSP_UMTS,	U3GFL_NONE },
 	/* OEM: Qualcomm, Inc. */
-	{{ USB_VENDOR_QUALCOMMINC, USB_PRODUCT_QUALCOMMINC_CDMA_MSM },	U3GSP_CDMA,	U3GFL_STUB_WAIT },
+	{{ USB_VENDOR_QUALCOMMINC, USB_PRODUCT_QUALCOMMINC_ZTE_STOR },	U3GSP_CDMA,	U3GFL_SCSI_EJECT },
+	{{ USB_VENDOR_QUALCOMMINC, USB_PRODUCT_QUALCOMMINC_CDMA_MSM },	U3GSP_CDMA,	U3GFL_SCSI_EJECT },
 	/* OEM: Huawei */
 	{{ USB_VENDOR_HUAWEI, USB_PRODUCT_HUAWEI_MOBILE },		U3GSP_HSDPA,	U3GFL_HUAWEI_INIT },
 	{{ USB_VENDOR_HUAWEI, USB_PRODUCT_HUAWEI_E220 },		U3GSP_HSPA,	U3GFL_HUAWEI_INIT },

==== //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/usbdevs#11 (text+ko) ====

@@ -1,4 +1,4 @@
-$FreeBSD: src/sys/dev/usb/usbdevs,v 1.379 2008/10/17 14:37:58 brooks Exp $
+$FreeBSD: src/sys/dev/usb/usbdevs,v 1.380 2008/10/29 08:08:55 n_hibma Exp $
 /* $NetBSD: usbdevs,v 1.392 2004/12/29 08:38:44 imp Exp $ */
 
 /*-
@@ -1996,6 +1996,7 @@
 product QUALCOMM2 RWT_FCT	0x3100	RWT FCT-CDMA 2000 1xRTT modem
 product QUALCOMM2 CDMA_MSM	0x3196	CDMA Technologies MSM modem
 product QUALCOMMINC CDMA_MSM	0x0001	CDMA Technologies MSM modem
+product QUALCOMMINC ZTE_STOR	0x2000	USB ZTE Storage
 
 /* Qtronix products */
 product QTRONIX 980N		0x2011	Scorpion-980N keyboard

==== //depot/projects/soc2008/trasz_nfs4acl/sys/kern/subr_acl_posix1e.c#9 (text+ko) ====

@@ -34,7 +34,7 @@
  */
 
 #include 
-__FBSDID("$FreeBSD: src/sys/kern/subr_acl_posix1e.c,v 1.53 2008/10/28 13:44:11 trasz Exp $");
+__FBSDID("$FreeBSD: src/sys/kern/subr_acl_posix1e.c,v 1.54 2008/10/28 21:58:48 trasz Exp $");
 
 #include 
 #include 
@@ -53,7 +53,7 @@
  */
 int
 vaccess_acl_posix1e(enum vtype type, uid_t file_uid, gid_t file_gid,
-    struct acl *acl, accmode_t acc_mode, struct ucred *cred, int *privused)
+    struct acl *acl, accmode_t accmode, struct ucred *cred, int *privused)
 {
 	struct acl_entry *acl_other, *acl_mask;
 	accmode_t dac_granted;
@@ -84,23 +84,23 @@
 	priv_granted = 0;
 
 	if (type == VDIR) {
-		if ((acc_mode & VEXEC) && !priv_check_cred(cred,
+		if ((accmode & VEXEC) && !priv_check_cred(cred,
 		     PRIV_VFS_LOOKUP, 0))
 			priv_granted |= VEXEC;
 	} else {
-		if ((acc_mode & VEXEC) && !priv_check_cred(cred,
+		if ((accmode & VEXEC) && !priv_check_cred(cred,
 		    PRIV_VFS_EXEC, 0))
 			priv_granted |= VEXEC;
 	}
 
-	if ((acc_mode & VREAD) && !priv_check_cred(cred, PRIV_VFS_READ, 0))
+	if ((accmode & VREAD) && !priv_check_cred(cred, PRIV_VFS_READ, 0))
 		priv_granted |= VREAD;
 
-	if (((acc_mode & VWRITE) || (acc_mode & VAPPEND)) &&
+	if (((accmode & VWRITE) || (accmode & VAPPEND)) &&
 	    !priv_check_cred(cred, PRIV_VFS_WRITE, 0))
 		priv_granted |= (VWRITE | VAPPEND);
 
-	if ((acc_mode & VADMIN) && !priv_check_cred(cred, PRIV_VFS_ADMIN, 0))
+	if ((accmode & VADMIN) && !priv_check_cred(cred, PRIV_VFS_ADMIN, 0))
 		priv_granted |= VADMIN;
 
 	/*
@@ -123,14 +123,14 @@
 				dac_granted |= VREAD;
 			if (acl->acl_entry[i].ae_perm & ACL_WRITE)
 				dac_granted |= (VWRITE | VAPPEND);
-			if ((acc_mode & dac_granted) == acc_mode)
+			if ((accmode & dac_granted) == accmode)
 				return (0);
 
 			/*
 			 * XXXRW: Do privilege lookup here.
 			 */
-			if ((acc_mode & (dac_granted | priv_granted)) ==
-			    acc_mode) {
+			if ((accmode & (dac_granted | priv_granted)) ==
+			    accmode) {
 				if (privused != NULL)
 					*privused = 1;
 				return (0);
@@ -200,13 +200,13 @@
 			if (acl->acl_entry[i].ae_perm & ACL_WRITE)
 				dac_granted |= (VWRITE | VAPPEND);
 			dac_granted &= acl_mask_granted;
-			if ((acc_mode & dac_granted) == acc_mode)
+			if ((accmode & dac_granted) == accmode)
 				return (0);
 			/*
 			 * XXXRW: Do privilege lookup here.
 			 */
-			if ((acc_mode & (dac_granted | priv_granted)) !=
-			    acc_mode)
+			if ((accmode & (dac_granted | priv_granted)) !=
+			    accmode)
 				goto error;
 
 			if (privused != NULL)
@@ -237,7 +237,7 @@
 				dac_granted |= (VWRITE | VAPPEND);
 			dac_granted  &= acl_mask_granted;
 
-			if ((acc_mode & dac_granted) == acc_mode)
+			if ((accmode & dac_granted) == accmode)
 				return (0);
 
 			group_matched = 1;
@@ -255,7 +255,7 @@
 				dac_granted |= (VWRITE | VAPPEND);
 			dac_granted  &= acl_mask_granted;
 
-			if ((acc_mode & dac_granted) == acc_mode)
+			if ((accmode & dac_granted) == accmode)
 				return (0);
 
 			group_matched = 1;
@@ -288,8 +288,8 @@
 				/*
 				 * XXXRW: Do privilege lookup here.
 				 */
-				if ((acc_mode & (dac_granted | priv_granted))
-				    != acc_mode)
+				if ((accmode & (dac_granted | priv_granted))
+				    != accmode)
 					break;
 
 				if (privused != NULL)
@@ -312,8 +312,8 @@
 				/*
 				 * XXXRW: Do privilege lookup here.
 				 */
-				if ((acc_mode & (dac_granted | priv_granted))
-				    != acc_mode)
+				if ((accmode & (dac_granted | priv_granted))
+				    != accmode)
 					break;
 
 				if (privused != NULL)
@@ -342,19 +342,19 @@
 	if (acl_other->ae_perm & ACL_WRITE)
 		dac_granted |= (VWRITE | VAPPEND);
 
-	if ((acc_mode & dac_granted) == acc_mode)
+	if ((accmode & dac_granted) == accmode)
 		return (0);
 	/*
 	 * XXXRW: Do privilege lookup here.
 	 */
-	if ((acc_mode & (dac_granted | priv_granted)) == acc_mode) {
+	if ((accmode & (dac_granted | priv_granted)) == accmode) {
 		if (privused != NULL)
 			*privused = 1;
 		return (0);
 	}
 
 error:
-	return ((acc_mode & VADMIN) ? EPERM : EACCES);
+	return ((accmode & VADMIN) ? EPERM : EACCES);
 }
 
 /*

==== //depot/projects/soc2008/trasz_nfs4acl/sys/powerpc/powermac/ata_dbdma.c#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/sys/powerpc/powermac/ata_dbdma.c,v 1.1 2008/09/27 15:13:44 nwhitehorn Exp $
+ * $FreeBSD: src/sys/powerpc/powermac/ata_dbdma.c,v 1.2 2008/10/28 22:09:30 nwhitehorn Exp $
  */
 
 /*
@@ -275,6 +275,12 @@
 	sc->sc_ch.dma.load = ata_dbdma_load;
 	sc->sc_ch.dma.reset = ata_dbdma_reset;
 
+	/*
+	 * DBDMA's field for transfer size is 16 bits. This will overflow
+	 * if we try to do a 64K transfer, so stop short of 64K.
+	 */
+	sc->sc_ch.dma.segsize = 126 * DEV_BSIZE;
+
 	sc->sc_ch.hw.status = ata_dbdma_status;
 
 	mtx_init(&sc->dbdma_mtx, "ATA DBDMA", NULL, MTX_DEF);

==== //depot/projects/soc2008/trasz_nfs4acl/sys/security/mac/mac_process.c#4 (text+ko) ====

@@ -41,7 +41,7 @@
  */
 
 #include 
-__FBSDID("$FreeBSD: src/sys/security/mac/mac_process.c,v 1.125 2008/10/28 12:49:07 rwatson Exp $");
+__FBSDID("$FreeBSD: src/sys/security/mac/mac_process.c,v 1.126 2008/10/28 21:53:10 rwatson Exp $");
 
 #include "opt_mac.h"
 
@@ -84,26 +84,6 @@
 static void	mac_proc_vm_revoke_recurse(struct thread *td,
 		    struct ucred *cred, struct vm_map *map);
 
-struct label *
-mac_cred_label_alloc(void)
-{
-	struct label *label;
-
-	label = mac_labelzone_alloc(M_WAITOK);
-	MAC_PERFORM(cred_init_label, label);
-	return (label);
-}
-
-void
-mac_cred_init(struct ucred *cred)
-{
-
-	if (mac_labeled & MPC_OBJECT_CRED)
-		cred->cr_label = mac_cred_label_alloc();
-	else
-		cred->cr_label = NULL;
-}
-
 static struct label *
 mac_proc_label_alloc(void)
 {
@@ -124,24 +104,6 @@
 		p->p_label = NULL;
 }
 
-void
-mac_cred_label_free(struct label *label)
-{
-
-	MAC_PERFORM(cred_destroy_label, label);
-	mac_labelzone_free(label);
-}
-
-void
-mac_cred_destroy(struct ucred *cred)
-{
-
-	if (cred->cr_label != NULL) {
-		mac_cred_label_free(cred->cr_label);
-		cred->cr_label = NULL;
-	}
-}
-
 static void
 mac_proc_label_free(struct label *label)
 {
@@ -160,84 +122,13 @@
 	}
 }
 
-/*
- * When a thread becomes an NFS server daemon, its credential may need to be
- * updated to reflect this so that policies can recognize when file system
- * operations originate from the network.
- *
- * At some point, it would be desirable if the credential used for each NFS
- * RPC could be set based on the RPC context (i.e., source system, etc) to
- * provide more fine-grained access control.
- */
-void
-mac_cred_associate_nfsd(struct ucred *cred)
-{
-
-	MAC_PERFORM(cred_associate_nfsd, cred);
-}
-
-/*
- * Initialize MAC label for the first kernel process, from which other kernel
- * processes and threads are spawned.
- */
-void
-mac_cred_create_swapper(struct ucred *cred)
-{
-
-	MAC_PERFORM(cred_create_swapper, cred);
-}
-
-/*
- * Initialize MAC label for the first userland process, from which other
- * userland processes and threads are spawned.
- */
 void
-mac_cred_create_init(struct ucred *cred)
-{
-
-	MAC_PERFORM(cred_create_init, cred);
-}
-
-int
-mac_cred_externalize_label(struct label *label, char *elements,
-    char *outbuf, size_t outbuflen)
-{
-	int error;
-
-	MAC_EXTERNALIZE(cred, label, elements, outbuf, outbuflen);
-
-	return (error);
-}
-
-int
-mac_cred_internalize_label(struct label *label, char *string)
-{
-	int error;
-
-	MAC_INTERNALIZE(cred, label, string);
-
-	return (error);
-}
-
-void
 mac_thread_userret(struct thread *td)
 {
 
 	MAC_PERFORM(thread_userret, td);
 }
 
-/*
- * When a new process is created, its label must be initialized.  Generally,
- * this involves inheritence from the parent process, modulo possible deltas.
- * This function allows that processing to take place.
- */
-void
-mac_cred_copy(struct ucred *src, struct ucred *dest)
-{
-
-	MAC_PERFORM(cred_copy_label, src->cr_label, dest->cr_label);
-}
-
 int
 mac_execve_enter(struct image_params *imgp, struct mac *mac_p)
 {
@@ -484,38 +375,6 @@
 	vm_map_unlock_read(map);
 }
 
-/*
- * When the subject's label changes, it may require revocation of privilege
- * to mapped objects.  This can't be done on-the-fly later with a unified
- * buffer cache.
- */
-void
-mac_cred_relabel(struct ucred *cred, struct label *newlabel)
-{
-
-	MAC_PERFORM(cred_relabel, cred, newlabel);
-}
-
-int
-mac_cred_check_relabel(struct ucred *cred, struct label *newlabel)
-{
-	int error;
-
-	MAC_CHECK(cred_check_relabel, cred, newlabel);
-
-	return (error);
-}
-
-int
-mac_cred_check_visible(struct ucred *cr1, struct ucred *cr2)
-{
-	int error;
-
-	MAC_CHECK(cred_check_visible, cr1, cr2);
-
-	return (error);
-}
-
 int
 mac_proc_check_debug(struct ucred *cred, struct proc *p)
 {

==== //depot/projects/soc2008/trasz_nfs4acl/sys/security/mac_stub/mac_stub.c#9 (text+ko) ====

@@ -36,7 +36,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD: src/sys/security/mac_stub/mac_stub.c,v 1.89 2008/10/28 13:44:11 trasz Exp $
+ * $FreeBSD: src/sys/security/mac_stub/mac_stub.c,v 1.90 2008/10/28 21:57:32 trasz Exp $
  */
 
 /*
@@ -1215,7 +1215,7 @@
 
 static int
 stub_vnode_check_access(struct ucred *cred, struct vnode *vp,
-    struct label *vplabel, int acc_mode)
+    struct label *vplabel, accmode_t accmode)
 {
 
 	return (0);

==== //depot/projects/soc2008/trasz_nfs4acl/sys/sparc64/pci/schizo.c#2 (text+ko) ====

@@ -32,7 +32,7 @@
  */
 
 #include 
-__FBSDID("$FreeBSD: src/sys/sparc64/pci/schizo.c,v 1.1 2008/09/28 00:07:05 marius Exp $");
+__FBSDID("$FreeBSD: src/sys/sparc64/pci/schizo.c,v 1.2 2008/10/28 22:05:20 marius Exp $");
 
 /*
  * Driver for `Schizo' Fireplane/Safari to PCI 2.1 and `Tomatillo' JBus to
@@ -175,7 +175,6 @@
 	driver_filter_t		*sds_handler;
 	void			*sds_arg;
 	void			*sds_cookie;
-	bus_size_t		sds_syncreg;
 	uint64_t		sds_syncval;
 	u_int			sds_bswar;
 };
@@ -955,25 +954,25 @@
 	static u_char buf[VIS_BLOCKSIZE] __aligned(VIS_BLOCKSIZE);
 	struct schizo_dmasync *sds = arg;
 	struct schizo_softc *sc = sds->sds_sc;
-	uint64_t reg;
+	register_t reg, s;
 	int timeout;
 
-	SCHIZO_PCI_WRITE_8(sc, sds->sds_syncreg, sds->sds_syncval);
+	SCHIZO_PCI_WRITE_8(sc, TOMXMS_PCI_DMA_SYNC_PEND, sds->sds_syncval);
 	timeout = 1000000;
-	for (; (SCHIZO_PCI_READ_8(sc, sds->sds_syncreg) &
+	for (; (SCHIZO_PCI_READ_8(sc, TOMXMS_PCI_DMA_SYNC_PEND) &
 	    sds->sds_syncval) != 0;)
 		if (--timeout < 0)
 			panic("%s: DMA does not sync", __func__);
 
 	if (sds->sds_bswar != 0) {
-		critical_enter();
+		s = intr_disable();
 		reg = rd(fprs);
 		wr(fprs, reg | FPRS_FEF, 0);
-		__asm__ __volatile__("stda %%f0, [%0] %1"
+		__asm __volatile("stda %%f0, [%0] %1"
 		    : : "r" (buf), "n" (ASI_BLK_COMMIT_S));
+		membar(Sync);
 		wr(fprs, reg, 0);
-		membar(Sync);
-		critical_exit();
+		intr_restore(s);
 	}
 	return (sds->sds_handler(sds->sds_arg));
 }
@@ -1039,8 +1038,8 @@
 	}
 
 	/*
-	 * Schizo revision >= 2.3 (i.e. version >= 5) and Tomatillo bridges
-	 * need to be manually told to sync DMA writes.
+	 * Tomatillo and XMITS bridges need to be told to sync DMA writes
+	 * based on the INO of the respective device.
 	 * Tomatillo revision <= 2.3 (i.e. version <= 4) bridges additionally
 	 * need a block store as a workaround for a hardware bug.
 	 * XXX setup of the wrapper and the contents of schizo_dmasync()
@@ -1049,15 +1048,12 @@
 	 * is newbus'ified, so the wrapper isn't only applied for interrupt
 	 * handlers but also for polling(4) callbacks.
 	 */
-	if ((sc->sc_mode == SCHIZO_MODE_SCZ && sc->sc_ver >= 5) ||
-	    sc->sc_mode == SCHIZO_MODE_TOM) {
+	if (sc->sc_mode == SCHIZO_MODE_TOM || sc->sc_mode == SCHIZO_MODE_XMS) {
 		sds = malloc(sizeof(*sds), M_DEVBUF, M_NOWAIT | M_ZERO);
 		if (sds == NULL)
 			return (ENOMEM);
 		sds->sds_sc = sc;
 		sds->sds_arg = arg;
-		sds->sds_syncreg = sc->sc_mode == SCHIZO_MODE_SCZ ?
-		    SCZ_PCI_DMA_SYNC : TOMXMS_PCI_DMA_SYNC_PEND;
 		sds->sds_syncval = 1ULL << INTINO(vec);
 		if (sc->sc_mode == SCHIZO_MODE_TOM && sc->sc_ver <= 4)
 			sds->sds_bswar = 1;

==== //depot/projects/soc2008/trasz_nfs4acl/sys/sys/param.h#9 (text+ko) ====

@@ -32,7 +32,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)param.h	8.3 (Berkeley) 4/4/95
- * $FreeBSD: src/sys/sys/param.h,v 1.370 2008/10/23 15:53:51 des Exp $
+ * $FreeBSD: src/sys/sys/param.h,v 1.371 2008/10/28 19:48:58 trasz Exp $
  */
 
 #ifndef _SYS_PARAM_H_
@@ -57,7 +57,7 @@
  *		is created, otherwise 1.
  */
 #undef __FreeBSD_version
-#define __FreeBSD_version 800051	/* Master, propagated to newvers */
+#define __FreeBSD_version 800052	/* Master, propagated to newvers */
 
 #ifndef LOCORE
 #include 

From owner-p4-projects@FreeBSD.ORG  Wed Oct 29 08:15:00 2008
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id ADED2106568D; Wed, 29 Oct 2008 08:15:00 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 5989E106567C
	for ; Wed, 29 Oct 2008 08:15:00 +0000 (UTC)
	(envelope-from peter-gmail@wemm.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 469218FC0A
	for ; Wed, 29 Oct 2008 08:15:00 +0000 (UTC)
	(envelope-from peter-gmail@wemm.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id m9T8F0HQ071641
	for ; Wed, 29 Oct 2008 08:15:00 GMT
	(envelope-from peter-gmail@wemm.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m9T8F0XL071639
	for perforce@freebsd.org; Wed, 29 Oct 2008 08:15:00 GMT
	(envelope-from peter-gmail@wemm.org)
Date: Wed, 29 Oct 2008 08:15:00 GMT
Message-Id: <200810290815.m9T8F0XL071639@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	peter-gmail@wemm.org using -f
From: Peter Wemm 
To: Perforce Change Reviews 
Cc: 
Subject: PERFORCE change 152140 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, 29 Oct 2008 08:15:00 -0000

http://perforce.freebsd.org/chv.cgi?CH=152140

Change 152140 by peter@peter_overcee on 2008/10/29 08:14:03

	Deal with the procfs map handler inserting stray newlines at random.
	Write an alternative map reader that uses the KERN_PROC_VMMAP sysctl -
	MUCH MUCH nicer to deal with, and hopefully it has my patch for kve_offset.

Affected files ...

.. //depot/projects/valgrind/coregrind/m_aspacemgr/aspacemgr-freebsd.c#8 edit

Differences ...

==== //depot/projects/valgrind/coregrind/m_aspacemgr/aspacemgr-freebsd.c#8 (text+ko) ====

@@ -1932,6 +1932,7 @@
    if (!(flags & VKI_MAP_ANONYMOUS)) {
       // Nb: We ignore offset requests in anonymous mmaps (see bug #126722)
       seg.offset = offset;
+//VG_(printf)("XX:1 offset %#llx\n", offset);
       if (get_inode_for_fd(fd, &dev, &ino, &mode)) {
          seg.dev = dev;
          seg.ino = ino;
@@ -2119,6 +2120,7 @@
    if (!ok || advised != start)
       return VG_(mk_SysRes_Error)( VKI_EINVAL );
 
+//VG_(printf)("XX:2 offset %#lx\n", offset);
    /* We have been advised that the mapping is allowable at the
       specified address.  So hand it off to the kernel, and propagate
       any resulting failure immediately. */
@@ -2144,6 +2146,7 @@
    seg.start  = start;
    seg.end    = seg.start + VG_PGROUNDUP(length) - 1;
    seg.offset = offset;
+//VG_(printf)("XX:3 offset %#llx\n", offset);
    seg.hasR   = toBool(prot & VKI_PROT_READ);
    seg.hasW   = toBool(prot & VKI_PROT_WRITE);
    seg.hasX   = toBool(prot & VKI_PROT_EXEC);
@@ -2394,6 +2397,7 @@
    if (!ok)
       return VG_(mk_SysRes_Error)( VKI_EINVAL );
 
+//VG_(printf)("XX:4 offset %#llx\n", offset);
    /* We have been advised that the mapping is allowable at the
       specified address.  So hand it off to the kernel, and propagate
       any resulting failure immediately. */
@@ -2419,6 +2423,7 @@
    seg.start  = sres.res;
    seg.end    = seg.start + VG_PGROUNDUP(length) - 1;
    seg.offset = offset;
+//VG_(printf)("XX:5 offset %#llx\n", offset);
    seg.hasR   = toBool(prot & VKI_PROT_READ);
    seg.hasW   = toBool(prot & VKI_PROT_WRITE);
    seg.hasX   = toBool(prot & VKI_PROT_EXEC);
@@ -2882,6 +2887,7 @@
       aspacem_assert(seg.kind == SkAnonC);
       aspacem_assert(seg.offset == 0);
    }
+//VG_(printf)("XX:6 offset %#llx\n", seg.offset);
    seg.start = new_addr;
    seg.end   = new_addr + new_len - 1;
    add_segment( &seg );
@@ -2905,6 +2911,81 @@
    return True;
 }
 
+#if __FreeBSD__ >= 7
+
+/* Size of a smallish table used to read /proc/self/map entries. */
+#define M_PROCMAP_BUF 100000
+
+/* static ... to keep it out of the stack frame. */
+static Char procmap_buf[M_PROCMAP_BUF];
+
+static void parse_procselfmaps (
+      void (*record_mapping)( Addr addr, SizeT len, UInt prot,
+                              ULong dev, ULong ino, ULong offset, 
+                              const UChar* filename ),
+      void (*record_gap)( Addr addr, SizeT len )
+   )
+{
+   Int    i;
+   Addr   start, endPlusOne, gapStart;
+   UChar* filename;
+   UInt	  prot;
+   ULong  foffset, dev, ino;
+   struct vki_kinfo_vmentry *kve;
+   vki_size_t len;
+   Int    oid[4];
+   SysRes sres;
+
+//VG_(debugLog)(0, "procselfmaps", "DOING SYSCTL\n");
+   foffset = ino = 0; /* keep gcc-4.1.0 happy */
+
+   oid[0] = VKI_CTL_KERN;
+   oid[1] = VKI_KERN_PROC;
+   oid[2] = VKI_KERN_PROC_VMMAP;
+   oid[3] = VG_(do_syscall0)(__NR_getpid).res;
+   len = sizeof(procmap_buf);
+
+   sres = VG_(do_syscall6)(__NR___sysctl, (UWord)oid, 4, (UWord)procmap_buf, (UWord)&len, 0, 0);
+   if (sres.isError) {
+      VG_(debugLog)(0, "procselfmaps", "sysctl %ld\n", sres.err);
+      ML_(am_exit)(1);
+   }
+
+   gapStart = Addr_MIN;
+   i = 0;
+   kve = (struct vki_kinfo_vmentry *)procmap_buf;
+   for (i = 0; i < (len / sizeof(*kve)); i++, kve++) {
+      dev = ino = 0;
+
+      start      = (UWord)kve->kve_start;
+      endPlusOne = (UWord)kve->kve_end;
+      foffset    = kve->kve_offset;
+      filename   = kve->kve_path;
+      if (filename[0] != '/') {
+	 filename = NULL;
+	 foffset = 0;
+      }
+
+      prot = 0;
+      if (kve->kve_protection & VKI_KVME_PROT_READ)  prot |= VKI_PROT_READ;
+      if (kve->kve_protection & VKI_KVME_PROT_WRITE) prot |= VKI_PROT_WRITE;
+      if (kve->kve_protection & VKI_KVME_PROT_EXEC)  prot |= VKI_PROT_EXEC;
+
+      if (record_gap && gapStart < start)
+         (*record_gap) ( gapStart, start-gapStart );
+
+      if (record_mapping && start < endPlusOne)
+         (*record_mapping) ( start, endPlusOne-start,
+                             prot, dev, ino,
+                             foffset, filename );
+      gapStart = endPlusOne;
+   }
+
+   if (record_gap && gapStart < Addr_MAX)
+      (*record_gap) ( gapStart, Addr_MAX - gapStart + 1 );
+}
+
+#else
 
 /*-----------------------------------------------------------------*/
 /*---                                                           ---*/
@@ -3073,6 +3154,10 @@
    gapStart = Addr_MIN;
    while (True) {
       if (i >= buf_n_tot) break;
+      if (procmap_buf[i] == '\n') {
+	 i++;
+	 continue;
+      }
 
       /* Read (without fscanf :) the pattern %8x %8x %d %d %8x %c%c%c%c %d %d %8x .* .* .* */
       /* 0x38000000 0x38119000 281 748 0xd76df8a0 r-x 2 1 0x0 COW NC vnode */
@@ -3246,6 +3331,7 @@
    if (record_gap && gapStart < Addr_MAX)
       (*record_gap) ( gapStart, Addr_MAX - gapStart + 1 );
 }
+#endif
 
 /*--------------------------------------------------------------------*/
 /*--- end                                                          ---*/

From owner-p4-projects@FreeBSD.ORG  Wed Oct 29 08:17:03 2008
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 1FF0F1065674; Wed, 29 Oct 2008 08:17:03 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id D75801065670
	for ; Wed, 29 Oct 2008 08:17:02 +0000 (UTC)
	(envelope-from peter-gmail@wemm.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id ABBC38FC08
	for ; Wed, 29 Oct 2008 08:17:02 +0000 (UTC)
	(envelope-from peter-gmail@wemm.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id m9T8H2MX071816
	for ; Wed, 29 Oct 2008 08:17:02 GMT
	(envelope-from peter-gmail@wemm.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m9T8H2Eq071814
	for perforce@freebsd.org; Wed, 29 Oct 2008 08:17:02 GMT
	(envelope-from peter-gmail@wemm.org)
Date: Wed, 29 Oct 2008 08:17:02 GMT
Message-Id: <200810290817.m9T8H2Eq071814@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	peter-gmail@wemm.org using -f
From: Peter Wemm 
To: Perforce Change Reviews 
Cc: 
Subject: PERFORCE change 152141 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, 29 Oct 2008 08:17:03 -0000

http://perforce.freebsd.org/chv.cgi?CH=152141

Change 152141 by peter@peter_overcee on 2008/10/29 08:16:03

	document vmmap offset.  turn on warns.

Affected files ...

.. //depot/projects/hammer/usr.bin/procstat/Makefile#2 edit
.. //depot/projects/hammer/usr.bin/procstat/procstat.1#6 edit

Differences ...

==== //depot/projects/hammer/usr.bin/procstat/Makefile#2 (text+ko) ====


==== //depot/projects/hammer/usr.bin/procstat/procstat.1#6 (text+ko) ====

@@ -293,6 +293,8 @@
 mapping flags
 .It TP
 VM object type
+.It OFFSET
+mapping offset within VM object
 .El
 .Pp
 The following protection flags may be displayed:

From owner-p4-projects@FreeBSD.ORG  Wed Oct 29 09:09:56 2008
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 694CF106568E; Wed, 29 Oct 2008 09:09:56 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 29FFA106568C
	for ; Wed, 29 Oct 2008 09:09:56 +0000 (UTC)
	(envelope-from peter-gmail@wemm.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 186918FC08
	for ; Wed, 29 Oct 2008 09:09:56 +0000 (UTC)
	(envelope-from peter-gmail@wemm.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id m9T99tSX086833
	for ; Wed, 29 Oct 2008 09:09:55 GMT
	(envelope-from peter-gmail@wemm.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m9T99txI086831
	for perforce@freebsd.org; Wed, 29 Oct 2008 09:09:55 GMT
	(envelope-from peter-gmail@wemm.org)
Date: Wed, 29 Oct 2008 09:09:55 GMT
Message-Id: <200810290909.m9T99txI086831@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	peter-gmail@wemm.org using -f
From: Peter Wemm 
To: Perforce Change Reviews 
Cc: 
Subject: PERFORCE change 152142 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, 29 Oct 2008 09:09:56 -0000

http://perforce.freebsd.org/chv.cgi?CH=152142

Change 152142 by peter@peter_overcee on 2008/10/29 09:09:52

	record KERN_PROC_VMMAP structures (used instead of procfs)

Affected files ...

.. //depot/projects/valgrind/include/vki/vki-freebsd.h#7 edit

Differences ...

==== //depot/projects/valgrind/include/vki/vki-freebsd.h#7 (text+ko) ====

@@ -1740,6 +1740,54 @@
 	vki_uint8_t	node[6];
 };
 
+//----------------------------------------------------------------------
+// From sys/user.h
+//----------------------------------------------------------------------
+
+#define VKI_KVME_TYPE_NONE          0
+#define VKI_KVME_TYPE_DEFAULT       1
+#define VKI_KVME_TYPE_VNODE         2
+#define VKI_KVME_TYPE_SWAP          3
+#define VKI_KVME_TYPE_DEVICE        4
+#define VKI_KVME_TYPE_PHYS          5
+#define VKI_KVME_TYPE_DEAD          6
+#define VKI_KVME_TYPE_UNKNOWN       255
+
+#define VKI_KVME_PROT_READ          0x00000001
+#define VKI_KVME_PROT_WRITE         0x00000002
+#define VKI_KVME_PROT_EXEC          0x00000004
+
+#define VKI_KVME_FLAG_COW           0x00000001
+#define VKI_KVME_FLAG_NEEDS_COPY    0x00000002
+
+struct vki_kinfo_vmentry {
+	int	kve_structsize;
+	int	kve_type;
+	void *	kve_start;
+	void *	kve_end;
+	int	kve_flags;
+	int	kve_resident;
+	int	kve_private_resident;
+	int	kve_protection;
+	int	kve_ref_count;
+	int	kve_shadow_count;
+	char	kve_path[VKI_PATH_MAX];
+	Off64T	kve_offset;
+#ifdef VGA_amd64
+	long	kve_pad;
+#endif
+	void *	kve_pspare[6];
+	int	kve_ispare[8];
+};
+
+//----------------------------------------------------------------------
+// From sys/sysctl.h (and related)
+//----------------------------------------------------------------------
+
+#define VKI_CTL_KERN         1
+#define VKI_KERN_PROC        14
+#define VKI_KERN_PROC_VMMAP  13
+
 /*--------------------------------------------------------------------*/
 /*--- end                                                          ---*/
 /*--------------------------------------------------------------------*/

From owner-p4-projects@FreeBSD.ORG  Wed Oct 29 09:11:58 2008
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 961071065675; Wed, 29 Oct 2008 09:11:58 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 59EDA1065673
	for ; Wed, 29 Oct 2008 09:11:58 +0000 (UTC)
	(envelope-from peter-gmail@wemm.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 482228FC20
	for ; Wed, 29 Oct 2008 09:11:58 +0000 (UTC)
	(envelope-from peter-gmail@wemm.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id m9T9BwKv087037
	for ; Wed, 29 Oct 2008 09:11:58 GMT
	(envelope-from peter-gmail@wemm.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m9T9Bw2q087035
	for perforce@freebsd.org; Wed, 29 Oct 2008 09:11:58 GMT
	(envelope-from peter-gmail@wemm.org)
Date: Wed, 29 Oct 2008 09:11:58 GMT
Message-Id: <200810290911.m9T9Bw2q087035@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	peter-gmail@wemm.org using -f
From: Peter Wemm 
To: Perforce Change Reviews 
Cc: 
Subject: PERFORCE change 152143 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, 29 Oct 2008 09:11:58 -0000

http://perforce.freebsd.org/chv.cgi?CH=152143

Change 152143 by peter@peter_overcee on 2008/10/29 09:11:54

	Complete getSyscallStatusFromGuestState() for amd64.
	Fix 8th argument in getSyscallArgsFromGuestState() for amd64.
	Rough syscall abi notes added.

Affected files ...

.. //depot/projects/valgrind/coregrind/m_syswrap/syswrap-main.c#9 edit

Differences ...

==== //depot/projects/valgrind/coregrind/m_syswrap/syswrap-main.c#9 (text+ko) ====

@@ -63,6 +63,9 @@
    AIX:
    ppc32  r2  r3   r4   r5   r6   r7   r8   r9   r10  r3(res),r4(err)
    ppc64  r2  r3   r4   r5   r6   r7   r8   r9   r10  r3(res),r4(err)
+   FreeBSD:
+   x86    eax esp  esp  esp  esp  esp  esp  esp  esp  eax+edx+eflags.c
+   amd64  rax rdi  rsi  rdx  r10  r8   r9   rsp  rsp  rax+rdx+rflags.c
 */
 
 /* This is the top level of the system-call handler module.  All
@@ -286,7 +289,7 @@
 static
 Bool eq_SyscallStatus ( SyscallStatus* s1, SyscallStatus* s2 )
 {
-//VG_(printf)( "eq_SyscallStatus: what %d %d res %ld %ld res2 %ld %ld err %ld %ld\n", s1->what, s2->what, s1->sres.res, s2->sres.res, s1->sres.res2, s2->sres.res2, s1->sres.err, s2->sres.err);
+//VG_(printf)( "eq_SyscallStatus: what %d %d res %ld %ld res2 %ld %ld err %ld %ld isError %d %d\n", s1->what, s2->what, s1->sres.res, s2->sres.res, s1->sres.res2, s2->sres.res2, s1->sres.err, s2->sres.err, s1->sres.isError, s2->sres.isError);
    return s1->what == s2->what 
           && s1->sres.res == s2->sres.res
 #if defined(VGO_freebsd)
@@ -357,7 +360,7 @@
       canonical->arg5  = gst->guest_R9;
       canonical->arg6  = argv[1];
       canonical->arg7  = argv[2];
-      canonical->arg8  = argv[2];
+      canonical->arg8  = argv[3];
       break;
    }
 
@@ -561,8 +564,7 @@
 #elif defined(VGP_amd64_freebsd)
    VexGuestAMD64State* gst = (VexGuestAMD64State*)gst_vanilla;
    canonical->what = SsComplete;
-   canonical->sres.res  = (UWord)gst->guest_RAX;
-   canonical->sres.res2 = (UWord)gst->guest_RDX;
+   canonical->sres = VG_(mk_SysRes_amd64_freebsd)( gst->guest_RAX, gst->guest_RDX, LibVEX_GuestAMD64_get_rflags(gst));
 
 #  else
 #    error "getSyscallStatusFromGuestState: unknown arch"

From owner-p4-projects@FreeBSD.ORG  Wed Oct 29 09:14:00 2008
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id C5F951065679; Wed, 29 Oct 2008 09:14:00 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 8A8981065677
	for ; Wed, 29 Oct 2008 09:14:00 +0000 (UTC)
	(envelope-from peter-gmail@wemm.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 78A818FC14
	for ; Wed, 29 Oct 2008 09:14:00 +0000 (UTC)
	(envelope-from peter-gmail@wemm.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id m9T9E0tN087179
	for ; Wed, 29 Oct 2008 09:14:00 GMT
	(envelope-from peter-gmail@wemm.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m9T9E0pK087177
	for perforce@freebsd.org; Wed, 29 Oct 2008 09:14:00 GMT
	(envelope-from peter-gmail@wemm.org)
Date: Wed, 29 Oct 2008 09:14:00 GMT
Message-Id: <200810290914.m9T9E0pK087177@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	peter-gmail@wemm.org using -f
From: Peter Wemm 
To: Perforce Change Reviews 
Cc: 
Subject: PERFORCE change 152144 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, 29 Oct 2008 09:14:01 -0000

http://perforce.freebsd.org/chv.cgi?CH=152144

Change 152144 by peter@peter_overcee on 2008/10/29 09:13:14

	The oid vector for syscall(2) is arg2 * sizeof(int), not sizeof(int *).

Affected files ...

.. //depot/projects/valgrind/coregrind/m_syswrap/syswrap-freebsd.c#18 edit

Differences ...

==== //depot/projects/valgrind/coregrind/m_syswrap/syswrap-freebsd.c#18 (text+ko) ====

@@ -869,7 +869,7 @@
    PRINT("sys_sysctl ( %#lx, %ld, %#lx, %#lx, %#lx, %ld )", ARG1,ARG2,ARG3,ARG4,ARG5,ARG6 );
    PRE_REG_READ6(long, "__sysctl", int *, name, unsigned int, namelen, void *, old,
 		 vki_size_t *, oldlenp, void *, new, vki_size_t, newlen);
-   PRE_MEM_READ("sysctl(name)", ARG1, ARG2 * sizeof(int *));
+   PRE_MEM_READ("sysctl(name)", ARG1, ARG2 * sizeof(int));
    if (ARG5 != (UWord)NULL)
       PRE_MEM_READ("sysctl(new)", (Addr)ARG5, ARG6);
    if (ARG4 != (UWord)NULL) {

From owner-p4-projects@FreeBSD.ORG  Wed Oct 29 09:16:03 2008
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 3C20C106567D; Wed, 29 Oct 2008 09:16:03 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id F3D2F1065675
	for ; Wed, 29 Oct 2008 09:16:02 +0000 (UTC)
	(envelope-from peter-gmail@wemm.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id E1D328FC17
	for ; Wed, 29 Oct 2008 09:16:02 +0000 (UTC)
	(envelope-from peter-gmail@wemm.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id m9T9G2vT087366
	for ; Wed, 29 Oct 2008 09:16:02 GMT
	(envelope-from peter-gmail@wemm.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m9T9G2TT087364
	for perforce@freebsd.org; Wed, 29 Oct 2008 09:16:02 GMT
	(envelope-from peter-gmail@wemm.org)
Date: Wed, 29 Oct 2008 09:16:02 GMT
Message-Id: <200810290916.m9T9G2TT087364@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	peter-gmail@wemm.org using -f
From: Peter Wemm 
To: Perforce Change Reviews 
Cc: 
Subject: PERFORCE change 152145 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, 29 Oct 2008 09:16:03 -0000

http://perforce.freebsd.org/chv.cgi?CH=152145

Change 152145 by peter@peter_overcee on 2008/10/29 09:15:52

	Trim more linux junk
	guest_RDI is part of the freebsd-amd64 exec startup abi, but not linux.
	It helps to set it.

Affected files ...

.. //depot/projects/valgrind/coregrind/m_initimg/initimg-freebsd.c#3 edit

Differences ...

==== //depot/projects/valgrind/coregrind/m_initimg/initimg-freebsd.c#3 (text+ko) ====

@@ -327,30 +327,6 @@
 /*=== Setting up the client's stack                                ===*/
 /*====================================================================*/
 
-#ifndef AT_DCACHEBSIZE
-#define AT_DCACHEBSIZE		19
-#endif /* AT_DCACHEBSIZE */
-
-#ifndef AT_ICACHEBSIZE
-#define AT_ICACHEBSIZE		20
-#endif /* AT_ICACHEBSIZE */
-
-#ifndef AT_UCACHEBSIZE
-#define AT_UCACHEBSIZE		21
-#endif /* AT_UCACHEBSIZE */
-
-#ifndef AT_SYSINFO
-#define AT_SYSINFO		32
-#endif /* AT_SYSINFO */
-
-#ifndef AT_SYSINFO_EHDR
-#define AT_SYSINFO_EHDR		33
-#endif /* AT_SYSINFO_EHDR */
-
-#ifndef AT_SECURE
-#define AT_SECURE 23   /* secure mode boolean */
-#endif	/* AT_SECURE */
-
 /* Add a string onto the string table, and return its address */
 static char *copy_str(char **tab, const char *str)
 {
@@ -676,27 +652,6 @@
             auxv->u.a_val = info->entry;
             break;
 
-         case AT_DCACHEBSIZE:
-         case AT_ICACHEBSIZE:
-         case AT_UCACHEBSIZE:
-            break;
-
-         case AT_SECURE:
-            /* If this is 1, then it means that this program is
-               running suid, and therefore the dynamic linker should
-               be careful about LD_PRELOAD, etc.  However, since
-               stage1 (the thing the kernel actually execve's) should
-               never be SUID, and we need LD_PRELOAD to work for the
-               client, we set AT_SECURE to 0. */
-            auxv->u.a_val = 0;
-            break;
-
-         case AT_SYSINFO:
-         case AT_SYSINFO_EHDR:
-            /* Trash this, because we don't reproduce it */
-            auxv->a_type = AT_IGNORE;
-            break;
-
          default:
             /* stomp out anything we don't know about */
             VG_(debugLog)(2, "initimg",
@@ -940,7 +895,11 @@
 
    /* Put essential stuff into the new state. */
    arch->vex.guest_RSP = iifii.initial_client_SP;
+//VG_(printf)("Initial SP %#lx\n", arch->vex.guest_RSP);
+   arch->vex.guest_RDI = iifii.initial_client_SP;
+//VG_(printf)("Initial RDI %#lx\n", arch->vex.guest_RDI);
    arch->vex.guest_RIP = iifii.initial_client_IP;
+//VG_(printf)("Initial IP %#lx\n", arch->vex.guest_RIP);
 
 #  else
 #    error Unknown platform

From owner-p4-projects@FreeBSD.ORG  Wed Oct 29 09:19:06 2008
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 3BCA91065677; Wed, 29 Oct 2008 09:19:06 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id F391A1065673
	for ; Wed, 29 Oct 2008 09:19:05 +0000 (UTC)
	(envelope-from peter-gmail@wemm.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id E1D508FC25
	for ; Wed, 29 Oct 2008 09:19:05 +0000 (UTC)
	(envelope-from peter-gmail@wemm.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id m9T9J5Yu087549
	for ; Wed, 29 Oct 2008 09:19:05 GMT
	(envelope-from peter-gmail@wemm.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m9T9J5Bo087547
	for perforce@freebsd.org; Wed, 29 Oct 2008 09:19:05 GMT
	(envelope-from peter-gmail@wemm.org)
Date: Wed, 29 Oct 2008 09:19:05 GMT
Message-Id: <200810290919.m9T9J5Bo087547@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	peter-gmail@wemm.org using -f
From: Peter Wemm 
To: Perforce Change Reviews 
Cc: 
Subject: PERFORCE change 152146 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, 29 Oct 2008 09:19:06 -0000

http://perforce.freebsd.org/chv.cgi?CH=152146

Change 152146 by peter@peter_overcee on 2008/10/29 09:18:53

	FreeBSD/amd64's exec binary handoff isn't compatible with the linux code.
	We have an extra argument in %rdi, so don't trash it during startup, and pass
	the extra argument to a custom _start_in_C handler.

Affected files ...

.. //depot/projects/valgrind/coregrind/m_main.c#8 edit

Differences ...

==== //depot/projects/valgrind/coregrind/m_main.c#8 (text+ko) ====

@@ -2495,15 +2495,15 @@
     "\t.globl _start\n"
     "\t.type _start,@function\n"
     "_start:\n"
-    /* set up the new stack in %rdi */
-    "\tmovq  $vgPlain_interim_stack, %rdi\n"
-    "\taddq  $"VG_STRINGIFY(VG_STACK_GUARD_SZB)", %rdi\n"
-    "\taddq  $"VG_STRINGIFY(VG_STACK_ACTIVE_SZB)", %rdi\n"
-    "\tandq  $~15, %rdi\n"
+    /* set up the new stack in %rsi */
+    "\tmovq  $vgPlain_interim_stack, %rsi\n"
+    "\taddq  $"VG_STRINGIFY(VG_STACK_GUARD_SZB)", %rsi\n"
+    "\taddq  $"VG_STRINGIFY(VG_STACK_ACTIVE_SZB)", %rsi\n"
+    "\tandq  $~15, %rsi\n"
     /* install it, and collect the original one */
-    "\txchgq %rdi, %rsp\n"
-    /* call _start_in_C_linux, passing it the startup %rsp */
-    "\tcall  _start_in_C_linux\n"
+    "\txchgq %rsi, %rsp\n"
+    /* call _start_in_C_amd64_freebsd, passing it the startup %rsp */
+    "\tcall  _start_in_C_amd64_freebsd\n"
     "\thlt\n"
     ".previous\n"
 );
@@ -2518,6 +2518,26 @@
 #include 
 /* --- !!! --- EXTERNAL HEADERS end --- !!! --- */
 
+#if defined(VGP_amd64_freebsd)
+void _start_in_C_amd64_freebsd ( UWord* pArgc, UWord *initial_sp );
+void _start_in_C_amd64_freebsd ( UWord* pArgc, UWord *initial_sp )
+{
+   Int     r;
+   Word    argc = pArgc[0];
+   HChar** argv = (HChar**)&pArgc[1];
+   HChar** envp = (HChar**)&pArgc[1+argc+1];
+
+   VG_(memset)( &the_iicii, 0, sizeof(the_iicii) );
+   VG_(memset)( &the_iifii, 0, sizeof(the_iifii) );
+
+   the_iicii.sp_at_startup = (Addr)initial_sp;
+
+   r = valgrind_main( (Int)argc, argv, envp );
+   /* NOTREACHED */
+   VG_(exit)(r);
+}
+
+#else
 /* Avoid compiler warnings: this fn _is_ used, but labelling it
    'static' causes gcc to complain it isn't. */
 void _start_in_C_linux ( UWord* pArgc );
@@ -2556,6 +2576,7 @@
    /* NOTREACHED */
    VG_(exit)(r);
 }
+#endif
 
 #endif /* defined(VGO_linux) */
 

From owner-p4-projects@FreeBSD.ORG  Wed Oct 29 10:01:49 2008
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 9FD80106567F; Wed, 29 Oct 2008 10:01:49 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 61EAE106568C
	for ; Wed, 29 Oct 2008 10:01:49 +0000 (UTC)
	(envelope-from trasz@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 374668FC1F
	for ; Wed, 29 Oct 2008 10:01:49 +0000 (UTC)
	(envelope-from trasz@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id m9TA1nUF090763
	for ; Wed, 29 Oct 2008 10:01:49 GMT
	(envelope-from trasz@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m9TA1n80090761
	for perforce@freebsd.org; Wed, 29 Oct 2008 10:01:49 GMT
	(envelope-from trasz@freebsd.org)
Date: Wed, 29 Oct 2008 10:01:49 GMT
Message-Id: <200810291001.m9TA1n80090761@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	trasz@freebsd.org using -f
From: Edward Tomasz Napierala 
To: Perforce Change Reviews 
Cc: 
Subject: PERFORCE change 152147 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, 29 Oct 2008 10:01:49 -0000

http://perforce.freebsd.org/chv.cgi?CH=152147

Change 152147 by trasz@trasz_victim7 on 2008/10/29 10:00:48

	Fix compilation.

Affected files ...

.. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/subr_acl_posix1e.c#10 edit

Differences ...

==== //depot/projects/soc2008/trasz_nfs4acl/sys/kern/subr_acl_posix1e.c#10 (text+ko) ====

@@ -71,7 +71,7 @@
 	if (privused != NULL)
 		*privused = 0;
 
-	if (unixify_vaccess(&acc_mode, &error))
+	if (unixify_vaccess(&accmode, &error))
 		return (error);
 
 	/*

From owner-p4-projects@FreeBSD.ORG  Wed Oct 29 11:27:16 2008
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id D58231065688; Wed, 29 Oct 2008 11:27:16 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 98994106567D
	for ; Wed, 29 Oct 2008 11:27:16 +0000 (UTC)
	(envelope-from zec@tel.fer.hr)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 867518FC1E
	for ; Wed, 29 Oct 2008 11:27:16 +0000 (UTC)
	(envelope-from zec@tel.fer.hr)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id m9TBRGkt003811
	for ; Wed, 29 Oct 2008 11:27:16 GMT
	(envelope-from zec@tel.fer.hr)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m9TBRFvK003809
	for perforce@freebsd.org; Wed, 29 Oct 2008 11:27:15 GMT
	(envelope-from zec@tel.fer.hr)
Date: Wed, 29 Oct 2008 11:27:15 GMT
Message-Id: <200810291127.m9TBRFvK003809@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	zec@tel.fer.hr using -f
From: Marko Zec 
To: Perforce Change Reviews 
Cc: 
Subject: PERFORCE change 152150 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, 29 Oct 2008 11:27:17 -0000

http://perforce.freebsd.org/chv.cgi?CH=152150

Change 152150 by zec@zec_tpx32 on 2008/10/29 11:26:27

	Initialize all V_ variables in initializer functions (like
	ip_init() etc.) instead of using initialization at instantiation.
	
	Enclose all V_ globals in #ifdef VIMAGE_GLOBALS, so that in
	next step we can simplify switching from globals to vimage
	structures / containers.
	
	So far sys/net, sys/netinet, and sys/netinet6 are covered with
	this change.

Affected files ...

.. //depot/projects/vimage-commit2/src/sys/conf/options#11 edit
.. //depot/projects/vimage-commit2/src/sys/net/if.c#19 edit
.. //depot/projects/vimage-commit2/src/sys/net/if_ethersubr.c#10 edit
.. //depot/projects/vimage-commit2/src/sys/net/if_loop.c#10 edit
.. //depot/projects/vimage-commit2/src/sys/net/raw_cb.c#10 edit
.. //depot/projects/vimage-commit2/src/sys/net/route.c#15 edit
.. //depot/projects/vimage-commit2/src/sys/netinet/if_ether.c#16 edit
.. //depot/projects/vimage-commit2/src/sys/netinet/igmp.c#12 edit
.. //depot/projects/vimage-commit2/src/sys/netinet/in.c#11 edit
.. //depot/projects/vimage-commit2/src/sys/netinet/in_mcast.c#10 edit
.. //depot/projects/vimage-commit2/src/sys/netinet/in_pcb.c#19 edit
.. //depot/projects/vimage-commit2/src/sys/netinet/in_pcb.h#7 edit
.. //depot/projects/vimage-commit2/src/sys/netinet/in_proto.c#6 edit
.. //depot/projects/vimage-commit2/src/sys/netinet/in_rmx.c#13 edit
.. //depot/projects/vimage-commit2/src/sys/netinet/in_var.h#5 edit
.. //depot/projects/vimage-commit2/src/sys/netinet/ip_divert.c#10 edit
.. //depot/projects/vimage-commit2/src/sys/netinet/ip_fastfwd.c#9 edit
.. //depot/projects/vimage-commit2/src/sys/netinet/ip_icmp.c#11 edit
.. //depot/projects/vimage-commit2/src/sys/netinet/ip_icmp.h#2 edit
.. //depot/projects/vimage-commit2/src/sys/netinet/ip_input.c#16 edit
.. //depot/projects/vimage-commit2/src/sys/netinet/ip_output.c#8 edit
.. //depot/projects/vimage-commit2/src/sys/netinet/raw_ip.c#14 edit
.. //depot/projects/vimage-commit2/src/sys/netinet/tcp_hostcache.c#12 edit
.. //depot/projects/vimage-commit2/src/sys/netinet/tcp_input.c#19 edit
.. //depot/projects/vimage-commit2/src/sys/netinet/tcp_output.c#16 edit
.. //depot/projects/vimage-commit2/src/sys/netinet/tcp_reass.c#9 edit
.. //depot/projects/vimage-commit2/src/sys/netinet/tcp_sack.c#11 edit
.. //depot/projects/vimage-commit2/src/sys/netinet/tcp_subr.c#20 edit
.. //depot/projects/vimage-commit2/src/sys/netinet/tcp_syncache.c#21 edit
.. //depot/projects/vimage-commit2/src/sys/netinet/tcp_timewait.c#10 edit
.. //depot/projects/vimage-commit2/src/sys/netinet/tcp_var.h#4 edit
.. //depot/projects/vimage-commit2/src/sys/netinet/udp_usrreq.c#19 edit
.. //depot/projects/vimage-commit2/src/sys/netinet/vinet.h#7 edit
.. //depot/projects/vimage-commit2/src/sys/netinet6/frag6.c#12 edit
.. //depot/projects/vimage-commit2/src/sys/netinet6/icmp6.c#15 edit
.. //depot/projects/vimage-commit2/src/sys/netinet6/in6_ifattach.c#12 edit
.. //depot/projects/vimage-commit2/src/sys/netinet6/in6_proto.c#9 edit
.. //depot/projects/vimage-commit2/src/sys/netinet6/in6_rmx.c#13 edit
.. //depot/projects/vimage-commit2/src/sys/netinet6/in6_src.c#10 edit
.. //depot/projects/vimage-commit2/src/sys/netinet6/ip6_forward.c#9 edit
.. //depot/projects/vimage-commit2/src/sys/netinet6/ip6_input.c#11 edit
.. //depot/projects/vimage-commit2/src/sys/netinet6/ip6_mroute.c#9 edit
.. //depot/projects/vimage-commit2/src/sys/netinet6/mld6.c#10 edit
.. //depot/projects/vimage-commit2/src/sys/netinet6/nd6.c#15 edit
.. //depot/projects/vimage-commit2/src/sys/netinet6/nd6_nbr.c#12 edit
.. //depot/projects/vimage-commit2/src/sys/netinet6/nd6_rtr.c#12 edit
.. //depot/projects/vimage-commit2/src/sys/netinet6/raw_ip6.c#11 edit
.. //depot/projects/vimage-commit2/src/sys/netinet6/scope6.c#9 edit
.. //depot/projects/vimage-commit2/src/sys/netinet6/vinet6.h#7 edit
.. //depot/projects/vimage-commit2/src/sys/sys/vimage.h#21 edit

Differences ...

==== //depot/projects/vimage-commit2/src/sys/conf/options#11 (text+ko) ====

@@ -758,5 +758,6 @@
 IEEE80211_DEBUG_REFCNT	opt_wlan.h
 IEEE80211_AMPDU_AGE	opt_wlan.h
 
-# Virtualize the network stack
+# Network stack virtualization.
+VIMAGE_GLOBALS		opt_global.h
 VIMAGE			opt_global.h

==== //depot/projects/vimage-commit2/src/sys/net/if.c#19 (text+ko) ====

@@ -133,22 +133,21 @@
 extern void	nd6_setmtu(struct ifnet *);
 #endif
 
-int	if_index = 0;
-int	ifqmaxlen = IFQ_MAXLEN;
+#ifdef VIMAGE_GLOBALS
 struct	ifnethead ifnet;	/* depend on static init XXX */
 struct	ifgrouphead ifg_head;
+int	if_index;
+static	int if_indexlim;
+/* Table of ifnet/cdev by index.  Locked with ifnet_lock. */
+static struct ifindex_entry *ifindex_table;
+static struct	knlist ifklist;
+#endif
+
+int	ifqmaxlen = IFQ_MAXLEN;
 struct	mtx ifnet_lock;
 static	if_com_alloc_t *if_com_alloc[256];
 static	if_com_free_t *if_com_free[256];
 
-static int	if_indexlim = 8;
-static struct	knlist ifklist;
-
-/*
- * Table of ifnet/cdev by index.  Locked with ifnet_lock.
- */
-static struct ifindex_entry *ifindex_table = NULL;
-
 static void	filt_netdetach(struct knote *kn);
 static int	filt_netdev(struct knote *kn, long hint);
 
@@ -356,6 +355,10 @@
 {
 	INIT_VNET_NET(curvnet);
 
+	V_if_index = 0;
+	V_ifindex_table = NULL;
+	V_if_indexlim = 8;
+
 	IFNET_LOCK_INIT();
 	TAILQ_INIT(&V_ifnet);
 	TAILQ_INIT(&V_ifg_head);

==== //depot/projects/vimage-commit2/src/sys/net/if_ethersubr.c#10 (text+ko) ====

@@ -142,8 +142,10 @@
 int
 ether_ipfw_chk(struct mbuf **m0, struct ifnet *dst,
 	struct ip_fw **rule, int shared);
+#ifdef VIMAGE_GLOBALS
 static int ether_ipfw;
 #endif
+#endif
 
 /*
  * Ethernet output routine.

==== //depot/projects/vimage-commit2/src/sys/net/if_loop.c#10 (text+ko) ====

@@ -96,7 +96,9 @@
 static int	lo_clone_create(struct if_clone *, int, caddr_t);
 static void	lo_clone_destroy(struct ifnet *);
 
-struct ifnet *loif = NULL;			/* Used externally */
+#ifdef VIMAGE_GLOBALS
+struct ifnet *loif;			/* Used externally */
+#endif
 
 IFC_SIMPLE_DECLARE(lo, 1);
 
@@ -139,9 +141,11 @@
 static int
 loop_modevent(module_t mod, int type, void *data)
 {
+	INIT_VNET_NET(curvnet);
 
 	switch (type) {
 	case MOD_LOAD:
+		V_loif = NULL;
 		if_clone_attach(&lo_cloner);
 		break;
 

==== //depot/projects/vimage-commit2/src/sys/net/raw_cb.c#10 (text+ko) ====

@@ -57,7 +57,9 @@
  */
 
 struct mtx rawcb_mtx;
+#ifdef VIMAGE_GLOBALS
 struct rawcb_list_head rawcb_list;
+#endif
 
 SYSCTL_NODE(_net, OID_AUTO, raw, CTLFLAG_RW, 0, "Raw socket infrastructure");
 

==== //depot/projects/vimage-commit2/src/sys/net/route.c#15 (text+ko) ====

@@ -84,6 +84,7 @@
     &rt_add_addr_allfibs, 0, "");
 TUNABLE_INT("net.add_addr_allfibs", &rt_add_addr_allfibs);
 
+#ifdef VIMAGE_GLOBALS
 static struct rtstat rtstat;
 
 /* by default only the first 'row' of tables will be accessed. */
@@ -96,6 +97,7 @@
 struct radix_node_head *rt_tables[RT_MAXFIBS][AF_MAX+1];
 
 static int	rttrash;		/* routes not in table but not freed */
+#endif
 
 static void rt_maskedcopy(struct sockaddr *,
 	    struct sockaddr *, struct sockaddr *);

==== //depot/projects/vimage-commit2/src/sys/netinet/if_ether.c#16 (text+ko) ====

@@ -82,10 +82,15 @@
 SYSCTL_NODE(_net_link_ether, PF_INET, inet, CTLFLAG_RW, 0, "");
 
 /* timer values */
-static int arpt_keep = (20*60); /* once resolved, good for 20 more minutes */
+#ifdef VIMAGE_GLOBALS
+static int	arpt_keep; /* once resolved, good for 20 more minutes */
+static int	arp_maxtries;
+static int	useloopback; /* use loopback interface for local traffic */
+static int	arp_proxyall;
+#endif
 
-SYSCTL_INT(_net_link_ether_inet, OID_AUTO, max_age, CTLFLAG_RW, 
-	   &arpt_keep, 0, "ARP entry lifetime in seconds");
+SYSCTL_V_INT(V_NET, vnet_inet, _net_link_ether_inet, OID_AUTO, max_age,
+    CTLFLAG_RW, arpt_keep, 0, "ARP entry lifetime in seconds");
 
 #define	rt_expire rt_rmx.rmx_expire
 
@@ -99,10 +104,6 @@
 
 static struct	ifqueue arpintrq;
 
-static int	arp_maxtries = 5;
-static int	useloopback = 1; /* use loopback interface for local traffic */
-static int	arp_proxyall = 0;
-
 SYSCTL_V_INT(V_NET, vnet_inet, _net_link_ether_inet, OID_AUTO, maxtries,
 	CTLFLAG_RW, arp_maxtries, 0,
 	"ARP resolution attempts before returning error");
@@ -1076,6 +1077,12 @@
 static void
 arp_init(void)
 {
+	INIT_VNET_INET(curvnet);
+
+	V_arpt_keep = (20*60); /* once resolved, good for 20 more minutes */
+	V_arp_maxtries = 5;
+	V_useloopback = 1; /* use loopback interface for local traffic */
+	V_arp_proxyall = 0;
 
 	arpintrq.ifq_maxlen = 50;
 	mtx_init(&arpintrq.ifq_mtx, "arp_inq", NULL, MTX_DEF);

==== //depot/projects/vimage-commit2/src/sys/netinet/igmp.c#12 (text+ko) ====

@@ -80,7 +80,9 @@
 static struct router_info	*find_rti(struct ifnet *ifp);
 static void	igmp_sendpkt(struct in_multi *, int, unsigned long);
 
+#ifdef VIMAGE_GLOBALS
 static struct igmpstat igmpstat;
+#endif
 
 SYSCTL_V_STRUCT(V_NET, vnet_inet, _net_inet_igmp, IGMPCTL_STATS,
     stats, CTLFLAG_RW, igmpstat, igmpstat, "");
@@ -92,8 +94,10 @@
  * reference counting is used.  We allow unlocked reads of router_info data
  * when accessed via an in_multi read-only.
  */
+#ifdef VIMAGE_GLOBALS
+static SLIST_HEAD(, router_info) router_info_head;
+#endif
 static struct mtx igmp_mtx;
-static SLIST_HEAD(, router_info) router_info_head;
 static int igmp_timers_are_running;
 
 /*

==== //depot/projects/vimage-commit2/src/sys/netinet/in.c#11 (text+ko) ====

@@ -66,18 +66,20 @@
 	    struct in_ifaddr *, struct sockaddr_in *, int);
 static void	in_purgemaddrs(struct ifnet *);
 
-static int subnetsarelocal = 0;
+#ifdef VIMAGE_GLOBALS
+static int subnetsarelocal;
+static int sameprefixcarponly;
+extern struct inpcbinfo ripcbinfo;
+extern struct inpcbinfo udbinfo;
+#endif
+
 SYSCTL_V_INT(V_NET, vnet_inet, _net_inet_ip, OID_AUTO, subnets_are_local,
 	CTLFLAG_RW, subnetsarelocal, 0,
 	"Treat all subnets as directly connected");
-static int sameprefixcarponly = 0;
 SYSCTL_V_INT(V_NET, vnet_inet, _net_inet_ip, OID_AUTO, same_prefix_carp_only,
 	CTLFLAG_RW, sameprefixcarponly, 0,
 	"Refuse to create same prefixes on different interfaces");
 
-extern struct inpcbinfo ripcbinfo;
-extern struct inpcbinfo udbinfo;
-
 /*
  * Return 1 if an internet address is for a ``local'' host
  * (one to which we have a connection).  If subnetsarelocal

==== //depot/projects/vimage-commit2/src/sys/netinet/in_mcast.c#10 (text+ko) ====

@@ -86,7 +86,9 @@
  * ip_output() to send IGMP packets while holding the lock; this probably is
  * not quite desirable.
  */
+#ifdef VIMAGE_GLOBALS
 struct in_multihead in_multihead;	/* XXX BSS initialization */
+#endif
 struct mtx in_multi_mtx;
 MTX_SYSINIT(in_multi_mtx, &in_multi_mtx, "in_multi_mtx", MTX_DEF | MTX_RECURSE);
 

==== //depot/projects/vimage-commit2/src/sys/netinet/in_pcb.c#19 (text+ko) ====

@@ -84,32 +84,34 @@
 
 #include 
 
+#ifdef VIMAGE_GLOBALS
 /*
  * These configure the range of local port addresses assigned to
  * "unspecified" outgoing connections/packets/whatever.
  */
-int	ipport_lowfirstauto  = IPPORT_RESERVED - 1;	/* 1023 */
-int	ipport_lowlastauto = IPPORT_RESERVEDSTART;	/* 600 */
-int	ipport_firstauto = IPPORT_EPHEMERALFIRST;	/* 10000 */
-int	ipport_lastauto  = IPPORT_EPHEMERALLAST;	/* 65535 */
-int	ipport_hifirstauto = IPPORT_HIFIRSTAUTO;	/* 49152 */
-int	ipport_hilastauto  = IPPORT_HILASTAUTO;		/* 65535 */
+int	ipport_lowfirstauto;
+int	ipport_lowlastauto;
+int	ipport_firstauto;
+int	ipport_lastauto;
+int	ipport_hifirstauto;
+int	ipport_hilastauto;
 
 /*
  * Reserved ports accessible only to root. There are significant
  * security considerations that must be accounted for when changing these,
  * but the security benefits can be great. Please be careful.
  */
-int	ipport_reservedhigh = IPPORT_RESERVED - 1;	/* 1023 */
-int	ipport_reservedlow = 0;
+int	ipport_reservedhigh;
+int	ipport_reservedlow;
 
 /* Variables dealing with random ephemeral port allocation. */
-int	ipport_randomized = 1;	/* user controlled via sysctl */
-int	ipport_randomcps = 10;	/* user controlled via sysctl */
-int	ipport_randomtime = 45;	/* user controlled via sysctl */
-int	ipport_stoprandom = 0;	/* toggled by ipport_tick */
+int	ipport_randomized;
+int	ipport_randomcps;
+int	ipport_randomtime;
+int	ipport_stoprandom;
 int	ipport_tcpallocs;
 int	ipport_tcplastcount;
+#endif
 
 #define RANGECHK(var, min, max) \
 	if ((var) < (min)) { (var) = (min); } \

==== //depot/projects/vimage-commit2/src/sys/netinet/in_pcb.h#7 (text+ko) ====

@@ -449,6 +449,10 @@
 extern int	ipport_lastauto;
 extern int	ipport_hifirstauto;
 extern int	ipport_hilastauto;
+extern int	ipport_randomized;
+extern int	ipport_randomcps;
+extern int	ipport_randomtime;
+extern int	ipport_stoprandom;
 extern struct callout ipport_tick_callout;
 
 void	in_pcbpurgeif0(struct inpcbinfo *, struct ifnet *);

==== //depot/projects/vimage-commit2/src/sys/netinet/in_proto.c#6 (text+ko) ====

@@ -193,6 +193,7 @@
 	.pr_flags =		PR_ATOMIC|PR_ADDR|PR_LASTHDR,
 	.pr_input =		icmp_input,
 	.pr_ctloutput =		rip_ctloutput,
+	.pr_init =		icmp_init,
 	.pr_usrreqs =		&rip_usrreqs
 },
 {

==== //depot/projects/vimage-commit2/src/sys/netinet/in_rmx.c#13 (text+ko) ====

@@ -151,17 +151,20 @@
 	return rn;
 }
 
-static int rtq_reallyold = 60*60;		/* one hour is "really old" */
+#ifdef VIMAGE_GLOBALS
+static int rtq_reallyold;
+static int rtq_minreallyold;
+static int rtq_toomany;
+#endif
+
 SYSCTL_V_INT(V_NET, vnet_inet, _net_inet_ip, IPCTL_RTEXPIRE, rtexpire,
     CTLFLAG_RW, rtq_reallyold, 0,
     "Default expiration time on dynamically learned routes");
 
-static int rtq_minreallyold = 10;  /* never automatically crank down to less */
 SYSCTL_V_INT(V_NET, vnet_inet, _net_inet_ip, IPCTL_RTMINEXPIRE,
     rtminexpire, CTLFLAG_RW, rtq_minreallyold, 0,
     "Minimum time to attempt to hold onto dynamically learned routes");
 
-static int rtq_toomany = 128;		/* 128 cached routes is "too many" */
 SYSCTL_V_INT(V_NET, vnet_inet, _net_inet_ip, IPCTL_RTMAXCACHE,
     rtmaxcache, CTLFLAG_RW, rtq_toomany, 0,
     "Upper limit on dynamically learned routes");
@@ -256,8 +259,10 @@
 }
 
 #define RTQ_TIMEOUT	60*10	/* run no less than once every ten minutes */
-static int rtq_timeout = RTQ_TIMEOUT;
+#ifdef VIMAGE_GLOBALS
+static int rtq_timeout;
 static struct callout rtq_timer;
+#endif
 
 static void in_rtqtimo_one(void *rock);
 
@@ -376,6 +381,11 @@
 	if (off == 0)		/* XXX MRT  see above */
 		return 1;	/* only do the rest for a real routing table */
 
+	V_rtq_reallyold = 60*60; /* one hour is "really old" */
+	V_rtq_minreallyold = 10; /* never automatically crank down to less */
+	V_rtq_toomany = 128;	/* 128 cached routes is "too many" */
+	V_rtq_timeout = RTQ_TIMEOUT;
+
 	rnh = *head;
 	rnh->rnh_addaddr = in_addroute;
 	rnh->rnh_matchaddr = in_matroute;

==== //depot/projects/vimage-commit2/src/sys/netinet/in_var.h#5 (text+ko) ====

@@ -138,6 +138,15 @@
 #endif
 
 /*
+ * IP datagram reassembly.
+ */
+#define	IPREASS_NHASH_LOG2	6
+#define	IPREASS_NHASH		(1 << IPREASS_NHASH_LOG2)
+#define	IPREASS_HMASK		(IPREASS_NHASH - 1)
+#define	IPREASS_HASH(x,y) \
+	(((((x) & 0xF) | ((((x) >> 8) & 0xF) << 4)) ^ (y)) & IPREASS_HMASK)
+
+/*
  * This information should be part of the ifnet structure but we don't wish
  * to change that - as it might break a number of things
  */

==== //depot/projects/vimage-commit2/src/sys/netinet/ip_divert.c#10 (text+ko) ====

@@ -112,8 +112,10 @@
  */
 
 /* Internal variables. */
+#ifdef VIMAGE_GLOBALS
 static struct inpcbhead divcb;
 static struct inpcbinfo divcbinfo;
+#endif
 
 static u_long	div_sendspace = DIVSNDQ;	/* XXX sysctl ? */
 static u_long	div_recvspace = DIVRCVQ;	/* XXX sysctl ? */

==== //depot/projects/vimage-commit2/src/sys/netinet/ip_fastfwd.c#9 (text+ko) ====

@@ -106,7 +106,9 @@
 
 #include 
 
-static int ipfastforward_active = 0;
+#ifdef VIMAGE_GLOBALS
+static int ipfastforward_active;
+#endif
 SYSCTL_V_INT(V_NET, vnet_inet, _net_inet_ip, OID_AUTO, fastforwarding,
     CTLFLAG_RW, ipfastforward_active, 0, "Enable fast IP forwarding");
 

==== //depot/projects/vimage-commit2/src/sys/netinet/ip_icmp.c#11 (text+ko) ====

@@ -77,47 +77,51 @@
  * host table maintenance routines.
  */
 
-struct	icmpstat icmpstat;
+#ifdef VIMAGE_GLOBALS
+struct icmpstat icmpstat;
+static int	icmpmaskrepl;
+static u_int	icmpmaskfake;
+static int	drop_redirect;
+static int	log_redirect;
+static int      icmplim;
+static int	icmplim_output;
+static char	reply_src[IFNAMSIZ];
+static int	icmp_rfi;
+static int	icmp_quotelen;
+static int	icmpbmcastecho;
+#endif
+
 SYSCTL_V_STRUCT(V_NET, vnet_inet, _net_inet_icmp, ICMPCTL_STATS, stats,
 	CTLFLAG_RW, icmpstat, icmpstat, "");
 
-static int	icmpmaskrepl = 0;
 SYSCTL_V_INT(V_NET, vnet_inet, _net_inet_icmp, ICMPCTL_MASKREPL, maskrepl,
 	CTLFLAG_RW, icmpmaskrepl, 0,
 	"Reply to ICMP Address Mask Request packets.");
 
-static u_int	icmpmaskfake = 0;
 SYSCTL_V_UINT(V_NET, vnet_inet, _net_inet_icmp, OID_AUTO, maskfake, CTLFLAG_RW,
 	icmpmaskfake, 0, "Fake reply to ICMP Address Mask Request packets.");
 
-static int	drop_redirect = 0;
 SYSCTL_V_INT(V_NET, vnet_inet, _net_inet_icmp, OID_AUTO, drop_redirect,
 	CTLFLAG_RW, drop_redirect, 0, "Ignore ICMP redirects");
 
-static int	log_redirect = 0;
 SYSCTL_V_INT(V_NET, vnet_inet, _net_inet_icmp, OID_AUTO, log_redirect,
 	CTLFLAG_RW, log_redirect, 0, "Log ICMP redirects to the console");
 
-static int      icmplim = 200;
 SYSCTL_V_INT(V_NET, vnet_inet, _net_inet_icmp, ICMPCTL_ICMPLIM, icmplim,
 	CTLFLAG_RW, icmplim, 0, "Maximum number of ICMP responses per second");
 
-static int	icmplim_output = 1;
 SYSCTL_V_INT(V_NET, vnet_inet, _net_inet_icmp, OID_AUTO, icmplim_output,
 	CTLFLAG_RW, icmplim_output, 0,
 	"Enable rate limiting of ICMP responses");
 
-static char	reply_src[IFNAMSIZ];
 SYSCTL_V_STRING(V_NET, vnet_inet, _net_inet_icmp, OID_AUTO, reply_src,
 	CTLFLAG_RW, reply_src, IFNAMSIZ,
 	"icmp reply source for non-local packets.");
 
-static int	icmp_rfi = 0;
 SYSCTL_V_INT(V_NET, vnet_inet, _net_inet_icmp, OID_AUTO, reply_from_interface,
 	CTLFLAG_RW, icmp_rfi, 0, "ICMP reply from incoming interface for "
 	"non-local packets");
 
-static int	icmp_quotelen = 8;
 SYSCTL_V_INT(V_NET, vnet_inet, _net_inet_icmp, OID_AUTO, quotelen, CTLFLAG_RW,
 	icmp_quotelen, 0, "Number of bytes from original packet to "
 	"quote in ICMP reply");
@@ -126,7 +130,6 @@
  * ICMP broadcast echo sysctl
  */
 
-static int	icmpbmcastecho = 0;
 SYSCTL_V_INT(V_NET, vnet_inet, _net_inet_icmp, OID_AUTO, bmcastecho,
 	CTLFLAG_RW, icmpbmcastecho, 0, "");
 
@@ -140,6 +143,22 @@
 
 extern	struct protosw inetsw[];
 
+void
+icmp_init(void)
+{
+	INIT_VNET_INET(curvnet);
+
+	V_icmpmaskrepl = 0;
+	V_icmpmaskfake = 0;
+	V_drop_redirect = 0;
+	V_log_redirect = 0;
+	V_icmplim = 200;
+	V_icmplim_output = 1;
+	V_icmp_rfi = 0;
+	V_icmp_quotelen = 8;
+	V_icmpbmcastecho = 0;
+}
+
 /*
  * Generate an error packet of type error
  * in response to bad packet ip.

==== //depot/projects/vimage-commit2/src/sys/netinet/ip_icmp.h#2 (text+ko) ====

@@ -204,6 +204,7 @@
 #ifdef _KERNEL
 void	icmp_error(struct mbuf *, int, int, n_long, int);
 void	icmp_input(struct mbuf *, int);
+void	icmp_init(void);
 int	ip_next_mtu(int, int);
 #endif
 

==== //depot/projects/vimage-commit2/src/sys/netinet/ip_input.c#16 (text+ko) ====

@@ -89,33 +89,47 @@
 CTASSERT(sizeof(struct ip) == 20);
 #endif
 
-int rsvp_on = 0;
+#ifdef VIMAGE_GLOBALS
+static int	ipsendredirects;
+static int	ip_checkinterface;
+static int	ip_keepfaith;
+static int	ip_sendsourcequench;
+int	ip_defttl;
+int	ip_do_randomid;
+int	ipforwarding;
+struct	in_ifaddrhead in_ifaddrhead; 		/* first inet address */
+struct	in_ifaddrhashhead *in_ifaddrhashtbl;	/* inet addr hash table  */
+u_long 	in_ifaddrhmask;				/* mask for hash table */
+struct ipstat ipstat;
+static int ip_rsvp_on;
+struct socket *ip_rsvpd;
+int	rsvp_on;
+static TAILQ_HEAD(ipqhead, ipq) ipq[IPREASS_NHASH];
+static int	maxnipq;	/* Administrative limit on # reass queues. */
+static int	maxfragsperpacket;
+int	ipstealth;
+static int	nipq;	/* Total # of reass queues */
+#endif
 
-int	ipforwarding = 0;
 SYSCTL_V_INT(V_NET, vnet_inet, _net_inet_ip, IPCTL_FORWARDING,
     forwarding, CTLFLAG_RW, ipforwarding, 0,
     "Enable IP forwarding between interfaces");
 
-static int	ipsendredirects = 1; /* XXX */
 SYSCTL_V_INT(V_NET, vnet_inet, _net_inet_ip, IPCTL_SENDREDIRECTS,
     redirect, CTLFLAG_RW, ipsendredirects, 0,
     "Enable sending IP redirects");
 
-int	ip_defttl = IPDEFTTL;
 SYSCTL_V_INT(V_NET, vnet_inet, _net_inet_ip, IPCTL_DEFTTL,
     ttl, CTLFLAG_RW, ip_defttl, 0, "Maximum TTL on IP packets");
 
-static int	ip_keepfaith = 0;
 SYSCTL_V_INT(V_NET, vnet_inet, _net_inet_ip, IPCTL_KEEPFAITH,
     keepfaith, CTLFLAG_RW, ip_keepfaith,	0,
     "Enable packet capture for FAITH IPv4->IPv6 translater daemon");
 
-static int	ip_sendsourcequench = 0;
 SYSCTL_V_INT(V_NET, vnet_inet, _net_inet_ip, OID_AUTO,
     sendsourcequench, CTLFLAG_RW, ip_sendsourcequench, 0,
     "Enable the transmission of source quench packets");
 
-int	ip_do_randomid = 0;
 SYSCTL_V_INT(V_NET, vnet_inet, _net_inet_ip, OID_AUTO, random_id,
     CTLFLAG_RW, ip_do_randomid, 0, "Assign random ip_id values");
 
@@ -132,7 +146,6 @@
  * to the loopback interface instead of the interface where the
  * packets for those addresses are received.
  */
-static int	ip_checkinterface = 0;
 SYSCTL_V_INT(V_NET, vnet_inet, _net_inet_ip, OID_AUTO,
     check_interface, CTLFLAG_RW, ip_checkinterface, 0,
     "Verify packet arrives on correct interface");
@@ -145,9 +158,6 @@
 extern	struct domain inetdomain;
 extern	struct protosw inetsw[];
 u_char	ip_protox[IPPROTO_MAX];
-struct	in_ifaddrhead in_ifaddrhead; 		/* first inet address */
-struct	in_ifaddrhashhead *in_ifaddrhashtbl;	/* inet addr hash table  */
-u_long 	in_ifaddrhmask;				/* mask for hash table */
 
 SYSCTL_INT(_net_inet_ip, IPCTL_INTRQMAXLEN, intr_queue_maxlen, CTLFLAG_RW,
     &ipintrq.ifq_maxlen, 0, "Maximum size of the IP input queue");
@@ -155,21 +165,10 @@
     &ipintrq.ifq_drops, 0,
     "Number of packets dropped from the IP input queue");
 
-struct ipstat ipstat;
 SYSCTL_V_STRUCT(V_NET, vnet_inet, _net_inet_ip, IPCTL_STATS, stats, CTLFLAG_RW,
     ipstat, ipstat, "IP statistics (struct ipstat, netinet/ip_var.h)");
 
-/*
- * IP datagram reassembly.
- */
-#define IPREASS_NHASH_LOG2      6
-#define IPREASS_NHASH           (1 << IPREASS_NHASH_LOG2)
-#define IPREASS_HMASK           (IPREASS_NHASH - 1)
-#define IPREASS_HASH(x,y) \
-	(((((x) & 0xF) | ((((x) >> 8) & 0xF) << 4)) ^ (y)) & IPREASS_HMASK)
-
 static uma_zone_t ipq_zone;
-static TAILQ_HEAD(ipqhead, ipq) ipq[IPREASS_NHASH];
 static struct mtx ipqlock;
 
 #define	IPQ_LOCK()	mtx_lock(&ipqlock)
@@ -180,13 +179,10 @@
 static void	maxnipq_update(void);
 static void	ipq_zone_change(void *);
 
-static int	maxnipq;	/* Administrative limit on # reass queues. */
-static int	nipq = 0;	/* Total # of reass queues */
 SYSCTL_V_INT(V_NET, vnet_inet, _net_inet_ip, OID_AUTO, fragpackets,
     CTLFLAG_RD, nipq, 0,
     "Current number of IPv4 fragment reassembly queue entries");
 
-static int	maxfragsperpacket;
 SYSCTL_V_INT(V_NET, vnet_inet, _net_inet_ip, OID_AUTO, maxfragsperpacket,
     CTLFLAG_RW, maxfragsperpacket, 0,
     "Maximum number of IPv4 fragments allowed per packet");
@@ -199,7 +195,6 @@
 #endif
 
 #ifdef IPSTEALTH
-int	ipstealth = 0;
 SYSCTL_V_INT(V_NET, vnet_inet, _net_inet_ip, OID_AUTO, stealth, CTLFLAG_RW,
     ipstealth, 0, "IP stealth mode, no TTL decrementation on forwarding");
 #endif
@@ -225,6 +220,37 @@
 	struct protosw *pr;
 	int i;
 
+	V_ipsendredirects = 1; /* XXX */
+	V_ip_checkinterface = 0;
+	V_ip_keepfaith = 0;
+	V_ip_sendsourcequench = 0;
+	V_rsvp_on = 0;
+	V_ip_defttl = IPDEFTTL;
+	V_ip_do_randomid = 0;
+	V_ipforwarding = 0;
+	V_ipstealth = 0;
+	V_nipq = 0;	/* Total # of reass queues */
+
+	V_ipport_lowfirstauto  = IPPORT_RESERVED - 1;	/* 1023 */
+	V_ipport_lowlastauto = IPPORT_RESERVEDSTART;	/* 600 */
+	V_ipport_firstauto = IPPORT_EPHEMERALFIRST;	/* 10000 */
+	V_ipport_lastauto  = IPPORT_EPHEMERALLAST;	/* 65535 */
+	V_ipport_hifirstauto = IPPORT_HIFIRSTAUTO;	/* 49152 */
+	V_ipport_hilastauto  = IPPORT_HILASTAUTO;	/* 65535 */
+	V_ipport_reservedhigh = IPPORT_RESERVED - 1;	/* 1023 */
+	V_ipport_reservedlow = 0;
+	V_ipport_randomized = 1;	/* user controlled via sysctl */
+	V_ipport_randomcps = 10;	/* user controlled via sysctl */
+	V_ipport_randomtime = 45;	/* user controlled via sysctl */
+	V_ipport_stoprandom = 0;	/* toggled by ipport_tick */
+
+#ifdef NOTYET
+	/* XXX global static but not instantiated in this file */
+	V_ipfastforward_active = 0;
+	V_subnetsarelocal = 0;
+	V_sameprefixcarponly = 0;
+#endif
+
 	TAILQ_INIT(&V_in_ifaddrhead);
 	V_in_ifaddrhashtbl = hashinit(INADDR_NHASH, M_IFADDR, &V_in_ifaddrhmask);
 	pr = pffindproto(PF_INET, IPPROTO_RAW, SOCK_RAW);
@@ -1591,8 +1617,6 @@
  * locking.  This code remains in ip_input.c as ip_mroute.c is optionally
  * compiled.
  */
-static int ip_rsvp_on;
-struct socket *ip_rsvpd;
 int
 ip_rsvp_init(struct socket *so)
 {

==== //depot/projects/vimage-commit2/src/sys/netinet/ip_output.c#8 (text+ko) ====

@@ -83,7 +83,9 @@
 				  (ntohl(a.s_addr)>>8)&0xFF,\
 				  (ntohl(a.s_addr))&0xFF, y);
 
+#ifdef VIMAGE_GLOBALS
 u_short ip_id;
+#endif
 
 #ifdef MBUF_STRESS_TEST
 int mbuf_frag_size = 0;

==== //depot/projects/vimage-commit2/src/sys/netinet/raw_ip.c#14 (text+ko) ====

@@ -76,8 +76,10 @@
 
 #include 
 
+#ifdef VIMAGE_GLOBALS
 struct	inpcbhead ripcb;
 struct	inpcbinfo ripcbinfo;
+#endif
 
 /* control hooks for ipfw and dummynet */
 ip_fw_ctl_t *ip_fw_ctl_ptr = NULL;
@@ -91,7 +93,9 @@
 /*
  * The socket used to communicate with the multicast routing daemon.
  */
+#ifdef VIMAGE_GLOBALS
 struct socket  *ip_mrouter;
+#endif
 
 /*
  * The various mrouter and rsvp functions.

==== //depot/projects/vimage-commit2/src/sys/netinet/tcp_hostcache.c#12 (text+ko) ====

@@ -146,9 +146,11 @@
 	int	prune;
 	int	purgeall;
 };
+
+#ifdef VIMAGE_GLOBALS
 static struct tcp_hostcache tcp_hostcache;
-
 static struct callout tcp_hc_callout;
+#endif
 
 static struct hc_metrics *tcp_hc_lookup(struct in_conninfo *);
 static struct hc_metrics *tcp_hc_insert(struct in_conninfo *);

==== //depot/projects/vimage-commit2/src/sys/netinet/tcp_input.c#19 (text+ko) ====

@@ -99,7 +99,21 @@
 
 static const int tcprexmtthresh = 3;
 
+#ifdef VIMAGE_GLOBALS
 struct	tcpstat tcpstat;
+int	blackhole;
+int	tcp_delack_enabled;
+int	drop_synfin;
+int	tcp_do_rfc3042;
+int	tcp_do_rfc3390;
+int	tcp_do_ecn;
+int	tcp_ecn_maxretries;
+int	tcp_insecure_rst;
+int	tcp_do_autorcvbuf;
+int	tcp_autorcvbuf_inc;
+int	tcp_autorcvbuf_max;
+#endif
+
 SYSCTL_V_STRUCT(V_NET, vnet_inet, _net_inet_tcp, TCPCTL_STATS, stats,
     CTLFLAG_RW, tcpstat , tcpstat,
     "TCP statistics (struct tcpstat, netinet/tcp_var.h)");
@@ -108,59 +122,50 @@
 SYSCTL_INT(_net_inet_tcp, OID_AUTO, log_in_vain, CTLFLAG_RW,
     &tcp_log_in_vain, 0, "Log all incoming TCP segments to closed ports");
 
-static int blackhole = 0;
 SYSCTL_V_INT(V_NET, vnet_inet, _net_inet_tcp, OID_AUTO, blackhole, CTLFLAG_RW,
     blackhole, 0, "Do not send RST on segments to closed ports");
 
-int tcp_delack_enabled = 1;
 SYSCTL_V_INT(V_NET, vnet_inet, _net_inet_tcp, OID_AUTO, delayed_ack,
     CTLFLAG_RW, tcp_delack_enabled, 0,
     "Delay ACK to try and piggyback it onto a data packet");
 
-static int drop_synfin = 0;
 SYSCTL_V_INT(V_NET, vnet_inet, _net_inet_tcp, OID_AUTO, drop_synfin,
     CTLFLAG_RW, drop_synfin, 0, "Drop TCP packets with SYN+FIN set");
 
-static int tcp_do_rfc3042 = 1;
 SYSCTL_V_INT(V_NET, vnet_inet, _net_inet_tcp, OID_AUTO, rfc3042, CTLFLAG_RW,
     tcp_do_rfc3042, 0, "Enable RFC 3042 (Limited Transmit)");
 
-static int tcp_do_rfc3390 = 1;
 SYSCTL_V_INT(V_NET, vnet_inet, _net_inet_tcp, OID_AUTO, rfc3390, CTLFLAG_RW,
     tcp_do_rfc3390, 0,
     "Enable RFC 3390 (Increasing TCP's Initial Congestion Window)");
 
-int	tcp_do_ecn = 0;
-int	tcp_ecn_maxretries = 1;
 SYSCTL_NODE(_net_inet_tcp, OID_AUTO, ecn, CTLFLAG_RW, 0, "TCP ECN");
 SYSCTL_V_INT(V_NET, vnet_inet, _net_inet_tcp_ecn, OID_AUTO, enable,
     CTLFLAG_RW, tcp_do_ecn, 0, "TCP ECN support");
 SYSCTL_V_INT(V_NET, vnet_inet, _net_inet_tcp_ecn, OID_AUTO, maxretries,
     CTLFLAG_RW, tcp_ecn_maxretries, 0, "Max retries before giving up on ECN");
 
-static int tcp_insecure_rst = 0;
 SYSCTL_V_INT(V_NET, vnet_inet, _net_inet_tcp, OID_AUTO, insecure_rst,
     CTLFLAG_RW, tcp_insecure_rst, 0,
     "Follow the old (insecure) criteria for accepting RST packets");
 
-int	tcp_do_autorcvbuf = 1;
 SYSCTL_V_INT(V_NET, vnet_inet, _net_inet_tcp, OID_AUTO, recvbuf_auto,
     CTLFLAG_RW, tcp_do_autorcvbuf, 0,
     "Enable automatic receive buffer sizing");
 
-int	tcp_autorcvbuf_inc = 16*1024;
 SYSCTL_V_INT(V_NET, vnet_inet, _net_inet_tcp, OID_AUTO, recvbuf_inc,
     CTLFLAG_RW, tcp_autorcvbuf_inc, 0,
     "Incrementor step size of automatic receive buffer");
 
-int	tcp_autorcvbuf_max = 256*1024;
 SYSCTL_V_INT(V_NET, vnet_inet, _net_inet_tcp, OID_AUTO, recvbuf_max,
     CTLFLAG_RW, tcp_autorcvbuf_max, 0,
     "Max size of automatic receive buffer");
 
+#ifdef VIMAGE_GLOBALS
 struct inpcbhead tcb;
+struct inpcbinfo tcbinfo;
+#endif
 #define	tcb6	tcb  /* for KAME src sync over BSD*'s */
-struct inpcbinfo tcbinfo;
 
 static void	 tcp_dooptions(struct tcpopt *, u_char *, int, int);
 static void	 tcp_do_segment(struct mbuf *, struct tcphdr *,

==== //depot/projects/vimage-commit2/src/sys/netinet/tcp_output.c#16 (text+ko) ====

@@ -87,39 +87,42 @@
 extern struct mbuf *m_copypack();
 #endif
 
-int path_mtu_discovery = 1;
+#ifdef VIMAGE_GLOBALS
+int path_mtu_discovery;
+int ss_fltsz;
+int ss_fltsz_local;
+int     tcp_do_newreno;
+int	tcp_do_tso;
+int	tcp_do_autosndbuf;
+int	tcp_autosndbuf_inc;
+int	tcp_autosndbuf_max;
+#endif
+
 SYSCTL_V_INT(V_NET, vnet_inet, _net_inet_tcp, OID_AUTO, path_mtu_discovery,
 	CTLFLAG_RW, path_mtu_discovery, 1, "Enable Path MTU Discovery");
 
-int ss_fltsz = 1;
 SYSCTL_V_INT(V_NET, vnet_inet, _net_inet_tcp, OID_AUTO,
 	slowstart_flightsize, CTLFLAG_RW,
 	ss_fltsz, 1, "Slow start flight size");
 
-int ss_fltsz_local = 4;
 SYSCTL_V_INT(V_NET, vnet_inet, _net_inet_tcp, OID_AUTO,
 	local_slowstart_flightsize, CTLFLAG_RW,
 	ss_fltsz_local, 1, "Slow start flight size for local networks");
 
-int     tcp_do_newreno = 1;
 SYSCTL_V_INT(V_NET, vnet_inet, _net_inet_tcp, OID_AUTO, newreno, CTLFLAG_RW,
 	tcp_do_newreno, 0, "Enable NewReno Algorithms");
 
-int	tcp_do_tso = 1;
 SYSCTL_V_INT(V_NET, vnet_inet, _net_inet_tcp, OID_AUTO, tso, CTLFLAG_RW,
 	tcp_do_tso, 0, "Enable TCP Segmentation Offload");
 
-int	tcp_do_autosndbuf = 1;
 SYSCTL_V_INT(V_NET, vnet_inet, _net_inet_tcp, OID_AUTO, sendbuf_auto,
 	CTLFLAG_RW,
 	tcp_do_autosndbuf, 0, "Enable automatic send buffer sizing");
 
-int	tcp_autosndbuf_inc = 8*1024;
 SYSCTL_V_INT(V_NET, vnet_inet, _net_inet_tcp, OID_AUTO, sendbuf_inc,
 	CTLFLAG_RW, tcp_autosndbuf_inc, 0,
 	"Incrementor step size of automatic send buffer");
 
-int	tcp_autosndbuf_max = 256*1024;
 SYSCTL_V_INT(V_NET, vnet_inet, _net_inet_tcp, OID_AUTO, sendbuf_max,
 	CTLFLAG_RW, tcp_autosndbuf_max, 0,
 	"Max size of automatic send buffer");

==== //depot/projects/vimage-commit2/src/sys/netinet/tcp_reass.c#9 (text+ko) ====

@@ -74,25 +74,28 @@
 #include 
 #endif /* TCPDEBUG */
 
+#ifdef VIMAGE_GLOBALS
+static int tcp_reass_maxseg;
+int tcp_reass_qsize;
+static int tcp_reass_maxqlen;
+static int tcp_reass_overflows;
+#endif
+
 SYSCTL_NODE(_net_inet_tcp, OID_AUTO, reass, CTLFLAG_RW, 0,
     "TCP Segment Reassembly Queue");
 
-static int tcp_reass_maxseg = 0;
 SYSCTL_V_INT(V_NET, vnet_inet, _net_inet_tcp_reass, OID_AUTO, maxsegments,
     CTLFLAG_RDTUN, tcp_reass_maxseg, 0,
     "Global maximum number of TCP Segments in Reassembly Queue");
 
-int tcp_reass_qsize = 0;
 SYSCTL_V_INT(V_NET, vnet_inet, _net_inet_tcp_reass, OID_AUTO, cursegments,
     CTLFLAG_RD, tcp_reass_qsize, 0,
     "Global number of TCP Segments currently in Reassembly Queue");
 
-static int tcp_reass_maxqlen = 48;
 SYSCTL_V_INT(V_NET, vnet_inet, _net_inet_tcp_reass, OID_AUTO, maxqlen,
     CTLFLAG_RW, tcp_reass_maxqlen, 0,
     "Maximum number of TCP Segments per individual Reassembly Queue");
 
-static int tcp_reass_overflows = 0;
 SYSCTL_V_INT(V_NET, vnet_inet, _net_inet_tcp_reass, OID_AUTO, overflows,
     CTLFLAG_RD, tcp_reass_overflows, 0,
     "Global number of TCP Segment Reassembly Queue Overflows");
@@ -114,6 +117,11 @@
 {
 	INIT_VNET_INET(curvnet);
 
+	V_tcp_reass_maxseg = 0;
+	V_tcp_reass_qsize = 0;
+	V_tcp_reass_maxqlen = 48;
+	V_tcp_reass_overflows = 0;
+
 	V_tcp_reass_maxseg = nmbclusters / 16;
 	TUNABLE_INT_FETCH("net.inet.tcp.reass.maxsegments",
 	    &V_tcp_reass_maxseg);

==== //depot/projects/vimage-commit2/src/sys/netinet/tcp_sack.c#11 (text+ko) ====

>>> TRUNCATED FOR MAIL (1000 lines) <<<

From owner-p4-projects@FreeBSD.ORG  Wed Oct 29 15:03:59 2008
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 940FE1065672; Wed, 29 Oct 2008 15:03:59 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 4D076106564A
	for ; Wed, 29 Oct 2008 15:03:59 +0000 (UTC)
	(envelope-from bz@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 3DAB58FC18
	for ; Wed, 29 Oct 2008 15:03:59 +0000 (UTC)
	(envelope-from bz@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id m9TF3xSv037755
	for ; Wed, 29 Oct 2008 15:03:59 GMT
	(envelope-from bz@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m9TF3x2H037752
	for perforce@freebsd.org; Wed, 29 Oct 2008 15:03:59 GMT
	(envelope-from bz@freebsd.org)
Date: Wed, 29 Oct 2008 15:03:59 GMT
Message-Id: <200810291503.m9TF3x2H037752@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	bz@freebsd.org using -f
From: "Bjoern A. Zeeb" 
To: Perforce Change Reviews 
Cc: 
Subject: PERFORCE change 152153 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, 29 Oct 2008 15:04:00 -0000

http://perforce.freebsd.org/chv.cgi?CH=152153

Change 152153 by bz@bz_dumpster on 2008/10/29 15:03:35

	Make ddb _compile_ and enable it in GENERIC.
	Disable MD_ROOT for the moment.
	We die in dat_init() -- so reworking pmap.c entirely is next.

Affected files ...

.. //depot/projects/s390/sys/conf/files.s390#7 edit
.. //depot/projects/s390/sys/ddb/db_sym.c#5 edit
.. //depot/projects/s390/sys/s390/conf/GENERIC#12 edit
.. //depot/projects/s390/sys/s390/include/db_machdep.h#2 edit
.. //depot/projects/s390/sys/s390/include/setjmp.h#2 edit
.. //depot/projects/s390/sys/s390/s390/db_disasm.c#4 edit
.. //depot/projects/s390/sys/s390/s390/db_hwatch.c#4 edit
.. //depot/projects/s390/sys/s390/s390/db_interface.c#4 edit
.. //depot/projects/s390/sys/s390/s390/db_trace.c#4 edit
.. //depot/projects/s390/sys/s390/s390/genassym.c#6 edit
.. //depot/projects/s390/sys/s390/s390/machdep.c#13 edit
.. //depot/projects/s390/sys/s390/s390/mp_machdep.c#4 edit
.. //depot/projects/s390/sys/s390/s390/pmap.c#19 edit
.. //depot/projects/s390/sys/s390/s390/stack_machdep.c#1 add

Differences ...

==== //depot/projects/s390/sys/conf/files.s390#7 (text+ko) ====

@@ -93,6 +93,7 @@
 s390/s390/mp_machdep.c		optional	smp
 s390/s390/pmap.c		standard
 s390/s390/service.c		standard
+s390/s390/stack_machdep.c	optional	ddb | stack
 s390/s390/support.S		standard
 s390/s390/swtch.S		standard
 s390/s390/sys_machdep.c		standard

==== //depot/projects/s390/sys/ddb/db_sym.c#5 (text+ko) ====

@@ -225,7 +225,7 @@
 {
 	register
 	unsigned int	diff;
-	size_t		newdiff;
+	db_expr_t	newdiff;
 	register int	i;
 	c_db_sym_t	ret = C_DB_SYM_NULL, sym;
 

==== //depot/projects/s390/sys/s390/conf/GENERIC#12 (text+ko) ====

@@ -30,10 +30,14 @@
 
 #options 	ADDRESS_SPACE_2GB	# Probably will never be implemented (no reason).
 
-#options 	INVARIANT_SUPPORT
-#options 	INVARIANTS
-#options 	WITNESS
-#options 	WITNESS_SKIPSPIN
+# Debugging for use in -current
+options 	KDB			# Enable kernel debugger support.
+options 	DDB			# Support DDB.
+#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
+#options 	WITNESS			# Enable checks to detect deadlocks and cycles
+#options 	WITNESS_SKIPSPIN	# Don't run witness on spinlocks for speed
 #options 	DIAGNOSTIC
 #options 	DEBUG_LOCKS
 
@@ -53,8 +57,10 @@
 options 	PSEUDOFS		# Pseudo-filesystem framework
 options 	COMPAT_43		# Compatible with BSD 4.3
 options		COMPAT_FREEBSD4
-options 	MD_ROOT			# MD is potential root device
-options 	MD_ROOT_SIZE=8192
+
+# XXX-BZ we want that once we get there but for now it bloats the oco.
+#options 	MD_ROOT			# MD is potential root device
+#options 	MD_ROOT_SIZE=8192
 
 #device		hhc			# Debug feature
 device		hmcsc			# HMC system console

==== //depot/projects/s390/sys/s390/include/db_machdep.h#2 (text+ko) ====

@@ -43,18 +43,24 @@
 
 #define	DDB_REGS	(&ddb_regs)
 
+#ifdef __OLD_FOO
 #define	PC_REGS(regs)	((db_addr_t)(regs)->tf_psw.addr & ~PSW_A)
+#endif
+#define	PC_REGS()	((db_addr_t)kdb_thrctx->pcb_ontrap)
 
 #define	BKPT_INST	0		/* breakpoint instruction */
 #define	BKPT_SIZE	2		/* size of breakpoint inst */
 #define	BKPT_SET(inst)	BKPT_INST
 
-#define BKPT_SKIP		ddb_regs.tf_psw. += 1
+#define	BKPT_SKIP					\
+	do {						\
+		kdb_frame->tf_psw.addr += 1;		\
+	} while (0)
 
-#define	db_clear_single_step(regs)	((regs)->tf_eflags &= ~PSL_T)
-#define	db_set_single_step(regs)	((regs)->tf_eflags |=  PSL_T)
+#define	db_clear_single_step		kdb_cpu_clear_singlestep
+#define	db_set_single_step		kdb_cpu_set_singlestep
 
-#define	IS_BREAKPOINT_TRAP(type, code)	((type) == T_BPTFLT)
+#define	IS_BREAKPOINT_TRAP(type, code)	0
 /*
  * Watchpoints are not supported.  The debug exception type is in %dr6
  * and not yet in the args to this macro.

==== //depot/projects/s390/sys/s390/include/setjmp.h#2 (text+ko) ====

@@ -32,6 +32,9 @@
  * $FreeBSD: src/sys/s390/include/setjmp.h,v 1.0 2000/10/06 11:53:31 tzukanov Exp $
  */
 
+#ifndef _MACHINE_SETJMP_H_
+#define	_MACHINE_SETJMP_H_
+
 /*
  * word is 32-bit here.
  *
@@ -54,3 +57,5 @@
 #endif /* not ANSI */
 
 typedef struct _jmp_buf { int _jb[_JB_LEN]; } jmp_buf[1];
+
+#endif

==== //depot/projects/s390/sys/s390/s390/db_disasm.c#4 (text+ko) ====

@@ -4,10 +4,12 @@
  * Copyright (c) 2002 Serguei Tzukanov. All rights reserved.
  */
 
-#include 
+#include 
 __FBSDID("$FreeBSD: src/sys/s390/s390/db_disasm.c,v 1.0 2002/07/01 23:51:16 tzukanov Exp $");
 
+#include 
 #include 
+
 #include 
 #include 
 #include 
@@ -36,18 +38,18 @@
 	unsigned shift;
 	unsigned mask;
 } os[] = {
-	52, 0x0000000f,
-	48, 0x000000ff,
-	48, 0x0000000f,
-	44, 0x0000000f,
-	32, 0x0000ffff,
-	16, 0xffffffff,
-	40, 0x0000000f,
-	32, 0x00000fff,
-	36, 0x0000000f,
-	32, 0x0000000f,
-	28, 0x0000000f,
-	16, 0x00000fff,
+	{ 52, 0x0000000f },
+	{ 48, 0x000000ff },
+	{ 48, 0x0000000f },
+	{ 44, 0x0000000f },
+	{ 32, 0x0000ffff },
+	{ 16, 0xffffffff },
+	{ 40, 0x0000000f },
+	{ 32, 0x00000fff },
+	{ 36, 0x0000000f },
+	{ 32, 0x0000000f },
+	{ 28, 0x0000000f },
+	{ 16, 0x00000fff },
 };
 
 /* And four bits for type of operand. */
@@ -70,7 +72,12 @@
 
 #define A8		(T_A | O8_S4)
 #define A12		(T_A | O12_S4)
+#define A24		(T_A | O24_S4)
+#define A28		(T_A | O28_S4)
 
+#define B16		(T_B | O16_S16)
+#define B32		(T_B | O32_S4)
+
 #define C8		(T_C | O8_S4)
 #define C12		(T_C | O12_S4)
 
@@ -80,9 +87,11 @@
 #define F8		(T_F | O8_S4)
 #define F12		(T_F | O12_S4)
 #define F16		(T_F | O16_S4)
+#define F24		(T_F | O24_S4)
 #define F28		(T_F | O28_S4)
 
 #define I8		(T_I | O8_S8)
+#define I12_8		(T_I | O12_S4)	/* XXX */
 #define I16_16		(T_I | O16_S16)
 #define I16_32		(T_I | O16_S32)
 
@@ -90,6 +99,7 @@
 #define L8_8		(T_I | O8_S8)
 #define L12		(T_I | O12_S4)
 
+#define M8		(T_M | O8_S4)
 #define M12		(T_M | O12_S4)
 #define M16		(T_M | O16_S4)
 #define M20		(T_M | O20_S4)
@@ -100,6 +110,7 @@
 #define R16		(T_R | O16_S4)
 #define R20		(T_R | O20_S4)
 #define R24		(T_R | O24_S4)
+#define R28		(T_R | O28_S4)
 
 #define S28		(T_S | O28_S4)
 
@@ -109,6 +120,8 @@
 #define V24		(T_V | O24_S4)
 #define V28		(T_V | O28_S4)
 
+#define X12		(T_X | O12_S4)
+
 #define ESA390		0x1
 #define ESAME		0x2
 
@@ -119,7 +132,7 @@
 #endif
 
 struct insndesc {
-	uint16_t opcode,
+	uint16_t opcode;
 	char     mnemonic[6];
 	uint8_t  archmask;
 	uint8_t  operand[7];
@@ -894,10 +907,12 @@
 static char *gpr_names[16] = {
 	"r0", "r1", "r2",  "r3",  "r4",  "r5",  "r6",  "r7",
 	"r8", "r9", "r10", "r11", "r12", "lit", "r14", "sp"
-}
+};
 
+static void
 print_operand(unsigned v, int type, int delim)
 {
+
 	switch(type) {
 	case T_A:
 		db_printf("a%u", v);
@@ -922,7 +937,7 @@
 		db_printf("%u", v);
 		break;
 	case T_R:
-		db_printf("%s", gpr_names[op]);
+		db_printf("%s", gpr_names[v]);
 		break;
 	/* It's either the last operand or we have T_T after. */
 	case T_S:
@@ -947,8 +962,8 @@
 static int
 insndesc_cmp(const void *_k, const void *_m)
 {
-	struct insndesc *k = (struct insndesc *)_k;
-	struct insndesc *m = (struct insndesc *)_m;
+	const struct insndesc *k = (const struct insndesc *)_k;
+	const struct insndesc *m = (const struct insndesc *)_m;
 
 	if ((m->archmask & archmask) == 0)
 		return 1;
@@ -959,7 +974,7 @@
 static struct insndesc *
 find_insndesc(unsigned opcode, struct insndesc *insndesc, size_t n)
 {
-	struct insndesc id = {opcode};
+	struct insndesc id = { opcode };
 
 	/* Not really necessary but table sorted anyway. */
 	return bsearch(&id, insndesc, n, sizeof(*insndesc), insndesc_cmp);
@@ -967,27 +982,29 @@
 
 /* I ignore altfmt for now. */
 db_addr_t
-db_disasm(db_addr_t addr, boolean altfmt)
+db_disasm(db_addr_t loc, boolean_t altfmt)
 {
 	uint64_t insn_s;
 	uint8_t *insn = (uint8_t *)&insn_s;
 	unsigned opdesc;
+	struct insndesc *id;
 	int insnlen;
 	int i;
 
-	addr &= ~1ul;
+	loc &= ~1ul;
 
-	db_read_bytes(addr, 2, insn);
+	db_read_bytes(loc, 2, insn);
 
 #define INSNLEN_MASK	0x03
 
-	switch (instr[0] & INSNLEN_MASK) {
-	case 1: case 2:
-		db_read_bytes(addr + 2, 2, insn + 2);
+	switch (insn[0] & INSNLEN_MASK) {
+	case 1:
+	case 2:
+		db_read_bytes(loc + 2, 2, insn + 2);
 		insnlen = 4;
 		break;
 	case 3:
-		db_read_bytes(addr + 2, 4, insn + 2);
+		db_read_bytes(loc + 2, 4, insn + 2);
 		insnlen = 6;
 		break;
 	default:
@@ -1016,17 +1033,17 @@
 			break;
 		/* fall through */
 	case 2:
-		id = find_insnlen(OPCODE2(insn), FID(xx));
+		id = find_insndesc(OPCODE2(insn), FID(xx));
 		if (id == NULL) {
 			for (i = 0; i < insnlen; i++)
 				db_printf("%2x", insn[i]);
 			db_printf("\n");
-			return addr + insnlen;
+			return loc + insnlen;
 		}
 	}
 
 	db_printf("%s ", id->mnemonic);
-	for (i = 0; opdesc = id->operand[i]; i++) {
+	for (i = 0; (opdesc = id->operand[i]); i++) {
 		int osi;
 
 		osi = opdesc & O_S_MASK;
@@ -1035,14 +1052,14 @@
 	}
 	db_printf("\n");
 
-	return addr + insnlen;
+	return loc + insnlen;
 }
 
 /*
  * Set the disassembler filter. Should also have ESA390|ESAME,
  * but some vector opcodes intersect with z/Architecture ones.
  */
-DB_COMMAND(esa390, db_esame)
+DB_COMMAND(esa390, db_esa390)
 {
 	archmask = ESA390;
 }

==== //depot/projects/s390/sys/s390/s390/db_hwatch.c#4 (text+ko) ====

@@ -8,16 +8,14 @@
 __FBSDID("$FreeBSD: src/sys/s390/s390/db_hwatch.c,v 1.0 2002/04/01 23:51:16 tzukanov Exp $");
 
 #include 
+
 #include 
 #include 
 #include 
 #include 
+
 #include 
 
-int db_md_set_watchpoint(db_expr_t addr, db_expr_t size);
-int db_md_clr_watchpoint(db_expr_t addr, db_expr_t size);
-void db_md_list_watchpoints(void);
-
 int
 db_md_set_watchpoint(db_expr_t addr, db_expr_t size)
 {

==== //depot/projects/s390/sys/s390/s390/db_interface.c#4 (text+ko) ====

@@ -10,57 +10,40 @@
 __FBSDID("$FreeBSD: src/sys/s390/s390/db_interface.c,v 1.0 2002/04/01 23:51:16 tzukanov Exp $");
 
 #include 
+#include 
+#include 
+
+#include 
+
 #include 
 #include 
 #include 
 #include 
 
 int
-kdb_trap(u_int code, struct trapframe *tf)
-{
-
-	ddb_regs = *tf;
-
-	db_trap(code, 0);
-
-
-	*tf = ddb_regs;
-
-	/* Let's call it success: we handled the trap. */
-	return 1;
-}
-
-void
 db_read_bytes(vm_offset_t va, size_t size, char *data)
 {
+#if 0
 	db_nofault = &db_jmpbuf;
+#endif
 
-	
+	return (0);
 }
 
-void
+int
 db_write_bytes(vm_offset_t va, size_t size, char *data)
 {
+
+#if 0
 	db_nofault = &db_jmpbuf;
-}
+#endif
 
-void
-Debugger(const char *msg)
-{
-	static volatile int in_Debugger;
-
-	if (atomic_cmpset_int(&in_Debugger, 0, 1)) {
-		db_printf("Debugger('%s')", msg);
-		/* call debugger */
-		...
-		atomic_store_rel_int(&in_Debugger, 0);
-	}
+	return (0);
 }
 
 void
 db_show_mdpcpu(struct pcpu *pc)
 {
-	db_printf("ipi		= 0x%x\n", pc->pc_ipi);
 }
 
 DB_COMMAND(reboot, db_reboot)

==== //depot/projects/s390/sys/s390/s390/db_trace.c#4 (text+ko) ====

@@ -2,42 +2,69 @@
  * Support for stack tracing in DDB.
  *
  * Copyright (c) 2002 Serguei Tzukanov.
+ * Copyright (c) 2008 Bjoern A. Zeeb
  */
 
 #include 
 __FBSDID("$FreeBSD: src/sys/s390/s390/db_trace.c,v 1.0 2002/04/01 23:51:16 tzukanov Exp $");
 
 #include 
+#include 
+#include 
+
 #include 
 #include 
+#include 
 #include 
-#include 
+#include 
+
+#include 
 #include 
 
+#define	DB_OFFSET(x)	(db_expr_t *)offsetof(struct trapframe, x)
 struct db_variable db_regs[] = {
-	{"r0",		&ddb_regs.tf_gpr[0],	FCN_NULL},
-	{"r1",		&ddb_regs.tf_gpr[1],	FCN_NULL},
-	{"r2",		&ddb_regs.tf_gpr[2],	FCN_NULL},
-	{"r3",		&ddb_regs.tf_gpr[3],	FCN_NULL},
-	{"r4",		&ddb_regs.tf_gpr[4],	FCN_NULL},
-	{"r5",		&ddb_regs.tf_gpr[5],	FCN_NULL},
-	{"r6",		&ddb_regs.tf_gpr[6],	FCN_NULL},
-	{"r7",		&ddb_regs.tf_gpr[7],	FCN_NULL},
-	{"r8",		&ddb_regs.tf_gpr[8],	FCN_NULL},
-	{"r9",		&ddb_regs.tf_gpr[9],	FCN_NULL},
-	{"r10",		&ddb_regs.tf_gpr[10],	FCN_NULL},
-	{"r11",		&ddb_regs.tf_gpr[11],	FCN_NULL},
-	{"r12",		&ddb_regs.tf_gpr[12],	FCN_NULL},
-	{"r13",		&ddb_regs.tf_gpr[13],	FCN_NULL},
-	{"r14",		&ddb_regs.tf_gpr[14],	FCN_NULL},
-	{"r15",		&ddb_regs.tf_gpr[15],	FCN_NULL},
+	{"r0",		DB_OFFSET(tf_gpr[0]),	FCN_NULL},
+	{"r1",		DB_OFFSET(tf_gpr[1]),	FCN_NULL},
+	{"r2",		DB_OFFSET(tf_gpr[2]),	FCN_NULL},
+	{"r3",		DB_OFFSET(tf_gpr[3]),	FCN_NULL},
+	{"r4",		DB_OFFSET(tf_gpr[4]),	FCN_NULL},
+	{"r5",		DB_OFFSET(tf_gpr[5]),	FCN_NULL},
+	{"r6",		DB_OFFSET(tf_gpr[6]),	FCN_NULL},
+	{"r7",		DB_OFFSET(tf_gpr[7]),	FCN_NULL},
+	{"r8",		DB_OFFSET(tf_gpr[8]),	FCN_NULL},
+	{"r9",		DB_OFFSET(tf_gpr[9]),	FCN_NULL},
+	{"r10",		DB_OFFSET(tf_gpr[10]),	FCN_NULL},
+	{"r11",		DB_OFFSET(tf_gpr[11]),	FCN_NULL},
+	{"r12",		DB_OFFSET(tf_gpr[12]),	FCN_NULL},
+	{"r13",		DB_OFFSET(tf_gpr[13]),	FCN_NULL},
+	{"r14",		DB_OFFSET(tf_gpr[14]),	FCN_NULL},
+	{"r15",		DB_OFFSET(tf_gpr[15]),	FCN_NULL},
 };
 
 struct db_variable *db_eregs = db_regs + sizeof(db_regs) / sizeof(db_regs[0]);
 
+static void
+db_stack_trace_cmd(db_expr_t addr, db_expr_t count)
+{
+
+}
+
+int
+db_trace_thread(struct thread *thr, int count)
+{
+	uint32_t addr;
+
+	if (thr == curthread)
+		addr = (uint32_t)__builtin_frame_address(0);
+	else
+		panic("[%s:%d] fixme", __func__, __LINE__);
+	db_stack_trace_cmd(addr, -1);
+	return (0);
+}
+
 void
-db_stack_trace_cmd(db_expr_t addr, boolean_t have_addr,
-		   db_expr_t count, char *modif)
+db_trace_self(void)
 {
-	
+	db_trace_thread(curthread, -1);
 }
+

==== //depot/projects/s390/sys/s390/s390/genassym.c#6 (text+ko) ====

@@ -65,8 +65,12 @@
 
 ASSYM(P_VMSPACE, offsetof(struct proc, p_vmspace));
 
+ASSYM(PC_CURPCB, offsetof(struct pcpu, pc_curpcb));
+ASSYM(PC_CURTHREAD, offsetof(struct pcpu, pc_curthread));
+ASSYM(PC_FPCURTHREAD, offsetof(struct pcpu, pc_fpcurthread));
+ASSYM(PC_CPUID, offsetof(struct pcpu, pc_cpuid));
 ASSYM(PC_CPUMASK, offsetof(struct pcpu, pc_cpumask));
-ASSYM(PC_CURTHREAD, offsetof(struct pcpu, pc_curthread));
+ASSYM(PCPU_SIZE, sizeof(struct pcpu));
 
 ASSYM(PCB_CR7, offsetof(struct pcb, pcb_cr7));
 ASSYM(PCB_GPR2, offsetof(struct pcb, pcb_gpr2));

==== //depot/projects/s390/sys/s390/s390/machdep.c#13 (text+ko) ====

@@ -204,9 +204,6 @@
 	/* Count number of CPUs. No-op on UP kernel. */
 	mp_early_probe();
 
-	/* Enable DAT. */
-	dat_init();
-
 #ifndef __s390x__
 	/* Reserve space for machine check exception. */
 	sysarea.pcpu += EXTENDED_SAVE_AREA_SIZE;
@@ -225,7 +222,16 @@
 	/* Setup pcpu struct. */
 	pcpu_init(sysarea.pcpu, 0, sizeof(struct pcpu));
 	PCPU_SET(curthread, &thread0);
+	PCPU_SET(curpcb, thread0.td_pcb);
+
+	/* init cons here already for debugging aid */
+	cninit();
+	printf("[%s:%d] reincarnation revolution rapid - run FreeBSD run!\n",
+	    __func__, __LINE__);
 
+	/* Enable DAT. */
+	dat_init();
+	
 	mutex_init();
 
 	/* Setup interruption vectors. */
@@ -242,14 +248,14 @@
 	css_init();
 #endif
 
-	/* Now we can init console, even a channel attached one. */
-	cninit();
-
 	/* Print info about found subchannels/devices. */
 #if 0
 	css_init_info();
 #endif
 
+	/* Now we can init console, even a channel attached one. */
+	/* cninit(); */
+
 	esa_cpu_model();
 }
 

==== //depot/projects/s390/sys/s390/s390/mp_machdep.c#4 (text+ko) ====


==== //depot/projects/s390/sys/s390/s390/pmap.c#19 (text+ko) ====

@@ -198,7 +198,7 @@
 
 	sk_set(0, SK_RW);
 	avail_end = PAGE_SIZE;
-	while(tprot(avail_end)) {
+	while (tprot(avail_end)) {
 		sk_set(avail_end, SK_RW);
 		avail_end += PAGE_SIZE;
 	}
@@ -212,6 +212,10 @@
 		*(*dimp)->vap = dat_init_map((*dimp)->n);
 	}
 
+	phys_avail[0] = avail_start;
+	phys_avail[1] = avail_end;
+	phys_avail[2] = 0;
+
 #if 0
 	sysarea.pcpu = (struct pcpu *)
 		(pmap_bootstrap_map(1) + EXTENDED_SAVE_AREA_SIZE);
@@ -240,14 +244,12 @@
 
 	/* Initialize the kernel pmap. */
 	kernel_pmap = &kernel_pmap_store;
+
+	PMAP_LOCK_INIT(kernel_pmap);
 	kernel_pmap->pm_sto = proc0sto;
-	kernel_pmap->pm_active = -1;
+	kernel_pmap->pm_active = ~0;
 	TAILQ_INIT(&kernel_pmap->pm_pvlist);
 
-	phys_avail[0] = avail_start;
-	phys_avail[1] = avail_end;
-	phys_avail[2] = 0;
-
 	/* Now let's enable DAT. */
 	cr_write(CR1, STD_PRIMARY(proc0sto));
 

From owner-p4-projects@FreeBSD.ORG  Wed Oct 29 18:07:13 2008
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id D9F5F1065689; Wed, 29 Oct 2008 18:07:12 +0000 (UTC)
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 84279106567F
	for ; Wed, 29 Oct 2008 18:07:12 +0000 (UTC)
	(envelope-from pgj@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 764D78FC14
	for ; Wed, 29 Oct 2008 18:07:12 +0000 (UTC)
	(envelope-from pgj@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id m9TI7CEb071504
	for ; Wed, 29 Oct 2008 18:07:12 GMT
	(envelope-from pgj@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m9TI7CN3071502
	for perforce@freebsd.org; Wed, 29 Oct 2008 18:07:12 GMT
	(envelope-from pgj@FreeBSD.org)
Date: Wed, 29 Oct 2008 18:07:12 GMT
Message-Id: <200810291807.m9TI7CN3071502@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	pgj@FreeBSD.org using -f
From: Gabor Pali 
To: Perforce Change Reviews 
Cc: 
Subject: PERFORCE change 152156 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, 29 Oct 2008 18:07:13 -0000

http://perforce.freebsd.org/chv.cgi?CH=152156

Change 152156 by pgj@kolbasz on 2008/10/29 18:07:02

	MFen (docs):
	    1.76       -> 1.78       hu_HU.ISO8859-2/books/handbook/desktop/chapter.sgml
	    1.129      -> 1.130      hu_HU.ISO8859-2/books/handbook/multimedia/chapter.sgml
	    1.283      -> 1.284      hu_HU.ISO8859-2/books/handbook/ports/chapter.sgml
	    1.189      -> 1.190      hu_HU.ISO8859-2/books/handbook/x11/chapter.sgml

Affected files ...

.. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/desktop/chapter.sgml#6 edit
.. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/multimedia/chapter.sgml#4 edit
.. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/ports/chapter.sgml#10 edit
.. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/x11/chapter.sgml#8 edit

Differences ...

==== //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/desktop/chapter.sgml#6 (text+ko) ====

@@ -6,7 +6,7 @@
      The FreeBSD Hungarian Documentation Project
      Translated by: PALI, Gabor 
      %SOURCE%	en_US.ISO8859-1/books/handbook/desktop/chapter.sgml
-     %SRCID%	1.76
+     %SRCID%	1.78
 -->
 
 
@@ -375,7 +375,7 @@
 	root felhasználóként
 	adjuk ki az alábbi parancsot:
 
-      &prompt.root; ln -s /usr/local/diablo-jre1.5.0/plugin/i386/ns7/libjavaplugin_oji.so \
+      &prompt.root; ln -s /usr/local/diablo-jre1.6.0/plugin/i386/ns7/libjavaplugin_oji.so \
   /usr/local/lib/browser_plugins/
 
       Ezt követõen indítsuk újra a
@@ -491,7 +491,7 @@
 	&flash; és a
 	Konqueror kapcsolatával egy
 	külön Hogyan is foglalkozik, amelyet a
-	
+	
 	címen olvashatunk el.
 
     

==== //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/multimedia/chapter.sgml#4 (text+ko) ====

@@ -7,7 +7,7 @@
 
 
 
@@ -684,11 +684,11 @@
 MPEG 1.0 layer III, 128 kbit/s, 44100 Hz joint-stereo
 
 
-      Itt a /dev/dsp1.0 eszköznevet ne
-	felejtsük el kicserélni a rendszerünkben
-	található dsp eszköz
-	nevével.
-
+      Itt a
+	/dev/dsp1.0
+	nevet ne felejtsük el kicserélni a
+	rendszerünkben található
+	dsp eszköz nevével.
     
 
     

==== //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/ports/chapter.sgml#10 (text+ko) ====

@@ -7,7 +7,7 @@
 
 
 

==== //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/x11/chapter.sgml#8 (text+ko) ====

@@ -7,7 +7,7 @@
 
 
 
@@ -591,12 +591,32 @@
       Amennyiben ez nem mûködne, vagy az
 	alapértelmezések nem felelnek meg
 	számunkra, az X11 kézzel is
-	beállítható.  Az X11
-	beállítása egy többlépcsõs
-	folyamat.  Elsõ lépésünk egy alap
-	konfigurációs állomány
-	összeállítása lesz.
-	Rendszeradminisztrátorként adjuk ki az
+	beállítható.
+
+      
+	A különbözõ munkakörnyezetek,
+	  mint például a GNOME, a
+	  KDE vagy éppen az
+	  XFce általában
+	  tartalmaznak olyan segédprogramokat, amelyekkel a
+	  felhasználó könnyedén be tudja
+	  állítani a megjelenítés
+	  paramétereit, többek közt a
+	  képernyõ felbontását.  Tehát
+	  ha az alapértelmezések nem megfelelõek,
+	  viszont használni akarunk majd valamilyen
+	  munkakörnyezetet is, akkor egyszerûen csak
+	  telepítsük az adott környezetet és a
+	  hozzátartozó eszközön keresztül
+	  állítsuk be a
+	  megjelenítést.
+      
+
+      Az X11 beállítása egy
+	többlépcsõs folyamat.  Elsõ
+	lépésünk egy alap konfigurációs
+	állomány összeállítása
+	lesz.  Rendszeradminisztrátorként adjuk ki az
 	alábbi parancsot:
 
       &prompt.root; Xorg -configure

From owner-p4-projects@FreeBSD.ORG  Wed Oct 29 18:08:14 2008
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id F15731065677; Wed, 29 Oct 2008 18:08:13 +0000 (UTC)
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id B4A0C1065673
	for ; Wed, 29 Oct 2008 18:08:13 +0000 (UTC)
	(envelope-from pgj@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id A5B9B8FC1D
	for ; Wed, 29 Oct 2008 18:08:13 +0000 (UTC)
	(envelope-from pgj@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id m9TI8DLw071594
	for ; Wed, 29 Oct 2008 18:08:13 GMT
	(envelope-from pgj@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m9TI8DXh071592
	for perforce@freebsd.org; Wed, 29 Oct 2008 18:08:13 GMT
	(envelope-from pgj@FreeBSD.org)
Date: Wed, 29 Oct 2008 18:08:13 GMT
Message-Id: <200810291808.m9TI8DXh071592@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	pgj@FreeBSD.org using -f
From: Gabor Pali 
To: Perforce Change Reviews 
Cc: 
Subject: PERFORCE change 152157 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, 29 Oct 2008 18:08:14 -0000

http://perforce.freebsd.org/chv.cgi?CH=152157

Change 152157 by pgj@kolbasz on 2008/10/29 18:08:00

	IFC

Affected files ...

.. //depot/projects/docproj_hu/src/release/doc/en_US.ISO8859-1/hardware/article.sgml#6 integrate
.. //depot/projects/docproj_hu/src_7/release/doc/en_US.ISO8859-1/hardware/article.sgml#2 integrate
.. //depot/projects/docproj_hu/www/en/donations/wantlist.sgml#6 integrate
.. //depot/projects/docproj_hu/www/share/sgml/commercial.consult.xml#8 integrate
.. //depot/projects/docproj_hu/www/share/sgml/commercial.isp.xml#7 integrate
.. //depot/projects/docproj_hu/www/share/sgml/events.xml#7 integrate
.. //depot/projects/docproj_hu/www/share/sgml/news.xml#24 integrate
.. //depot/projects/docproj_hu/www/share/sgml/release.ent#4 integrate

Differences ...

==== //depot/projects/docproj_hu/src/release/doc/en_US.ISO8859-1/hardware/article.sgml#6 (text+ko) ====

@@ -17,7 +17,7 @@
 
     The &os; Documentation Project
 
-    $FreeBSD: src/release/doc/en_US.ISO8859-1/hardware/article.sgml,v 1.340 2008/10/13 21:02:19 brueffer Exp $
+    $FreeBSD: src/release/doc/en_US.ISO8859-1/hardware/article.sgml,v 1.341 2008/10/23 10:38:04 marck Exp $
 
     
       2000
@@ -90,7 +90,7 @@
 	
 
 	
-	  &intel; 64-bit &xeon; (Nacona).  This
+	  &intel; 64-bit &xeon; (Nocona).  This
 	    processor is fabricated on 90nm process technology, and
 	    operates with 2.80 to 3.60 GHz (FSB 800MHz) and &intel;
 	    E7520/E7525/E7320 chipsets.

==== //depot/projects/docproj_hu/src_7/release/doc/en_US.ISO8859-1/hardware/article.sgml#2 (text+ko) ====

@@ -18,7 +18,7 @@
 
   The &os; Documentation Project
 
-  $FreeBSD: src/release/doc/en_US.ISO8859-1/hardware/article.sgml,v 1.326.2.2 2008/02/03 16:26:17 brueffer Exp $
+  $FreeBSD: src/release/doc/en_US.ISO8859-1/hardware/article.sgml,v 1.326.2.3 2008/10/26 22:56:17 marck Exp $
 
   
     2000
@@ -91,7 +91,7 @@
     
 
     
-      &intel; 64-bit &xeon; (Nacona).
+      &intel; 64-bit &xeon; (Nocona).
 	This processor is fabricated on 90nm process technology, and operates
 	with 2.80 to 3.60 GHz (FSB 800MHz) and &intel; E7520/E7525/E7320 chipsets.
     

==== //depot/projects/docproj_hu/www/en/donations/wantlist.sgml#6 (text+ko) ====

@@ -1,6 +1,6 @@
 
-
+
 
 
 
@@ -51,6 +51,14 @@
       
 
       
+        brueffer
+	Germany
+	IBM 14.1" SGXA+ notebook display
+	Replacement for the faulty display on my notebook
+	  (IBM Thinkpad T41p).
+      
+
+      
 	cognet
 	France
 	A Zaurus, with hard disk preferably.

==== //depot/projects/docproj_hu/www/share/sgml/commercial.consult.xml#8 (text+ko) ====

@@ -1,12 +1,12 @@
 
 
-
+
 
 
   
     
-      $FreeBSD: www/share/sgml/commercial.consult.xml,v 1.54 2008/10/11 12:40:34 jkois Exp $
+      $FreeBSD: www/share/sgml/commercial.consult.xml,v 1.55 2008/10/21 07:28:34 remko Exp $
     
   
 
@@ -2938,4 +2938,15 @@
       adam@adammccarthy.co.uk
     
   
+
+  
+    PontoSI
+    http://www.pontosi.pt
+    
+      PontoSI is portuguese company based in Vila Nova de Gaia.  We are
+      specialized in FreeBSD and OpenBSD solutions and services.
+      Please visit our website at http://www.pontosi.pt or contact us
+      via email geral@pontosi.pt
+    
+  
 

==== //depot/projects/docproj_hu/www/share/sgml/commercial.isp.xml#7 (text+ko) ====

@@ -1,12 +1,12 @@
 
 
-
+
 
 
   
     
-      $FreeBSD: www/share/sgml/commercial.isp.xml,v 1.37 2008/10/18 16:55:21 erwin Exp $
+      $FreeBSD: www/share/sgml/commercial.isp.xml,v 1.38 2008/10/22 19:52:02 jkois Exp $
     
   
 
@@ -861,6 +861,17 @@
     
   
 
+  
+    KwShell Internet Services
+    http://www.kwshell.com
+    
+      KwShell Internet Services is an Arabic based company, which
+      provides hosting solutions like shared and dedicated Servers.
+      KwShell Internet Services is also able to provide management and
+      support for a variety of BSD and Linux systems.
+    
+  
+
   
     RootBSD
     http://www.rootbsd.net

==== //depot/projects/docproj_hu/www/share/sgml/events.xml#7 (text+ko) ====

@@ -10,10 +10,34 @@
 
   
     
-      $FreeBSD: www/share/sgml/events.xml,v 1.57 2008/09/05 01:00:56 murray Exp $
+      $FreeBSD: www/share/sgml/events.xml,v 1.58 2008/10/21 12:41:23 rwatson Exp $
     
   
 
+  
+    EuroBSDCon 2009
+    http://2009.eurobsdcon.org/
+    
+      2009
+      9
+      17
+    
+    
+      2009
+      9
+      19
+    
+    
+      UK
+      Cambridge
+      Universe of Cambridge
+    
+
+    The ninth annual European BSD Confernece will take place
+      in Cambridge, England in September, 2009, and include a technical
+      track, tutorials, and FreeBSD developer summit.
+  
+
   
     MeetBSD California 2008
     http://meetbsd.com/

==== //depot/projects/docproj_hu/www/share/sgml/news.xml#24 (text+ko) ====

@@ -25,7 +25,7 @@
 
   
     
-      $FreeBSD: www/share/sgml/news.xml,v 1.202 2008/10/12 09:36:46 blackend Exp $
+      $FreeBSD: www/share/sgml/news.xml,v 1.203 2008/10/23 08:48:05 danger Exp $
     
   
 
@@ -36,6 +36,18 @@
       10
 
       
+	19
+	
+	  &os; 7.1-BETA2 Available
+
+	  
The second beta release of &os; 7.1 is now available.
+	    ISO images for Tier-1 architectures can be found on most of the &os; mirror sites.

+	
+      
+
+      
 	12
 
 	

==== //depot/projects/docproj_hu/www/share/sgml/release.ent#4 (text+ko) ====

@@ -1,4 +1,4 @@
-
+
 
 
 
 
 
 
 
 
 
 
 
 
+     %SOURCE%	en/copyrigth/freebsd-license.sgml
+     %SRCID%	1.20
+-->
 
 
 &header;
 
-    
Copyright 1994-2006
-      FreeBSD, Inc.
-      All rights reserved.
+    
Copyright 1994-2008
+      El Proyecto &os;
+      Todos los derechos reservados.
 
     
La redistribución y uso en forma de código fuente o
-      binario, con o sín modicaciones, están permitidas
-      siempre y cuando sean conocidas las siguientes condiciones:
+      binario, con o sin modicaciones, están permitidas
+      si se coinciden las siguientes condiciones:

 
     
    
-      
  1. La redistribución del código fuente debe contener
-        el texto arriba indicado, esta lista de condiciones y el
-        siguiente texto.
+      
  2. La redistribución del código fuente tiene que mantener
+        el texto antedicho indicado, esta lista de condiciones y el
+        siguiente texto.
    3. 
 
-      
  3. La redistribución en formato binario debe contener el
-        texto arriba indicado. esta lista de codiciones y el siguiente
+      
  4. La redistribución en formato binario tiene que contener el
+        copyright antedicho indicado, esta lista de codiciones y el siguiente
         texto en la documentación y/o en otros materiales que
-        acompañen a la distribución.
+        acompañen a la distribución.
    5. 
     

 
     
THIS SOFTWARE IS PROVIDED BY THE FREEBSD PROJECT
       ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING,
       BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
       MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-      DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS
+      DISCLAIMED.  IN NO EVENT SHALL THE FREEBSD PROJECT OR CONTRIBUTORS
       BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
       EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
       LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
@@ -44,37 +46,12 @@
       CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
       OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
       SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
-      DAMAGE.
+      DAMAGE.

 
-  
Manuales

-
-  
Algunos de los manuales de FreeBSD contienen textos de la
-    specificación IEEE Std 1003.1, 2004 Edition, Standard for
-    Information Technology -- Portable Operating System Interface
-    (POSIX®).  Estos exigen las condiciones siguientes:

-
-  

-    
Institute of Electrical and Electronics Engineers y Open Group nos
-      han permitido, que utilizemos unos partes de su documentación.

-
-    
En la sigieunte declaración, el término "este texto" se
-      refiere a partes de la dicumentación del sistema.

-
-    
Partes de este texto son reimpreso y reproducido en forma
-      eléctrico en los manuales de FreeBSD, de IEEE Std
-      1003.1, 2004 Edition, Standard for Information Technology --
-      Portable Operating System Interface (POSIX), The Open Group Base
-      Specifications Issue 6, Copyright (C) 2001-2004 de Institute
-      of Electrical and Electronics Engineers, Inc y The Open
-      Group.  En el caso de divergencia entre esta versión y la
-      versión original de la specificación de IEEE y The Open
-      Group, lo original es la versión normativa.  La
-      specificación original se encuentra en líne sobre http://www.opengroup.org/unix/online.html.

-
-    
Este noticia se aparecerá en cualquier producto, que contiene
-      esta material.

-  

+    
Los aspectos y conclusiones contenidos por el software y la
+      documentación pertenecen al autor y no se deben
+      interpretar como representantes de política
+      oficial, o expresada o supuesta, del Proyecto &os;.

 
   Inicio del Copyright
 

==== //depot/projects/docproj_es/www/es/docproj/current.sgml#2 (text+ko) ====

@@ -6,7 +6,9 @@
 ]>
 
 
+     %SOURCE%	en/docproj/current.sgml
+     %SRCID%	1.89
+-->
 
 
     &header;
@@ -26,7 +28,6 @@
      
  • Informes de problemas abiertos sobre la
        documentació
    • 
      
  • Enviar presentaciones
    • 
-     
  • FreeBSD para usuarios de Linux
    • 
      
  • Escribir una sección del Handbook y/o
        las FAQ
    • 
      
  • Escribir nuevos documentos
    • 
@@ -117,17 +118,6 @@
       ya que las hojas de estilo XSL-FO generan presentaciones
       muy espartanas.
    
 
-    
-    
    FreeBSD para usuarios de Linux
    
-
-    
    Responsable: FreeBSD-doc  <FreeBSD-doc@FreeBSD.org>
    
-
-    
    Sinopsis: Los usuarios de FreeBSD provenientes de Linux
-      pueden confundirse gracias a algunas de las diferencias que hay
-      entre los dos sistemas (diferente shell por omisión, el
-      funcionamiento de la configuración del arranque, etc).
    
-
     
     
    Escribir una sección en las FAQ y/o Handbook
    
 

==== //depot/projects/docproj_es/www/es/index.xsl#4 (text+ko) ====

@@ -5,7 +5,9 @@
 ]>
 
 
+     %SOURCE%	en/index.xsl
+     %SRCID%	1.163
+-->
 
 
   
@@ -303,7 +305,7 @@
 			 
 
 			
    
-			
    AVISOS SOBRE ERRORES
    
+			
    FE DE ERRATAS
    
 			
    
 
 			
@@ -311,6 +313,17 @@
 				
 			
 
+			  
    
+			    	
      
+				  
    • 
+				    Más
+				  
      • 
+				  
    • 
+				    Fuente RSS de fe de erratas
+				  
      • 
+				
    
+			  
     
+
 			
     
 
 		    

==== //depot/projects/docproj_es/www/es/platforms/alpha.sgml#2 (text+ko) ====

@@ -7,13 +7,19 @@
 ]>
 
 
+     %SOURCE%	en/platforms/alpha.sgml
+     %SRCID%	1.7
+-->
 
 
   &header;
 
   
    Esta página contiene información acerca
-    de FreeBSD en los sistemas HP/Compaq Alpha.
    
+    de FreeBSD en los sistemas HP/Compaq Alpha.  Discusiones
+    de esta plataforma ocurren en la lista de distribuciones
+    freebsd-alpha.
    
+
+  
    Estado
    
 
   
    Note: A partir de FreeBSD 7.0 se dejará de dar
     soporte a la plataforma Alpha.  El fabricante ha dejado de
@@ -31,10 +37,9 @@
 
   
    Enlaces específicos de FreeBSD/alpha
    
 
-  
+    
    Para suscribirse a la lista envíe un correo a 
+      o visite la interfaz de mailman.
    
 
   
    Otros enlaces de interés
    
 

From owner-p4-projects@FreeBSD.ORG  Fri Oct 31 13:15:30 2008
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 7C3FB1065678; Fri, 31 Oct 2008 13:15:30 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 3F2451065673
	for ; Fri, 31 Oct 2008 13:15:30 +0000 (UTC)
	(envelope-from gabor@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id EB6A58FC35
	for ; Fri, 31 Oct 2008 13:15:29 +0000 (UTC)
	(envelope-from gabor@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id m9VDFTt0048973
	for ; Fri, 31 Oct 2008 13:15:29 GMT
	(envelope-from gabor@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m9VDFTav048971
	for perforce@freebsd.org; Fri, 31 Oct 2008 13:15:29 GMT
	(envelope-from gabor@freebsd.org)
Date: Fri, 31 Oct 2008 13:15:29 GMT
Message-Id: <200810311315.m9VDFTav048971@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 152265 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, 31 Oct 2008 13:15:30 -0000

http://perforce.freebsd.org/chv.cgi?CH=152265

Change 152265 by gabor@gabor_server on 2008/10/31 13:15:26

	Submit partial translation.

Affected files ...

.. //depot/projects/docproj_es/src/release/doc/es_ES.ISO8859-1/readme/article.sgml#7 edit

Differences ...

==== //depot/projects/docproj_es/src/release/doc/es_ES.ISO8859-1/readme/article.sgml#7 (text+ko) ====

@@ -220,54 +220,55 @@
     
       Email y listas de distribución
 
-      En case de cuestiones o problemas técnicos generales,
+      En caso de cuestiones o problemas técnicos generales,
 	por favor envíe un correo a &a.questions;.
 
-      If you're tracking the &release.branch; development efforts, you
-	must join the &a.current;, in order to
-	keep abreast of recent developments and changes that may
-	affect the way you use and maintain the system.
+      Si sigue los acontecimientos de desarrollo de &release.branch;,
+	debe suscribirse a &a.current; para enterarse
+	de las mejoras y cambios que pueden afectar el modo de que
+	usa y mantiene el sistema.
 
-      Being a largely-volunteer effort, the &os;
-	Project is always happy to have extra hands willing to help—there are already far more desired enhancements than
-	there is time to implement them.  To contact the developers on
-	technical matters, or with offers of help, please send mail to
-	the &a.hackers;.
+      Siendo un proyecto voluntario, el Proyecto &os; siempre
+	se alegra de los esfuerzos extra de ayuda—ya hay más
+	funciones deseadas que tiempo para implementarlas.  Para ponerse en
+	contacto con los desarrolladores sobre cuestiones técnicos
+	o para ofrecerles su ayuda, por favor envíe un email a la
+	lista &a.hackers;.
 
-      Please note that these mailing lists can experience
-	significant amounts of traffic.  If you
-	have slow or expensive mail access, or are only interested in
-	keeping up with major &os; events, you may find it
-	preferable to subscribe instead to the &a.announce;.
+      Por favor, tenga en cuenta que estas listas de correo se
+	cargarán con un tráfico significativo.
+	Si tiene un accesso lento o caro a sus correos o sólo
+	está interesado en los acontecimientos principales de &os;,
+	puede que prefiera suscribirse sólo a &a.announce;.
 
-      All of the mailing lists can be freely joined by anyone
-	wishing to do so.  Visit the 
-	&os; Mailman Info Page.  This will give you more
-	information on joining the various lists, accessing archives,
-	etc.  There are a number of mailing lists targeted at special
-	interest groups not mentioned here; more information can be
-	obtained either from the Mailman pages or the mailing
-	lists section of the &os; Web site.
+      Se puede suscribir a cada lista de distribuciones libremente.
+	Eche un vistazo a la 
+	página de informaciones de Mailman de &os;.  La dicha
+	le dará más informació cómo suscribirse
+	a las diversas listas, cómo usar los archivos, etc.  Hay
+	numerosas listas para equipos especiales que no están
+	nombradas aquí; se encuentra más información sobre
+	ello en la página de Mailman o en la sección de listas
+	  de correo en la página de web de &os;.
 
       
-	Do not send email to the lists
-	  asking to be subscribed.  Use the Mailman interface
-	  instead.
+	No env&eacite;e correos a la listas pidiendo
+	  ser suscrito.  En vez de eso, use la interfaz de Mailman.
       
     
 
     
-      Submitting Problem Reports
+      Enviar informes de problemas
 
-      Suggestions, bug reports and contributions of code are
-	always valued—please do not hesitate to report any
-	problems you may find.  Bug reports with attached fixes are of
-	course even more welcome.
+      Sugerencias, informes de fallos y contribuciones de código
+	están siempre deseados—por favor no tarde en enviar
+	qualquier problema que haya encontrado.  Informes con mejoras
+	están incluso más apreciados.
 
-      The preferred method to submit bug reports from a machine
-	with Internet mail connectivity is to use the &man.send-pr.1;
-	command.
+      El método preferido de enviar informes de una máquina
+	con conexión de correos de Internet es usar el mando
+	&man.send-pr.1;.
 	Problem Reports (PRs) submitted in this way
 	will be filed and their progress tracked; the &os; developers
 	will do their best to respond to all reported bugs as soon as
@@ -277,77 +278,81 @@
 	this list is useful to see what potential problems other users
 	have encountered.
 
-      Note that &man.send-pr.1; itself is a shell script that
-	should be easy to move even onto a non-&os; system.  Using
-	this interface is highly preferred.  If, for some reason, you
-	are unable to use &man.send-pr.1; to submit a bug report, you
-	can try to send it to the &a.bugs;.
+      Tenga en cuenta que &man.send-pr.1; mismo es un shell script que
+	será fácil de transferir incluso a sistemas que no
+	son de &os;.  Usar esta interfaz eastá especialmente
+	preferido.  Si por alguna razón no está capaz de usar
+	&man.send-pr.1; para enviar informes, puede intentar enviarlo a
+	&a.bugs;.
 
-      For more information, Writing
-	&os; Problem Reports, available on the &os; Web
-	site, has a number of helpful hints on writing and submitting
-	effective problem reports.
+      Véase Cómo enviar
+	  informes de problemas &os; para conseguir
+	má información, que está disponibe en la
+	página de web de &os; y tiene muchos consejos útiles
+	sobre escribir y enviar informes eficaces.
     
   
 
   
-    Further Reading
+    Otros recursos de lectura
 
-    There are many sources of information about &os;; some are
-      included with this distribution, while others are available
-      on-line or in print versions.
+    Hay varias fuentes de información sobre &os;.  Unas
+      están incluidas en esta disribución, mientras
+      otras están disponibles en línea o en formatos
+      para imprimir.
 
     
-      Release Documentation
+      Documentación de la release
 
-      A number of other files provide more specific information
-	about this &release.type; distribution.  These files are
-	provided in various formats.  Most distributions will include
-	both ASCII text (.TXT) and HTML
-	(.HTM) renditions.  Some distributions
-	may also include other formats such as Portable Document Format
-	(.PDF).
+      Numerosos ficheros ofrece informaci&oacue;n más
+	específica sobre esta ditribución &release.type;.
+	Éstes están disponibles en varios formatos.
+	La mayoría de las distribuciones incluye ambos formatos de
+	texto pleno ASCII (.TXT) y HTML
+	(.HTM).  Otras distribuciones pueden
+	incluir otros formatos, como por ejemplo
+	Portable Document Format (.PDF).
 
 	
 	  
-	    README.TXT: This file, which
-	      gives some general information about &os; as well as
-	      some cursory notes about obtaining a
-	      distribution.
+	    README.TXT: Este fichero informa
+	      sobre cuestiones generales de &os; y breves consejos sobre
+	      conseguir una distribución.
 	  
 
 	  
-	    RELNOTES.TXT: The release
-	      notes, showing what's new and different in &os;
-	      &release.current; compared to the previous release (&os;
+	    RELNOTES.TXT: Las noticias de la
+	      release, explicando las novedades y los cambios en &os;
+	      &release.current; comparado a la release anterior (&os;
 	      &release.prev;).
 	  
 
 	  
-	    HARDWARE.TXT: The hardware
-	      compatibility list, showing devices with which &os; has
-	      been tested and is known to work.
+	    HARDWARE.TXT: La lista de hardware
+	      compatibles, nombrando los herramientos con los que
+	      funciona &os; según las comprobaciones.
 	  
 
 	  
-	    ERRATA.TXT: Release errata.
-	      Late-breaking, post-release information can be found in
-	      this file, which is principally applicable to releases
-	      (as opposed to snapshots).  It is important to consult
-	      this file before installing a release of &os;, as it
-	      contains the latest information on problems which have
-	      been found and fixed since the release was
-	      created.
+	    ERRATA.TXT: Fe de erratas.
+	      Este fichero contiene Información; reciente,
+	      posterior a la release que se aplica a las releases
+	      (en cambio de las intantáneas).  Es importante
+	      consultar con este fichero antes de instalar &os;,
+	      porque el dicho contiene la información; más
+	      actual sobre problemas que se han encontrado y corregido
+	      desde que se sacó la release.
 	  
 	
       
 
-      On platforms that support &man.sysinstall.8; (currently
-	&arch.amd64;, &arch.i386;, &arch.ia64;, &arch.pc98;, and &arch.sparc64;), these documents are generally available via the
-	Documentation menu during installation.  Once the system is
-	installed, you can revisit this menu by re-running the
-	&man.sysinstall.8; utility.
+      En otras plataformas, que tienen soporte de &man.sysinstall.8; (ahora
+	&arch.amd64;, &arch.i386;, &arch.ia64;, &arch.pc98; y &arch.sparc64;),
+	estos documentos normalmente están disponibles on el menú
+	Documentation durante la instalación.  A partir
+	de que el sistema esté instalado, este menú se puede
+	revisitar ejecutando la herramienta &man.sysinstall.8;.
 
       
 	It is extremely important to read the errata for any
@@ -365,7 +370,7 @@
     
 
     
-      Manual Pages
+      Manuales
 
       As with almost all &unix; like operating systems, &os; comes
 	with a set of on-line manual pages, accessed through the
@@ -383,7 +388,7 @@
     
 
     
-      Books and Articles
+      Libros y Artículos
 
       Two highly-useful collections of &os;-related information,
 	maintained by the &os; Project,
@@ -409,31 +414,30 @@
         Documentation Page or in the doc
         distribution set.
 
-      A listing of other books and documents about &os; can be
-        found in the bibliography
-        of the &os; Handbook.  Because of &os;'s strong &unix; heritage,
-        many other articles and books written for &unix; systems are
-        applicable as well, some of which are also listed in the
-        bibliography.
+      Una lista de otros libros y documentos sobre &os; se encuentra
+        en la bibliografía
+        del Handbook de &os;.  Por la herencia significative de &unix; en
+	&os;, muchos de otros artículos y libros escritos para sistemas
+	&unix; se pueden utilizar y algunos de ellos tamén están
+	enumerados en la bibliografía.
     
   
 
   
-    Acknowledgments
+    Agradecimientos
 
-    &os; represents the cumulative work of many hundreds, if not
-      thousands, of individuals from around the world who have worked
-      countless hours to bring about this &release.type;.  For a
-      complete list of &os; developers and contributors, please see
-      Contributors
-      to &os; on the &os; Web site or any of its
-      mirrors.
+    &os; representa el trabajo acumulado de cientos si no miles de
+      individuales del mundo entero que han trabajado horas incontables
+      para conseguir esta &release.type;.  Para una lista complete de
+      desarrolladores y contribuidores de &os;, véase Contribuidores de &os;
+      en la página de web de &os; o en qualquier servidor
+      espejo.
 
-    Special thanks also go to the many thousands of &os; users
-      and testers all over the world, without whom this &release.type;
-      simply would not have been possible.
+    Dedicamos agradecimientos especiales a los miles de usuarios y
+      probadores de &os; por el mundo entero sin los que esta &release.type;
+      no se habría sacado.
   
 
 

From owner-p4-projects@FreeBSD.ORG  Fri Oct 31 13:18:33 2008
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id A1CAD1065688; Fri, 31 Oct 2008 13:18:33 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 6391D1065677
	for ; Fri, 31 Oct 2008 13:18:33 +0000 (UTC)
	(envelope-from gabor@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 4E65F8FC0A
	for ; Fri, 31 Oct 2008 13:18:33 +0000 (UTC)
	(envelope-from gabor@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id m9VDIXlk049191
	for ; Fri, 31 Oct 2008 13:18:33 GMT
	(envelope-from gabor@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m9VDIXZn049189
	for perforce@freebsd.org; Fri, 31 Oct 2008 13:18:33 GMT
	(envelope-from gabor@freebsd.org)
Date: Fri, 31 Oct 2008 13:18:33 GMT
Message-Id: <200810311318.m9VDIXZn049189@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 152267 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, 31 Oct 2008 13:18:33 -0000

http://perforce.freebsd.org/chv.cgi?CH=152267

Change 152267 by gabor@gabor_server on 2008/10/31 13:17:51

	IFC

Affected files ...

.. //depot/projects/docproj_es/doc/en_US.ISO8859-1/share/sgml/authors.ent#5 integrate
.. //depot/projects/docproj_es/doc/en_US.ISO8859-1/share/sgml/glossary/freebsd-glossary.sgml#4 integrate
.. //depot/projects/docproj_es/doc/en_US.ISO8859-1/share/sgml/mailing-lists.ent#4 integrate
.. //depot/projects/docproj_es/doc/share/images/articles/releng/branches-releng6.pic#2 integrate
.. //depot/projects/docproj_es/doc/share/images/articles/releng/branches-releng7.pic#1 branch
.. //depot/projects/docproj_es/doc/share/pgpkeys/des.key#2 integrate
.. //depot/projects/docproj_es/doc/share/pgpkeys/jpaetzel.key#1 branch
.. //depot/projects/docproj_es/doc/share/pgpkeys/lippe.key#2 integrate
.. //depot/projects/docproj_es/doc/share/pgpkeys/makc.key#1 branch
.. //depot/projects/docproj_es/doc/share/pgpkeys/matteo.key#2 integrate
.. //depot/projects/docproj_es/doc/share/pgpkeys/pgpkeys-developers.sgml#5 integrate
.. //depot/projects/docproj_es/doc/share/pgpkeys/pgpkeys.ent#5 integrate
.. //depot/projects/docproj_es/doc/share/pgpkeys/yar.key#1 branch
.. //depot/projects/docproj_es/doc/share/sgml/freebsd.ent#2 integrate
.. //depot/projects/docproj_es/doc/share/sgml/man-refs.ent#5 integrate
.. //depot/projects/docproj_es/doc/share/sgml/mirrors.xml#4 integrate
.. //depot/projects/docproj_es/src/release/doc/en_US.ISO8859-1/hardware/article.sgml#3 integrate
.. //depot/projects/docproj_es/src/release/doc/en_US.ISO8859-1/relnotes/article.sgml#4 integrate
.. //depot/projects/docproj_es/src/release/doc/share/misc/dev.archlist.txt#2 integrate
.. //depot/projects/docproj_es/src/release/doc/share/misc/man2hwnotes.pl#2 integrate
.. //depot/projects/docproj_es/src_7/release/doc/en_US.ISO8859-1/errata/article.sgml#2 integrate
.. //depot/projects/docproj_es/src_7/release/doc/en_US.ISO8859-1/hardware/article.sgml#2 integrate
.. //depot/projects/docproj_es/src_7/release/doc/en_US.ISO8859-1/relnotes/article.sgml#2 integrate
.. //depot/projects/docproj_es/www/en/administration.sgml#3 integrate
.. //depot/projects/docproj_es/www/en/cgi/cgi-style.pl#2 integrate
.. //depot/projects/docproj_es/www/en/cgi/cvsweb.cgi#2 integrate
.. //depot/projects/docproj_es/www/en/cgi/getmsg.cgi#2 integrate
.. //depot/projects/docproj_es/www/en/cgi/man.cgi#6 integrate
.. //depot/projects/docproj_es/www/en/cgi/mid.cgi#2 integrate
.. //depot/projects/docproj_es/www/en/cgi/ports.cgi#2 integrate
.. //depot/projects/docproj_es/www/en/cgi/query-pr.cgi#2 integrate
.. //depot/projects/docproj_es/www/en/developers.sgml#5 integrate
.. //depot/projects/docproj_es/www/en/docproj/translations.sgml#5 integrate
.. //depot/projects/docproj_es/www/en/docproj/who.sgml#2 integrate
.. //depot/projects/docproj_es/www/en/docs/webresources.sgml#2 integrate
.. //depot/projects/docproj_es/www/en/donations/donors.sgml#4 integrate
.. //depot/projects/docproj_es/www/en/donations/index.sgml#2 integrate
.. //depot/projects/docproj_es/www/en/donations/wantlist.sgml#3 integrate
.. //depot/projects/docproj_es/www/en/gnome/docs/example-Makefile.sgml#2 integrate
.. //depot/projects/docproj_es/www/en/gnome/docs/faq2.sgml#3 integrate
.. //depot/projects/docproj_es/www/en/gnome/docs/gnome2_porting.sgml#2 integrate
.. //depot/projects/docproj_es/www/en/gnome/docs/gnome_porting.sgml#2 integrate
.. //depot/projects/docproj_es/www/en/gnome/docs/porting.sgml#2 integrate
.. //depot/projects/docproj_es/www/en/internal/about.sgml#3 integrate
.. //depot/projects/docproj_es/www/en/internal/developer.sgml#2 integrate
.. //depot/projects/docproj_es/www/en/internal/internal.sgml#2 integrate
.. //depot/projects/docproj_es/www/en/internal/ssh-keys.asc#2 integrate
.. //depot/projects/docproj_es/www/en/java/dists/index.sgml#2 integrate
.. //depot/projects/docproj_es/www/en/java/docs/newbies.sgml#2 integrate
.. //depot/projects/docproj_es/www/en/java/index.sgml#2 integrate
.. //depot/projects/docproj_es/www/en/java/news.xml#2 integrate
.. //depot/projects/docproj_es/www/en/multimedia/multimedia-input.xml#3 integrate
.. //depot/projects/docproj_es/www/en/news/status/Makefile#3 integrate
.. //depot/projects/docproj_es/www/en/news/status/report-2004-07-2004-12.xml#2 integrate
.. //depot/projects/docproj_es/www/en/news/status/report-2005-01-2005-03.xml#2 integrate
.. //depot/projects/docproj_es/www/en/news/status/report-2005-03-2005-06.xml#2 integrate
.. //depot/projects/docproj_es/www/en/news/status/report-2005-10-2005-12.xml#2 integrate
.. //depot/projects/docproj_es/www/en/news/status/report-2006-01-2006-03.xml#2 integrate
.. //depot/projects/docproj_es/www/en/news/status/report-2006-04-2006-06.xml#2 integrate
.. //depot/projects/docproj_es/www/en/news/status/report-2006-06-2006-10.xml#2 integrate
.. //depot/projects/docproj_es/www/en/news/status/report-2006-10-2006-12.xml#2 integrate
.. //depot/projects/docproj_es/www/en/news/status/report-2007-01-2007-03.xml#2 integrate
.. //depot/projects/docproj_es/www/en/news/status/report-2007-04-2007-06.xml#2 integrate
.. //depot/projects/docproj_es/www/en/news/status/report-2008-04-2008-06.xml#1 branch
.. //depot/projects/docproj_es/www/en/news/status/status.sgml#3 integrate
.. //depot/projects/docproj_es/www/en/platforms/amd64.sgml#3 integrate
.. //depot/projects/docproj_es/www/en/platforms/amd64/motherboards.sgml#3 integrate
.. //depot/projects/docproj_es/www/en/projects/summerofcode-2008.sgml#3 integrate
.. //depot/projects/docproj_es/www/en/projects/summerofcode.xsl#2 integrate
.. //depot/projects/docproj_es/www/en/releases/6.3R/errata.html#2 integrate
.. //depot/projects/docproj_es/www/en/releases/6.4R/Makefile#1 branch
.. //depot/projects/docproj_es/www/en/releases/6.4R/docbook.css#1 branch
.. //depot/projects/docproj_es/www/en/releases/6.4R/schedule.sgml#1 branch
.. //depot/projects/docproj_es/www/en/releases/7.0R/errata.html#2 integrate
.. //depot/projects/docproj_es/www/en/releases/7.1R/Makefile#1 branch
.. //depot/projects/docproj_es/www/en/releases/7.1R/docbook.css#1 branch
.. //depot/projects/docproj_es/www/en/releases/7.1R/schedule.sgml#1 branch
.. //depot/projects/docproj_es/www/en/releases/Makefile#2 integrate
.. //depot/projects/docproj_es/www/en/releng/index.sgml#3 integrate
.. //depot/projects/docproj_es/www/en/relnotes.sgml#2 integrate
.. //depot/projects/docproj_es/www/en/relnotes/Makefile#2 integrate
.. //depot/projects/docproj_es/www/en/search/Makefile#2 integrate
.. //depot/projects/docproj_es/www/en/search/Makefile.inc#1 branch
.. //depot/projects/docproj_es/www/en/search/opensearch/Makefile#1 branch
.. //depot/projects/docproj_es/www/en/search/opensearch/cvsweb.xml#1 branch
.. //depot/projects/docproj_es/www/en/search/opensearch/man.xml#1 branch
.. //depot/projects/docproj_es/www/en/search/opensearch/markmail.xml#1 branch
.. //depot/projects/docproj_es/www/en/search/opensearch/message-id.xml#1 branch
.. //depot/projects/docproj_es/www/en/search/opensearch/opensearch.js#1 branch
.. //depot/projects/docproj_es/www/en/search/opensearch/opensearch.sgml#1 branch
.. //depot/projects/docproj_es/www/en/search/opensearch/ports.xml#1 branch
.. //depot/projects/docproj_es/www/en/search/opensearch/query-pr.xml#1 branch
.. //depot/projects/docproj_es/www/en/search/opensearch/rambler.xml#1 branch
.. //depot/projects/docproj_es/www/en/search/opensearch/web-all.xml#1 branch
.. //depot/projects/docproj_es/www/en/search/opensearch/web.xml#1 branch
.. //depot/projects/docproj_es/www/en/search/search.sgml#4 integrate
.. //depot/projects/docproj_es/www/en/search/web.atoz#2 integrate
.. //depot/projects/docproj_es/www/en/security/security.sgml#3 integrate
.. //depot/projects/docproj_es/www/en/smp/index.sgml#2 integrate
.. //depot/projects/docproj_es/www/en/where.sgml#2 integrate
.. //depot/projects/docproj_es/www/share/sgml/advisories.xml#3 integrate
.. //depot/projects/docproj_es/www/share/sgml/commercial.consult.xml#5 integrate
.. //depot/projects/docproj_es/www/share/sgml/commercial.hardware.xml#2 integrate
.. //depot/projects/docproj_es/www/share/sgml/commercial.isp.xml#4 integrate
.. //depot/projects/docproj_es/www/share/sgml/events.xml#5 integrate
.. //depot/projects/docproj_es/www/share/sgml/news.xml#6 integrate
.. //depot/projects/docproj_es/www/share/sgml/press.xml#4 integrate
.. //depot/projects/docproj_es/www/share/sgml/release.ent#2 integrate
.. //depot/projects/docproj_es/www/share/sgml/usergroups.xml#4 integrate

Differences ...

==== //depot/projects/docproj_es/doc/en_US.ISO8859-1/share/sgml/authors.ent#5 (text+ko) ====

@@ -13,7 +13,7 @@
                  builds for the other languages, and we will poke fun of you
                  in public.
 
-     $FreeBSD: doc/en_US.ISO8859-1/share/sgml/authors.ent,v 1.459 2008/08/09 19:21:39 sbruno Exp $
+     $FreeBSD: doc/en_US.ISO8859-1/share/sgml/authors.ent,v 1.463 2008/10/06 08:36:30 lstewart Exp $
 -->
 
 aaron@FreeBSD.org">
@@ -532,6 +532,8 @@
 
 josef@FreeBSD.org">
 
+jpaetzel@FreeBSD.org">
+
 jseger@FreeBSD.org">
 
 julian@FreeBSD.org">
@@ -622,6 +624,8 @@
 
 logo@FreeBSD.org">
 
+lstewart@FreeBSD.org">
+
 lth@FreeBSD.org">
 
 luigi@FreeBSD.org">
@@ -636,6 +640,8 @@
 
 maho@FreeBSD.org">
 
+makc@FreeBSD.org">
+
 manolis@FreeBSD.org">
 
 marcel@FreeBSD.org">
@@ -1138,5 +1144,7 @@
 
 zarzycki@FreeBSD.org">
 
+zec@FreeBSD.org">
+
 znerd@FreeBSD.org">
 

==== //depot/projects/docproj_es/doc/en_US.ISO8859-1/share/sgml/glossary/freebsd-glossary.sgml#4 (text+ko) ====

@@ -1,5 +1,5 @@
 
 
 
@@ -395,6 +395,54 @@
 FreeBSD sun4v porting mailing list">
 freebsd-sun4v">
 
+
+SVN commit messages for the entire src tree (except for user and projects)">
+svn-src-all">
+
+
+SVN commit messages for the src tree for head/-current">
+svn-src-head">
+
+
+SVN commit messages for the src projects tree">
+svn-src-projects">
+
+
+SVN commit messages for releases in the src tree">
+svn-src-release">
+
+
+SVN commit messages for the release engineering / security commits to the src tree">
+svn-src-releng">
+
+
+SVN commit messages for all the -stable branches of the src tree">
+svn-src-stable">
+
+
+SVN commit messages for only the 6-stable src tree">
+svn-src-stable-6">
+
+
+SVN commit messages for only the 7-stable src tree">
+svn-src-stable-7">
+
+
+SVN commit messages for the old stable src trees">
+svn-src-stable-other">
+
+
+SVN commit messages for the admin / configuration tree">
+svn-src-svnadmin">
+
+
+SVN commit messages for the experimental user src tree">
+svn-src-user">
+
+
+SVN commit messages for the vendor work area tree">
+svn-src-vendor">
+
 
 FreeBSD test mailing list">
 freebsd-test">
@@ -444,6 +492,10 @@
 FreeBSD X11 mailing list">
 freebsd-x11">
 
+
+FreeBSD port to Xen mailing list">
+freebsd-xen">
+
 
 
 bug-followup@FreeBSD.org">

==== //depot/projects/docproj_es/doc/share/images/articles/releng/branches-releng6.pic#2 (text+ko) ====

@@ -1,5 +1,5 @@
 .\" -*- nroff -*-
-.\" $FreeBSD: doc/share/images/articles/releng/branches-releng6.pic,v 1.4 2007/01/17 07:22:16 murray Exp $
+.\" $FreeBSD: doc/share/images/articles/releng/branches-releng6.pic,v 1.5 2008/10/05 12:41:45 hrs Exp $
 
 .PS 6
 
@@ -30,6 +30,22 @@
 	box width .9 "\s-3RELENG_6_2\s+3" dashed
 
 	line -> right from RELENG_6_2_0_RELEASE.e
+RELENG_6_3_0_RELEASE:
+	ellipse width .9 "\s-26.3-RELEASE\s+2"
+
+	line -> down from RELENG_6_3_0_RELEASE.s
+RELENG_6_3:
+	box width .9 "\s-3RELENG_6_3\s+3" dashed
+
+	line -> right from RELENG_6_3_0_RELEASE.e
+RELENG_6_4_0_RELEASE:
+	ellipse width .9 "\s-26.4-RELEASE\s+2"
+
+	line -> down from RELENG_6_4_0_RELEASE.s
+RELENG_6_4:
+	box width .9 "\s-3RELENG_6_4\s+3" dashed
+
+	line -> right from RELENG_6_4_0_RELEASE.e
 RELENG_6:box "\s-26-STABLE\s+2"
 
 .PE

==== //depot/projects/docproj_es/doc/share/pgpkeys/des.key#2 (text+ko) ====

@@ -1,12 +1,12 @@
-
+
 
 
 uid                  Dag-Erling Smørgrav 
-uid                  Dag-Erling Smørgrav 
 uid                  Dag-Erling Smørgrav 
 uid                  [jpeg image of size 3315]
 sub   2048g/920C3313 2006-11-11 [expires: 2008-11-10]
@@ -22,144 +22,193 @@
 PBq6bMcstlqRn7V4YCndXLRUxUNApg/BAiex3Jk78YUR02Fm8Yn5moKa8aYI+Kg3
 q5HbBACF/bIV/T85Jzds6ShS+OpzRXeL/v0640bdoJxjlcCvuF/zldp4ynB7mz5t
 +JDY4jBi+051uOMNGPsUbeSoc7/SXAoh3KnzO1GpX3hGzgXPg651TiJYSUx5AKvS
-h1YsRbkew6JzEdcjSRgEROYNfk1n4Vqy0t8sxxkogaEpT0dVJ7QmRGFnLUVybGlu
-ZyBTbcO4cmdyYXYgPGRlc0BmcmVlYnNkLm9yZz6IZgQTEQIAJgIbAwYLCQgHAwIE
-FQIIAwQWAgMBAh4BAheABQJFVcxYBQkDwmdqAAoJEDDUOm5k6+IginkAnAhVjjz8
-rtrJGvX072L8g5sR3dCUAJ0QjELqG42pdZuk2vAqxGUfnLthiohGBBARAgAGBQJF
-Vc56AAoJEBXWiATKbN+ycOIAoIOoNuBhwUECQ8gLCbZ0UM32KYTuAJsEFe+fTwfm
-ke3z1EyqLw6hI9kRT4hGBBARAgAGBQJFVdEHAAoJEKBP+xt9yunTmIwAn2ZYsSEN
-JuXc/RtkiyfsHd9V3r+5AKDjk6T44A8yt1rJTxAafISkWnfqz4hGBBARAgAGBQJF
-VdLFAAoJEBRll9zcw5nHLMQAn2owiwjKy9KHQPUrxdPLlu+8wzkjAKDTRxKO95jd
-q4ciRH3OytDQnNAWX4icBBABAgAGBQJFVdThAAoJEE1WKCF5BQwRljgEAIhEqAWq
-ANd9TRbaZusKCbebxj4KwryatvRFnACdf2+QdQPlMWXLFT/o0mOWLfO/ZXp5PR8q
-yh5SLS5JzBvtfqQ8CpXlu7d9gQ/huDEYIbfOHeQmURjh0xz7eNeOpo9aI873o988
-ZWY5xerzBLpI2KMOW4D8FE3+3BBRimMJ9PquiEYEEBECAAYFAkVV2iUACgkQMxEk
-bVFH3PQ6qACeMcmmhoEdyUWqJD6XFRtoWnGQAqgAmwRlgx/5K9EwGnkVfnUr5rfZ
-uEEziJwEEAECAAYFAkVV0YMACgkQH3+pCANY/L3LcgP6AqlGo3DYeCAyAoNM2rZ9
-foI9+4/601jrEmiTMZ9fCc1KQ0bs1vg3Q3iZlz1NaE08zMN6ub14tnCeWSzTMaKz
-741lm4ZxuHWnyQdEjUGqcnCSykHsyyZxl4urkWJNO/3Z+o6MT+8Cg1Q8Tsz0iSJ2
-kopIJC+1PYuIV35MR4CFhSW0IURhZy1FcmxpbmcgU23DuHJncmF2IDxkZXNAZGVz
-Lm5vPohmBBMRAgAmAhsDBgsJCAcDAgQVAggDBBYCAwECHgECF4AFAkVVzFEFCQPC
-Z2oACgkQMNQ6bmTr4iCLbwCffkTovf6eg0tYwfDzZG1K4HdeNYAAn2SOy0S1cAXj
-k4ci3x00pisEE3U8iEYEEBECAAYFAkVVzn8ACgkQFdaIBMps37Kv6wCglU9/QpZD
-u2Hj9UPHjN/0uFLHyqAAnisZb2MNvsS9KAegVN7zUpnJl3itiEYEEBECAAYFAkVV
-0REACgkQoE/7G33K6dNA5QCg8aTnAQKQVvazXOU6fdWkxIUumzcAoLyiGBpVQrYw
-nWXMccFVtVwW1sDxiEYEEBECAAYFAkVV0tUACgkQFGWX3NzDmcct5gCgw3kM7D69
-rLbMfq25L/Tz+NelmGkAoNZ23I0g7krjj4L5OKVCXZu8mtcIiJwEEAECAAYFAkVV
-1OsACgkQTVYoIXkFDBFEbAP/Sojn7y3EoAZxa/5Y6kiXUk6lx9WkZxV/8Q7pf+HK
-nMrL6skQPUSjXqYNcM88WAzLR6VGAHhM0YKG0q2cHF3xNzOXyggd60haFYD+iH/8
-3MQc09/rn2oYWtPrzXlmnPpcydmQfKHwd6e9+FIc3213KIchzE1dncNihUmjwPOs
-X6iIRgQQEQIABgUCRVXaNgAKCRAzESRtUUfc9KgUAJ4j6eaNQsKeaL6xSBWuv0xl
-i10PjwCfYKdih3+QEPKot9zYa+MfzsH38peInAQQAQIABgUCRVXRhwAKCRAff6kI
-A1j8vWCjA/9kzjUYKAIk1ZUo3v0IXS0qvFLHr40yNk0CnJPEU/DqMIarg65Y946p
-E+GZJ1gTDtnzZga44AE1wcMTQPlX81sWkTBB1osNRU66NurTHf5fPO7gehv/Euzi
-BER5FsgnnUk4HuCCbNOxsscpBjkUiYSXVoZQa+XgA5BANmW+IaFU77QkRGFnLUVy
-bGluZyBTbcO4cmdyYXYgPGRlc0BsaW5wcm8ubm8+iGYEExECACYCGwMGCwkIBwMC
-BBUCCAMEFgIDAQIeAQIXgAUCRVXMWAUJA8JnagAKCRAw1DpuZOviINXPAJwNOWfH
-J+QUI+oREvQzD/7X0x/WAgCfVO9uN1bna3u07QRB91J2QSqoRV6IRgQQEQIABgUC
-RVXOfwAKCRAV1ogEymzfsu4AAJ9KNsOzSiIbLHJyhvebODRgPiOe9ACfSVHbJWV5
-Gv6j2Ee7uMBqGDmm6VCIRgQQEQIABgUCRVXREQAKCRCgT/sbfcrp0y7FAJ0XWB/r
-gkcjG5dZUGaNFvcvBZXgeACgl8FJS3gJP3WCS4mwiQ2YE23IQySIRgQQEQIABgUC
-RVXS1QAKCRAUZZfc3MOZx8IOAKCUm2GhELKFMKQf/J0APIu3YjzmQwCg0a7UnQcw
-h5Tyqh5tsBP2dIKvVumInAQQAQIABgUCRVXU6wAKCRBNVigheQUMEdbcBACT5jwZ
-WMTZApWUXksb+Br/4AJQuyl/ioSM/QKN+ISUoL8z15u3sMyAeRtxRPzdyzM70qF/
-pil2EJ973IGONRbsgDSkxXeEnQ54NaJSgZb43WJu/PgARN5PV0Bv5lovGYW0hbMx
-MvlE8nVufXrrJnHLhp7ZMDRvfLXPf1adNBoxJIhGBBARAgAGBQJFVdo2AAoJEDMR
-JG1RR9z0MFYAnAmoO/9oTt1qNQfmEvHiMpCwC7MMAJ4/lhNKKx/5PZeIw2AGkG2V
-iiu92NHMRsxEARAAAQEAAAAAAAAAAAAAAAD/2P/gABBKRklGAAEBAQBIAEgAAP/h
-Af5FeGlmAABNTQAqAAAACAAHAQ8AAgAAAAUAAABiARAAAgAAAAcAAABoARoABQAA
-AAEAAABwARsABQAAAAEAAAB4ASgAAwAAAAEAAgAAATIAAgAAABQAAACAh2kABAAA
-AAEAAACUAAAAAFNPTlkAAERTQy1WMQAAAAABLAAAAAEAAAEsAAAAATIwMDY6MDg6
-MDkgMTI6NTI6MDcAABWCmgAFAAAAAQAAAZaCnQAFAAAAAQAAAZ6IIgADAAAAAQAC
-AACIJwADAAAAAQBkAACQAAAHAAAABDAyMjCQAwACAAAAFAAAAaaQBAACAAAAFAAA
-AbqSAQAKAAAAAQAAAc6SAgAFAAAAAQAAAdaSBAAKAAAAAQAAAd6SBQAFAAAAAQAA
-AeaSBwADAAAAAQAFAACSCAADAAAAAQAAAACSCQADAAAAAQAAAACSCgAFAAAAAQAA
-Ae6jAAAHAAAAAQMAAACjAQAHAAAAAQEAAACkAQADAAAAAQAAAACkAgADAAAAAQAA
-AACkAwADAAAAAQAAAACkBgADAAAAAQAAAAAAAAAAAAAAAQAAAB4AAAAcAAAACjIw
-MDY6MDg6MDggMTA6MjA6MjIAMjAwNjowODowOCAxMDoyMDoyMgAASt+LAA9CQAAt
-VOYAD0JAAAAAAAAAAAoAAAAwAAAAEAAAAEYAAAAK/9sAQwAIBgYHBgUIBwcHCQkI
-CgwUDQwLCwwZEhMPFB0aHx4dGhwcICQuJyAiLCMcHCg3KSwwMTQ0NB8nOT04Mjwu
-MzQy/9sAQwEJCQkMCwwYDQ0YMiEcITIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIy
-MjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIy/8AAEQgAlgBxAwEiAAIRAQMRAf/EABwA
-AAEFAQEBAAAAAAAAAAAAAAABAgMEBgUHCP/EAD8QAAEDAwIEAgYFCgcBAAAAAAEA
-AgMEBRESIQYxQWETURQicYGRwQcyobHRFSMkQlJicqLh8BdDVIKSk7Lx/8QAGQEA
-AgMBAAAAAAAAAAAAAAAAAQMABAUC/8QAJhEAAgIBBAEEAgMAAAAAAAAAAAECEQME
-EiExURMUMkEiI2Fxkf/aAAwDAQACEQMRAD8A9MQhCB0CRCTKhAQmSzMhjL5HBrR1
-K49Td5HgtgHhjzO7v6Lic4xXIyGOU3SO0jIKx8jpJnapZXv9pTGl0Ryx72/wuIVf
-3S8FlaOXk2aFmYLpWwD1ZG1DR+rJsf8Al+K69DdaeuJY0lk7Rl0T9nDv3HdOhljL
-oRPDOHZfSpoKcE0SCMJUKEEwhLlChByRKmldAEyo5JGxsc9xw1oySnErjXapJmbT
-NOwGt/yHz9yXOW1WdwhulRTq6p9TMZH5A/UZ0aPxVNxJKd9bKABnPRZs5uT5NnFj
-UVSEa3fn7kx4wd1YHuz5Ic0Y2898pbQ2ylqI3SPb4jmPa8xzMOY5W82n5jsrUjRn
-AGVUcMEY23XKk0yOKkjTWm5+mxFkoDamLAkaOR7jsV0wVhfSjQ3GmrAcMBDJf4St
-s12QMLTwZN65MfPi2S4JwU5MaU8KwVgQlQiQCmFOKY5QgxxWUM4qJ55wQQ95x7Bs
-PsC0dfL4NDUS5xojc7PsCylEP0RuAcFVNRLpFzSx5bJW5OcJWtPtUT6iKPOt4AHM
-nokp7tSSO0sLnD9oNOFn8fbNRPwXC0jbt1SYJCfqDwCU5zw1hOM9gmbf5BZWcMHd
-RPaNJJ6Jkle8v0+hT+QcBn7lEalzjh0bmjuEqR0iCuj8akkaDzGFqrBWmustNK45
-kDdD/wCJux+5Zx7RLE5oPMbK7wXLmGugzkMmDwfaP6KzpXUq8lPWRThfg1rSpAom
-qULSRlschCF0AQpjk8qNy5YSjdGmS2VbAM6oXj+UrL29xfbIXci5uT8VqLkSKCbS
-4g6dz5Dqs9Tw+DSRQZyGsDcqnqXyX9LF7WyhWXGjoXFjonTzAatDRn49AqdNxFLO
-4n8lSRx4zk7fDbf3LtspI4s6QBk5JPU+abLHCRkkvPQeSrRlFR5XJc2ttV0LTTCU
-hxaWgjOlwwUypqDG5xDdWNwAE1mluXO6qOZ7cjGyrudcj1CzmVd4usOiSCmbI07m
-MMcSOxwOatQXd8+htXTOgc9oIO+AT0z5roxMjwMAtPXBwpHxRyDBw72qxOcXD8ex
-Kg1Jt9FUNIwRyKscIRiKa45IyZQ0d8Z/EJsjA0Bo2wi0UrRXskjOHPlc5x9hOymC
-TUk6Oc0FKDTdGuapmqFhUzVqoxWOQjKF0AaVG5SFRuXLCVawA0suRtpKzscgcwOB
-zuQPiVpKkaoJG+bT9yydNJGGvYzGGyOAAOf1iqWp7Ro6P4v+y2W685J2VOWoy/wI
-dgdnOSV1b6PTEt+sfsWcfdqqXLKalL8bkqhKSujUhG1Zpo2ZIDjt3UVRFh4aDkHq
-FlKOpvTKx7pmTaAdwQSPcn3SsvBna2ljm0h2C4NIUaTVHStGmiqHxSFkh1xjqei6
-LWNxqaTgrEQ110gjLp4SATg5HMLQWq4men0jp08kItXtYJp9o6Djk+9MsE2moZGM
-n13HPlkkKGomEUbpHO2G6ucNMMzIpXNxoZq95/8Aqdh+aSK2ZpY5N+DVN5qdqgYp
-2rYRhMehCEQDConqUqNy5aCQuWFu8brbeahzBpjeGyMHQk7EfEZW6cs5xbRST2s1
-EDczQZOPNpGD+PuVfUY98GWdNk2TV9Mz1yqG1Nuc7qw5wFSbb6qOOGqppXFmMyQN
-djPcFcue4NdRlhIwSNXm7yXXtNyJgADMAbAkrIUkpW0bqX48FymrKZ+RJT18Lhnc
-Pa7O+3U9ETVVKyIfmq6V+nJBc1u/xCbPcJGE/o0T99i3qom3CR+l/ocYz+2CMJjy
-qhixru3/AKQNts1VPJVufLFT7+HDryT3KsWiZlJQmVwBdI7bsMlVrrdnim0McA47
-EN6bLiw3A+hCLVhocXux/fmuHO3aFyi6pmjq6h9aWU0WPzjgzHmScL0Ckp46anZF
-E0Na0AYCxPCNL6dcHVcgBjp/qd3H8Pmt41aeix1He/sx9dkuexfRNHyU7VFGFM1X
-aKAuEJUIgIymFPKY5SgkUnJVpwDC8EZBByrDzsqlU8Mp5CfJLlxydRVujxniOgdb
-6+Ux5ELtx27KCmqsNaAA49Qey2fEFrFypgQMvac4zzXnlQyehqNDmEb7ZG6yJw3c
-G/CThyb2lmjbSB7nZPTAzhJXvayFrg869uR5BZKkvM+gsbDr08zqS1l2qzE1zoS0
-A7lxxuk7JfGh/qx7sdcKolhHiYAO3ke6pW+CSeTLi7Q48wMquHTVUwLgQM8lqrJb
-5TVBpa0RgZJI69l2ltVfYq/Ulf0egcLUwpbToDQ0lxJA9gXfYuVaNqVw8nfILqMW
-zgX60YWof7ZFpilChYpgnCByEmUIkIHOULnrgX3jKzWFrm1dUHTj/Iiw5/vHT34X
-k/Ev0kXO9F9PSE0VGdi1jvXeP3nfIfauewnoHEX0j2mzyT0sBNXWx7aWfUafIu7d
-s+Wy4nCfGFVxPPViuljZMxrTHBEC1obvkjJJJ3H2LyGR515yprfcKi1V8VZSv0Sx
-nLT0PY9kvJDfFpDMWRQmpM990tkaQ4AjyKzd8sPiZkiAH+3kuhw3xFR8QUgkhcGV
-DR+dhJ3afMeY7ruviBbnCzXjfTNqORNWujzantWl4zqG+dLTzSTW6WR3rRta1v1d
-t1un26IvJA0k88JI7XGD6xc4d1x6bGb0Y+3WTXOBIZNQOcADGVr6WkEDRth3JXIq
-ZkQ9RoCc5oBycADmosdAc0Uq+/nh2mbVyR+JSiQCYD6wB2y3z3xstHabxQ3ik9Jo
-J2zRZ0kgEEHyIO4XivHnFUVzmbbaCTXTxOzJIOT3duwWetN7r7TVGahqpIJNslp2
-PYjkfetPApRgkzF1LjLI2j6hjdspmkLyPh/6WWksgvlOG9PSYB/6b8x8F6bQXGku
-NM2ooqiOeF3J0bsj2HyPZOTEUdLZCh8T+8oRsB8mSSue7c5TM7JqQoEA7pnLYp4R
-jKhB1LVVNDUsqKWZ8UrDlr2HBC9Dsn0pFjWw3mmL+njwgZPtafl8F5yRjkmnHUYX
-EoKXYyGWUPiz3mk4s4drgHRXWnaT0ld4Z/mwukLpbS3P5RpMefjtx96+csDzTsH9
-pK9BeSx7uX2j3i5cacPWyIl9wimkHKOnPiE9tth7yF5lxJx5X3wPpqcGlozsWNOX
-PH7x+X3rJ49qUD3LuOKMeRU9ROXHQDb2qRpwEwDCXKYJJQ8jqula73X2ipFRQVck
-EnUsOx7EciOxXJ6JwKgDef4qcS/6iH/pb+CFhMoUoNsYhCEQBhLhCFCAkwhChAwB
-0Cdt0CEKBGndAQhAgFJzQhEAqEIUIGUIQgQ//9mIZgQTEQIAJgUCRVXNiwIbAwUJ
-A8JnagYLCQgHAwIEFQIIAwQWAgMBAh4BAheAAAoJEDDUOm5k6+IgXsAAoIgKM28/
-7QEaj/dniY60Dx05HmGBAJ9wzVU81fZOsy1zhQXjqkXR86SfrohGBBARAgAGBQJF
-Vc5/AAoJEBXWiATKbN+y0swAnioDHaWcqqjBIBSN96Sj2Fc9MdKjAKCI/DI2x/9U
-S+oLQqbmWuIM+f/WbIhGBBARAgAGBQJFVdERAAoJEKBP+xt9yunThOcAoM0tU4B5
-nYu/BEThw303mx15tQHXAKCxEiYipngcXVCL2SqmEL5yQq4vT4hGBBARAgAGBQJF
-VdLVAAoJEBRll9zcw5nHxQ8AoMk8FXQ8FRPZmUmSMrgH/rn1W01dAJ9JoGO73MIJ
-qKFyHBU5UYYeomGmOYicBBABAgAGBQJFVdTrAAoJEE1WKCF5BQwRSqMEALRtvzYB
-tj697WhppxWqZ5zVV1nAgbdbJ5zHWghMoYiod69OZ/3ZxticAmLEF+yenp4OeItk
-3ZjPCBQAI7sT7YPHEkwzp8vCUrqWp5XkA4OvSgI6p2ajuZhREdCvilRPtuIf0jTV
-sOK/eklxU1Sd6KUPzBI5o0ac9zQsrY5oFqeiiEYEEBECAAYFAkVV2jYACgkQMxEk
-bVFH3PRIfQCeKG8J5xyPZJF3e6b3HovW8eiAVzAAnRCcLkhgrrNA0BYKWUJAKWv3
-deEhuQINBEVVy+wQCACAJNIBtl1krYP2kKBpS7VRAaXUH7kf2FmxKmH51lYBbBwS
-JYFHJorMSAWNYZBqY5vrDwy1K6hAxz/B/shQEYWYY9aVEEffmUUxcKF4OZpqUP/j
-CcgJOqUcXL9uir9uYHc+tSnGEiAtJZ9HjQ4gwfXQ0qNmrdPTI8PbDR8ELoRYuQLm
-4c4HYBO+/C6PRcwHiXSg6uO/NyUthZWz4ODnwPV7dJllPxwJTTgay6sKJ3UhgdFH
-pGb5U5OW+fEA2tEsv5sbszDvSgSugWAUCQxb7Js7REY1fcwGFXP9lAzwkUicMJZo
-osuqvIrusK9tL4DJWbkIz/5LAsPeRKJNXQ/j6yH7AAMFB/9v1FJtBebXV9PiahIP
-W0/fiB5Bcmp2lj7M74a0rPT6fwG+p/NULicBBAPU3p3vPzAsm3BJauOPBDH9XFrM
-iaQ64L0ijQoHhZhoD3tVkGihT8L2SHanhGXoFJTHb8CIA8yh1Sq18U2twPZjCK30
-0lD0ba/qrfm3902miKMXYSlCszosjpfqoX3f/WDQXrOgERMdPkZ34Q8bNk5VD+95
-j3f171Lmn08/c8IoUWGvwMhsONJHDQYmxf+dJi8M6zU9HqyTy4KJ7dSufRuOLcpO
-zEfBrn/Ii0sxgeONSwUgeYLtjXC00e/XrVGZtJwUVSMwinuwxY7KF/pyaWrEePRr
-gp7jiE8EGBECAA8FAkVVy+wCGwwFCQPCZwAACgkQMNQ6bmTr4iB+XgCeJAW1mrjx
-/50jTLN0kTiQXnmd5dgAnjGc8V7Ovynb8ZannQ/Q3nYwCFw2
-=R5bv
+h1YsRbkew6JzEdcjSRgEROYNfk1n4Vqy0t8sxxkogaEpT0dVJ7QhRGFnLUVybGlu
+ZyBTbcO4cmdyYXYgPGRlc0BkZXMubm8+iGkEExECACkCGwMGCwkIBwMCBBUCCAME
+FgIDAQIeAQIXgAUJBaNj3wUCSLu0cAIZAQAKCRAw1DpuZOviIL8EAJ45G6ZfXwsi
+KDduvXh+o7S8FNDX+gCfTA4zI5sFDJJM4gOaOhoRWY+p6iKIRgQQEQIABgUCRVXO
+fwAKCRAV1ogEymzfsq/rAKCVT39ClkO7YeP1Q8eM3/S4UsfKoACeKxlvYw2+xL0o
+B6BU3vNSmcmXeK2IRgQQEQIABgUCRVXREQAKCRCgT/sbfcrp00DlAKDxpOcBApBW
+9rNc5Tp91aTEhS6bNwCgvKIYGlVCtjCdZcxxwVW1XBbWwPGIRgQQEQIABgUCRVXS
+1QAKCRAUZZfc3MOZxy3mAKDDeQzsPr2stsx+rbkv9PP416WYaQCg1nbcjSDuSuOP
+gvk4pUJdm7ya1wiInAQQAQIABgUCRVXU6wAKCRBNVigheQUMEURsA/9KiOfvLcSg
+BnFr/ljqSJdSTqXH1aRnFX/xDul/4cqcysvqyRA9RKNepg1wzzxYDMtHpUYAeEzR
+gobSrZwcXfE3M5fKCB3rSFoVgP6If/zcxBzT3+ufahha0+vNeWac+lzJ2ZB8ofB3
+p734UhzfbXcohyHMTV2dw2KFSaPA86xfqIhGBBARAgAGBQJFVdo2AAoJEDMRJG1R
+R9z0qBQAniPp5o1Cwp5ovrFIFa6/TGWLXQ+PAJ9gp2KHf5AQ8qi33Nhr4x/Owffy
+l4icBBABAgAGBQJFVdGHAAoJEB9/qQgDWPy9YKMD/2TONRgoAiTVlSje/QhdLSq8
+UsevjTI2TQKck8RT8OowhquDrlj3jqkT4ZknWBMO2fNmBrjgATXBwxNA+VfzWxaR
+MEHWiw1FTro26tMd/l887uB6G/8S7OIERHkWyCedSTge4IJs07GyxykGORSJhJdW
+hlBr5eADkEA2Zb4hoVTviQJIBBABAgAyBQJFVxrYKxpodHRwOi8vd3d3LnBhZXBz
+LmN4L2dwZy9zaWduaW5nLXBvbGljeS5hc2MACgkQJknmKMXTTQVjSRAAp+JK7kcz
+FAygdwI/zxi+C7HVuR4VOf3Zbl3u0tyMfLaAjaRTImxuxoA+qQ7luikONLuFIwLr
+urSLkjbawlgYpdkaoS+d6gk6hRfvkejpgrC6Uve+vuUnO3XNhlgbEZlEKThxt6x2
+mS/bjJ98q72nDXM0jf7YSpKPvWPugndy6Z3puOdh6pqLJLR62SVp6OQixj3vohsF
+49ubMO7F0kbc6GueM3IWIUUHl93rStf8Zeyz6LB4nSIA0xycLynQIt60UerXkvFb
+wReN/rPW/C41MzdBKled/aus1B9gcNpv4MnO3+RU9SYpLQkJthvHfsmjMnoBvTWZ
+LrEfeGiqlg0pP/TpWE2sdf1wXrrvMgPd/oVRjSUgiEUB8LRojLNHJ9KrxMMm8kjd
+g+DhmB/EZny3IUdXYU01xd6MrXgAy+Yw0BH6639fh38/BldJU/bHWimIEQWY3vd2
+r4Uii513sThN6Usf2wBlfO3sQsUFiLHqPMvrgfDWk14xZzVbA3Nq6YqkLa//4AO6
+UdpB+jBbTrh5QOuoOt9OzyDNN/4LcnaI6DzS63XalT7VPBQaX7jva7QjPDcCN76N
+yrsj0+qAT6LVfHB+NAaci6C0Wvpi0VzkzVaajmyipa+V+W6Wid1PVI+shgq37Q4W
+OCBVUG3Eq1MjlnfLmpBCVOgNQ08V2oyqAQ+0JkRhZy1FcmxpbmcgU23DuHJncmF2
+IDxkZXNAZnJlZWJzZC5vcmc+iGYEExECACYCGwMGCwkIBwMCBBUCCAMEFgIDAQIe
+AQIXgAUJBaNj3wUCSLu0bQAKCRAw1DpuZOviINbfAJ9g5L3Jy9bI1LxPBof5h5Wk
+kx7bXACfVoDF7ER6lIpYjpl4kNJDLHO1bu6IRgQQEQIABgUCRVXOegAKCRAV1ogE
+ymzfsnDiAKCDqDbgYcFBAkPICwm2dFDN9imE7gCbBBXvn08H5pHt89RMqi8OoSPZ
+EU+IRgQQEQIABgUCRVXRBwAKCRCgT/sbfcrp05iMAJ9mWLEhDSbl3P0bZIsn7B3f
+Vd6/uQCg45Ok+OAPMrdayU8QGnyEpFp36s+IRgQQEQIABgUCRVXSxQAKCRAUZZfc
+3MOZxyzEAJ9qMIsIysvSh0D1K8XTy5bvvMM5IwCg00cSjveY3auHIkR9zsrQ0JzQ
+Fl+InAQQAQIABgUCRVXU4QAKCRBNVigheQUMEZY4BACIRKgFqgDXfU0W2mbrCgm3
+m8Y+CsK8mrb0RZwAnX9vkHUD5TFlyxU/6NJjli3zv2V6eT0fKsoeUi0uScwb7X6k
+PAqV5bu3fYEP4bgxGCG3zh3kJlEY4dMc+3jXjqaPWiPO96PfPGVmOcXq8wS6SNij
+DluA/BRN/twQUYpjCfT6rohGBBARAgAGBQJFVdolAAoJEDMRJG1RR9z0OqgAnjHJ
+poaBHclFqiQ+lxUbaFpxkAKoAJsEZYMf+SvRMBp5FX51K+a32bhBM4icBBABAgAG
+BQJFVdGDAAoJEB9/qQgDWPy9y3ID+gKpRqNw2HggMgKDTNq2fX6CPfuP+tNY6xJo
+kzGfXwnNSkNG7Nb4N0N4mZc9TWhNPMzDerm9eLZwnlks0zGis++NZZuGcbh1p8kH
+RI1BqnJwkspB7MsmcZeLq5FiTTv92fqOjE/vAoNUPE7M9IkidpKKSCQvtT2LiFd+
+TEeAhYUliQJIBBABAgAyBQJFVxrJKxpodHRwOi8vd3d3LnBhZXBzLmN4L2dwZy9z
+aWduaW5nLXBvbGljeS5hc2MACgkQJknmKMXTTQWQhg/+Iw/okbVJbs4m+BXShV9u
+O/wbhTUtYSdSYYsd40CW2w+UhbZ4XVVdXDPRTrMSM6XGFTF+QOdvCSrvcETVTWp3
+ZSjjxbruh8DGLNVeV7f2mWmGQHKWr+skdMumxJxdcGVqbjIf5k43jlXo0CGW9IcM
+8i1aUX6bgsGe0BatMRxP7FgKNSA7BRN5rCHzYg88/CJQk+pm1LON0Kfuy0Vp7n5m
+vB91Z9qDBPlT3+MEvfj6n6oC2mbXPECo/k34sJIj/lZCvVWjgpqGG0dG7XY+Ardj
+eGlBP5pbypS0ibPwDXhVxx7DjPJVlxPsRVYvdWkYIYATAsddwlGo54dHfWGojXZw
+J/8CWgI9sMclQr10dOc4SurVxV7QaWh/HTZeXLfJ/0NiWg5HKW7PgZjS8swlUz9m
+5qbHpsDXr/P3iAfHcJa2EGnU2nqBMJvTwv2XQSdgc7gxmlKaa/n+Y15z7a2AOMz/
+qMIoHmxI7VFtJSXd0ynSmDwXN8UIszup8Wf9kO8tEhNTAtDjGg+BxzCHmtD2f0V4
+b6XV4Oco/4ACykU/T1MUEgXDcGaSyY2hyKqhUmljlHfjPMkZRXCEIft72LNlLfaJ
+QlDQfVUCg2yH8nTwUkcGnPU9aQApnf6rPvEmOZuvs2+nzwTF9YLGVOsX/3DjK/e2
+WSm68wul2KaJVVODyOnbAS+0JERhZy1FcmxpbmcgU23DuHJncmF2IDxkZXNAbGlu
+cHJvLm5vPohmBBMRAgAmAhsDBgsJCAcDAgQVAggDBBYCAwECHgECF4AFAki7s04F
+CQWjY98ACgkQMNQ6bmTr4iDXmQCaAtXIiyZmamwNqPGQGfHNJpnlujQAnjuHMK65
+yLLmU5pGdk5wOTlWWcWYiEYEEBECAAYFAkVVzn8ACgkQFdaIBMps37LuAACfSjbD
+s0oiGyxycob3mzg0YD4jnvQAn0lR2yVleRr+o9hHu7jAahg5pulQiEYEEBECAAYF
+AkVV0REACgkQoE/7G33K6dMuxQCdF1gf64JHIxuXWVBmjRb3LwWV4HgAoJfBSUt4
+CT91gkuJsIkNmBNtyEMkiEYEEBECAAYFAkVV0tUACgkQFGWX3NzDmcfCDgCglJth
+oRCyhTCkH/ydADyLt2I85kMAoNGu1J0HMIeU8qoebbAT9nSCr1bpiJwEEAECAAYF
+AkVV1OsACgkQTVYoIXkFDBHW3AQAk+Y8GVjE2QKVlF5LG/ga/+ACULspf4qEjP0C
+jfiElKC/M9ebt7DMgHkbcUT83cszO9Khf6YpdhCfe9yBjjUW7IA0pMV3hJ0OeDWi
+UoGW+N1ibvz4AETeT1dAb+ZaLxmFtIWzMTL5RPJ1bn166yZxy4ae2TA0b3y1z39W
+nTQaMSSIRgQQEQIABgUCRVXaNgAKCRAzESRtUUfc9DBWAJwJqDv/aE7dajUH5hLx
+4jKQsAuzDACeP5YTSisf+T2XiMNgBpBtlYorvdiJAkgEEAECADIFAkVXGtkrGmh0
+dHA6Ly93d3cucGFlcHMuY3gvZ3BnL3NpZ25pbmctcG9saWN5LmFzYwAKCRAmSeYo
+xdNNBbz/D/9+lMr3MrpcBzZSTHUHeoWua3h/wt5By3mOFBkcUwJYQERa08t95WfA
+mnZTRR8mGRXaE9Atazkf1wjcdt5AlCe41BaT3mNJd6TO92+BAHaR72PkFr18W4ZP
+GQDAKfGToQ9QDyy3CFrPRzlooqhzLMonuDe0/QXe5YD4OQT9jMTeBfq7i0ryRjjd
+Z3J4wQ0xcYhOc9pWmJuUIoTEjZkq7rKtU2obddudPTOKz8V6isG5CiPWpjn4rhEf
+8/RD9EMfqcANm+FOzMqLQ/xu5hxMiKervjykixhsI40ixDM1FqeVR4K0T/CIEzXQ
+JXn5ZWH0LLw8CY17Wo1MIz+TugSmLQjFkGhgddk16LQgaa4laUdTGHp1skN11EBq
+4eQLA3126eWi8xCpnMKGt0Vk2/sRatgjalWjFyI0S9ZODrZyicT5v6+mCMCa/y4b
+7NYl1ZX8h3MhbvvLAsAxK/DKNIf9ML2Oa4ufYA+fyNaiaeRw1N+98/OfbAEw/IS0
+q+ITzum7ksbCkRHa/i8d8E/VtdQPTPK02pj638N7T11Mik2fZK6y2q4Tz9zwqBxs
+UogZCq6cb6H9iFK6ggQhCl5jLBIv4EcbHjgkX9aWERjUgR9DtxBoZPGW7PFkSy0g
+eLjQHDOZdOF2xdP5Uoc90CcMq3pXMmjAHSLqbFevAWZLTVS5d2jfSdHMRsxEARAA
+AQEAAAAAAAAAAAAAAAD/2P/gABBKRklGAAEBAQBIAEgAAP/hAf5FeGlmAABNTQAq
+AAAACAAHAQ8AAgAAAAUAAABiARAAAgAAAAcAAABoARoABQAAAAEAAABwARsABQAA
+AAEAAAB4ASgAAwAAAAEAAgAAATIAAgAAABQAAACAh2kABAAAAAEAAACUAAAAAFNP
+TlkAAERTQy1WMQAAAAABLAAAAAEAAAEsAAAAATIwMDY6MDg6MDkgMTI6NTI6MDcA
+ABWCmgAFAAAAAQAAAZaCnQAFAAAAAQAAAZ6IIgADAAAAAQACAACIJwADAAAAAQBk
+AACQAAAHAAAABDAyMjCQAwACAAAAFAAAAaaQBAACAAAAFAAAAbqSAQAKAAAAAQAA
+Ac6SAgAFAAAAAQAAAdaSBAAKAAAAAQAAAd6SBQAFAAAAAQAAAeaSBwADAAAAAQAF
+AACSCAADAAAAAQAAAACSCQADAAAAAQAAAACSCgAFAAAAAQAAAe6jAAAHAAAAAQMA
+AACjAQAHAAAAAQEAAACkAQADAAAAAQAAAACkAgADAAAAAQAAAACkAwADAAAAAQAA
+AACkBgADAAAAAQAAAAAAAAAAAAAAAQAAAB4AAAAcAAAACjIwMDY6MDg6MDggMTA6
+MjA6MjIAMjAwNjowODowOCAxMDoyMDoyMgAASt+LAA9CQAAtVOYAD0JAAAAAAAAA
+AAoAAAAwAAAAEAAAAEYAAAAK/9sAQwAIBgYHBgUIBwcHCQkICgwUDQwLCwwZEhMP
+FB0aHx4dGhwcICQuJyAiLCMcHCg3KSwwMTQ0NB8nOT04MjwuMzQy/9sAQwEJCQkM
+CwwYDQ0YMiEcITIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIy
+MjIyMjIyMjIyMjIy/8AAEQgAlgBxAwEiAAIRAQMRAf/EABwAAAEFAQEBAAAAAAAA
+AAAAAAABAgMEBgUHCP/EAD8QAAEDAwIEAgYFCgcBAAAAAAEAAgMEBRESIQYxQWET
+URQicYGRwQcyobHRFSMkQlJicqLh8BdDVIKSk7Lx/8QAGQEAAgMBAAAAAAAAAAAA
+AAAAAQMABAUC/8QAJhEAAgIBBAEEAgMAAAAAAAAAAAECEQMEEiExURMUMkEiI2Fx
+kf/aAAwDAQACEQMRAD8A9MQhCB0CRCTKhAQmSzMhjL5HBrR1K49Td5HgtgHhjzO7
+v6Lic4xXIyGOU3SO0jIKx8jpJnapZXv9pTGl0Ryx72/wuIVf3S8FlaOXk2aFmYLp
+WwD1ZG1DR+rJsf8Al+K69DdaeuJY0lk7Rl0T9nDv3HdOhljLoRPDOHZfSpoKcE0S
+CMJUKEEwhLlChByRKmldAEyo5JGxsc9xw1oySnErjXapJmbTNOwGt/yHz9yXOW1W
+dwhulRTq6p9TMZH5A/UZ0aPxVNxJKd9bKABnPRZs5uT5NnFjUVSEa3fn7kx4wd1Y
+Huz5Ic0Y2898pbQ2ylqI3SPb4jmPa8xzMOY5W82n5jsrUjRnAGVUcMEY23XKk0yO
+KkjTWm5+mxFkoDamLAkaOR7jsV0wVhfSjQ3GmrAcMBDJf4Sts12QMLTwZN65MfPi
+2S4JwU5MaU8KwVgQlQiQCmFOKY5QgxxWUM4qJ55wQQ95x7BsPsC0dfL4NDUS5xoj
+c7PsCylEP0RuAcFVNRLpFzSx5bJW5OcJWtPtUT6iKPOt4AHMnokp7tSSO0sLnD9o
+NOFn8fbNRPwXC0jbt1SYJCfqDwCU5zw1hOM9gmbf5BZWcMHdRPaNJJ6Jkle8v0+h
+T+QcBn7lEalzjh0bmjuEqR0iCuj8akkaDzGFqrBWmustNK45kDdD/wCJux+5Zx7R
+LE5oPMbK7wXLmGugzkMmDwfaP6KzpXUq8lPWRThfg1rSpAomqULSRlschCF0AQpj
+k8qNy5YSjdGmS2VbAM6oXj+UrL29xfbIXci5uT8VqLkSKCbS4g6dz5Dqs9Tw+DSR
+QZyGsDcqnqXyX9LF7WyhWXGjoXFjonTzAatDRn49AqdNxFLO4n8lSRx4zk7fDbf3
+LtspI4s6QBk5JPU+abLHCRkkvPQeSrRlFR5XJc2ttV0LTTCUhxaWgjOlwwUypqDG
+5xDdWNwAE1mluXO6qOZ7cjGyrudcj1CzmVd4usOiSCmbI07mMMcSOxwOatQXd8+h
+tXTOgc9oIO+AT0z5roxMjwMAtPXBwpHxRyDBw72qxOcXD8exKg1Jt9FUNIwRyKsc
+IRiKa45IyZQ0d8Z/EJsjA0Bo2wi0UrRXskjOHPlc5x9hOymCTUk6Oc0FKDTdGuap
+mqFhUzVqoxWOQjKF0AaVG5SFRuXLCVawA0suRtpKzscgcwOBzuQPiVpKkaoJG+bT
+9yydNJGGvYzGGyOAAOf1iqWp7Ro6P4v+y2W685J2VOWoy/wIdgdnOSV1b6PTEt+s
+fsWcfdqqXLKalL8bkqhKSujUhG1Zpo2ZIDjt3UVRFh4aDkHqFlKOpvTKx7pmTaAd
+wQSPcn3SsvBna2ljm0h2C4NIUaTVHStGmiqHxSFkh1xjqei6LWNxqaTgrEQ110gj
+Lp4SATg5HMLQWq4men0jp08kItXtYJp9o6Djk+9MsE2moZGMn13HPlkkKGomEUbp
+HO2G6ucNMMzIpXNxoZq95/8Aqdh+aSK2ZpY5N+DVN5qdqgYp2rYRhMehCEQDConq
+UqNy5aCQuWFu8brbeahzBpjeGyMHQk7EfEZW6cs5xbRST2s1EDczQZOPNpGD+PuV
+fUY98GWdNk2TV9Mz1yqG1Nuc7qw5wFSbb6qOOGqppXFmMyQNdjPcFcue4NdRlhIw
+SNXm7yXXtNyJgADMAbAkrIUkpW0bqX48FymrKZ+RJT18LhncPa7O+3U9ETVVKyIf
+mq6V+nJBc1u/xCbPcJGE/o0T99i3qom3CR+l/ocYz+2CMJjyqhixru3/AKQNts1V
+PJVufLFT7+HDryT3KsWiZlJQmVwBdI7bsMlVrrdnim0McA47EN6bLiw3A+hCLVho
+cXux/fmuHO3aFyi6pmjq6h9aWU0WPzjgzHmScL0Ckp46anZFE0Na0AYCxPCNL6dc
+HVcgBjp/qd3H8Pmt41aeix1He/sx9dkuexfRNHyU7VFGFM1XaKAuEJUIgIymFPKY
+5SgkUnJVpwDC8EZBByrDzsqlU8Mp5CfJLlxydRVujxniOgdb6+Ux5ELtx27KCmqs
+NaAA49Qey2fEFrFypgQMvac4zzXnlQyehqNDmEb7ZG6yJw3cG/CThyb2lmjbSB7n
+ZPTAzhJXvayFrg869uR5BZKkvM+gsbDr08zqS1l2qzE1zoS0A7lxxuk7JfGh/qx7
+sdcKolhHiYAO3ke6pW+CSeTLi7Q48wMquHTVUwLgQM8lqrJb5TVBpa0RgZJI69l2
+ltVfYq/Ulf0egcLUwpbToDQ0lxJA9gXfYuVaNqVw8nfILqMWzgX60YWof7ZFpilC
+hYpgnCByEmUIkIHOULnrgX3jKzWFrm1dUHTj/Iiw5/vHT34Xk/Ev0kXO9F9PSE0V
+Gdi1jvXeP3nfIfauewnoHEX0j2mzyT0sBNXWx7aWfUafIu7ds+Wy4nCfGFVxPPVi
+uljZMxrTHBEC1obvkjJJJ3H2LyGR515yprfcKi1V8VZSv0SxnLT0PY9kvJDfFpDM
+WRQmpM990tkaQ4AjyKzd8sPiZkiAH+3kuhw3xFR8QUgkhcGVDR+dhJ3afMeY7ruv
+iBbnCzXjfTNqORNWujzantWl4zqG+dLTzSTW6WR3rRta1v1dt1un26IvJA0k88JI
+7XGD6xc4d1x6bGb0Y+3WTXOBIZNQOcADGVr6WkEDRth3JXIqZkQ9RoCc5oBycADm
+osdAc0Uq+/nh2mbVyR+JSiQCYD6wB2y3z3xstHabxQ3ik9JoJ2zRZ0kgEEHyIO4X
+ivHnFUVzmbbaCTXTxOzJIOT3duwWetN7r7TVGahqpIJNslp2PYjkfetPApRgkzF1
+LjLI2j6hjdspmkLyPh/6WWksgvlOG9PSYB/6b8x8F6bQXGkuNM2ooqiOeF3J0bsj
+2HyPZOTEUdLZCh8T+8oRsB8mSSue7c5TM7JqQoEA7pnLYp4RjKhB1LVVNDUsqKWZ
+8UrDlr2HBC9Dsn0pFjWw3mmL+njwgZPtafl8F5yRjkmnHUYXEoKXYyGWUPiz3mk4
+s4drgHRXWnaT0ld4Z/mwukLpbS3P5RpMefjtx96+csDzTsH9pK9BeSx7uX2j3i5c
+acPWyIl9wimkHKOnPiE9tth7yF5lxJx5X3wPpqcGlozsWNOXPH7x+X3rJ49qUD3L
+uOKMeRU9ROXHQDb2qRpwEwDCXKYJJQ8jqula73X2ipFRQVckEnUsOx7EciOxXJ6J
+wKgDef4qcS/6iH/pb+CFhMoUoNsYhCEQBhLhCFCAkwhChAwB0Cdt0CEKBGndAQhA
+gFJzQhEAqEIUIGUIQgQ//9mIZgQTEQIAJgIbAwYLCQgHAwIEFQIIAwQWAgMBAh4B
+AheABQJIu7NOBQkFo2PfAAoJEDDUOm5k6+IgMKEAn1G0q8tbSMcohVdFlp+UFvCM
+Ph68AJ41cHcD6fQTp097sqhaY8DQzushzohGBBARAgAGBQJFVc5/AAoJEBXWiATK
+bN+y0swAnioDHaWcqqjBIBSN96Sj2Fc9MdKjAKCI/DI2x/9US+oLQqbmWuIM+f/W
+bIhGBBARAgAGBQJFVdERAAoJEKBP+xt9yunThOcAoM0tU4B5nYu/BEThw303mx15
+tQHXAKCxEiYipngcXVCL2SqmEL5yQq4vT4hGBBARAgAGBQJFVdLVAAoJEBRll9zc
+w5nHxQ8AoMk8FXQ8FRPZmUmSMrgH/rn1W01dAJ9JoGO73MIJqKFyHBU5UYYeomGm
+OYicBBABAgAGBQJFVdTrAAoJEE1WKCF5BQwRSqMEALRtvzYBtj697WhppxWqZ5zV
+V1nAgbdbJ5zHWghMoYiod69OZ/3ZxticAmLEF+yenp4OeItk3ZjPCBQAI7sT7YPH
+Ekwzp8vCUrqWp5XkA4OvSgI6p2ajuZhREdCvilRPtuIf0jTVsOK/eklxU1Sd6KUP
+zBI5o0ac9zQsrY5oFqeiiEYEEBECAAYFAkVV2jYACgkQMxEkbVFH3PRIfQCeKG8J
+5xyPZJF3e6b3HovW8eiAVzAAnRCcLkhgrrNA0BYKWUJAKWv3deEhiQJIBBABAgAy
+BQJFVxrZKxpodHRwOi8vd3d3LnBhZXBzLmN4L2dwZy9zaWduaW5nLXBvbGljeS5h
+c2MACgkQJknmKMXTTQUioQ//T/eTZppZZC81xRDDHf+AQ7z2Zc3Eb2RMl2HQXCDd
+CG5iQjxQSjYj+TxfrKWCckRBO6xpvpuNotMtmJptQZqaZfGqIkSxLQJxn8pATUIc
+FoGzKTQse6VAshgvU7ehPYVspgJEyaKWpfwav8BhTeWEScrwOIY5smkr/2xPjMRl
+n342/RaoE2d2neV3mpv7wP2NWJ6ufuhe1Y3xjX7XXrSuIJaVSqYBPPICvjH/ykBL
+3RlNN4fIbdSQ/lNQBXAe1WDNV/hPEipBO5+7pl3aPu9YC1y92lkKYmLmzXr1FmHB
++Bw/5J2wpTD3GG86tdc16IdAkuMFJoRlPojxq4wchFi01DTPsakl3bApJL7RQsvD
+mUKc8s5XBcmd3fJrb5omkw1Pt6q5yrOUVOH/7eqacNxQ4t3hZzuwLwxvt/65FNen
+X6WSqxM3EzGFKNtr8eDYj/ns0tGvxcTJRCVs1llTVv9g0O12Tcrt4FHxrHmI02PN
+s9MtjSvSpilF/jMpqYNTzVOtpp8PxSqzLr3oXPTO8JIwQGSLHcOE1ghUAm5wSzlE
+IhBNIih9HUu/KK041IbdqfhzCbhDyWc4gqnW7XZxNCKvXMegCwtDpAZTBlaAXZtN
+KyRhs7UXJlOVX6Yv29BQmLsHcLLKTsjuJ+Cc6m+ELyT+ghGTb0OfmzNg/i8zbgc5
+byC5Ag0ERVXL7BAIAIAk0gG2XWStg/aQoGlLtVEBpdQfuR/YWbEqYfnWVgFsHBIl
+gUcmisxIBY1hkGpjm+sPDLUrqEDHP8H+yFARhZhj1pUQR9+ZRTFwoXg5mmpQ/+MJ
+yAk6pRxcv26Kv25gdz61KcYSIC0ln0eNDiDB9dDSo2at09Mjw9sNHwQuhFi5Aubh
+zgdgE778Lo9FzAeJdKDq4783JS2FlbPg4OfA9Xt0mWU/HAlNOBrLqwondSGB0Uek
+ZvlTk5b58QDa0Sy/mxuzMO9KBK6BYBQJDFvsmztERjV9zAYVc/2UDPCRSJwwlmii
+y6q8iu6wr20vgMlZuQjP/ksCw95Eok1dD+PrIfsAAwUH/2/UUm0F5tdX0+JqEg9b
+T9+IHkFyanaWPszvhrSs9Pp/Ab6n81QuJwEEA9Tene8/MCybcElq448EMf1cWsyJ
+pDrgvSKNCgeFmGgPe1WQaKFPwvZIdqeEZegUlMdvwIgDzKHVKrXxTa3A9mMIrfTS
+UPRtr+qt+bf3TaaIoxdhKUKzOiyOl+qhfd/9YNBes6AREx0+RnfhDxs2TlUP73mP
+d/XvUuafTz9zwihRYa/AyGw40kcNBibF/50mLwzrNT0erJPLgont1K59G44tyk7M
+R8Guf8iLSzGB441LBSB5gu2NcLTR79etUZm0nBRVIzCKe7DFjsoX+nJpasR49GuC
+nuOITwQYEQIADwUCRVXL7AIbDAUJA8JnAAAKCRAw1DpuZOviIH5eAJ4kBbWauPH/
+nSNMs3SROJBeeZ3l2ACeMZzxXs6/KdvxlqedD9DedjAIXDY=
+=J9VG
 -----END PGP PUBLIC KEY BLOCK-----
 ]]>

==== //depot/projects/docproj_es/doc/share/pgpkeys/lippe.key#2 (text+ko) ====

@@ -1,28 +1,42 @@
-
+
 
 
+pub   1024D/F2CF7DAE 2008-09-02 [expires: 2010-09-02]
+      Key fingerprint = 0532 A900 286D DAFD 099D  394D 231B AF20 F2CF 7DAE
+uid                  Felippe de Meirelles Motta (FreeBSD Ports Committer) 
+sub   2048g/38E8EEF3 2008-09-02 [expires: 2010-09-02]
 ]]>
 

==== //depot/projects/docproj_es/doc/share/pgpkeys/matteo.key#2 (text+ko) ====

@@ -1,9 +1,9 @@
-
+
 
 
 uid                  Matteo Riondato (Rionda) 
@@ -12,7 +12,7 @@
 uid                  Matteo Riondato (Rionda) 
 uid                  Matteo Riondato (Rionda) 
 uid                  Matteo Riondato (Rionda) 
-sub   1024g/A040570C 2003-01-05
+sub   2048g/87C44A55 2008-09-23 [expires: 2009-09-23]
 ]]>
 >> TRUNCATED FOR MAIL (1000 lines) <<<

From owner-p4-projects@FreeBSD.ORG  Fri Oct 31 17:53:16 2008
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 527F6106568B; Fri, 31 Oct 2008 17:53:16 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 142A4106567D
	for ; Fri, 31 Oct 2008 17:53:16 +0000 (UTC)
	(envelope-from peter-gmail@wemm.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 007698FC20
	for ; Fri, 31 Oct 2008 17:53:16 +0000 (UTC)
	(envelope-from peter-gmail@wemm.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id m9VHrFkC086632
	for ; Fri, 31 Oct 2008 17:53:16 GMT
	(envelope-from peter-gmail@wemm.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m9VHrEQg086630
	for perforce@freebsd.org; Fri, 31 Oct 2008 17:53:14 GMT
	(envelope-from peter-gmail@wemm.org)
Date: Fri, 31 Oct 2008 17:53:14 GMT
Message-Id: <200810311753.m9VHrEQg086630@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	peter-gmail@wemm.org using -f
From: Peter Wemm 
To: Perforce Change Reviews 
Cc: 
Subject: PERFORCE change 152286 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, 31 Oct 2008 17:53:16 -0000

http://perforce.freebsd.org/chv.cgi?CH=152286

Change 152286 by peter@peter_daintree on 2008/10/31 17:52:42

	Integrate @152285

Affected files ...

.. //depot/projects/valgrind/VEX/priv/guest-generic/bb_to_IR.c#3 integrate
.. //depot/projects/valgrind/cachegrind/docs/cg-manual.xml#3 integrate
.. //depot/projects/valgrind/callgrind/docs/cl-manual.xml#3 integrate
.. //depot/projects/valgrind/callgrind/dump.c#3 integrate
.. //depot/projects/valgrind/coregrind/Makefile.am#7 integrate
.. //depot/projects/valgrind/coregrind/m_aspacemgr/aspacemgr-linux.c#4 integrate
.. //depot/projects/valgrind/coregrind/m_debuginfo/debuginfo.c#6 integrate
.. //depot/projects/valgrind/coregrind/m_debuginfo/priv_storage.h#3 integrate
.. //depot/projects/valgrind/coregrind/m_debuginfo/priv_tytypes.h#2 integrate
.. //depot/projects/valgrind/coregrind/m_debuginfo/readdwarf3.c#2 integrate
.. //depot/projects/valgrind/coregrind/m_debuginfo/readelf.c#4 integrate
.. //depot/projects/valgrind/coregrind/m_debuginfo/storage.c#3 integrate
.. //depot/projects/valgrind/coregrind/m_debuginfo/tytypes.c#2 integrate
.. //depot/projects/valgrind/coregrind/m_demangle/ansidecl.h#2 integrate
.. //depot/projects/valgrind/coregrind/m_demangle/cp-demangle.c#3 integrate
.. //depot/projects/valgrind/coregrind/m_demangle/cp-demangle.h#1 branch
.. //depot/projects/valgrind/coregrind/m_demangle/cplus-dem.c#3 integrate
.. //depot/projects/valgrind/coregrind/m_demangle/demangle.c#3 integrate
.. //depot/projects/valgrind/coregrind/m_demangle/demangle.h#3 integrate
.. //depot/projects/valgrind/coregrind/m_demangle/dyn-string.c#3 integrate
.. //depot/projects/valgrind/coregrind/m_demangle/dyn-string.h#2 integrate
.. //depot/projects/valgrind/coregrind/m_demangle/safe-ctype.c#2 integrate
.. //depot/projects/valgrind/coregrind/m_demangle/safe-ctype.h#2 integrate
.. //depot/projects/valgrind/coregrind/m_demangle/vg_libciface.h#1 branch
.. //depot/projects/valgrind/coregrind/m_errormgr.c#3 integrate
.. //depot/projects/valgrind/coregrind/m_execontext.c#3 integrate
.. //depot/projects/valgrind/coregrind/m_libcbase.c#5 integrate
.. //depot/projects/valgrind/coregrind/m_main.c#9 integrate
.. //depot/projects/valgrind/coregrind/m_stacktrace.c#4 integrate
.. //depot/projects/valgrind/coregrind/m_syswrap/syswrap-amd64-linux.c#3 integrate
.. //depot/projects/valgrind/coregrind/m_syswrap/syswrap-generic.c#7 integrate
.. //depot/projects/valgrind/coregrind/m_syswrap/syswrap-main.c#10 integrate
.. //depot/projects/valgrind/coregrind/m_trampoline.S#5 integrate
.. //depot/projects/valgrind/coregrind/m_xarray.c#2 integrate
.. //depot/projects/valgrind/coregrind/pub_core_debuginfo.h#4 integrate
.. //depot/projects/valgrind/docs/internals/3_3_BUGSTATUS.txt#2 integrate
.. //depot/projects/valgrind/docs/internals/BIG_APP_NOTES.txt#1 branch
.. //depot/projects/valgrind/docs/internals/Makefile.am#3 integrate
.. //depot/projects/valgrind/docs/internals/howto_BUILD_KDE42.txt#1 branch
.. //depot/projects/valgrind/docs/internals/howto_oprofile.txt#1 branch
.. //depot/projects/valgrind/docs/xml/manual-core.xml#3 integrate
.. //depot/projects/valgrind/docs/xml/manual.xml#3 integrate
.. //depot/projects/valgrind/docs/xml/valgrind-manpage.xml#3 integrate
.. //depot/projects/valgrind/exp-ptrcheck/Makefile.am#2 integrate
.. //depot/projects/valgrind/exp-ptrcheck/README.ABOUT.PTRCHECK.txt#2 delete
.. //depot/projects/valgrind/exp-ptrcheck/docs/Makefile.am#2 integrate
.. //depot/projects/valgrind/exp-ptrcheck/docs/pc-manual.xml#1 branch
.. //depot/projects/valgrind/exp-ptrcheck/h_main.c#3 integrate
.. //depot/projects/valgrind/glibc-2.34567-NPTL-helgrind.supp#2 integrate
.. //depot/projects/valgrind/helgrind/Makefile.am#4 integrate
.. //depot/projects/valgrind/helgrind/README_MSMProp2.txt#1 branch
.. //depot/projects/valgrind/helgrind/README_YARD.txt#1 branch
.. //depot/projects/valgrind/helgrind/helgrind.h#3 integrate
.. //depot/projects/valgrind/helgrind/hg_basics.c#1 branch
.. //depot/projects/valgrind/helgrind/hg_basics.h#1 branch
.. //depot/projects/valgrind/helgrind/hg_errors.c#1 branch
.. //depot/projects/valgrind/helgrind/hg_errors.h#1 branch
.. //depot/projects/valgrind/helgrind/hg_intercepts.c#2 integrate
.. //depot/projects/valgrind/helgrind/hg_lock_n_thread.c#1 branch
.. //depot/projects/valgrind/helgrind/hg_lock_n_thread.h#1 branch
.. //depot/projects/valgrind/helgrind/hg_main.c#3 integrate
.. //depot/projects/valgrind/helgrind/hg_wordset.c#2 integrate
.. //depot/projects/valgrind/helgrind/hg_wordset.h#2 integrate
.. //depot/projects/valgrind/helgrind/libhb.h#1 branch
.. //depot/projects/valgrind/helgrind/libhb_core.c#1 branch
.. //depot/projects/valgrind/include/pub_tool_execontext.h#3 integrate
.. //depot/projects/valgrind/include/pub_tool_libcbase.h#3 integrate
.. //depot/projects/valgrind/massif/hp2ps/AreaBelow.c#2 delete
.. //depot/projects/valgrind/massif/hp2ps/AreaBelow.h#2 delete
.. //depot/projects/valgrind/massif/hp2ps/AuxFile.c#2 delete
.. //depot/projects/valgrind/massif/hp2ps/AuxFile.h#2 delete
.. //depot/projects/valgrind/massif/hp2ps/Axes.c#2 delete
.. //depot/projects/valgrind/massif/hp2ps/Axes.h#2 delete
.. //depot/projects/valgrind/massif/hp2ps/CHANGES#2 delete
.. //depot/projects/valgrind/massif/hp2ps/Curves.c#2 delete
.. //depot/projects/valgrind/massif/hp2ps/Curves.h#2 delete
.. //depot/projects/valgrind/massif/hp2ps/Defines.h#2 delete
.. //depot/projects/valgrind/massif/hp2ps/Deviation.c#2 delete
.. //depot/projects/valgrind/massif/hp2ps/Deviation.h#2 delete
.. //depot/projects/valgrind/massif/hp2ps/Dimensions.c#2 delete
.. //depot/projects/valgrind/massif/hp2ps/Dimensions.h#2 delete
.. //depot/projects/valgrind/massif/hp2ps/Error.c#2 delete
.. //depot/projects/valgrind/massif/hp2ps/Error.h#2 delete
.. //depot/projects/valgrind/massif/hp2ps/HpFile.c#2 delete
.. //depot/projects/valgrind/massif/hp2ps/HpFile.h#2 delete
.. //depot/projects/valgrind/massif/hp2ps/INSTALL#2 delete
.. //depot/projects/valgrind/massif/hp2ps/Key.c#2 delete
.. //depot/projects/valgrind/massif/hp2ps/Key.h#2 delete
.. //depot/projects/valgrind/massif/hp2ps/LICENSE#2 delete
.. //depot/projects/valgrind/massif/hp2ps/Main.c#2 delete
.. //depot/projects/valgrind/massif/hp2ps/Main.h#2 delete
.. //depot/projects/valgrind/massif/hp2ps/Makefile.am#2 delete
.. //depot/projects/valgrind/massif/hp2ps/Makefile.old#2 delete
.. //depot/projects/valgrind/massif/hp2ps/Marks.c#2 delete
.. //depot/projects/valgrind/massif/hp2ps/Marks.h#2 delete
.. //depot/projects/valgrind/massif/hp2ps/PsFile.c#2 delete
.. //depot/projects/valgrind/massif/hp2ps/PsFile.h#2 delete
.. //depot/projects/valgrind/massif/hp2ps/README#2 delete
.. //depot/projects/valgrind/massif/hp2ps/Reorder.c#2 delete
.. //depot/projects/valgrind/massif/hp2ps/Reorder.h#2 delete
.. //depot/projects/valgrind/massif/hp2ps/Scale.c#2 delete
.. //depot/projects/valgrind/massif/hp2ps/Scale.h#2 delete
.. //depot/projects/valgrind/massif/hp2ps/Shade.c#2 delete
.. //depot/projects/valgrind/massif/hp2ps/Shade.h#2 delete
.. //depot/projects/valgrind/massif/hp2ps/TopTwenty.c#2 delete
.. //depot/projects/valgrind/massif/hp2ps/TopTwenty.h#2 delete
.. //depot/projects/valgrind/massif/hp2ps/TraceElement.c#2 delete
.. //depot/projects/valgrind/massif/hp2ps/TraceElement.h#2 delete
.. //depot/projects/valgrind/massif/hp2ps/Utilities.c#2 delete
.. //depot/projects/valgrind/massif/hp2ps/Utilities.h#2 delete
.. //depot/projects/valgrind/massif/hp2ps/hp2ps.1#2 delete
.. //depot/projects/valgrind/memcheck/mc_translate.c#3 integrate
.. //depot/projects/valgrind/none/tests/amd64/Makefile.am#3 integrate
.. //depot/projects/valgrind/none/tests/amd64/bug156404-amd64.c#1 branch
.. //depot/projects/valgrind/none/tests/amd64/bug156404-amd64.stderr.exp#1 branch
.. //depot/projects/valgrind/none/tests/amd64/bug156404-amd64.stdout.exp#1 branch
.. //depot/projects/valgrind/none/tests/amd64/bug156404-amd64.vgtest#1 branch
.. //depot/projects/valgrind/xfree-4.supp#4 integrate

Differences ...

==== //depot/projects/valgrind/VEX/priv/guest-generic/bb_to_IR.c#3 (text+ko) ====

@@ -376,9 +376,12 @@
      irsb->stmts[selfcheck_idx+3]
         = IRStmt_Put( offB_TILEN, IRExpr_RdTmp(tilen_tmp) );
 
-     p_adler_helper = abiinfo_both->host_ppc_calls_use_fndescrs
-                      ? ((HWord*)(&genericg_compute_adler32))[0]
-                      : (HWord)&genericg_compute_adler32;
+     if (abiinfo_both->host_ppc_calls_use_fndescrs) {
+        HWord* fndescr = (HWord*)&genericg_compute_adler32;
+        p_adler_helper = fndescr[0];
+     } else {
+        p_adler_helper = (HWord)&genericg_compute_adler32;
+     }
 
      irsb->stmts[selfcheck_idx+4]
         = IRStmt_Exit( 

==== //depot/projects/valgrind/cachegrind/docs/cg-manual.xml#3 (text+ko) ====

@@ -807,16 +807,12 @@
 instructions.
 
 To do this, you just need to assemble your
-.s files with assembler-level
-debug information.  gcc doesn't do this, but you can use the GNU
-assembler with the --gstabs
-option to generate object files with this information, eg:
-
-
-
-You can then profile and annotate source files in the same
-way as for C/C++ programs.
+.s files with assembly-level debug
+information.  You can use gcc
+-S to compile C/C++ programs to assembly code, and then
+gcc -g on the assembly code files to
+achieve this.  You can then profile and annotate the assembly code source
+files in the same way as C/C++ source files.
 
     
 

==== //depot/projects/valgrind/callgrind/docs/cl-manual.xml#3 (text+ko) ====

@@ -197,7 +197,7 @@
   callgrind_control -i on just before the 
   interesting code section is executed. To exactly specify
   the code position where profiling should start, use the client request
-  CALLGRIND_START_INSTRUMENTATION.
+  .
 
   If you want to be able to see assembly code level annotation, specify
   . This will produce
@@ -292,18 +292,13 @@
 
     
       Program controlled dumping.
-      Put ]]>
-      into your source and add 
-      CALLGRIND_DUMP_STATS; when you
-      want a dump to happen. Use 
-      CALLGRIND_ZERO_STATS; to only 
-      zero cost centers.
-      In Valgrind terminology, this method is called "Client
-      requests".  The given macros generate a special instruction
-      pattern with no effect at all (i.e. a NOP). When run under
-      Valgrind, the CPU simulation engine detects the special
-      instruction pattern and triggers special actions like the ones
-      described above.
+      Insert
+      ;
+      at the position in your code where you want a profile dump to happen. Use 
+      ; to only 
+      zero profile counters.
+      See  for more information on
+      Callgrind specific client requests.
     
   
 
@@ -338,8 +333,8 @@
   with callgrind_control -i on
   and off by specifying "off" instead of "on".
   Furthermore, instrumentation state can be programatically changed with
-  the macros CALLGRIND_START_INSTRUMENTATION;
-  and CALLGRIND_STOP_INSTRUMENTATION;.
+  the macros ;
+  and ;.
   
   
   In addition to enabling instrumentation, you must also enable
@@ -471,6 +466,27 @@
 
   
 
+  
+  Forking Programs
+
+  If your program forks, the child will inherit all the profiling
+  data that has been gathered for the parent. To start with empty profile
+  counter values in the child, the client request
+  ;
+  can be inserted into code to be executed by the child, directly after
+  fork().
+
+  However, you will have to make sure that the output file format string
+  (controlled by ) does contain
+   (which is true by default). Otherwise, the
+  outputs from the parent and child will overwrite each other or will be
+  intermingled, which almost certainly is not what you want.
+
+  You will be able to control the new child independently from
+  the parent via callgrind_control.
+
+  
+
 
 
 
@@ -701,7 +717,7 @@
     
   
   
-  
+  
     
       
     
@@ -733,13 +749,9 @@
       specification of --toggle-collect
       implicitly sets
       --collect-state=no.
-      Collection state can be toggled also by using a Valgrind
-      Client Request in your application.  For this, include
-      valgrind/callgrind.h and specify
-      the macro
-      CALLGRIND_TOGGLE_COLLECT at the
-      needed positions. This only will have any effect if run under
-      supervision of the Callgrind tool.
+      Collection state can be toggled also by inserting the client request
+      ;
+      at the needed code positions.
     
   
 
@@ -912,4 +924,94 @@
 
 
 
+
+Callgrind specific client requests
+
+In Valgrind terminology, a client request is a C macro which
+can be inserted into your code to request specific functionality when
+run under Valgrind. For this, special instruction patterns resulting
+in NOPs are used, but which can be detected by Valgrind.
+
+Callgrind provides the following specific client requests.
+To use them, add the line
+]]>
+into your code for the macro definitions.
+.
+
+
+  
+  
+    
+      CALLGRIND_DUMP_STATS
+    
+    
+      Force generation of a profile dump at specified position
+      in code, for the current thread only. Written counters will be reset
+      to zero.
+    
+  
+
+  
+    
+      CALLGRIND_DUMP_STATS_AT(string)
+    
+    
+      Same as CALLGRIND_DUMP_STATS, but allows to specify a string
+      to be able to distinguish profile dumps.
+    
+  
+
+  
+    
+      CALLGRIND_ZERO_STATS
+    
+    
+      Reset the profile counters for the current thread to zero.
+    
+  
+
+  
+    
+      CALLGRIND_TOGGLE_COLLECT
+    
+    
+      Toggle the collection state. This allows to ignore events
+      with regard to profile counters. See also options
+       and
+      .
+    
+  
+
+  
+    
+      CALLGRIND_START_INSTRUMENTATION
+    
+    
+      Start full Callgrind instrumentation if not already switched on.
+      When cache simulation is done, this will flush the simulated cache
+      and lead to an artifical cache warmup phase afterwards with
+      cache misses which would not have happened in reality.
+      See also option .
+    
+  
+
+  
+    
+      CALLGRIND_STOP_INSTRUMENTATION
+    
+    
+      Stop full Callgrind instrumentation if not already switched off.
+      This flushes Valgrinds translation cache, and does no additional
+      instrumentation afterwards: it effectivly will run at the same
+      speed as the "none" tool, ie. at minimal slowdown. Use this to
+      speed up the Callgrind run for uninteresting code parts. Use
+       to switch on instrumentation again.
+      See also option .
+    
+  
+
+
+
+
+
 

==== //depot/projects/valgrind/callgrind/dump.c#3 (text+ko) ====

@@ -64,13 +64,13 @@
 
 Char* CLG_(get_out_file)()
 {
-    CLG_ASSERT(dumps_initialized);
+    CLG_(init_dumps)();
     return out_file;
 }
 
 Char* CLG_(get_out_directory)()
 {
-    CLG_ASSERT(dumps_initialized);
+    CLG_(init_dumps)();
     return out_directory;
 }
 
@@ -1616,6 +1616,8 @@
    CLG_DEBUG(2, "+ dump_profile(Trigger '%s')\n",
 	    trigger ? trigger : (Char*)"Prg.Term.");
 
+   CLG_(init_dumps)();
+
    if (VG_(clo_verbosity) > 1)
        VG_(message)(Vg_DebugMsg, "Start dumping at BB %llu (%s)...",
 		    CLG_(stat).bb_executions,
@@ -1673,15 +1675,35 @@
  *  always starts with a full absolute path.
  * If the output format string represents a relative path, the current
  * working directory at program start is used.
+ *
+ * This function has to be called every time a profile dump is generated
+ * to be able to react on PID changes.
  */
 void CLG_(init_dumps)()
 {
    Int lastSlash, i;
    SysRes res;
 
+   static int thisPID = 0;
+   int currentPID = VG_(getpid)();
+   if (currentPID == thisPID) {
+       /* already initialized, and no PID change */
+       CLG_ASSERT(out_file != 0);
+       return;
+   }
+   thisPID = currentPID;
+   
    if (!CLG_(clo).out_format)
      CLG_(clo).out_format = DEFAULT_OUTFORMAT;
 
+   /* If a file name was already set, clean up before */
+   if (out_file) {
+       VG_(free)(out_file);
+       VG_(free)(out_directory);
+       VG_(free)(filename);
+       out_counter = 0;
+   }
+
    // Setup output filename.
    out_file =
        VG_(expand_file_name)("--callgrind-out-file", CLG_(clo).out_format);
@@ -1721,7 +1743,8 @@
     }
     if (!res.isError) VG_(close)( (Int)res.res );
 
-    init_cmdbuf();
+    if (!dumps_initialized)
+	init_cmdbuf();
 
     dumps_initialized = True;
 }

==== //depot/projects/valgrind/coregrind/Makefile.am#7 (text+ko) ====

@@ -169,9 +169,11 @@
 	m_debuginfo/priv_readelf.h	\
 	m_debuginfo/priv_readxcoff.h	\
 	m_demangle/ansidecl.h	\
+	m_demangle/cp-demangle.h \
 	m_demangle/dyn-string.h	\
 	m_demangle/demangle.h	\
 	m_demangle/safe-ctype.h \
+	m_demangle/vg_libciface.h \
 	m_scheduler/priv_sema.h \
 	m_syswrap/priv_types_n_macros.h \
 	m_syswrap/priv_syswrap-generic.h \

==== //depot/projects/valgrind/coregrind/m_aspacemgr/aspacemgr-linux.c#4 (text+ko) ====

@@ -325,6 +325,7 @@
 /* ------ end of STATE for the address-space manager ------ */
 
 /* ------ Forwards decls ------ */
+inline
 static Int  find_nsegment_idx ( Addr a );
 
 static void parse_procselfmaps (
@@ -1101,8 +1102,19 @@
 /*-----------------------------------------------------------------*/
 
 /* Binary search the interval array for a given address.  Since the
-   array covers the entire address space the search cannot fail. */
-static Int find_nsegment_idx ( Addr a )
+   array covers the entire address space the search cannot fail.  The
+   _WRK function does the real work.  Its caller (just below) caches
+   the results thereof, to save time.  With N_CACHE of 63 we get a hit
+   rate exceeding 90% when running OpenOffice.
+
+   Re ">> 12", it doesn't matter that the page size of some targets
+   might be different from 12.  Really "(a >> 12) % N_CACHE" is merely
+   a hash function, and the actual cache entry is always validated
+   correctly against the selected cache entry before use.
+*/
+/* Don't call find_nsegment_idx_WRK; use find_nsegment_idx instead. */
+__attribute__((noinline))
+static Int find_nsegment_idx_WRK ( Addr a )
 {
    Addr a_mid_lo, a_mid_hi;
    Int  mid,
@@ -1126,6 +1138,52 @@
    }
 }
 
+inline static Int find_nsegment_idx ( Addr a )
+{
+#  define N_CACHE 63
+   static Addr cache_pageno[N_CACHE];
+   static Int  cache_segidx[N_CACHE];
+   static Bool cache_inited = False;
+
+   static UWord n_q = 0;
+   static UWord n_m = 0;
+
+   UWord ix;
+
+   if (LIKELY(cache_inited)) {
+      /* do nothing */
+   } else {
+      for (ix = 0; ix < N_CACHE; ix++) {
+         cache_pageno[ix] = 0;
+         cache_segidx[ix] = -1;
+      }
+      cache_inited = True;
+   }
+
+   ix = (a >> 12) % N_CACHE;
+
+   n_q++;
+   if (0 && 0 == (n_q & 0xFFFF))
+      VG_(debugLog)(0,"xxx","find_nsegment_idx: %lu %lu\n", n_q, n_m);
+
+   if ((a >> 12) == cache_pageno[ix]
+       && cache_segidx[ix] >= 0
+       && cache_segidx[ix] < nsegments_used
+       && nsegments[cache_segidx[ix]].start <= a
+       && a <= nsegments[cache_segidx[ix]].end) {
+      /* hit */
+      /* aspacem_assert( cache_segidx[ix] == find_nsegment_idx_WRK(a) ); */
+      return cache_segidx[ix];
+   }
+   /* miss */
+   n_m++;
+   cache_segidx[ix] = find_nsegment_idx_WRK(a);
+   cache_pageno[ix] = a >> 12;
+   return cache_segidx[ix];
+#  undef N_CACHE
+}
+
+
 
 /* Finds the segment containing 'a'.  Only returns file/anon/resvn
    segments.  This returns a 'NSegment const *' - a pointer to 

==== //depot/projects/valgrind/coregrind/m_debuginfo/debuginfo.c#6 (text+ko) ====

@@ -99,6 +99,13 @@
 
 
 /*------------------------------------------------------------*/
+/*--- fwdses                                               ---*/
+/*------------------------------------------------------------*/
+
+static void cfsi_cache__invalidate ( void );
+
+
+/*------------------------------------------------------------*/
 /*--- Root structure                                       ---*/
 /*------------------------------------------------------------*/
 
@@ -320,10 +327,11 @@
 /* Repeatedly scan debugInfo_list, looking for DebugInfos with text
    AVMAs intersecting [start,start+length), and call discard_DebugInfo
    to get rid of them.  This modifies the list, hence the multiple
-   iterations.
+   iterations.  Returns True iff any such DebugInfos were found.
 */
-static void discard_syms_in_range ( Addr start, SizeT length )
+static Bool discard_syms_in_range ( Addr start, SizeT length )
 {
+   Bool       anyFound = False;
    Bool       found;
    DebugInfo* curr;
 
@@ -347,8 +355,11 @@
       }
 
       if (!found) break;
+      anyFound = True;
       discard_DebugInfo( curr );
    }
+
+   return anyFound;
 }
 
 
@@ -479,8 +490,86 @@
 }
 
 
+/* Debuginfo reading for 'di' has just been successfully completed.
+   Check that the invariants stated in
+   "Comment_on_IMPORTANT_CFSI_REPRESENTATIONAL_INVARIANTS" in
+   priv_storage.h are observed. */
+static void check_CFSI_related_invariants ( DebugInfo* di )
+{
+   DebugInfo* di2 = NULL;
+   vg_assert(di);
+   /* This fn isn't called until after debuginfo for this object has
+      been successfully read.  And that shouldn't happen until we have
+      both a r-x and rw- mapping for the object.  Hence: */
+   vg_assert(di->have_rx_map);
+   vg_assert(di->have_rw_map);
+   /* degenerate case: r-x section is empty */
+   if (di->rx_map_size == 0) {
+      vg_assert(di->cfsi == NULL);
+      return;
+   }
+   /* normal case: r-x section is nonempty */
+   /* invariant (0) */
+   vg_assert(di->rx_map_size > 0);
+   /* invariant (1) */
+   for (di2 = debugInfo_list; di2; di2 = di2->next) {
+      if (di2 == di)
+         continue;
+      if (di2->rx_map_size == 0)
+         continue;
+      vg_assert(di->rx_map_avma + di->rx_map_size <= di2->rx_map_avma
+                || di2->rx_map_avma + di2->rx_map_size <= di->rx_map_avma);
+   }
+   di2 = NULL;
+   /* invariant (2) */
+   if (di->cfsi) {
+      vg_assert(di->cfsi_minavma <= di->cfsi_maxavma); /* duh! */
+      vg_assert(di->cfsi_minavma >= di->rx_map_avma);
+      vg_assert(di->cfsi_maxavma < di->rx_map_avma + di->rx_map_size);
+   }
+   /* invariants (3) and (4) */
+   if (di->cfsi) {
+      Word i;
+      vg_assert(di->cfsi_used > 0);
+      vg_assert(di->cfsi_size > 0);
+      for (i = 0; i < di->cfsi_used; i++) {
+         DiCfSI* cfsi = &di->cfsi[i];
+         vg_assert(cfsi->len > 0);
+         vg_assert(cfsi->base >= di->cfsi_minavma);
+         vg_assert(cfsi->base + cfsi->len - 1 <= di->cfsi_maxavma);
+         if (i > 0) {
+            DiCfSI* cfsip = &di->cfsi[i-1];
+            vg_assert(cfsip->base + cfsip->len <= cfsi->base);
+         }
+      }
+   } else {
+      vg_assert(di->cfsi_used == 0);
+      vg_assert(di->cfsi_size == 0);
+   }
+}
+
+
 /*--------------------------------------------------------------*/
 /*---                                                        ---*/
+/*--- TOP LEVEL: INITIALISE THE DEBUGINFO SYSTEM             ---*/
+/*---                                                        ---*/
+/*--------------------------------------------------------------*/
+
+void VG_(di_initialise) ( void )
+{
+   /* There's actually very little to do here, since everything
+      centers around the DebugInfos in debugInfo_list, they are
+      created and destroyed on demand, and each one is treated more or
+      less independently. */
+   vg_assert(debugInfo_list == NULL);
+
+   /* flush the CFI fast query cache. */
+   cfsi_cache__invalidate();
+}
+
+
+/*--------------------------------------------------------------*/
+/*---                                                        ---*/
 /*--- TOP LEVEL: NOTIFICATION (ACQUIRE/DISCARD INFO) (LINUX) ---*/
 /*---                                                        ---*/
 /*--------------------------------------------------------------*/
@@ -719,6 +808,8 @@
 
       TRACE_SYMTAB("\n------ Canonicalising the "
                    "acquired info ------\n");
+      /* invalidate the CFI unwind cache. */
+      cfsi_cache__invalidate();
       /* prepare read data for use */
       ML_(canonicaliseTables)( di );
       /* notify m_redir about it */
@@ -728,6 +819,10 @@
       di->have_dinfo = True;
       tl_assert(di->handle > 0);
       di_handle = di->handle;
+      /* Check invariants listed in
+         Comment_on_IMPORTANT_REPRESENTATIONAL_INVARIANTS in
+         priv_storage.h. */
+      check_CFSI_related_invariants(di);
 
    } else {
       TRACE_SYMTAB("\n------ ELF reading failed ------\n");
@@ -735,6 +830,7 @@
          this DebugInfo?  No - it contains info on the rw/rx
          mappings, at least. */
       di_handle = 0;
+      vg_assert(di->have_dinfo == False);
    }
 
    TRACE_SYMTAB("\n");
@@ -751,8 +847,11 @@
    [a, a+len).  */
 void VG_(di_notify_munmap)( Addr a, SizeT len )
 {
+   Bool anyFound;
    if (0) VG_(printf)("DISCARD %#lx %#lx\n", a, a+len);
-   discard_syms_in_range(a, len);
+   anyFound = discard_syms_in_range(a, len);
+   if (anyFound)
+      cfsi_cache__invalidate();
 }
 
 
@@ -766,8 +865,11 @@
 #  if defined(VGP_x86_linux) || defined(VGP_x86_freebsd)
    exe_ok = exe_ok || toBool(prot & VKI_PROT_READ);
 #  endif
-   if (0 && !exe_ok)
-      discard_syms_in_range(a, len);
+   if (0 && !exe_ok) {
+      Bool anyFound = discard_syms_in_range(a, len);
+      if (anyFound)
+         cfsi_cache__invalidate();
+   }
 }
 
 #endif /* defined(VGO_linux) */
@@ -798,6 +900,10 @@
 {
    ULong hdl = 0;
 
+   /* play safe; always invalidate the CFI cache.  Not
+      that it should be used on AIX, but still .. */
+   cfsi_cache__invalidate();
+
    if (acquire) {
 
       Bool       ok;
@@ -841,6 +947,10 @@
          di->have_dinfo = True;
          hdl = di->handle;
          vg_assert(hdl > 0);
+         /* Check invariants listed in
+            Comment_on_IMPORTANT_REPRESENTATIONAL_INVARIANTS in
+            priv_storage.h. */
+         check_CFSI_related_invariants(di);
       } else {
          /*  Something went wrong (eg. bad XCOFF file). */
          discard_DebugInfo( di );
@@ -851,8 +961,11 @@
 
       /* Dump all the debugInfos whose text segments intersect
          code_start/code_len. */
+      /* CFI cache is always invalidated at start of this routine.
+         Hence it's safe to ignore the return value of
+         discard_syms_in_range. */
       if (code_len > 0)
-         discard_syms_in_range( code_start, code_len );
+         (void)discard_syms_in_range( code_start, code_len );
 
    }
 
@@ -894,11 +1007,11 @@
    If findText==False, only data symbols are searched for.
 */
 static void search_all_symtabs ( Addr ptr, /*OUT*/DebugInfo** pdi,
-                                           /*OUT*/Int* symno,
+                                           /*OUT*/Word* symno,
                                  Bool match_anywhere_in_sym,
                                  Bool findText )
 {
-   Int        sno;
+   Word       sno;
    DebugInfo* di;
    Bool       inRange;
 
@@ -945,9 +1058,9 @@
    *pdi to the relevant DebugInfo, and *locno to the loctab entry
    *number within that.  If not found, *pdi is set to NULL. */
 static void search_all_loctabs ( Addr ptr, /*OUT*/DebugInfo** pdi,
-                                           /*OUT*/Int* locno )
+                                           /*OUT*/Word* locno )
 {
-   Int        lno;
+   Word       lno;
    DebugInfo* di;
    for (di = debugInfo_list; di != NULL; di = di->next) {
       if (di->text_present
@@ -978,7 +1091,7 @@
                     Bool findText, /*OUT*/OffT* offsetP )
 {
    DebugInfo* di;
-   Int        sno;
+   Word       sno;
    Int        offset;
 
    search_all_symtabs ( a, &di, &sno, match_anywhere_in_sym, findText );
@@ -1020,7 +1133,7 @@
 Addr VG_(get_tocptr) ( Addr guest_code_addr )
 {
    DebugInfo* si;
-   Int        sno;
+   Word       sno;
    search_all_symtabs ( guest_code_addr, 
                         &si, &sno,
                         True/*match_anywhere_in_fun*/,
@@ -1187,7 +1300,7 @@
 Bool VG_(get_filename)( Addr a, Char* filename, Int n_filename )
 {
    DebugInfo* si;
-   Int      locno;
+   Word       locno;
    search_all_loctabs ( a, &si, &locno );
    if (si == NULL) 
       return False;
@@ -1199,7 +1312,7 @@
 Bool VG_(get_linenum)( Addr a, UInt* lineno )
 {
    DebugInfo* si;
-   Int      locno;
+   Word       locno;
    search_all_loctabs ( a, &si, &locno );
    if (si == NULL) 
       return False;
@@ -1218,7 +1331,7 @@
                                  /*OUT*/UInt* lineno )
 {
    DebugInfo* si;
-   Int      locno;
+   Word       locno;
 
    vg_assert( (dirname == NULL && dirname_available == NULL)
               ||
@@ -1542,6 +1655,122 @@
 }
 
 
+/* Search all the DebugInfos in the entire system, to find the DiCfSI
+   that pertains to 'ip'. 
+
+   If found, set *diP to the DebugInfo in which it resides, and
+   *ixP to the index in that DebugInfo's cfsi array.
+
+   If not found, set *diP to (DebugInfo*)1 and *ixP to zero.
+*/
+__attribute__((noinline))
+static void find_DiCfSI ( /*OUT*/DebugInfo** diP, 
+                          /*OUT*/Word* ixP,
+                          Addr ip )
+{
+   DebugInfo* di;
+   Word       i = -1;
+
+   static UWord n_search = 0;
+   static UWord n_steps = 0;
+   n_search++;
+
+   if (0) VG_(printf)("search for %#lx\n", ip);
+
+   for (di = debugInfo_list; di != NULL; di = di->next) {
+      Word j;
+      n_steps++;
+
+      /* Use the per-DebugInfo summary address ranges to skip
+         inapplicable DebugInfos quickly. */
+      if (di->cfsi_used == 0)
+         continue;
+      if (ip < di->cfsi_minavma || ip > di->cfsi_maxavma)
+         continue;
+
+      /* It might be in this DebugInfo.  Search it. */
+      j = ML_(search_one_cfitab)( di, ip );
+      vg_assert(j >= -1 && j < (Word)di->cfsi_used);
+
+      if (j != -1) {
+         i = j;
+         break; /* found it */
+      }
+   }
+
+   if (i == -1) {
+
+      /* we didn't find it. */
+      *diP = (DebugInfo*)1;
+      *ixP = 0;
+
+   } else {
+
+      /* found it. */
+      /* ensure that di is 4-aligned (at least), so it can't possibly
+         be equal to (DebugInfo*)1. */
+      vg_assert(di && VG_IS_4_ALIGNED(di));
+      vg_assert(i >= 0 && i < di->cfsi_used);
+      *diP = di;
+      *ixP = i;
+
+      /* Start of performance-enhancing hack: once every 64 (chosen
+         hackily after profiling) successful searches, move the found
+         DebugInfo one step closer to the start of the list.  This
+         makes future searches cheaper.  For starting konqueror on
+         amd64, this in fact reduces the total amount of searching
+         done by the above find-the-right-DebugInfo loop by more than
+         a factor of 20. */
+      if ((n_search & 0xF) == 0) {
+         /* Move di one step closer to the start of the list. */
+         move_DebugInfo_one_step_forward( di );
+      }
+      /* End of performance-enhancing hack. */
+
+      if (0 && ((n_search & 0x7FFFF) == 0))
+         VG_(printf)("find_DiCfSI: %lu searches, "
+                     "%lu DebugInfos looked at\n", 
+                     n_search, n_steps);
+
+   }
+
+}
+
+
+/* Now follows a mechanism for caching queries to find_DiCfSI, since
+   they are extremely frequent on amd64-linux, during stack unwinding.
+
+   Each cache entry binds an ip value to a (di, ix) pair.  Possible
+   values:
+
+   di is non-null, ix >= 0  ==>  cache slot in use, "di->cfsi[ix]"
+   di is (DebugInfo*)1      ==>  cache slot in use, no associated di
+   di is NULL               ==>  cache slot not in use
+
+   Hence simply zeroing out the entire cache invalidates all
+   entries.
+
+   Why not map ip values directly to DiCfSI*'s?  Because this would
+   cause problems if/when the cfsi array is moved due to resizing.
+   Instead we cache .cfsi array index value, which should be invariant
+   across resizing.  (That said, I don't think the current
+   implementation will resize whilst during queries, since the DiCfSI
+   records are added all at once, when the debuginfo for an object is
+   read, and is not changed ever thereafter. */
+
+#define N_CFSI_CACHE 511
+
+typedef
+   struct { Addr ip; DebugInfo* di; Word ix; }
+   CFSICacheEnt;
+
+static CFSICacheEnt cfsi_cache[N_CFSI_CACHE];
+
+static void cfsi_cache__invalidate ( void ) {
+   VG_(memset)(&cfsi_cache, 0, sizeof(cfsi_cache));
+}
+
+
 /* The main function for DWARF2/3 CFI-based stack unwinding.
    Given an IP/SP/FP triple, produce the IP/SP/FP values for the
    previous frame, if possible. */
@@ -1554,61 +1783,47 @@
                         Addr min_accessible,
                         Addr max_accessible )
 {
-   Bool     ok;
-   Int      i;
-   DebugInfo* si;
-   DiCfSI*  cfsi = NULL;
-   Addr     cfa, ipHere, spHere, fpHere, ipPrev, spPrev, fpPrev;
+   Bool       ok;
+   DebugInfo* di;
+   DiCfSI*    cfsi = NULL;
+   Addr       cfa, ipHere, spHere, fpHere, ipPrev, spPrev, fpPrev;
 
    CfiExprEvalContext eec;
 
-   static UInt n_search = 0;
-   static UInt n_steps = 0;
-   n_search++;
+   static UWord n_q = 0, n_m = 0;
+   n_q++;
+   if (0 && 0 == (n_q & 0x1FFFFF))
+      VG_(printf)("QQQ %lu %lu\n", n_q, n_m);
 
-   if (0) VG_(printf)("search for %#lx\n", *ipP);
+   { UWord hash = (*ipP) % N_CFSI_CACHE;
+     CFSICacheEnt* ce = &cfsi_cache[hash];
 
-   for (si = debugInfo_list; si != NULL; si = si->next) {
-      n_steps++;
+     if (LIKELY(ce->ip == *ipP) && LIKELY(ce->di != NULL)) {
+        /* found an entry in the cache .. */
+     } else {
+        /* not found in cache.  Search and update. */
+        n_m++;
+        ce->ip = *ipP;
+        find_DiCfSI( &ce->di, &ce->ix, *ipP );
+     }
 
-      /* Use the per-DebugInfo summary address ranges to skip
-         inapplicable DebugInfos quickly. */
-      if (si->cfsi_used == 0)

>>> TRUNCATED FOR MAIL (1000 lines) <<<

From owner-p4-projects@FreeBSD.ORG  Fri Oct 31 18:54:18 2008
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 537851065675; Fri, 31 Oct 2008 18:54:18 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 152EF106567D
	for ; Fri, 31 Oct 2008 18:54:18 +0000 (UTC)
	(envelope-from peter-gmail@wemm.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 038038FC23
	for ; Fri, 31 Oct 2008 18:54:18 +0000 (UTC)
	(envelope-from peter-gmail@wemm.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id m9VIsHc4092327
	for ; Fri, 31 Oct 2008 18:54:17 GMT
	(envelope-from peter-gmail@wemm.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m9VIsH8r092325
	for perforce@freebsd.org; Fri, 31 Oct 2008 18:54:17 GMT
	(envelope-from peter-gmail@wemm.org)
Date: Fri, 31 Oct 2008 18:54:17 GMT
Message-Id: <200810311854.m9VIsH8r092325@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	peter-gmail@wemm.org using -f
From: Peter Wemm 
To: Perforce Change Reviews 
Cc: 
Subject: PERFORCE change 152287 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, 31 Oct 2008 18:54:18 -0000

http://perforce.freebsd.org/chv.cgi?CH=152287

Change 152287 by peter@peter_overcee on 2008/10/31 18:53:56

	We've long been remiss about the END() macro matching
	the corresponding ENTRY() macro.  This is what sets the ELF
	function size attribute.  It turns out that valgrind cares and
	that this is not negotiable.  Fix it at the source.

Affected files ...

.. //depot/projects/hammer/lib/libc/amd64/SYS.h#10 edit
.. //depot/projects/hammer/lib/libc/amd64/gen/_setjmp.S#9 edit
.. //depot/projects/hammer/lib/libc/amd64/gen/fabs.S#7 edit
.. //depot/projects/hammer/lib/libc/amd64/gen/modf.S#8 edit
.. //depot/projects/hammer/lib/libc/amd64/gen/rfork_thread.S#4 edit
.. //depot/projects/hammer/lib/libc/amd64/gen/setjmp.S#11 edit
.. //depot/projects/hammer/lib/libc/amd64/gen/sigsetjmp.S#11 edit
.. //depot/projects/hammer/lib/libc/amd64/stdlib/div.S#4 edit
.. //depot/projects/hammer/lib/libc/amd64/stdlib/ldiv.S#4 edit
.. //depot/projects/hammer/lib/libc/amd64/stdlib/lldiv.S#2 edit
.. //depot/projects/hammer/lib/libc/amd64/string/bcmp.S#4 edit
.. //depot/projects/hammer/lib/libc/amd64/string/bcopy.S#4 edit
.. //depot/projects/hammer/lib/libc/amd64/string/bzero.S#4 edit
.. //depot/projects/hammer/lib/libc/amd64/string/memcmp.S#4 edit
.. //depot/projects/hammer/lib/libc/amd64/string/memset.S#4 edit
.. //depot/projects/hammer/lib/libc/amd64/string/strcat.S#4 edit
.. //depot/projects/hammer/lib/libc/amd64/string/strcmp.S#4 edit
.. //depot/projects/hammer/lib/libc/amd64/string/strcpy.S#5 edit
.. //depot/projects/hammer/lib/libc/amd64/sys/brk.S#10 edit
.. //depot/projects/hammer/lib/libc/amd64/sys/exect.S#9 edit
.. //depot/projects/hammer/lib/libc/amd64/sys/getcontext.S#2 edit
.. //depot/projects/hammer/lib/libc/amd64/sys/pipe.S#9 edit
.. //depot/projects/hammer/lib/libc/amd64/sys/ptrace.S#8 edit
.. //depot/projects/hammer/lib/libc/amd64/sys/reboot.S#7 edit
.. //depot/projects/hammer/lib/libc/amd64/sys/sbrk.S#8 edit
.. //depot/projects/hammer/lib/libc/amd64/sys/setlogin.S#9 edit
.. //depot/projects/hammer/lib/libc/amd64/sys/vfork.S#8 edit

Differences ...

==== //depot/projects/hammer/lib/libc/amd64/SYS.h#10 (text+ko) ====

@@ -43,13 +43,15 @@
 			.weak CNAME(__CONCAT(_,x));			\
 			.set CNAME(__CONCAT(_,x)),CNAME(__CONCAT(__sys_,x)); \
 			mov __CONCAT($SYS_,x),%rax; KERNCALL; jb 2f; ret; \
-			2: movq PIC_GOT(HIDENAME(cerror)),%rcx; jmp *%rcx
+			2: movq PIC_GOT(HIDENAME(cerror)),%rcx; jmp *%rcx; \
+			END(__CONCAT(__sys_,x))
 
 #define	PSEUDO(x)	ENTRY(__CONCAT(__sys_,x));			\
 			.weak CNAME(__CONCAT(_,x));			\
 			.set CNAME(__CONCAT(_,x)),CNAME(__CONCAT(__sys_,x)); \
 			mov __CONCAT($SYS_,x),%rax; KERNCALL; jb 2f; ret ; \
-			2: movq PIC_GOT(HIDENAME(cerror)),%rcx; jmp *%rcx
+			2: movq PIC_GOT(HIDENAME(cerror)),%rcx; jmp *%rcx; \
+			END(__CONCAT(__sys_,x))
 #else
 #define	RSYSCALL(x)	ENTRY(__CONCAT(__sys_,x));			\
 			.weak CNAME(x);					\
@@ -57,13 +59,15 @@
 			.weak CNAME(__CONCAT(_,x));			\
 			.set CNAME(__CONCAT(_,x)),CNAME(__CONCAT(__sys_,x)); \
 			mov __CONCAT($SYS_,x),%rax; KERNCALL; jb 2f; ret; \
-			2: jmp HIDENAME(cerror)
+			2: jmp HIDENAME(cerror);			\
+			END(__CONCAT(__sys_,x))
 
 #define	PSEUDO(x)	ENTRY(__CONCAT(__sys_,x));			\
 			.weak CNAME(__CONCAT(_,x));			\
 			.set CNAME(__CONCAT(_,x)),CNAME(__CONCAT(__sys_,x)); \
 			mov __CONCAT($SYS_,x),%rax; KERNCALL; jb 2f; ret; \
-			2: jmp HIDENAME(cerror)
+			2: jmp HIDENAME(cerror);			\
+			END(__CONCAT(__sys_,x))
 #endif
 
 #define KERNCALL	movq %rcx, %r10; syscall

==== //depot/projects/hammer/lib/libc/amd64/gen/_setjmp.S#9 (text+ko) ====

@@ -61,6 +61,7 @@
 	stmxcsr	68(%rax)		/*    and mxcsr */
 	xorq	%rax,%rax
 	ret
+END(_setjmp)
 
 	.weak	CNAME(_longjmp)
 	.set	CNAME(_longjmp),CNAME(___longjmp)
@@ -90,3 +91,4 @@
 	incq	%rax
 1:	movq	%rcx,0(%rsp)
 	ret
+END(___longjmp)

==== //depot/projects/hammer/lib/libc/amd64/gen/fabs.S#7 (text+ko) ====

@@ -37,6 +37,7 @@
 	movsd	signbit(%rip), %xmm0
 	andnpd  %xmm1, %xmm0
 	ret
+END(fabs)
 
 	.data
 signbit:

==== //depot/projects/hammer/lib/libc/amd64/gen/modf.S#8 (text+ko) ====

@@ -86,3 +86,4 @@
 	movsd   -8(%rsp),%xmm0
 
 	ret
+END(modf)

==== //depot/projects/hammer/lib/libc/amd64/gen/rfork_thread.S#4 (text+ko) ====

@@ -99,3 +99,4 @@
 #else
 	jmp	HIDENAME(cerror)
 #endif
+END(rfork_thread)

==== //depot/projects/hammer/lib/libc/amd64/gen/setjmp.S#11 (text+ko) ====

@@ -70,6 +70,7 @@
 	stmxcsr	68(%rcx)		/*    and mxcsr */
 	xorq	%rax,%rax
 	ret
+END(setjmp)
 
 	.weak CNAME(longjmp)
 	.set CNAME(longjmp),CNAME(__longjmp)
@@ -108,3 +109,4 @@
 	incq	%rax
 1:	movq	%rcx,0(%rsp)
 	ret
+END(__longjmp)

==== //depot/projects/hammer/lib/libc/amd64/gen/sigsetjmp.S#11 (text+ko) ====

@@ -77,6 +77,7 @@
 	fnstcw	64(%rcx)		/* 8; fpu cw */
 	xorq	%rax,%rax
 	ret
+END(sigsetjmp)
 
 	.weak CNAME(siglongjmp)
 	.set CNAME(siglongjmp),CNAME(__siglongjmp)
@@ -109,3 +110,4 @@
 	incq	%rax
 1:	movq	%rcx,0(%rsp)
 	ret
+END(__siglongjmp)

==== //depot/projects/hammer/lib/libc/amd64/stdlib/div.S#4 (text+ko) ====

@@ -15,3 +15,4 @@
 	salq	$32,%rdx
 	orq	%rdx,%rax
 	ret
+END(div)

==== //depot/projects/hammer/lib/libc/amd64/stdlib/ldiv.S#4 (text+ko) ====

@@ -13,3 +13,4 @@
 	cqto
 	idivq	%rsi
 	ret
+END(ldiv)

==== //depot/projects/hammer/lib/libc/amd64/stdlib/lldiv.S#2 (text+ko) ====

@@ -13,3 +13,4 @@
 	cqto
 	idivq	%rsi
 	ret
+END(lldiv)

==== //depot/projects/hammer/lib/libc/amd64/string/bcmp.S#4 (text+ko) ====

@@ -22,3 +22,4 @@
 	setne	%al
 	movsbl	%al,%eax
 	ret
+END(bcmp)

==== //depot/projects/hammer/lib/libc/amd64/string/bcopy.S#4 (text+ko) ====

@@ -86,3 +86,12 @@
 	movsq
 	cld
 	ret
+#ifdef MEMCOPY
+END(memcpy)
+#else
+#ifdef MEMMOVE
+END(memmove)
+#else
+END(bcopy)
+#endif
+#endif

==== //depot/projects/hammer/lib/libc/amd64/string/bzero.S#4 (text+ko) ====

@@ -41,3 +41,4 @@
 	stosb
 
 	ret
+END(bzero)

==== //depot/projects/hammer/lib/libc/amd64/string/memcmp.S#4 (text+ko) ====

@@ -39,3 +39,4 @@
 	movb	-1(%rsi),%dl
 	subl    %edx,%eax
 	ret
+END(memcmp)

==== //depot/projects/hammer/lib/libc/amd64/string/memset.S#4 (text+ko) ====

@@ -58,3 +58,4 @@
 	movq	%r11,%rax
 
 	ret
+END(memset)

==== //depot/projects/hammer/lib/libc/amd64/string/strcat.S#4 (text+ko) ====

@@ -163,3 +163,4 @@
 
 .Ldone:
 	ret
+END(strcat)

==== //depot/projects/hammer/lib/libc/amd64/string/strcmp.S#4 (text+ko) ====

@@ -71,3 +71,4 @@
 	movzbq	%dl,%rdx
 	subq	%rdx,%rax
 	ret
+END(strcmp)

==== //depot/projects/hammer/lib/libc/amd64/string/strcpy.S#5 (text+ko) ====

@@ -109,3 +109,4 @@
 
 .Ldone:
 	ret
+END(strcpy)

==== //depot/projects/hammer/lib/libc/amd64/sys/brk.S#10 (text+ko) ====

@@ -43,6 +43,7 @@
 ENTRY(_brk)
 	pushq	%rdi
 	jmp	ok
+END(_brk)
 
 ENTRY(brk)
 	pushq	%rdi
@@ -81,3 +82,4 @@
 #else
 	jmp	HIDENAME(cerror)
 #endif
+END(brk)

==== //depot/projects/hammer/lib/libc/amd64/sys/exect.S#9 (text+ko) ====

@@ -53,3 +53,4 @@
 #else
 	jmp	HIDENAME(cerror)
 #endif
+END(exect)

==== //depot/projects/hammer/lib/libc/amd64/sys/getcontext.S#2 (text+ko) ====

@@ -52,3 +52,4 @@
 #else
 	jmp	HIDENAME(cerror)
 #endif
+END(__sys_getcontext)

==== //depot/projects/hammer/lib/libc/amd64/sys/pipe.S#9 (text+ko) ====

@@ -57,3 +57,4 @@
 #else
 	jmp	HIDENAME(cerror)
 #endif
+END(__sys_pipe)

==== //depot/projects/hammer/lib/libc/amd64/sys/ptrace.S#8 (text+ko) ====

@@ -57,3 +57,4 @@
 #else
 	jmp	HIDENAME(cerror)
 #endif
+END(ptrace)

==== //depot/projects/hammer/lib/libc/amd64/sys/reboot.S#7 (text+ko) ====

@@ -54,3 +54,4 @@
 #else
 	jmp	HIDENAME(cerror)
 #endif
+END(__sys_reboot)

==== //depot/projects/hammer/lib/libc/amd64/sys/sbrk.S#8 (text+ko) ====

@@ -85,3 +85,4 @@
 #else
 	jmp	HIDENAME(cerror)
 #endif
+END(sbrk)

==== //depot/projects/hammer/lib/libc/amd64/sys/setlogin.S#9 (text+ko) ====

@@ -62,3 +62,4 @@
 #else
 	jmp	HIDENAME(cerror)
 #endif
+END(__sys_setlogin)

==== //depot/projects/hammer/lib/libc/amd64/sys/vfork.S#8 (text+ko) ====

@@ -56,3 +56,4 @@
 #else
 	jmp	HIDENAME(cerror)
 #endif
+END(__sys_vfork)

From owner-p4-projects@FreeBSD.ORG  Fri Oct 31 19:23:48 2008
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id CF6521065696; Fri, 31 Oct 2008 19:23:48 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 4776C1065676
	for ; Fri, 31 Oct 2008 19:23:48 +0000 (UTC)
	(envelope-from peter-gmail@wemm.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 366908FC12
	for ; Fri, 31 Oct 2008 19:23:48 +0000 (UTC)
	(envelope-from peter-gmail@wemm.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id m9VJNmpu095655
	for ; Fri, 31 Oct 2008 19:23:48 GMT
	(envelope-from peter-gmail@wemm.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m9VJNmDK095653
	for perforce@freebsd.org; Fri, 31 Oct 2008 19:23:48 GMT
	(envelope-from peter-gmail@wemm.org)
Date: Fri, 31 Oct 2008 19:23:48 GMT
Message-Id: <200810311923.m9VJNmDK095653@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	peter-gmail@wemm.org using -f
From: Peter Wemm 
To: Perforce Change Reviews 
Cc: 
Subject: PERFORCE change 152290 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, 31 Oct 2008 19:23:49 -0000

http://perforce.freebsd.org/chv.cgi?CH=152290

Change 152290 by peter@peter_overcee on 2008/10/31 19:23:33

	Patch up a few warnings.  Will probably cause whiplash on i386.

Affected files ...

.. //depot/projects/valgrind/coregrind/m_sigframe/sigframe-amd64-freebsd.c#3 edit
.. //depot/projects/valgrind/coregrind/m_signals.c#7 edit
.. //depot/projects/valgrind/coregrind/m_syscall.c#9 edit
.. //depot/projects/valgrind/coregrind/m_syswrap/syswrap-amd64-freebsd.c#5 edit
.. //depot/projects/valgrind/include/vki/vki-freebsd.h#9 edit

Differences ...

==== //depot/projects/valgrind/coregrind/m_sigframe/sigframe-amd64-freebsd.c#3 (text+ko) ====

@@ -389,14 +389,14 @@
    if (VG_(extend_stack)(addr, tst->client_stack_szB)) {
       stackseg = VG_(am_find_nsegment)(addr);
       if (0 && stackseg)
-	 VG_(printf)("frame=%p seg=%p-%p\n",
+	 VG_(printf)("frame=%#lx seg=%#lx-%#lx\n",
 		     addr, stackseg->start, stackseg->end);
    }
 
    if (stackseg == NULL || !stackseg->hasR || !stackseg->hasW) {
       VG_(message)(
          Vg_UserMsg,
-         "Can't extend stack to %p during signal delivery for thread %d:",
+         "Can't extend stack to %#lx during signal delivery for thread %d:",
          addr, tid);
       if (stackseg == NULL)
          VG_(message)(Vg_UserMsg, "  no stack segment");
@@ -523,8 +523,8 @@
       caller to do. */
 
    if (0)
-      VG_(printf)("pushed signal frame; %%RSP now = %p, "
-                  "next %%RIP = %p, status=%d\n", 
+      VG_(printf)("pushed signal frame; %%RSP now = %#lx, "
+                  "next %%RIP = %#llx, status=%d\n", 
 		  rsp, tst->arch.vex.guest_RIP, tst->status);
 }
 
@@ -641,7 +641,7 @@
    if (VG_(clo_trace_signals))
       VG_(message)(
          Vg_DebugMsg, 
-         "VG_(signal_return) (thread %d): isRT=%d valid magic; RIP=%p", 
+         "VG_(signal_return) (thread %d): isRT=%d valid magic; RIP=%#llx", 
          tid, isRT, tst->arch.vex.guest_RIP);
 
    /* tell the tools */

==== //depot/projects/valgrind/coregrind/m_signals.c#7 (text+ko) ====

@@ -1537,6 +1537,7 @@
    deliver_signal(tid, &info, &uc);
 }
 
+#ifndef VGO_freebsd
 /* Make a signal pending for a thread, for later delivery.
    VG_(poll_signals) will arrange for it to be delivered at the right
    time. 
@@ -1582,6 +1583,7 @@
 
    restore_all_host_signals(&savedmask);
 }
+#endif
 
 /*
    Returns the next queued signal for thread tid which is in "set".
@@ -1866,7 +1868,7 @@
 
    if (VG_(clo_trace_signals)) {
       VG_(message)(Vg_DebugMsg, "signal %d arrived ... si_code=%d, "
-                                "EIP=%#lx, eip=%#x addr=%#lx",
+                                "EIP=%#lx, eip=%#lx addr=%#lx",
                    sigNo, info->si_code, VG_(get_IP)(tid), 
 		   VG_UCONTEXT_INSTR_PTR(uc), (Addr)info->si_addr );
    }
@@ -1974,7 +1976,7 @@
 		   sigNo, signame(sigNo));
 
       VG_(message)(Vg_DebugMsg, 
-		   "si_code=%x;  Faulting address: %p;  sp: %#x",
+		   "si_code=%x;  Faulting address: %p;  sp: %#lx",
 		   info->si_code, info->VKI_SIGINFO_si_addr,
                    VG_UCONTEXT_STACK_PTR(uc));
 

==== //depot/projects/valgrind/coregrind/m_syscall.c#9 (text+ko) ====

@@ -600,8 +600,8 @@
   ULong val = do_syscall_WRK(sysno,a1,a2,a3,a4,a5,a6,a7,a8,&flags,rv2);
   return VG_(mk_SysRes_x86_freebsd)( (UInt)val, (UInt)(val>>32), flags );
 #elif defined(VGP_amd64_freebsd)
-  ULong val2 = -10;
-  ULong val = do_syscall_WRK(sysno,a1,a2,a3,a4,a5,a6,a7,a8,&flags,&val2);
+  UWord val2 = -10;
+  UWord val = do_syscall_WRK(sysno,a1,a2,a3,a4,a5,a6,a7,a8,&flags,&val2);
   return VG_(mk_SysRes_amd64_freebsd)( val, val2, flags );
 #else
 #   error Unknown platform

==== //depot/projects/valgrind/coregrind/m_syswrap/syswrap-amd64-freebsd.c#5 (text+ko) ====

@@ -369,9 +369,9 @@
       /* On FreeBSD, the syscall loads the %gs selector for us, so do it now. */
       tst = VG_(get_ThreadState)(tid);
       p = (void**)ARG2;
-      tst->arch.vex.guest_FS_ZERO = *p;
+      tst->arch.vex.guest_FS_ZERO = (UWord)*p;
       /* "do" the syscall ourselves; the kernel never sees it */
-      SET_STATUS_Success2(*p, tst->arch.vex.guest_RDX );
+      SET_STATUS_Success2((ULong)*p, tst->arch.vex.guest_RDX );
 
       break;
    case VKI_AMD64_GET_FSBASE:
@@ -380,6 +380,7 @@
       PRE_MEM_WRITE( "amd64_get_fsbase(basep)", ARG2, sizeof(void *) );
 
       /* "do" the syscall ourselves; the kernel never sees it */
+      tst = VG_(get_ThreadState)(tid);
       SET_STATUS_Success2( tst->arch.vex.guest_FS_ZERO, tst->arch.vex.guest_RDX );
       POST_MEM_WRITE( ARG2, sizeof(void *) );
       break;

==== //depot/projects/valgrind/include/vki/vki-freebsd.h#9 (text+ko) ====

@@ -520,7 +520,9 @@
 	vki_sigval_t sigev_value;       /* Signal value */
 };
 #define sigev_signo             __sigev_u.__sigev_signo
+#if 0
 #define sigev_notify_kqueue     __sigev_u.__sigev_notify_kqueue
+#endif
 
 //----------------------------------------------------------------------
 // From sys/_iovec.h

From owner-p4-projects@FreeBSD.ORG  Fri Oct 31 19:58:23 2008
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id A9B9C1065680; Fri, 31 Oct 2008 19:58:23 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 6DFCF1065688
	for ; Fri, 31 Oct 2008 19:58:23 +0000 (UTC)
	(envelope-from peter-gmail@wemm.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 44C588FC20
	for ; Fri, 31 Oct 2008 19:58:23 +0000 (UTC)
	(envelope-from peter-gmail@wemm.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id m9VJwNUp098235
	for ; Fri, 31 Oct 2008 19:58:23 GMT
	(envelope-from peter-gmail@wemm.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m9VJwNJg098233
	for perforce@freebsd.org; Fri, 31 Oct 2008 19:58:23 GMT
	(envelope-from peter-gmail@wemm.org)
Date: Fri, 31 Oct 2008 19:58:23 GMT
Message-Id: <200810311958.m9VJwNJg098233@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	peter-gmail@wemm.org using -f
From: Peter Wemm 
To: Perforce Change Reviews 
Cc: 
Subject: PERFORCE change 152291 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, 31 Oct 2008 19:58:24 -0000

http://perforce.freebsd.org/chv.cgi?CH=152291

Change 152291 by peter@peter_overcee on 2008/10/31 19:58:21

	Correct the sigaction structure layout.  flags is int, not long.

Affected files ...

.. //depot/projects/valgrind/include/vki/vki-amd64-freebsd.h#3 edit

Differences ...

==== //depot/projects/valgrind/include/vki/vki-amd64-freebsd.h#3 (text+ko) ====

@@ -123,7 +123,7 @@
 
 struct vki_sigaction {
 	__vki_sighandler_t ksa_handler;
-	unsigned long sa_flags;
+	unsigned int sa_flags;
 	vki_sigset_t sa_mask;		/* mask last for extensibility */
 };
 

From owner-p4-projects@FreeBSD.ORG  Fri Oct 31 20:43:22 2008
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id DF81E106567D; Fri, 31 Oct 2008 20:43:21 +0000 (UTC)
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id A21C21065674
	for ; Fri, 31 Oct 2008 20:43:21 +0000 (UTC)
	(envelope-from hselasky@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 926EC8FC1B
	for ; Fri, 31 Oct 2008 20:43:21 +0000 (UTC)
	(envelope-from hselasky@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id m9VKhL28004088
	for ; Fri, 31 Oct 2008 20:43:21 GMT
	(envelope-from hselasky@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m9VKhLjK004086
	for perforce@freebsd.org; Fri, 31 Oct 2008 20:43:21 GMT
	(envelope-from hselasky@FreeBSD.org)
Date: Fri, 31 Oct 2008 20:43:21 GMT
Message-Id: <200810312043.m9VKhLjK004086@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 152295 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, 31 Oct 2008 20:43:22 -0000

http://perforce.freebsd.org/chv.cgi?CH=152295

Change 152295 by hselasky@hselasky_laptop001 on 2008/10/31 20:42:38

	
	Some USB related kernel config option corrections.

Affected files ...

.. //depot/projects/usb/src/sys/conf/files#38 edit

Differences ...

==== //depot/projects/usb/src/sys/conf/files#38 (text+ko) ====

@@ -1348,6 +1348,8 @@
 dev/usb2/controller/ohci2_pci.c		optional usb2_core usb2_controller usb2_controller_ohci pci
 dev/usb2/controller/uhci2.c		optional usb2_core usb2_controller usb2_controller_uhci
 dev/usb2/controller/uhci2_pci.c		optional usb2_core usb2_controller usb2_controller_uhci pci
+dev/usb2/controller/uss820dci.c		optional usb2_core usb2_controller usb2_controller_uss820dci
+dev/usb2/controller/uss820dci_atmelarm.c	optional usb2_core usb2_controller usb2_controller_uss820dci at91rm9200
 dev/usb2/controller/usb2_controller.c	optional usb2_core usb2_controller
 #
 # USB2 storage drivers
@@ -1397,7 +1399,7 @@
 dev/usb2/ethernet/if_cue2.c		optional usb2_core usb2_ethernet usb2_ethernet_cue
 dev/usb2/ethernet/if_kue2.c		optional usb2_core usb2_ethernet usb2_ethernet_kue
 dev/usb2/ethernet/if_rue2.c		optional usb2_core usb2_ethernet usb2_ethernet_rue
-dev/usb2/ethernet/if_udav2.c		optional usb2_core usb2_ethernet usb2_ethernet_udav
+dev/usb2/ethernet/if_udav2.c		optional usb2_core usb2_ethernet usb2_ethernet_dav
 dev/usb2/ethernet/usb2_ethernet.c	optional usb2_core usb2_ethernet
 #
 # USB2 WLAN drivers
@@ -1444,7 +1446,7 @@
 #
 dev/usb2/input/uhid2.c		optional usb2_core usb2_input usb2_input_hid
 dev/usb2/input/ukbd2.c		optional usb2_core usb2_input usb2_input_kbd
-dev/usb2/input/ums2.c		optional usb2_core usb2_input usb2_input_ums
+dev/usb2/input/ums2.c		optional usb2_core usb2_input usb2_input_ms
 dev/usb2/input/usb2_input.c	optional usb2_core usb2_input
 #
 # USB2 quirks

From owner-p4-projects@FreeBSD.ORG  Fri Oct 31 20:46:33 2008
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 2D5E91065672; Fri, 31 Oct 2008 20:46:33 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id E3B5F106564A
	for ; Fri, 31 Oct 2008 20:46:32 +0000 (UTC)
	(envelope-from imp@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id D25468FC1A
	for ; Fri, 31 Oct 2008 20:46:32 +0000 (UTC)
	(envelope-from imp@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id m9VKkWBu004339
	for ; Fri, 31 Oct 2008 20:46:32 GMT
	(envelope-from imp@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m9VKkPjA004333
	for perforce@freebsd.org; Fri, 31 Oct 2008 20:46:25 GMT
	(envelope-from imp@freebsd.org)
Date: Fri, 31 Oct 2008 20:46:25 GMT
Message-Id: <200810312046.m9VKkPjA004333@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 152296 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, 31 Oct 2008 20:46:33 -0000

http://perforce.freebsd.org/chv.cgi?CH=152296

Change 152296 by imp@imp_paco-paco on 2008/10/31 20:46:25

	IFC @152294

Affected files ...

.. //depot/projects/mips2/src/Makefile.inc1#25 integrate
.. //depot/projects/mips2/src/UPDATING#24 integrate
.. //depot/projects/mips2/src/bin/cat/cat.c#2 integrate
.. //depot/projects/mips2/src/bin/chio/chio.c#2 integrate
.. //depot/projects/mips2/src/bin/cp/utils.c#6 integrate
.. //depot/projects/mips2/src/bin/rcp/rcp.c#3 integrate
.. //depot/projects/mips2/src/contrib/tcsh/sh.c#4 integrate
.. //depot/projects/mips2/src/contrib/tcsh/tc.const.c#4 integrate
.. //depot/projects/mips2/src/crypto/openssh/loginrec.c#4 integrate
.. //depot/projects/mips2/src/crypto/openssh/sshd.c#4 integrate
.. //depot/projects/mips2/src/etc/Makefile#12 integrate
.. //depot/projects/mips2/src/etc/devd.conf#7 integrate
.. //depot/projects/mips2/src/etc/periodic/security/200.chkmounts#2 integrate
.. //depot/projects/mips2/src/etc/rc.d/netif#7 integrate
.. //depot/projects/mips2/src/etc/rc.subr#10 integrate
.. //depot/projects/mips2/src/etc/remote#3 integrate
.. //depot/projects/mips2/src/gnu/usr.bin/gdb/arch/amd64/Makefile#3 integrate
.. //depot/projects/mips2/src/gnu/usr.bin/gdb/arch/i386/Makefile#3 integrate
.. //depot/projects/mips2/src/lib/libarchive/archive_read_support_format_zip.c#11 integrate
.. //depot/projects/mips2/src/lib/libarchive/archive_util.c#7 integrate
.. //depot/projects/mips2/src/lib/libarchive/archive_write_disk.c#16 integrate
.. //depot/projects/mips2/src/lib/libarchive/test/Makefile#11 integrate
.. //depot/projects/mips2/src/lib/libarchive/test/test_acl_basic.c#5 integrate
.. //depot/projects/mips2/src/lib/libarchive/test/test_acl_freebsd.c#1 branch
.. //depot/projects/mips2/src/lib/libarchive/test/test_read_format_zip.c#7 integrate
.. //depot/projects/mips2/src/lib/libarchive/test/test_read_format_zip.zip.uu#2 integrate
.. //depot/projects/mips2/src/lib/libc/arm/gen/_setjmp.S#2 integrate
.. //depot/projects/mips2/src/lib/libc/gen/__xuname.c#3 integrate
.. //depot/projects/mips2/src/lib/libc/gen/err.3#3 integrate
.. //depot/projects/mips2/src/lib/libc/gen/posix_spawn.c#2 integrate
.. //depot/projects/mips2/src/lib/libc/stdlib/Makefile.inc#4 integrate
.. //depot/projects/mips2/src/lib/libc/stdtime/strftime.c#2 integrate
.. //depot/projects/mips2/src/lib/libc/string/strlcpy.c#2 integrate
.. //depot/projects/mips2/src/lib/libc/string/strxfrm.c#2 integrate
.. //depot/projects/mips2/src/lib/libc/sys/mmap.2#3 integrate
.. //depot/projects/mips2/src/lib/libcam/camlib.c#3 integrate
.. //depot/projects/mips2/src/lib/libfetch/http.c#5 integrate
.. //depot/projects/mips2/src/lib/libkvm/kvm.c#5 integrate
.. //depot/projects/mips2/src/lib/libkvm/kvm_minidump_amd64.c#2 integrate
.. //depot/projects/mips2/src/lib/libkvm/kvm_minidump_i386.c#2 integrate
.. //depot/projects/mips2/src/lib/libstand/Makefile#6 integrate
.. //depot/projects/mips2/src/lib/libutil/flopen.3#4 integrate
.. //depot/projects/mips2/src/lib/libutil/flopen.c#3 integrate
.. //depot/projects/mips2/src/lib/libutil/login_cap.h#3 integrate
.. //depot/projects/mips2/src/lib/libutil/login_class.3#3 integrate
.. //depot/projects/mips2/src/lib/libutil/login_class.c#4 integrate
.. //depot/projects/mips2/src/lib/libutil/login_times.3#2 integrate
.. //depot/projects/mips2/src/lib/libutil/login_times.c#2 integrate
.. //depot/projects/mips2/src/lib/libutil/logwtmp.c#3 integrate
.. //depot/projects/mips2/src/lib/libutil/pidfile.3#3 integrate
.. //depot/projects/mips2/src/lib/libutil/pidfile.c#5 integrate
.. //depot/projects/mips2/src/lib/libutil/pty.c#7 integrate
.. //depot/projects/mips2/src/lib/libutil/realhostname.c#2 integrate
.. //depot/projects/mips2/src/libexec/rtld-elf/mips/reloc.c#6 integrate
.. //depot/projects/mips2/src/release/Makefile#13 integrate
.. //depot/projects/mips2/src/release/doc/en_US.ISO8859-1/hardware/article.sgml#12 integrate
.. //depot/projects/mips2/src/release/doc/en_US.ISO8859-1/relnotes/article.sgml#22 integrate
.. //depot/projects/mips2/src/sbin/dhclient/dhclient.c#6 integrate
.. //depot/projects/mips2/src/sbin/dhclient/dhcp.h#3 integrate
.. //depot/projects/mips2/src/sbin/dhclient/tables.c#3 integrate
.. //depot/projects/mips2/src/sbin/geom/class/part/geom_part.c#5 integrate
.. //depot/projects/mips2/src/sbin/ifconfig/ifconfig.8#15 integrate
.. //depot/projects/mips2/src/sbin/ipfw/ipfw2.c#15 integrate
.. //depot/projects/mips2/src/share/man/man4/Makefile#24 integrate
.. //depot/projects/mips2/src/share/man/man4/ddb.4#12 integrate
.. //depot/projects/mips2/src/share/man/man4/mmc.4#3 integrate
.. //depot/projects/mips2/src/share/man/man4/mmcsd.4#2 integrate
.. //depot/projects/mips2/src/share/man/man4/sdhci.4#1 branch
.. //depot/projects/mips2/src/share/man/man4/snd_hda.4#7 integrate
.. //depot/projects/mips2/src/share/man/man4/u3g.4#3 integrate
.. //depot/projects/mips2/src/share/man/man4/ubsa.4#6 integrate
.. //depot/projects/mips2/src/share/man/man4/umass.4#3 integrate
.. //depot/projects/mips2/src/share/man/man4/umodem.4#4 integrate
.. //depot/projects/mips2/src/share/man/man9/Makefile#18 integrate
.. //depot/projects/mips2/src/share/man/man9/VOP_ACCESS.9#2 integrate
.. //depot/projects/mips2/src/share/man/man9/malloc.9#3 integrate
.. //depot/projects/mips2/src/share/man/man9/style.9#5 integrate
.. //depot/projects/mips2/src/share/man/man9/vaccess.9#2 integrate
.. //depot/projects/mips2/src/share/man/man9/vaccess_acl_posix1e.9#2 integrate
.. //depot/projects/mips2/src/share/man/man9/vinvalbuf.9#2 integrate
.. //depot/projects/mips2/src/share/syscons/keymaps/INDEX.keymaps#5 integrate
.. //depot/projects/mips2/src/share/syscons/keymaps/eee_nordic.kbd#1 branch
.. //depot/projects/mips2/src/share/zoneinfo/Makefile#4 integrate
.. //depot/projects/mips2/src/share/zoneinfo/africa#8 integrate
.. //depot/projects/mips2/src/share/zoneinfo/asia#9 integrate
.. //depot/projects/mips2/src/share/zoneinfo/southamerica#12 integrate
.. //depot/projects/mips2/src/share/zoneinfo/zone.tab#9 integrate
.. //depot/projects/mips2/src/sys/amd64/amd64/dump_machdep.c#5 integrate
.. //depot/projects/mips2/src/sys/amd64/amd64/identcpu.c#10 integrate
.. //depot/projects/mips2/src/sys/amd64/amd64/initcpu.c#2 integrate
.. //depot/projects/mips2/src/sys/amd64/amd64/local_apic.c#10 integrate
.. //depot/projects/mips2/src/sys/amd64/amd64/minidump_machdep.c#7 integrate
.. //depot/projects/mips2/src/sys/amd64/amd64/prof_machdep.c#5 integrate
.. //depot/projects/mips2/src/sys/amd64/amd64/tsc.c#4 integrate
.. //depot/projects/mips2/src/sys/amd64/include/clock.h#7 integrate
.. //depot/projects/mips2/src/sys/amd64/include/md_var.h#4 integrate
.. //depot/projects/mips2/src/sys/amd64/include/specialreg.h#10 integrate
.. //depot/projects/mips2/src/sys/amd64/linux32/linux.h#5 integrate
.. //depot/projects/mips2/src/sys/amd64/linux32/linux32_sysvec.c#9 integrate
.. //depot/projects/mips2/src/sys/arm/arm/locore.S#7 integrate
.. //depot/projects/mips2/src/sys/arm/arm/swtch.S#7 integrate
.. //depot/projects/mips2/src/sys/arm/arm/undefined.c#4 integrate
.. //depot/projects/mips2/src/sys/arm/at91/at91.c#7 integrate
.. //depot/projects/mips2/src/sys/arm/at91/at91_mci.c#5 integrate
.. //depot/projects/mips2/src/sys/arm/conf/AVILA#11 integrate
.. //depot/projects/mips2/src/sys/arm/conf/BWCT#5 integrate
.. //depot/projects/mips2/src/sys/arm/conf/CRB#6 integrate
.. //depot/projects/mips2/src/sys/arm/conf/DB-78XXX#1 branch
.. //depot/projects/mips2/src/sys/arm/conf/DB-88F5XXX#1 branch
.. //depot/projects/mips2/src/sys/arm/conf/DB-88F6XXX#1 branch
.. //depot/projects/mips2/src/sys/arm/conf/DEFAULTS#1 branch
.. //depot/projects/mips2/src/sys/arm/conf/EP80219#5 integrate
.. //depot/projects/mips2/src/sys/arm/conf/GUMSTIX#2 integrate
.. //depot/projects/mips2/src/sys/arm/conf/HL200#5 integrate
.. //depot/projects/mips2/src/sys/arm/conf/IQ31244#6 integrate
.. //depot/projects/mips2/src/sys/arm/conf/KB920X#10 integrate
.. //depot/projects/mips2/src/sys/arm/conf/NSLU#3 integrate
.. //depot/projects/mips2/src/sys/arm/conf/SIMICS#6 integrate
.. //depot/projects/mips2/src/sys/arm/conf/SKYEYE#6 integrate
.. //depot/projects/mips2/src/sys/arm/include/bootinfo.h#1 branch
.. //depot/projects/mips2/src/sys/arm/include/metadata.h#2 integrate
.. //depot/projects/mips2/src/sys/arm/xscale/ixp425/if_npe.c#6 integrate
.. //depot/projects/mips2/src/sys/boot/Makefile#6 integrate
.. //depot/projects/mips2/src/sys/boot/arm/Makefile#2 integrate
.. //depot/projects/mips2/src/sys/boot/arm/uboot/Makefile#1 branch
.. //depot/projects/mips2/src/sys/boot/arm/uboot/conf.c#1 branch
.. //depot/projects/mips2/src/sys/boot/arm/uboot/help.uboot#1 branch
.. //depot/projects/mips2/src/sys/boot/arm/uboot/ldscript.arm#1 branch
.. //depot/projects/mips2/src/sys/boot/arm/uboot/start.S#1 branch
.. //depot/projects/mips2/src/sys/boot/arm/uboot/version#1 branch
.. //depot/projects/mips2/src/sys/boot/common/Makefile.inc#3 integrate
.. //depot/projects/mips2/src/sys/boot/common/load_elf.c#4 integrate
.. //depot/projects/mips2/src/sys/boot/ficl/Makefile#4 integrate
.. //depot/projects/mips2/src/sys/boot/powerpc/Makefile#4 integrate
.. //depot/projects/mips2/src/sys/boot/powerpc/boot1.chrp/Makefile#1 branch
.. //depot/projects/mips2/src/sys/boot/powerpc/boot1.chrp/Makefile.hfs#1 branch
.. //depot/projects/mips2/src/sys/boot/powerpc/boot1.chrp/boot1.c#1 branch
.. //depot/projects/mips2/src/sys/boot/powerpc/boot1.chrp/bootinfo.txt#1 branch
.. //depot/projects/mips2/src/sys/boot/powerpc/boot1.chrp/generate-hfs.sh#1 branch
.. //depot/projects/mips2/src/sys/boot/powerpc/boot1.chrp/hfs.tmpl.bz2.uu#1 branch
.. //depot/projects/mips2/src/sys/boot/uboot/lib/glue.c#6 integrate
.. //depot/projects/mips2/src/sys/cam/scsi/scsi_target.c#5 integrate
.. //depot/projects/mips2/src/sys/cddl/compat/opensolaris/kern/opensolaris_policy.c#2 integrate
.. //depot/projects/mips2/src/sys/cddl/compat/opensolaris/sys/policy.h#2 integrate
.. //depot/projects/mips2/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ctldir.c#5 integrate
.. //depot/projects/mips2/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c#6 integrate
.. //depot/projects/mips2/src/sys/compat/freebsd32/freebsd32_misc.c#13 integrate
.. //depot/projects/mips2/src/sys/compat/freebsd32/freebsd32_proto.h#16 integrate
.. //depot/projects/mips2/src/sys/compat/freebsd32/freebsd32_syscall.h#16 integrate
.. //depot/projects/mips2/src/sys/compat/freebsd32/freebsd32_syscalls.c#16 integrate
.. //depot/projects/mips2/src/sys/compat/freebsd32/freebsd32_sysent.c#16 integrate
.. //depot/projects/mips2/src/sys/compat/freebsd32/syscalls.master#17 integrate
.. //depot/projects/mips2/src/sys/compat/linux/linux_emul.c#3 integrate
.. //depot/projects/mips2/src/sys/compat/linux/linux_futex.c#6 integrate
.. //depot/projects/mips2/src/sys/compat/linux/linux_futex.h#4 integrate
.. //depot/projects/mips2/src/sys/compat/linux/linux_getcwd.c#6 integrate
.. //depot/projects/mips2/src/sys/compat/linux/linux_ioctl.c#7 integrate
.. //depot/projects/mips2/src/sys/compat/linux/linux_signal.c#3 integrate
.. //depot/projects/mips2/src/sys/compat/linux/linux_signal.h#3 integrate
.. //depot/projects/mips2/src/sys/compat/linux/linux_socket.c#9 integrate
.. //depot/projects/mips2/src/sys/compat/linux/linux_util.c#6 integrate
.. //depot/projects/mips2/src/sys/conf/NOTES#27 integrate
.. //depot/projects/mips2/src/sys/conf/files#32 integrate
.. //depot/projects/mips2/src/sys/conf/files.arm#7 integrate
.. //depot/projects/mips2/src/sys/conf/files.mips#26 integrate
.. //depot/projects/mips2/src/sys/conf/files.powerpc#15 integrate
.. //depot/projects/mips2/src/sys/conf/options#23 integrate
.. //depot/projects/mips2/src/sys/contrib/altq/altq/altq_cbq.c#4 integrate
.. //depot/projects/mips2/src/sys/contrib/altq/altq/altq_cdnr.c#3 integrate
.. //depot/projects/mips2/src/sys/contrib/altq/altq/altq_hfsc.c#4 integrate
.. //depot/projects/mips2/src/sys/contrib/altq/altq/altq_priq.c#4 integrate
.. //depot/projects/mips2/src/sys/contrib/altq/altq/altq_red.c#4 integrate
.. //depot/projects/mips2/src/sys/contrib/altq/altq/altq_rio.c#3 integrate
.. //depot/projects/mips2/src/sys/contrib/altq/altq/altq_rmclass.c#2 integrate
.. //depot/projects/mips2/src/sys/contrib/altq/altq/altq_subr.c#5 integrate
.. //depot/projects/mips2/src/sys/contrib/ipfilter/netinet/ip_compat.h#7 integrate
.. //depot/projects/mips2/src/sys/dev/adb/adb.h#1 branch
.. //depot/projects/mips2/src/sys/dev/adb/adb_bus.c#1 branch
.. //depot/projects/mips2/src/sys/dev/adb/adb_hb_if.m#1 branch
.. //depot/projects/mips2/src/sys/dev/adb/adb_if.m#1 branch
.. //depot/projects/mips2/src/sys/dev/adb/adb_kbd.c#1 branch
.. //depot/projects/mips2/src/sys/dev/adb/adb_mouse.c#1 branch
.. //depot/projects/mips2/src/sys/dev/adb/adbvar.h#1 branch
.. //depot/projects/mips2/src/sys/dev/age/if_age.c#3 integrate
.. //depot/projects/mips2/src/sys/dev/age/if_agevar.h#2 integrate
.. //depot/projects/mips2/src/sys/dev/ar/if_ar.c#3 integrate
.. //depot/projects/mips2/src/sys/dev/ata/ata-dma.c#9 integrate
.. //depot/projects/mips2/src/sys/dev/ata/ata-queue.c#6 integrate
.. //depot/projects/mips2/src/sys/dev/ata/chipsets/ata-cyrix.c#2 integrate
.. //depot/projects/mips2/src/sys/dev/ata/chipsets/ata-marvell.c#2 integrate
.. //depot/projects/mips2/src/sys/dev/ata/chipsets/ata-national.c#2 integrate
.. //depot/projects/mips2/src/sys/dev/ata/chipsets/ata-serverworks.c#2 integrate
.. //depot/projects/mips2/src/sys/dev/ath/ah_osdep.c#5 integrate
.. //depot/projects/mips2/src/sys/dev/ath/ath_rate/amrr/amrr.c#6 integrate
.. //depot/projects/mips2/src/sys/dev/ath/ath_rate/onoe/onoe.c#6 integrate
.. //depot/projects/mips2/src/sys/dev/ath/ath_rate/sample/sample.c#6 integrate
.. //depot/projects/mips2/src/sys/dev/ath/if_ath.c#14 integrate
.. //depot/projects/mips2/src/sys/dev/ath/if_athrate.h#5 integrate
.. //depot/projects/mips2/src/sys/dev/ath/if_athvar.h#8 integrate
.. //depot/projects/mips2/src/sys/dev/atkbdc/psm.c#9 integrate
.. //depot/projects/mips2/src/sys/dev/bge/if_bge.c#15 integrate
.. //depot/projects/mips2/src/sys/dev/bge/if_bgereg.h#9 integrate
.. //depot/projects/mips2/src/sys/dev/ce/if_ce.c#6 integrate
.. //depot/projects/mips2/src/sys/dev/cfe/cfe_console.c#4 integrate
.. //depot/projects/mips2/src/sys/dev/cfi/cfi_bus_lbc.c#1 branch
.. //depot/projects/mips2/src/sys/dev/cfi/cfi_core.c#1 branch
.. //depot/projects/mips2/src/sys/dev/cfi/cfi_dev.c#1 branch
.. //depot/projects/mips2/src/sys/dev/cfi/cfi_reg.h#1 branch
.. //depot/projects/mips2/src/sys/dev/cfi/cfi_var.h#1 branch
.. //depot/projects/mips2/src/sys/dev/cxgb/cxgb_sge.c#19 integrate
.. //depot/projects/mips2/src/sys/dev/drm/drm_drv.c#7 integrate
.. //depot/projects/mips2/src/sys/dev/drm/drm_fops.c#5 integrate
.. //depot/projects/mips2/src/sys/dev/drm/drm_lock.c#4 integrate
.. //depot/projects/mips2/src/sys/dev/drm/i915_dma.c#9 integrate
.. //depot/projects/mips2/src/sys/dev/drm/radeon_cp.c#6 integrate
.. //depot/projects/mips2/src/sys/dev/drm/radeon_drv.h#5 integrate
.. //depot/projects/mips2/src/sys/dev/hwpmc/hwpmc_amd.c#5 integrate
.. //depot/projects/mips2/src/sys/dev/hwpmc/hwpmc_logging.c#5 integrate
.. //depot/projects/mips2/src/sys/dev/hwpmc/hwpmc_mod.c#9 integrate
.. //depot/projects/mips2/src/sys/dev/hwpmc/hwpmc_piv.c#5 integrate
.. //depot/projects/mips2/src/sys/dev/hwpmc/hwpmc_ppro.c#5 integrate
.. //depot/projects/mips2/src/sys/dev/hwpmc/hwpmc_x86.c#5 integrate
.. //depot/projects/mips2/src/sys/dev/iwn/if_iwn.c#3 integrate
.. //depot/projects/mips2/src/sys/dev/jme/if_jme.c#6 integrate
.. //depot/projects/mips2/src/sys/dev/lmc/if_lmc.c#7 integrate
.. //depot/projects/mips2/src/sys/dev/mge/if_mge.c#1 branch
.. //depot/projects/mips2/src/sys/dev/mge/if_mgevar.h#1 branch
.. //depot/projects/mips2/src/sys/dev/mii/atphy.c#3 integrate
.. //depot/projects/mips2/src/sys/dev/mii/ciphy.c#8 integrate
.. //depot/projects/mips2/src/sys/dev/mii/e1000phy.c#8 integrate
.. //depot/projects/mips2/src/sys/dev/mii/miidevs#14 integrate
.. //depot/projects/mips2/src/sys/dev/mmc/mmc.c#6 integrate
.. //depot/projects/mips2/src/sys/dev/mmc/mmcbrvar.h#5 integrate
.. //depot/projects/mips2/src/sys/dev/mmc/mmcreg.h#5 integrate
.. //depot/projects/mips2/src/sys/dev/mmc/mmcsd.c#7 integrate
.. //depot/projects/mips2/src/sys/dev/mmc/mmcvar.h#6 integrate
.. //depot/projects/mips2/src/sys/dev/mxge/eth_z8e.h#5 integrate
.. //depot/projects/mips2/src/sys/dev/mxge/ethp_z8e.h#5 integrate
.. //depot/projects/mips2/src/sys/dev/mxge/rss_eth_z8e.h#3 integrate
.. //depot/projects/mips2/src/sys/dev/mxge/rss_ethp_z8e.h#3 integrate
.. //depot/projects/mips2/src/sys/dev/ofw/ofw_console.c#7 integrate
.. //depot/projects/mips2/src/sys/dev/pci/pci.c#10 integrate
.. //depot/projects/mips2/src/sys/dev/pci/pcireg.h#6 integrate
.. //depot/projects/mips2/src/sys/dev/powermac_nvram/powermac_nvram.c#4 integrate
.. //depot/projects/mips2/src/sys/dev/ppbus/if_plip.c#5 integrate
.. //depot/projects/mips2/src/sys/dev/ppbus/immio.c#2 integrate
.. //depot/projects/mips2/src/sys/dev/ppbus/lpbb.c#3 integrate
.. //depot/projects/mips2/src/sys/dev/ppbus/lpt.c#5 integrate
.. //depot/projects/mips2/src/sys/dev/ppbus/pcfclock.c#3 integrate
.. //depot/projects/mips2/src/sys/dev/ppbus/ppb_base.c#2 integrate
.. //depot/projects/mips2/src/sys/dev/ppbus/ppb_msq.c#2 integrate
.. //depot/projects/mips2/src/sys/dev/ppbus/ppbconf.c#6 integrate
.. //depot/projects/mips2/src/sys/dev/ppbus/ppbconf.h#4 integrate
.. //depot/projects/mips2/src/sys/dev/ppbus/ppi.c#5 integrate
.. //depot/projects/mips2/src/sys/dev/ppbus/pps.c#4 integrate
.. //depot/projects/mips2/src/sys/dev/ppbus/vpo.c#5 integrate
.. //depot/projects/mips2/src/sys/dev/ppbus/vpoio.c#2 integrate
.. //depot/projects/mips2/src/sys/dev/ppbus/vpoio.h#2 integrate
.. //depot/projects/mips2/src/sys/dev/ppc/ppc.c#5 integrate
.. //depot/projects/mips2/src/sys/dev/ppc/ppcreg.h#4 integrate
.. //depot/projects/mips2/src/sys/dev/puc/pucdata.c#8 integrate
.. //depot/projects/mips2/src/sys/dev/ral/rt2560.c#12 integrate
.. //depot/projects/mips2/src/sys/dev/ral/rt2661.c#10 integrate
.. //depot/projects/mips2/src/sys/dev/ray/if_ray.c#4 integrate
.. //depot/projects/mips2/src/sys/dev/ray/if_rayvar.h#2 integrate
.. //depot/projects/mips2/src/sys/dev/sdhci/sdhci.c#1 branch
.. //depot/projects/mips2/src/sys/dev/sdhci/sdhci.h#1 branch
.. //depot/projects/mips2/src/sys/dev/sound/pci/hda/hdac.c#15 integrate
.. //depot/projects/mips2/src/sys/dev/sr/if_sr.c#3 integrate
.. //depot/projects/mips2/src/sys/dev/sym/sym_hipd.c#8 integrate
.. //depot/projects/mips2/src/sys/dev/uart/uart_tty.c#4 integrate
.. //depot/projects/mips2/src/sys/dev/usb/ehci.c#10 integrate
.. //depot/projects/mips2/src/sys/dev/usb/ehci_mbus.c#1 branch
.. //depot/projects/mips2/src/sys/dev/usb/ehcivar.h#6 integrate
.. //depot/projects/mips2/src/sys/dev/usb/if_zyd.c#11 integrate
.. //depot/projects/mips2/src/sys/dev/usb/u3g.c#3 integrate
.. //depot/projects/mips2/src/sys/dev/usb/ubsa.c#13 integrate
.. //depot/projects/mips2/src/sys/dev/usb/ucom.c#9 integrate
.. //depot/projects/mips2/src/sys/dev/usb/udbp.c#4 integrate
.. //depot/projects/mips2/src/sys/dev/usb/ufoma.c#7 integrate
.. //depot/projects/mips2/src/sys/dev/usb/umass.c#11 integrate
.. //depot/projects/mips2/src/sys/dev/usb/usb_quirks.c#9 integrate
.. //depot/projects/mips2/src/sys/dev/usb/usbdevs#26 integrate
.. //depot/projects/mips2/src/sys/dev/usb/usbdi.c#6 integrate
.. //depot/projects/mips2/src/sys/dev/wpi/if_wpi.c#10 integrate
.. //depot/projects/mips2/src/sys/dev/xen/console/console.c#3 integrate
.. //depot/projects/mips2/src/sys/fs/cd9660/cd9660_node.c#3 integrate
.. //depot/projects/mips2/src/sys/fs/cd9660/cd9660_vfsops.c#5 integrate
.. //depot/projects/mips2/src/sys/fs/cd9660/cd9660_vnops.c#4 integrate
.. //depot/projects/mips2/src/sys/fs/coda/coda_vnops.c#4 integrate
.. //depot/projects/mips2/src/sys/fs/devfs/devfs_vnops.c#15 integrate
.. //depot/projects/mips2/src/sys/fs/fdescfs/fdesc_vfsops.c#6 integrate
.. //depot/projects/mips2/src/sys/fs/fdescfs/fdesc_vnops.c#11 integrate
.. //depot/projects/mips2/src/sys/fs/fifofs/fifo_vnops.c#8 integrate
.. //depot/projects/mips2/src/sys/fs/hpfs/hpfs_subr.c#2 integrate
.. //depot/projects/mips2/src/sys/fs/hpfs/hpfs_vfsops.c#6 integrate
.. //depot/projects/mips2/src/sys/fs/hpfs/hpfs_vnops.c#6 integrate
.. //depot/projects/mips2/src/sys/fs/msdosfs/msdosfs_denode.c#6 integrate
.. //depot/projects/mips2/src/sys/fs/msdosfs/msdosfs_vfsops.c#13 integrate
.. //depot/projects/mips2/src/sys/fs/msdosfs/msdosfs_vnops.c#12 integrate
.. //depot/projects/mips2/src/sys/fs/ntfs/ntfs_subr.c#5 integrate
.. //depot/projects/mips2/src/sys/fs/ntfs/ntfs_vfsops.c#7 integrate
.. //depot/projects/mips2/src/sys/fs/ntfs/ntfs_vnops.c#5 integrate
.. //depot/projects/mips2/src/sys/fs/nullfs/null_subr.c#6 integrate
.. //depot/projects/mips2/src/sys/fs/nullfs/null_vnops.c#8 integrate
.. //depot/projects/mips2/src/sys/fs/nwfs/nwfs_node.c#5 integrate
.. //depot/projects/mips2/src/sys/fs/nwfs/nwfs_vfsops.c#5 integrate
.. //depot/projects/mips2/src/sys/fs/nwfs/nwfs_vnops.c#4 integrate
.. //depot/projects/mips2/src/sys/fs/portalfs/portal_vfsops.c#5 integrate
.. //depot/projects/mips2/src/sys/fs/portalfs/portal_vnops.c#9 integrate
.. //depot/projects/mips2/src/sys/fs/pseudofs/pseudofs.c#5 integrate
.. //depot/projects/mips2/src/sys/fs/pseudofs/pseudofs_vncache.c#6 integrate
.. //depot/projects/mips2/src/sys/fs/pseudofs/pseudofs_vnops.c#8 integrate
.. //depot/projects/mips2/src/sys/fs/smbfs/smbfs_node.c#9 integrate
.. //depot/projects/mips2/src/sys/fs/smbfs/smbfs_vfsops.c#7 integrate
.. //depot/projects/mips2/src/sys/fs/smbfs/smbfs_vnops.c#7 integrate
.. //depot/projects/mips2/src/sys/fs/tmpfs/tmpfs_vnops.c#15 integrate
.. //depot/projects/mips2/src/sys/fs/udf/udf_vfsops.c#8 integrate
.. //depot/projects/mips2/src/sys/fs/udf/udf_vnops.c#7 integrate
.. //depot/projects/mips2/src/sys/fs/unionfs/union_subr.c#12 integrate
.. //depot/projects/mips2/src/sys/fs/unionfs/union_vnops.c#11 integrate
.. //depot/projects/mips2/src/sys/geom/geom_disk.c#6 integrate
.. //depot/projects/mips2/src/sys/geom/part/g_part_bsd.c#6 integrate
.. //depot/projects/mips2/src/sys/geom/part/g_part_pc98.c#6 integrate
.. //depot/projects/mips2/src/sys/geom/part/g_part_vtoc8.c#5 integrate
.. //depot/projects/mips2/src/sys/geom/vinum/geom_vinum.c#2 integrate
.. //depot/projects/mips2/src/sys/geom/vinum/geom_vinum.h#4 integrate
.. //depot/projects/mips2/src/sys/geom/vinum/geom_vinum_drive.c#7 integrate
.. //depot/projects/mips2/src/sys/geom/vinum/geom_vinum_init.c#3 integrate
.. //depot/projects/mips2/src/sys/geom/vinum/geom_vinum_plex.c#3 integrate
.. //depot/projects/mips2/src/sys/geom/vinum/geom_vinum_raid5.c#2 integrate
.. //depot/projects/mips2/src/sys/geom/vinum/geom_vinum_rm.c#4 integrate
.. //depot/projects/mips2/src/sys/geom/vinum/geom_vinum_state.c#2 integrate
.. //depot/projects/mips2/src/sys/geom/vinum/geom_vinum_subr.c#4 integrate
.. //depot/projects/mips2/src/sys/geom/vinum/geom_vinum_volume.c#3 integrate
.. //depot/projects/mips2/src/sys/gnu/fs/ext2fs/ext2_inode.c#4 integrate
.. //depot/projects/mips2/src/sys/gnu/fs/ext2fs/ext2_lookup.c#3 integrate
.. //depot/projects/mips2/src/sys/gnu/fs/ext2fs/ext2_vfsops.c#10 integrate
.. //depot/projects/mips2/src/sys/gnu/fs/ext2fs/ext2_vnops.c#7 integrate
.. //depot/projects/mips2/src/sys/gnu/fs/reiserfs/reiserfs_inode.c#4 integrate
.. //depot/projects/mips2/src/sys/gnu/fs/reiserfs/reiserfs_vfsops.c#6 integrate
.. //depot/projects/mips2/src/sys/gnu/fs/reiserfs/reiserfs_vnops.c#3 integrate
.. //depot/projects/mips2/src/sys/gnu/fs/xfs/FreeBSD/xfs_super.c#5 integrate
.. //depot/projects/mips2/src/sys/gnu/fs/xfs/FreeBSD/xfs_vnops.c#7 integrate
.. //depot/projects/mips2/src/sys/i386/conf/NOTES#16 integrate
.. //depot/projects/mips2/src/sys/i386/cpufreq/powernow.c#4 integrate
.. //depot/projects/mips2/src/sys/i386/i386/apic_vector.s#3 integrate
.. //depot/projects/mips2/src/sys/i386/i386/dump_machdep.c#5 integrate
.. //depot/projects/mips2/src/sys/i386/i386/identcpu.c#11 integrate
.. //depot/projects/mips2/src/sys/i386/i386/initcpu.c#5 integrate
.. //depot/projects/mips2/src/sys/i386/i386/local_apic.c#11 integrate
.. //depot/projects/mips2/src/sys/i386/i386/minidump_machdep.c#6 integrate
.. //depot/projects/mips2/src/sys/i386/i386/sys_machdep.c#7 integrate
.. //depot/projects/mips2/src/sys/i386/i386/trap.c#14 integrate
.. //depot/projects/mips2/src/sys/i386/i386/tsc.c#4 integrate
.. //depot/projects/mips2/src/sys/i386/include/apicvar.h#4 integrate
.. //depot/projects/mips2/src/sys/i386/include/clock.h#7 integrate
.. //depot/projects/mips2/src/sys/i386/include/cpufunc.h#5 integrate
.. //depot/projects/mips2/src/sys/i386/include/md_var.h#3 integrate
.. //depot/projects/mips2/src/sys/i386/include/pcpu.h#6 integrate
.. //depot/projects/mips2/src/sys/i386/include/smp.h#8 integrate
.. //depot/projects/mips2/src/sys/i386/include/specialreg.h#10 integrate
.. //depot/projects/mips2/src/sys/i386/include/trap.h#3 integrate
.. //depot/projects/mips2/src/sys/i386/include/xen/evtchn.h#3 integrate
.. //depot/projects/mips2/src/sys/i386/include/xen/xen-os.h#2 integrate
.. //depot/projects/mips2/src/sys/i386/include/xen/xen_intr.h#2 integrate
.. //depot/projects/mips2/src/sys/i386/include/xen/xenfunc.h#2 integrate
.. //depot/projects/mips2/src/sys/i386/isa/pmtimer.c#4 integrate
.. //depot/projects/mips2/src/sys/i386/isa/prof_machdep.c#5 integrate
.. //depot/projects/mips2/src/sys/i386/linux/linux.h#5 integrate
.. //depot/projects/mips2/src/sys/i386/linux/linux_sysvec.c#9 integrate
.. //depot/projects/mips2/src/sys/i386/xen/clock.c#2 integrate
.. //depot/projects/mips2/src/sys/i386/xen/exception.s#2 integrate
.. //depot/projects/mips2/src/sys/i386/xen/locore.s#3 integrate
.. //depot/projects/mips2/src/sys/i386/xen/mp_machdep.c#4 integrate
.. //depot/projects/mips2/src/sys/i386/xen/xen_machdep.c#6 integrate
.. //depot/projects/mips2/src/sys/ia64/ia64/mp_machdep.c#8 integrate
.. //depot/projects/mips2/src/sys/ia64/ia64/sscdisk.c#4 integrate
.. //depot/projects/mips2/src/sys/kern/init_main.c#15 integrate
.. //depot/projects/mips2/src/sys/kern/kern_descrip.c#16 integrate
.. //depot/projects/mips2/src/sys/kern/kern_event.c#10 integrate
.. //depot/projects/mips2/src/sys/kern/kern_exit.c#10 integrate
.. //depot/projects/mips2/src/sys/kern/kern_fork.c#11 integrate
.. //depot/projects/mips2/src/sys/kern/kern_jail.c#11 integrate
.. //depot/projects/mips2/src/sys/kern/kern_linker.c#13 integrate
.. //depot/projects/mips2/src/sys/kern/kern_lockf.c#9 integrate
.. //depot/projects/mips2/src/sys/kern/kern_mtxpool.c#3 integrate
.. //depot/projects/mips2/src/sys/kern/kern_proc.c#17 integrate
.. //depot/projects/mips2/src/sys/kern/kern_prot.c#6 integrate
.. //depot/projects/mips2/src/sys/kern/kern_resource.c#10 integrate
.. //depot/projects/mips2/src/sys/kern/kern_sig.c#13 integrate
.. //depot/projects/mips2/src/sys/kern/kern_synch.c#13 integrate
.. //depot/projects/mips2/src/sys/kern/kern_thr.c#11 integrate
.. //depot/projects/mips2/src/sys/kern/kern_thread.c#15 integrate
.. //depot/projects/mips2/src/sys/kern/kern_time.c#5 integrate
.. //depot/projects/mips2/src/sys/kern/kern_timeout.c#13 integrate
.. //depot/projects/mips2/src/sys/kern/sched_ule.c#18 integrate
.. //depot/projects/mips2/src/sys/kern/subr_acl_posix1e.c#5 integrate
.. //depot/projects/mips2/src/sys/kern/subr_blist.c#3 integrate
.. //depot/projects/mips2/src/sys/kern/subr_param.c#4 integrate
.. //depot/projects/mips2/src/sys/kern/subr_rman.c#7 integrate
.. //depot/projects/mips2/src/sys/kern/subr_sleepqueue.c#16 integrate
.. //depot/projects/mips2/src/sys/kern/subr_stack.c#4 integrate
.. //depot/projects/mips2/src/sys/kern/subr_trap.c#10 integrate
.. //depot/projects/mips2/src/sys/kern/subr_witness.c#20 integrate
.. //depot/projects/mips2/src/sys/kern/sys_process.c#8 integrate
.. //depot/projects/mips2/src/sys/kern/tty.c#16 integrate
.. //depot/projects/mips2/src/sys/kern/uipc_accf.c#2 integrate
.. //depot/projects/mips2/src/sys/kern/uipc_mqueue.c#10 integrate
.. //depot/projects/mips2/src/sys/kern/uipc_shm.c#4 integrate
.. //depot/projects/mips2/src/sys/kern/uipc_socket.c#14 integrate
.. //depot/projects/mips2/src/sys/kern/uipc_syscalls.c#13 integrate
.. //depot/projects/mips2/src/sys/kern/uipc_usrreq.c#14 integrate
.. //depot/projects/mips2/src/sys/kern/vfs_export.c#4 integrate
.. //depot/projects/mips2/src/sys/kern/vfs_subr.c#22 integrate
.. //depot/projects/mips2/src/sys/kern/vfs_syscalls.c#13 integrate
.. //depot/projects/mips2/src/sys/kern/vfs_vnops.c#12 integrate
.. //depot/projects/mips2/src/sys/kern/vnode_if.src#8 integrate
.. //depot/projects/mips2/src/sys/mips/conf/ADM5120#9 integrate
.. //depot/projects/mips2/src/sys/mips/conf/DEFAULTS#1 branch
.. //depot/projects/mips2/src/sys/mips/conf/IDT#12 integrate
.. //depot/projects/mips2/src/sys/mips/conf/MALTA#24 integrate
.. //depot/projects/mips2/src/sys/mips/conf/QEMU#10 integrate
.. //depot/projects/mips2/src/sys/mips/conf/SENTRY5#14 integrate
.. //depot/projects/mips2/src/sys/modules/Makefile#22 integrate
.. //depot/projects/mips2/src/sys/modules/mac_bsdextended/Makefile#2 integrate
.. //depot/projects/mips2/src/sys/modules/sdhci/Makefile#1 branch
.. //depot/projects/mips2/src/sys/modules/u3g/Makefile#2 integrate
.. //depot/projects/mips2/src/sys/net/bpf.c#16 integrate
.. //depot/projects/mips2/src/sys/net/bsd_comp.c#4 integrate
.. //depot/projects/mips2/src/sys/net/if.c#15 integrate
.. //depot/projects/mips2/src/sys/net/if_arcsubr.c#2 integrate
.. //depot/projects/mips2/src/sys/net/if_ethersubr.c#15 integrate
.. //depot/projects/mips2/src/sys/net/if_fddisubr.c#5 integrate
.. //depot/projects/mips2/src/sys/net/if_iso88025subr.c#7 integrate
.. //depot/projects/mips2/src/sys/net/if_ppp.c#7 integrate
.. //depot/projects/mips2/src/sys/net/if_sl.c#4 integrate
.. //depot/projects/mips2/src/sys/net/if_tap.c#8 integrate
.. //depot/projects/mips2/src/sys/net/if_tun.c#6 integrate
.. //depot/projects/mips2/src/sys/net/ppp_deflate.c#2 integrate
.. //depot/projects/mips2/src/sys/net/rtsock.c#11 integrate
.. //depot/projects/mips2/src/sys/net80211/_ieee80211.h#6 integrate
.. //depot/projects/mips2/src/sys/net80211/ieee80211.c#12 integrate
.. //depot/projects/mips2/src/sys/net80211/ieee80211_acl.c#4 integrate
.. //depot/projects/mips2/src/sys/net80211/ieee80211_adhoc.c#4 integrate
.. //depot/projects/mips2/src/sys/net80211/ieee80211_crypto.c#7 integrate
.. //depot/projects/mips2/src/sys/net80211/ieee80211_crypto_ccmp.c#5 integrate
.. //depot/projects/mips2/src/sys/net80211/ieee80211_crypto_tkip.c#6 integrate
.. //depot/projects/mips2/src/sys/net80211/ieee80211_crypto_wep.c#5 integrate
.. //depot/projects/mips2/src/sys/net80211/ieee80211_freebsd.c#10 integrate
.. //depot/projects/mips2/src/sys/net80211/ieee80211_freebsd.h#10 integrate
.. //depot/projects/mips2/src/sys/net80211/ieee80211_hostap.c#5 integrate
.. //depot/projects/mips2/src/sys/net80211/ieee80211_ht.c#11 integrate
.. //depot/projects/mips2/src/sys/net80211/ieee80211_ht.h#8 integrate
.. //depot/projects/mips2/src/sys/net80211/ieee80211_input.c#9 integrate
.. //depot/projects/mips2/src/sys/net80211/ieee80211_ioctl.c#11 integrate
.. //depot/projects/mips2/src/sys/net80211/ieee80211_node.c#10 integrate
.. //depot/projects/mips2/src/sys/net80211/ieee80211_node.h#8 integrate
.. //depot/projects/mips2/src/sys/net80211/ieee80211_output.c#12 integrate
.. //depot/projects/mips2/src/sys/net80211/ieee80211_power.c#4 integrate
.. //depot/projects/mips2/src/sys/net80211/ieee80211_power.h#3 integrate
.. //depot/projects/mips2/src/sys/net80211/ieee80211_proto.c#9 integrate
.. //depot/projects/mips2/src/sys/net80211/ieee80211_proto.h#8 integrate
.. //depot/projects/mips2/src/sys/net80211/ieee80211_regdomain.c#5 integrate
.. //depot/projects/mips2/src/sys/net80211/ieee80211_scan.c#5 integrate
.. //depot/projects/mips2/src/sys/net80211/ieee80211_scan_sta.c#7 integrate
.. //depot/projects/mips2/src/sys/net80211/ieee80211_sta.c#4 integrate
.. //depot/projects/mips2/src/sys/net80211/ieee80211_var.h#10 integrate
.. //depot/projects/mips2/src/sys/net80211/ieee80211_wds.c#4 integrate
.. //depot/projects/mips2/src/sys/netatalk/ddp_pcb.c#3 integrate
.. //depot/projects/mips2/src/sys/netgraph/atm/sscfu/ng_sscfu_cust.h#2 integrate
.. //depot/projects/mips2/src/sys/netgraph/bluetooth/drivers/h4/ng_h4.c#5 integrate
.. //depot/projects/mips2/src/sys/netgraph/bluetooth/hci/ng_hci_main.c#2 integrate
.. //depot/projects/mips2/src/sys/netgraph/bluetooth/hci/ng_hci_misc.c#2 integrate
.. //depot/projects/mips2/src/sys/netgraph/bluetooth/l2cap/ng_l2cap_main.c#2 integrate
.. //depot/projects/mips2/src/sys/netgraph/bluetooth/l2cap/ng_l2cap_misc.c#2 integrate
.. //depot/projects/mips2/src/sys/netgraph/bluetooth/l2cap/ng_l2cap_misc.h#2 integrate
.. //depot/projects/mips2/src/sys/netgraph/bluetooth/socket/ng_btsocket_hci_raw.c#5 integrate
.. //depot/projects/mips2/src/sys/netgraph/bluetooth/socket/ng_btsocket_l2cap.c#8 integrate
.. //depot/projects/mips2/src/sys/netgraph/bluetooth/socket/ng_btsocket_l2cap_raw.c#5 integrate
.. //depot/projects/mips2/src/sys/netgraph/bluetooth/socket/ng_btsocket_rfcomm.c#8 integrate
.. //depot/projects/mips2/src/sys/netgraph/bluetooth/socket/ng_btsocket_sco.c#2 integrate
.. //depot/projects/mips2/src/sys/netgraph/netflow/netflow.c#7 integrate
.. //depot/projects/mips2/src/sys/netgraph/netflow/ng_netflow.c#6 integrate
.. //depot/projects/mips2/src/sys/netgraph/netgraph.h#12 integrate
.. //depot/projects/mips2/src/sys/netgraph/ng_UI.c#2 integrate
.. //depot/projects/mips2/src/sys/netgraph/ng_async.c#2 integrate
.. //depot/projects/mips2/src/sys/netgraph/ng_atmllc.c#2 integrate
.. //depot/projects/mips2/src/sys/netgraph/ng_base.c#21 integrate
.. //depot/projects/mips2/src/sys/netgraph/ng_bpf.c#5 integrate
.. //depot/projects/mips2/src/sys/netgraph/ng_bridge.c#3 integrate
.. //depot/projects/mips2/src/sys/netgraph/ng_cisco.c#3 integrate
.. //depot/projects/mips2/src/sys/netgraph/ng_device.c#4 integrate
.. //depot/projects/mips2/src/sys/netgraph/ng_eiface.c#6 integrate
.. //depot/projects/mips2/src/sys/netgraph/ng_etf.c#2 integrate
.. //depot/projects/mips2/src/sys/netgraph/ng_ether.c#5 integrate
.. //depot/projects/mips2/src/sys/netgraph/ng_fec.c#4 integrate
.. //depot/projects/mips2/src/sys/netgraph/ng_frame_relay.c#2 integrate
.. //depot/projects/mips2/src/sys/netgraph/ng_gif.c#4 integrate
.. //depot/projects/mips2/src/sys/netgraph/ng_gif_demux.c#2 integrate
.. //depot/projects/mips2/src/sys/netgraph/ng_hole.c#2 integrate
.. //depot/projects/mips2/src/sys/netgraph/ng_iface.c#6 integrate
.. //depot/projects/mips2/src/sys/netgraph/ng_ipfw.c#2 integrate
.. //depot/projects/mips2/src/sys/netgraph/ng_ksocket.c#5 integrate
.. //depot/projects/mips2/src/sys/netgraph/ng_l2tp.c#8 integrate
.. //depot/projects/mips2/src/sys/netgraph/ng_lmi.c#2 integrate
.. //depot/projects/mips2/src/sys/netgraph/ng_message.h#3 integrate
.. //depot/projects/mips2/src/sys/netgraph/ng_mppc.c#3 integrate
.. //depot/projects/mips2/src/sys/netgraph/ng_nat.c#6 integrate
.. //depot/projects/mips2/src/sys/netgraph/ng_one2many.c#2 integrate
.. //depot/projects/mips2/src/sys/netgraph/ng_parse.c#3 integrate
.. //depot/projects/mips2/src/sys/netgraph/ng_pipe.c#2 integrate
.. //depot/projects/mips2/src/sys/netgraph/ng_ppp.c#8 integrate
.. //depot/projects/mips2/src/sys/netgraph/ng_pptpgre.c#5 integrate
.. //depot/projects/mips2/src/sys/netgraph/ng_rfc1490.c#2 integrate
.. //depot/projects/mips2/src/sys/netgraph/ng_sample.c#2 integrate
.. //depot/projects/mips2/src/sys/netgraph/ng_split.c#2 integrate
.. //depot/projects/mips2/src/sys/netgraph/ng_sppp.c#3 integrate
.. //depot/projects/mips2/src/sys/netgraph/ng_tag.c#2 integrate
.. //depot/projects/mips2/src/sys/netgraph/ng_tcpmss.c#3 integrate
.. //depot/projects/mips2/src/sys/netgraph/ng_tee.c#4 integrate
.. //depot/projects/mips2/src/sys/netgraph/ng_tty.c#4 integrate
.. //depot/projects/mips2/src/sys/netgraph/ng_vjc.c#2 integrate
.. //depot/projects/mips2/src/sys/netgraph/ng_vlan.c#4 integrate
.. //depot/projects/mips2/src/sys/netinet/if_ether.c#13 integrate
.. //depot/projects/mips2/src/sys/netinet/igmp.c#6 integrate
.. //depot/projects/mips2/src/sys/netinet/in.c#9 integrate
.. //depot/projects/mips2/src/sys/netinet/in_mcast.c#7 integrate
.. //depot/projects/mips2/src/sys/netinet/in_pcb.c#17 integrate
.. //depot/projects/mips2/src/sys/netinet/in_pcb.h#14 integrate
.. //depot/projects/mips2/src/sys/netinet/ip_carp.c#11 integrate
.. //depot/projects/mips2/src/sys/netinet/ip_divert.c#10 integrate
.. //depot/projects/mips2/src/sys/netinet/ip_dummynet.h#4 integrate
.. //depot/projects/mips2/src/sys/netinet/ip_fw2.c#18 integrate
.. //depot/projects/mips2/src/sys/netinet/raw_ip.c#10 integrate
.. //depot/projects/mips2/src/sys/netinet/sctp_crc32.c#4 integrate
.. //depot/projects/mips2/src/sys/netinet/sctp_os_bsd.h#9 integrate
.. //depot/projects/mips2/src/sys/netinet/sctp_output.c#16 integrate
.. //depot/projects/mips2/src/sys/netinet/sctp_sysctl.c#7 integrate
.. //depot/projects/mips2/src/sys/netinet/sctp_timer.c#11 integrate
.. //depot/projects/mips2/src/sys/netinet/sctp_timer.h#6 integrate
.. //depot/projects/mips2/src/sys/netinet/sctp_uio.h#9 integrate
.. //depot/projects/mips2/src/sys/netinet/sctp_usrreq.c#16 integrate
.. //depot/projects/mips2/src/sys/netinet/sctputil.c#18 integrate
.. //depot/projects/mips2/src/sys/netinet/tcp_input.c#18 integrate
.. //depot/projects/mips2/src/sys/netinet/tcp_sack.c#8 integrate
.. //depot/projects/mips2/src/sys/netinet/tcp_subr.c#18 integrate
.. //depot/projects/mips2/src/sys/netinet/tcp_syncache.c#17 integrate
.. //depot/projects/mips2/src/sys/netinet/udp_usrreq.c#11 integrate
.. //depot/projects/mips2/src/sys/netinet6/frag6.c#9 integrate
.. //depot/projects/mips2/src/sys/netinet6/in6.c#9 integrate
.. //depot/projects/mips2/src/sys/netinet6/in6_pcb.c#13 integrate
.. //depot/projects/mips2/src/sys/netinet6/in6_src.c#11 integrate
.. //depot/projects/mips2/src/sys/netinet6/ip6_output.c#11 integrate
.. //depot/projects/mips2/src/sys/netinet6/ip6_var.h#9 integrate
.. //depot/projects/mips2/src/sys/netinet6/raw_ip6.c#12 integrate
.. //depot/projects/mips2/src/sys/netipsec/keysock.c#8 integrate
.. //depot/projects/mips2/src/sys/netipsec/xform_ah.c#7 integrate
.. //depot/projects/mips2/src/sys/netipx/ipx_pcb.c#4 integrate
.. //depot/projects/mips2/src/sys/netipx/spx_usrreq.c#5 integrate
.. //depot/projects/mips2/src/sys/netnatm/natm.c#4 integrate
.. //depot/projects/mips2/src/sys/netnatm/natm_pcb.c#3 integrate
.. //depot/projects/mips2/src/sys/netncp/ncp_conn.c#7 integrate
.. //depot/projects/mips2/src/sys/netncp/ncp_rq.c#3 integrate
.. //depot/projects/mips2/src/sys/netncp/ncp_sock.c#7 integrate
.. //depot/projects/mips2/src/sys/netncp/ncp_subr.c#2 integrate
.. //depot/projects/mips2/src/sys/netsmb/smb_rq.c#4 integrate
.. //depot/projects/mips2/src/sys/netsmb/smb_trantcp.c#7 integrate
.. //depot/projects/mips2/src/sys/nfs4client/nfs4_dev.c#2 integrate
.. //depot/projects/mips2/src/sys/nfs4client/nfs4_idmap.c#4 integrate
.. //depot/projects/mips2/src/sys/nfs4client/nfs4_socket.c#3 integrate
.. //depot/projects/mips2/src/sys/nfs4client/nfs4_vfsops.c#9 integrate
.. //depot/projects/mips2/src/sys/nfs4client/nfs4_vn_subs.c#3 integrate
.. //depot/projects/mips2/src/sys/nfs4client/nfs4_vnops.c#10 integrate
.. //depot/projects/mips2/src/sys/nfsclient/krpc_subr.c#4 integrate
.. //depot/projects/mips2/src/sys/nfsclient/nfs_lock.c#6 integrate
.. //depot/projects/mips2/src/sys/nfsclient/nfs_node.c#5 integrate
.. //depot/projects/mips2/src/sys/nfsclient/nfs_socket.c#10 integrate
.. //depot/projects/mips2/src/sys/nfsclient/nfs_subs.c#8 integrate
.. //depot/projects/mips2/src/sys/nfsclient/nfs_vfsops.c#14 integrate
.. //depot/projects/mips2/src/sys/nfsclient/nfs_vnops.c#14 integrate
.. //depot/projects/mips2/src/sys/nfsserver/nfs_serv.c#12 integrate
.. //depot/projects/mips2/src/sys/nfsserver/nfs_srvcache.c#4 integrate
.. //depot/projects/mips2/src/sys/nfsserver/nfs_srvsock.c#10 integrate
.. //depot/projects/mips2/src/sys/nfsserver/nfs_syscalls.c#10 integrate
.. //depot/projects/mips2/src/sys/opencrypto/cryptodev.c#7 integrate
.. //depot/projects/mips2/src/sys/opencrypto/cryptosoft.c#4 integrate
.. //depot/projects/mips2/src/sys/opencrypto/deflate.c#2 integrate
.. //depot/projects/mips2/src/sys/opencrypto/xform.c#3 integrate
.. //depot/projects/mips2/src/sys/pc98/pc98/pc98_machdep.c#3 integrate
.. //depot/projects/mips2/src/sys/pc98/pc98/pc98_machdep.h#2 integrate
.. //depot/projects/mips2/src/sys/pci/if_rl.c#9 integrate
.. //depot/projects/mips2/src/sys/pci/if_rlreg.h#15 integrate
.. //depot/projects/mips2/src/sys/powerpc/aim/locore.S#4 integrate
.. //depot/projects/mips2/src/sys/powerpc/aim/nexus.c#3 integrate
.. //depot/projects/mips2/src/sys/powerpc/aim/ofw_machdep.c#3 integrate
.. //depot/projects/mips2/src/sys/powerpc/booke/locore.S#3 integrate
.. //depot/projects/mips2/src/sys/powerpc/booke/pmap.c#5 integrate
.. //depot/projects/mips2/src/sys/powerpc/booke/trap.c#3 integrate
.. //depot/projects/mips2/src/sys/powerpc/conf/GENERIC#13 integrate
.. //depot/projects/mips2/src/sys/powerpc/conf/MPC85XX#4 integrate
.. //depot/projects/mips2/src/sys/powerpc/include/cpu.h#3 integrate
.. //depot/projects/mips2/src/sys/powerpc/include/cpufunc.h#5 integrate
.. //depot/projects/mips2/src/sys/powerpc/include/endian.h#2 integrate
.. //depot/projects/mips2/src/sys/powerpc/include/nexusvar.h#2 delete
.. //depot/projects/mips2/src/sys/powerpc/include/profile.h#2 integrate
.. //depot/projects/mips2/src/sys/powerpc/mpc85xx/lbc.c#1 branch
.. //depot/projects/mips2/src/sys/powerpc/mpc85xx/lbc.h#1 branch
.. //depot/projects/mips2/src/sys/powerpc/mpc85xx/ocpbus.c#4 integrate
.. //depot/projects/mips2/src/sys/powerpc/ofw/ofw_pci.c#2 delete
.. //depot/projects/mips2/src/sys/powerpc/ofw/ofw_pci.h#2 delete
.. //depot/projects/mips2/src/sys/powerpc/ofw/ofw_pcib_pci.c#2 integrate
.. //depot/projects/mips2/src/sys/powerpc/ofw/ofw_pcibus.c#1 branch
.. //depot/projects/mips2/src/sys/powerpc/ofw/ofw_syscons.c#4 integrate
.. //depot/projects/mips2/src/sys/powerpc/powermac/ata_dbdma.c#2 integrate
.. //depot/projects/mips2/src/sys/powerpc/powermac/ata_kauai.c#4 integrate
.. //depot/projects/mips2/src/sys/powerpc/powermac/cuda.c#1 branch
.. //depot/projects/mips2/src/sys/powerpc/powermac/cudavar.h#1 branch
.. //depot/projects/mips2/src/sys/powerpc/powermac/dbdma.c#4 integrate
.. //depot/projects/mips2/src/sys/powerpc/powermac/dbdmavar.h#3 integrate
.. //depot/projects/mips2/src/sys/powerpc/powermac/grackle.c#5 integrate
.. //depot/projects/mips2/src/sys/powerpc/powermac/hrowpic.c#5 integrate
.. //depot/projects/mips2/src/sys/powerpc/powermac/macgpio.c#1 branch
.. //depot/projects/mips2/src/sys/powerpc/powermac/macgpiovar.h#1 branch
.. //depot/projects/mips2/src/sys/powerpc/powermac/macio.c#5 integrate
.. //depot/projects/mips2/src/sys/powerpc/powermac/openpic_macio.c#5 integrate
.. //depot/projects/mips2/src/sys/powerpc/powermac/pmu.c#1 branch
.. //depot/projects/mips2/src/sys/powerpc/powermac/pmuvar.h#1 branch
.. //depot/projects/mips2/src/sys/powerpc/powermac/uninorth.c#6 integrate
.. //depot/projects/mips2/src/sys/powerpc/powermac/uninorthvar.h#2 integrate
.. //depot/projects/mips2/src/sys/powerpc/powermac/viareg.h#1 branch
.. //depot/projects/mips2/src/sys/powerpc/psim/iobus.c#3 integrate
.. //depot/projects/mips2/src/sys/powerpc/psim/openpic_iobus.c#6 integrate
.. //depot/projects/mips2/src/sys/rpc/rpcclnt.c#7 integrate
.. //depot/projects/mips2/src/sys/security/audit/audit_bsm_klib.c#11 integrate
.. //depot/projects/mips2/src/sys/security/audit/audit_pipe.c#10 integrate
.. //depot/projects/mips2/src/sys/security/mac/mac_cred.c#1 branch
.. //depot/projects/mips2/src/sys/security/mac/mac_framework.h#9 integrate
.. //depot/projects/mips2/src/sys/security/mac/mac_inet.c#8 integrate
.. //depot/projects/mips2/src/sys/security/mac/mac_inet6.c#2 integrate
.. //depot/projects/mips2/src/sys/security/mac/mac_policy.h#9 integrate
.. //depot/projects/mips2/src/sys/security/mac/mac_process.c#7 integrate
.. //depot/projects/mips2/src/sys/security/mac/mac_syscalls.c#7 integrate
.. //depot/projects/mips2/src/sys/security/mac/mac_vfs.c#7 integrate
.. //depot/projects/mips2/src/sys/security/mac_biba/mac_biba.c#9 integrate
.. //depot/projects/mips2/src/sys/security/mac_bsdextended/mac_bsdextended.c#8 integrate
.. //depot/projects/mips2/src/sys/security/mac_bsdextended/ugidfw_internal.h#1 branch
.. //depot/projects/mips2/src/sys/security/mac_bsdextended/ugidfw_system.c#1 branch
.. //depot/projects/mips2/src/sys/security/mac_bsdextended/ugidfw_vnode.c#1 branch
.. //depot/projects/mips2/src/sys/security/mac_lomac/mac_lomac.c#8 integrate
.. //depot/projects/mips2/src/sys/security/mac_mls/mac_mls.c#10 integrate
.. //depot/projects/mips2/src/sys/security/mac_partition/mac_partition.c#6 integrate
.. //depot/projects/mips2/src/sys/security/mac_seeotheruids/mac_seeotheruids.c#6 integrate
.. //depot/projects/mips2/src/sys/security/mac_stub/mac_stub.c#9 integrate
.. //depot/projects/mips2/src/sys/security/mac_test/mac_test.c#10 integrate
.. //depot/projects/mips2/src/sys/sparc64/pci/schizo.c#2 integrate
.. //depot/projects/mips2/src/sys/sparc64/sparc64/db_trace.c#4 integrate
.. //depot/projects/mips2/src/sys/sparc64/sparc64/stack_machdep.c#3 integrate
.. //depot/projects/mips2/src/sys/sun4v/sun4v/db_trace.c#3 integrate
.. //depot/projects/mips2/src/sys/sun4v/sun4v/stack_machdep.c#2 integrate
.. //depot/projects/mips2/src/sys/sys/_types.h#3 integrate
.. //depot/projects/mips2/src/sys/sys/cdefs.h#5 integrate
.. //depot/projects/mips2/src/sys/sys/cfictl.h#1 branch
.. //depot/projects/mips2/src/sys/sys/cons.h#4 integrate
.. //depot/projects/mips2/src/sys/sys/extattr.h#4 integrate
.. //depot/projects/mips2/src/sys/sys/malloc.h#4 integrate
.. //depot/projects/mips2/src/sys/sys/param.h#23 integrate
.. //depot/projects/mips2/src/sys/sys/proc.h#21 integrate
.. //depot/projects/mips2/src/sys/sys/syscallsubr.h#8 integrate
.. //depot/projects/mips2/src/sys/sys/systm.h#14 integrate
.. //depot/projects/mips2/src/sys/sys/tty.h#8 integrate
.. //depot/projects/mips2/src/sys/sys/types.h#7 integrate
.. //depot/projects/mips2/src/sys/sys/user.h#15 integrate
.. //depot/projects/mips2/src/sys/sys/vnode.h#14 integrate
.. //depot/projects/mips2/src/sys/ufs/ffs/ffs_inode.c#8 integrate
.. //depot/projects/mips2/src/sys/ufs/ffs/ffs_snapshot.c#12 integrate
.. //depot/projects/mips2/src/sys/ufs/ffs/ffs_softdep.c#14 integrate
.. //depot/projects/mips2/src/sys/ufs/ffs/ffs_vfsops.c#15 integrate
.. //depot/projects/mips2/src/sys/ufs/ffs/ffs_vnops.c#11 integrate
.. //depot/projects/mips2/src/sys/ufs/ufs/ufs_dirhash.c#5 integrate
.. //depot/projects/mips2/src/sys/ufs/ufs/ufs_extattr.c#7 integrate
.. //depot/projects/mips2/src/sys/ufs/ufs/ufs_vnops.c#12 integrate
.. //depot/projects/mips2/src/sys/vm/vm_mmap.c#12 integrate
.. //depot/projects/mips2/src/sys/xen/evtchn/evtchn.c#4 integrate
.. //depot/projects/mips2/src/tools/regression/lib/libutil/test-flopen.c#2 integrate
.. //depot/projects/mips2/src/tools/tools/ath/athdebug/athdebug.c#4 integrate
.. //depot/projects/mips2/src/tools/tools/ath/athstats/Makefile#4 integrate
.. //depot/projects/mips2/src/tools/tools/ath/athstats/athstats.c#5 integrate
.. //depot/projects/mips2/src/tools/tools/ath/athstats/main.c#4 integrate
.. //depot/projects/mips2/src/tools/tools/nanobsd/nanobsd.sh#16 integrate
.. //depot/projects/mips2/src/usr.bin/ministat/Makefile#2 integrate
.. //depot/projects/mips2/src/usr.bin/ministat/ministat.c#3 integrate
.. //depot/projects/mips2/src/usr.bin/netstat/inet.c#9 integrate
.. //depot/projects/mips2/src/usr.bin/netstat/route.c#8 integrate
.. //depot/projects/mips2/src/usr.bin/tftp/extern.h#2 integrate
.. //depot/projects/mips2/src/usr.bin/tftp/main.c#2 integrate
.. //depot/projects/mips2/src/usr.bin/tftp/tftp.c#3 integrate
.. //depot/projects/mips2/src/usr.bin/tftp/tftpsubs.c#2 integrate
.. //depot/projects/mips2/src/usr.sbin/Makefile#18 integrate
.. //depot/projects/mips2/src/usr.sbin/nscd/agents/group.c#3 integrate
.. //depot/projects/mips2/src/usr.sbin/nscd/agents/passwd.c#3 integrate
.. //depot/projects/mips2/src/usr.sbin/nscd/agents/services.c#3 integrate
.. //depot/projects/mips2/src/usr.sbin/nscd/cachelib.c#4 integrate
.. //depot/projects/mips2/src/usr.sbin/nscd/nscd.c#4 integrate
.. //depot/projects/mips2/src/usr.sbin/nscd/nscdcli.c#4 integrate
.. //depot/projects/mips2/src/usr.sbin/pciconf/pciconf.c#5 integrate
.. //depot/projects/mips2/src/usr.sbin/pkg_install/add/main.c#7 integrate
.. //depot/projects/mips2/src/usr.sbin/rpc.yppasswdd/yppasswdd_main.c#2 integrate
.. //depot/projects/mips2/src/usr.sbin/setfib/setfib.c#4 integrate
.. //depot/projects/mips2/src/usr.sbin/sysinstall/config.c#6 integrate
.. //depot/projects/mips2/src/usr.sbin/sysinstall/globals.c#2 integrate
.. //depot/projects/mips2/src/usr.sbin/sysinstall/index.c#6 integrate
.. //depot/projects/mips2/src/usr.sbin/sysinstall/keymap.c#2 integrate
.. //depot/projects/mips2/src/usr.sbin/sysinstall/package.c#3 integrate
.. //depot/projects/mips2/src/usr.sbin/sysinstall/sysinstall.h#8 integrate

Differences ...

==== //depot/projects/mips2/src/Makefile.inc1#25 (text+ko) ====

@@ -1,5 +1,5 @@
 #
-# $FreeBSD: src/Makefile.inc1,v 1.611 2008/09/19 16:14:42 obrien Exp $
+# $FreeBSD: src/Makefile.inc1,v 1.613 2008/10/23 16:06:49 des Exp $
 #
 # Make command line options:
 #	-DNO_CLEANDIR run ${MAKE} clean, instead of ${MAKE} cleandir

==== //depot/projects/mips2/src/UPDATING#24 (text+ko) ====

@@ -22,6 +22,9 @@
 	to maximize performance.  (To disable malloc debugging, run
 	ln -s aj /etc/malloc.conf.)
 
+20081028:
+	dummynet(4) ABI has changed. ipfw(8) needs to be recompiled.
+
 20081009:
 	The uhci, ohci, ehci and slhci USB Host controller drivers have
 	been put into separate modules. If you load the usb module
@@ -1146,4 +1149,4 @@
 Contact Warner Losh if you have any questions about your use of
 this document.
 
-$FreeBSD: src/UPDATING,v 1.545 2008/10/10 06:37:51 n_hibma Exp $
+$FreeBSD: src/UPDATING,v 1.546 2008/10/28 14:14:57 oleg Exp $

==== //depot/projects/mips2/src/bin/cat/cat.c#2 (text+ko) ====

@@ -44,7 +44,7 @@
 #endif
 #endif /* not lint */
 #include 
-__FBSDID("$FreeBSD: src/bin/cat/cat.c,v 1.32 2005/01/10 08:39:20 imp Exp $");
+__FBSDID("$FreeBSD: src/bin/cat/cat.c,v 1.33 2008/10/30 14:05:57 ivoras Exp $");
 
 #include 
 #include 
@@ -77,6 +77,17 @@
 static int udom_open(const char *path, int flags);
 #endif
 
+/* Memory strategy threshold, in pages: if physmem is larger then this, use a 
+ * large buffer */
+#define PHYSPAGES_THRESHOLD (32*1024)
+
+/* Maximum buffer size in bytes - do not allow it to grow larger than this */
+#define BUFSIZE_MAX (2*1024*1024)
+
+/* Small (default) buffer size in bytes. It's inefficient for this to be
+ * smaller than MAXPHYS */
+#define BUFSIZE_SMALL (MAXPHYS)
+
 int
 main(int argc, char *argv[])
 {
@@ -247,9 +258,17 @@
 	if (buf == NULL) {
 		if (fstat(wfd, &sbuf))
 			err(1, "%s", filename);
-		bsize = MAX(sbuf.st_blksize, 1024);
+		if (S_ISREG(sbuf.st_mode)) {
+			/* If there's plenty of RAM, use a large copy buffer */
+			if (sysconf(_SC_PHYS_PAGES) > PHYSPAGES_THRESHOLD)
+				bsize = MIN(BUFSIZE_MAX, MAXPHYS*8);
+			else
+				bsize = BUFSIZE_SMALL;
+		} else
+			bsize = MAX(sbuf.st_blksize, 
+					(blksize_t)sysconf(_SC_PAGESIZE));
 		if ((buf = malloc(bsize)) == NULL)
-			err(1, "buffer");
+			err(1, "malloc() failure of IO buffer");
 	}
 	while ((nr = read(rfd, buf, bsize)) > 0)
 		for (off = 0; nr; nr -= nw, off += nw)

==== //depot/projects/mips2/src/bin/chio/chio.c#2 (text+ko) ====

@@ -43,7 +43,7 @@
 #endif
 
 #include 
-__FBSDID("$FreeBSD: src/bin/chio/chio.c,v 1.27 2005/01/10 08:39:20 imp Exp $");
+__FBSDID("$FreeBSD: src/bin/chio/chio.c,v 1.28 2008/10/30 19:51:02 joerg Exp $");
 
 #include 
 #include  
@@ -69,7 +69,7 @@
 
 static	void find_element(char *, uint16_t *, uint16_t *);
 static	struct changer_element_status *get_element_status
-	   (unsigned int, unsigned int);
+	   (unsigned int, unsigned int, int);
 
 static	int do_move(const char *, int, char **);
 static	int do_exchange(const char *, int, char **);
@@ -969,7 +969,8 @@
 	++argv; --argc;
 
 	/* Get the status */
-	ces = get_element_status((unsigned int)type, (unsigned int)element);
+	ces = get_element_status((unsigned int)type, (unsigned int)element,
+	    CHET_VT == type);
 
 	if (NULL == ces)
 		errx(1, "%s: null element status pointer", cname);
@@ -1004,7 +1005,7 @@
  * should free() it when done.
  */
 static struct changer_element_status *
-get_element_status(unsigned int type, unsigned int element)
+get_element_status(unsigned int type, unsigned int element, int use_voltags)
 {
 	struct changer_element_status_request cesr;
 	struct changer_element_status *ces;
@@ -1020,7 +1021,8 @@
 	cesr.cesr_element_type = (uint16_t)type;
 	cesr.cesr_element_base = (uint16_t)element;
 	cesr.cesr_element_count = 1;		/* Only this one element */
-	cesr.cesr_flags |= CESR_VOLTAGS;	/* Grab voltags as well */
+	if (use_voltags)
+		cesr.cesr_flags |= CESR_VOLTAGS; /* Grab voltags as well */
 	cesr.cesr_element_status = ces;
 
 	if (ioctl(changer_fd, CHIOGSTATUS, (char *)&cesr) == -1) {

==== //depot/projects/mips2/src/bin/cp/utils.c#6 (text+ko) ====

@@ -33,7 +33,7 @@
 #endif
 #endif /* not lint */
 #include 
-__FBSDID("$FreeBSD: src/bin/cp/utils.c,v 1.55 2008/09/09 12:31:42 trasz Exp $");
+__FBSDID("$FreeBSD: src/bin/cp/utils.c,v 1.57 2008/10/30 14:05:57 ivoras Exp $");
 
 #include 
 #include 
@@ -57,10 +57,22 @@
 
 #define	cp_pct(x, y)	((y == 0) ? 0 : (int)(100.0 * (x) / (y)))
 
+/* Memory strategy threshold, in pages: if physmem is larger then this, use a 
+ * large buffer */
+#define PHYSPAGES_THRESHOLD (32*1024)
+
+/* Maximum buffer size in bytes - do not allow it to grow larger than this */
+#define BUFSIZE_MAX (2*1024*1024)
+
+/* Small (default) buffer size in bytes. It's inefficient for this to be
+ * smaller than MAXPHYS */
+#define BUFSIZE_SMALL (MAXPHYS)
+
 int
 copy_file(const FTSENT *entp, int dne)
 {
-	static char buf[MAXBSIZE];
+	static char *buf = NULL;
+	static size_t bufsize;
 	struct stat *fs;
 	ssize_t wcount;
 	size_t wresid;
@@ -137,47 +149,60 @@
 		 * Mmap and write if less than 8M (the limit is so we don't totally
 		 * trash memory on big files.  This is really a minor hack, but it
 		 * wins some CPU back.
+		 * Some filesystems, such as smbnetfs, don't support mmap,
+		 * so this is a best-effort attempt.
 		 */
 #ifdef VM_AND_BUFFER_CACHE_SYNCHRONIZED
 		if (S_ISREG(fs->st_mode) && fs->st_size > 0 &&
-	    	fs->st_size <= 8 * 1048576) {
-			if ((p = mmap(NULL, (size_t)fs->st_size, PROT_READ,
-		    	MAP_SHARED, from_fd, (off_t)0)) == MAP_FAILED) {
+	    	    fs->st_size <= 8 * 1024 * 1024 &&
+		    (p = mmap(NULL, (size_t)fs->st_size, PROT_READ,
+		    MAP_SHARED, from_fd, (off_t)0)) != MAP_FAILED) {
+			wtotal = 0;
+			for (bufp = p, wresid = fs->st_size; ;
+			bufp += wcount, wresid -= (size_t)wcount) {
+				wcount = write(to_fd, bufp, wresid);
+				if (wcount <= 0)
+					break;
+				wtotal += wcount;
+				if (info) {
+					info = 0;
+					(void)fprintf(stderr,
+					    "%s -> %s %3d%%\n",
+					    entp->fts_path, to.p_path,
+					    cp_pct(wtotal, fs->st_size));
+				}
+				if (wcount >= (ssize_t)wresid)
+					break;
+			}
+			if (wcount != (ssize_t)wresid) {
+				warn("%s", to.p_path);
+				rval = 1;
+			}
+			/* Some systems don't unmap on close(2). */
+			if (munmap(p, fs->st_size) < 0) {
 				warn("%s", entp->fts_path);
 				rval = 1;
-			} else {
-				wtotal = 0;
-				for (bufp = p, wresid = fs->st_size; ;
-			    	bufp += wcount, wresid -= (size_t)wcount) {
-					wcount = write(to_fd, bufp, wresid);
-					if (wcount <= 0)
-						break;
-					wtotal += wcount;
-					if (info) {
-						info = 0;
-						(void)fprintf(stderr,
-						    "%s -> %s %3d%%\n",
-						    entp->fts_path, to.p_path,
-						    cp_pct(wtotal, fs->st_size));
-					}
-					if (wcount >= (ssize_t)wresid)
-						break;
-				}
-				if (wcount != (ssize_t)wresid) {
-					warn("%s", to.p_path);
-					rval = 1;
-				}
-				/* Some systems don't unmap on close(2). */
-				if (munmap(p, fs->st_size) < 0) {
-					warn("%s", entp->fts_path);
-					rval = 1;
-				}
 			}
 		} else
 #endif
 		{
+			if (buf == NULL) {
+				/*
+				 * Note that buf and bufsize are static. If
+				 * malloc() fails, it will fail at the start
+				 * and not copy only some files. 
+				 */ 
+				if (sysconf(_SC_PHYS_PAGES) > 
+				    PHYSPAGES_THRESHOLD)
+					bufsize = MIN(BUFSIZE_MAX, MAXPHYS * 8);
+				else
+					bufsize = BUFSIZE_SMALL;
+				buf = malloc(bufsize);
+				if (buf == NULL)
+					err(1, "Not enough memory");
+			}
 			wtotal = 0;
-			while ((rcount = read(from_fd, buf, MAXBSIZE)) > 0) {
+			while ((rcount = read(from_fd, buf, bufsize)) > 0) {
 				for (bufp = buf, wresid = rcount; ;
 			    	bufp += wcount, wresid -= wcount) {
 					wcount = write(to_fd, bufp, wresid);

==== //depot/projects/mips2/src/bin/rcp/rcp.c#3 (text+ko) ====

@@ -46,7 +46,7 @@
 #endif /* not lint */
 #endif
 #include 
-__FBSDID("$FreeBSD: src/bin/rcp/rcp.c,v 1.46 2007/05/22 04:21:00 cperciva Exp $");
+__FBSDID("$FreeBSD: src/bin/rcp/rcp.c,v 1.47 2008/10/28 17:15:46 rdivacky Exp $");
 
 #include 
 #include 
@@ -789,6 +789,4 @@
 		vwarnx(fmt, ap);
 		va_end(ap);
 	}
-
-	va_end(ap);
 }


>>> TRUNCATED FOR MAIL (1000 lines) <<<

From owner-p4-projects@FreeBSD.ORG  Fri Oct 31 21:07:02 2008
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id C49A9106568E; Fri, 31 Oct 2008 21:07:02 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 86B6A106568C
	for ; Fri, 31 Oct 2008 21:07:02 +0000 (UTC)
	(envelope-from wsalamon@computer.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 751768FC1E
	for ; Fri, 31 Oct 2008 21:07:02 +0000 (UTC)
	(envelope-from wsalamon@computer.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id m9VL72Bd016454
	for ; Fri, 31 Oct 2008 21:07:02 GMT
	(envelope-from wsalamon@computer.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m9VL6sfN016436
	for perforce@freebsd.org; Fri, 31 Oct 2008 21:06:54 GMT
	(envelope-from wsalamon@computer.org)
Date: Fri, 31 Oct 2008 21:06:54 GMT
Message-Id: <200810312106.m9VL6sfN016436@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	wsalamon@computer.org using -f
From: Wayne Salamon 
To: Perforce Change Reviews 
Cc: 
Subject: PERFORCE change 152297 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, 31 Oct 2008 21:07:03 -0000

http://perforce.freebsd.org/chv.cgi?CH=152297

Change 152297 by wsalamon@vh2 on 2008/10/31 21:06:54

	Integrate audit_mac development branch from parent.

Affected files ...

.. //depot/projects/trustedbsd/audit_mac/src/sys/amd64/amd64/dump_machdep.c#4 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/amd64/amd64/identcpu.c#5 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/amd64/amd64/initcpu.c#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/amd64/amd64/local_apic.c#5 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/amd64/amd64/minidump_machdep.c#5 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/amd64/amd64/prof_machdep.c#3 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/amd64/amd64/tsc.c#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/amd64/include/clock.h#4 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/amd64/include/md_var.h#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/amd64/include/specialreg.h#4 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/amd64/linux32/linux.h#4 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/amd64/linux32/linux32_sysvec.c#5 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/arm/arm/swtch.S#4 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/arm/arm/undefined.c#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/arm/at91/at91.c#5 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/arm/at91/at91_mci.c#3 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/arm/conf/AVILA#5 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/arm/conf/BWCT#4 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/arm/conf/CRB#4 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/arm/conf/DB-78XXX#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/arm/conf/DB-88F5XXX#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/arm/conf/DB-88F6XXX#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/arm/conf/DEFAULTS#1 branch
.. //depot/projects/trustedbsd/audit_mac/src/sys/arm/conf/EP80219#4 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/arm/conf/GUMSTIX#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/arm/conf/HL200#4 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/arm/conf/IQ31244#4 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/arm/conf/KB920X#6 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/arm/conf/NSLU#3 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/arm/conf/SIMICS#4 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/arm/conf/SKYEYE#4 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/boot/powerpc/boot1.chrp/boot1.c#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/boot/powerpc/boot1.chrp/bootinfo.txt#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/cam/scsi/scsi_target.c#3 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/cddl/compat/opensolaris/kern/opensolaris_policy.c#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/cddl/compat/opensolaris/sys/policy.h#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ctldir.c#4 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c#5 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/compat/freebsd32/freebsd32_misc.c#5 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/compat/freebsd32/freebsd32_proto.h#6 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/compat/freebsd32/freebsd32_syscall.h#6 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/compat/freebsd32/freebsd32_syscalls.c#6 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/compat/freebsd32/freebsd32_sysent.c#6 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/compat/freebsd32/syscalls.master#6 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/compat/linux/linux_emul.c#3 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/compat/linux/linux_getcwd.c#3 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/compat/linux/linux_ioctl.c#5 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/compat/linux/linux_signal.c#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/compat/linux/linux_signal.h#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/compat/linux/linux_socket.c#4 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/compat/linux/linux_util.c#5 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/conf/NOTES#10 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/conf/files#12 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/conf/files.arm#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/conf/files.mips#4 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/conf/files.powerpc#7 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/conf/options#10 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/contrib/altq/altq/altq_cbq.c#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/contrib/altq/altq/altq_cdnr.c#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/contrib/altq/altq/altq_hfsc.c#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/contrib/altq/altq/altq_priq.c#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/contrib/altq/altq/altq_red.c#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/contrib/altq/altq/altq_rio.c#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/contrib/altq/altq/altq_rmclass.c#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/contrib/altq/altq/altq_subr.c#4 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/contrib/ipfilter/netinet/ip_compat.h#4 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/dev/adb/adb.h#1 branch
.. //depot/projects/trustedbsd/audit_mac/src/sys/dev/adb/adb_bus.c#1 branch
.. //depot/projects/trustedbsd/audit_mac/src/sys/dev/adb/adb_hb_if.m#1 branch
.. //depot/projects/trustedbsd/audit_mac/src/sys/dev/adb/adb_if.m#1 branch
.. //depot/projects/trustedbsd/audit_mac/src/sys/dev/adb/adb_kbd.c#1 branch
.. //depot/projects/trustedbsd/audit_mac/src/sys/dev/adb/adb_mouse.c#1 branch
.. //depot/projects/trustedbsd/audit_mac/src/sys/dev/adb/adbvar.h#1 branch
.. //depot/projects/trustedbsd/audit_mac/src/sys/dev/age/if_age.c#3 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/dev/age/if_agevar.h#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/dev/ar/if_ar.c#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/dev/ata/ata-dma.c#4 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/dev/ata/ata-queue.c#3 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/dev/ata/chipsets/ata-cyrix.c#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/dev/ata/chipsets/ata-marvell.c#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/dev/ata/chipsets/ata-national.c#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/dev/ata/chipsets/ata-serverworks.c#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/dev/ath/ah_osdep.c#3 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/dev/ath/ath_rate/amrr/amrr.c#3 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/dev/ath/ath_rate/onoe/onoe.c#3 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/dev/ath/ath_rate/sample/sample.c#3 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/dev/ath/if_ath.c#7 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/dev/ath/if_athrate.h#3 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/dev/ath/if_athvar.h#6 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/dev/bge/if_bge.c#7 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/dev/ce/if_ce.c#4 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/dev/cfe/cfe_console.c#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/dev/cfi/cfi_bus_lbc.c#1 branch
.. //depot/projects/trustedbsd/audit_mac/src/sys/dev/cfi/cfi_core.c#1 branch
.. //depot/projects/trustedbsd/audit_mac/src/sys/dev/cfi/cfi_dev.c#1 branch
.. //depot/projects/trustedbsd/audit_mac/src/sys/dev/cfi/cfi_reg.h#1 branch
.. //depot/projects/trustedbsd/audit_mac/src/sys/dev/cfi/cfi_var.h#1 branch
.. //depot/projects/trustedbsd/audit_mac/src/sys/dev/cxgb/cxgb_sge.c#6 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/dev/drm/drm_drv.c#4 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/dev/drm/drm_fops.c#4 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/dev/drm/drm_lock.c#4 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/dev/drm/i915_dma.c#5 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/dev/drm/radeon_cp.c#4 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/dev/drm/radeon_drv.h#4 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/dev/hwpmc/hwpmc_amd.c#4 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/dev/hwpmc/hwpmc_logging.c#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/dev/hwpmc/hwpmc_mod.c#4 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/dev/hwpmc/hwpmc_piv.c#3 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/dev/hwpmc/hwpmc_ppro.c#3 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/dev/hwpmc/hwpmc_x86.c#3 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/dev/iwn/if_iwn.c#3 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/dev/lmc/if_lmc.c#4 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/dev/mii/atphy.c#3 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/dev/mii/ciphy.c#5 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/dev/mii/e1000phy.c#3 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/dev/mii/miidevs#8 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/dev/mmc/mmc.c#3 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/dev/mmc/mmcbrvar.h#3 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/dev/mmc/mmcreg.h#3 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/dev/mmc/mmcsd.c#3 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/dev/mmc/mmcvar.h#3 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/dev/mxge/eth_z8e.h#3 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/dev/mxge/ethp_z8e.h#3 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/dev/mxge/rss_eth_z8e.h#3 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/dev/mxge/rss_ethp_z8e.h#3 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/dev/ofw/ofw_console.c#5 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/dev/pci/pci.c#4 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/dev/pci/pcireg.h#3 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/dev/ppbus/if_plip.c#4 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/dev/ppbus/immio.c#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/dev/ppbus/lpbb.c#3 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/dev/ppbus/lpt.c#3 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/dev/ppbus/pcfclock.c#3 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/dev/ppbus/ppb_base.c#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/dev/ppbus/ppb_msq.c#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/dev/ppbus/ppbconf.c#4 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/dev/ppbus/ppbconf.h#3 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/dev/ppbus/ppi.c#3 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/dev/ppbus/pps.c#3 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/dev/ppbus/vpo.c#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/dev/ppbus/vpoio.c#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/dev/ppbus/vpoio.h#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/dev/ppc/ppc.c#4 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/dev/ppc/ppcreg.h#4 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/dev/puc/pucdata.c#5 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/dev/ral/rt2560.c#5 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/dev/ral/rt2661.c#5 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/dev/ray/if_ray.c#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/dev/ray/if_rayvar.h#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/dev/sdhci/sdhci.c#1 branch
.. //depot/projects/trustedbsd/audit_mac/src/sys/dev/sdhci/sdhci.h#1 branch
.. //depot/projects/trustedbsd/audit_mac/src/sys/dev/sound/pci/hda/hdac.c#6 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/dev/sr/if_sr.c#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/dev/uart/uart_tty.c#3 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/dev/usb/if_zyd.c#7 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/dev/usb/u3g.c#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/dev/usb/ubsa.c#8 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/dev/usb/ucom.c#5 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/dev/usb/udbp.c#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/dev/usb/ufoma.c#5 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/dev/usb/usb_quirks.c#5 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/dev/usb/usbdevs#10 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/dev/usb/usbdi.c#3 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/dev/wpi/if_wpi.c#7 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/dev/xen/console/console.c#4 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/fs/cd9660/cd9660_node.c#3 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/fs/cd9660/cd9660_vfsops.c#3 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/fs/cd9660/cd9660_vnops.c#4 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/fs/coda/coda_vnops.c#3 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/fs/devfs/devfs_vnops.c#7 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/fs/fdescfs/fdesc_vfsops.c#3 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/fs/fdescfs/fdesc_vnops.c#7 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/fs/fifofs/fifo_vnops.c#3 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/fs/hpfs/hpfs_subr.c#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/fs/hpfs/hpfs_vfsops.c#3 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/fs/hpfs/hpfs_vnops.c#4 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/fs/msdosfs/msdosfs_denode.c#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/fs/msdosfs/msdosfs_vfsops.c#4 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/fs/msdosfs/msdosfs_vnops.c#7 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/fs/ntfs/ntfs_subr.c#3 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/fs/ntfs/ntfs_vfsops.c#3 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/fs/ntfs/ntfs_vnops.c#3 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/fs/nullfs/null_subr.c#3 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/fs/nullfs/null_vnops.c#3 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/fs/nwfs/nwfs_node.c#3 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/fs/nwfs/nwfs_vfsops.c#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/fs/nwfs/nwfs_vnops.c#3 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/fs/portalfs/portal_vfsops.c#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/fs/portalfs/portal_vnops.c#4 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/fs/pseudofs/pseudofs.c#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/fs/pseudofs/pseudofs_vncache.c#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/fs/pseudofs/pseudofs_vnops.c#4 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/fs/smbfs/smbfs_node.c#6 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/fs/smbfs/smbfs_vfsops.c#3 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/fs/smbfs/smbfs_vnops.c#4 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/fs/tmpfs/tmpfs_vnops.c#6 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/fs/udf/udf_vfsops.c#3 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/fs/udf/udf_vnops.c#4 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/fs/unionfs/union_subr.c#5 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/fs/unionfs/union_vnops.c#4 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/geom/geom_disk.c#3 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/geom/part/g_part_bsd.c#6 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/geom/part/g_part_pc98.c#5 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/geom/part/g_part_vtoc8.c#5 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/geom/vinum/geom_vinum.c#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/geom/vinum/geom_vinum.h#3 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/geom/vinum/geom_vinum_drive.c#6 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/geom/vinum/geom_vinum_init.c#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/geom/vinum/geom_vinum_plex.c#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/geom/vinum/geom_vinum_raid5.c#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/geom/vinum/geom_vinum_rm.c#3 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/geom/vinum/geom_vinum_state.c#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/geom/vinum/geom_vinum_subr.c#3 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/geom/vinum/geom_vinum_volume.c#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/gnu/fs/ext2fs/ext2_inode.c#3 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/gnu/fs/ext2fs/ext2_lookup.c#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/gnu/fs/ext2fs/ext2_vfsops.c#5 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/gnu/fs/ext2fs/ext2_vnops.c#4 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/gnu/fs/reiserfs/reiserfs_inode.c#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/gnu/fs/reiserfs/reiserfs_vfsops.c#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/gnu/fs/reiserfs/reiserfs_vnops.c#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/gnu/fs/xfs/FreeBSD/xfs_super.c#3 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/gnu/fs/xfs/FreeBSD/xfs_vnops.c#5 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/i386/conf/NOTES#8 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/i386/cpufreq/powernow.c#4 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/i386/i386/apic_vector.s#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/i386/i386/dump_machdep.c#4 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/i386/i386/identcpu.c#5 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/i386/i386/initcpu.c#3 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/i386/i386/local_apic.c#6 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/i386/i386/minidump_machdep.c#4 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/i386/i386/sys_machdep.c#5 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/i386/i386/trap.c#6 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/i386/i386/tsc.c#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/i386/include/apicvar.h#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/i386/include/clock.h#4 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/i386/include/cpufunc.h#5 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/i386/include/md_var.h#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/i386/include/pcpu.h#5 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/i386/include/smp.h#4 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/i386/include/specialreg.h#5 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/i386/include/trap.h#3 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/i386/include/xen/evtchn.h#3 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/i386/include/xen/xen-os.h#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/i386/include/xen/xen_intr.h#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/i386/include/xen/xenfunc.h#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/i386/isa/pmtimer.c#3 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/i386/isa/prof_machdep.c#3 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/i386/linux/linux.h#4 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/i386/linux/linux_sysvec.c#5 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/i386/xen/clock.c#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/i386/xen/exception.s#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/i386/xen/locore.s#3 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/i386/xen/mp_machdep.c#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/i386/xen/xen_machdep.c#4 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/ia64/ia64/mp_machdep.c#5 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/ia64/ia64/sscdisk.c#4 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/kern/init_main.c#7 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/kern/kern_descrip.c#9 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/kern/kern_event.c#4 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/kern/kern_fork.c#5 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/kern/kern_jail.c#7 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/kern/kern_linker.c#6 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/kern/kern_lockf.c#5 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/kern/kern_mtxpool.c#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/kern/kern_proc.c#7 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/kern/kern_prot.c#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/kern/kern_resource.c#5 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/kern/kern_sig.c#7 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/kern/kern_synch.c#7 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/kern/kern_thr.c#5 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/kern/kern_thread.c#9 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/kern/kern_time.c#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/kern/kern_timeout.c#5 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/kern/sched_ule.c#8 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/kern/subr_acl_posix1e.c#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/kern/subr_blist.c#3 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/kern/subr_param.c#3 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/kern/subr_rman.c#4 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/kern/subr_sleepqueue.c#6 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/kern/subr_stack.c#3 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/kern/subr_trap.c#4 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/kern/subr_witness.c#10 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/kern/sys_process.c#4 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/kern/tty.c#8 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/kern/uipc_accf.c#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/kern/uipc_mqueue.c#5 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/kern/uipc_shm.c#4 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/kern/uipc_socket.c#8 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/kern/uipc_syscalls.c#5 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/kern/uipc_usrreq.c#5 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/kern/vfs_export.c#3 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/kern/vfs_subr.c#10 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/kern/vfs_syscalls.c#6 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/kern/vfs_vnops.c#6 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/kern/vnode_if.src#5 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/mips/conf/ADM5120#3 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/mips/conf/DEFAULTS#1 branch
.. //depot/projects/trustedbsd/audit_mac/src/sys/mips/conf/IDT#3 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/mips/conf/MALTA#3 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/mips/conf/QEMU#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/mips/conf/SENTRY5#3 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/modules/Makefile#10 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/modules/mac_bsdextended/Makefile#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/modules/sdhci/Makefile#1 branch
.. //depot/projects/trustedbsd/audit_mac/src/sys/modules/u3g/Makefile#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/net/bpf.c#8 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/net/bsd_comp.c#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/net/if.c#8 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/net/if_arcsubr.c#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/net/if_ethersubr.c#8 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/net/if_fddisubr.c#3 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/net/if_iso88025subr.c#5 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/net/if_ppp.c#3 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/net/if_sl.c#3 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/net/if_tap.c#5 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/net/if_tun.c#4 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/net/ppp_deflate.c#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/net/rtsock.c#7 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/net80211/_ieee80211.h#3 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/net80211/ieee80211.c#7 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/net80211/ieee80211_acl.c#3 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/net80211/ieee80211_adhoc.c#4 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/net80211/ieee80211_crypto.c#5 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/net80211/ieee80211_crypto_ccmp.c#4 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/net80211/ieee80211_crypto_tkip.c#5 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/net80211/ieee80211_crypto_wep.c#4 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/net80211/ieee80211_freebsd.c#6 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/net80211/ieee80211_freebsd.h#5 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/net80211/ieee80211_hostap.c#4 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/net80211/ieee80211_ht.c#6 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/net80211/ieee80211_ht.h#5 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/net80211/ieee80211_input.c#4 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/net80211/ieee80211_ioctl.c#6 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/net80211/ieee80211_node.c#6 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/net80211/ieee80211_node.h#4 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/net80211/ieee80211_output.c#5 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/net80211/ieee80211_power.c#3 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/net80211/ieee80211_power.h#3 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/net80211/ieee80211_proto.c#4 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/net80211/ieee80211_proto.h#4 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/net80211/ieee80211_regdomain.c#3 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/net80211/ieee80211_scan.c#4 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/net80211/ieee80211_scan_sta.c#5 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/net80211/ieee80211_sta.c#3 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/net80211/ieee80211_var.h#5 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/net80211/ieee80211_wds.c#4 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/netatalk/ddp_pcb.c#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/netgraph/atm/sscfu/ng_sscfu_cust.h#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/netgraph/bluetooth/drivers/h4/ng_h4.c#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/netgraph/bluetooth/hci/ng_hci_main.c#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/netgraph/bluetooth/hci/ng_hci_misc.c#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/netgraph/bluetooth/l2cap/ng_l2cap_main.c#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/netgraph/bluetooth/l2cap/ng_l2cap_misc.c#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/netgraph/bluetooth/l2cap/ng_l2cap_misc.h#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/netgraph/bluetooth/socket/ng_btsocket_hci_raw.c#3 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/netgraph/bluetooth/socket/ng_btsocket_l2cap.c#3 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/netgraph/bluetooth/socket/ng_btsocket_l2cap_raw.c#3 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/netgraph/bluetooth/socket/ng_btsocket_rfcomm.c#3 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/netgraph/bluetooth/socket/ng_btsocket_sco.c#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/netgraph/netflow/netflow.c#4 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/netgraph/netflow/ng_netflow.c#4 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/netgraph/netgraph.h#6 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/netgraph/ng_UI.c#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/netgraph/ng_async.c#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/netgraph/ng_atmllc.c#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/netgraph/ng_base.c#8 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/netgraph/ng_bpf.c#3 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/netgraph/ng_bridge.c#3 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/netgraph/ng_cisco.c#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/netgraph/ng_device.c#3 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/netgraph/ng_eiface.c#4 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/netgraph/ng_etf.c#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/netgraph/ng_ether.c#3 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/netgraph/ng_fec.c#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/netgraph/ng_frame_relay.c#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/netgraph/ng_gif.c#4 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/netgraph/ng_gif_demux.c#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/netgraph/ng_hole.c#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/netgraph/ng_iface.c#5 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/netgraph/ng_ipfw.c#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/netgraph/ng_ksocket.c#3 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/netgraph/ng_l2tp.c#4 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/netgraph/ng_lmi.c#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/netgraph/ng_message.h#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/netgraph/ng_mppc.c#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/netgraph/ng_nat.c#4 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/netgraph/ng_one2many.c#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/netgraph/ng_parse.c#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/netgraph/ng_pipe.c#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/netgraph/ng_ppp.c#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/netgraph/ng_pptpgre.c#3 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/netgraph/ng_rfc1490.c#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/netgraph/ng_sample.c#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/netgraph/ng_split.c#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/netgraph/ng_sppp.c#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/netgraph/ng_tag.c#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/netgraph/ng_tcpmss.c#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/netgraph/ng_tee.c#3 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/netgraph/ng_tty.c#3 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/netgraph/ng_vjc.c#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/netgraph/ng_vlan.c#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/netinet/if_ether.c#6 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/netinet/igmp.c#4 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/netinet/in.c#5 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/netinet/in_mcast.c#6 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/netinet/in_pcb.c#7 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/netinet/in_pcb.h#7 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/netinet/ip_carp.c#5 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/netinet/ip_divert.c#5 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/netinet/ip_dummynet.h#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/netinet/raw_ip.c#7 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/netinet/sctp_crc32.c#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/netinet/sctp_os_bsd.h#4 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/netinet/sctp_output.c#6 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/netinet/sctp_sysctl.c#4 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/netinet/sctp_timer.c#5 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/netinet/sctp_timer.h#4 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/netinet/sctp_uio.h#4 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/netinet/sctp_usrreq.c#5 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/netinet/sctputil.c#6 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/netinet/tcp_input.c#8 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/netinet/tcp_sack.c#5 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/netinet/tcp_subr.c#7 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/netinet/tcp_syncache.c#8 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/netinet/udp_usrreq.c#7 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/netinet6/frag6.c#5 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/netinet6/in6.c#6 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/netinet6/in6_pcb.c#7 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/netinet6/in6_src.c#6 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/netinet6/ip6_var.h#4 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/netinet6/raw_ip6.c#6 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/netipsec/keysock.c#4 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/netipsec/xform_ah.c#5 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/netipx/ipx_pcb.c#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/netipx/spx_usrreq.c#3 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/netnatm/natm.c#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/netnatm/natm_pcb.c#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/netncp/ncp_conn.c#3 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/netncp/ncp_rq.c#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/netncp/ncp_sock.c#3 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/netncp/ncp_subr.c#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/netsmb/smb_rq.c#3 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/netsmb/smb_trantcp.c#3 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/nfs4client/nfs4_dev.c#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/nfs4client/nfs4_idmap.c#3 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/nfs4client/nfs4_socket.c#3 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/nfs4client/nfs4_vfsops.c#5 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/nfs4client/nfs4_vn_subs.c#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/nfs4client/nfs4_vnops.c#6 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/nfsclient/krpc_subr.c#3 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/nfsclient/nfs_lock.c#4 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/nfsclient/nfs_node.c#3 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/nfsclient/nfs_socket.c#4 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/nfsclient/nfs_subs.c#3 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/nfsclient/nfs_vfsops.c#8 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/nfsclient/nfs_vnops.c#8 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/nfsserver/nfs_serv.c#7 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/nfsserver/nfs_srvcache.c#3 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/nfsserver/nfs_srvsock.c#4 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/nfsserver/nfs_syscalls.c#5 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/opencrypto/cryptodev.c#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/opencrypto/cryptosoft.c#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/opencrypto/deflate.c#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/opencrypto/xform.c#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/pc98/pc98/pc98_machdep.c#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/pc98/pc98/pc98_machdep.h#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/pci/if_rl.c#5 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/pci/if_rlreg.h#6 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/powerpc/aim/locore.S#6 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/powerpc/booke/locore.S#3 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/powerpc/booke/pmap.c#5 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/powerpc/booke/trap.c#4 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/powerpc/conf/GENERIC#6 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/powerpc/conf/MPC85XX#4 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/powerpc/include/cpu.h#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/powerpc/include/cpufunc.h#5 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/powerpc/include/endian.h#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/powerpc/include/profile.h#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/powerpc/mpc85xx/lbc.c#1 branch
.. //depot/projects/trustedbsd/audit_mac/src/sys/powerpc/mpc85xx/lbc.h#1 branch
.. //depot/projects/trustedbsd/audit_mac/src/sys/powerpc/mpc85xx/ocpbus.c#4 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/powerpc/powermac/ata_dbdma.c#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/powerpc/powermac/ata_kauai.c#3 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/powerpc/powermac/cuda.c#1 branch
.. //depot/projects/trustedbsd/audit_mac/src/sys/powerpc/powermac/cudavar.h#1 branch
.. //depot/projects/trustedbsd/audit_mac/src/sys/powerpc/powermac/dbdma.c#3 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/powerpc/powermac/dbdmavar.h#3 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/powerpc/powermac/macgpio.c#1 branch
.. //depot/projects/trustedbsd/audit_mac/src/sys/powerpc/powermac/macgpiovar.h#1 branch
.. //depot/projects/trustedbsd/audit_mac/src/sys/powerpc/powermac/macio.c#5 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/powerpc/powermac/pmu.c#1 branch
.. //depot/projects/trustedbsd/audit_mac/src/sys/powerpc/powermac/pmuvar.h#1 branch
.. //depot/projects/trustedbsd/audit_mac/src/sys/powerpc/powermac/viareg.h#1 branch
.. //depot/projects/trustedbsd/audit_mac/src/sys/rpc/rpcclnt.c#4 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/security/audit/audit_bsm_klib.c#6 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/security/audit/audit_pipe.c#6 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/security/mac/mac_cred.c#1 branch
.. //depot/projects/trustedbsd/audit_mac/src/sys/security/mac/mac_framework.h#7 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/security/mac/mac_inet.c#5 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/security/mac/mac_inet6.c#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/security/mac/mac_policy.h#9 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/security/mac/mac_process.c#3 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/security/mac/mac_syscalls.c#4 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/security/mac/mac_vfs.c#3 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/security/mac_biba/mac_biba.c#5 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/security/mac_bsdextended/mac_bsdextended.c#5 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/security/mac_bsdextended/ugidfw_internal.h#1 branch
.. //depot/projects/trustedbsd/audit_mac/src/sys/security/mac_bsdextended/ugidfw_system.c#1 branch
.. //depot/projects/trustedbsd/audit_mac/src/sys/security/mac_bsdextended/ugidfw_vnode.c#1 branch
.. //depot/projects/trustedbsd/audit_mac/src/sys/security/mac_lomac/mac_lomac.c#5 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/security/mac_mls/mac_mls.c#5 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/security/mac_partition/mac_partition.c#4 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/security/mac_seeotheruids/mac_seeotheruids.c#3 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/security/mac_stub/mac_stub.c#4 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/security/mac_test/mac_test.c#4 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/sparc64/pci/schizo.c#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/sparc64/sparc64/db_trace.c#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/sparc64/sparc64/stack_machdep.c#3 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/sun4v/sun4v/db_trace.c#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/sun4v/sun4v/stack_machdep.c#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/sys/_types.h#3 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/sys/cdefs.h#3 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/sys/cfictl.h#1 branch
.. //depot/projects/trustedbsd/audit_mac/src/sys/sys/cons.h#3 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/sys/extattr.h#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/sys/malloc.h#3 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/sys/param.h#9 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/sys/proc.h#10 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/sys/syscallsubr.h#4 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/sys/systm.h#5 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/sys/types.h#5 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/sys/user.h#5 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/sys/vnode.h#8 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/ufs/ffs/ffs_inode.c#4 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/ufs/ffs/ffs_snapshot.c#5 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/ufs/ffs/ffs_softdep.c#6 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/ufs/ffs/ffs_vfsops.c#8 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/ufs/ffs/ffs_vnops.c#4 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/ufs/ufs/ufs_dirhash.c#4 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/ufs/ufs/ufs_extattr.c#4 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/ufs/ufs/ufs_vnops.c#6 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/vm/vm_mmap.c#8 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/xen/evtchn/evtchn.c#3 integrate

Differences ...

==== //depot/projects/trustedbsd/audit_mac/src/sys/amd64/amd64/dump_machdep.c#4 (text+ko) ====

@@ -25,7 +25,7 @@
  */
 
 #include 
-__FBSDID("$FreeBSD: src/sys/amd64/amd64/dump_machdep.c,v 1.16 2008/10/01 22:08:53 peter Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/dump_machdep.c,v 1.17 2008/10/31 10:11:35 kib Exp $");
 
 #include 
 #include 
@@ -165,7 +165,7 @@
 	va = 0;
 	pgs = mdp->md_size / PAGE_SIZE;
 	pa = mdp->md_start;
-	maxdumppgs = di->maxiosize / PAGE_SIZE;
+	maxdumppgs = min(di->maxiosize / PAGE_SIZE, MAXDUMPPGS);
 	if (maxdumppgs == 0)	/* seatbelt */
 		maxdumppgs = 1;
 

==== //depot/projects/trustedbsd/audit_mac/src/sys/amd64/amd64/identcpu.c#5 (text+ko) ====

@@ -39,7 +39,7 @@
  */
 
 #include 
-__FBSDID("$FreeBSD: src/sys/amd64/amd64/identcpu.c,v 1.160 2008/09/18 18:51:32 stas Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/identcpu.c,v 1.164 2008/10/22 17:30:37 jkim Exp $");
 
 #include "opt_cpu.h"
 
@@ -348,6 +348,19 @@
 				cpu_feature &= ~CPUID_HTT;
 
 			/*
+			 * If this CPU supports P-state invariant TSC then
+			 * mention the capability.
+			 */
+			if (!tsc_is_invariant &&
+			    (strcmp(cpu_vendor, "AuthenticAMD") == 0 &&
+			    ((amd_pminfo & AMDPM_TSC_INVARIANT) != 0 ||
+			    AMD64_CPU_FAMILY(cpu_id) >= 0x10 ||
+			    cpu_id == 0x60fb2))) {
+				tsc_is_invariant = 1;
+				printf("\n  TSC: P-state invariant");
+			}
+
+			/*
 			 * If this CPU supports HTT or CMP then mention the
 			 * number of physical/logical cores it contains.
 			 */
@@ -409,8 +422,11 @@
 static void
 tsc_freq_changed(void *arg, const struct cf_level *level, int status)
 {
-	/* If there was an error during the transition, don't do anything. */
-	if (status != 0)
+	/*
+	 * If there was an error during the transition or
+	 * TSC is P-state invariant, don't do anything.
+	 */
+	if (status != 0 || tsc_is_invariant)
 		return;
 
 	/* Total setting for this level gives the new frequency in MHz. */
@@ -451,6 +467,10 @@
 		amd_feature = regs[3] & ~(cpu_feature & 0x0183f3ff);
 		amd_feature2 = regs[2];
 	}
+	if (cpu_exthigh >= 0x80000007) {
+		do_cpuid(0x80000007, regs);
+		amd_pminfo = regs[3];
+	}
 	if (cpu_exthigh >= 0x80000008) {
 		do_cpuid(0x80000008, regs);
 		cpu_procinfo2 = regs[2];

==== //depot/projects/trustedbsd/audit_mac/src/sys/amd64/amd64/initcpu.c#2 (text+ko) ====

@@ -28,7 +28,7 @@
  */
 
 #include 
-__FBSDID("$FreeBSD: src/sys/amd64/amd64/initcpu.c,v 1.50 2006/06/19 22:59:28 davidxu Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/initcpu.c,v 1.51 2008/10/21 00:17:55 jkim Exp $");
 
 #include "opt_cpu.h"
 
@@ -53,6 +53,7 @@
 u_int	cpu_feature2;		/* Feature flags */
 u_int	amd_feature;		/* AMD feature flags */
 u_int	amd_feature2;		/* AMD feature flags */
+u_int	amd_pminfo;		/* AMD advanced power management info */
 u_int	cpu_high;		/* Highest arg to CPUID */
 u_int	cpu_exthigh;		/* Highest arg to extended CPUID */
 u_int	cpu_id;			/* Stepping ID */

==== //depot/projects/trustedbsd/audit_mac/src/sys/amd64/amd64/local_apic.c#5 (text+ko) ====

@@ -32,7 +32,7 @@
  */
 
 #include 
-__FBSDID("$FreeBSD: src/sys/amd64/amd64/local_apic.c,v 1.46 2008/08/23 12:35:43 jhb Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/local_apic.c,v 1.48 2008/10/27 21:45:18 sobomax Exp $");
 
 #include "opt_hwpmc_hooks.h"
 #include "opt_kdtrace.h"
@@ -401,7 +401,10 @@
 		lapic_timer_hz = hz * 2;
 	else
 		lapic_timer_hz = hz * 4;
-	stathz = lapic_timer_hz / (lapic_timer_hz / 128);
+	if (lapic_timer_hz < 128)
+		stathz = lapic_timer_hz;
+	else
+		stathz = lapic_timer_hz / (lapic_timer_hz / 128);
 	profhz = lapic_timer_hz;
 	lapic_timer_period = value / lapic_timer_hz;
 

==== //depot/projects/trustedbsd/audit_mac/src/sys/amd64/amd64/minidump_machdep.c#5 (text) ====

@@ -25,7 +25,7 @@
  */
 
 #include 
-__FBSDID("$FreeBSD: src/sys/amd64/amd64/minidump_machdep.c,v 1.8 2008/10/01 22:08:53 peter Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/minidump_machdep.c,v 1.9 2008/10/31 10:11:35 kib Exp $");
 
 #include 
 #include 
@@ -104,7 +104,7 @@
 	int error, i, c;
 	u_int maxdumpsz;
 
-	maxdumpsz = di->maxiosize;
+	maxdumpsz = min(di->maxiosize, MAXDUMPPGS * PAGE_SIZE);
 	if (maxdumpsz == 0)	/* seatbelt */
 		maxdumpsz = PAGE_SIZE;
 	error = 0;

==== //depot/projects/trustedbsd/audit_mac/src/sys/amd64/amd64/prof_machdep.c#3 (text+ko) ====

@@ -25,7 +25,7 @@
  */
 
 #include 
-__FBSDID("$FreeBSD: src/sys/amd64/amd64/prof_machdep.c,v 1.32 2008/03/26 15:03:23 phk Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/prof_machdep.c,v 1.33 2008/10/21 00:38:00 jkim Exp $");
 
 #ifdef GUPROF
 #if 0
@@ -383,8 +383,11 @@
 tsc_freq_changed(void *arg, const struct cf_level *level, int status)
 {
 
-	/* If there was an error during the transition, don't do anything. */
-	if (status != 0)
+	/*
+	 * If there was an error during the transition or
+	 * TSC is P-state invariant, don't do anything.
+	 */
+	if (status != 0 || tsc_is_invariant)
 		return;
 	if (cputime_prof_active && cputime_clock == CPUTIME_CLOCK_TSC)
 		printf("warning: cpu freq changed while profiling active\n");

==== //depot/projects/trustedbsd/audit_mac/src/sys/amd64/amd64/tsc.c#2 (text+ko) ====

@@ -25,7 +25,7 @@
  */
 
 #include 
-__FBSDID("$FreeBSD: src/sys/amd64/amd64/tsc.c,v 1.208 2007/06/04 18:25:01 dwmalone Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/tsc.c,v 1.209 2008/10/21 00:38:00 jkim Exp $");
 
 #include "opt_clock.h"
 
@@ -48,8 +48,13 @@
 
 uint64_t	tsc_freq;
 int		tsc_is_broken;
+int		tsc_is_invariant;
 static eventhandler_tag tsc_levels_tag, tsc_pre_tag, tsc_post_tag;
 
+SYSCTL_INT(_kern_timecounter, OID_AUTO, invariant_tsc, CTLFLAG_RDTUN,
+    &tsc_is_invariant, 0, "Indicates whether the TSC is P-state invariant");
+TUNABLE_INT("kern.timecounter.invariant_tsc", &tsc_is_invariant);
+
 #ifdef SMP
 static int	smp_tsc;
 SYSCTL_INT(_kern_timecounter, OID_AUTO, smp_tsc, CTLFLAG_RDTUN, &smp_tsc, 0,
@@ -174,11 +179,12 @@
 tsc_freq_changing(void *arg, const struct cf_level *level, int *status)
 {
 
-	if (*status != 0 || timecounter != &tsc_timecounter)
+	if (*status != 0 || timecounter != &tsc_timecounter ||
+	    tsc_is_invariant)
 		return;
 
 	printf("timecounter TSC must not be in use when "
-	     "changing frequencies; change denied\n");
+	    "changing frequencies; change denied\n");
 	*status = EBUSY;
 }
 
@@ -186,8 +192,11 @@
 static void
 tsc_freq_changed(void *arg, const struct cf_level *level, int status)
 {
-	/* If there was an error during the transition, don't do anything. */
-	if (status != 0)
+	/*
+	 * If there was an error during the transition or
+	 * TSC is P-state invariant, don't do anything.
+	 */
+	if (status != 0 || tsc_is_invariant)
 		return;
 
 	/* Total setting for this level gives the new frequency in MHz. */

==== //depot/projects/trustedbsd/audit_mac/src/sys/amd64/include/clock.h#4 (text+ko) ====

@@ -3,7 +3,7 @@
  * Garrett Wollman, September 1994.
  * This file is in the public domain.
  *
- * $FreeBSD: src/sys/amd64/include/clock.h,v 1.60 2008/04/22 19:38:27 phk Exp $
+ * $FreeBSD: src/sys/amd64/include/clock.h,v 1.61 2008/10/21 00:38:00 jkim Exp $
  */
 
 #ifndef _MACHINE_CLOCK_H_
@@ -20,6 +20,7 @@
 extern int	i8254_max_count;
 extern uint64_t	tsc_freq;
 extern int	tsc_is_broken;
+extern int	tsc_is_invariant;
 
 void	i8254_init(void);
 

==== //depot/projects/trustedbsd/audit_mac/src/sys/amd64/include/md_var.h#2 (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/include/md_var.h,v 1.81 2007/05/19 05:03:59 kan Exp $
+ * $FreeBSD: src/sys/amd64/include/md_var.h,v 1.82 2008/10/21 00:17:55 jkim Exp $
  */
 
 #ifndef _MACHINE_MD_VAR_H_
@@ -44,6 +44,7 @@
 extern	u_int	cpu_feature2;
 extern	u_int	amd_feature;
 extern	u_int	amd_feature2;
+extern	u_int	amd_pminfo;
 extern	u_int	cpu_fxsr;
 extern	u_int	cpu_high;
 extern	u_int	cpu_id;

==== //depot/projects/trustedbsd/audit_mac/src/sys/amd64/include/specialreg.h#4 (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.46 2008/08/08 16:26:53 stas Exp $
+ * $FreeBSD: src/sys/amd64/include/specialreg.h,v 1.49 2008/10/22 17:36:52 jkim Exp $
  */
 
 #ifndef _MACHINE_SPECIALREG_H_
@@ -153,6 +153,21 @@
 #define	AMDID2_PREFETCH	0x00000100
 
 /*
+ * CPUID instruction 1 eax info
+ */
+#define	CPUID_STEPPING		0x0000000f
+#define	CPUID_MODEL		0x000000f0
+#define	CPUID_FAMILY		0x00000f00
+#define	CPUID_EXT_MODEL		0x000f0000
+#define	CPUID_EXT_FAMILY	0x0ff00000
+#define	AMD64_CPU_MODEL(id) \
+    ((((id) & CPUID_MODEL) >> 4) | \
+    (((id) & CPUID_EXT_MODEL) >> 12))
+#define	AMD64_CPU_FAMILY(id) \
+    ((((id) & CPUID_FAMILY) >> 8) + \
+    (((id) & CPUID_EXT_FAMILY) >> 20))
+
+/*
  * CPUID instruction 1 ebx info
  */
 #define	CPUID_BRAND_INDEX	0x000000ff
@@ -161,6 +176,19 @@
 #define	CPUID_LOCAL_APIC_ID	0xff000000
 
 /*
+ * AMD extended function 8000_0007h edx info
+ */
+#define	AMDPM_TS		0x00000001
+#define	AMDPM_FID		0x00000002
+#define	AMDPM_VID		0x00000004
+#define	AMDPM_TTP		0x00000008
+#define	AMDPM_TM		0x00000010
+#define	AMDPM_STC		0x00000020
+#define	AMDPM_100MHZ_STEPS	0x00000040
+#define	AMDPM_HW_PSTATE		0x00000080
+#define	AMDPM_TSC_INVARIANT	0x00000100
+
+/*
  * AMD extended function 8000_0008h ecx info
  */
 #define	AMDID_CMP_CORES		0x000000ff

==== //depot/projects/trustedbsd/audit_mac/src/sys/amd64/linux32/linux.h#4 (text+ko) ====

@@ -27,7 +27,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD: src/sys/amd64/linux32/linux.h,v 1.18 2008/10/14 07:59:23 kib Exp $
+ * $FreeBSD: src/sys/amd64/linux32/linux.h,v 1.19 2008/10/19 10:02:26 kib Exp $
  */
 
 #ifndef _AMD64_LINUX_H_
@@ -86,6 +86,8 @@
 typedef l_long		l_time_t;
 typedef l_uint		l_uid_t;
 typedef l_ushort	l_uid16_t;
+typedef l_int		l_timer_t;
+typedef l_int		l_mqd_t;
 
 typedef struct {
 	l_int		val[2];
@@ -399,10 +401,10 @@
 #define	LINUX_SI_MAX_SIZE	128
 #define	LINUX_SI_PAD_SIZE	((LINUX_SI_MAX_SIZE/sizeof(l_int)) - 3)
 
-union l_sigval {
+typedef union l_sigval {
 	l_int		sival_int;
 	l_uintptr_t	sival_ptr;
-};
+} l_sigval_t;
 
 typedef struct l_siginfo {
 	l_int		lsi_signo;
@@ -413,23 +415,26 @@
 
 		struct {
 			l_pid_t		_pid;
-			l_uid16_t	_uid;
+			l_uid_t		_uid;
 		} __packed _kill;
 
 		struct {
-			l_uint		_timer1;
-			l_uint		_timer2;
+			l_timer_t	_tid;
+			l_int		_overrun;
+			char		_pad[sizeof(l_uid_t) - sizeof(l_int)];
+			l_sigval_t	_sigval;
+			l_int		_sys_private;
 		} __packed _timer;
 
 		struct {
 			l_pid_t		_pid;		/* sender's pid */
-			l_uid16_t	_uid;		/* sender's uid */
-			union l_sigval _sigval;
+			l_uid_t		_uid;		/* sender's uid */
+			l_sigval_t	_sigval;
 		} __packed _rt;
 
 		struct {
 			l_pid_t		_pid;		/* which child */
-			l_uid16_t	_uid;		/* sender's uid */
+			l_uid_t		_uid;		/* sender's uid */
 			l_int		_status;	/* exit code */
 			l_clock_t	_utime;
 			l_clock_t	_stime;
@@ -440,7 +445,7 @@
 		} __packed _sigfault;
 
 		struct {
-			l_int		_band;	/* POLL_IN,POLL_OUT,POLL_MSG */
+			l_long		_band;	/* POLL_IN,POLL_OUT,POLL_MSG */
 			l_int		_fd;
 		} __packed _sigpoll;
 	} _sifields;
@@ -448,6 +453,9 @@
 
 #define	lsi_pid		_sifields._kill._pid
 #define	lsi_uid		_sifields._kill._uid
+#define	lsi_tid		_sifields._timer._tid
+#define	lsi_overrun	_sifields._timer._overrun
+#define	lsi_sys_private	_sifields._timer._sys_private
 #define	lsi_status	_sifields._sigchld._status
 #define	lsi_utime	_sifields._sigchld._utime
 #define	lsi_stime	_sifields._sigchld._stime
@@ -860,9 +868,6 @@
 #define	LINUX_CLOCK_REALTIME_HR		4
 #define	LINUX_CLOCK_MONOTONIC_HR	5
 
-typedef int l_timer_t;
-typedef int l_mqd_t;
-
 #define	LINUX_CLONE_VM			0x00000100
 #define	LINUX_CLONE_FS			0x00000200
 #define	LINUX_CLONE_FILES		0x00000400

==== //depot/projects/trustedbsd/audit_mac/src/sys/amd64/linux32/linux32_sysvec.c#5 (text+ko) ====

@@ -31,7 +31,7 @@
  */
 
 #include 
-__FBSDID("$FreeBSD: src/sys/amd64/linux32/linux32_sysvec.c,v 1.35 2008/09/24 10:14:37 kib Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/linux32/linux32_sysvec.c,v 1.37 2008/10/19 10:02:26 kib Exp $");
 #include "opt_compat.h"
 
 #ifndef COMPAT_IA32
@@ -334,9 +334,7 @@
 	frame.sf_ucontext = PTROUT(&fp->sf_sc);
 
 	/* Fill in POSIX parts */
-	frame.sf_si.lsi_signo = sig;
-	frame.sf_si.lsi_code = code;
-	frame.sf_si.lsi_addr = PTROUT(ksi->ksi_addr);
+	ksiginfo_to_lsiginfo(ksi, &frame.sf_si, sig);
 
 	/*
 	 * Build the signal context to be used by sigreturn.
@@ -843,7 +841,8 @@
 	fpstate_drop(td);
 
 	/* Return via doreti so that we can change to a different %cs */
-	pcb->pcb_flags |= PCB_FULLCTX;
+	pcb->pcb_flags |= PCB_FULLCTX | PCB_32BIT;
+	pcb->pcb_flags &= ~PCB_GS32BIT;
 	td->td_retval[1] = 0;
 }
 


>>> TRUNCATED FOR MAIL (1000 lines) <<<

From owner-p4-projects@FreeBSD.ORG  Sat Nov  1 13:10:51 2008
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 4FE061065678; Sat,  1 Nov 2008 13:10:51 +0000 (UTC)
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 133AD106564A
	for ; Sat,  1 Nov 2008 13:10:51 +0000 (UTC)
	(envelope-from ed@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 026268FC12
	for ; Sat,  1 Nov 2008 13:10:51 +0000 (UTC)
	(envelope-from ed@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id mA1DAguZ063908
	for ; Sat, 1 Nov 2008 13:10:42 GMT
	(envelope-from ed@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id mA1DAdMx063900
	for perforce@freebsd.org; Sat, 1 Nov 2008 13:10:39 GMT
	(envelope-from ed@FreeBSD.org)
Date: Sat, 1 Nov 2008 13:10:39 GMT
Message-Id: <200811011310.mA1DAdMx063900@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	ed@FreeBSD.org using -f
From: Ed Schouten 
To: Perforce Change Reviews 
Cc: 
Subject: PERFORCE change 152311 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, 01 Nov 2008 13:10:51 -0000

http://perforce.freebsd.org/chv.cgi?CH=152311

Change 152311 by ed@ed_dull on 2008/11/01 13:10:17

	IFC.

Affected files ...

.. //depot/projects/mpsafetty/UPDATING#12 integrate
.. //depot/projects/mpsafetty/bin/cat/cat.c#2 integrate
.. //depot/projects/mpsafetty/bin/chio/chio.c#2 integrate
.. //depot/projects/mpsafetty/bin/cp/utils.c#5 integrate
.. //depot/projects/mpsafetty/bin/rcp/rcp.c#2 integrate
.. //depot/projects/mpsafetty/etc/Makefile#5 integrate
.. //depot/projects/mpsafetty/etc/rc.d/netif#2 integrate
.. //depot/projects/mpsafetty/lib/libc/gen/err.3#2 integrate
.. //depot/projects/mpsafetty/lib/libc/stdtime/strftime.c#2 integrate
.. //depot/projects/mpsafetty/lib/libcam/camlib.c#2 integrate
.. //depot/projects/mpsafetty/lib/libutil/pty.c#4 integrate
.. //depot/projects/mpsafetty/share/man/man4/Makefile#13 integrate
.. //depot/projects/mpsafetty/share/man/man4/u3g.4#4 integrate
.. //depot/projects/mpsafetty/share/man/man9/VOP_ACCESS.9#2 integrate
.. //depot/projects/mpsafetty/share/man/man9/style.9#4 integrate
.. //depot/projects/mpsafetty/share/man/man9/vaccess.9#2 integrate
.. //depot/projects/mpsafetty/share/man/man9/vaccess_acl_posix1e.9#2 integrate
.. //depot/projects/mpsafetty/share/misc/bsd-family-tree#3 integrate
.. //depot/projects/mpsafetty/share/zoneinfo/southamerica#6 integrate
.. //depot/projects/mpsafetty/share/zoneinfo/zone.tab#4 integrate
.. //depot/projects/mpsafetty/sys/amd64/amd64/dump_machdep.c#4 integrate
.. //depot/projects/mpsafetty/sys/amd64/amd64/local_apic.c#4 integrate
.. //depot/projects/mpsafetty/sys/amd64/amd64/minidump_machdep.c#5 integrate
.. //depot/projects/mpsafetty/sys/arm/at91/at91_mci.c#6 integrate
.. //depot/projects/mpsafetty/sys/boot/powerpc/boot1.chrp/boot1.c#2 integrate
.. //depot/projects/mpsafetty/sys/boot/powerpc/boot1.chrp/bootinfo.txt#2 integrate
.. //depot/projects/mpsafetty/sys/cddl/compat/opensolaris/kern/opensolaris_policy.c#2 integrate
.. //depot/projects/mpsafetty/sys/cddl/compat/opensolaris/sys/policy.h#2 integrate
.. //depot/projects/mpsafetty/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ctldir.c#5 integrate
.. //depot/projects/mpsafetty/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c#5 integrate
.. //depot/projects/mpsafetty/sys/compat/linux/linux_emul.c#2 integrate
.. //depot/projects/mpsafetty/sys/compat/linux/linux_getcwd.c#3 integrate
.. //depot/projects/mpsafetty/sys/conf/NOTES#15 integrate
.. //depot/projects/mpsafetty/sys/conf/files#24 integrate
.. //depot/projects/mpsafetty/sys/conf/options#13 integrate
.. //depot/projects/mpsafetty/sys/dev/adb/adb_bus.c#2 integrate
.. //depot/projects/mpsafetty/sys/dev/adb/adb_mouse.c#2 integrate
.. //depot/projects/mpsafetty/sys/dev/adb/adbvar.h#2 integrate
.. //depot/projects/mpsafetty/sys/dev/ath/if_ath.c#6 integrate
.. //depot/projects/mpsafetty/sys/dev/bge/if_bge.c#5 integrate
.. //depot/projects/mpsafetty/sys/dev/drm/i915_dma.c#6 integrate
.. //depot/projects/mpsafetty/sys/dev/drm/radeon_cp.c#5 integrate
.. //depot/projects/mpsafetty/sys/dev/drm/radeon_drv.h#4 integrate
.. //depot/projects/mpsafetty/sys/dev/mmc/mmc.c#6 integrate
.. //depot/projects/mpsafetty/sys/dev/mmc/mmcbrvar.h#4 integrate
.. //depot/projects/mpsafetty/sys/dev/mmc/mmcsd.c#7 integrate
.. //depot/projects/mpsafetty/sys/dev/mmc/mmcvar.h#6 integrate
.. //depot/projects/mpsafetty/sys/dev/sdhci/sdhci.c#2 integrate
.. //depot/projects/mpsafetty/sys/dev/sound/pci/hda/hdac.c#9 integrate
.. //depot/projects/mpsafetty/sys/dev/usb/u3g.c#5 integrate
.. //depot/projects/mpsafetty/sys/dev/usb/usbdevs#15 integrate
.. //depot/projects/mpsafetty/sys/dev/usb/usbdi.c#2 integrate
.. //depot/projects/mpsafetty/sys/fs/cd9660/cd9660_vfsops.c#4 integrate
.. //depot/projects/mpsafetty/sys/fs/cd9660/cd9660_vnops.c#4 integrate
.. //depot/projects/mpsafetty/sys/fs/coda/coda_vnops.c#3 integrate
.. //depot/projects/mpsafetty/sys/fs/devfs/devfs_vnops.c#7 integrate
.. //depot/projects/mpsafetty/sys/fs/hpfs/hpfs_vnops.c#5 integrate
.. //depot/projects/mpsafetty/sys/fs/msdosfs/msdosfs_vfsops.c#3 integrate
.. //depot/projects/mpsafetty/sys/fs/msdosfs/msdosfs_vnops.c#5 integrate
.. //depot/projects/mpsafetty/sys/fs/ntfs/ntfs_vnops.c#4 integrate
.. //depot/projects/mpsafetty/sys/fs/nullfs/null_vnops.c#4 integrate
.. //depot/projects/mpsafetty/sys/fs/nwfs/nwfs_vnops.c#3 integrate
.. //depot/projects/mpsafetty/sys/fs/pseudofs/pseudofs_vnops.c#4 integrate
.. //depot/projects/mpsafetty/sys/fs/smbfs/smbfs_vnops.c#3 integrate
.. //depot/projects/mpsafetty/sys/fs/tmpfs/tmpfs_vnops.c#6 integrate
.. //depot/projects/mpsafetty/sys/fs/udf/udf_vnops.c#4 integrate
.. //depot/projects/mpsafetty/sys/fs/unionfs/union_vnops.c#3 integrate
.. //depot/projects/mpsafetty/sys/geom/geom_disk.c#4 integrate
.. //depot/projects/mpsafetty/sys/gnu/fs/ext2fs/ext2_vfsops.c#5 integrate
.. //depot/projects/mpsafetty/sys/gnu/fs/ext2fs/ext2_vnops.c#3 integrate
.. //depot/projects/mpsafetty/sys/gnu/fs/reiserfs/reiserfs_vfsops.c#3 integrate
.. //depot/projects/mpsafetty/sys/gnu/fs/reiserfs/reiserfs_vnops.c#2 integrate
.. //depot/projects/mpsafetty/sys/gnu/fs/xfs/FreeBSD/xfs_super.c#3 integrate
.. //depot/projects/mpsafetty/sys/gnu/fs/xfs/FreeBSD/xfs_vnops.c#4 integrate
.. //depot/projects/mpsafetty/sys/i386/i386/dump_machdep.c#4 integrate
.. //depot/projects/mpsafetty/sys/i386/i386/local_apic.c#6 integrate
.. //depot/projects/mpsafetty/sys/i386/i386/minidump_machdep.c#4 integrate
.. //depot/projects/mpsafetty/sys/i386/isa/pmtimer.c#2 integrate
.. //depot/projects/mpsafetty/sys/kern/init_main.c#6 integrate
.. //depot/projects/mpsafetty/sys/kern/kern_proc.c#9 integrate
.. //depot/projects/mpsafetty/sys/kern/kern_thr.c#4 integrate
.. //depot/projects/mpsafetty/sys/kern/kern_timeout.c#4 integrate
.. //depot/projects/mpsafetty/sys/kern/sched_ule.c#3 integrate
.. //depot/projects/mpsafetty/sys/kern/subr_acl_posix1e.c#2 integrate
.. //depot/projects/mpsafetty/sys/kern/subr_stack.c#4 integrate
.. //depot/projects/mpsafetty/sys/kern/tty.c#64 integrate
.. //depot/projects/mpsafetty/sys/kern/uipc_mqueue.c#6 integrate
.. //depot/projects/mpsafetty/sys/kern/uipc_shm.c#2 integrate
.. //depot/projects/mpsafetty/sys/kern/vfs_subr.c#10 integrate
.. //depot/projects/mpsafetty/sys/kern/vfs_syscalls.c#7 integrate
.. //depot/projects/mpsafetty/sys/kern/vfs_vnops.c#7 integrate
.. //depot/projects/mpsafetty/sys/kern/vnode_if.src#3 integrate
.. //depot/projects/mpsafetty/sys/modules/rl/Makefile#2 integrate
.. //depot/projects/mpsafetty/sys/net80211/ieee80211_adhoc.c#5 integrate
.. //depot/projects/mpsafetty/sys/net80211/ieee80211_hostap.c#6 integrate
.. //depot/projects/mpsafetty/sys/net80211/ieee80211_sta.c#6 integrate
.. //depot/projects/mpsafetty/sys/net80211/ieee80211_wds.c#3 integrate
.. //depot/projects/mpsafetty/sys/netinet/ip_dummynet.h#2 integrate
.. //depot/projects/mpsafetty/sys/nfs4client/nfs4_vnops.c#4 integrate
.. //depot/projects/mpsafetty/sys/nfsclient/nfs_vnops.c#8 integrate
.. //depot/projects/mpsafetty/sys/nfsserver/nfs_serv.c#7 integrate
.. //depot/projects/mpsafetty/sys/nfsserver/nfs_srvsock.c#4 integrate
.. //depot/projects/mpsafetty/sys/opencrypto/cryptosoft.c#3 integrate
.. //depot/projects/mpsafetty/sys/pci/if_rl.c#3 integrate
.. //depot/projects/mpsafetty/sys/pci/if_rlreg.h#5 integrate
.. //depot/projects/mpsafetty/sys/powerpc/include/cpufunc.h#4 integrate
.. //depot/projects/mpsafetty/sys/powerpc/include/endian.h#2 integrate
.. //depot/projects/mpsafetty/sys/powerpc/powermac/ata_dbdma.c#2 integrate
.. //depot/projects/mpsafetty/sys/powerpc/powermac/cuda.c#2 integrate
.. //depot/projects/mpsafetty/sys/powerpc/powermac/dbdma.c#4 integrate
.. //depot/projects/mpsafetty/sys/powerpc/powermac/dbdmavar.h#3 integrate
.. //depot/projects/mpsafetty/sys/powerpc/powermac/pmu.c#2 integrate
.. //depot/projects/mpsafetty/sys/security/audit/audit_bsm_klib.c#6 integrate
.. //depot/projects/mpsafetty/sys/security/audit/audit_pipe.c#4 integrate
.. //depot/projects/mpsafetty/sys/security/mac/mac_cred.c#1 branch
.. //depot/projects/mpsafetty/sys/security/mac/mac_framework.h#5 integrate
.. //depot/projects/mpsafetty/sys/security/mac/mac_policy.h#5 integrate
.. //depot/projects/mpsafetty/sys/security/mac/mac_process.c#3 integrate
.. //depot/projects/mpsafetty/sys/security/mac/mac_syscalls.c#3 integrate
.. //depot/projects/mpsafetty/sys/security/mac/mac_vfs.c#3 integrate
.. //depot/projects/mpsafetty/sys/security/mac_biba/mac_biba.c#6 integrate
.. //depot/projects/mpsafetty/sys/security/mac_bsdextended/mac_bsdextended.c#9 integrate
.. //depot/projects/mpsafetty/sys/security/mac_bsdextended/ugidfw_internal.h#2 integrate
.. //depot/projects/mpsafetty/sys/security/mac_bsdextended/ugidfw_vnode.c#3 integrate
.. //depot/projects/mpsafetty/sys/security/mac_lomac/mac_lomac.c#8 integrate
.. //depot/projects/mpsafetty/sys/security/mac_mls/mac_mls.c#6 integrate
.. //depot/projects/mpsafetty/sys/security/mac_partition/mac_partition.c#5 integrate
.. //depot/projects/mpsafetty/sys/security/mac_stub/mac_stub.c#5 integrate
.. //depot/projects/mpsafetty/sys/security/mac_test/mac_test.c#5 integrate
.. //depot/projects/mpsafetty/sys/sparc64/pci/schizo.c#2 integrate
.. //depot/projects/mpsafetty/sys/sparc64/sparc64/db_trace.c#2 integrate
.. //depot/projects/mpsafetty/sys/sparc64/sparc64/stack_machdep.c#3 integrate
.. //depot/projects/mpsafetty/sys/sun4v/sun4v/db_trace.c#2 integrate
.. //depot/projects/mpsafetty/sys/sun4v/sun4v/stack_machdep.c#2 integrate
.. //depot/projects/mpsafetty/sys/sys/_types.h#2 integrate
.. //depot/projects/mpsafetty/sys/sys/extattr.h#2 integrate
.. //depot/projects/mpsafetty/sys/sys/param.h#18 integrate
.. //depot/projects/mpsafetty/sys/sys/tty.h#24 integrate
.. //depot/projects/mpsafetty/sys/sys/types.h#4 integrate
.. //depot/projects/mpsafetty/sys/sys/user.h#4 integrate
.. //depot/projects/mpsafetty/sys/sys/vnode.h#7 integrate
.. //depot/projects/mpsafetty/sys/ufs/ffs/ffs_vfsops.c#10 integrate
.. //depot/projects/mpsafetty/sys/ufs/ufs/ufs_vnops.c#7 integrate
.. //depot/projects/mpsafetty/tools/tools/ath/athdebug/athdebug.c#2 integrate
.. //depot/projects/mpsafetty/tools/tools/ath/athstats/Makefile#2 integrate
.. //depot/projects/mpsafetty/tools/tools/ath/athstats/athstats.c#2 integrate
.. //depot/projects/mpsafetty/tools/tools/ath/athstats/main.c#2 integrate
.. //depot/projects/mpsafetty/usr.sbin/rpc.yppasswdd/yppasswdd_main.c#2 integrate

Differences ...

==== //depot/projects/mpsafetty/UPDATING#12 (text+ko) ====

@@ -22,6 +22,9 @@
 	to maximize performance.  (To disable malloc debugging, run
 	ln -s aj /etc/malloc.conf.)
 
+20081028:
+	dummynet(4) ABI has changed. ipfw(8) needs to be recompiled.
+
 20081009:
 	The uhci, ohci, ehci and slhci USB Host controller drivers have
 	been put into separate modules. If you load the usb module
@@ -1146,4 +1149,4 @@
 Contact Warner Losh if you have any questions about your use of
 this document.
 
-$FreeBSD: src/UPDATING,v 1.545 2008/10/10 06:37:51 n_hibma Exp $
+$FreeBSD: src/UPDATING,v 1.546 2008/10/28 14:14:57 oleg Exp $

==== //depot/projects/mpsafetty/bin/cat/cat.c#2 (text+ko) ====

@@ -44,7 +44,7 @@
 #endif
 #endif /* not lint */
 #include 
-__FBSDID("$FreeBSD: src/bin/cat/cat.c,v 1.32 2005/01/10 08:39:20 imp Exp $");
+__FBSDID("$FreeBSD: src/bin/cat/cat.c,v 1.33 2008/10/30 14:05:57 ivoras Exp $");
 
 #include 
 #include 
@@ -77,6 +77,17 @@
 static int udom_open(const char *path, int flags);
 #endif
 
+/* Memory strategy threshold, in pages: if physmem is larger then this, use a 
+ * large buffer */
+#define PHYSPAGES_THRESHOLD (32*1024)
+
+/* Maximum buffer size in bytes - do not allow it to grow larger than this */
+#define BUFSIZE_MAX (2*1024*1024)
+
+/* Small (default) buffer size in bytes. It's inefficient for this to be
+ * smaller than MAXPHYS */
+#define BUFSIZE_SMALL (MAXPHYS)
+
 int
 main(int argc, char *argv[])
 {
@@ -247,9 +258,17 @@
 	if (buf == NULL) {
 		if (fstat(wfd, &sbuf))
 			err(1, "%s", filename);
-		bsize = MAX(sbuf.st_blksize, 1024);
+		if (S_ISREG(sbuf.st_mode)) {
+			/* If there's plenty of RAM, use a large copy buffer */
+			if (sysconf(_SC_PHYS_PAGES) > PHYSPAGES_THRESHOLD)
+				bsize = MIN(BUFSIZE_MAX, MAXPHYS*8);
+			else
+				bsize = BUFSIZE_SMALL;
+		} else
+			bsize = MAX(sbuf.st_blksize, 
+					(blksize_t)sysconf(_SC_PAGESIZE));
 		if ((buf = malloc(bsize)) == NULL)
-			err(1, "buffer");
+			err(1, "malloc() failure of IO buffer");
 	}
 	while ((nr = read(rfd, buf, bsize)) > 0)
 		for (off = 0; nr; nr -= nw, off += nw)

==== //depot/projects/mpsafetty/bin/chio/chio.c#2 (text+ko) ====

@@ -43,7 +43,7 @@
 #endif
 
 #include 
-__FBSDID("$FreeBSD: src/bin/chio/chio.c,v 1.27 2005/01/10 08:39:20 imp Exp $");
+__FBSDID("$FreeBSD: src/bin/chio/chio.c,v 1.28 2008/10/30 19:51:02 joerg Exp $");
 
 #include 
 #include  
@@ -69,7 +69,7 @@
 
 static	void find_element(char *, uint16_t *, uint16_t *);
 static	struct changer_element_status *get_element_status
-	   (unsigned int, unsigned int);
+	   (unsigned int, unsigned int, int);
 
 static	int do_move(const char *, int, char **);
 static	int do_exchange(const char *, int, char **);
@@ -969,7 +969,8 @@
 	++argv; --argc;
 
 	/* Get the status */
-	ces = get_element_status((unsigned int)type, (unsigned int)element);
+	ces = get_element_status((unsigned int)type, (unsigned int)element,
+	    CHET_VT == type);
 
 	if (NULL == ces)
 		errx(1, "%s: null element status pointer", cname);
@@ -1004,7 +1005,7 @@
  * should free() it when done.
  */
 static struct changer_element_status *
-get_element_status(unsigned int type, unsigned int element)
+get_element_status(unsigned int type, unsigned int element, int use_voltags)
 {
 	struct changer_element_status_request cesr;
 	struct changer_element_status *ces;
@@ -1020,7 +1021,8 @@
 	cesr.cesr_element_type = (uint16_t)type;
 	cesr.cesr_element_base = (uint16_t)element;
 	cesr.cesr_element_count = 1;		/* Only this one element */
-	cesr.cesr_flags |= CESR_VOLTAGS;	/* Grab voltags as well */
+	if (use_voltags)
+		cesr.cesr_flags |= CESR_VOLTAGS; /* Grab voltags as well */
 	cesr.cesr_element_status = ces;
 
 	if (ioctl(changer_fd, CHIOGSTATUS, (char *)&cesr) == -1) {

==== //depot/projects/mpsafetty/bin/cp/utils.c#5 (text+ko) ====

@@ -33,7 +33,7 @@
 #endif
 #endif /* not lint */
 #include 
-__FBSDID("$FreeBSD: src/bin/cp/utils.c,v 1.56 2008/10/27 15:21:15 dds Exp $");
+__FBSDID("$FreeBSD: src/bin/cp/utils.c,v 1.57 2008/10/30 14:05:57 ivoras Exp $");
 
 #include 
 #include 
@@ -57,10 +57,22 @@
 
 #define	cp_pct(x, y)	((y == 0) ? 0 : (int)(100.0 * (x) / (y)))
 
+/* Memory strategy threshold, in pages: if physmem is larger then this, use a 
+ * large buffer */
+#define PHYSPAGES_THRESHOLD (32*1024)
+
+/* Maximum buffer size in bytes - do not allow it to grow larger than this */
+#define BUFSIZE_MAX (2*1024*1024)
+
+/* Small (default) buffer size in bytes. It's inefficient for this to be
+ * smaller than MAXPHYS */
+#define BUFSIZE_SMALL (MAXPHYS)
+
 int
 copy_file(const FTSENT *entp, int dne)
 {
-	static char buf[MAXBSIZE];
+	static char *buf = NULL;
+	static size_t bufsize;
 	struct stat *fs;
 	ssize_t wcount;
 	size_t wresid;
@@ -174,8 +186,23 @@
 		} else
 #endif
 		{
+			if (buf == NULL) {
+				/*
+				 * Note that buf and bufsize are static. If
+				 * malloc() fails, it will fail at the start
+				 * and not copy only some files. 
+				 */ 
+				if (sysconf(_SC_PHYS_PAGES) > 
+				    PHYSPAGES_THRESHOLD)
+					bufsize = MIN(BUFSIZE_MAX, MAXPHYS * 8);
+				else
+					bufsize = BUFSIZE_SMALL;
+				buf = malloc(bufsize);
+				if (buf == NULL)
+					err(1, "Not enough memory");
+			}
 			wtotal = 0;
-			while ((rcount = read(from_fd, buf, MAXBSIZE)) > 0) {
+			while ((rcount = read(from_fd, buf, bufsize)) > 0) {
 				for (bufp = buf, wresid = rcount; ;
 			    	bufp += wcount, wresid -= wcount) {
 					wcount = write(to_fd, bufp, wresid);

==== //depot/projects/mpsafetty/bin/rcp/rcp.c#2 (text+ko) ====

@@ -46,7 +46,7 @@
 #endif /* not lint */
 #endif
 #include 
-__FBSDID("$FreeBSD: src/bin/rcp/rcp.c,v 1.46 2007/05/22 04:21:00 cperciva Exp $");
+__FBSDID("$FreeBSD: src/bin/rcp/rcp.c,v 1.47 2008/10/28 17:15:46 rdivacky Exp $");
 
 #include 
 #include 
@@ -789,6 +789,4 @@
 		vwarnx(fmt, ap);
 		va_end(ap);
 	}
-
-	va_end(ap);
 }

==== //depot/projects/mpsafetty/etc/Makefile#5 (text+ko) ====

@@ -1,5 +1,5 @@
 #	from: @(#)Makefile	5.11 (Berkeley) 5/21/91
-# $FreeBSD: src/etc/Makefile,v 1.372 2008/10/27 16:13:28 sam Exp $
+# $FreeBSD: src/etc/Makefile,v 1.373 2008/10/29 18:46:47 mp Exp $
 
 .include 
 
@@ -154,7 +154,7 @@
 	    ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 600 \
 		master.passwd nsmb.conf opieaccess ${DESTDIR}/etc;
 .if ${MK_TCSH} == "no"
-	sed -i "" -e 's;/bin/csh;;' ${DESTDIR}/etc/master.passwd
+	sed -i "" -e 's;/bin/csh;/bin/sh;' ${DESTDIR}/etc/master.passwd
 .endif
 	pwd_mkdb ${PWD_MKDB_ENDIAN} -i -p -d ${DESTDIR}/etc \
 	    ${DESTDIR}/etc/master.passwd

==== //depot/projects/mpsafetty/etc/rc.d/netif#2 (text+ko) ====

@@ -22,7 +22,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/etc/rc.d/netif,v 1.29 2008/06/23 20:50:11 mtm Exp $
+# $FreeBSD: src/etc/rc.d/netif,v 1.30 2008/10/30 20:24:25 pjd Exp $
 #
 
 # PROVIDE: netif
@@ -141,7 +141,9 @@
 		esac
 		echo "${_str} Network:${_ok}."
 		if [ -z "${rc_quiet}" ]; then
-			/sbin/ifconfig ${_ok}
+			for ifn in ${_ok}; do
+				/sbin/ifconfig ${ifn}
+			done
 		fi
 	fi
 

==== //depot/projects/mpsafetty/lib/libc/gen/err.3#2 (text+ko) ====

@@ -26,7 +26,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	From: @(#)err.3	8.1 (Berkeley) 6/9/93
-.\" $FreeBSD: src/lib/libc/gen/err.3,v 1.23 2007/01/09 00:27:53 imp Exp $
+.\" $FreeBSD: src/lib/libc/gen/err.3,v 1.24 2008/10/31 15:14:40 rwatson Exp $
 .\"
 .Dd March 6, 1999
 .Dt ERR 3
@@ -178,15 +178,16 @@
 Display the current errno information string and exit:
 .Bd -literal -offset indent
 if ((p = malloc(size)) == NULL)
-	err(1, NULL);
+	err(EX_OSERR, NULL);
 if ((fd = open(file_name, O_RDONLY, 0)) == -1)
-	err(1, "%s", file_name);
+	err(EX_NOINPUT, "%s", file_name);
 .Ed
 .Pp
 Display an error message and exit:
 .Bd -literal -offset indent
 if (tm.tm_hour < START_TIME)
-	errx(1, "too early, wait until %s", start_time_string);
+	errx(EX_DATAERR, "too early, wait until %s",
+	    start_time_string);
 .Ed
 .Pp
 Warn of an error:
@@ -195,7 +196,7 @@
 	warnx("%s: %s: trying the block device",
 	    raw_device, strerror(errno));
 if ((fd = open(block_device, O_RDONLY, 0)) == -1)
-	err(1, "%s", block_device);
+	err(EX_OSFILE, "%s", block_device);
 .Ed
 .Pp
 Warn of an error without using the global variable

==== //depot/projects/mpsafetty/lib/libc/stdtime/strftime.c#2 (text+ko) ====

@@ -32,7 +32,7 @@
 static const char	sccsid[] = "@(#)strftime.c	5.4 (Berkeley) 3/14/89";
 #endif /* LIBC_SCCS and not lint */
 #include 
-__FBSDID("$FreeBSD: src/lib/libc/stdtime/strftime.c,v 1.41 2004/11/04 08:34:57 delphij Exp $");
+__FBSDID("$FreeBSD: src/lib/libc/stdtime/strftime.c,v 1.42 2008/10/30 00:19:19 delphij Exp $");
 
 #include "tzfile.h"
 #include 
@@ -177,7 +177,7 @@
 				{
 				int warn2 = IN_SOME;
 
-				pt = _fmt(tptr->c_fmt, t, pt, ptlim, warnp);
+				pt = _fmt(tptr->c_fmt, t, pt, ptlim, &warn2);
 				if (warn2 == IN_ALL)
 					warn2 = IN_THIS;
 				if (warn2 > *warnp)

==== //depot/projects/mpsafetty/lib/libcam/camlib.c#2 (text+ko) ====

@@ -24,7 +24,7 @@
  */
 
 #include 
-__FBSDID("$FreeBSD: src/lib/libcam/camlib.c,v 1.16 2006/11/02 00:54:32 mjacob Exp $");
+__FBSDID("$FreeBSD: src/lib/libcam/camlib.c,v 1.17 2008/10/27 21:46:58 marius Exp $");
 
 #include 
 #include 
@@ -346,6 +346,9 @@
 
 	bzero(&ccb, sizeof(union ccb));
 	ccb.ccb_h.func_code = XPT_DEV_MATCH;
+	ccb.ccb_h.path_id = CAM_XPT_PATH_ID;
+	ccb.ccb_h.target_id = CAM_TARGET_WILDCARD;
+	ccb.ccb_h.target_lun = CAM_LUN_WILDCARD;
 
 	/* Setup the result buffer */
 	bufsize = sizeof(struct dev_match_result);

==== //depot/projects/mpsafetty/lib/libutil/pty.c#4 (text+ko) ====

@@ -28,7 +28,7 @@
  */
 
 #include 
-__FBSDID("$FreeBSD: src/lib/libutil/pty.c,v 1.23 2008/10/03 09:42:50 ed Exp $");
+__FBSDID("$FreeBSD: src/lib/libutil/pty.c,v 1.24 2008/10/28 06:00:13 ed Exp $");
 
 #if defined(LIBC_SCCS) && !defined(lint)
 #if 0
@@ -47,7 +47,6 @@
 #include 
 #include 
 #include 
-#include 
 
 int
 openpty(int *amaster, int *aslave, char *name, struct termios *termp,
@@ -70,9 +69,6 @@
 	if (slavename == NULL)
 		goto bad;
 
-	if (revoke(slavename) == -1)
-		goto bad;
-
 	slave = open(slavename, O_RDWR);
 	if (slave == -1)
 		goto bad;

==== //depot/projects/mpsafetty/share/man/man4/Makefile#13 (text+ko) ====

@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/18/93
-# $FreeBSD: src/share/man/man4/Makefile,v 1.434 2008/10/09 21:25:01 n_hibma Exp $
+# $FreeBSD: src/share/man/man4/Makefile,v 1.435 2008/10/29 16:17:34 n_hibma Exp $
 
 MAN=	aac.4 \
 	acpi.4 \
@@ -553,6 +553,7 @@
 MLINKS+=tun.4 if_tun.4
 MLINKS+=tx.4 if_tx.4
 MLINKS+=txp.4 if_txp.4
+MLINKS+=u3g.4 u3gstub.4
 MLINKS+=udav.4 if_udav.4
 MLINKS+=ural.4 if_ural.4
 MLINKS+=vge.4 if_vge.4

==== //depot/projects/mpsafetty/share/man/man4/u3g.4#4 (text+ko) ====

@@ -2,7 +2,7 @@
 .\" Copyright (c) 2008 AnyWi Technologies
 .\" All rights reserved.
 .\"
-.\" This code is derived from uark.c 
+.\" This code is derived from uark.c
 .\"
 .\" Permission to use, copy, modify, and distribute this software for any
 .\" purpose with or without fee is hereby granted, provided that the above
@@ -16,7 +16,7 @@
 .\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 .\"
-.\" $FreeBSD: src/share/man/man4/u3g.4,v 1.6 2008/10/19 17:19:42 simon Exp $
+.\" $FreeBSD: src/share/man/man4/u3g.4,v 1.8 2008/10/29 18:49:37 brueffer Exp $
 .\"
 .Dd October 7, 2008
 .Dt U3G 4
@@ -43,7 +43,7 @@
 The
 .Nm
 driver provides support for the multiple USB-to-serial interfaces exposed by
-many 3G usb/pccard modems.
+many 3G USB/PCCard modems.
 .Pp
 The device is accessed through the
 .Xr ucom 4
@@ -76,18 +76,30 @@
 .It
 Sierra cards
 .El
-(See /sys/dev/u3g.c for the complete list of supported cards for each vendor
-mentioned above).
+.Pp
+See
+.Pa /sys/dev/u3g.c
+for the complete list of supported cards for each vendor
+mentioned above.
 .Pp
 The supported 3G cards provide the necessary modem port for ppp,
 pppd, or mpd connections as well as extra ports (depending on the specific
-device) to provide other functions (diagnostic port, SIM toolkit port)
+device) to provide other functions (diagnostic port, SIM toolkit port).
 .Pp
-In some of these devices a mass storage device supported by the 
+In some of these devices a mass storage device supported by the
 .Xr umass 4
-driver is present which contains Windows and Mac OSX drivers. This device is
-hidden, unless the machine was booted in verbose (see
-.Xr boot 8 ).
+driver is present which contains Windows and Mac OS X drivers.
+This device is
+hidden, unless the machine was booted in verbose mode (see
+.Xr boot 8 ) .
+To temporarily unhide the device, set
+.Va debug.bootverbose
+to 1 using
+.Xr sysctl 8
+and replug the device.
+The
+.Xr u3gstub 4
+device will attach temporarily and detach within seconds.
 .Sh SEE ALSO
 .Xr tty 4 ,
 .Xr ucom 4 ,
@@ -95,10 +107,11 @@
 .Sh HISTORY
 The
 .Nm
-driver
-appeared in
+driver appeared in
 .Fx 8.0 ,
-is based on the uark driver, and written by
+is based on the
+.Xr uark 4
+driver, and written by
 .An Andrea Guzzo Aq aguzzo@anywi.com
 in September 2008.
 .Sh AUTHORS
@@ -108,4 +121,4 @@
 .An Andrea Guzzo Aq aguzzo@anywi.com
 and
 .An Nick Hibma Aq n_hibma@freebsd.org .
-Hardware for testing provided by AnyWi Technologies, Leiden, NL.
+Hardware for testing was provided by AnyWi Technologies, Leiden, NL.

==== //depot/projects/mpsafetty/share/man/man9/VOP_ACCESS.9#2 (text+ko) ====

@@ -27,7 +27,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/share/man/man9/VOP_ACCESS.9,v 1.21 2005/06/28 20:15:18 hmp Exp $
+.\" $FreeBSD: src/share/man/man9/VOP_ACCESS.9,v 1.22 2008/10/28 13:44:11 trasz Exp $
 .\"
 .Dd July 24, 1996
 .Os
@@ -39,16 +39,16 @@
 .In sys/param.h
 .In sys/vnode.h
 .Ft int
-.Fn VOP_ACCESS "struct vnode *vp" "int mode" "struct ucred *cred" "struct thread *td"
+.Fn VOP_ACCESS "struct vnode *vp" "accmode_t accmode" "struct ucred *cred" "struct thread *td"
 .Sh DESCRIPTION
 This entry point checks the access permissions of the file against the
 given credentials.
 .Pp
 Its arguments are:
-.Bl -tag -width mode
+.Bl -tag -width accmode
 .It Fa vp
 The vnode of the file to check.
-.It Fa mode
+.It Fa accmode
 The type of access required.
 .It Fa cred
 The user credentials to check.
@@ -57,8 +57,8 @@
 .El
 .Pp
 The
-.Fa mode
-is a mask which can contain
+.Fa accmode
+is a mask which can contain flags described in , e.g.
 .Dv VREAD ,
 .Dv VWRITE
 or
@@ -71,7 +71,7 @@
 .Sh PSEUDOCODE
 .Bd -literal
 int
-vop_access(struct vnode *vp, int mode, struct ucred *cred, struct thread *td)
+vop_access(struct vnode *vp, accmode_t accmode, struct ucred *cred, struct thread *td)
 {
     int error;
 
@@ -80,7 +80,7 @@
      * unless the file is a socket, fifo, or a block or
      * character device resident on the filesystem.
      */
-    if (mode & VWRITE) {
+    if (accmode & VWRITE) {
 	switch (vp->v_type) {
 	case VDIR:
 	case VLNK:
@@ -93,7 +93,7 @@
     }
 
     /* If immutable bit set, nobody gets to write it. */
-    if ((mode & VWRITE) && vp has immutable bit set)
+    if ((accmode & VWRITE) && vp has immutable bit set)
 	return EPERM;
 
     /* Otherwise, user id 0 always gets access. */
@@ -104,11 +104,11 @@
 
     /* Otherwise, check the owner. */
     if (cred->cr_uid == owner of vp) {
-	if (mode & VEXEC)
+	if (accmode & VEXEC)
 	    mask |= S_IXUSR;
-	if (mode & VREAD)
+	if (accmode & VREAD)
 	    mask |= S_IRUSR;
-	if (mode & VWRITE)
+	if (accmode & VWRITE)
 	    mask |= S_IWUSR;
 	return (((mode of vp) & mask) == mask ? 0 : EACCES);
     }
@@ -116,21 +116,21 @@
     /* Otherwise, check the groups. */
     for (i = 0, gp = cred->cr_groups; i < cred->cr_ngroups; i++, gp++)
 	if (group of vp == *gp) {
-	    if (mode & VEXEC)
+	    if (accmode & VEXEC)
 		mask |= S_IXGRP;
-	    if (mode & VREAD)
+	    if (accmode & VREAD)
 		mask |= S_IRGRP;
-	    if (mode & VWRITE)
+	    if (accmode & VWRITE)
 		mask |= S_IWGRP;
 	    return (((mode of vp) & mask) == mask ? 0 : EACCES);
 	}
 
     /* Otherwise, check everyone else. */
-    if (mode & VEXEC)
+    if (accmode & VEXEC)
 	mask |= S_IXOTH;
-    if (mode & VREAD)
+    if (accmode & VREAD)
 	mask |= S_IROTH;
-    if (mode & VWRITE)
+    if (accmode & VWRITE)
 	mask |= S_IWOTH;
     return (((mode of vp) & mask) == mask ? 0 : EACCES);
 }

==== //depot/projects/mpsafetty/share/man/man9/style.9#4 (text+ko) ====

@@ -24,7 +24,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	From: @(#)style	1.14 (Berkeley) 4/28/95
-.\" $FreeBSD: src/share/man/man9/style.9,v 1.127 2008/07/10 11:24:41 danger Exp $
+.\" $FreeBSD: src/share/man/man9/style.9,v 1.128 2008/10/31 14:47:15 rwatson Exp $
 .\"
 .Dd February 10, 2005
 .Dt STYLE 9
@@ -46,7 +46,7 @@
  * Style guide for FreeBSD.  Based on the CSRG's KNF (Kernel Normal Form).
  *
  *	@(#)style	1.14 (Berkeley) 4/28/95
- * $FreeBSD: src/share/man/man9/style.9,v 1.127 2008/07/10 11:24:41 danger Exp $
+ * $FreeBSD: src/share/man/man9/style.9,v 1.128 2008/10/31 14:47:15 rwatson Exp $
  */
 
 /*
@@ -111,7 +111,7 @@
 #endif
 
 #include 
-__FBSDID("$FreeBSD: src/share/man/man9/style.9,v 1.127 2008/07/10 11:24:41 danger Exp $");
+__FBSDID("$FreeBSD: src/share/man/man9/style.9,v 1.128 2008/10/31 14:47:15 rwatson Exp $");
 .Ed
 .Pp
 Leave another blank line before the header files.
@@ -716,9 +716,9 @@
 do not roll your own.
 .Bd -literal
 	if ((four = malloc(sizeof(struct foo))) == NULL)
-		err(1, (char *)NULL);
+		err(EX_OSERR, NULL);
 	if ((six = (int *)overflow()) == NULL)
-		errx(1, "number overflowed");
+		errx(EX_DATAERR, "number overflowed");
 	return (eight);
 }
 .Ed

==== //depot/projects/mpsafetty/share/man/man9/vaccess.9#2 (text+ko) ====

@@ -23,7 +23,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD: src/share/man/man9/vaccess.9,v 1.9 2005/06/28 20:15:18 hmp Exp $
+.\" $FreeBSD: src/share/man/man9/vaccess.9,v 1.10 2008/10/28 13:44:11 trasz Exp $
 .\"
 .Dd August 22, 2001
 .Os
@@ -40,7 +40,7 @@
 .Fa "mode_t file_mode"
 .Fa "uid_t file_uid"
 .Fa "gid_t file_gid"
-.Fa "mode_t acc_mode"
+.Fa "accmode_t accmode"
 .Fa "struct ucred *cred"
 .Fa "int *privused"
 .Fc
@@ -59,7 +59,7 @@
 owning GID
 .Fa file_gid ,
 desired access mode
-.Fa acc_mode ,
+.Fa accmode ,
 requesting credential
 .Fa cred ,
 and an optional call-by-reference

==== //depot/projects/mpsafetty/share/man/man9/vaccess_acl_posix1e.9#2 (text+ko) ====

@@ -23,7 +23,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD: src/share/man/man9/vaccess_acl_posix1e.9,v 1.5 2005/06/28 20:15:18 hmp Exp $
+.\" $FreeBSD: src/share/man/man9/vaccess_acl_posix1e.9,v 1.6 2008/10/28 13:44:11 trasz Exp $
 .\"
 .Dd August 22, 2001
 .Os
@@ -41,7 +41,7 @@
 .Fa "uid_t file_uid"
 .Fa "gid_t file_gid"
 .Fa "struct acl *acl"
-.Fa "mode_t acc_mode"
+.Fa "accmode_t accmode"
 .Fa "struct ucred *cred"
 .Fa "int *privused"
 .Fc
@@ -59,7 +59,7 @@
 access ACL for the file
 .Fa acl ,
 desired access mode
-.Fa acc_mode ,
+.Fa accmode ,
 requesting credential
 .Fa cred ,
 and an optional call-by-reference

==== //depot/projects/mpsafetty/share/misc/bsd-family-tree#3 (text+ko) ====

@@ -222,6 +222,7 @@
  |    7.0             |      |                 |                       |
  |     |              |      |             OpenBSD 4.3                 |
  |     V              |      |                 |                DragonFly 2.0.0
+ |                    |      |             OpenBSD 4.4                 |
  |                    |      |                 |                       |
 FreeBSD 8 -current    |  NetBSD -current  OpenBSD -current             |
  |                    |      |                 |                       |
@@ -486,6 +487,7 @@
 FreeBSD 7.0		2008-02-27 [FBD]
 OpenBSD 4.3		2008-05-01 [OBD]
 DragonFly 2.0.0		2008-07-21 [DFB]
+OpenBSD 4.4		2008-11-01 [OBD]
 
 Bibliography
 ------------------------
@@ -546,4 +548,4 @@
 Copyright (c) 1997-2007 Wolfram Schneider 
 URL: http://cvsweb.freebsd.org/src/share/misc/bsd-family-tree
 
-$FreeBSD: src/share/misc/bsd-family-tree,v 1.121 2008/07/23 14:25:39 maxim Exp $
+$FreeBSD: src/share/misc/bsd-family-tree,v 1.122 2008/11/01 06:48:28 maxim Exp $

==== //depot/projects/mpsafetty/share/zoneinfo/southamerica#6 (text+ko) ====

@@ -1,4 +1,4 @@
-# @(#)southamerica	8.30
+# @(#)southamerica	8.33
 # 
     
 # This data is by no means authoritative; if you think you know better,
@@ -193,6 +193,26 @@
 # 
 # So there is no summer time in Argentina for now.
 
+# From Mariano Absatz (2008-10-20):
+# Decree 1693/2008 applies Law 26.350 for the summer 2008/2009 establishing DST in Argentina
+# From 2008-10-19 until 2009-03-15
+# 
+# http://www.boletinoficial.gov.ar/Bora.Portal/CustomControls/PdfContent.aspx?fp=16102008&pi=3&pf=4&s=0&sec=01
+# 
+#
+# Decree 1705/2008 excepting 12 Provinces from applying DST in the summer 2008/2009:
+# Catamarca, La Rioja, Mendoza, Salta, San Juan, San Luis, La Pampa, Neuquen, Rio Negro, Chubut, Santa Cruz
+# and Tierra del Fuego
+# 
+# http://www.boletinoficial.gov.ar/Bora.Portal/CustomControls/PdfContent.aspx?fp=17102008&pi=1&pf=1&s=0&sec=01
+# 
+#
+# Press release 235 dated Saturday October 18th, from the Government of the Province of Jujuy saying
+# it will not apply DST either (even when it was not included in Decree 1705/2008)
+# 
+# http://www.jujuy.gov.ar/index2/partes_prensa/18_10_08/235-181008.doc
+# 
+
 Rule	Arg	2007	only	-	Dec	30	0:00	1:00	S
 Rule	Arg	2008	max	-	Mar	Sun>=15	0:00	0	-
 Rule	Arg	2008	max	-	Oct	Sun>=15	0:00	1:00	S
@@ -343,9 +363,8 @@
 			-4:00	Arg	AR%sT	2000 Mar  3
 			-3:00	Arg	AR%sT
 #
-# Santa Fe (SF), Entre Rios (ER), Corrientes (CN), Misiones (MN), Chaco (CC),
-# Formosa (FM), Salta (SA), Santiago del Estero (SE), Cordoba (CB),
-# La Pampa (LP), Neuquen (NQ), Rio Negro (RN)
+# Cordoba (CB), Santa Fe (SF), Entre Rios (ER), Corrientes (CN), Misiones (MN),
+# Chaco (CC), Formosa (FM), Santiago del Estero (SE)
 #
 # Shanks & Pottenger also make the following claims, which we haven't verified:
 # - Formosa switched to -3:00 on 1991-01-07.
@@ -364,6 +383,18 @@
 			-4:00	Arg	AR%sT	2000 Mar  3
 			-3:00	Arg	AR%sT
 #
+# Salta (SA), La Pampa (LP), Neuquen (NQ), Rio Negro (RN)
+Zone America/Argentina/Salta -4:21:40 - LMT	1894 Oct 31
+			-4:16:48 -	CMT	1920 May
+			-4:00	-	ART	1930 Dec
+			-4:00	Arg	AR%sT	1969 Oct  5
+			-3:00	Arg	AR%sT	1991 Mar  3
+			-4:00	-	WART	1991 Oct 20
+			-3:00	Arg	AR%sT	1999 Oct  3
+			-4:00	Arg	AR%sT	2000 Mar  3
+			-3:00	Arg	AR%sT	2008 Oct 18
+			-3:00	-	ART
+#
 # Tucuman (TM)
 Zone America/Argentina/Tucuman -4:20:52 - LMT	1894 Oct 31
 			-4:16:48 -	CMT	1920 May
@@ -388,7 +419,8 @@
 			-4:00	Arg	AR%sT	2000 Mar  3
 			-3:00	-	ART	2004 Jun  1
 			-4:00	-	WART	2004 Jun 20
-			-3:00	Arg	AR%sT
+			-3:00	Arg	AR%sT	2008 Oct 18
+			-3:00	-	ART
 #
 # San Juan (SJ)
 Zone America/Argentina/San_Juan -4:34:04 - LMT	1894 Oct 31
@@ -401,7 +433,8 @@
 			-4:00	Arg	AR%sT	2000 Mar  3
 			-3:00	-	ART	2004 May 31
 			-4:00	-	WART	2004 Jul 25
-			-3:00	Arg	AR%sT
+			-3:00	Arg	AR%sT	2008 Oct 18
+			-3:00	-	ART
 #
 # Jujuy (JY)
 Zone America/Argentina/Jujuy -4:21:12 -	LMT	1894 Oct 31
@@ -415,7 +448,8 @@
 			-3:00	1:00	ARST	1992
 			-3:00	Arg	AR%sT	1999 Oct  3
 			-4:00	Arg	AR%sT	2000 Mar  3
-			-3:00	Arg	AR%sT
+			-3:00	Arg	AR%sT	2008 Oct 18
+			-3:00	-	ART
 #
 # Catamarca (CT), Chubut (CH)
 Zone America/Argentina/Catamarca -4:23:08 - LMT	1894 Oct 31
@@ -428,7 +462,8 @@
 			-4:00	Arg	AR%sT	2000 Mar  3
 			-3:00	-	ART	2004 Jun  1
 			-4:00	-	WART	2004 Jun 20
-			-3:00	Arg	AR%sT
+			-3:00	Arg	AR%sT	2008 Oct 18
+			-3:00	-	ART
 #
 # Mendoza (MZ)
 Zone America/Argentina/Mendoza -4:35:16 - LMT	1894 Oct 31
@@ -445,7 +480,8 @@
 			-4:00	Arg	AR%sT	2000 Mar  3
 			-3:00	-	ART	2004 May 23
 			-4:00	-	WART	2004 Sep 26
-			-3:00	Arg	AR%sT
+			-3:00	Arg	AR%sT	2008 Oct 18
+			-3:00	-	ART
 #
 # San Luis (SL)
 Zone America/Argentina/San_Luis -4:25:24 - LMT	1894 Oct 31
@@ -473,7 +509,8 @@
 			-4:00	Arg	AR%sT	2000 Mar  3
 			-3:00	-	ART	2004 Jun  1
 			-4:00	-	WART	2004 Jun 20
-			-3:00	Arg	AR%sT
+			-3:00	Arg	AR%sT	2008 Oct 18
+			-3:00	-	ART
 #
 # Tierra del Fuego, Antartida e Islas del Atlantico Sur (TF)
 Zone America/Argentina/Ushuaia -4:33:12 - LMT 1894 Oct 31
@@ -484,7 +521,8 @@
 			-4:00	Arg	AR%sT	2000 Mar  3
 			-3:00	-	ART	2004 May 30
 			-4:00	-	WART	2004 Jun 20
-			-3:00	Arg	AR%sT
+			-3:00	Arg	AR%sT	2008 Oct 18
+			-3:00	-	ART
 
 # Aruba
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]

==== //depot/projects/mpsafetty/share/zoneinfo/zone.tab#4 (text+ko) ====

@@ -1,4 +1,4 @@
-# @(#)zone.tab	8.19

>>> TRUNCATED FOR MAIL (1000 lines) <<<

From owner-p4-projects@FreeBSD.ORG  Sat Nov  1 13:12:53 2008
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id CBD071065674; Sat,  1 Nov 2008 13:12:53 +0000 (UTC)
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 8FC191065672
	for ; Sat,  1 Nov 2008 13:12:53 +0000 (UTC)
	(envelope-from ed@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 67FA18FC1B
	for ; Sat,  1 Nov 2008 13:12:53 +0000 (UTC)
	(envelope-from ed@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id mA1DCrAB064052
	for ; Sat, 1 Nov 2008 13:12:53 GMT
	(envelope-from ed@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id mA1DCrec064050
	for perforce@freebsd.org; Sat, 1 Nov 2008 13:12:53 GMT
	(envelope-from ed@FreeBSD.org)
Date: Sat, 1 Nov 2008 13:12:53 GMT
Message-Id: <200811011312.mA1DCrec064050@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	ed@FreeBSD.org using -f
From: Ed Schouten 
To: Perforce Change Reviews 
Cc: 
Subject: PERFORCE change 152312 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, 01 Nov 2008 13:12:54 -0000

http://perforce.freebsd.org/chv.cgi?CH=152312

Change 152312 by ed@ed_dull on 2008/11/01 13:11:53

	Reduce diff against HEAD.

Affected files ...

.. //depot/projects/mpsafetty/sys/kern/kern_cons.c#3 integrate

Differences ...

==== //depot/projects/mpsafetty/sys/kern/kern_cons.c#3 (text+ko) ====

@@ -35,7 +35,7 @@
  */
 
 #include 
-__FBSDID("$FreeBSD: src/sys/kern/tty_cons.c,v 1.145 2008/08/20 08:31:58 ed Exp $");
+__FBSDID("$FreeBSD: src/sys/kern/kern_cons.c,v 1.1 2008/11/01 08:35:28 ed Exp $");
 
 #include "opt_ddb.h"
 

From owner-p4-projects@FreeBSD.ORG  Sat Nov  1 18:27:12 2008
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 53D13106567C; Sat,  1 Nov 2008 18:27:12 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 1646B1065678
	for ; Sat,  1 Nov 2008 18:27:12 +0000 (UTC)
	(envelope-from peter-gmail@wemm.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id DF3048FC08
	for ; Sat,  1 Nov 2008 18:27:11 +0000 (UTC)
	(envelope-from peter-gmail@wemm.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id mA1IRBAj005762
	for ; Sat, 1 Nov 2008 18:27:11 GMT
	(envelope-from peter-gmail@wemm.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id mA1IRBhd005760
	for perforce@freebsd.org; Sat, 1 Nov 2008 18:27:11 GMT
	(envelope-from peter-gmail@wemm.org)
Date: Sat, 1 Nov 2008 18:27:11 GMT
Message-Id: <200811011827.mA1IRBhd005760@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	peter-gmail@wemm.org using -f
From: Peter Wemm 
To: Perforce Change Reviews 
Cc: 
Subject: PERFORCE change 152318 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, 01 Nov 2008 18:27:12 -0000

http://perforce.freebsd.org/chv.cgi?CH=152318

Change 152318 by peter@peter_overcee on 2008/11/01 18:26:45

	Add libc-4x.supp to the build list

Affected files ...

.. //depot/projects/valgrind/Makefile.am#9 edit

Differences ...

==== //depot/projects/valgrind/Makefile.am#9 (text+ko) ====

@@ -27,6 +27,7 @@
 	glibc-2.34567-NPTL-helgrind.supp \
 	glibc-2.2-LinuxThreads-helgrind.supp \
 	glibc-2.X-drd.supp \
+	libc-4x.supp \
 	exp-ptrcheck.supp
 
 dist_val_DATA = $(SUPP_FILES) default.supp

From owner-p4-projects@FreeBSD.ORG  Sat Nov  1 18:28:13 2008
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 2C3B91065687; Sat,  1 Nov 2008 18:28:13 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id E3F10106568D
	for ; Sat,  1 Nov 2008 18:28:12 +0000 (UTC)
	(envelope-from peter-gmail@wemm.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id D25618FC14
	for ; Sat,  1 Nov 2008 18:28:12 +0000 (UTC)
	(envelope-from peter-gmail@wemm.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id mA1ISCK7005827
	for ; Sat, 1 Nov 2008 18:28:12 GMT
	(envelope-from peter-gmail@wemm.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id mA1ISCgK005824
	for perforce@freebsd.org; Sat, 1 Nov 2008 18:28:12 GMT
	(envelope-from peter-gmail@wemm.org)
Date: Sat, 1 Nov 2008 18:28:12 GMT
Message-Id: <200811011828.mA1ISCgK005824@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	peter-gmail@wemm.org using -f
From: Peter Wemm 
To: Perforce Change Reviews 
Cc: 
Subject: PERFORCE change 152319 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, 01 Nov 2008 18:28:13 -0000

http://perforce.freebsd.org/chv.cgi?CH=152319

Change 152319 by peter@peter_overcee on 2008/11/01 18:27:22

	Note that sigaction.sa_flags is an int on both of our platforms.

Affected files ...

.. //depot/projects/valgrind/include/vki/vki-amd64-freebsd.h#4 edit
.. //depot/projects/valgrind/include/vki/vki-x86-freebsd.h#3 edit

Differences ...

==== //depot/projects/valgrind/include/vki/vki-amd64-freebsd.h#4 (text+ko) ====

@@ -66,7 +66,7 @@
 #define _VKI_NSIG_BPW	32
 #define _VKI_NSIG_WORDS	(_VKI_NSIG / _VKI_NSIG_BPW)
 
-/* Note that this uses 32 bit words, even on amd64 */
+/* 32 bit words, even on amd64 - is not long aligned. */
 typedef struct {
 	vki_uint32_t sig[_VKI_NSIG_WORDS];
 } vki_sigset_t;

==== //depot/projects/valgrind/include/vki/vki-x86-freebsd.h#3 (text+ko) ====

@@ -66,6 +66,7 @@
 #define _VKI_NSIG_BPW	32
 #define _VKI_NSIG_WORDS	(_VKI_NSIG / _VKI_NSIG_BPW)
 
+/* 32 bit words, even on amd64 - is not long aligned. */
 typedef struct {
 	vki_uint32_t sig[_VKI_NSIG_WORDS];
 } vki_sigset_t;
@@ -122,7 +123,7 @@
 
 struct vki_sigaction {
 	__vki_sighandler_t ksa_handler;
-	unsigned long sa_flags;
+	unsigned int sa_flags;
 	vki_sigset_t sa_mask;		/* mask last for extensibility */
 };
 

From owner-p4-projects@FreeBSD.ORG  Sat Nov  1 18:39:24 2008
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id B8C111065675; Sat,  1 Nov 2008 18:39:24 +0000 (UTC)
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 7CCDA1065673
	for ; Sat,  1 Nov 2008 18:39:24 +0000 (UTC)
	(envelope-from gonzo@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 525118FC1D
	for ; Sat,  1 Nov 2008 18:39:24 +0000 (UTC)
	(envelope-from gonzo@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id mA1IdOZq006669
	for ; Sat, 1 Nov 2008 18:39:24 GMT
	(envelope-from gonzo@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id mA1IdOPb006667
	for perforce@freebsd.org; Sat, 1 Nov 2008 18:39:24 GMT
	(envelope-from gonzo@FreeBSD.org)
Date: Sat, 1 Nov 2008 18:39:24 GMT
Message-Id: <200811011839.mA1IdOPb006667@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 152320 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, 01 Nov 2008 18:39:25 -0000

http://perforce.freebsd.org/chv.cgi?CH=152320

Change 152320 by gonzo@gonzo_jeeves on 2008/11/01 18:38:25

	- cfe_tp is unused, remove it

Affected files ...

.. //depot/projects/mips2/src/sys/dev/cfe/cfe_console.c#5 edit

Differences ...

==== //depot/projects/mips2/src/sys/dev/cfe/cfe_console.c#5 (text+ko) ====

@@ -62,7 +62,6 @@
 };
 
 static int			conhandle = -1;
-static struct tty		*cfe_tp = NULL;
 /* XXX does cfe have to poll? */
 static int			polltime;
 static struct callout_handle	cfe_timeouthandle

From owner-p4-projects@FreeBSD.ORG  Sat Nov  1 18:46:32 2008
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 14BD2106568D; Sat,  1 Nov 2008 18:46:32 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id CD518106568B
	for ; Sat,  1 Nov 2008 18:46:31 +0000 (UTC)
	(envelope-from peter-gmail@wemm.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id A2EA58FC13
	for ; Sat,  1 Nov 2008 18:46:31 +0000 (UTC)
	(envelope-from peter-gmail@wemm.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id mA1IkVQj007465
	for ; Sat, 1 Nov 2008 18:46:31 GMT
	(envelope-from peter-gmail@wemm.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id mA1IkV7V007463
	for perforce@freebsd.org; Sat, 1 Nov 2008 18:46:31 GMT
	(envelope-from peter-gmail@wemm.org)
Date: Sat, 1 Nov 2008 18:46:31 GMT
Message-Id: <200811011846.mA1IkV7V007463@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	peter-gmail@wemm.org using -f
From: Peter Wemm 
To: Perforce Change Reviews 
Cc: 
Subject: PERFORCE change 152321 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, 01 Nov 2008 18:46:32 -0000

http://perforce.freebsd.org/chv.cgi?CH=152321

Change 152321 by peter@peter_overcee on 2008/11/01 18:46:02

	attempt a suppression of ttyname_r's ioctl call copyin.

Affected files ...

.. //depot/projects/valgrind/libc-4x.supp#2 edit

Differences ...

==== //depot/projects/valgrind/libc-4x.supp#2 (text+ko) ====

@@ -55,3 +55,10 @@
    fun:realloc
    fun:__submore
 }
+{
+   ttyname_r copyin of alignment padding
+   Memcheck:Param
+   ioctl(generic)
+   fun:__sys_ioctl
+   fun:ttyname_r
+}

From owner-p4-projects@FreeBSD.ORG  Sat Nov  1 18:47:33 2008
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 252B91065675; Sat,  1 Nov 2008 18:47:33 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id DD59C1065673
	for ; Sat,  1 Nov 2008 18:47:32 +0000 (UTC)
	(envelope-from peter-gmail@wemm.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id CC2098FC08
	for ; Sat,  1 Nov 2008 18:47:32 +0000 (UTC)
	(envelope-from peter-gmail@wemm.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id mA1IlW3d007526
	for ; Sat, 1 Nov 2008 18:47:32 GMT
	(envelope-from peter-gmail@wemm.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id mA1IlW39007524
	for perforce@freebsd.org; Sat, 1 Nov 2008 18:47:32 GMT
	(envelope-from peter-gmail@wemm.org)
Date: Sat, 1 Nov 2008 18:47:32 GMT
Message-Id: <200811011847.mA1IlW39007524@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	peter-gmail@wemm.org using -f
From: Peter Wemm 
To: Perforce Change Reviews 
Cc: 
Subject: PERFORCE change 152322 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, 01 Nov 2008 18:47:33 -0000

http://perforce.freebsd.org/chv.cgi?CH=152322

Change 152322 by peter@peter_overcee on 2008/11/01 18:46:43

	Add a redirect entry for strcpy in ld-elf.so.1, but I don't yet know why
	m_redir.c can't do it.

Affected files ...

.. //depot/projects/valgrind/memcheck/mc_replace_strmem.c#5 edit

Differences ...

==== //depot/projects/valgrind/memcheck/mc_replace_strmem.c#5 (text+ko) ====

@@ -112,6 +112,8 @@
 #  error "Unknown platform"
 #endif
 
+#define  m_ld_elf_so_1         ldZhelfZdsoZd1               // ld-elf.so.1
+
 /* --- Sonames for Linux ELF linkers. --- */
 
 #define  m_ld_linux_so_2         ldZhlinuxZdsoZd2           // ld-linux.so.2
@@ -266,6 +268,7 @@
    }
 
 STRCPY(m_libc_soname, strcpy)
+STRCPY(m_ld_elf_so_1, strcpy)
 
 
 #define STRNCPY(soname, fnname) \

From owner-p4-projects@FreeBSD.ORG  Sat Nov  1 18:48:34 2008
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 4E44A1065679; Sat,  1 Nov 2008 18:48:34 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 123071065673
	for ; Sat,  1 Nov 2008 18:48:34 +0000 (UTC)
	(envelope-from peter-gmail@wemm.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 00DCE8FC0A
	for ; Sat,  1 Nov 2008 18:48:34 +0000 (UTC)
	(envelope-from peter-gmail@wemm.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id mA1ImX1C007595
	for ; Sat, 1 Nov 2008 18:48:33 GMT
	(envelope-from peter-gmail@wemm.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id mA1ImXWl007593
	for perforce@freebsd.org; Sat, 1 Nov 2008 18:48:33 GMT
	(envelope-from peter-gmail@wemm.org)
Date: Sat, 1 Nov 2008 18:48:33 GMT
Message-Id: <200811011848.mA1ImXWl007593@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	peter-gmail@wemm.org using -f
From: Peter Wemm 
To: Perforce Change Reviews 
Cc: 
Subject: PERFORCE change 152323 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, 01 Nov 2008 18:48:34 -0000

http://perforce.freebsd.org/chv.cgi?CH=152323

Change 152323 by peter@peter_overcee on 2008/11/01 18:48:28

	Give in and try an explicitly unaligned bitfield in sigaction.  This
	is to work around other signal mask problems elsewhere because valgrind
	likes to assume that (UWord) == bitfield container (eg: m_libcsignal.c)

Affected files ...

.. //depot/projects/valgrind/include/vki/vki-amd64-freebsd.h#5 edit
.. //depot/projects/valgrind/include/vki/vki-x86-freebsd.h#4 edit

Differences ...

==== //depot/projects/valgrind/include/vki/vki-amd64-freebsd.h#5 (text+ko) ====

@@ -63,12 +63,12 @@
 #define VKI_SIG_IGN	((__vki_sighandler_t)1)	/* ignore signal */
 
 #define _VKI_NSIG	128
-#define _VKI_NSIG_BPW	32
+#define _VKI_NSIG_BPW	64
 #define _VKI_NSIG_WORDS	(_VKI_NSIG / _VKI_NSIG_BPW)
 
-/* 32 bit words, even on amd64 - is not long aligned. */
+/* Beware, not longword aligned in struct sigaction */
 typedef struct {
-	vki_uint32_t sig[_VKI_NSIG_WORDS];
+	vki_uint64_t sig[_VKI_NSIG_WORDS];
 } vki_sigset_t;
 
 #define VKI_SIGHUP		 1
@@ -124,7 +124,8 @@
 struct vki_sigaction {
 	__vki_sighandler_t ksa_handler;
 	unsigned int sa_flags;
-	vki_sigset_t sa_mask;		/* mask last for extensibility */
+	vki_sigset_t sa_mask __attribute__((__packed__));
+	unsigned int __sa_pad;
 };
 
 typedef struct vki_sigaltstack {

==== //depot/projects/valgrind/include/vki/vki-x86-freebsd.h#4 (text+ko) ====

@@ -66,7 +66,6 @@
 #define _VKI_NSIG_BPW	32
 #define _VKI_NSIG_WORDS	(_VKI_NSIG / _VKI_NSIG_BPW)
 
-/* 32 bit words, even on amd64 - is not long aligned. */
 typedef struct {
 	vki_uint32_t sig[_VKI_NSIG_WORDS];
 } vki_sigset_t;

From owner-p4-projects@FreeBSD.ORG  Sat Nov  1 20:15:02 2008
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 4AD161065679; Sat,  1 Nov 2008 20:15:02 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 0ED1E1065672
	for ; Sat,  1 Nov 2008 20:15:02 +0000 (UTC)
	(envelope-from gabor@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id F0CC38FC18
	for ; Sat,  1 Nov 2008 20:15:01 +0000 (UTC)
	(envelope-from gabor@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id mA1KF1tB016527
	for ; Sat, 1 Nov 2008 20:15:01 GMT
	(envelope-from gabor@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id mA1KF11N016525
	for perforce@freebsd.org; Sat, 1 Nov 2008 20:15:01 GMT
	(envelope-from gabor@freebsd.org)
Date: Sat, 1 Nov 2008 20:15:01 GMT
Message-Id: <200811012015.mA1KF11N016525@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 152326 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, 01 Nov 2008 20:15:02 -0000

http://perforce.freebsd.org/chv.cgi?CH=152326

Change 152326 by gabor@gabor_server on 2008/11/01 20:14:29

	- Add some tags

Affected files ...

.. //depot/projects/docproj_es/www/es/about.sgml#2 edit
.. //depot/projects/docproj_es/www/es/applications.sgml#2 edit
.. //depot/projects/docproj_es/www/es/availability.sgml#2 edit
.. //depot/projects/docproj_es/www/es/community.sgml#2 edit
.. //depot/projects/docproj_es/www/es/docs.sgml#2 edit
.. //depot/projects/docproj_es/www/es/features.sgml#2 edit
.. //depot/projects/docproj_es/www/es/index.xsl#5 edit
.. //depot/projects/docproj_es/www/es/internet.sgml#5 edit
.. //depot/projects/docproj_es/www/es/mailto.sgml#2 edit
.. //depot/projects/docproj_es/www/es/publish.sgml#2 edit
.. //depot/projects/docproj_es/www/es/send-pr.sgml#4 edit
.. //depot/projects/docproj_es/www/es/support.sgml#2 edit
.. //depot/projects/docproj_es/www/es/where.sgml#2 edit
.. //depot/projects/docproj_es/www/es/y2kbug.sgml#2 edit

Differences ...

==== //depot/projects/docproj_es/www/es/about.sgml#2 (text+ko) ====

@@ -5,7 +5,9 @@
 ]>
 
 
+     %SOURCE%	en/about.sgml
+     %SRCID%	1.12
+-->
 
 
 &header;

==== //depot/projects/docproj_es/www/es/applications.sgml#2 (text+ko) ====

@@ -5,7 +5,9 @@
 ]>
 
 
+     %SOURCE%	en/applications.sgml
+     %SRCID%	1.34
+-->
 
 
 &header;

==== //depot/projects/docproj_es/www/es/availability.sgml#2 (text+ko) ====

@@ -5,7 +5,9 @@
 ]>
 
 
+     %SOURCE%	en/availability.sgml
+     %SRCID%	1.35
+-->
 
 
   

==== //depot/projects/docproj_es/www/es/community.sgml#2 (text+ko) ====

@@ -5,7 +5,9 @@
 ]>
 
 
+     %SOURCE%	en/cmmunity.sgml
+     %SRCID%	1.5
+-->
 
 
     &header;

==== //depot/projects/docproj_es/www/es/docs.sgml#2 (text+ko) ====

@@ -5,7 +5,9 @@
 ]>
 
 
+     %SOURCE%	en/docs.sgml
+     %SRCID%	1.195
+-->
 
 
   &header;

==== //depot/projects/docproj_es/www/es/features.sgml#2 (text+ko) ====


==== //depot/projects/docproj_es/www/es/index.xsl#5 (text+ko) ====

@@ -6,7 +6,7 @@
 
 
 
 

==== //depot/projects/docproj_es/www/es/internet.sgml#5 (text+ko) ====

@@ -5,7 +5,9 @@
 ]>
 
 
+     %SOURCE%	en/internet.sgml
+     %SRCID%	1.39
+-->
 
 
     &header;

==== //depot/projects/docproj_es/www/es/mailto.sgml#2 (text+ko) ====

@@ -5,7 +5,9 @@
 ]>
 
 
+     %SOURCE%	en/mailto.sgml
+     %SRCID%	1.32
+-->
 
 
   &header;

==== //depot/projects/docproj_es/www/es/publish.sgml#2 (text+ko) ====


==== //depot/projects/docproj_es/www/es/send-pr.sgml#4 (text+ko) ====

@@ -8,7 +8,9 @@
 ]>
 
 
+     %SOURCE%	en/send-pr.sgml
+     %SRCID%	1.60
+-->
 
 
     &header;

==== //depot/projects/docproj_es/www/es/support.sgml#2 (text+ko) ====

@@ -5,7 +5,9 @@
 ]>
 
 
+     %SOURCE%	en/support.sgml
+     %SRCID%	1.356
+-->
 
 
   &header;

==== //depot/projects/docproj_es/www/es/where.sgml#2 (text+ko) ====


==== //depot/projects/docproj_es/www/es/y2kbug.sgml#2 (text+ko) ====


From owner-p4-projects@FreeBSD.ORG  Sat Nov  1 21:16:04 2008
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 2AD421065673; Sat,  1 Nov 2008 21:16:04 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id E2FAC1065670
	for ; Sat,  1 Nov 2008 21:16:03 +0000 (UTC)
	(envelope-from peter-gmail@wemm.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 9E50C8FC13
	for ; Sat,  1 Nov 2008 21:16:03 +0000 (UTC)
	(envelope-from peter-gmail@wemm.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id mA1LG3ks032137
	for ; Sat, 1 Nov 2008 21:16:03 GMT
	(envelope-from peter-gmail@wemm.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id mA1LG3WY032135
	for perforce@freebsd.org; Sat, 1 Nov 2008 21:16:03 GMT
	(envelope-from peter-gmail@wemm.org)
Date: Sat, 1 Nov 2008 21:16:03 GMT
Message-Id: <200811012116.mA1LG3WY032135@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	peter-gmail@wemm.org using -f
From: Peter Wemm 
To: Perforce Change Reviews 
Cc: 
Subject: PERFORCE change 152328 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, 01 Nov 2008 21:16:04 -0000

http://perforce.freebsd.org/chv.cgi?CH=152328

Change 152328 by peter@peter_overcee on 2008/11/01 21:16:03

	Fix warnings on i386.  The UCONTEXT macros return 'long'
	all platforms except i386-freebsd, so that upset some printf
	strings.  Cast them to long (instead of int) for freebsd rather
	than adding ifdefs to ``MI'' code.

Affected files ...

.. //depot/projects/valgrind/coregrind/m_coredump/priv_elf.h#3 edit
.. //depot/projects/valgrind/coregrind/m_signals.c#8 edit

Differences ...

==== //depot/projects/valgrind/coregrind/m_coredump/priv_elf.h#3 (text+ko) ====

@@ -37,7 +37,7 @@
 void ML_(fill_elffpregs_from_tst)(vki_elf_fpregset_t* fpu,
                                   const ThreadArchState* arch);
 
-#if defined(VGP_x86_linux)
+#if defined(VGP_x86_linux) || defined(VGP_x86_freebsd)
 void ML_(fill_elffpxregs_from_tst)(vki_elf_fpxregset_t* xfpu,
                                    const ThreadArchState* arch);
 #endif

==== //depot/projects/valgrind/coregrind/m_signals.c#8 (text+ko) ====

@@ -307,10 +307,10 @@
    }
 
 #elif defined(VGP_x86_freebsd)
-#  define VG_UCONTEXT_INSTR_PTR(uc)       ((uc)->uc_mcontext.eip)
-#  define VG_UCONTEXT_STACK_PTR(uc)       ((uc)->uc_mcontext.esp)
-#  define VG_UCONTEXT_FRAME_PTR(uc)       ((uc)->uc_mcontext.ebp)
-#  define VG_UCONTEXT_SYSCALL_NUM(uc)     ((uc)->uc_mcontext.eax)
+#  define VG_UCONTEXT_INSTR_PTR(uc)       ((UWord)(uc)->uc_mcontext.eip)
+#  define VG_UCONTEXT_STACK_PTR(uc)       ((UWord)(uc)->uc_mcontext.esp)
+#  define VG_UCONTEXT_FRAME_PTR(uc)       ((UWord)(uc)->uc_mcontext.ebp)
+#  define VG_UCONTEXT_SYSCALL_NUM(uc)     ((UWord)(uc)->uc_mcontext.eax)
 #  define VG_UCONTEXT_SYSCALL_SYSRES(uc)                        \
       /* Convert the value in uc_mcontext.eax into a SysRes. */ \
       VG_(mk_SysRes_x86_freebsd)( (uc)->uc_mcontext.eax, \

From owner-p4-projects@FreeBSD.ORG  Sat Nov  1 21:17:05 2008
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 3306F1065679; Sat,  1 Nov 2008 21:17:05 +0000 (UTC)
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id E97751065673
	for ; Sat,  1 Nov 2008 21:17:04 +0000 (UTC)
	(envelope-from rene@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id D56928FC12
	for ; Sat,  1 Nov 2008 21:17:04 +0000 (UTC)
	(envelope-from rene@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id mA1LH4xN032225
	for ; Sat, 1 Nov 2008 21:17:04 GMT
	(envelope-from rene@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id mA1LH4F3032223
	for perforce@freebsd.org; Sat, 1 Nov 2008 21:17:04 GMT
	(envelope-from rene@FreeBSD.org)
Date: Sat, 1 Nov 2008 21:17:04 GMT
Message-Id: <200811012117.mA1LH4F3032223@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	rene@FreeBSD.org using -f
From: Rene Ladan 
To: Perforce Change Reviews 
Cc: 
Subject: PERFORCE change 152329 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, 01 Nov 2008 21:17:05 -0000

http://perforce.freebsd.org/chv.cgi?CH=152329

Change 152329 by rene@rene_self on 2008/11/01 21:16:46

	Oops, do two things at once:
	* IFC
	* Translate 'contributing' article up to 13%

Affected files ...

.. //depot/projects/docproj_nl/en_US.ISO8859-1/articles/contributors/contrib.committers.sgml#11 integrate
.. //depot/projects/docproj_nl/en_US.ISO8859-1/books/fdp-primer/sgml-primer/chapter.sgml#2 integrate
.. //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/config/chapter.sgml#5 integrate
.. //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/cutting-edge/chapter.sgml#3 integrate
.. //depot/projects/docproj_nl/en_US.ISO8859-1/share/sgml/authors.ent#10 integrate
.. //depot/projects/docproj_nl/nl_NL.ISO8859-1/articles/contributing/article.sgml#2 edit
.. //depot/projects/docproj_nl/share/pgpkeys/pgpkeys-developers.sgml#8 integrate
.. //depot/projects/docproj_nl/share/pgpkeys/pgpkeys.ent#8 integrate
.. //depot/projects/docproj_nl/share/pgpkeys/versus.key#1 branch
.. //depot/projects/docproj_nl/www/en/developers.sgml#8 integrate
.. //depot/projects/docproj_nl/www/en/releases/6.4R/schedule.sgml#7 integrate
.. //depot/projects/docproj_nl/www/en/releng/index.sgml#6 integrate
.. //depot/projects/docproj_nl/www/share/sgml/news.xml#14 integrate

Differences ...

==== //depot/projects/docproj_nl/en_US.ISO8859-1/articles/contributors/contrib.committers.sgml#11 (text+ko) ====

@@ -1,4 +1,4 @@
-
+
 
 
 
@@ -65,8 +65,8 @@
       like that, and our computers require some assistance before they can
       meaningfully process our text.
 
-    More precisely, they need help identifying what is what.  You or I
-      can look at
+    More precisely, they need help identifying what is what.  Let's
+      look at this text:
 
       
    
 	To remove /tmp/foo use &man.rm.1;.
@@ -74,7 +74,7 @@
 	&prompt.user; rm /tmp/foo
       
    
 
-      and easily see which parts are filenames, which are commands to be typed
+    It is easy to see which parts are filenames, which are commands to be typed
       in, which parts are references to manual pages, and so on.  But the
       computer processing the document cannot.  For this we need
       markup.
@@ -204,15 +204,15 @@
 
     For an element called element-name the
       start tag will normally look like
-      <element-name>.  The
+      element-name.  The
       corresponding closing tag for this element is
-      </element-name>.
+      /element-name.    
 
     
       Using an element (start and end tags)
 
       HTML has an element for indicating that the content enclosed by
-	the element is a paragraph, called p.  This
+	the element is a paragraph, called p.  This
 	element has both start and end tags.
       
       This is a paragraph.  It starts with the start tag for
@@ -231,7 +231,7 @@
       Using an element (start tag only)
 
       HTML has an element for indicating a horizontal rule, called
-	hr.  This element does not wrap content, so only
+	hr.  This element does not wrap content, so only
 	has a start tag.
 
       This is a paragraph.
    
@@ -266,10 +266,10 @@
 	end.
 
       When this document (or anyone else knowledgeable about SGML) refers
-	to the <p> tag they mean the literal text
+	to the p tag they mean the literal text
 	consisting of the three characters <,
 	p, and >.  But the phrase
-	the <p> element refers to the whole
+	the p element refers to the whole
 	element.
 
       This distinction is very subtle.  But keep it 
@@ -287,7 +287,7 @@
       attribute-name="attribute-value".
 
     In sufficiently recent versions of HTML, the p
-      element has an attribute called align, which suggests
+      element has an attribute called align, which suggests
       an alignment (justification) for the paragraph to the program displaying
       the HTML.
 
@@ -494,7 +494,7 @@
 
 		
 		  6
-		  The text of the error message.
+		  The text of the message.
 		
 	      
 	    
@@ -519,7 +519,7 @@
 	
 
 	
-	  Put the title element back in.
+	  Put the title element back in.
 	
       
     
@@ -781,7 +781,7 @@
   
     Escaping back to SGML
 
-    Earlier in this primer I said that SGML is only used when writing a
+    As mentioned earlier, SGML is only used when writing a
       DTD.  This is not strictly true.  There is certain SGML syntax that you
       will want to be able to use within your documents.  For example,
       comments can be included in your document, and will be ignored by the
@@ -1379,7 +1379,7 @@
 	  characters.
 	
 	RCDATA is for Entity references and
-	  character data If the parser is in this content model then it
+	  character data.  If the parser is in this content model then it
 	  is expecting to see characters and entities.
 	  < loses its special status, but
 	  & will still be treated as
@@ -1392,7 +1392,7 @@
 	  < is converted to a
 	  &lt; and every &
 	  is converted to a &amp;, it can be
-	  easier to mark the section as only containing CDATA.  When the SGML
+	  easier to mark the section as only containing CDATA.  When the SGML
 	  parser encounters this it will ignore the
 	  < and & symbols
 	  embedded in the content.
@@ -1534,7 +1534,7 @@
   <body>	    
     <p>This paragraph <![ CDATA [contains many <
       characters (< < < < <) so it is easier
-      to wrap it in a CDATA marked section ]]></p>
+      to wrap it in a CDATA marked section.]]></p>
 
     <![ IGNORE [
     <p>This paragraph will definitely not be included in the

==== //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/config/chapter.sgml#5 (text+ko) ====

@@ -1,7 +1,7 @@
 
 
 
@@ -623,7 +623,7 @@
       
     
 
-    This is the basic set up for every
+    This is the basic setup for every
       crontab file, although there is one thing
       different about this one.  Field number six, where we specified
       the username, only exists in the system

==== //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/cutting-edge/chapter.sgml#3 (text+ko) ====

@@ -1,7 +1,7 @@
 
 
 
@@ -14,20 +14,24 @@
       
       
     
+
     
       
 	Jordan
 	Hubbard
 	Original work by 
       
+
       
 	Poul-Henning
 	Kamp
       
+
       
 	John
 	Polstra
       
+
       
 	Nik
 	Clayton
@@ -52,31 +56,48 @@
     After reading this chapter, you will know:
 
     
-      The difference between the two development
-      branches: &os.stable; and &os.current;.
+      
+	The difference between the two development
+	  branches: &os.stable; and &os.current;.
       
-      How to keep your system up to date with
+
+      
+	How to keep your system up to date with
 	  CVSup,
 	  CVS, or
 	  CTM.
       
-      How to rebuild and reinstall the entire base
-      system with make buildworld (etc).
+
+      
+	How to rebuild and reinstall the entire base
+	  system with make buildworld (etc).
       
-
     
 
     Before reading this chapter, you should:
 
     
-      Properly set up your network connection ().
+      
+	Properly set up your network connection ().
+      
+
+      
+	Know how to install additional third-party
+	  software ().
       
-      Know how to install additional third-party
-        software ().
     
+
+    
+      Throughout this chapter, the cvsup command is
+	used to obtain and update &os; sources.  To use it, you will need to
+	install a port or package like net/cvsup-without-gui.  If you are using
+	&os; 6.2-RELEASE or later, you may wish to substitute this
+	with &man.csup.1;, which is now part of the base system.
+    
   
-  
+
   
     &os.current; vs. &os.stable;
     -CURRENT
@@ -95,7 +116,7 @@
 	&os.current; users are expected to have a high degree of
 	technical skill, and should be capable of solving difficult
 	system problems on their own.  If you are new to &os;, think
-	twice before installing it.  
+	twice before installing it.
 
       
 	What Is &os.current;?
@@ -184,31 +205,33 @@
 
       
 	Using &os.current;
-      
+
 	
 	  -CURRENT
 	  using
 	
 	
 	  
-	    Join the &a.current.name; and the &a.cvsall.name; lists.  This is not
-	      just a good idea, it is essential.  If
-	      you are not on the &a.current.name; list,
-	      you will not see the comments that people are
-	      making about the current state of the system and thus will
-	      probably end up stumbling over a lot of problems that others
-	      have already found and solved.  Even more importantly, you
-	      will miss out on important bulletins which may be critical
-	      to your system's continued health.
+	    Join the &a.current.name; and the &a.svn-src-head.name;
+	      lists.  This is not just a good idea, it is
+	      essential.  If you are not on the
+	      &a.current.name; list, you will not see
+	      the comments that people are making about the current state of
+	      the system and thus will probably end up stumbling over a lot
+	      of problems that others have already found and solved.  Even
+	      more importantly, you will miss out on important bulletins
+	      which may be critical to your system's continued health.
 
-	    The &a.cvsall.name; list will allow you to see the
-	      commit log entry for each change as it is made along with
+	    The &a.svn-src-head.name; list will allow you to see the
+	      commit log entry for each change as it is made, along with
 	      any pertinent information on possible side-effects.
 
 	    To join these lists, or one of the others available
 	      go to &a.mailman.lists.link; and click on the list that
 	      you wish to subscribe to.  Instructions on the rest of
-	      the procedure are available there.
+	      the procedure are available there.  If you are interested
+	      in tracking changes for the whole source tree, we would
+	      recommend subscribing to the &a.svn-src-all.name; list.
 	  
 
 	  
@@ -216,47 +239,66 @@
 	      site.  You can do this in one of two ways:
 
 	    
-              
-                cvsup
-              
-              
-                cron
-              
-              
-	        -CURRENT
+	      
+		cvsup
+	      
+	      
+		cron
+	      
+	      
+		-CURRENT
 		Syncing with CVSup
 	      
 
 	      
 		Use the cvsup program
-                  with the supfile named standard-supfile
-                  available from /usr/share/examples/cvsup.
-		  This is the most recommended
-		  method, since it allows you to grab the entire
-		  collection once and then only what has changed from then
-		  on.  Many people run cvsup from 
-		  cron and keep their
- 		  sources up-to-date automatically.  You have to 
- 		  customize the sample supfile above, and configure 
- 		  cvsup for your environment.
+		  with the supfile named
+		  standard-supfile
+		  available from
+		  /usr/share/examples/cvsup.
+		  This is the most recommended method, since it allows you to
+		  grab the entire collection once and then only what has
+		  changed from then on.  Many people run
+		  cvsup from cron and
+		  keep their sources up-to-date automatically.  You have to
+		  customize the sample supfile above,
+		  and configure cvsup for your environment.
+
+		
+		  The sample standard-supfile is
+		    intended for tracking a specific security branch of
+		    &os;, and not &os.current;.  You will need to edit this
+		    file and replace the following line:
+
+		  *default release=cvs tag=RELENG_X_Y
+
+		  With this one:
+
+		  *default release=cvs tag=.
+
+		  For a detailed explanation of usable tags, please
+		    refer to the Handbook's CVS Tags section.
+		
 	      
 
-              
-	        -CURRENT
+	      
+		-CURRENT
 		Syncing with CTM
 	      
 	      
 		Use the CTM facility.  If you
+		    linkend="ctm">CTM facility.  If you
 		  have very bad connectivity (high price connections or
-		  only email access) CTM is an option.
-		  However, it is a lot of hassle and can give you broken files.
-		  This leads to it being rarely used, which again increases
-		  the chance of it not working for fairly long periods of
-		  time.  We recommend using
+		  only email access) CTM is an
+		  option.  However, it is a lot of hassle and can give you
+		  broken files.  This leads to it being rarely used, which
+		  again increases the chance of it not working for fairly
+		  long periods of time.  We recommend using
 		  CVSup
-		  for anybody with a 9600 bps modem or faster connection.
-		
+		  for anybody with a 9600 bps modem or faster
+		  connection.
 	      
 	    
 	  
@@ -269,20 +311,21 @@
 	      to compile just a subset is almost guaranteed to get you
 	      into trouble.
 
-	  
-	    -CURRENT
-	    compiling
-	  
+	    
+	      -CURRENT
+	      compiling
+	    
 	    Before compiling &os.current;, read the
 	      Makefile in /usr/src
 	      carefully.  You should at least install a new kernel and rebuild the world the first time through
+		linkend="makeworld">install a new kernel and rebuild the
+		world the first time through
 	      as part of the upgrading process.  Reading the &a.current;
-	      and /usr/src/UPDATING will keep you up-to-date on other bootstrapping procedures
-	      that sometimes become necessary as we move toward the next
-	      release.
+	      and /usr/src/UPDATING will keep you
+	      up-to-date on other bootstrapping procedures that sometimes
+	      become necessary as we move toward the next release.
 	  
-	      
+
 	  
 	    Be active! If you are running &os.current;, we want
 	      to know what you have to say about it, especially if you
@@ -293,7 +336,7 @@
 	
       
     
-  
+
     
       Staying Stable with &os;
 
@@ -305,8 +348,8 @@
 	  are made.  Changes go into this branch at a different pace, and
 	  with the general assumption that they have first gone into
 	  &os.current; for testing.  This is still
-	  a development branch, however, and this means that at any given time,
-	  the sources for &os.stable; may or may not be suitable for any
+	  a development branch, however, and this means that at any given
+	  time, the sources for &os.stable; may or may not be suitable for any
 	  particular purpose.  It is simply another engineering development
 	  track, not a resource for end-users.
       
@@ -315,23 +358,23 @@
 	Who Needs &os.stable;?
 
 	If you are interested in tracking or contributing to the
-          FreeBSD development process, especially as it relates to the
+	  FreeBSD development process, especially as it relates to the
 	  next point release of FreeBSD, then you should
 	  consider following &os.stable;.
 
 	While it is true that security fixes also go into the
 	  &os.stable; branch, you do not need to
-	  track &os.stable; to do this. Every security advisory for
+	  track &os.stable; to do this.  Every security advisory for
 	  FreeBSD explains how to fix the problem for the releases it
 	  affects
 	  That is not quite true.  We can not continue to
-  	    support old releases of FreeBSD forever, although we do
-  	    support them for many years.  For a complete description
-  	    of the current security policy for old releases of
-  	    FreeBSD, please see http://www.FreeBSD.org/security/.
-	  
-	  , and tracking an entire development branch just
+	    support old releases of FreeBSD forever, although we do
+	    support them for many years.  For a complete description
+	    of the current security policy for old releases of
+	    FreeBSD, please see http://www.FreeBSD.org/security/.
+	  ,
+	  and tracking an entire development branch just
 	  for security reasons is likely to bring in a lot of unwanted
 	  changes as well.
 
@@ -355,38 +398,42 @@
 
       
 	Using &os.stable;
-      
+
 	
 	  -STABLE
 	  using
 	
 	
 	  
-	    Join the &a.stable.name; list.  This will keep you informed of
-	      build-dependencies that may appear in &os.stable;
-	      or any other issues requiring
-	      special attention.  Developers will also make announcements
-	      in this mailing list when they are contemplating some
-	      controversial fix or update, giving the users a chance to
-	      respond if they have any issues to raise concerning the
-	      proposed change.
+	    Join the &a.stable.name; list.  This will keep you informed
+	      of build-dependencies that may appear in &os.stable;
+	      or any other issues requiring special attention.  Developers
+	      will also make announcements in this mailing list when they are
+	      contemplating some controversial fix or update, giving the
+	      users a chance to respond if they have any issues to raise
+	      concerning the proposed change.
 
-	    The &a.cvsall.name; list will allow you to see the
-	      commit log entry for each change as it is made along with
-	      any pertinent information on possible side-effects.
+	    Join the relevant SVN list for
+	      the branch you are tracking.  For example, if you are tracking
+	      the 7-STABLE branch, join the &a.svn-src-stable-7.name; list.
+	      This will allow you to view the commit log entry for each
+	      change as it is made, along with any pertinent information on
+	      possible side-effects.
 
 	    To join these lists, or one of the others available
 	      go to &a.mailman.lists.link; and click on the list that
 	      you wish to subscribe to.  Instructions on the rest of
-	      the procedure are available there.
+	      the procedure are available there.  If you are interested
+	      in tracking changes for the whole source tree, we would
+	      recommend subscribing to the &a.svn-src-all.name; list.
 	  
 
 	  
 	    If you are going to install a new system and want it
 	      to run monthly snapshot built from &os.stable;, please
-	      check the 
-		Snapshots web page for more information.
-	      Alternatively, it is possible to
+	      check the Snapshots web page for
+	      more information.  Alternatively, it is possible to
 	      install the most recent &os.stable; release from the
 	      mirror sites and follow
 	      the instructions below to upgrade your system to the
@@ -405,39 +452,37 @@
 		cron
 	      
 	      
-	        -STABLE
+		-STABLE
 		syncing with CVSup
 	      
 	      
 		Use the cvsup program
-                  with the supfile named stable-supfile
-                  from the directory
-                  /usr/share/examples/cvsup.
-		  This is the most recommended
-		  method, since it allows you to grab the entire
-		  collection once and then only what has changed from then
-		  on.  Many people run cvsup from 
-		  cron to keep their
-		  sources up-to-date automatically.  You have to
+		  with the supfile named
+		  stable-supfile from the directory
+		  /usr/share/examples/cvsup.
+		  This is the most recommended method, since it allows you to
+		  grab the entire collection once and then only what has
+		  changed from then on.  Many people run
+		  cvsup from cron to
+		  keep their sources up-to-date automatically.  You have to
 		  customize the sample supfile above,
 		  and configure cvsup for your
 		  environment.
 	      
 
 	      
-	        -STABLE
+		-STABLE
 		syncing with CTM
 	      
 	      
 		Use the CTM facility.  If
+		    linkend="ctm">CTM facility.  If
 		  you do not have a fast and inexpensive connection to
 		  the Internet, this is the method you should consider
-		  using.
-		  
+		  using.
 	      
-	   
-	 
+	    
+	  
 
 	  
 	    Essentially, if you need rapid on-demand access to the
@@ -454,11 +499,12 @@
 	    Before compiling &os.stable;, read the
 	    Makefile in /usr/src
 	    carefully.  You should at least install a new kernel and rebuild the world the first time through
-	    as part of the upgrading process.  Reading the &a.stable; and /usr/src/UPDATING will
-	    keep you up-to-date on other bootstrapping procedures that
-	    sometimes become necessary as we move toward the next
-	    release.
+	      linkend="makeworld">install a new kernel and rebuild the
+	      world the first time through
+	    as part of the upgrading process.  Reading the &a.stable; and
+	    /usr/src/UPDATING will keep you up-to-date
+	    on other bootstrapping procedures that sometimes become
+	    necessary as we move toward the next release.
 	  
 	
       
@@ -467,23 +513,23 @@
 
   
     Synchronizing Your Source
-    
+
     There are various ways of using an Internet (or email)
       connection to stay up-to-date with any given area of the &os;
       project sources, or all areas, depending on what interests you.  The
       primary services we offer are Anonymous
       CVS, CVSup, and CTM.
+	linkend="ctm">CTM.
 
     
       While it is possible to update only parts of your source tree,
-        the only supported update procedure is to update the entire tree
-        and recompile both userland (i.e., all the programs that run in
-        user space, such as those in /bin and
-        /sbin) and kernel sources.  Updating only part
-        of your source tree, only the kernel, or only userland will often
-        result in problems.  These problems may range from compile errors
-        to kernel panics or data corruption.
+	the only supported update procedure is to update the entire tree
+	and recompile both userland (i.e., all the programs that run in
+	user space, such as those in /bin and
+	/sbin) and kernel sources.  Updating only part
+	of your source tree, only the kernel, or only userland will often
+	result in problems.  These problems may range from compile errors
+	to kernel panics or data corruption.
     
 
     
@@ -494,7 +540,7 @@
     Anonymous CVS and
       CVSup use the pull
       model of updating sources.  In the case of
-      CVSup the user (or a 
+      CVSup the user (or a
       cron script) invokes
       the cvsup program, and it interacts with a
       cvsupd server somewhere to bring your files
@@ -504,12 +550,11 @@
       of interest to you.  Updates are generated on the fly by the server,
       according to what you have and what you want to have.
       Anonymous CVS is quite a bit more
-      simplistic than CVSup in that it is just an extension to
-      CVS which allows it to pull changes
-      directly from a remote CVS repository.
+      simplistic than CVSup in that it is just an
+      extension to CVS which allows it to pull
+      changes directly from a remote CVS repository.
       CVSup can do this far more efficiently,
-      but Anonymous CVS is easier to
-      use.
+      but Anonymous CVS is easier to use.
 
     
       CTM
@@ -535,8 +580,10 @@
       CTM will not do this, and if you wipe some
       portion of your source tree out (and do not have it backed up) then
       you will have to start from scratch (from the most recent CVS
-      base delta) and rebuild it all with CTM or, with
-      Anonymous CVS, simply delete the bad bits and resync.
+      base delta) and rebuild it all with
+      CTM or, with
+      Anonymous CVS, simply delete the bad bits
+      and resync.
   
 
   
@@ -547,8 +594,7 @@
     
     Once you have synchronized your local source tree against a
       particular version of &os; (&os.stable;, &os.current;, and so on)
-      you can then use the source
-      tree to rebuild the system.
+      you can then use the source tree to rebuild the system.
 
     
       Make a Backup
@@ -561,9 +607,8 @@
 	source tree render your system unbootable.
 
       Make sure you have taken a backup.  And have a fixit floppy or
-	bootable CD at
-	hand.  You will probably never have to use it, but it is better to be
-	safe than sorry!
+	bootable CD at hand.  You will probably never have to use it, but it
+	is better to be safe than sorry!
     
 
     
@@ -581,15 +626,14 @@
 	file systems (or worse).
 
       If problems like these occur, a heads up is
-        posted to the appropriate mailing list, explaining the nature of
+	posted to the appropriate mailing list, explaining the nature of
 	the problem and which systems it affects.  And an all
 	clear announcement is posted when the problem has been
 	solved.
 
       If you try to track &os.stable; or &os.current; and do
-	not read the &a.stable; or the
-	&a.current; respectively, then you are
-	asking for trouble.
+	not read the &a.stable; or the &a.current; respectively, then you
+	are asking for trouble.
     
 
     
@@ -611,10 +655,11 @@
 	necessary for your version of the sources and then use the following
 	procedure:
 
-      &prompt.root; make buildworld
+      &prompt.root; cd /usr/src
+&prompt.root; make buildworld
 &prompt.root; make buildkernel
 &prompt.root; make installkernel
-&prompt.root; reboot
+&prompt.root; shutdown -r now
 
       
 	There are a few rare cases when an extra run of
@@ -630,7 +675,9 @@
 	(i.e. using boot -s from the loader
 	prompt).  Then run:
 
-      &prompt.root; mergemaster -p
+      &prompt.root; mount -a -t ufs
+&prompt.root; mergemaster -p
+&prompt.root; cd /usr/src
 &prompt.root; make installworld
 &prompt.root; mergemaster
 &prompt.root; reboot
@@ -658,8 +705,8 @@
 
       
 	Reading UPDATING is not an acceptable
-	  substitute for subscribing to the correct mailing list, as described 
-	  previously.  The two requirements are complementary, not
+	  substitute for subscribing to the correct mailing list, as
+	  described previously.  The two requirements are complementary, not
 	  exclusive.
       
     
@@ -667,12 +714,11 @@
     
       Check <filename>/etc/make.conf</filename>
       
-        make.conf
+	make.conf
       
 
       Examine the files
-	/usr/share/examples/etc/make.conf
-	and
+	/usr/share/examples/etc/make.conf and
 	/etc/make.conf.  The first contains some
 	default defines – most of which are commented out.  To
 	make use of them when you rebuild your system from source, add
@@ -685,10 +731,9 @@
 	CFLAGS and
 	NO_PROFILE lines found in
 	/usr/share/examples/etc/make.conf
-	to
-	/etc/make.conf and uncomment them.
+	to /etc/make.conf and uncomment them.
 
-      Examine the other definitions (COPTFLAGS, 
+      Examine the other definitions (COPTFLAGS,
 	NOPORTDOCS and so
 	on) and decide if they are relevant to you.
     
@@ -706,15 +751,14 @@
 	/etc/group.
 
       There have been occasions when the installation part of
-        make installworld has expected certain usernames or groups
-	to exist.  When performing an upgrade it is likely that these
-	users or groups did not exist. This caused problems when upgrading.
-	In some cases make buildworld will check to see if
-	these users or groups exist.
+	make installworld has expected certain usernames
+	or groups to exist.  When performing an upgrade it is likely that
+	these users or groups did not exist.  This caused problems when
+	upgrading.  In some cases make buildworld will
+	check to see if these users or groups exist.
 
-      An example of this is when the
-	smmsp user was added.  Users had the
-	installation process fail for them when
+      An example of this is when the smmsp user
+	was added.  Users had the installation process fail for them when
 	&man.mtree.8; was trying to create
 	/var/spool/clientmqueue.
 
@@ -757,9 +801,9 @@
 
       multi-user mode
       Another method is to compile the system in multi-user mode, and
-        then drop into single user mode for the installation.  If you would
-        like to do it this way, simply hold off on the following steps until
-        the build has completed.  You can postpone dropping to single user
+	then drop into single user mode for the installation.  If you would
+	like to do it this way, simply hold off on the following steps until
+	the build has completed.  You can postpone dropping to single user
 	mode until you have to installkernel or
 	installworld.
 
@@ -771,8 +815,8 @@
 	mode.
 
       Alternatively, reboot the system, and at the boot prompt,
-        select the single user option.  The system will then boot
-	single user.  At the shell prompt you should then run:
+	select the single user option.  The system will then
+	boot single user.  At the shell prompt you should then run:
 
       &prompt.root; fsck -p
 &prompt.root; mount -u /
@@ -783,20 +827,18 @@
 	read/write, mounts all the other UFS file systems referenced in
 	/etc/fstab and then turns swapping on.
 
+      
+	If your CMOS clock is set to local time and not to GMT
+	  (this is true if the output of the &man.date.1; command
+	  does not show the correct time and zone),
+	  you may also need to run the following command:
 
-        
-          If your CMOS clock is set to local time and not to GMT
-	    (this is true if the output of the &man.date.1; command
-	    does not show the correct time and zone),
-            you may also need to run the following command:
-&prompt.root; adjkerntz -i
+	&prompt.root; adjkerntz -i
 
-          This will make sure that your local time-zone settings
-            get set up correctly — without this, you may later run into some
-            problems.
-          
-        
-
+	This will make sure that your local time-zone settings
+	  get set up correctly — without this, you may later run
+	  into some problems.
+      
     
 
     
@@ -807,8 +849,8 @@
 	/usr/obj.  The directories shadow those under
 	/usr/src.
 
-      You can speed up the make buildworld process, and
-	possibly save yourself some dependency headaches by removing this
+      You can speed up the make buildworld process,
+	and possibly save yourself some dependency headaches by removing this
 	directory as well.
 
       Some files below /usr/obj may have the
@@ -839,9 +881,9 @@
 	  when the process has finished.
 
 	&prompt.root; script /var/tmp/mw.out
-Script started, output file is /var/tmp/mw.out	 
+Script started, output file is /var/tmp/mw.out
 &prompt.root; make TARGET
-… compile, compile, compile …	  
+… compile, compile, compile …
 &prompt.root; exit
 Script done, …
 
@@ -865,9 +907,9 @@
 	make
 
 	To rebuild the world you use the &man.make.1; command.  This
-          command reads instructions from the Makefile,
-          which describes how the programs that comprise &os; should be
-          rebuilt, the order in which they should be built, and so on.
+	  command reads instructions from the Makefile,
+	  which describes how the programs that comprise &os; should be
+	  rebuilt, the order in which they should be built, and so on.
 
 	The general format of the command line you will type is as
 	  follows:
@@ -891,7 +933,7 @@
 	is another way of specifying that profiled libraries should
 	  not be built, and corresponds with the
 
-	NO_PROFILE=    true 	#    Avoid compiling profiled libraries
+	NO_PROFILE=    true     #    Avoid compiling profiled libraries
 
 	line in /etc/make.conf.
 
@@ -907,8 +949,8 @@
 	  sub-steps.
 
 	Most of the time you will not need to pass any parameters to
-	    &man.make.1;, and so your command like will look like
-	    this:
+	  &man.make.1;, and so your command like will look like
+	  this:
 
 	&prompt.root; make target
 
@@ -918,26 +960,27 @@
 
 	As the names imply, buildworld
 	  builds a complete new tree under /usr/obj,
-	  and installworld, another target, installs this tree on
-	  the current machine.
+	  and installworld, another target,
+	  installs this tree on the current machine.
 
-	Having separate options is very useful for two reasons.  First, it allows you
-	  to do the build safe in the knowledge that no components of
-	  your running system will be affected.  The build is
+	Having separate options is very useful for two reasons.  First,
+	  it allows you to do the build safe in the knowledge that no
+	  components of your running system will be affected.  The build is
 	  self hosted.  Because of this, you can safely
 	  run buildworld on a machine running
 	  in multi-user mode with no fear of ill-effects.  It is still
-	  recommended that you run the
-	  installworld part in single user
-	  mode, though.
+	  recommended that you run the installworld
+	  part in single user mode, though.
 
-	Secondly, it allows you to use NFS mounts to upgrade 
+	Secondly, it allows you to use NFS mounts to upgrade

>>> TRUNCATED FOR MAIL (1000 lines) <<<

From owner-p4-projects@FreeBSD.ORG  Sat Nov  1 22:58:48 2008
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 7B8E71065674; Sat,  1 Nov 2008 22:58:48 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 3F6F81065672
	for ; Sat,  1 Nov 2008 22:58:48 +0000 (UTC)
	(envelope-from peter-gmail@wemm.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 2DB6B8FC13
	for ; Sat,  1 Nov 2008 22:58:48 +0000 (UTC)
	(envelope-from peter-gmail@wemm.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id mA1Mwmkb042986
	for ; Sat, 1 Nov 2008 22:58:48 GMT
	(envelope-from peter-gmail@wemm.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id mA1Mwm4F042984
	for perforce@freebsd.org; Sat, 1 Nov 2008 22:58:48 GMT
	(envelope-from peter-gmail@wemm.org)
Date: Sat, 1 Nov 2008 22:58:48 GMT
Message-Id: <200811012258.mA1Mwm4F042984@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	peter-gmail@wemm.org using -f
From: Peter Wemm 
To: Perforce Change Reviews 
Cc: 
Subject: PERFORCE change 152332 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, 01 Nov 2008 22:58:48 -0000

http://perforce.freebsd.org/chv.cgi?CH=152332

Change 152332 by peter@peter_overcee on 2008/11/01 22:58:20

	AARGH!!!!
	Fix the value of SIG_SETMASK in sigprocmask syscall.  (It is 2 on linux,
	3 on FreeBSD.)  This was duplicated rather than using #includes.
	
	This is responsible for the assertion failures on non-trivial code due to
	signals getting unblocked when they should have remained blocked for the
	interpreter-driven periodic polling to find them.

Affected files ...

.. //depot/projects/valgrind/coregrind/m_syswrap/syscall-amd64-freebsd.S#3 edit
.. //depot/projects/valgrind/coregrind/m_syswrap/syscall-x86-freebsd.S#6 edit

Differences ...

==== //depot/projects/valgrind/coregrind/m_syswrap/syscall-amd64-freebsd.S#3 (text+ko) ====

@@ -71,7 +71,7 @@
 */
 
 /* from vki_arch.h */	
-#define VKI_SIG_SETMASK	2
+#define VKI_SIG_SETMASK	3
 	
 .globl ML_(do_syscall_for_client_WRK)
 ML_(do_syscall_for_client_WRK):

==== //depot/projects/valgrind/coregrind/m_syswrap/syscall-x86-freebsd.S#6 (text+ko) ====

@@ -84,7 +84,7 @@
 */
 
 /* from vki_arch.h */	
-#define VKI_SIG_SETMASK	2
+#define VKI_SIG_SETMASK	3
 	
 /* QQQ translate syscall abi conventions */
 .globl ML_(do_syscall_for_client_WRK)

From owner-p4-projects@FreeBSD.ORG  Sat Nov  1 23:14:04 2008
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 70FE4106567F; Sat,  1 Nov 2008 23:14:04 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 32FF9106567A
	for ; Sat,  1 Nov 2008 23:14:04 +0000 (UTC)
	(envelope-from peter-gmail@wemm.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id EF0638FC23
	for ; Sat,  1 Nov 2008 23:14:03 +0000 (UTC)
	(envelope-from peter-gmail@wemm.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id mA1NE3t6045513
	for ; Sat, 1 Nov 2008 23:14:03 GMT
	(envelope-from peter-gmail@wemm.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id mA1NE33r045511
	for perforce@freebsd.org; Sat, 1 Nov 2008 23:14:03 GMT
	(envelope-from peter-gmail@wemm.org)
Date: Sat, 1 Nov 2008 23:14:03 GMT
Message-Id: <200811012314.mA1NE33r045511@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	peter-gmail@wemm.org using -f
From: Peter Wemm 
To: Perforce Change Reviews 
Cc: 
Subject: PERFORCE change 152334 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, 01 Nov 2008 23:14:04 -0000

http://perforce.freebsd.org/chv.cgi?CH=152334

Change 152334 by peter@peter_overcee on 2008/11/01 23:13:17

	Unused

Affected files ...

.. //depot/projects/valgrind/coregrind/m_syswrap/priv_types_n_macros.h#8 edit

Differences ...

==== //depot/projects/valgrind/coregrind/m_syswrap/priv_types_n_macros.h#8 (text+ko) ====

@@ -90,7 +90,6 @@
       Int o_arg7;
       Int o_arg8;
 #ifdef VGO_freebsd
-      Int o_onstk;
       Int o_retval2;
 #endif
       Int o_retval;

From owner-p4-projects@FreeBSD.ORG  Sat Nov  1 23:14:05 2008
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 3F28F1065751; Sat,  1 Nov 2008 23:14:04 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 349F7106567B
	for ; Sat,  1 Nov 2008 23:14:04 +0000 (UTC)
	(envelope-from peter-gmail@wemm.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 198A38FC24
	for ; Sat,  1 Nov 2008 23:14:04 +0000 (UTC)
	(envelope-from peter-gmail@wemm.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id mA1NE3fn045518
	for ; Sat, 1 Nov 2008 23:14:03 GMT
	(envelope-from peter-gmail@wemm.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id mA1NE37l045516
	for perforce@freebsd.org; Sat, 1 Nov 2008 23:14:03 GMT
	(envelope-from peter-gmail@wemm.org)
Date: Sat, 1 Nov 2008 23:14:03 GMT
Message-Id: <200811012314.mA1NE37l045516@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	peter-gmail@wemm.org using -f
From: Peter Wemm 
To: Perforce Change Reviews 
Cc: 
Subject: PERFORCE change 152335 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, 01 Nov 2008 23:14:05 -0000

http://perforce.freebsd.org/chv.cgi?CH=152335

Change 152335 by peter@peter_overcee on 2008/11/01 23:13:59

	Take a halfway complete shot at implementing async syscall wrappers for
	amd64.  (And sync/reduce-diffs with linux version)

Affected files ...

.. //depot/projects/valgrind/coregrind/m_syswrap/syscall-amd64-freebsd.S#4 edit

Differences ...

==== //depot/projects/valgrind/coregrind/m_syswrap/syscall-amd64-freebsd.S#4 (text+ko) ====

@@ -1,13 +1,13 @@
 
-##--------------------------------------------------------------------##
-##--- Support for doing system calls.        syscall-amd64-linux.S ---##
-##--------------------------------------------------------------------##
+/*--------------------------------------------------------------------*/
+/*--- Support for doing system calls.      syscall-amd64-freebsd.S ---*/
+/*--------------------------------------------------------------------*/
 
 /*
   This file is part of Valgrind, a dynamic binary instrumentation
   framework.
 
-  Copyright (C) 2000-2006 Julian Seward 
+  Copyright (C) 2000-2008 Julian Seward 
      jseward@acm.org
 
   This program is free software; you can redistribute it and/or
@@ -66,8 +66,20 @@
 				  void* guest_state,		// rsi
 				  const vki_sigset_t *sysmask,	// rdx
 				  const vki_sigset_t *postmask,	// rcx
-				  Int nsigwords)		// r8
-				   
+				  Int nsigwords,		// r8
+				  SyscallArgs *args)		// r9
+
+See priv_types_n_macros.h for SyscallArgs layout:
+      UWord sysno;             // 0
+      UWord arg1;              // 8
+      UWord arg2;              // 16
+      UWord arg3;              // 24
+      UWord arg4;              // 32
+      UWord arg5;              // 40
+      UWord arg6;              // 48
+      UWord arg7;              // 56
+      UWord arg8;              // 64
+
 */
 
 /* from vki_arch.h */	
@@ -113,13 +125,11 @@
 	movq	$VKI_SIG_SETMASK, %rdi		// how
 	movq	%rdx, %rsi			// sysmask
 	movq	%rcx, %rdx			// postmask
-	movq	%r8, %r10			// nsigwords
 	syscall
 
 	POP_di_si_dx_cx_8
 	
-	testq	%rax, %rax
-	js	7f	/* sigprocmask failed */
+	jb	7f	/* sigprocmask failed */
 
 	/* OK, that worked.  Now do the syscall proper. */
 	
@@ -144,8 +154,13 @@
 
 	POP_di_si_dx_cx_8
 
+	pushf
+	popq	%r15
 	movq	%rax, OFFSET_amd64_RAX(%rsi)	/* save back to RAX */
+	movq	%rdx, OFFSET_amd64_RDX(%rsi)	/* save back to RDX */
 
+	/* QQQ Race here.  see syscall-x86-freebsd.S comment */
+
 4:	/* Re-block signals.  If eip is in [4,5), then the syscall 
 	   is complete and we needn't worry about it. */
 
@@ -155,15 +170,22 @@
 	movq	$VKI_SIG_SETMASK, %rdi		// how
 	movq	%rcx, %rsi			// postmask
 	xorq	%rdx, %rdx			// NULL
-	movq	%r8, %r10			// nsigwords
 	syscall
 
 	POP_di_si_dx_cx_8
 
-	testq	%rax, %rax
-	js	7f	/* sigprocmask failed */
+	jb	7f	/* sigprocmask failed */
 
 5:	/* now safe from signals */
+
+	PUSH_di_si_dx_cx_8
+	/* Export carry state */
+	movq	%r15,%rdi
+	andq	$1, %rdi
+	/* rsi still --> VexGuestAMD64State * */
+	call	LibVEX_GuestAMD64_put_rflag_c
+	POP_di_si_dx_cx_8
+
 	movq	$0, %rax	/* SUCCESS */
 	popq	%r15
 	popq	%r14
@@ -174,8 +196,6 @@
 	ret
 
 7:	/* failure:	 return 0x8000 | error code */
-	negq	%rax
-	andq	$0x7FFF, %rax
 	orq	$0x8000, %rax
 	popq	%r15
 	popq	%r14
@@ -206,6 +226,6 @@
 /* Let the linker know we don't need an executable stack */
 .section .note.GNU-stack,"",@progbits
 
-##--------------------------------------------------------------------##
-##--- end                                                          ---##
-##--------------------------------------------------------------------##
+/*--------------------------------------------------------------------*/
+/*--- end                                                          ---*/
+/*--------------------------------------------------------------------*/