From owner-p4-projects@FreeBSD.ORG Sun Sep 7 14:40:54 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1874D106567C; Sun, 7 Sep 2008 14:40: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 D1CC01065677 for ; Sun, 7 Sep 2008 14:40:53 +0000 (UTC) (envelope-from raj@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id A31C38FC1C for ; Sun, 7 Sep 2008 14:40:53 +0000 (UTC) (envelope-from raj@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 m87Eer29091322 for ; Sun, 7 Sep 2008 14:40:53 GMT (envelope-from raj@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m87EerWA091316 for perforce@freebsd.org; Sun, 7 Sep 2008 14:40:53 GMT (envelope-from raj@freebsd.org) Date: Sun, 7 Sep 2008 14:40:53 GMT Message-Id: <200809071440.m87EerWA091316@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to raj@freebsd.org using -f From: Rafal Jaworowski To: Perforce Change Reviews Cc: Subject: PERFORCE change 149369 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, 07 Sep 2008 14:40:54 -0000 http://perforce.freebsd.org/chv.cgi?CH=149369 Change 149369 by raj@raj_mimi on 2008/09/07 14:40:49 Add SYS_RES_GPIO resource type for ARM. This is a prerequisite for the upcoming integrated Marvell GPIO controller driver. Affected files ... .. //depot/projects/arm/src/sys/arm/include/resource.h#3 edit Differences ... ==== //depot/projects/arm/src/sys/arm/include/resource.h#3 (text+ko) ==== @@ -41,5 +41,6 @@ #define SYS_RES_DRQ 2 /* isa dma lines */ #define SYS_RES_MEMORY 3 /* i/o memory */ #define SYS_RES_IOPORT 4 /* i/o ports */ +#define SYS_RES_GPIO 5 /* general purpose i/o */ #endif /* !_MACHINE_RESOURCE_H_ */ From owner-p4-projects@FreeBSD.ORG Sun Sep 7 14:56:09 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9EE301065678; Sun, 7 Sep 2008 14: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 62BE8106564A for ; Sun, 7 Sep 2008 14:56:09 +0000 (UTC) (envelope-from raj@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 4E1058FC14 for ; Sun, 7 Sep 2008 14:56:09 +0000 (UTC) (envelope-from raj@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 m87Eu96U092012 for ; Sun, 7 Sep 2008 14:56:09 GMT (envelope-from raj@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m87Eu9fF092001 for perforce@freebsd.org; Sun, 7 Sep 2008 14:56:09 GMT (envelope-from raj@freebsd.org) Date: Sun, 7 Sep 2008 14:56:09 GMT Message-Id: <200809071456.m87Eu9fF092001@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to raj@freebsd.org using -f From: Rafal Jaworowski To: Perforce Change Reviews Cc: Subject: PERFORCE change 149372 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, 07 Sep 2008 14:56:09 -0000 http://perforce.freebsd.org/chv.cgi?CH=149372 Change 149372 by raj@raj_mimi on 2008/09/07 14:55:12 Extend the infrastructure to accomodate for different SOC variants (Orion, Kirkwood, Discovery). - Update and improve registers/offsets definitions. - Improve the decode windows set-up layer to account for more integrated peripherals (IDMA, PCI, PCIE etc). - Extend the interrupt controller driver to work with all SOC flavours, adapt to varying number of IRQs, registers and other such differences between family members. - Introduce GPIO controller driver. - Extend the integrated timer driver to work with all SOC flavours, introduce watchdog(9) support. - Other minor cleanups and corrections. Obtained from: Marvell, Semihalf Affected files ... .. //depot/projects/arm/src/sys/arm/conf/DB-88F5XXX#5 edit .. //depot/projects/arm/src/sys/arm/mv/bus_space.c#2 edit .. //depot/projects/arm/src/sys/arm/mv/common.c#1 add .. //depot/projects/arm/src/sys/arm/mv/files.mv#2 edit .. //depot/projects/arm/src/sys/arm/mv/gpio.c#1 add .. //depot/projects/arm/src/sys/arm/mv/ic.c#4 edit .. //depot/projects/arm/src/sys/arm/mv/mv_machdep.c#2 edit .. //depot/projects/arm/src/sys/arm/mv/mvreg.h#2 edit .. //depot/projects/arm/src/sys/arm/mv/mvvar.h#2 edit .. //depot/projects/arm/src/sys/arm/mv/obio.c#4 edit .. //depot/projects/arm/src/sys/arm/mv/orion/db88f5xxx.c#3 edit .. //depot/projects/arm/src/sys/arm/mv/orion/orion.c#2 edit .. //depot/projects/arm/src/sys/arm/mv/orion/std.db88f5xxx#3 edit .. //depot/projects/arm/src/sys/arm/mv/timer.c#4 edit .. //depot/projects/arm/src/sys/conf/options.arm#28 edit .. //depot/projects/arm/src/sys/dev/uart/uart_cpu_mv.c#2 edit .. //depot/projects/arm/src/sys/dev/usb/ehci_mbus.c#4 edit Differences ... ==== //depot/projects/arm/src/sys/arm/conf/DB-88F5XXX#5 (text+ko) ==== @@ -8,6 +8,8 @@ ident DB-88F5XXX include "../mv/orion/std.db88f5xxx" +options SOC_MV_ORION + #makeoptions DEBUG=-g #Build kernel with gdb(1) debug symbols makeoptions WERROR="-Werror" ==== //depot/projects/arm/src/sys/arm/mv/bus_space.c#2 (text+ko) ==== @@ -41,7 +41,7 @@ #include /* - * Bus space functions for Marvell Orion SoC family + * Bus space functions for Marvell SoC family */ /* Prototypes for all the bus_space structure functions */ ==== //depot/projects/arm/src/sys/arm/mv/files.mv#2 (text+ko) ==== @@ -1,12 +1,11 @@ # $FreeBSD$ # -# The Marvell Feroceon core +# The Marvell CPU cores # - Compliant with V5TE architecture # - Super scalar dual issue CPU # - Big/Little Endian # - MMU/MPU # - L1 Cache: Supports streaming and write allocate -# 32/32 KB, Direct mapped IC / 4-Way DC # - Variable pipeline stages # - Out-of-order execution # - Branch Prediction @@ -19,9 +18,11 @@ arm/arm/irq_dispatch.S standard arm/mv/bus_space.c standard +arm/mv/common.c standard +arm/mv/gpio.c standard arm/mv/ic.c standard +arm/mv/mv_machdep.c standard arm/mv/obio.c standard -arm/mv/mv_machdep.c standard arm/mv/timer.c standard dev/mge/if_mge.c optional mge ==== //depot/projects/arm/src/sys/arm/mv/ic.c#4 (text+ko) ==== @@ -1,9 +1,9 @@ /*- * Copyright (c) 2006 Benno Rice. - * Copyright (C) 2007 MARVELL INTERNATIONAL LTD. + * Copyright (C) 2007-2008 MARVELL INTERNATIONAL LTD. * All rights reserved. * - * Adapted to Marvell Orion SoC family by Semihalf. + * Adapted and extended to Marvell SoCs by Semihalf. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -41,51 +41,70 @@ #include #include +#include -struct orion_ic_softc { +struct mv_ic_softc { struct resource * ic_res[1]; bus_space_tag_t ic_bst; bus_space_handle_t ic_bsh; + int ic_high_regs; + int ic_error_regs; }; -static struct resource_spec orion_ic_spec[] = { +static struct resource_spec mv_ic_spec[] = { { SYS_RES_MEMORY, 0, RF_ACTIVE }, { -1, 0 } }; -static struct orion_ic_softc *orion_ic_sc = NULL; +static struct mv_ic_softc *mv_ic_sc = NULL; -static int orion_ic_probe(device_t); -static int orion_ic_attach(device_t); +static int mv_ic_probe(device_t); +static int mv_ic_attach(device_t); -uint32_t orion_ic_get_micr(void); -uint32_t orion_ic_get_miimr(void); -void orion_ic_set_miimr(uint32_t); - +uint32_t mv_ic_get_cause(void); +uint32_t mv_ic_get_mask(void); +void mv_ic_set_mask(uint32_t); +uint32_t mv_ic_get_cause_hi(void); +uint32_t mv_ic_get_mask_hi(void); +void mv_ic_set_mask_hi(uint32_t); +uint32_t mv_ic_get_cause_error(void); +uint32_t mv_ic_get_mask_error(void); +void mv_ic_set_mask_error(uint32_t); static void arm_mask_irq_all(void); -static uint32_t arm_is_enabled_irq(uint32_t); static int -orion_ic_probe(device_t dev) +mv_ic_probe(device_t dev) { - device_set_desc(dev, "Interrupt Controller"); + device_set_desc(dev, "Marvell Integrated Interrupt Controller"); return (0); } static int -orion_ic_attach(device_t dev) +mv_ic_attach(device_t dev) { - int error; - struct orion_ic_softc *sc; + struct mv_ic_softc *sc; + uint32_t dev_id, rev_id; + int error; - sc = (struct orion_ic_softc *)device_get_softc(dev); + sc = (struct mv_ic_softc *)device_get_softc(dev); - if (orion_ic_sc != NULL) + if (mv_ic_sc != NULL) return (ENXIO); - orion_ic_sc = sc; + mv_ic_sc = sc; + + soc_id(&dev_id, &rev_id); + + sc->ic_high_regs = 0; + sc->ic_error_regs = 0; + + if (dev_id == MV_DEV_88F6281 || dev_id == MV_DEV_78100) + sc->ic_high_regs = 1; + + if (dev_id == MV_DEV_78100) + sc->ic_error_regs = 1; - error = bus_alloc_resources(dev, orion_ic_spec, sc->ic_res); + error = bus_alloc_resources(dev, mv_ic_spec, sc->ic_res); if (error) { device_printf(dev, "could not allocate resources\n"); return (ENXIO); @@ -94,41 +113,47 @@ sc->ic_bst = rman_get_bustag(sc->ic_res[0]); sc->ic_bsh = rman_get_bushandle(sc->ic_res[0]); - /* Mask all interrupts. */ + /* Mask all interrupts */ arm_mask_irq_all(); return (0); } -static device_method_t orion_ic_methods[] = { - DEVMETHOD(device_probe, orion_ic_probe), - DEVMETHOD(device_attach, orion_ic_attach), - +static device_method_t mv_ic_methods[] = { + DEVMETHOD(device_probe, mv_ic_probe), + DEVMETHOD(device_attach, mv_ic_attach), { 0, 0 } }; -static driver_t orion_ic_driver = { +static driver_t mv_ic_driver = { "ic", - orion_ic_methods, - sizeof(struct orion_ic_softc), + mv_ic_methods, + sizeof(struct mv_ic_softc), }; -static devclass_t orion_ic_devclass; +static devclass_t mv_ic_devclass; -DRIVER_MODULE(ic, mbus, orion_ic_driver, orion_ic_devclass, 0, 0); +DRIVER_MODULE(ic, mbus, mv_ic_driver, mv_ic_devclass, 0, 0); int arm_get_next_irq(void) { - int irq, nb; + int irq; + + irq = mv_ic_get_cause() & mv_ic_get_mask(); + if (irq) + return (ffs(irq) - 1); + + if (mv_ic_sc->ic_high_regs) { + irq = mv_ic_get_cause_hi() & mv_ic_get_mask_hi(); + if (irq) + return (ffs(irq) + 31); + } - irq = orion_ic_get_micr(); - while (irq != 0) { - nb = ffs(irq) - 1; - if (arm_is_enabled_irq(nb)) - return (nb); - else - irq &= ~(1 << nb); + if (mv_ic_sc->ic_error_regs) { + irq = mv_ic_get_cause_error() & mv_ic_get_mask_error(); + if (irq) + return (ffs(irq) + 63); } return (-1); @@ -138,7 +163,13 @@ arm_mask_irq_all(void) { - orion_ic_set_miimr(0); + mv_ic_set_mask(0); + + if (mv_ic_sc->ic_high_regs) + mv_ic_set_mask_hi(0); + + if (mv_ic_sc->ic_error_regs) + mv_ic_set_mask_error(0); } void @@ -146,9 +177,21 @@ { uint32_t mr; - mr = orion_ic_get_miimr(); - mr &= ~(1 << nb); - orion_ic_set_miimr(mr); + if (nb < 32) { + mr = mv_ic_get_mask(); + mr &= ~(1 << nb); + mv_ic_set_mask(mr); + + } else if ((nb < 64) && mv_ic_sc->ic_high_regs) { + mr = mv_ic_get_mask_hi(); + mr &= ~(1 << (nb - 32)); + mv_ic_set_mask_hi(mr); + + } else if ((nb < 96) && mv_ic_sc->ic_error_regs) { + mr = mv_ic_get_mask_error(); + mr &= ~(1 << (nb - 64)); + mv_ic_set_mask_error(mr); + } } void @@ -156,40 +199,91 @@ { uint32_t mr; - mr = orion_ic_get_miimr(); - mr |= (1 << nb); - orion_ic_set_miimr(mr); + if (nb < 32) { + mr = mv_ic_get_mask(); + mr |= (1 << nb); + mv_ic_set_mask(mr); + + } else if ((nb < 64) && mv_ic_sc->ic_high_regs) { + mr = mv_ic_get_mask_hi(); + mr |= (1 << (nb - 32)); + mv_ic_set_mask_hi(mr); + + } else if ((nb < 96) && mv_ic_sc->ic_error_regs) { + mr = mv_ic_get_mask_error(); + mr |= (1 << (nb - 64)); + mv_ic_set_mask_error(mr); + } +} + +void +mv_ic_set_mask(uint32_t val) +{ + + bus_space_write_4(mv_ic_sc->ic_bst, mv_ic_sc->ic_bsh, + IRQ_MASK, val); +} + +uint32_t +mv_ic_get_mask(void) +{ + + return (bus_space_read_4(mv_ic_sc->ic_bst, + mv_ic_sc->ic_bsh, IRQ_MASK)); +} + +uint32_t +mv_ic_get_cause(void) +{ + + return (bus_space_read_4(mv_ic_sc->ic_bst, + mv_ic_sc->ic_bsh, IRQ_CAUSE)); +} + +void +mv_ic_set_mask_hi(uint32_t val) +{ + + bus_space_write_4(mv_ic_sc->ic_bst, mv_ic_sc->ic_bsh, + IRQ_MASK_HI, val); +} + +uint32_t +mv_ic_get_mask_hi(void) +{ + + return (bus_space_read_4(mv_ic_sc->ic_bst, + mv_ic_sc->ic_bsh, IRQ_MASK_HI)); } -static uint32_t -arm_is_enabled_irq(uint32_t nb) +uint32_t +mv_ic_get_cause_hi(void) { - uint32_t mr; - mr = orion_ic_get_miimr(); - return (mr & (1 << nb)); + return (bus_space_read_4(mv_ic_sc->ic_bst, + mv_ic_sc->ic_bsh, IRQ_CAUSE_HI)); } void -orion_ic_set_miimr(uint32_t val) +mv_ic_set_mask_error(uint32_t val) { - bus_space_write_4(orion_ic_sc->ic_bst, orion_ic_sc->ic_bsh, - IRQ_MASK, val); + bus_space_write_4(mv_ic_sc->ic_bst, mv_ic_sc->ic_bsh, + IRQ_MASK_ERROR, val); } uint32_t -orion_ic_get_miimr(void) +mv_ic_get_mask_error(void) { - return (bus_space_read_4(orion_ic_sc->ic_bst, - orion_ic_sc->ic_bsh, IRQ_MASK)); + return (bus_space_read_4(mv_ic_sc->ic_bst, + mv_ic_sc->ic_bsh, IRQ_MASK_ERROR)); } uint32_t -orion_ic_get_micr(void) +mv_ic_get_cause_error(void) { - return (bus_space_read_4(orion_ic_sc->ic_bst, - orion_ic_sc->ic_bsh, IRQ_CAUSE)); + return (bus_space_read_4(mv_ic_sc->ic_bst, + mv_ic_sc->ic_bsh, IRQ_CAUSE_ERROR)); } ==== //depot/projects/arm/src/sys/arm/mv/mv_machdep.c#2 (text+ko) ==== @@ -243,10 +243,11 @@ VM_PROT_READ|VM_PROT_WRITE, PTE_CACHE); pmap_devmap_bootstrap(l1pagetable, pmap_devmap_bootstrap_table); - cpu_domains((DOMAIN_CLIENT << (PMAP_DOMAIN_KERNEL*2)) | DOMAIN_CLIENT); + cpu_domains((DOMAIN_CLIENT << (PMAP_DOMAIN_KERNEL * 2)) | + DOMAIN_CLIENT); setttb(kernel_l1pt.pv_pa); cpu_tlb_flushID(); - cpu_domains(DOMAIN_CLIENT << (PMAP_DOMAIN_KERNEL*2)); + cpu_domains(DOMAIN_CLIENT << (PMAP_DOMAIN_KERNEL * 2)); cninit(); memsize = platform_ramsize(); physmem = memsize / PAGE_SIZE; @@ -254,7 +255,7 @@ /* * Re-initialise decode windows */ - if (platform_decode_wins() != 0) + if (soc_decode_win() != 0) printf("WARNING: could not re-initialise decode windows! " "Running with existing settings...\n"); /* ==== //depot/projects/arm/src/sys/arm/mv/mvreg.h#2 (text+ko) ==== @@ -31,139 +31,326 @@ * $FreeBSD$ */ -#ifndef _ORIONREG_H_ -#define _ORIONREG_H_ +#ifndef _MVREG_H_ +#define _MVREG_H_ + +#include /* * Physical addresses of integrated SoC peripherals */ -#define ORION_PHYS_BASE 0xF1000000 -#define ORION_SIZE 0x100000 +#define MV_PHYS_BASE 0xF1000000 +#define MV_SIZE 0x100000 /* * Decode windows addresses (physical) */ -#define ORION_PCIE_IO_PHYS_BASE (ORION_PHYS_BASE + ORION_SIZE) -#define ORION_PCIE_IO_SIZE (1024 * 1024) -#define ORION_PCI_IO_PHYS_BASE (ORION_PCIE_IO_PHYS_BASE + ORION_PCIE_IO_SIZE) -#define ORION_PCI_IO_SIZE (1024 * 1024) +#define MV_PCIE_IO_PHYS_BASE (MV_PHYS_BASE + MV_SIZE) +#define MV_PCIE_IO_BASE MV_PCIE_IO_PHYS_BASE +#define MV_PCIE_IO_SIZE (1024 * 1024) +#define MV_PCI_IO_PHYS_BASE (MV_PCIE_IO_PHYS_BASE + MV_PCIE_IO_SIZE) +#define MV_PCI_IO_BASE MV_PCI_IO_PHYS_BASE +#define MV_PCI_IO_SIZE (1024 * 1024) -#define ORION_PCIE_MEM_PHYS_BASE (ORION_PCI_IO_PHYS_BASE + ORION_PCI_IO_SIZE) -#define ORION_PCIE_MEM_SIZE (64 * 1024 * 1024) -#define ORION_PCI_MEM_PHYS_BASE (ORION_PCIE_MEM_PHYS_BASE + ORION_PCIE_MEM_SIZE) -#define ORION_PCI_MEM_SIZE (64 * 1024 * 1024) +#define MV_PCIE_MEM_PHYS_BASE (MV_PCI_IO_PHYS_BASE + MV_PCI_IO_SIZE) +#define MV_PCIE_MEM_BASE MV_PCIE_MEM_PHYS_BASE +#define MV_PCIE_MEM_SIZE (64 * 1024 * 1024) +#define MV_PCI_MEM_PHYS_BASE (MV_PCIE_MEM_PHYS_BASE + MV_PCIE_MEM_SIZE) +#define MV_PCI_MEM_BASE MV_PCI_MEM_PHYS_BASE +#define MV_PCI_MEM_SIZE (64 * 1024 * 1024) /* XXX DEV_BOOT, CSx are board specific, should be defined per platform */ /* 512KB NOR FLASH */ -#define ORION_DEV_BOOT_PHYS_BASE (ORION_PCI_MEM_PHYS_BASE + ORION_PCI_MEM_SIZE) -#define ORION_DEV_BOOT_SIZE (512 * 1024) +#define MV_DEV_BOOT_PHYS_BASE (MV_PCI_MEM_PHYS_BASE + MV_PCI_MEM_SIZE) +#define MV_DEV_BOOT_SIZE (512 * 1024) /* CS0: 7-seg LED */ -#define ORION_DEV_CS0_PHYS_BASE 0xFA000000 -#define ORION_DEV_CS0_SIZE (1024 * 1024) /* XXX u-boot has 2MB */ +#define MV_DEV_CS0_PHYS_BASE 0xFA000000 +#define MV_DEV_CS0_SIZE (1024 * 1024) /* XXX u-boot has 2MB */ /* CS1: 32MB NOR FLASH */ -#define ORION_DEV_CS1_PHYS_BASE (ORION_DEV_CS0_PHYS_BASE + ORION_DEV_CS0_SIZE) -#define ORION_DEV_CS1_SIZE (32 * 1024 * 1024) +#define MV_DEV_CS1_PHYS_BASE (MV_DEV_CS0_PHYS_BASE + MV_DEV_CS0_SIZE) +#define MV_DEV_CS1_SIZE (32 * 1024 * 1024) /* CS2: 32MB NAND FLASH */ -#define ORION_DEV_CS2_PHYS_BASE (ORION_DEV_CS1_PHYS_BASE + ORION_DEV_CS1_SIZE) -#define ORION_DEV_CS2_SIZE 1024 /* XXX u-boot has 1MB */ +#define MV_DEV_CS2_PHYS_BASE (MV_DEV_CS1_PHYS_BASE + MV_DEV_CS1_SIZE) +#define MV_DEV_CS2_SIZE 1024 /* XXX u-boot has 1MB */ /* XXX this is probably not robust against wraparounds... */ -#if ((ORION_DEV_CS2_PHYS_BASE + ORION_DEV_CS2_SIZE) > 0xFFFEFFFF) +#if ((MV_DEV_CS2_PHYS_BASE + MV_DEV_CS2_SIZE) > 0xFFFEFFFF) #error Devices memory layout overlaps reset vectors range! #endif /* * Integrated SoC peripherals addresses */ -#define ORION_BASE ORION_PHYS_BASE /* VA == PA mapping */ -#define ORION_DDR_CADR_BASE (ORION_BASE + 0x1500) -#define ORION_MPP_BASE (ORION_BASE + 0x10000) -#define ORION_GPIO_BASE (ORION_BASE + 0x10100) -#define ORION_GPIO_SIZE 0x20 -#define ORION_TWSI_BASE (ORION_BASE + 0x11000) -#define ORION_TWSI_SIZE 0x20 -#define ORION_UART0_BASE (ORION_BASE + 0x12000) -#define ORION_UART1_BASE (ORION_BASE + 0x12100) -#define ORION_UART_SIZE 0x20 -#define ORION_MBUS_BRIDGE_BASE (ORION_BASE + 0x20000) -#define ORION_INTREGS_BASE (ORION_MBUS_BRIDGE_BASE + 0x80) -#define ORION_CPU_CONTROL_BASE (ORION_MBUS_BRIDGE_BASE + 0x100) -#define ORION_IC_BASE (ORION_MBUS_BRIDGE_BASE + 0x200) -#define ORION_IC_SIZE 0x20 -#define ORION_TIMERS_BASE (ORION_MBUS_BRIDGE_BASE + 0x300) -#define ORION_TIMERS_SIZE 0x30 -#define ORION_PCI_BASE (ORION_BASE + 0x30000) -#define ORION_PCI_SIZE 0x1000 -#define ORION_PCIE_BASE (ORION_BASE + 0x40000) -#define ORION_PCIE_SIZE 0x1000 -#define ORION_USB_BASE (ORION_BASE + 0x50000) -#define ORION_USB_SIZE 0x1000 -#define ORION_USB_HOST_OFST 0x0100 /* EHCI HC regs start at this offset within USB range */ -#define ORION_USB_AWR_BASE (ORION_USB_BASE + 0x320) -#define ORION_IDMA_BASE (ORION_BASE + 0x60000) -#define ORION_IDMA_SIZE 0x1000 -#define ORION_ETH_BASE (ORION_BASE + 0x70000) -#define ORION_ETH_SIZE 0x10000 -#define ORION_SATAHC_BASE (ORION_BASE + 0x80000) -#define ORION_SATAHC_SIZE 0x6000 +#define MV_BASE MV_PHYS_BASE /* VA == PA mapping */ +#define MV_DDR_CADR_BASE (MV_BASE + 0x1500) +#define MV_MPP_BASE (MV_BASE + 0x10000) +#define MV_GPIO_BASE (MV_BASE + 0x10100) +#define MV_GPIO_SIZE 0x20 +#define MV_RTC_BASE (MV_BASE + 0x10300) +#define MV_RTC_SIZE 0x08 +#define MV_TWSI_BASE (MV_BASE + 0x11000) +#define MV_TWSI_SIZE 0x20 +#define MV_UART0_BASE (MV_BASE + 0x12000) +#define MV_UART1_BASE (MV_BASE + 0x12100) +#define MV_UART_SIZE 0x20 +#define MV_MBUS_BRIDGE_BASE (MV_BASE + 0x20000) +#define MV_INTREGS_BASE (MV_MBUS_BRIDGE_BASE + 0x80) +#define MV_CPU_CONTROL_BASE (MV_MBUS_BRIDGE_BASE + 0x100) +#define MV_IC_BASE (MV_MBUS_BRIDGE_BASE + 0x200) +#if defined(SOC_MV_DISCOVERY) +#define MV_IC_SIZE 0x3C +#else +#define MV_IC_SIZE 0x20 +#endif +#define MV_TIMERS_BASE (MV_MBUS_BRIDGE_BASE + 0x300) +#define MV_TIMERS_SIZE 0x30 +#define MV_PCI_BASE (MV_BASE + 0x30000) +#define MV_PCI_SIZE 0x2000 +#define MV_PCIE_BASE (MV_BASE + 0x40000) +#define MV_PCIE_SIZE 0x2000 +#define MV_USB0_BASE (MV_BASE + 0x50000) +#define MV_USB1_BASE (MV_USB0_BASE + 0x1000) +#define MV_USB2_BASE (MV_USB0_BASE + 0x2000) +#define MV_USB_SIZE 0x1000 +#define MV_USB_HOST_OFST 0x0100 /* EHCI HC regs start at this offset within USB range */ +#define MV_USB_AWR_BASE (MV_USB0_BASE + 0x320) +#define MV_IDMA_BASE (MV_BASE + 0x60000) +#define MV_IDMA_SIZE 0x1000 +#define MV_XOR_BASE (MV_BASE + 0x60000) +#define MV_XOR_SIZE 0x1000 +#define MV_ETH0_BASE (MV_BASE + 0x72000) +#define MV_ETH1_BASE (MV_BASE + 0x76000) +#define MV_ETH_SIZE 0x2000 -#define ORION_DEV_CS0_BASE ORION_DEV_CS0_PHYS_BASE +#define MV_DEV_CS0_BASE MV_DEV_CS0_PHYS_BASE /* * Interrupt sources */ -#define ORION_INT_BRIDGE 0 /* AHB-MBus Bridge Interrupt */ -#define ORION_INT_UART0 3 /* UART0 Interrupt */ -#define ORION_INT_UART1 4 -#define ORION_INT_GPIO7_0 6 /* GPIO[7:0] Interrupt */ -#define ORION_INT_GPIO15_8 7 /* GPIO[15:8] Interrupt */ -#define ORION_INT_GPIO23_16 8 /* GPIO[23:16] Interrupt */ -#define ORION_INT_GPIO31_24 9 /* GPIO[31:24] Interrupt */ -#define ORION_INT_PEX0_ERR 10 /* PCI Express Error */ -#define ORION_INT_PEX0 11 /* PCI Express INTA,B,C,D Message */ -#define ORION_INT_PCI_ERR 15 /* PCI Error */ -#define ORION_INT_USB_BERR 16 /* USB Bridge Error */ -#define ORION_INT_USB_CI 17 /* USB Controller interrupt */ -#define ORION_INT_GBERX 18 /* GbE receive innterrupt */ -#define ORION_INT_GBETX 19 /* GbE transmit interrupt */ -#define ORION_INT_GBEMISC 20 /* GbE misc. interrupt */ -#define ORION_INT_GBESUM 21 /* GbE summary interrupt */ -#define ORION_INT_GBEERR 22 /* GbE error interrupt */ -#define ORION_INT_IDMA_ERR 23 /* DMA error interrupt */ -#define ORION_INT_IDMA0 24 /* IDMA channel 0 completion interrupt */ -#define ORION_INT_IDMA1 25 /* IDMA channel 1 completion interrupt */ -#define ORION_INT_IDMA2 26 /* IDMA channel 2 completion interrupt */ -#define ORION_INT_IDMA3 27 /* IDMA channel 3 completion interrupt */ -#define ORION_INT_SATA 29 /* Serial-ATA Interrupt */ +#if defined(SOC_MV_ORION) + +#define MV_INT_BRIDGE 0 /* AHB-MBus Bridge Interrupt */ +#define MV_INT_UART0 3 /* UART0 Interrupt */ +#define MV_INT_UART1 4 +#define MV_INT_GPIO7_0 6 /* GPIO[7:0] Interrupt */ +#define MV_INT_GPIO15_8 7 /* GPIO[15:8] Interrupt */ +#define MV_INT_GPIO23_16 8 /* GPIO[23:16] Interrupt */ +#define MV_INT_GPIO31_24 9 /* GPIO[31:24] Interrupt */ +#define MV_INT_PEX0_ERR 10 /* PCI Express Error */ +#define MV_INT_PEX0 11 /* PCI Express INTA,B,C,D Message */ +#define MV_INT_PCI_ERR 15 /* PCI Error */ +#define MV_INT_USB_BERR 16 /* USB Bridge Error */ +#define MV_INT_USB_CI 17 /* USB Controller interrupt */ +#define MV_INT_GBERX 18 /* GbE receive interrupt */ +#define MV_INT_GBETX 19 /* GbE transmit interrupt */ +#define MV_INT_GBEMISC 20 /* GbE misc. interrupt */ +#define MV_INT_GBESUM 21 /* GbE summary interrupt */ +#define MV_INT_GBEERR 22 /* GbE error interrupt */ +#define MV_INT_IDMA_ERR 23 /* DMA error interrupt */ +#define MV_INT_IDMA0 24 /* IDMA chan. 0 completion interrupt */ +#define MV_INT_IDMA1 25 /* IDMA chan. 1 completion interrupt */ +#define MV_INT_IDMA2 26 /* IDMA chan. 2 completion interrupt */ +#define MV_INT_IDMA3 27 /* IDMA chan. 3 completion interrupt */ +#define MV_INT_SATA 29 /* Serial-ATA Interrupt */ + +#elif defined(SOC_MV_KIRKWOOD) + +#define MV_INT_BRIDGE 1 /* AHB-MBus Bridge Interrupt */ +#define MV_INT_XOR0_CHAN0 5 /* XOR engine 0 channel 0 Interrupt */ +#define MV_INT_XOR0_CHAN1 6 /* XOR engine 0 channel 1 Interrupt */ +#define MV_INT_XOR1_CHAN0 7 /* XOR engine 1 channel 0 Interrupt */ +#define MV_INT_XOR1_CHAN1 8 /* XOR engine 1 channel 1 Interrupt */ +#define MV_INT_PEX0 9 /* PCI Express INTA,B,C,D Message */ +#define MV_INT_GBESUM 11 /* GbE0 summary interrupt */ +#define MV_INT_GBERX 12 /* GbE0 receive interrupt */ +#define MV_INT_GBETX 13 /* GbE0 transmit interrupt */ +#define MV_INT_GBEMISC 14 /* GbE0 misc. interrupt */ +#define MV_INT_GBE1SUM 15 /* GbE1 summary interrupt */ +#define MV_INT_GBE1RX 16 /* GbE1 receive interrupt */ +#define MV_INT_GBE1TX 17 /* GbE1 transmit interrupt */ +#define MV_INT_GBE1MISC 18 /* GbE1 misc. interrupt */ +#define MV_INT_USB_CI 19 /* USB Controller interrupt */ +#define MV_INT_SATA 21 /* Serial-ATA Interrupt */ +#define MV_INT_IDMA_ERR 23 /* DMA error interrupt */ +#define MV_INT_UART0 33 /* UART0 Interrupt */ +#define MV_INT_UART1 34 +#define MV_INT_GPIO7_0 35 /* GPIO[7:0] Interrupt */ +#define MV_INT_GPIO15_8 36 /* GPIO[15:8] Interrupt */ +#define MV_INT_GPIO23_16 37 /* GPIO[23:16] Interrupt */ +#define MV_INT_GPIO31_24 38 /* GPIO[31:24] Interrupt */ +#define MV_INT_GPIOHI7_0 39 /* GPIOHI[7:0] Interrupt */ +#define MV_INT_GPIOHI15_8 40 /* GPIOHI[15:8] Interrupt */ +#define MV_INT_GPIOHI23_16 41 /* GPIOHI[23:16] Interrupt */ +#define MV_INT_XOR0_ERR 42 /* XOR engine 0 error Interrupt */ +#define MV_INT_XOR1_ERR 43 /* XOR engine 1 error Interrupt */ +#define MV_INT_PEX0_ERR 44 /* PCI Express Error */ +#define MV_INT_GBEERR 46 /* GbE0 error interrupt */ +#define MV_INT_GBE1ERR 47 /* GbE1 error interrupt */ +#define MV_INT_USB_BERR 48 /* USB Bridge Error */ + +#elif defined(SOC_MV_DISCOVERY) + +#define MV_INT_ERRSUM 0 /* Summary of error interrupts */ +#define MV_INT_SPI 1 /* SPI interrupt */ +#define MV_INT_TWSI0 2 /* TWSI0 interrupt */ +#define MV_INT_TWSI1 3 /* TWSI1 interrupt */ +#define MV_INT_IDMA0 4 /* IDMA Channel0 completion */ +#define MV_INT_IDMA1 5 /* IDMA Channel0 completion */ +#define MV_INT_IDMA2 6 /* IDMA Channel0 completion */ +#define MV_INT_IDMA3 7 /* IDMA Channel0 completion */ +#define MV_INT_TIMER0 8 /* Timer0 interrupt */ +#define MV_INT_TIMER1 9 /* Timer1 interrupt */ +#define MV_INT_TIMER2 10 /* Timer2 interrupt */ +#define MV_INT_TIMER3 11 /* Timer3 interrupt */ +#define MV_INT_UART0 12 /* UART0 interrupt */ +#define MV_INT_UART1 13 /* UART1 interrupt */ +#define MV_INT_UART2 14 /* UART2 interrupt */ +#define MV_INT_UART3 15 /* UART3 interrupt */ +#define MV_INT_USB0 16 /* USB0 interrupt */ +#define MV_INT_USB1 17 /* USB1 interrupt */ +#define MV_INT_USB2 18 /* USB2 interrupt */ +#define MV_INT_CRYPTO 19 /* Crypto engine completion interrupt */ +#define MV_INT_XOR0 22 /* XOR engine 0 completion interrupt */ +#define MV_INT_XOR1 23 /* XOR engine 1 completion interrupt */ +#define MV_INT_SATA 26 /* SATA interrupt */ +#define MV_INT_PEX00 32 /* PCI Express port 0.0 INTA/B/C/D */ +#define MV_INT_PEX01 33 /* PCI Express port 0.1 INTA/B/C/D */ +#define MV_INT_PEX02 34 /* PCI Express port 0.2 INTA/B/C/D */ +#define MV_INT_PEX03 35 /* PCI Express port 0.3 INTA/B/C/D */ +#define MV_INT_PEX10 36 /* PCI Express port 1.0 INTA/B/C/D */ +#define MV_INT_PEX11 37 /* PCI Express port 1.1 INTA/B/C/D */ +#define MV_INT_PEX12 38 /* PCI Express port 1.2 INTA/B/C/D */ +#define MV_INT_PEX13 39 /* PCI Express port 1.3 INTA/B/C/D */ +#define MV_INT_GBESUM 40 /* Gigabit Ethernet Port 0 summary */ +#define MV_INT_GBERX 41 /* Gigabit Ethernet Port 0 Rx summary */ +#define MV_INT_GBETX 42 /* Gigabit Ethernet Port 0 Tx summary */ +#define MV_INT_GBEMISC 43 /* Gigabit Ethernet Port 0 Misc summ. */ +#define MV_INT_GBE1SUM 44 /* Gigabit Ethernet Port 1 summary */ +#define MV_INT_GBE1RX 45 /* Gigabit Ethernet Port 1 Rx summary */ +#define MV_INT_GBE1TX 46 /* Gigabit Ethernet Port 1 Tx summary */ +#define MV_INT_GBE1MISC 47 /* Gigabit Ethernet Port 1 Misc summ. */ +#define MV_INT_GPIO7_0 56 /* GPIO[7:0] Interrupt */ +#define MV_INT_GPIO15_8 57 /* GPIO[15:8] Interrupt */ +#define MV_INT_GPIO23_16 58 /* GPIO[23:16] Interrupt */ +#define MV_INT_GPIO31_24 59 /* GPIO[31:24] Interrupt */ +#define MV_INT_DB_IN 60 /* Inbound Doorbell Cause reg Summary */ +#define MV_INT_DB_OUT 61 /* Outbound Doorbell Cause reg Summ. */ +#define MV_INT_CRYPT_ERR 64 /* Crypto engine error */ +#define MV_INT_DEV_ERR 65 /* Device bus error */ +#define MV_INT_IDMA_ERR 66 /* DMA error */ +#define MV_INT_CPU_ERR 67 /* CPU error */ +#define MV_INT_PEX0_ERR 68 /* PCI-Express port0 error */ +#define MV_INT_PEX1_ERR 69 /* PCI-Express port1 error */ +#define MV_INT_GBE_ERR 70 /* Gigabit Ethernet error */ +#define MV_INT_USB_ERR 72 /* USB error */ +#define MV_INT_DRAM_ERR 73 /* DRAM ECC error */ +#define MV_INT_XOR_ERR 74 /* XOR engine error */ +#define MV_INT_WD 79 /* WD Timer interrupt */ + +#endif /* SOC_MV_ORION */ #define BRIDGE_IRQ_CAUSE 0x10 #define BRIGDE_IRQ_MASK 0x14 +#if defined(SOC_MV_DISCOVERY) +#define IRQ_CAUSE_ERROR 0x0 +#define IRQ_CAUSE 0x4 +#define IRQ_CAUSE_HI 0x8 +#define IRQ_MASK_ERROR 0xC +#define IRQ_MASK 0x10 +#define IRQ_MASK_HI 0x14 +#define IRQ_CAUSE_SELECT 0x18 +#define FIQ_MASK_ERROR 0x1C +#define FIQ_MASK 0x20 +#define FIQ_MASK_HI 0x24 +#define FIQ_CAUSE_SELECT 0x28 +#define ENDPOINT_IRQ_MASK_ERROR 0x2C +#define ENDPOINT_IRQ_MASK 0x30 +#define ENDPOINT_IRQ_MASK_HI 0x34 +#define ENDPOINT_IRQ_CAUSE_SELECT 0x38 +#else /* !SOC_MV_DISCOVERY */ #define IRQ_CAUSE 0x0 #define IRQ_MASK 0x4 #define FIQ_MASK 0x8 #define ENDPOINT_IRQ_MASK 0xC +#define IRQ_CAUSE_HI 0x10 +#define IRQ_MASK_HI 0x14 +#define FIQ_MASK_HI 0x18 +#define ENDPOINT_IRQ_MASK_HI 0x1C +#define IRQ_CAUSE_ERROR (-1) /* Fake defines for unified */ +#define IRQ_MASK_ERROR (-1) /* interrupt controller code */ +#endif #define BRIDGE_IRQ_CAUSE 0x10 #define IRQ_CPU_SELF 0x00000001 #define IRQ_TIMER0 0x00000002 #define IRQ_TIMER1 0x00000004 +#define IRQ_TIMER_WD 0x00000008 #define BRIDGE_IRQ_MASK 0x14 #define IRQ_CPU_MASK 0x00000001 #define IRQ_TIMER0_MASK 0x00000002 #define IRQ_TIMER1_MASK 0x00000004 +#define IRQ_TIMER_WD_MASK 0x00000008 /* * System reset */ #define RSTOUTn_MASK 0x8 +#define WD_RST_OUT_EN 0x00000002 #define SOFT_RST_OUT_EN 0x00000004 #define SYSTEM_SOFT_RESET 0xc #define SYS_SOFT_RST 0x00000001 /* + * Power Control + */ +#define CPU_PM_CTRL 0x1C +#define CPU_PM_CTRL_NONE 0 + +#if defined(SOC_MV_KIRKWOOD) +#define CPU_PM_CTRL_GE0 (1 << 0) +#define CPU_PM_CTRL_PEX0_PHY (1 << 1) +#define CPU_PM_CTRL_PEX0 (1 << 2) +#define CPU_PM_CTRL_USB0 (1 << 3) +#define CPU_PM_CTRL_SDIO (1 << 4) +#define CPU_PM_CTRL_TSU (1 << 5) +#define CPU_PM_CTRL_DUNIT (1 << 6) +#define CPU_PM_CTRL_RUNIT (1 << 7) +#define CPU_PM_CTRL_XOR0 (1 << 8) +#define CPU_PM_CTRL_AUDIO (1 << 9) +#define CPU_PM_CTRL_SATA0 (1 << 14) +#define CPU_PM_CTRL_SATA1 (1 << 15) +#define CPU_PM_CTRL_XOR1 (1 << 16) +#define CPU_PM_CTRL_CRYPTO (1 << 17) +#define CPU_PM_CTRL_GE1 (1 << 18) +#define CPU_PM_CTRL_TDM (1 << 19) +#elif defined(SOC_MV_DISCOVERY) +#define CPU_PM_CTRL_GE0 (1 << 1) +#define CPU_PM_CTRL_GE1 (1 << 2) +#define CPU_PM_CTRL_PEX00 (1 << 5) +#define CPU_PM_CTRL_PEX01 (1 << 6) +#define CPU_PM_CTRL_PEX02 (1 << 7) +#define CPU_PM_CTRL_PEX03 (1 << 8) +#define CPU_PM_CTRL_PEX10 (1 << 9) +#define CPU_PM_CTRL_PEX11 (1 << 10) +#define CPU_PM_CTRL_PEX12 (1 << 11) +#define CPU_PM_CTRL_PEX13 (1 << 12) +#define CPU_PM_CTRL_SATA0_PHY (1 << 13) +#define CPU_PM_CTRL_SATA0 (1 << 14) +#define CPU_PM_CTRL_SATA1_PHY (1 << 15) +#define CPU_PM_CTRL_SATA1 (1 << 16) +#define CPU_PM_CTRL_USB0 (1 << 17) +#define CPU_PM_CTRL_USB1 (1 << 18) +#define CPU_PM_CTRL_USB2 (1 << 19) +#define CPU_PM_CTRL_IDMA (1 << 20) +#define CPU_PM_CTRL_XOR (1 << 21) +#define CPU_PM_CTRL_CRYPTO (1 << 22) +#define CPU_PM_CTRL_DEVICE (1 << 23) +#endif + +/* * Timers */ #define CPU_TIMER_CONTROL 0x0 @@ -188,8 +375,26 @@ #define GPIO_INT_EDGE_MASK 0x18 #define GPIO_INT_LEV_MASK 0x1c -#define GPIO(n) (1 << n) -#define ORION_GPIO_NPINS 32 +#define GPIO_HI_DATA_OUT 0x40 +#define GPIO_HI_DATA_OUT_EN_CTRL 0x44 +#define GPIO_HI_BLINK_EN 0x48 +#define GPIO_HI_DATA_IN_POLAR 0x4c +#define GPIO_HI_DATA_IN 0x50 +#define GPIO_HI_INT_CAUSE 0x54 +#define GPIO_HI_INT_EDGE_MASK 0x58 +#define GPIO_HI_INT_LEV_MASK 0x5c + +#define GPIO(n) (1 << (n)) +#define MV_GPIO_MAX_NPINS 64 + +#define MV_GPIO_BLINK 0x1 +#define MV_GPIO_POLARITY 0x2 +#define MV_GPIO_EDGE 0x4 +#define MV_GPIO_LEVEL 0x8 + +#define IS_GPIO_IRQ(irq) ((irq) >= NIRQ && (irq) < NIRQ + MV_GPIO_MAX_NPINS) +#define GPIO2IRQ(gpio) ((gpio) + NIRQ) +#define IRQ2GPIO(irq) ((irq) - NIRQ) /* * MPP @@ -198,13 +403,28 @@ #define MPP_CONTROL1 0x04 #define MPP_CONTROL2 0x50 #define DEVICE_MULTIPLEX 0x08 + +#if defined(SOC_MV_ORION) #define SAMPLE_AT_RESET 0x10 +#elif defined(SOC_MV_KIRKWOOD) || defined(SOC_MV_DISCOVERY) +#define SAMPLE_AT_RESET 0x30 +#else +#error SOC_MV_XX not defined +#endif /* * Clocks */ +#ifdef SOC_MV_ORION #define TCLK_MASK 0x300 #define TCLK_SHIFT 0x8 +#elif defined(SOC_MV_KIRKWOOD) || defined(SOC_MV_DISCOVERY) +#define TCLK_MASK 0x30000 +#define TCLK_SHIFT 0x10 +#else +#error SOC_MV_XX not defined +#endif + #define TCLK_100MHZ 100000000 #define TCLK_125MHZ 125000000 #define TCLK_133MHZ 133333333 @@ -215,9 +435,106 @@ /* * Chip ID */ -#define ORION_ID_MV 0x11ab -#define ORION_ID_88F5181 0x5181 -#define ORION_ID_88F5182 0x5182 -#define ORION_ID_88F5281 0x5281 +#define MV_DEV_88F5181 0x5181 +#define MV_DEV_88F5182 0x5182 +#define MV_DEV_88F5281 0x5281 +#define MV_DEV_88F6281 0x6281 +#define MV_DEV_78100 0x6381 + +/* + * Decode windows definitions and macros + */ +#define MV_WIN_CPU_CTRL(n) (0x10 * (n) + 0x0) +#define MV_WIN_CPU_BASE(n) (0x10 * (n) + 0x4) +#define MV_WIN_CPU_REMAP_LO(n) (0x10 * (n) + 0x8) +#define MV_WIN_CPU_REMAP_HI(n) (0x10 * (n) + 0xc) +#define MV_WIN_CPU_MAX 8 + +#define MV_WIN_DDR_BASE(n) (0x8 * (n) + 0x0) +#define MV_WIN_DDR_SIZE(n) (0x8 * (n) + 0x4) +#define MV_WIN_DDR_MAX 4 + +#define MV_WIN_USB_CTRL(n) (0x10 * (n) + 0x0) +#define MV_WIN_USB_BASE(n) (0x10 * (n) + 0x4) +#define MV_WIN_USB_MAX 4 + +#define MV_WIN_ETH_BASE(n) (0x8 * (n) + 0x200) +#define MV_WIN_ETH_SIZE(n) (0x8 * (n) + 0x204) +#define MV_WIN_ETH_REMAP(n) (0x4 * (n) + 0x280) +#define MV_WIN_ETH_MAX 6 + +#define MV_WIN_IDMA_BASE(n) (0x8 * (n) + 0xa00) +#define MV_WIN_IDMA_SIZE(n) (0x8 * (n) + 0xa04) +#define MV_WIN_IDMA_REMAP(n) (0x4 * (n) + 0xa60) +#define MV_WIN_IDMA_CAP(n) (0x4 * (n) + 0xa70) +#define MV_WIN_IDMA_MAX 8 +#define MV_IDMA_CHAN_MAX 4 + +#define MV_WIN_PCIE_CTRL(n) (0x10 * (((n) < 5) ? (n) : (n) + 1) + \ + 0x1820) +#define MV_WIN_PCIE_BASE(n) (0x10 * (((n) < 5) ? (n) : (n) + 1) + \ + 0x1824) +#define MV_WIN_PCIE_REMAP(n) (0x10 * (((n) < 5) ? (n) : (n) + 1) + \ + 0x182C) +#define MV_WIN_PCIE_MAX 6 + +#define MV_PCIE_BAR(n) (0x04 * (n) + 0x1804) +#define MV_PCIE_BAR_MAX 3 + +#define WIN_REG_IDX_RD(pre,reg,off,base) \ + static __inline uint32_t \ + pre ## _ ## reg ## _read(int i) \ + { \ + return (bus_space_read_4(obio_tag, base, off(i))); \ + } + +#define WIN_REG_BASE_IDX_RD(pre,reg,off) \ + static __inline uint32_t \ + pre ## _ ## reg ## _read(uint32_t base, int i) \ + { \ + return (bus_space_read_4(obio_tag, base, off(i))); \ + } + +#define WIN_REG_IDX_WR(pre,reg,off,base) \ + static __inline void \ + pre ## _ ## reg ## _write(int i, uint32_t val) \ + { \ + bus_space_write_4(obio_tag, base, off(i), val); \ + } + +#define WIN_REG_BASE_IDX_WR(pre,reg,off) \ + static __inline void \ + pre ## _ ## reg ## _write(uint32_t base, int i, uint32_t val) \ + { \ + bus_space_write_4(obio_tag, base, off(i), val); \ + } + +#define WIN_REG_RD(pre,reg,off,base) \ + static __inline uint32_t \ + pre ## _ ## reg ## _read(void) \ + { \ + return (bus_space_read_4(obio_tag, base, off)); \ + } + +#define WIN_REG_BASE_RD(pre,reg,off) \ + static __inline uint32_t \ + pre ## _ ## reg ## _read(uint32_t base) \ >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sun Sep 7 16:53:14 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B2CEA1065670; Sun, 7 Sep 2008 16:53:14 +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 770CF1065673 for ; Sun, 7 Sep 2008 16:53:14 +0000 (UTC) (envelope-from rpaulo@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 541518FC12 for ; Sun, 7 Sep 2008 16:53:14 +0000 (UTC) (envelope-from rpaulo@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 m87GrEpg098973 for ; Sun, 7 Sep 2008 16:53:14 GMT (envelope-from rpaulo@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m87GrD6n098968 for perforce@freebsd.org; Sun, 7 Sep 2008 16:53:13 GMT (envelope-from rpaulo@FreeBSD.org) Date: Sun, 7 Sep 2008 16:53:13 GMT Message-Id: <200809071653.m87GrD6n098968@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rpaulo@FreeBSD.org using -f From: Rui Paulo To: Perforce Change Reviews Cc: Subject: PERFORCE change 149379 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, 07 Sep 2008 16:53:15 -0000 http://perforce.freebsd.org/chv.cgi?CH=149379 Change 149379 by rpaulo@rpaulo_phi on 2008/09/07 16:53:00 Add URL to the wiki. Affected files ... .. //depot/projects/soc2008/rpaulo-tcpad/README#4 edit Differences ... ==== //depot/projects/soc2008/rpaulo-tcpad/README#4 (text+ko) ==== @@ -13,4 +13,6 @@ The 'test' directory contains some test cases for tcpad. +Wiki page: http://wiki.freebsd.org/RuiPaulo/TCPAnomaly + -- Rui Paulo From owner-p4-projects@FreeBSD.ORG Sun Sep 7 19:10:39 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5C2FB10656F6; Sun, 7 Sep 2008 19:10: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 1FF4E10656F0 for ; Sun, 7 Sep 2008 19:10:39 +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 1BF8B8FC17 for ; Sun, 7 Sep 2008 19:10:39 +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 m87JAc8l081046 for ; Sun, 7 Sep 2008 19:10:38 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m87JAc2g081040 for perforce@freebsd.org; Sun, 7 Sep 2008 19:10:38 GMT (envelope-from imp@freebsd.org) Date: Sun, 7 Sep 2008 19:10:38 GMT Message-Id: <200809071910.m87JAc2g081040@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 149386 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, 07 Sep 2008 19:10:39 -0000 http://perforce.freebsd.org/chv.cgi?CH=149386 Change 149386 by imp@imp_lighthouse on 2008/09/07 19:09:48 Update based on changes to KB920X Affected files ... .. //depot/projects/arm/src/sys/arm/conf/TSC4370#21 edit Differences ... ==== //depot/projects/arm/src/sys/arm/conf/TSC4370#21 (text+ko) ==== @@ -1,5 +1,4 @@ -# KB920X -- Custom kernel configuration for the KB9200, 9201 and 9202 -# AT91RM9200 evaluation boards from kwikbyte.com. +# TSC4370 -- Custom kernel for an embedded timing board # # For more information on this file, please read the handbook section on # Kernel Configuration Files: @@ -17,20 +16,21 @@ # in NOTES. # # From: -# $FreeBSD: src/sys/arm/conf/KB920X,v 1.7 2006/06/17 23:34:59 imp Exp $ +# FreeBSD: head/sys/arm/conf/KB920X 182852 2008-09-07 18:55:55Z imp machine arm ident TSC4370 -options AT91_TSC +options AT91_TSC include "../at91/std.kb920x" -#To statically compile in device wiring instead of /boot/device.hints +# The AT91 platform doesn't use /boot/loader, so we have to statically wire +# hints. hints "hints.at91rm9200" hints "TSC4370.hints" #makeoptions DEBUG=-g #Build kernel with gdb(1) debug symbols -options DDB -options KDB +options DDB +options KDB options BREAK_TO_DEBUGGER options ALT_BREAK_TO_DEBUGGER @@ -42,11 +42,12 @@ #options UFS_ACL #Support for access control lists #options UFS_DIRHASH #Improve performance on big directories #options MD_ROOT #MD is a potential root device -#options MD_ROOT_SIZE=4096 # 4MB ram disk +#options MD_ROOT_SIZE=4096 # 4MB ram disk #options ROOTDEVNAME=\"ufs:md0\" options ROOTDEVNAME=\"ufs:/dev/mmcsd0s1a\" -#options NFSCLIENT #Network Filesystem Client +options NFSCLIENT #Network Filesystem Client #options NFSSERVER #Network Filesystem Server +#options NFSLOCKD #Network Lock Manager #options NFS_ROOT #NFS usable as /, requires NFSCLIENT #options BOOTP_NFSROOT #options BOOTP @@ -60,31 +61,24 @@ options SYSVMSG #SYSV-style message queues options SYSVSEM #SYSV-style semaphores options _KPOSIX_PRIORITY_SCHEDULING #Posix P1003_1B real-time extensions -options KBD_INSTALL_CDEV # install a CDEV entry in /dev -options NO_SYSCTL_DESCR +#options SYSCTL_OMIT_DESCR +# Disable the inlining of mutex, rwlock and sx locks. These eat up a lot +# of space. options MUTEX_NOINLINE +options RWLOCK_NOINLINE +options SX_NOINLINE options NO_FFS_SNAPSHOT options NO_SWAPPING - -device genclock +device random +device pty device loop -device random device ether -device pty device nexus device uart device ate device mii device lxtphy -# USB support -##device ohci # OHCI PCI->USB interface -##device usb # USB Bus (required) -##options USB_DEBUG -##device umass # Disks/Mass storage - Requires scbus and da -##device scbus # SCSI bus (required for SCSI) -##device da # Direct Access (disks) - # Debugging for use in -current #options INVARIANTS #Enable calls of extra sanity checking #options INVARIANT_SUPPORT #Extra sanity checks of internal structures, required by INVARIANTS @@ -93,27 +87,22 @@ device mem # Memory and kernel memory devices device md -#device at91_twi # TWI: Two Wire Interface -device at91_bbiic # TWI: Two Wire Interface, bit bang +device at91_twi # TWI: Two Wire Interface device at91_spi # SPI bridge support device at91_ssc device at91_tc -# MMC +# MMC/SD device at91_mci -device mmc # mmc/sd bus -device mmcsd # mmc/sd flash cards +device mmc +device mmcsd # iic device iic device iicbus device icee -device iicbb # SPI bus device spibus device at45d # at45db642 and maybe others -# The `bpf' device enables the Berkeley Packet Filter. -# Be aware of the administrative consequences of enabling this! -# Note that 'bpf' is required for DHCP. device bpf # Berkeley packet filter # Enable support for the kernel PLL to use an external PPS signal, From owner-p4-projects@FreeBSD.ORG Sun Sep 7 20:35:05 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 22FB11065675; Sun, 7 Sep 2008 20:35: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 DA0B1106566C for ; Sun, 7 Sep 2008 20:35:04 +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 D6D668FC1A for ; Sun, 7 Sep 2008 20:35:04 +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 m87KZ4Ur042416 for ; Sun, 7 Sep 2008 20:35:04 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m87KZ4rb042409 for perforce@freebsd.org; Sun, 7 Sep 2008 20:35:04 GMT (envelope-from hselasky@FreeBSD.org) Date: Sun, 7 Sep 2008 20:35:04 GMT Message-Id: <200809072035.m87KZ4rb042409@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 149389 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, 07 Sep 2008 20:35:05 -0000 http://perforce.freebsd.org/chv.cgi?CH=149389 Change 149389 by hselasky@hselasky_laptop001 on 2008/09/07 20:34:59 The musbotg hardware does not support inter-mixing 1-byte and 4-byte transfers, which means we have to use a bounce buffer for unaligned buffers. Re-factor DRQ API to be more generic. Affected files ... .. //depot/projects/usb/src/sys/dev/usb2/controller/musb2_otg.c#11 edit .. //depot/projects/usb/src/sys/dev/usb2/controller/musb2_otg.h#6 edit .. //depot/projects/usb/src/sys/dev/usb2/controller/musb2_otg_atmelarm.c#4 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb2/controller/musb2_otg.c#11 (text+ko) ==== @@ -431,15 +431,34 @@ if (buf_res.length > count) { buf_res.length = count; } - /* - * Compute the least number of bytes to the next buffer - * alignment address: - */ - temp = 4 - (USB_P2U(buf_res.buffer) & 3); + /* check for unaligned memory address */ + if (USB_P2U(buf_res.buffer) & 3) { + + temp = count & ~3; + + if (temp) { + /* receive data 4 bytes at a time */ + bus_space_read_multi_4(sc->sc_io_tag, sc->sc_io_hdl, + MUSB2_REG_EPFIFO(0), sc->sc_bounce_buf, + temp / 4); + } + temp = count & 3; + if (temp) { + /* receive data 1 byte at a time */ + bus_space_read_multi_1(sc->sc_io_tag, sc->sc_io_hdl, + MUSB2_REG_EPFIFO(0), + (void *)(&sc->sc_bounce_buf[count / 4]), temp); + } + usb2_copy_in(td->pc, td->offset, + sc->sc_bounce_buf, count); + /* update offset and remainder */ + td->offset += count; + td->remainder -= count; + break; + } /* check if we can optimise */ - if ((temp == 4) && - (buf_res.length >= 4)) { + if (buf_res.length >= 4) { /* receive data 4 bytes at a time */ bus_space_read_multi_4(sc->sc_io_tag, sc->sc_io_hdl, @@ -454,10 +473,6 @@ td->remainder -= temp; continue; } - /* minimise data transfer length */ - if (buf_res.length > temp) { - buf_res.length = temp; - } /* receive data */ bus_space_read_multi_1(sc->sc_io_tag, sc->sc_io_hdl, MUSB2_REG_EPFIFO(0), buf_res.buffer, buf_res.length); @@ -534,15 +549,34 @@ if (buf_res.length > count) { buf_res.length = count; } - /* - * Compute the least number of bytes to the next buffer - * alignment address: - */ - temp = 4 - (USB_P2U(buf_res.buffer) & 3); + /* check for unaligned memory address */ + if (USB_P2U(buf_res.buffer) & 3) { + + usb2_copy_out(td->pc, td->offset, + sc->sc_bounce_buf, count); + + temp = count & ~3; + if (temp) { + /* transmit data 4 bytes at a time */ + bus_space_write_multi_4(sc->sc_io_tag, sc->sc_io_hdl, + MUSB2_REG_EPFIFO(0), sc->sc_bounce_buf, + temp / 4); + } + temp = count & 3; + if (temp) { + /* receive data 1 byte at a time */ + bus_space_write_multi_1(sc->sc_io_tag, sc->sc_io_hdl, + MUSB2_REG_EPFIFO(0), + ((void *)&sc->sc_bounce_buf[count / 4]), temp); + } + /* update offset and remainder */ + td->offset += count; + td->remainder -= count; + break; + } /* check if we can optimise */ - if ((temp == 4) && - (buf_res.length >= 4)) { + if (buf_res.length >= 4) { /* transmit data 4 bytes at a time */ bus_space_write_multi_4(sc->sc_io_tag, sc->sc_io_hdl, @@ -557,10 +591,6 @@ td->remainder -= temp; continue; } - /* minimise data transfer length */ - if (buf_res.length > temp) { - buf_res.length = temp; - } /* transmit data */ bus_space_write_multi_1(sc->sc_io_tag, sc->sc_io_hdl, MUSB2_REG_EPFIFO(0), buf_res.buffer, buf_res.length); @@ -734,6 +764,32 @@ if (buf_res.length > count) { buf_res.length = count; } + /* check for unaligned memory address */ + if (USB_P2U(buf_res.buffer) & 3) { + + temp = count & ~3; + + if (temp) { + /* receive data 4 bytes at a time */ + bus_space_read_multi_4(sc->sc_io_tag, sc->sc_io_hdl, + MUSB2_REG_EPFIFO(td->ep_no), sc->sc_bounce_buf, + temp / 4); + } + temp = count & 3; + if (temp) { + /* receive data 1 byte at a time */ + bus_space_read_multi_1(sc->sc_io_tag, + sc->sc_io_hdl, MUSB2_REG_EPFIFO(td->ep_no), + ((void *)&sc->sc_bounce_buf[count / 4]), temp); + } + usb2_copy_in(td->pc, td->offset, + sc->sc_bounce_buf, count); + + /* update offset and remainder */ + td->offset += count; + td->remainder -= count; + break; + } #ifdef MUSB2_DMA_ENABLED if (td->dma_enabled) { /* @@ -755,9 +811,13 @@ sc->sc_rx_dma[td->ep_no].error = 0; /* start DMA job */ - musbotg_start_rxdma(sc->sc_rx_dma + td->ep_no, - buf_res.buffer, temp, td->ep_no); - + if (musbotg_start_rxdma(sc->sc_rx_dma[td->ep_no].dma_chan, + sc->sc_rx_dma + td->ep_no, buf_res.buffer, temp)) { + /* DMA failure */ + td->error = 1; + /* we are complete */ + return (0); + } /* * Pre-advance buffer pointers because the * USB chip will update its counters: @@ -772,15 +832,8 @@ } } #endif - /* - * Compute the least number of bytes to the next buffer - * alignment address: - */ - temp = 4 - (USB_P2U(buf_res.buffer) & 3); - /* check if we can optimise */ - if ((temp == 4) && - (buf_res.length >= 4)) { + if (buf_res.length >= 4) { /* receive data 4 bytes at a time */ bus_space_read_multi_4(sc->sc_io_tag, sc->sc_io_hdl, @@ -795,10 +848,6 @@ td->remainder -= temp; continue; } - /* minimise data transfer length */ - if (buf_res.length > temp) { - buf_res.length = temp; - } /* receive data */ bus_space_read_multi_1(sc->sc_io_tag, sc->sc_io_hdl, MUSB2_REG_EPFIFO(td->ep_no), buf_res.buffer, @@ -880,6 +929,32 @@ if (buf_res.length > count) { buf_res.length = count; } + /* check for unaligned memory address */ + if (USB_P2U(buf_res.buffer) & 3) { + + usb2_copy_out(td->pc, td->offset, + sc->sc_bounce_buf, count); + + temp = count & ~3; + + if (temp) { + /* transmit data 4 bytes at a time */ + bus_space_write_multi_4(sc->sc_io_tag, + sc->sc_io_hdl, MUSB2_REG_EPFIFO(td->ep_no), + sc->sc_bounce_buf, temp / 4); + } + temp = count & 3; + if (temp) { + /* receive data 1 byte at a time */ + bus_space_write_multi_1(sc->sc_io_tag, sc->sc_io_hdl, + MUSB2_REG_EPFIFO(td->ep_no), + ((void *)&sc->sc_bounce_buf[count / 4]), temp); + } + /* update offset and remainder */ + td->offset += count; + td->remainder -= count; + break; + } #ifdef MUSB2_DMA_ENABLED if (td->dma_enabled) { /* @@ -921,8 +996,13 @@ sc->sc_tx_dma[td->ep_no].error = 0; /* start DMA job */ - musbotg_start_txdma(sc->sc_tx_dma + td->ep_no, - buf_res.buffer, temp, td->ep_no); + if (musbotg_start_txdma(sc->sc_tx_dma[td->ep_no].dma_chan, + sc->sc_tx_dma + td->ep_no, buf_res.buffer, temp)) { + /* DMA failure */ + td->error = 1; + /* we are complete */ + return (0); + } return (1); /* wait for callback */ } } @@ -932,15 +1012,8 @@ } } #endif - /* - * Compute the least number of bytes to the next buffer - * alignment address: - */ - temp = 4 - (USB_P2U(buf_res.buffer) & 3); - /* check if we can optimise */ - if ((temp == 4) && - (buf_res.length >= 4)) { + if (buf_res.length >= 4) { /* transmit data 4 bytes at a time */ bus_space_write_multi_4(sc->sc_io_tag, sc->sc_io_hdl, @@ -955,10 +1028,6 @@ td->remainder -= temp; continue; } - /* minimise data transfer length */ - if (buf_res.length > temp) { - buf_res.length = temp; - } /* transmit data */ bus_space_write_multi_1(sc->sc_io_tag, sc->sc_io_hdl, MUSB2_REG_EPFIFO(td->ep_no), buf_res.buffer, @@ -1390,7 +1459,7 @@ * so there is no need for an * immediate DMA stop! */ - musbotg_stop_rxdma_async(ep_no); + musbotg_stop_rxdma_async(sc->sc_tx_dma[ep_no].dma_chan); } sc->sc_rx_dma[ep_no].complete = 0; sc->sc_rx_dma[ep_no].busy = 0; @@ -1412,7 +1481,7 @@ * so there is no need for an * immediate DMA stop! */ - musbotg_stop_txdma_async(ep_no); + musbotg_stop_txdma_async(sc->sc_tx_dma[ep_no].dma_chan); } sc->sc_tx_dma[ep_no].complete = 0; sc->sc_tx_dma[ep_no].busy = 0; @@ -1671,13 +1740,17 @@ if (ep_dir == UE_DIR_IN) { +#ifdef MUSB2_DMA_ENABLED /* check if we support DMA */ - if (musbotg_support_txdma(ep_no)) { + if (sc->sc_tx_dma_res[ep_no] != NULL) { temp = MUSB2_MASK_CSRH_TXDMAREQMODE | MUSB2_MASK_CSRH_TXDMAREQENA; } else { temp = 0; } +#else + temp = 0; +#endif /* Configure endpoint */ switch (ep_type) { @@ -1738,13 +1811,17 @@ } } else { +#ifdef MUSB2_DMA_ENABLED /* check if we support DMA */ - if (musbotg_support_rxdma(ep_no)) { + if (sc->sc_rx_dma_res[ep_no] != NULL) { temp = MUSB2_MASK_CSRH_RXDMAREQMODE | MUSB2_MASK_CSRH_RXDMAREQENA; } else { temp = 0; } +#else + temp = 0; +#endif /* Configure endpoint */ switch (ep_type) { @@ -2020,6 +2097,7 @@ musbotg_pull_down(sc); musbotg_clocks_off(sc); mtx_unlock(&sc->sc_bus.mtx); + return; } @@ -2975,17 +3053,19 @@ td->ep_no = ep_no; td->obj_next = last_obj; +#ifdef MUSB2_DMA_ENABLED /* check for DMA support */ if ((xfer->endpoint & (UE_DIR_IN | UE_DIR_OUT)) == UE_DIR_IN) { - if (musbotg_support_txdma(ep_no)) { + if (sc->sc_tx_dma_res[ep_no] != NULL) { td->dma_enabled = 1; } } else { - if (musbotg_support_rxdma(ep_no)) { + if (sc->sc_rx_dma_res[ep_no] != NULL) { td->dma_enabled = 1; } } +#endif last_obj = td; } parm->size[0] += sizeof(*td); ==== //depot/projects/usb/src/sys/dev/usb2/controller/musb2_otg.h#6 (text+ko) ==== @@ -294,6 +294,7 @@ struct musbotg_dma { struct musbotg_softc *sc; + uint32_t dma_chan; uint8_t busy:1; uint8_t complete:1; uint8_t error:1; @@ -367,8 +368,9 @@ #ifdef MUSB2_DMA_ENABLED struct musbotg_dma sc_rx_dma[16]; struct musbotg_dma sc_tx_dma[16]; + struct resource *sc_rx_dma_res[16]; + struct resource *sc_tx_dma_res[16]; #endif - struct resource *sc_io_res; struct resource *sc_irq_res; void *sc_intr_hdl; @@ -381,6 +383,7 @@ void *sc_clocks_arg; uint32_t sc_dma_align; /* DMA buffer alignment */ + uint32_t sc_bounce_buf[(1024 * 3) / 4]; /* bounce buffer */ uint8_t sc_ep_max; /* maximum number of RX and TX * endpoints supported */ @@ -405,19 +408,14 @@ void musbotg_interrupt(struct musbotg_softc *sc); #ifdef MUSB2_DMA_ENABLED -void musbotg_start_rxdma(void *arg, const void *dstaddr, uint32_t bytecount, uint32_t ep_no); -void musbotg_start_txdma(void *arg, const void *srcaddr, uint32_t bytecount, uint32_t ep_no); -void musbotg_stop_rxdma_async(uint32_t ep_no); -void musbotg_stop_txdma_async(uint32_t ep_no); +/* These functions needs to be implemented for your DMA controller */ +int musbotg_start_rxdma(uint32_t dma_chan, void *arg, const void *dstaddr, uint32_t bytecount); +int musbotg_start_txdma(uint32_t dma_chan, void *arg, const void *srcaddr, uint32_t bytecount); +uint32_t musbotg_get_dma_align(void); void musbotg_complete_dma_cb(void *arg, uint32_t is_error); -uint32_t musbotg_support_rxdma(uint32_t ep_no); -uint32_t musbotg_support_txdma(uint32_t ep_no); -uint32_t musbotg_get_dma_align(void); +void musbotg_stop_rxdma_async(uint32_t dma_chan); +void musbotg_stop_txdma_async(uint32_t dma_chan); -#else -#define musbotg_support_rxdma(...) 0 -#define musbotg_support_txdma(...) 0 -#define musbotg_get_dma_align(...) 0 #endif #endif /* _MUSB2_OTG_H_ */ ==== //depot/projects/usb/src/sys/dev/usb2/controller/musb2_otg_atmelarm.c#4 (text+ko) ==== @@ -65,16 +65,22 @@ static void musbotg_clocks_on(void *arg) { +#if 0 struct musbotg_super_softc *sc = arg; +#endif + return; } static void musbotg_clocks_off(void *arg) { +#if 0 struct musbotg_super_softc *sc = arg; +#endif + return; } @@ -92,6 +98,11 @@ int err; int rid; +#ifdef MUSB2_DMA_ENABLED + int temp; + +#endif + if (sc == NULL) { return (ENXIO); } @@ -107,6 +118,25 @@ USB_GET_DMA_TAG(dev), NULL)) { return (ENOMEM); } +#ifdef MUSB2_DMA_ENABLED + /* allocate all DMA channels */ + for (temp = 0; temp != 16; temp++) { + rid = temp; /* OUT endpoint */ + sc->sc_otg.sc_rx_dma_res[temp] = + bus_alloc_resource_any(dev, SYS_RES_DRQ, &rid, RF_ACTIVE); + if (sc->sc_otg.sc_rx_dma_res[temp]) { + sc->sc_otg.sc_rx_dma[temp].dma_chan = + rman_get_start(sc->sc_otg.sc_rx_dma_res[temp]); + } + rid = temp | 0x80; /* IN endpoint */ + sc->sc_otg.sc_tx_dma_res[temp] = + bus_alloc_resource_any(dev, SYS_RES_DRQ, &rid, RF_ACTIVE); + if (sc->sc_otg.sc_tx_dma_res[temp]) { + sc->sc_otg.sc_tx_dma[temp].dma_chan = + rman_get_start(sc->sc_otg.sc_tx_dma_res[temp]); + } + } +#endif rid = 0; sc->sc_otg.sc_io_res = bus_alloc_resource_any(dev, SYS_RES_MEMORY, &rid, RF_ACTIVE); @@ -172,6 +202,10 @@ device_t bdev; int err; +#ifdef MUSB2_DMA_ENABLED + int temp; + +#endif if (sc->sc_otg.sc_bus.bdev) { bdev = sc->sc_otg.sc_bus.bdev; device_detach(bdev); @@ -190,11 +224,26 @@ sc->sc_otg.sc_intr_hdl); sc->sc_otg.sc_intr_hdl = NULL; } +#ifdef MUSB2_DMA_ENABLED + /* free all DMA channels */ + for (temp = 0; temp != 16; temp++) { + if (sc->sc_otg.sc_rx_dma_res[temp]) { + bus_release_resource(dev, SYS_RES_DRQ, + temp, sc->sc_otg.sc_rx_dma_res[temp]); + } + if (sc->sc_otg.sc_tx_dma_res[temp]) { + bus_release_resource(dev, SYS_RES_DRQ, + temp | 0x80, sc->sc_otg.sc_tx_dma_res[temp]); + } + } +#endif + /* free IRQ channel, if any */ if (sc->sc_otg.sc_irq_res) { bus_release_resource(dev, SYS_RES_IRQ, 0, sc->sc_otg.sc_irq_res); sc->sc_otg.sc_irq_res = NULL; } + /* free memory resource, if any */ if (sc->sc_otg.sc_io_res) { bus_release_resource(dev, SYS_RES_MEMORY, 0, sc->sc_otg.sc_io_res); From owner-p4-projects@FreeBSD.ORG Sun Sep 7 22:14:46 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 668631065683; Sun, 7 Sep 2008 22:14: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 29FE6106567D for ; Sun, 7 Sep 2008 22:14:46 +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 29A0C8FC48 for ; Sun, 7 Sep 2008 22:14:46 +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 m87MEkDa030840 for ; Sun, 7 Sep 2008 22:14:46 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m87MEjj3030838 for perforce@freebsd.org; Sun, 7 Sep 2008 22:14:45 GMT (envelope-from sam@freebsd.org) Date: Sun, 7 Sep 2008 22:14:45 GMT Message-Id: <200809072214.m87MEjj3030838@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 149392 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, 07 Sep 2008 22:14:46 -0000 http://perforce.freebsd.org/chv.cgi?CH=149392 Change 149392 by sam@sam_ebb on 2008/09/07 22:13:52 hack a check for building against old hal versions Affected files ... .. //depot/projects/vap/sys/dev/ath/if_ath.c#92 edit Differences ... ==== //depot/projects/vap/sys/dev/ath/if_ath.c#92 (text+ko) ==== @@ -607,6 +607,7 @@ wmodes = ath_hal_getwirelessmodes(ah, ic->ic_regdomain.country); if (wmodes & (HAL_MODE_108G|HAL_MODE_TURBO)) ic->ic_caps |= IEEE80211_C_TURBOP; +#if HAL_ABI_VERSION > 0x06102600 /* XXX not exact but close enough */ if (wmodes & HAL_MODE_HT20) { /* XXX no capabilities for short GI */ ic->ic_htcaps |= IEEE80211_HTC_HT; @@ -616,6 +617,7 @@ ic->ic_htcaps |= IEEE80211_HTCAP_SHORTGI40; } } +#endif /* * Indicate we need the 802.11 header padded to a From owner-p4-projects@FreeBSD.ORG Mon Sep 8 08:52:40 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B2EC9106567A; Mon, 8 Sep 2008 08:52:40 +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 763F31065672 for ; Mon, 8 Sep 2008 08:52:40 +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 638AA8FC13 for ; Mon, 8 Sep 2008 08:52:40 +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 m888qesg046683 for ; Mon, 8 Sep 2008 08:52:40 GMT (envelope-from pgj@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m888qeDu046679 for perforce@freebsd.org; Mon, 8 Sep 2008 08:52:40 GMT (envelope-from pgj@FreeBSD.org) Date: Mon, 8 Sep 2008 08:52:40 GMT Message-Id: <200809080852.m888qeDu046679@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 149406 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, 08 Sep 2008 08:52:40 -0000 http://perforce.freebsd.org/chv.cgi?CH=149406 Change 149406 by pgj@kolbasz on 2008/09/08 08:52:02 IFC Affected files ... .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/faq/book.sgml#23 integrate .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/advanced-networking/chapter.sgml#14 integrate .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/introduction/chapter.sgml#9 integrate .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/mac/chapter.sgml#9 integrate .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/network-servers/chapter.sgml#11 integrate .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/security/chapter.sgml#12 integrate .. //depot/projects/docproj_hu/doc/share/pgpkeys/matteo.key#2 integrate .. //depot/projects/docproj_hu/www/en/internal/about.sgml#3 integrate .. //depot/projects/docproj_hu/www/en/internal/developer.sgml#2 integrate .. //depot/projects/docproj_hu/www/en/internal/ssh-keys.asc#2 integrate Differences ... ==== //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/faq/book.sgml#23 (text+ko) ==== @@ -20,7 +20,7 @@ A &os; Dokumentációs Projekt - $FreeBSD: doc/hu_HU.ISO8859-2/books/faq/book.sgml,v 1.1 2008/08/20 16:34:20 pgj Exp $ + $FreeBSD: doc/hu_HU.ISO8859-2/books/faq/book.sgml,v 1.2 2008/09/06 15:11:08 pgj Exp $ 1995 ==== //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/advanced-networking/chapter.sgml#14 (text+ko) ==== @@ -1,7 +1,7 @@ + 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 1024g/A040570C 2003-01-05 [expires: 2009-09-07] ]]> ==== //depot/projects/docproj_hu/www/en/internal/about.sgml#3 (text+ko) ==== @@ -1,6 +1,6 @@ - + ]> @@ -36,7 +36,7 @@

The Software

lighttpd fly light.

- These pages are served up by the fast, secure and flexible lighttpd webserver. In addition, there are a few locally crafted CGI scripts. Indexing of these pages and the mailing list archive are @@ -84,14 +84,17 @@ Build type + XX:23 + English www only, if no other build is running + + + XX:53 + + 01:22 Full build - 05:22 - English www only - - 09:22 English only @@ -103,10 +106,6 @@ 17:22 English only - - 21:22 - English www only -

The recent build status is available - + ]> @@ -48,7 +48,6 @@

  • FreeBSD Documentation Project
  • FreeBSD Release Engineering
    • -
  • PicoBSD
  • FreeBSD/Alpha Project
  • FreeBSD/IA-64 Project
  • FreeBSD/PPC Project
    • ==== //depot/projects/docproj_hu/www/en/internal/ssh-keys.asc#2 (text+ko) ==== @@ -1,60 +1,106 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 - These are the current SSH host public keys and fingerprints (generated using ssh-keygen -l) of the freebsd.org machines available to -committers. +committers. Note that some of these systems may be restricted so not +all committers can access them. This file has been signed by the FreeBSD Security Officer -, PGP Key ID 0x73D288A5. To obtain this -key, see ftp://ftp.FreeBSD.org/pub/FreeBSD/CERT/public_key.asc or your +, PGP Key ID 0xCA6CDFB2. To obtain this +key, see http://www.freebsd.org/security/so_public_key.asc or your favorite PGP keyserver (e.g. http://pgp.mit.edu). You should verify the signature before making use of this key information. The fingerprints are suitable for verification of a key at connection time (OpenSSH will prompt with the fingerprint upon encountering an unknown SSH host key), and the public keys can be added to your -~/.ssh/known_hosts2 file directly. +~/.ssh/known_hosts file directly. SSH2 Fingerprints: -1024 26:26:00:00:6b:69:d9:a1:a1:d1:61:4b:fa:72:75:18 axp0.freebsd.org -1024 90:ab:fb:9a:a7:d8:e9:64:0a:8c:1d:9e:7d:26:8d:c4 beast.freebsd.org -1024 22:bd:b9:9c:ad:57:13:cd:c9:79:47:1e:43:5a:7b:48 bento.freebsd.org -1024 89:e8:32:8f:e9:0a:2e:c1:02:e5:d8:19:ea:03:99:5b builder.freebsd.org -1024 b5:d5:f4:28:ac:d7:20:6c:98:7f:a8:d4:a3:9d:3c:bd freefall.freebsd.org -1024 4c:f5:69:00:fb:c5:e9:2b:8c:21:19:f1:3c:b0:12:1e ftp-master.freebsd.org -1024 2e:66:7a:55:fe:51:95:35:47:0e:27:f7:39:62:8c:71 hub.freebsd.org -1024 b7:39:a3:55:0b:81:a8:cc:e3:f6:3d:a9:3f:b2:d8:77 ncvs.freebsd.org -1024 89:ce:3f:b6:f2:23:8e:01:0e:a1:33:34:0c:88:65:6d panther.freebsd.org -1024 a8:92:a5:00:3e:eb:fb:2e:c5:02:6e:fd:28:e8:31:46 pluto1.freebsd.org -1024 a8:92:a5:00:3e:eb:fb:2e:c5:02:6e:fd:28:e8:31:46 pluto2.freebsd.org -1024 76:9e:70:2e:6f:93:64:1f:71:aa:06:7d:7d:5e:a1:d5 pointyhat.freebsd.org -1024 91:c9:2f:a0:8c:98:62:ec:64:92:e3:b5:ea:91:80:7a ref4.freebsd.org -1024 61:01:d2:1f:ef:d1:d1:40:94:ec:7e:06:2e:78:ed:9d sledge.freebsd.org -1024 09:ae:f1:48:e0:76:c6:e1:13:ff:2b:cb:20:40:38:d0 www.freebsd.org +1024 89:e8:32:8f:e9:0a:2e:c1:02:e5:d8:19:ea:03:99:5b builder.freebsd.org DSA +1024 4e:67:3a:f5:4b:bd:c1:70:11:b8:a0:f1:87:72:f9:ee builder.freebsd.org RSA +1024 b5:d5:f4:28:ac:d7:20:6c:98:7f:a8:d4:a3:9d:3c:bd freefall.freebsd.org DSA +1024 57:6a:21:ed:dc:ff:35:5a:63:2a:b3:be:24:aa:f9:e1 freefall.freebsd.org RSA +1024 4c:f5:69:00:fb:c5:e9:2b:8c:21:19:f1:3c:b0:12:1e ftp-master.freebsd.org DSA +1024 8d:d8:31:a1:d4:5b:c3:1c:65:47:ab:31:b0:e0:fc:d4 ftp-master.freebsd.org RSA +1024 2e:66:7a:55:fe:51:95:35:47:0e:27:f7:39:62:8c:71 hub.freebsd.org DSA +1024 c0:9f:1c:eb:7b:56:f1:7d:3c:d3:a9:e6:22:05:34:07 hub.freebsd.org RSA +1024 b7:39:a3:55:0b:81:a8:cc:e3:f6:3d:a9:3f:b2:d8:77 ncvsup.freebsd.org DSA +1024 de:10:99:ed:ad:5f:f7:87:9b:a7:81:9a:11:c3:1e:d2 ncvsup.freebsd.org RSA +1024 a8:92:a5:00:3e:eb:fb:2e:c5:02:6e:fd:28:e8:31:46 pluto1.freebsd.org DSA +1024 c4:42:31:7b:9d:52:97:52:ad:9a:68:77:fb:55:95:5f pluto1.freebsd.org RSA +1024 a2:21:a9:e6:a1:3c:97:0d:ad:a5:da:a7:b3:89:a9:16 pointyhat.freebsd.org DSA +2048 3c:07:08:d3:a4:98:01:58:79:37:bc:11:f1:eb:7c:63 pointyhat.freebsd.org RSA +1024 76:11:13:03:70:ab:54:f6:00:ce:86:ff:e2:77:08:31 ref4.freebsd.org DSA +1024 3c:cf:15:9e:95:be:dd:97:65:b7:92:5d:31:06:91:1c ref4.freebsd.org RSA +1024 bb:55:72:fc:fc:a7:a0:9a:6a:1a:54:86:49:94:2c:f3 ref6-amd64.freebsd.org DSA +2048 88:8e:3f:a8:53:70:0e:99:aa:62:14:70:6c:58:2e:aa ref6-amd64.freebsd.org RSA +1024 39:c3:a2:95:5a:05:e9:32:59:b3:d0:fd:8f:5a:75:6f ref6-i386.freebsd.org DSA +2048 29:7a:91:fc:f0:21:dd:26:1e:98:25:82:29:0b:83:60 ref6-i386.freebsd.org RSA +1024 29:85:c2:6c:ac:17:65:8c:22:91:3a:d2:4f:ac:5b:05 ref7-amd64.freebsd.org DSA +2048 cb:53:61:cc:a2:88:28:2d:79:a2:36:88:42:c7:25:7c ref7-amd64.freebsd.org RSA +1024 7f:16:3b:9f:fd:be:c4:3f:e7:df:bb:12:18:44:ba:96 ref7-i386.freebsd.org DSA +2048 b6:55:0e:f8:54:5a:43:2a:45:c5:24:ee:2e:32:6a:f7 ref7-i386.freebsd.org RSA +1024 eb:ad:ae:0f:13:59:f1:7d:c8:19:c7:bd:84:be:c0:a2 ref8-amd64.freebsd.org DSA +2048 18:df:4f:93:a7:e4:08:5b:98:e2:cc:33:9f:4e:0c:9f ref8-amd64.freebsd.org RSA +1024 cb:dd:d3:ef:18:da:69:ab:fc:d5:c0:bb:df:a2:d4:70 ref8-i386.freebsd.org DSA +2048 ec:ba:18:27:07:cf:ce:2f:34:33:93:c8:26:81:ea:9d ref8-i386.freebsd.org RSA +1024 b7:39:a3:55:0b:81:a8:cc:e3:f6:3d:a9:3f:b2:d8:77 repoman.freebsd.org DSA +1024 de:10:99:ed:ad:5f:f7:87:9b:a7:81:9a:11:c3:1e:d2 repoman.freebsd.org RSA +1024 b7:39:a3:55:0b:81:a8:cc:e3:f6:3d:a9:3f:b2:d8:77 sky.freebsd.org DSA +1024 de:10:99:ed:ad:5f:f7:87:9b:a7:81:9a:11:c3:1e:d2 sky.freebsd.org RSA +1024 8d:35:fb:99:ec:66:01:f3:5a:0d:f4:06:17:58:d2:0f svn.freebsd.org DSA +2048 56:bc:da:e8:c0:40:31:0b:a9:b2:2d:6b:19:24:3b:2c svn.freebsd.org RSA +1024 09:ae:f1:48:e0:76:c6:e1:13:ff:2b:cb:20:40:38:d0 www.freebsd.org DSA +1024 ea:c0:a6:4f:ad:a5:b8:10:f1:b6:41:9d:57:fd:8f:57 www.freebsd.org RSA +1024 2d:10:a3:db:dc:1f:5e:24:11:04:a9:8b:5c:34:a0:3f zoo.freebsd.org DSA +1024 f0:65:f7:7b:79:e6:d0:f7:49:5c:47:04:cb:c1:6f:4d zoo.freebsd.org RSA SSH2 Public keys: -axp0.freebsd.org ssh-dss AAAAB3NzaC1kc3MAAACBAMuPFlyZkrQbi+e32jV57l3FD+DvYbvDm5oARw3z86yo7X0JgTHDYU6+lhldkrrtFFDKfYD5IVM74uF5iGJcuV677AxB4XILy+00lm6Krim/oBpFCeeuUGHecmcLFjQxnfc72W0Ce0CGqv4ovx2c3R9VRFdQtEdMwdtP8v+91rmnAAAAFQCCXtHYaE9LR2Xe3v6XCQwG4otdvQAAAIB4u5o1jsQmjExu9UQ9QMQuGF9zCfi91Nfq+SWgZw6DC1uPCh0HH+0AveihLLR8twU2sbq7YxAuRHz1ffGqWj7dN1YwBy6y7r4xq8/MafTMoxhOT2RT4mGc3C+oB1zG277dwgB6zeDuxpxNyxEsmtcQ0d8zKLjXSffun4Y8x6O6YAAAAIEAuM43cx/vwm0wojBRMpUO9CKQ2/hmaMkCVN6M7XhvzfOhv96y+RBcVmB70w0roEC0ZYOy2Ct71DrOQkynrn7nzeX6TZ7YxKKOg01X+uluvsAp6LobvwOFVqeqptC+2wIMqfJd7XM2nlppifVivxqpgwhdeQztlSBU7dA7C/J4mDw= -beast.freebsd.org ssh-dss AAAAB3NzaC1kc3MAAACBAIAAyxxAfl9dAqv4yWt80Q6urmbS9/DutHPPCEbmeXA0J3DG/t/XYom8aK8Co0c3VTwu73ObuyifYAkGjBZSS3EA54ikTxUJnuUDoM/Izk03c9N6D8jp5tX9PyFFjtWzStbsV4pZCzOe4rHpgX667YvTUp1MQcthlbmfSmY3t/9fAAAAFQC0S6gc3cBmNNiB74+bMck0DEgyywAAAIAqxIJqu51vLcICYnAgTlt8DSgp74yEcyhLCwNKE5pYevs2ZETt4ivxeBpi9NTIw+vJRNyyVQL2V5XJfGf+bxfhp99Nf+noGEvmfwS7JKAIWF9ByF74JTgHN77ONhOtS0+NP7W5l2oGDzelT//zMlZn246eiY74V4kSIGsDPCN9MQAAAIARu4GYebk3UEvw0A2utLEuuks1aT/YUOI0E+Um6HhfkrYvg7/pWsj8mcybyh3+U/HZ1vV9nUDW+tHusOfh4SR27aPYubohXII05+m0HSidrO4xaOWf0jBlz77kj6pnfMZ/UNNCv1m37I5GL2O0rJSIrMFyoTR3AL/jq+sqfQE9Pg== -bento.freebsd.org ssh-dss AAAAB3NzaC1kc3MAAACBAIf5x7bOgFCFqoKFH0QamUgh9crQe4au76VzRvCuSBDwhojn7crE2vCmHlIfLjXKP2OZ/j5/k9ooXejmwwgzWZZDygqu+e1eGvaMFklWdxxvIAjkKb39LfY4OB4EswBxVu45Bn/atwkgdZ4YJB3m5ywhK+JySzhVDCVdaM8QRIaBAAAAFQDfPKbFP90xwn+ueKV+GUWWQMrI8QAAAIAGnyhQAxwM8EOczUiNV1J9bvyacD3sSq3KrS61nl7he8EOYCLLTfUVIJGEWDVDzjauoUjbP7yh6vR5E3TEgwDHBenEoxv9EHgoSkMjgIIllU/xwsdid+R9/oDtiKiJUWXX+LYGVGVGs22QuOlmJGWqlYCr5V2hSda3/K2xdkXLPwAAAIBFqA8jBu+SiyiV9nhBPY7EiMrEITp8xayVFa5j/q0WKtnromilTahVaY/Uq/6n/W8ZAQONori0gpnEW3yBvPVkhMkNcBzbp32t8sGinKlJuM6IzGcty/PV8qEz7N5I1xcJ9arCV7WdQPuJCUIs0B/QEusSaS9lcjxBH6+r59qTqQ== builder.freebsd.org ssh-dss AAAAB3NzaC1kc3MAAACBAJy3TD0mHyx4G3w6gYbBfWDEuRW0nD4i6J3K/o8nVDsTP7wnvb/s8/BZvZ+Rp986q7Z5oYodbYSFO+2EdDNdvKQGm5Edzfpf/wb0jf+1zTSu+ysqORWzmWT3bowisr91nnRf/SvIxSpRp1QVt7PhtQf5bTzQiBq0z9hMBDXZUaUVAAAAFQDPsW9+nilJFAL/qIbvNQT6JZXvXQAAAIAf+XgpLybLYE9l19/FOrSI0L9RqKymD3+S2+W1kJxTgRaFxCszOnR930wSag2MdRmaEz7c0uqIQLnkoVnwKio+j+7BNA+Qq4qUnReTLlWnwS5+iUyE2b0jJQNROBzmT0LNyLBff8D3LxCHQQZ7CsQLfIXDlADSWtrluHlzAhJmIwAAAIBi/2JgQaqhq68eGA7kmKcvr/ytwuKyUjIhtls9qD5xey2kMCgq07iAINirslmJX6NjSI/6/9r+8RXuygbLzroxQw0W8LsCR+WtGIPYt7haa9fNfmJxGOlYYa5Mmiep5V6BdL9qdlJ0M5A/W8urAONbmgIYf7rwgimujdQ1Ic8cEw== +builder.freebsd.org ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAIEAttCqkby39nf3lHk7xzNpxD1WUbCZo+0mvKSsAYGPbMKTHuPk3XmW1/OKcRN76RlPLM/pP6ceIQEvzWswoAr/lZj5wYOAZwKGC55m1mWgTlkG27MC9pNBSy+mHB3shGIgtuRdLz0b0uuYPvMJbPx3tTAnqYJUGmR0CvHQcM8rQzU= freefall.freebsd.org ssh-dss AAAAB3NzaC1kc3MAAACBAOrc9NdYhC/HaoEHXKb7Wg9xzDpiMpuy9plIjlUlqz3FuPldyDSOQAgxsFvBtb/GzwZunwxLQBb8HCGLx5uR+8bCEPoOD+fYcOI/olMv5wDcyXbab0+8f0E8v3rcAkz877p+upa2IFMk9VX2SKJ3WPacMskj/xUNX4T4YGvUGaUBAAAAFQCOuaDXoAi1bkBxXxctcrcKZSddUQAAAIAC4+ChjTUrDHwOfpoHjnCLwRHKJb+MdR6MhYr+9CYJwFYjB/5sC2GND9e1ACTGQAPN20v+qQXlGJD5utbVtA9yXA5V7hJIxdCy93BMNLu79dzNTSwIGA0HSugq7n4hwTYnULi4T7fEx70Hw9ZoSq5pKnarfP/bmkBN5/qbVZ66aQAAAIA877E5c023ircNiHXh2Fpe/PEm1qZDVb9O/wSisJcCcNggGz/ph+22hY4sOioHBjxhYmrR9XBG/shiPdVM8KgK25LOznk49F0tcM4YW7203lxUFycB1nHgvg3ihwjnlHumxDaIVAbIRJ4dKnZwcpC9sKCWvYI/NLX2KJ4LQ0cw1g== +freefall.freebsd.org ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAIEA6FpCVgwrxcHE5pGAP+RuSKG4ZbI5hpQpy8Zxo25iJgah9wSqgt67I4SDZRfbm86pkJgUJ6M4qCjpBV5oQCBkXWHDcNdKqL0Kwnw1RICucj9wYB6RkOwHLIz4fJJzq3mpWKr7YucClGE2+S/p19jSuacC8+WiTmDJy+729iSGSjE= ftp-master.freebsd.org ssh-dss AAAAB3NzaC1kc3MAAACBAIfzGATD1boyfeVpjmUXmu0fwNhM4vHTs8OFR25RhsRZ/UKklUZod2g4HgE0kJtYSK5ORUOO2iKVRpr5QFQEN7RnWis2rpqWoVv5KApcnW+/ynRc4z1Zn6lR9W99N/uIaYLs1KiqToMsGn0TbiprC2HAvrF3PZIwETVNtISvoQ/JAAAAFQCJIECEehh4g8AGAINvWV30yL5jVwAAAIBDuystVAnc/n/yvoxqJ69JBMqHbKLqWdMQJAjdJxS50NyHS4R+X+Zw+xrW+k2p25jTJ7dOdGsV988v10WWMgw5cYKzz9xRV1J441PEbsn5Sd36WITCQl/VRqBZhRZHJUiyZmQf0IA9DOOFN1XTB2wwvikuzK3qhIofR74sitayuQAAAIEAgykO0Y4pE/rPCqrdMY39pd71mV9pG9VD97aMWcOqcBEe17CqTazlHV+Ma3HvdI6tkMQi7a5yMOs6R7b/YJsZMbMyRpBPAF4fEEoAgiFy04gFlwpNS0bBv/1iXafjIXO/H3r31GAG0P4RFCObSDmw3gV1fyOb3Gt0e+5vvhTIaUQ= +ftp-master.freebsd.org ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAIEAwI6a4nc6kpJvwQyRwsk73BrAfuYEflUAGv/x7SViMHTuCA1Pl6AXb6arbjr1f4sX77F/VWv3QDXXr+qhBu7oYY3V7AWqkkA2O8uL7lG14pgAg8DFDbTkL25cBOx/WuwSzmDLGbDeNt5puUuQgmLc0qfZOhEEJHCfK9L8dJDqZKM= hub.freebsd.org ssh-dss AAAAB3NzaC1kc3MAAACBAM9dOErjUoOcA5FJE04QjobOmJFElaMoISTTWzitvREsx8MqGmyfWte4HDtqWbYGuahWG8UNKlAhOsx06EgDW8GBeK+POnvlde6wNbxxh+/BqLUpBOy9cP/2Yikyx0UZHCSxAVn5NQVbrCu05qUCvSWjNR83IsXDsZ7eQ0APsu4bAAAAFQCsR5notEUD5eMkBPjShRoDA9y3lQAAAIAfCCrWjCTA1GDAHtruAzJgwheyclktSbcj4mqfaJ5yrIeBBZzBVFCu78Pjwd1Cui0eQhqHqokleEV+ZrXO0c0CeIhzSDiVHpeQO+dpX5RxGVC81pEHTBojSn9WlKoq1Wt4cgrEJ5brW1goNcGIJvFXtmGIYXn6/p+I0+8ROKcROwAAAIAZqda8MjO51odH+/pDf1arhTxBzAKnrk6NsRfisR8VYkzl1XyOqsw73O24ooCzvpXMf8TbXNgkTSUxCYCxOJhYRkr5ZCKErxfS5Do/4aiVBGSQy4/pGfOFeHOB2zR61XL3lE9H9REXSKmmvc8kJ9addn4es/x/Lu2aXmsI2vUzIQ== -ncvs.freebsd.org ssh-dss AAAAB3NzaC1kc3MAAACBAIIqGeRirURWvcdTm3X8ORgNsyJhKxxozwXFea9Jadae2GUPqqFxmIbdEyQS7pOFXdFsjqXL6xQXRYad7x1R5v2N//R9iVq1c3JuWGuUECDtxCtqAChzj+dBt+0VBefGFtRjZBwvb4GL0CrMkwSUMj4xOsi9kFqHDvDF+jYsADTLAAAAFQD70/67rf/9xegwMyQyvbbiAb0GnQAAAIAgc0QgbN9rFCWKD9AqFLulPJsEVQPUWyKs2UwTZXFnVCTXg6hPf4Vo9ujxux4dAbQH26akddfR4wAZk/XQDjl13OKN89bJGbOHEVRgArcIqrdWJTmImbYCQmaY0egBPA/Qywh4dXPBUMxEnj3hJSyyIUoSArjo8y9NijxnWWpjigAAAIBag+NChmp1JNfAlOgguq1xp7KgVm6b9Wfo3weLFu6r4bxWV515hV4BFcpxrz/6x5QA73x/rxBVVQdlOSOZHE9OFssmRImE/ra4xn33/xWTHZXK9zRR2eLBsexxmCpKZs1/WkB80ObMD4rMy0zMkv6gS6WX8F90jbR6P7pHDWtjNA== -panther.freebsd.org ssh-dss AAAAB3NzaC1kc3MAAACBAOB0jJe3utPD3GolmtkvUy3oZiGsF7y12jo4aeQxk2guzw/lEKrGFzBl7kvL9F5u6WX8cnoWy6hhRSeT2CZaE/Znrsn7Mg/SKs93lUUk+xDHVeMCh+Jh+Qn5aFXZL+Vq1iuWVyY9+imr7IGhMCoNq4KG1XHvmW7WaMIH07z9mKpFAAAAFQCN0qmX9nkP/UNAGzW3hmRNXPCR6wAAAIBxwTE0oC7yWJ2hAIs4W3rgCYya8gTvYsFfTiHYxPvju1u4n9PFSGvG/jkAOje93QWOnz5BVZGNY1IS882+S5pQFx4W4fuuZ7RzuPVn7Zr8FD76+YYuv1DW2HelW07jO1zsqfYYdicos6MbohuxuRe6NYP2ZFcvTW3R0IFbTRGNyQAAAIEAy2xwmi9GtCphBfopxh58QUCA/Hhj2WvQ4cJ3ICzHE4F6+aKB5yJE657tI/nR2k7B9RuWNq0A+LYZV5mNriF1vsP8qAmqVheyVjnD3/zpELVsyJwncnUvMyIi7b+tCWdbWfT8gGXchG+FLwo6QEi6u8QbJGv+wrgR7vZziRoSmOs= +hub.freebsd.org ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAIEAqX8flNZcGufOtqeYTGcz9XMrmILk3deMPvD2LGg5V0FlFZj5uyEABIJFLQx13VX8kx0xOJz7XW69JRWWGo4TC1H3a+RfpsXyXWcUbH+HGicLyv1vCqc/n87OihNxwL1mdYgHdmNg8P6HvB/okdGjGq8YIdkUzEjz6v7SnLhogzU= +ncvsup.freebsd.org ssh-dss AAAAB3NzaC1kc3MAAACBAIIqGeRirURWvcdTm3X8ORgNsyJhKxxozwXFea9Jadae2GUPqqFxmIbdEyQS7pOFXdFsjqXL6xQXRYad7x1R5v2N//R9iVq1c3JuWGuUECDtxCtqAChzj+dBt+0VBefGFtRjZBwvb4GL0CrMkwSUMj4xOsi9kFqHDvDF+jYsADTLAAAAFQD70/67rf/9xegwMyQyvbbiAb0GnQAAAIAgc0QgbN9rFCWKD9AqFLulPJsEVQPUWyKs2UwTZXFnVCTXg6hPf4Vo9ujxux4dAbQH26akddfR4wAZk/XQDjl13OKN89bJGbOHEVRgArcIqrdWJTmImbYCQmaY0egBPA/Qywh4dXPBUMxEnj3hJSyyIUoSArjo8y9NijxnWWpjigAAAIBag+NChmp1JNfAlOgguq1xp7KgVm6b9Wfo3weLFu6r4bxWV515hV4BFcpxrz/6x5QA73x/rxBVVQdlOSOZHE9OFssmRImE/ra4xn33/xWTHZXK9zRR2eLBsexxmCpKZs1/WkB80ObMD4rMy0zMkv6gS6WX8F90jbR6P7pHDWtjNA== +ncvsup.freebsd.org ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAIEAyXkaSqC7bvMxUE2mlSxNXvzO8IRrFO/73UZFKkyPfeSifCgFHXMxKafxMXcfKDzjUwwaQ9BfUp1FzEB4sX2YtKmBvPMEJ6luKvbRPWKBtbh4kHLZkTyJipjmq2yf8sYpFOCdH21PmfuI7jceU7Av9/k/r+5xO6C/8HBmPOAhFo8= pluto1.freebsd.org ssh-dss AAAAB3NzaC1kc3MAAACBANi3AYBQPLbC3T2/OA1gTj2vlh6zlH2+fTT26hqbKNFnS9JiZnjhWQWtslQdWqXDLs7Z1ZWeMdJiyhgfq6GxHRlcb2U8toIfocZWXkMEr3OKWwQjJLv1ReNMlgCcvIZFowtNEiT+5InL8pDVO3H8lBMh813zZJBdUUs6AhEHULmjAAAAFQDqakqS6G75fk1mgsyRFOJ6PDIePQAAAIEA1oTgZr4o3C8A7q8V+xKzJaLtcUG3GZnpHmlMQzLCZkVCabnsS6NAqVA/wmUeuGnBATxfZ87sP5fed+FvuQtxQDCY3gxuZT3ydoZHiY+U0epChwl0qVZ2zies8O3QqoyqpcAWx73Y/BGnTpNTrrcMMp1U1lBxbrXgQbqDx1lbXC4AAACACTrNnCxlQlAmExzlQAlTNNeqdbADG9II94vj2fUCJNqlbwaKTHXbkC1xzYTo6CP7G0u3T7li0hzkeDoQhKETek+F4JGz7lHbddQtOHeS3Im+wVgc3k9mAkN8CnTeWr05LmEFFnfKiH7SNOxmQ/AvvB7DjK95Xg3VcOEvh86y87g= -pluto2.freebsd.org ssh-dss AAAAB3NzaC1kc3MAAACBANi3AYBQPLbC3T2/OA1gTj2vlh6zlH2+fTT26hqbKNFnS9JiZnjhWQWtslQdWqXDLs7Z1ZWeMdJiyhgfq6GxHRlcb2U8toIfocZWXkMEr3OKWwQjJLv1ReNMlgCcvIZFowtNEiT+5InL8pDVO3H8lBMh813zZJBdUUs6AhEHULmjAAAAFQDqakqS6G75fk1mgsyRFOJ6PDIePQAAAIEA1oTgZr4o3C8A7q8V+xKzJaLtcUG3GZnpHmlMQzLCZkVCabnsS6NAqVA/wmUeuGnBATxfZ87sP5fed+FvuQtxQDCY3gxuZT3ydoZHiY+U0epChwl0qVZ2zies8O3QqoyqpcAWx73Y/BGnTpNTrrcMMp1U1lBxbrXgQbqDx1lbXC4AAACACTrNnCxlQlAmExzlQAlTNNeqdbADG9II94vj2fUCJNqlbwaKTHXbkC1xzYTo6CP7G0u3T7li0hzkeDoQhKETek+F4JGz7lHbddQtOHeS3Im+wVgc3k9mAkN8CnTeWr05LmEFFnfKiH7SNOxmQ/AvvB7DjK95Xg3VcOEvh86y87g= -pointyhat.freebsd.org ssh-dss AAAAB3NzaC1kc3MAAACBAOwBSkPg5OPU60uei++UJ+o8j1xGD1IRhgLa92ACyBbR0E84Fuepyh9eeRkSuSwvNy5o62JjUenUE6GjPGJoZvXbTl7d4zoZMobswpIq5XOyCEb9Biatyi7VlX9rrdvqXufFynEo3UXn5uUkFx+EQNzlCHkfPM/ONwprFMEDIaMlAAAAFQDQ6tmKNA6sCk3IzV2dPuRgkxm7dQAAAIEAvkYTh+ejJnv1miza2UKGbIT2Z9Uay9q4sv9R6k6vYF10kxX1hTouqgS7I643jalSG3WGpa5vmLTn7T8GvriSEdBswT6MQxeUtEhCPXrWu9ajGI5W/y9mSqYdohFjqeZ3J6cjih3q1dhUhulJ5iQ25EXEGcN/dO5kIJEy425dLoUAAACBAJ7He/HDeUysa/GyWvp8qxvqycjAWysuBAGe6lQ6iNZqVVO9uY7NuGuqbbXM4AqjM+VTwg6geexM8z97jnN19VibGRQeNDIufEKn3hPWaM7Qu0I8q7xIh9GcSdEcs0hgtSCqTOsdll+7oltYWq5WWuGSyA/fG9wGm7fU4sZyVKoT -ref4.freebsd.org ssh-dss AAAAB3NzaC1kc3MAAACBAJ+dx+dJTYcv7LH6+u16/Kg/0MVzqzYNSC1Sn4V6dv+Z3xfEcw4f45Hca5iGCBKcq3OGusvngsdlE/x69E82x2/8oKMV3TOHwxf0D1vKQ8PiFiRsi4e5hhKKrGYzQ+8X2FYDa4bunHtPFd7Oj1nkXS89hmzWkIcvd3RxbQOejw9fAAAAFQD4Gc6Q7Ifb7/nwja6d/PKLycifSQAAAIA5ozESABfsAqHjnrO71BQagBAGb2X2X0wJQpZ7DRT3uj2/yAjpdiFV5o/YdVtDWsXLqKE9XaVday3zUjwJ0xu/5muaiGz2eqYi4FFlbyaLycMQfna/qrqv2YurhUaC3Naw3145IwgIAj/fpOdSC+laE+ypD6sFFXQ29as5Wt/MxgAAAIBfWyU1CqrTN2K2uk/s8Sp2dD2MnJWoi3Zo62SgeK9E6N+8DBQgUJIf0ZxUCxhmDFRD4SzSv47JrOF4VTJDBeq4rK6YeHA8LtZgE+DttiJ7XROR7FaNIDxrr5156FYdUB5MKqIPifxxaTtLr6AUFmquL2ddn1YSc+tSuoUHwnHmTA== -sledge.freebsd.org ssh-dss AAAAB3NzaC1kc3MAAACBAMUSHluJQ9ppCKufRTjUQgxP3x+TqnGH0fLm8hru7P67qlmYfrG2u5dzMOm7aMcoL58FACfUET9TbwBzLQlxu9sTGy6MOQ3Yy075VNx+WsbXz7JQ9XihbDy6e2VNa7UZ9N5MGLSKZS5HaKhTwB9pAdOufmPmteC/Wis6qsZKtjUdAAAAFQC3fbJCGfXlEJ9Bdn227GdRy3pIowAAAIBc0X0VW2NmFhlS3FHs42oG7fCdEd0pxUTYOu4/qcGsfczlOIhJ+E9Hpra3/jIt4poe6XubHjip0vjsUohsRXeUZAoM24n1Yu5dboapqcyiluUph2Km8i/+LN5FMJ0fYjmiFi79/lunic5mTjDchG/nOvlbeWWoi8KZ9cIQEgJ0hQAAAIEAlxNDhlrohrp4k3Sp3OgU/fqvCynlR2voccCqLdpgcNIqy8e0BjU0J47d1SDzYaWi0rgXd3lBII3wENpvs1gyljRWoK9WT4pCb68j96TgCDDZYgUN3oaC/E+5PKqIQ7PGkDEDoel5sQuS44JrhXTaHjhFitiUAfSNoqalanbI1gU= +pluto1.freebsd.org ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAIEA5iRSqagAStjJ5aAQ9cxMNqwDekYADrmpJT3TK8u7+gEl6jmrP7lM08eXua/BBE3HyHa8lHxsq0iBdY0HuCsEzJkKHGJFKnesbAN9ApD3srMStuBHqv0FQWa5f5wi9IL48/Np6ESvC2W6Fp+/go6ZTONq9V4BLcRLf/VxmTHFdk8= +pointyhat.freebsd.org ssh-dss AAAAB3NzaC1kc3MAAACBAIzVwhZARXA2qPdjoK6Gk7AR77po+0McweJID5G8ygtYSGlOPL2eo8ImjRSDGBoSvco+M+W9ywILg4GQbZg8H16H0KtyAsSSJSSPsUhmpBKVaR4GdUZL5RYHeWLkFn38MkYh+xq+hSiQ0dFxD2dHYP5/vrT5Y2BsikzbTZw72QYHAAAAFQCx+5P9JaAs+b0CjMjdz6yIUPFKEwAAAIAewmpv4g7GnrglnB3lYl6u5f6g1AZE57RXVgPP1yiMZbcanQMcmbyLM7Z0d3VLmsf1dDdBFpjCwNr+BRkIZvf/Qd421cXic7QCA3LsbOn/l80QLtptcsThNcflFx7C6dotIaxAwuotWh5ua/SNjuXOKcKokGQTiU8Xk9Nf336aTAAAAIBthZcOD3790vg8sXKa5qMnNyM6r2uy5LrafC0CYb3nyfXmgQ5AsuLVoveaxHrN43CK0IOWxK0ZUIR50G5e5EXl0CTBYhCWg1RfpvLWGJsJp8u/4WAZU2WatrbQZa1k72pIN1G57Vdo1c5Go4EQJ5f9GnefCcL8eGWJ8UO7mF7wiw== +pointyhat.freebsd.org ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEAznTEfpjGAkJDcaIT81KiA2dMF679LENIW0oPr/gAR5NDO/Qu6QsmU6ivv9qq0ktIjh71zqcZw61HIAURIIzqwWFqZ67dgtkWQ1a+aqYqN+LF+95fpya/aqUK3St0IGjP4a+GsHHqpWaYxi8TygnlKiuSMMkogmMBSXDJAHINTjFKbgPkjLwVxeo0Xpr/6+bLxbPJgCma6s+N9c1mo/vnhhMhGW+6OJ6TENUxWHhQUzE78VdyRGCouhsA5hpL8FcZn4bOiBwGX95nG65crKyaUFIgFIO37E+I8s3Mo6DdHic8uZicsnWwtI0jWHYipqJPrlmDimsVyWWjFYPN1C1rgQ== +ref4.freebsd.org ssh-dss AAAAB3NzaC1kc3MAAACBAMKfGgnucV3HUFE8vX+o65N+2RLxLZK8KGPOj7GT7O07wrXqdLXpI2f0ExYY5MiHdzQNFbUX2X1RqUvfWTt7nki68TXCDtOiZ7ysZlr71tq1BLhSFaKIS8NuU3uOQZwhqYY0FUu8Pmcd8DY62YUH92UccdXEmqOI9e7kkCfdA7NdAAAAFQCl6lPKF2RJYovs62feHBHhno+BMQAAAIEAlnrmTI2lgcrfmBLV320rIa4bvriZLetd4896++zhoIGr+9+dMQXla8FHJxek6jQU6fQkfQnko6mg7HdVfSA6bbVmNP4mGqliaAhhTSmiDRweQT4NA8gVLJXblx72OtZ/SUzUi8FPXLr6IymCJC2HO4GydcA+6/VMNcUK9/6sOcMAAACARUCuTjvCaqIYUNrLWi6KYSlox3f89iE2OXNGkTSWSZb1XV72aSveGk2uwYvzEEHYt3GK6LATRfGbSpQivuFYvage8/KhXOKQY39BrReacqwOz0z0dNo2zNwF7ni0hjTkrbh+419rWRTvWHEJqvPvUItOthaZguTIi0bHWRl7JSo= +ref4.freebsd.org ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAIEAwk1/3NTb2eId7m1lknKkiOeX1HjQmp1ZPK4kvR4awTPyexBimsNqZ4p3d6zJujAxf4W7Jx9CfEaAMcqYa73NYBBUSQBcFurtQrf4uuevGYGHuxgjmaDNUC00j3pMP83IQG4osCtlIuZ5IxnFY7vxEGifLRzf6DEAqOU1moA6Uqs= +ref6-amd64.freebsd.org ssh-dss AAAAB3NzaC1kc3MAAACBAJKQZcrHIUXY4NLJ8uSeY1SSiiqUSmtmhcoIvX69mCh8r9RMOrbXxopRfGIIQzmGKhwp40yF8ZVSrj0Fgd04QFyV5ggPom/C6gq4AfzHDXCiRS347Oygd3ROaRawB3rJzbReIGH4OI1wrEij2n4uZhvHnU87G/98kAB/awCrV/05AAAAFQCFzH3cmhP+HasDAYdvvDx5270fHwAAAIBxEsor3wcjwPXlxtPMgIrMgnh4SE6wfNI1IPcwlFnFub1D7c+q1PHZKd3DrgmewKR28pAF3TbOFAOKZjKAV9VifVAn9Sb4FUAiaPFqKYEP5zsF0AUrRSvwcOkMvDtdL83nmzK6mljFOTH5o0yiFD5QlVucbLxey0n6pIkfBl9I7gAAAIBg/zmsJ1S+OXsFE5T3LOY3zkzPFK3gaD/pfQiDRsKnQEA7W8sHDu9ChvGHVxq/r91bvB2aItey1LlvkldTpzqLSRfZ1jc0JB0D+mODnR/QD4ku9eL8YfiEhRzXbrduthuEmj3k7bbuRkVlI82Wrxu79AwSSsBnTZaSfkhq0MCN6A== +ref6-amd64.freebsd.org ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEA6MW7OzI9VbI/EAzsXelu34hSVMPHGMpAdwLhd7nwmkVOo5rNZitjsbT/hNZQvVm+sPe2dCV6mA+7vMKX160pdaURnZWx/NDDTlz607DD9RdUpZyB+h5crYmNxnHxrkWa8cfLSfmRdzzLpcOQYlJpUjcSMCOg8X5A38g7YouTADjBFo3sv9Fg3gpnZQXW5ib6K8rO3FTabZmXFm5DDellbwRrtZJNVG3JHcvUR5OvvC0YvUznBwdNE1oNaGbtEvMIGcMWfRNvqNSv7C9iRSFZhuRirVXleqqskaSse+R/61VcGCtilrnr8lSzKPQbwHz3XSzk8Fr+U4kn9KVkWGL0qw== +ref6-i386.freebsd.org ssh-dss AAAAB3NzaC1kc3MAAACBAJ9ogFNr9vNZVcsbtPNUwdDkN4P4naTpC50/Ch+giAzqtpYob5QF5PSDd7mizz9psbH0uuwosT3xKXovsXFKfVSxZ3rrOQg2VpRR/yyITrZ4rzUp+01/L7Q6ms+A1T1zWV6BCcdPSj/97y+zErcGOSnQ0bDyXpFwODKcBzRInAv7AAAAFQDyH+6diuoqIXeJcwBAlpR20smChwAAAIBs+TAkP1kfCmtdiJKR/rtEZ/8iTZ83m0Tf0JOvIhdx7UIINrF9A2XfJlFueadygtgzCIfzh5XrMChtzEBs+DwdIwp9xV9hKs4qUVKn0o8tWQ47htGhj6ap2HLiSjJrAVX+k5AXdexRhtWuU3VxzE1mraSXE1P/C2rE+Guyg6WY2QAAAIBs8sUMSJEyn47iq1JnAmn4uUxAbf+kHcYd15/AKrawTa7QAsHtc/NHVkxASvvTT+RHPK3Se/IR1yT0uclFSTjHB/njVR3jVX1PYTpSU2fzcvDp5wumS22IhmpRwwPk0+6Nz74UmwOt4Ja0E6mwN3CAqeCtL2t8BJU2iTC3zonjXw== +ref6-i386.freebsd.org ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEA7yTe+gWFIsWJVrF2cJmHTNN8c1AsGDD74cjNt6bbtJ8xjUqxBrpLCsX5UehJQIJ9BrpxaI0JbHnhu3CQ6/XWk2WOVkpppWcIueHFoYWBSnZw3yhDRxljDt2X6Wr/M4jL4RU5lvQuIah342ikn9HE20D0l4T5rg5e/mgwvrPdVoP+HgSbX5MZcLN8k9qpph2hD8IOG2bgPEVhXr8zG8y/ARmydAztd9b+HNvGFDol/vzruILDMnP9QewrCZQu155++f2JdwvepP1sIGZhkuNjZkwcU168jDWy/m36l1u6jx43YIe5V82zmK9QdKnl4Ny8QFHklHrnq+1U5F6kYlVVcQ== +ref7-amd64.freebsd.org ssh-dss AAAAB3NzaC1kc3MAAACBAMWjQCh45FWf4LRSGpEp9nqD1IzzRFx6egBYCWaSDGhy75Ail6oKOShGr324tB2+DnmsYN8ZDGpT3hvd5QEbPJxlb0nyaiNStWVAfKgqbqQ+eyM35GJpBt2Rv2Ha1p6DTpsdYJAoioeE4OIytGjuPZn0mcg0UlOJF8aABIgXOOk/AAAAFQD17/0rYYmGL5KZ/A6MTMPVSAOdkQAAAIA75RvP5kgSGe07a0iNoTcK25ejaIVnIRConAziTKgBX7IuUJM8q5uiM+II0WG7z8ruYhALUnU3wYqMqJ6/OVxU+3Nq3T2ZQeydzeJ1NbjMc/pyXBz5EoZ8p0qJ0a4+ZInpNxr/J+1dkl/3kJXm3n7LuAk05atAUvfYo/+qUz+ptQAAAIEApkHGAZi2nFBhydwavpTMPd2fenrU8+Dixb4fwdeqWm/HWmbNAXnO1vxCRj4FPFdpAseW01cB69iBefbf0SzTKZp1a+DEZ2Da3IbTEiuQ6kxw96wYwQ4u1lHAUAw+bx1N8LzLIGAQMEwOOLMtnWHStVCxtsYrakSodxtkwGZo3Us= +ref7-amd64.freebsd.org ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEAo/avbzE1KBLPOELjOUP5jFIDKaPRU/9Wfw7ao/unNswAiJfIsrW4LkoXFpOpdP8OpIh7Y9Om/WJhdh8zDE+BTyK9VGI9BijUz6aiVwA8zli1Ckg/A5k0tN3yVMjU4m5nkw2QtFbSnITaV/5C9ssRcbcrBzMIEFuda6qyk9rKQo1J6AaKcckVEyi4T2N4s51Yz+HHE8J/fR4/cOAth293sv9JzPgF5xW1FIGy+aoQUxPrdoGYlFhLotOslDQ1AnJmLve2LYoaZVLY5DdC5Q5ensU5nJnn2N2VoO1QHYWtQVsVfiz68W06ZFbMB9S7qpezk7b9NkXuMKhx0WxyaSmriQ== +ref7-i386.freebsd.org ssh-dss AAAAB3NzaC1kc3MAAACBAPrn2WeGi2iZfEjyYz4Ou0z8JhoD/8+v9lAJ0bqKzk4yDu2ur36QFC+nHjD/ZBitvsP7MrFZAUYyaRxIYFDFaiKm34fyXoMdrRLOrWFE18cQV1rgXwCDMzzEd+uzuMjsPl72Dr4py/NacK8yciiO5xrtDlNEzXwat7A35Bd7s86xAAAAFQCoeYrqVHHtxLu8VgX93lGrGfZBCwAAAIEAvtCCBeFXV1xEFvKgdDNxBsjeROYhtqQ48TcJzupQjisAqWh+EGXen0H360W2J3DEetyxWKvC24hmEB1FMQpaNzmagErX2JfAI6zbE6cnDpTmPWkmy3T4uvEj6eTmb7cCk76S1kCbw8NR9ag1eQR/rlJ02cHicAWoh52Ks9uKoPYAAACBALr+Ch3TnXdeY6FBpFKv361hC148kT4IgTpfsReRYLeMZ6HSN/7CISqRqrO+rxIhVX7jC2w9f6UFP/4mKlIPlJDlZrIIXch/l2+2bV+LOpAFpp5rNu2PsoYLej2OzyKFrxtbnzQ6UwOZa8vsjnIbzR1mj/19Xt/54YMyuOjhSzim +ref7-i386.freebsd.org ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEAurCZ1OOWaaarhMntNc7DKOsGJp71TPd0//Sidr+pRmSD1svsowEYmqIXN4k5rFFCxUdcf6mkqy/Dmcj1hwhX9W8HwctSSqyQMnKwwfXALQxr0TJT3rMIL5LMZY2nG6/e+b9i726+T4wsajFKXxu1vQDNLQgAuqKtPkFCI/wcKsY8e8xwEoay4SssUMY9xVoUVWAUehu8Aao/n1GUltfrL0MqZp2L402leE2kFPI5O/A98nRCQxSUVvRXQSaro/SvaExH3TGjQqvJmF49P318dskYVyttpugqMutSkI6Vpw5uTWXVAmnV9xo5BGWkroRGT3dt4zmzQvQ5gRqCozKezQ== +ref8-amd64.freebsd.org ssh-dss AAAAB3NzaC1kc3MAAACBAMoqa1g2tap6YXLtMdmgvGgZxLAWCmloKS8MILPEmu4raNj2IW31iR9cz24mXIWdJwfi3qrm9CLG5mfcxW6Sw13wIFEASJkg1+WIwrCiJmxTFx37Hr3B3x50hYyrogzQJ5NQwQxMKY9HhycMef0hrxuEIRLdD9VERp/GSidgQPJzAAAAFQCvYYcIqUSnj+97Mck8vZEagDAv5QAAAIBHZwohQEdENBzfVilg5wbG8Oh/quu8369Apmli8yXZ4rrGctgmiY6/oZ/6J2THU46eYoO2lqGMJj2A0FTENzSkvDa7xeSS296CiY0FlfSgKlWKzepAJqeUIiME2dYCeByiQC/28Bg66OdExi0lXt1rE0pMhLGXgyA0LyG0sFX+yQAAAIEAkunEnil9H/AbaIG9vKY2nXv5smHwnitCG3+JhjWDhl9caViLbR7D1XbmCluBlUBguaPz2GV9TFuLxrTbPEz4U7t66MyFl08JFrZraclC2vkh77+DXRoUsBdxPcPtab/QeQlJ/0j0ykn4L0cstk0SyCcP+mwmuplzl0xeha4/WlU= +ref8-amd64.freebsd.org ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEAxNquiXclLeacmYrxnqwfUl8a9nG7De/GY6ABs3huw9NByoMVorYozdXU+kmaokCTbBgIvHyehYwqvU35vcz3npmFr7ZldgF3TFcsudibyMDth623GBoympytBOhf/AOVq0SH0cgvR4ZjNy9gpnFgvp7OmFAKZdBm+qfT392QMYpRTYLT+ta/pIDgEOtGb+1eH5BsW5kQlldCL15TnBlCnvcSitR9HSXAIqkXSxafA19c0ONz3ryw46o/P6OZ8XeIM6FBt/eA2oz2tF6j94jtYrr/+Mp1Yn6iu9ux0mGO9rTghyM2D6ffuZMjBj8ijiUkVV1EtGZwUNq3jGC3mT+MSw== +ref8-i386.freebsd.org ssh-dss AAAAB3NzaC1kc3MAAACBAPNSQ+FvWoswDsE60irnYMFI7oXPP20qTkUJW7dX78yIifHbT51An1cyd9jw55btR1ayExIejVkWG/yaBjmePEP6zOoc2SXUuTe2WUS+uR2hI2WVOTdTG3HKWei16iG2eN+Bn9ElB8/M9505F3KxcKNBhpl6xpwG9UvfmCKVr5ghAAAAFQCdgSqWY1DuZGydz+aOILmqnJNtvQAAAIAogrUYF5NsXx/eZu6fXxmIb6MPcaSzwWfupITAfA8GnNfeANnTvbhhWncG8wSx4Cj1vmbOfLiTZC4Ojs8W51pi2/YKy4KK6Tb339qQH9j/4ZJ/k+17mbyBIs8S6nbcl4U1Gih90Qnz31QnxXj7X68PirE+2MP4lKLbsRX4+uJGWQAAAIBsXITebfTMBjKPlogoapOkSztkj29yVS0WTgEkCw1aV3/ZdCzmDW8Q0HWWYYO8vFoxv7mzfwNdFwriROcTJIVwP1Ssx0j6KTF5VUkh0Xqf2anHbF7iF0XY6qOdjHMQpyJYP7KbIzaraT2dRaA/uyyBD4rEU8jYW4KJST5OrmTcrw== +ref8-i386.freebsd.org ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEAyF32CpiDstCzDvkKJiPqfqJZLJWIvD3rKqepIPkcxpUk5CHG2OuYs2+gSOMeK7nX7clp9RchIEt3qgoO0FahWk/83OAlOGcfGpFcYJEb29ROyHqJIGY91GzGdfpHAACh2HybGHV/wXaLehTbsKdHkK7gWudN1OxDHKDCqxgc/8J5pKP7RZlbXBDH1cDhIy+ZPyngstaPkCLRKdh+h2Oqzg5v0joNIyv7HkYqGFeF8dsIx4gr5KXUqNGTT67eUC77yBpq2hKs3NgBShf/078BjZRWw/EnnxXSXIsaFLXuXvPjICqJ+G5yRj5je7vuZ6cdIGnsHCNr4C5JB+WyFW7Rww== +repoman.freebsd.org ssh-dss AAAAB3NzaC1kc3MAAACBAIIqGeRirURWvcdTm3X8ORgNsyJhKxxozwXFea9Jadae2GUPqqFxmIbdEyQS7pOFXdFsjqXL6xQXRYad7x1R5v2N//R9iVq1c3JuWGuUECDtxCtqAChzj+dBt+0VBefGFtRjZBwvb4GL0CrMkwSUMj4xOsi9kFqHDvDF+jYsADTLAAAAFQD70/67rf/9xegwMyQyvbbiAb0GnQAAAIAgc0QgbN9rFCWKD9AqFLulPJsEVQPUWyKs2UwTZXFnVCTXg6hPf4Vo9ujxux4dAbQH26akddfR4wAZk/XQDjl13OKN89bJGbOHEVRgArcIqrdWJTmImbYCQmaY0egBPA/Qywh4dXPBUMxEnj3hJSyyIUoSArjo8y9NijxnWWpjigAAAIBag+NChmp1JNfAlOgguq1xp7KgVm6b9Wfo3weLFu6r4bxWV515hV4BFcpxrz/6x5QA73x/rxBVVQdlOSOZHE9OFssmRImE/ra4xn33/xWTHZXK9zRR2eLBsexxmCpKZs1/WkB80ObMD4rMy0zMkv6gS6WX8F90jbR6P7pHDWtjNA== +repoman.freebsd.org ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAIEAyXkaSqC7bvMxUE2mlSxNXvzO8IRrFO/73UZFKkyPfeSifCgFHXMxKafxMXcfKDzjUwwaQ9BfUp1FzEB4sX2YtKmBvPMEJ6luKvbRPWKBtbh4kHLZkTyJipjmq2yf8sYpFOCdH21PmfuI7jceU7Av9/k/r+5xO6C/8HBmPOAhFo8= +sky.freebsd.org ssh-dss AAAAB3NzaC1kc3MAAACBAIIqGeRirURWvcdTm3X8ORgNsyJhKxxozwXFea9Jadae2GUPqqFxmIbdEyQS7pOFXdFsjqXL6xQXRYad7x1R5v2N//R9iVq1c3JuWGuUECDtxCtqAChzj+dBt+0VBefGFtRjZBwvb4GL0CrMkwSUMj4xOsi9kFqHDvDF+jYsADTLAAAAFQD70/67rf/9xegwMyQyvbbiAb0GnQAAAIAgc0QgbN9rFCWKD9AqFLulPJsEVQPUWyKs2UwTZXFnVCTXg6hPf4Vo9ujxux4dAbQH26akddfR4wAZk/XQDjl13OKN89bJGbOHEVRgArcIqrdWJTmImbYCQmaY0egBPA/Qywh4dXPBUMxEnj3hJSyyIUoSArjo8y9NijxnWWpjigAAAIBag+NChmp1JNfAlOgguq1xp7KgVm6b9Wfo3weLFu6r4bxWV515hV4BFcpxrz/6x5QA73x/rxBVVQdlOSOZHE9OFssmRImE/ra4xn33/xWTHZXK9zRR2eLBsexxmCpKZs1/WkB80ObMD4rMy0zMkv6gS6WX8F90jbR6P7pHDWtjNA== +sky.freebsd.org ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAIEAyXkaSqC7bvMxUE2mlSxNXvzO8IRrFO/73UZFKkyPfeSifCgFHXMxKafxMXcfKDzjUwwaQ9BfUp1FzEB4sX2YtKmBvPMEJ6luKvbRPWKBtbh4kHLZkTyJipjmq2yf8sYpFOCdH21PmfuI7jceU7Av9/k/r+5xO6C/8HBmPOAhFo8= +svn.freebsd.org ssh-dss AAAAB3NzaC1kc3MAAACBAJut1BGViW/QBjdqJSIwa1/dtpATKCMYd01HsJfvYOZ6CSbnqN9BNU/eJdVZmN8/m13LR7leFMWPUS1EW4DJan91A3PbiAfRQWz3H5JxYcsk6DGrL57ot3AHwbysAtgJtv/82crGEF8lQKYuvEfgHaUKmpKTjRHTU93MVUb8nwJhAAAAFQCih4RXOd6mLYr5+7poh9KljKZe7wAAAIAWZQLr0tJKcfxW6xEHLe5umW1ZrCkCgveWbRGGOYSWSOdTeDS5//0ZqpPbNQTrM9aYZd/RsF4K+44j+O6KsPlCSwKA6K2IxyY0tBHxLhxaLG0hM/pqtFHFrFwWJjC+YTZ4yM1r/GQb5oThawPDC4YeWD9Mwvwvs3PR7b2ReewHyQAAAIAWaREC4ORld4brL2tCeNp2ky8IkkrubrnXIscQeyHCLOZg9y05UAKrIUvjIM0pJXV8rzVcZ/oN0huN/r8tmu1S7PfpA07bF7lXTXU0+onEpMOxWgk3ETB601wp8BKX4ZJlIxBKyz4XjSnNsgvRkHMvkaf9VSx8q2IL61/DleoR2g== +svn.freebsd.org ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEAvnPw8T77uwTMJJTakmWoSA89AtZRi/X5zAFCmfuG9QlofyRa23ktqP0fOxMmFARXRvbVr3pozEl/AP14CZbTxWZYwHAphZd0EcEYgDiW/N75t/ilywWHPXp/IiYQLLL3xeHxNyTNEiodcCLCVUufPyFGfaeBrUw2r3PKNZ7ZwW0UofbbSytJHsk8UVxpjS3RFjxB3daRjrMc/df7xIBPr61bhfxKR+C42K8qX9TqATTFoV9ngNafcfiPRzB9OLZ8sJwLjaV1Tc1lDjUr0nSbcRMr690yQ96O7e+eklze6ocSiglbqtpenPN430Ru0YnDP23u/k2CLHPo3hszHfmCDw== www.freebsd.org ssh-dss AAAAB3NzaC1kc3MAAACBAPo6h43vA5HH8SGuNIrZFkSciu6jOrbGy+oxDAB8EPxncGlix7WHYkupqI7ZWuTAzrnDT9oJGUwGywwrl4Qh4wo1J25pwkYfcTk6TNiIyXmDbrcfMmgj+fcsukHtTKZvsMqPT299jpFVa+rNPYMD9i942keCI+SmvlMAC+s+p1cBAAAAFQD4Ct3IHJ0Ha9raL36UDkaTsr1UzwAAAIBH8CJBtMwrJGC1Z5/FNIyoX23X9jzSvkKIOr/KQ9UOcWTWY2jmsnptTWi2dY6T3O3Q4aKbelF9AcVYWPuSxeaa4v/xidO0+Vc2o1AP1w6vVEatElBUx5cMfNZ/aTGdE7ezrKXNeVzjlO3jwl/ceJIvqEGdyCcoHdJ7LiPxXJq6LwAAAIA1rjmXzbuOUbjRkQsUXUERl7XONPkrMyIcfPXSJxn7qDXQIv/4haEhqK5stu/LPmondnJzOVYF6iBCGp/0d0i306UpK9pv7K0Ewe7oLqZhduh/Ws3541CkVBJ+axhifsI3xzM/GhqUBd4O32o9Fguu5l/vGKalYPbXBVsDKl2r/Q== +www.freebsd.org ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAIEAzl7OghF2iE9mu1bQEDGxg7i7nX8E5EAM4LLzXh6+ElqwPEfdwiJwej2PR1dePKH6jHMIoXp10HPfcL5nqEc7hqt3ftW1/47MvordlapLV0oiYC6dsIN9OfgbU0PATYcaD4sQB+C6yKbXTaaYeBbdo2IKgdJi1NhUjtXYAO6cJtU= +zoo.freebsd.org ssh-dss AAAAB3NzaC1kc3MAAACBAIH0U+SOGnwWHUTSkUBk6LlpvWDSBC27pmP9iTsbIZRHMVDxVzaQ5cTTgsf3qp+xr5bk4Cpth86izBp98D+YqbEWt5sCCLmiPPCM/GZRGwGKUsAvpRtLXBJGEJTrOFndzb4f/gEAMHV/h3pdD9JidsBI/X93qSEUt4OhVjJf7eWdAAAAFQD5eQHFTtJ1OAQM69EZMzGC131JHQAAAIEAgGvbBh58U5RpPBN88T0nzSUI+nEF68jU7+gd2iU9lZpcDENZpbC0NenGphCX9nzbeR1a60hxsHcFNJNcpoQD02Xy3vNhJXzHYE0gir2YPtQhpwkZ8Nkez5bLEt/JUlpKfTxQW6nhzRY5LE582UpW5OqxtCePk4eBXi4ni/eJF0MAAACARmOxjWGuDvedKmcAoEyB4g6eUVemZaQ/finbk9lsxiHnYZa06D4MYzgaDO+xgeo0Pbv/FWEgBYMW7tSyEz7epVKIcOn9kB25o6XvNZRulBHeVqhZHDec62yBskQDpcOv/tN2kMQmi86ZW2zuGGxrdU/AZzWeJgW/afeaMUYHIqg= +zoo.freebsd.org ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAIEAwZGtTA/mc6WxduSKwzqwgoSErpoKfeUt+VZZs5SSzgNJVPALwcqYMUqkp/gl9hBpA9tzjXSR/6Wmb1IZKRTr5AhB/XnDdsCjrZTxSJidcjRk5wBMkHLn6/wyIWfGhTZCGOkYBXBjkhydJaVckvEZ45vfqexpmvWCS9Rzjt6/RxU= -----BEGIN PGP SIGNATURE----- -Version: GnuPG v1.2.5 (FreeBSD) +Version: GnuPG v1.4.9 (FreeBSD) -iD8DBQFBLfDdFdaIBMps37IRAncqAJ9BxIyCzAPKM+qw2OBsP2leemcfcACeLRM+ -wOo5rvcJvAnKq8nDcM2DPVE= -=waPf +iD8DBQFIw/bFFdaIBMps37IRAm9cAJ9YtLxyToZG8RAK8RqlhnqKnORVnQCgmQbn ++qJbZG3jiRDQ+hz/XHDMrPM= +=t/HT -----END PGP SIGNATURE----- From owner-p4-projects@FreeBSD.ORG Mon Sep 8 12:09:04 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6FAEA1065670; Mon, 8 Sep 2008 12:09: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 1A6C9106564A for ; Mon, 8 Sep 2008 12:09:04 +0000 (UTC) (envelope-from raj@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 0856E8FC17 for ; Mon, 8 Sep 2008 12:09:04 +0000 (UTC) (envelope-from raj@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 m88C93la075528 for ; Mon, 8 Sep 2008 12:09:03 GMT (envelope-from raj@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m88C93SH075488 for perforce@freebsd.org; Mon, 8 Sep 2008 12:09:03 GMT (envelope-from raj@freebsd.org) Date: Mon, 8 Sep 2008 12:09:03 GMT Message-Id: <200809081209.m88C93SH075488@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to raj@freebsd.org using -f From: Rafal Jaworowski To: Perforce Change Reviews Cc: Subject: PERFORCE change 149415 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, 08 Sep 2008 12:09:04 -0000 http://perforce.freebsd.org/chv.cgi?CH=149415 Change 149415 by raj@raj_mimi on 2008/09/08 12:08:35 IFC @149413 Affected files ... .. //depot/projects/arm/src/contrib/ntp/libparse/clk_rawdcf.c#3 integrate .. //depot/projects/arm/src/lib/libarchive/archive_write_disk.c#16 integrate .. //depot/projects/arm/src/lib/libarchive/test/Makefile#12 integrate .. //depot/projects/arm/src/lib/libarchive/test/test_read_format_gtar_sparse.c#7 integrate .. //depot/projects/arm/src/lib/libarchive/test/test_write_disk_secure.c#6 integrate .. //depot/projects/arm/src/lib/libgeom/geom_util.c#3 integrate .. //depot/projects/arm/src/lib/libgeom/libgeom.3#4 integrate .. //depot/projects/arm/src/lib/libgeom/libgeom.h#4 integrate .. //depot/projects/arm/src/sbin/fdisk/fdisk.c#5 integrate .. //depot/projects/arm/src/sbin/ipfw/ipfw2.c#17 integrate .. //depot/projects/arm/src/sbin/md5/md5.1#2 integrate .. //depot/projects/arm/src/sbin/natd/natd.c#4 integrate .. //depot/projects/arm/src/share/man/man4/if_bridge.4#11 integrate .. //depot/projects/arm/src/sys/amd64/amd64/cpu_switch.S#12 integrate .. //depot/projects/arm/src/sys/amd64/amd64/genassym.c#13 integrate .. //depot/projects/arm/src/sys/amd64/amd64/machdep.c#32 integrate .. //depot/projects/arm/src/sys/amd64/amd64/mp_machdep.c#21 integrate .. //depot/projects/arm/src/sys/amd64/amd64/trap.c#24 integrate .. //depot/projects/arm/src/sys/amd64/include/pcb.h#6 integrate .. //depot/projects/arm/src/sys/amd64/include/pcpu.h#9 integrate .. //depot/projects/arm/src/sys/amd64/include/segments.h#3 integrate .. //depot/projects/arm/src/sys/amd64/linux32/linux32_genassym.c#2 integrate .. //depot/projects/arm/src/sys/amd64/linux32/linux32_locore.s#3 integrate .. //depot/projects/arm/src/sys/amd64/linux32/linux32_machdep.c#21 integrate .. //depot/projects/arm/src/sys/arm/conf/KB920X#50 integrate .. //depot/projects/arm/src/sys/arm/conf/NSLU#2 integrate .. //depot/projects/arm/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c#4 integrate .. //depot/projects/arm/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_znode.c#5 integrate .. //depot/projects/arm/src/sys/conf/NOTES#65 integrate .. //depot/projects/arm/src/sys/dev/acpi_support/acpi_fujitsu.c#4 integrate .. //depot/projects/arm/src/sys/dev/asmc/asmc.c#4 integrate .. //depot/projects/arm/src/sys/dev/asmc/asmcvar.h#4 integrate .. //depot/projects/arm/src/sys/dev/ic/i8251.h#2 integrate .. //depot/projects/arm/src/sys/dev/ic/i8255.h#1 branch .. //depot/projects/arm/src/sys/dev/iicbus/ds133x.c#2 integrate .. //depot/projects/arm/src/sys/dev/si/si.c#7 integrate .. //depot/projects/arm/src/sys/dev/sound/pci/hda/hdac.c#23 integrate .. //depot/projects/arm/src/sys/dev/uart/uart_cpu_pc98.c#6 integrate .. //depot/projects/arm/src/sys/geom/geom_dev.c#10 integrate .. //depot/projects/arm/src/sys/i386/isa/isa.c#5 integrate .. //depot/projects/arm/src/sys/i386/linux/linux_genassym.c#2 integrate .. //depot/projects/arm/src/sys/i386/linux/linux_locore.s#2 integrate .. //depot/projects/arm/src/sys/kern/uipc_sockbuf.c#13 integrate .. //depot/projects/arm/src/sys/net/if_bridge.c#40 integrate .. //depot/projects/arm/src/sys/net80211/ieee80211.h#11 integrate .. //depot/projects/arm/src/sys/net80211/ieee80211_ddb.c#3 integrate .. //depot/projects/arm/src/sys/net80211/ieee80211_freebsd.h#13 integrate .. //depot/projects/arm/src/sys/net80211/ieee80211_ht.c#6 integrate .. //depot/projects/arm/src/sys/net80211/ieee80211_ht.h#6 integrate .. //depot/projects/arm/src/sys/net80211/ieee80211_ioctl.c#22 integrate .. //depot/projects/arm/src/sys/net80211/ieee80211_ioctl.h#13 integrate .. //depot/projects/arm/src/sys/net80211/ieee80211_node.c#22 integrate .. //depot/projects/arm/src/sys/net80211/ieee80211_node.h#11 integrate .. //depot/projects/arm/src/sys/net80211/ieee80211_phy.c#3 integrate .. //depot/projects/arm/src/sys/net80211/ieee80211_sta.c#2 integrate .. //depot/projects/arm/src/sys/netinet/ip_fw.h#15 integrate .. //depot/projects/arm/src/sys/netinet/ip_fw2.c#46 integrate .. //depot/projects/arm/src/sys/netinet/tcp_debug.c#5 integrate .. //depot/projects/arm/src/sys/netinet/tcp_input.c#43 integrate .. //depot/projects/arm/src/sys/netinet/tcp_output.c#28 integrate .. //depot/projects/arm/src/sys/netinet/tcp_subr.c#38 integrate .. //depot/projects/arm/src/sys/netinet/tcp_var.h#27 integrate .. //depot/projects/arm/src/sys/pc98/cbus/sio.c#12 integrate .. //depot/projects/arm/src/sys/pc98/include/bus.h#4 integrate .. //depot/projects/arm/src/sys/pc98/pc98/busiosubr.c#3 integrate .. //depot/projects/arm/src/sys/sys/disk.h#4 integrate .. //depot/projects/arm/src/sys/sys/param.h#47 integrate .. //depot/projects/arm/src/tools/tools/nanobsd/nanobsd.sh#13 integrate .. //depot/projects/arm/src/usr.sbin/boot0cfg/boot0cfg.c#2 integrate .. //depot/projects/arm/src/usr.sbin/setfib/setfib.c#2 integrate Differences ... ==== //depot/projects/arm/src/contrib/ntp/libparse/clk_rawdcf.c#3 (text+ko) ==== @@ -229,7 +229,7 @@ unsigned char *c = dcfprm->zerobits; int i; - parseprintf(DD_RAWDCF,("parse: convert_rawdcf: \"%s\"\n", buffer)); + parseprintf(DD_RAWDCF,("parse: convert_rawdcf: \"%.*s\"\n", size, buffer)); if (size < 57) { @@ -320,7 +320,7 @@ * bad format - not for us */ #ifndef PARSEKERNEL - msyslog(LOG_ERR, "parse: convert_rawdcf: parity check FAILED for \"%s\"\n", buffer); + msyslog(LOG_ERR, "parse: convert_rawdcf: parity check FAILED for \"%.*s\"\n", size, buffer); #endif return CVT_FAIL|CVT_BADFMT; } ==== //depot/projects/arm/src/lib/libarchive/archive_write_disk.c#16 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include "archive_platform.h" -__FBSDID("$FreeBSD: src/lib/libarchive/archive_write_disk.c,v 1.35 2008/09/05 06:13:11 kientzle Exp $"); +__FBSDID("$FreeBSD: src/lib/libarchive/archive_write_disk.c,v 1.36 2008/09/07 05:22:33 kientzle Exp $"); #ifdef HAVE_SYS_TYPES_H #include @@ -907,14 +907,26 @@ * We know something is in the way, but we don't know what; * we need to find out before we go any further. */ - if (lstat(a->name, &a->st) != 0) { + int r = 0; + /* + * The SECURE_SYMLINK logic has already removed a + * symlink to a dir if the client wants that. So + * follow the symlink if we're creating a dir. + */ + if (S_ISDIR(a->mode)) + r = stat(a->name, &a->st); + /* + * If it's not a dir (or it's a broken symlink), + * then don't follow it. + */ + if (r != 0 || !S_ISDIR(a->mode)) + r = lstat(a->name, &a->st); + if (r != 0) { archive_set_error(&a->archive, errno, "Can't stat existing object"); return (ARCHIVE_WARN); } - /* TODO: if it's a symlink... */ - /* * NO_OVERWRITE_NEWER doesn't apply to directories. */ ==== //depot/projects/arm/src/lib/libarchive/test/Makefile#12 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/lib/libarchive/test/Makefile,v 1.24 2008/08/25 06:08:22 kientzle Exp $ +# $FreeBSD: src/lib/libarchive/test/Makefile,v 1.25 2008/09/08 00:58:12 kientzle Exp $ # Where to find the libarchive sources LA_SRCDIR=${.CURDIR}/.. @@ -89,7 +89,7 @@ # Uncomment to link against dmalloc #LDADD+= -L/usr/local/lib -ldmalloc #CFLAGS+= -I/usr/local/include -DUSE_DMALLOC -#WARNS=6 +WARNS=6 # Build libarchive_test and run it. check test: libarchive_test ==== //depot/projects/arm/src/lib/libarchive/test/test_read_format_gtar_sparse.c#7 (text+ko) ==== @@ -23,7 +23,7 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ #include "test.h" -__FBSDID("$FreeBSD: src/lib/libarchive/test/test_read_format_gtar_sparse.c,v 1.9 2008/09/01 05:38:33 kientzle Exp $"); +__FBSDID("$FreeBSD: src/lib/libarchive/test/test_read_format_gtar_sparse.c,v 1.10 2008/09/08 00:58:12 kientzle Exp $"); struct contents { @@ -187,6 +187,7 @@ struct contents expect; /* data, size, offset of block read from archive. */ struct contents actual; + const void *p; struct archive *a; extract_reference_file(name); @@ -206,10 +207,10 @@ expect = *cts++; while (0 == (err = archive_read_data_block(a, - (const void **)&actual.d, - &actual.s, &actual.o))) { + &p, &actual.s, &actual.o))) { + actual.d = p; while (actual.s > 0) { - char c = *(const char *)actual.d; + char c = *actual.d; if(actual.o < expect.o) { /* * Any byte before the expected ==== //depot/projects/arm/src/lib/libarchive/test/test_write_disk_secure.c#6 (text+ko) ==== @@ -23,7 +23,7 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ #include "test.h" -__FBSDID("$FreeBSD: src/lib/libarchive/test/test_write_disk_secure.c,v 1.5 2008/09/01 05:38:33 kientzle Exp $"); +__FBSDID("$FreeBSD: src/lib/libarchive/test/test_write_disk_secure.c,v 1.8 2008/09/07 23:59:27 kientzle Exp $"); #define UMASK 022 @@ -105,6 +105,80 @@ archive_entry_free(ae); assert(0 == archive_write_finish_entry(a)); + /* + * Without security checks, extracting a dir over a link to a + * dir should follow the link. + */ + /* Create a symlink to a dir. */ + assert((ae = archive_entry_new()) != NULL); + archive_entry_copy_pathname(ae, "link_to_dir3"); + archive_entry_set_mode(ae, S_IFLNK | 0777); + archive_entry_set_symlink(ae, "dir"); + archive_write_disk_set_options(a, 0); + assert(0 == archive_write_header(a, ae)); + assert(0 == archive_write_finish_entry(a)); + /* Extract a dir whose name matches the symlink. */ + assert(archive_entry_clear(ae) != NULL); + archive_entry_copy_pathname(ae, "link_to_dir3"); + archive_entry_set_mode(ae, S_IFDIR | 0777); + assert(0 == archive_write_header(a, ae)); + assert(0 == archive_write_finish_entry(a)); + /* Verify link was followed. */ + assertEqualInt(0, lstat("link_to_dir3", &st)); + assert(S_ISLNK(st.st_mode)); + archive_entry_free(ae); + + /* + * As above, but a broken link, so the link should get replaced. + */ + /* Create a symlink to a dir. */ + assert((ae = archive_entry_new()) != NULL); + archive_entry_copy_pathname(ae, "link_to_dir4"); + archive_entry_set_mode(ae, S_IFLNK | 0777); + archive_entry_set_symlink(ae, "nonexistent_dir"); + archive_write_disk_set_options(a, 0); + assert(0 == archive_write_header(a, ae)); + assert(0 == archive_write_finish_entry(a)); + /* Extract a dir whose name matches the symlink. */ + assert(archive_entry_clear(ae) != NULL); + archive_entry_copy_pathname(ae, "link_to_dir4"); + archive_entry_set_mode(ae, S_IFDIR | 0777); + assert(0 == archive_write_header(a, ae)); + assert(0 == archive_write_finish_entry(a)); + /* Verify link was replaced. */ + assertEqualInt(0, lstat("link_to_dir4", &st)); + assert(S_ISDIR(st.st_mode)); + archive_entry_free(ae); + + /* + * As above, but a link to a non-dir, so the link should get replaced. + */ + /* Create a regular file and a symlink to it */ + assert((ae = archive_entry_new()) != NULL); + archive_entry_copy_pathname(ae, "non_dir"); + archive_entry_set_mode(ae, S_IFREG | 0777); + archive_write_disk_set_options(a, 0); + assert(0 == archive_write_header(a, ae)); + assert(0 == archive_write_finish_entry(a)); + /* Create symlink to the file. */ + archive_entry_copy_pathname(ae, "link_to_dir5"); + archive_entry_set_mode(ae, S_IFLNK | 0777); + archive_entry_set_symlink(ae, "non_dir"); + archive_write_disk_set_options(a, 0); + assert(0 == archive_write_header(a, ae)); + assert(0 == archive_write_finish_entry(a)); + /* Extract a dir whose name matches the symlink. */ + assert(archive_entry_clear(ae) != NULL); + archive_entry_copy_pathname(ae, "link_to_dir5"); + archive_entry_set_mode(ae, S_IFDIR | 0777); + assert(0 == archive_write_header(a, ae)); + assert(0 == archive_write_finish_entry(a)); + /* Verify link was replaced. */ + assertEqualInt(0, lstat("link_to_dir5", &st)); + assert(S_ISDIR(st.st_mode)); + archive_entry_free(ae); + + #if ARCHIVE_VERSION_NUMBER < 2000000 archive_write_finish(a); #else ==== //depot/projects/arm/src/lib/libgeom/geom_util.c#3 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/lib/libgeom/geom_util.c,v 1.2 2008/05/20 11:45:05 pjd Exp $"); +__FBSDID("$FreeBSD: src/lib/libgeom/geom_util.c,v 1.3 2008/09/07 13:54:57 lulf Exp $"); #include #include @@ -42,29 +42,22 @@ #include +static char *g_device_path_open(const char *, int *, int); + /* * Open the given provider and at least check if this is a block device. */ int g_open(const char *name, int dowrite) { - char path[MAXPATHLEN]; + char *path; int fd; - if (name[0] == '/') - strlcpy(path, name, sizeof(path)); - else - snprintf(path, sizeof(path), "%s%s", _PATH_DEV, name); - - fd = open(path, dowrite ? O_RDWR : O_RDONLY); + path = g_device_path_open(name, &fd, dowrite); + if (path != NULL) + free(path); if (fd == -1) return (-1); - /* Let try to get sectorsize, which will prove it is a GEOM provider. */ - if (g_sectorsize(fd) == -1) { - close(fd); - errno = EFTYPE; - return (-1); - } return (fd); } @@ -121,6 +114,19 @@ } /* + * Return the correct provider name. + */ +char * +g_providername(int fd) +{ + char name[MAXPATHLEN]; + + if (g_ioctl_arg(fd, DIOCGPROVIDERNAME, name) == -1) + return (NULL); + return (strdup(name)); +} + +/* * Call BIO_FLUSH for the given provider. */ int @@ -234,3 +240,77 @@ } return (fd); } + +/* + * Return the device path device given a partial or full path to its node. + * A pointer can be provided, which will be set to an opened file descriptor of + * not NULL. + */ +static char * +g_device_path_open(const char *devpath, int *fdp, int dowrite) +{ + char *path; + int fd; + + /* Make sure that we can fail. */ + if (fdp != NULL) + *fdp = -1; + /* Use the device node if we're able to open it. */ + do { + fd = open(devpath, dowrite ? O_RDWR : O_RDONLY); + if (fd == -1) + break; + /* + * Let try to get sectorsize, which will prove it is a GEOM + * provider. + */ + if (g_sectorsize(fd) == -1) { + close(fd); + errno = EFTYPE; + return (NULL); + } + if ((path = strdup(devpath)) == NULL) { + close(fd); + return (NULL); + } + if (fdp != NULL) + *fdp = fd; + else + close(fd); + return (path); + } while (0); + + /* If we're not given an absolute path, assume /dev/ prefix. */ + if (*devpath != '/') { + asprintf(&path, "%s%s", _PATH_DEV, devpath); + if (path == NULL) + return (NULL); + fd = open(path, dowrite ? O_RDWR : O_RDONLY); + if (fd == -1) { + free(path); + return (NULL); + } + /* + * Let try to get sectorsize, which will prove it is a GEOM + * provider. + */ + if (g_sectorsize(fd) == -1) { + free(path); + close(fd); + errno = EFTYPE; + return (NULL); + } + if (fdp != NULL) + *fdp = fd; + else + close(fd); + return (path); + } + return (NULL); +} + +char * +g_device_path(const char *devpath) +{ + return (g_device_path_open(devpath, NULL, 0)); +} ==== //depot/projects/arm/src/lib/libgeom/libgeom.3#4 (text+ko) ==== @@ -26,9 +26,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/lib/libgeom/libgeom.3,v 1.10 2008/06/13 21:49:21 thompsa Exp $ +.\" $FreeBSD: src/lib/libgeom/libgeom.3,v 1.11 2008/09/08 06:27:00 lulf Exp $ .\" -.Dd May 6, 2007 +.Dd September 8, 2008 .Dt LIBGEOM 3 .Os .Sh NAME @@ -52,9 +52,11 @@ .Nm g_sectorsize , .Nm g_flush , .Nm g_delete , +.Nm g_device_path , .Nm g_get_ident , .Nm g_get_name , -.Nm g_open_by_ident +.Nm g_open_by_ident , +.Nm g_providername .Nd userland API library for kernel GEOM subsystem .Sh LIBRARY .Lb libgeom @@ -103,12 +105,16 @@ .Fn g_flush "int fd" .Ft int .Fn g_delete "int fd" "off_t offset" "off_t length" +.Ft "char *" +.Fn g_device_path "const char *devpath" .Ft int .Fn g_get_ident "int fd" "char *ident" "size_t size" .Ft int .Fn g_get_name "const char *ident" "char *name" "size_t size" .Ft int .Fn g_open_by_ident "const char *ident" "int dowrite" "char *name" "size_t size" +.Ft "char *" +.Fn g_providername "int fd" .Sh DESCRIPTION The .Nm geom @@ -301,6 +307,13 @@ function tells the provider that the given data range is no longer used. .Pp The +.Fn g_device_path +function returns the full path to a provider given a partial or full path to the +device node. +If the device can not be found or is not a valid geom provider, NULL is +returned. +.Pp +The .Fn g_get_ident function returns provider's fixed and unique identifier. The @@ -326,7 +339,17 @@ .Dv NULL , the function will store provider's name there. .Pp -All functions return value greater than or equal to +The +.Fn g_providername +function returns the provider name of an open file descriptor. +If the file descriptor does not point to a valid geom provider, NULL is +returned. +.Pp +All functions except +.Fn g_providername +and +.Fn g_device_path +return a value greater than or equal to .Va 0 on success or .Va -1 ==== //depot/projects/arm/src/lib/libgeom/libgeom.h#4 (text+ko) ==== @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/lib/libgeom/libgeom.h,v 1.12 2007/05/06 10:00:27 des Exp $ + * $FreeBSD: src/lib/libgeom/libgeom.h,v 1.13 2008/09/07 13:54:57 lulf Exp $ */ #ifndef _LIBGEOM_H_ #define _LIBGEOM_H_ @@ -154,6 +154,8 @@ int g_get_ident(int, char *, size_t); int g_get_name(const char *, char *, size_t); int g_open_by_ident(const char *, int, char *, size_t); +char *g_device_path(const char *); +char *g_providername(int); __END_DECLS ==== //depot/projects/arm/src/sbin/fdisk/fdisk.c#5 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sbin/fdisk/fdisk.c,v 1.85 2008/07/31 00:55:29 obrien Exp $"); +__FBSDID("$FreeBSD: src/sbin/fdisk/fdisk.c,v 1.86 2008/09/07 13:58:35 lulf Exp $"); #include #include @@ -245,7 +245,6 @@ int main(int argc, char *argv[]) { - struct stat sb; int c, i; int partition = -1; struct dos_partition *partp; @@ -307,18 +306,9 @@ if (argc == 0) { disk = get_rootdisk(); } else { - if (stat(argv[0], &sb) == 0) { - /* OK, full pathname given */ - disk = argv[0]; - } else if (errno == ENOENT && argv[0][0] != '/') { - /* Try prepending "/dev" */ - asprintf(&disk, "%s%s", _PATH_DEV, argv[0]); - if (disk == NULL) - errx(1, "out of memory"); - } else { - /* other stat error, let it fail below */ - disk = argv[0]; - } + disk = g_device_path(argv[0]); + if (disk == NULL) + err(1, "unable to get correct path for %s\n", argv[0]); } if (open_disk(u_flag) < 0) err(1, "cannot open disk %s", disk); @@ -724,21 +714,14 @@ static int open_disk(int flag) { - struct stat st; int rwmode; - if (stat(disk, &st) == -1) { - if (errno == ENOENT) - return -2; - warnx("can't get file status of %s", disk); - return -1; - } - if ( !(st.st_mode & S_IFCHR) ) - warnx("device %s is not character special", disk); - rwmode = a_flag || I_flag || B_flag || flag ? O_RDWR : O_RDONLY; - fd = open(disk, rwmode); - if (fd == -1 && errno == EPERM && rwmode == O_RDWR) - fd = open(disk, O_RDONLY); + /* Write mode if one of these flags are set. */ + rwmode = (a_flag || I_flag || B_flag || flag); + fd = g_open(disk, rwmode); + /* If the mode fails, try read-only if we didn't. */ + if (fd == -1 && errno == EPERM && rwmode) + fd = g_open(disk, 0); if (fd == -1 && errno == ENXIO) return -2; if (fd == -1) { @@ -778,29 +761,30 @@ { int error; struct gctl_req *grq; - const char *q; - char fbuf[BUFSIZ]; + const char *errmsg; + char fbuf[BUFSIZ], *pname; int i, fdw; grq = gctl_get_handle(); gctl_ro_param(grq, "verb", -1, "write MBR"); gctl_ro_param(grq, "class", -1, "MBR"); - q = strrchr(disk, '/'); - if (q == NULL) - q = disk; - else - q++; - gctl_ro_param(grq, "geom", -1, q); + pname = g_providername(fd); + if (pname == NULL) { + warnx("Error getting providername for %s\n", disk); + return (-1); + } + gctl_ro_param(grq, "geom", -1, pname); gctl_ro_param(grq, "data", secsize, buf); - q = gctl_issue(grq); - if (q == NULL) { + errmsg = gctl_issue(grq); + free(pname); + if (errmsg == NULL) { gctl_free(grq); return(0); } if (!q_flag) /* GEOM errors are benign, not all devices supported */ - warnx("%s", q); + warnx("%s", errmsg); gctl_free(grq); - + error = pwrite(fd, buf, secsize, (sector * 512)); if (error == secsize) return (0); @@ -841,21 +825,18 @@ dos_cylsecs = cylsecs = heads * sectors; disksecs = cyls * heads * sectors; - error = ioctl(fd, DIOCGSECTORSIZE, &u); - if (error != 0 || u == 0) - u = 512; - else - secsize = u; + u = g_sectorsize(fd); + if (u <= 0) + return (-1); - error = ioctl(fd, DIOCGMEDIASIZE, &o); - if (error == 0) { - disksecs = o / u; - cyls = dos_cyls = o / (u * dos_heads * dos_sectors); - } + o = g_mediasize(fd); + if (o < 0) + return (-1); + disksecs = o / u; + cyls = dos_cyls = o / (u * dos_heads * dos_sectors); return (disksecs); } - static int read_s0() ==== //depot/projects/arm/src/sbin/ipfw/ipfw2.c#17 (text+ko) ==== @@ -17,7 +17,7 @@ * * NEW command line interface for IP firewall facility * - * $FreeBSD: src/sbin/ipfw/ipfw2.c,v 1.120 2008/05/10 15:02:56 julian Exp $ + * $FreeBSD: src/sbin/ipfw/ipfw2.c,v 1.121 2008/09/06 17:23:37 rik Exp $ */ #include @@ -2429,7 +2429,7 @@ rulenum = atoi(av[0]); new_set = atoi(av[2]); if (!isdigit(*(av[0])) || (cmd == 3 && rulenum > RESVD_SET) || - (cmd == 2 && rulenum == 65535) ) + (cmd == 2 && rulenum == IPFW_DEFAULT_RULE) ) errx(EX_DATAERR, "invalid source number %s\n", av[0]); if (!isdigit(*(av[2])) || new_set > RESVD_SET) errx(EX_DATAERR, "invalid dest. set %s\n", av[1]); @@ -2553,7 +2553,7 @@ * need to scan the list to count them. */ for (nstat = 1, r = data, lim = (char *)data + nbytes; - r->rulenum < 65535 && (char *)r < lim; + r->rulenum < IPFW_DEFAULT_RULE && (char *)r < lim; ++nstat, r = NEXT(r) ) ; /* nothing */ @@ -5045,7 +5045,8 @@ if (have_tag) errx(EX_USAGE, "tag and untag cannot be " "specified more than once"); - GET_UINT_ARG(tag, 1, 65534, i, rule_action_params); + GET_UINT_ARG(tag, 1, IPFW_DEFAULT_RULE - 1, i, + rule_action_params); have_tag = cmd; fill_cmd(cmd, O_TAG, (i == TOK_TAG) ? 0: F_NOT, tag); ac--; av++; @@ -5521,8 +5522,8 @@ if (c->limit_mask == 0) errx(EX_USAGE, "limit: missing limit mask"); - GET_UINT_ARG(c->conn_limit, 1, 65534, TOK_LIMIT, - rule_options); + GET_UINT_ARG(c->conn_limit, 1, IPFW_DEFAULT_RULE - 1, + TOK_LIMIT, rule_options); ac--; av++; break; @@ -5649,8 +5650,8 @@ else { uint16_t tag; - GET_UINT_ARG(tag, 1, 65534, TOK_TAGGED, - rule_options); + GET_UINT_ARG(tag, 1, IPFW_DEFAULT_RULE - 1, + TOK_TAGGED, rule_options); fill_cmd(cmd, O_TAGGED, 0, tag); } ac--; av++; @@ -5978,7 +5979,7 @@ size = 0; data = NULL; frule = 0; - lrule = 65535; /* max ipfw rule number */ + lrule = IPFW_DEFAULT_RULE; /* max ipfw rule number */ ac--; av++; /* Parse parameters. */ ==== //depot/projects/arm/src/sbin/md5/md5.1#2 (text+ko) ==== @@ -1,5 +1,5 @@ -.\" $FreeBSD: src/sbin/md5/md5.1,v 1.24 2005/03/10 09:56:39 cperciva Exp $ -.Dd June 6, 2004 +.\" $FreeBSD: src/sbin/md5/md5.1,v 1.25 2008/09/07 15:19:34 trhodes Exp $ +.Dd September 7, 2008 .Dt MD5 1 .Os .Sh NAME @@ -49,7 +49,7 @@ .Tn RSA . .Pp .Tn MD5 -has not yet (2001-09-03) been broken, but sufficient attacks have been +has not yet (2007-03-05) been broken, but sufficient attacks have been made that its security is in some doubt. The attacks on .Tn MD5 ==== //depot/projects/arm/src/sbin/natd/natd.c#4 (text+ko) ==== @@ -11,7 +11,7 @@ */ #include -__FBSDID("$FreeBSD: src/sbin/natd/natd.c,v 1.53 2008/06/22 22:14:02 mav Exp $"); +__FBSDID("$FreeBSD: src/sbin/natd/natd.c,v 1.54 2008/09/06 17:26:52 rik Exp $"); #define SYSLOG_NAMES @@ -130,6 +130,7 @@ static void SetupSkinnyPort(const char *strValue); static void NewInstance(const char *name); static void DoGlobal (int fd); +static int CheckIpfwRulenum(unsigned int rnum); /* * Globals. @@ -1947,6 +1948,10 @@ if (sscanf(strValue, "%u:%u", &base, &num) != 2) errx(1, "punch_fw: basenumber:count parameter required"); + if (CheckIpfwRulenum(base + num - 1) == -1) + errx(1, "punch_fw: basenumber:count parameter should fit " + "the maximum allowed rule numbers"); + LibAliasSetFWBase(mla, base, num); (void)LibAliasSetMode(mla, PKT_ALIAS_PUNCH_FW, PKT_ALIAS_PUNCH_FW); } @@ -1991,3 +1996,22 @@ mla = ip->la; mip = ip; } + +static int +CheckIpfwRulenum(unsigned int rnum) +{ + unsigned int default_rule; + size_t len = sizeof(default_rule); + + if (sysctlbyname("net.inet.ip.fw.default_rule", &default_rule, &len, + NULL, 0) == -1) { + warn("Failed to get the default ipfw rule number, using " + "default historical value 65535. The reason was"); + default_rule = 65535; + } + if (rnum >= default_rule) { + return -1; + } + + return 0; +} ==== //depot/projects/arm/src/share/man/man4/if_bridge.4#11 (text+ko) ==== @@ -33,7 +33,7 @@ .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\" POSSIBILITY OF SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man4/if_bridge.4,v 1.31 2008/08/04 23:16:07 thompsa Exp $ +.\" $FreeBSD: src/share/man/man4/if_bridge.4,v 1.32 2008/09/08 03:28:26 thompsa Exp $ .\" .Dd September 17, 2007 .Dt IF_BRIDGE 4 @@ -92,6 +92,22 @@ The address can be changed by assigning the desired link address using .Xr ifconfig 8 . .Pp +If +.Xr sysctl 8 +node +.Va net.link.bridge.inherit_mac +has non-zero value, newly created bridge will inherit MAC address +from its first member instead of choosing random link-level address. +This will provide more predictable bridge MAC without any +additional configuration, but currently this feature is known +to break some L2 protocols, for example PPPoE that is provided +by +.Xr ng_pppoe 4 +and +.Xr ppp 8 . +Now this feature is considered as experimental and is turned off +by-default. +.Pp A bridge can be used to provide several services, such as a simple 802.11-to-Ethernet bridge for wireless hosts, and traffic isolation. .Pp ==== //depot/projects/arm/src/sys/amd64/amd64/cpu_switch.S#12 (text+ko) ==== @@ -30,7 +30,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/amd64/amd64/cpu_switch.S,v 1.163 2008/09/02 17:52:11 kib Exp $ + * $FreeBSD: src/sys/amd64/amd64/cpu_switch.S,v 1.164 2008/09/08 09:59:05 kib Exp $ */ #include @@ -266,7 +266,7 @@ movl %es,PCB_ES(%r8) movl %fs,PCB_FS(%r8) jmp done_store_seg -2: movq PCB_GS32P(%r8),%rax +2: movq PCPU(GS32P),%rax movq (%rax),%rax movq %rax,PCB_GS32SD(%r8) jmp 1b @@ -283,7 +283,7 @@ movl PCB_FS(%r8),%fs jmp done_load_seg /* Restore userland %gs while preserving kernel gsbase */ -2: movq PCB_GS32P(%r8),%rax +2: movq PCPU(GS32P),%rax movq PCB_GS32SD(%r8),%rcx movq %rcx,(%rax) jmp 1b ==== //depot/projects/arm/src/sys/amd64/amd64/genassym.c#13 (text+ko) ==== @@ -33,7 +33,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/genassym.c,v 1.169 2008/07/30 11:30:55 kib Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/genassym.c,v 1.170 2008/09/08 09:59:05 kib Exp $"); #include "opt_compat.h" #include "opt_kstack_pages.h" @@ -147,7 +147,6 @@ ASSYM(PCB_SAVEFPU, offsetof(struct pcb, pcb_save)); ASSYM(PCB_SAVEFPU_SIZE, sizeof(struct savefpu)); ASSYM(PCB_ONFAULT, offsetof(struct pcb, pcb_onfault)); -ASSYM(PCB_GS32P, offsetof(struct pcb, pcb_gs32p)); ASSYM(PCB_GS32SD, offsetof(struct pcb, pcb_gs32sd)); ASSYM(PCB_SIZE, sizeof(struct pcb)); @@ -199,6 +198,7 @@ ASSYM(PC_CURPMAP, offsetof(struct pcpu, pc_curpmap)); ASSYM(PC_TSSP, offsetof(struct pcpu, pc_tssp)); ASSYM(PC_RSP0, offsetof(struct pcpu, pc_rsp0)); +ASSYM(PC_GS32P, offsetof(struct pcpu, pc_gs32p)); ASSYM(LA_VER, offsetof(struct LAPIC, version)); ASSYM(LA_TPR, offsetof(struct LAPIC, tpr)); ==== //depot/projects/arm/src/sys/amd64/amd64/machdep.c#32 (text+ko) ==== @@ -39,7 +39,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/machdep.c,v 1.688 2008/09/02 17:52:11 kib Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/machdep.c,v 1.690 2008/09/08 09:59:05 kib Exp $"); #include "opt_atalk.h" #include "opt_atpic.h" @@ -803,7 +803,7 @@ * Initialize segments & interrupt table */ -struct user_segment_descriptor gdt[NGDT * MAXCPU];/* global descriptor table */ +struct user_segment_descriptor gdt[NGDT * MAXCPU];/* global descriptor tables */ static struct gate_descriptor idt0[NIDT]; struct gate_descriptor *idt = &idt0[0]; /* interrupt descriptor table */ @@ -870,7 +870,7 @@ /* GPROC0_SEL 6 Proc 0 Tss Descriptor */ { 0x0, /* segment base address */ - sizeof(struct amd64tss)-1,/* length - all address space */ + sizeof(struct amd64tss)-1,/* length */ SDT_SYSTSS, /* segment type */ SEL_KPL, /* segment descriptor priority level */ 1, /* segment descriptor present */ @@ -1347,6 +1347,7 @@ PCPU_SET(curthread, &thread0); PCPU_SET(curpcb, thread0.td_pcb); PCPU_SET(tssp, &common_tss[0]); + PCPU_SET(gs32p, &gdt[GUGS32_SEL]); /* * Initialize mutexes. ==== //depot/projects/arm/src/sys/amd64/amd64/mp_machdep.c#21 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/mp_machdep.c,v 1.291 2008/07/09 19:44:37 peter Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/mp_machdep.c,v 1.293 2008/09/08 09:59:05 kib Exp $"); #include "opt_cpu.h" #include "opt_kstack_pages.h" @@ -436,7 +436,8 @@ { struct pcpu *pc; u_int64_t msr, cr0; - int cpu, gsel_tss; + int cpu, gsel_tss, x; + struct region_descriptor ap_gdt; /* Set by the startup code for us to use */ cpu = bootAP; @@ -447,11 +448,17 @@ common_tss[cpu].tss_iobase = sizeof(struct amd64tss); common_tss[cpu].tss_ist1 = (long)&doublefault_stack[PAGE_SIZE]; + /* Prepare private GDT */ gdt_segs[GPROC0_SEL].ssd_base = (long) &common_tss[cpu]; ssdtosyssd(&gdt_segs[GPROC0_SEL], - (struct system_segment_descriptor *)&gdt[GPROC0_SEL]); - - lgdt(&r_gdt); /* does magic intra-segment return */ + (struct system_segment_descriptor *)&gdt[NGDT * cpu + GPROC0_SEL]); + for (x = 0; x < NGDT; x++) { + if (x != GPROC0_SEL && x != (GPROC0_SEL + 1)) + ssdtosd(&gdt_segs[x], &gdt[NGDT * cpu + x]); + } + ap_gdt.rd_limit = NGDT * sizeof(gdt[0]) - 1; + ap_gdt.rd_base = (long) &gdt[NGDT * cpu]; + lgdt(&ap_gdt); /* does magic intra-segment return */ /* Get per-cpu data */ pc = &__pcpu[cpu]; @@ -463,6 +470,7 @@ pc->pc_curthread = 0; pc->pc_tssp = &common_tss[cpu]; pc->pc_rsp0 = 0; + pc->pc_gs32p = &gdt[NGDT * cpu + GUGS32_SEL]; wrmsr(MSR_FSBASE, 0); /* User value */ >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Mon Sep 8 12:09:05 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 872441065720; Mon, 8 Sep 2008 12:09: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 3BC47106566B for ; Mon, 8 Sep 2008 12:09:04 +0000 (UTC) (envelope-from strauss@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 2A7268FC1D for ; Mon, 8 Sep 2008 12:09:04 +0000 (UTC) (envelope-from strauss@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 m88C94iO075559 for ; Mon, 8 Sep 2008 12:09:04 GMT (envelope-from strauss@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m88C94Bm075553 for perforce@freebsd.org; Mon, 8 Sep 2008 12:09:04 GMT (envelope-from strauss@FreeBSD.org) Date: Mon, 8 Sep 2008 12:09:04 GMT Message-Id: <200809081209.m88C94Bm075553@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to strauss@FreeBSD.org using -f From: Anselm Strauss To: Perforce Change Reviews Cc: Subject: PERFORCE change 149416 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, 08 Sep 2008 12:09:05 -0000 http://perforce.freebsd.org/chv.cgi?CH=149416 Change 149416 by strauss@strauss_marvelman on 2008/09/08 12:08:40 Work towards compression, things are currently broken ... Affected files ... .. //depot/projects/soc2008/strauss_libarchive/TODO#16 edit .. //depot/projects/soc2008/strauss_libarchive/libarchive/archive_write_set_format_zip.c#41 edit .. //depot/projects/soc2008/strauss_libarchive/misc/deflate/Makefile#1 add .. //depot/projects/soc2008/strauss_libarchive/misc/deflate/deflate.c#1 add Differences ... ==== //depot/projects/soc2008/strauss_libarchive/TODO#16 (text+ko) ==== @@ -1,6 +1,7 @@ To Be Done ========== +- add HAVE_ZLIB_H checks - Fix compiler warnings (also in checks) - Consider switching to 0x000d extension - Consider portability of code to other operating systems ==== //depot/projects/soc2008/strauss_libarchive/libarchive/archive_write_set_format_zip.c#41 (text+ko) ==== @@ -85,6 +85,7 @@ static unsigned int dos_time(const time_t); static size_t path_length(struct archive_entry *); static int write_path(struct archive_entry *, struct archive_write *); +static int set_compression(struct archive_write *, enum compression); struct zip_local_file_header { char signature[4]; @@ -152,6 +153,7 @@ struct archive_entry *entry; off_t offset; uLong crc32; + enum compression compression; }; struct zip { @@ -161,6 +163,7 @@ off_t offset; size_t written_bytes; size_t remaining_data_bytes; + enum compression compression; }; struct zip_central_directory_end { @@ -174,6 +177,11 @@ char comment_length[2]; }; +static enum compression { + COMPRESSION_STORE = 0, + COMPRESSION_DEFLATE = 6 +}; + int archive_write_set_format_zip(struct archive *_a) { @@ -194,6 +202,7 @@ zip->offset = 0; zip->written_bytes = 0; zip->remaining_data_bytes = 0; + zip->compression = COMPRESSION_DEFLATE; a->format_data = zip; a->pad_uncompressed = 0; /* Actually not needed for now, since no compression support yet. */ @@ -214,6 +223,20 @@ return (ARCHIVE_OK); } +/* TODO: Register compression setting functions in public header. */ + +void +archive_write_zip_set_store(struct archive_write *a) +{ + set_compression(a, COMPRESSION_STORE); +} + +void +archive_write_zip_set_deflate(struct archive_write *a) +{ + set_compression(a, COMPRESSION_DEFLATE); +} + static int archive_write_zip_header(struct archive_write *a, struct archive_entry *entry) { @@ -250,6 +273,7 @@ } l->entry = archive_entry_clone(entry); l->crc32 = crc32(0, NULL, 0); + l->compression = zip->compression; l->next = NULL; if (zip->central_directory == NULL) { zip->central_directory = l; @@ -261,27 +285,22 @@ /* Store the offset of this header for later use in central directory. */ l->offset = zip->written_bytes; - /* - * Formatting local file header. - * Some fields are not explicitely set after they were set to 0 - * by the memset() call, meaning they are unused or contain the default value. - * The fields this is true for and the reason why are: - * - * - compression: Not yet supported (TODO) - * - crc32: written in data descriptor - * - extra_length: not used (TODO) - */ memset(&h, 0, sizeof(h)); zip_encode(ZIP_SIGNATURE_LOCAL_FILE_HEADER, &h.signature, sizeof(h.signature)); zip_encode(ZIP_VERSION_EXTRACT, &h.version, sizeof(h.version)); zip_encode(ZIP_FLAGS, &h.flags, sizeof(h.flags)); + zip_encode(zip->compression, &h.compression, sizeof(h.compression)); zip_encode(dos_time(archive_entry_mtime(entry)), &h.timedate, sizeof(h.timedate)); zip_encode(path_length(entry), &h.filename_length, sizeof(h.filename_length)); zip_encode(sizeof(e), &h.extra_length, sizeof(h.extra_length)); - /* Setting compressed and uncompressed sizes even when specification says - * to set to zero when using data descriptors. */ - zip_encode(size, &h.compressed_size, sizeof(h.compressed_size)); - zip_encode(size, &h.uncompressed_size, sizeof(h.uncompressed_size)); + + if (zip->compression = COMPRESSION_STORE) { + /* Setting compressed and uncompressed sizes even when specification says + * to set to zero when using data descriptors. Otherwise the end of the + * data for an entry is rather difficult to find. */ + zip_encode(size, &h.compressed_size, sizeof(h.compressed_size)); + zip_encode(size, &h.uncompressed_size, sizeof(h.uncompressed_size)); + } /* Formatting extra data. */ zip_encode(sizeof(e), &h.extra_length, sizeof(h.extra_length)); @@ -296,8 +315,6 @@ zip_encode(archive_entry_uid(entry), &e.unix_uid, sizeof(e.unix_uid)); zip_encode(archive_entry_gid(entry), &e.unix_gid, sizeof(e.unix_gid)); - /* This will surely change when compression is implemented. */ - zip_encode(size, &d->compressed_size, sizeof(d->compressed_size)); zip_encode(size, &d->uncompressed_size, sizeof(d->uncompressed_size)); ret = (a->compressor.write)(a, &h, sizeof(h)); @@ -324,11 +341,28 @@ int ret; struct zip *zip = a->format_data; struct zip_file_header_link *l = zip->central_directory_end; + z_stream stream; if (s > zip->remaining_data_bytes) s = zip->remaining_data_bytes; - ret = (a->compressor.write)(a, buff, s); + switch (zip->compression) { + + case COMPRESSION_STORE: + + ret = (a->compressor.write)(a, buff, s); + + case COMPRESSION_DEFLATE: + + deflateInit2( + stream, + + ); + + } + + /* TODO: set compressed size in data descriptor and local file header link */ + if (ret >= 0) { zip->written_bytes += s; zip->remaining_data_bytes -= s; @@ -367,7 +401,6 @@ struct zip_file_header h; struct zip_central_directory_end end; struct zip_extra_data_central e; - int64_t size; off_t offset_start, offset_end; int entries; int ret; @@ -397,11 +430,11 @@ * writing each entry. */ while (l != NULL) { - size = archive_entry_size(l->entry); + zip_encode(l->compression, &h.compression, sizeof(h.compression)); zip_encode(dos_time(archive_entry_mtime(l->entry)), &h.timedate, sizeof(h.timedate)); zip_encode(l->crc32, &h.crc32, sizeof(h.crc32)); - zip_encode(size, &h.compressed_size, sizeof(h.compressed_size)); - zip_encode(size, &h.uncompressed_size, sizeof(h.uncompressed_size)); + /* TODO: write compressed size */ + zip_encode(archive_entry_size(entry), &h.uncompressed_size, sizeof(h.uncompressed_size)); zip_encode(path_length(l->entry), &h.filename_length, sizeof(h.filename_length)); zip_encode(sizeof(e), &h.extra_length, sizeof(h.extra_length)); mode = archive_entry_mode(l->entry); @@ -550,3 +583,12 @@ return written_bytes; } + +static int +set_compression(struct archive_write *a, enum compression compression) +{ + /* TODO: check archive state, should not switch between header and data */ + /* TODO: check if valid compression? */ + + a->format_data->compression = compression; +} From owner-p4-projects@FreeBSD.ORG Mon Sep 8 12:27:23 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5125A1065677; Mon, 8 Sep 2008 12:27: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 15307106566C for ; Mon, 8 Sep 2008 12:27:23 +0000 (UTC) (envelope-from raj@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 05A978FC08 for ; Mon, 8 Sep 2008 12:27:23 +0000 (UTC) (envelope-from raj@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 m88CRM4Y039179 for ; Mon, 8 Sep 2008 12:27:22 GMT (envelope-from raj@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m88CRMXd039177 for perforce@freebsd.org; Mon, 8 Sep 2008 12:27:22 GMT (envelope-from raj@freebsd.org) Date: Mon, 8 Sep 2008 12:27:22 GMT Message-Id: <200809081227.m88CRMXd039177@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to raj@freebsd.org using -f From: Rafal Jaworowski To: Perforce Change Reviews Cc: Subject: PERFORCE change 149417 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, 08 Sep 2008 12:27:23 -0000 http://perforce.freebsd.org/chv.cgi?CH=149417 Change 149417 by raj@raj_mimi on 2008/09/08 12:26:55 Introduce TWSI (I2C) driver for Marvell SOCs. Update kernel config. Obtained from: Marvell, Semihalf Affected files ... .. //depot/projects/arm/src/sys/arm/conf/DB-88F5XXX#6 edit .. //depot/projects/arm/src/sys/arm/mv/files.mv#3 edit .. //depot/projects/arm/src/sys/arm/mv/twsi.c#1 add Differences ... ==== //depot/projects/arm/src/sys/arm/conf/DB-88F5XXX#6 (text+ko) ==== @@ -67,6 +67,11 @@ options DEVICE_POLLING options HZ=1000 +# I2C (TWSI) +device iic +device iicbus +device ds133x + device mem # Memory and kernel memory devices device md ==== //depot/projects/arm/src/sys/arm/mv/files.mv#3 (text+ko) ==== @@ -24,6 +24,7 @@ arm/mv/mv_machdep.c standard arm/mv/obio.c standard arm/mv/timer.c standard +arm/mv/twsi.c optional iicbus dev/mge/if_mge.c optional mge dev/uart/uart_bus_mbus.c optional uart From owner-p4-projects@FreeBSD.ORG Mon Sep 8 12:37:33 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 90993106567E; Mon, 8 Sep 2008 12:37: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 54598106564A for ; Mon, 8 Sep 2008 12:37:33 +0000 (UTC) (envelope-from remko@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 4367C8FC1C for ; Mon, 8 Sep 2008 12:37:33 +0000 (UTC) (envelope-from remko@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 m88CbXgI087345 for ; Mon, 8 Sep 2008 12:37:33 GMT (envelope-from remko@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m88CbXAa087343 for perforce@freebsd.org; Mon, 8 Sep 2008 12:37:33 GMT (envelope-from remko@freebsd.org) Date: Mon, 8 Sep 2008 12:37:33 GMT Message-Id: <200809081237.m88CbXAa087343@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to remko@freebsd.org using -f From: Remko Lodder To: Perforce Change Reviews Cc: Subject: PERFORCE change 149418 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, 08 Sep 2008 12:37:33 -0000 http://perforce.freebsd.org/chv.cgi?CH=149418 Change 149418 by remko@remko_nakur on 2008/09/08 12:37:29 Update my WIP. Affected files ... .. //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/ppp-and-slip/chapter.sgml#4 edit Differences ... ==== //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/ppp-and-slip/chapter.sgml#4 (text+ko) ==== @@ -67,7 +67,7 @@ PPP - user PPP + gebruiker PPP PPP @@ -271,7 +271,7 @@ configuratie - zowel ppp en pppd + Zowel ppp en pppd (de implementatie van PPP op kernel niveau) gebruiken de configuratie bestanden die zich in de /etc/ppp directory bevinden. Voorbeelden @@ -396,7 +396,7 @@ - De inbel regel. Gebruiker PPP gebruikt een + De inbelregel. Gebruiker PPP gebruikt een verwachting-verstuur syntax wat vergelijkbaar is met het &man.chat.8; programma. Bekijk de handleiding voor meer informatie over de mogelijkheden van deze @@ -515,251 +515,270 @@ password: bar protocol: ppp - You will need to alter this script to suit your - own needs. When you write this script for the first - time, you should ensure that you have enabled - chat logging so you can determine if - the conversation is going as expected. + U moet dit schript aanpassen om aan uw behoeften + te vodloen. Wanneer u dit script voor het eerst + schrijft, moet u ervoor zorgen dat u de + chat log optie heeft aangezet zodat u + kunt bepalen of de conversatie gaat zoals + verwacht. - Line 16: + Regel 16: timeout - Sets the default idle timeout (in seconds) for the - connection. Here, the connection will be closed - automatically after 300 seconds of inactivity. If you - never want to timeout, set this value to zero or use - the command line switch. + Selt de standaard idle timeout in (in seconden) + voor de connectie. Hier wordt de connectie + automatisch afgesloten na 300 seconden van + inactiviteit. Als u nooit een timeout wilt krijgen, + kunt u de waarde op nul zetten of gebruik maken van + de commando regel optie. - Line 17: + Retel 17: ISP - Sets the interface addresses. The string - x.x.x.x should be - replaced by the IP address that your provider has - allocated to you. The string - y.y.y.y should be - replaced by the IP address that your ISP indicated - for their gateway (the machine to which you - connect). If your ISP has not given you a gateway - address, use 10.0.0.2/0. If you need to - use a guessed address, make sure that - you create an entry in - /etc/ppp/ppp.linkup as per the - instructions for PPP and Dynamic IP - addresses. If this line is omitted, - ppp cannot run in - mode. + Stelt het interface adres in. De string + x.x.x.x moet vervangen + worden door het IP adres dat uw provider aan u heeft + aangegeven. De string + y.y.y.y moet vervangen + worden door het IP adres dat uw provider aan u + heeft gegeven voor de gateway (de machine waarmee + u verbinding maakt). Als uw ISP u geen gateway + adres heeft gegeven, gebruik dan 10.0.0.2/0. Als u gebruik + moet maken van een gegokt, zorg ervoor + dat er een regel staat in + /etc/ppp/ppp.linkup zoals + beschreven in de instructies voor PPP en dynamische IP + adressen. Als deze regel weggelaten wordt + kan ppp niet in + mode starten. - Line 18: + Regel 18: - Adds a default route to your ISP's gateway. The - special word HISADDR is replaced with - the gateway address specified on line 17. It is - important that this line appears after line 17, - otherwise HISADDR will not yet be - initialized. + Voegt een standaard routering to naar uw ISP's + gateway. Het speciale HISADDR + woord, wordt vervangen door het gateway adres zoals + gespecificeerd op regel 17. Het is belangrijk dat + deze regel na reegl 17 komt, anders is + HISADDR nog niet + geinitialiseerd. - If you do not wish to run ppp in , - this line should be moved to the - ppp.linkup file. + Als u ppp niet in + mode wilt draaien, moet deze regel verplaatst + worden naar het ppp.linkup + bestand. - It is not necessary to add an entry to - ppp.linkup when you have a static IP - address and are running ppp in mode as your - routing table entries are already correct before you connect. - You may however wish to create an entry to invoke programs after - connection. This is explained later with the sendmail - example. + Het is niet nodig om een regel toe te voegen aan + ppp.linkup wanneer u een statisch + IP adres krijgt en ppp met de mode + gestart is omdat uw routerings tabel al correcte regels + heeft voordat u verbinding maakt. U kunt echter een regel + aanmaken om programma's te starten nadat de verbinding + opgezet is. Dit wordt later uitgelegd met een sendmail + voorbeeld. - Example configuration files can be found in the - /usr/share/examples/ppp/ directory. + Voorbeeld configuratie bestanden kunnen gevonden worden + in de usr/share/examples/ppp + directory. - PPP and Dynamic IP Addresses + PPP en dynamische ip adressen PPP - with dynamic IP addresses + met dynamische ip adressen IPCP - If your service provider does not assign static IP - addresses, ppp can be configured to - negotiate the local and remote addresses. This is done by - guessing an IP address and allowing - ppp to set it up correctly using the IP - Configuration Protocol (IPCP) after connecting. The - ppp.conf configuration is the same as - PPP and Static IP - Addresses, with the following change: + Als uw service provider geen statisch IP adres + aanlevert kan ppp geconfigureerd + worden om het lokale en het adres aan de andere kant + te onderhandelen. Dit wordt gedaan door het + gokken van een IP adres en het toestaan + van ppp om het goed op te zetten + door gebruik te maken van het IP Configuration Protocol + (IPCP) nadat er verbinding gemaakt is. De + ppp.conf configuratie is hetzelfde + als voor de PPP en + statische IP adressen, met de volgende + wijziging: 17 set ifaddr 10.0.0.1/0 10.0.0.2/0 255.255.255.255 - Again, do not include the line number, it is just for - reference. Indentation of at least one space is - required. + Nogmaals, voegt u alstublieft het regelnummer niet toe + het is puur ter referentie. Indentiatie van minstens + één spatie is vereist. - Line 17: + Regel 17: - The number after the / character - is the number of bits of the address that ppp will - insist on. You may wish to use IP numbers more - appropriate to your circumstances, but the above example - will always work. + Het nummer achter de / karakter + is het aantal bits van het adres die ppp eist. Het is + mogelijk dat u IP adressen wilt gebruiken die meer van + toepassing zijn op uw omstandigheden, maar bovenstaand + voorbeeld zal altijd werken. - The last argument (0.0.0.0) tells - PPP to start negotiations using address 0.0.0.0 rather than 10.0.0.1 and is necessary for some - ISPs. Do not use 0.0.0.0 as the first - argument to set ifaddr as it prevents - PPP from setting up an initial route in - mode. + Het laatste argument (0.0.0.0) + vertelt PPP om te onderhandelen met het adres 0.0.0.0 in plaats van met + 10.0.0.1 en is benodigd + voor sommige ISPs. Gebruik geen + 0.0.0.0 als eerste argument voor + set ifaddr, omdat dat ervoor zorgt + dat PPP geen initiele route kan opbrengen in + mode. - If you are not running in mode, you - will need to create an entry in - /etc/ppp/ppp.linkup. - ppp.linkup is used after a connection has - been established. At this point, ppp will - have assigned the interface addresses and it will now be - possible to add the routing table entries: + Als u niet draait in mode, moet + u een nieuwe regel toevoegen in + /etc/ppp/ppp.linkup. + ppp.linkup wordt gebruikt nadat er + een connectie is gemaakt. Op dit moment krijgt + ppp het interface adres en is het mogelijk + om route tabel regels toe te voegen: 1 provider: 2 add default HISADDR - Line 1: + Regel 1: - On establishing a connection, - ppp will look for an entry in - ppp.linkup according to the - following rules: First, try to match the same label - as we used in ppp.conf. If - that fails, look for an entry for the IP address of - our gateway. This entry is a four-octet IP style - label. If we still have not found an entry, look - for the MYADDR entry. + Bij het tot stand brengen van een verbinding + zal ppp kijken voor een + corresponderende regel in + ppp.linkup volgens de volgende + regels: Als eerste, probeer hetzelfde label te vinden + zoals gebruikt in ppp.conf. Als + dat mislukt, zoek dan een regel waarin het IP adres + van onze gateway in voorkomt. Deze regel is een + vier octets IP stijl label. Als we nog steeds geen + regel gevonden hebben, zoek dan naar de + MYADDR regel. - Line 2: + Reegl 2: - This line tells ppp to add a - default route that points to - HISADDR. - HISADDR will be replaced with the - IP number of the gateway as negotiated by the + Deze regel verteld ppp om + een standaard routering toe te voegen die wijst + richting HISADDR. + HISADDR wordt vervangen door + het IP adres van de gateway zoals onderhandeld door IPCP. - See the pmdemand entry in the files + Zie de pmdemand regel in de bestanden /usr/share/examples/ppp/ppp.conf.sample - and + en /usr/share/examples/ppp/ppp.linkup.sample - for a detailed example. + voor een gedetailleerd voorbeeld. - Receiving Incoming Calls + Het ontvangen van binnenkomende gesprekken PPP - receiving incoming calls + ontvangen van inkomende gesprekken - When you configure ppp to - receive incoming calls on a machine connected to a LAN, you - must decide if you wish to forward packets to the LAN. If you - do, you should allocate the peer an IP number from your LAN's - subnet, and use the command enable proxy in - your /etc/ppp/ppp.conf file. You should - also confirm that the /etc/rc.conf file - contains the following: + Wanneer ppp geconfigureerd + is om inkomende gesprekken te ontvangen op een machine die + verbonden is aan een LAN, moet u beslissen of er pakketten + worden doorgestuurd naar het LAN. Als u dat doet, moet + u de peer een IP adres geven uit uw LAN's subnet, en gebruik + maken van het commando enable proxy in + het /etc/ppp/ppp.conf bestand. U + moet ook bevestigen dat het /etc/rc.conf + bestand het volgende bevat: gateway_enable="YES" - Which getty? + Welke getty? - Configuring FreeBSD for Dial-up - Services provides a good description on enabling - dial-up services using &man.getty.8;. + Het configureren van &os; voor + inbel diensten levert een goede omschrijving van + het inschakelen van inbel diensten door gebruik te maken + van &man.getty.8;. - An alternative to getty is Een alternatief voor getty is mgetty, - a smarter version of getty designed - with dial-up lines in mind. + een slimmere versie van getty ontworpen + met inbel lijnen in het achterhoofd. - The advantages of using mgetty is - that it actively talks to modems, - meaning if port is turned off in - /etc/ttys then your modem will not answer - the phone. + De voordelen van het gebruik van + mgetty is dat het actief + praat tegen modems, wat betekend + dat als de port uitgeschakeld is in + /etc/ttys zal de modem de telefoon + niet beantwoorden. - Later versions of mgetty (from - 0.99beta onwards) also support the automatic detection of - PPP streams, allowing your clients script-less access to - your server. + Latere versies van mgetty (vanaf + 0.99beta en later) ondersteunen ook het automatisch + detecteren van PPP stromen waardoor cliënten + zonder extra scripting toegang kunnen krijgen tot uw + server. - Refer to Mgetty and - AutoPPP for more information on + Refereer naar Mgetty en + AutoPPP voor meer informatie over mgetty. - <application>PPP</application> Permissions + <application>PPP</application> Permissies - The ppp command must normally be - run as the root user. If however, - you wish to allow ppp to run in - server mode as a normal user by executing - ppp as described below, that user - must be given permission to run ppp - by adding them to the network group - in /etc/group. + Het ppp commando moet normaal + gesproken gestart worden door de root + gebruiker. Als u echter wilt toestaan dat + ppp in server mode gestart wordt door + een normale gebruiker door het uitvoeren van + ppp zoals beschreven hieronder moet + deze gebruiker permissies gegeven worden om + ppp te starten door deze toe te + voegen aan de network groep in + /etc/group. - You will also need to give them access to one or more - sections of the configuration file using the - allow command: + U moet ze ook toegang geven tot één + of meerdere secties in het configuratie bestand door + gebruik te maken van het allow + commando: allow users fred mary - If this command is used in the default - section, it gives the specified users access to - everything. + Als dit commando wordt gebruikt in de + default sectie, geeft het alle + gespecificeerde gebruikers toegang tot alles. @@ -1832,12 +1851,12 @@ Tom Rhodes - Contributed by + Bijgedragen door - Troubleshooting <acronym>PPP</acronym> Connections + Het troubleshooten van <acronym>PPP</acronym> connecties PPP @@ -2096,13 +2115,13 @@ Jim Mock - Contributed (from http://node.to/freebsd/how-tos/how-to-freebsd-pppoe.html) by + Bijgedragen (vanaf http://node.to/freebsd/how-tos/how-to-freebsd-pppoe.html) door - Using PPP over Ethernet (PPPoE) + PPP gebruiken over Ethernet (PPPoE) PPP From owner-p4-projects@FreeBSD.ORG Mon Sep 8 16:04:06 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 40860106566C; Mon, 8 Sep 2008 16:04: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 0466E106564A for ; Mon, 8 Sep 2008 16:04:06 +0000 (UTC) (envelope-from raj@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id EAE158FC18 for ; Mon, 8 Sep 2008 16:04:05 +0000 (UTC) (envelope-from raj@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 m88G45D1066350 for ; Mon, 8 Sep 2008 16:04:05 GMT (envelope-from raj@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m88G45u1066348 for perforce@freebsd.org; Mon, 8 Sep 2008 16:04:05 GMT (envelope-from raj@freebsd.org) Date: Mon, 8 Sep 2008 16:04:05 GMT Message-Id: <200809081604.m88G45u1066348@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to raj@freebsd.org using -f From: Rafal Jaworowski To: Perforce Change Reviews Cc: Subject: PERFORCE change 149427 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, 08 Sep 2008 16:04:06 -0000 http://perforce.freebsd.org/chv.cgi?CH=149427 Change 149427 by raj@raj_mimi on 2008/09/08 16:03:33 Do not use cached page for temporary mapping in pmap_zero_page_generic() We can safely use a cached page for the temporary mapping only if d-cache write-allocate feature is disabled or not present. The physical page which we zero here is accessed via *additional* kernel mapping for the period of zeroing operation. However with WA enabled we can have modified but unflushed content pertaining to this physical page still in the d-cache due to its primary mapping. In this case when that cached content is flushed it will overwrite [portions of] the physical page we want to zero here. This is a general problem with multiple virtual mappings covering the same physical page with write-allocate d-cache: there is inherent potential for corruptions of this kind, which are not easily resolved; it it best policy that such multiple mappings are not allowed. Affected files ... .. //depot/projects/arm/src/sys/arm/arm/pmap.c#40 edit Differences ... ==== //depot/projects/arm/src/sys/arm/arm/pmap.c#40 (text+ko) ==== @@ -3851,21 +3851,19 @@ mtx_lock(&cmtx); /* - * Hook in the page, zero it, and purge the cache for that - * zeroed page. Invalidate the TLB as needed. + * Hook in the page, zero it, invalidate the TLB as needed. + * + * Note the temporary zero-page mapping must be a non-cached page in + * ordert to work without corruption when write-allocate is enabled. */ - *cdst_pte = L2_S_PROTO | phys | - L2_S_PROT(PTE_KERNEL, VM_PROT_WRITE) | pte_l2_s_cache_mode; - PTE_SYNC(cdst_pte); + *cdst_pte = L2_S_PROTO | phys | L2_S_PROT(PTE_KERNEL, VM_PROT_WRITE); cpu_tlb_flushD_SE(cdstp); cpu_cpwait(); - if (off || size != PAGE_SIZE) { + if (off || size != PAGE_SIZE) bzero((void *)(cdstp + off), size); - cpu_dcache_wbinv_range(cdstp + off, size); - } else { + else bzero_page(cdstp); - cpu_dcache_wbinv_range(cdstp, PAGE_SIZE); - } + mtx_unlock(&cmtx); #endif } From owner-p4-projects@FreeBSD.ORG Mon Sep 8 16:46:50 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 82DCB1065679; Mon, 8 Sep 2008 16:46: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 46E40106566B for ; Mon, 8 Sep 2008 16:46:50 +0000 (UTC) (envelope-from raj@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 399CA8FC27 for ; Mon, 8 Sep 2008 16:46:50 +0000 (UTC) (envelope-from raj@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 m88GkoVf032334 for ; Mon, 8 Sep 2008 16:46:50 GMT (envelope-from raj@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m88GkoSD032332 for perforce@freebsd.org; Mon, 8 Sep 2008 16:46:50 GMT (envelope-from raj@freebsd.org) Date: Mon, 8 Sep 2008 16:46:50 GMT Message-Id: <200809081646.m88GkoSD032332@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to raj@freebsd.org using -f From: Rafal Jaworowski To: Perforce Change Reviews Cc: Subject: PERFORCE change 149432 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, 08 Sep 2008 16:46:50 -0000 http://perforce.freebsd.org/chv.cgi?CH=149432 Change 149432 by raj@raj_mimi on 2008/09/08 16:46:41 Cosmetics. Affected files ... .. //depot/projects/arm/src/sys/arm/mv/common.c#2 edit .. //depot/projects/arm/src/sys/arm/mv/orion/db88f5xxx.c#4 edit Differences ... ==== //depot/projects/arm/src/sys/arm/mv/common.c#2 (text+ko) ==== @@ -29,6 +29,9 @@ * SUCH DAMAGE. */ +#include +__FBSDID("$FreeBSD$"); + #include #include @@ -37,8 +40,6 @@ #include #include -/* Prototypes */ - static int win_eth_can_remap(int i); static int decode_win_cpu_valid(void); ==== //depot/projects/arm/src/sys/arm/mv/orion/db88f5xxx.c#4 (text+ko) ==== @@ -47,6 +47,22 @@ #include #include +/* + * Virtual address space layout: + * ----------------------------- + * 0x0000_0000 - 0xbfff_ffff : user process + * + * 0xc040_0000 - virtual_avail : kerel reserved (text, data, page tables + * : structures, ARM stacks etc.) + * virtual_avail - 0xefff_ffff : KVA (virtual_avail is typically < 0xc0a0_0000) + * 0xf000_0000 - 0xf0ff_ffff : no-cache allocation area (16MB) + * 0xf100_0000 - 0xf10f_ffff : SoC integrated devices registers range (1MB) + * 0xf110_0000 - 0xfffe_ffff : PCI, PCIE outbound windows (MEM+IO) + * 0xffff_0000 - 0xffff_0fff : 'high' vectors page (4KB) + * 0xffff_1000 - 0xffff_1fff : ARM_TP_ADDRESS/RAS page (4KB) + * 0xffff_2000 - 0xffff_ffff : unused (~55KB) + */ + const struct pmap_devmap *pmap_devmap_bootstrap_table; vm_offset_t pmap_bootstrap_lastaddr; @@ -101,22 +117,6 @@ { 0, 0, 0, 0, 0, } }; -/* - * Virtual address space layout: - * ----------------------------- - * 0x0000_0000 - 0xbfff_ffff : user process - * - * 0xc040_0000 - virtual_avail : kerel reserved (text, data, page tables - * : structures, ARM stacks etc.) - * virtual_avail - 0xefff_ffff : KVA (virtual_avail is typically < 0xc0a0_0000) - * 0xf000_0000 - 0xf0ff_ffff : no-cache allocation area (16MB) - * 0xf100_0000 - 0xf10f_ffff : SoC integrated devices registers range (1MB) - * 0xf110_0000 - 0xfffe_ffff : unused (~238MB -- PCI/PEX etc. windows will go here!) - * 0xffff_0000 - 0xffff_0fff : 'high' vectors page (4KB) - * 0xffff_1000 - 0xffff_1fff : ARM_TP_ADDRESS/RAS page (4KB) - * 0xffff_2000 - 0xffff_ffff : unused (~55KB) - */ - #if 0 int platform_pci_get_irq(u_int bus, u_int slot, u_int func, u_int pin) { From owner-p4-projects@FreeBSD.ORG Mon Sep 8 16:56:01 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 172F81065674; Mon, 8 Sep 2008 16:56: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 B5AA4106566C for ; Mon, 8 Sep 2008 16:56:00 +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 A70D38FC18 for ; Mon, 8 Sep 2008 16:56:00 +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 m88Gu0fI001046 for ; Mon, 8 Sep 2008 16:56:00 GMT (envelope-from zec@tel.fer.hr) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m88GtxbV000906 for perforce@freebsd.org; Mon, 8 Sep 2008 16:55:59 GMT (envelope-from zec@tel.fer.hr) Date: Mon, 8 Sep 2008 16:55:59 GMT Message-Id: <200809081655.m88GtxbV000906@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 149433 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, 08 Sep 2008 16:56:01 -0000 http://perforce.freebsd.org/chv.cgi?CH=149433 Change 149433 by zec@zec_tpx32 on 2008/09/08 16:55:34 First-cut replacement of VNET_ITERLOOP_BEGIN() / VNET_ITERLOOP_END() kludges with VNET_FOREACH() constructs discussed at freebsd-virtualization@ Needs a bit more testing before merging over to vimage-commit2 branch. Affected files ... .. //depot/projects/vimage/src/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb.c#3 edit .. //depot/projects/vimage/src/sys/kern/kern_vimage.c#66 edit .. //depot/projects/vimage/src/sys/net/if.c#36 edit .. //depot/projects/vimage/src/sys/net/if_ef.c#6 edit .. //depot/projects/vimage/src/sys/net80211/ieee80211_ddb.c#8 edit .. //depot/projects/vimage/src/sys/netgraph/atm/ng_atm.c#6 edit .. //depot/projects/vimage/src/sys/netgraph/ng_gif.c#7 edit .. //depot/projects/vimage/src/sys/netinet/igmp.c#15 edit .. //depot/projects/vimage/src/sys/netinet/in_pcb.c#29 edit .. //depot/projects/vimage/src/sys/netinet/in_rmx.c#18 edit .. //depot/projects/vimage/src/sys/netinet/ip_input.c#32 edit .. //depot/projects/vimage/src/sys/netinet/tcp_subr.c#47 edit .. //depot/projects/vimage/src/sys/netinet/tcp_timer.c#20 edit .. //depot/projects/vimage/src/sys/netinet6/frag6.c#17 edit .. //depot/projects/vimage/src/sys/netipsec/key.c#20 edit .. //depot/projects/vimage/src/sys/sys/vimage.h#63 edit Differences ... ==== //depot/projects/vimage/src/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb.c#3 (text+ko) ==== @@ -218,6 +218,7 @@ static int iwch_init_module(void) { + VNET_ITERATOR_DECL(vnet_iter); int err; struct ifnet *ifp; @@ -239,12 +240,13 @@ /* Register existing TOE interfaces by walking the ifnet chain */ IFNET_RLOCK(); - VNET_ITERLOOP_BEGIN(); - INIT_VNET_NET(curvnet); - TAILQ_FOREACH(ifp, &V_ifnet, if_link) { - (void)ifaddr_event_handler(NULL, ifp); + VNET_FOREACH(vnet_iter) { + CURVNET_SET(vnet_iter); /* XXX CURVNET_SET_QUIET() ? */ + INIT_VNET_NET(vnet_iter); + TAILQ_FOREACH(ifp, &V_ifnet, if_link) + (void)ifaddr_event_handler(NULL, ifp); + CURVNET_RESTORE(); } - VNET_ITERLOOP_END(); IFNET_RUNLOCK(); return 0; } ==== //depot/projects/vimage/src/sys/kern/kern_vimage.c#66 (text+ko) ==== @@ -187,13 +187,16 @@ void vnet_mod_complete_registration(struct vnet_modlink *vml) { + VNET_ITERATOR_DECL(vnet_iter); struct vnet_modlink *vml_iter; TAILQ_INSERT_TAIL(&vnet_modlink_head, vml, vml_mod_le); - VNET_ITERLOOP_BEGIN_QUIET(); + VNET_FOREACH(vnet_iter) { + CURVNET_SET_QUIET(vnet_iter); vnet_mod_constructor(vml); - VNET_ITERLOOP_END(); + CURVNET_RESTORE(); + } /* Check for pending modules depending on us */ do { @@ -225,6 +228,7 @@ vnet_mod_deregister_multi(const struct vnet_modinfo *vmi, void *iarg, char *iname) { + VNET_ITERATOR_DECL(vnet_iter); struct vnet_modlink *vml; TAILQ_FOREACH(vml, &vnet_modlink_head, vml_mod_le) @@ -234,9 +238,11 @@ panic("cannot deregister unregistered vnet module %s", vmi->vmi_name); - VNET_ITERLOOP_BEGIN_QUIET(); + VNET_FOREACH(vnet_iter) { + CURVNET_SET_QUIET(vnet_iter); vnet_mod_destructor(vml); - VNET_ITERLOOP_END(); + CURVNET_RESTORE(); + } TAILQ_REMOVE(&vnet_modlink_head, vml, vml_mod_le); vi_free(vml, M_VIMAGE); @@ -976,9 +982,11 @@ DB_SHOW_COMMAND(vnets, db_show_vnets) { + VNET_ITERATOR_DECL(vnet_iter); + db_printf(" vnet ifs socks"); db_printf(" net inet inet6 ipsec netgraph\n"); - VNET_ITERLOOP_BEGIN_QUIET(); + VNET_FOREACH(vnet_iter) { db_printf("%p %3d %5d", vnet_iter, vnet_iter->ifccnt, vnet_iter->sockcnt); db_vnet_ptr(vnet_iter->mod_data[VNET_MOD_NET]); @@ -987,6 +995,6 @@ db_vnet_ptr(vnet_iter->mod_data[VNET_MOD_IPSEC]); db_vnet_ptr(vnet_iter->mod_data[VNET_MOD_NETGRAPH]); db_printf("\n"); - VNET_ITERLOOP_END(); + } } #endif ==== //depot/projects/vimage/src/sys/net/if.c#36 (text+ko) ==== @@ -1637,19 +1637,24 @@ static void if_slowtimo(void *arg) { + VNET_ITERATOR_DECL(vnet_iter); struct ifnet *ifp; int s = splimp(); IFNET_RLOCK(); - VNET_ITERLOOP_BEGIN(); - INIT_VNET_NET(curvnet); - TAILQ_FOREACH(ifp, &V_ifnet, if_link) { - if (ifp->if_timer == 0 || --ifp->if_timer) - continue; - if (ifp->if_watchdog) - (*ifp->if_watchdog)(ifp); + VNET_LIST_REF(); + VNET_FOREACH(vnet_iter) { + CURVNET_SET(vnet_iter); + INIT_VNET_NET(vnet_iter); + TAILQ_FOREACH(ifp, &V_ifnet, if_link) { + if (ifp->if_timer == 0 || --ifp->if_timer) + continue; + if (ifp->if_watchdog) + (*ifp->if_watchdog)(ifp); + } + CURVNET_RESTORE(); } - VNET_ITERLOOP_END(); + VNET_LIST_UNREF(); IFNET_RUNLOCK(); splx(s); timeout(if_slowtimo, (void *)0, hz / IFNET_SLOWHZ); ==== //depot/projects/vimage/src/sys/net/if_ef.c#6 (text+ko) ==== @@ -485,46 +485,47 @@ static int ef_load(void) { + VNET_ITERATOR_DECL(vnet_iter); struct ifnet *ifp; struct efnet *efp; struct ef_link *efl = NULL, *efl_temp; int error = 0, d; IFNET_RLOCK(); - { - VNET_ITERLOOP_BEGIN_QUIET(); - INIT_VNET_NET(curvnet); - TAILQ_FOREACH(ifp, &V_ifnet, if_link) { - if (ifp->if_type != IFT_ETHER) continue; - EFDEBUG("Found interface %s\n", ifp->if_xname); - efl = (struct ef_link*)malloc(sizeof(struct ef_link), - M_IFADDR, M_WAITOK | M_ZERO); - if (efl == NULL) { - error = ENOMEM; - break; - } + VNET_FOREACH(vnet_iter) { + CURVNET_SET(vnet_iter); + INIT_VNET_NET(vnet_iter); + TAILQ_FOREACH(ifp, &V_ifnet, if_link) { + if (ifp->if_type != IFT_ETHER) continue; + EFDEBUG("Found interface %s\n", ifp->if_xname); + efl = (struct ef_link*)malloc(sizeof(struct ef_link), + M_IFADDR, M_WAITOK | M_ZERO); + if (efl == NULL) { + error = ENOMEM; + break; + } - efl->el_ifp = ifp; + efl->el_ifp = ifp; #ifdef ETHER_II - error = ef_clone(efl, ETHER_FT_EII); - if (error) break; + error = ef_clone(efl, ETHER_FT_EII); + if (error) break; #endif #ifdef ETHER_8023 - error = ef_clone(efl, ETHER_FT_8023); - if (error) break; + error = ef_clone(efl, ETHER_FT_8023); + if (error) break; #endif #ifdef ETHER_8022 - error = ef_clone(efl, ETHER_FT_8022); - if (error) break; + error = ef_clone(efl, ETHER_FT_8022); + if (error) break; #endif #ifdef ETHER_SNAP - error = ef_clone(efl, ETHER_FT_SNAP); - if (error) break; + error = ef_clone(efl, ETHER_FT_SNAP); + if (error) break; #endif - efcount++; - SLIST_INSERT_HEAD(&efdev, efl, el_next); - } - VNET_ITERLOOP_END(); + efcount++; + SLIST_INSERT_HEAD(&efdev, efl, el_next); + } + CURVNET_RESTORE(); } IFNET_RUNLOCK(); if (error) { ==== //depot/projects/vimage/src/sys/net80211/ieee80211_ddb.c#8 (text+ko) ==== @@ -184,6 +184,7 @@ DB_SHOW_ALL_COMMAND(vaps, db_show_all_vaps) { + VNET_ITERATOR_DECL(vnet_iter); const struct ifnet *ifp; int i, showall = 0; @@ -194,24 +195,25 @@ break; } - VNET_ITERLOOP_BEGIN(); - INIT_VNET_NET(vnet_iter); - TAILQ_FOREACH(ifp, &V_ifnet, if_list) - if (ifp->if_type == IFT_IEEE80211) { - const struct ieee80211com *ic = ifp->if_l2com; + VNET_FOREACH(vnet_iter) { + INIT_VNET_NET(vnet_iter); + TAILQ_FOREACH(ifp, &V_ifnet, if_list) + if (ifp->if_type == IFT_IEEE80211) { + const struct ieee80211com *ic = ifp->if_l2com; - if (!showall) { - const struct ieee80211vap *vap; - db_printf("%s: com %p vaps:", - ifp->if_xname, ic); - TAILQ_FOREACH(vap, &ic->ic_vaps, iv_next) - db_printf(" %s(%p)", - vap->iv_ifp->if_xname, vap); - db_printf("\n"); - } else - _db_show_com(ic, 1, 1, 1); - } - VNET_ITERLOOP_END(); + if (!showall) { + const struct ieee80211vap *vap; + db_printf("%s: com %p vaps:", + ifp->if_xname, ic); + TAILQ_FOREACH(vap, &ic->ic_vaps, + iv_next) + db_printf(" %s(%p)", + vap->iv_ifp->if_xname, vap); + db_printf("\n"); + } else + _db_show_com(ic, 1, 1, 1); + } + } } static void ==== //depot/projects/vimage/src/sys/netgraph/atm/ng_atm.c#6 (text+ko) ==== @@ -1380,6 +1380,7 @@ static int ng_atm_mod_event(module_t mod, int event, void *data) { + VNET_ITERATOR_DECL(vnet_iter); struct ifnet *ifp; int error = 0; @@ -1402,15 +1403,15 @@ ng_atm_input_orphan_p = ng_atm_input_orphans; ng_atm_event_p = ng_atm_event; - { - VNET_ITERLOOP_BEGIN_QUIET(); - INIT_VNET_NET(curvnet); - /* Create nodes for existing ATM interfaces */ - TAILQ_FOREACH(ifp, &V_ifnet, if_link) { - if (ifp->if_type == IFT_ATM) - ng_atm_attach(ifp); - } - VNET_ITERLOOP_END(); + VNET_FOREACH(vnet_iter) { + CURVNET_SET_QUIET(vnet_iter); + INIT_VNET_NET(vnet_iter); + /* Create nodes for existing ATM interfaces */ + TAILQ_FOREACH(ifp, &V_ifnet, if_link) { + if (ifp->if_type == IFT_ATM) + ng_atm_attach(ifp); + } + CURVNET_RESTORE(); } IFNET_RUNLOCK(); break; @@ -1425,14 +1426,14 @@ ng_atm_input_orphan_p = NULL; ng_atm_event_p = NULL; - { - VNET_ITERLOOP_BEGIN_QUIET(); - INIT_VNET_NET(curvnet); - TAILQ_FOREACH(ifp, &V_ifnet, if_link) { - if (ifp->if_type == IFT_ATM) - ng_atm_detach(ifp); - } - VNET_ITERLOOP_END(); + VNET_FOREACH(vnet_iter) { + CURVNET_SET_QUIET(vnet_iter); + INIT_VNET_NET(vnet_iter); + TAILQ_FOREACH(ifp, &V_ifnet, if_link) { + if (ifp->if_type == IFT_ATM) + ng_atm_detach(ifp); + } + CURVNET_RESTORE(); } IFNET_RUNLOCK(); break; ==== //depot/projects/vimage/src/sys/netgraph/ng_gif.c#7 (text+ko) ==== @@ -542,6 +542,7 @@ static int ng_gif_mod_event(module_t mod, int event, void *data) { + VNET_ITERATOR_DECL(vnet_iter); struct ifnet *ifp; int error = 0; int s; @@ -562,13 +563,15 @@ /* Create nodes for any already-existing gif interfaces */ IFNET_RLOCK(); - VNET_ITERLOOP_BEGIN_QUIET(); - INIT_VNET_NET(curvnet); - TAILQ_FOREACH(ifp, &V_ifnet, if_link) { - if (ifp->if_type == IFT_GIF) - ng_gif_attach(ifp); + VNET_FOREACH(vnet_iter) { + CURVNET_SET_QUIET(vnet_iter); /* XXX revisit quiet */ + INIT_VNET_NET(curvnet); + TAILQ_FOREACH(ifp, &V_ifnet, if_link) { + if (ifp->if_type == IFT_GIF) + ng_gif_attach(ifp); + } + CURVNET_RESTORE(); } - VNET_ITERLOOP_END(); IFNET_RUNLOCK(); break; ==== //depot/projects/vimage/src/sys/netinet/igmp.c#15 (text+ko) ==== @@ -426,6 +426,7 @@ void igmp_fasttimo(void) { + VNET_ITERATOR_DECL(vnet_iter); register struct in_multi *inm; struct in_multistep step; @@ -439,41 +440,46 @@ IN_MULTI_LOCK(); igmp_timers_are_running = 0; - VNET_ITERLOOP_BEGIN(); - INIT_VNET_INET(vnet_iter); - IN_FIRST_MULTI(step, inm); - while (inm != NULL) { - if (inm->inm_timer == 0) { - /* do nothing */ - } else if (--inm->inm_timer == 0) { - igmp_sendpkt(inm, inm->inm_rti->rti_type, 0); - inm->inm_state = IGMP_IREPORTEDLAST; - } else { - igmp_timers_are_running = 1; + VNET_FOREACH(vnet_iter) { + CURVNET_SET(vnet_iter); + INIT_VNET_INET(vnet_iter); + IN_FIRST_MULTI(step, inm); + while (inm != NULL) { + if (inm->inm_timer == 0) { + /* do nothing */ + } else if (--inm->inm_timer == 0) { + igmp_sendpkt(inm, inm->inm_rti->rti_type, 0); + inm->inm_state = IGMP_IREPORTEDLAST; + } else { + igmp_timers_are_running = 1; + } + IN_NEXT_MULTI(step, inm); } - IN_NEXT_MULTI(step, inm); + CURVNET_RESTORE(); } - VNET_ITERLOOP_END(); IN_MULTI_UNLOCK(); } void igmp_slowtimo(void) { + VNET_ITERATOR_DECL(vnet_iter); struct router_info *rti; IGMP_PRINTF("[igmp.c,_slowtimo] -- > entering \n"); mtx_lock(&igmp_mtx); - VNET_ITERLOOP_BEGIN() - INIT_VNET_INET(vnet_iter); - SLIST_FOREACH(rti, &V_router_info_head, rti_list) { - if (rti->rti_type == IGMP_V1_ROUTER) { - rti->rti_time++; - if (rti->rti_time >= IGMP_AGE_THRESHOLD) - rti->rti_type = IGMP_V2_ROUTER; + VNET_FOREACH(vnet_iter) { + CURVNET_SET(vnet_iter); + INIT_VNET_INET(vnet_iter); + SLIST_FOREACH(rti, &V_router_info_head, rti_list) { + if (rti->rti_type == IGMP_V1_ROUTER) { + rti->rti_time++; + if (rti->rti_time >= IGMP_AGE_THRESHOLD) + rti->rti_type = IGMP_V2_ROUTER; + } } + CURVNET_RESTORE(); } - VNET_ITERLOOP_END() mtx_unlock(&igmp_mtx); IGMP_PRINTF("[igmp.c,_slowtimo] -- > exiting \n"); } ==== //depot/projects/vimage/src/sys/netinet/in_pcb.c#29 (text+ko) ==== @@ -1221,16 +1221,20 @@ void ipport_tick(void *xtp) { + VNET_ITERATOR_DECL(vnet_iter); - VNET_ITERLOOP_BEGIN(); - INIT_VNET_INET(curvnet); - if (V_ipport_tcpallocs <= V_ipport_tcplastcount + V_ipport_randomcps) { - if (V_ipport_stoprandom > 0) - V_ipport_stoprandom--; - } else - V_ipport_stoprandom = V_ipport_randomtime; - V_ipport_tcplastcount = V_ipport_tcpallocs; - VNET_ITERLOOP_END(); + VNET_FOREACH(vnet_iter) { + CURVNET_SET(vnet_iter); /* XXX appease INVARIANTS here */ + INIT_VNET_INET(vnet_iter); + if (V_ipport_tcpallocs <= + V_ipport_tcplastcount + V_ipport_randomcps) { + if (V_ipport_stoprandom > 0) + V_ipport_stoprandom--; + } else + V_ipport_stoprandom = V_ipport_randomtime; + V_ipport_tcplastcount = V_ipport_tcpallocs; + CURVNET_RESTORE(); + } callout_reset(&ipport_tick_callout, hz, ipport_tick, NULL); } ==== //depot/projects/vimage/src/sys/netinet/in_rmx.c#18 (text+ko) ==== @@ -336,25 +336,28 @@ void in_rtqdrain(void) { + VNET_ITERATOR_DECL(vnet_iter); struct radix_node_head *rnh; struct rtqk_arg arg; int fibnum; - VNET_ITERLOOP_BEGIN(); - INIT_VNET_NET(vnet_iter); + VNET_FOREACH(vnet_iter) { + CURVNET_SET(vnet_iter); + INIT_VNET_NET(vnet_iter); - for ( fibnum = 0; fibnum < rt_numfibs; fibnum++) { - rnh = V_rt_tables[fibnum][AF_INET]; - arg.found = arg.killed = 0; - arg.rnh = rnh; - arg.nextstop = 0; - arg.draining = 1; - arg.updating = 0; - RADIX_NODE_HEAD_LOCK(rnh); - rnh->rnh_walktree(rnh, in_rtqkill, &arg); - RADIX_NODE_HEAD_UNLOCK(rnh); + for ( fibnum = 0; fibnum < rt_numfibs; fibnum++) { + rnh = V_rt_tables[fibnum][AF_INET]; + arg.found = arg.killed = 0; + arg.rnh = rnh; + arg.nextstop = 0; + arg.draining = 1; + arg.updating = 0; + RADIX_NODE_HEAD_LOCK(rnh); + rnh->rnh_walktree(rnh, in_rtqkill, &arg); + RADIX_NODE_HEAD_UNLOCK(rnh); + } + CURVNET_RESTORE(); } - VNET_ITERLOOP_END(); } static int _in_rt_was_here; ==== //depot/projects/vimage/src/sys/netinet/ip_input.c#32 (text+ko) ==== @@ -1145,39 +1145,45 @@ void ip_slowtimo(void) { + VNET_ITERATOR_DECL(vnet_iter); struct ipq *fp; int i; IPQ_LOCK(); - VNET_ITERLOOP_BEGIN(); - INIT_VNET_INET(vnet_iter); - for (i = 0; i < IPREASS_NHASH; i++) { - for(fp = TAILQ_FIRST(&V_ipq[i]); fp;) { - struct ipq *fpp; + VNET_FOREACH(vnet_iter) { + CURVNET_SET(vnet_iter); + INIT_VNET_INET(vnet_iter); + for (i = 0; i < IPREASS_NHASH; i++) { + for(fp = TAILQ_FIRST(&V_ipq[i]); fp;) { + struct ipq *fpp; - fpp = fp; - fp = TAILQ_NEXT(fp, ipq_list); - if(--fpp->ipq_ttl == 0) { - V_ipstat.ips_fragtimeout += fpp->ipq_nfrags; - ip_freef(&V_ipq[i], fpp); + fpp = fp; + fp = TAILQ_NEXT(fp, ipq_list); + if(--fpp->ipq_ttl == 0) { + V_ipstat.ips_fragtimeout += + fpp->ipq_nfrags; + ip_freef(&V_ipq[i], fpp); + } } } - } - /* - * If we are over the maximum number of fragments - * (due to the limit being lowered), drain off - * enough to get down to the new limit. - */ - if (V_maxnipq >= 0 && V_nipq > V_maxnipq) { - for (i = 0; i < IPREASS_NHASH; i++) { - while (V_nipq > V_maxnipq && !TAILQ_EMPTY(&V_ipq[i])) { - V_ipstat.ips_fragdropped += - TAILQ_FIRST(&V_ipq[i])->ipq_nfrags; - ip_freef(&V_ipq[i], TAILQ_FIRST(&V_ipq[i])); + /* + * If we are over the maximum number of fragments + * (due to the limit being lowered), drain off + * enough to get down to the new limit. + */ + if (V_maxnipq >= 0 && V_nipq > V_maxnipq) { + for (i = 0; i < IPREASS_NHASH; i++) { + while (V_nipq > V_maxnipq && + !TAILQ_EMPTY(&V_ipq[i])) { + V_ipstat.ips_fragdropped += + TAILQ_FIRST(&V_ipq[i])->ipq_nfrags; + ip_freef(&V_ipq[i], + TAILQ_FIRST(&V_ipq[i])); + } } } + CURVNET_RESTORE(); } - VNET_ITERLOOP_END(); IPQ_UNLOCK(); } @@ -1187,19 +1193,22 @@ void ip_drain(void) { + VNET_ITERATOR_DECL(vnet_iter); int i; IPQ_LOCK(); - VNET_ITERLOOP_BEGIN(); - INIT_VNET_INET(vnet_iter); - for (i = 0; i < IPREASS_NHASH; i++) { - while(!TAILQ_EMPTY(&V_ipq[i])) { - V_ipstat.ips_fragdropped += - TAILQ_FIRST(&V_ipq[i])->ipq_nfrags; - ip_freef(&V_ipq[i], TAILQ_FIRST(&V_ipq[i])); + VNET_FOREACH(vnet_iter) { + CURVNET_SET(vnet_iter); + INIT_VNET_INET(vnet_iter); + for (i = 0; i < IPREASS_NHASH; i++) { + while(!TAILQ_EMPTY(&V_ipq[i])) { + V_ipstat.ips_fragdropped += + TAILQ_FIRST(&V_ipq[i])->ipq_nfrags; + ip_freef(&V_ipq[i], TAILQ_FIRST(&V_ipq[i])); + } } + CURVNET_RESTORE(); } - VNET_ITERLOOP_END(); IPQ_UNLOCK(); in_rtqdrain(); } ==== //depot/projects/vimage/src/sys/netinet/tcp_subr.c#47 (text+ko) ==== @@ -903,8 +903,13 @@ void tcp_drain(void) { - if (do_tcpdrain) { - VNET_ITERLOOP_BEGIN(); + VNET_ITERATOR_DECL(vnet_iter); + + if (!do_tcpdrain) + return; + + VNET_FOREACH(vnet_iter) { + CURVNET_SET(vnet_iter); INIT_VNET_INET(vnet_iter); struct inpcb *inpb; struct tcpcb *tcpb; @@ -937,7 +942,7 @@ INP_WUNLOCK(inpb); } INP_INFO_RUNLOCK(&V_tcbinfo); - VNET_ITERLOOP_END(); + CURVNET_RESTORE(); } } @@ -1546,18 +1551,22 @@ static void tcp_isn_tick(void *xtp) { + VNET_ITERATOR_DECL(vnet_iter); u_int32_t projected_offset; ISN_LOCK(); - VNET_ITERLOOP_BEGIN(); - INIT_VNET_INET(curvnet); - projected_offset = V_isn_offset_old + ISN_BYTES_PER_SECOND / 100; + VNET_FOREACH(vnet_iter) { + CURVNET_SET(vnet_iter); /* XXX appease INVARIANTS */ + INIT_VNET_INET(curvnet); + projected_offset = + V_isn_offset_old + ISN_BYTES_PER_SECOND / 100; - if (SEQ_GT(projected_offset, V_isn_offset)) - V_isn_offset = projected_offset; + if (SEQ_GT(projected_offset, V_isn_offset)) + V_isn_offset = projected_offset; - V_isn_offset_old = V_isn_offset; - VNET_ITERLOOP_END(); + V_isn_offset_old = V_isn_offset; + CURVNET_RESTORE(); + } callout_reset(&isn_callout, hz/100, tcp_isn_tick, NULL); ISN_UNLOCK(); } ==== //depot/projects/vimage/src/sys/netinet/tcp_timer.c#20 (text+ko) ==== @@ -126,14 +126,17 @@ void tcp_slowtimo(void) { + VNET_ITERATOR_DECL(vnet_iter); - VNET_ITERLOOP_BEGIN(); - INIT_VNET_INET(vnet_iter); - tcp_maxidle = tcp_keepcnt * tcp_keepintvl; - INP_INFO_WLOCK(&V_tcbinfo); - (void) tcp_tw_2msl_scan(0); - INP_INFO_WUNLOCK(&V_tcbinfo); - VNET_ITERLOOP_END(); + VNET_FOREACH(vnet_iter) { + CURVNET_SET(vnet_iter); + INIT_VNET_INET(vnet_iter); + tcp_maxidle = tcp_keepcnt * tcp_keepintvl; + INP_INFO_WLOCK(&V_tcbinfo); + (void) tcp_tw_2msl_scan(0); + INP_INFO_WUNLOCK(&V_tcbinfo); + CURVNET_RESTORE(); + } } int tcp_syn_backoff[TCP_MAXRXTSHIFT + 1] = ==== //depot/projects/vimage/src/sys/netinet6/frag6.c#17 (text+ko) ==== @@ -693,34 +693,37 @@ void frag6_slowtimo(void) { + VNET_ITERATOR_DECL(vnet_iter); struct ip6q *q6; IP6Q_LOCK(); - VNET_ITERLOOP_BEGIN() - INIT_VNET_INET6(curvnet); - q6 = V_ip6q.ip6q_next; - if (q6) - while (q6 != &V_ip6q) { - --q6->ip6q_ttl; - q6 = q6->ip6q_next; - if (q6->ip6q_prev->ip6q_ttl == 0) { - V_ip6stat.ip6s_fragtimeout++; - /* XXX in6_ifstat_inc(ifp, ifs6_reass_fail) */ - frag6_freef(q6->ip6q_prev); + VNET_FOREACH(vnet_iter) { + CURVNET_SET(vnet_iter); + INIT_VNET_INET6(curvnet); + q6 = V_ip6q.ip6q_next; + if (q6) + while (q6 != &V_ip6q) { + --q6->ip6q_ttl; + q6 = q6->ip6q_next; + if (q6->ip6q_prev->ip6q_ttl == 0) { + V_ip6stat.ip6s_fragtimeout++; + /* XXX in6_ifstat_inc(ifp, ifs6_reass_fail) */ + frag6_freef(q6->ip6q_prev); + } } + /* + * If we are over the maximum number of fragments + * (due to the limit being lowered), drain off + * enough to get down to the new limit. + */ + while (V_frag6_nfragpackets > (u_int)V_ip6_maxfragpackets && + V_ip6q.ip6q_prev) { + V_ip6stat.ip6s_fragoverflow++; + /* XXX in6_ifstat_inc(ifp, ifs6_reass_fail) */ + frag6_freef(V_ip6q.ip6q_prev); } - /* - * If we are over the maximum number of fragments - * (due to the limit being lowered), drain off - * enough to get down to the new limit. - */ - while (V_frag6_nfragpackets > (u_int)V_ip6_maxfragpackets && - V_ip6q.ip6q_prev) { - V_ip6stat.ip6s_fragoverflow++; - /* XXX in6_ifstat_inc(ifp, ifs6_reass_fail) */ - frag6_freef(V_ip6q.ip6q_prev); + CURVNET_RESTORE(); } - VNET_ITERLOOP_END() IP6Q_UNLOCK(); #if 0 @@ -746,16 +749,19 @@ void frag6_drain(void) { + VNET_ITERATOR_DECL(vnet_iter); if (IP6Q_TRYLOCK() == 0) return; - VNET_ITERLOOP_BEGIN() - INIT_VNET_INET6(curvnet); - while (V_ip6q.ip6q_next != &V_ip6q) { - V_ip6stat.ip6s_fragdropped++; - /* XXX in6_ifstat_inc(ifp, ifs6_reass_fail) */ - frag6_freef(V_ip6q.ip6q_next); + VNET_FOREACH(vnet_iter) { + CURVNET_SET(vnet_iter); + INIT_VNET_INET6(vnet_iter); + while (V_ip6q.ip6q_next != &V_ip6q) { + V_ip6stat.ip6s_fragdropped++; + /* XXX in6_ifstat_inc(ifp, ifs6_reass_fail) */ + frag6_freef(V_ip6q.ip6q_next); + } + CURVNET_RESTORE(); } - VNET_ITERLOOP_END() IP6Q_UNLOCK(); } ==== //depot/projects/vimage/src/sys/netipsec/key.c#20 (text+ko) ==== @@ -4344,14 +4344,17 @@ void key_timehandler(void) { + VNET_ITERATOR_DECL(vnet_iter); time_t now = time_second; - VNET_ITERLOOP_BEGIN(); - key_flush_spd(now); - key_flush_sad(now); - key_flush_acq(now); - key_flush_spacq(now); - VNET_ITERLOOP_END(); + VNET_FOREACH(vnet_iter) { + CURVNET_SET(vnet_iter); + key_flush_spd(now); + key_flush_sad(now); + key_flush_acq(now); + key_flush_spacq(now); + CURVNET_RESTORE(); + } #ifndef IPSEC_DEBUG2 /* do exchange to tick time !! */ ==== //depot/projects/vimage/src/sys/sys/vimage.h#63 (text+ko) ==== @@ -219,23 +219,6 @@ vnet, curvnet); \ modtype *sym = (vnet)->mod_data[modindex]; -#define VNET_ITERLOOP_BEGIN() \ - struct vnet *vnet_iter; \ - VNET_LIST_REF(); \ - LIST_FOREACH(vnet_iter, &vnet_head, vnet_le) { \ - CURVNET_SET(vnet_iter); - -#define VNET_ITERLOOP_BEGIN_QUIET() \ - struct vnet *vnet_iter; \ - VNET_LIST_REF(); \ - LIST_FOREACH(vnet_iter, &vnet_head, vnet_le) { \ - CURVNET_SET_QUIET(vnet_iter); - -#define VNET_ITERLOOP_END() \ - CURVNET_RESTORE(); \ - } \ - VNET_LIST_UNREF(); - #else /* !VNET_DEBUG */ #define VNET_ASSERT(condition) @@ -253,20 +236,10 @@ #define INIT_FROM_VNET(vnet, modindex, modtype, sym) \ modtype *sym = (vnet)->mod_data[modindex]; -#define VNET_ITERLOOP_BEGIN() \ - struct vnet *vnet_iter; \ - VNET_LIST_REF(); \ - LIST_FOREACH(vnet_iter, &vnet_head, vnet_le) { \ - CURVNET_SET(vnet_iter); +#endif /* !VNET_DEBUG */ -#define VNET_ITERLOOP_BEGIN_QUIET() VNET_ITERLOOP_BEGIN() - -#define VNET_ITERLOOP_END() \ - CURVNET_RESTORE(); \ - } \ - VNET_LIST_UNREF(); - -#endif /* !VNET_DEBUG */ +#define VNET_ITERATOR_DECL(arg) struct vnet *arg; +#define VNET_FOREACH(arg) LIST_FOREACH(arg, &vnet_head, vnet_le) #define INIT_VPROCG(arg) struct vprocg *vprocg = (arg); @@ -301,9 +274,10 @@ #define VNET_ASSERT(condition) #define VSYM(base, sym) (sym) #define INIT_FROM_VNET(vnet, modindex, modtype, sym) -#define VNET_ITERLOOP_BEGIN() -#define VNET_ITERLOOP_BEGIN_QUIET() -#define VNET_ITERLOOP_END() +#define VNET_ITERATOR_DECL(arg) +#define VNET_FOREACH(arg) +#define VNET_LIST_REF() +#define VNET_LIST_UNREF() #define INIT_VPROCG(arg) #define VPROCG_ITERLOOP_BEGIN() #define VPROCG_ITERLOOP_END() From owner-p4-projects@FreeBSD.ORG Mon Sep 8 20:13:08 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C86E1106567B; Mon, 8 Sep 2008 20:13:07 +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 870521065675 for ; Mon, 8 Sep 2008 20:13: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 76DC68FC14 for ; Mon, 8 Sep 2008 20:13: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 m88KD7VY004112 for ; Mon, 8 Sep 2008 20:13:07 GMT (envelope-from peter-gmail@wemm.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m88KCKUU098513 for perforce@freebsd.org; Mon, 8 Sep 2008 20:12:20 GMT (envelope-from peter-gmail@wemm.org) Date: Mon, 8 Sep 2008 20:12:20 GMT Message-Id: <200809082012.m88KCKUU098513@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 149438 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, 08 Sep 2008 20:13:08 -0000 http://perforce.freebsd.org/chv.cgi?CH=149438 Change 149438 by peter@peter_overcee on 2008/09/08 20:12:01 IFC @149436 Affected files ... .. //depot/projects/hammer/Makefile.inc1#139 integrate .. //depot/projects/hammer/ObsoleteFiles.inc#57 integrate .. //depot/projects/hammer/UPDATING#121 integrate .. //depot/projects/hammer/bin/Makefile#7 integrate .. //depot/projects/hammer/bin/cp/utils.c#12 integrate .. //depot/projects/hammer/bin/pkill/Makefile#1 branch .. //depot/projects/hammer/bin/pkill/pkill.1#1 branch .. //depot/projects/hammer/bin/pkill/pkill.c#1 branch .. //depot/projects/hammer/bin/setfacl/setfacl.c#9 integrate .. //depot/projects/hammer/bin/sh/miscbltin.c#8 integrate .. //depot/projects/hammer/bin/sh/options.c#8 integrate .. //depot/projects/hammer/bin/sh/sh.1#30 integrate .. //depot/projects/hammer/bin/stty/modes.c#3 integrate .. //depot/projects/hammer/bin/stty/print.c#5 integrate .. //depot/projects/hammer/bin/stty/stty.1#7 integrate .. //depot/projects/hammer/cddl/contrib/opensolaris/lib/libzpool/common/sys/zfs_context.h#3 integrate .. //depot/projects/hammer/contrib/bind9/CHANGES#11 integrate .. //depot/projects/hammer/contrib/bind9/COPYRIGHT#6 integrate .. //depot/projects/hammer/contrib/bind9/bin/dig/dighost.c#7 integrate .. //depot/projects/hammer/contrib/bind9/bin/named/client.c#9 integrate .. //depot/projects/hammer/contrib/bind9/bin/named/config.c#6 integrate .. //depot/projects/hammer/contrib/bind9/bin/named/controlconf.c#4 integrate .. //depot/projects/hammer/contrib/bind9/bin/named/interfacemgr.c#4 integrate .. //depot/projects/hammer/contrib/bind9/bin/named/lwresd.c#4 integrate .. //depot/projects/hammer/contrib/bind9/bin/named/named.conf.docbook#7 integrate .. //depot/projects/hammer/contrib/bind9/bin/named/server.c#9 integrate .. //depot/projects/hammer/contrib/bind9/bin/rndc/rndc.c#7 integrate .. //depot/projects/hammer/contrib/bind9/configure.in#7 integrate .. //depot/projects/hammer/contrib/bind9/doc/arm/Bv9ARM-book.xml#9 integrate .. //depot/projects/hammer/contrib/bind9/lib/bind/configure.in#7 integrate .. //depot/projects/hammer/contrib/bind9/lib/bind9/check.c#8 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/api#9 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/dispatch.c#7 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/include/dns/dispatch.h#6 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/request.c#4 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/resolver.c#10 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/xfrin.c#7 integrate .. //depot/projects/hammer/contrib/bind9/lib/isc/api#7 integrate .. //depot/projects/hammer/contrib/bind9/lib/isc/include/isc/resource.h#3 integrate .. //depot/projects/hammer/contrib/bind9/lib/isc/include/isc/socket.h#3 integrate .. //depot/projects/hammer/contrib/bind9/lib/isc/include/isc/timer.h#4 integrate .. //depot/projects/hammer/contrib/bind9/lib/isc/timer.c#6 integrate .. //depot/projects/hammer/contrib/bind9/lib/isc/unix/app.c#3 integrate .. //depot/projects/hammer/contrib/bind9/lib/isc/unix/resource.c#3 integrate .. //depot/projects/hammer/contrib/bind9/lib/isc/unix/socket.c#7 integrate .. //depot/projects/hammer/contrib/bind9/lib/isc/unix/socket_p.h#3 integrate .. //depot/projects/hammer/contrib/bind9/lib/isccfg/api#6 integrate .. //depot/projects/hammer/contrib/bind9/lib/isccfg/namedconf.c#6 integrate .. //depot/projects/hammer/contrib/bind9/version#11 integrate .. //depot/projects/hammer/contrib/gcc/common.opt#4 integrate .. //depot/projects/hammer/contrib/gcc/config/freebsd-spec.h#15 integrate .. //depot/projects/hammer/contrib/gcc/config/freebsd.h#6 integrate .. //depot/projects/hammer/contrib/gcc/config/i386/freebsd.h#15 integrate .. //depot/projects/hammer/contrib/gcc/config/i386/freebsd64.h#10 integrate .. //depot/projects/hammer/contrib/gcc/config/mips/freebsd.h#1 branch .. //depot/projects/hammer/contrib/gcc/doc/invoke.texi#13 integrate .. //depot/projects/hammer/contrib/gdtoa/README#4 integrate .. //depot/projects/hammer/contrib/gdtoa/dtoa.c#3 integrate .. //depot/projects/hammer/contrib/gdtoa/gdtoa.h#3 integrate .. //depot/projects/hammer/contrib/gdtoa/gdtoaimp.h#9 integrate .. //depot/projects/hammer/contrib/gdtoa/gethex.c#6 integrate .. //depot/projects/hammer/contrib/gdtoa/strtoIg.c#3 integrate .. //depot/projects/hammer/contrib/gdtoa/strtod.c#6 integrate .. //depot/projects/hammer/contrib/gdtoa/strtodg.c#4 integrate .. //depot/projects/hammer/contrib/gdtoa/strtof.c#4 integrate .. //depot/projects/hammer/contrib/gdtoa/test/README#2 integrate .. //depot/projects/hammer/contrib/gdtoa/test/f.out#2 integrate .. //depot/projects/hammer/contrib/gdtoa/test/getround.c#3 integrate .. //depot/projects/hammer/contrib/gdtoa/test/xsum0.out#3 integrate .. //depot/projects/hammer/contrib/gdtoa/xsum0.out#5 integrate .. //depot/projects/hammer/contrib/ntp/COPYRIGHT#4 integrate .. //depot/projects/hammer/contrib/ntp/ChangeLog#4 integrate .. //depot/projects/hammer/contrib/ntp/ChangeLog-4.1.0#3 delete .. //depot/projects/hammer/contrib/ntp/CommitLog#1 branch .. //depot/projects/hammer/contrib/ntp/CommitLog-4.1.0#1 branch .. //depot/projects/hammer/contrib/ntp/FREEBSD-Xlist#2 delete .. //depot/projects/hammer/contrib/ntp/FREEBSD-upgrade#4 delete .. //depot/projects/hammer/contrib/ntp/INSTALL#2 integrate .. //depot/projects/hammer/contrib/ntp/Makefile.am#4 integrate .. //depot/projects/hammer/contrib/ntp/Makefile.in#4 integrate .. //depot/projects/hammer/contrib/ntp/NEWS#4 integrate .. //depot/projects/hammer/contrib/ntp/README#3 integrate .. //depot/projects/hammer/contrib/ntp/README.bk#3 integrate .. //depot/projects/hammer/contrib/ntp/README.patches#2 integrate .. //depot/projects/hammer/contrib/ntp/README.refclocks#2 integrate .. //depot/projects/hammer/contrib/ntp/README.versions#2 integrate .. //depot/projects/hammer/contrib/ntp/TODO#3 integrate .. //depot/projects/hammer/contrib/ntp/WHERE-TO-START#2 integrate .. //depot/projects/hammer/contrib/ntp/acinclude.m4#4 delete .. //depot/projects/hammer/contrib/ntp/aclocal.m4#4 integrate .. //depot/projects/hammer/contrib/ntp/adjtimed/Makefile.am#2 integrate .. //depot/projects/hammer/contrib/ntp/adjtimed/Makefile.in#4 integrate .. //depot/projects/hammer/contrib/ntp/arlib/Makefile.in#2 integrate .. //depot/projects/hammer/contrib/ntp/arlib/aclocal.m4#2 integrate .. //depot/projects/hammer/contrib/ntp/arlib/configure#2 integrate .. //depot/projects/hammer/contrib/ntp/arlib/depcomp#2 integrate .. //depot/projects/hammer/contrib/ntp/arlib/install-sh#2 integrate .. //depot/projects/hammer/contrib/ntp/arlib/missing#2 integrate .. //depot/projects/hammer/contrib/ntp/arlib/mkinstalldirs#2 delete .. //depot/projects/hammer/contrib/ntp/bincheck.mf#1 branch .. //depot/projects/hammer/contrib/ntp/bootstrap#1 branch .. //depot/projects/hammer/contrib/ntp/build#3 integrate .. //depot/projects/hammer/contrib/ntp/clockstuff/Makefile.am#3 integrate .. //depot/projects/hammer/contrib/ntp/clockstuff/Makefile.in#4 integrate .. //depot/projects/hammer/contrib/ntp/clockstuff/clktest.c#2 integrate .. //depot/projects/hammer/contrib/ntp/clockstuff/propdelay.c#2 integrate .. //depot/projects/hammer/contrib/ntp/compile#2 integrate .. //depot/projects/hammer/contrib/ntp/config.guess#4 integrate .. //depot/projects/hammer/contrib/ntp/config.h.in#4 integrate .. //depot/projects/hammer/contrib/ntp/config.sub#4 integrate .. //depot/projects/hammer/contrib/ntp/configure#4 integrate .. //depot/projects/hammer/contrib/ntp/configure.ac#1 branch .. //depot/projects/hammer/contrib/ntp/configure.in#4 delete .. //depot/projects/hammer/contrib/ntp/depcomp#4 integrate .. //depot/projects/hammer/contrib/ntp/flock-build#4 integrate .. //depot/projects/hammer/contrib/ntp/html/accopt.html#2 integrate .. //depot/projects/hammer/contrib/ntp/html/assoc.html#2 integrate .. //depot/projects/hammer/contrib/ntp/html/audio.html#2 integrate .. //depot/projects/hammer/contrib/ntp/html/authopt.html#2 integrate .. //depot/projects/hammer/contrib/ntp/html/build.html#2 delete .. //depot/projects/hammer/contrib/ntp/html/build/build.html#1 branch .. //depot/projects/hammer/contrib/ntp/html/build/config.html#1 branch .. //depot/projects/hammer/contrib/ntp/html/build/hints.html#1 branch .. //depot/projects/hammer/contrib/ntp/html/build/hints/a-ux#1 branch .. //depot/projects/hammer/contrib/ntp/html/build/hints/aix#1 branch .. //depot/projects/hammer/contrib/ntp/html/build/hints/bsdi#1 branch .. //depot/projects/hammer/contrib/ntp/html/build/hints/changes#1 branch .. //depot/projects/hammer/contrib/ntp/html/build/hints/decosf1#1 branch .. //depot/projects/hammer/contrib/ntp/html/build/hints/decosf2#1 branch .. //depot/projects/hammer/contrib/ntp/html/build/hints/freebsd#1 branch .. //depot/projects/hammer/contrib/ntp/html/build/hints/hpux#1 branch .. //depot/projects/hammer/contrib/ntp/html/build/hints/linux#1 branch .. //depot/projects/hammer/contrib/ntp/html/build/hints/mpeix#1 branch .. //depot/projects/hammer/contrib/ntp/html/build/hints/netbsd#1 branch .. //depot/projects/hammer/contrib/ntp/html/build/hints/notes-xntp-v3#1 branch .. //depot/projects/hammer/contrib/ntp/html/build/hints/parse#1 branch .. //depot/projects/hammer/contrib/ntp/html/build/hints/refclocks#1 branch .. //depot/projects/hammer/contrib/ntp/html/build/hints/rs6000#1 branch .. //depot/projects/hammer/contrib/ntp/html/build/hints/sco.html#1 branch .. //depot/projects/hammer/contrib/ntp/html/build/hints/sgi#1 branch .. //depot/projects/hammer/contrib/ntp/html/build/hints/solaris-dosynctodr.html#1 branch .. //depot/projects/hammer/contrib/ntp/html/build/hints/solaris.html#1 branch .. //depot/projects/hammer/contrib/ntp/html/build/hints/solaris.xtra.4023118#1 branch .. //depot/projects/hammer/contrib/ntp/html/build/hints/solaris.xtra.S99ntpd#1 branch .. //depot/projects/hammer/contrib/ntp/html/build/hints/solaris.xtra.patchfreq#1 branch .. //depot/projects/hammer/contrib/ntp/html/build/hints/sun4#1 branch .. //depot/projects/hammer/contrib/ntp/html/build/hints/svr4-dell#1 branch .. //depot/projects/hammer/contrib/ntp/html/build/hints/svr4_package#1 branch .. //depot/projects/hammer/contrib/ntp/html/build/hints/todo#1 branch .. //depot/projects/hammer/contrib/ntp/html/build/hints/vxworks.html#1 branch .. //depot/projects/hammer/contrib/ntp/html/build/hints/winnt.html#1 branch .. //depot/projects/hammer/contrib/ntp/html/build/patches.html#1 branch .. //depot/projects/hammer/contrib/ntp/html/build/porting.html#1 branch .. //depot/projects/hammer/contrib/ntp/html/build/quick.html#1 branch .. //depot/projects/hammer/contrib/ntp/html/build/scripts/footer.txt#1 branch .. //depot/projects/hammer/contrib/ntp/html/build/scripts/links10.txt#1 branch .. //depot/projects/hammer/contrib/ntp/html/build/scripts/links11.txt#1 branch .. //depot/projects/hammer/contrib/ntp/html/build/scripts/links12.txt#1 branch .. //depot/projects/hammer/contrib/ntp/html/build/scripts/links7.txt#1 branch .. //depot/projects/hammer/contrib/ntp/html/build/scripts/links8.txt#1 branch .. //depot/projects/hammer/contrib/ntp/html/build/scripts/links9.txt#1 branch .. //depot/projects/hammer/contrib/ntp/html/build/scripts/style.css#1 branch .. //depot/projects/hammer/contrib/ntp/html/clockopt.html#2 integrate .. //depot/projects/hammer/contrib/ntp/html/config.html#2 delete .. //depot/projects/hammer/contrib/ntp/html/confopt.html#2 integrate .. //depot/projects/hammer/contrib/ntp/html/copyright.html#2 integrate .. //depot/projects/hammer/contrib/ntp/html/debug.html#2 integrate .. //depot/projects/hammer/contrib/ntp/html/drivers/driver1.html#2 integrate .. //depot/projects/hammer/contrib/ntp/html/drivers/driver10.html#2 integrate .. //depot/projects/hammer/contrib/ntp/html/drivers/driver11.html#2 integrate .. //depot/projects/hammer/contrib/ntp/html/drivers/driver12.html#2 integrate .. //depot/projects/hammer/contrib/ntp/html/drivers/driver16.html#2 integrate .. //depot/projects/hammer/contrib/ntp/html/drivers/driver18.html#2 integrate .. //depot/projects/hammer/contrib/ntp/html/drivers/driver19.html#2 integrate .. //depot/projects/hammer/contrib/ntp/html/drivers/driver2.html#2 integrate .. //depot/projects/hammer/contrib/ntp/html/drivers/driver20.html#2 integrate .. //depot/projects/hammer/contrib/ntp/html/drivers/driver22.html#2 integrate .. //depot/projects/hammer/contrib/ntp/html/drivers/driver23.html#2 delete .. //depot/projects/hammer/contrib/ntp/html/drivers/driver24.html#2 delete .. //depot/projects/hammer/contrib/ntp/html/drivers/driver26.html#2 integrate .. //depot/projects/hammer/contrib/ntp/html/drivers/driver27.html#2 integrate .. //depot/projects/hammer/contrib/ntp/html/drivers/driver28.html#2 integrate .. //depot/projects/hammer/contrib/ntp/html/drivers/driver29.html#2 integrate .. //depot/projects/hammer/contrib/ntp/html/drivers/driver3.html#2 integrate .. //depot/projects/hammer/contrib/ntp/html/drivers/driver30.html#2 integrate .. //depot/projects/hammer/contrib/ntp/html/drivers/driver31.html#1 branch .. //depot/projects/hammer/contrib/ntp/html/drivers/driver32.html#2 integrate .. //depot/projects/hammer/contrib/ntp/html/drivers/driver33.html#2 integrate .. //depot/projects/hammer/contrib/ntp/html/drivers/driver34.html#2 integrate .. //depot/projects/hammer/contrib/ntp/html/drivers/driver35.html#2 integrate .. //depot/projects/hammer/contrib/ntp/html/drivers/driver36.html#2 integrate .. //depot/projects/hammer/contrib/ntp/html/drivers/driver37.html#2 integrate .. //depot/projects/hammer/contrib/ntp/html/drivers/driver38.html#2 integrate .. //depot/projects/hammer/contrib/ntp/html/drivers/driver39.html#2 integrate .. //depot/projects/hammer/contrib/ntp/html/drivers/driver4.html#2 integrate .. //depot/projects/hammer/contrib/ntp/html/drivers/driver40.html#2 integrate .. //depot/projects/hammer/contrib/ntp/html/drivers/driver42.html#2 integrate .. //depot/projects/hammer/contrib/ntp/html/drivers/driver43.html#2 integrate .. //depot/projects/hammer/contrib/ntp/html/drivers/driver44.html#2 integrate .. //depot/projects/hammer/contrib/ntp/html/drivers/driver5.html#2 integrate .. //depot/projects/hammer/contrib/ntp/html/drivers/driver6.html#2 integrate .. //depot/projects/hammer/contrib/ntp/html/drivers/driver7.html#2 integrate .. //depot/projects/hammer/contrib/ntp/html/drivers/driver8.html#2 integrate .. //depot/projects/hammer/contrib/ntp/html/drivers/driver9.html#2 integrate .. //depot/projects/hammer/contrib/ntp/html/drivers/oncore-shmem.html#2 integrate .. //depot/projects/hammer/contrib/ntp/html/drivers/scripts/footer.txt#1 branch .. //depot/projects/hammer/contrib/ntp/html/drivers/scripts/style.css#1 branch .. //depot/projects/hammer/contrib/ntp/html/drivers/tf582_4.html#1 branch .. //depot/projects/hammer/contrib/ntp/html/extern.html#2 integrate .. //depot/projects/hammer/contrib/ntp/html/gadget.html#1 branch .. //depot/projects/hammer/contrib/ntp/html/groups.html#1 branch .. //depot/projects/hammer/contrib/ntp/html/hints.html#2 delete .. //depot/projects/hammer/contrib/ntp/html/hints/a-ux#2 delete .. //depot/projects/hammer/contrib/ntp/html/hints/aix#2 delete .. //depot/projects/hammer/contrib/ntp/html/hints/bsdi#2 delete .. //depot/projects/hammer/contrib/ntp/html/hints/changes#2 delete .. //depot/projects/hammer/contrib/ntp/html/hints/decosf1#2 delete .. //depot/projects/hammer/contrib/ntp/html/hints/decosf2#2 delete .. //depot/projects/hammer/contrib/ntp/html/hints/freebsd#2 delete .. //depot/projects/hammer/contrib/ntp/html/hints/hpux#2 delete .. //depot/projects/hammer/contrib/ntp/html/hints/linux#2 delete .. //depot/projects/hammer/contrib/ntp/html/hints/mpeix#2 delete .. //depot/projects/hammer/contrib/ntp/html/hints/netbsd#2 delete .. //depot/projects/hammer/contrib/ntp/html/hints/notes-xntp-v3#2 delete .. //depot/projects/hammer/contrib/ntp/html/hints/parse#2 delete .. //depot/projects/hammer/contrib/ntp/html/hints/refclocks#2 delete .. //depot/projects/hammer/contrib/ntp/html/hints/rs6000#2 delete .. //depot/projects/hammer/contrib/ntp/html/hints/sco.html#2 delete .. //depot/projects/hammer/contrib/ntp/html/hints/sgi#2 delete .. //depot/projects/hammer/contrib/ntp/html/hints/solaris-dosynctodr.html#3 delete .. //depot/projects/hammer/contrib/ntp/html/hints/solaris.html#3 delete .. //depot/projects/hammer/contrib/ntp/html/hints/solaris.xtra.4023118#2 delete .. //depot/projects/hammer/contrib/ntp/html/hints/solaris.xtra.4095849#2 delete .. //depot/projects/hammer/contrib/ntp/html/hints/solaris.xtra.S99ntpd#2 delete .. //depot/projects/hammer/contrib/ntp/html/hints/solaris.xtra.patchfreq#2 delete .. //depot/projects/hammer/contrib/ntp/html/hints/sun4#2 delete .. //depot/projects/hammer/contrib/ntp/html/hints/svr4-dell#2 delete .. //depot/projects/hammer/contrib/ntp/html/hints/svr4_package#2 delete .. //depot/projects/hammer/contrib/ntp/html/hints/todo#2 delete .. //depot/projects/hammer/contrib/ntp/html/hints/vxworks.html#4 delete .. //depot/projects/hammer/contrib/ntp/html/hints/winnt.html#2 delete .. //depot/projects/hammer/contrib/ntp/html/howto.html#2 integrate .. //depot/projects/hammer/contrib/ntp/html/index.html#2 integrate .. //depot/projects/hammer/contrib/ntp/html/kern.html#2 integrate .. //depot/projects/hammer/contrib/ntp/html/keygen.html#2 integrate .. //depot/projects/hammer/contrib/ntp/html/ldisc.html#2 integrate .. //depot/projects/hammer/contrib/ntp/html/manyopt.html#2 integrate .. //depot/projects/hammer/contrib/ntp/html/measure.html#2 integrate .. //depot/projects/hammer/contrib/ntp/html/miscopt.html#2 integrate .. //depot/projects/hammer/contrib/ntp/html/monopt.html#2 integrate .. //depot/projects/hammer/contrib/ntp/html/msyslog.html#2 integrate .. //depot/projects/hammer/contrib/ntp/html/mx4200data.html#2 integrate .. //depot/projects/hammer/contrib/ntp/html/notes.html#2 integrate .. //depot/projects/hammer/contrib/ntp/html/ntp_conf.html#1 branch .. //depot/projects/hammer/contrib/ntp/html/ntpd.html#2 integrate .. //depot/projects/hammer/contrib/ntp/html/ntpdate.html#2 integrate .. //depot/projects/hammer/contrib/ntp/html/ntpdc.html#2 integrate .. //depot/projects/hammer/contrib/ntp/html/ntpdsim.html#2 integrate .. //depot/projects/hammer/contrib/ntp/html/ntpdsim_new.html#1 branch .. //depot/projects/hammer/contrib/ntp/html/ntpq.html#2 integrate .. //depot/projects/hammer/contrib/ntp/html/ntptime.html#2 integrate .. //depot/projects/hammer/contrib/ntp/html/ntptrace.html#2 integrate .. //depot/projects/hammer/contrib/ntp/html/parsedata.html#2 integrate .. //depot/projects/hammer/contrib/ntp/html/parsenew.html#2 integrate .. //depot/projects/hammer/contrib/ntp/html/patches.html#2 delete .. //depot/projects/hammer/contrib/ntp/html/porting.html#2 delete .. //depot/projects/hammer/contrib/ntp/html/pps.html#2 integrate .. //depot/projects/hammer/contrib/ntp/html/prefer.html#2 integrate .. //depot/projects/hammer/contrib/ntp/html/quick.html#2 delete .. //depot/projects/hammer/contrib/ntp/html/rdebug.html#2 integrate .. //depot/projects/hammer/contrib/ntp/html/refclock.html#2 integrate .. //depot/projects/hammer/contrib/ntp/html/release.html#2 integrate .. //depot/projects/hammer/contrib/ntp/html/scripts/links11.txt#2 integrate .. //depot/projects/hammer/contrib/ntp/html/scripts/links7.txt#2 integrate .. //depot/projects/hammer/contrib/ntp/html/scripts/links8.txt#2 integrate .. //depot/projects/hammer/contrib/ntp/html/scripts/links9.txt#2 integrate .. //depot/projects/hammer/contrib/ntp/html/sntp.html#2 integrate .. //depot/projects/hammer/contrib/ntp/html/tickadj.html#2 integrate .. //depot/projects/hammer/contrib/ntp/include/Makefile.am#3 integrate .. //depot/projects/hammer/contrib/ntp/include/Makefile.in#4 integrate .. //depot/projects/hammer/contrib/ntp/include/adjtime.h#3 integrate .. //depot/projects/hammer/contrib/ntp/include/ascii.h#2 integrate .. //depot/projects/hammer/contrib/ntp/include/autogen-version.def#1 branch .. //depot/projects/hammer/contrib/ntp/include/binio.h#2 integrate .. //depot/projects/hammer/contrib/ntp/include/copyright.def#1 branch .. //depot/projects/hammer/contrib/ntp/include/debug-opt.def#1 branch .. //depot/projects/hammer/contrib/ntp/include/homerc.def#1 branch .. //depot/projects/hammer/contrib/ntp/include/ieee754io.h#2 integrate .. //depot/projects/hammer/contrib/ntp/include/isc/Makefile.am#2 integrate .. //depot/projects/hammer/contrib/ntp/include/isc/Makefile.in#2 integrate .. //depot/projects/hammer/contrib/ntp/include/isc/buffer.h#1 branch .. //depot/projects/hammer/contrib/ntp/include/isc/interfaceiter.h#2 integrate .. //depot/projects/hammer/contrib/ntp/include/isc/ipv6.h#2 integrate .. //depot/projects/hammer/contrib/ntp/include/isc/msgs.h#2 integrate .. //depot/projects/hammer/contrib/ntp/include/isc/net.h#2 integrate .. //depot/projects/hammer/contrib/ntp/include/isc/netaddr.h#2 integrate .. //depot/projects/hammer/contrib/ntp/include/isc/netscope.h#1 branch .. //depot/projects/hammer/contrib/ntp/include/isc/region.h#1 branch .. //depot/projects/hammer/contrib/ntp/include/isc/result.h#2 integrate .. //depot/projects/hammer/contrib/ntp/include/isc/sockaddr.h#2 integrate .. //depot/projects/hammer/contrib/ntp/include/l_stdlib.h#4 integrate .. //depot/projects/hammer/contrib/ntp/include/mbg_gps166.h#2 integrate .. //depot/projects/hammer/contrib/ntp/include/ntp.h#4 integrate .. //depot/projects/hammer/contrib/ntp/include/ntp_config.h#3 integrate .. //depot/projects/hammer/contrib/ntp/include/ntp_control.h#3 integrate .. //depot/projects/hammer/contrib/ntp/include/ntp_crypto.h#3 integrate .. //depot/projects/hammer/contrib/ntp/include/ntp_debug.h#1 branch .. //depot/projects/hammer/contrib/ntp/include/ntp_filegen.h#2 integrate .. //depot/projects/hammer/contrib/ntp/include/ntp_fp.h#3 integrate .. //depot/projects/hammer/contrib/ntp/include/ntp_machine.h#4 integrate .. //depot/projects/hammer/contrib/ntp/include/ntp_random.h#1 branch .. //depot/projects/hammer/contrib/ntp/include/ntp_refclock.h#3 integrate .. //depot/projects/hammer/contrib/ntp/include/ntp_request.h#4 integrate .. //depot/projects/hammer/contrib/ntp/include/ntp_rfc2553.h#2 integrate .. //depot/projects/hammer/contrib/ntp/include/ntp_stdlib.h#4 integrate .. //depot/projects/hammer/contrib/ntp/include/ntp_tty.h#2 integrate .. //depot/projects/hammer/contrib/ntp/include/ntp_types.h#2 integrate .. //depot/projects/hammer/contrib/ntp/include/ntpd.h#5 integrate .. //depot/projects/hammer/contrib/ntp/include/parse.h#2 integrate .. //depot/projects/hammer/contrib/ntp/include/parse_conf.h#2 integrate .. //depot/projects/hammer/contrib/ntp/include/recvbuff.h#3 integrate .. //depot/projects/hammer/contrib/ntp/include/timepps-SCO.h#1 branch .. //depot/projects/hammer/contrib/ntp/include/timepps-Solaris.h#1 branch .. //depot/projects/hammer/contrib/ntp/include/timepps-SunOS.h#1 branch .. //depot/projects/hammer/contrib/ntp/include/trimble.h#2 integrate .. //depot/projects/hammer/contrib/ntp/include/version.def#1 branch .. //depot/projects/hammer/contrib/ntp/install-sh#4 integrate .. //depot/projects/hammer/contrib/ntp/kernel/Makefile.in#4 integrate .. //depot/projects/hammer/contrib/ntp/kernel/chuinit.c#2 integrate .. //depot/projects/hammer/contrib/ntp/kernel/clkinit.c#2 integrate .. //depot/projects/hammer/contrib/ntp/kernel/sys/Makefile.in#4 integrate .. //depot/projects/hammer/contrib/ntp/kernel/sys/parsestreams.h#3 integrate .. //depot/projects/hammer/contrib/ntp/libisc/ifiter_getifaddrs.c#1 branch .. //depot/projects/hammer/contrib/ntp/libisc/ifiter_ioctl.c#2 integrate .. //depot/projects/hammer/contrib/ntp/libisc/ifiter_sysctl.c#2 integrate .. //depot/projects/hammer/contrib/ntp/libisc/inet_aton.c#1 branch .. //depot/projects/hammer/contrib/ntp/libisc/inet_pton.c#1 branch .. //depot/projects/hammer/contrib/ntp/libisc/interfaceiter.c#2 integrate .. //depot/projects/hammer/contrib/ntp/libisc/net.c#2 integrate .. //depot/projects/hammer/contrib/ntp/libisc/netaddr.c#1 branch .. //depot/projects/hammer/contrib/ntp/libisc/netscope.c#1 branch .. //depot/projects/hammer/contrib/ntp/libisc/sockaddr.c#1 branch .. //depot/projects/hammer/contrib/ntp/libntp/Makefile.am#4 integrate .. //depot/projects/hammer/contrib/ntp/libntp/Makefile.in#4 integrate .. //depot/projects/hammer/contrib/ntp/libntp/a_md5encrypt.c#3 integrate .. //depot/projects/hammer/contrib/ntp/libntp/adjtime.c#4 integrate .. //depot/projects/hammer/contrib/ntp/libntp/audio.c#3 integrate .. //depot/projects/hammer/contrib/ntp/libntp/binio.c#3 delete .. //depot/projects/hammer/contrib/ntp/libntp/buftvtots.c#2 integrate .. //depot/projects/hammer/contrib/ntp/libntp/caljulian.c#3 integrate .. //depot/projects/hammer/contrib/ntp/libntp/calleapwhen.c#2 delete .. //depot/projects/hammer/contrib/ntp/libntp/clocktypes.c#4 integrate .. //depot/projects/hammer/contrib/ntp/libntp/decodenetnum.c#3 integrate .. //depot/projects/hammer/contrib/ntp/libntp/dolfptoa.c#3 integrate .. //depot/projects/hammer/contrib/ntp/libntp/gpstolfp.c#2 delete .. //depot/projects/hammer/contrib/ntp/libntp/humandate.c#3 integrate .. //depot/projects/hammer/contrib/ntp/libntp/icom.c#3 integrate .. //depot/projects/hammer/contrib/ntp/libntp/ieee754io.c#3 delete .. //depot/projects/hammer/contrib/ntp/libntp/iosignal.c#4 integrate .. //depot/projects/hammer/contrib/ntp/libntp/lib_strbuf.h#2 integrate .. //depot/projects/hammer/contrib/ntp/libntp/log.c#3 delete .. //depot/projects/hammer/contrib/ntp/libntp/log.h#2 delete .. //depot/projects/hammer/contrib/ntp/libntp/machines.c#4 integrate .. //depot/projects/hammer/contrib/ntp/libntp/mfp_mul.c#2 delete .. //depot/projects/hammer/contrib/ntp/libntp/mktime.c#4 integrate .. //depot/projects/hammer/contrib/ntp/libntp/msyslog.c#4 integrate .. //depot/projects/hammer/contrib/ntp/libntp/ntp_random.c#1 branch .. //depot/projects/hammer/contrib/ntp/libntp/ntp_rfc2553.c#2 integrate .. //depot/projects/hammer/contrib/ntp/libntp/numtohost.c#2 integrate .. //depot/projects/hammer/contrib/ntp/libntp/prettydate.c#2 integrate .. //depot/projects/hammer/contrib/ntp/libntp/random.c#2 delete .. //depot/projects/hammer/contrib/ntp/libntp/ranny.c#2 delete .. //depot/projects/hammer/contrib/ntp/libntp/recvbuff.c#2 integrate .. //depot/projects/hammer/contrib/ntp/libntp/socktoa.c#2 integrate .. //depot/projects/hammer/contrib/ntp/libntp/socktohost.c#2 integrate .. //depot/projects/hammer/contrib/ntp/libntp/statestr.c#3 integrate .. //depot/projects/hammer/contrib/ntp/libntp/systime.c#3 integrate .. //depot/projects/hammer/contrib/ntp/libopts/COPYING.lgpl#1 branch .. //depot/projects/hammer/contrib/ntp/libopts/COPYING.mbsd#1 branch .. //depot/projects/hammer/contrib/ntp/libopts/MakeDefs.inc#1 branch .. //depot/projects/hammer/contrib/ntp/libopts/Makefile.am#1 branch .. //depot/projects/hammer/contrib/ntp/libopts/Makefile.in#1 branch .. //depot/projects/hammer/contrib/ntp/libopts/README#1 branch .. //depot/projects/hammer/contrib/ntp/libopts/autoopts.c#1 branch .. //depot/projects/hammer/contrib/ntp/libopts/autoopts.h#1 branch .. //depot/projects/hammer/contrib/ntp/libopts/autoopts/options.h#1 branch .. //depot/projects/hammer/contrib/ntp/libopts/autoopts/usage-txt.h#1 branch .. //depot/projects/hammer/contrib/ntp/libopts/boolean.c#1 branch .. //depot/projects/hammer/contrib/ntp/libopts/compat/compat.h#1 branch .. //depot/projects/hammer/contrib/ntp/libopts/compat/pathfind.c#1 branch .. //depot/projects/hammer/contrib/ntp/libopts/compat/snprintf.c#1 branch .. //depot/projects/hammer/contrib/ntp/libopts/compat/strchr.c#1 branch .. //depot/projects/hammer/contrib/ntp/libopts/compat/strdup.c#1 branch .. //depot/projects/hammer/contrib/ntp/libopts/compat/windows-config.h#1 branch .. //depot/projects/hammer/contrib/ntp/libopts/configfile.c#1 branch .. //depot/projects/hammer/contrib/ntp/libopts/cook.c#1 branch .. //depot/projects/hammer/contrib/ntp/libopts/enumeration.c#1 branch .. //depot/projects/hammer/contrib/ntp/libopts/environment.c#1 branch .. //depot/projects/hammer/contrib/ntp/libopts/genshell.c#1 branch .. //depot/projects/hammer/contrib/ntp/libopts/genshell.h#1 branch .. //depot/projects/hammer/contrib/ntp/libopts/libopts.c#1 branch .. //depot/projects/hammer/contrib/ntp/libopts/load.c#1 branch .. //depot/projects/hammer/contrib/ntp/libopts/m4/libopts.m4#1 branch .. //depot/projects/hammer/contrib/ntp/libopts/m4/liboptschk.m4#1 branch .. //depot/projects/hammer/contrib/ntp/libopts/makeshell.c#1 branch .. //depot/projects/hammer/contrib/ntp/libopts/nested.c#1 branch .. //depot/projects/hammer/contrib/ntp/libopts/numeric.c#1 branch .. //depot/projects/hammer/contrib/ntp/libopts/pgusage.c#1 branch .. //depot/projects/hammer/contrib/ntp/libopts/proto.h#1 branch .. //depot/projects/hammer/contrib/ntp/libopts/putshell.c#1 branch .. //depot/projects/hammer/contrib/ntp/libopts/restore.c#1 branch .. //depot/projects/hammer/contrib/ntp/libopts/save.c#1 branch .. //depot/projects/hammer/contrib/ntp/libopts/sort.c#1 branch .. //depot/projects/hammer/contrib/ntp/libopts/stack.c#1 branch .. //depot/projects/hammer/contrib/ntp/libopts/streqvcmp.c#1 branch .. //depot/projects/hammer/contrib/ntp/libopts/text_mmap.c#1 branch .. //depot/projects/hammer/contrib/ntp/libopts/tokenize.c#1 branch .. //depot/projects/hammer/contrib/ntp/libopts/usage.c#1 branch .. //depot/projects/hammer/contrib/ntp/libopts/version.c#1 branch .. //depot/projects/hammer/contrib/ntp/libparse/Makefile.am#2 integrate .. //depot/projects/hammer/contrib/ntp/libparse/Makefile.in#4 integrate .. //depot/projects/hammer/contrib/ntp/libparse/README#2 integrate .. //depot/projects/hammer/contrib/ntp/libparse/binio.c#1 branch .. //depot/projects/hammer/contrib/ntp/libparse/clk_computime.c#2 integrate .. //depot/projects/hammer/contrib/ntp/libparse/clk_dcf7000.c#2 integrate .. //depot/projects/hammer/contrib/ntp/libparse/clk_hopf6021.c#2 integrate .. //depot/projects/hammer/contrib/ntp/libparse/clk_meinberg.c#2 integrate .. //depot/projects/hammer/contrib/ntp/libparse/clk_rawdcf.c#2 integrate .. //depot/projects/hammer/contrib/ntp/libparse/clk_rcc8000.c#2 integrate .. //depot/projects/hammer/contrib/ntp/libparse/clk_schmid.c#2 integrate .. //depot/projects/hammer/contrib/ntp/libparse/clk_trimtaip.c#2 integrate .. //depot/projects/hammer/contrib/ntp/libparse/clk_trimtsip.c#2 integrate .. //depot/projects/hammer/contrib/ntp/libparse/clk_varitext.c#2 integrate .. //depot/projects/hammer/contrib/ntp/libparse/clk_wharton.c#2 integrate .. //depot/projects/hammer/contrib/ntp/libparse/data_mbg.c#2 integrate .. //depot/projects/hammer/contrib/ntp/libparse/gpstolfp.c#1 branch .. //depot/projects/hammer/contrib/ntp/libparse/ieee754io.c#1 branch .. //depot/projects/hammer/contrib/ntp/libparse/info_trimble.c#2 integrate .. //depot/projects/hammer/contrib/ntp/libparse/mfp_mul.c#1 branch .. //depot/projects/hammer/contrib/ntp/libparse/parse.c#2 integrate .. //depot/projects/hammer/contrib/ntp/libparse/parse_conf.c#2 integrate .. //depot/projects/hammer/contrib/ntp/libparse/parsesolaris.c#2 integrate .. //depot/projects/hammer/contrib/ntp/libparse/parsestreams.c#2 integrate .. //depot/projects/hammer/contrib/ntp/libparse/trim_info.c#2 integrate .. //depot/projects/hammer/contrib/ntp/ltmain.sh#1 branch .. //depot/projects/hammer/contrib/ntp/m4/define_dir.m4#1 branch .. //depot/projects/hammer/contrib/ntp/m4/hs_ulong_const.m4#1 branch .. //depot/projects/hammer/contrib/ntp/m4/os_cflags.m4#1 branch .. //depot/projects/hammer/contrib/ntp/missing#4 integrate .. //depot/projects/hammer/contrib/ntp/mkinstalldirs#4 delete .. //depot/projects/hammer/contrib/ntp/ntpd/Makefile.am#4 integrate .. //depot/projects/hammer/contrib/ntp/ntpd/Makefile.in#4 integrate .. //depot/projects/hammer/contrib/ntp/ntpd/cmd_args.c#3 integrate .. //depot/projects/hammer/contrib/ntp/ntpd/map_vme.c#2 delete .. //depot/projects/hammer/contrib/ntp/ntpd/ntp_config.c#4 integrate .. //depot/projects/hammer/contrib/ntp/ntpd/ntp_control.c#4 integrate .. //depot/projects/hammer/contrib/ntp/ntpd/ntp_crypto.c#4 integrate .. //depot/projects/hammer/contrib/ntp/ntpd/ntp_filegen.c#3 integrate .. //depot/projects/hammer/contrib/ntp/ntpd/ntp_intres.c#4 integrate .. //depot/projects/hammer/contrib/ntp/ntpd/ntp_io.c#4 integrate .. //depot/projects/hammer/contrib/ntp/ntpd/ntp_loopfilter.c#4 integrate .. //depot/projects/hammer/contrib/ntp/ntpd/ntp_monitor.c#3 integrate .. //depot/projects/hammer/contrib/ntp/ntpd/ntp_peer.c#3 integrate .. //depot/projects/hammer/contrib/ntp/ntpd/ntp_proto.c#4 integrate .. //depot/projects/hammer/contrib/ntp/ntpd/ntp_refclock.c#3 integrate .. //depot/projects/hammer/contrib/ntp/ntpd/ntp_request.c#4 integrate .. //depot/projects/hammer/contrib/ntp/ntpd/ntp_restrict.c#3 integrate .. //depot/projects/hammer/contrib/ntp/ntpd/ntp_timer.c#4 integrate .. //depot/projects/hammer/contrib/ntp/ntpd/ntp_util.c#3 integrate .. //depot/projects/hammer/contrib/ntp/ntpd/ntpd-opts.c#1 branch .. //depot/projects/hammer/contrib/ntp/ntpd/ntpd-opts.def#1 branch .. //depot/projects/hammer/contrib/ntp/ntpd/ntpd-opts.h#1 branch .. //depot/projects/hammer/contrib/ntp/ntpd/ntpd-opts.menu#1 branch .. //depot/projects/hammer/contrib/ntp/ntpd/ntpd-opts.texi#1 branch .. //depot/projects/hammer/contrib/ntp/ntpd/ntpd.1#1 branch .. //depot/projects/hammer/contrib/ntp/ntpd/ntpd.c#4 integrate .. //depot/projects/hammer/contrib/ntp/ntpd/ntpdbase-opts.def#1 branch .. //depot/projects/hammer/contrib/ntp/ntpd/ntpdsim-opts.c#1 branch .. //depot/projects/hammer/contrib/ntp/ntpd/ntpdsim-opts.def#1 branch .. //depot/projects/hammer/contrib/ntp/ntpd/ntpdsim-opts.h#1 branch .. //depot/projects/hammer/contrib/ntp/ntpd/ntpdsim-opts.menu#1 branch .. //depot/projects/hammer/contrib/ntp/ntpd/ntpdsim-opts.texi#1 branch .. //depot/projects/hammer/contrib/ntp/ntpd/ntpdsim.1#1 branch .. //depot/projects/hammer/contrib/ntp/ntpd/ntpsim.c#2 integrate .. //depot/projects/hammer/contrib/ntp/ntpd/ppsapi_timepps.h#1 branch .. //depot/projects/hammer/contrib/ntp/ntpd/refclock_acts.c#3 integrate .. //depot/projects/hammer/contrib/ntp/ntpd/refclock_arbiter.c#3 integrate .. //depot/projects/hammer/contrib/ntp/ntpd/refclock_arc.c#3 integrate .. //depot/projects/hammer/contrib/ntp/ntpd/refclock_atom.c#3 integrate .. //depot/projects/hammer/contrib/ntp/ntpd/refclock_bancomm.c#3 integrate .. //depot/projects/hammer/contrib/ntp/ntpd/refclock_chu.c#4 integrate .. //depot/projects/hammer/contrib/ntp/ntpd/refclock_conf.c#4 integrate .. //depot/projects/hammer/contrib/ntp/ntpd/refclock_datum.c#3 integrate .. //depot/projects/hammer/contrib/ntp/ntpd/refclock_fg.c#3 integrate .. //depot/projects/hammer/contrib/ntp/ntpd/refclock_gpsvme.c#3 integrate .. //depot/projects/hammer/contrib/ntp/ntpd/refclock_heath.c#3 integrate .. //depot/projects/hammer/contrib/ntp/ntpd/refclock_hopfpci.c#3 integrate .. //depot/projects/hammer/contrib/ntp/ntpd/refclock_hopfser.c#3 integrate .. //depot/projects/hammer/contrib/ntp/ntpd/refclock_hpgps.c#3 integrate .. //depot/projects/hammer/contrib/ntp/ntpd/refclock_irig.c#3 integrate .. //depot/projects/hammer/contrib/ntp/ntpd/refclock_jjy.c#3 integrate .. //depot/projects/hammer/contrib/ntp/ntpd/refclock_jupiter.c#3 integrate .. //depot/projects/hammer/contrib/ntp/ntpd/refclock_leitch.c#3 integrate .. //depot/projects/hammer/contrib/ntp/ntpd/refclock_local.c#4 integrate .. //depot/projects/hammer/contrib/ntp/ntpd/refclock_msfees.c#3 integrate .. //depot/projects/hammer/contrib/ntp/ntpd/refclock_mx4200.c#3 integrate .. //depot/projects/hammer/contrib/ntp/ntpd/refclock_neoclock4x.c#3 integrate .. //depot/projects/hammer/contrib/ntp/ntpd/refclock_nmea.c#3 integrate .. //depot/projects/hammer/contrib/ntp/ntpd/refclock_oncore.c#4 integrate .. //depot/projects/hammer/contrib/ntp/ntpd/refclock_palisade.c#4 integrate .. //depot/projects/hammer/contrib/ntp/ntpd/refclock_palisade.h#3 integrate .. //depot/projects/hammer/contrib/ntp/ntpd/refclock_parse.c#3 integrate .. //depot/projects/hammer/contrib/ntp/ntpd/refclock_pst.c#3 integrate .. //depot/projects/hammer/contrib/ntp/ntpd/refclock_ptbacts.c#2 delete .. //depot/projects/hammer/contrib/ntp/ntpd/refclock_ripencc.c#3 integrate .. //depot/projects/hammer/contrib/ntp/ntpd/refclock_shm.c#3 integrate .. //depot/projects/hammer/contrib/ntp/ntpd/refclock_ulink.c#3 integrate .. //depot/projects/hammer/contrib/ntp/ntpd/refclock_usno.c#3 delete .. //depot/projects/hammer/contrib/ntp/ntpd/refclock_wwv.c#3 integrate .. //depot/projects/hammer/contrib/ntp/ntpd/refclock_wwvb.c#3 integrate .. //depot/projects/hammer/contrib/ntp/ntpdate/Makefile.am#4 integrate .. //depot/projects/hammer/contrib/ntp/ntpdate/Makefile.in#4 integrate .. //depot/projects/hammer/contrib/ntp/ntpdate/ntpdate.c#6 integrate .. //depot/projects/hammer/contrib/ntp/ntpdate/ntptimeset.c#3 integrate .. //depot/projects/hammer/contrib/ntp/ntpdc/Makefile.am#4 integrate .. //depot/projects/hammer/contrib/ntp/ntpdc/Makefile.in#4 integrate .. //depot/projects/hammer/contrib/ntp/ntpdc/layout.std#2 integrate .. //depot/projects/hammer/contrib/ntp/ntpdc/nl.pl#2 integrate .. //depot/projects/hammer/contrib/ntp/ntpdc/nl.pl.in#2 integrate .. //depot/projects/hammer/contrib/ntp/ntpdc/ntpdc-opts.c#1 branch .. //depot/projects/hammer/contrib/ntp/ntpdc/ntpdc-opts.def#1 branch .. //depot/projects/hammer/contrib/ntp/ntpdc/ntpdc-opts.h#1 branch .. //depot/projects/hammer/contrib/ntp/ntpdc/ntpdc-opts.menu#1 branch .. //depot/projects/hammer/contrib/ntp/ntpdc/ntpdc-opts.texi#1 branch .. //depot/projects/hammer/contrib/ntp/ntpdc/ntpdc.1#1 branch .. //depot/projects/hammer/contrib/ntp/ntpdc/ntpdc.c#4 integrate .. //depot/projects/hammer/contrib/ntp/ntpdc/ntpdc.h#3 integrate .. //depot/projects/hammer/contrib/ntp/ntpdc/ntpdc_ops.c#4 integrate .. //depot/projects/hammer/contrib/ntp/ntpq/Makefile.am#4 integrate .. //depot/projects/hammer/contrib/ntp/ntpq/Makefile.in#4 integrate .. //depot/projects/hammer/contrib/ntp/ntpq/ntpq-opts.c#1 branch .. //depot/projects/hammer/contrib/ntp/ntpq/ntpq-opts.def#1 branch .. //depot/projects/hammer/contrib/ntp/ntpq/ntpq-opts.h#1 branch .. //depot/projects/hammer/contrib/ntp/ntpq/ntpq-opts.menu#1 branch .. //depot/projects/hammer/contrib/ntp/ntpq/ntpq-opts.texi#1 branch .. //depot/projects/hammer/contrib/ntp/ntpq/ntpq-subs.c#1 branch .. //depot/projects/hammer/contrib/ntp/ntpq/ntpq.1#1 branch .. //depot/projects/hammer/contrib/ntp/ntpq/ntpq.c#4 integrate .. //depot/projects/hammer/contrib/ntp/ntpq/ntpq.h#3 integrate .. //depot/projects/hammer/contrib/ntp/ntpq/ntpq_ops.c#3 delete .. //depot/projects/hammer/contrib/ntp/packageinfo.sh#1 branch .. //depot/projects/hammer/contrib/ntp/parseutil/Makefile.in#4 integrate .. //depot/projects/hammer/contrib/ntp/parseutil/dcfd.c#4 integrate .. //depot/projects/hammer/contrib/ntp/parseutil/testdcf.c#3 integrate .. //depot/projects/hammer/contrib/ntp/scripts/Makefile.am#3 integrate .. //depot/projects/hammer/contrib/ntp/scripts/Makefile.in#4 integrate .. //depot/projects/hammer/contrib/ntp/scripts/VersionName#1 branch .. //depot/projects/hammer/contrib/ntp/scripts/genCommitLog#1 branch .. //depot/projects/hammer/contrib/ntp/scripts/genver#1 branch .. //depot/projects/hammer/contrib/ntp/scripts/html2man.in#1 branch .. //depot/projects/hammer/contrib/ntp/scripts/mkver.in#3 integrate .. //depot/projects/hammer/contrib/ntp/scripts/monitoring/lr.pl#2 integrate .. //depot/projects/hammer/contrib/ntp/scripts/monitoring/ntploopwatch#2 integrate .. //depot/projects/hammer/contrib/ntp/scripts/ntpsweep.in#3 integrate .. //depot/projects/hammer/contrib/ntp/scripts/ntptrace.in#2 integrate .. //depot/projects/hammer/contrib/ntp/scripts/support/README#2 delete .. //depot/projects/hammer/contrib/ntp/scripts/support/bin/monl#2 delete .. //depot/projects/hammer/contrib/ntp/scripts/support/bin/mvstats#2 delete .. //depot/projects/hammer/contrib/ntp/scripts/support/conf/hp300.hp300#2 delete .. //depot/projects/hammer/contrib/ntp/scripts/support/conf/hp700.hp700#2 delete .. //depot/projects/hammer/contrib/ntp/scripts/support/conf/hp700.hp700.faui47#2 delete .. //depot/projects/hammer/contrib/ntp/scripts/support/conf/hp800.hp800#2 delete .. //depot/projects/hammer/contrib/ntp/scripts/support/conf/ntp.conf#2 delete .. //depot/projects/hammer/contrib/ntp/scripts/support/conf/sun3.sun3#2 delete .. //depot/projects/hammer/contrib/ntp/scripts/support/conf/sun4.sun4.faui01#2 delete .. //depot/projects/hammer/contrib/ntp/scripts/support/conf/sun4.sun4.faui10#2 delete .. //depot/projects/hammer/contrib/ntp/scripts/support/conf/sun4.sun4.faui45#2 delete .. //depot/projects/hammer/contrib/ntp/scripts/support/conf/sun4.sun4c#2 delete .. //depot/projects/hammer/contrib/ntp/scripts/support/conf/sun4.sun4c.Lucifer#2 delete .. //depot/projects/hammer/contrib/ntp/scripts/support/conf/sun4.sun4m#2 delete .. //depot/projects/hammer/contrib/ntp/scripts/support/conf/sun4.sun4m.faui42#2 delete .. //depot/projects/hammer/contrib/ntp/scripts/support/conf/sun4.sun4m.faui45m#2 delete .. //depot/projects/hammer/contrib/ntp/scripts/support/conf/tickconf#2 delete .. //depot/projects/hammer/contrib/ntp/scripts/support/etc/cron#2 delete .. //depot/projects/hammer/contrib/ntp/scripts/support/etc/crontab#2 delete .. //depot/projects/hammer/contrib/ntp/scripts/support/etc/install#2 delete .. //depot/projects/hammer/contrib/ntp/scripts/support/etc/rc#2 delete .. //depot/projects/hammer/contrib/ntp/scripts/support/etc/setup#2 delete .. //depot/projects/hammer/contrib/ntp/sntp/COPYRIGHT#1 branch .. //depot/projects/hammer/contrib/ntp/sntp/Makefile.am#2 integrate .. //depot/projects/hammer/contrib/ntp/sntp/Makefile.in#2 integrate .. //depot/projects/hammer/contrib/ntp/sntp/README#2 integrate .. //depot/projects/hammer/contrib/ntp/sntp/aclocal.m4#2 integrate .. //depot/projects/hammer/contrib/ntp/sntp/autogen-version.def#1 branch .. //depot/projects/hammer/contrib/ntp/sntp/bincheck.mf#1 branch .. //depot/projects/hammer/contrib/ntp/sntp/compile#1 branch .. //depot/projects/hammer/contrib/ntp/sntp/config.guess#2 integrate .. //depot/projects/hammer/contrib/ntp/sntp/config.h.in#1 branch .. //depot/projects/hammer/contrib/ntp/sntp/config.sub#2 integrate .. //depot/projects/hammer/contrib/ntp/sntp/configure#2 integrate .. //depot/projects/hammer/contrib/ntp/sntp/configure.ac#2 integrate .. //depot/projects/hammer/contrib/ntp/sntp/depcomp#2 integrate .. //depot/projects/hammer/contrib/ntp/sntp/header.h#2 integrate .. //depot/projects/hammer/contrib/ntp/sntp/install-sh#2 integrate .. //depot/projects/hammer/contrib/ntp/sntp/internet.c#2 integrate .. //depot/projects/hammer/contrib/ntp/sntp/internet.h#2 integrate .. //depot/projects/hammer/contrib/ntp/sntp/libopts/COPYING.lgpl#1 branch .. //depot/projects/hammer/contrib/ntp/sntp/libopts/COPYING.mbsd#1 branch .. //depot/projects/hammer/contrib/ntp/sntp/libopts/MakeDefs.inc#1 branch .. //depot/projects/hammer/contrib/ntp/sntp/libopts/Makefile.am#1 branch .. //depot/projects/hammer/contrib/ntp/sntp/libopts/Makefile.in#1 branch .. //depot/projects/hammer/contrib/ntp/sntp/libopts/README#1 branch .. //depot/projects/hammer/contrib/ntp/sntp/libopts/autoopts.c#1 branch .. //depot/projects/hammer/contrib/ntp/sntp/libopts/autoopts.h#1 branch .. //depot/projects/hammer/contrib/ntp/sntp/libopts/autoopts/options.h#1 branch .. //depot/projects/hammer/contrib/ntp/sntp/libopts/autoopts/usage-txt.h#1 branch .. //depot/projects/hammer/contrib/ntp/sntp/libopts/boolean.c#1 branch .. //depot/projects/hammer/contrib/ntp/sntp/libopts/compat/compat.h#1 branch .. //depot/projects/hammer/contrib/ntp/sntp/libopts/compat/pathfind.c#1 branch .. //depot/projects/hammer/contrib/ntp/sntp/libopts/compat/snprintf.c#1 branch .. //depot/projects/hammer/contrib/ntp/sntp/libopts/compat/strchr.c#1 branch .. //depot/projects/hammer/contrib/ntp/sntp/libopts/compat/strdup.c#1 branch .. //depot/projects/hammer/contrib/ntp/sntp/libopts/compat/windows-config.h#1 branch .. //depot/projects/hammer/contrib/ntp/sntp/libopts/configfile.c#1 branch .. //depot/projects/hammer/contrib/ntp/sntp/libopts/cook.c#1 branch .. //depot/projects/hammer/contrib/ntp/sntp/libopts/enumeration.c#1 branch .. //depot/projects/hammer/contrib/ntp/sntp/libopts/environment.c#1 branch .. //depot/projects/hammer/contrib/ntp/sntp/libopts/genshell.c#1 branch .. //depot/projects/hammer/contrib/ntp/sntp/libopts/genshell.h#1 branch .. //depot/projects/hammer/contrib/ntp/sntp/libopts/libopts.c#1 branch .. //depot/projects/hammer/contrib/ntp/sntp/libopts/load.c#1 branch .. //depot/projects/hammer/contrib/ntp/sntp/libopts/m4/libopts.m4#1 branch .. //depot/projects/hammer/contrib/ntp/sntp/libopts/m4/liboptschk.m4#1 branch .. //depot/projects/hammer/contrib/ntp/sntp/libopts/makeshell.c#1 branch .. //depot/projects/hammer/contrib/ntp/sntp/libopts/nested.c#1 branch .. //depot/projects/hammer/contrib/ntp/sntp/libopts/numeric.c#1 branch .. //depot/projects/hammer/contrib/ntp/sntp/libopts/pgusage.c#1 branch .. //depot/projects/hammer/contrib/ntp/sntp/libopts/proto.h#1 branch .. //depot/projects/hammer/contrib/ntp/sntp/libopts/putshell.c#1 branch .. //depot/projects/hammer/contrib/ntp/sntp/libopts/restore.c#1 branch .. //depot/projects/hammer/contrib/ntp/sntp/libopts/save.c#1 branch .. //depot/projects/hammer/contrib/ntp/sntp/libopts/sort.c#1 branch .. //depot/projects/hammer/contrib/ntp/sntp/libopts/stack.c#1 branch .. //depot/projects/hammer/contrib/ntp/sntp/libopts/streqvcmp.c#1 branch .. //depot/projects/hammer/contrib/ntp/sntp/libopts/text_mmap.c#1 branch .. //depot/projects/hammer/contrib/ntp/sntp/libopts/tokenize.c#1 branch .. //depot/projects/hammer/contrib/ntp/sntp/libopts/usage.c#1 branch .. //depot/projects/hammer/contrib/ntp/sntp/libopts/version.c#1 branch .. //depot/projects/hammer/contrib/ntp/sntp/ltmain.sh#1 branch .. //depot/projects/hammer/contrib/ntp/sntp/main.c#2 integrate .. //depot/projects/hammer/contrib/ntp/sntp/missing#2 integrate .. //depot/projects/hammer/contrib/ntp/sntp/mkinstalldirs#2 delete .. //depot/projects/hammer/contrib/ntp/sntp/sntp-opts.c#1 branch .. //depot/projects/hammer/contrib/ntp/sntp/sntp-opts.def#1 branch .. //depot/projects/hammer/contrib/ntp/sntp/sntp-opts.h#1 branch .. //depot/projects/hammer/contrib/ntp/sntp/sntp-opts.menu#1 branch .. //depot/projects/hammer/contrib/ntp/sntp/sntp-opts.texi#1 branch .. //depot/projects/hammer/contrib/ntp/sntp/sntp.1#1 branch .. //depot/projects/hammer/contrib/ntp/sntp/socket.c#2 integrate .. //depot/projects/hammer/contrib/ntp/sntp/timing.c#2 integrate .. //depot/projects/hammer/contrib/ntp/sntp/version.def#1 branch .. //depot/projects/hammer/contrib/ntp/util/Makefile.am#3 integrate .. //depot/projects/hammer/contrib/ntp/util/Makefile.in#4 integrate .. //depot/projects/hammer/contrib/ntp/util/ansi2knr.c#3 integrate .. //depot/projects/hammer/contrib/ntp/util/hist.c#3 integrate .. //depot/projects/hammer/contrib/ntp/util/jitter.c#2 integrate .. //depot/projects/hammer/contrib/ntp/util/jitter.h#1 branch .. //depot/projects/hammer/contrib/ntp/util/ntp-keygen-opts.c#1 branch .. //depot/projects/hammer/contrib/ntp/util/ntp-keygen-opts.def#1 branch .. //depot/projects/hammer/contrib/ntp/util/ntp-keygen-opts.h#1 branch .. //depot/projects/hammer/contrib/ntp/util/ntp-keygen-opts.menu#1 branch .. //depot/projects/hammer/contrib/ntp/util/ntp-keygen-opts.texi#1 branch .. //depot/projects/hammer/contrib/ntp/util/ntp-keygen.1#1 branch .. //depot/projects/hammer/contrib/ntp/util/ntp-keygen.c#3 integrate .. //depot/projects/hammer/contrib/ntp/util/ntptime.c#3 integrate .. //depot/projects/hammer/contrib/ntp/util/tg.c#1 branch .. //depot/projects/hammer/contrib/ntp/version#3 integrate .. //depot/projects/hammer/contrib/ntp/version.m4#1 branch .. //depot/projects/hammer/contrib/sendmail/FREEBSD-upgrade#18 integrate .. //depot/projects/hammer/contrib/sendmail/KNOWNBUGS#6 integrate .. //depot/projects/hammer/contrib/sendmail/PGPKEYS#9 integrate .. //depot/projects/hammer/contrib/sendmail/README#5 integrate .. //depot/projects/hammer/contrib/sendmail/RELEASE_NOTES#15 integrate .. //depot/projects/hammer/contrib/sendmail/cf/README#12 integrate .. //depot/projects/hammer/contrib/sendmail/cf/cf/submit.cf#15 integrate .. //depot/projects/hammer/contrib/sendmail/cf/m4/proto.m4#13 integrate .. //depot/projects/hammer/contrib/sendmail/cf/m4/version.m4#15 integrate .. //depot/projects/hammer/contrib/sendmail/include/libmilter/mfapi.h#8 integrate .. //depot/projects/hammer/contrib/sendmail/libmilter/Makefile.m4#4 integrate .. //depot/projects/hammer/contrib/sendmail/libmilter/docs/smfi_opensocket.html#3 integrate .. //depot/projects/hammer/contrib/sendmail/libmilter/docs/smfi_version.html#2 integrate .. //depot/projects/hammer/contrib/sendmail/libmilter/engine.c#12 integrate .. //depot/projects/hammer/contrib/sendmail/libmilter/main.c#8 integrate .. //depot/projects/hammer/contrib/sendmail/libmilter/worker.c#2 integrate .. //depot/projects/hammer/contrib/sendmail/mail.local/mail.local.c#9 integrate .. //depot/projects/hammer/contrib/sendmail/makemap/makemap.8#3 integrate .. //depot/projects/hammer/contrib/sendmail/makemap/makemap.c#7 integrate .. //depot/projects/hammer/contrib/sendmail/smrsh/README#4 integrate .. //depot/projects/hammer/contrib/sendmail/smrsh/smrsh.c#9 integrate .. //depot/projects/hammer/contrib/sendmail/src/Makefile.m4#7 integrate .. //depot/projects/hammer/contrib/sendmail/src/README#12 integrate .. //depot/projects/hammer/contrib/sendmail/src/collect.c#12 integrate .. //depot/projects/hammer/contrib/sendmail/src/conf.c#15 integrate .. //depot/projects/hammer/contrib/sendmail/src/conf.h#7 integrate .. //depot/projects/hammer/contrib/sendmail/src/daemon.c#11 integrate .. //depot/projects/hammer/contrib/sendmail/src/envelope.c#9 integrate .. //depot/projects/hammer/contrib/sendmail/src/err.c#6 integrate .. //depot/projects/hammer/contrib/sendmail/src/headers.c#14 integrate .. //depot/projects/hammer/contrib/sendmail/src/mailq.1#6 integrate .. //depot/projects/hammer/contrib/sendmail/src/main.c#13 integrate .. //depot/projects/hammer/contrib/sendmail/src/mci.c#11 integrate .. //depot/projects/hammer/contrib/sendmail/src/parseaddr.c#13 integrate .. //depot/projects/hammer/contrib/sendmail/src/queue.c#15 integrate .. //depot/projects/hammer/contrib/sendmail/src/ratectrl.c#4 integrate .. //depot/projects/hammer/contrib/sendmail/src/readcf.c#12 integrate .. //depot/projects/hammer/contrib/sendmail/src/savemail.c#9 integrate .. //depot/projects/hammer/contrib/sendmail/src/sendmail.h#14 integrate .. //depot/projects/hammer/contrib/sendmail/src/sfsasl.c#9 integrate .. //depot/projects/hammer/contrib/sendmail/src/sm_resolve.c#7 integrate .. //depot/projects/hammer/contrib/sendmail/src/srvrsmtp.c#15 integrate .. //depot/projects/hammer/contrib/sendmail/src/usersmtp.c#12 integrate .. //depot/projects/hammer/contrib/sendmail/src/util.c#11 integrate .. //depot/projects/hammer/contrib/sendmail/src/version.c#15 integrate .. //depot/projects/hammer/contrib/telnet/telnetd/telnetd.8#4 integrate .. //depot/projects/hammer/crypto/openssh/config.h#14 integrate .. //depot/projects/hammer/crypto/openssh/openbsd-compat/fake-queue.h#2 delete .. //depot/projects/hammer/crypto/openssh/openbsd-compat/tree.h#2 delete .. //depot/projects/hammer/crypto/openssh/readconf.c#13 integrate .. //depot/projects/hammer/etc/defaults/devfs.rules#6 integrate .. //depot/projects/hammer/etc/defaults/rc.conf#89 integrate .. //depot/projects/hammer/etc/etc.amd64/ttys#8 integrate .. //depot/projects/hammer/etc/etc.arm/ttys#6 integrate .. //depot/projects/hammer/etc/etc.i386/ttys#6 integrate .. //depot/projects/hammer/etc/etc.ia64/ttys#7 integrate .. //depot/projects/hammer/etc/etc.mips/ttys#2 integrate .. //depot/projects/hammer/etc/etc.powerpc/ttys#7 integrate .. //depot/projects/hammer/etc/etc.sparc64/ttys#14 integrate .. //depot/projects/hammer/etc/freebsd-update.conf#6 integrate .. //depot/projects/hammer/etc/login.conf#5 integrate .. //depot/projects/hammer/etc/periodic/security/550.ipfwlimit#9 integrate .. //depot/projects/hammer/etc/rc.d/Makefile#63 integrate .. //depot/projects/hammer/etc/rc.d/kernel#3 delete .. //depot/projects/hammer/etc/rc.d/savecore#12 integrate .. //depot/projects/hammer/etc/rc.firewall#11 integrate .. //depot/projects/hammer/etc/sendmail/freebsd.mc#12 integrate .. //depot/projects/hammer/etc/sendmail/freebsd.submit.mc#7 integrate .. //depot/projects/hammer/games/fortune/fortune/fortune.6#5 integrate .. //depot/projects/hammer/games/fortune/fortune/fortune.c#8 integrate .. //depot/projects/hammer/games/fortune/strfile/strfile.c#8 integrate .. //depot/projects/hammer/games/random/random.c#9 integrate .. //depot/projects/hammer/games/random/randomize_fd.c#3 integrate .. //depot/projects/hammer/games/random/randomize_fd.h#2 integrate .. //depot/projects/hammer/gnu/lib/libgcc/Makefile#18 integrate .. //depot/projects/hammer/gnu/lib/libgomp/Makefile#2 integrate .. //depot/projects/hammer/gnu/lib/libgomp/config.h#2 integrate .. //depot/projects/hammer/gnu/usr.bin/Makefile#20 integrate .. //depot/projects/hammer/gnu/usr.bin/binutils/libbfd/Makefile.amd64#8 integrate .. //depot/projects/hammer/gnu/usr.bin/cc/Makefile.tgt#8 integrate .. //depot/projects/hammer/gnu/usr.bin/cc/cc_tools/Makefile#24 integrate .. //depot/projects/hammer/gnu/usr.bin/cc/cc_tools/elfos-undef.h#1 branch .. //depot/projects/hammer/gnu/usr.bin/cc/cc_tools/freebsd64-fix.h#2 delete .. //depot/projects/hammer/include/complex.h#6 integrate .. //depot/projects/hammer/lib/bind/config.h#9 integrate .. //depot/projects/hammer/lib/csu/amd64/Makefile#6 integrate .. //depot/projects/hammer/lib/libarchive/Makefile#51 integrate .. //depot/projects/hammer/lib/libarchive/archive.h#15 integrate .. //depot/projects/hammer/lib/libarchive/archive_entry.c#35 integrate .. //depot/projects/hammer/lib/libarchive/archive_entry.h#24 integrate .. //depot/projects/hammer/lib/libarchive/archive_entry_link_resolver.c#4 integrate .. //depot/projects/hammer/lib/libarchive/archive_entry_private.h#5 integrate .. //depot/projects/hammer/lib/libarchive/archive_write_disk.3#4 integrate .. //depot/projects/hammer/lib/libarchive/archive_write_disk.c#16 integrate .. //depot/projects/hammer/lib/libarchive/archive_write_set_format.c#6 integrate .. //depot/projects/hammer/lib/libarchive/archive_write_set_format_ar.c#8 integrate .. //depot/projects/hammer/lib/libarchive/archive_write_set_format_by_name.c#8 integrate .. //depot/projects/hammer/lib/libarchive/archive_write_set_format_mtree.c#1 branch .. //depot/projects/hammer/lib/libarchive/archive_write_set_format_pax.c#35 integrate .. //depot/projects/hammer/lib/libarchive/archive_write_set_format_shar.c#14 integrate .. //depot/projects/hammer/lib/libarchive/test/Makefile#13 integrate .. //depot/projects/hammer/lib/libarchive/test/main.c#13 integrate .. //depot/projects/hammer/lib/libarchive/test/read_open_memory.c#3 integrate .. //depot/projects/hammer/lib/libarchive/test/test_acl_basic.c#5 integrate .. //depot/projects/hammer/lib/libarchive/test/test_acl_pax.c#6 integrate .. //depot/projects/hammer/lib/libarchive/test/test_bad_fd.c#2 integrate .. //depot/projects/hammer/lib/libarchive/test/test_compat_gtar.c#3 integrate .. //depot/projects/hammer/lib/libarchive/test/test_compat_tar_hardlink.c#3 integrate .. //depot/projects/hammer/lib/libarchive/test/test_compat_zip.c#3 integrate .. //depot/projects/hammer/lib/libarchive/test/test_empty_write.c#3 integrate .. //depot/projects/hammer/lib/libarchive/test/test_entry.c#5 integrate .. //depot/projects/hammer/lib/libarchive/test/test_pax_filename_encoding.c#3 integrate .. //depot/projects/hammer/lib/libarchive/test/test_read_compress_program.c#3 integrate .. //depot/projects/hammer/lib/libarchive/test/test_read_data_large.c#4 integrate .. //depot/projects/hammer/lib/libarchive/test/test_read_extract.c#5 integrate .. //depot/projects/hammer/lib/libarchive/test/test_read_format_ar.c#6 integrate .. //depot/projects/hammer/lib/libarchive/test/test_read_format_cpio_bin.c#2 integrate .. //depot/projects/hammer/lib/libarchive/test/test_read_format_cpio_bin_Z.c#2 integrate .. //depot/projects/hammer/lib/libarchive/test/test_read_format_cpio_bin_bz2.c#2 integrate .. //depot/projects/hammer/lib/libarchive/test/test_read_format_cpio_bin_gz.c#2 integrate .. //depot/projects/hammer/lib/libarchive/test/test_read_format_cpio_odc.c#3 integrate .. //depot/projects/hammer/lib/libarchive/test/test_read_format_cpio_svr4_gzip.c#2 integrate .. //depot/projects/hammer/lib/libarchive/test/test_read_format_cpio_svr4c_Z.c#2 integrate .. //depot/projects/hammer/lib/libarchive/test/test_read_format_empty.c#2 integrate .. //depot/projects/hammer/lib/libarchive/test/test_read_format_gtar_gz.c#2 integrate .. //depot/projects/hammer/lib/libarchive/test/test_read_format_gtar_sparse.c#8 integrate .. //depot/projects/hammer/lib/libarchive/test/test_read_format_iso_gz.c#2 integrate .. //depot/projects/hammer/lib/libarchive/test/test_read_format_isorr_bz2.c#5 integrate .. //depot/projects/hammer/lib/libarchive/test/test_read_format_mtree.c#3 integrate .. //depot/projects/hammer/lib/libarchive/test/test_read_format_pax_bz2.c#2 integrate .. //depot/projects/hammer/lib/libarchive/test/test_read_format_tar.c#4 integrate .. //depot/projects/hammer/lib/libarchive/test/test_read_format_tar_empty_filename.c#2 integrate .. //depot/projects/hammer/lib/libarchive/test/test_read_format_tbz.c#2 integrate .. //depot/projects/hammer/lib/libarchive/test/test_read_format_tgz.c#2 integrate .. //depot/projects/hammer/lib/libarchive/test/test_read_format_tz.c#2 integrate .. //depot/projects/hammer/lib/libarchive/test/test_read_format_zip.c#5 integrate .. //depot/projects/hammer/lib/libarchive/test/test_read_large.c#4 integrate .. //depot/projects/hammer/lib/libarchive/test/test_read_pax_truncated.c#3 integrate .. //depot/projects/hammer/lib/libarchive/test/test_read_position.c#4 integrate .. //depot/projects/hammer/lib/libarchive/test/test_read_truncated.c#4 integrate .. //depot/projects/hammer/lib/libarchive/test/test_tar_filenames.c#8 integrate .. //depot/projects/hammer/lib/libarchive/test/test_tar_large.c#3 integrate .. //depot/projects/hammer/lib/libarchive/test/test_ustar_filenames.c#2 integrate .. //depot/projects/hammer/lib/libarchive/test/test_write_compress.c#2 integrate .. //depot/projects/hammer/lib/libarchive/test/test_write_compress_program.c#3 integrate .. //depot/projects/hammer/lib/libarchive/test/test_write_disk.c#7 integrate .. //depot/projects/hammer/lib/libarchive/test/test_write_disk_hardlink.c#3 integrate .. //depot/projects/hammer/lib/libarchive/test/test_write_disk_perms.c#10 integrate .. //depot/projects/hammer/lib/libarchive/test/test_write_disk_secure.c#5 integrate .. //depot/projects/hammer/lib/libarchive/test/test_write_format_ar.c#8 integrate .. //depot/projects/hammer/lib/libarchive/test/test_write_format_cpio.c#5 integrate .. //depot/projects/hammer/lib/libarchive/test/test_write_format_cpio_empty.c#3 integrate .. //depot/projects/hammer/lib/libarchive/test/test_write_format_cpio_newc.c#3 integrate .. //depot/projects/hammer/lib/libarchive/test/test_write_format_cpio_odc.c#2 integrate .. //depot/projects/hammer/lib/libarchive/test/test_write_format_shar_empty.c#3 integrate .. //depot/projects/hammer/lib/libarchive/test/test_write_format_tar.c#4 integrate .. //depot/projects/hammer/lib/libarchive/test/test_write_format_tar_empty.c#4 integrate .. //depot/projects/hammer/lib/libarchive/test/test_write_format_tar_ustar.c#2 integrate .. //depot/projects/hammer/lib/libarchive/test/test_write_open_memory.c#4 integrate .. //depot/projects/hammer/lib/libbluetooth/Makefile#6 integrate .. //depot/projects/hammer/lib/libbluetooth/bluetooth.3#7 integrate .. //depot/projects/hammer/lib/libbluetooth/bluetooth.h#3 integrate .. //depot/projects/hammer/lib/libc/include/libc_private.h#18 integrate .. //depot/projects/hammer/lib/libc/regex/re_format.7#3 integrate .. //depot/projects/hammer/lib/libc/stdlib/Makefile.inc#18 integrate .. //depot/projects/hammer/lib/libc/stdlib/Symbol.map#7 integrate .. //depot/projects/hammer/lib/libc/stdlib/grantpt.3#4 delete .. //depot/projects/hammer/lib/libc/stdlib/grantpt.c#11 delete .. //depot/projects/hammer/lib/libc/stdlib/malloc.3#20 integrate .. //depot/projects/hammer/lib/libc/stdlib/malloc.c#47 integrate .. //depot/projects/hammer/lib/libc/stdlib/ptsname.3#1 branch .. //depot/projects/hammer/lib/libc/stdlib/ptsname.c#1 branch .. //depot/projects/hammer/lib/libc/sys/Makefile.inc#36 integrate .. //depot/projects/hammer/lib/libc/sys/Symbol.map#14 integrate .. //depot/projects/hammer/lib/libc/sys/execve.2#6 integrate .. //depot/projects/hammer/lib/libc/sys/getrlimit.2#6 integrate .. //depot/projects/hammer/lib/libc/sys/posix_openpt.2#1 branch .. //depot/projects/hammer/lib/libc/sys/setfib.2#3 integrate .. //depot/projects/hammer/lib/libc/sys/wait.2#11 integrate .. //depot/projects/hammer/lib/libc/uuid/Makefile.inc#6 integrate .. //depot/projects/hammer/lib/libc/uuid/uuid.3#6 integrate .. //depot/projects/hammer/lib/libc/uuid/uuid_stream.c#1 branch .. //depot/projects/hammer/lib/libgeom/geom_util.c#3 integrate .. //depot/projects/hammer/lib/libgeom/geom_xml2tree.c#6 integrate .. //depot/projects/hammer/lib/libgeom/libgeom.3#9 integrate .. //depot/projects/hammer/lib/libgeom/libgeom.h#7 integrate .. //depot/projects/hammer/lib/libkvm/Makefile#5 integrate .. //depot/projects/hammer/lib/libkvm/kvm.h#6 integrate .. //depot/projects/hammer/lib/libkvm/kvm_cptime.c#1 branch .. //depot/projects/hammer/lib/libkvm/kvm_getcptime.3#1 branch .. //depot/projects/hammer/lib/libkvm/kvm_getpcpu.3#1 branch .. //depot/projects/hammer/lib/libkvm/kvm_pcpu.c#1 branch .. //depot/projects/hammer/lib/libpcap/Makefile#14 integrate .. //depot/projects/hammer/lib/libpcap/config.h#6 integrate .. //depot/projects/hammer/lib/librpcsec_gss/svc_rpcsec_gss.c#2 integrate .. //depot/projects/hammer/lib/librt/sigev_thread.c#4 integrate .. //depot/projects/hammer/lib/libstand/mips/_setjmp.S#1 branch .. //depot/projects/hammer/lib/libstand/stand.h#9 integrate .. //depot/projects/hammer/lib/libstand/ufs.c#6 integrate .. //depot/projects/hammer/lib/libstand/zalloc_malloc.c#4 integrate .. //depot/projects/hammer/lib/libthr/thread/thr_exit.c#27 integrate .. //depot/projects/hammer/lib/libthread_db/arch/mips/libpthread_md.c#1 branch .. //depot/projects/hammer/lib/libthread_db/thread_db.h#6 integrate .. //depot/projects/hammer/lib/libutil/login.conf.5#11 integrate .. //depot/projects/hammer/lib/libutil/login_class.c#8 integrate .. //depot/projects/hammer/lib/msun/Makefile#43 integrate .. //depot/projects/hammer/lib/msun/Symbol.map#13 integrate .. //depot/projects/hammer/lib/msun/man/cimag.3#3 integrate .. //depot/projects/hammer/lib/msun/src/e_asinf.c#5 integrate .. //depot/projects/hammer/lib/msun/src/e_jnf.c#3 integrate .. //depot/projects/hammer/lib/msun/src/e_rem_pio2.c#6 integrate .. //depot/projects/hammer/lib/msun/src/e_rem_pio2f.c#10 integrate .. //depot/projects/hammer/lib/msun/src/s_cimag.c#2 integrate .. //depot/projects/hammer/lib/msun/src/s_cimagf.c#2 integrate .. //depot/projects/hammer/lib/msun/src/s_cimagl.c#2 integrate .. //depot/projects/hammer/lib/msun/src/s_conj.c#2 integrate .. //depot/projects/hammer/lib/msun/src/s_conjf.c#2 integrate .. //depot/projects/hammer/lib/msun/src/s_conjl.c#2 integrate .. //depot/projects/hammer/lib/msun/src/s_cproj.c#1 branch .. //depot/projects/hammer/lib/msun/src/s_cprojf.c#1 branch .. //depot/projects/hammer/lib/msun/src/s_cprojl.c#1 branch .. //depot/projects/hammer/lib/msun/src/s_csqrt.c#4 integrate .. //depot/projects/hammer/lib/msun/src/s_csqrtf.c#3 integrate .. //depot/projects/hammer/lib/msun/src/s_csqrtl.c#2 integrate .. //depot/projects/hammer/libexec/Makefile#34 integrate .. //depot/projects/hammer/libexec/pt_chown/Makefile#5 delete .. //depot/projects/hammer/libexec/pt_chown/pt_chown.c#2 delete .. //depot/projects/hammer/libexec/rtld-elf/rtld.c#42 integrate .. //depot/projects/hammer/release/Makefile.inc.docports#13 integrate .. //depot/projects/hammer/release/amd64/boot_crunch.conf#9 integrate .. //depot/projects/hammer/release/doc/en_US.ISO8859-1/relnotes/article.sgml#36 integrate .. //depot/projects/hammer/release/i386/boot_crunch.conf#10 integrate .. //depot/projects/hammer/release/ia64/boot_crunch.conf#13 integrate .. //depot/projects/hammer/release/pc98/boot_crunch.conf#11 integrate .. //depot/projects/hammer/release/powerpc/boot_crunch.conf#6 integrate .. //depot/projects/hammer/release/sparc64/boot_crunch.conf#9 integrate .. //depot/projects/hammer/release/sun4v/boot_crunch.conf#4 integrate .. //depot/projects/hammer/rescue/rescue/Makefile#40 integrate .. //depot/projects/hammer/sbin/fdisk/fdisk.c#22 integrate .. //depot/projects/hammer/sbin/fsck_ffs/main.c#17 integrate .. //depot/projects/hammer/sbin/geom/class/eli/geli.8#10 integrate .. //depot/projects/hammer/sbin/geom/class/eli/geom_eli.c#14 integrate .. //depot/projects/hammer/sbin/geom/class/virstor/geom_virstor.c#3 integrate .. //depot/projects/hammer/sbin/gpt/Makefile#8 delete .. //depot/projects/hammer/sbin/gpt/add.c#14 delete .. //depot/projects/hammer/sbin/gpt/boot.c#3 delete .. //depot/projects/hammer/sbin/gpt/create.c#9 delete .. //depot/projects/hammer/sbin/gpt/destroy.c#6 delete .. //depot/projects/hammer/sbin/gpt/gpt.8#16 delete .. //depot/projects/hammer/sbin/gpt/gpt.c#16 delete .. //depot/projects/hammer/sbin/gpt/gpt.h#11 delete .. //depot/projects/hammer/sbin/gpt/label.c#4 delete .. //depot/projects/hammer/sbin/gpt/map.c#5 delete .. //depot/projects/hammer/sbin/gpt/map.h#6 delete .. //depot/projects/hammer/sbin/gpt/migrate.c#13 delete .. //depot/projects/hammer/sbin/gpt/recover.c#8 delete .. //depot/projects/hammer/sbin/gpt/remove.c#8 delete .. //depot/projects/hammer/sbin/gpt/show.c#12 delete .. //depot/projects/hammer/sbin/ifconfig/ifconfig.8#52 integrate .. //depot/projects/hammer/sbin/ifconfig/ifconfig.c#40 integrate .. //depot/projects/hammer/sbin/ifconfig/ifieee80211.c#36 integrate .. //depot/projects/hammer/sbin/ifconfig/ifvlan.c#10 integrate .. //depot/projects/hammer/sbin/ifconfig/regdomain.c#3 integrate .. //depot/projects/hammer/sbin/ipfw/ipfw.8#67 integrate .. //depot/projects/hammer/sbin/ipfw/ipfw2.c#65 integrate .. //depot/projects/hammer/sbin/md5/md5.1#8 integrate .. //depot/projects/hammer/sbin/md5/md5.c#10 integrate .. //depot/projects/hammer/sbin/mount/mount.c#32 integrate .. //depot/projects/hammer/sbin/natd/natd.c#14 integrate .. //depot/projects/hammer/sbin/ping6/ping6.8#8 integrate .. //depot/projects/hammer/sbin/ping6/ping6.c#14 integrate .. //depot/projects/hammer/share/man/man4/Makefile#109 integrate .. //depot/projects/hammer/share/man/man4/acpi_aiboost.4#1 branch .. //depot/projects/hammer/share/man/man4/acpi_asus.4#1 branch .. //depot/projects/hammer/share/man/man4/acpi_fujitsu.4#1 branch .. //depot/projects/hammer/share/man/man4/acpi_ibm.4#1 branch .. //depot/projects/hammer/share/man/man4/acpi_panasonic.4#1 branch .. //depot/projects/hammer/share/man/man4/acpi_sony.4#1 branch .. //depot/projects/hammer/share/man/man4/acpi_toshiba.4#1 branch .. //depot/projects/hammer/share/man/man4/ata.4#32 integrate .. //depot/projects/hammer/share/man/man4/bpf.4#16 integrate .. //depot/projects/hammer/share/man/man4/cpuctl.4#1 branch .. //depot/projects/hammer/share/man/man4/ddb.4#19 integrate .. //depot/projects/hammer/share/man/man4/et.4#2 integrate .. //depot/projects/hammer/share/man/man4/ichwd.4#2 integrate .. //depot/projects/hammer/share/man/man4/if_bridge.4#17 integrate .. //depot/projects/hammer/share/man/man4/io.4#1 branch .. //depot/projects/hammer/share/man/man4/linux.4#1 branch .. //depot/projects/hammer/share/man/man4/man4.i386/Makefile#38 integrate .. //depot/projects/hammer/share/man/man4/man4.i386/acpi_aiboost.4#2 delete .. //depot/projects/hammer/share/man/man4/man4.i386/acpi_asus.4#12 delete .. //depot/projects/hammer/share/man/man4/man4.i386/acpi_fujitsu.4#6 delete .. //depot/projects/hammer/share/man/man4/man4.i386/acpi_ibm.4#13 delete .. //depot/projects/hammer/share/man/man4/man4.i386/acpi_panasonic.4#8 delete .. //depot/projects/hammer/share/man/man4/man4.i386/acpi_sony.4#6 delete .. //depot/projects/hammer/share/man/man4/man4.i386/acpi_toshiba.4#6 delete .. //depot/projects/hammer/share/man/man4/man4.i386/dpms.4#1 branch .. //depot/projects/hammer/share/man/man4/man4.i386/glxsb.4#1 branch .. //depot/projects/hammer/share/man/man4/man4.i386/ichwd.4#3 delete .. //depot/projects/hammer/share/man/man4/man4.i386/io.4#4 delete .. //depot/projects/hammer/share/man/man4/man4.i386/linux.4#9 delete .. //depot/projects/hammer/share/man/man4/man4.i386/ndis.4#10 delete .. //depot/projects/hammer/share/man/man4/miibus.4#16 integrate .. //depot/projects/hammer/share/man/man4/ndis.4#1 branch .. //depot/projects/hammer/share/man/man4/pts.4#1 branch .. //depot/projects/hammer/share/man/man4/pty.4#9 integrate .. //depot/projects/hammer/share/man/man4/rum.4#5 integrate .. //depot/projects/hammer/share/man/man4/snp.4#6 integrate .. //depot/projects/hammer/share/man/man4/tcp.4#20 integrate .. //depot/projects/hammer/share/man/man4/termios.4#8 integrate .. //depot/projects/hammer/share/man/man4/uipaq.4#1 branch .. //depot/projects/hammer/share/man/man4/upgt.4#1 branch .. //depot/projects/hammer/share/man/man4/wi.4#33 integrate .. //depot/projects/hammer/share/man/man4/witness.4#9 integrate .. //depot/projects/hammer/share/man/man5/rc.conf.5#92 integrate .. //depot/projects/hammer/share/man/man9/CTASSERT.9#3 integrate >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Mon Sep 8 20:28:23 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 877D41065687; Mon, 8 Sep 2008 20:28: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 4AA461065676 for ; Mon, 8 Sep 2008 20:28: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 3C9BE8FC1A for ; Mon, 8 Sep 2008 20:28: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 m88KSNCe003517 for ; Mon, 8 Sep 2008 20:28:23 GMT (envelope-from peter-gmail@wemm.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m88KSN0O003509 for perforce@freebsd.org; Mon, 8 Sep 2008 20:28:23 GMT (envelope-from peter-gmail@wemm.org) Date: Mon, 8 Sep 2008 20:28:23 GMT Message-Id: <200809082028.m88KSN0O003509@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 149440 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, 08 Sep 2008 20:28:23 -0000 http://perforce.freebsd.org/chv.cgi?CH=149440 Change 149440 by peter@peter_overcee on 2008/09/08 20:27:38 revert fsbase/gsbase tweaks. OBE. Affected files ... .. //depot/projects/hammer/sys/amd64/amd64/cpu_switch.S#49 edit .. //depot/projects/hammer/sys/amd64/amd64/genassym.c#55 edit .. //depot/projects/hammer/sys/amd64/amd64/machdep.c#172 edit .. //depot/projects/hammer/sys/amd64/amd64/sys_machdep.c#28 edit .. //depot/projects/hammer/sys/amd64/amd64/vm_machdep.c#93 edit .. //depot/projects/hammer/sys/amd64/ia32/ia32_signal.c#27 edit .. //depot/projects/hammer/sys/amd64/include/pcpu.h#32 edit .. //depot/projects/hammer/sys/amd64/linux32/linux32_machdep.c#24 edit .. //depot/projects/hammer/sys/amd64/linux32/linux32_sysvec.c#22 edit Differences ... ==== //depot/projects/hammer/sys/amd64/amd64/cpu_switch.S#49 (text+ko) ==== @@ -84,7 +84,6 @@ movq TD_PCB(%rsi),%r8 /* newtd->td_proc */ movq PCB_CR3(%r8),%rdx movq %rdx,%cr3 /* new address space */ - movq TD_PCB(%rsi),%r8 jmp swact END(cpu_throw) @@ -191,33 +190,27 @@ /* Skip loading user fsbase/gsbase for kthreads */ testl $TDP_KTHREAD,TD_PFLAGS(%rsi) - jnz do_tss + jnz do_kthread testl $PCB_32BIT,PCB_FLAGS(%r8) jnz load_seg done_load_seg: - movq PCPU(FSBASE),%r10 - movq PCPU(GSBASE),%r11 - cmpq PCB_FSBASE(%r8),%r10 + cmpq PCB_FSBASE(%r8),%r9 jz 1f /* Restore userland %fs */ movl $MSR_FSBASE,%ecx movl PCB_FSBASE(%r8),%eax movl PCB_FSBASE+4(%r8),%edx wrmsr - movq PCB_FSBASE(%r8),%rax - movq %rax,PCPU(FSBASE) 1: - cmpq PCB_GSBASE(%r8),%r11 + cmpq PCB_GSBASE(%r8),%r10 jz 2f /* Restore userland %gs */ movl $MSR_KGSBASE,%ecx movl PCB_GSBASE(%r8),%eax movl PCB_GSBASE+4(%r8),%edx wrmsr - movq PCB_GSBASE(%r8),%rax - movq %rax,PCPU(GSBASE) 2: do_tss: ==== //depot/projects/hammer/sys/amd64/amd64/genassym.c#55 (text+ko) ==== @@ -199,8 +199,6 @@ ASSYM(PC_TSSP, offsetof(struct pcpu, pc_tssp)); ASSYM(PC_RSP0, offsetof(struct pcpu, pc_rsp0)); ASSYM(PC_GS32P, offsetof(struct pcpu, pc_gs32p)); -ASSYM(PC_FSBASE, offsetof(struct pcpu, pc_fsbase)); -ASSYM(PC_GSBASE, offsetof(struct pcpu, pc_gsbase)); ASSYM(LA_VER, offsetof(struct LAPIC, version)); ASSYM(LA_TPR, offsetof(struct LAPIC, tpr)); ==== //depot/projects/hammer/sys/amd64/amd64/machdep.c#172 (text+ko) ==== @@ -732,8 +732,6 @@ critical_enter(); wrmsr(MSR_FSBASE, 0); wrmsr(MSR_KGSBASE, 0); /* User value while we're in the kernel */ - PCPU_SET(fsbase, 0); - PCPU_SET(gsbase, 0); pcb->pcb_fsbase = 0; pcb->pcb_gsbase = 0; critical_exit(); ==== //depot/projects/hammer/sys/amd64/amd64/sys_machdep.c#28 (text+ko) ==== @@ -73,7 +73,6 @@ if (!error) { critical_enter(); wrmsr(MSR_FSBASE, i386base); - PCPU_SET(fsbase, i386base); pcb->pcb_fsbase = i386base; critical_exit(); } @@ -87,7 +86,6 @@ if (!error) { critical_enter(); wrmsr(MSR_KGSBASE, i386base); - PCPU_SET(gsbase, i386base); pcb->pcb_gsbase = i386base; critical_exit(); } @@ -102,7 +100,6 @@ if (a64base < VM_MAXUSER_ADDRESS) { critical_enter(); wrmsr(MSR_FSBASE, a64base); - PCPU_SET(fsbase, a64base); pcb->pcb_fsbase = a64base; critical_exit(); } else { @@ -121,7 +118,6 @@ if (a64base < VM_MAXUSER_ADDRESS) { critical_enter(); wrmsr(MSR_KGSBASE, a64base); - PCPU_SET(gsbase, a64base); pcb->pcb_gsbase = a64base; critical_exit(); } else { ==== //depot/projects/hammer/sys/amd64/amd64/vm_machdep.c#93 (text+ko) ==== @@ -374,7 +374,6 @@ critical_enter(); td->td_pcb->pcb_gsbase = (register_t)tls_base; wrmsr(MSR_KGSBASE, td->td_pcb->pcb_gsbase); - PCPU_SET(gsbase, td->td_pcb->pcb_gsbase); critical_exit(); } else { td->td_pcb->pcb_gsbase = (register_t)tls_base; @@ -386,7 +385,6 @@ critical_enter(); td->td_pcb->pcb_fsbase = (register_t)tls_base; wrmsr(MSR_FSBASE, td->td_pcb->pcb_fsbase); - PCPU_SET(fsbase, td->td_pcb->pcb_fsbase); critical_exit(); } else { td->td_pcb->pcb_fsbase = (register_t)tls_base; ==== //depot/projects/hammer/sys/amd64/ia32/ia32_signal.c#27 (text+ko) ==== @@ -718,8 +718,6 @@ critical_enter(); wrmsr(MSR_FSBASE, 0); wrmsr(MSR_KGSBASE, 0); /* User value while we're in the kernel */ - PCPU_SET(fsbase, 0); - PCPU_SET(gsbase, 0); pcb->pcb_fsbase = 0; pcb->pcb_gsbase = 0; critical_exit(); ==== //depot/projects/hammer/sys/amd64/include/pcpu.h#32 (text+ko) ==== @@ -49,9 +49,7 @@ register_t pc_scratch_rsp; /* User %rsp in syscall */ \ u_int pc_apic_id; \ u_int pc_acpi_id; /* ACPI CPU id */ \ - struct user_segment_descriptor *pc_gs32p; \ - register_t pc_fsbase; /* User values of fsbase */ \ - register_t pc_gsbase /* User values of gsbase */ + struct user_segment_descriptor *pc_gs32p #ifdef _KERNEL #define PCPU_MD_ALIGN __aligned(64) /* use unique cache line per entry */ ==== //depot/projects/hammer/sys/amd64/linux32/linux32_machdep.c#24 (text+ko) ==== @@ -1354,7 +1354,6 @@ td->td_pcb->pcb_gs32sd = *PCPU_GET(gs32p) = sd; td->td_pcb->pcb_flags |= PCB_32BIT | PCB_GS32BIT; wrmsr(MSR_KGSBASE, td->td_pcb->pcb_gsbase); - PCPU_SET(gsbase, td->td_pcb->pcb_gsbase); critical_exit(); return (0); ==== //depot/projects/hammer/sys/amd64/linux32/linux32_sysvec.c#22 (text+ko) ==== @@ -820,8 +820,6 @@ critical_enter(); wrmsr(MSR_FSBASE, 0); wrmsr(MSR_KGSBASE, 0); /* User value while we're in the kernel */ - PCPU_SET(fsbase, 0); - PCPU_SET(gsbase, 0); pcb->pcb_fsbase = 0; pcb->pcb_gsbase = 0; critical_exit(); From owner-p4-projects@FreeBSD.ORG Mon Sep 8 20:29:24 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id AFE171065673; Mon, 8 Sep 2008 20:29: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 73056106566B for ; Mon, 8 Sep 2008 20:29:24 +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 656708FC08 for ; Mon, 8 Sep 2008 20:29:24 +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 m88KTOXP005304 for ; Mon, 8 Sep 2008 20:29:24 GMT (envelope-from peter-gmail@wemm.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m88KTO5D005302 for perforce@freebsd.org; Mon, 8 Sep 2008 20:29:24 GMT (envelope-from peter-gmail@wemm.org) Date: Mon, 8 Sep 2008 20:29:24 GMT Message-Id: <200809082029.m88KTO5D005302@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 149441 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, 08 Sep 2008 20:29:25 -0000 http://perforce.freebsd.org/chv.cgi?CH=149441 Change 149441 by peter@peter_overcee on 2008/09/08 20:28:31 Fix mismerge Affected files ... .. //depot/projects/hammer/sys/amd64/include/pcpu.h#33 edit .. //depot/projects/hammer/sys/i386/include/pcpu.h#19 edit Differences ... ==== //depot/projects/hammer/sys/amd64/include/pcpu.h#33 (text+ko) ==== @@ -53,7 +53,6 @@ #ifdef _KERNEL #define PCPU_MD_ALIGN __aligned(64) /* use unique cache line per entry */ -#endif #ifdef lint ==== //depot/projects/hammer/sys/i386/include/pcpu.h#19 (text+ko) ==== @@ -83,7 +83,6 @@ #ifdef _KERNEL #define PCPU_MD_ALIGN __aligned(64) /* max cache line size */ -#endif #ifdef lint From owner-p4-projects@FreeBSD.ORG Mon Sep 8 20:49:50 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8AE331065679; Mon, 8 Sep 2008 20:49: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 4E9491065675 for ; Mon, 8 Sep 2008 20:49:50 +0000 (UTC) (envelope-from rfrench@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 4096C8FC1A for ; Mon, 8 Sep 2008 20:49:50 +0000 (UTC) (envelope-from rfrench@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 m88Knoa3078478 for ; Mon, 8 Sep 2008 20:49:50 GMT (envelope-from rfrench@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m88KnoGR078476 for perforce@freebsd.org; Mon, 8 Sep 2008 20:49:50 GMT (envelope-from rfrench@FreeBSD.org) Date: Mon, 8 Sep 2008 20:49:50 GMT Message-Id: <200809082049.m88KnoGR078476@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rfrench@FreeBSD.org using -f From: Ryan French To: Perforce Change Reviews Cc: Subject: PERFORCE change 149444 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, 08 Sep 2008 20:49:50 -0000 http://perforce.freebsd.org/chv.cgi?CH=149444 Change 149444 by rfrench@rfrench_mpls on 2008/09/08 20:49:01 Stil trying to work through why my code isnt being called when the if_ethersubr.c demuxer is run. Affected files ... .. //depot/projects/soc2008/rfrench_mpls/net/if_ethersubr.c#7 edit .. //depot/projects/soc2008/rfrench_mpls/netmpls/mpls.h#5 edit .. //depot/projects/soc2008/rfrench_mpls/netmpls/mpls_input.c#5 edit .. //depot/projects/soc2008/rfrench_mpls/netmpls/mpls_proto.c#5 edit .. //depot/projects/soc2008/rfrench_mpls/netmpls/mpls_raw.c#5 edit .. //depot/projects/soc2008/rfrench_mpls/netmpls/mpls_shim.c#3 edit Differences ... ==== //depot/projects/soc2008/rfrench_mpls/net/if_ethersubr.c#7 (text+ko) ==== ==== //depot/projects/soc2008/rfrench_mpls/netmpls/mpls.h#5 (text+ko) ==== @@ -40,9 +40,6 @@ #include #include -#define MPLS -#define MPLS_DEBUG - /* * Structure of a SHIM header. */ ==== //depot/projects/soc2008/rfrench_mpls/netmpls/mpls_input.c#5 (text+ko) ==== @@ -15,6 +15,8 @@ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ +#include "opt_mpls.h" + #include #include #include ==== //depot/projects/soc2008/rfrench_mpls/netmpls/mpls_proto.c#5 (text+ko) ==== @@ -28,6 +28,8 @@ * SUCH DAMAGE. */ +#include "opt_mpls.h" + #include #include @@ -48,9 +50,6 @@ * MPLS protocol family: */ -#define MPLS -#define MPLS_DEBUG - extern struct domain mplsdomain; extern struct pr_usrreqs mpls_raw_usrreq; ==== //depot/projects/soc2008/rfrench_mpls/netmpls/mpls_raw.c#5 (text+ko) ==== @@ -28,7 +28,9 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. */ - + +#include "opt_mpls.h" + #include #include #include ==== //depot/projects/soc2008/rfrench_mpls/netmpls/mpls_shim.c#3 (text+ko) ==== @@ -28,6 +28,8 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. */ + +#include "opt_mpls.h" #include #include From owner-p4-projects@FreeBSD.ORG Mon Sep 8 20:51:53 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id DF846106566C; Mon, 8 Sep 2008 20:51: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 A385A1065677 for ; Mon, 8 Sep 2008 20:51:52 +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 950128FC1F for ; Mon, 8 Sep 2008 20:51:52 +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 m88Kpq55089780 for ; Mon, 8 Sep 2008 20:51:52 GMT (envelope-from rene@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m88KpqQH089778 for perforce@freebsd.org; Mon, 8 Sep 2008 20:51:52 GMT (envelope-from rene@FreeBSD.org) Date: Mon, 8 Sep 2008 20:51:52 GMT Message-Id: <200809082051.m88KpqQH089778@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 149446 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, 08 Sep 2008 20:51:53 -0000 http://perforce.freebsd.org/chv.cgi?CH=149446 Change 149446 by rene@rene_self on 2008/09/08 20:51:03 Finish translation of IPv6 section. Affected files ... .. //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/advanced-networking/chapter.sgml#11 edit Differences ... ==== //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/advanced-networking/chapter.sgml#11 (text+ko) ==== @@ -3,7 +3,7 @@ $FreeBSD$ %SOURCE% en_US.ISO8859-1/books/handbook/advanced-networking/chapter.sgml - %SRCID% 1.412 (in progress) + %SRCID% 1.413 (in progress) --> @@ -5356,7 +5356,7 @@ 128-bits adresruimte. Met andere woorden, er zijn theoretisch 340.282.366.920.938.463.463.374.607.431.768.211.456 adressen - beschikbaar. Dit betekent dat er ongeveer 6,67 * 10^27 + beschikbaar. Dit betekent dat er ongeveer 6,67 * 10^27 IPv6-adressen per vierkante meter op onze planeet beschikbaar zijn. @@ -5417,53 +5417,331 @@ - * Achtergrond over IPv6 adressen + Achtergrond over IPv6 adressen + + Er zijn verschillende soorten IPv6-adressen: unicast, + anycast, en multicast. + + Unicast-adressen zijn de bekende adressen. Een pakket dat + naar een unicast-adres wordt verzonden arriveert precies op de + interface dat bij dat adres hoort. + + Anycast-adressen zijn syntactisch niet van unicast-adressen + te onderscheiden maar ze adresseren een groep interfaces. Een + pakket dat bestemd is voor een anycast-adres zal bij de + dichtstbijzijnde interface arriveren (in router-metrieken). + Anycast-adresssen mogen alleen door routers worden gebruikt. + + + Multicast-adressen identificeren een groep interfaces. Een + pakket dat bestemd is voor en multicast-adres zal bij alle + interfaces die bij de multicast-groep horen arriveren. + + + Het broadcast-adres van IPv4 (gewoonlijk xxx.xxx.xxx.255) wordt in IPv6 met + multicast-adressen uitgedrukt. + + + + Gereserveerde IPv6-adressen + + + + + IPv6-adres + Prefixlengte (bits) + Beschrijving + Opmerkingen + + + + + + :: + 128 bits + niet gespecificeerd + cf. 0.0.0.0 in IPv4 + + + + + ::1 + 128 bits + teruglusadres + cf. 127.0.0.1 in + IPv4 + + + + ::00:xx:xx:xx:xx + 96 bits + ingebouwd IPv4 + De laagste 32 bits zijn het IPv4-adres. Ook + IPv4 compatibel IPv6-adres genoemd. + + + + + ::ff:xx:xx:xx:xx + 96 bits + IPv4-gemapt IPv6-adres + De laagste 32 bits zijn het IPv4-adres. Voor hosts + die geen IPv6 ondersteunen. + + + + fe80:: - feb:: + 10 bits + link-lokaal + cf. teruglusadres in IPv4 + + + + fec0:: - fef:: + 10 bits + site-lokaal +   + + + + ff:: + 8 bits + multicast +   + - + + 001 (base 2) + + 3 bits + globale unicast + Alle globale unicast-adressen worden vanuit deze + pool toegewezen. De eerste 3 bits zijn + 001. + + + + +
    - * IPv6 adressen lezen + IPv6-adressen lezen + + De kanonieke vorm wordt weergegeven als: x:x:x:x:x:x:x:x, waarbij elke + x een 16-bits hexadecimale waarde is. + Bijvoorbeeld FEBC:A574:382B:23C1:AA49:4592:4EFE:9982 + + + Vaak bevat een adres lange deelstrings van allen nullen, + daarom kan per adres één zo'n deelstring worden + afgekort als ::. Ook kunnen maximaal drie + voorlopende 0's per hexadecimaal viertal worden + weggelaten. Bijvoorbeeld, fe80::1 komt overeen met de kanonieke + vorm fe80:0000:0000:0000:0000:0000:0000:0001. + + + Een derde vorm is het schrijven van de laatste 32 bits in de + bekende (decimale) IPv4-stijl met punten . als + scheidingstekens. Bijvoorbeeld, 2002::10.0.0.1 komt overeen met de + (hexidecimale) kanonieke representatie 2002:0000:0000:0000:0000:0000:0a00:0001 + wat weer hetzelfde is als 2002::a00:1. + + Op dit punt dient de lezer het volgende te begrijpen: + + &prompt.root; ifconfig + + rl0: flags=8943<UP,BROADCAST,RUNNING,PROMISC,SIMPLEX,MULTICAST> mtu 1500 + inet 10.0.0.10 netmask 0xffffff00 broadcast 10.0.0.255 + inet6 fe80::200:21ff:fe03:8e1%rl0 prefixlen 64 scopeid 0x1 + ether 00:00:21:03:08:e1 + media: Ethernet autoselect (100baseTX ) + status: active + + fe80::200:21ff:fe03:8e1%rl0 + is een automatisch ingesteld link-lokaal adres. Het is als deel + van de automatische instelling vanuit het MAC-adres aangemaakt. + - + Kijk voor verdere informatie over de structuur van + IPv6-adressen op RFC3513. + - * Verbinding krijgen + Verbinding krijgen + + Er zijn momenteel vier manieren om met andere IPv6-hosts en + -netwerken te verbinden: + + + + Neem contact op met de Internetprovider om te zien of ze + al IPv6 aanbieden. + + + + SixXS biedt + wereldwijd tunnels met eindpunten aan. + + + + Tunnelen via 6-naar-4 (RFC3068) + + - + + Gebruik de poort net/freenet6 indien er een + inbelverbinding wordt gebruikt. + + - * DNS in de IPv6 wereld + DNS in de IPv6-wereld + + Er waren twee soorten DNS-records voor IPv6. De IETF heeft + A6-records overbodig verklaard. AAAA-records zijn nu de + standaard. + + AAAA-records gebruiken gaat rechttoe-rechtaan. Wijs de + hostnaam toe aan het nieuwe IPv6-adres dat net ontvangen is door + het volgende aan de DNS-bestand voor primaire zones toe te + voegen: + + MIJNHOSTNAAM AAAA MIJNIPv6ADRES - + Vraag het aan de DNS-provider indien de + DNS-zones niet zelf worden geserveerd. De + huidige versies van bind (versie 8.3 + en 9) en dns/djbdns (met de + IPv6-patch) ondersteunen AAAA-records. - * De benodigde wijzigingen doorvoeren in + <title>De benodigde wijzigingen doorvoeren in <filename>/etc/rc.conf</filename> - + + IPv6-cliëntinstellingen + + Deze instellingen helpen bij het configureren van een + machine in het LAN die als cliënt in plaats van router + dienst zal doen. Om &man.rtsol.8; automatisch de interface + tijdens het opstarten te laten configureren dient het volgende + toegevoegd te worden: + + ipv6_enable="YES" + + Voeg het volgende toe om statisch een IP-adres zoals + 2001:471:1f11:251:290:27ff:fee0:2093 + aan de interface fxp0 toe te voegen: + + + ipv6_ifconfig_fxp0="2001:471:1f11:251:290:27ff:fee0:2093" + + Voeg het volgende aan /etc/rc.conf + toe om een standaardrouter 2001:471:1f11:251::1 toe te wijzen: + + + ipv6_defaultrouter="2001:471:1f11:251::1" + - * IPv6-cliënt instellingen + IPv6 Router/Gateway instellingen + + Deze paragraaf helpt bij het opvolgen van de aanwijzingen + die de tunnelprovider heeft gegeven en ze om te zetten in + instellingen die blijven na een herstart. Om de tunnel + tijdens het opstarten te herstellen kan het volgende in + /etc/rc.conf gebruikt worden: + + Noem de generieke tunnelinterfaces die zullen worden + ingesteld, bijvoorbeeld gif0: + + gif_interfaces="gif0" + + Om de interface met een lokaal eindpunt + MIJN_IPv4_ADRES in te stellen naar + een ver eindpunt VER_IPv4_ADRES: + + + gifconfig_gif0="MIJN_IPv4_ADRES VER_IPv4_ADRES" + + Voeg het volgende toe om het IPv6-adres dat is toegewezen + als het eindpunt van de IPv6-tunnel te gebruiken: + + ipv6_ifconfig_gif0="MIJN_TOEGEWEZEN_IPv6_TUNNEL_EINDPUNT_ADRES" + + Nu hoeft alleen de standaardroute voor IPv6 ingesteld te + worden. Dit is de andere kant van de IPv6-tunnel: - + ipv6_defaultrouter="MIJN_IPv6_VER_TUNNEL_EINDPUNT_ADRES" - * IPv6 Router/Gateway instellingen + IPv6-tunnelinstellingen + + Indien de server gebruikt wordt om IPv6 tussen de rest van + het netwerk en de wereld te routen, is ook de volgende + instelling in /etc/rc.conf nodig: - - + ipv6_gateway_enable="YES" - * Router advertentie en automatische host - configuratie + Routeradvertentie en automatische hostconfiguratie + + Deze sectie helpt bij het instellen van &man.rtadvd.8; om de + standaard IPv6-route te adverteren. + + Het volgende is nodig in /etc/rc.conf + om &man.rtadvd.8; aan te zetten: + + rtadvd_enable="YES" + + Het is belangrijk om de interface te specificeren waarop het + IPv6-routerverzoek plaatsvindt. Om bijvoorbeeld &man.rtadvd.8; + te vertellen om fxp0 te gebruiken: + + + rtadvd_interfaces="fxp0" + + Nu dient het instellingenbestand + /etc/rtadvd.conf aangemaakt te worden. + Hier is een voorbeeld: + + fxp0:\ + :addrs#1:addr="2001:471:1f11:246::":prefixlen#64:tc=ether: + + Vervang fxp0 door de inteface die + gebruikt gaat worden. + + Vervang vervolgens 2001:471:1f11:246:: met de prefix van uw + toewijzing. - + Indien een /64 subnet is + toegewezen, hoeft er verder niets veranderd te worden. In + andere gevallen dient de juiste waarde voor + prefixlen# gebruikt te worden. From owner-p4-projects@FreeBSD.ORG Mon Sep 8 21:21:23 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4C6501065681; Mon, 8 Sep 2008 21:21: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 1052C106567F for ; Mon, 8 Sep 2008 21:21: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 DD0758FC14 for ; Mon, 8 Sep 2008 21:21:22 +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 m88LLMRF069409 for ; Mon, 8 Sep 2008 21:21:22 GMT (envelope-from peter-gmail@wemm.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m88LLMCt069403 for perforce@freebsd.org; Mon, 8 Sep 2008 21:21:22 GMT (envelope-from peter-gmail@wemm.org) Date: Mon, 8 Sep 2008 21:21:22 GMT Message-Id: <200809082121.m88LLMCt069403@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 149448 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, 08 Sep 2008 21:21:23 -0000 http://perforce.freebsd.org/chv.cgi?CH=149448 Change 149448 by peter@peter_overcee on 2008/09/08 21:21:01 If cc -m32 switches to lib32, then explicitly list -L${LIBDIR} or it won't find the 32 bit libstand.a in the regular location. Affected files ... .. //depot/projects/hammer/sys/boot/i386/Makefile.inc#9 edit Differences ... ==== //depot/projects/hammer/sys/boot/i386/Makefile.inc#9 (text+ko) ==== @@ -11,7 +11,7 @@ .if ${MACHINE_ARCH} == "amd64" CFLAGS+= -m32 -march=i386 -LDFLAGS+= -m elf_i386_fbsd +LDFLAGS+= -m elf_i386_fbsd -L${LIBDIR} AFLAGS+= --32 .endif From owner-p4-projects@FreeBSD.ORG Mon Sep 8 22:32:36 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 01DD5106566C; Mon, 8 Sep 2008 22:32: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 B94A2106564A for ; Mon, 8 Sep 2008 22:32:35 +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 90B7C8FC1A for ; Mon, 8 Sep 2008 22:32:35 +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 m88MWZ6d009484 for ; Mon, 8 Sep 2008 22:32:35 GMT (envelope-from peter-gmail@wemm.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m88MWZZG009482 for perforce@freebsd.org; Mon, 8 Sep 2008 22:32:35 GMT (envelope-from peter-gmail@wemm.org) Date: Mon, 8 Sep 2008 22:32:35 GMT Message-Id: <200809082232.m88MWZZG009482@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 149452 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, 08 Sep 2008 22:32:36 -0000 http://perforce.freebsd.org/chv.cgi?CH=149452 Change 149452 by peter@peter_overcee on 2008/09/08 22:31:35 Kill pcie cfg method. It breaks my X server. Affected files ... .. //depot/projects/hammer/sys/amd64/pci/pci_cfgreg.c#28 edit Differences ... ==== //depot/projects/hammer/sys/amd64/pci/pci_cfgreg.c#28 (text+ko) ==== @@ -232,6 +232,7 @@ int pcie_cfgregopen(uint64_t base, uint8_t minbus, uint8_t maxbus) { + return 0; if (minbus != 0) return (0); From owner-p4-projects@FreeBSD.ORG Tue Sep 9 02:57:04 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C76681065673; Tue, 9 Sep 2008 02:57: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 725A01065671 for ; Tue, 9 Sep 2008 02:57:04 +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 5E3DB8FC14 for ; Tue, 9 Sep 2008 02:57:04 +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 m892v4X6020289 for ; Tue, 9 Sep 2008 02:57:04 GMT (envelope-from gonzo@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m892v3UW020287 for perforce@freebsd.org; Tue, 9 Sep 2008 02:57:03 GMT (envelope-from gonzo@FreeBSD.org) Date: Tue, 9 Sep 2008 02:57:03 GMT Message-Id: <200809090257.m892v3UW020287@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 149458 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, 09 Sep 2008 02:57:05 -0000 http://perforce.freebsd.org/chv.cgi?CH=149458 Change 149458 by gonzo@gonzo_jeeves on 2008/09/09 02:56:18 IFC @149457 Affected files ... .. //depot/projects/mips2/src/bin/setfacl/setfacl.c#3 integrate .. //depot/projects/mips2/src/contrib/ntp/libparse/clk_rawdcf.c#3 integrate .. //depot/projects/mips2/src/lib/libarchive/archive_write_disk.c#13 integrate .. //depot/projects/mips2/src/lib/libarchive/test/Makefile#9 integrate .. //depot/projects/mips2/src/lib/libarchive/test/test_read_format_gtar_sparse.c#7 integrate .. //depot/projects/mips2/src/lib/libarchive/test/test_write_disk_secure.c#6 integrate .. //depot/projects/mips2/src/lib/libc/regex/re_format.7#2 integrate .. //depot/projects/mips2/src/lib/libc/stdlib/malloc.c#14 integrate .. //depot/projects/mips2/src/lib/libgeom/geom_util.c#3 integrate .. //depot/projects/mips2/src/lib/libgeom/libgeom.3#4 integrate .. //depot/projects/mips2/src/lib/libgeom/libgeom.h#3 integrate .. //depot/projects/mips2/src/release/Makefile.inc.docports#3 integrate .. //depot/projects/mips2/src/release/doc/en_US.ISO8859-1/relnotes/article.sgml#20 integrate .. //depot/projects/mips2/src/sbin/fdisk/fdisk.c#4 integrate .. //depot/projects/mips2/src/sbin/ipfw/ipfw2.c#10 integrate .. //depot/projects/mips2/src/sbin/md5/md5.1#2 integrate .. //depot/projects/mips2/src/sbin/natd/natd.c#4 integrate .. //depot/projects/mips2/src/share/man/man4/if_bridge.4#5 integrate .. //depot/projects/mips2/src/share/man/man4/tap.4#3 integrate .. //depot/projects/mips2/src/share/man/man9/bus_dma.9#4 integrate .. //depot/projects/mips2/src/share/misc/committers-ports.dot#10 integrate .. //depot/projects/mips2/src/sys/amd64/amd64/cpu_switch.S#8 integrate .. //depot/projects/mips2/src/sys/amd64/amd64/genassym.c#9 integrate .. //depot/projects/mips2/src/sys/amd64/amd64/machdep.c#14 integrate .. //depot/projects/mips2/src/sys/amd64/amd64/mp_machdep.c#8 integrate .. //depot/projects/mips2/src/sys/amd64/amd64/trap.c#11 integrate .. //depot/projects/mips2/src/sys/amd64/include/pcb.h#5 integrate .. //depot/projects/mips2/src/sys/amd64/include/pcpu.h#6 integrate .. //depot/projects/mips2/src/sys/amd64/include/segments.h#3 integrate .. //depot/projects/mips2/src/sys/amd64/linux32/linux32_genassym.c#2 integrate .. //depot/projects/mips2/src/sys/amd64/linux32/linux32_locore.s#3 integrate .. //depot/projects/mips2/src/sys/amd64/linux32/linux32_machdep.c#7 integrate .. //depot/projects/mips2/src/sys/arm/at91/at91.c#6 integrate .. //depot/projects/mips2/src/sys/arm/at91/at91_mci.c#3 integrate .. //depot/projects/mips2/src/sys/arm/at91/at91_ssc.c#4 integrate .. //depot/projects/mips2/src/sys/arm/at91/kb920x_machdep.c#9 integrate .. //depot/projects/mips2/src/sys/arm/conf/KB920X#9 integrate .. //depot/projects/mips2/src/sys/arm/conf/NSLU#2 integrate .. //depot/projects/mips2/src/sys/boot/sparc64/loader/main.c#6 integrate .. //depot/projects/mips2/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c#4 integrate .. //depot/projects/mips2/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_znode.c#5 integrate .. //depot/projects/mips2/src/sys/conf/NOTES#23 integrate .. //depot/projects/mips2/src/sys/contrib/dev/ath/public/wisoc.hal.o.uu#1 branch .. //depot/projects/mips2/src/sys/contrib/dev/ath/public/wisoc.inc#1 branch .. //depot/projects/mips2/src/sys/contrib/dev/ath/public/wisoc.opt_ah.h#1 branch .. //depot/projects/mips2/src/sys/dev/acpi_support/acpi_fujitsu.c#3 integrate .. //depot/projects/mips2/src/sys/dev/asmc/asmc.c#5 integrate .. //depot/projects/mips2/src/sys/dev/asmc/asmcvar.h#4 integrate .. //depot/projects/mips2/src/sys/dev/bge/if_bge.c#13 integrate .. //depot/projects/mips2/src/sys/dev/cxgb/cxgb_adapter.h#12 integrate .. //depot/projects/mips2/src/sys/dev/cxgb/cxgb_main.c#18 integrate .. //depot/projects/mips2/src/sys/dev/cxgb/cxgb_sge.c#15 integrate .. //depot/projects/mips2/src/sys/dev/drm/ati_pcigart.c#3 integrate .. //depot/projects/mips2/src/sys/dev/drm/drm_bufs.c#3 integrate .. //depot/projects/mips2/src/sys/dev/drm/drm_pci.c#3 integrate .. //depot/projects/mips2/src/sys/dev/drm/i915_dma.c#7 integrate .. //depot/projects/mips2/src/sys/dev/drm/mach64_dma.c#3 integrate .. //depot/projects/mips2/src/sys/dev/esp/esp_sbus.c#5 integrate .. //depot/projects/mips2/src/sys/dev/esp/ncr53c9x.c#6 integrate .. //depot/projects/mips2/src/sys/dev/esp/ncr53c9xreg.h#2 integrate .. //depot/projects/mips2/src/sys/dev/esp/ncr53c9xvar.h#3 integrate .. //depot/projects/mips2/src/sys/dev/ic/i8251.h#2 integrate .. //depot/projects/mips2/src/sys/dev/ic/i8255.h#1 branch .. //depot/projects/mips2/src/sys/dev/iicbus/ds133x.c#2 integrate .. //depot/projects/mips2/src/sys/dev/iicbus/ds1672.c#2 integrate .. //depot/projects/mips2/src/sys/dev/le/if_le_ledma.c#3 integrate .. //depot/projects/mips2/src/sys/dev/re/if_re.c#19 integrate .. //depot/projects/mips2/src/sys/dev/si/si.c#4 integrate .. //depot/projects/mips2/src/sys/dev/sound/pci/hda/hdac.c#12 integrate .. //depot/projects/mips2/src/sys/dev/uart/uart_cpu_pc98.c#4 integrate .. //depot/projects/mips2/src/sys/dev/usb/ucom.c#7 integrate .. //depot/projects/mips2/src/sys/dev/usb/ucomvar.h#6 integrate .. //depot/projects/mips2/src/sys/dev/usb/usbdevs#21 integrate .. //depot/projects/mips2/src/sys/geom/geom_dev.c#6 integrate .. //depot/projects/mips2/src/sys/i386/isa/isa.c#4 integrate .. //depot/projects/mips2/src/sys/i386/linux/linux_genassym.c#2 integrate .. //depot/projects/mips2/src/sys/i386/linux/linux_locore.s#2 integrate .. //depot/projects/mips2/src/sys/kern/subr_sleepqueue.c#14 integrate .. //depot/projects/mips2/src/sys/kern/subr_turnstile.c#8 integrate .. //depot/projects/mips2/src/sys/kern/tty.c#11 integrate .. //depot/projects/mips2/src/sys/kern/uipc_sockbuf.c#8 integrate .. //depot/projects/mips2/src/sys/net/if_bridge.c#13 integrate .. //depot/projects/mips2/src/sys/net/if_tap.c#6 integrate .. //depot/projects/mips2/src/sys/net/if_tap.h#3 integrate .. //depot/projects/mips2/src/sys/net/route.h#5 integrate .. //depot/projects/mips2/src/sys/net80211/ieee80211.h#11 integrate .. //depot/projects/mips2/src/sys/net80211/ieee80211_ddb.c#4 integrate .. //depot/projects/mips2/src/sys/net80211/ieee80211_freebsd.h#8 integrate .. //depot/projects/mips2/src/sys/net80211/ieee80211_ht.c#9 integrate .. //depot/projects/mips2/src/sys/net80211/ieee80211_ht.h#6 integrate .. //depot/projects/mips2/src/sys/net80211/ieee80211_ioctl.c#9 integrate .. //depot/projects/mips2/src/sys/net80211/ieee80211_ioctl.h#7 integrate .. //depot/projects/mips2/src/sys/net80211/ieee80211_node.c#8 integrate .. //depot/projects/mips2/src/sys/net80211/ieee80211_node.h#6 integrate .. //depot/projects/mips2/src/sys/net80211/ieee80211_phy.c#3 integrate .. //depot/projects/mips2/src/sys/net80211/ieee80211_sta.c#2 integrate .. //depot/projects/mips2/src/sys/netinet/ip_fw.h#8 integrate .. //depot/projects/mips2/src/sys/netinet/ip_fw2.c#15 integrate .. //depot/projects/mips2/src/sys/netinet/tcp_debug.c#4 integrate .. //depot/projects/mips2/src/sys/netinet/tcp_input.c#14 integrate .. //depot/projects/mips2/src/sys/netinet/tcp_output.c#13 integrate .. //depot/projects/mips2/src/sys/netinet/tcp_subr.c#15 integrate .. //depot/projects/mips2/src/sys/netinet/tcp_var.h#13 integrate .. //depot/projects/mips2/src/sys/pc98/cbus/sio.c#8 integrate .. //depot/projects/mips2/src/sys/pc98/include/bus.h#3 integrate .. //depot/projects/mips2/src/sys/pc98/pc98/busiosubr.c#3 integrate .. //depot/projects/mips2/src/sys/sparc64/include/asi.h#4 integrate .. //depot/projects/mips2/src/sys/sparc64/include/tlb.h#3 integrate .. //depot/projects/mips2/src/sys/sparc64/sbus/dma_sbus.c#4 integrate .. //depot/projects/mips2/src/sys/sparc64/sbus/lsi64854.c#2 integrate .. //depot/projects/mips2/src/sys/sparc64/sbus/lsi64854var.h#2 integrate .. //depot/projects/mips2/src/sys/sparc64/sparc64/cheetah.c#6 integrate .. //depot/projects/mips2/src/sys/sparc64/sparc64/exception.S#6 integrate .. //depot/projects/mips2/src/sys/sparc64/sparc64/genassym.c#6 integrate .. //depot/projects/mips2/src/sys/sparc64/sparc64/mp_exception.S#4 integrate .. //depot/projects/mips2/src/sys/sparc64/sparc64/pmap.c#12 integrate .. //depot/projects/mips2/src/sys/sparc64/sparc64/support.S#4 integrate .. //depot/projects/mips2/src/sys/sparc64/sparc64/swtch.S#4 integrate .. //depot/projects/mips2/src/sys/sparc64/sparc64/tlb.c#4 integrate .. //depot/projects/mips2/src/sys/sys/disk.h#3 integrate .. //depot/projects/mips2/src/sys/sys/param.h#20 integrate .. //depot/projects/mips2/src/sys/sys/termios.h#4 integrate .. //depot/projects/mips2/src/tools/tools/nanobsd/nanobsd.sh#11 integrate .. //depot/projects/mips2/src/usr.sbin/boot0cfg/boot0cfg.c#2 integrate .. //depot/projects/mips2/src/usr.sbin/setfib/setfib.c#3 integrate Differences ... ==== //depot/projects/mips2/src/bin/setfacl/setfacl.c#3 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/bin/setfacl/setfacl.c,v 1.13 2007/02/26 00:42:17 mckusick Exp $"); +__FBSDID("$FreeBSD: src/bin/setfacl/setfacl.c,v 1.14 2008/09/06 13:17:35 trasz Exp $"); #include #include @@ -245,10 +245,13 @@ continue; } - if (acl_type == ACL_TYPE_ACCESS) + if (acl_type == ACL_TYPE_ACCESS) { final_acl = acl[ACCESS_ACL]; - else + acl_free(acl[DEFAULT_ACL]); + } else { final_acl = acl[DEFAULT_ACL]; + acl_free(acl[ACCESS_ACL]); + } if (need_mask && (set_acl_mask(&final_acl) == -1)) { warnx("failed to set ACL mask on %s", file->filename); @@ -269,8 +272,7 @@ } } - acl_free(acl[ACCESS_ACL]); - acl_free(acl[DEFAULT_ACL]); + acl_free(final_acl); free(acl); } ==== //depot/projects/mips2/src/contrib/ntp/libparse/clk_rawdcf.c#3 (text+ko) ==== @@ -229,7 +229,7 @@ unsigned char *c = dcfprm->zerobits; int i; - parseprintf(DD_RAWDCF,("parse: convert_rawdcf: \"%s\"\n", buffer)); + parseprintf(DD_RAWDCF,("parse: convert_rawdcf: \"%.*s\"\n", size, buffer)); if (size < 57) { @@ -320,7 +320,7 @@ * bad format - not for us */ #ifndef PARSEKERNEL - msyslog(LOG_ERR, "parse: convert_rawdcf: parity check FAILED for \"%s\"\n", buffer); + msyslog(LOG_ERR, "parse: convert_rawdcf: parity check FAILED for \"%.*s\"\n", size, buffer); #endif return CVT_FAIL|CVT_BADFMT; } ==== //depot/projects/mips2/src/lib/libarchive/archive_write_disk.c#13 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include "archive_platform.h" -__FBSDID("$FreeBSD: src/lib/libarchive/archive_write_disk.c,v 1.35 2008/09/05 06:13:11 kientzle Exp $"); +__FBSDID("$FreeBSD: src/lib/libarchive/archive_write_disk.c,v 1.36 2008/09/07 05:22:33 kientzle Exp $"); #ifdef HAVE_SYS_TYPES_H #include @@ -907,14 +907,26 @@ * We know something is in the way, but we don't know what; * we need to find out before we go any further. */ - if (lstat(a->name, &a->st) != 0) { + int r = 0; + /* + * The SECURE_SYMLINK logic has already removed a + * symlink to a dir if the client wants that. So + * follow the symlink if we're creating a dir. + */ + if (S_ISDIR(a->mode)) + r = stat(a->name, &a->st); + /* + * If it's not a dir (or it's a broken symlink), + * then don't follow it. + */ + if (r != 0 || !S_ISDIR(a->mode)) + r = lstat(a->name, &a->st); + if (r != 0) { archive_set_error(&a->archive, errno, "Can't stat existing object"); return (ARCHIVE_WARN); } - /* TODO: if it's a symlink... */ - /* * NO_OVERWRITE_NEWER doesn't apply to directories. */ ==== //depot/projects/mips2/src/lib/libarchive/test/Makefile#9 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/lib/libarchive/test/Makefile,v 1.24 2008/08/25 06:08:22 kientzle Exp $ +# $FreeBSD: src/lib/libarchive/test/Makefile,v 1.25 2008/09/08 00:58:12 kientzle Exp $ # Where to find the libarchive sources LA_SRCDIR=${.CURDIR}/.. @@ -89,7 +89,7 @@ # Uncomment to link against dmalloc #LDADD+= -L/usr/local/lib -ldmalloc #CFLAGS+= -I/usr/local/include -DUSE_DMALLOC -#WARNS=6 +WARNS=6 # Build libarchive_test and run it. check test: libarchive_test ==== //depot/projects/mips2/src/lib/libarchive/test/test_read_format_gtar_sparse.c#7 (text+ko) ==== @@ -23,7 +23,7 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ #include "test.h" -__FBSDID("$FreeBSD: src/lib/libarchive/test/test_read_format_gtar_sparse.c,v 1.9 2008/09/01 05:38:33 kientzle Exp $"); +__FBSDID("$FreeBSD: src/lib/libarchive/test/test_read_format_gtar_sparse.c,v 1.10 2008/09/08 00:58:12 kientzle Exp $"); struct contents { @@ -187,6 +187,7 @@ struct contents expect; /* data, size, offset of block read from archive. */ struct contents actual; + const void *p; struct archive *a; extract_reference_file(name); @@ -206,10 +207,10 @@ expect = *cts++; while (0 == (err = archive_read_data_block(a, - (const void **)&actual.d, - &actual.s, &actual.o))) { + &p, &actual.s, &actual.o))) { + actual.d = p; while (actual.s > 0) { - char c = *(const char *)actual.d; + char c = *actual.d; if(actual.o < expect.o) { /* * Any byte before the expected ==== //depot/projects/mips2/src/lib/libarchive/test/test_write_disk_secure.c#6 (text+ko) ==== @@ -23,7 +23,7 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ #include "test.h" -__FBSDID("$FreeBSD: src/lib/libarchive/test/test_write_disk_secure.c,v 1.5 2008/09/01 05:38:33 kientzle Exp $"); +__FBSDID("$FreeBSD: src/lib/libarchive/test/test_write_disk_secure.c,v 1.8 2008/09/07 23:59:27 kientzle Exp $"); #define UMASK 022 @@ -105,6 +105,80 @@ archive_entry_free(ae); assert(0 == archive_write_finish_entry(a)); + /* + * Without security checks, extracting a dir over a link to a + * dir should follow the link. + */ + /* Create a symlink to a dir. */ + assert((ae = archive_entry_new()) != NULL); + archive_entry_copy_pathname(ae, "link_to_dir3"); + archive_entry_set_mode(ae, S_IFLNK | 0777); + archive_entry_set_symlink(ae, "dir"); + archive_write_disk_set_options(a, 0); + assert(0 == archive_write_header(a, ae)); + assert(0 == archive_write_finish_entry(a)); + /* Extract a dir whose name matches the symlink. */ + assert(archive_entry_clear(ae) != NULL); + archive_entry_copy_pathname(ae, "link_to_dir3"); + archive_entry_set_mode(ae, S_IFDIR | 0777); + assert(0 == archive_write_header(a, ae)); + assert(0 == archive_write_finish_entry(a)); + /* Verify link was followed. */ + assertEqualInt(0, lstat("link_to_dir3", &st)); + assert(S_ISLNK(st.st_mode)); + archive_entry_free(ae); + + /* + * As above, but a broken link, so the link should get replaced. + */ + /* Create a symlink to a dir. */ + assert((ae = archive_entry_new()) != NULL); + archive_entry_copy_pathname(ae, "link_to_dir4"); + archive_entry_set_mode(ae, S_IFLNK | 0777); + archive_entry_set_symlink(ae, "nonexistent_dir"); + archive_write_disk_set_options(a, 0); + assert(0 == archive_write_header(a, ae)); + assert(0 == archive_write_finish_entry(a)); + /* Extract a dir whose name matches the symlink. */ + assert(archive_entry_clear(ae) != NULL); + archive_entry_copy_pathname(ae, "link_to_dir4"); + archive_entry_set_mode(ae, S_IFDIR | 0777); + assert(0 == archive_write_header(a, ae)); + assert(0 == archive_write_finish_entry(a)); + /* Verify link was replaced. */ + assertEqualInt(0, lstat("link_to_dir4", &st)); + assert(S_ISDIR(st.st_mode)); + archive_entry_free(ae); + + /* + * As above, but a link to a non-dir, so the link should get replaced. + */ + /* Create a regular file and a symlink to it */ + assert((ae = archive_entry_new()) != NULL); + archive_entry_copy_pathname(ae, "non_dir"); + archive_entry_set_mode(ae, S_IFREG | 0777); + archive_write_disk_set_options(a, 0); + assert(0 == archive_write_header(a, ae)); + assert(0 == archive_write_finish_entry(a)); + /* Create symlink to the file. */ + archive_entry_copy_pathname(ae, "link_to_dir5"); + archive_entry_set_mode(ae, S_IFLNK | 0777); + archive_entry_set_symlink(ae, "non_dir"); + archive_write_disk_set_options(a, 0); + assert(0 == archive_write_header(a, ae)); + assert(0 == archive_write_finish_entry(a)); + /* Extract a dir whose name matches the symlink. */ + assert(archive_entry_clear(ae) != NULL); + archive_entry_copy_pathname(ae, "link_to_dir5"); + archive_entry_set_mode(ae, S_IFDIR | 0777); + assert(0 == archive_write_header(a, ae)); + assert(0 == archive_write_finish_entry(a)); + /* Verify link was replaced. */ + assertEqualInt(0, lstat("link_to_dir5", &st)); + assert(S_ISDIR(st.st_mode)); + archive_entry_free(ae); + + #if ARCHIVE_VERSION_NUMBER < 2000000 archive_write_finish(a); #else ==== //depot/projects/mips2/src/lib/libc/regex/re_format.7#2 (text+ko) ==== @@ -34,7 +34,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)re_format.7 8.3 (Berkeley) 3/20/94 -.\" $FreeBSD: src/lib/libc/regex/re_format.7,v 1.11 2004/07/02 23:52:12 ru Exp $ +.\" $FreeBSD: src/lib/libc/regex/re_format.7,v 1.12 2008/09/05 17:41:20 keramida Exp $ .\" .Dd March 20, 1994 .Dt RE_FORMAT 7 @@ -288,6 +288,14 @@ A locale may provide others. A character class may not be used as an endpoint of a range. .Pp +A bracketed expression like +.Ql [[:class:]] +can be used to match a single character that belongs to a character +class. +The reverse, matching any character that does not belong to a specific +class, the negation operator of bracket expressions may be used: +.Ql [^[:class:]] . +.Pp There are two special cases\(dd of bracket expressions: the bracket expressions .Ql [[:<:]] ==== //depot/projects/mips2/src/lib/libc/stdlib/malloc.c#14 (text+ko) ==== @@ -156,7 +156,7 @@ #define MALLOC_DSS #include -__FBSDID("$FreeBSD: src/lib/libc/stdlib/malloc.c,v 1.177 2008/08/27 02:00:53 jasone Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/stdlib/malloc.c,v 1.178 2008/09/06 05:26:31 marcel Exp $"); #include "libc_private.h" #ifdef MALLOC_DEBUG @@ -226,7 +226,7 @@ # define CPU_SPINWAIT __asm__ volatile("pause") #endif #ifdef __ia64__ -# define PAGESIZE_2POW 12 +# define PAGESIZE_2POW 13 # define QUANTUM_2POW 4 # define SIZEOF_PTR_2POW 3 #endif ==== //depot/projects/mips2/src/lib/libgeom/geom_util.c#3 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/lib/libgeom/geom_util.c,v 1.2 2008/05/20 11:45:05 pjd Exp $"); +__FBSDID("$FreeBSD: src/lib/libgeom/geom_util.c,v 1.3 2008/09/07 13:54:57 lulf Exp $"); #include #include @@ -42,29 +42,22 @@ #include +static char *g_device_path_open(const char *, int *, int); + /* * Open the given provider and at least check if this is a block device. */ int g_open(const char *name, int dowrite) { - char path[MAXPATHLEN]; + char *path; int fd; - if (name[0] == '/') - strlcpy(path, name, sizeof(path)); - else - snprintf(path, sizeof(path), "%s%s", _PATH_DEV, name); - - fd = open(path, dowrite ? O_RDWR : O_RDONLY); + path = g_device_path_open(name, &fd, dowrite); + if (path != NULL) + free(path); if (fd == -1) return (-1); - /* Let try to get sectorsize, which will prove it is a GEOM provider. */ - if (g_sectorsize(fd) == -1) { - close(fd); - errno = EFTYPE; - return (-1); - } return (fd); } @@ -121,6 +114,19 @@ } /* + * Return the correct provider name. + */ +char * +g_providername(int fd) +{ + char name[MAXPATHLEN]; + + if (g_ioctl_arg(fd, DIOCGPROVIDERNAME, name) == -1) + return (NULL); + return (strdup(name)); +} + +/* * Call BIO_FLUSH for the given provider. */ int @@ -234,3 +240,77 @@ } return (fd); } + +/* + * Return the device path device given a partial or full path to its node. + * A pointer can be provided, which will be set to an opened file descriptor of + * not NULL. + */ +static char * +g_device_path_open(const char *devpath, int *fdp, int dowrite) +{ + char *path; + int fd; + + /* Make sure that we can fail. */ + if (fdp != NULL) + *fdp = -1; + /* Use the device node if we're able to open it. */ + do { + fd = open(devpath, dowrite ? O_RDWR : O_RDONLY); + if (fd == -1) + break; + /* + * Let try to get sectorsize, which will prove it is a GEOM + * provider. + */ + if (g_sectorsize(fd) == -1) { + close(fd); + errno = EFTYPE; + return (NULL); + } + if ((path = strdup(devpath)) == NULL) { + close(fd); + return (NULL); + } + if (fdp != NULL) + *fdp = fd; + else + close(fd); + return (path); + } while (0); + + /* If we're not given an absolute path, assume /dev/ prefix. */ + if (*devpath != '/') { + asprintf(&path, "%s%s", _PATH_DEV, devpath); + if (path == NULL) + return (NULL); + fd = open(path, dowrite ? O_RDWR : O_RDONLY); + if (fd == -1) { + free(path); + return (NULL); + } + /* + * Let try to get sectorsize, which will prove it is a GEOM + * provider. + */ + if (g_sectorsize(fd) == -1) { + free(path); + close(fd); + errno = EFTYPE; + return (NULL); + } + if (fdp != NULL) + *fdp = fd; + else + close(fd); + return (path); + } + return (NULL); +} + +char * +g_device_path(const char *devpath) +{ + return (g_device_path_open(devpath, NULL, 0)); +} ==== //depot/projects/mips2/src/lib/libgeom/libgeom.3#4 (text+ko) ==== @@ -26,9 +26,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/lib/libgeom/libgeom.3,v 1.10 2008/06/13 21:49:21 thompsa Exp $ +.\" $FreeBSD: src/lib/libgeom/libgeom.3,v 1.11 2008/09/08 06:27:00 lulf Exp $ .\" -.Dd May 6, 2007 +.Dd September 8, 2008 .Dt LIBGEOM 3 .Os .Sh NAME @@ -52,9 +52,11 @@ .Nm g_sectorsize , .Nm g_flush , .Nm g_delete , +.Nm g_device_path , .Nm g_get_ident , .Nm g_get_name , -.Nm g_open_by_ident +.Nm g_open_by_ident , +.Nm g_providername .Nd userland API library for kernel GEOM subsystem .Sh LIBRARY .Lb libgeom @@ -103,12 +105,16 @@ .Fn g_flush "int fd" .Ft int .Fn g_delete "int fd" "off_t offset" "off_t length" +.Ft "char *" +.Fn g_device_path "const char *devpath" .Ft int .Fn g_get_ident "int fd" "char *ident" "size_t size" .Ft int .Fn g_get_name "const char *ident" "char *name" "size_t size" .Ft int .Fn g_open_by_ident "const char *ident" "int dowrite" "char *name" "size_t size" +.Ft "char *" +.Fn g_providername "int fd" .Sh DESCRIPTION The .Nm geom @@ -301,6 +307,13 @@ function tells the provider that the given data range is no longer used. .Pp The +.Fn g_device_path +function returns the full path to a provider given a partial or full path to the +device node. +If the device can not be found or is not a valid geom provider, NULL is +returned. +.Pp +The .Fn g_get_ident function returns provider's fixed and unique identifier. The @@ -326,7 +339,17 @@ .Dv NULL , the function will store provider's name there. .Pp -All functions return value greater than or equal to +The +.Fn g_providername +function returns the provider name of an open file descriptor. +If the file descriptor does not point to a valid geom provider, NULL is +returned. +.Pp +All functions except +.Fn g_providername +and +.Fn g_device_path +return a value greater than or equal to .Va 0 on success or .Va -1 ==== //depot/projects/mips2/src/lib/libgeom/libgeom.h#3 (text+ko) ==== @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/lib/libgeom/libgeom.h,v 1.12 2007/05/06 10:00:27 des Exp $ + * $FreeBSD: src/lib/libgeom/libgeom.h,v 1.13 2008/09/07 13:54:57 lulf Exp $ */ #ifndef _LIBGEOM_H_ #define _LIBGEOM_H_ @@ -154,6 +154,8 @@ int g_get_ident(int, char *, size_t); int g_get_name(const char *, char *, size_t); int g_open_by_ident(const char *, int, char *, size_t); +char *g_device_path(const char *); +char *g_providername(int); __END_DECLS ==== //depot/projects/mips2/src/release/Makefile.inc.docports#3 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/release/Makefile.inc.docports,v 1.27 2007/04/11 15:24:58 ru Exp $ +# $FreeBSD: src/release/Makefile.inc.docports,v 1.28 2008/09/06 10:12:52 jhay Exp $ # # List of (dependent) ports that are minimally required to be # checked out from CVS in order to get ${DOCPORTS} built and @@ -38,8 +38,8 @@ ports/graphics/scr2png \ ports/graphics/tiff \ ports/print/freetype2 \ - ports/print/ghostscript-gpl \ - ports/print/ghostscript-gpl-nox11 \ + ports/print/ghostscript8 \ + ports/print/ghostscript8-nox11 \ ports/print/gsfonts \ ports/textproc/docbook-410 \ ports/textproc/docbook-xml \ ==== //depot/projects/mips2/src/release/doc/en_US.ISO8859-1/relnotes/article.sgml#20 (text+ko) ==== @@ -17,7 +17,7 @@ The &os; Project - $FreeBSD: src/release/doc/en_US.ISO8859-1/relnotes/article.sgml,v 1.1092 2008/07/29 04:23:18 bmah Exp $ + $FreeBSD: src/release/doc/en_US.ISO8859-1/relnotes/article.sgml,v 1.1093 2008/09/08 17:13:18 gshapiro Exp $ 2000 @@ -449,7 +449,7 @@ Figwort release to the Hydrangea release.     sendmail has been updated from - 8.14.1 to 8.14.2. + 8.14.1 to 8.14.3.     The timezone database has been updated from the tzdata2007h release to ==== //depot/projects/mips2/src/sbin/fdisk/fdisk.c#4 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sbin/fdisk/fdisk.c,v 1.85 2008/07/31 00:55:29 obrien Exp $"); +__FBSDID("$FreeBSD: src/sbin/fdisk/fdisk.c,v 1.86 2008/09/07 13:58:35 lulf Exp $"); #include #include @@ -245,7 +245,6 @@ int main(int argc, char *argv[]) { - struct stat sb; int c, i; int partition = -1; struct dos_partition *partp; @@ -307,18 +306,9 @@ if (argc == 0) { disk = get_rootdisk(); } else { - if (stat(argv[0], &sb) == 0) { - /* OK, full pathname given */ - disk = argv[0]; - } else if (errno == ENOENT && argv[0][0] != '/') { - /* Try prepending "/dev" */ - asprintf(&disk, "%s%s", _PATH_DEV, argv[0]); - if (disk == NULL) - errx(1, "out of memory"); - } else { - /* other stat error, let it fail below */ - disk = argv[0]; - } + disk = g_device_path(argv[0]); + if (disk == NULL) + err(1, "unable to get correct path for %s\n", argv[0]); } if (open_disk(u_flag) < 0) err(1, "cannot open disk %s", disk); @@ -724,21 +714,14 @@ static int open_disk(int flag) { - struct stat st; int rwmode; - if (stat(disk, &st) == -1) { - if (errno == ENOENT) - return -2; - warnx("can't get file status of %s", disk); - return -1; - } - if ( !(st.st_mode & S_IFCHR) ) - warnx("device %s is not character special", disk); - rwmode = a_flag || I_flag || B_flag || flag ? O_RDWR : O_RDONLY; - fd = open(disk, rwmode); - if (fd == -1 && errno == EPERM && rwmode == O_RDWR) - fd = open(disk, O_RDONLY); + /* Write mode if one of these flags are set. */ + rwmode = (a_flag || I_flag || B_flag || flag); + fd = g_open(disk, rwmode); + /* If the mode fails, try read-only if we didn't. */ + if (fd == -1 && errno == EPERM && rwmode) + fd = g_open(disk, 0); if (fd == -1 && errno == ENXIO) return -2; if (fd == -1) { @@ -778,29 +761,30 @@ { int error; struct gctl_req *grq; - const char *q; - char fbuf[BUFSIZ]; + const char *errmsg; + char fbuf[BUFSIZ], *pname; int i, fdw; grq = gctl_get_handle(); gctl_ro_param(grq, "verb", -1, "write MBR"); gctl_ro_param(grq, "class", -1, "MBR"); - q = strrchr(disk, '/'); - if (q == NULL) - q = disk; - else - q++; - gctl_ro_param(grq, "geom", -1, q); + pname = g_providername(fd); + if (pname == NULL) { + warnx("Error getting providername for %s\n", disk); + return (-1); + } + gctl_ro_param(grq, "geom", -1, pname); gctl_ro_param(grq, "data", secsize, buf); - q = gctl_issue(grq); - if (q == NULL) { + errmsg = gctl_issue(grq); + free(pname); + if (errmsg == NULL) { gctl_free(grq); return(0); } if (!q_flag) /* GEOM errors are benign, not all devices supported */ - warnx("%s", q); + warnx("%s", errmsg); gctl_free(grq); - + error = pwrite(fd, buf, secsize, (sector * 512)); if (error == secsize) return (0); @@ -841,21 +825,18 @@ dos_cylsecs = cylsecs = heads * sectors; disksecs = cyls * heads * sectors; - error = ioctl(fd, DIOCGSECTORSIZE, &u); - if (error != 0 || u == 0) - u = 512; - else - secsize = u; + u = g_sectorsize(fd); + if (u <= 0) + return (-1); - error = ioctl(fd, DIOCGMEDIASIZE, &o); - if (error == 0) { - disksecs = o / u; - cyls = dos_cyls = o / (u * dos_heads * dos_sectors); - } + o = g_mediasize(fd); + if (o < 0) + return (-1); + disksecs = o / u; + cyls = dos_cyls = o / (u * dos_heads * dos_sectors); return (disksecs); } - static int read_s0() ==== //depot/projects/mips2/src/sbin/ipfw/ipfw2.c#10 (text+ko) ==== @@ -17,7 +17,7 @@ * * NEW command line interface for IP firewall facility * - * $FreeBSD: src/sbin/ipfw/ipfw2.c,v 1.120 2008/05/10 15:02:56 julian Exp $ + * $FreeBSD: src/sbin/ipfw/ipfw2.c,v 1.121 2008/09/06 17:23:37 rik Exp $ */ #include @@ -2429,7 +2429,7 @@ rulenum = atoi(av[0]); new_set = atoi(av[2]); if (!isdigit(*(av[0])) || (cmd == 3 && rulenum > RESVD_SET) || - (cmd == 2 && rulenum == 65535) ) + (cmd == 2 && rulenum == IPFW_DEFAULT_RULE) ) errx(EX_DATAERR, "invalid source number %s\n", av[0]); if (!isdigit(*(av[2])) || new_set > RESVD_SET) errx(EX_DATAERR, "invalid dest. set %s\n", av[1]); @@ -2553,7 +2553,7 @@ * need to scan the list to count them. */ for (nstat = 1, r = data, lim = (char *)data + nbytes; - r->rulenum < 65535 && (char *)r < lim; + r->rulenum < IPFW_DEFAULT_RULE && (char *)r < lim; ++nstat, r = NEXT(r) ) ; /* nothing */ @@ -5045,7 +5045,8 @@ if (have_tag) errx(EX_USAGE, "tag and untag cannot be " "specified more than once"); - GET_UINT_ARG(tag, 1, 65534, i, rule_action_params); + GET_UINT_ARG(tag, 1, IPFW_DEFAULT_RULE - 1, i, + rule_action_params); have_tag = cmd; fill_cmd(cmd, O_TAG, (i == TOK_TAG) ? 0: F_NOT, tag); ac--; av++; @@ -5521,8 +5522,8 @@ if (c->limit_mask == 0) errx(EX_USAGE, "limit: missing limit mask"); - GET_UINT_ARG(c->conn_limit, 1, 65534, TOK_LIMIT, - rule_options); + GET_UINT_ARG(c->conn_limit, 1, IPFW_DEFAULT_RULE - 1, + TOK_LIMIT, rule_options); ac--; av++; break; @@ -5649,8 +5650,8 @@ else { uint16_t tag; - GET_UINT_ARG(tag, 1, 65534, TOK_TAGGED, - rule_options); + GET_UINT_ARG(tag, 1, IPFW_DEFAULT_RULE - 1, + TOK_TAGGED, rule_options); fill_cmd(cmd, O_TAGGED, 0, tag); } ac--; av++; @@ -5978,7 +5979,7 @@ size = 0; data = NULL; frule = 0; - lrule = 65535; /* max ipfw rule number */ + lrule = IPFW_DEFAULT_RULE; /* max ipfw rule number */ ac--; av++; /* Parse parameters. */ ==== //depot/projects/mips2/src/sbin/md5/md5.1#2 (text+ko) ==== @@ -1,5 +1,5 @@ -.\" $FreeBSD: src/sbin/md5/md5.1,v 1.24 2005/03/10 09:56:39 cperciva Exp $ -.Dd June 6, 2004 +.\" $FreeBSD: src/sbin/md5/md5.1,v 1.25 2008/09/07 15:19:34 trhodes Exp $ +.Dd September 7, 2008 .Dt MD5 1 .Os .Sh NAME @@ -49,7 +49,7 @@ .Tn RSA . .Pp .Tn MD5 -has not yet (2001-09-03) been broken, but sufficient attacks have been +has not yet (2007-03-05) been broken, but sufficient attacks have been made that its security is in some doubt. The attacks on .Tn MD5 ==== //depot/projects/mips2/src/sbin/natd/natd.c#4 (text+ko) ==== @@ -11,7 +11,7 @@ */ #include -__FBSDID("$FreeBSD: src/sbin/natd/natd.c,v 1.53 2008/06/22 22:14:02 mav Exp $"); +__FBSDID("$FreeBSD: src/sbin/natd/natd.c,v 1.54 2008/09/06 17:26:52 rik Exp $"); #define SYSLOG_NAMES @@ -130,6 +130,7 @@ static void SetupSkinnyPort(const char *strValue); static void NewInstance(const char *name); static void DoGlobal (int fd); +static int CheckIpfwRulenum(unsigned int rnum); /* * Globals. @@ -1947,6 +1948,10 @@ if (sscanf(strValue, "%u:%u", &base, &num) != 2) errx(1, "punch_fw: basenumber:count parameter required"); + if (CheckIpfwRulenum(base + num - 1) == -1) + errx(1, "punch_fw: basenumber:count parameter should fit " + "the maximum allowed rule numbers"); + LibAliasSetFWBase(mla, base, num); (void)LibAliasSetMode(mla, PKT_ALIAS_PUNCH_FW, PKT_ALIAS_PUNCH_FW); } @@ -1991,3 +1996,22 @@ mla = ip->la; mip = ip; } + +static int +CheckIpfwRulenum(unsigned int rnum) +{ + unsigned int default_rule; + size_t len = sizeof(default_rule); + + if (sysctlbyname("net.inet.ip.fw.default_rule", &default_rule, &len, + NULL, 0) == -1) { + warn("Failed to get the default ipfw rule number, using " + "default historical value 65535. The reason was"); + default_rule = 65535; + } + if (rnum >= default_rule) { + return -1; + } + + return 0; >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Tue Sep 9 03:00:08 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 18C571065679; Tue, 9 Sep 2008 03:00: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 D0E3C1065677 for ; Tue, 9 Sep 2008 03:00:07 +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 961678FC0A for ; Tue, 9 Sep 2008 03:00:07 +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 m89307CN040129 for ; Tue, 9 Sep 2008 03:00:07 GMT (envelope-from gonzo@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m89307Qa040127 for perforce@freebsd.org; Tue, 9 Sep 2008 03:00:07 GMT (envelope-from gonzo@FreeBSD.org) Date: Tue, 9 Sep 2008 03:00:07 GMT Message-Id: <200809090300.m89307Qa040127@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 149459 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, 09 Sep 2008 03:00:08 -0000 http://perforce.freebsd.org/chv.cgi?CH=149459 Change 149459 by gonzo@gonzo_jeeves on 2008/09/09 02:59:50 Remove unused variable Affected files ... .. //depot/projects/mips2/src/sys/mips/mips/intr_machdep.c#7 edit Differences ... ==== //depot/projects/mips2/src/sys/mips/mips/intr_machdep.c#7 (text+ko) ==== @@ -138,7 +138,7 @@ { struct intr_event *event; register_t cause; - int hard, i, intr, thread; + int hard, i, intr; critical_enter(); From owner-p4-projects@FreeBSD.ORG Tue Sep 9 09:04:23 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id EBAD41065683; Tue, 9 Sep 2008 09:04:22 +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 AF94C106567F for ; Tue, 9 Sep 2008 09:04:22 +0000 (UTC) (envelope-from raj@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id A238E8FC21 for ; Tue, 9 Sep 2008 09:04:22 +0000 (UTC) (envelope-from raj@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 m8994MNm048085 for ; Tue, 9 Sep 2008 09:04:22 GMT (envelope-from raj@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m8994McT048080 for perforce@freebsd.org; Tue, 9 Sep 2008 09:04:22 GMT (envelope-from raj@freebsd.org) Date: Tue, 9 Sep 2008 09:04:22 GMT Message-Id: <200809090904.m8994McT048080@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to raj@freebsd.org using -f From: Rafal Jaworowski To: Perforce Change Reviews Cc: Subject: PERFORCE change 149462 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, 09 Sep 2008 09:04:23 -0000 http://perforce.freebsd.org/chv.cgi?CH=149462 Change 149462 by raj@raj_mimi on 2008/09/09 09:03:33 More db88f5xxx cleanup. Affected files ... .. //depot/projects/arm/src/sys/arm/mv/orion/db88f5xxx.c#5 edit Differences ... ==== //depot/projects/arm/src/sys/arm/mv/orion/db88f5xxx.c#5 (text+ko) ==== @@ -52,19 +52,19 @@ * ----------------------------- * 0x0000_0000 - 0xbfff_ffff : user process * - * 0xc040_0000 - virtual_avail : kerel reserved (text, data, page tables + * 0xc040_0000 - virtual_avail : kernel reserved (text, data, page tables * : structures, ARM stacks etc.) * virtual_avail - 0xefff_ffff : KVA (virtual_avail is typically < 0xc0a0_0000) * 0xf000_0000 - 0xf0ff_ffff : no-cache allocation area (16MB) * 0xf100_0000 - 0xf10f_ffff : SoC integrated devices registers range (1MB) - * 0xf110_0000 - 0xfffe_ffff : PCI, PCIE outbound windows (MEM+IO) + * 0xf110_0000 - 0xfffe_ffff : PCI, PCIE (MEM+IO) outbound windows (~238MB) * 0xffff_0000 - 0xffff_0fff : 'high' vectors page (4KB) * 0xffff_1000 - 0xffff_1fff : ARM_TP_ADDRESS/RAS page (4KB) * 0xffff_2000 - 0xffff_ffff : unused (~55KB) */ -const struct pmap_devmap *pmap_devmap_bootstrap_table; -vm_offset_t pmap_bootstrap_lastaddr; +const struct pmap_devmap *pmap_devmap_bootstrap_table; +vm_offset_t pmap_bootstrap_lastaddr; /* Static device mappings. */ static const struct pmap_devmap pmap_devmap[] = { From owner-p4-projects@FreeBSD.ORG Tue Sep 9 09:18:42 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8003F106567C; Tue, 9 Sep 2008 09:18:42 +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 2ACD6106567B for ; Tue, 9 Sep 2008 09:18:42 +0000 (UTC) (envelope-from remko@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 1C8418FC18 for ; Tue, 9 Sep 2008 09:18:42 +0000 (UTC) (envelope-from remko@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 m899IgGa036787 for ; Tue, 9 Sep 2008 09:18:42 GMT (envelope-from remko@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m899Ignv036779 for perforce@freebsd.org; Tue, 9 Sep 2008 09:18:42 GMT (envelope-from remko@freebsd.org) Date: Tue, 9 Sep 2008 09:18:42 GMT Message-Id: <200809090918.m899Ignv036779@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to remko@freebsd.org using -f From: Remko Lodder To: Perforce Change Reviews Cc: Subject: PERFORCE change 149463 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, 09 Sep 2008 09:18:43 -0000 http://perforce.freebsd.org/chv.cgi?CH=149463 Change 149463 by remko@remko_nakur on 2008/09/09 09:18:34 More WIP, stylify (this chapter has a lot of work wrt. style's which are not being followed thoroughly). Affected files ... .. //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/ppp-and-slip/chapter.sgml#5 edit Differences ... ==== //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/ppp-and-slip/chapter.sgml#5 (text+ko) ==== @@ -28,9 +28,11 @@ Overzicht + PPP + SLIP @@ -69,10 +71,12 @@ PPP gebruiker PPP + PPP kernel PPP + PPP over Ethernet @@ -84,6 +88,7 @@ Bekend zijn met basis netwerk terminologie. + De basis en doeleinden van een inbel verbinding en van PPP en/of SLIP. @@ -157,9 +162,11 @@ ISP + PPP + Een account bij een Internet Service Provider (ISP) waarmee verbinding gemaakt wordt door mdidel van @@ -179,18 +186,23 @@ PAP + CHAP + UNIX + login naam + wachtwoord + Uw loginnaam en wachtwoord (danwel een standaard &unix; style login en wachtwoord combinatie of een PAP of CHAP @@ -200,6 +212,7 @@ naamserver + Het IP adres van één of meerdere naam servers. Normaal gesproken krijgt u twee IP adressen van @@ -214,7 +227,7 @@ - De volgende informatie kan aangeleverd worden door uw + De volgende informatie kan aangeleverd worden door uw ISP maar is niet volledig noodzakelijk: @@ -241,6 +254,7 @@ statisch ip adres + Als uw ISP een vast IP adres en hostname levert, kunt u dit invoeren. In andere gevallen laten bepaalt de @@ -498,7 +512,9 @@ PAP + CHAP + Als u gebruik maakt van PPP en CHAP, zal er geen login op dit moment zijn, en moet deze regel uitgecommentarieerd worden of verwijderd. Zie het @@ -528,6 +544,7 @@ Regel 16: timeout + Selt de standaard idle timeout in (in seconden) voor de connectie. Hier wordt de connectie @@ -539,8 +556,10 @@ - Retel 17: + Regel 17: + ISP + Stelt het interface adres in. De string x.x.x.x moet vervangen @@ -724,75 +743,75 @@ gateway_enable="YES" - - Welke getty? + + Welke getty? - Het configureren van &os; voor - inbel diensten levert een goede omschrijving van - het inschakelen van inbel diensten door gebruik te maken - van &man.getty.8;. + Het configureren van &os; voor + inbel diensten levert een goede omschrijving van + het inschakelen van inbel diensten door gebruik te maken + van &man.getty.8;. - Een alternatief voor getty is mgetty, - een slimmere versie van getty ontworpen - met inbel lijnen in het achterhoofd. + Een alternatief voor getty is mgetty, + een slimmere versie van getty ontworpen + met inbel lijnen in het achterhoofd. - De voordelen van het gebruik van - mgetty is dat het actief - praat tegen modems, wat betekend - dat als de port uitgeschakeld is in - /etc/ttys zal de modem de telefoon - niet beantwoorden. + De voordelen van het gebruik van + mgetty is dat het actief + praat tegen modems, wat betekend + dat als de port uitgeschakeld is in + /etc/ttys zal de modem de telefoon + niet beantwoorden. - Latere versies van mgetty (vanaf - 0.99beta en later) ondersteunen ook het automatisch - detecteren van PPP stromen waardoor cliënten - zonder extra scripting toegang kunnen krijgen tot uw - server. + Latere versies van mgetty (vanaf + 0.99beta en later) ondersteunen ook het automatisch + detecteren van PPP stromen waardoor cliënten + zonder extra scripting toegang kunnen krijgen tot uw + server. - Refereer naar Mgetty en - AutoPPP voor meer informatie over - mgetty. - + Refereer naar Mgetty en + AutoPPP voor meer informatie over + mgetty. + - - <application>PPP</application> Permissies + + <application>PPP</application> Permissies - Het ppp commando moet normaal - gesproken gestart worden door de root - gebruiker. Als u echter wilt toestaan dat - ppp in server mode gestart wordt door - een normale gebruiker door het uitvoeren van - ppp zoals beschreven hieronder moet - deze gebruiker permissies gegeven worden om - ppp te starten door deze toe te - voegen aan de network groep in - /etc/group. + Het ppp commando moet normaal + gesproken gestart worden door de root + gebruiker. Als u echter wilt toestaan dat + ppp in server mode gestart wordt door + een normale gebruiker door het uitvoeren van + ppp zoals beschreven hieronder moet + deze gebruiker permissies gegeven worden om + ppp te starten door deze toe te + voegen aan de network groep in + /etc/group. - U moet ze ook toegang geven tot één - of meerdere secties in het configuratie bestand door - gebruik te maken van het allow - commando: + U moet ze ook toegang geven tot één + of meerdere secties in het configuratie bestand door + gebruik te maken van het allow + commando: - allow users fred mary + allow users fred mary - Als dit commando wordt gebruikt in de - default sectie, geeft het alle - gespecificeerde gebruikers toegang tot alles. - + Als dit commando wordt gebruikt in de + default sectie, geeft het alle + gespecificeerde gebruikers toegang tot alles. + - - PPP Shells for Dynamic-IP Users + + PPP shells voor dynamische IP gebruikers - - PPP shells - + + PPP shells + - Create a file called - /etc/ppp/ppp-shell containing the - following: + Create a file called + /etc/ppp/ppp-shell containing the + following: - #!/bin/sh + #!/bin/sh IDENT=`echo $0 | sed -e 's/^.*-\(.*\)$/\1/'` CALLEDAS="$IDENT" TTY=`tty` @@ -806,66 +825,66 @@ exec /usr/sbin/ppp -direct $IDENT - This script should be executable. Now make a symbolic - link called ppp-dialup to this script - using the following commands: + This script should be executable. Now make a symbolic + link called ppp-dialup to this script + using the following commands: - &prompt.root; ln -s ppp-shell /etc/ppp/ppp-dialup + &prompt.root; ln -s ppp-shell /etc/ppp/ppp-dialup - You should use this script as the - shell for all of your dialup users. - This is an example from /etc/passwd - for a dialup PPP user with username - pchilds (remember do not directly edit - the password file, use &man.vipw.8;). + You should use this script as the + shell for all of your dialup users. + This is an example from /etc/passwd + for a dialup PPP user with username + pchilds (remember do not directly edit + the password file, use &man.vipw.8;). - pchilds:*:1011:300:Peter Childs PPP:/home/ppp:/etc/ppp/ppp-dialup + pchilds:*:1011:300:Peter Childs PPP:/home/ppp:/etc/ppp/ppp-dialup - Create a /home/ppp directory that - is world readable containing the following 0 byte - files: + Create a /home/ppp directory that + is world readable containing the following 0 byte + files: - -r--r--r-- 1 root wheel 0 May 27 02:23 .hushlogin + -r--r--r-- 1 root wheel 0 May 27 02:23 .hushlogin -r--r--r-- 1 root wheel 0 May 27 02:22 .rhosts - which prevents /etc/motd from being - displayed. - + which prevents /etc/motd from being + displayed. + - - PPP Shells for Static-IP Users + + PPP shells voor statische IP gebruikers - - PPP shells - + + PPP shells + - Create the ppp-shell file as above, - and for each account with statically assigned IPs create a - symbolic link to ppp-shell. + Create the ppp-shell file as above, + and for each account with statically assigned IPs create a + symbolic link to ppp-shell. - For example, if you have three dialup customers, - fred, sam, and - mary, that you route /24 CIDR networks - for, you would type the following: + For example, if you have three dialup customers, + fred, sam, and + mary, that you route /24 CIDR networks + for, you would type the following: - &prompt.root; ln -s /etc/ppp/ppp-shell /etc/ppp/ppp-fred + &prompt.root; ln -s /etc/ppp/ppp-shell /etc/ppp/ppp-fred &prompt.root; ln -s /etc/ppp/ppp-shell /etc/ppp/ppp-sam &prompt.root; ln -s /etc/ppp/ppp-shell /etc/ppp/ppp-mary - Each of these users dialup accounts should have their - shell set to the symbolic link created above (for example, - mary's shell should be - /etc/ppp/ppp-mary). - + Each of these users dialup accounts should have their + shell set to the symbolic link created above (for example, + mary's shell should be + /etc/ppp/ppp-mary). + - - Setting Up <filename>ppp.conf</filename> for Dynamic-IP - Users + + Het instellen van <filename>ppp.conf</filename> voor + dynamische IP gebruikers - The /etc/ppp/ppp.conf file should - contain something along the lines of: + The /etc/ppp/ppp.conf file should + contain something along the lines of: - default: + default: set debug phase lcp chat set timeout 0 @@ -877,30 +896,30 @@ set ifaddr 203.14.100.1 203.14.100.21 255.255.255.255 enable proxy - - The indenting is important. - + + De indentie is belangrijk. + - The default: section is loaded for - each session. For each dialup line enabled in - /etc/ttys create an entry similar to - the one for ttyd0: above. Each line - should get a unique IP address from your pool of IP - addresses for dynamic users. - + The default: section is loaded for + each session. For each dialup line enabled in + /etc/ttys create an entry similar to + the one for ttyd0: above. Each line + should get a unique IP address from your pool of IP + addresses for dynamic users. + - - Setting Up <filename>ppp.conf</filename> for Static-IP - Users + + Het instellen van <filename>ppp.conf</filename> voor + statische IP gebruikers. - Along with the contents of the sample - /usr/share/examples/ppp/ppp.conf - above you should add a section for each of the - statically assigned dialup users. We will continue with - our fred, sam, - and mary example. + Along with the contents of the sample + /usr/share/examples/ppp/ppp.conf + above you should add a section for each of the + statically assigned dialup users. We will continue with + our fred, sam, + and mary example. - fred: + fred: set ifaddr 203.14.100.1 203.14.101.1 255.255.255.255 sam: @@ -909,13 +928,13 @@ mary: set ifaddr 203.14.100.1 203.14.103.1 255.255.255.255 - The file /etc/ppp/ppp.linkup - should also contain routing information for each static - IP user if required. The line below would add a route - for the 203.14.101.0/24 - network via the client's ppp link. + The file /etc/ppp/ppp.linkup + should also contain routing information for each static + IP user if required. The line below would add a route + for the 203.14.101.0/24 + network via the client's ppp link. - fred: + fred: add 203.14.101.0 netmask 255.255.255.0 HISADDR sam: @@ -925,123 +944,126 @@ add 203.14.103.0 netmask 255.255.255.0 HISADDR - - <command>mgetty</command> and AutoPPP + + <command>mgetty</command> en AutoPPP - - mgetty - + + mgetty + - - AutoPPP - + + AutoPPP + - - LCP - + + LCP + - Configuring and compiling mgetty - with the AUTO_PPP option enabled - allows mgetty to detect the LCP phase - of PPP connections and automatically spawn off a ppp - shell. However, since the default login/password - sequence does not occur it is necessary to authenticate - users using either PAP or CHAP. + Configuring and compiling mgetty + with the AUTO_PPP option enabled + allows mgetty to detect the LCP phase + of PPP connections and automatically spawn off a ppp + shell. However, since the default login/password + sequence does not occur it is necessary to authenticate + users using either PAP or CHAP. - This section assumes the user has successfully - configured, compiled, and installed a version of - mgetty with the - AUTO_PPP option (v0.99beta or - later). + This section assumes the user has successfully + configured, compiled, and installed a version of + mgetty with the + AUTO_PPP option (v0.99beta or + later). - Make sure your - /usr/local/etc/mgetty+sendfax/login.config - file has the following in it: + Make sure your + /usr/local/etc/mgetty+sendfax/login.config + file has the following in it: - /AutoPPP/ - - /etc/ppp/ppp-pap-dialup + /AutoPPP/ - - /etc/ppp/ppp-pap-dialup - This will tell mgetty to run the - ppp-pap-dialup script for detected - PPP connections. + This will tell mgetty to run the + ppp-pap-dialup script for detected + PPP connections. - Create a file called - /etc/ppp/ppp-pap-dialup containing the - following (the file should be executable): + Create a file called + /etc/ppp/ppp-pap-dialup containing the + following (the file should be executable): - #!/bin/sh + #!/bin/sh exec /usr/sbin/ppp -direct pap$IDENT - For each dialup line enabled in - /etc/ttys, create a corresponding entry - in /etc/ppp/ppp.conf. This will - happily co-exist with the definitions we created - above. + For each dialup line enabled in + /etc/ttys, create a corresponding entry + in /etc/ppp/ppp.conf. This will + happily co-exist with the definitions we created + above. - pap: + pap: enable pap set ifaddr 203.14.100.1 203.14.100.20-203.14.100.40 enable proxy - Each user logging in with this method will need to have - a username/password in - /etc/ppp/ppp.secret file, or - alternatively add the following option to authenticate users - via PAP from the /etc/passwd file. + Each user logging in with this method will need to have + a username/password in + /etc/ppp/ppp.secret file, or + alternatively add the following option to authenticate users + via PAP from the /etc/passwd file. - enable passwdauth + enable passwdauth - If you wish to assign some users a static IP number, - you can specify the number as the third argument in - /etc/ppp/ppp.secret. See - /usr/share/examples/ppp/ppp.secret.sample - for examples. - + If you wish to assign some users a static IP number, + you can specify the number as the third argument in + /etc/ppp/ppp.secret. See + /usr/share/examples/ppp/ppp.secret.sample + for examples. + - - MS Extensions + + MS Extensies - - DNS - + + DNS + - - NetBIOS - + + NetBIOS + - - PPP - Microsoft extensions - + + PPP + Microsoft extensions + - It is possible to configure PPP to supply DNS and - NetBIOS nameserver addresses on demand. + It is possible to configure PPP to supply DNS and + NetBIOS nameserver addresses on demand. - To enable these extensions with PPP version 1.x, the - following lines might be added to the relevant section of - /etc/ppp/ppp.conf. + To enable these extensions with PPP version 1.x, the + following lines might be added to the relevant section of + /etc/ppp/ppp.conf. - enable msext + enable msext set ns 203.14.100.1 203.14.100.2 set nbns 203.14.100.5 - And for PPP version 2 and above: + And for PPP version 2 and above: - accept dns + accept dns set dns 203.14.100.1 203.14.100.2 set nbns 203.14.100.5 - This will tell the clients the primary and secondary - name server addresses, and a NetBIOS nameserver host. + This will tell the clients the primary and secondary + name server addresses, and a NetBIOS nameserver host. - In version 2 and above, if the - set dns line is omitted, PPP will use the - values found in /etc/resolv.conf. + In version 2 and above, if the + set dns line is omitted, PPP will use the + values found in /etc/resolv.conf. - PAP and CHAP Authentication + PAP en CHAP authenticatie + PAP + CHAP + Some ISPs set their system up so that the authentication part of your connection is done using either of the PAP or CHAP authentication mechanisms. If this is the case, your ISP @@ -1065,7 +1087,7 @@ - Line 13: + Regel 13: This line specifies your PAP/CHAP user name. You @@ -1075,8 +1097,10 @@ - Line 14: + Regel 14: + password + This line specifies your PAP/CHAP password. You will need to insert the correct value for @@ -1095,7 +1119,7 @@ - Line 15: + Regel 15: Your ISP will not normally require that you log into @@ -1108,8 +1132,8 @@ - Changing Your <command>ppp</command> Configuration on the - Fly + Het aanpassen van uw <command>ppp</command> configuratie + terwijl deze in gebruik is It is possible to talk to the ppp program while it is running in the background, but only if a @@ -1132,10 +1156,12 @@ - Using PPP Network Address Translation Capability + PPP's netwerk adres translatie mogelijkheden + gebruiken - PPPNAT + PPP + NAT PPP has ability to use internal NAT without kernel diverting @@ -1162,10 +1188,11 @@ - Final System Configuration + Laatste systeem configuratie - PPPconfiguration + PPP + configuration You now have ppp configured, but there @@ -1229,8 +1256,9 @@ sendmail_flags="-bd" - sendmail - + sendmail + + The downside of this is that you must force sendmail to re-examine the mail queue whenever the ppp link is up by typing: @@ -1268,7 +1296,7 @@ - Summary + Samenvatting To recap, the following steps are necessary when setting up ppp for the first time: @@ -1364,7 +1392,7 @@ Gennady B. Sorokopud - Parts originally contributed by + Delen origineel bijgedragen door Robert @@ -1373,10 +1401,10 @@ - Using Kernel PPP + Kernel PPP gebruiken - Setting Up Kernel PPP + Het opzetten van kernel PPP PPP @@ -1425,13 +1453,14 @@ Trev Roydhouse - Based on information provided by + Gebaseerd op informatie geleverd door - Using <command>pppd</command> as a Client + Gebruik maken van <command>pppd</command> als + cliënt PPP @@ -1464,7 +1493,9 @@ To connect: Kermit + modem + Dial to the remote host using @@ -1628,7 +1659,8 @@ - Using <command>pppd</command> as a Server + Gebruik maken van <command>pppd</command> als + server<title> <para><filename>/etc/ppp/options</filename> should contain something similar to the following:</para> @@ -1860,7 +1892,7 @@ <indexterm> <primary>PPP</primary> - <secondary>troubleshooting</secondary> + <secondary>troubleshooten</secondary> </indexterm> <para>This section covers a few issues which may arise when @@ -1876,7 +1908,7 @@ step.</para> <sect2> - <title>Check the Device Nodes + Controleer de apparaat nodes If you reconfigured your kernel then you recall the sio device. If you did not @@ -1898,7 +1930,7 @@ - Connecting Manually + Handmatig verbinding maken Connecting to the Internet by manually controlling ppp is quick, easy, and a great way to @@ -1976,13 +2008,13 @@ to use ppp as we want an Internet connection. - Ppp ON example> + PPP ON example> Notice that in this example the first has been capitalized. This shows that we have successfully connected to the ISP. - PPp ON example> + PPP ON example> We have successfully authenticated with our ISP and are waiting for the @@ -2017,7 +2049,7 @@ ppp only has these 2 states. - Debugging + Debuggen If you have a direct line and cannot seem to make a connection, then turn hardware flow @@ -2106,9 +2138,6 @@ - - - @@ -2133,11 +2162,11 @@ PPP, over Ethernet - This section describes how to set up PPP over Ethernet + Deze sectie beschrijft hoe PPP over Ethernet opgezet kan worden (PPPoE). - Configuring the Kernel + Het configureren van de kernel No kernel configuration is necessary for PPPoE any longer. If the necessary netgraph support is not built into the kernel, it will @@ -2145,7 +2174,7 @@ - Setting Up <filename>ppp.conf</filename> + Het instellen van <filename>ppp.conf</filename> Here is an example of a working ppp.conf: @@ -2165,16 +2194,16 @@ - Running <application>ppp</application> + Het draaien van <application>ppp</application> As root, you can run: &prompt.root; ppp -ddial name_of_service_provider - - Starting <application>ppp</application> at Boot + Het opstarten van <application>ppp</application> tijdens het + opstarten Add the following to your /etc/rc.conf file: @@ -2186,7 +2215,7 @@ - Using a PPPoE Service Tag + Gebruik maken van een PPPoE service label Sometimes it will be necessary to use a service tag to establish your connection. Service tags are used to distinguish between @@ -2240,7 +2269,7 @@ - PPPoE with a &tm.3com; <trademark + <title>PPPoE met een &tm.3com; <trademark class="registered">HomeConnect</trademark> ADSL Modem Dual Link @@ -2272,7 +2301,8 @@ - Using <application>PPP</application> over ATM (PPPoA) + Gebruik maken van <application>PPP</application> over ATM + (PPPoA) PPP @@ -2288,7 +2318,7 @@ PPPoA is a popular choice among European DSL providers. - Using PPPoA with the Alcatel &speedtouch; USB + Gebruik maken van PPPoA met de Alcatel &speedtouch; USB PPPoA support for this device is supplied as a port in FreeBSD because the firmware is distributed under - Using mpd + Gebruik maken van mpd You can use mpd to connect to a variety of services, in particular PPTP services. You can find @@ -2396,6 +2426,7 @@ The username used to authenticate with your ISP. + The password used to authenticate with your ISP. @@ -2420,6 +2451,7 @@ The IP address of your &os; computer which you will be using mpd from. + The IP address of your ADSL modem. For the Alcatel &speedtouch; Home this address defaults to - Using pptpclient + Gebruik maken van pptpclient It is also possible to use FreeBSD to connect to other PPPoA services using @@ -2469,26 +2501,28 @@ set ifaddr 0 0 add default HISADDR - - - The username of your account with the DSL provider. - - - The password for your account. - - + + + The username of your account with the DSL provider. + + + + The password for your account. + + >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Tue Sep 9 09:49:13 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 920451065672; Tue, 9 Sep 2008 09:49: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 55859106564A for ; Tue, 9 Sep 2008 09:49:13 +0000 (UTC) (envelope-from raj@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 45CCB8FC14 for ; Tue, 9 Sep 2008 09:49:13 +0000 (UTC) (envelope-from raj@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 m899nDFh021093 for ; Tue, 9 Sep 2008 09:49:13 GMT (envelope-from raj@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m899nDRQ021090 for perforce@freebsd.org; Tue, 9 Sep 2008 09:49:13 GMT (envelope-from raj@freebsd.org) Date: Tue, 9 Sep 2008 09:49:13 GMT Message-Id: <200809090949.m899nDRQ021090@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to raj@freebsd.org using -f From: Rafal Jaworowski To: Perforce Change Reviews Cc: Subject: PERFORCE change 149465 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, 09 Sep 2008 09:49:13 -0000 http://perforce.freebsd.org/chv.cgi?CH=149465 Change 149465 by raj@raj_mimi on 2008/09/09 09:48:21 Introduce low-level support for new Marvell core CPUs: 88FR131, 88FR571. They are integrated on 88F6281 (Kirkwood) and MV78100 (Discovery) SOC families. This includes L2 cache operation routines for the unified L2 cache subsystem found along with the CPU core in some of them. Obtained from: Marvell, Semihalf Affected files ... .. //depot/projects/arm/src/sys/arm/arm/cpufunc.c#20 edit .. //depot/projects/arm/src/sys/arm/arm/cpufunc_asm_feroceon.S#1 add .. //depot/projects/arm/src/sys/arm/arm/identcpu.c#16 edit .. //depot/projects/arm/src/sys/arm/include/armreg.h#8 edit .. //depot/projects/arm/src/sys/arm/include/cpufunc.h#11 edit .. //depot/projects/arm/src/sys/arm/mv/files.mv#4 edit Differences ... ==== //depot/projects/arm/src/sys/arm/arm/cpufunc.c#20 (text+ko) ==== @@ -357,6 +357,66 @@ arm10_setup /* cpu setup */ }; + +struct cpu_functions feroceon_cpufuncs = { + /* CPU functions */ + + cpufunc_id, /* id */ + cpufunc_nullop, /* cpwait */ + + /* MMU functions */ + + cpufunc_control, /* control */ + cpufunc_domains, /* Domain */ + feroceon_setttb, /* Setttb */ + cpufunc_faultstatus, /* Faultstatus */ + cpufunc_faultaddress, /* Faultaddress */ + + /* TLB functions */ + + armv4_tlb_flushID, /* tlb_flushID */ + arm10_tlb_flushID_SE, /* tlb_flushID_SE */ + armv4_tlb_flushI, /* tlb_flushI */ + arm10_tlb_flushI_SE, /* tlb_flushI_SE */ + armv4_tlb_flushD, /* tlb_flushD */ + armv4_tlb_flushD_SE, /* tlb_flushD_SE */ + + /* Cache operations */ + + armv5_ec_icache_sync_all, /* icache_sync_all */ + armv5_ec_icache_sync_range, /* icache_sync_range */ + + armv5_ec_dcache_wbinv_all, /* dcache_wbinv_all */ + feroceon_dcache_wbinv_range, /* dcache_wbinv_range */ + feroceon_dcache_inv_range, /* dcache_inv_range */ + feroceon_dcache_wb_range, /* dcache_wb_range */ + + armv5_ec_idcache_wbinv_all, /* idcache_wbinv_all */ + feroceon_idcache_wbinv_range, /* idcache_wbinv_all */ + + feroceon_l2cache_wbinv_all, /* l2cache_wbinv_all */ + feroceon_l2cache_wbinv_range, /* l2cache_wbinv_range */ + feroceon_l2cache_inv_range, /* l2cache_inv_range */ + feroceon_l2cache_wb_range, /* l2cache_wb_range */ + + /* Other functions */ + + cpufunc_nullop, /* flush_prefetchbuf */ + armv4_drain_writebuf, /* drain_writebuf */ + cpufunc_nullop, /* flush_brnchtgt_C */ + (void *)cpufunc_nullop, /* flush_brnchtgt_E */ + + (void *)cpufunc_nullop, /* sleep */ + + /* Soft functions */ + + cpufunc_null_fixup, /* dataabt_fixup */ + cpufunc_null_fixup, /* prefetchabt_fixup */ + + arm10_context_switch, /* context_switch */ + + arm10_setup /* cpu setup */ +}; #endif /* CPU_ARM9E || CPU_ARM10 */ #ifdef CPU_ARM10 @@ -933,9 +993,36 @@ } #endif /* CPU_ARM9 */ #if defined(CPU_ARM9E) || defined(CPU_ARM10) - if (cputype == CPU_ID_ARM926EJS || - cputype == CPU_ID_ARM1026EJS) { - cpufuncs = armv5_ec_cpufuncs; + if (cputype == CPU_ID_ARM926EJS || cputype == CPU_ID_ARM1026EJS || + cputype == CPU_ID_MV88FR131 || cputype == CPU_ID_MV88FR571_VD || + cputype == CPU_ID_MV88FR571_41) { + if (cputype == CPU_ID_MV88FR131 || + cputype == CPU_ID_MV88FR571_VD || + cputype == CPU_ID_MV88FR571_41) { + + cpufuncs = feroceon_cpufuncs; + /* + * Workaround for Marvell MV78100 CPU: Cache prefetch + * mechanism may affect the cache coherency validity, + * so it needs to be disabled. + * + * Refer to errata document MV-S501058-00C.pdf (p. 3.1 + * L2 Prefetching Mechanism) for details. + */ + if (cputype == CPU_ID_MV88FR571_VD || + cputype == CPU_ID_MV88FR571_41) { + feroceon_control_ext(0xffffffff, + FC_DCACHE_STREAM_EN | FC_WR_ALLOC_EN | + FC_BRANCH_TARG_BUF_DIS | FC_L2CACHE_EN | + FC_L2_PREF_DIS); + } else { + feroceon_control_ext(0xffffffff, + FC_DCACHE_STREAM_EN | FC_WR_ALLOC_EN | + FC_BRANCH_TARG_BUF_DIS | FC_L2CACHE_EN); + } + } else + cpufuncs = armv5_ec_cpufuncs; + cpu_reset_needs_v4_MMU_disable = 1; /* V4 or higher */ get_cachetype_cp15(); pmap_pte_init_generic(); ==== //depot/projects/arm/src/sys/arm/arm/identcpu.c#16 (text+ko) ==== @@ -75,7 +75,8 @@ CPU_CLASS_ARM10EJ, CPU_CLASS_SA1, CPU_CLASS_XSCALE, - CPU_CLASS_ARM11J + CPU_CLASS_ARM11J, + CPU_CLASS_MARVELL }; static const char * const generic_steppings[16] = { @@ -304,6 +305,15 @@ { CPU_ID_ARM1136JSR1, CPU_CLASS_ARM11J, "ARM1136J-S R1", generic_steppings }, + { CPU_ID_MV88FR131, CPU_CLASS_MARVELL, "Feroceon 88FR131", + generic_steppings }, + + { CPU_ID_MV88FR571_VD, CPU_CLASS_MARVELL, "Feroceon 88FR571-VD", + generic_steppings }, + + { CPU_ID_MV88FR571_41, CPU_CLASS_MARVELL, "Early Feroceon 88FR571", + generic_steppings }, + { 0, CPU_CLASS_NONE, NULL, NULL } }; ==== //depot/projects/arm/src/sys/arm/include/armreg.h#8 (text+ko) ==== @@ -148,6 +148,9 @@ #define CPU_ID_SA110 0x4401a100 #define CPU_ID_SA1100 0x4401a110 #define CPU_ID_TI925T 0x54029250 +#define CPU_ID_MV88FR131 0x56251310 /* Marvell Feroceon 88FR131 Core */ +#define CPU_ID_MV88FR571_VD 0x56155710 /* Marvell Feroceon 88FR571-VD Core (ID from datasheet) */ +#define CPU_ID_MV88FR571_41 0x41159260 /* Marvell Feroceon 88FR571-VD Core (actual ID from CPU reg) */ #define CPU_ID_FA526 0x66015260 #define CPU_ID_SA1110 0x6901b110 #define CPU_ID_IXP1200 0x6901c120 @@ -253,6 +256,18 @@ /* Xscale Core 3 only */ #define XSCALE_AUXCTL_LLR 0x00000400 /* Enable L2 for LLR Cache */ +/* Marvell Feroceon Extra Features Register (CP15 register 1, opcode2 0) */ +#define FC_DCACHE_REPL_LOCK 0x80000000 /* Replace DCache Lock */ +#define FC_DCACHE_STREAM_EN 0x20000000 /* DCache Streaming Switch */ +#define FC_WR_ALLOC_EN 0x10000000 /* Enable Write Allocate */ +#define FC_L2_PREF_DIS 0x01000000 /* L2 Cache Prefetch Disable */ +#define FC_L2_INV_EVICT_LINE 0x00800000 /* L2 Invalidates Uncorrectable Error Line Eviction */ +#define FC_L2CACHE_EN 0x00400000 /* L2 enable */ +#define FC_ICACHE_REPL_LOCK 0x00080000 /* Replace ICache Lock */ +#define FC_GLOB_HIST_REG_EN 0x00040000 /* Branch Global History Register Enable */ +#define FC_BRANCH_TARG_BUF_DIS 0x00020000 /* Branch Target Buffer Disable */ +#define FC_L1_PAR_ERR_EN 0x00010000 /* L1 Parity Error Enable */ + /* Cache type register definitions */ #define CPU_CT_ISIZE(x) ((x) & 0xfff) /* I$ info */ #define CPU_CT_DSIZE(x) (((x) >> 12) & 0xfff) /* D$ info */ ==== //depot/projects/arm/src/sys/arm/include/cpufunc.h#11 (text+ko) ==== @@ -376,6 +376,18 @@ extern unsigned arm10_dcache_sets_inc; extern unsigned arm10_dcache_index_max; extern unsigned arm10_dcache_index_inc; + +u_int feroceon_control_ext (u_int, u_int); +void feroceon_setttb (u_int); +void feroceon_dcache_wbinv_range (vm_offset_t, vm_size_t); +void feroceon_dcache_inv_range (vm_offset_t, vm_size_t); +void feroceon_dcache_wb_range (vm_offset_t, vm_size_t); +void feroceon_idcache_wbinv_range (vm_offset_t, vm_size_t); + +void feroceon_l2cache_wbinv_range (vm_offset_t, vm_size_t); +void feroceon_l2cache_inv_range (vm_offset_t, vm_size_t); +void feroceon_l2cache_wb_range (vm_offset_t, vm_size_t); +void feroceon_l2cache_wbinv_all (void); #endif #ifdef CPU_ARM11 ==== //depot/projects/arm/src/sys/arm/mv/files.mv#4 (text+ko) ==== @@ -15,6 +15,7 @@ arm/arm/bus_space_generic.c standard arm/arm/cpufunc_asm_arm10.S standard arm/arm/cpufunc_asm_armv5_ec.S standard +arm/arm/cpufunc_asm_feroceon.S standard arm/arm/irq_dispatch.S standard arm/mv/bus_space.c standard From owner-p4-projects@FreeBSD.ORG Tue Sep 9 13:18:58 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D76481065677; Tue, 9 Sep 2008 13:18: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 98CF91065670 for ; Tue, 9 Sep 2008 13:18:57 +0000 (UTC) (envelope-from raj@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 8AA9B8FC13 for ; Tue, 9 Sep 2008 13:18:57 +0000 (UTC) (envelope-from raj@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 m89DIvbb019007 for ; Tue, 9 Sep 2008 13:18:57 GMT (envelope-from raj@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m89DIvOc019001 for perforce@freebsd.org; Tue, 9 Sep 2008 13:18:57 GMT (envelope-from raj@freebsd.org) Date: Tue, 9 Sep 2008 13:18:57 GMT Message-Id: <200809091318.m89DIvOc019001@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to raj@freebsd.org using -f From: Rafal Jaworowski To: Perforce Change Reviews Cc: Subject: PERFORCE change 149474 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, 09 Sep 2008 13:18:58 -0000 http://perforce.freebsd.org/chv.cgi?CH=149474 Change 149474 by raj@raj_mimi on 2008/09/09 13:18:50 Dynamically calculate the number of required L2 tables in initarm(). This lets the mv_machdep.c better handle varying sizes of system DRAM. Obtained from: Marvell, Semihalf Affected files ... .. //depot/projects/arm/src/sys/arm/mv/mv_machdep.c#3 edit Differences ... ==== //depot/projects/arm/src/sys/arm/mv/mv_machdep.c#3 (text+ko) ==== @@ -89,8 +89,12 @@ #define KERNEL_PT_SYS 0 /* Page table for mapping proc0 zero page */ #define KERNEL_PT_KERN 1 -/* This should be evenly divisable by PAGE_SIZE / L2_TABLE_SIZE_REAL (or 4) */ -#define NUM_KERNEL_PTS 8 +/* + * This is the number of L2 page tables required for covering max + * (hypothetical) memsize of 4GB and all kernel mappings (vectors, msgbuf, + * stacks etc.), uprounded to be divisible by 4. + */ +#define KERNEL_PT_MAX 78 /* Define various stack sizes in pages */ #define IRQ_STACK_SIZE 1 @@ -104,7 +108,7 @@ extern const struct pmap_devmap *pmap_devmap_bootstrap_table; extern vm_offset_t pmap_bootstrap_lastaddr; -struct pv_addr kernel_pt_table[NUM_KERNEL_PTS]; +struct pv_addr kernel_pt_table[KERNEL_PT_MAX]; extern void *_end; extern int *end; @@ -136,7 +140,7 @@ vm_offset_t freemempos; vm_offset_t l2_start; vm_offset_t lastaddr; - uint32_t memsize; + uint32_t memsize, l2size; boothowto = RB_VERBOSE | RB_SINGLE; @@ -150,6 +154,21 @@ pcpu_init(pcpup, 0, sizeof(struct pcpu)); PCPU_SET(curthread, &thread0); + memsize = platform_ramsize(); + + /* Calculate number of L2 tables needed for mapping vm_page_array */ + l2size = (memsize / PAGE_SIZE) * sizeof(struct vm_page); + l2size = (l2size >> L1_S_SHIFT) + 1; + + /* + * Add one table for end of kernel map, one for stacks, msgbuf and + * L1 and L2 tables map and one for vectors map. + */ + l2size += 3; + + /* Make it divisible by 4 */ + l2size = (l2size + 3) & ~3; + #define KERNEL_TEXT_BASE (KERNBASE) freemempos = (lastaddr + PAGE_MASK) & ~PAGE_MASK; @@ -167,7 +186,7 @@ freemempos += PAGE_SIZE; valloc_pages(kernel_l1pt, L1_TABLE_SIZE / PAGE_SIZE); - for (i = 0; i < NUM_KERNEL_PTS; ++i) { + for (i = 0; i < l2size; ++i) { if (!(i % (PAGE_SIZE / L2_TABLE_SIZE_REAL))) { valloc_pages(kernel_pt_table[i], L2_TABLE_SIZE / PAGE_SIZE); @@ -210,11 +229,11 @@ * and kernel structures */ l2_start = lastaddr & ~(L1_S_OFFSET); - for (i = 0 ; i < NUM_KERNEL_PTS - 1; i++) + for (i = 0 ; i < l2size - 1; i++) pmap_link_l2pt(l1pagetable, l2_start + i * L1_S_SIZE, &kernel_pt_table[KERNEL_PT_KERN + i]); - pmap_curmaxkvaddr = l2_start + NUM_KERNEL_PTS * L1_S_SIZE; + pmap_curmaxkvaddr = l2_start + (l2size - 1) * L1_S_SIZE; /* Map kernel code and data */ pmap_map_chunk(l1pagetable, KERNVIRTADDR, KERNPHYSADDR, @@ -228,7 +247,7 @@ pmap_map_chunk(l1pagetable, kernel_pt_table[0].pv_va, kernel_pt_table[0].pv_pa, - L2_TABLE_SIZE_REAL * NUM_KERNEL_PTS, + L2_TABLE_SIZE_REAL * l2size, VM_PROT_READ|VM_PROT_WRITE, PTE_PAGETABLE); /* Map allocated stacks and msgbuf */ @@ -249,7 +268,6 @@ cpu_tlb_flushID(); cpu_domains(DOMAIN_CLIENT << (PMAP_DOMAIN_KERNEL * 2)); cninit(); - memsize = platform_ramsize(); physmem = memsize / PAGE_SIZE; /* From owner-p4-projects@FreeBSD.ORG Tue Sep 9 14:38:19 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 676E9106568C; Tue, 9 Sep 2008 14:38:19 +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 29BDB106567D for ; Tue, 9 Sep 2008 14:38:19 +0000 (UTC) (envelope-from brooks@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 17B008FC16 for ; Tue, 9 Sep 2008 14:38:19 +0000 (UTC) (envelope-from brooks@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 m89EcJES048063 for ; Tue, 9 Sep 2008 14:38:19 GMT (envelope-from brooks@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m89EcIqN048025 for perforce@freebsd.org; Tue, 9 Sep 2008 14:38:18 GMT (envelope-from brooks@freebsd.org) Date: Tue, 9 Sep 2008 14:38:18 GMT Message-Id: <200809091438.m89EcIqN048025@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to brooks@freebsd.org using -f From: Brooks Davis To: Perforce Change Reviews Cc: Subject: PERFORCE change 149477 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, 09 Sep 2008 14:38:19 -0000 http://perforce.freebsd.org/chv.cgi?CH=149477 Change 149477 by brooks@brooks_coredump on 2008/09/09 14:38:11 IFC (exact change number lost due to running out of battery :) Affected files ... .. //depot/projects/vimage-commit2/src/sys/amd64/amd64/cpu_switch.S#4 integrate .. //depot/projects/vimage-commit2/src/sys/amd64/amd64/genassym.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/amd64/amd64/machdep.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/amd64/amd64/mp_machdep.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/amd64/amd64/trap.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/amd64/include/pcb.h#3 integrate .. //depot/projects/vimage-commit2/src/sys/amd64/include/pcpu.h#3 integrate .. //depot/projects/vimage-commit2/src/sys/amd64/include/segments.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/amd64/linux32/linux32_genassym.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/amd64/linux32/linux32_locore.s#2 integrate .. //depot/projects/vimage-commit2/src/sys/amd64/linux32/linux32_machdep.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/arm/at91/at91.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/arm/at91/at91_mci.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/arm/at91/at91_ssc.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/arm/at91/kb920x_machdep.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/arm/conf/KB920X#3 integrate .. //depot/projects/vimage-commit2/src/sys/arm/conf/NSLU#2 integrate .. //depot/projects/vimage-commit2/src/sys/boot/sparc64/loader/main.c#5 integrate .. //depot/projects/vimage-commit2/src/sys/cddl/contrib/opensolaris/uts/common/fs/gfs.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ctldir.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_znode.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/conf/NOTES#8 integrate .. //depot/projects/vimage-commit2/src/sys/contrib/dev/ath/public/mipsisa32-be-elf.hal.o.uu#3 integrate .. //depot/projects/vimage-commit2/src/sys/contrib/dev/ath/public/wisoc.hal.o.uu#1 branch .. //depot/projects/vimage-commit2/src/sys/contrib/dev/ath/public/wisoc.inc#1 branch .. //depot/projects/vimage-commit2/src/sys/contrib/dev/ath/public/wisoc.opt_ah.h#1 branch .. //depot/projects/vimage-commit2/src/sys/dev/acpi_support/acpi_fujitsu.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/asmc/asmc.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/asmc/asmcvar.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/ata/ata-chipset.c#5 integrate .. //depot/projects/vimage-commit2/src/sys/dev/ata/ata-pci.h#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/bge/if_bge.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/esp/esp_sbus.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/esp/ncr53c9x.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/esp/ncr53c9xreg.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/esp/ncr53c9xvar.h#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/ic/i8251.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/ic/i8255.h#1 branch .. //depot/projects/vimage-commit2/src/sys/dev/iicbus/ds133x.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/iicbus/ds1672.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/le/if_le_ledma.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/mii/e1000phy.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/mii/miidevs#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/re/if_re.c#5 integrate .. //depot/projects/vimage-commit2/src/sys/dev/si/si.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/sound/pci/hda/hdac.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/uart/uart_cpu_pc98.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/if_zyd.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/ucom.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/ucomvar.h#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/usbdevs#8 integrate .. //depot/projects/vimage-commit2/src/sys/geom/geom_dev.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/geom/part/g_part.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/geom/part/g_part.h#3 integrate .. //depot/projects/vimage-commit2/src/sys/geom/part/g_part_gpt.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/i386/include/pmc_mdep.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/i386/isa/isa.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/i386/linux/linux_genassym.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/i386/linux/linux_locore.s#2 integrate .. //depot/projects/vimage-commit2/src/sys/kern/kern_proc.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/kern/kern_resource.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/kern/subr_sleepqueue.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/kern/tty.c#8 integrate .. //depot/projects/vimage-commit2/src/sys/kern/tty_compat.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/kern/tty_pts.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/kern/uipc_mbuf.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/kern/uipc_mqueue.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/kern/uipc_sockbuf.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/mips/mips/intr_machdep.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/net/if_bridge.c#8 integrate .. //depot/projects/vimage-commit2/src/sys/net/route.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/net80211/ieee80211.h#3 integrate .. //depot/projects/vimage-commit2/src/sys/net80211/ieee80211_ddb.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/net80211/ieee80211_freebsd.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/net80211/ieee80211_ht.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/net80211/ieee80211_ht.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/net80211/ieee80211_ioctl.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/net80211/ieee80211_ioctl.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/net80211/ieee80211_node.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/net80211/ieee80211_node.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/net80211/ieee80211_phy.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/net80211/ieee80211_sta.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/if_ether.c#12 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/ip_fw.h#5 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/ip_fw2.c#19 edit .. //depot/projects/vimage-commit2/src/sys/netinet/tcp_debug.c#6 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/tcp_input.c#13 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/tcp_output.c#12 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/tcp_subr.c#10 edit .. //depot/projects/vimage-commit2/src/sys/netinet/tcp_var.h#3 integrate .. //depot/projects/vimage-commit2/src/sys/pc98/cbus/sio.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/pc98/include/bus.h#3 integrate .. //depot/projects/vimage-commit2/src/sys/pc98/pc98/busiosubr.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/security/audit/audit_syscalls.c#5 integrate .. //depot/projects/vimage-commit2/src/sys/sparc64/include/cpu.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/sparc64/include/dcr.h#1 branch .. //depot/projects/vimage-commit2/src/sys/sparc64/include/trap.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/sparc64/include/tte.h#3 integrate .. //depot/projects/vimage-commit2/src/sys/sparc64/sbus/dma_sbus.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/sparc64/sbus/lsi64854.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/sparc64/sbus/lsi64854var.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/sparc64/sparc64/cheetah.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/sparc64/sparc64/exception.S#5 integrate .. //depot/projects/vimage-commit2/src/sys/sparc64/sparc64/genassym.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/sparc64/sparc64/machdep.c#5 integrate .. //depot/projects/vimage-commit2/src/sys/sparc64/sparc64/mp_machdep.c#6 integrate .. //depot/projects/vimage-commit2/src/sys/sparc64/sparc64/pmap.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/sparc64/sparc64/trap.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/sys/disk.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/sys/gpt.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/sys/param.h#10 integrate .. //depot/projects/vimage-commit2/src/sys/sys/termios.h#4 integrate .. //depot/projects/vimage-commit2/src/sys/sys/tty.h#3 integrate .. //depot/projects/vimage-commit2/src/sys/sys/ttydevsw.h#2 integrate Differences ... ==== //depot/projects/vimage-commit2/src/sys/amd64/amd64/cpu_switch.S#4 (text+ko) ==== @@ -30,7 +30,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/amd64/amd64/cpu_switch.S,v 1.163 2008/09/02 17:52:11 kib Exp $ + * $FreeBSD: src/sys/amd64/amd64/cpu_switch.S,v 1.164 2008/09/08 09:59:05 kib Exp $ */ #include @@ -266,7 +266,7 @@ movl %es,PCB_ES(%r8) movl %fs,PCB_FS(%r8) jmp done_store_seg -2: movq PCB_GS32P(%r8),%rax +2: movq PCPU(GS32P),%rax movq (%rax),%rax movq %rax,PCB_GS32SD(%r8) jmp 1b @@ -283,7 +283,7 @@ movl PCB_FS(%r8),%fs jmp done_load_seg /* Restore userland %gs while preserving kernel gsbase */ -2: movq PCB_GS32P(%r8),%rax +2: movq PCPU(GS32P),%rax movq PCB_GS32SD(%r8),%rcx movq %rcx,(%rax) jmp 1b ==== //depot/projects/vimage-commit2/src/sys/amd64/amd64/genassym.c#3 (text+ko) ==== @@ -33,7 +33,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/genassym.c,v 1.169 2008/07/30 11:30:55 kib Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/genassym.c,v 1.170 2008/09/08 09:59:05 kib Exp $"); #include "opt_compat.h" #include "opt_kstack_pages.h" @@ -147,7 +147,6 @@ ASSYM(PCB_SAVEFPU, offsetof(struct pcb, pcb_save)); ASSYM(PCB_SAVEFPU_SIZE, sizeof(struct savefpu)); ASSYM(PCB_ONFAULT, offsetof(struct pcb, pcb_onfault)); -ASSYM(PCB_GS32P, offsetof(struct pcb, pcb_gs32p)); ASSYM(PCB_GS32SD, offsetof(struct pcb, pcb_gs32sd)); ASSYM(PCB_SIZE, sizeof(struct pcb)); @@ -199,6 +198,7 @@ ASSYM(PC_CURPMAP, offsetof(struct pcpu, pc_curpmap)); ASSYM(PC_TSSP, offsetof(struct pcpu, pc_tssp)); ASSYM(PC_RSP0, offsetof(struct pcpu, pc_rsp0)); +ASSYM(PC_GS32P, offsetof(struct pcpu, pc_gs32p)); ASSYM(LA_VER, offsetof(struct LAPIC, version)); ASSYM(LA_TPR, offsetof(struct LAPIC, tpr)); ==== //depot/projects/vimage-commit2/src/sys/amd64/amd64/machdep.c#4 (text+ko) ==== @@ -39,7 +39,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/machdep.c,v 1.688 2008/09/02 17:52:11 kib Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/machdep.c,v 1.690 2008/09/08 09:59:05 kib Exp $"); #include "opt_atalk.h" #include "opt_atpic.h" @@ -803,7 +803,7 @@ * Initialize segments & interrupt table */ -struct user_segment_descriptor gdt[NGDT * MAXCPU];/* global descriptor table */ +struct user_segment_descriptor gdt[NGDT * MAXCPU];/* global descriptor tables */ static struct gate_descriptor idt0[NIDT]; struct gate_descriptor *idt = &idt0[0]; /* interrupt descriptor table */ @@ -870,7 +870,7 @@ /* GPROC0_SEL 6 Proc 0 Tss Descriptor */ { 0x0, /* segment base address */ - sizeof(struct amd64tss)-1,/* length - all address space */ + sizeof(struct amd64tss)-1,/* length */ SDT_SYSTSS, /* segment type */ SEL_KPL, /* segment descriptor priority level */ 1, /* segment descriptor present */ @@ -1347,6 +1347,7 @@ PCPU_SET(curthread, &thread0); PCPU_SET(curpcb, thread0.td_pcb); PCPU_SET(tssp, &common_tss[0]); + PCPU_SET(gs32p, &gdt[GUGS32_SEL]); /* * Initialize mutexes. ==== //depot/projects/vimage-commit2/src/sys/amd64/amd64/mp_machdep.c#3 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/mp_machdep.c,v 1.291 2008/07/09 19:44:37 peter Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/mp_machdep.c,v 1.293 2008/09/08 09:59:05 kib Exp $"); #include "opt_cpu.h" #include "opt_kstack_pages.h" @@ -436,7 +436,8 @@ { struct pcpu *pc; u_int64_t msr, cr0; - int cpu, gsel_tss; + int cpu, gsel_tss, x; + struct region_descriptor ap_gdt; /* Set by the startup code for us to use */ cpu = bootAP; @@ -447,11 +448,17 @@ common_tss[cpu].tss_iobase = sizeof(struct amd64tss); common_tss[cpu].tss_ist1 = (long)&doublefault_stack[PAGE_SIZE]; + /* Prepare private GDT */ gdt_segs[GPROC0_SEL].ssd_base = (long) &common_tss[cpu]; ssdtosyssd(&gdt_segs[GPROC0_SEL], - (struct system_segment_descriptor *)&gdt[GPROC0_SEL]); - - lgdt(&r_gdt); /* does magic intra-segment return */ + (struct system_segment_descriptor *)&gdt[NGDT * cpu + GPROC0_SEL]); + for (x = 0; x < NGDT; x++) { + if (x != GPROC0_SEL && x != (GPROC0_SEL + 1)) + ssdtosd(&gdt_segs[x], &gdt[NGDT * cpu + x]); + } + ap_gdt.rd_limit = NGDT * sizeof(gdt[0]) - 1; + ap_gdt.rd_base = (long) &gdt[NGDT * cpu]; + lgdt(&ap_gdt); /* does magic intra-segment return */ /* Get per-cpu data */ pc = &__pcpu[cpu]; @@ -463,6 +470,7 @@ pc->pc_curthread = 0; pc->pc_tssp = &common_tss[cpu]; pc->pc_rsp0 = 0; + pc->pc_gs32p = &gdt[NGDT * cpu + GUGS32_SEL]; wrmsr(MSR_FSBASE, 0); /* User value */ wrmsr(MSR_GSBASE, (u_int64_t)pc); ==== //depot/projects/vimage-commit2/src/sys/amd64/amd64/trap.c#3 (text+ko) ==== @@ -38,7 +38,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/trap.c,v 1.327 2008/06/20 05:22:09 alc Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/trap.c,v 1.328 2008/09/08 09:55:51 kib Exp $"); /* * AMD64 Trap and System call handling @@ -692,7 +692,8 @@ code = frame->tf_err; type = frame->tf_trapno; - sdtossd(&gdt[IDXSEL(frame->tf_cs & 0xffff)], &softseg); + sdtossd(&gdt[NGDT * PCPU_GET(cpuid) + IDXSEL(frame->tf_cs & 0xffff)], + &softseg); if (type <= MAX_TRAP_MSG) msg = trap_msg[type]; ==== //depot/projects/vimage-commit2/src/sys/amd64/include/pcb.h#3 (text+ko) ==== @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * from: @(#)pcb.h 5.10 (Berkeley) 5/12/91 - * $FreeBSD: src/sys/amd64/include/pcb.h,v 1.65 2008/07/30 11:30:55 kib Exp $ + * $FreeBSD: src/sys/amd64/include/pcb.h,v 1.66 2008/09/08 09:59:05 kib Exp $ */ #ifndef _AMD64_PCB_H_ @@ -77,7 +77,6 @@ caddr_t pcb_onfault; /* copyin/out fault recovery */ /* 32-bit segment descriptor */ - struct user_segment_descriptor *pcb_gs32p; struct user_segment_descriptor pcb_gs32sd; }; ==== //depot/projects/vimage-commit2/src/sys/amd64/include/pcpu.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/amd64/include/pcpu.h,v 1.50 2008/08/19 19:53:52 jhb Exp $ + * $FreeBSD: src/sys/amd64/include/pcpu.h,v 1.51 2008/09/08 09:59:05 kib Exp $ */ #ifndef _MACHINE_PCPU_H_ @@ -48,7 +48,8 @@ register_t pc_rsp0; \ register_t pc_scratch_rsp; /* User %rsp in syscall */ \ u_int pc_apic_id; \ - u_int pc_acpi_id /* ACPI CPU id */ + u_int pc_acpi_id; /* ACPI CPU id */ \ + struct user_segment_descriptor *pc_gs32p #ifdef _KERNEL ==== //depot/projects/vimage-commit2/src/sys/amd64/include/segments.h#2 (text+ko) ==== @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * from: @(#)segments.h 7.1 (Berkeley) 5/9/91 - * $FreeBSD: src/sys/amd64/include/segments.h,v 1.39 2007/03/30 00:06:21 jkim Exp $ + * $FreeBSD: src/sys/amd64/include/segments.h,v 1.40 2008/09/08 08:58:29 kib Exp $ */ #ifndef _MACHINE_SEGMENTS_H_ @@ -201,7 +201,7 @@ #define GUDATA_SEL 4 /* User 32/64 bit Data Descriptor */ #define GUCODE_SEL 5 /* User 64 bit Code Descriptor */ #define GPROC0_SEL 6 /* TSS for entering kernel etc */ -/* slot 6 is second half of GPROC0_SEL */ +/* slot 7 is second half of GPROC0_SEL */ #define GUGS32_SEL 8 /* User 32 bit GS Descriptor */ #define NGDT 9 ==== //depot/projects/vimage-commit2/src/sys/amd64/linux32/linux32_genassym.c#2 (text+ko) ==== @@ -1,5 +1,5 @@ #include -__FBSDID("$FreeBSD: src/sys/amd64/linux32/linux32_genassym.c,v 1.1 2004/08/16 07:55:06 tjr Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/linux32/linux32_genassym.c,v 1.2 2008/09/07 16:39:21 kib Exp $"); #include #include @@ -9,9 +9,8 @@ ASSYM(LINUX_SIGF_HANDLER, offsetof(struct l_sigframe, sf_handler)); ASSYM(LINUX_SIGF_SC, offsetof(struct l_sigframe, sf_sc)); -ASSYM(LINUX_SC_GS, offsetof(struct l_sigcontext, sc_gs)); -ASSYM(LINUX_SC_FS, offsetof(struct l_sigcontext, sc_fs)); ASSYM(LINUX_SC_ES, offsetof(struct l_sigcontext, sc_es)); ASSYM(LINUX_SC_DS, offsetof(struct l_sigcontext, sc_ds)); ASSYM(LINUX_RT_SIGF_HANDLER, offsetof(struct l_rt_sigframe, sf_handler)); ASSYM(LINUX_RT_SIGF_UC, offsetof(struct l_rt_sigframe, sf_sc)); +ASSYM(LINUX_RT_SIGF_SC, offsetof(struct l_ucontext, uc_mcontext)); ==== //depot/projects/vimage-commit2/src/sys/amd64/linux32/linux32_locore.s#2 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/amd64/linux32/linux32_locore.s,v 1.2 2007/03/30 00:06:21 jkim Exp $ */ +/* $FreeBSD: src/sys/amd64/linux32/linux32_locore.s,v 1.3 2008/09/07 16:39:21 kib Exp $ */ #include "linux32_assym.h" /* system definitions */ #include /* miscellaneous asm macros */ @@ -23,8 +23,9 @@ linux_rt_sigcode: call *LINUX_RT_SIGF_HANDLER(%esp) leal LINUX_RT_SIGF_UC(%esp),%ebx /* linux ucp */ - movl LINUX_SC_ES(%ebx),%es - movl LINUX_SC_DS(%ebx),%ds + leal LINUX_RT_SIGF_SC(%ebx),%ecx /* linux sigcontext */ + movl LINUX_SC_ES(%ecx),%es + movl LINUX_SC_DS(%ecx),%ds push %eax /* fake ret addr */ movl $LINUX_SYS_linux_rt_sigreturn,%eax /* linux_rt_sigreturn() */ int $0x80 /* enter kernel with args */ ==== //depot/projects/vimage-commit2/src/sys/amd64/linux32/linux32_machdep.c#3 (text+ko) ==== @@ -29,7 +29,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/linux32/linux32_machdep.c,v 1.47 2008/07/30 11:30:55 kib Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/linux32/linux32_machdep.c,v 1.49 2008/09/08 09:59:05 kib Exp $"); #include #include @@ -694,7 +694,6 @@ #endif td2->td_pcb->pcb_gsbase = (register_t)info.base_addr; td2->td_pcb->pcb_gs32sd = sd; - td2->td_pcb->pcb_gs32p = &gdt[GUGS32_SEL]; td2->td_pcb->pcb_gs = GSEL(GUGS32_SEL, SEL_UPL); td2->td_pcb->pcb_flags |= PCB_GS32BIT | PCB_32BIT; } @@ -1352,9 +1351,8 @@ critical_enter(); td->td_pcb->pcb_gsbase = (register_t)info.base_addr; - td->td_pcb->pcb_gs32sd = gdt[GUGS32_SEL] = sd; - td->td_pcb->pcb_gs32p = &gdt[GUGS32_SEL]; - td->td_pcb->pcb_flags |= PCB_32BIT; + td->td_pcb->pcb_gs32sd = *PCPU_GET(gs32p) = sd; + td->td_pcb->pcb_flags |= PCB_32BIT | PCB_GS32BIT; wrmsr(MSR_KGSBASE, td->td_pcb->pcb_gsbase); critical_exit(); ==== //depot/projects/vimage-commit2/src/sys/arm/at91/at91.c#3 (text) ==== @@ -23,7 +23,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/arm/at91/at91.c,v 1.17 2008/08/19 22:15:14 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/at91/at91.c,v 1.18 2008/09/05 22:27:10 imp Exp $"); #include #include @@ -458,10 +458,6 @@ sc->sc_irq_rman.rm_descr = "AT91 IRQs"; sc->sc_mem_rman.rm_type = RMAN_ARRAY; sc->sc_mem_rman.rm_descr = "AT91 Memory"; -#if 0 - sc->sc_usbmem_rman.rm_type = RMAN_ARRAY; - sc->sc_usbmem_rman.rm_descr = "AT91RM9200 USB Memory-mapped regs"; -#endif if (rman_init(&sc->sc_irq_rman) != 0 || rman_manage_region(&sc->sc_irq_rman, 1, 31) != 0) panic("at91_attach: failed to set up IRQ rman"); @@ -536,14 +532,8 @@ start, end, count, flags, child); break; case SYS_RES_MEMORY: -#if 0 - if (start >= 0x00300000 && start <= 0x003fffff) - rle->res = rman_reserve_resource(&sc->sc_usbmem_rman, - start, end, count, flags, child); - else -#endif - rle->res = rman_reserve_resource(&sc->sc_mem_rman, - start, end, count, flags, child); + 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); break; ==== //depot/projects/vimage-commit2/src/sys/arm/at91/at91_mci.c#2 (text+ko) ==== @@ -24,7 +24,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/arm/at91/at91_mci.c,v 1.4 2007/09/16 07:48:58 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/at91/at91_mci.c,v 1.5 2008/09/05 22:30:59 imp Exp $"); #include #include @@ -298,14 +298,7 @@ else WR4(sc, MCI_SDCR, RD4(sc, MCI_SDCR) & ~MCI_SDCR_SDCBUS); WR4(sc, MCI_MR, (RD4(sc, MCI_MR) & ~MCI_MR_CLKDIV) | clkdiv); -#if 0 - if (sc->vcc_pin) { - if (sc->power_mode == MMC_POWER_OFF) - gpio_set(sc->vcc_pin, 0); - else - gpio_set(sc->vcc_pin, 1); - } -#endif + /* XXX We need to turn the device on/off here with a GPIO pin */ return (0); } ==== //depot/projects/vimage-commit2/src/sys/arm/at91/at91_ssc.c#2 (text) ==== @@ -23,7 +23,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/arm/at91/at91_ssc.c,v 1.4 2007/02/23 12:18:27 piso Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/at91/at91_ssc.c,v 1.5 2008/09/05 22:29:50 imp Exp $"); #include #include @@ -209,16 +209,6 @@ at91_ssc_intr(void *xsc) { struct at91_ssc_softc *sc = xsc; -#if 0 - uint32_t status; - - /* Reading the status also clears the interrupt */ - status = RD4(sc, SSC_SR); - if (status == 0) - return; - AT91_SSC_LOCK(sc); - AT91_SSC_UNLOCK(sc); -#endif wakeup(sc); return; } @@ -232,9 +222,6 @@ AT91_SSC_LOCK(sc); if (!(sc->flags & OPENED)) { sc->flags |= OPENED; -#if 0 - // Enable interrupts -#endif } AT91_SSC_UNLOCK(sc); return (0); @@ -248,9 +235,6 @@ sc = CDEV2SOFTC(dev); AT91_SSC_LOCK(sc); sc->flags &= ~OPENED; -#if 0 - // Disable interrupts -#endif AT91_SSC_UNLOCK(sc); return (0); } ==== //depot/projects/vimage-commit2/src/sys/arm/at91/kb920x_machdep.c#2 (text) ==== @@ -47,7 +47,7 @@ #include "opt_at91.h" #include -__FBSDID("$FreeBSD: src/sys/arm/at91/kb920x_machdep.c,v 1.30 2008/04/03 16:44:49 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/at91/kb920x_machdep.c,v 1.31 2008/09/05 22:23:41 imp Exp $"); #define _ARM32_BUS_DMA_PRIVATE #include @@ -164,7 +164,6 @@ * initialization is done. However, the AT91 resource allocation * system doesn't know how to use pmap_mapdev() yet. */ -#if 1 { /* * Add the ohci controller, and anything else that might be @@ -176,7 +175,6 @@ VM_PROT_READ|VM_PROT_WRITE, PTE_NOCACHE, }, -#endif { 0, 0, ==== //depot/projects/vimage-commit2/src/sys/arm/conf/KB920X#3 (text) ==== @@ -1,4 +1,4 @@ -# KB920X -- Custom kernel configuration for the KB9200, 9201 and 9202 +# KB920X -- Custom kernel configuration for the KB9202 (no letter, A and B) # AT91RM9200 evaluation boards from kwikbyte.com. # # For more information on this file, please read the handbook section on @@ -16,19 +16,19 @@ # If you are in doubt as to the purpose or necessity of a line, check first # in NOTES. # -# $FreeBSD: src/sys/arm/conf/KB920X,v 1.18 2008/08/03 10:32:17 ed Exp $ +# $FreeBSD: src/sys/arm/conf/KB920X,v 1.19 2008/09/07 18:55:55 imp Exp $ machine arm ident KB920X include "../at91/std.kb920x" -#To statically compile in device wiring instead of /boot/device.hints -#hints "GENERIC.hints" #Default places to look for devices. +# The AT91 platform doesn't use /boot/loader, so we have to statically wire +# hints. hints "KB920X.hints" makeoptions DEBUG=-g #Build kernel with gdb(1) debug symbols -options DDB -options KDB +options DDB +options KDB options SCHED_4BSD #4BSD scheduler options INET #InterNETworking @@ -38,14 +38,14 @@ #options UFS_ACL #Support for access control lists #options UFS_DIRHASH #Improve performance on big directories #options MD_ROOT #MD is a potential root device -#options MD_ROOT_SIZE=4096 # 3MB ram disk +#options MD_ROOT_SIZE=4096 # 4MB ram disk options ROOTDEVNAME=\"ufs:/dev/mmcsd0s1a\" options NFSCLIENT #Network Filesystem Client #options NFSSERVER #Network Filesystem Server #options NFSLOCKD #Network Lock Manager #options NFS_ROOT #NFS usable as /, requires NFSCLIENT -#options BOOTP_NFSROOT -#options BOOTP +#options BOOTP_NFSROOT +#options BOOTP #options MSDOSFS #MSDOS Filesystem #options CD9660 #ISO 9660 Filesystem @@ -58,8 +58,11 @@ options SYSVSEM #SYSV-style semaphores options _KPOSIX_PRIORITY_SCHEDULING #Posix P1003_1B real-time extensions #options SYSCTL_OMIT_DESCR +# Disable the inlining of mutex, rwlock and sx locks. These eat up a lot +# of space. options MUTEX_NOINLINE -options RWLOCK_NOINLINE +options RWLOCK_NOINLINE +options SX_NOINLINE options NO_FFS_SNAPSHOT options NO_SWAPPING device random ==== //depot/projects/vimage-commit2/src/sys/arm/conf/NSLU#2 (text+ko) ==== @@ -15,7 +15,7 @@ # If you are in doubt as to the purpose or necessity of a line, check first # in NOTES. # -# $FreeBSD: src/sys/arm/conf/NSLU,v 1.1 2008/08/03 07:10:25 imp Exp $ +# $FreeBSD: src/sys/arm/conf/NSLU,v 1.2 2008/09/08 00:41:32 imp Exp $ machine arm ident NSLU @@ -67,6 +67,9 @@ options SYSVMSG #SYSV-style message queues options SYSVSEM #SYSV-style semaphores options _KPOSIX_PRIORITY_SCHEDULING #Posix P1003_1B real-time extensions +options MUTEX_NOINLINE #Mutex inlines are space hogs +options RWLOCK_NOINLINE #rwlock inlines are space hogs +options SX_NOINLINE #sx inliens are space hogs options BOOTP options BOOTP_NFSROOT options BOOTP_NFSV3 @@ -89,7 +92,8 @@ device npe_fw device firmware device qmgr # Q Manager (required by npe) -device miibus # NB: required by npe +device mii # Minimal mii routines +device rlphy # NSLU2 uses Realtek PHY attached to npe device ether device bpf ==== //depot/projects/vimage-commit2/src/sys/boot/sparc64/loader/main.c#5 (text+ko) ==== @@ -8,7 +8,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/boot/sparc64/loader/main.c,v 1.35 2008/08/30 16:03:22 marius Exp $"); +__FBSDID("$FreeBSD: src/sys/boot/sparc64/loader/main.c,v 1.36 2008/09/04 19:41:54 marius Exp $"); /* * FreeBSD/sparc64 kernel loader - machine dependent part @@ -396,36 +396,44 @@ static vm_offset_t dtlb_va_to_pa_sun4u(vm_offset_t va) { - u_long reg; + u_long pstate, reg; int i; + pstate = rdpr(pstate); + wrpr(pstate, pstate & ~PSTATE_IE, 0); for (i = 0; i < dtlb_slot_max; i++) { reg = ldxa(TLB_DAR_SLOT(i), ASI_DTLB_TAG_READ_REG); if (TLB_TAR_VA(reg) != va) continue; reg = dtlb_get_data_sun4u(i); + wrpr(pstate, pstate, 0); if (cpu_impl >= CPU_IMPL_ULTRASPARCIII) return ((reg & TD_PA_CH_MASK) >> TD_PA_SHIFT); return ((reg & TD_PA_SF_MASK) >> TD_PA_SHIFT); } + wrpr(pstate, pstate, 0); return (-1); } static vm_offset_t itlb_va_to_pa_sun4u(vm_offset_t va) { - u_long reg; + u_long pstate, reg; int i; + pstate = rdpr(pstate); + wrpr(pstate, pstate & ~PSTATE_IE, 0); for (i = 0; i < itlb_slot_max; i++) { reg = ldxa(TLB_DAR_SLOT(i), ASI_ITLB_TAG_READ_REG); if (TLB_TAR_VA(reg) != va) continue; reg = itlb_get_data_sun4u(i); + wrpr(pstate, pstate, 0); if (cpu_impl >= CPU_IMPL_ULTRASPARCIII) return ((reg & TD_PA_CH_MASK) >> TD_PA_SHIFT); return ((reg & TD_PA_SF_MASK) >> TD_PA_SHIFT); } + wrpr(pstate, pstate, 0); return (-1); } ==== //depot/projects/vimage-commit2/src/sys/cddl/contrib/opensolaris/uts/common/fs/gfs.c#2 (text+ko) ==== @@ -358,6 +358,7 @@ fp = kmem_zalloc(size, KM_SLEEP); error = getnewvnode("zfs", vfsp, ops, &vp); ASSERT(error == 0); + vn_lock(vp, LK_EXCLUSIVE | LK_RETRY); vp->v_data = (caddr_t)fp; /* @@ -368,7 +369,9 @@ fp->gfs_size = size; fp->gfs_type = GFS_FILE; + vp->v_vflag |= VV_FORCEINSMQ; error = insmntque(vp, vfsp); + vp->v_vflag &= ~VV_FORCEINSMQ; KASSERT(error == 0, ("insmntque() failed: error %d", error)); /* ==== //depot/projects/vimage-commit2/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ctldir.c#3 (text+ko) ==== @@ -176,6 +176,8 @@ vp->v_vflag &= ~VV_ROOT; zfsvfs->z_ctldir = vp; + + VOP_UNLOCK(vp, 0); } /* @@ -788,6 +790,7 @@ mutex_init(&sdp->sd_lock, NULL, MUTEX_DEFAULT, NULL); avl_create(&sdp->sd_snaps, snapentry_compare, sizeof (zfs_snapentry_t), offsetof(zfs_snapentry_t, se_node)); + VOP_UNLOCK(vp, 0); return (vp); } @@ -860,6 +863,7 @@ &zfsctl_ops_snapshot, NULL, NULL, MAXNAMELEN, NULL, NULL); zcp = vp->v_data; zcp->zc_id = objset; + VOP_UNLOCK(vp, 0); return (vp); } ==== //depot/projects/vimage-commit2/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c#3 (text+ko) ==== @@ -1303,12 +1303,6 @@ } } out: - - if (error == 0) { - *vpp = ZTOV(zp); - vn_lock(*vpp, LK_EXCLUSIVE | LK_RETRY); - } - if (dl) zfs_dirent_unlock(dl); @@ -1588,8 +1582,6 @@ zfs_log_create(zilog, tx, TX_MKDIR, dzp, zp, dirname); dmu_tx_commit(tx); - vn_lock(*vpp, LK_EXCLUSIVE | LK_RETRY); - zfs_dirent_unlock(dl); ZFS_EXIT(zfsvfs); @@ -2773,7 +2765,6 @@ if (error == 0) { zfs_log_symlink(zilog, tx, TX_SYMLINK, dzp, zp, name, link); *vpp = ZTOV(zp); - vn_lock(*vpp, LK_EXCLUSIVE | LK_RETRY); } dmu_tx_commit(tx); ==== //depot/projects/vimage-commit2/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_znode.c#3 (text+ko) ==== @@ -117,6 +117,7 @@ if (cdrarg != NULL) { error = getnewvnode("zfs", vfsp, &zfs_vnodeops, &vp); ASSERT(error == 0); + vn_lock(vp, LK_EXCLUSIVE | LK_RETRY); zp->z_vnode = vp; vp->v_data = (caddr_t)zp; VN_LOCK_AREC(vp); @@ -346,7 +347,9 @@ if (vp == NULL) return (zp); + vp->v_vflag |= VV_FORCEINSMQ; error = insmntque(vp, zfsvfs->z_vfs); + vp->v_vflag &= ~VV_FORCEINSMQ; KASSERT(error == 0, ("insmntque() failed: error %d", error)); vp->v_type = IFTOVT((mode_t)zp->z_phys->zp_mode); @@ -533,8 +536,10 @@ *zpp = zp; } else { - if (ZTOV(zp) != NULL) + if (ZTOV(zp) != NULL) { ZTOV(zp)->v_count = 0; + VOP_UNLOCK(ZTOV(zp), 0); + } dmu_buf_rele(dbp, NULL); zfs_znode_free(zp); } @@ -596,14 +601,18 @@ &zp->z_vnode); ASSERT(err == 0); vp = ZTOV(zp); + vn_lock(vp, LK_EXCLUSIVE | LK_RETRY); vp->v_data = (caddr_t)zp; VN_LOCK_AREC(vp); VN_LOCK_ASHARE(vp); vp->v_type = IFTOVT((mode_t)zp->z_phys->zp_mode); if (vp->v_type == VDIR) zp->z_zn_prefetch = B_TRUE; /* z_prefetch default is enabled */ + vp->v_vflag |= VV_FORCEINSMQ; err = insmntque(vp, zfsvfs->z_vfs); + vp->v_vflag &= ~VV_FORCEINSMQ; KASSERT(err == 0, ("insmntque() failed: error %d", err)); + VOP_UNLOCK(vp, 0); } mutex_exit(&zp->z_lock); ZFS_OBJ_HOLD_EXIT(zfsvfs, obj_num); @@ -619,6 +628,8 @@ zfs_znode_dmu_init(zp); ZFS_OBJ_HOLD_EXIT(zfsvfs, obj_num); *zpp = zp; + if ((vp = ZTOV(zp)) != NULL) + VOP_UNLOCK(vp, 0); return (0); } ==== //depot/projects/vimage-commit2/src/sys/conf/NOTES#8 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/NOTES,v 1.1504 2008/08/20 08:31:58 ed Exp $ +# $FreeBSD: src/sys/conf/NOTES,v 1.1505 2008/09/08 10:40:48 raj Exp $ # # NOTES -- Lines that can be cut/pasted into kernel and hints configs. # @@ -2276,6 +2276,14 @@ device iic device iicsmb # smb over i2c bridge +# I2C peripheral devices +# +# ds133x Dallas Semiconductor DS1337, DS1338 and DS1339 RTC +# ds1672 Dallas Semiconductor DS1672 RTC +# +device ds133x +device ds1672 + # Parallel-Port Bus # # Parallel port bus support is provided by the `ppbus' device. ==== //depot/projects/vimage-commit2/src/sys/contrib/dev/ath/public/mipsisa32-be-elf.hal.o.uu#3 (text+ko) ==== @@ -3203,7 +3203,7 @@ M"0.@,"T00`'H)`,``X^D`5`PAO__CJ) -__FBSDID("$FreeBSD: src/sys/dev/acpi_support/acpi_fujitsu.c,v 1.5 2007/03/22 18:16:39 jkim Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/acpi_support/acpi_fujitsu.c,v 1.6 2008/09/08 06:29:24 ed Exp $"); #include "opt_acpi.h" #include @@ -245,7 +245,7 @@ AcpiInstallNotifyHandler(sc->handle, ACPI_DEVICE_NOTIFY, acpi_fujitsu_notify_handler, sc); - /* Snag our default values for the hotkys / hotkey states. */ + /* Snag our default values for the hotkeys / hotkey states. */ ACPI_SERIAL_BEGIN(fujitsu); if (!acpi_fujitsu_init(sc)) device_printf(dev, "Couldn't initialize hotkey states!\n"); ==== //depot/projects/vimage-commit2/src/sys/dev/asmc/asmc.c#2 (text+ko) ==== @@ -33,7 +33,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/asmc/asmc.c,v 1.9 2008/04/12 12:04:09 rpaulo Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/asmc/asmc.c,v 1.10 2008/09/07 18:15:34 rpaulo Exp $"); #include #include @@ -197,6 +197,13 @@ NULL, NULL, ASMC_MP_TEMPS, ASMC_MP_TEMPNAMES, ASMC_MP_TEMPDESCS }, + + { + "MacBookAir1,1", "Apple SMC MacBook Air", + ASMC_SMS_FUNCS, ASMC_FAN_FUNCS, NULL, NULL, + ASMC_MBA_TEMPS, ASMC_MBA_TEMPNAMES, ASMC_MBA_TEMPDESCS + }, + { NULL, NULL } }; ==== //depot/projects/vimage-commit2/src/sys/dev/asmc/asmcvar.h#2 (text+ko) ==== @@ -23,7 +23,7 @@ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/asmc/asmcvar.h,v 1.6 2008/04/12 12:04:09 rpaulo Exp $ + * $FreeBSD: src/sys/dev/asmc/asmcvar.h,v 1.7 2008/09/07 18:15:34 rpaulo Exp $ * */ @@ -126,8 +126,8 @@ /* * Temperatures. * - * First for MacBook, second for MacBook Pro, third for Intel Mac Mini and - * last Mac Pro 8-core. + * First for MacBook, second for MacBook Pro, third for Intel Mac Mini, + * fourth the Mac Pro 8-core and finally the MacBook Air. * */ /* maximum array size for temperatures including the last NULL */ @@ -186,3 +186,7 @@ "TM1S", "TM2P", "TM2S", "TM3S", "TM8P", \ "TM8S", "TM9P", "TM9S", "TN0H", "TS0C", \ NULL } + +#define ASMC_MBA_TEMPS { "TB0T", NULL } +#define ASMC_MBA_TEMPNAMES { "enclosure" } +#define ASMC_MBA_TEMPDESCS { "Enclosure Bottom" } ==== //depot/projects/vimage-commit2/src/sys/dev/ata/ata-chipset.c#5 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ata/ata-chipset.c,v 1.225 2008/08/15 10:55:11 philip Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ata/ata-chipset.c,v 1.226 2008/09/04 10:27:58 mav Exp $"); #include "opt_ata.h" #include @@ -4932,6 +4932,7 @@ >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Tue Sep 9 15:09:51 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A3F5E1065678; Tue, 9 Sep 2008 15:09: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 67B591065673 for ; Tue, 9 Sep 2008 15:09:51 +0000 (UTC) (envelope-from raj@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 55B658FC15 for ; Tue, 9 Sep 2008 15:09:51 +0000 (UTC) (envelope-from raj@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 m89F9pJW036019 for ; Tue, 9 Sep 2008 15:09:51 GMT (envelope-from raj@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m89F9pJn036017 for perforce@freebsd.org; Tue, 9 Sep 2008 15:09:51 GMT (envelope-from raj@freebsd.org) Date: Tue, 9 Sep 2008 15:09:51 GMT Message-Id: <200809091509.m89F9pJn036017@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to raj@freebsd.org using -f From: Rafal Jaworowski To: Perforce Change Reviews Cc: Subject: PERFORCE change 149479 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, 09 Sep 2008 15:09:51 -0000 http://perforce.freebsd.org/chv.cgi?CH=149479 Change 149479 by raj@raj_mimi on 2008/09/09 15:09:37 Provide L2 cache synchronization (invalidation) on ARM. Mainly pmap module and context switching routines are affected. Obtained from: Marvell, Semihalf Affected files ... .. //depot/projects/arm/src/sys/arm/arm/elf_machdep.c#4 edit .. //depot/projects/arm/src/sys/arm/arm/genassym.c#9 edit .. //depot/projects/arm/src/sys/arm/arm/locore.S#27 edit .. //depot/projects/arm/src/sys/arm/arm/pmap.c#41 edit .. //depot/projects/arm/src/sys/arm/arm/swtch.S#11 edit Differences ... ==== //depot/projects/arm/src/sys/arm/arm/elf_machdep.c#4 (text+ko) ==== @@ -214,6 +214,7 @@ { cpu_idcache_wbinv_all(); + cpu_l2cache_wbinv_all(); cpu_tlb_flushID(); return (0); } ==== //depot/projects/arm/src/sys/arm/arm/genassym.c#9 (text+ko) ==== @@ -79,7 +79,9 @@ ASSYM(CF_CONTROL, offsetof(struct cpu_functions, cf_control)); ASSYM(CF_CONTEXT_SWITCH, offsetof(struct cpu_functions, cf_context_switch)); ASSYM(CF_DCACHE_WB_RANGE, offsetof(struct cpu_functions, cf_dcache_wb_range)); +ASSYM(CF_L2CACHE_WB_RANGE, offsetof(struct cpu_functions, cf_l2cache_wb_range)); ASSYM(CF_IDCACHE_WBINV_ALL, offsetof(struct cpu_functions, cf_idcache_wbinv_all)); +ASSYM(CF_L2CACHE_WBINV_ALL, offsetof(struct cpu_functions, cf_l2cache_wbinv_all)); ASSYM(CF_TLB_FLUSHID_SE, offsetof(struct cpu_functions, cf_tlb_flushID_SE)); ASSYM(CF_ICACHE_SYNC, offsetof(struct cpu_functions, cf_icache_sync_all)); ==== //depot/projects/arm/src/sys/arm/arm/locore.S#27 (text+ko) ==== @@ -245,6 +245,8 @@ ldr r0, .Lcpufuncs mov lr, pc ldr pc, [r0, #CF_IDCACHE_WBINV_ALL] + mov lr, pc + ldr pc, [r0, #CF_L2CACHE_WBINV_ALL] /* * Load the cpu_reset_needs_v4_MMU_disable flag to determine if it's ==== //depot/projects/arm/src/sys/arm/arm/pmap.c#41 (text+ko) ==== @@ -151,6 +151,7 @@ #include #include #include +#include #include #include #include @@ -1196,27 +1197,104 @@ } static PMAP_INLINE void +pmap_l2cache_wbinv_range(pmap_t pm, vm_offset_t va, vm_size_t len) +{ + vm_size_t rest; + pd_entry_t *pde; + pt_entry_t *ptep; + + rest = MIN(PAGE_SIZE - (va & PAGE_MASK), len); + + while (len > 0) { + CTR4(KTR_PMAP, "pmap_l2cache_wbinv_range: pmap %p is_kernel %d " + "va 0x%08x len 0x%x ", pm, pm == pmap_kernel(), va, rest); + if (pmap_get_pde_pte(pm, va, &pde, &ptep) && l2pte_valid(*ptep)) + cpu_l2cache_wb_range(va, rest); + + len -= rest; + va += rest; + + rest = MIN(PAGE_SIZE, len); + } +} + +static PMAP_INLINE void pmap_idcache_wbinv_range(pmap_t pm, vm_offset_t va, vm_size_t len) { - if (pmap_is_current(pm)) + if (pmap_is_current(pm)) { cpu_idcache_wbinv_range(va, len); + pmap_l2cache_wbinv_range(pm, va, len); + } +} + +static PMAP_INLINE void +pmap_l2cache_wb_range(pmap_t pm, vm_offset_t va, vm_size_t len) +{ + vm_size_t rest; + pd_entry_t *pde; + pt_entry_t *ptep; + + rest = MIN(PAGE_SIZE - (va & PAGE_MASK), len); + + while (len > 0) { + CTR4(KTR_PMAP, "pmap_l2cache_wb_range: pmap %p is_kernel %d " + "va 0x%08x len 0x%x ", pm, pm == pmap_kernel(), va, rest); + if (pmap_get_pde_pte(pm, va, &pde, &ptep) && l2pte_valid(*ptep)) + cpu_l2cache_wb_range(va, rest); + + len -= rest; + va += rest; + + rest = MIN(PAGE_SIZE, len); + } } static PMAP_INLINE void -pmap_dcache_wb_range(pmap_t pm, vm_offset_t va, vm_size_t len, - boolean_t do_inv, boolean_t rd_only) +pmap_l2cache_inv_range(pmap_t pm, vm_offset_t va, vm_size_t len) +{ + vm_size_t rest; + pd_entry_t *pde; + pt_entry_t *ptep; + + rest = MIN(PAGE_SIZE - (va & PAGE_MASK), len); + + while (len > 0) { + CTR4(KTR_PMAP, "pmap_l2cache_wb_range: pmap %p is_kernel %d " + "va 0x%08x len 0x%x ", pm, pm == pmap_kernel(), va, rest); + if (pmap_get_pde_pte(pm, va, &pde, &ptep) && l2pte_valid(*ptep)) + cpu_l2cache_inv_range(va, rest); + + len -= rest; + va += rest; + + rest = MIN(PAGE_SIZE, len); + } +} + +static PMAP_INLINE void +pmap_dcache_wb_range(pmap_t pm, vm_offset_t va, vm_size_t len, boolean_t do_inv, + boolean_t rd_only) { + CTR4(KTR_PMAP, "pmap_dcache_wb_range: pmap %p is_kernel %d va 0x%08x " + "len 0x%x ", pm, pm == pmap_kernel(), va, len); + CTR2(KTR_PMAP, " do_inv %d rd_only %d", do_inv, rd_only); if (pmap_is_current(pm)) { if (do_inv) { - if (rd_only) + if (rd_only) { cpu_dcache_inv_range(va, len); - else + pmap_l2cache_inv_range(pm, va, len); + } + else { cpu_dcache_wbinv_range(va, len); + pmap_l2cache_wbinv_range(pm, va, len); + } } else - if (!rd_only) + if (!rd_only) { cpu_dcache_wb_range(va, len); + pmap_l2cache_wb_range(pm, va, len); + } } } @@ -1224,16 +1302,20 @@ pmap_idcache_wbinv_all(pmap_t pm) { - if (pmap_is_current(pm)) + if (pmap_is_current(pm)) { cpu_idcache_wbinv_all(); + cpu_l2cache_wbinv_all(); + } } static PMAP_INLINE void pmap_dcache_wbinv_all(pmap_t pm) { - if (pmap_is_current(pm)) + if (pmap_is_current(pm)) { cpu_dcache_wbinv_all(); + cpu_l2cache_wbinv_all(); + } } /* @@ -2169,6 +2251,8 @@ PTE_SYNC(pdep); cpu_dcache_wbinv_range((vm_offset_t)pdep, sizeof(*pdep)); + cpu_l2cache_wbinv_range((vm_offset_t)pdep, + sizeof(*pdep)); rv = 1; } } else { @@ -2185,6 +2269,8 @@ PTE_SYNC(ptep); cpu_dcache_wbinv_range((vm_offset_t)ptep, sizeof(*ptep)); + cpu_l2cache_wbinv_range((vm_offset_t)ptep, + sizeof(*ptep)); rv = 1; } } @@ -2337,6 +2423,7 @@ } cpu_dcache_wbinv_all(); + cpu_l2cache_wbinv_all(); cpu_tlb_flushID(); cpu_cpwait(); @@ -2373,6 +2460,7 @@ mtx_init(&l1_lru_lock, "l1 list lock", NULL, MTX_DEF); pmap_init_l1(l1, kernel_l1pt); cpu_dcache_wbinv_all(); + cpu_l2cache_wbinv_all(); virtual_avail = round_page(virtual_avail); virtual_end = lastaddr; @@ -2402,6 +2490,7 @@ struct pcb *pcb; pmap_idcache_wbinv_all(pmap); + cpu_l2cache_wbinv_all(); pmap_tlb_flushID(pmap); cpu_cpwait(); if (vector_page < KERNBASE) { @@ -2589,6 +2678,7 @@ * rarely */ cpu_dcache_wbinv_all(); + cpu_l2cache_wbinv_all(); cpu_tlb_flushD(); cpu_cpwait(); kernel_vm_end = pmap_curmaxkvaddr; @@ -2615,6 +2705,7 @@ vm_page_lock_queues(); PMAP_LOCK(pmap); cpu_idcache_wbinv_all(); + cpu_l2cache_wbinv_all(); for (pv = TAILQ_FIRST(&pmap->pm_pvlist); pv; pv = npv) { if (pv->pv_flags & PVF_WIRED) { /* The page is wired, cannot remove it now. */ @@ -2727,6 +2818,7 @@ (uint32_t) pte, opte, *pte)); if (l2pte_valid(opte)) { cpu_dcache_wbinv_range(va, PAGE_SIZE); + cpu_l2cache_wbinv_range(va, PAGE_SIZE); cpu_tlb_flushD_SE(va); cpu_cpwait(); } else { @@ -2785,6 +2877,7 @@ opte = *pte; if (l2pte_valid(opte)) { cpu_dcache_wbinv_range(va, PAGE_SIZE); + cpu_l2cache_wbinv_range(va, PAGE_SIZE); cpu_tlb_flushD_SE(va); cpu_cpwait(); *pte = 0; @@ -3053,6 +3146,9 @@ u_int flags; int flush; + CTR4(KTR_PMAP, "pmap_protect: pmap %p sva 0x%08x eva 0x%08x prot %x", + pm, sva, eva, prot); + if ((prot & VM_PROT_READ) == 0) { pmap_remove(pm, sva, eva); return; @@ -3287,9 +3383,11 @@ */ if (pmap_is_current(pmap) && (oflags & PVF_NC) == 0 && - (opte & L2_S_PROT_W) != 0 && - (prot & VM_PROT_WRITE) == 0) + (opte & L2_S_PROT_W) != 0 && + (prot & VM_PROT_WRITE) == 0) { cpu_dcache_wb_range(va, PAGE_SIZE); + pmap_l2cache_wb_range(pmap, va, PAGE_SIZE); + } } else { /* * New mapping, or changing the backing page @@ -3776,6 +3874,8 @@ if (l2pte_valid(pte) && pmap_is_current(pm)) { if (total < PMAP_REMOVE_CLEAN_LIST_SIZE) { total++; + cpu_l2cache_wbinv_range(sva, + PAGE_SIZE); if (is_exec) { cpu_idcache_wbinv_range(sva, PAGE_SIZE); @@ -3790,6 +3890,7 @@ * for a current pmap */ cpu_idcache_wbinv_all(); + cpu_l2cache_wbinv_all(); flushall = 1; total++; } @@ -3843,9 +3944,11 @@ if (off || size != PAGE_SIZE) { bzero(dstpg + off, size); cpu_dcache_wbinv_range((vm_offset_t)(dstpg + off), size); + cpu_l2cache_wbinv_range((vm_offset_t)(dstpg + off), size); } else { bzero_page((vm_offset_t)dstpg); cpu_dcache_wbinv_range((vm_offset_t)dstpg, PAGE_SIZE); + cpu_l2cache_wbinv_range((vm_offset_t)dstpg, PAGE_SIZE); } #else @@ -4140,6 +4243,8 @@ mtx_unlock(&cmtx); cpu_dcache_inv_range(csrcp, PAGE_SIZE); cpu_dcache_wbinv_range(cdstp, PAGE_SIZE); + cpu_l2cache_inv_range(csrcp, PAGE_SIZE); + cpu_l2cache_wbinv_range(cdstp, PAGE_SIZE); } #endif /* (ARM_MMU_GENERIC + ARM_MMU_SA1) != 0 */ @@ -4202,6 +4307,7 @@ #endif cpu_dcache_wbinv_all(); + cpu_l2cache_wbinv_all(); if (_arm_memcpy && PAGE_SIZE >= _min_memcpy_size && _arm_memcpy((void *)VM_PAGE_TO_PHYS(dst), (void *)VM_PAGE_TO_PHYS(src), PAGE_SIZE, IS_PHYSICAL) == 0) @@ -4211,6 +4317,7 @@ dstpg = arm_ptovirt(VM_PAGE_TO_PHYS(dst)); bcopy_page(srcpg, dstpg); cpu_dcache_wbinv_range(dstpg, PAGE_SIZE); + cpu_l2cache_wbinv_range(dstpg, PAGE_SIZE); #else pmap_copy_page_func(VM_PAGE_TO_PHYS(src), VM_PAGE_TO_PHYS(dst)); #endif ==== //depot/projects/arm/src/sys/arm/arm/swtch.S#11 (text+ko) ==== @@ -143,6 +143,8 @@ ldr r9, .Lcpufuncs mov lr, pc ldr pc, [r9, #CF_IDCACHE_WBINV_ALL] + mov lr, pc + ldr pc, [r9, #CF_L2CACHE_WBINV_ALL] ldr r0, [r7, #(PCB_PL1VEC)] ldr r1, [r7, #(PCB_DACR)] /* @@ -172,6 +174,8 @@ movne r1, #4 movne lr, pc ldrne pc, [r9, #CF_DCACHE_WB_RANGE] + movne lr, pc + ldrne pc, [r9, #CF_L2CACHE_WB_RANGE] #endif /* PMAP_INCLUDE_PTE_SYNC */ /* @@ -328,6 +332,8 @@ ldr r1, .Lcpufuncs mov lr, pc ldr pc, [r1, #CF_IDCACHE_WBINV_ALL] + mov lr, pc + ldr pc, [r1, #CF_L2CACHE_WBINV_ALL] .Lcs_cache_purge_skipped: /* rem: r6 = lock */ /* rem: r9 = new PCB */ @@ -360,6 +366,8 @@ mov r1, #4 mov lr, pc ldr pc, [r2, #CF_DCACHE_WB_RANGE] + mov lr, pc + ldr pc, [r2, #CF_L2CACHE_WB_RANGE] .Lcs_same_vector: #endif /* PMAP_INCLUDE_PTE_SYNC */ From owner-p4-projects@FreeBSD.ORG Tue Sep 9 16:07:51 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 310D4106566C; Tue, 9 Sep 2008 16:07: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 E9656106567D for ; Tue, 9 Sep 2008 16:07:50 +0000 (UTC) (envelope-from raj@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id D83E18FC12 for ; Tue, 9 Sep 2008 16:07:50 +0000 (UTC) (envelope-from raj@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 m89G7oiC072014 for ; Tue, 9 Sep 2008 16:07:50 GMT (envelope-from raj@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m89G7o2N072012 for perforce@freebsd.org; Tue, 9 Sep 2008 16:07:50 GMT (envelope-from raj@freebsd.org) Date: Tue, 9 Sep 2008 16:07:50 GMT Message-Id: <200809091607.m89G7o2N072012@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to raj@freebsd.org using -f From: Rafal Jaworowski To: Perforce Change Reviews Cc: Subject: PERFORCE change 149482 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, 09 Sep 2008 16:07:51 -0000 http://perforce.freebsd.org/chv.cgi?CH=149482 Change 149482 by raj@raj_mimi on 2008/09/09 16:06:53 Introduce support for Marvell Kirkwood family of SOCs, based on the Feroceon/Shiva 88FR131 core. The new kernel config file is DB-88F6XXX. The code was tested on 88F6281 chips with the following evaluation systems: DB-88F6281, RD-88F6281. 1. build the kernel: make buildkernel TARGET_ARCH=arm KERNCONF=DB-88F6XXX 2. run from U-Boot: >> tftp 200000 mv6281/kernel.bin >> go 200000 Obtained from: Marvell, Semihalf Affected files ... .. //depot/projects/arm/src/sys/arm/arm/elf_trampoline.c#20 edit .. //depot/projects/arm/src/sys/arm/conf/DB-88F6XXX#1 add .. //depot/projects/arm/src/sys/arm/include/intr.h#9 edit .. //depot/projects/arm/src/sys/arm/mv/kirkwood/db88f6xxx.c#1 add .. //depot/projects/arm/src/sys/arm/mv/kirkwood/files.db88f6xxx#1 add .. //depot/projects/arm/src/sys/arm/mv/kirkwood/kirkwood.c#1 add .. //depot/projects/arm/src/sys/arm/mv/kirkwood/std.db88f6xxx#1 add .. //depot/projects/arm/src/sys/conf/Makefile.arm#26 edit .. //depot/projects/arm/src/sys/conf/options.arm#29 edit Differences ... ==== //depot/projects/arm/src/sys/arm/arm/elf_trampoline.c#20 (text+ko) ==== @@ -73,6 +73,8 @@ #endif #ifdef CPU_XSCALE_81342 #define cpu_l2cache_wbinv_all xscalec3_l2cache_purge +#elif defined(SOC_MV_KIRKWOOD) || defined(SOC_MV_DISCOVERY) +#define cpu_l2cache_wbinv_all feroceon_l2cache_wbinv_all #else #define cpu_l2cache_wbinv_all() #endif ==== //depot/projects/arm/src/sys/arm/include/intr.h#9 (text+ko) ==== @@ -44,7 +44,9 @@ #elif defined(CPU_XSCALE_PXA2X0) #include #define NIRQ IRQ_GPIO_MAX -#elif defined(CPU_ARM9) +#elif defined(SOC_MV_DISCOVERY) +#define NIRQ 96 +#elif defined(CPU_ARM9) || defined(SOC_MV_KIRKWOOD) #define NIRQ 64 #else #define NIRQ 32 ==== //depot/projects/arm/src/sys/conf/Makefile.arm#26 (text+ko) ==== @@ -75,7 +75,8 @@ $S/$M/$M/cpufunc_asm_arm8.S $S/$M/$M/cpufunc_asm_arm9.S \ $S/$M/$M/cpufunc_asm_sa1.S $S/$M/$M/cpufunc_asm_arm10.S \ $S/$M/$M/cpufunc_asm_xscale.S $S/$M/$M/cpufunc_asm.S \ - $S/$M/$M/cpufunc_asm_xscale_c3.S $S/$M/$M/cpufunc_asm_armv5_ec.S + $S/$M/$M/cpufunc_asm_xscale_c3.S $S/$M/$M/cpufunc_asm_armv5_ec.S \ + $S/$M/$M/cpufunc_asm_feroceon.S KERNEL_EXTRA=trampoline KERNEL_EXTRA_INSTALL=kernel.gz.tramp trampoline: ${KERNEL_KO}.tramp ==== //depot/projects/arm/src/sys/conf/options.arm#29 (text+ko) ==== @@ -23,6 +23,7 @@ LOADERRAMADDR opt_global.h PHYSADDR opt_global.h SKYEYE_WORKAROUNDS opt_global.h +SOC_MV_KIRKWOOD opt_global.h SOC_MV_ORION opt_global.h STARTUP_PAGETABLE_ADDR opt_global.h XSCALE_CACHE_READ_WRITE_ALLOCATE opt_global.h From owner-p4-projects@FreeBSD.ORG Tue Sep 9 17:32:23 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 137C31065673; Tue, 9 Sep 2008 17:32: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 B40731065672 for ; Tue, 9 Sep 2008 17:32:22 +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 A20788FC18 for ; Tue, 9 Sep 2008 17:32:22 +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 m89HWMFm001131 for ; Tue, 9 Sep 2008 17:32:22 GMT (envelope-from ed@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m89HWMjU001060 for perforce@freebsd.org; Tue, 9 Sep 2008 17:32:22 GMT (envelope-from ed@FreeBSD.org) Date: Tue, 9 Sep 2008 17:32:22 GMT Message-Id: <200809091732.m89HWMjU001060@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 149485 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, 09 Sep 2008 17:32:23 -0000 http://perforce.freebsd.org/chv.cgi?CH=149485 Change 149485 by ed@ed_dull on 2008/09/09 17:32:04 IFC Peter's si(4) fixes. Affected files ... .. //depot/projects/mpsafetty/bin/cp/utils.c#3 integrate .. //depot/projects/mpsafetty/contrib/ntp/libparse/clk_rawdcf.c#3 integrate .. //depot/projects/mpsafetty/include/rpc/svc_auth.h#2 integrate .. //depot/projects/mpsafetty/lib/libarchive/archive_write_disk.c#6 integrate .. //depot/projects/mpsafetty/lib/libarchive/test/Makefile#3 integrate .. //depot/projects/mpsafetty/lib/libarchive/test/test_read_format_gtar_sparse.c#3 integrate .. //depot/projects/mpsafetty/lib/libarchive/test/test_write_disk_secure.c#3 integrate .. //depot/projects/mpsafetty/lib/libc/gen/arc4random.c#5 integrate .. //depot/projects/mpsafetty/lib/libc/rpc/svc.c#3 integrate .. //depot/projects/mpsafetty/lib/libc/rpc/svc_auth.c#3 integrate .. //depot/projects/mpsafetty/lib/libgeom/geom_util.c#2 integrate .. //depot/projects/mpsafetty/lib/libgeom/libgeom.3#2 integrate .. //depot/projects/mpsafetty/lib/libgeom/libgeom.h#2 integrate .. //depot/projects/mpsafetty/release/doc/en_US.ISO8859-1/relnotes/article.sgml#4 integrate .. //depot/projects/mpsafetty/sbin/fdisk/fdisk.c#3 integrate .. //depot/projects/mpsafetty/sbin/ipfw/ipfw2.c#2 integrate .. //depot/projects/mpsafetty/sbin/md5/md5.1#2 integrate .. //depot/projects/mpsafetty/sbin/natd/natd.c#2 integrate .. //depot/projects/mpsafetty/share/man/man4/if_bridge.4#3 integrate .. //depot/projects/mpsafetty/share/man/man4/tap.4#2 integrate .. //depot/projects/mpsafetty/share/man/man9/bus_dma.9#2 integrate .. //depot/projects/mpsafetty/sys/amd64/amd64/cpu_switch.S#4 integrate .. //depot/projects/mpsafetty/sys/amd64/amd64/genassym.c#3 integrate .. //depot/projects/mpsafetty/sys/amd64/amd64/machdep.c#4 integrate .. //depot/projects/mpsafetty/sys/amd64/amd64/mp_machdep.c#3 integrate .. //depot/projects/mpsafetty/sys/amd64/amd64/trap.c#2 integrate .. //depot/projects/mpsafetty/sys/amd64/include/pcb.h#3 integrate .. //depot/projects/mpsafetty/sys/amd64/include/pcpu.h#3 integrate .. //depot/projects/mpsafetty/sys/amd64/include/segments.h#2 integrate .. //depot/projects/mpsafetty/sys/amd64/linux32/linux32_genassym.c#2 integrate .. //depot/projects/mpsafetty/sys/amd64/linux32/linux32_locore.s#2 integrate .. //depot/projects/mpsafetty/sys/amd64/linux32/linux32_machdep.c#3 integrate .. //depot/projects/mpsafetty/sys/arm/conf/KB920X#5 integrate .. //depot/projects/mpsafetty/sys/arm/conf/NSLU#2 integrate .. //depot/projects/mpsafetty/sys/boot/sparc64/loader/main.c#6 integrate .. //depot/projects/mpsafetty/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c#3 integrate .. //depot/projects/mpsafetty/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_znode.c#3 integrate .. //depot/projects/mpsafetty/sys/compat/linux/linux_file.c#2 integrate .. //depot/projects/mpsafetty/sys/compat/linux/linux_socket.c#3 integrate .. //depot/projects/mpsafetty/sys/conf/NOTES#9 integrate .. //depot/projects/mpsafetty/sys/dev/acpi_support/acpi_fujitsu.c#2 integrate .. //depot/projects/mpsafetty/sys/dev/asmc/asmc.c#2 integrate .. //depot/projects/mpsafetty/sys/dev/asmc/asmcvar.h#2 integrate .. //depot/projects/mpsafetty/sys/dev/ath/if_athvar.h#2 integrate .. //depot/projects/mpsafetty/sys/dev/bge/if_bge.c#2 integrate .. //depot/projects/mpsafetty/sys/dev/cxgb/cxgb_adapter.h#5 integrate .. //depot/projects/mpsafetty/sys/dev/cxgb/cxgb_main.c#7 integrate .. //depot/projects/mpsafetty/sys/dev/cxgb/cxgb_sge.c#6 integrate .. //depot/projects/mpsafetty/sys/dev/drm/ati_pcigart.c#3 integrate .. //depot/projects/mpsafetty/sys/dev/drm/drm_bufs.c#3 integrate .. //depot/projects/mpsafetty/sys/dev/drm/drm_pci.c#3 integrate .. //depot/projects/mpsafetty/sys/dev/drm/i915_dma.c#3 integrate .. //depot/projects/mpsafetty/sys/dev/drm/mach64_dma.c#3 integrate .. //depot/projects/mpsafetty/sys/dev/esp/esp_sbus.c#3 integrate .. //depot/projects/mpsafetty/sys/dev/esp/ncr53c9x.c#3 integrate .. //depot/projects/mpsafetty/sys/dev/esp/ncr53c9xreg.h#2 integrate .. //depot/projects/mpsafetty/sys/dev/esp/ncr53c9xvar.h#3 integrate .. //depot/projects/mpsafetty/sys/dev/ic/i8251.h#2 integrate .. //depot/projects/mpsafetty/sys/dev/ic/i8255.h#1 branch .. //depot/projects/mpsafetty/sys/dev/iicbus/ds133x.c#2 integrate .. //depot/projects/mpsafetty/sys/dev/iicbus/ds1672.c#2 integrate .. //depot/projects/mpsafetty/sys/dev/jme/if_jme.c#4 integrate .. //depot/projects/mpsafetty/sys/dev/jme/if_jmereg.h#2 integrate .. //depot/projects/mpsafetty/sys/dev/le/if_le_ledma.c#2 integrate .. //depot/projects/mpsafetty/sys/dev/si/si.c#3 integrate .. //depot/projects/mpsafetty/sys/dev/sound/pci/hda/hdac.c#3 integrate .. //depot/projects/mpsafetty/sys/dev/uart/uart_cpu_pc98.c#3 integrate .. //depot/projects/mpsafetty/sys/geom/geom_dev.c#2 integrate .. //depot/projects/mpsafetty/sys/i386/isa/isa.c#2 integrate .. //depot/projects/mpsafetty/sys/i386/linux/linux_genassym.c#2 integrate .. //depot/projects/mpsafetty/sys/i386/linux/linux_locore.s#2 integrate .. //depot/projects/mpsafetty/sys/kern/subr_sleepqueue.c#4 integrate .. //depot/projects/mpsafetty/sys/kern/subr_turnstile.c#2 integrate .. //depot/projects/mpsafetty/sys/kern/uipc_sockbuf.c#2 integrate .. //depot/projects/mpsafetty/sys/net/if_bridge.c#4 integrate .. //depot/projects/mpsafetty/sys/net/if_tap.c#2 integrate .. //depot/projects/mpsafetty/sys/net/if_tap.h#2 integrate .. //depot/projects/mpsafetty/sys/net80211/ieee80211.h#3 integrate .. //depot/projects/mpsafetty/sys/net80211/ieee80211_ddb.c#3 integrate .. //depot/projects/mpsafetty/sys/net80211/ieee80211_freebsd.h#2 integrate .. //depot/projects/mpsafetty/sys/net80211/ieee80211_ht.c#3 integrate .. //depot/projects/mpsafetty/sys/net80211/ieee80211_ht.h#2 integrate .. //depot/projects/mpsafetty/sys/net80211/ieee80211_ioctl.c#3 integrate .. //depot/projects/mpsafetty/sys/net80211/ieee80211_ioctl.h#2 integrate .. //depot/projects/mpsafetty/sys/net80211/ieee80211_node.c#2 integrate .. //depot/projects/mpsafetty/sys/net80211/ieee80211_node.h#2 integrate .. //depot/projects/mpsafetty/sys/net80211/ieee80211_phy.c#2 integrate .. //depot/projects/mpsafetty/sys/net80211/ieee80211_sta.c#2 integrate .. //depot/projects/mpsafetty/sys/netinet/ip_fw.h#2 integrate .. //depot/projects/mpsafetty/sys/netinet/ip_fw2.c#7 integrate .. //depot/projects/mpsafetty/sys/netinet/tcp_debug.c#2 integrate .. //depot/projects/mpsafetty/sys/netinet/tcp_input.c#5 integrate .. //depot/projects/mpsafetty/sys/netinet/tcp_output.c#5 integrate .. //depot/projects/mpsafetty/sys/netinet/tcp_subr.c#4 integrate .. //depot/projects/mpsafetty/sys/netinet/tcp_var.h#3 integrate .. //depot/projects/mpsafetty/sys/pc98/cbus/sio.c#2 integrate .. //depot/projects/mpsafetty/sys/pc98/include/bus.h#2 integrate .. //depot/projects/mpsafetty/sys/pc98/pc98/busiosubr.c#2 integrate .. //depot/projects/mpsafetty/sys/sparc64/include/asi.h#3 integrate .. //depot/projects/mpsafetty/sys/sparc64/include/tlb.h#2 integrate .. //depot/projects/mpsafetty/sys/sparc64/sbus/dma_sbus.c#3 integrate .. //depot/projects/mpsafetty/sys/sparc64/sbus/lsi64854.c#2 integrate .. //depot/projects/mpsafetty/sys/sparc64/sbus/lsi64854var.h#2 integrate .. //depot/projects/mpsafetty/sys/sparc64/sparc64/cheetah.c#5 integrate .. //depot/projects/mpsafetty/sys/sparc64/sparc64/exception.S#6 integrate .. //depot/projects/mpsafetty/sys/sparc64/sparc64/genassym.c#4 integrate .. //depot/projects/mpsafetty/sys/sparc64/sparc64/mp_exception.S#3 integrate .. //depot/projects/mpsafetty/sys/sparc64/sparc64/pmap.c#4 integrate .. //depot/projects/mpsafetty/sys/sparc64/sparc64/support.S#3 integrate .. //depot/projects/mpsafetty/sys/sparc64/sparc64/swtch.S#3 integrate .. //depot/projects/mpsafetty/sys/sparc64/sparc64/tlb.c#3 integrate .. //depot/projects/mpsafetty/sys/sys/disk.h#2 integrate .. //depot/projects/mpsafetty/sys/sys/param.h#8 integrate .. //depot/projects/mpsafetty/sys/sys/termios.h#8 integrate .. //depot/projects/mpsafetty/tools/tools/nanobsd/nanobsd.sh#7 integrate .. //depot/projects/mpsafetty/usr.sbin/boot0cfg/boot0cfg.c#2 integrate .. //depot/projects/mpsafetty/usr.sbin/setfib/setfib.c#3 integrate Differences ... ==== //depot/projects/mpsafetty/bin/cp/utils.c#3 (text+ko) ==== @@ -33,7 +33,7 @@ #endif #endif /* not lint */ #include -__FBSDID("$FreeBSD: src/bin/cp/utils.c,v 1.54 2008/08/07 07:29:26 trasz Exp $"); +__FBSDID("$FreeBSD: src/bin/cp/utils.c,v 1.55 2008/09/09 12:31:42 trasz Exp $"); #include #include @@ -224,7 +224,6 @@ rval = 1; if (pflag && preserve_fd_acls(from_fd, to_fd) != 0) rval = 1; - (void)close(from_fd); if (close(to_fd)) { warn("%s", to.p_path); rval = 1; ==== //depot/projects/mpsafetty/contrib/ntp/libparse/clk_rawdcf.c#3 (text+ko) ==== @@ -229,7 +229,7 @@ unsigned char *c = dcfprm->zerobits; int i; - parseprintf(DD_RAWDCF,("parse: convert_rawdcf: \"%s\"\n", buffer)); + parseprintf(DD_RAWDCF,("parse: convert_rawdcf: \"%.*s\"\n", size, buffer)); if (size < 57) { @@ -320,7 +320,7 @@ * bad format - not for us */ #ifndef PARSEKERNEL - msyslog(LOG_ERR, "parse: convert_rawdcf: parity check FAILED for \"%s\"\n", buffer); + msyslog(LOG_ERR, "parse: convert_rawdcf: parity check FAILED for \"%.*s\"\n", size, buffer); #endif return CVT_FAIL|CVT_BADFMT; } ==== //depot/projects/mpsafetty/include/rpc/svc_auth.h#2 (text+ko) ==== @@ -30,7 +30,7 @@ * * from: @(#)svc_auth.h 1.6 86/07/16 SMI * @(#)svc_auth.h 2.1 88/07/29 4.0 RPCSRC - * $FreeBSD: src/include/rpc/svc_auth.h,v 1.14 2002/03/23 17:24:55 imp Exp $ + * $FreeBSD: src/include/rpc/svc_auth.h,v 1.15 2008/09/09 14:15:55 dfr Exp $ */ /* @@ -46,6 +46,8 @@ * Server side authenticator */ __BEGIN_DECLS +extern struct svc_auth_ops svc_auth_null_ops; + extern enum auth_stat _authenticate(struct svc_req *, struct rpc_msg *); extern int svc_auth_reg(int, enum auth_stat (*)(struct svc_req *, struct rpc_msg *)); ==== //depot/projects/mpsafetty/lib/libarchive/archive_write_disk.c#6 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include "archive_platform.h" -__FBSDID("$FreeBSD: src/lib/libarchive/archive_write_disk.c,v 1.35 2008/09/05 06:13:11 kientzle Exp $"); +__FBSDID("$FreeBSD: src/lib/libarchive/archive_write_disk.c,v 1.36 2008/09/07 05:22:33 kientzle Exp $"); #ifdef HAVE_SYS_TYPES_H #include @@ -907,14 +907,26 @@ * We know something is in the way, but we don't know what; * we need to find out before we go any further. */ - if (lstat(a->name, &a->st) != 0) { + int r = 0; + /* + * The SECURE_SYMLINK logic has already removed a + * symlink to a dir if the client wants that. So + * follow the symlink if we're creating a dir. + */ + if (S_ISDIR(a->mode)) + r = stat(a->name, &a->st); + /* + * If it's not a dir (or it's a broken symlink), + * then don't follow it. + */ + if (r != 0 || !S_ISDIR(a->mode)) + r = lstat(a->name, &a->st); + if (r != 0) { archive_set_error(&a->archive, errno, "Can't stat existing object"); return (ARCHIVE_WARN); } - /* TODO: if it's a symlink... */ - /* * NO_OVERWRITE_NEWER doesn't apply to directories. */ ==== //depot/projects/mpsafetty/lib/libarchive/test/Makefile#3 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/lib/libarchive/test/Makefile,v 1.24 2008/08/25 06:08:22 kientzle Exp $ +# $FreeBSD: src/lib/libarchive/test/Makefile,v 1.25 2008/09/08 00:58:12 kientzle Exp $ # Where to find the libarchive sources LA_SRCDIR=${.CURDIR}/.. @@ -89,7 +89,7 @@ # Uncomment to link against dmalloc #LDADD+= -L/usr/local/lib -ldmalloc #CFLAGS+= -I/usr/local/include -DUSE_DMALLOC -#WARNS=6 +WARNS=6 # Build libarchive_test and run it. check test: libarchive_test ==== //depot/projects/mpsafetty/lib/libarchive/test/test_read_format_gtar_sparse.c#3 (text+ko) ==== @@ -23,7 +23,7 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ #include "test.h" -__FBSDID("$FreeBSD: src/lib/libarchive/test/test_read_format_gtar_sparse.c,v 1.9 2008/09/01 05:38:33 kientzle Exp $"); +__FBSDID("$FreeBSD: src/lib/libarchive/test/test_read_format_gtar_sparse.c,v 1.10 2008/09/08 00:58:12 kientzle Exp $"); struct contents { @@ -187,6 +187,7 @@ struct contents expect; /* data, size, offset of block read from archive. */ struct contents actual; + const void *p; struct archive *a; extract_reference_file(name); @@ -206,10 +207,10 @@ expect = *cts++; while (0 == (err = archive_read_data_block(a, - (const void **)&actual.d, - &actual.s, &actual.o))) { + &p, &actual.s, &actual.o))) { + actual.d = p; while (actual.s > 0) { - char c = *(const char *)actual.d; + char c = *actual.d; if(actual.o < expect.o) { /* * Any byte before the expected ==== //depot/projects/mpsafetty/lib/libarchive/test/test_write_disk_secure.c#3 (text+ko) ==== @@ -23,7 +23,7 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ #include "test.h" -__FBSDID("$FreeBSD: src/lib/libarchive/test/test_write_disk_secure.c,v 1.5 2008/09/01 05:38:33 kientzle Exp $"); +__FBSDID("$FreeBSD: src/lib/libarchive/test/test_write_disk_secure.c,v 1.8 2008/09/07 23:59:27 kientzle Exp $"); #define UMASK 022 @@ -105,6 +105,80 @@ archive_entry_free(ae); assert(0 == archive_write_finish_entry(a)); + /* + * Without security checks, extracting a dir over a link to a + * dir should follow the link. + */ + /* Create a symlink to a dir. */ + assert((ae = archive_entry_new()) != NULL); + archive_entry_copy_pathname(ae, "link_to_dir3"); + archive_entry_set_mode(ae, S_IFLNK | 0777); + archive_entry_set_symlink(ae, "dir"); + archive_write_disk_set_options(a, 0); + assert(0 == archive_write_header(a, ae)); + assert(0 == archive_write_finish_entry(a)); + /* Extract a dir whose name matches the symlink. */ + assert(archive_entry_clear(ae) != NULL); + archive_entry_copy_pathname(ae, "link_to_dir3"); + archive_entry_set_mode(ae, S_IFDIR | 0777); + assert(0 == archive_write_header(a, ae)); + assert(0 == archive_write_finish_entry(a)); + /* Verify link was followed. */ + assertEqualInt(0, lstat("link_to_dir3", &st)); + assert(S_ISLNK(st.st_mode)); + archive_entry_free(ae); + + /* + * As above, but a broken link, so the link should get replaced. + */ + /* Create a symlink to a dir. */ + assert((ae = archive_entry_new()) != NULL); + archive_entry_copy_pathname(ae, "link_to_dir4"); + archive_entry_set_mode(ae, S_IFLNK | 0777); + archive_entry_set_symlink(ae, "nonexistent_dir"); + archive_write_disk_set_options(a, 0); + assert(0 == archive_write_header(a, ae)); + assert(0 == archive_write_finish_entry(a)); + /* Extract a dir whose name matches the symlink. */ + assert(archive_entry_clear(ae) != NULL); + archive_entry_copy_pathname(ae, "link_to_dir4"); + archive_entry_set_mode(ae, S_IFDIR | 0777); + assert(0 == archive_write_header(a, ae)); + assert(0 == archive_write_finish_entry(a)); + /* Verify link was replaced. */ + assertEqualInt(0, lstat("link_to_dir4", &st)); + assert(S_ISDIR(st.st_mode)); + archive_entry_free(ae); + + /* + * As above, but a link to a non-dir, so the link should get replaced. + */ + /* Create a regular file and a symlink to it */ + assert((ae = archive_entry_new()) != NULL); + archive_entry_copy_pathname(ae, "non_dir"); + archive_entry_set_mode(ae, S_IFREG | 0777); + archive_write_disk_set_options(a, 0); + assert(0 == archive_write_header(a, ae)); + assert(0 == archive_write_finish_entry(a)); + /* Create symlink to the file. */ + archive_entry_copy_pathname(ae, "link_to_dir5"); + archive_entry_set_mode(ae, S_IFLNK | 0777); + archive_entry_set_symlink(ae, "non_dir"); + archive_write_disk_set_options(a, 0); + assert(0 == archive_write_header(a, ae)); + assert(0 == archive_write_finish_entry(a)); + /* Extract a dir whose name matches the symlink. */ + assert(archive_entry_clear(ae) != NULL); + archive_entry_copy_pathname(ae, "link_to_dir5"); + archive_entry_set_mode(ae, S_IFDIR | 0777); + assert(0 == archive_write_header(a, ae)); + assert(0 == archive_write_finish_entry(a)); + /* Verify link was replaced. */ + assertEqualInt(0, lstat("link_to_dir5", &st)); + assert(S_ISDIR(st.st_mode)); + archive_entry_free(ae); + + #if ARCHIVE_VERSION_NUMBER < 2000000 archive_write_finish(a); #else ==== //depot/projects/mpsafetty/lib/libc/gen/arc4random.c#5 (text+ko) ==== @@ -33,7 +33,7 @@ */ #include -__FBSDID("$FreeBSD: src/lib/libc/gen/arc4random.c,v 1.24 2008/08/03 20:15:22 ache Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/gen/arc4random.c,v 1.25 2008/09/09 09:46:36 ache Exp $"); #include "namespace.h" #include @@ -54,7 +54,7 @@ static pthread_mutex_t arc4random_mtx = PTHREAD_MUTEX_INITIALIZER; -#define RANDOMDEV "/dev/urandom" +#define RANDOMDEV "/dev/random" #define KEYSIZE 128 #define THREAD_LOCK() \ do { \ @@ -193,6 +193,7 @@ THREAD_LOCK(); arc4_check_init(); arc4_stir(); + rs_stired = 1; THREAD_UNLOCK(); } ==== //depot/projects/mpsafetty/lib/libc/rpc/svc.c#3 (text+ko) ==== @@ -34,7 +34,7 @@ static char *sccsid = "@(#)svc.c 2.4 88/08/11 4.0 RPCSRC"; #endif #include -__FBSDID("$FreeBSD: src/lib/libc/rpc/svc.c,v 1.25 2008/08/06 14:02:05 dfr Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/rpc/svc.c,v 1.26 2008/09/09 14:15:55 dfr Exp $"); /* * svc.c, Server-side remote procedure call interface. @@ -569,6 +569,7 @@ ext = mem_alloc(sizeof(SVCXPRT_EXT)); memset(ext, 0, sizeof(SVCXPRT_EXT)); xprt->xp_p3 = ext; + ext->xp_auth.svc_ah_ops = &svc_auth_null_ops; return (xprt); } ==== //depot/projects/mpsafetty/lib/libc/rpc/svc_auth.c#3 (text+ko) ==== @@ -37,7 +37,7 @@ static char sccsid[] = "@(#)svc_auth.c 1.26 89/02/07 Copyr 1984 Sun Micro"; #endif #include -__FBSDID("$FreeBSD: src/lib/libc/rpc/svc_auth.c,v 1.14 2008/08/06 14:02:05 dfr Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/rpc/svc_auth.c,v 1.15 2008/09/09 14:15:55 dfr Exp $"); /* * svc_auth.c, Server-side rpc authenticator interface. @@ -75,7 +75,7 @@ }; static struct authsvc *Auths = NULL; -static struct svc_auth_ops svc_auth_null_ops; +struct svc_auth_ops svc_auth_null_ops; /* * The call rpc message, msg has been obtained from the wire. The msg contains @@ -162,7 +162,7 @@ return (xdr_func(xdrs, xdr_ptr)); } -static struct svc_auth_ops svc_auth_null_ops = { +struct svc_auth_ops svc_auth_null_ops = { svcauth_null_wrap, svcauth_null_wrap, }; ==== //depot/projects/mpsafetty/lib/libgeom/geom_util.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/lib/libgeom/geom_util.c,v 1.2 2008/05/20 11:45:05 pjd Exp $"); +__FBSDID("$FreeBSD: src/lib/libgeom/geom_util.c,v 1.3 2008/09/07 13:54:57 lulf Exp $"); #include #include @@ -42,29 +42,22 @@ #include +static char *g_device_path_open(const char *, int *, int); + /* * Open the given provider and at least check if this is a block device. */ int g_open(const char *name, int dowrite) { - char path[MAXPATHLEN]; + char *path; int fd; - if (name[0] == '/') - strlcpy(path, name, sizeof(path)); - else - snprintf(path, sizeof(path), "%s%s", _PATH_DEV, name); - - fd = open(path, dowrite ? O_RDWR : O_RDONLY); + path = g_device_path_open(name, &fd, dowrite); + if (path != NULL) + free(path); if (fd == -1) return (-1); - /* Let try to get sectorsize, which will prove it is a GEOM provider. */ - if (g_sectorsize(fd) == -1) { - close(fd); - errno = EFTYPE; - return (-1); - } return (fd); } @@ -121,6 +114,19 @@ } /* + * Return the correct provider name. + */ +char * +g_providername(int fd) +{ + char name[MAXPATHLEN]; + + if (g_ioctl_arg(fd, DIOCGPROVIDERNAME, name) == -1) + return (NULL); + return (strdup(name)); +} + +/* * Call BIO_FLUSH for the given provider. */ int @@ -234,3 +240,77 @@ } return (fd); } + +/* + * Return the device path device given a partial or full path to its node. + * A pointer can be provided, which will be set to an opened file descriptor of + * not NULL. + */ +static char * +g_device_path_open(const char *devpath, int *fdp, int dowrite) +{ + char *path; + int fd; + + /* Make sure that we can fail. */ + if (fdp != NULL) + *fdp = -1; + /* Use the device node if we're able to open it. */ + do { + fd = open(devpath, dowrite ? O_RDWR : O_RDONLY); + if (fd == -1) + break; + /* + * Let try to get sectorsize, which will prove it is a GEOM + * provider. + */ + if (g_sectorsize(fd) == -1) { + close(fd); + errno = EFTYPE; + return (NULL); + } + if ((path = strdup(devpath)) == NULL) { + close(fd); + return (NULL); + } + if (fdp != NULL) + *fdp = fd; + else + close(fd); + return (path); + } while (0); + + /* If we're not given an absolute path, assume /dev/ prefix. */ + if (*devpath != '/') { + asprintf(&path, "%s%s", _PATH_DEV, devpath); + if (path == NULL) + return (NULL); + fd = open(path, dowrite ? O_RDWR : O_RDONLY); + if (fd == -1) { + free(path); + return (NULL); + } + /* + * Let try to get sectorsize, which will prove it is a GEOM + * provider. + */ + if (g_sectorsize(fd) == -1) { + free(path); + close(fd); + errno = EFTYPE; + return (NULL); + } + if (fdp != NULL) + *fdp = fd; + else + close(fd); + return (path); + } + return (NULL); +} + +char * +g_device_path(const char *devpath) +{ + return (g_device_path_open(devpath, NULL, 0)); +} ==== //depot/projects/mpsafetty/lib/libgeom/libgeom.3#2 (text+ko) ==== @@ -26,9 +26,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/lib/libgeom/libgeom.3,v 1.10 2008/06/13 21:49:21 thompsa Exp $ +.\" $FreeBSD: src/lib/libgeom/libgeom.3,v 1.11 2008/09/08 06:27:00 lulf Exp $ .\" -.Dd May 6, 2007 +.Dd September 8, 2008 .Dt LIBGEOM 3 .Os .Sh NAME @@ -52,9 +52,11 @@ .Nm g_sectorsize , .Nm g_flush , .Nm g_delete , +.Nm g_device_path , .Nm g_get_ident , .Nm g_get_name , -.Nm g_open_by_ident +.Nm g_open_by_ident , +.Nm g_providername .Nd userland API library for kernel GEOM subsystem .Sh LIBRARY .Lb libgeom @@ -103,12 +105,16 @@ .Fn g_flush "int fd" .Ft int .Fn g_delete "int fd" "off_t offset" "off_t length" +.Ft "char *" +.Fn g_device_path "const char *devpath" .Ft int .Fn g_get_ident "int fd" "char *ident" "size_t size" .Ft int .Fn g_get_name "const char *ident" "char *name" "size_t size" .Ft int .Fn g_open_by_ident "const char *ident" "int dowrite" "char *name" "size_t size" +.Ft "char *" +.Fn g_providername "int fd" .Sh DESCRIPTION The .Nm geom @@ -301,6 +307,13 @@ function tells the provider that the given data range is no longer used. .Pp The +.Fn g_device_path +function returns the full path to a provider given a partial or full path to the +device node. +If the device can not be found or is not a valid geom provider, NULL is +returned. +.Pp +The .Fn g_get_ident function returns provider's fixed and unique identifier. The @@ -326,7 +339,17 @@ .Dv NULL , the function will store provider's name there. .Pp -All functions return value greater than or equal to +The +.Fn g_providername +function returns the provider name of an open file descriptor. +If the file descriptor does not point to a valid geom provider, NULL is +returned. +.Pp +All functions except +.Fn g_providername +and +.Fn g_device_path +return a value greater than or equal to .Va 0 on success or .Va -1 ==== //depot/projects/mpsafetty/lib/libgeom/libgeom.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/lib/libgeom/libgeom.h,v 1.12 2007/05/06 10:00:27 des Exp $ + * $FreeBSD: src/lib/libgeom/libgeom.h,v 1.13 2008/09/07 13:54:57 lulf Exp $ */ #ifndef _LIBGEOM_H_ #define _LIBGEOM_H_ @@ -154,6 +154,8 @@ int g_get_ident(int, char *, size_t); int g_get_name(const char *, char *, size_t); int g_open_by_ident(const char *, int, char *, size_t); +char *g_device_path(const char *); +char *g_providername(int); __END_DECLS ==== //depot/projects/mpsafetty/release/doc/en_US.ISO8859-1/relnotes/article.sgml#4 (text+ko) ==== @@ -17,7 +17,7 @@ The &os; Project - $FreeBSD: src/release/doc/en_US.ISO8859-1/relnotes/article.sgml,v 1.1092 2008/07/29 04:23:18 bmah Exp $ + $FreeBSD: src/release/doc/en_US.ISO8859-1/relnotes/article.sgml,v 1.1093 2008/09/08 17:13:18 gshapiro Exp $ 2000 @@ -449,7 +449,7 @@ Figwort release to the Hydrangea release. sendmail has been updated from - 8.14.1 to 8.14.2. + 8.14.1 to 8.14.3. The timezone database has been updated from the tzdata2007h release to ==== //depot/projects/mpsafetty/sbin/fdisk/fdisk.c#3 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sbin/fdisk/fdisk.c,v 1.85 2008/07/31 00:55:29 obrien Exp $"); +__FBSDID("$FreeBSD: src/sbin/fdisk/fdisk.c,v 1.86 2008/09/07 13:58:35 lulf Exp $"); #include #include @@ -245,7 +245,6 @@ int main(int argc, char *argv[]) { - struct stat sb; int c, i; int partition = -1; struct dos_partition *partp; @@ -307,18 +306,9 @@ if (argc == 0) { disk = get_rootdisk(); } else { - if (stat(argv[0], &sb) == 0) { - /* OK, full pathname given */ - disk = argv[0]; - } else if (errno == ENOENT && argv[0][0] != '/') { - /* Try prepending "/dev" */ - asprintf(&disk, "%s%s", _PATH_DEV, argv[0]); - if (disk == NULL) - errx(1, "out of memory"); - } else { - /* other stat error, let it fail below */ - disk = argv[0]; - } + disk = g_device_path(argv[0]); + if (disk == NULL) + err(1, "unable to get correct path for %s\n", argv[0]); } if (open_disk(u_flag) < 0) err(1, "cannot open disk %s", disk); @@ -724,21 +714,14 @@ static int open_disk(int flag) { - struct stat st; int rwmode; - if (stat(disk, &st) == -1) { - if (errno == ENOENT) - return -2; - warnx("can't get file status of %s", disk); - return -1; - } - if ( !(st.st_mode & S_IFCHR) ) - warnx("device %s is not character special", disk); - rwmode = a_flag || I_flag || B_flag || flag ? O_RDWR : O_RDONLY; - fd = open(disk, rwmode); - if (fd == -1 && errno == EPERM && rwmode == O_RDWR) - fd = open(disk, O_RDONLY); + /* Write mode if one of these flags are set. */ + rwmode = (a_flag || I_flag || B_flag || flag); + fd = g_open(disk, rwmode); + /* If the mode fails, try read-only if we didn't. */ + if (fd == -1 && errno == EPERM && rwmode) + fd = g_open(disk, 0); if (fd == -1 && errno == ENXIO) return -2; if (fd == -1) { @@ -778,29 +761,30 @@ { int error; struct gctl_req *grq; - const char *q; - char fbuf[BUFSIZ]; + const char *errmsg; + char fbuf[BUFSIZ], *pname; int i, fdw; grq = gctl_get_handle(); gctl_ro_param(grq, "verb", -1, "write MBR"); gctl_ro_param(grq, "class", -1, "MBR"); - q = strrchr(disk, '/'); - if (q == NULL) - q = disk; - else - q++; - gctl_ro_param(grq, "geom", -1, q); + pname = g_providername(fd); + if (pname == NULL) { + warnx("Error getting providername for %s\n", disk); + return (-1); + } + gctl_ro_param(grq, "geom", -1, pname); gctl_ro_param(grq, "data", secsize, buf); - q = gctl_issue(grq); - if (q == NULL) { + errmsg = gctl_issue(grq); + free(pname); + if (errmsg == NULL) { gctl_free(grq); return(0); } if (!q_flag) /* GEOM errors are benign, not all devices supported */ - warnx("%s", q); + warnx("%s", errmsg); gctl_free(grq); - + error = pwrite(fd, buf, secsize, (sector * 512)); if (error == secsize) return (0); @@ -841,21 +825,18 @@ dos_cylsecs = cylsecs = heads * sectors; disksecs = cyls * heads * sectors; - error = ioctl(fd, DIOCGSECTORSIZE, &u); - if (error != 0 || u == 0) - u = 512; - else - secsize = u; + u = g_sectorsize(fd); + if (u <= 0) + return (-1); - error = ioctl(fd, DIOCGMEDIASIZE, &o); - if (error == 0) { - disksecs = o / u; - cyls = dos_cyls = o / (u * dos_heads * dos_sectors); - } + o = g_mediasize(fd); + if (o < 0) + return (-1); + disksecs = o / u; + cyls = dos_cyls = o / (u * dos_heads * dos_sectors); return (disksecs); } - static int read_s0() ==== //depot/projects/mpsafetty/sbin/ipfw/ipfw2.c#2 (text+ko) ==== @@ -17,7 +17,7 @@ * * NEW command line interface for IP firewall facility * - * $FreeBSD: src/sbin/ipfw/ipfw2.c,v 1.120 2008/05/10 15:02:56 julian Exp $ + * $FreeBSD: src/sbin/ipfw/ipfw2.c,v 1.121 2008/09/06 17:23:37 rik Exp $ */ #include @@ -2429,7 +2429,7 @@ rulenum = atoi(av[0]); new_set = atoi(av[2]); if (!isdigit(*(av[0])) || (cmd == 3 && rulenum > RESVD_SET) || - (cmd == 2 && rulenum == 65535) ) + (cmd == 2 && rulenum == IPFW_DEFAULT_RULE) ) errx(EX_DATAERR, "invalid source number %s\n", av[0]); if (!isdigit(*(av[2])) || new_set > RESVD_SET) errx(EX_DATAERR, "invalid dest. set %s\n", av[1]); @@ -2553,7 +2553,7 @@ * need to scan the list to count them. */ for (nstat = 1, r = data, lim = (char *)data + nbytes; - r->rulenum < 65535 && (char *)r < lim; + r->rulenum < IPFW_DEFAULT_RULE && (char *)r < lim; ++nstat, r = NEXT(r) ) ; /* nothing */ @@ -5045,7 +5045,8 @@ if (have_tag) errx(EX_USAGE, "tag and untag cannot be " "specified more than once"); - GET_UINT_ARG(tag, 1, 65534, i, rule_action_params); + GET_UINT_ARG(tag, 1, IPFW_DEFAULT_RULE - 1, i, + rule_action_params); have_tag = cmd; fill_cmd(cmd, O_TAG, (i == TOK_TAG) ? 0: F_NOT, tag); ac--; av++; @@ -5521,8 +5522,8 @@ if (c->limit_mask == 0) errx(EX_USAGE, "limit: missing limit mask"); - GET_UINT_ARG(c->conn_limit, 1, 65534, TOK_LIMIT, - rule_options); + GET_UINT_ARG(c->conn_limit, 1, IPFW_DEFAULT_RULE - 1, + TOK_LIMIT, rule_options); ac--; av++; break; @@ -5649,8 +5650,8 @@ else { uint16_t tag; - GET_UINT_ARG(tag, 1, 65534, TOK_TAGGED, - rule_options); + GET_UINT_ARG(tag, 1, IPFW_DEFAULT_RULE - 1, + TOK_TAGGED, rule_options); fill_cmd(cmd, O_TAGGED, 0, tag); } ac--; av++; @@ -5978,7 +5979,7 @@ size = 0; data = NULL; frule = 0; - lrule = 65535; /* max ipfw rule number */ + lrule = IPFW_DEFAULT_RULE; /* max ipfw rule number */ ac--; av++; /* Parse parameters. */ ==== //depot/projects/mpsafetty/sbin/md5/md5.1#2 (text+ko) ==== @@ -1,5 +1,5 @@ -.\" $FreeBSD: src/sbin/md5/md5.1,v 1.24 2005/03/10 09:56:39 cperciva Exp $ -.Dd June 6, 2004 +.\" $FreeBSD: src/sbin/md5/md5.1,v 1.25 2008/09/07 15:19:34 trhodes Exp $ +.Dd September 7, 2008 .Dt MD5 1 .Os .Sh NAME @@ -49,7 +49,7 @@ .Tn RSA . .Pp .Tn MD5 -has not yet (2001-09-03) been broken, but sufficient attacks have been +has not yet (2007-03-05) been broken, but sufficient attacks have been made that its security is in some doubt. The attacks on .Tn MD5 ==== //depot/projects/mpsafetty/sbin/natd/natd.c#2 (text+ko) ==== @@ -11,7 +11,7 @@ */ #include -__FBSDID("$FreeBSD: src/sbin/natd/natd.c,v 1.53 2008/06/22 22:14:02 mav Exp $"); +__FBSDID("$FreeBSD: src/sbin/natd/natd.c,v 1.54 2008/09/06 17:26:52 rik Exp $"); #define SYSLOG_NAMES @@ -130,6 +130,7 @@ static void SetupSkinnyPort(const char *strValue); static void NewInstance(const char *name); static void DoGlobal (int fd); +static int CheckIpfwRulenum(unsigned int rnum); /* * Globals. @@ -1947,6 +1948,10 @@ if (sscanf(strValue, "%u:%u", &base, &num) != 2) errx(1, "punch_fw: basenumber:count parameter required"); + if (CheckIpfwRulenum(base + num - 1) == -1) + errx(1, "punch_fw: basenumber:count parameter should fit " + "the maximum allowed rule numbers"); + LibAliasSetFWBase(mla, base, num); (void)LibAliasSetMode(mla, PKT_ALIAS_PUNCH_FW, PKT_ALIAS_PUNCH_FW); } @@ -1991,3 +1996,22 @@ mla = ip->la; mip = ip; } + +static int +CheckIpfwRulenum(unsigned int rnum) +{ + unsigned int default_rule; + size_t len = sizeof(default_rule); + + if (sysctlbyname("net.inet.ip.fw.default_rule", &default_rule, &len, + NULL, 0) == -1) { + warn("Failed to get the default ipfw rule number, using " + "default historical value 65535. The reason was"); + default_rule = 65535; >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Tue Sep 9 19:34:26 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id CA4BB1065677; Tue, 9 Sep 2008 19:34: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 8D1CD1065673 for ; Tue, 9 Sep 2008 19:34:26 +0000 (UTC) (envelope-from strauss@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 7F0228FC12 for ; Tue, 9 Sep 2008 19:34:26 +0000 (UTC) (envelope-from strauss@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 m89JYQNx010731 for ; Tue, 9 Sep 2008 19:34:26 GMT (envelope-from strauss@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m89JYQBa010723 for perforce@freebsd.org; Tue, 9 Sep 2008 19:34:26 GMT (envelope-from strauss@FreeBSD.org) Date: Tue, 9 Sep 2008 19:34:26 GMT Message-Id: <200809091934.m89JYQBa010723@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to strauss@FreeBSD.org using -f From: Anselm Strauss To: Perforce Change Reviews Cc: Subject: PERFORCE change 149489 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, 09 Sep 2008 19:34:27 -0000 http://perforce.freebsd.org/chv.cgi?CH=149489 Change 149489 by strauss@strauss_marvelman on 2008/09/09 19:33:37 Small deflate example. Affected files ... .. //depot/projects/soc2008/strauss_libarchive/misc/deflate/Makefile#2 edit .. //depot/projects/soc2008/strauss_libarchive/misc/deflate/common.c#1 add .. //depot/projects/soc2008/strauss_libarchive/misc/deflate/common.h#1 add .. //depot/projects/soc2008/strauss_libarchive/misc/deflate/deflate.c#2 edit Differences ... ==== //depot/projects/soc2008/strauss_libarchive/misc/deflate/Makefile#2 (text+ko) ==== @@ -1,8 +1,17 @@ +PROGRAMS = deflate #inflate + +CC = gcc +CFLAGS = -Wall -Werror -std=c99 +LDFLAGS = -lz + .PHONY: clean +all: $(PROGRAMS) -all: deflate +clean: + $(RM) $(PROGRAMS) *.o -clean: - rm deflate +$(PROGRAMS): %: %.o common.o + $(CC) $(LDFLAGS) -o $@ $^ -deflate: deflate.c +%.o: %.c common.h + $(CC) -c $(CFLAGS) -o $@ $< ==== //depot/projects/soc2008/strauss_libarchive/misc/deflate/deflate.c#2 (text+ko) ==== @@ -1,30 +1,46 @@ -#include -#include - -#define WINDOW 8 +#include "common.h" int main(int argc, char **argv) { z_stream stream; - char in[WINDOW], out[WINDOW]; + Bytef in[CHUNK]; + Bytef out[CHUNK]; + int flush; + int ret; + int eof; - stream.next_in = ∈ - stream.avail_in = 0; - stream.next_out = &out; - stream.avail_out = strlen(&out); + stream.zalloc = Z_NULL; + stream.zfree = Z_NULL; + stream.opaque = Z_NULL; + deflateInit(&stream, Z_DEFAULT_COMPRESSION); - deflateInit2( - stream, - Z_DEFAULT_COMPRESSION, - Z_DEFLATE, - -WINDOW, - WINDOW, - Z_DEFAULT_STRATEGY - ); - - while ((stream.avail_in = fread(&in, 1, WINDOW, stdin)) > 0) { - while (deflate(stream, Z_NO_FLUSH)) { - + do { + stream.next_in = in; + stream.avail_in = fread(in, 1, CHUNK, stdin); + if(ferror(stdin)) { + deflateEnd(&stream); + err_msg("while reading from standard input"); + return 1; } - fwrite(&out, 1, - } + debug("read from stdin"); + eof = feof(stdin); + flush = eof ? Z_FINISH : Z_NO_FLUSH; + do { + stream.next_out = out; + stream.avail_out = CHUNK; + ret = deflate(&stream, flush); + if (ret == Z_STREAM_ERROR) { + deflateEnd(&stream); + err_msg("while deflating"); + return 1; + } + debug("deflated data"); + ret = fwrite(out, 1, stream.avail_out, stdout); + if ( ret != stream.avail_out || ferror(stdout)) { + deflateEnd(&stream); + err_msg("while writing to standard output"); + return 1; + }; + debug("wrote to stdout"); + } while (stream.avail_out == 0); + } while (!eof); } From owner-p4-projects@FreeBSD.ORG Tue Sep 9 21:08:05 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 24D4A106567E; Tue, 9 Sep 2008 21:08: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 DB0F91065679 for ; Tue, 9 Sep 2008 21:08:04 +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 CE28A8FC16 for ; Tue, 9 Sep 2008 21:08:04 +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 m89L84M8036106 for ; Tue, 9 Sep 2008 21:08:04 GMT (envelope-from pgj@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m89L84s3036092 for perforce@freebsd.org; Tue, 9 Sep 2008 21:08:04 GMT (envelope-from pgj@FreeBSD.org) Date: Tue, 9 Sep 2008 21:08:04 GMT Message-Id: <200809092108.m89L84s3036092@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 149492 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, 09 Sep 2008 21:08:05 -0000 http://perforce.freebsd.org/chv.cgi?CH=149492 Change 149492 by pgj@kolbasz on 2008/09/09 21:07:53 MFen: 1.42 -> 1.43 hu_HU.ISO8859-2/articles/dialup-firewall/article.sgml 1.412 -> 1.413 hu_HU.ISO8859-2/books/handbook/advanced-networking/chapter.sgml 1.125 -> 1.126 hu_HU.ISO8859-2/books/handbook/introduction/chapter.sgml 1.186 -> 1.187 hu_HU.ISO8859-2/books/handbook/x11/chapter.sgml 1.31 -> 1.32 hu_HU.ISO8859-2/share/sgml/glossary/freebsd-glossary.sgml MFP4 after: ASAP Affected files ... .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/articles/dialup-firewall/article.sgml#6 edit .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/advanced-networking/chapter.sgml#15 edit .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/introduction/chapter.sgml#10 edit .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/x11/chapter.sgml#4 edit .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/share/sgml/glossary/freebsd-glossary.sgml#9 edit Differences ... ==== //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/articles/dialup-firewall/article.sgml#6 (text+ko) ==== @@ -6,7 +6,7 @@
    @@ -181,10 +181,17 @@ ppp_nat="YES" ppp_profile="internet_beallitasok" - Ne felejtsük el kicserélni az - internet_beallitasok-at saját - betárcsázós beállításait - tartalmazó állomány nevére! + + Ne felejtsük el kicserélni az + internet_beallitasok + értékét a saját + betárcsázós + beállításait tartalmazó + állomány nevére! Ennek nevének meg + kell egyeznie a beállításaink + /etc/ppp/ppp.conf állományban + szereplõ nevével. + ==== //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/advanced-networking/chapter.sgml#15 (text+ko) ==== @@ -7,7 +7,7 @@ @@ -4343,9 +4343,9 @@ Címek korlátozása - Le tudjuk korlátozni az egy felület + Korlátozhatóak az egy felület mögül küldeni képes egyedi - MAC-címeket. Amikor ezen a határon felül + MAC-címek. Amikor ezen a határon felül érkeznek ismeretlen feladótól csomagok, egészen addig eldobjuk ezeket, amíg egy korábban már regisztrált ==== //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/introduction/chapter.sgml#10 (text+ko) ==== @@ -7,7 +7,7 @@ The FreeBSD Hungarian Documentation Project Translated by: PALI, Gabor %SOURCE% en_US.ISO8859-1/books/handbook/introduction/chapter.sgml - %SRCID% 1.125 + %SRCID% 1.126 --> ==== //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/x11/chapter.sgml#4 (text+ko) ==== @@ -7,7 +7,7 @@ @@ -2069,6 +2069,15 @@ honlapján találhatunk információkat. + &os; alatt a KDE két verziója + érhetõ el: a harmadik változat már + régóta használható, nagyon + megbízható, amely mellett viszont a + következõ generációt + képviselõ negyedik változat is + megtalálható a Portgyûjteményben. + Akár egymás mellé is + telepíthetõek. @@ -2080,32 +2089,52 @@ csomagból vagy a Portgyûjtemény segítségével is: - A KDE csomagját + A KDE3 csomagját hálózaton keresztül így tudjuk telepíteni: &prompt.root; pkg_add -r kde + A KDE4 csomagját pedig + hálózaton keresztül így tudjuk + telepíteni: + + &prompt.root; pkg_add -r kde4 + A &man.pkg.add.1; magától letölti az alkalmazás legfrissebb verzióját. - Ha a KDE-t + Ha a KDE3 környezetet forrásból akarjuk telepíteni, használjuk a portfát: &prompt.root; cd /usr/ports/x11/kde3 &prompt.root; make install clean + Ha viszont a KDE4 + környezetet akarjuk inkább a portfa + felhasználásával forrásból + telepíteni, akkor ezeket a parancsokat adjuk ki: + + &prompt.root; cd /usr/ports/x11/kde4 +&prompt.root; make install clean + Miután a KDE-t sikeresen telepítettük, tudatnunk kell az X szerverrel, hogy az alapértelmezett ablakkezelõ helyett ezt indítsa el. Ezt az .xinitrc állomány módosításával érhetjük - el: + el. + + KDE3 esetén: &prompt.user; echo "exec startkde" > ~/.xinitrc + KDE4 esetén: + + &prompt.user; echo "exec /usr/local/kde4/bin/startkde" > ~/.xinitrc + Mostantól pedig mindig KDE lesz az asztalunk, amikor az X Window Systemet elindítjuk a startx @@ -2183,10 +2212,15 @@ használatához az /etc/ttys állományban található ttyv8 bejegyzést kell némileg - átalakítanunk. Valahogy így: + átalakítanunk. + + KDE3 esetén: ttyv8 "/usr/local/bin/kdm -nodaemon" xterm on secure + KDE4 esetén: + + ttyv8 "/usr/local/kde4/bin/kdm -nodaemon" xterm on secure ==== //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/share/sgml/glossary/freebsd-glossary.sgml#9 (text+ko) ==== @@ -33,7 +33,7 @@ @@ -1951,6 +1951,11 @@ + + SVN + + + SMTP Authentication SMTP AUTH @@ -2001,6 +2006,18 @@ + + Subversion + SVN + + A Subversion egy CVS-hez hasonló + verziókezelõ rendszer, némileg bõvebb + tudással. + + + + + Suspend To RAM STR From owner-p4-projects@FreeBSD.ORG Tue Sep 9 21:10:07 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 715E8106567F; Tue, 9 Sep 2008 21:10:07 +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 1C9A4106567D for ; Tue, 9 Sep 2008 21:10:07 +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 0FE918FC1B for ; Tue, 9 Sep 2008 21:10:07 +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 m89LA6OC047051 for ; Tue, 9 Sep 2008 21:10:06 GMT (envelope-from pgj@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m89LA6Qj047049 for perforce@freebsd.org; Tue, 9 Sep 2008 21:10:06 GMT (envelope-from pgj@FreeBSD.org) Date: Tue, 9 Sep 2008 21:10:06 GMT Message-Id: <200809092110.m89LA6Qj047049@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 149493 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, 09 Sep 2008 21:10:07 -0000 http://perforce.freebsd.org/chv.cgi?CH=149493 Change 149493 by pgj@kolbasz on 2008/09/09 21:09:43 MFen: 1.19 -> 1.21 hu/administration.sgml 1.22 -> 1.23 hu/platforms/amd64.sgml MFP4 after: ASAP Affected files ... .. //depot/projects/docproj_hu/www/hu/administration.sgml#12 edit .. //depot/projects/docproj_hu/www/hu/platforms/amd64.sgml#7 edit Differences ... ==== //depot/projects/docproj_hu/www/hu/administration.sgml#12 (text+ko) ==== @@ -9,7 +9,7 @@ @@ -233,10 +233,12 @@ mellett bejelenti a kód befagyasztását és karbantartja a RELENG_* ágakat. A releng szabadalomlevele - részeletesen ismerteti az Elsõdleges Release Engineering + részletesen ismerteti az Elsõdleges Release Engineering Team feladatait és kötelezettségeit.

      +
    • &a.kib; <kib@FreeBSD.org>
      • +
    • &a.blackend; <blackend@FreeBSD.org>
    • &a.mux; <mux@FreeBSD.org>
    • &a.bmah; <bmah@FreeBSD.org>
    • &a.gnn; <gnn@FreeBSD.org>
      • @@ -351,8 +353,10 @@ találhatunk.

        +
      • &a.tabthorpe; <tabthorpe@FreeBSD.org>
      • &a.wilko; <wilko@FreeBSD.org>
      • &a.brueffer; <brueffer@FreeBSD.org>
        • +
      • &a.gahr; <gahr@FreeBSD.org>
      • &a.obrien; <obrien@FreeBSD.org>
      • &a.trhodes; <trhodes@FreeBSD.org>
      • Daniel Seuffert <ds@FreeBSD.org>
        • ==== //depot/projects/docproj_hu/www/hu/platforms/amd64.sgml#7 (text+ko) ==== @@ -10,7 +10,7 @@ @@ -20,7 +20,7 @@

        Ez az oldal az AMD64 és az Intel® 64 + href="http://developer.intel.com/technology/intel64/index.htm">Intel® 64 (Extended Memory 64-bit Technology) architektúrák &os; portjával kapcsolatban tartalmaz információkat. Az AMD64 architektúra korábban x86-64 vagy "Hammer", From owner-p4-projects@FreeBSD.ORG Tue Sep 9 21:11:12 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 212DF106567C; Tue, 9 Sep 2008 21:11: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 C09D41065678 for ; Tue, 9 Sep 2008 21:11:11 +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 B37B78FC1E for ; Tue, 9 Sep 2008 21:11:11 +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 m89LBBgi051266 for ; Tue, 9 Sep 2008 21:11:11 GMT (envelope-from pgj@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m89LB9GA051142 for perforce@freebsd.org; Tue, 9 Sep 2008 21:11:09 GMT (envelope-from pgj@FreeBSD.org) Date: Tue, 9 Sep 2008 21:11:09 GMT Message-Id: <200809092111.m89LB9GA051142@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 149494 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, 09 Sep 2008 21:11:12 -0000 http://perforce.freebsd.org/chv.cgi?CH=149494 Change 149494 by pgj@kolbasz on 2008/09/09 21:10:39 IFC Affected files ... .. //depot/projects/docproj_hu/src/release/doc/en_US.ISO8859-1/relnotes/article.sgml#6 integrate .. //depot/projects/docproj_hu/www/en/administration.sgml#4 integrate .. //depot/projects/docproj_hu/www/en/donations/wantlist.sgml#4 integrate .. //depot/projects/docproj_hu/www/en/releases/6.4R/schedule.sgml#3 integrate .. //depot/projects/docproj_hu/www/en/releases/7.1R/schedule.sgml#2 integrate .. //depot/projects/docproj_hu/www/en/releng/index.sgml#5 integrate Differences ... ==== //depot/projects/docproj_hu/src/release/doc/en_US.ISO8859-1/relnotes/article.sgml#6 (text+ko) ==== @@ -17,7 +17,7 @@ The &os; Project - $FreeBSD: src/release/doc/en_US.ISO8859-1/relnotes/article.sgml,v 1.1092 2008/07/29 04:23:18 bmah Exp $ + $FreeBSD: src/release/doc/en_US.ISO8859-1/relnotes/article.sgml,v 1.1093 2008/09/08 17:13:18 gshapiro Exp $ 2000 @@ -449,7 +449,7 @@ Figwort release to the Hydrangea release. sendmail has been updated from - 8.14.1 to 8.14.2. + 8.14.1 to 8.14.3. The timezone database has been updated from the tzdata2007h release to ==== //depot/projects/docproj_hu/www/en/administration.sgml#4 (text+ko) ==== @@ -1,5 +1,5 @@ + %developers; @@ -157,6 +157,8 @@ Engineering Team in greater detail.

          +
        • &a.kib; <kib@FreeBSD.org>
          • +
        • &a.blackend; <blackend@FreeBSD.org>
        • &a.mux; <mux@FreeBSD.org>
        • &a.bmah; <bmah@FreeBSD.org>
        • &a.gnn; <gnn@FreeBSD.org>
          • @@ -259,8 +261,10 @@ href="donations/">FreeBSD Donations Liaison page.

            +
          • &a.tabthorpe; <tabthorpe@FreeBSD.org>
          • &a.wilko; <wilko@FreeBSD.org>
          • &a.brueffer; <brueffer@FreeBSD.org>
            • +
          • &a.gahr; <gahr@FreeBSD.org>
          • &a.obrien; <obrien@FreeBSD.org>
          • &a.trhodes; <trhodes@FreeBSD.org>
          • Daniel Seuffert <ds@FreeBSD.org>
            • ==== //depot/projects/docproj_hu/www/en/donations/wantlist.sgml#4 (text+ko) ==== @@ -1,6 +1,6 @@ - + @@ -488,6 +488,12 @@ afd/ast drivers. + + tabthorpe + Canada + AMD64 machine, minimum 256 M memory, any size hard drive. + Ports testing and building. + &footer; ==== //depot/projects/docproj_hu/www/en/releases/6.4R/schedule.sgml#3 (text+ko) ==== @@ -1,7 +1,7 @@ - + @@ -56,7 +56,7 @@ Code freeze begins 29 August 2008 - -- + 2 September 2008 After this date, all commits to HEAD must be approved by re@FreeBSD.org. Certain highly active documentation committers are exempt from this rule for @@ -78,7 +78,7 @@ Ports tree frozen 8 September 2008 - -- + 8 September 2008 Only approved commits will be permitted to the ports/ tree during the freeze. @@ -107,7 +107,7 @@ BETA1 builds 1 September 2008 - -- + 5 September 2008 Begin BETA1 builds. ==== //depot/projects/docproj_hu/www/en/releases/7.1R/schedule.sgml#2 (text+ko) ==== @@ -1,7 +1,7 @@ - + @@ -56,7 +56,7 @@ Code freeze begins 29 August 2008 - -- + 2 September 2008 After this date, all commits to HEAD must be approved by re@FreeBSD.org. Certain highly active documentation committers are exempt from this rule for @@ -77,7 +77,7 @@ Ports tree frozen 8 September 2008 - -- + 8 September 2008 Only approved commits will be permitted to the ports/ tree during the freeze. @@ -106,7 +106,7 @@ BETA1 builds 1 September 2008 - -- + 5 September 2008 Begin BETA1 builds. ==== //depot/projects/docproj_hu/www/en/releng/index.sgml#5 (text+ko) ==== @@ -1,6 +1,6 @@ - + @@ -92,8 +92,8 @@ RELENG_7 - Open - committers + Frozen + &contact.re; Development branch for 7-STABLE. @@ -106,8 +106,8 @@ RELENG_6 - Open - committers + Frozen + &contact.re; Development branch for 6-STABLE. @@ -281,7 +281,7 @@ ports/ - Open + Frozen &contact.portmgr; FreeBSD Ports Collection. From owner-p4-projects@FreeBSD.ORG Tue Sep 9 23:24:32 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5B6BD1065696; Tue, 9 Sep 2008 23:24: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 035371065671 for ; Tue, 9 Sep 2008 23:24:32 +0000 (UTC) (envelope-from strauss@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id EBEB78FC15 for ; Tue, 9 Sep 2008 23:24:31 +0000 (UTC) (envelope-from strauss@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 m89NOVk9054099 for ; Tue, 9 Sep 2008 23:24:31 GMT (envelope-from strauss@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m89NOVeK054097 for perforce@freebsd.org; Tue, 9 Sep 2008 23:24:31 GMT (envelope-from strauss@FreeBSD.org) Date: Tue, 9 Sep 2008 23:24:31 GMT Message-Id: <200809092324.m89NOVeK054097@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to strauss@FreeBSD.org using -f From: Anselm Strauss To: Perforce Change Reviews Cc: Subject: PERFORCE change 149502 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, 09 Sep 2008 23:24:32 -0000 http://perforce.freebsd.org/chv.cgi?CH=149502 Change 149502 by strauss@strauss_marvelman on 2008/09/09 23:23:52 Inflate counterpart example. Affected files ... .. //depot/projects/soc2008/strauss_libarchive/misc/deflate/Makefile#3 edit .. //depot/projects/soc2008/strauss_libarchive/misc/deflate/common.h#2 edit .. //depot/projects/soc2008/strauss_libarchive/misc/deflate/inflate.c#1 add Differences ... ==== //depot/projects/soc2008/strauss_libarchive/misc/deflate/Makefile#3 (text+ko) ==== @@ -1,4 +1,4 @@ -PROGRAMS = deflate #inflate +PROGRAMS = deflate inflate CC = gcc CFLAGS = -Wall -Werror -std=c99 ==== //depot/projects/soc2008/strauss_libarchive/misc/deflate/common.h#2 (text+ko) ==== @@ -3,7 +3,7 @@ #define CHUNK 8 -#define DEBUG +//#define DEBUG #ifdef DEBUG #define debug(s) debug_msg(s); #else From owner-p4-projects@FreeBSD.ORG Wed Sep 10 00:46:56 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 08F291065673; Wed, 10 Sep 2008 00:46: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 C12D2106566B for ; Wed, 10 Sep 2008 00:46:55 +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 B3CDB8FC08 for ; Wed, 10 Sep 2008 00:46:55 +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 m8A0ktfw077767 for ; Wed, 10 Sep 2008 00:46:55 GMT (envelope-from gonzo@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m8A0ktjl077719 for perforce@freebsd.org; Wed, 10 Sep 2008 00:46:55 GMT (envelope-from gonzo@FreeBSD.org) Date: Wed, 10 Sep 2008 00:46:55 GMT Message-Id: <200809100046.m8A0ktjl077719@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 149503 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, 10 Sep 2008 00:46:56 -0000 http://perforce.freebsd.org/chv.cgi?CH=149503 Change 149503 by gonzo@gonzo_jeeves on 2008/09/10 00:46:07 One more IFC in order to generate new mips2 patchset Affected files ... .. //depot/projects/mips2/src/bin/cp/utils.c#5 integrate .. //depot/projects/mips2/src/etc/rc.initdiskless#4 integrate .. //depot/projects/mips2/src/include/rpc/svc_auth.h#2 integrate .. //depot/projects/mips2/src/lib/libc/gen/arc4random.c#5 integrate .. //depot/projects/mips2/src/lib/libc/rpc/svc.c#3 integrate .. //depot/projects/mips2/src/lib/libc/rpc/svc_auth.c#3 integrate .. //depot/projects/mips2/src/lib/libthr/thread/thr_exit.c#10 integrate .. //depot/projects/mips2/src/sys/compat/linux/linux_file.c#12 integrate .. //depot/projects/mips2/src/sys/compat/linux/linux_socket.c#7 integrate .. //depot/projects/mips2/src/sys/dev/ath/if_athvar.h#6 integrate .. //depot/projects/mips2/src/sys/dev/drm/ati_pcigart.c#4 integrate .. //depot/projects/mips2/src/sys/dev/jme/if_jme.c#3 integrate .. //depot/projects/mips2/src/sys/dev/jme/if_jmereg.h#2 integrate .. //depot/projects/mips2/src/sys/dev/usb/usb_quirks.c#8 integrate .. //depot/projects/mips2/src/sys/dev/usb/usbdevs#22 integrate .. //depot/projects/mips2/src/sys/netinet/tcp_input.c#15 integrate Differences ... ==== //depot/projects/mips2/src/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.54 2008/08/07 07:29:26 trasz Exp $"); +__FBSDID("$FreeBSD: src/bin/cp/utils.c,v 1.55 2008/09/09 12:31:42 trasz Exp $"); #include #include @@ -224,7 +224,6 @@ rval = 1; if (pflag && preserve_fd_acls(from_fd, to_fd) != 0) rval = 1; - (void)close(from_fd); if (close(to_fd)) { warn("%s", to.p_path); rval = 1; ==== //depot/projects/mips2/src/etc/rc.initdiskless#4 (text+ko) ==== @@ -24,7 +24,7 @@ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # -# $FreeBSD: src/etc/rc.initdiskless,v 1.53 2008/05/15 11:00:23 bms Exp $ +# $FreeBSD: src/etc/rc.initdiskless,v 1.54 2008/09/09 18:40:50 bms Exp $ # On entry to this script the entire system consists of a read-only root # mounted via NFS. The kernel has run BOOTP and configured an interface @@ -73,6 +73,16 @@ # If this file exists, then failure to execute the mount # command contained in /conf/T/M/remount is non-fatal. # +# /conf/T/M/remount_subdir +# If this file exists, then the behaviour of /conf/T/M/remount +# changes as follows: +# 1. /conf/T/M/remount is invoked to mount the root of the +# filesystem where the configuration data exists on a +# temporary mountpoint. +# 2. /conf/T/M/remount_subdir is then invoked to mount a +# *subdirectory* of the filesystem mounted by +# /conf/T/M/remount on /conf/T/M/. +# # /conf/T/M/diskless_remount # The contents of the file points to an NFS filesystem, # possibly followed by mount_nfs options. If the server name @@ -296,10 +306,33 @@ # remount. Beware, the command is in the file itself! if [ -f $j/remount ]; then - nfspt=`/bin/cat $j/remount` - $nfspt $j - chkerr $? "$nfspt $j" - to_umount="$j ${to_umount}" # XXX hope it is really a mount! + if [ -f $j/remount_subdir ]; then + k="/conf.tmp/$i/$subdir" + [ -d $k ] || continue + + # Mount the filesystem root where the config data is + # on the temporary mount point. + nfspt=`/bin/cat $j/remount` + $nfspt $k + chkerr $? "$nfspt $k" + + # Now use a nullfs mount to get the data where we + # really want to see it. + remount_subdir=`/bin/cat $j/remount_subdir` + remount_subdir_cmd="mount -t nullfs $k/$remount_subdir" + + $remount_subdir_cmd $j + chkerr $? "$remount_subdir_cmd $j" + + # XXX check order -- we must force $k to be unmounted + # after j, as j depends on k. + to_umount="$j $k ${to_umount}" + else + nfspt=`/bin/cat $j/remount` + $nfspt $j + chkerr $? "$nfspt $j" + to_umount="$j ${to_umount}" # XXX hope it is really a mount! + fi fi # NFS remount ==== //depot/projects/mips2/src/include/rpc/svc_auth.h#2 (text+ko) ==== @@ -30,7 +30,7 @@ * * from: @(#)svc_auth.h 1.6 86/07/16 SMI * @(#)svc_auth.h 2.1 88/07/29 4.0 RPCSRC - * $FreeBSD: src/include/rpc/svc_auth.h,v 1.14 2002/03/23 17:24:55 imp Exp $ + * $FreeBSD: src/include/rpc/svc_auth.h,v 1.15 2008/09/09 14:15:55 dfr Exp $ */ /* @@ -46,6 +46,8 @@ * Server side authenticator */ __BEGIN_DECLS +extern struct svc_auth_ops svc_auth_null_ops; + extern enum auth_stat _authenticate(struct svc_req *, struct rpc_msg *); extern int svc_auth_reg(int, enum auth_stat (*)(struct svc_req *, struct rpc_msg *)); ==== //depot/projects/mips2/src/lib/libc/gen/arc4random.c#5 (text+ko) ==== @@ -33,7 +33,7 @@ */ #include -__FBSDID("$FreeBSD: src/lib/libc/gen/arc4random.c,v 1.24 2008/08/03 20:15:22 ache Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/gen/arc4random.c,v 1.25 2008/09/09 09:46:36 ache Exp $"); #include "namespace.h" #include @@ -54,7 +54,7 @@ static pthread_mutex_t arc4random_mtx = PTHREAD_MUTEX_INITIALIZER; -#define RANDOMDEV "/dev/urandom" +#define RANDOMDEV "/dev/random" #define KEYSIZE 128 #define THREAD_LOCK() \ do { \ @@ -193,6 +193,7 @@ THREAD_LOCK(); arc4_check_init(); arc4_stir(); + rs_stired = 1; THREAD_UNLOCK(); } ==== //depot/projects/mips2/src/lib/libc/rpc/svc.c#3 (text+ko) ==== @@ -34,7 +34,7 @@ static char *sccsid = "@(#)svc.c 2.4 88/08/11 4.0 RPCSRC"; #endif #include -__FBSDID("$FreeBSD: src/lib/libc/rpc/svc.c,v 1.25 2008/08/06 14:02:05 dfr Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/rpc/svc.c,v 1.26 2008/09/09 14:15:55 dfr Exp $"); /* * svc.c, Server-side remote procedure call interface. @@ -569,6 +569,7 @@ ext = mem_alloc(sizeof(SVCXPRT_EXT)); memset(ext, 0, sizeof(SVCXPRT_EXT)); xprt->xp_p3 = ext; + ext->xp_auth.svc_ah_ops = &svc_auth_null_ops; return (xprt); } ==== //depot/projects/mips2/src/lib/libc/rpc/svc_auth.c#3 (text+ko) ==== @@ -37,7 +37,7 @@ static char sccsid[] = "@(#)svc_auth.c 1.26 89/02/07 Copyr 1984 Sun Micro"; #endif #include -__FBSDID("$FreeBSD: src/lib/libc/rpc/svc_auth.c,v 1.14 2008/08/06 14:02:05 dfr Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/rpc/svc_auth.c,v 1.15 2008/09/09 14:15:55 dfr Exp $"); /* * svc_auth.c, Server-side rpc authenticator interface. @@ -75,7 +75,7 @@ }; static struct authsvc *Auths = NULL; -static struct svc_auth_ops svc_auth_null_ops; +struct svc_auth_ops svc_auth_null_ops; /* * The call rpc message, msg has been obtained from the wire. The msg contains @@ -162,7 +162,7 @@ return (xdr_func(xdrs, xdr_ptr)); } -static struct svc_auth_ops svc_auth_null_ops = { +struct svc_auth_ops svc_auth_null_ops = { svcauth_null_wrap, svcauth_null_wrap, }; ==== //depot/projects/mips2/src/lib/libthr/thread/thr_exit.c#10 (text+ko) ==== @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/lib/libthr/thread/thr_exit.c,v 1.30 2008/08/27 02:00:53 jasone Exp $ + * $FreeBSD: src/lib/libthr/thread/thr_exit.c,v 1.31 2008/09/09 17:14:32 jasone Exp $ */ #include "namespace.h" @@ -96,9 +96,6 @@ _thread_cleanupspecific(); } - /* Tell malloc that the thread is exiting. */ - _malloc_thread_cleanup(); - if (!_thr_isthreaded()) exit(0); @@ -109,6 +106,12 @@ exit(0); /* Never reach! */ } + THREAD_LIST_UNLOCK(curthread); + + /* Tell malloc that the thread is exiting. */ + _malloc_thread_cleanup(); + + THREAD_LIST_LOCK(curthread); THR_LOCK(curthread); curthread->state = PS_DEAD; if (curthread->flags & THR_FLAGS_NEED_SUSPEND) { ==== //depot/projects/mips2/src/sys/compat/linux/linux_file.c#12 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/compat/linux/linux_file.c,v 1.114 2008/06/08 11:09:25 rdivacky Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/linux/linux_file.c,v 1.115 2008/09/09 16:00:17 rdivacky Exp $"); #include "opt_compat.h" #include "opt_mac.h" @@ -303,9 +303,20 @@ char d_name[LINUX_NAME_MAX + 1]; }; -#define LINUX_RECLEN(de,namlen) \ - ALIGN((((char *)&(de)->d_name - (char *)de) + (namlen) + 1)) +/* + * Linux uses the last byte in the dirent buffer to store d_type, + * at least glibc-2.7 requires it. That is why l_dirent is padded with 2 bytes. + */ +#define LINUX_RECLEN(namlen) \ + roundup((offsetof(struct l_dirent, d_name) + (namlen) + 2), \ + sizeof(l_ulong)) + +#define LINUX_RECLEN64(namlen) \ + roundup((offsetof(struct l_dirent64, d_name) + (namlen) + 1), \ + sizeof(uint64_t)) +#define LINUX_MAXRECLEN max(LINUX_RECLEN(LINUX_NAME_MAX), \ + LINUX_RECLEN64(LINUX_NAME_MAX)) #define LINUX_DIRBLKSIZ 512 static int @@ -318,12 +329,13 @@ int len, reclen; /* BSD-format */ caddr_t outp; /* Linux-format */ int resid, linuxreclen=0; /* Linux-format */ + caddr_t lbuf; /* Linux-format */ struct file *fp; struct uio auio; struct iovec aiov; off_t off; - struct l_dirent linux_dirent; - struct l_dirent64 linux_dirent64; + struct l_dirent *linux_dirent; + struct l_dirent64 *linux_dirent64; int buflen, error, eofflag, nbytes, justone; u_long *cookies = NULL, *cookiep; int ncookies, vfslocked; @@ -359,6 +371,7 @@ buflen = max(LINUX_DIRBLKSIZ, nbytes); buflen = min(buflen, MAXBSIZE); buf = malloc(buflen, M_TEMP, M_WAITOK); + lbuf = malloc(LINUX_MAXRECLEN, M_TEMP, M_WAITOK | M_ZERO); vn_lock(vp, LK_EXCLUSIVE | LK_RETRY); again: @@ -436,8 +449,8 @@ } linuxreclen = (is64bit) - ? LINUX_RECLEN(&linux_dirent64, bdp->d_namlen) - : LINUX_RECLEN(&linux_dirent, bdp->d_namlen); + ? LINUX_RECLEN64(bdp->d_namlen) + : LINUX_RECLEN(bdp->d_namlen); if (reclen > len || resid < linuxreclen) { outp++; @@ -446,34 +459,41 @@ if (justone) { /* readdir(2) case. */ - linux_dirent.d_ino = bdp->d_fileno; - linux_dirent.d_off = (l_off_t)linuxreclen; - linux_dirent.d_reclen = (l_ushort)bdp->d_namlen; - strcpy(linux_dirent.d_name, bdp->d_name); - error = copyout(&linux_dirent, outp, linuxreclen); - } else { - if (is64bit) { - linux_dirent64.d_ino = bdp->d_fileno; - linux_dirent64.d_off = (cookiep) - ? (l_off_t)*cookiep - : (l_off_t)(off + reclen); - linux_dirent64.d_reclen = - (l_ushort)linuxreclen; - linux_dirent64.d_type = bdp->d_type; - strcpy(linux_dirent64.d_name, bdp->d_name); - error = copyout(&linux_dirent64, outp, - linuxreclen); - } else { - linux_dirent.d_ino = bdp->d_fileno; - linux_dirent.d_off = (cookiep) - ? (l_off_t)*cookiep - : (l_off_t)(off + reclen); - linux_dirent.d_reclen = (l_ushort)linuxreclen; - strcpy(linux_dirent.d_name, bdp->d_name); - error = copyout(&linux_dirent, outp, - linuxreclen); - } + linux_dirent = (struct l_dirent*)lbuf; + linux_dirent->d_ino = bdp->d_fileno; + linux_dirent->d_off = (l_off_t)linuxreclen; + linux_dirent->d_reclen = (l_ushort)bdp->d_namlen; + strlcpy(linux_dirent->d_name, bdp->d_name, + linuxreclen - offsetof(struct l_dirent, d_name)); + error = copyout(linux_dirent, outp, linuxreclen); + } + if (is64bit) { + linux_dirent64 = (struct l_dirent64*)lbuf; + linux_dirent64->d_ino = bdp->d_fileno; + linux_dirent64->d_off = (cookiep) + ? (l_off_t)*cookiep + : (l_off_t)(off + reclen); + linux_dirent64->d_reclen = (l_ushort)linuxreclen; + linux_dirent64->d_type = bdp->d_type; + strlcpy(linux_dirent64->d_name, bdp->d_name, + linuxreclen - offsetof(struct l_dirent64, d_name)); + error = copyout(linux_dirent64, outp, linuxreclen); + } else if (!justone) { + linux_dirent = (struct l_dirent*)lbuf; + linux_dirent->d_ino = bdp->d_fileno; + linux_dirent->d_off = (cookiep) + ? (l_off_t)*cookiep + : (l_off_t)(off + reclen); + linux_dirent->d_reclen = (l_ushort)linuxreclen; + /* + * Copy d_type to last byte of l_dirent buffer + */ + lbuf[linuxreclen-1] = bdp->d_type; + strlcpy(linux_dirent->d_name, bdp->d_name, + linuxreclen - offsetof(struct l_dirent, d_name)-1); + error = copyout(linux_dirent, outp, linuxreclen); } + if (error) goto out; @@ -509,6 +529,7 @@ VFS_UNLOCK_GIANT(vfslocked); fdrop(fp, td); free(buf, M_TEMP); + free(lbuf, M_TEMP); return (error); } ==== //depot/projects/mips2/src/sys/compat/linux/linux_socket.c#7 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/compat/linux/linux_socket.c,v 1.75 2008/08/17 23:27:27 bz Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/linux/linux_socket.c,v 1.76 2008/09/09 13:01:14 kib Exp $"); /* XXX we use functions that might not exist. */ #include "opt_compat.h" @@ -546,21 +546,16 @@ static int linux_socket(struct thread *td, struct linux_socket_args *args) { - struct linux_socket_args linux_args; struct socket_args /* { int domain; int type; int protocol; } */ bsd_args; - int error; int retval_socket; - if ((error = copyin(args, &linux_args, sizeof(linux_args)))) - return (error); - - bsd_args.protocol = linux_args.protocol; - bsd_args.type = linux_args.type; - bsd_args.domain = linux_to_bsd_domain(linux_args.domain); + bsd_args.protocol = args->protocol; + bsd_args.type = args->type; + bsd_args.domain = linux_to_bsd_domain(args->domain); if (bsd_args.domain == -1) return (EINVAL); @@ -613,21 +608,17 @@ static int linux_bind(struct thread *td, struct linux_bind_args *args) { - struct linux_bind_args linux_args; struct sockaddr *sa; int error; - if ((error = copyin(args, &linux_args, sizeof(linux_args)))) - return (error); - - error = linux_getsockaddr(&sa, PTRIN(linux_args.name), - linux_args.namelen); + error = linux_getsockaddr(&sa, PTRIN(args->name), + args->namelen); if (error) return (error); - error = kern_bind(td, linux_args.s, sa); + error = kern_bind(td, args->s, sa); free(sa, M_SONAME); - if (error == EADDRNOTAVAIL && linux_args.namelen != sizeof(struct sockaddr_in)) + if (error == EADDRNOTAVAIL && args->namelen != sizeof(struct sockaddr_in)) return (EINVAL); return (error); } @@ -642,22 +633,17 @@ int linux_connect(struct thread *td, struct linux_connect_args *args) { - struct linux_connect_args linux_args; struct socket *so; struct sockaddr *sa; u_int fflag; int error; - if ((error = copyin(args, &linux_args, sizeof(linux_args)))) - return (error); - - error = linux_getsockaddr(&sa, - (struct osockaddr *)PTRIN(linux_args.name), - linux_args.namelen); + error = linux_getsockaddr(&sa, (struct osockaddr *)PTRIN(args->name), + args->namelen); if (error) return (error); - error = kern_connect(td, linux_args.s, sa); + error = kern_connect(td, args->s, sa); free(sa, M_SONAME); if (error != EISCONN) return (error); @@ -671,7 +657,7 @@ * socket and use the file descriptor reference instead of * creating a new one. */ - error = fgetsock(td, linux_args.s, &so, &fflag); + error = fgetsock(td, args->s, &so, &fflag); if (error == 0) { error = EISCONN; if (fflag & FNONBLOCK) { @@ -694,18 +680,13 @@ static int linux_listen(struct thread *td, struct linux_listen_args *args) { - struct linux_listen_args linux_args; struct listen_args /* { int s; int backlog; } */ bsd_args; - int error; - if ((error = copyin(args, &linux_args, sizeof(linux_args)))) - return (error); - - bsd_args.s = linux_args.s; - bsd_args.backlog = linux_args.backlog; + bsd_args.s = args->s; + bsd_args.backlog = args->backlog; return (listen(td, &bsd_args)); } @@ -718,7 +699,6 @@ static int linux_accept(struct thread *td, struct linux_accept_args *args) { - struct linux_accept_args linux_args; struct accept_args /* { int s; struct sockaddr * __restrict name; @@ -726,22 +706,19 @@ } */ bsd_args; int error, fd; - if ((error = copyin(args, &linux_args, sizeof(linux_args)))) - return (error); - - bsd_args.s = linux_args.s; + bsd_args.s = args->s; /* XXX: */ - bsd_args.name = (struct sockaddr * __restrict)PTRIN(linux_args.addr); - bsd_args.anamelen = PTRIN(linux_args.namelen);/* XXX */ + bsd_args.name = (struct sockaddr * __restrict)PTRIN(args->addr); + bsd_args.anamelen = PTRIN(args->namelen);/* XXX */ error = accept(td, &bsd_args); bsd_to_linux_sockaddr((struct sockaddr *)bsd_args.name); if (error) { - if (error == EFAULT && linux_args.namelen != sizeof(struct sockaddr_in)) - return (EINVAL); + if (error == EFAULT && args->namelen != sizeof(struct sockaddr_in)) + return (EINVAL); return (error); } - if (linux_args.addr) { - error = linux_sa_put(PTRIN(linux_args.addr)); + if (args->addr) { + error = linux_sa_put(PTRIN(args->addr)); if (error) { (void)kern_close(td, td->td_retval[0]); return (error); @@ -768,7 +745,6 @@ static int linux_getsockname(struct thread *td, struct linux_getsockname_args *args) { - struct linux_getsockname_args linux_args; struct getsockname_args /* { int fdes; struct sockaddr * __restrict asa; @@ -776,18 +752,15 @@ } */ bsd_args; int error; - if ((error = copyin(args, &linux_args, sizeof(linux_args)))) - return (error); - - bsd_args.fdes = linux_args.s; + bsd_args.fdes = args->s; /* XXX: */ - bsd_args.asa = (struct sockaddr * __restrict)PTRIN(linux_args.addr); - bsd_args.alen = PTRIN(linux_args.namelen); /* XXX */ + bsd_args.asa = (struct sockaddr * __restrict)PTRIN(args->addr); + bsd_args.alen = PTRIN(args->namelen); /* XXX */ error = getsockname(td, &bsd_args); bsd_to_linux_sockaddr((struct sockaddr *)bsd_args.asa); if (error) return (error); - error = linux_sa_put(PTRIN(linux_args.addr)); + error = linux_sa_put(PTRIN(args->addr)); if (error) return (error); return (0); @@ -802,7 +775,6 @@ static int linux_getpeername(struct thread *td, struct linux_getpeername_args *args) { - struct linux_getpeername_args linux_args; struct getpeername_args /* { int fdes; caddr_t asa; @@ -810,17 +782,14 @@ } */ bsd_args; int error; - if ((error = copyin(args, &linux_args, sizeof(linux_args)))) - return (error); - - bsd_args.fdes = linux_args.s; - bsd_args.asa = (struct sockaddr *)PTRIN(linux_args.addr); - bsd_args.alen = (int *)PTRIN(linux_args.namelen); + bsd_args.fdes = args->s; + bsd_args.asa = (struct sockaddr *)PTRIN(args->addr); + bsd_args.alen = (int *)PTRIN(args->namelen); error = getpeername(td, &bsd_args); bsd_to_linux_sockaddr((struct sockaddr *)bsd_args.asa); if (error) return (error); - error = linux_sa_put(PTRIN(linux_args.addr)); + error = linux_sa_put(PTRIN(args->addr)); if (error) return (error); return (0); @@ -836,25 +805,20 @@ static int linux_socketpair(struct thread *td, struct linux_socketpair_args *args) { - struct linux_socketpair_args linux_args; struct socketpair_args /* { int domain; int type; int protocol; int *rsv; } */ bsd_args; - int error; - if ((error = copyin(args, &linux_args, sizeof(linux_args)))) - return (error); - - bsd_args.domain = linux_to_bsd_domain(linux_args.domain); + bsd_args.domain = linux_to_bsd_domain(args->domain); if (bsd_args.domain == -1) return (EINVAL); - bsd_args.type = linux_args.type; - bsd_args.protocol = linux_args.protocol; - bsd_args.rsv = (int *)PTRIN(linux_args.rsv); + bsd_args.type = args->type; + bsd_args.protocol = args->protocol; + bsd_args.rsv = (int *)PTRIN(args->rsv); return (socketpair(td, &bsd_args)); } @@ -868,7 +832,6 @@ static int linux_send(struct thread *td, struct linux_send_args *args) { - struct linux_send_args linux_args; struct sendto_args /* { int s; caddr_t buf; @@ -877,15 +840,11 @@ caddr_t to; int tolen; } */ bsd_args; - int error; - if ((error = copyin(args, &linux_args, sizeof(linux_args)))) - return (error); - - bsd_args.s = linux_args.s; - bsd_args.buf = (caddr_t)PTRIN(linux_args.msg); - bsd_args.len = linux_args.len; - bsd_args.flags = linux_args.flags; + bsd_args.s = args->s; + bsd_args.buf = (caddr_t)PTRIN(args->msg); + bsd_args.len = args->len; + bsd_args.flags = args->flags; bsd_args.to = NULL; bsd_args.tolen = 0; return sendto(td, &bsd_args); @@ -901,7 +860,6 @@ static int linux_recv(struct thread *td, struct linux_recv_args *args) { - struct linux_recv_args linux_args; struct recvfrom_args /* { int s; caddr_t buf; @@ -910,15 +868,11 @@ struct sockaddr *from; socklen_t fromlenaddr; } */ bsd_args; - int error; - if ((error = copyin(args, &linux_args, sizeof(linux_args)))) - return (error); - - bsd_args.s = linux_args.s; - bsd_args.buf = (caddr_t)PTRIN(linux_args.msg); - bsd_args.len = linux_args.len; - bsd_args.flags = linux_args.flags; + bsd_args.s = args->s; + bsd_args.buf = (caddr_t)PTRIN(args->msg); + bsd_args.len = args->len; + bsd_args.flags = args->flags; bsd_args.from = NULL; bsd_args.fromlenaddr = 0; return (recvfrom(td, &bsd_args)); @@ -927,28 +881,23 @@ static int linux_sendto(struct thread *td, struct linux_sendto_args *args) { - struct linux_sendto_args linux_args; struct msghdr msg; struct iovec aiov; int error; - if ((error = copyin(args, &linux_args, sizeof(linux_args)))) - return (error); - - if (linux_check_hdrincl(td, linux_args.s) == 0) + if (linux_check_hdrincl(td, args->s) == 0) /* IP_HDRINCL set, tweak the packet before sending */ - return (linux_sendto_hdrincl(td, &linux_args)); + return (linux_sendto_hdrincl(td, args)); - msg.msg_name = PTRIN(linux_args.to); - msg.msg_namelen = linux_args.tolen; + msg.msg_name = PTRIN(args->to); + msg.msg_namelen = args->tolen; msg.msg_iov = &aiov; msg.msg_iovlen = 1; msg.msg_control = NULL; msg.msg_flags = 0; - aiov.iov_base = PTRIN(linux_args.msg); - aiov.iov_len = linux_args.len; - error = linux_sendit(td, linux_args.s, &msg, linux_args.flags, - UIO_USERSPACE); + aiov.iov_base = PTRIN(args->msg); + aiov.iov_len = args->len; + error = linux_sendit(td, args->s, &msg, args->flags, UIO_USERSPACE); return (error); } @@ -964,7 +913,6 @@ static int linux_recvfrom(struct thread *td, struct linux_recvfrom_args *args) { - struct linux_recvfrom_args linux_args; struct recvfrom_args /* { int s; caddr_t buf; @@ -976,19 +924,16 @@ size_t len; int error; - if ((error = copyin(args, &linux_args, sizeof(linux_args)))) + if ((error = copyin(PTRIN(args->fromlen), &len, sizeof(size_t)))) return (error); - if ((error = copyin(PTRIN(linux_args.fromlen), &len, sizeof(size_t)))) - return (error); - - bsd_args.s = linux_args.s; - bsd_args.buf = PTRIN(linux_args.buf); - bsd_args.len = linux_args.len; - bsd_args.flags = linux_to_bsd_msg_flags(linux_args.flags); + bsd_args.s = args->s; + bsd_args.buf = PTRIN(args->buf); + bsd_args.len = args->len; + bsd_args.flags = linux_to_bsd_msg_flags(args->flags); /* XXX: */ - bsd_args.from = (struct sockaddr * __restrict)PTRIN(linux_args.from); - bsd_args.fromlenaddr = PTRIN(linux_args.fromlen);/* XXX */ + bsd_args.from = (struct sockaddr * __restrict)PTRIN(args->from); + bsd_args.fromlenaddr = PTRIN(args->fromlen);/* XXX */ linux_to_bsd_sockaddr((struct sockaddr *)bsd_args.from, len); error = recvfrom(td, &bsd_args); @@ -996,9 +941,9 @@ if (error) return (error); - if (linux_args.from) { + if (args->from) { error = linux_sa_put((struct osockaddr *) - PTRIN(linux_args.from)); + PTRIN(args->from)); if (error) return (error); } @@ -1014,19 +959,15 @@ static int linux_sendmsg(struct thread *td, struct linux_sendmsg_args *args) { - struct linux_sendmsg_args linux_args; struct msghdr msg; struct iovec *iov; int error; /* XXXTJR sendmsg is broken on amd64 */ - error = copyin(args, &linux_args, sizeof(linux_args)); + error = copyin(PTRIN(args->msg), &msg, sizeof(msg)); if (error) return (error); - error = copyin(PTRIN(linux_args.msg), &msg, sizeof(msg)); - if (error) - return (error); /* * Some Linux applications (ping) define a non-NULL control data @@ -1042,8 +983,7 @@ return (error); msg.msg_iov = iov; msg.msg_flags = 0; - error = linux_sendit(td, linux_args.s, &msg, linux_args.flags, - UIO_USERSPACE); + error = linux_sendit(td, args->s, &msg, args->flags, UIO_USERSPACE); free(iov, M_IOV); return (error); } @@ -1057,7 +997,6 @@ static int linux_recvmsg(struct thread *td, struct linux_recvmsg_args *args) { - struct linux_recvmsg_args linux_args; struct recvmsg_args /* { int s; struct msghdr *msg; @@ -1069,15 +1008,12 @@ /* XXXTJR recvmsg is broken on amd64 */ - if ((error = copyin(args, &linux_args, sizeof(linux_args)))) - return (error); - if ((error = copyin(PTRIN(args->msg), &msg, sizeof (msg)))) return (error); - bsd_args.s = linux_args.s; - bsd_args.msg = PTRIN(linux_args.msg); - bsd_args.flags = linux_to_bsd_msg_flags(linux_args.flags); + bsd_args.s = args->s; + bsd_args.msg = PTRIN(args->msg); + bsd_args.flags = linux_to_bsd_msg_flags(args->flags); if (msg.msg_name) { linux_to_bsd_sockaddr((struct sockaddr *)msg.msg_name, msg.msg_namelen); @@ -1094,7 +1030,7 @@ cmsg->cmsg_level = bsd_to_linux_sockopt_level(cmsg->cmsg_level); } - error = copyin(PTRIN(linux_args.msg), &msg, sizeof(msg)); + error = copyin(PTRIN(args->msg), &msg, sizeof(msg)); if (error) return (error); if (msg.msg_name && msg.msg_namelen > 2) @@ -1110,18 +1046,13 @@ static int linux_shutdown(struct thread *td, struct linux_shutdown_args *args) { - struct linux_shutdown_args linux_args; struct shutdown_args /* { int s; int how; } */ bsd_args; - int error; - if ((error = copyin(args, &linux_args, sizeof(linux_args)))) - return (error); - - bsd_args.s = linux_args.s; - bsd_args.how = linux_args.how; + bsd_args.s = args->s; + bsd_args.how = args->how; return (shutdown(td, &bsd_args)); } @@ -1136,7 +1067,6 @@ static int linux_setsockopt(struct thread *td, struct linux_setsockopt_args *args) { - struct linux_setsockopt_args linux_args; struct setsockopt_args /* { int s; int level; @@ -1146,21 +1076,18 @@ } */ bsd_args; int error, name; - if ((error = copyin(args, &linux_args, sizeof(linux_args)))) - return (error); - - bsd_args.s = linux_args.s; - bsd_args.level = linux_to_bsd_sockopt_level(linux_args.level); + bsd_args.s = args->s; + bsd_args.level = linux_to_bsd_sockopt_level(args->level); switch (bsd_args.level) { case SOL_SOCKET: - name = linux_to_bsd_so_sockopt(linux_args.optname); + name = linux_to_bsd_so_sockopt(args->optname); break; case IPPROTO_IP: - name = linux_to_bsd_ip_sockopt(linux_args.optname); + name = linux_to_bsd_ip_sockopt(args->optname); break; case IPPROTO_TCP: /* Linux TCP option values match BSD's */ - name = linux_args.optname; + name = args->optname; break; default: name = -1; @@ -1170,8 +1097,8 @@ return (ENOPROTOOPT); bsd_args.name = name; - bsd_args.val = PTRIN(linux_args.optval); - bsd_args.valsize = linux_args.optlen; + bsd_args.val = PTRIN(args->optval); + bsd_args.valsize = args->optlen; if (name == IPV6_NEXTHOP) { linux_to_bsd_sockaddr((struct sockaddr *)bsd_args.val, @@ -1195,7 +1122,6 @@ static int linux_getsockopt(struct thread *td, struct linux_getsockopt_args *args) { - struct linux_getsockopt_args linux_args; struct getsockopt_args /* { int s; int level; @@ -1205,21 +1131,18 @@ } */ bsd_args; int error, name; - if ((error = copyin(args, &linux_args, sizeof(linux_args)))) - return (error); - - bsd_args.s = linux_args.s; - bsd_args.level = linux_to_bsd_sockopt_level(linux_args.level); + bsd_args.s = args->s; + bsd_args.level = linux_to_bsd_sockopt_level(args->level); switch (bsd_args.level) { case SOL_SOCKET: - name = linux_to_bsd_so_sockopt(linux_args.optname); + name = linux_to_bsd_so_sockopt(args->optname); break; case IPPROTO_IP: - name = linux_to_bsd_ip_sockopt(linux_args.optname); + name = linux_to_bsd_ip_sockopt(args->optname); break; case IPPROTO_TCP: /* Linux TCP option values match BSD's */ - name = linux_args.optname; + name = args->optname; break; default: name = -1; @@ -1229,8 +1152,8 @@ return (EINVAL); bsd_args.name = name; - bsd_args.val = PTRIN(linux_args.optval); - bsd_args.avalsize = PTRIN(linux_args.optlen); + bsd_args.val = PTRIN(args->optval); + bsd_args.avalsize = PTRIN(args->optlen); if (name == IPV6_NEXTHOP) { error = getsockopt(td, &bsd_args); ==== //depot/projects/mips2/src/sys/dev/ath/if_athvar.h#6 (text+ko) ==== @@ -26,7 +26,7 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF * THE POSSIBILITY OF SUCH DAMAGES. * - * $FreeBSD: src/sys/dev/ath/if_athvar.h,v 1.65 2008/05/29 00:10:48 sam Exp $ + * $FreeBSD: src/sys/dev/ath/if_athvar.h,v 1.66 2008/09/09 16:21:25 rpaulo Exp $ */ /* @@ -506,7 +506,7 @@ #define ath_hal_getregdomain(_ah, _prd) \ (ath_hal_getcapability(_ah, HAL_CAP_REG_DMN, 0, (_prd)) == HAL_OK) #define ath_hal_setregdomain(_ah, _rd) \ - (*(uint16_t *)(((uint8_t *)(_ah)) + 520) = (_rd)) + (*(uint16_t *)(((uint8_t *)&(_ah)[1]) + 128) = (_rd)) #define ath_hal_getcountrycode(_ah, _pcc) \ (*(_pcc) = (_ah)->ah_countryCode) #define ath_hal_gettkipmic(_ah) \ ==== //depot/projects/mips2/src/sys/dev/drm/ati_pcigart.c#4 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/drm/ati_pcigart.c,v 1.5 2008/09/09 02:05:03 rnoland Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/drm/ati_pcigart.c,v 1.6 2008/09/09 02:18:37 rnoland Exp $"); /** @file ati_pcigart.c * Implementation of ATI's PCIGART, which provides an aperture in card virtual @@ -42,31 +42,86 @@ #define ATI_PCIE_WRITE 0x4 #define ATI_PCIE_READ 0x8 -static int drm_ati_alloc_pcigart_table(struct drm_device *dev, - struct drm_ati_pcigart_info *gart_info) +static void >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Wed Sep 10 01:01:11 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id DFFB11065673; Wed, 10 Sep 2008 01:01:10 +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 A4410106566C for ; Wed, 10 Sep 2008 01:01:10 +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 98C6C8FC08 for ; Wed, 10 Sep 2008 01:01:10 +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 m8A11AWd072082 for ; Wed, 10 Sep 2008 01:01:10 GMT (envelope-from gonzo@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m8A11Axk072075 for perforce@freebsd.org; Wed, 10 Sep 2008 01:01:10 GMT (envelope-from gonzo@FreeBSD.org) Date: Wed, 10 Sep 2008 01:01:10 GMT Message-Id: <200809100101.m8A11Axk072075@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 149504 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, 10 Sep 2008 01:01:11 -0000 http://perforce.freebsd.org/chv.cgi?CH=149504 Change 149504 by gonzo@gonzo_jeeves on 2008/09/10 01:00:40 Change type to text and revert $P4$ expansion Affected files ... .. //depot/projects/mips2/src/sys/contrib/dev/ath/public/mipsisa32-be-elf.hal.o.uu#5 edit Differences ... ==== //depot/projects/mips2/src/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 C28DE1065671; Wed, 10 Sep 2008 07:50:19 +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 86EEE106566C for ; Wed, 10 Sep 2008 07:50:19 +0000 (UTC) (envelope-from julian@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 743FB8FC1C for ; Wed, 10 Sep 2008 07:50:19 +0000 (UTC) (envelope-from julian@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 m8A7oJx3053860 for ; Wed, 10 Sep 2008 07:50:19 GMT (envelope-from julian@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m8A7oJYU053853 for perforce@freebsd.org; Wed, 10 Sep 2008 07:50:19 GMT (envelope-from julian@freebsd.org) Date: Wed, 10 Sep 2008 07:50:19 GMT Message-Id: <200809100750.m8A7oJYU053853@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to julian@freebsd.org using -f From: Julian Elischer To: Perforce Change Reviews Cc: Subject: PERFORCE change 149518 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, 10 Sep 2008 07:50:20 -0000 http://perforce.freebsd.org/chv.cgi?CH=149518 Change 149518 by julian@julian_trafmon1 on 2008/09/10 07:49:56 Show how to iterate through vnets Affected files ... .. //depot/projects/vimage/porting_to_vimage.txt#8 edit Differences ... ==== //depot/projects/vimage/porting_to_vimage.txt#8 (text+ko) ==== @@ -338,6 +338,35 @@ [...] } +/* + * A function which on entry has no idea of which vnet it is on + * and needs to look at them all for some reason. + * NOTE! if this code is running in a thread that + * does nothing else, or otherwise doesn't care about which + * vnet it is on then the steps that save and restore the previous vnet + * need not be done. (Marked with /* XXX */) + */ +void +foo_tick(void) +{ + VNET_ITERATOR_DECL(vnet_iter); + [...] + + [...] + VNET_LIST_REF(); + VNET_FOREACH(vnet_iter) { + CURVNET_SET(vnet_iter); + INIT_VNET_NET(vnet_iter); + [...] + do work, + including calling code that assumes we have curvnet set. + [...] + CURVNET_RESTORE(); /* XXX */ + } + VNET_LIST_UNREF(); + [...] +} + #if (defined(VIMAGE) || defined(FUTURE)) static int vnet_foo_iattach(const void *unused) { From owner-p4-projects@FreeBSD.ORG Wed Sep 10 07:53:23 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3BF041065676; Wed, 10 Sep 2008 07:53: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 F2C0D1065672 for ; Wed, 10 Sep 2008 07:53:22 +0000 (UTC) (envelope-from julian@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id DFCC48FC1B for ; Wed, 10 Sep 2008 07:53:22 +0000 (UTC) (envelope-from julian@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 m8A7rMN9076406 for ; Wed, 10 Sep 2008 07:53:22 GMT (envelope-from julian@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m8A7rMvU076400 for perforce@freebsd.org; Wed, 10 Sep 2008 07:53:22 GMT (envelope-from julian@freebsd.org) Date: Wed, 10 Sep 2008 07:53:22 GMT Message-Id: <200809100753.m8A7rMvU076400@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to julian@freebsd.org using -f From: Julian Elischer To: Perforce Change Reviews Cc: Subject: PERFORCE change 149519 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, 10 Sep 2008 07:53:23 -0000 http://perforce.freebsd.org/chv.cgi?CH=149519 Change 149519 by julian@julian_trafmon1 on 2008/09/10 07:53:03 some missing INIT_VNET_XXX calls Affected files ... .. //depot/projects/vimage/src/sys/contrib/pf/net/pf_subr.c#7 edit .. //depot/projects/vimage/src/sys/contrib/rdma/rdma_cma.c#3 edit Differences ... ==== //depot/projects/vimage/src/sys/contrib/pf/net/pf_subr.c#7 (text+ko) ==== @@ -127,6 +127,7 @@ u_int32_t pf_new_isn(struct pf_state *s) { + INIT_VNET_INET(curvnet); u_int32_t md5_buffer[4]; u_int32_t new_isn; struct pf_state_host *src, *dst; ==== //depot/projects/vimage/src/sys/contrib/rdma/rdma_cma.c#3 (text+ko) ==== @@ -48,8 +48,10 @@ #include #include +#include #include #include +#include #include #include @@ -1947,6 +1949,7 @@ static int cma_alloc_any_port(struct kvl *ps, struct rdma_id_private *id_priv) { + INIT_VNET_INET(curvnet); struct rdma_bind_list *bind_list; int port, ret; @@ -1991,6 +1994,7 @@ static int cma_use_port(struct kvl *ps, struct rdma_id_private *id_priv) { + INIT_VNET_INET(curvnet); struct rdma_id_private *cur_id; struct sockaddr_in *sin, *cur_sin; struct rdma_bind_list *bind_list; @@ -2910,6 +2914,7 @@ static int cma_init(void) { + INIT_VNET_INET(curvnet); int ret; LIST_INIT(&listen_any_list); From owner-p4-projects@FreeBSD.ORG Wed Sep 10 15:24:17 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id DADB1106567D; Wed, 10 Sep 2008 15:24: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 9D263106564A for ; Wed, 10 Sep 2008 15:24:16 +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 884518FC18 for ; Wed, 10 Sep 2008 15:24:16 +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 m8AFOGuo055631 for ; Wed, 10 Sep 2008 15:24:16 GMT (envelope-from rene@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m8AFOGnG055629 for perforce@freebsd.org; Wed, 10 Sep 2008 15:24:16 GMT (envelope-from rene@FreeBSD.org) Date: Wed, 10 Sep 2008 15:24:16 GMT Message-Id: <200809101524.m8AFOGnG055629@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 149532 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, 10 Sep 2008 15:24:17 -0000 http://perforce.freebsd.org/chv.cgi?CH=149532 Change 149532 by rene@rene_self on 2008/09/10 15:23:28 Finish translation of Advanced Networking chapter. Checked with make, aspell, and for whitespace. Affected files ... .. //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/advanced-networking/chapter.sgml#12 edit Differences ... ==== //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/advanced-networking/chapter.sgml#12 (text+ko) ==== @@ -3,7 +3,7 @@ $FreeBSD$ %SOURCE% en_US.ISO8859-1/books/handbook/advanced-networking/chapter.sgml - %SRCID% 1.413 (in progress) + %SRCID% 1.413 --> @@ -120,11 +120,11 @@ een gateway. Het paar geeft aan dat door deze gateway gecommuniceerd moet worden om bij deze bestemming aan te komen. Er zijn drie - bestemmingssoorten: individuele host, subnetten en + soorten bestemmingen: individuele host, subnetten en standaard. De standaardroute wordt gebruikt indien geen van de andere routes van toepassing zijn. Verderop wordt verder op standaardroutes ingegaan. Er zijn ook - drie soorten geteways: individuele hosts, interfaces (ook wel + drie soorten gateways: individuele hosts, interfaces (ook wel verbindingen genoemd), en Ethernet-hardware-adressen (MAC-adressen). @@ -365,7 +365,7 @@ Een veelvoorkomende vraag is Waarom (of hoe) moet - worden inesteld dat T1-GW de standaard gateway + worden ingesteld dat T1-GW de standaard gateway is voor Lokaal1, in plaats van de server van de internetprovider waarmee het verbonden is?. @@ -438,10 +438,10 @@ term wordt echt alleen gebruikt om naar een machine te verwijzen die in twee LAN's zit. - In het ene geval heeft de machine twee Ethernet-kaarten, + In het ene geval heeft de machine twee Ethernetkaarten, waarbij elke kaart een adres op de gescheiden subnetten heeft. Een alternatief is dat de machine slechts één - Ethernet-kaart heeft en gebruikt maakt van &man.ifconfig.8; + Ethernetkaart heeft en gebruikt maakt van &man.ifconfig.8; aliasing. Het eerste wordt gebruikt indien er twee fysiek gescheiden Ethernet-netwerken in gebruik zijn, het laatste indien er één fysiek netwerksegment is, maar er @@ -582,7 +582,7 @@ route voor 192.168.2.0/24. Een manier om dit te verhelpen is om de route handmatig toe te voegen. Het volgende commando voegt het netwerk Intern Net 2 - toe aan de routeertabe van RouterA door + toe aan de routeertabel van RouterA door 192.168.1.2 als de volgende hop te gebruiken: @@ -651,7 +651,7 @@ Het is al bekend dat routeertabellen aangemaakt kunnen worden zodat al het verkeer voor een bepaalde adresruimte (in ons voorbeeld een klasse-C subnet) naar een bepaalde host op dat - netwerk gezonden kan worden, dat de ingaande paketten doorgeeft. + netwerk gezonden kan worden, dat de ingaande pakketten doorgeeft. Wanneer een adresruimte aan een site wordt toegewezen, stelt @@ -667,7 +667,7 @@ door het land en over de wereld sturen. Elke backbone-machine heeft een kopie van een master-verzameling van tabellen, die verkeer voor een bepaald netwerk naar een bepaalde - backbone-carrier sturen, en vandaaruit naar een keten van + backbone-carrier sturen, en van daaruit naar een keten van serviceproviders totdat het het netwerk van de site bereikt. @@ -682,8 +682,8 @@ traceroute - Soms is er een probeem met routepropagatie en kunnen sommige - sites geen verbinding maken. Misschien is het nuttigste + Soms is er een probleem met routepropagatie en kunnen + sommige sites geen verbinding maken. Misschien is het nuttigste commando om proberen uit te zoeken waar het routen misgaat &man.traceroute.8;. Het is ook nuttig als er geen verbinding mogelijk lijkt met een verre machine (dus als &man.ping.8; @@ -727,11 +727,11 @@ Sinds &os; 7.0 is het multicast-routeer-daemon &man.mrouted.8; uit het basissysteem verwijderd. Het - implementeert het multicast-routeer-protocol DVRMP - , welke in veel multicast-installaties grotendeels - is vervangen door &man.pim.4;. De gerelateerde gereedschappen - &man.map-mbone.8; en &man.mrinfo.8; zijn ook verwijderd. Deze - programma's zijn nu beschikbaar in de &os; + implementeert het multicast-routeer-protocol + DVRMP, welke in veel multicast-installaties + grotendeels is vervangen door &man.pim.4;. De gerelateerde + gereedschappen &man.map-mbone.8; en &man.mrinfo.8; zijn ook + verwijderd. Deze programma's zijn nu beschikbaar in de &os; Ports Collectie als net/mrouted. @@ -803,8 +803,8 @@ Afgezien van de onderliggende zendtechnieken beschikken 802.11-netwerken over een verscheidenheid aan beveiligingstechnieken. De originele 802.11-specificaties - definieerden een envoudig beveiligingsprotocol genaamd WEP. Dit - protocol maakt gebruik van een vaste, van te voren gedeelde + definieerden een eenvoudig beveiligingsprotocol genaamd WEP. + Dit protocol maakt gebruik van een vaste, van te voren gedeelde sleutel en het cryptografische algoritme RC4 om de gegevens die over het netwerk verstuurd worden te coderen. Alle stations dienen dezelfde sleutel te gebruiken om te kunnen communiceren. @@ -834,19 +834,19 @@ Afgezien van de bovenstaande protocolstandaarden is de andere belangrijke standaard waarvan bewustzijn belangrijk is 802.11e. Deze standaard definieert het opstellen van - multi-mediatoepassingen zoals gestroomde video en voice over IP + multimediatoepassingen zoals gestroomde video en voice over IP (VoIP) binnen een 802.11-netwerk. Net als 802.11i heeft ook 802.11e een voorgaande specificatie genaamd WME (later hernoemd tot WMM) die door een industriegroep is gedefinieerd als een - deelverzameling van 802.11e die nu kan worden gebruikt om multi- - mediatoepassingen mogelijk te maken terwijl er gewacht wordt op - de uiteindelijke ratificatie van 802.11e. Het belangrijkste om - over 802.11e en WME/WMM te weten is dat ze gepriotiseerd - verkeersgebruik van een draadloos netwerk mogelijk maken door - middel van Quality of Service (QoS) protocollen en protocollen - voor verbeterde mediatoegang. Een juiste implementatie van deze - protocollen maken snelle gegevensbursts en gepriotiseerde - verkeersstromen mogelijk. + deelverzameling van 802.11e die nu kan worden gebruikt om + multimediatoepassingen mogelijk te maken terwijl er gewacht + wordt op de uiteindelijke ratificatie van 802.11e. Het + belangrijkste om over 802.11e en WME/WMM te weten is dat ze + gepriotiseerd verkeersgebruik van een draadloos netwerk mogelijk + maken door middel van Quality of Service (QoS) protocollen en + protocollen voor verbeterde mediatoegang. Een juiste + implementatie van deze protocollen maken snelle gegevensbursts + en gepriotiseerde verkeersstromen mogelijk. Sinds versie 6.0 ondersteunt &os; netwerken die met 802.11a, 802.11b, en 802.11g werken. Ook worden de @@ -871,7 +871,7 @@ Ten eerste is een draadloos netwerkapparaat nodig. De meestgebruikte apparaten zijn degenen die onderdelen van - Atheros gebruiken. Deze apparaten worden onderteund door het + Atheros gebruiken. Deze apparaten worden ondersteund door het stuurprogramma &man.ath.4; en voor hen dient de volgende regel aan het bestand /boot/loader.conf toegevoegd te worden: @@ -914,7 +914,7 @@ &man.wlan.4;, wlan_scan_ap en wlan_scan_sta; de module &man.wlan.4; wordt automatisch geladen met het stuurprogramma voor draadloze - apparaten, de overige modeules dienen tijdens het opstarten + apparaten, de overige modules dienen tijdens het opstarten geladen te worden via het bestand /boot/loader.conf: @@ -1063,7 +1063,7 @@ Korte preambule. Geeft aan dat het netwerk korte - preambules gebruikt (gedefineerd in 802.11b Hoge + preambules gebruikt (gedefinieerd in 802.11b Hoge Snelheid/DSSS PHY, korte preambule gebruikt een 56-bits synchronisatieveld in tegenstelling tot een 128-bits dat bij lange preambules wordt gebruikt). @@ -1091,7 +1091,7 @@ de adapter of handmatig met een verzoek. Oude gegevens worden automatisch uit de cache verwijderd, dus kan deze lijst na verloop van tijd korter - worde tenzij er meer scanverzoeken gedaan worden. + worden tenzij er meer scanverzoeken gedaan worden. @@ -1168,11 +1168,11 @@ staat doe dat elk station aan het netwerk deelneemt en communiceert. Deze manier van authenticatie dient gebruikt te worden voor testdoeleinden tijdens het voor de - eesrte keer opzetten van een draadloos netwerk. Andere + eerste keer opzetten van een draadloos netwerk. Andere schema's vereisen dat cryptografische overeenkomsten voltooid worden voordat gegevensverkeer kan stromen; ofwel door vooraf gedeelde sleutels of geheimen te gebruiken, of - door complexere schema's te gebruiken welke acherliggende + door complexere schema's te gebruiken welke achterliggende diensten zoals RADIUS betrekken. De meeste gebruikers zullen open authenticatie gebruiken welke de standaardinstelling is. De dan meest voorkomende @@ -1201,23 +1201,23 @@ compatibiliteit met verouderde apparaten) is het beter om WEP met open authenticatie te gebruiken. Meer informatie met betrekking tot WEP kan - gevonden worden in - . + gevonden worden in . + Een IP-adres verkrijgen met DHCP - Nadat het toeganspunt is gekozen en de parameters voor - de authenticatie zijn ingesteld, dient er een IP-adres ter - communicatie verkregen worden. In de meeste gevallen - wordt het draadloze IP-adres verkregen via DHCP. Om dat - te bereiken, dient /etc/rc.conf - bewerkt te worden en DHCP aan de - instellingen voor het apparaat toegevoegd te worden zoals - in de verschillende bovenstaande voorbeelden is laten zien - : + Nadat het toegangspunt is gekozen en de parameters + voor de authenticatie zijn ingesteld, dient er een + IP-adres ter communicatie verkregen worden. In de meeste + gevallen wordt het draadloze IP-adres verkregen via DHCP. + Om dat te bereiken, dient + /etc/rc.conf bewerkt te worden en + DHCP aan de instellingen voor het + apparaat toegevoegd te worden zoals in de verschillende + bovenstaande voorbeelden is laten zien: ifconfig_ath0="DHCP" @@ -1263,7 +1263,7 @@ ifconfig_ath0="ssid uw_ssid_hier inet 192.168.1.100 netmask 255.255.255.0" - + WPA @@ -1278,7 +1278,7 @@ TKIP (Temporary Key Integrity Protocol), een sleutel dat de basis-RC4-sleutel welke door WEP wordt gebruikt uitbreidt door integriteitscontroles, knoeidetectie, en maatregelen om - op elke gedectecteerde inbraak te reageren toe te voegen. + op elke gedetecteerde inbraak te reageren toe te voegen. TKIP is ontworpen om op verouderde hardware met enkel wijzigingen in software te draaien; het representeert een compromis dat de veiligheid verbetert maar nog steeds niet @@ -1338,8 +1338,8 @@ Daarna zal in /etc/rc.conf worden aangegeven dat de draadloze configuratie met WPA zal - gebeuren en dat het IP-adres met DHCP zal worden verkregen - : + gebeuren en dat het IP-adres met DHCP zal worden verkregen: + ifconfig_ath0="WPA DHCP" @@ -1711,7 +1711,7 @@ - Dit veld bevat de parameters voor de eeerste fase + Dit veld bevat de parameters voor de eerste fase van de authenticatie (de TLS-tunnel). Afhankelijk van de gebruikte authenticatieserver moet er een specifiek label voor de authenticatie worden opgegeven. In de @@ -1858,8 +1858,8 @@ De I in de uitvoer bevestigt dat machine A in ad-hoc-modus verkeert. Het is slechts - nodig om B met een ander IP-adres in te stellen - : + nodig om B met een ander IP-adres in te stellen: + &prompt.root; ifconfig ath0 ssid freebsdap mediaopt adhoc inet 192.168.0.2 netmask 255.255.255.0 &prompt.root; ifconfig ath0 @@ -1896,7 +1896,7 @@ linkend="network-wireless-basic">. - Momenteel staan de NDIS-stuurpgrogrammawrapper en de + Momenteel staan de NDIS-stuurprogrammawrapper en de stuurprogramma's van &windows; het werken als AP niet toe. Alleen originele draadloze &os;-stuurprogramma's ondersteunen AP-modus. @@ -1912,7 +1912,7 @@ Deze uitvoer geeft de mogelijkheden van de kaart weer, het woord HOSTAP bevestigt dat deze draadloze - kaart als toeganspunt kan functioneren. Ook worden + kaart als toegangspunt kan functioneren. Ook worden verschillende ondersteunde versleutelmethoden genoemd: WEP, TKIP, WPA2, enz., deze informatie is belangrijk om te weten welke beveiligingsprotocollen ingesteld kunnen worden op het @@ -1940,7 +1940,7 @@ interface in hostgebaseerde toegangspuntmodus draait. Het instellen van de interface kan automatisch tijdens het - opstarten gedaan worde door de volgende regel aan + opstarten gedaan worden door de volgende regel aan /etc/rc.conf toe te voegen: ifconfig_ath0="ssid freebsdap mode 11g mediaopt hostap inet 192.168.0.1 netmask 255.255.255.0" @@ -1965,7 +1965,7 @@ freebsdap 00:11:95:c3:0d:ac 1 54M 22:1 100 ES De cliëntmachine heeft het AP gevonden en kan ermee - geassocieeerd worden: + geassocieerd worden: &prompt.root; ifconfig ath0 ssid freebsdap inet 192.168.0.2 netmask 255.255.255.0 &prompt.root; ifconfig ath0 @@ -1983,7 +1983,7 @@ WPA hostgebaseerde toegangspunt Deze sectie zal zich richten op opzetten van een &os; - toegangspunt dat het beveilingsprotocol WPA gebruikt. Meer + toegangspunt dat het beveiligingsprotocol WPA gebruikt. Meer details over WPA en het instellen van op WPA gebaseerde draadloze cliënten kan gevonden worden in . @@ -2028,8 +2028,8 @@ - Dit veld geeft aan welke draadloze inteface voor het - toegangspunt wordt gebruikt. + Dit veld geeft aan welke draadloze interface voor + het toegangspunt wordt gebruikt. @@ -2052,7 +2052,7 @@ De regel ctrl_interface_group stelt de groep in (hier is het de groep wheel) die toegang heeft tot de - control interfacebestanden. + controle interfacebestanden. @@ -2067,7 +2067,7 @@ ASCII-wachtwoord voor de WPA-authenticatie. - Gebruik altijd sterke wachtwoorden welke voldoende + Gebruik altijd sterke wachtwoorden welke voldoende lang zijn en opgebouwd zijn uit een grote tekenverzameling zodat ze niet gemakkelijk worden geraden of aangevallen. @@ -2087,8 +2087,8 @@ TKIP (WPA) en CCMP (WPA2) geaccepteerd. De versleuteling CCMP is een alternatief voor TKIP en wordt sterk aangeraden indien mogelijk; TKIP dient alleen - gebruikt te worden voor stations die geen CCMP aankunnen - . + gebruikt te worden voor stations die geen CCMP aankunnen. + @@ -2147,7 +2147,7 @@ Het wepkey geeft aan dat de - geselecterde WEP-sleutel wordt ingesteld. Het dient in + geselecteerde WEP-sleutel wordt ingesteld. Het dient in het formaat index:key te zijn, indien de index niet is gegeven, wordt sleutel 1 gebruikt. Dus indien een andere @@ -2243,7 +2243,7 @@ zijn geïdentificeerd moeten identificeren. Let erop dat sommige fouten worden geïdentificeerd in de apparaatstuurprogramma's die onder de 802.11 laag liggen - zodat ze niet verschijnen. Voor het diagnoseren van + zodat ze niet verschijnen. Voor het diagnosticeren van apparaatspecifieke problemen dient de documentatie van het stuurprogramma geraadpleegd te worden. @@ -2527,7 +2527,7 @@ Het RFCOMM-protocol biedt emulatie van seriële poorten over het L2CAP-protocol. Het protocol is gebaseerd op de - ETSI-standaard TS 07.10. RFCOMM is een envoudig + ETSI-standaard TS 07.10. RFCOMM is een eenvoudig transportprotocol, met aanvullende voorzieningen om de 9 circuits van RS-232- (EIATIA-232-E-) seriële poorten te emuleren. Het RFCOMM-protocol ondersteunt tot 60 gelijktijdige @@ -2606,7 +2606,7 @@ apparaat worden geïnitialiseerd. Op &os; 5.5, 6.1, en nieuwer kan de volgende regel aan - het bestand /etc/rc.conf worden toegvoegd + het bestand /etc/rc.conf worden toegevoegd om hcsecd automatisch met het systeem op te starten: @@ -2868,7 +2868,7 @@ &prompt.root; rfcomm_sppd -a 00:07:E0:00:0B:CA -t /dev/ttyp6 rfcomm_sppd[94692]: Starting on /dev/ttyp6... - Als er een verbinding is, kan de pseudotty als seriële + Als er een verbinding is, kan de pseudo-tty als seriële poort worden gebruikt: &prompt.root; cu -l ttyp6 @@ -2939,7 +2939,7 @@ De bridge werkt door de adressen van de MAC-laag - (Ethernet-adressen) van de apparaten op elke netwerkinterface + (Ethernetadressen) van de apparaten op elke netwerkinterface te leren. Het stuurt alleen verkeer tussen twee netwerken door indien de bron en het doel zich op verschillende netwerken bevinden. @@ -3074,16 +3074,16 @@ root id 00:00:00:00:00:00 priority 0 ifcost 0 port 0 Een bridge-interface is aangemaakt en er is automatisch een - random gegenereerd Ethernet-adres aan toegekend. De parameters + random gegenereerd Ethernetadres aan toegekend. De parameters maxaddr en timeout bepalen hoeveel MAC-adressen de bridge in de doorstuurtabel houdt en hoeveel seconden voordat elke regel wordt verwijderd nadat het voor het laatst gezien is. De andere parameters bepalen hoe Spanning Tree werkt. - Voeg de netwerk-interfaces die lid zijn aan de bridge toe. + Voeg de netwerkinterfaces die lid zijn aan de bridge toe. Om de bridge pakketten te laten doorsturen dienen alle - lid-interfaces en de bridge actief te zijn: + lidinterfaces en de bridge actief te zijn: &prompt.root; ifconfig bridge0 addm fxp0 addm fxp1 up &prompt.root; ifconfig fxp0 up @@ -3102,7 +3102,7 @@ Indien de bridge-gastheer een IP-adres nodig heeft dan is de juiste plaats om dit in te stellen op de bridge-interface zelf - in plaats van op een van de lid-interfaces. Dit kan statisch of + in plaats van op een van de lidinterfaces. Dit kan statisch of via DHCP worden ingesteld: &prompt.root; ifconfig bridge0 inet 192.168.0.1/24 @@ -3121,7 +3121,7 @@ passeren, op de bridge-interface en outbound op de bestemde interface. Elke stap kan uitgezet worden. Wanneer de richting van het pakketverkeer belangrijk is, kan de firewall het beste - op de lid-interfaces draaien en niet op de bridge zelf. + op de lidinterfaces draaien en niet op de bridge zelf. De bridge heeft verschillende aanpasbare instellingen voor het doorlaten van non-IP- en ARP-pakketten, en een laag 2 @@ -3176,7 +3176,7 @@ - Spanning Tree kan op lid-interfaces worden geactiveerd met + Spanning Tree kan op lidinterfaces worden geactiveerd met het commando stp. Voor een bridge met fxp0 en fxp1 ale huidige interfaces, wordt STP met het volgende geactiveerd: @@ -3199,7 +3199,7 @@ 00:01:02:4b:d4:50 en prioriteit 32768. Aangezien het root id hetzelfde is geeft dit aan dat dit de - hoofd-bridge voor de boom is. + hoofdbridge voor de boom is. Een andere bridge in het netwerk heeft spanning tree ook geactiveerd: @@ -3217,10 +3217,10 @@ role designated state forwarding De reegl root id 00:01:02:4b:d4:50 priority 32768 - ifcost 400000 port 4 geeft aan dat de hoofd-bridge + ifcost 400000 port 4 geeft aan dat de hoofdbridge 00:01:02:4b:d4:50 is zoals boven en dat de padkosten 400000 zijn vanaf deze bridge, het - pad naar de hoofd-bridge gaat via port 4 + pad naar de hoofdbridge gaat via port 4 welke fxp0 is. @@ -3230,14 +3230,14 @@ Verkeersstromen reconstrueren - De bridge ondersteunt monitor-modus, waarin de pakketten + De bridge ondersteunt monitormodus, waarin de pakketten worden verwijderd nadat ze door &man.bpf.4; zijn verwerkt, en ze niet verder verwerkt of doorgestuurd worden. Dit kan worden gebruikt om de invoer van twee of meer interfaces naar een enkele &man.bpf.4;-stroom te multiplexen. Dit is nuttig voor het reconstrueren van het verkeer voor netwerktaps welke - de RX/TX-signalen over twee verschillende interfaces uitzenden - . + de RX/TX-signalen over twee verschillende interfaces uitzenden. + Om de invoer van vier netwerkinterfaces als één stroom te lezen: @@ -3253,10 +3253,10 @@ wordt er een kopie naar de aangewezen SPAN-poort verstuurd. Het aantal geconfigureerde SPAN-poorten op een bridge is onbeperkt, indien een interface aangewezen is als SPAN-poort - kan het niet ook als gewone bridge-poort gebruikt worden. Dit + kan het niet ook als gewone bridgepoort gebruikt worden. Dit is het nuttigste voor het passief afluisteren van een gebridged netwerk op een andere host die met een van de - SPAN-poorten van de brdige verbonden is. + SPAN-poorten van de bridge verbonden is. Om een kopie van alle frames naar het interface fxp4 te versturen: @@ -3270,7 +3270,7 @@ Een privé-interface stuurt geen verkeer door naar poorten die niet ook een privé-interface zijn. Het verkeer wordt onvoorwaardelijk geblokkeerd, dus worden er - geen Ethernet-frames doorgestuurd, inclusief ARP. Indien + geen Ethernetframes doorgestuurd, inclusief ARP. Indien verkeer selectief dient te worden geblokkeerd dient er in plaats hiervan een firewall gebruikt te worden. @@ -3278,16 +3278,15 @@ Klevende interfaces - Indien een lid-interface van een bridge als klevend is + Indien een lidinterface van een bridge als klevend is gemarkeerd worden dynamisch geleerde adresregels als statisch behandelt wanneer ze in de doorstuurcache komen. Klevende - interfaces vallen nooit uit de cache en worden nooit vervangen - , zelfs niet als het adres op een andere interface wordt - gezien. Dit biedt het voordeel van statische adresregels - zonder dat de doorstuurtabel van te voren gevuld hoeft te - worden, cliënten die geleerd zijn op een bepaald segment - van de bridge kunnen niet roamen naar een ander segment. - + interfaces vallen nooit uit de cache en worden nooit vervangen, + zelfs niet als het adres op een andere interface wordt gezien. + Dit biedt het voordeel van statische adresregels zonder dat de + doorstuurtabel van te voren gevuld hoeft te worden, + cliënten die geleerd zijn op een bepaald segment van de + bridge kunnen niet roamen naar een ander segment. Een ander voorbeeld voor het gebruik van klevende adressen zou het combineren van de bridge met VLANs zijn om een router @@ -3310,8 +3309,8 @@ vangen. Alle communicatie tussen de VLANs kan geblokkeerd worden - door het gebruik van privé-interfaces (of een firewall) - : + door het gebruik van privé-interfaces (of een firewall): + &prompt.root; ifconfig bridge0 private vlan100 private vlan101 @@ -3330,7 +3329,7 @@ Het volgende voorbeeld stelt het maximum aantal - Ethernet-apparaten voor KlantA op vlan100 in op 10. @@ -3343,18 +3342,18 @@ De bridge-interface en STP-parameters kunnen gemonitord worden via het SNMP-daemon dat met het basis &os;-systeem wordt meegeleverd. De geëxporteerde bridge-MIBs houden - zich an de standaarden van de IETF zodat elke SNMP-cliënt - of monitorpakket kan worden gebruikt om de gegevens te - verzamelen. + zich aan de standaarden van de IETF zodat elke + SNMP-cliënt of monitorpakket kan worden gebruikt om de + gegevens te verzamelen. Op de bridge-machine dient de regel begemotSnmpdModulePath."bridge" = "/usr/lib/snmp_bridge.so" van /etc/snmp.config geactiveerd te worden en - het daemon bsnmpd gestart te worden - . Andere instellingen zoals gemeenschapsnamen en - toegangslijsten dienen eventueel aangepast te worden. Zie - &man.bsnmpd.1; en &man.snmp.bridge.3; voor meer informatie. + het daemon bsnmpd gestart te worden. + Andere instellingen zoals gemeenschapsnamen en toegangslijsten + dienen eventueel aangepast te worden. Zie &man.bsnmpd.1; en + &man.snmp.bridge.3; voor meer informatie. Het volgende voorbeeld gebruikt de software @@ -3431,11 +3430,11 @@ - + Andrew Thompson Geschreven door - + @@ -3470,14 +3469,14 @@ failover - Zendt en ontvangt vekeer alleen door de meesterpoort. + Zendt en ontvangt verkeer alleen door de meesterpoort. Wanneer de meesterpoort niet beschikbaar is, wordt de volgende actieve poort gebruikt. De eerste toegevoegde interface is de meesterpoort; alle interfaces die hierna zijn toegevoegd worden gebruikt als failover-apparaten. - - + + fec @@ -3495,7 +3494,7 @@ hash bevat het Ethernet bron- en doeladres, en indien beschikbaar, de VLAN-tag, en de IPv4/IPv6 bron- en doeladressen. - + @@ -3521,7 +3520,7 @@ hash bevat het Ethernet bron- en doeladres, en indien beschikbaar, de VLAN-tag, en de IPv4/IPv6 bron- en doeladressen. - + @@ -3530,8 +3529,8 @@ Dit is een alias van de fec modus. - - + + roundrobin @@ -3542,7 +3541,7 @@ accepteert inkomend verkeer van elke actieve poort. Deze modus schendt Ethernet frame-ordering en dient met zorg gebruikt te worden. - + @@ -3556,8 +3555,8 @@ Dit voorbeeld verbindt twee interfaces op een &os;-machine met de switch als een enkele loadgebalanceerde en fout-tolerante verbinding. Er kunnen meer interfaces worden - toegevoegd om de doorvoer en fout-tolerantie te verhogen. - Aangezien frame-ordering verplicht is op Ethernet-verbindingen + toegevoegd om de doorvoer en fouttolerantie te verhogen. + Aangezien frame-ordering verplicht is op Ethernetverbindingen stroomt al het verkeer tussen twee stations altijd over dezelfde fysieke verbinding zodat de maximum snelheid beperkt wordt tot die van één interface. Het @@ -3580,7 +3579,7 @@ Maak op de &os;-machine de lagg-interface aan. - &prompt.root; ifconfig lagg0 create + &prompt.root; ifconfig lagg0 create &prompt.root; ifconfig lagg0 up laggproto lacp laggport fxp0 laggport fxp1 Bekijk de interfacestatus van ifconfig; poorten die als @@ -3674,8 +3673,8 @@ Een &os;-machine kan over het netwerk opstarten en zonder een plaatselijke schijf werken, door gebruik te maken van bestandssystemen die van een NFS-server - gemount worden. Er zijn geen systeemwijzigingen nodig anders dan - de standaard instellingenbestanden. Dit soort systemen is + aangekoppeld worden. Er zijn geen systeemwijzigingen nodig anders + dan de standaard instellingenbestanden. Dit soort systemen is relatief eenvoudig op te zetten omdat alle noodzakelijke elementen al aanwezig zijn: @@ -3750,7 +3749,7 @@ versies die specifiek zijn voor een schijfloos systeem of, mogelijk, door het werkstation horen waar ze bij horen. - De delen van het root-bestandssysteem die schrijfbaar + De delen van het root-bestandssysteem die beschrijfbaar moeten zijn, zijn overdekt met &man.md.4; bestandssystemen. Alle veranderingen gaan verloren indien het systeem opnieuw wordt opgestart. @@ -3789,7 +3788,7 @@ - Foutmeldingen zijn vaak cryptisch of gheel afwezig. + Foutmeldingen zijn vaak cryptisch of geheel afwezig. @@ -4087,7 +4086,7 @@ apparaatsoort hangt af van het - soort Ethernet-kaart dat in het schijfloze werkstation + soort Ethernetkaart dat in het schijfloze werkstation aanwezig is. Raadpleeg het bestand NIC in dezelfde map om het juiste apparaatsoort te bepalen. @@ -4143,7 +4142,7 @@ - Maak een map aan vanwaaruit + Maak een map aan van waaruit tftpd de bestanden serveert, bijvoorbeeld /tftpboot. @@ -4197,7 +4196,7 @@ Exporteer het bestandssysteem waar de schijfloze root-map zich bevindt door het volgende aan /etc/exports toe te voegen (pas het - mountpunt van het volume aan en vervang + aankoppelpunt van het volume aan en vervang margaux corbieres door de namen van de schijfloze werkstations): @@ -4227,8 +4226,8 @@ kernelinstellingen - Indien Etherboot gebruikt wordt - , is het nodig om een kernelinstellingenbestand voor de + Indien Etherboot gebruikt wordt, + is het nodig om een kernelinstellingenbestand voor de schijfloze cliënt met de volgende opties (naast de gebruikelijke) aan te maken: @@ -4237,15 +4236,15 @@ options BOOTP_NFSROOT # NFS-mount het root-bestandssysteem door gebruik te maken van de informatie van BOOTP - Het kan ook gewenst zijn om BOOTP_NFSV3 - , BOOT_COMPAT, en + Het kan ook gewenst zijn om BOOTP_NFSV3, + BOOT_COMPAT, en BOOTP_WIRED_TO te gebruiken (raadpleeg hiervoor NOTES). De namen van deze opties zijn historisch en enigszins misleidend aangezien ze eigenlijk onverschillig gebruik van DHCP en BOOTP in de kernel mogelijk maken - (het is ook mogelijk om strict gebruik van BOOTP of + (het is ook mogelijk om strikt gebruik van BOOTP of DHCP te forceren). De kernel dient gebouwd te worden (zie Indien PXE gebruikt wordt, is het - bouwen van een kernel met bovenstaande opties niet strict + bouwen van een kernel met bovenstaande opties niet strikt noodzakelijk (maar wel aangeraden). Door deze opties aan te zetten zullen er meer verzoeken voor DHCP tijdens het opstarten van de kernel verstuurd worden, met in @@ -4272,8 +4271,8 @@ Om laadbaar te zijn met Etherboot, dienen de - apparaataanwijzingen in de kenel gecompileerd te worden. - Normaalgesporekn wordt hiervoor de volgende optie in het + apparaataanwijzingen in de kernel gecompileerd te worden. + Normaalgesproken wordt hiervoor de volgende optie in het instellingenbestand gebruikt (zie het instellingencommentaarbestand NOTES): @@ -4331,10 +4330,10 @@ De kernel biedt geen ondersteuning om swapruimte via NFS tijdens het opstarten aan te zetten. De swapruimte moet door de opstartscripts worden aangezet, - door een beschrijfbaar bestandssysteem te mounten en een - wisselbestand aan te maken en aan te zetten. De volgende - opdracht maakt een wisselbestand van de juiste grootte aan: - + door een beschrijfbaar bestandssysteem aan te koppelen en + een wisselbestand aan te maken en aan te zetten. De + volgende opdracht maakt een wisselbestand van de juiste + grootte aan: &prompt.root; dd if=/dev/zero of=/pad/naar/wisselbestand bs=1k count=1 oseek=100000 @@ -4380,7 +4379,7 @@ verschillen in de groottes van grote/kleine integers. Een oplossing voor dit probleem is om een map van de niet-&os;-server te exporteren, deze map op een &os;-machine - te mounten, en &man.devfs.5; te gebruiken om de + aan te koppelen, en &man.devfs.5; te gebruiken om de apparaatknooppunten transparant voor de gebruiker toe te wijzen. @@ -4471,8 +4470,8 @@ De ondersteunde passieve ISDN-kaarten zijn meestal uitgerust - met de Infineon (voormalig Siemens) ISAC/HSCX/IPAC ISDN-chipsets - , maar ook worden ISDN-kaarten ondersteund met chips van Cologne + met de Infineon (voormalig Siemens) ISAC/HSCX/IPAC ISDN-chipsets, + maar ook worden ISDN-kaarten ondersteund met chips van Cologne Chip (alleen ISA-bus), PCI-kaarten met Winbond W6692-chips, enkele kaarten met combinaties van Tiger300/320/ISAC chipsets en enkele kaarten die gebaseerd zijn op fabrikantspecifieke @@ -4536,7 +4535,7 @@ wordt voor hun mogelijkheden en stabiliteit van de verbinding. Dit maakt het mogelijk om gemakkelijk om op een &os;-machine van een modem naar ISDN over te gaan, indien PPP reeds is ingesteld. - Echter, dezelfde probolemen die er waren met het PPP-programma + Echter, dezelfde problemen die er waren met het PPP-programma zullen blijven voorkomen. Indien maximale stabiliteit gewenst is, dient de kernel @@ -4582,7 +4581,7 @@ synchroon/asynchroon niet. Interne TA's hebben simpelweg een seriële poortchip van een standaard PC ingebouwd. Dit ontlast de gebruiker alleen van het kopen van nog een - seriële kabel en het vinden van nog een leeg electronisch + seriële kabel en het vinden van nog een leeg elektronisch uitbreidingsslot. Een synchrone kaart met een TA is minstens zo snel als een @@ -4615,9 +4614,9 @@ worden gebruikt. Aangezien de prijzen van eenvoudige ISDN-routers/-bridges - zakken, zal dit waarshijnlijk een steeds populairdere keuze + zakken, zal dit waarschijnlijk een steeds populairdere keuze worden. Een ISDN-router is en kleine doos die direct in het - plaatselijke Ethernet-netwerk geprikt wordt, en zijn eigen + plaatselijke Ethernetnetwerk geprikt wordt, en zijn eigen verbinding met de andere bridge/router beheert. Het heeft ingebouwde software om via PPP en andere populaire protocollen te communiceren. @@ -4627,10 +4626,9 @@ gebruiken. Het grootste probleem met ISDN-routers en -bridges is dat - samenwerking tussen fabrikanten nog steeds een probleem kan zijn - . Indien er plannen zijn om met een internetprovider te - verbinden, is het raadzaam de wensen met hen te bespreken. - + samenwerking tussen fabrikanten nog steeds een probleem kan zijn. + Indien er plannen zijn om met een internetprovider te verbinden, + is het raadzaam de wensen met hen te bespreken. Indien er gepland is om twee LAN-segmenten met elkaar te verbinden, zoals het thuis-LAN en het kantoor-LAN, is dit de @@ -4652,10 +4650,10 @@ indien nodig de router met de netwerkkabel met een AUI/10BT transceiver. - - - - + + + + ---Sun werkstation @@ -4667,7 +4665,7 @@ Zelfstandige router | ISDN BRI lijn - + 10 Base 2 Ethernet @@ -4676,7 +4674,7 @@ Wanneer het thuis-/afdelingskantoornetwerk uit slechts één computer bestaat kan een twisted-pair - crossover-kabel geruikt worden om direct met de zelfstandige + crossover-kabel gebruikt worden om direct met de zelfstandige router te verbinden. @@ -4688,10 +4686,10 @@ Het netwerk gebruikt een stertopologie met 10 base T Ethernet (Twisted Pair). - - - - + + + + -------Novell Server @@ -4721,21 +4719,21 @@ seriële poorten hebben. Dit dient niet met kanaalbinding, MPP, etc. verward te worden. - Dit kan een erg handige eigenschap zijn indien, bijvoorbeeld - , er een toegewijdige ISDN-verbinding op kantoor is en het - gewenst is om deze af te tappen, maar een andere ISDN-lijn op - het werk ongewenst is. Een router op kantoor kan een toegewijde - B-kanaalverbinding (64 Kbps) met het Internet beheren en - het andere B-kanaal voor een gescheiden gegevensverbinding - gebruiken. Het tweede B-kanaal kan voor inbellen, uitbellen, of - dynamisch binden (MPP, etc.) gebruikt worden met het eerste - B-kanaal voor meer bandbreedte. + Dit kan een erg handige eigenschap zijn indien, bijvoorbeeld, + er een toegewijde ISDN-verbinding op kantoor is en het gewenst + is om deze af te tappen, maar een andere ISDN-lijn op het werk + ongewenst is. Een router op kantoor kan een toegewijde B-kanaal + verbinding (64 Kbps) met het Internet beheren en het andere + B-kanaal voor een gescheiden gegevensverbinding gebruiken. Het + tweede B-kanaal kan voor inbellen, uitbellen, of dynamisch + binden (MPP, etc.) gebruikt worden met het eerste B-kanaal voor + meer bandbreedte. IPX/SPX Een Ethernet-bridge staat ook toe om meer dan alleen IP-verkeer te verzenden. Het is ook mogelijk om IPX/SPX of - enig ander protol te gebruiken. + enig ander protocol te gebruiken. @@ -4759,8 +4757,8 @@ natd - Het Network Adress Translation daemon van &os;, in het - algemeen bekend als &man.natd.8;, is een daeomon dat rauwe + Het Network Address Translation daemon van &os;, in het + algemeen bekend als &man.natd.8;, is een daemon dat rauwe binnenkomende IP-pakketten accepteert, de bron naar die van de plaatselijke machine verandert en de pakketten terug in de uitgaande IP-pakketstroom injecteert. &man.natd.8; doet dit @@ -4780,11 +4778,11 @@ Installatie - Wegens de krimpende IP-ruimte in IPv4, en het groeind aantal - gebruikers van consumentenlijnen op hoge snelheid zoals kabel of - DSL, hebben steeds meer mensen een oplossing als het delen van - een Internetverbinding nodig. Vanwege de mogelijkheid om - meerdere computers online te verbinden door één + Wegens de krimpende IP-ruimte in IPv4, en het groeiend + aantal gebruikers van consumentenlijnen op hoge snelheid zoals + kabel of DSL, hebben steeds meer mensen een oplossing als het + delen van een Internetverbinding nodig. Vanwege de mogelijkheid + om meerdere computers online te verbinden door één verbinding en IP-adres is &man.natd.8; een redelijke keuze. @@ -4902,7 +4900,7 @@ Het is ook mogelijk om een instellingenbestand voor &man.natd.8; te gebruiken als er teveel opties zijn om door te geven. In dit geval dient het instellingenbestand te worden - gedefinieerd door de veolgende regel aan + gedefinieerd door de volgende regel aan /etc/rc.conf toe te voegen: natd_flags="-f /etc/natd.conf" @@ -4964,7 +4962,7 @@ >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Wed Sep 10 15:24:18 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E7A8B10656FC; Wed, 10 Sep 2008 15:24:17 +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 BDA5E106567B for ; Wed, 10 Sep 2008 15:24:16 +0000 (UTC) (envelope-from strauss@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id A98468FC1B for ; Wed, 10 Sep 2008 15:24:16 +0000 (UTC) (envelope-from strauss@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 m8AFOGwE055638 for ; Wed, 10 Sep 2008 15:24:16 GMT (envelope-from strauss@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m8AFOGk0055636 for perforce@freebsd.org; Wed, 10 Sep 2008 15:24:16 GMT (envelope-from strauss@FreeBSD.org) Date: Wed, 10 Sep 2008 15:24:16 GMT Message-Id: <200809101524.m8AFOGk0055636@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to strauss@FreeBSD.org using -f From: Anselm Strauss To: Perforce Change Reviews Cc: Subject: PERFORCE change 149533 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, 10 Sep 2008 15:24:18 -0000 http://perforce.freebsd.org/chv.cgi?CH=149533 Change 149533 by strauss@strauss_marvelman on 2008/09/10 15:23:29 Fixed deflate example, now applying to ZIP writer ... Affected files ... .. //depot/projects/soc2008/strauss_libarchive/misc/deflate/common.c#2 edit .. //depot/projects/soc2008/strauss_libarchive/misc/deflate/common.h#3 edit .. //depot/projects/soc2008/strauss_libarchive/misc/deflate/deflate.c#3 edit .. //depot/projects/soc2008/strauss_libarchive/misc/deflate/inflate.c#2 edit .. //depot/projects/soc2008/strauss_libarchive/misc/deflate/test.sh#1 add Differences ... ==== //depot/projects/soc2008/strauss_libarchive/misc/deflate/common.c#2 (text+ko) ==== @@ -1,13 +1,18 @@ #include "common.h" +#include -void err_msg(const char *string) { - fputs("Error: ", stderr); - fputs(string, stderr); +void err_msg(const char *string, ...) { + va_list args; + va_start(args, string); + fputs("error: ", stderr); + vfprintf(stderr, string, args); fputs("\n", stderr); } -void debug_msg(const char *string) { - fputs("Debug: ", stderr); - fputs(string, stderr); +void debug_msg(const char *string, ...) { + va_list args; + va_start(args, string); + fputs("debug: ", stderr); + vfprintf(stderr, string, args); fputs("\n", stderr); } ==== //depot/projects/soc2008/strauss_libarchive/misc/deflate/common.h#3 (text+ko) ==== @@ -1,14 +1,14 @@ #include #include -#define CHUNK 8 +#define CHUNK 1024 -//#define DEBUG +#define DEBUG #ifdef DEBUG - #define debug(s) debug_msg(s); + #define debug(...) debug_msg(__VA_ARGS__); #else - #define debug(s) + #define debug(...) #endif -void err_msg(const char *); -void debug_msg(const char *); +void err_msg(const char *, ...); +void debug_msg(const char *, ...); ==== //depot/projects/soc2008/strauss_libarchive/misc/deflate/deflate.c#3 (text+ko) ==== @@ -7,6 +7,7 @@ int flush; int ret; int eof; + unsigned int deflated; stream.zalloc = Z_NULL; stream.zfree = Z_NULL; @@ -21,7 +22,7 @@ err_msg("while reading from standard input"); return 1; } - debug("read from stdin"); + debug("read %u units from stdin", stream.avail_in); eof = feof(stdin); flush = eof ? Z_FINISH : Z_NO_FLUSH; do { @@ -33,14 +34,15 @@ err_msg("while deflating"); return 1; } - debug("deflated data"); - ret = fwrite(out, 1, stream.avail_out, stdout); - if ( ret != stream.avail_out || ferror(stdout)) { + deflated = CHUNK - stream.avail_out; + debug("deflated %u units", deflated); + ret = fwrite(out, 1, deflated, stdout); + if ( ret != deflated || ferror(stdout)) { deflateEnd(&stream); err_msg("while writing to standard output"); return 1; }; - debug("wrote to stdout"); + debug("wrote %i units to stdout", ret); } while (stream.avail_out == 0); } while (!eof); } ==== //depot/projects/soc2008/strauss_libarchive/misc/deflate/inflate.c#2 (text+ko) ==== @@ -7,6 +7,7 @@ int flush; int ret; int eof; + unsigned int inflated; stream.zalloc = Z_NULL; stream.zfree = Z_NULL; @@ -21,7 +22,7 @@ err_msg("while reading from standard input"); return 1; } - debug("read from stdin"); + debug("read %u units from stdin", stream.avail_in); eof = feof(stdin); flush = eof ? Z_FINISH : Z_NO_FLUSH; do { @@ -33,14 +34,15 @@ err_msg("while inflating"); return 1; } - debug("inflated data"); - ret = fwrite(out, 1, stream.avail_out, stdout); - if ( ret != stream.avail_out || ferror(stdout)) { + inflated = CHUNK - stream.avail_out; + debug("inflated %u units", inflated); + ret = fwrite(out, 1, inflated, stdout); + if ( ret != inflated || ferror(stdout)) { inflateEnd(&stream); err_msg("while writing to standard output"); return 1; }; - debug("wrote to stdout"); + debug("wrote %i units to stdout", ret); } while (stream.avail_out == 0); } while (!eof); } From owner-p4-projects@FreeBSD.ORG Wed Sep 10 16:13:09 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8A4701065674; Wed, 10 Sep 2008 16:13: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 329AA1065672 for ; Wed, 10 Sep 2008 16:13:09 +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 1CD3B8FC17 for ; Wed, 10 Sep 2008 16:13:09 +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 m8AGD9Eu048169 for ; Wed, 10 Sep 2008 16:13:09 GMT (envelope-from rene@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m8AGD8JK048145 for perforce@freebsd.org; Wed, 10 Sep 2008 16:13:08 GMT (envelope-from rene@FreeBSD.org) Date: Wed, 10 Sep 2008 16:13:08 GMT Message-Id: <200809101613.m8AGD8JK048145@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 149536 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, 10 Sep 2008 16:13:09 -0000 http://perforce.freebsd.org/chv.cgi?CH=149536 Change 149536 by rene@rene_self on 2008/09/10 16:12:13 IFC Affected files ... .. //depot/projects/docproj_nl/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml#7 integrate .. //depot/projects/docproj_nl/en_US.ISO8859-1/articles/contributors/contrib.committers.sgml#8 integrate .. //depot/projects/docproj_nl/en_US.ISO8859-1/articles/portbuild/article.sgml#6 integrate .. //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/advanced-networking/chapter.sgml#5 integrate .. //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/x11/chapter.sgml#2 integrate .. //depot/projects/docproj_nl/en_US.ISO8859-1/books/porters-handbook/book.sgml#7 integrate .. //depot/projects/docproj_nl/en_US.ISO8859-1/share/sgml/authors.ent#7 integrate .. //depot/projects/docproj_nl/share/pgpkeys/jpaetzel.key#1 branch .. //depot/projects/docproj_nl/share/pgpkeys/matteo.key#2 integrate .. //depot/projects/docproj_nl/share/pgpkeys/pgpkeys-developers.sgml#7 integrate .. //depot/projects/docproj_nl/share/pgpkeys/pgpkeys.ent#7 integrate .. //depot/projects/docproj_nl/www/en/administration.sgml#4 integrate .. //depot/projects/docproj_nl/www/en/developers.sgml#5 integrate .. //depot/projects/docproj_nl/www/en/donations/wantlist.sgml#3 integrate .. //depot/projects/docproj_nl/www/en/internal/about.sgml#2 integrate .. //depot/projects/docproj_nl/www/en/internal/developer.sgml#2 integrate .. //depot/projects/docproj_nl/www/en/internal/ssh-keys.asc#2 integrate .. //depot/projects/docproj_nl/www/en/releases/6.4R/schedule.sgml#2 integrate .. //depot/projects/docproj_nl/www/en/releases/7.1R/schedule.sgml#2 integrate .. //depot/projects/docproj_nl/www/en/releng/index.sgml#3 integrate .. //depot/projects/docproj_nl/www/share/sgml/events.xml#5 integrate .. //depot/projects/docproj_nl/www/share/sgml/news.xml#7 integrate Differences ... ==== //depot/projects/docproj_nl/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml#7 (text+ko) ==== @@ -1,4 +1,4 @@ - + + @@ -3088,7 +3088,7 @@ Address limits The number of unique source MAC addresses behind an - interface can limited. Once the limit is reached packets + interface can be limited. Once the limit is reached packets with unknown source addresses are dropped until an existing host cache entry expires or is removed. ==== //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/x11/chapter.sgml#2 (text+ko) ==== @@ -1,7 +1,7 @@ @@ -1459,6 +1459,11 @@ resources on KDE, consult the KDE on FreeBSD team's website. + + There are two versions of KDE available on FreeBSD. Version 3 + has been around for a long time, and is very mature. Version 4, + the next generation, is also available in the Ports Collection. + They can even be installed side by side. @@ -1468,26 +1473,43 @@ other desktop environment, the software can be easily installed from a package or the Ports Collection: - To install the KDE package + To install the KDE3 package from the network, simply type: &prompt.root; pkg_add -r kde + To install the KDE4 package + from the network, simply type: + + &prompt.root; pkg_add -r kde4 + &man.pkg.add.1; will automatically fetch the latest version of the application. - To build KDE from source, + To build KDE3 from source, use the ports tree: &prompt.root; cd /usr/ports/x11/kde3 &prompt.root; make install clean + To build KDE4 from source, + use the ports tree: + + &prompt.root; cd /usr/ports/x11/kde4 +&prompt.root; make install clean + After KDE has been installed, the X server must be told to launch this application instead of the default window manager. This is accomplished by editing the .xinitrc file: - &prompt.user; echo "exec startkde" > ~/.xinitrc + For KDE3: + + &prompt.user; echo "exec startkde" > ~/.xinitrc + + For KDE4: + + &prompt.user; echo "exec /usr/local/kde4/bin/startkde" > ~/.xinitrc Now, whenever the X Window System is invoked with startx, @@ -1539,7 +1561,13 @@ ttyv8 entry in /etc/ttys has to be adapted. The line should look as follows: - ttyv8 "/usr/local/bin/kdm -nodaemon" xterm on secure + For KDE3 + + ttyv8 "/usr/local/bin/kdm -nodaemon" xterm on secure + + For KDE4 + + ttyv8 "/usr/local/kde4/bin/kdm -nodaemon" xterm on secure ==== //depot/projects/docproj_nl/en_US.ISO8859-1/books/porters-handbook/book.sgml#7 (text+ko) ==== @@ -1,7 +1,7 @@ + 7.0-STABLE after addition of physically contiguous + jumbo frame support. + 700111 + + + 7.0-STABLE after MFC of kernel DTrace support. 700112 @@ -12165,6 +12171,16 @@ drivers and utilities that interact with it. 800045 + + 8.0-CURRENT after the separation of the GDT + per CPU on amd64 architecture. + 800046 + + + 8.0-CURRENT after removal of VSVTX, VSGID + and VSUID. + 800047 + ==== //depot/projects/docproj_nl/en_US.ISO8859-1/share/sgml/authors.ent#7 (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.460 2008/08/25 22:03:59 makc Exp $ + $FreeBSD: doc/en_US.ISO8859-1/share/sgml/authors.ent,v 1.461 2008/09/05 21:35:59 jpaetzel Exp $ --> aaron@FreeBSD.org"> @@ -532,6 +532,8 @@ josef@FreeBSD.org"> +jpaetzel@FreeBSD.org"> + jseger@FreeBSD.org"> julian@FreeBSD.org"> ==== //depot/projects/docproj_nl/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 1024g/A040570C 2003-01-05 [expires: 2009-09-07] ]]> ==== //depot/projects/docproj_nl/share/pgpkeys/pgpkeys-developers.sgml#7 (text+ko) ==== @@ -1,7 +1,7 @@ @@ -874,6 +874,11 @@ &pgpkey.philip; + + &a.jpaetzel; + &pgpkey.jpaetzel; + + &a.pgj; &pgpkey.pgj; ==== //depot/projects/docproj_nl/share/pgpkeys/pgpkeys.ent#7 (text+ko) ==== @@ -1,5 +1,5 @@ - + @@ -132,6 +132,7 @@ + ==== //depot/projects/docproj_nl/www/en/administration.sgml#4 (text+ko) ==== @@ -1,5 +1,5 @@ + %developers; @@ -157,6 +157,8 @@ Engineering Team in greater detail.

              +
            • &a.kib; <kib@FreeBSD.org>
              • +
            • &a.blackend; <blackend@FreeBSD.org>
            • &a.mux; <mux@FreeBSD.org>
            • &a.bmah; <bmah@FreeBSD.org>
            • &a.gnn; <gnn@FreeBSD.org>
              • @@ -259,8 +261,10 @@ href="donations/">FreeBSD Donations Liaison page.

                +
              • &a.tabthorpe; <tabthorpe@FreeBSD.org>
              • &a.wilko; <wilko@FreeBSD.org>
              • &a.brueffer; <brueffer@FreeBSD.org>
                • +
              • &a.gahr; <gahr@FreeBSD.org>
              • &a.obrien; <obrien@FreeBSD.org>
              • &a.trhodes; <trhodes@FreeBSD.org>
              • Daniel Seuffert <ds@FreeBSD.org>
                • ==== //depot/projects/docproj_nl/www/en/developers.sgml#5 (text+ko) ==== @@ -6,7 +6,7 @@ us to update author names, or the representation of those names (such as adding email addresses), by just editing a single file. -$FreeBSD: www/en/developers.sgml,v 1.203 2008/08/25 22:28:15 makc Exp $ +$FreeBSD: www/en/developers.sgml,v 1.204 2008/09/05 21:55:07 jpaetzel Exp $ --> @@ -267,6 +267,7 @@ + ==== //depot/projects/docproj_nl/www/en/donations/wantlist.sgml#3 (text+ko) ==== @@ -1,6 +1,6 @@ - + @@ -84,6 +84,7 @@ Populate a CPU-less motherboard. + dfr @@ -387,18 +389,6 @@ - shaun - United Kingdom - UltraSPARC/PPC based laptop(s) (not too antiquated), - complete or partial amd64 (or ia64?) system (something - reasonably beefy), a Soekris 1401 or 1461 crypto accelerator, - Cisco WIC-1ADSL card. - Replace various dying or old bits of hardware; make my - time a little more productive; expand development work on - non-i386 architectures. - - - simon / cperciva Ontario, Canada Fast 1U rack mountable server. Preferably 4 cores, 2GB @@ -488,6 +478,12 @@ afd/ast drivers. + + tabthorpe + Canada + AMD64 machine, minimum 256 M memory, any size hard drive. + Ports testing and building. + &footer; ==== //depot/projects/docproj_nl/www/en/internal/about.sgml#2 (text+ko) ==== @@ -1,6 +1,6 @@ - + ]> @@ -36,7 +36,7 @@

                The Software

                lighttpd fly light.

                - These pages are served up by the fast, secure and flexible lighttpd webserver. In addition, there are a few locally crafted CGI scripts. Indexing of these pages and the mailing list archive are @@ -84,14 +84,17 @@ Build type + XX:23 + English www only, if no other build is running + + + XX:53 + + 01:22 Full build - 05:22 - English www only - - 09:22 English only @@ -103,10 +106,6 @@ 17:22 English only - - 21:22 - English www only -

                The recent build status is available - + ]> @@ -48,7 +48,6 @@

                • FreeBSD Documentation Project
                • FreeBSD Release Engineering
                  • -
                • PicoBSD
                • FreeBSD/Alpha Project
                • FreeBSD/IA-64 Project
                • FreeBSD/PPC Project
                  • ==== //depot/projects/docproj_nl/www/en/internal/ssh-keys.asc#2 (text+ko) ==== @@ -1,60 +1,106 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 - These are the current SSH host public keys and fingerprints (generated using ssh-keygen -l) of the freebsd.org machines available to -committers. +committers. Note that some of these systems may be restricted so not +all committers can access them. This file has been signed by the FreeBSD Security Officer -, PGP Key ID 0x73D288A5. To obtain this -key, see ftp://ftp.FreeBSD.org/pub/FreeBSD/CERT/public_key.asc or your +, PGP Key ID 0xCA6CDFB2. To obtain this +key, see http://www.freebsd.org/security/so_public_key.asc or your favorite PGP keyserver (e.g. http://pgp.mit.edu). You should verify the signature before making use of this key information. The fingerprints are suitable for verification of a key at connection time (OpenSSH will prompt with the fingerprint upon encountering an unknown SSH host key), and the public keys can be added to your -~/.ssh/known_hosts2 file directly. +~/.ssh/known_hosts file directly. SSH2 Fingerprints: -1024 26:26:00:00:6b:69:d9:a1:a1:d1:61:4b:fa:72:75:18 axp0.freebsd.org -1024 90:ab:fb:9a:a7:d8:e9:64:0a:8c:1d:9e:7d:26:8d:c4 beast.freebsd.org -1024 22:bd:b9:9c:ad:57:13:cd:c9:79:47:1e:43:5a:7b:48 bento.freebsd.org -1024 89:e8:32:8f:e9:0a:2e:c1:02:e5:d8:19:ea:03:99:5b builder.freebsd.org -1024 b5:d5:f4:28:ac:d7:20:6c:98:7f:a8:d4:a3:9d:3c:bd freefall.freebsd.org -1024 4c:f5:69:00:fb:c5:e9:2b:8c:21:19:f1:3c:b0:12:1e ftp-master.freebsd.org -1024 2e:66:7a:55:fe:51:95:35:47:0e:27:f7:39:62:8c:71 hub.freebsd.org -1024 b7:39:a3:55:0b:81:a8:cc:e3:f6:3d:a9:3f:b2:d8:77 ncvs.freebsd.org -1024 89:ce:3f:b6:f2:23:8e:01:0e:a1:33:34:0c:88:65:6d panther.freebsd.org -1024 a8:92:a5:00:3e:eb:fb:2e:c5:02:6e:fd:28:e8:31:46 pluto1.freebsd.org -1024 a8:92:a5:00:3e:eb:fb:2e:c5:02:6e:fd:28:e8:31:46 pluto2.freebsd.org -1024 76:9e:70:2e:6f:93:64:1f:71:aa:06:7d:7d:5e:a1:d5 pointyhat.freebsd.org -1024 91:c9:2f:a0:8c:98:62:ec:64:92:e3:b5:ea:91:80:7a ref4.freebsd.org -1024 61:01:d2:1f:ef:d1:d1:40:94:ec:7e:06:2e:78:ed:9d sledge.freebsd.org -1024 09:ae:f1:48:e0:76:c6:e1:13:ff:2b:cb:20:40:38:d0 www.freebsd.org +1024 89:e8:32:8f:e9:0a:2e:c1:02:e5:d8:19:ea:03:99:5b builder.freebsd.org DSA +1024 4e:67:3a:f5:4b:bd:c1:70:11:b8:a0:f1:87:72:f9:ee builder.freebsd.org RSA +1024 b5:d5:f4:28:ac:d7:20:6c:98:7f:a8:d4:a3:9d:3c:bd freefall.freebsd.org DSA +1024 57:6a:21:ed:dc:ff:35:5a:63:2a:b3:be:24:aa:f9:e1 freefall.freebsd.org RSA +1024 4c:f5:69:00:fb:c5:e9:2b:8c:21:19:f1:3c:b0:12:1e ftp-master.freebsd.org DSA +1024 8d:d8:31:a1:d4:5b:c3:1c:65:47:ab:31:b0:e0:fc:d4 ftp-master.freebsd.org RSA +1024 2e:66:7a:55:fe:51:95:35:47:0e:27:f7:39:62:8c:71 hub.freebsd.org DSA +1024 c0:9f:1c:eb:7b:56:f1:7d:3c:d3:a9:e6:22:05:34:07 hub.freebsd.org RSA +1024 b7:39:a3:55:0b:81:a8:cc:e3:f6:3d:a9:3f:b2:d8:77 ncvsup.freebsd.org DSA +1024 de:10:99:ed:ad:5f:f7:87:9b:a7:81:9a:11:c3:1e:d2 ncvsup.freebsd.org RSA +1024 a8:92:a5:00:3e:eb:fb:2e:c5:02:6e:fd:28:e8:31:46 pluto1.freebsd.org DSA +1024 c4:42:31:7b:9d:52:97:52:ad:9a:68:77:fb:55:95:5f pluto1.freebsd.org RSA +1024 a2:21:a9:e6:a1:3c:97:0d:ad:a5:da:a7:b3:89:a9:16 pointyhat.freebsd.org DSA +2048 3c:07:08:d3:a4:98:01:58:79:37:bc:11:f1:eb:7c:63 pointyhat.freebsd.org RSA +1024 76:11:13:03:70:ab:54:f6:00:ce:86:ff:e2:77:08:31 ref4.freebsd.org DSA +1024 3c:cf:15:9e:95:be:dd:97:65:b7:92:5d:31:06:91:1c ref4.freebsd.org RSA +1024 bb:55:72:fc:fc:a7:a0:9a:6a:1a:54:86:49:94:2c:f3 ref6-amd64.freebsd.org DSA +2048 88:8e:3f:a8:53:70:0e:99:aa:62:14:70:6c:58:2e:aa ref6-amd64.freebsd.org RSA +1024 39:c3:a2:95:5a:05:e9:32:59:b3:d0:fd:8f:5a:75:6f ref6-i386.freebsd.org DSA +2048 29:7a:91:fc:f0:21:dd:26:1e:98:25:82:29:0b:83:60 ref6-i386.freebsd.org RSA +1024 29:85:c2:6c:ac:17:65:8c:22:91:3a:d2:4f:ac:5b:05 ref7-amd64.freebsd.org DSA +2048 cb:53:61:cc:a2:88:28:2d:79:a2:36:88:42:c7:25:7c ref7-amd64.freebsd.org RSA +1024 7f:16:3b:9f:fd:be:c4:3f:e7:df:bb:12:18:44:ba:96 ref7-i386.freebsd.org DSA +2048 b6:55:0e:f8:54:5a:43:2a:45:c5:24:ee:2e:32:6a:f7 ref7-i386.freebsd.org RSA +1024 eb:ad:ae:0f:13:59:f1:7d:c8:19:c7:bd:84:be:c0:a2 ref8-amd64.freebsd.org DSA +2048 18:df:4f:93:a7:e4:08:5b:98:e2:cc:33:9f:4e:0c:9f ref8-amd64.freebsd.org RSA +1024 cb:dd:d3:ef:18:da:69:ab:fc:d5:c0:bb:df:a2:d4:70 ref8-i386.freebsd.org DSA +2048 ec:ba:18:27:07:cf:ce:2f:34:33:93:c8:26:81:ea:9d ref8-i386.freebsd.org RSA +1024 b7:39:a3:55:0b:81:a8:cc:e3:f6:3d:a9:3f:b2:d8:77 repoman.freebsd.org DSA +1024 de:10:99:ed:ad:5f:f7:87:9b:a7:81:9a:11:c3:1e:d2 repoman.freebsd.org RSA +1024 b7:39:a3:55:0b:81:a8:cc:e3:f6:3d:a9:3f:b2:d8:77 sky.freebsd.org DSA +1024 de:10:99:ed:ad:5f:f7:87:9b:a7:81:9a:11:c3:1e:d2 sky.freebsd.org RSA +1024 8d:35:fb:99:ec:66:01:f3:5a:0d:f4:06:17:58:d2:0f svn.freebsd.org DSA +2048 56:bc:da:e8:c0:40:31:0b:a9:b2:2d:6b:19:24:3b:2c svn.freebsd.org RSA +1024 09:ae:f1:48:e0:76:c6:e1:13:ff:2b:cb:20:40:38:d0 www.freebsd.org DSA +1024 ea:c0:a6:4f:ad:a5:b8:10:f1:b6:41:9d:57:fd:8f:57 www.freebsd.org RSA +1024 2d:10:a3:db:dc:1f:5e:24:11:04:a9:8b:5c:34:a0:3f zoo.freebsd.org DSA +1024 f0:65:f7:7b:79:e6:d0:f7:49:5c:47:04:cb:c1:6f:4d zoo.freebsd.org RSA SSH2 Public keys: -axp0.freebsd.org ssh-dss AAAAB3NzaC1kc3MAAACBAMuPFlyZkrQbi+e32jV57l3FD+DvYbvDm5oARw3z86yo7X0JgTHDYU6+lhldkrrtFFDKfYD5IVM74uF5iGJcuV677AxB4XILy+00lm6Krim/oBpFCeeuUGHecmcLFjQxnfc72W0Ce0CGqv4ovx2c3R9VRFdQtEdMwdtP8v+91rmnAAAAFQCCXtHYaE9LR2Xe3v6XCQwG4otdvQAAAIB4u5o1jsQmjExu9UQ9QMQuGF9zCfi91Nfq+SWgZw6DC1uPCh0HH+0AveihLLR8twU2sbq7YxAuRHz1ffGqWj7dN1YwBy6y7r4xq8/MafTMoxhOT2RT4mGc3C+oB1zG277dwgB6zeDuxpxNyxEsmtcQ0d8zKLjXSffun4Y8x6O6YAAAAIEAuM43cx/vwm0wojBRMpUO9CKQ2/hmaMkCVN6M7XhvzfOhv96y+RBcVmB70w0roEC0ZYOy2Ct71DrOQkynrn7nzeX6TZ7YxKKOg01X+uluvsAp6LobvwOFVqeqptC+2wIMqfJd7XM2nlppifVivxqpgwhdeQztlSBU7dA7C/J4mDw= -beast.freebsd.org ssh-dss AAAAB3NzaC1kc3MAAACBAIAAyxxAfl9dAqv4yWt80Q6urmbS9/DutHPPCEbmeXA0J3DG/t/XYom8aK8Co0c3VTwu73ObuyifYAkGjBZSS3EA54ikTxUJnuUDoM/Izk03c9N6D8jp5tX9PyFFjtWzStbsV4pZCzOe4rHpgX667YvTUp1MQcthlbmfSmY3t/9fAAAAFQC0S6gc3cBmNNiB74+bMck0DEgyywAAAIAqxIJqu51vLcICYnAgTlt8DSgp74yEcyhLCwNKE5pYevs2ZETt4ivxeBpi9NTIw+vJRNyyVQL2V5XJfGf+bxfhp99Nf+noGEvmfwS7JKAIWF9ByF74JTgHN77ONhOtS0+NP7W5l2oGDzelT//zMlZn246eiY74V4kSIGsDPCN9MQAAAIARu4GYebk3UEvw0A2utLEuuks1aT/YUOI0E+Um6HhfkrYvg7/pWsj8mcybyh3+U/HZ1vV9nUDW+tHusOfh4SR27aPYubohXII05+m0HSidrO4xaOWf0jBlz77kj6pnfMZ/UNNCv1m37I5GL2O0rJSIrMFyoTR3AL/jq+sqfQE9Pg== -bento.freebsd.org ssh-dss AAAAB3NzaC1kc3MAAACBAIf5x7bOgFCFqoKFH0QamUgh9crQe4au76VzRvCuSBDwhojn7crE2vCmHlIfLjXKP2OZ/j5/k9ooXejmwwgzWZZDygqu+e1eGvaMFklWdxxvIAjkKb39LfY4OB4EswBxVu45Bn/atwkgdZ4YJB3m5ywhK+JySzhVDCVdaM8QRIaBAAAAFQDfPKbFP90xwn+ueKV+GUWWQMrI8QAAAIAGnyhQAxwM8EOczUiNV1J9bvyacD3sSq3KrS61nl7he8EOYCLLTfUVIJGEWDVDzjauoUjbP7yh6vR5E3TEgwDHBenEoxv9EHgoSkMjgIIllU/xwsdid+R9/oDtiKiJUWXX+LYGVGVGs22QuOlmJGWqlYCr5V2hSda3/K2xdkXLPwAAAIBFqA8jBu+SiyiV9nhBPY7EiMrEITp8xayVFa5j/q0WKtnromilTahVaY/Uq/6n/W8ZAQONori0gpnEW3yBvPVkhMkNcBzbp32t8sGinKlJuM6IzGcty/PV8qEz7N5I1xcJ9arCV7WdQPuJCUIs0B/QEusSaS9lcjxBH6+r59qTqQ== builder.freebsd.org ssh-dss AAAAB3NzaC1kc3MAAACBAJy3TD0mHyx4G3w6gYbBfWDEuRW0nD4i6J3K/o8nVDsTP7wnvb/s8/BZvZ+Rp986q7Z5oYodbYSFO+2EdDNdvKQGm5Edzfpf/wb0jf+1zTSu+ysqORWzmWT3bowisr91nnRf/SvIxSpRp1QVt7PhtQf5bTzQiBq0z9hMBDXZUaUVAAAAFQDPsW9+nilJFAL/qIbvNQT6JZXvXQAAAIAf+XgpLybLYE9l19/FOrSI0L9RqKymD3+S2+W1kJxTgRaFxCszOnR930wSag2MdRmaEz7c0uqIQLnkoVnwKio+j+7BNA+Qq4qUnReTLlWnwS5+iUyE2b0jJQNROBzmT0LNyLBff8D3LxCHQQZ7CsQLfIXDlADSWtrluHlzAhJmIwAAAIBi/2JgQaqhq68eGA7kmKcvr/ytwuKyUjIhtls9qD5xey2kMCgq07iAINirslmJX6NjSI/6/9r+8RXuygbLzroxQw0W8LsCR+WtGIPYt7haa9fNfmJxGOlYYa5Mmiep5V6BdL9qdlJ0M5A/W8urAONbmgIYf7rwgimujdQ1Ic8cEw== +builder.freebsd.org ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAIEAttCqkby39nf3lHk7xzNpxD1WUbCZo+0mvKSsAYGPbMKTHuPk3XmW1/OKcRN76RlPLM/pP6ceIQEvzWswoAr/lZj5wYOAZwKGC55m1mWgTlkG27MC9pNBSy+mHB3shGIgtuRdLz0b0uuYPvMJbPx3tTAnqYJUGmR0CvHQcM8rQzU= freefall.freebsd.org ssh-dss AAAAB3NzaC1kc3MAAACBAOrc9NdYhC/HaoEHXKb7Wg9xzDpiMpuy9plIjlUlqz3FuPldyDSOQAgxsFvBtb/GzwZunwxLQBb8HCGLx5uR+8bCEPoOD+fYcOI/olMv5wDcyXbab0+8f0E8v3rcAkz877p+upa2IFMk9VX2SKJ3WPacMskj/xUNX4T4YGvUGaUBAAAAFQCOuaDXoAi1bkBxXxctcrcKZSddUQAAAIAC4+ChjTUrDHwOfpoHjnCLwRHKJb+MdR6MhYr+9CYJwFYjB/5sC2GND9e1ACTGQAPN20v+qQXlGJD5utbVtA9yXA5V7hJIxdCy93BMNLu79dzNTSwIGA0HSugq7n4hwTYnULi4T7fEx70Hw9ZoSq5pKnarfP/bmkBN5/qbVZ66aQAAAIA877E5c023ircNiHXh2Fpe/PEm1qZDVb9O/wSisJcCcNggGz/ph+22hY4sOioHBjxhYmrR9XBG/shiPdVM8KgK25LOznk49F0tcM4YW7203lxUFycB1nHgvg3ihwjnlHumxDaIVAbIRJ4dKnZwcpC9sKCWvYI/NLX2KJ4LQ0cw1g== +freefall.freebsd.org ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAIEA6FpCVgwrxcHE5pGAP+RuSKG4ZbI5hpQpy8Zxo25iJgah9wSqgt67I4SDZRfbm86pkJgUJ6M4qCjpBV5oQCBkXWHDcNdKqL0Kwnw1RICucj9wYB6RkOwHLIz4fJJzq3mpWKr7YucClGE2+S/p19jSuacC8+WiTmDJy+729iSGSjE= ftp-master.freebsd.org ssh-dss AAAAB3NzaC1kc3MAAACBAIfzGATD1boyfeVpjmUXmu0fwNhM4vHTs8OFR25RhsRZ/UKklUZod2g4HgE0kJtYSK5ORUOO2iKVRpr5QFQEN7RnWis2rpqWoVv5KApcnW+/ynRc4z1Zn6lR9W99N/uIaYLs1KiqToMsGn0TbiprC2HAvrF3PZIwETVNtISvoQ/JAAAAFQCJIECEehh4g8AGAINvWV30yL5jVwAAAIBDuystVAnc/n/yvoxqJ69JBMqHbKLqWdMQJAjdJxS50NyHS4R+X+Zw+xrW+k2p25jTJ7dOdGsV988v10WWMgw5cYKzz9xRV1J441PEbsn5Sd36WITCQl/VRqBZhRZHJUiyZmQf0IA9DOOFN1XTB2wwvikuzK3qhIofR74sitayuQAAAIEAgykO0Y4pE/rPCqrdMY39pd71mV9pG9VD97aMWcOqcBEe17CqTazlHV+Ma3HvdI6tkMQi7a5yMOs6R7b/YJsZMbMyRpBPAF4fEEoAgiFy04gFlwpNS0bBv/1iXafjIXO/H3r31GAG0P4RFCObSDmw3gV1fyOb3Gt0e+5vvhTIaUQ= +ftp-master.freebsd.org ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAIEAwI6a4nc6kpJvwQyRwsk73BrAfuYEflUAGv/x7SViMHTuCA1Pl6AXb6arbjr1f4sX77F/VWv3QDXXr+qhBu7oYY3V7AWqkkA2O8uL7lG14pgAg8DFDbTkL25cBOx/WuwSzmDLGbDeNt5puUuQgmLc0qfZOhEEJHCfK9L8dJDqZKM= hub.freebsd.org ssh-dss AAAAB3NzaC1kc3MAAACBAM9dOErjUoOcA5FJE04QjobOmJFElaMoISTTWzitvREsx8MqGmyfWte4HDtqWbYGuahWG8UNKlAhOsx06EgDW8GBeK+POnvlde6wNbxxh+/BqLUpBOy9cP/2Yikyx0UZHCSxAVn5NQVbrCu05qUCvSWjNR83IsXDsZ7eQ0APsu4bAAAAFQCsR5notEUD5eMkBPjShRoDA9y3lQAAAIAfCCrWjCTA1GDAHtruAzJgwheyclktSbcj4mqfaJ5yrIeBBZzBVFCu78Pjwd1Cui0eQhqHqokleEV+ZrXO0c0CeIhzSDiVHpeQO+dpX5RxGVC81pEHTBojSn9WlKoq1Wt4cgrEJ5brW1goNcGIJvFXtmGIYXn6/p+I0+8ROKcROwAAAIAZqda8MjO51odH+/pDf1arhTxBzAKnrk6NsRfisR8VYkzl1XyOqsw73O24ooCzvpXMf8TbXNgkTSUxCYCxOJhYRkr5ZCKErxfS5Do/4aiVBGSQy4/pGfOFeHOB2zR61XL3lE9H9REXSKmmvc8kJ9addn4es/x/Lu2aXmsI2vUzIQ== -ncvs.freebsd.org ssh-dss AAAAB3NzaC1kc3MAAACBAIIqGeRirURWvcdTm3X8ORgNsyJhKxxozwXFea9Jadae2GUPqqFxmIbdEyQS7pOFXdFsjqXL6xQXRYad7x1R5v2N//R9iVq1c3JuWGuUECDtxCtqAChzj+dBt+0VBefGFtRjZBwvb4GL0CrMkwSUMj4xOsi9kFqHDvDF+jYsADTLAAAAFQD70/67rf/9xegwMyQyvbbiAb0GnQAAAIAgc0QgbN9rFCWKD9AqFLulPJsEVQPUWyKs2UwTZXFnVCTXg6hPf4Vo9ujxux4dAbQH26akddfR4wAZk/XQDjl13OKN89bJGbOHEVRgArcIqrdWJTmImbYCQmaY0egBPA/Qywh4dXPBUMxEnj3hJSyyIUoSArjo8y9NijxnWWpjigAAAIBag+NChmp1JNfAlOgguq1xp7KgVm6b9Wfo3weLFu6r4bxWV515hV4BFcpxrz/6x5QA73x/rxBVVQdlOSOZHE9OFssmRImE/ra4xn33/xWTHZXK9zRR2eLBsexxmCpKZs1/WkB80ObMD4rMy0zMkv6gS6WX8F90jbR6P7pHDWtjNA== -panther.freebsd.org ssh-dss AAAAB3NzaC1kc3MAAACBAOB0jJe3utPD3GolmtkvUy3oZiGsF7y12jo4aeQxk2guzw/lEKrGFzBl7kvL9F5u6WX8cnoWy6hhRSeT2CZaE/Znrsn7Mg/SKs93lUUk+xDHVeMCh+Jh+Qn5aFXZL+Vq1iuWVyY9+imr7IGhMCoNq4KG1XHvmW7WaMIH07z9mKpFAAAAFQCN0qmX9nkP/UNAGzW3hmRNXPCR6wAAAIBxwTE0oC7yWJ2hAIs4W3rgCYya8gTvYsFfTiHYxPvju1u4n9PFSGvG/jkAOje93QWOnz5BVZGNY1IS882+S5pQFx4W4fuuZ7RzuPVn7Zr8FD76+YYuv1DW2HelW07jO1zsqfYYdicos6MbohuxuRe6NYP2ZFcvTW3R0IFbTRGNyQAAAIEAy2xwmi9GtCphBfopxh58QUCA/Hhj2WvQ4cJ3ICzHE4F6+aKB5yJE657tI/nR2k7B9RuWNq0A+LYZV5mNriF1vsP8qAmqVheyVjnD3/zpELVsyJwncnUvMyIi7b+tCWdbWfT8gGXchG+FLwo6QEi6u8QbJGv+wrgR7vZziRoSmOs= +hub.freebsd.org ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAIEAqX8flNZcGufOtqeYTGcz9XMrmILk3deMPvD2LGg5V0FlFZj5uyEABIJFLQx13VX8kx0xOJz7XW69JRWWGo4TC1H3a+RfpsXyXWcUbH+HGicLyv1vCqc/n87OihNxwL1mdYgHdmNg8P6HvB/okdGjGq8YIdkUzEjz6v7SnLhogzU= +ncvsup.freebsd.org ssh-dss AAAAB3NzaC1kc3MAAACBAIIqGeRirURWvcdTm3X8ORgNsyJhKxxozwXFea9Jadae2GUPqqFxmIbdEyQS7pOFXdFsjqXL6xQXRYad7x1R5v2N//R9iVq1c3JuWGuUECDtxCtqAChzj+dBt+0VBefGFtRjZBwvb4GL0CrMkwSUMj4xOsi9kFqHDvDF+jYsADTLAAAAFQD70/67rf/9xegwMyQyvbbiAb0GnQAAAIAgc0QgbN9rFCWKD9AqFLulPJsEVQPUWyKs2UwTZXFnVCTXg6hPf4Vo9ujxux4dAbQH26akddfR4wAZk/XQDjl13OKN89bJGbOHEVRgArcIqrdWJTmImbYCQmaY0egBPA/Qywh4dXPBUMxEnj3hJSyyIUoSArjo8y9NijxnWWpjigAAAIBag+NChmp1JNfAlOgguq1xp7KgVm6b9Wfo3weLFu6r4bxWV515hV4BFcpxrz/6x5QA73x/rxBVVQdlOSOZHE9OFssmRImE/ra4xn33/xWTHZXK9zRR2eLBsexxmCpKZs1/WkB80ObMD4rMy0zMkv6gS6WX8F90jbR6P7pHDWtjNA== +ncvsup.freebsd.org ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAIEAyXkaSqC7bvMxUE2mlSxNXvzO8IRrFO/73UZFKkyPfeSifCgFHXMxKafxMXcfKDzjUwwaQ9BfUp1FzEB4sX2YtKmBvPMEJ6luKvbRPWKBtbh4kHLZkTyJipjmq2yf8sYpFOCdH21PmfuI7jceU7Av9/k/r+5xO6C/8HBmPOAhFo8= pluto1.freebsd.org ssh-dss AAAAB3NzaC1kc3MAAACBANi3AYBQPLbC3T2/OA1gTj2vlh6zlH2+fTT26hqbKNFnS9JiZnjhWQWtslQdWqXDLs7Z1ZWeMdJiyhgfq6GxHRlcb2U8toIfocZWXkMEr3OKWwQjJLv1ReNMlgCcvIZFowtNEiT+5InL8pDVO3H8lBMh813zZJBdUUs6AhEHULmjAAAAFQDqakqS6G75fk1mgsyRFOJ6PDIePQAAAIEA1oTgZr4o3C8A7q8V+xKzJaLtcUG3GZnpHmlMQzLCZkVCabnsS6NAqVA/wmUeuGnBATxfZ87sP5fed+FvuQtxQDCY3gxuZT3ydoZHiY+U0epChwl0qVZ2zies8O3QqoyqpcAWx73Y/BGnTpNTrrcMMp1U1lBxbrXgQbqDx1lbXC4AAACACTrNnCxlQlAmExzlQAlTNNeqdbADG9II94vj2fUCJNqlbwaKTHXbkC1xzYTo6CP7G0u3T7li0hzkeDoQhKETek+F4JGz7lHbddQtOHeS3Im+wVgc3k9mAkN8CnTeWr05LmEFFnfKiH7SNOxmQ/AvvB7DjK95Xg3VcOEvh86y87g= -pluto2.freebsd.org ssh-dss AAAAB3NzaC1kc3MAAACBANi3AYBQPLbC3T2/OA1gTj2vlh6zlH2+fTT26hqbKNFnS9JiZnjhWQWtslQdWqXDLs7Z1ZWeMdJiyhgfq6GxHRlcb2U8toIfocZWXkMEr3OKWwQjJLv1ReNMlgCcvIZFowtNEiT+5InL8pDVO3H8lBMh813zZJBdUUs6AhEHULmjAAAAFQDqakqS6G75fk1mgsyRFOJ6PDIePQAAAIEA1oTgZr4o3C8A7q8V+xKzJaLtcUG3GZnpHmlMQzLCZkVCabnsS6NAqVA/wmUeuGnBATxfZ87sP5fed+FvuQtxQDCY3gxuZT3ydoZHiY+U0epChwl0qVZ2zies8O3QqoyqpcAWx73Y/BGnTpNTrrcMMp1U1lBxbrXgQbqDx1lbXC4AAACACTrNnCxlQlAmExzlQAlTNNeqdbADG9II94vj2fUCJNqlbwaKTHXbkC1xzYTo6CP7G0u3T7li0hzkeDoQhKETek+F4JGz7lHbddQtOHeS3Im+wVgc3k9mAkN8CnTeWr05LmEFFnfKiH7SNOxmQ/AvvB7DjK95Xg3VcOEvh86y87g= -pointyhat.freebsd.org ssh-dss AAAAB3NzaC1kc3MAAACBAOwBSkPg5OPU60uei++UJ+o8j1xGD1IRhgLa92ACyBbR0E84Fuepyh9eeRkSuSwvNy5o62JjUenUE6GjPGJoZvXbTl7d4zoZMobswpIq5XOyCEb9Biatyi7VlX9rrdvqXufFynEo3UXn5uUkFx+EQNzlCHkfPM/ONwprFMEDIaMlAAAAFQDQ6tmKNA6sCk3IzV2dPuRgkxm7dQAAAIEAvkYTh+ejJnv1miza2UKGbIT2Z9Uay9q4sv9R6k6vYF10kxX1hTouqgS7I643jalSG3WGpa5vmLTn7T8GvriSEdBswT6MQxeUtEhCPXrWu9ajGI5W/y9mSqYdohFjqeZ3J6cjih3q1dhUhulJ5iQ25EXEGcN/dO5kIJEy425dLoUAAACBAJ7He/HDeUysa/GyWvp8qxvqycjAWysuBAGe6lQ6iNZqVVO9uY7NuGuqbbXM4AqjM+VTwg6geexM8z97jnN19VibGRQeNDIufEKn3hPWaM7Qu0I8q7xIh9GcSdEcs0hgtSCqTOsdll+7oltYWq5WWuGSyA/fG9wGm7fU4sZyVKoT -ref4.freebsd.org ssh-dss AAAAB3NzaC1kc3MAAACBAJ+dx+dJTYcv7LH6+u16/Kg/0MVzqzYNSC1Sn4V6dv+Z3xfEcw4f45Hca5iGCBKcq3OGusvngsdlE/x69E82x2/8oKMV3TOHwxf0D1vKQ8PiFiRsi4e5hhKKrGYzQ+8X2FYDa4bunHtPFd7Oj1nkXS89hmzWkIcvd3RxbQOejw9fAAAAFQD4Gc6Q7Ifb7/nwja6d/PKLycifSQAAAIA5ozESABfsAqHjnrO71BQagBAGb2X2X0wJQpZ7DRT3uj2/yAjpdiFV5o/YdVtDWsXLqKE9XaVday3zUjwJ0xu/5muaiGz2eqYi4FFlbyaLycMQfna/qrqv2YurhUaC3Naw3145IwgIAj/fpOdSC+laE+ypD6sFFXQ29as5Wt/MxgAAAIBfWyU1CqrTN2K2uk/s8Sp2dD2MnJWoi3Zo62SgeK9E6N+8DBQgUJIf0ZxUCxhmDFRD4SzSv47JrOF4VTJDBeq4rK6YeHA8LtZgE+DttiJ7XROR7FaNIDxrr5156FYdUB5MKqIPifxxaTtLr6AUFmquL2ddn1YSc+tSuoUHwnHmTA== -sledge.freebsd.org ssh-dss AAAAB3NzaC1kc3MAAACBAMUSHluJQ9ppCKufRTjUQgxP3x+TqnGH0fLm8hru7P67qlmYfrG2u5dzMOm7aMcoL58FACfUET9TbwBzLQlxu9sTGy6MOQ3Yy075VNx+WsbXz7JQ9XihbDy6e2VNa7UZ9N5MGLSKZS5HaKhTwB9pAdOufmPmteC/Wis6qsZKtjUdAAAAFQC3fbJCGfXlEJ9Bdn227GdRy3pIowAAAIBc0X0VW2NmFhlS3FHs42oG7fCdEd0pxUTYOu4/qcGsfczlOIhJ+E9Hpra3/jIt4poe6XubHjip0vjsUohsRXeUZAoM24n1Yu5dboapqcyiluUph2Km8i/+LN5FMJ0fYjmiFi79/lunic5mTjDchG/nOvlbeWWoi8KZ9cIQEgJ0hQAAAIEAlxNDhlrohrp4k3Sp3OgU/fqvCynlR2voccCqLdpgcNIqy8e0BjU0J47d1SDzYaWi0rgXd3lBII3wENpvs1gyljRWoK9WT4pCb68j96TgCDDZYgUN3oaC/E+5PKqIQ7PGkDEDoel5sQuS44JrhXTaHjhFitiUAfSNoqalanbI1gU= +pluto1.freebsd.org ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAIEA5iRSqagAStjJ5aAQ9cxMNqwDekYADrmpJT3TK8u7+gEl6jmrP7lM08eXua/BBE3HyHa8lHxsq0iBdY0HuCsEzJkKHGJFKnesbAN9ApD3srMStuBHqv0FQWa5f5wi9IL48/Np6ESvC2W6Fp+/go6ZTONq9V4BLcRLf/VxmTHFdk8= +pointyhat.freebsd.org ssh-dss AAAAB3NzaC1kc3MAAACBAIzVwhZARXA2qPdjoK6Gk7AR77po+0McweJID5G8ygtYSGlOPL2eo8ImjRSDGBoSvco+M+W9ywILg4GQbZg8H16H0KtyAsSSJSSPsUhmpBKVaR4GdUZL5RYHeWLkFn38MkYh+xq+hSiQ0dFxD2dHYP5/vrT5Y2BsikzbTZw72QYHAAAAFQCx+5P9JaAs+b0CjMjdz6yIUPFKEwAAAIAewmpv4g7GnrglnB3lYl6u5f6g1AZE57RXVgPP1yiMZbcanQMcmbyLM7Z0d3VLmsf1dDdBFpjCwNr+BRkIZvf/Qd421cXic7QCA3LsbOn/l80QLtptcsThNcflFx7C6dotIaxAwuotWh5ua/SNjuXOKcKokGQTiU8Xk9Nf336aTAAAAIBthZcOD3790vg8sXKa5qMnNyM6r2uy5LrafC0CYb3nyfXmgQ5AsuLVoveaxHrN43CK0IOWxK0ZUIR50G5e5EXl0CTBYhCWg1RfpvLWGJsJp8u/4WAZU2WatrbQZa1k72pIN1G57Vdo1c5Go4EQJ5f9GnefCcL8eGWJ8UO7mF7wiw== +pointyhat.freebsd.org ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEAznTEfpjGAkJDcaIT81KiA2dMF679LENIW0oPr/gAR5NDO/Qu6QsmU6ivv9qq0ktIjh71zqcZw61HIAURIIzqwWFqZ67dgtkWQ1a+aqYqN+LF+95fpya/aqUK3St0IGjP4a+GsHHqpWaYxi8TygnlKiuSMMkogmMBSXDJAHINTjFKbgPkjLwVxeo0Xpr/6+bLxbPJgCma6s+N9c1mo/vnhhMhGW+6OJ6TENUxWHhQUzE78VdyRGCouhsA5hpL8FcZn4bOiBwGX95nG65crKyaUFIgFIO37E+I8s3Mo6DdHic8uZicsnWwtI0jWHYipqJPrlmDimsVyWWjFYPN1C1rgQ== +ref4.freebsd.org ssh-dss AAAAB3NzaC1kc3MAAACBAMKfGgnucV3HUFE8vX+o65N+2RLxLZK8KGPOj7GT7O07wrXqdLXpI2f0ExYY5MiHdzQNFbUX2X1RqUvfWTt7nki68TXCDtOiZ7ysZlr71tq1BLhSFaKIS8NuU3uOQZwhqYY0FUu8Pmcd8DY62YUH92UccdXEmqOI9e7kkCfdA7NdAAAAFQCl6lPKF2RJYovs62feHBHhno+BMQAAAIEAlnrmTI2lgcrfmBLV320rIa4bvriZLetd4896++zhoIGr+9+dMQXla8FHJxek6jQU6fQkfQnko6mg7HdVfSA6bbVmNP4mGqliaAhhTSmiDRweQT4NA8gVLJXblx72OtZ/SUzUi8FPXLr6IymCJC2HO4GydcA+6/VMNcUK9/6sOcMAAACARUCuTjvCaqIYUNrLWi6KYSlox3f89iE2OXNGkTSWSZb1XV72aSveGk2uwYvzEEHYt3GK6LATRfGbSpQivuFYvage8/KhXOKQY39BrReacqwOz0z0dNo2zNwF7ni0hjTkrbh+419rWRTvWHEJqvPvUItOthaZguTIi0bHWRl7JSo= +ref4.freebsd.org ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAIEAwk1/3NTb2eId7m1lknKkiOeX1HjQmp1ZPK4kvR4awTPyexBimsNqZ4p3d6zJujAxf4W7Jx9CfEaAMcqYa73NYBBUSQBcFurtQrf4uuevGYGHuxgjmaDNUC00j3pMP83IQG4osCtlIuZ5IxnFY7vxEGifLRzf6DEAqOU1moA6Uqs= +ref6-amd64.freebsd.org ssh-dss AAAAB3NzaC1kc3MAAACBAJKQZcrHIUXY4NLJ8uSeY1SSiiqUSmtmhcoIvX69mCh8r9RMOrbXxopRfGIIQzmGKhwp40yF8ZVSrj0Fgd04QFyV5ggPom/C6gq4AfzHDXCiRS347Oygd3ROaRawB3rJzbReIGH4OI1wrEij2n4uZhvHnU87G/98kAB/awCrV/05AAAAFQCFzH3cmhP+HasDAYdvvDx5270fHwAAAIBxEsor3wcjwPXlxtPMgIrMgnh4SE6wfNI1IPcwlFnFub1D7c+q1PHZKd3DrgmewKR28pAF3TbOFAOKZjKAV9VifVAn9Sb4FUAiaPFqKYEP5zsF0AUrRSvwcOkMvDtdL83nmzK6mljFOTH5o0yiFD5QlVucbLxey0n6pIkfBl9I7gAAAIBg/zmsJ1S+OXsFE5T3LOY3zkzPFK3gaD/pfQiDRsKnQEA7W8sHDu9ChvGHVxq/r91bvB2aItey1LlvkldTpzqLSRfZ1jc0JB0D+mODnR/QD4ku9eL8YfiEhRzXbrduthuEmj3k7bbuRkVlI82Wrxu79AwSSsBnTZaSfkhq0MCN6A== +ref6-amd64.freebsd.org ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEA6MW7OzI9VbI/EAzsXelu34hSVMPHGMpAdwLhd7nwmkVOo5rNZitjsbT/hNZQvVm+sPe2dCV6mA+7vMKX160pdaURnZWx/NDDTlz607DD9RdUpZyB+h5crYmNxnHxrkWa8cfLSfmRdzzLpcOQYlJpUjcSMCOg8X5A38g7YouTADjBFo3sv9Fg3gpnZQXW5ib6K8rO3FTabZmXFm5DDellbwRrtZJNVG3JHcvUR5OvvC0YvUznBwdNE1oNaGbtEvMIGcMWfRNvqNSv7C9iRSFZhuRirVXleqqskaSse+R/61VcGCtilrnr8lSzKPQbwHz3XSzk8Fr+U4kn9KVkWGL0qw== +ref6-i386.freebsd.org ssh-dss AAAAB3NzaC1kc3MAAACBAJ9ogFNr9vNZVcsbtPNUwdDkN4P4naTpC50/Ch+giAzqtpYob5QF5PSDd7mizz9psbH0uuwosT3xKXovsXFKfVSxZ3rrOQg2VpRR/yyITrZ4rzUp+01/L7Q6ms+A1T1zWV6BCcdPSj/97y+zErcGOSnQ0bDyXpFwODKcBzRInAv7AAAAFQDyH+6diuoqIXeJcwBAlpR20smChwAAAIBs+TAkP1kfCmtdiJKR/rtEZ/8iTZ83m0Tf0JOvIhdx7UIINrF9A2XfJlFueadygtgzCIfzh5XrMChtzEBs+DwdIwp9xV9hKs4qUVKn0o8tWQ47htGhj6ap2HLiSjJrAVX+k5AXdexRhtWuU3VxzE1mraSXE1P/C2rE+Guyg6WY2QAAAIBs8sUMSJEyn47iq1JnAmn4uUxAbf+kHcYd15/AKrawTa7QAsHtc/NHVkxASvvTT+RHPK3Se/IR1yT0uclFSTjHB/njVR3jVX1PYTpSU2fzcvDp5wumS22IhmpRwwPk0+6Nz74UmwOt4Ja0E6mwN3CAqeCtL2t8BJU2iTC3zonjXw== +ref6-i386.freebsd.org ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEA7yTe+gWFIsWJVrF2cJmHTNN8c1AsGDD74cjNt6bbtJ8xjUqxBrpLCsX5UehJQIJ9BrpxaI0JbHnhu3CQ6/XWk2WOVkpppWcIueHFoYWBSnZw3yhDRxljDt2X6Wr/M4jL4RU5lvQuIah342ikn9HE20D0l4T5rg5e/mgwvrPdVoP+HgSbX5MZcLN8k9qpph2hD8IOG2bgPEVhXr8zG8y/ARmydAztd9b+HNvGFDol/vzruILDMnP9QewrCZQu155++f2JdwvepP1sIGZhkuNjZkwcU168jDWy/m36l1u6jx43YIe5V82zmK9QdKnl4Ny8QFHklHrnq+1U5F6kYlVVcQ== +ref7-amd64.freebsd.org ssh-dss AAAAB3NzaC1kc3MAAACBAMWjQCh45FWf4LRSGpEp9nqD1IzzRFx6egBYCWaSDGhy75Ail6oKOShGr324tB2+DnmsYN8ZDGpT3hvd5QEbPJxlb0nyaiNStWVAfKgqbqQ+eyM35GJpBt2Rv2Ha1p6DTpsdYJAoioeE4OIytGjuPZn0mcg0UlOJF8aABIgXOOk/AAAAFQD17/0rYYmGL5KZ/A6MTMPVSAOdkQAAAIA75RvP5kgSGe07a0iNoTcK25ejaIVnIRConAziTKgBX7IuUJM8q5uiM+II0WG7z8ruYhALUnU3wYqMqJ6/OVxU+3Nq3T2ZQeydzeJ1NbjMc/pyXBz5EoZ8p0qJ0a4+ZInpNxr/J+1dkl/3kJXm3n7LuAk05atAUvfYo/+qUz+ptQAAAIEApkHGAZi2nFBhydwavpTMPd2fenrU8+Dixb4fwdeqWm/HWmbNAXnO1vxCRj4FPFdpAseW01cB69iBefbf0SzTKZp1a+DEZ2Da3IbTEiuQ6kxw96wYwQ4u1lHAUAw+bx1N8LzLIGAQMEwOOLMtnWHStVCxtsYrakSodxtkwGZo3Us= +ref7-amd64.freebsd.org ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEAo/avbzE1KBLPOELjOUP5jFIDKaPRU/9Wfw7ao/unNswAiJfIsrW4LkoXFpOpdP8OpIh7Y9Om/WJhdh8zDE+BTyK9VGI9BijUz6aiVwA8zli1Ckg/A5k0tN3yVMjU4m5nkw2QtFbSnITaV/5C9ssRcbcrBzMIEFuda6qyk9rKQo1J6AaKcckVEyi4T2N4s51Yz+HHE8J/fR4/cOAth293sv9JzPgF5xW1FIGy+aoQUxPrdoGYlFhLotOslDQ1AnJmLve2LYoaZVLY5DdC5Q5ensU5nJnn2N2VoO1QHYWtQVsVfiz68W06ZFbMB9S7qpezk7b9NkXuMKhx0WxyaSmriQ== +ref7-i386.freebsd.org ssh-dss AAAAB3NzaC1kc3MAAACBAPrn2WeGi2iZfEjyYz4Ou0z8JhoD/8+v9lAJ0bqKzk4yDu2ur36QFC+nHjD/ZBitvsP7MrFZAUYyaRxIYFDFaiKm34fyXoMdrRLOrWFE18cQV1rgXwCDMzzEd+uzuMjsPl72Dr4py/NacK8yciiO5xrtDlNEzXwat7A35Bd7s86xAAAAFQCoeYrqVHHtxLu8VgX93lGrGfZBCwAAAIEAvtCCBeFXV1xEFvKgdDNxBsjeROYhtqQ48TcJzupQjisAqWh+EGXen0H360W2J3DEetyxWKvC24hmEB1FMQpaNzmagErX2JfAI6zbE6cnDpTmPWkmy3T4uvEj6eTmb7cCk76S1kCbw8NR9ag1eQR/rlJ02cHicAWoh52Ks9uKoPYAAACBALr+Ch3TnXdeY6FBpFKv361hC148kT4IgTpfsReRYLeMZ6HSN/7CISqRqrO+rxIhVX7jC2w9f6UFP/4mKlIPlJDlZrIIXch/l2+2bV+LOpAFpp5rNu2PsoYLej2OzyKFrxtbnzQ6UwOZa8vsjnIbzR1mj/19Xt/54YMyuOjhSzim +ref7-i386.freebsd.org ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEAurCZ1OOWaaarhMntNc7DKOsGJp71TPd0//Sidr+pRmSD1svsowEYmqIXN4k5rFFCxUdcf6mkqy/Dmcj1hwhX9W8HwctSSqyQMnKwwfXALQxr0TJT3rMIL5LMZY2nG6/e+b9i726+T4wsajFKXxu1vQDNLQgAuqKtPkFCI/wcKsY8e8xwEoay4SssUMY9xVoUVWAUehu8Aao/n1GUltfrL0MqZp2L402leE2kFPI5O/A98nRCQxSUVvRXQSaro/SvaExH3TGjQqvJmF49P318dskYVyttpugqMutSkI6Vpw5uTWXVAmnV9xo5BGWkroRGT3dt4zmzQvQ5gRqCozKezQ== +ref8-amd64.freebsd.org ssh-dss AAAAB3NzaC1kc3MAAACBAMoqa1g2tap6YXLtMdmgvGgZxLAWCmloKS8MILPEmu4raNj2IW31iR9cz24mXIWdJwfi3qrm9CLG5mfcxW6Sw13wIFEASJkg1+WIwrCiJmxTFx37Hr3B3x50hYyrogzQJ5NQwQxMKY9HhycMef0hrxuEIRLdD9VERp/GSidgQPJzAAAAFQCvYYcIqUSnj+97Mck8vZEagDAv5QAAAIBHZwohQEdENBzfVilg5wbG8Oh/quu8369Apmli8yXZ4rrGctgmiY6/oZ/6J2THU46eYoO2lqGMJj2A0FTENzSkvDa7xeSS296CiY0FlfSgKlWKzepAJqeUIiME2dYCeByiQC/28Bg66OdExi0lXt1rE0pMhLGXgyA0LyG0sFX+yQAAAIEAkunEnil9H/AbaIG9vKY2nXv5smHwnitCG3+JhjWDhl9caViLbR7D1XbmCluBlUBguaPz2GV9TFuLxrTbPEz4U7t66MyFl08JFrZraclC2vkh77+DXRoUsBdxPcPtab/QeQlJ/0j0ykn4L0cstk0SyCcP+mwmuplzl0xeha4/WlU= +ref8-amd64.freebsd.org ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEAxNquiXclLeacmYrxnqwfUl8a9nG7De/GY6ABs3huw9NByoMVorYozdXU+kmaokCTbBgIvHyehYwqvU35vcz3npmFr7ZldgF3TFcsudibyMDth623GBoympytBOhf/AOVq0SH0cgvR4ZjNy9gpnFgvp7OmFAKZdBm+qfT392QMYpRTYLT+ta/pIDgEOtGb+1eH5BsW5kQlldCL15TnBlCnvcSitR9HSXAIqkXSxafA19c0ONz3ryw46o/P6OZ8XeIM6FBt/eA2oz2tF6j94jtYrr/+Mp1Yn6iu9ux0mGO9rTghyM2D6ffuZMjBj8ijiUkVV1EtGZwUNq3jGC3mT+MSw== +ref8-i386.freebsd.org ssh-dss AAAAB3NzaC1kc3MAAACBAPNSQ+FvWoswDsE60irnYMFI7oXPP20qTkUJW7dX78yIifHbT51An1cyd9jw55btR1ayExIejVkWG/yaBjmePEP6zOoc2SXUuTe2WUS+uR2hI2WVOTdTG3HKWei16iG2eN+Bn9ElB8/M9505F3KxcKNBhpl6xpwG9UvfmCKVr5ghAAAAFQCdgSqWY1DuZGydz+aOILmqnJNtvQAAAIAogrUYF5NsXx/eZu6fXxmIb6MPcaSzwWfupITAfA8GnNfeANnTvbhhWncG8wSx4Cj1vmbOfLiTZC4Ojs8W51pi2/YKy4KK6Tb339qQH9j/4ZJ/k+17mbyBIs8S6nbcl4U1Gih90Qnz31QnxXj7X68PirE+2MP4lKLbsRX4+uJGWQAAAIBsXITebfTMBjKPlogoapOkSztkj29yVS0WTgEkCw1aV3/ZdCzmDW8Q0HWWYYO8vFoxv7mzfwNdFwriROcTJIVwP1Ssx0j6KTF5VUkh0Xqf2anHbF7iF0XY6qOdjHMQpyJYP7KbIzaraT2dRaA/uyyBD4rEU8jYW4KJST5OrmTcrw== +ref8-i386.freebsd.org ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEAyF32CpiDstCzDvkKJiPqfqJZLJWIvD3rKqepIPkcxpUk5CHG2OuYs2+gSOMeK7nX7clp9RchIEt3qgoO0FahWk/83OAlOGcfGpFcYJEb29ROyHqJIGY91GzGdfpHAACh2HybGHV/wXaLehTbsKdHkK7gWudN1OxDHKDCqxgc/8J5pKP7RZlbXBDH1cDhIy+ZPyngstaPkCLRKdh+h2Oqzg5v0joNIyv7HkYqGFeF8dsIx4gr5KXUqNGTT67eUC77yBpq2hKs3NgBShf/078BjZRWw/EnnxXSXIsaFLXuXvPjICqJ+G5yRj5je7vuZ6cdIGnsHCNr4C5JB+WyFW7Rww== +repoman.freebsd.org ssh-dss AAAAB3NzaC1kc3MAAACBAIIqGeRirURWvcdTm3X8ORgNsyJhKxxozwXFea9Jadae2GUPqqFxmIbdEyQS7pOFXdFsjqXL6xQXRYad7x1R5v2N//R9iVq1c3JuWGuUECDtxCtqAChzj+dBt+0VBefGFtRjZBwvb4GL0CrMkwSUMj4xOsi9kFqHDvDF+jYsADTLAAAAFQD70/67rf/9xegwMyQyvbbiAb0GnQAAAIAgc0QgbN9rFCWKD9AqFLulPJsEVQPUWyKs2UwTZXFnVCTXg6hPf4Vo9ujxux4dAbQH26akddfR4wAZk/XQDjl13OKN89bJGbOHEVRgArcIqrdWJTmImbYCQmaY0egBPA/Qywh4dXPBUMxEnj3hJSyyIUoSArjo8y9NijxnWWpjigAAAIBag+NChmp1JNfAlOgguq1xp7KgVm6b9Wfo3weLFu6r4bxWV515hV4BFcpxrz/6x5QA73x/rxBVVQdlOSOZHE9OFssmRImE/ra4xn33/xWTHZXK9zRR2eLBsexxmCpKZs1/WkB80ObMD4rMy0zMkv6gS6WX8F90jbR6P7pHDWtjNA== +repoman.freebsd.org ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAIEAyXkaSqC7bvMxUE2mlSxNXvzO8IRrFO/73UZFKkyPfeSifCgFHXMxKafxMXcfKDzjUwwaQ9BfUp1FzEB4sX2YtKmBvPMEJ6luKvbRPWKBtbh4kHLZkTyJipjmq2yf8sYpFOCdH21PmfuI7jceU7Av9/k/r+5xO6C/8HBmPOAhFo8= +sky.freebsd.org ssh-dss AAAAB3NzaC1kc3MAAACBAIIqGeRirURWvcdTm3X8ORgNsyJhKxxozwXFea9Jadae2GUPqqFxmIbdEyQS7pOFXdFsjqXL6xQXRYad7x1R5v2N//R9iVq1c3JuWGuUECDtxCtqAChzj+dBt+0VBefGFtRjZBwvb4GL0CrMkwSUMj4xOsi9kFqHDvDF+jYsADTLAAAAFQD70/67rf/9xegwMyQyvbbiAb0GnQAAAIAgc0QgbN9rFCWKD9AqFLulPJsEVQPUWyKs2UwTZXFnVCTXg6hPf4Vo9ujxux4dAbQH26akddfR4wAZk/XQDjl13OKN89bJGbOHEVRgArcIqrdWJTmImbYCQmaY0egBPA/Qywh4dXPBUMxEnj3hJSyyIUoSArjo8y9NijxnWWpjigAAAIBag+NChmp1JNfAlOgguq1xp7KgVm6b9Wfo3weLFu6r4bxWV515hV4BFcpxrz/6x5QA73x/rxBVVQdlOSOZHE9OFssmRImE/ra4xn33/xWTHZXK9zRR2eLBsexxmCpKZs1/WkB80ObMD4rMy0zMkv6gS6WX8F90jbR6P7pHDWtjNA== +sky.freebsd.org ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAIEAyXkaSqC7bvMxUE2mlSxNXvzO8IRrFO/73UZFKkyPfeSifCgFHXMxKafxMXcfKDzjUwwaQ9BfUp1FzEB4sX2YtKmBvPMEJ6luKvbRPWKBtbh4kHLZkTyJipjmq2yf8sYpFOCdH21PmfuI7jceU7Av9/k/r+5xO6C/8HBmPOAhFo8= +svn.freebsd.org ssh-dss AAAAB3NzaC1kc3MAAACBAJut1BGViW/QBjdqJSIwa1/dtpATKCMYd01HsJfvYOZ6CSbnqN9BNU/eJdVZmN8/m13LR7leFMWPUS1EW4DJan91A3PbiAfRQWz3H5JxYcsk6DGrL57ot3AHwbysAtgJtv/82crGEF8lQKYuvEfgHaUKmpKTjRHTU93MVUb8nwJhAAAAFQCih4RXOd6mLYr5+7poh9KljKZe7wAAAIAWZQLr0tJKcfxW6xEHLe5umW1ZrCkCgveWbRGGOYSWSOdTeDS5//0ZqpPbNQTrM9aYZd/RsF4K+44j+O6KsPlCSwKA6K2IxyY0tBHxLhxaLG0hM/pqtFHFrFwWJjC+YTZ4yM1r/GQb5oThawPDC4YeWD9Mwvwvs3PR7b2ReewHyQAAAIAWaREC4ORld4brL2tCeNp2ky8IkkrubrnXIscQeyHCLOZg9y05UAKrIUvjIM0pJXV8rzVcZ/oN0huN/r8tmu1S7PfpA07bF7lXTXU0+onEpMOxWgk3ETB601wp8BKX4ZJlIxBKyz4XjSnNsgvRkHMvkaf9VSx8q2IL61/DleoR2g== +svn.freebsd.org ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEAvnPw8T77uwTMJJTakmWoSA89AtZRi/X5zAFCmfuG9QlofyRa23ktqP0fOxMmFARXRvbVr3pozEl/AP14CZbTxWZYwHAphZd0EcEYgDiW/N75t/ilywWHPXp/IiYQLLL3xeHxNyTNEiodcCLCVUufPyFGfaeBrUw2r3PKNZ7ZwW0UofbbSytJHsk8UVxpjS3RFjxB3daRjrMc/df7xIBPr61bhfxKR+C42K8qX9TqATTFoV9ngNafcfiPRzB9OLZ8sJwLjaV1Tc1lDjUr0nSbcRMr690yQ96O7e+eklze6ocSiglbqtpenPN430Ru0YnDP23u/k2CLHPo3hszHfmCDw== www.freebsd.org ssh-dss AAAAB3NzaC1kc3MAAACBAPo6h43vA5HH8SGuNIrZFkSciu6jOrbGy+oxDAB8EPxncGlix7WHYkupqI7ZWuTAzrnDT9oJGUwGywwrl4Qh4wo1J25pwkYfcTk6TNiIyXmDbrcfMmgj+fcsukHtTKZvsMqPT299jpFVa+rNPYMD9i942keCI+SmvlMAC+s+p1cBAAAAFQD4Ct3IHJ0Ha9raL36UDkaTsr1UzwAAAIBH8CJBtMwrJGC1Z5/FNIyoX23X9jzSvkKIOr/KQ9UOcWTWY2jmsnptTWi2dY6T3O3Q4aKbelF9AcVYWPuSxeaa4v/xidO0+Vc2o1AP1w6vVEatElBUx5cMfNZ/aTGdE7ezrKXNeVzjlO3jwl/ceJIvqEGdyCcoHdJ7LiPxXJq6LwAAAIA1rjmXzbuOUbjRkQsUXUERl7XONPkrMyIcfPXSJxn7qDXQIv/4haEhqK5stu/LPmondnJzOVYF6iBCGp/0d0i306UpK9pv7K0Ewe7oLqZhduh/Ws3541CkVBJ+axhifsI3xzM/GhqUBd4O32o9Fguu5l/vGKalYPbXBVsDKl2r/Q== +www.freebsd.org ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAIEAzl7OghF2iE9mu1bQEDGxg7i7nX8E5EAM4LLzXh6+ElqwPEfdwiJwej2PR1dePKH6jHMIoXp10HPfcL5nqEc7hqt3ftW1/47MvordlapLV0oiYC6dsIN9OfgbU0PATYcaD4sQB+C6yKbXTaaYeBbdo2IKgdJi1NhUjtXYAO6cJtU= +zoo.freebsd.org ssh-dss AAAAB3NzaC1kc3MAAACBAIH0U+SOGnwWHUTSkUBk6LlpvWDSBC27pmP9iTsbIZRHMVDxVzaQ5cTTgsf3qp+xr5bk4Cpth86izBp98D+YqbEWt5sCCLmiPPCM/GZRGwGKUsAvpRtLXBJGEJTrOFndzb4f/gEAMHV/h3pdD9JidsBI/X93qSEUt4OhVjJf7eWdAAAAFQD5eQHFTtJ1OAQM69EZMzGC131JHQAAAIEAgGvbBh58U5RpPBN88T0nzSUI+nEF68jU7+gd2iU9lZpcDENZpbC0NenGphCX9nzbeR1a60hxsHcFNJNcpoQD02Xy3vNhJXzHYE0gir2YPtQhpwkZ8Nkez5bLEt/JUlpKfTxQW6nhzRY5LE582UpW5OqxtCePk4eBXi4ni/eJF0MAAACARmOxjWGuDvedKmcAoEyB4g6eUVemZaQ/finbk9lsxiHnYZa06D4MYzgaDO+xgeo0Pbv/FWEgBYMW7tSyEz7epVKIcOn9kB25o6XvNZRulBHeVqhZHDec62yBskQDpcOv/tN2kMQmi86ZW2zuGGxrdU/AZzWeJgW/afeaMUYHIqg= +zoo.freebsd.org ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAIEAwZGtTA/mc6WxduSKwzqwgoSErpoKfeUt+VZZs5SSzgNJVPALwcqYMUqkp/gl9hBpA9tzjXSR/6Wmb1IZKRTr5AhB/XnDdsCjrZTxSJidcjRk5wBMkHLn6/wyIWfGhTZCGOkYBXBjkhydJaVckvEZ45vfqexpmvWCS9Rzjt6/RxU= -----BEGIN PGP SIGNATURE----- -Version: GnuPG v1.2.5 (FreeBSD) +Version: GnuPG v1.4.9 (FreeBSD) -iD8DBQFBLfDdFdaIBMps37IRAncqAJ9BxIyCzAPKM+qw2OBsP2leemcfcACeLRM+ -wOo5rvcJvAnKq8nDcM2DPVE= -=waPf +iD8DBQFIw/bFFdaIBMps37IRAm9cAJ9YtLxyToZG8RAK8RqlhnqKnORVnQCgmQbn ++qJbZG3jiRDQ+hz/XHDMrPM= +=t/HT -----END PGP SIGNATURE----- ==== //depot/projects/docproj_nl/www/en/releases/6.4R/schedule.sgml#2 (text+ko) ==== @@ -1,7 +1,7 @@ - + @@ -56,7 +56,7 @@ Code freeze begins 29 August 2008 - -- + 2 September 2008 After this date, all commits to HEAD must be approved by re@FreeBSD.org. Certain highly active documentation committers are exempt from this rule for @@ -78,7 +78,7 @@ Ports tree frozen 8 September 2008 - -- + 8 September 2008 Only approved commits will be permitted to the ports/ tree during the freeze. @@ -107,7 +107,7 @@ BETA1 builds 1 September 2008 - -- + 5 September 2008 Begin BETA1 builds. @@ -132,6 +132,7 @@ Ports tree tagged + 15 September 2008 -- RELEASE_&local.rel.tag;_0 tag for ports/. ==== //depot/projects/docproj_nl/www/en/releases/7.1R/schedule.sgml#2 (text+ko) ==== @@ -1,7 +1,7 @@ - + @@ -56,7 +56,7 @@ Code freeze begins 29 August 2008 - -- + 2 September 2008 After this date, all commits to HEAD must be approved by re@FreeBSD.org. Certain highly active documentation committers are exempt from this rule for @@ -77,7 +77,7 @@ Ports tree frozen 8 September 2008 - -- + 8 September 2008 Only approved commits will be permitted to the ports/ tree during the freeze. @@ -106,7 +106,7 @@ BETA1 builds 1 September 2008 - -- + 5 September 2008 Begin BETA1 builds. ==== //depot/projects/docproj_nl/www/en/releng/index.sgml#3 (text+ko) ==== @@ -1,6 +1,6 @@ - + @@ -92,8 +92,8 @@ RELENG_7 - Open - committers + Frozen + &contact.re; Development branch for 7-STABLE. @@ -106,8 +106,8 @@ RELENG_6 - Open - committers + Frozen + &contact.re; Development branch for 6-STABLE. @@ -281,7 +281,7 @@ ports/ - Open + Frozen &contact.portmgr; FreeBSD Ports Collection. ==== //depot/projects/docproj_nl/www/share/sgml/events.xml#5 (text+ko) ==== @@ -10,7 +10,7 @@ - $FreeBSD: www/share/sgml/events.xml,v 1.56 2008/09/04 04:56:29 murray Exp $ + $FreeBSD: www/share/sgml/events.xml,v 1.57 2008/09/05 01:00:56 murray Exp $ @@ -44,6 +44,27 @@ to celebrate FreeBSD's 15th Anniversary! + + Ticino Informatica 2008 + + 2008 + 10 + 22 + + + 2008 + 10 + 25 + + + Switzerland + Lugano + Palazzo dei Congressi + + FreeBSD and The FreeBSD Foundation + Stand A13 Presented by OEMS Sagl + + EuroBSDCon 2008 http://2008.eurobsdcon.org/ @@ -95,6 +116,28 @@ (NYC*BUG). + + OpenExpo 2008 + http://www.openexpo.ch/ + + 2008 + 9 + 24 + + + 2008 + 9 + 25 + + + Switzerland + Zurich + + The goal of OpenExpo is the promotion of Open Source + software in the business environment. Among many others, there + will be a FreeBSD booth. + + COSCUP 2008 - Conference for Open Source Coders, Users and Promoters http://coscup.org/2008/ ==== //depot/projects/docproj_nl/www/share/sgml/news.xml#7 (text+ko) ==== @@ -20,7 +20,7 @@ - $FreeBSD: www/share/sgml/news.xml,v 1.192 2008/08/25 23:40:56 stas Exp $ + $FreeBSD: www/share/sgml/news.xml,v 1.193 2008/09/05 22:28:12 jpaetzel Exp $ @@ -28,6 +28,17 @@ 2008 + 9 + + 5 + +

                  New committer: Josh Paetzel + (ports)

                  +                   +                   +                   + + 8 26 From owner-p4-projects@FreeBSD.ORG Wed Sep 10 16:51:49 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 121FE1065811; Wed, 10 Sep 2008 16:51: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 C9FF71065804 for ; Wed, 10 Sep 2008 16:51:48 +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 B5E188FC1F for ; Wed, 10 Sep 2008 16:51:48 +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 m8AGpmrI000778 for ; Wed, 10 Sep 2008 16:51:48 GMT (envelope-from rene@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m8AGpmV3000771 for perforce@freebsd.org; Wed, 10 Sep 2008 16:51:48 GMT (envelope-from rene@FreeBSD.org) Date: Wed, 10 Sep 2008 16:51:48 GMT Message-Id: <200809101651.m8AGpmV3000771@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 149538 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, 10 Sep 2008 16:51:49 -0000 http://perforce.freebsd.org/chv.cgi?CH=149538 Change 149538 by rene@rene_self on 2008/09/10 16:51:34 MFen 1.15 -> 1.16 Add %SOURCE% and %SRCID% tags Affected files ... .. //depot/projects/docproj_nl/nl_NL.ISO8859-1/flyer/flyer.tex#2 edit Differences ... ==== //depot/projects/docproj_nl/nl_NL.ISO8859-1/flyer/flyer.tex#2 (text+ko) ==== @@ -1,7 +1,6 @@ -% Gebaseerd op: 1.15 % Vertaald door: Siebrand Mazeland % -% Copyright (c) 2004 Marc Fonvieille +% Copyright (c) 2004-2008 Marc Fonvieille % Alle rechten voorbehouden. % % Herdistributie en gebruik in vorm van broncode of binaire vorm, @@ -28,6 +27,8 @@ % SUCH DAMAGE. % % $FreeBSD: doc/nl_NL.ISO8859-1/flyer/flyer.tex,v 1.4 2007/12/23 15:12:00 remko Exp $ +% %SOURCE% en_US.ISO8859-1/flyer/flyer.tex +% %SRCID% 1.16 % % FreeBSD Flyer % Gebruik make FORMAT (waar FORMAT: pdf, ps of dvi) om de flyer te bouwen. @@ -207,7 +208,7 @@ % % Copyrights \begin{center} -\tiny \copyright 2004-2007 The FreeBSD Project\\ +\tiny \copyright 2004-2008 The FreeBSD Project\\ \ifthenelse{\equal{\logo}{true}}{ FreeBSD en het FreeBSD Logo zijn geregistreerde handelsmerken van de FreeBSD Foundation.\\} From owner-p4-projects@FreeBSD.ORG Wed Sep 10 16:59:57 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A37EF1065681; Wed, 10 Sep 2008 16:59: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 66B2C106568B for ; Wed, 10 Sep 2008 16:59:57 +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 5078C8FC0A for ; Wed, 10 Sep 2008 16:59:57 +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 m8AGxvDp048880 for ; Wed, 10 Sep 2008 16:59:57 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m8AGxvMA048878 for perforce@freebsd.org; Wed, 10 Sep 2008 16:59:57 GMT (envelope-from sam@freebsd.org) Date: Wed, 10 Sep 2008 16:59:57 GMT Message-Id: <200809101659.m8AGxvMA048878@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 149539 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, 10 Sep 2008 16:59:57 -0000 http://perforce.freebsd.org/chv.cgi?CH=149539 Change 149539 by sam@sam_ebb on 2008/09/10 16:59:37 IFC @ 149537 Affected files ... .. //depot/projects/vap/bin/cp/utils.c#5 integrate .. //depot/projects/vap/contrib/gcc/config/arm/arm.h#3 integrate .. //depot/projects/vap/contrib/ntp/libparse/clk_rawdcf.c#4 integrate .. //depot/projects/vap/etc/rc.initdiskless#4 integrate .. //depot/projects/vap/include/rpc/svc_auth.h#3 integrate .. //depot/projects/vap/lib/libarchive/archive_write_disk.c#14 integrate .. //depot/projects/vap/lib/libarchive/test/Makefile#12 integrate .. //depot/projects/vap/lib/libarchive/test/test_read_format_gtar_sparse.c#6 integrate .. //depot/projects/vap/lib/libarchive/test/test_write_disk_secure.c#5 integrate .. //depot/projects/vap/lib/libc/gen/arc4random.c#5 integrate .. //depot/projects/vap/lib/libc/rpc/svc.c#4 integrate .. //depot/projects/vap/lib/libc/rpc/svc_auth.c#4 integrate .. //depot/projects/vap/lib/libc/stdlib/malloc.c#16 integrate .. //depot/projects/vap/lib/libgeom/geom_util.c#4 integrate .. //depot/projects/vap/lib/libgeom/libgeom.3#5 integrate .. //depot/projects/vap/lib/libgeom/libgeom.h#3 integrate .. //depot/projects/vap/lib/libthr/thread/thr_exit.c#10 integrate .. //depot/projects/vap/release/doc/en_US.ISO8859-1/relnotes/article.sgml#13 integrate .. //depot/projects/vap/sbin/fdisk/fdisk.c#4 integrate .. //depot/projects/vap/sbin/md5/md5.1#3 integrate .. //depot/projects/vap/share/man/man4/if_bridge.4#4 integrate .. //depot/projects/vap/share/man/man4/tap.4#3 integrate .. //depot/projects/vap/sys/amd64/amd64/cpu_switch.S#8 integrate .. //depot/projects/vap/sys/amd64/amd64/genassym.c#8 integrate .. //depot/projects/vap/sys/amd64/amd64/machdep.c#14 integrate .. //depot/projects/vap/sys/amd64/amd64/mp_machdep.c#10 integrate .. //depot/projects/vap/sys/amd64/amd64/trap.c#10 integrate .. //depot/projects/vap/sys/amd64/include/pcb.h#7 integrate .. //depot/projects/vap/sys/amd64/include/pcpu.h#8 integrate .. //depot/projects/vap/sys/amd64/include/segments.h#5 integrate .. //depot/projects/vap/sys/amd64/linux32/linux32_genassym.c#3 integrate .. //depot/projects/vap/sys/amd64/linux32/linux32_locore.s#5 integrate .. //depot/projects/vap/sys/amd64/linux32/linux32_machdep.c#8 integrate .. //depot/projects/vap/sys/arm/conf/KB920X#9 integrate .. //depot/projects/vap/sys/arm/conf/NSLU#2 integrate .. //depot/projects/vap/sys/boot/sparc64/loader/main.c#9 integrate .. //depot/projects/vap/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c#5 integrate .. //depot/projects/vap/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_znode.c#6 integrate .. //depot/projects/vap/sys/compat/linux/linux_file.c#12 integrate .. //depot/projects/vap/sys/compat/linux/linux_socket.c#7 integrate .. //depot/projects/vap/sys/conf/NOTES#27 integrate .. //depot/projects/vap/sys/dev/acpi_support/acpi_fujitsu.c#5 integrate .. //depot/projects/vap/sys/dev/asmc/asmc.c#5 integrate .. //depot/projects/vap/sys/dev/asmc/asmcvar.h#5 integrate .. //depot/projects/vap/sys/dev/bge/if_bge.c#16 integrate .. //depot/projects/vap/sys/dev/cxgb/cxgb_adapter.h#9 integrate .. //depot/projects/vap/sys/dev/cxgb/cxgb_main.c#13 integrate .. //depot/projects/vap/sys/dev/cxgb/cxgb_sge.c#11 integrate .. //depot/projects/vap/sys/dev/drm/ati_pcigart.c#6 integrate .. //depot/projects/vap/sys/dev/drm/drm_bufs.c#6 integrate .. //depot/projects/vap/sys/dev/drm/drm_pci.c#6 integrate .. //depot/projects/vap/sys/dev/drm/i915_dma.c#7 integrate .. //depot/projects/vap/sys/dev/drm/mach64_dma.c#6 integrate .. //depot/projects/vap/sys/dev/esp/esp_sbus.c#7 integrate .. //depot/projects/vap/sys/dev/esp/ncr53c9x.c#7 integrate .. //depot/projects/vap/sys/dev/esp/ncr53c9xreg.h#6 integrate .. //depot/projects/vap/sys/dev/esp/ncr53c9xvar.h#7 integrate .. //depot/projects/vap/sys/dev/ic/i8251.h#3 integrate .. //depot/projects/vap/sys/dev/ic/i8255.h#1 branch .. //depot/projects/vap/sys/dev/iicbus/ds133x.c#2 integrate .. //depot/projects/vap/sys/dev/iicbus/ds1672.c#3 integrate .. //depot/projects/vap/sys/dev/jme/if_jme.c#3 integrate .. //depot/projects/vap/sys/dev/jme/if_jmereg.h#2 integrate .. //depot/projects/vap/sys/dev/le/if_le_ledma.c#3 integrate .. //depot/projects/vap/sys/dev/si/si.c#7 integrate .. //depot/projects/vap/sys/dev/sound/pci/hda/hdac.c#8 integrate .. //depot/projects/vap/sys/dev/uart/uart_cpu_pc98.c#6 integrate .. //depot/projects/vap/sys/dev/usb/if_zyd.c#27 integrate .. //depot/projects/vap/sys/dev/usb/if_zydreg.h#10 integrate .. //depot/projects/vap/sys/dev/usb/usb_quirks.c#7 integrate .. //depot/projects/vap/sys/dev/usb/usbdevs#28 integrate .. //depot/projects/vap/sys/geom/geom_dev.c#8 integrate .. //depot/projects/vap/sys/gnu/fs/xfs/FreeBSD/xfs_vnode.h#3 integrate .. //depot/projects/vap/sys/i386/conf/XEN#3 integrate .. //depot/projects/vap/sys/i386/i386/local_apic.c#9 integrate .. //depot/projects/vap/sys/i386/i386/machdep.c#12 integrate .. //depot/projects/vap/sys/i386/include/xen/xenpmap.h#4 integrate .. //depot/projects/vap/sys/i386/include/xen/xenvar.h#3 integrate .. //depot/projects/vap/sys/i386/isa/isa.c#5 integrate .. //depot/projects/vap/sys/i386/linux/linux_genassym.c#3 integrate .. //depot/projects/vap/sys/i386/linux/linux_locore.s#3 integrate .. //depot/projects/vap/sys/i386/xen/mp_machdep.c#1 branch .. //depot/projects/vap/sys/i386/xen/mptable.c#1 branch .. //depot/projects/vap/sys/i386/xen/pmap.c#4 integrate .. //depot/projects/vap/sys/i386/xen/xen_machdep.c#5 integrate .. //depot/projects/vap/sys/kern/kern_exec.c#15 integrate .. //depot/projects/vap/sys/kern/subr_sleepqueue.c#15 integrate .. //depot/projects/vap/sys/kern/subr_turnstile.c#8 integrate .. //depot/projects/vap/sys/kern/uipc_sockbuf.c#7 integrate .. //depot/projects/vap/sys/mips/adm5120/admpci.c#2 integrate .. //depot/projects/vap/sys/mips/adm5120/if_admsw.c#2 integrate .. //depot/projects/vap/sys/mips/adm5120/if_admswvar.h#2 integrate .. //depot/projects/vap/sys/mips/adm5120/obio.c#2 integrate .. //depot/projects/vap/sys/mips/adm5120/uart_bus_adm5120.c#2 integrate .. //depot/projects/vap/sys/mips/adm5120/uart_cpu_adm5120.c#2 integrate .. //depot/projects/vap/sys/mips/adm5120/uart_dev_adm5120.c#2 integrate .. //depot/projects/vap/sys/mips/idt/idtpci.c#2 integrate .. //depot/projects/vap/sys/mips/idt/if_kr.c#2 integrate .. //depot/projects/vap/sys/mips/idt/obio.c#2 integrate .. //depot/projects/vap/sys/mips/idt/uart_bus_rc32434.c#2 integrate .. //depot/projects/vap/sys/mips/malta/gt.c#2 integrate .. //depot/projects/vap/sys/mips/malta/gt_pci.c#2 integrate .. //depot/projects/vap/sys/mips/malta/malta_machdep.c#2 integrate .. //depot/projects/vap/sys/mips/malta/obio.c#2 integrate .. //depot/projects/vap/sys/mips/malta/uart_bus_maltausart.c#2 integrate .. //depot/projects/vap/sys/mips/malta/uart_cpu_maltausart.c#2 integrate .. //depot/projects/vap/sys/mips/malta/yamon.c#2 integrate .. //depot/projects/vap/sys/mips/sentry5/obio.c#2 integrate .. //depot/projects/vap/sys/mips/sentry5/s5_machdep.c#2 integrate .. //depot/projects/vap/sys/mips/sentry5/uart_bus_sbusart.c#2 integrate .. //depot/projects/vap/sys/mips/sentry5/uart_cpu_sbusart.c#2 integrate .. //depot/projects/vap/sys/modules/Makefile#39 integrate .. //depot/projects/vap/sys/net/if_bridge.c#8 integrate .. //depot/projects/vap/sys/net/if_mib.c#6 integrate .. //depot/projects/vap/sys/net/if_tap.c#9 integrate .. //depot/projects/vap/sys/net/if_tap.h#5 integrate .. //depot/projects/vap/sys/netinet/tcp_debug.c#5 integrate .. //depot/projects/vap/sys/netinet/tcp_input.c#12 integrate .. //depot/projects/vap/sys/netinet/tcp_output.c#13 integrate .. //depot/projects/vap/sys/netinet/tcp_subr.c#12 integrate .. //depot/projects/vap/sys/netinet/tcp_var.h#10 integrate .. //depot/projects/vap/sys/pc98/cbus/sio.c#6 integrate .. //depot/projects/vap/sys/pc98/include/bus.h#6 integrate .. //depot/projects/vap/sys/pc98/pc98/busiosubr.c#4 integrate .. //depot/projects/vap/sys/security/mac_bsdextended/mac_bsdextended.c#9 integrate .. //depot/projects/vap/sys/sparc64/include/asi.h#6 integrate .. //depot/projects/vap/sys/sparc64/include/tlb.h#4 integrate .. //depot/projects/vap/sys/sparc64/sbus/dma_sbus.c#4 integrate .. //depot/projects/vap/sys/sparc64/sbus/lsi64854.c#6 integrate .. //depot/projects/vap/sys/sparc64/sbus/lsi64854var.h#6 integrate .. //depot/projects/vap/sys/sparc64/sparc64/cheetah.c#7 integrate .. //depot/projects/vap/sys/sparc64/sparc64/exception.S#9 integrate .. //depot/projects/vap/sys/sparc64/sparc64/genassym.c#8 integrate .. //depot/projects/vap/sys/sparc64/sparc64/mp_exception.S#6 integrate .. //depot/projects/vap/sys/sparc64/sparc64/pmap.c#12 integrate .. //depot/projects/vap/sys/sparc64/sparc64/support.S#6 integrate .. //depot/projects/vap/sys/sparc64/sparc64/swtch.S#6 integrate .. //depot/projects/vap/sys/sparc64/sparc64/tlb.c#5 integrate .. //depot/projects/vap/sys/sys/disk.h#5 integrate .. //depot/projects/vap/sys/sys/param.h#29 integrate .. //depot/projects/vap/sys/sys/vnode.h#15 integrate .. //depot/projects/vap/tools/regression/sockets/sendfile/sendfile.c#3 integrate .. //depot/projects/vap/tools/tools/nanobsd/nanobsd.sh#8 integrate .. //depot/projects/vap/usr.sbin/boot0cfg/boot0cfg.c#3 integrate .. //depot/projects/vap/usr.sbin/cxgbtool/cxgbtool.c#4 integrate .. //depot/projects/vap/usr.sbin/setfib/setfib.c#4 integrate Differences ... ==== //depot/projects/vap/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.54 2008/08/07 07:29:26 trasz Exp $"); +__FBSDID("$FreeBSD: src/bin/cp/utils.c,v 1.55 2008/09/09 12:31:42 trasz Exp $"); #include #include @@ -224,7 +224,6 @@ rval = 1; if (pflag && preserve_fd_acls(from_fd, to_fd) != 0) rval = 1; - (void)close(from_fd); if (close(to_fd)) { warn("%s", to.p_path); rval = 1; ==== //depot/projects/vap/contrib/gcc/config/arm/arm.h#3 (text+ko) ==== @@ -507,7 +507,7 @@ /* wchar_t is unsigned under the AAPCS. */ #ifndef WCHAR_TYPE #define WCHAR_TYPE (TARGET_AAPCS_BASED ? "unsigned int" : "int") - +#undef WCHAR_TYPE_SIZE #define WCHAR_TYPE_SIZE BITS_PER_WORD #endif ==== //depot/projects/vap/contrib/ntp/libparse/clk_rawdcf.c#4 (text+ko) ==== @@ -229,7 +229,7 @@ unsigned char *c = dcfprm->zerobits; int i; - parseprintf(DD_RAWDCF,("parse: convert_rawdcf: \"%s\"\n", buffer)); + parseprintf(DD_RAWDCF,("parse: convert_rawdcf: \"%.*s\"\n", size, buffer)); if (size < 57) { @@ -320,7 +320,7 @@ * bad format - not for us */ #ifndef PARSEKERNEL - msyslog(LOG_ERR, "parse: convert_rawdcf: parity check FAILED for \"%s\"\n", buffer); + msyslog(LOG_ERR, "parse: convert_rawdcf: parity check FAILED for \"%.*s\"\n", size, buffer); #endif return CVT_FAIL|CVT_BADFMT; } ==== //depot/projects/vap/etc/rc.initdiskless#4 (text+ko) ==== @@ -24,7 +24,7 @@ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # -# $FreeBSD: src/etc/rc.initdiskless,v 1.53 2008/05/15 11:00:23 bms Exp $ +# $FreeBSD: src/etc/rc.initdiskless,v 1.54 2008/09/09 18:40:50 bms Exp $ # On entry to this script the entire system consists of a read-only root # mounted via NFS. The kernel has run BOOTP and configured an interface @@ -73,6 +73,16 @@ # If this file exists, then failure to execute the mount # command contained in /conf/T/M/remount is non-fatal. # +# /conf/T/M/remount_subdir +# If this file exists, then the behaviour of /conf/T/M/remount +# changes as follows: +# 1. /conf/T/M/remount is invoked to mount the root of the +# filesystem where the configuration data exists on a +# temporary mountpoint. +# 2. /conf/T/M/remount_subdir is then invoked to mount a +# *subdirectory* of the filesystem mounted by +# /conf/T/M/remount on /conf/T/M/. +# # /conf/T/M/diskless_remount # The contents of the file points to an NFS filesystem, # possibly followed by mount_nfs options. If the server name @@ -296,10 +306,33 @@ # remount. Beware, the command is in the file itself! if [ -f $j/remount ]; then - nfspt=`/bin/cat $j/remount` - $nfspt $j - chkerr $? "$nfspt $j" - to_umount="$j ${to_umount}" # XXX hope it is really a mount! + if [ -f $j/remount_subdir ]; then + k="/conf.tmp/$i/$subdir" + [ -d $k ] || continue + + # Mount the filesystem root where the config data is + # on the temporary mount point. + nfspt=`/bin/cat $j/remount` + $nfspt $k + chkerr $? "$nfspt $k" + + # Now use a nullfs mount to get the data where we + # really want to see it. + remount_subdir=`/bin/cat $j/remount_subdir` + remount_subdir_cmd="mount -t nullfs $k/$remount_subdir" + + $remount_subdir_cmd $j + chkerr $? "$remount_subdir_cmd $j" + + # XXX check order -- we must force $k to be unmounted + # after j, as j depends on k. + to_umount="$j $k ${to_umount}" + else + nfspt=`/bin/cat $j/remount` + $nfspt $j + chkerr $? "$nfspt $j" + to_umount="$j ${to_umount}" # XXX hope it is really a mount! + fi fi # NFS remount ==== //depot/projects/vap/include/rpc/svc_auth.h#3 (text+ko) ==== @@ -30,7 +30,7 @@ * * from: @(#)svc_auth.h 1.6 86/07/16 SMI * @(#)svc_auth.h 2.1 88/07/29 4.0 RPCSRC - * $FreeBSD: src/include/rpc/svc_auth.h,v 1.14 2002/03/23 17:24:55 imp Exp $ + * $FreeBSD: src/include/rpc/svc_auth.h,v 1.15 2008/09/09 14:15:55 dfr Exp $ */ /* @@ -46,6 +46,8 @@ * Server side authenticator */ __BEGIN_DECLS +extern struct svc_auth_ops svc_auth_null_ops; + extern enum auth_stat _authenticate(struct svc_req *, struct rpc_msg *); extern int svc_auth_reg(int, enum auth_stat (*)(struct svc_req *, struct rpc_msg *)); ==== //depot/projects/vap/lib/libarchive/archive_write_disk.c#14 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include "archive_platform.h" -__FBSDID("$FreeBSD: src/lib/libarchive/archive_write_disk.c,v 1.35 2008/09/05 06:13:11 kientzle Exp $"); +__FBSDID("$FreeBSD: src/lib/libarchive/archive_write_disk.c,v 1.36 2008/09/07 05:22:33 kientzle Exp $"); #ifdef HAVE_SYS_TYPES_H #include @@ -907,14 +907,26 @@ * We know something is in the way, but we don't know what; * we need to find out before we go any further. */ - if (lstat(a->name, &a->st) != 0) { + int r = 0; + /* + * The SECURE_SYMLINK logic has already removed a + * symlink to a dir if the client wants that. So + * follow the symlink if we're creating a dir. + */ + if (S_ISDIR(a->mode)) + r = stat(a->name, &a->st); + /* + * If it's not a dir (or it's a broken symlink), + * then don't follow it. + */ + if (r != 0 || !S_ISDIR(a->mode)) + r = lstat(a->name, &a->st); + if (r != 0) { archive_set_error(&a->archive, errno, "Can't stat existing object"); return (ARCHIVE_WARN); } - /* TODO: if it's a symlink... */ - /* * NO_OVERWRITE_NEWER doesn't apply to directories. */ ==== //depot/projects/vap/lib/libarchive/test/Makefile#12 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/lib/libarchive/test/Makefile,v 1.24 2008/08/25 06:08:22 kientzle Exp $ +# $FreeBSD: src/lib/libarchive/test/Makefile,v 1.25 2008/09/08 00:58:12 kientzle Exp $ # Where to find the libarchive sources LA_SRCDIR=${.CURDIR}/.. @@ -89,7 +89,7 @@ # Uncomment to link against dmalloc #LDADD+= -L/usr/local/lib -ldmalloc #CFLAGS+= -I/usr/local/include -DUSE_DMALLOC -#WARNS=6 +WARNS=6 # Build libarchive_test and run it. check test: libarchive_test ==== //depot/projects/vap/lib/libarchive/test/test_read_format_gtar_sparse.c#6 (text+ko) ==== @@ -23,7 +23,7 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ #include "test.h" -__FBSDID("$FreeBSD: src/lib/libarchive/test/test_read_format_gtar_sparse.c,v 1.9 2008/09/01 05:38:33 kientzle Exp $"); +__FBSDID("$FreeBSD: src/lib/libarchive/test/test_read_format_gtar_sparse.c,v 1.10 2008/09/08 00:58:12 kientzle Exp $"); struct contents { @@ -187,6 +187,7 @@ struct contents expect; /* data, size, offset of block read from archive. */ struct contents actual; + const void *p; struct archive *a; extract_reference_file(name); @@ -206,10 +207,10 @@ expect = *cts++; while (0 == (err = archive_read_data_block(a, - (const void **)&actual.d, - &actual.s, &actual.o))) { + &p, &actual.s, &actual.o))) { + actual.d = p; while (actual.s > 0) { - char c = *(const char *)actual.d; + char c = *actual.d; if(actual.o < expect.o) { /* * Any byte before the expected ==== //depot/projects/vap/lib/libarchive/test/test_write_disk_secure.c#5 (text+ko) ==== @@ -23,7 +23,7 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ #include "test.h" -__FBSDID("$FreeBSD: src/lib/libarchive/test/test_write_disk_secure.c,v 1.5 2008/09/01 05:38:33 kientzle Exp $"); +__FBSDID("$FreeBSD: src/lib/libarchive/test/test_write_disk_secure.c,v 1.8 2008/09/07 23:59:27 kientzle Exp $"); #define UMASK 022 @@ -105,6 +105,80 @@ archive_entry_free(ae); assert(0 == archive_write_finish_entry(a)); + /* + * Without security checks, extracting a dir over a link to a + * dir should follow the link. + */ + /* Create a symlink to a dir. */ + assert((ae = archive_entry_new()) != NULL); + archive_entry_copy_pathname(ae, "link_to_dir3"); + archive_entry_set_mode(ae, S_IFLNK | 0777); + archive_entry_set_symlink(ae, "dir"); + archive_write_disk_set_options(a, 0); + assert(0 == archive_write_header(a, ae)); + assert(0 == archive_write_finish_entry(a)); + /* Extract a dir whose name matches the symlink. */ + assert(archive_entry_clear(ae) != NULL); + archive_entry_copy_pathname(ae, "link_to_dir3"); + archive_entry_set_mode(ae, S_IFDIR | 0777); + assert(0 == archive_write_header(a, ae)); + assert(0 == archive_write_finish_entry(a)); + /* Verify link was followed. */ + assertEqualInt(0, lstat("link_to_dir3", &st)); + assert(S_ISLNK(st.st_mode)); + archive_entry_free(ae); + + /* + * As above, but a broken link, so the link should get replaced. + */ + /* Create a symlink to a dir. */ + assert((ae = archive_entry_new()) != NULL); + archive_entry_copy_pathname(ae, "link_to_dir4"); + archive_entry_set_mode(ae, S_IFLNK | 0777); + archive_entry_set_symlink(ae, "nonexistent_dir"); + archive_write_disk_set_options(a, 0); + assert(0 == archive_write_header(a, ae)); + assert(0 == archive_write_finish_entry(a)); + /* Extract a dir whose name matches the symlink. */ + assert(archive_entry_clear(ae) != NULL); + archive_entry_copy_pathname(ae, "link_to_dir4"); + archive_entry_set_mode(ae, S_IFDIR | 0777); + assert(0 == archive_write_header(a, ae)); + assert(0 == archive_write_finish_entry(a)); + /* Verify link was replaced. */ + assertEqualInt(0, lstat("link_to_dir4", &st)); + assert(S_ISDIR(st.st_mode)); + archive_entry_free(ae); + + /* + * As above, but a link to a non-dir, so the link should get replaced. + */ + /* Create a regular file and a symlink to it */ + assert((ae = archive_entry_new()) != NULL); + archive_entry_copy_pathname(ae, "non_dir"); + archive_entry_set_mode(ae, S_IFREG | 0777); + archive_write_disk_set_options(a, 0); + assert(0 == archive_write_header(a, ae)); + assert(0 == archive_write_finish_entry(a)); + /* Create symlink to the file. */ + archive_entry_copy_pathname(ae, "link_to_dir5"); + archive_entry_set_mode(ae, S_IFLNK | 0777); + archive_entry_set_symlink(ae, "non_dir"); + archive_write_disk_set_options(a, 0); + assert(0 == archive_write_header(a, ae)); + assert(0 == archive_write_finish_entry(a)); + /* Extract a dir whose name matches the symlink. */ + assert(archive_entry_clear(ae) != NULL); + archive_entry_copy_pathname(ae, "link_to_dir5"); + archive_entry_set_mode(ae, S_IFDIR | 0777); + assert(0 == archive_write_header(a, ae)); + assert(0 == archive_write_finish_entry(a)); + /* Verify link was replaced. */ + assertEqualInt(0, lstat("link_to_dir5", &st)); + assert(S_ISDIR(st.st_mode)); + archive_entry_free(ae); + + #if ARCHIVE_VERSION_NUMBER < 2000000 archive_write_finish(a); #else ==== //depot/projects/vap/lib/libc/gen/arc4random.c#5 (text+ko) ==== @@ -33,7 +33,7 @@ */ #include -__FBSDID("$FreeBSD: src/lib/libc/gen/arc4random.c,v 1.24 2008/08/03 20:15:22 ache Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/gen/arc4random.c,v 1.25 2008/09/09 09:46:36 ache Exp $"); #include "namespace.h" #include @@ -54,7 +54,7 @@ static pthread_mutex_t arc4random_mtx = PTHREAD_MUTEX_INITIALIZER; -#define RANDOMDEV "/dev/urandom" +#define RANDOMDEV "/dev/random" #define KEYSIZE 128 #define THREAD_LOCK() \ do { \ @@ -193,6 +193,7 @@ THREAD_LOCK(); arc4_check_init(); arc4_stir(); + rs_stired = 1; THREAD_UNLOCK(); } ==== //depot/projects/vap/lib/libc/rpc/svc.c#4 (text+ko) ==== @@ -34,7 +34,7 @@ static char *sccsid = "@(#)svc.c 2.4 88/08/11 4.0 RPCSRC"; #endif #include -__FBSDID("$FreeBSD: src/lib/libc/rpc/svc.c,v 1.25 2008/08/06 14:02:05 dfr Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/rpc/svc.c,v 1.26 2008/09/09 14:15:55 dfr Exp $"); /* * svc.c, Server-side remote procedure call interface. @@ -569,6 +569,7 @@ ext = mem_alloc(sizeof(SVCXPRT_EXT)); memset(ext, 0, sizeof(SVCXPRT_EXT)); xprt->xp_p3 = ext; + ext->xp_auth.svc_ah_ops = &svc_auth_null_ops; return (xprt); } ==== //depot/projects/vap/lib/libc/rpc/svc_auth.c#4 (text+ko) ==== @@ -37,7 +37,7 @@ static char sccsid[] = "@(#)svc_auth.c 1.26 89/02/07 Copyr 1984 Sun Micro"; #endif #include -__FBSDID("$FreeBSD: src/lib/libc/rpc/svc_auth.c,v 1.14 2008/08/06 14:02:05 dfr Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/rpc/svc_auth.c,v 1.15 2008/09/09 14:15:55 dfr Exp $"); /* * svc_auth.c, Server-side rpc authenticator interface. @@ -75,7 +75,7 @@ }; static struct authsvc *Auths = NULL; -static struct svc_auth_ops svc_auth_null_ops; +struct svc_auth_ops svc_auth_null_ops; /* * The call rpc message, msg has been obtained from the wire. The msg contains @@ -162,7 +162,7 @@ return (xdr_func(xdrs, xdr_ptr)); } -static struct svc_auth_ops svc_auth_null_ops = { +struct svc_auth_ops svc_auth_null_ops = { svcauth_null_wrap, svcauth_null_wrap, }; ==== //depot/projects/vap/lib/libc/stdlib/malloc.c#16 (text+ko) ==== @@ -156,7 +156,7 @@ #define MALLOC_DSS #include -__FBSDID("$FreeBSD: src/lib/libc/stdlib/malloc.c,v 1.178 2008/09/06 05:26:31 marcel Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/stdlib/malloc.c,v 1.179 2008/09/10 14:27:34 jasone Exp $"); #include "libc_private.h" #ifdef MALLOC_DEBUG @@ -174,6 +174,7 @@ #include /* Must come after several other sys/ includes. */ #include +#include #include #include @@ -213,55 +214,43 @@ #define STRERROR_BUF 64 /* - * The const_size2bin table is sized according to PAGESIZE_2POW, but for - * correctness reasons, we never assume that - * (pagesize == (1U << * PAGESIZE_2POW)). - * * Minimum alignment of allocations is 2^QUANTUM_2POW bytes. */ #ifdef __i386__ -# define PAGESIZE_2POW 12 # define QUANTUM_2POW 4 # define SIZEOF_PTR_2POW 2 # define CPU_SPINWAIT __asm__ volatile("pause") #endif #ifdef __ia64__ -# define PAGESIZE_2POW 13 # define QUANTUM_2POW 4 # define SIZEOF_PTR_2POW 3 #endif #ifdef __alpha__ -# define PAGESIZE_2POW 13 # define QUANTUM_2POW 4 # define SIZEOF_PTR_2POW 3 # define NO_TLS #endif #ifdef __sparc64__ -# define PAGESIZE_2POW 13 # define QUANTUM_2POW 4 # define SIZEOF_PTR_2POW 3 # define NO_TLS #endif #ifdef __amd64__ -# define PAGESIZE_2POW 12 # define QUANTUM_2POW 4 # define SIZEOF_PTR_2POW 3 # define CPU_SPINWAIT __asm__ volatile("pause") #endif #ifdef __arm__ -# define PAGESIZE_2POW 12 # define QUANTUM_2POW 3 # define SIZEOF_PTR_2POW 2 # define NO_TLS #endif #ifdef __mips__ -# define PAGESIZE_2POW 12 # define QUANTUM_2POW 3 # define SIZEOF_PTR_2POW 2 # define NO_TLS #endif #ifdef __powerpc__ -# define PAGESIZE_2POW 12 # define QUANTUM_2POW 4 # define SIZEOF_PTR_2POW 2 #endif @@ -361,7 +350,7 @@ #define RUN_MAX_OVRHD_RELAX 0x00001800U /* Put a cap on small object run size. This overrides RUN_MAX_OVRHD. */ -#define RUN_MAX_SMALL (12 * pagesize) +#define RUN_MAX_SMALL (12 * PAGE_SIZE) /* * Hyper-threaded CPUs may need a special instruction inside spin loops in @@ -733,7 +722,8 @@ /* * bins is used to store rings of free regions of the following sizes, - * assuming a 16-byte quantum, 4kB pagesize, and default MALLOC_OPTIONS. + * assuming a 16-byte quantum, 4kB page size, and default + * MALLOC_OPTIONS. * * bins[i] | size | * --------+------+ @@ -794,11 +784,6 @@ /* Number of CPUs. */ static unsigned ncpus; -/* VM page size. */ -static size_t pagesize; -static size_t pagesize_mask; -static size_t pagesize_2pow; - /* Various bin-related settings. */ #ifdef MALLOC_TINY /* Number of (2^n)-spaced tiny bins. */ # define ntbins ((unsigned)(QUANTUM_2POW - TINY_MIN_2POW)) @@ -835,7 +820,7 @@ #define S2B_64(i) S2B_32(i) S2B_32(i) #define S2B_128(i) S2B_64(i) S2B_64(i) #define S2B_256(i) S2B_128(i) S2B_128(i) -static const uint8_t const_size2bin[(1U << PAGESIZE_2POW) - 255] = { +static const uint8_t const_size2bin[PAGE_SIZE - 255] = { S2B_1(0xffU) /* 0 */ #if (QUANTUM_2POW == 4) /* 64-bit system ************************/ @@ -906,7 +891,7 @@ S2B_256(S2B_SMIN + 10) /* 3328 */ S2B_256(S2B_SMIN + 11) /* 3584 */ S2B_256(S2B_SMIN + 12) /* 3840 */ -#if (PAGESIZE_2POW == 13) +#if (PAGE_SHIFT == 13) S2B_256(S2B_SMIN + 13) /* 4096 */ S2B_256(S2B_SMIN + 14) /* 4352 */ S2B_256(S2B_SMIN + 15) /* 4608 */ @@ -1345,9 +1330,9 @@ #define SUBPAGE_CEILING(s) \ (((s) + SUBPAGE_MASK) & ~SUBPAGE_MASK) -/* Return the smallest pagesize multiple that is >= s. */ +/* Return the smallest PAGE_SIZE multiple that is >= s. */ #define PAGE_CEILING(s) \ - (((s) + pagesize_mask) & ~pagesize_mask) + (((s) + PAGE_MASK) & ~PAGE_MASK) #ifdef MALLOC_TINY /* Compute the smallest power of 2 that is >= x. */ @@ -1693,7 +1678,7 @@ i < ntbins + nqbins + ncbins ? "C" : "S", arena->bins[i].reg_size, arena->bins[i].nregs, - arena->bins[i].run_size >> pagesize_2pow, + arena->bins[i].run_size >> PAGE_SHIFT, #ifdef MALLOC_MAG (__isthreaded && opt_mag) ? arena->bins[i].stats.nmags : @@ -2335,8 +2320,8 @@ arena_avail_comp(arena_chunk_map_t *a, arena_chunk_map_t *b) { int ret; - size_t a_size = a->bits & ~pagesize_mask; - size_t b_size = b->bits & ~pagesize_mask; + size_t a_size = a->bits & ~PAGE_MASK; + size_t b_size = b->bits & ~PAGE_MASK; ret = (a_size > b_size) - (a_size < b_size); if (ret == 0) { @@ -2521,7 +2506,7 @@ SSIZE_INV(4), SSIZE_INV(5), SSIZE_INV(6), SSIZE_INV(7), SSIZE_INV(8), SSIZE_INV(9), SSIZE_INV(10), SSIZE_INV(11), SSIZE_INV(12), SSIZE_INV(13), SSIZE_INV(14), SSIZE_INV(15) -#if (PAGESIZE_2POW == 13) +#if (PAGE_SHIFT == 13) , SSIZE_INV(16), SSIZE_INV(17), SSIZE_INV(18), SSIZE_INV(19), SSIZE_INV(20), SSIZE_INV(21), SSIZE_INV(22), SSIZE_INV(23), @@ -2530,7 +2515,7 @@ #endif }; assert(SUBPAGE * (((sizeof(ssize_invs)) / sizeof(unsigned)) + 3) - >= (1U << PAGESIZE_2POW)); + >= PAGE_SIZE); if (size < (((sizeof(ssize_invs) / sizeof(unsigned)) + 2) << SUBPAGE_2POW)) { @@ -2562,10 +2547,10 @@ chunk = (arena_chunk_t *)CHUNK_ADDR2BASE(run); old_ndirty = chunk->ndirty; run_ind = (unsigned)(((uintptr_t)run - (uintptr_t)chunk) - >> pagesize_2pow); - total_pages = (chunk->map[run_ind].bits & ~pagesize_mask) >> - pagesize_2pow; - need_pages = (size >> pagesize_2pow); + >> PAGE_SHIFT); + total_pages = (chunk->map[run_ind].bits & ~PAGE_MASK) >> + PAGE_SHIFT; + need_pages = (size >> PAGE_SHIFT); assert(need_pages > 0); assert(need_pages <= total_pages); rem_pages = total_pages - need_pages; @@ -2575,11 +2560,11 @@ /* Keep track of trailing unused pages for later use. */ if (rem_pages > 0) { chunk->map[run_ind+need_pages].bits = (rem_pages << - pagesize_2pow) | (chunk->map[run_ind+need_pages].bits & - pagesize_mask); + PAGE_SHIFT) | (chunk->map[run_ind+need_pages].bits & + PAGE_MASK); chunk->map[run_ind+total_pages-1].bits = (rem_pages << - pagesize_2pow) | (chunk->map[run_ind+total_pages-1].bits & - pagesize_mask); + PAGE_SHIFT) | (chunk->map[run_ind+total_pages-1].bits & + PAGE_MASK); arena_avail_tree_insert(&arena->runs_avail, &chunk->map[run_ind+need_pages]); } @@ -2590,7 +2575,7 @@ if ((chunk->map[run_ind + i].bits & CHUNK_MAP_ZEROED) == 0) { memset((void *)((uintptr_t)chunk + ((run_ind - + i) << pagesize_2pow)), 0, pagesize); + + i) << PAGE_SHIFT)), 0, PAGE_SIZE); /* CHUNK_MAP_ZEROED is cleared below. */ } } @@ -2706,7 +2691,7 @@ arena_chunk_map_t *mapelm, key; assert(size <= arena_maxclass); - assert((size & pagesize_mask) == 0); + assert((size & PAGE_MASK) == 0); /* Search the arena's chunks for the lowest best fit. */ key.bits = size | CHUNK_MAP_KEY; @@ -2717,7 +2702,7 @@ / sizeof(arena_chunk_map_t); run = (arena_run_t *)((uintptr_t)run_chunk + (pageind - << pagesize_2pow)); + << PAGE_SHIFT)); arena_run_split(arena, run, size, large, zero); return (run); } @@ -2729,7 +2714,7 @@ if (chunk == NULL) return (NULL); run = (arena_run_t *)((uintptr_t)chunk + (arena_chunk_header_npages << - pagesize_2pow)); + PAGE_SHIFT)); /* Update page map. */ arena_run_split(arena, run, size, large, zero); return (run); @@ -2781,7 +2766,7 @@ arena->ndirty -= npages; madvise((void *)((uintptr_t)chunk + (i << - pagesize_2pow)), (npages << pagesize_2pow), + PAGE_SHIFT)), (npages << PAGE_SHIFT), MADV_FREE); #ifdef MALLOC_STATS arena->stats.nmadvise++; @@ -2807,14 +2792,14 @@ chunk = (arena_chunk_t *)CHUNK_ADDR2BASE(run); run_ind = (size_t)(((uintptr_t)run - (uintptr_t)chunk) - >> pagesize_2pow); + >> PAGE_SHIFT); assert(run_ind >= arena_chunk_header_npages); assert(run_ind < chunk_npages); if ((chunk->map[run_ind].bits & CHUNK_MAP_LARGE) != 0) - size = chunk->map[run_ind].bits & ~pagesize_mask; + size = chunk->map[run_ind].bits & ~PAGE_MASK; else size = run->bin->run_size; - run_pages = (size >> pagesize_2pow); + run_pages = (size >> PAGE_SHIFT); /* Mark pages as unallocated in the chunk map. */ if (dirty) { @@ -2841,15 +2826,15 @@ } } chunk->map[run_ind].bits = size | (chunk->map[run_ind].bits & - pagesize_mask); + PAGE_MASK); chunk->map[run_ind+run_pages-1].bits = size | - (chunk->map[run_ind+run_pages-1].bits & pagesize_mask); + (chunk->map[run_ind+run_pages-1].bits & PAGE_MASK); /* Try to coalesce forward. */ if (run_ind + run_pages < chunk_npages && (chunk->map[run_ind+run_pages].bits & CHUNK_MAP_ALLOCATED) == 0) { size_t nrun_size = chunk->map[run_ind+run_pages].bits & - ~pagesize_mask; + ~PAGE_MASK; /* * Remove successor from runs_avail; the coalesced run is @@ -2859,22 +2844,22 @@ &chunk->map[run_ind+run_pages]); size += nrun_size; - run_pages = size >> pagesize_2pow; + run_pages = size >> PAGE_SHIFT; - assert((chunk->map[run_ind+run_pages-1].bits & ~pagesize_mask) + assert((chunk->map[run_ind+run_pages-1].bits & ~PAGE_MASK) == nrun_size); chunk->map[run_ind].bits = size | (chunk->map[run_ind].bits & - pagesize_mask); + PAGE_MASK); chunk->map[run_ind+run_pages-1].bits = size | - (chunk->map[run_ind+run_pages-1].bits & pagesize_mask); + (chunk->map[run_ind+run_pages-1].bits & PAGE_MASK); } /* Try to coalesce backward. */ if (run_ind > arena_chunk_header_npages && (chunk->map[run_ind-1].bits & CHUNK_MAP_ALLOCATED) == 0) { - size_t prun_size = chunk->map[run_ind-1].bits & ~pagesize_mask; + size_t prun_size = chunk->map[run_ind-1].bits & ~PAGE_MASK; - run_ind -= prun_size >> pagesize_2pow; + run_ind -= prun_size >> PAGE_SHIFT; /* * Remove predecessor from runs_avail; the coalesced run is @@ -2884,21 +2869,21 @@ &chunk->map[run_ind]); size += prun_size; - run_pages = size >> pagesize_2pow; + run_pages = size >> PAGE_SHIFT; - assert((chunk->map[run_ind].bits & ~pagesize_mask) == + assert((chunk->map[run_ind].bits & ~PAGE_MASK) == prun_size); chunk->map[run_ind].bits = size | (chunk->map[run_ind].bits & - pagesize_mask); + PAGE_MASK); chunk->map[run_ind+run_pages-1].bits = size | - (chunk->map[run_ind+run_pages-1].bits & pagesize_mask); + (chunk->map[run_ind+run_pages-1].bits & PAGE_MASK); } /* Insert into runs_avail, now that coalescing is complete. */ arena_avail_tree_insert(&arena->runs_avail, &chunk->map[run_ind]); /* Deallocate chunk if it is now completely unused. */ - if ((chunk->map[arena_chunk_header_npages].bits & (~pagesize_mask | + if ((chunk->map[arena_chunk_header_npages].bits & (~PAGE_MASK | CHUNK_MAP_ALLOCATED)) == arena_maxclass) arena_chunk_dealloc(arena, chunk); @@ -2911,8 +2896,8 @@ arena_run_trim_head(arena_t *arena, arena_chunk_t *chunk, arena_run_t *run, size_t oldsize, size_t newsize) { - size_t pageind = ((uintptr_t)run - (uintptr_t)chunk) >> pagesize_2pow; - size_t head_npages = (oldsize - newsize) >> pagesize_2pow; + size_t pageind = ((uintptr_t)run - (uintptr_t)chunk) >> PAGE_SHIFT; + size_t head_npages = (oldsize - newsize) >> PAGE_SHIFT; assert(oldsize > newsize); @@ -2932,8 +2917,8 @@ arena_run_trim_tail(arena_t *arena, arena_chunk_t *chunk, arena_run_t *run, size_t oldsize, size_t newsize, bool dirty) { - size_t pageind = ((uintptr_t)run - (uintptr_t)chunk) >> pagesize_2pow; - size_t npages = newsize >> pagesize_2pow; + size_t pageind = ((uintptr_t)run - (uintptr_t)chunk) >> PAGE_SHIFT; + size_t npages = newsize >> PAGE_SHIFT; assert(oldsize > newsize); @@ -2962,7 +2947,7 @@ if (mapelm != NULL) { /* run is guaranteed to have available space. */ arena_run_tree_remove(&bin->runs, mapelm); - run = (arena_run_t *)(mapelm->bits & ~pagesize_mask); + run = (arena_run_t *)(mapelm->bits & ~PAGE_MASK); #ifdef MALLOC_STATS bin->stats.reruns++; #endif @@ -3053,7 +3038,7 @@ unsigned good_nregs, good_mask_nelms, good_reg0_offset; unsigned try_nregs, try_mask_nelms, try_reg0_offset; - assert(min_run_size >= pagesize); + assert(min_run_size >= PAGE_SIZE); assert(min_run_size <= arena_maxclass); assert(min_run_size <= RUN_MAX_SMALL); @@ -3089,7 +3074,7 @@ good_reg0_offset = try_reg0_offset; /* Try more aggressive settings. */ - try_run_size += pagesize; + try_run_size += PAGE_SIZE; try_nregs = ((try_run_size - sizeof(arena_run_t)) / bin->reg_size) + 1; /* Counter-act try_nregs-- in loop. */ do { @@ -3405,8 +3390,8 @@ size_t offset; arena_chunk_t *chunk; - assert((size & pagesize_mask) == 0); - assert((alignment & pagesize_mask) == 0); + assert((size & PAGE_MASK) == 0); + assert((alignment & PAGE_MASK) == 0); #ifdef MALLOC_BALANCE arena_lock_balance(arena); @@ -3422,7 +3407,7 @@ chunk = (arena_chunk_t *)CHUNK_ADDR2BASE(ret); offset = (uintptr_t)ret & (alignment - 1); - assert((offset & pagesize_mask) == 0); + assert((offset & PAGE_MASK) == 0); assert(offset < alloc_size); if (offset == 0) arena_run_trim_tail(arena, chunk, ret, alloc_size, size, false); @@ -3492,7 +3477,7 @@ return (NULL); } - if (ceil_size <= pagesize || (alignment <= pagesize + if (ceil_size <= PAGE_SIZE || (alignment <= PAGE_SIZE && ceil_size <= arena_maxclass)) ret = arena_malloc(choose_arena(), ceil_size, false); else { @@ -3506,7 +3491,7 @@ ceil_size = PAGE_CEILING(size); /* * (ceil_size < size) protects against very large sizes within - * pagesize of SIZE_T_MAX. + * PAGE_SIZE of SIZE_T_MAX. * * (ceil_size + alignment < ceil_size) protects against the * combination of maximal alignment and ceil_size large enough @@ -3526,18 +3511,18 @@ * would need to allocate in order to guarantee the alignment. */ if (ceil_size >= alignment) - run_size = ceil_size + alignment - pagesize; + run_size = ceil_size + alignment - PAGE_SIZE; else { /* >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Wed Sep 10 17:00:59 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C8CE01065677; Wed, 10 Sep 2008 17:00: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 8E7541065671 for ; Wed, 10 Sep 2008 17:00:58 +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 7A6148FC1A for ; Wed, 10 Sep 2008 17:00:58 +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 m8AH0wHv053348 for ; Wed, 10 Sep 2008 17:00:58 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m8AH0wN0053346 for perforce@freebsd.org; Wed, 10 Sep 2008 17:00:58 GMT (envelope-from sam@freebsd.org) Date: Wed, 10 Sep 2008 17:00:58 GMT Message-Id: <200809101700.m8AH0wN0053346@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 149540 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, 10 Sep 2008 17:00:59 -0000 http://perforce.freebsd.org/chv.cgi?CH=149540 Change 149540 by sam@sam_ebb on 2008/09/10 17:00:49 IFC Affected files ... .. //depot/projects/vap/sys/conf/files.i386#18 integrate Differences ... ==== //depot/projects/vap/sys/conf/files.i386#18 (text+ko) ==== @@ -1,7 +1,7 @@ # This file tells config what files go into building a kernel, # files marked standard are always included. # -# $FreeBSD: src/sys/conf/files.i386,v 1.605 2008/08/23 21:00:40 jhb Exp $ +# $FreeBSD: src/sys/conf/files.i386,v 1.606 2008/09/09 22:37:29 rpaulo Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -205,6 +205,7 @@ dev/ipmi/ipmi_smbios.c optional ipmi dev/ipmi/ipmi_ssif.c optional ipmi smbus dev/ipmi/ipmi_pci.c optional ipmi pci +dev/k8temp/k8temp.c optional k8temp dev/kbd/kbd.c optional atkbd | sc | ukbd dev/le/if_le_isa.c optional le isa dev/mem/memutil.c optional mem From owner-p4-projects@FreeBSD.ORG Wed Sep 10 17:02:00 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 019AA1065671; Wed, 10 Sep 2008 17:02: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 B9DC5106564A for ; Wed, 10 Sep 2008 17:01:59 +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 A5E648FC15 for ; Wed, 10 Sep 2008 17:01:59 +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 m8AH1xWe059066 for ; Wed, 10 Sep 2008 17:01:59 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m8AH1x7V059060 for perforce@freebsd.org; Wed, 10 Sep 2008 17:01:59 GMT (envelope-from sam@freebsd.org) Date: Wed, 10 Sep 2008 17:01:59 GMT Message-Id: <200809101701.m8AH1x7V059060@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 149541 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, 10 Sep 2008 17:02:00 -0000 http://perforce.freebsd.org/chv.cgi?CH=149541 Change 149541 by sam@sam_ebb on 2008/09/10 17:01:33 IFC Affected files ... .. //depot/projects/vap/sys/dev/ath/if_athvar.h#28 integrate Differences ... ==== //depot/projects/vap/sys/dev/ath/if_athvar.h#28 (text+ko) ==== @@ -26,7 +26,7 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF * THE POSSIBILITY OF SUCH DAMAGES. * - * $FreeBSD: src/sys/dev/ath/if_athvar.h,v 1.65 2008/05/29 00:10:48 sam Exp $ + * $FreeBSD: src/sys/dev/ath/if_athvar.h,v 1.66 2008/09/09 16:21:25 rpaulo Exp $ */ /* @@ -505,7 +505,7 @@ #define ath_hal_getregdomain(_ah, _prd) \ (ath_hal_getcapability(_ah, HAL_CAP_REG_DMN, 0, (_prd)) == HAL_OK) #define ath_hal_setregdomain(_ah, _rd) \ - (*(uint16_t *)(((uint8_t *)(_ah)) + 520) = (_rd)) + (*(uint16_t *)(((uint8_t *)&(_ah)[1]) + 128) = (_rd)) #define ath_hal_getcountrycode(_ah, _pcc) \ (*(_pcc) = (_ah)->ah_countryCode) #define ath_hal_gettkipmic(_ah) \ From owner-p4-projects@FreeBSD.ORG Wed Sep 10 17:18:16 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A5FA21065678; Wed, 10 Sep 2008 17:18: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 6A1961065675 for ; Wed, 10 Sep 2008 17:18:16 +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 47D3C8FC13 for ; Wed, 10 Sep 2008 17:18:16 +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 m8AHIG0R065769 for ; Wed, 10 Sep 2008 17:18:16 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m8AHIG8k065763 for perforce@freebsd.org; Wed, 10 Sep 2008 17:18:16 GMT (envelope-from sam@freebsd.org) Date: Wed, 10 Sep 2008 17:18:16 GMT Message-Id: <200809101718.m8AHIG8k065763@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 149542 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, 10 Sep 2008 17:18:16 -0000 http://perforce.freebsd.org/chv.cgi?CH=149542 Change 149542 by sam@sam_ebb on 2008/09/10 17:17:33 correct spelling of EOSP and add a comment Affected files ... .. //depot/projects/vap/sys/net80211/ieee80211.h#16 edit Differences ... ==== //depot/projects/vap/sys/net80211/ieee80211.h#16 (text+ko) ==== @@ -188,8 +188,8 @@ #define IEEE80211_QOS_ACKPOLICY_S 5 #define IEEE80211_QOS_ACKPOLICY_NOACK 0x20 /* No ACK required */ #define IEEE80211_QOS_ACKPOLICY_BA 0x60 /* Block ACK */ -#define IEEE80211_QOS_ESOP 0x10 -#define IEEE80211_QOS_ESOP_S 4 +#define IEEE80211_QOS_EOSP 0x10 /* EndOfService Period*/ +#define IEEE80211_QOS_EOSP_S 4 #define IEEE80211_QOS_TID 0x0f /* does frame have QoS sequence control data */ From owner-p4-projects@FreeBSD.ORG Wed Sep 10 17:21:20 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id F049A1065671; Wed, 10 Sep 2008 17:21:19 +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 B4B01106566C for ; Wed, 10 Sep 2008 17:21:19 +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 A08958FC15 for ; Wed, 10 Sep 2008 17:21:19 +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 m8AHLJL0079511 for ; Wed, 10 Sep 2008 17:21:19 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m8AHLJcW079509 for perforce@freebsd.org; Wed, 10 Sep 2008 17:21:19 GMT (envelope-from sam@freebsd.org) Date: Wed, 10 Sep 2008 17:21:19 GMT Message-Id: <200809101721.m8AHLJcW079509@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 149544 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, 10 Sep 2008 17:21:20 -0000 http://perforce.freebsd.org/chv.cgi?CH=149544 Change 149544 by sam@sam_ebb on 2008/09/10 17:20:33 correct QoS control field in ampdu subframes; when ampdu is negotiated with an immediate BA policy subframes are to be marked to have normal acks and not explicit BA's; this (apparently) wasn't noticed because existing drivers crafted their own QoS ctrl field and/or some receivers generate BA regardless of what you stick in there Affected files ... .. //depot/projects/vap/sys/net80211/ieee80211_output.c#57 edit Differences ... ==== //depot/projects/vap/sys/net80211/ieee80211_output.c#57 (text+ko) ==== @@ -1061,8 +1061,12 @@ if (IEEE80211_AMPDU_RUNNING(tap)) { /* * Operational, mark frame for aggregation. + * + * NB: We support only immediate BA's for + * AMPDU which means we set the QoS control + * field to "normal ack" (0) to get "implicit + * block ack" behaviour. */ - qos[0] |= IEEE80211_QOS_ACKPOLICY_BA; m->m_flags |= M_AMPDU_MPDU; } else if (!IEEE80211_AMPDU_REQUESTED(tap) && ic->ic_ampdu_enable(ni, tap)) { From owner-p4-projects@FreeBSD.ORG Wed Sep 10 17:22:21 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2922E1065678; Wed, 10 Sep 2008 17:22: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 E04011065672 for ; Wed, 10 Sep 2008 17:22:20 +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 CBE6D8FC21 for ; Wed, 10 Sep 2008 17:22:20 +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 m8AHMK10086803 for ; Wed, 10 Sep 2008 17:22:20 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m8AHMKOR086801 for perforce@freebsd.org; Wed, 10 Sep 2008 17:22:20 GMT (envelope-from sam@freebsd.org) Date: Wed, 10 Sep 2008 17:22:20 GMT Message-Id: <200809101722.m8AHMKOR086801@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 149545 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, 10 Sep 2008 17:22:21 -0000 http://perforce.freebsd.org/chv.cgi?CH=149545 Change 149545 by sam@sam_ebb on 2008/09/10 17:21:36 need to use the bss node to get tx params for mgt frames; using the destination sta can result in mgt frames sent with HT rates Affected files ... .. //depot/projects/vap/sys/net80211/ieee80211_output.c#58 edit Differences ... ==== //depot/projects/vap/sys/net80211/ieee80211_output.c#58 (text+ko) ==== @@ -2133,10 +2133,10 @@ /* NB: force non-ProbeResp frames to the highest queue */ params.ibp_pri = WME_AC_VO; - params.ibp_rate0 = ni->ni_txparms->mgmtrate; + params.ibp_rate0 = bss->ni_txparms->mgmtrate; /* NB: we know all frames are unicast */ - params.ibp_try0 = ni->ni_txparms->maxretry; - params.ibp_power = ni->ni_txpower; + params.ibp_try0 = bss->ni_txparms->maxretry; + params.ibp_power = bss->ni_txpower; return ieee80211_mgmt_output(ni, m, type, ¶ms); bad: ieee80211_free_node(ni); From owner-p4-projects@FreeBSD.ORG Wed Sep 10 17:24:23 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id ABAD81065671; Wed, 10 Sep 2008 17:24: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 57430106564A for ; Wed, 10 Sep 2008 17:24:23 +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 42DD08FC0C for ; Wed, 10 Sep 2008 17:24:23 +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 m8AHON2S097653 for ; Wed, 10 Sep 2008 17:24:23 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m8AHONkS097651 for perforce@freebsd.org; Wed, 10 Sep 2008 17:24:23 GMT (envelope-from sam@freebsd.org) Date: Wed, 10 Sep 2008 17:24:23 GMT Message-Id: <200809101724.m8AHONkS097651@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 149547 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, 10 Sep 2008 17:24:24 -0000 http://perforce.freebsd.org/chv.cgi?CH=149547 Change 149547 by sam@sam_ebb on 2008/09/10 17:23:55 Fix handling of shortgi: use the local configuration (and implicitly device capabilities) to decide whether to use short gi. Drivers inspect ni_flags to decide whether to send a frame w/ short sgi. Affected files ... .. //depot/projects/vap/sys/net80211/ieee80211_ddb.c#26 edit .. //depot/projects/vap/sys/net80211/ieee80211_ht.c#47 edit .. //depot/projects/vap/sys/net80211/ieee80211_node.h#28 edit Differences ... ==== //depot/projects/vap/sys/net80211/ieee80211_ddb.c#26 (text+ko) ==== @@ -90,7 +90,7 @@ #define IEEE80211_NODE_BITS \ "\20\1AUTH\2QOS\3ERP\5PWR_MGT\6AREF\7HT\10HTCOMPAT\11WPS\12TSN" \ - "\13AMPDU_RX\14AMPDU_TX\15MIMO_PS\16MIMO_RTS\17RIFS" + "\13AMPDU_RX\14AMPDU_TX\15MIMO_PS\16MIMO_RTS\17RIFS\20SGI20\21SGI40" #define IEEE80211_ERP_BITS \ "\20\1NON_ERP_PRESENT\2USE_PROTECTION\3LONG_PREAMBLE" ==== //depot/projects/vap/sys/net80211/ieee80211_ht.c#47 (text+ko) ==== @@ -1247,7 +1247,7 @@ /* * Handle 11n MIMO PS switch. */ -static int +static __inline int htcap_update_mimo_ps(struct ieee80211_node *ni) { uint16_t oflags = ni->ni_flags; @@ -1271,6 +1271,24 @@ } /* + * Update short GI state according to received htcap + * and local settings. + */ +static __inline void +htcap_update_shortgi(struct ieee80211_node *ni) +{ + struct ieee80211vap *vap = ni->ni_vap; + + ni->ni_flags &= ~(IEEE80211_NODE_SGI20|IEEE80211_NODE_SGI40); + if ((ni->ni_htcap & IEEE80211_HTCAP_SHORTGI20) && + (vap->iv_flags_ext & IEEE80211_FEXT_SHORTGI20)) + ni->ni_flags |= IEEE80211_NODE_SGI20; + if ((ni->ni_htcap & IEEE80211_HTCAP_SHORTGI40) && + (vap->iv_flags_ext & IEEE80211_FEXT_SHORTGI40)) + ni->ni_flags |= IEEE80211_NODE_SGI40; +} + +/* * Parse and update HT-related state extracted from * the HT cap and info ie's. */ @@ -1285,6 +1303,7 @@ ieee80211_parse_htcap(ni, htcapie); if (vap->iv_htcaps & IEEE80211_HTCAP_SMPS) htcap_update_mimo_ps(ni); + htcap_update_shortgi(ni); if (htinfoie[0] == IEEE80211_ELEMID_VENDOR) htinfoie += 4; @@ -1323,6 +1342,7 @@ ieee80211_parse_htcap(ni, htcapie); if (vap->iv_htcaps & IEEE80211_HTCAP_SMPS) htcap_update_mimo_ps(ni); + htcap_update_shortgi(ni); /* NB: honor operating mode constraint */ /* XXX 40 MHZ intolerant */ ==== //depot/projects/vap/sys/net80211/ieee80211_node.h#28 (text+ko) ==== @@ -100,21 +100,23 @@ u_int ni_refcnt; /* count of held references */ u_int ni_scangen; /* gen# for timeout scan */ u_int ni_flags; -#define IEEE80211_NODE_AUTH 0x0001 /* authorized for data */ -#define IEEE80211_NODE_QOS 0x0002 /* QoS enabled */ -#define IEEE80211_NODE_ERP 0x0004 /* ERP enabled */ +#define IEEE80211_NODE_AUTH 0x000001 /* authorized for data */ +#define IEEE80211_NODE_QOS 0x000002 /* QoS enabled */ +#define IEEE80211_NODE_ERP 0x000004 /* ERP enabled */ /* NB: this must have the same value as IEEE80211_FC1_PWR_MGT */ -#define IEEE80211_NODE_PWR_MGT 0x0010 /* power save mode enabled */ -#define IEEE80211_NODE_AREF 0x0020 /* authentication ref held */ -#define IEEE80211_NODE_HT 0x0040 /* HT enabled */ -#define IEEE80211_NODE_HTCOMPAT 0x0080 /* HT setup w/ vendor OUI's */ -#define IEEE80211_NODE_WPS 0x0100 /* WPS association */ -#define IEEE80211_NODE_TSN 0x0200 /* TSN association */ -#define IEEE80211_NODE_AMPDU_RX 0x0400 /* AMPDU rx enabled */ -#define IEEE80211_NODE_AMPDU_TX 0x0800 /* AMPDU tx enabled */ -#define IEEE80211_NODE_MIMO_PS 0x1000 /* MIMO power save enabled */ -#define IEEE80211_NODE_MIMO_RTS 0x2000 /* send RTS in MIMO PS */ -#define IEEE80211_NODE_RIFS 0x4000 /* RIFS enabled */ +#define IEEE80211_NODE_PWR_MGT 0x000010 /* power save mode enabled */ +#define IEEE80211_NODE_AREF 0x000020 /* authentication ref held */ +#define IEEE80211_NODE_HT 0x000040 /* HT enabled */ +#define IEEE80211_NODE_HTCOMPAT 0x000080 /* HT setup w/ vendor OUI's */ +#define IEEE80211_NODE_WPS 0x000100 /* WPS association */ +#define IEEE80211_NODE_TSN 0x000200 /* TSN association */ +#define IEEE80211_NODE_AMPDU_RX 0x000400 /* AMPDU rx enabled */ +#define IEEE80211_NODE_AMPDU_TX 0x000800 /* AMPDU tx enabled */ +#define IEEE80211_NODE_MIMO_PS 0x001000 /* MIMO power save enabled */ +#define IEEE80211_NODE_MIMO_RTS 0x002000 /* send RTS in MIMO PS */ +#define IEEE80211_NODE_RIFS 0x004000 /* RIFS enabled */ +#define IEEE80211_NODE_SGI20 0x008000 /* Short GI in HT20 enabled */ +#define IEEE80211_NODE_SGI40 0x010000 /* Short GI in HT40 enabled */ uint16_t ni_associd; /* association ID */ uint16_t ni_vlan; /* vlan tag */ uint16_t ni_txpower; /* current transmit power */ @@ -199,7 +201,8 @@ #define IEEE80211_NODE_HT_ALL \ (IEEE80211_NODE_HT | IEEE80211_NODE_HTCOMPAT | \ IEEE80211_NODE_AMPDU | IEEE80211_NODE_MIMO_PS | \ - IEEE80211_NODE_MIMO_RTS | IEEE80211_NODE_RIFS) + IEEE80211_NODE_MIMO_RTS | IEEE80211_NODE_RIFS | \ + IEEE80211_NODE_SGI20 | IEEE80211_NODE_SGI40) #define IEEE80211_NODE_AID(ni) IEEE80211_AID(ni->ni_associd) From owner-p4-projects@FreeBSD.ORG Wed Sep 10 17:44:44 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B6201106567D; Wed, 10 Sep 2008 17:44: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 6224A106567A for ; Wed, 10 Sep 2008 17:44:44 +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 4D4238FC12 for ; Wed, 10 Sep 2008 17:44:44 +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 m8AHiiLM060981 for ; Wed, 10 Sep 2008 17:44:44 GMT (envelope-from rene@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m8AHiiwC060979 for perforce@freebsd.org; Wed, 10 Sep 2008 17:44:44 GMT (envelope-from rene@FreeBSD.org) Date: Wed, 10 Sep 2008 17:44:44 GMT Message-Id: <200809101744.m8AHiiwC060979@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 149549 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, 10 Sep 2008 17:44:44 -0000 http://perforce.freebsd.org/chv.cgi?CH=149549 Change 149549 by rene@rene_self on 2008/09/10 17:44:02 MFen 1.57 -> 1.61 plus local fixes Affected files ... .. //depot/projects/docproj_nl/nl_NL.ISO8859-1/share/sgml/mailing-lists.ent#2 edit Differences ... ==== //depot/projects/docproj_nl/nl_NL.ISO8859-1/share/sgml/mailing-lists.ent#2 (text+ko) ==== @@ -3,8 +3,10 @@ $FreeBSD: doc/nl_NL.ISO8859-1/share/sgml/mailing-lists.ent,v 1.12 2007/12/22 19:18:33 remko Exp $ $FreeBSDnl: doc/nl_NL.ISO8859-1/share/sgml/mailing-lists.ent,v 1.21 2006/08/25 10:40:41 remko Exp $ - Gebaseerd op: 1.57 Vertaald door: Siebrand Mazeland + + %SOURCE% en_US.ISO8859-1/share/sgml/mailing-lists.ent + %SRCID% 1.61 --> @@ -345,13 +347,17 @@ freebsd-questions"> -FreeBSD boot script system mailing list"> +FreeBSD boot script system mailinglijst"> freebsd-rc"> FreeBSD realtime extensions mailinglijst"> freebsd-realtime"> + +FreeBSD Ruby mailinglijst"> +freebsd-ruby"> + FreeBSD SCSI subsysteem mailinglijst"> freebsd-scsi"> @@ -422,10 +428,18 @@ FreeBSD wederverkopers pre-release coördinatie mailinglijst"> freebsd-vendors"> + +Discussies over verscheidene virtualizatietechnieken ondersteund door FreeBSD"> +freebsd-virtualization"> + -Discussies over de VuXML infrastructuur"> +Discussies over de VuXML infrastructuur"> freebsd-vuxml"> + +FreeBSD Werk-In-Uitvoering Status"> +freebsd-wip-status"> + FreeBSD Webmaster mailinglijst"> freebsd-www"> @@ -434,7 +448,7 @@ FreeBSD X11 mailinglijst"> freebsd-x11"> - + bug-followup@FreeBSD.org"> From owner-p4-projects@FreeBSD.ORG Wed Sep 10 17:49:51 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5CB841065685; Wed, 10 Sep 2008 17:49: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 227401065681 for ; Wed, 10 Sep 2008 17:49:51 +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 0E2CE8FC13 for ; Wed, 10 Sep 2008 17:49:51 +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 m8AHnoC8095288 for ; Wed, 10 Sep 2008 17:49:50 GMT (envelope-from zec@tel.fer.hr) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m8AHnnV1095253 for perforce@freebsd.org; Wed, 10 Sep 2008 17:49:49 GMT (envelope-from zec@tel.fer.hr) Date: Wed, 10 Sep 2008 17:49:49 GMT Message-Id: <200809101749.m8AHnnV1095253@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 149551 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, 10 Sep 2008 17:49:51 -0000 http://perforce.freebsd.org/chv.cgi?CH=149551 Change 149551 by zec@zec_tpx32 on 2008/09/10 17:48:54 Hold IFNET_WLOCK() when reassigning an ifnet from one vnet to another. Affected files ... .. //depot/projects/vimage/src/sys/kern/kern_vimage.c#67 edit Differences ... ==== //depot/projects/vimage/src/sys/kern/kern_vimage.c#67 (text+ko) ==== @@ -298,10 +298,11 @@ do { INIT_VNET_NET(curvnet); + IFNET_WLOCK(); ifnet_setbyindex(ifp->if_index, NULL); - /* XXX: should be locked with if_findindex() */ while (V_if_index > 0 && ifnet_byindex(V_if_index) == NULL) V_if_index--; + IFNET_WUNLOCK(); } while (0); CURVNET_SET_QUIET(new_vnet); @@ -309,9 +310,8 @@ /* * Try to find an empty slot below if_index. If we fail, take * the next slot. - * - * XXX: should be locked! */ + IFNET_WLOCK(); for (ifp->if_index = 1; ifp->if_index <= V_if_index; ifp->if_index++) { if (ifnet_byindex(ifp->if_index) == NULL) break; @@ -325,6 +325,7 @@ if (V_if_index >= V_if_indexlim) if_grow(); ifnet_setbyindex(ifp->if_index, ifp); + IFNET_WUNLOCK(); /* Rename the ifnet */ if (new_vnet == ifp->if_home_vnet) { From owner-p4-projects@FreeBSD.ORG Wed Sep 10 17:58:49 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B0DD1106568C; Wed, 10 Sep 2008 17:58: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 5B9701065689 for ; Wed, 10 Sep 2008 17:58:49 +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 461958FC1B for ; Wed, 10 Sep 2008 17:58:49 +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 m8AHwnoc051527 for ; Wed, 10 Sep 2008 17:58:49 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m8AHwnVA051525 for perforce@freebsd.org; Wed, 10 Sep 2008 17:58:49 GMT (envelope-from sam@freebsd.org) Date: Wed, 10 Sep 2008 17:58:49 GMT Message-Id: <200809101758.m8AHwnVA051525@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 149552 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, 10 Sep 2008 17:58:49 -0000 http://perforce.freebsd.org/chv.cgi?CH=149552 Change 149552 by sam@sam_ebb on 2008/09/10 17:57:49 Checkpoint support for sending BAR: o set the start seq# from ni_txseqs o add callback for response processing for driver to override o don't commit the new seq# until we believe the BAR has been delivered; this is problematic for drivers that don't give back ACK status (so they'll just have to assume it goes through) NB: there is no locking and we should allocate tap struct's on demand instead of statically allocating them in the node NB: we are super aggressive sending BAR as it's delivery is critical; this may need to be rethought NB: we reuse the addba request state which is a hack done w/ the assumption there should never be an addba request pending at the same time we send BAR Affected files ... .. //depot/projects/vap/sys/net80211/ieee80211_ht.c#48 edit .. //depot/projects/vap/sys/net80211/ieee80211_ht.h#21 edit .. //depot/projects/vap/sys/net80211/ieee80211_var.h#52 edit Differences ... ==== //depot/projects/vap/sys/net80211/ieee80211_ht.c#48 (text+ko) ==== @@ -86,6 +86,8 @@ int ieee80211_addba_timeout = -1; /* timeout waiting for ADDBA response */ int ieee80211_addba_backoff = -1; /* backoff after max ADDBA requests */ int ieee80211_addba_maxtries = 3; /* max ADDBA requests before backoff */ +int ieee80211_bar_timeout = -1; /* timeout waiting for BAR response */ +int ieee80211_bar_maxtries = 50; /* max BAR requests before DELBA */ /* * Setup HT parameters that depends on the clock frequency. @@ -98,6 +100,7 @@ #endif ieee80211_addba_timeout = msecs_to_ticks(250); ieee80211_addba_backoff = msecs_to_ticks(10*1000); + ieee80211_bar_timeout = msecs_to_ticks(250); } SYSINIT(wlan_ht, SI_SUB_DRIVERS, SI_ORDER_FIRST, ieee80211_ht_setup, NULL); @@ -113,6 +116,8 @@ struct ieee80211_tx_ampdu *tap); static void ieee80211_aggr_recv_action(struct ieee80211_node *ni, const uint8_t *frm, const uint8_t *efrm); +static void ieee80211_bar_response(struct ieee80211_node *ni, + struct ieee80211_tx_ampdu *tap, int status); void ieee80211_ht_attach(struct ieee80211com *ic) @@ -124,6 +129,7 @@ ic->ic_addba_request = ieee80211_addba_request; ic->ic_addba_response = ieee80211_addba_response; ic->ic_addba_stop = ieee80211_addba_stop; + ic->ic_bar_response = ieee80211_bar_response; ic->ic_htprotmode = IEEE80211_PROT_RTSCTS; ic->ic_curhtprotmode = IEEE80211_HTINFO_OPMODE_PURE; @@ -802,6 +808,7 @@ for (ac = 0; ac < WME_NUM_AC; ac++) { tap = &ni->ni_tx_ampdu[ac]; tap->txa_ac = ac; + tap->txa_ni = ni; /* NB: further initialization deferred */ } ni->ni_flags |= IEEE80211_NODE_HT | IEEE80211_NODE_AMPDU; @@ -1485,7 +1492,7 @@ struct ieee80211_tx_ampdu *tap, int status, int baparamset, int batimeout) { - int bufsiz; + int bufsiz, tid; /* XXX locking */ addba_stop_timeout(tap); @@ -1494,7 +1501,11 @@ /* XXX override our request? */ tap->txa_wnd = (bufsiz == 0) ? IEEE80211_AGGR_BAWMAX : min(bufsiz, IEEE80211_AGGR_BAWMAX); + /* XXX AC/TID */ + tid = MS(baparamset, IEEE80211_BAPS_TID); + tap->txa_seqstart = tap->txa_start = ni->ni_txseqs[tid]; tap->txa_flags |= IEEE80211_AGGR_RUNNING; + tap->txa_attempts = 0; } else { /* mark tid so we don't try again */ tap->txa_flags |= IEEE80211_AGGR_NAK; @@ -1868,6 +1879,7 @@ uint16_t args[4]; /* XXX locking */ + tap->txa_flags &= ~IEEE80211_AGGR_BARPEND; if (IEEE80211_AMPDU_RUNNING(tap)) { IEEE80211_NOTE(vap, IEEE80211_MSG_ACTION | IEEE80211_MSG_11N, ni, "%s: stop BA stream for AC %d (reason %d)", @@ -1888,6 +1900,83 @@ } } +static void +bar_timeout(void *arg) +{ + struct ieee80211_tx_ampdu *tap = arg; + struct ieee80211_node *ni = tap->txa_ni; + + KASSERT((tap->txa_flags & IEEE80211_AGGR_XCHGPEND) == 0, + ("bar/addba collision, flags 0x%x", tap->txa_flags)); + + IEEE80211_NOTE(ni->ni_vap, IEEE80211_MSG_11N, + ni, "%s: tid %u flags 0x%x attempts %d", __func__, + tap->txa_ac, tap->txa_flags, tap->txa_attempts); + + /* guard against race with bar_tx_complete */ + if ((tap->txa_flags & IEEE80211_AGGR_BARPEND) == 0) + return; + /* XXX ? */ + if (tap->txa_attempts >= ieee80211_bar_maxtries) + ieee80211_ampdu_stop(ni, tap, IEEE80211_REASON_TIMEOUT); + else + ieee80211_send_bar(ni, tap, tap->txa_seqpending); +} + +static void +bar_start_timer(struct ieee80211_tx_ampdu *tap) +{ + callout_reset(&tap->txa_timer, ieee80211_bar_timeout, bar_timeout, tap); +} + +static void +bar_stop_timer(struct ieee80211_tx_ampdu *tap) +{ + callout_stop(&tap->txa_timer); +} + +static void +bar_tx_complete(struct ieee80211_node *ni, void *arg, int status) +{ + struct ieee80211_tx_ampdu *tap = arg; + + IEEE80211_NOTE(ni->ni_vap, IEEE80211_MSG_11N, + ni, "%s: tid %u flags 0x%x pending %d status %d", + __func__, tap->txa_ac, tap->txa_flags, + callout_pending(&tap->txa_timer), status); + + /* XXX locking */ + if ((tap->txa_flags & IEEE80211_AGGR_BARPEND) && + callout_pending(&tap->txa_timer)) { + struct ieee80211com *ic = ni->ni_ic; + + if (status) /* ACK'd */ + bar_stop_timer(tap); + ic->ic_bar_response(ni, tap, status); + } else { + /* NB: just let timer expire so we pace requests */ + } +} + +static void +ieee80211_bar_response(struct ieee80211_node *ni, + struct ieee80211_tx_ampdu *tap, int status) +{ + + if (status != 0) { /* got ACK */ + IEEE80211_NOTE(ni->ni_vap, IEEE80211_MSG_11N, + ni, "BAR moves BA win <%u:%u> (%u frames) txseq %u tid %u", + tap->txa_start, + IEEE80211_SEQ_ADD(tap->txa_start, tap->txa_wnd-1), + tap->txa_qframes, tap->txa_seqpending, + WME_AC_TO_TID(tap->txa_ac)); + + /* NB: timer already stopped in bar_tx_complete */ + tap->txa_start = tap->txa_seqpending; + tap->txa_flags &= ~IEEE80211_AGGR_BARPEND; + } +} + /* * Transmit a BAR frame to the specified node. The * BAR contents are drawn from the supplied aggregation @@ -1904,17 +1993,30 @@ struct ieee80211com *ic = ni->ni_ic; struct ieee80211_frame_bar *bar; struct mbuf *m; + uint16_t barctl, barseqctl; uint8_t *frm; - uint16_t barctl, barseqctl; int tid, ret; + if ((tap->txa_flags & IEEE80211_AGGR_RUNNING) == 0) { + /* no ADDBA response, should not happen */ + /* XXX stat+msg */ + return EINVAL; + } + /* XXX locking */ + bar_stop_timer(tap); + ieee80211_ref_node(ni); - m = ieee80211_getmgtframe(&frm, ic->ic_headroom, - sizeof(struct ieee80211_frame_bar)); + m = ieee80211_getmgtframe(&frm, ic->ic_headroom, sizeof(*bar)); if (m == NULL) senderr(ENOMEM, is_tx_nobuf); + if (!ieee80211_add_callback(m, bar_tx_complete, tap)) { + m_freem(m); + senderr(ENOMEM, is_tx_nobuf); /* XXX */ + /* NOTREACHED */ + } + bar = mtod(m, struct ieee80211_frame_bar *); bar->i_fc[0] = IEEE80211_FC0_VERSION_0 | IEEE80211_FC0_TYPE_CTL | IEEE80211_FC0_SUBTYPE_BAR; @@ -1938,11 +2040,29 @@ IEEE80211_NODE_STAT(ni, tx_mgmt); /* XXX tx_ctl? */ + /* XXX locking */ + /* init/bump attempts counter */ + if ((tap->txa_flags & IEEE80211_AGGR_BARPEND) == 0) + tap->txa_attempts = 1; + else + tap->txa_attempts++; + tap->txa_seqpending = seq; + tap->txa_flags |= IEEE80211_AGGR_BARPEND; + IEEE80211_NOTE(vap, IEEE80211_MSG_DEBUG | IEEE80211_MSG_11N, ni, "send BAR: tid %u ctl 0x%x start %u (attempt %d)", tid, barctl, seq, tap->txa_attempts); - return ic->ic_raw_xmit(ni, m, NULL); + ret = ic->ic_raw_xmit(ni, m, NULL); + if (ret != 0) { + /* xmit failed, clear state flag */ + tap->txa_flags &= ~IEEE80211_AGGR_BARPEND; + goto bad; + } + /* XXX hack against tx complete happening before timer is started */ + if (tap->txa_flags & IEEE80211_AGGR_BARPEND) + bar_start_timer(tap); + return 0; bad: ieee80211_free_node(ni); return ret; ==== //depot/projects/vap/sys/net80211/ieee80211_ht.h#21 (text+ko) ==== @@ -38,12 +38,14 @@ typedef uint16_t ieee80211_seq; struct ieee80211_tx_ampdu { + struct ieee80211_node *txa_ni; /* back pointer */ u_short txa_flags; #define IEEE80211_AGGR_IMMEDIATE 0x0001 /* BA policy */ #define IEEE80211_AGGR_XCHGPEND 0x0002 /* ADDBA response pending */ #define IEEE80211_AGGR_RUNNING 0x0004 /* ADDBA response received */ #define IEEE80211_AGGR_SETUP 0x0008 /* deferred state setup */ #define IEEE80211_AGGR_NAK 0x0010 /* peer NAK'd ADDBA request */ +#define IEEE80211_AGGR_BARPEND 0x0020 /* BAR response pending */ uint8_t txa_ac; uint8_t txa_token; /* dialog token */ int txa_lastsample; /* ticks @ last traffic sample */ @@ -53,9 +55,10 @@ short txa_qframes; /* data queued (frames) */ ieee80211_seq txa_seqstart; ieee80211_seq txa_start; + ieee80211_seq txa_seqpending; /* new start pending BAR response */ uint16_t txa_wnd; /* BA window size */ - uint8_t txa_attempts; /* # ADDBA requests w/o a response */ - int txa_nextrequest;/* soonest to make next ADDBA request */ + uint8_t txa_attempts; /* # ADDBA/BAR requests w/o a response*/ + int txa_nextrequest;/* soonest to make next request */ struct callout txa_timer; void *txa_private; /* driver-private storage */ }; @@ -187,8 +190,8 @@ struct ieee80211_tx_ampdu *); void ieee80211_ampdu_stop(struct ieee80211_node *, struct ieee80211_tx_ampdu *, int); -int ieee80211_send_bar(struct ieee80211_node *, - struct ieee80211_tx_ampdu *tap, ieee80211_seq seq); +int ieee80211_send_bar(struct ieee80211_node *, struct ieee80211_tx_ampdu *, + ieee80211_seq); int ieee80211_send_action(struct ieee80211_node *, int, int, uint16_t [4]); uint8_t *ieee80211_add_htcap(uint8_t *, struct ieee80211_node *); ==== //depot/projects/vap/sys/net80211/ieee80211_var.h#52 (text+ko) ==== @@ -273,6 +273,9 @@ int status, int baparamset, int batimeout); void (*ic_addba_stop)(struct ieee80211_node *, struct ieee80211_tx_ampdu *); + /* BAR response received */ + void (*ic_bar_response)(struct ieee80211_node *, + struct ieee80211_tx_ampdu *, int status); }; struct ieee80211_aclator; From owner-p4-projects@FreeBSD.ORG Wed Sep 10 17:59:50 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id BF3A81065683; Wed, 10 Sep 2008 17:59: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 82075106567A for ; Wed, 10 Sep 2008 17:59:50 +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 6E2208FC08 for ; Wed, 10 Sep 2008 17:59:50 +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 m8AHxogp056542 for ; Wed, 10 Sep 2008 17:59:50 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m8AHxoZ9056540 for perforce@freebsd.org; Wed, 10 Sep 2008 17:59:50 GMT (envelope-from sam@freebsd.org) Date: Wed, 10 Sep 2008 17:59:50 GMT Message-Id: <200809101759.m8AHxoZ9056540@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 149553 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, 10 Sep 2008 17:59:51 -0000 http://perforce.freebsd.org/chv.cgi?CH=149553 Change 149553 by sam@sam_ebb on 2008/09/10 17:59:08 add IEEE80211_BEACON_CAPINFO; it's going to be used shortly Affected files ... .. //depot/projects/vap/sys/net80211/ieee80211_proto.h#26 edit Differences ... ==== //depot/projects/vap/sys/net80211/ieee80211_proto.h#26 (text+ko) ==== @@ -325,6 +325,7 @@ IEEE80211_BEACON_APPIE = 5, /* Application IE's */ IEEE80211_BEACON_CFP = 6, /* CFParms */ IEEE80211_BEACON_CSA = 7, /* Channel Switch Announcement */ + IEEE80211_BEACON_CAPINFO = 8, /* Capabilities Info */ }; int ieee80211_beacon_update(struct ieee80211_node *, struct ieee80211_beacon_offsets *, struct mbuf *, int mcast); From owner-p4-projects@FreeBSD.ORG Wed Sep 10 18:00:52 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 112D2106567C; Wed, 10 Sep 2008 18:00: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 C791A1065670 for ; Wed, 10 Sep 2008 18:00:51 +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 99DA98FC15 for ; Wed, 10 Sep 2008 18:00:51 +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 m8AI0pOJ060172 for ; Wed, 10 Sep 2008 18:00:51 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m8AI0pDv060165 for perforce@freebsd.org; Wed, 10 Sep 2008 18:00:51 GMT (envelope-from sam@freebsd.org) Date: Wed, 10 Sep 2008 18:00:51 GMT Message-Id: <200809101800.m8AI0pDv060165@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 149554 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, 10 Sep 2008 18:00:52 -0000 http://perforce.freebsd.org/chv.cgi?CH=149554 Change 149554 by sam@sam_ebb on 2008/09/10 18:00:13 fix comment Affected files ... .. //depot/projects/vap/sys/net80211/ieee80211_ht.c#49 edit Differences ... ==== //depot/projects/vap/sys/net80211/ieee80211_ht.c#49 (text+ko) ==== @@ -1252,7 +1252,7 @@ } /* - * Handle 11n MIMO PS switch. + * Update 11n MIMO PS state according to received htcap. */ static __inline int htcap_update_mimo_ps(struct ieee80211_node *ni) From owner-p4-projects@FreeBSD.ORG Wed Sep 10 18:32:24 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 684651065677; Wed, 10 Sep 2008 18:32: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 2B082106564A for ; Wed, 10 Sep 2008 18:32:24 +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 162DC8FC14 for ; Wed, 10 Sep 2008 18:32:24 +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 m8AIWOHX056330 for ; Wed, 10 Sep 2008 18:32:24 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m8AIWNeu056324 for perforce@freebsd.org; Wed, 10 Sep 2008 18:32:23 GMT (envelope-from sam@freebsd.org) Date: Wed, 10 Sep 2008 18:32:23 GMT Message-Id: <200809101832.m8AIWNeu056324@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 149557 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, 10 Sep 2008 18:32:24 -0000 http://perforce.freebsd.org/chv.cgi?CH=149557 Change 149557 by sam@sam_ebb on 2008/09/10 18:31:45 Always update ic_lastnonht so we track overlapping legacy bss properly; was doing this only on a change in the protection mode so the advertised protection mode in the beacon would oscillate. Submitted by: Chris Zimmermann Affected files ... .. //depot/projects/vap/sys/net80211/ieee80211_ht.c#50 edit Differences ... ==== //depot/projects/vap/sys/net80211/ieee80211_ht.c#50 (text+ko) ==== @@ -1103,22 +1103,21 @@ ieee80211_htprot_update(struct ieee80211com *ic, int protmode) { #define OPMODE(x) SM(x, IEEE80211_HTINFO_OPMODE) - if (protmode == ic->ic_curhtprotmode) - return; - if (OPMODE(ic->ic_curhtprotmode) == IEEE80211_HTINFO_OPMODE_MIXED && - OPMODE(protmode) == IEEE80211_HTINFO_OPMODE_PROTOPT) - return; + IEEE80211_LOCK(ic); - IEEE80211_LOCK(ic); /* track non-HT station presence */ KASSERT(protmode & IEEE80211_HTINFO_NONHT_PRESENT, - ("missing NONHT_PRESENT")); + ("protmode 0x%x", protmode)); ic->ic_flags_ext |= IEEE80211_FEXT_NONHT_PR; ic->ic_lastnonht = ticks; - /* push beacon update */ - ic->ic_curhtprotmode = protmode; - htinfo_notify(ic); + if (protmode != ic->ic_curhtprotmode && + (OPMODE(ic->ic_curhtprotmode) != IEEE80211_HTINFO_OPMODE_MIXED || + OPMODE(protmode) == IEEE80211_HTINFO_OPMODE_PROTOPT)) { + /* push beacon update */ + ic->ic_curhtprotmode = protmode; + htinfo_notify(ic); + } IEEE80211_UNLOCK(ic); #undef OPMODE } From owner-p4-projects@FreeBSD.ORG Wed Sep 10 20:31:26 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 787A41065672; Wed, 10 Sep 2008 20:31: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 3B428106564A for ; Wed, 10 Sep 2008 20:31:26 +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 23DEB8FC13 for ; Wed, 10 Sep 2008 20:31:26 +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 m8AKVQDI085633 for ; Wed, 10 Sep 2008 20:31:26 GMT (envelope-from rene@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m8AKVQ0g085625 for perforce@freebsd.org; Wed, 10 Sep 2008 20:31:26 GMT (envelope-from rene@FreeBSD.org) Date: Wed, 10 Sep 2008 20:31:26 GMT Message-Id: <200809102031.m8AKVQ0g085625@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 149568 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, 10 Sep 2008 20:31:26 -0000 http://perforce.freebsd.org/chv.cgi?CH=149568 Change 149568 by rene@rene_self on 2008/09/10 20:30:43 MFen 1.20 -> 1.32 (plus local fixes). For translated entries, keep order 'English (Dutch)' Affected files ... .. //depot/projects/docproj_nl/nl_NL.ISO8859-1/share/sgml/glossary/freebsd-glossary.sgml#2 edit Differences ... ==== //depot/projects/docproj_nl/nl_NL.ISO8859-1/share/sgml/glossary/freebsd-glossary.sgml#2 (text+ko) ==== @@ -3,10 +3,12 @@ $FreeBSD: doc/nl_NL.ISO8859-1/share/sgml/glossary/freebsd-glossary.sgml,v 1.5 2006/08/13 20:59:05 remko Exp $ $FreeBSDnl: doc/nl_NL.ISO8859-1/share/sgml/glossary/freebsd-glossary.sgml,v 1.10 2006/08/13 20:57:49 remko Exp $ - Gebaseerd op: 1.20 + + %SOURCE% en_US.ISO8859-1/share/sgml/glossary/freebsd-glossary.sgml + %SRCID% 1.32 FreeBSD begrippenlijst - Houd dit bestand alsjeblieft alfabetisch/ASCII gesorteerd op + Houd dit bestand alstublieft alfabetisch/ASCII gesorteerd op begrip. Begrippen die acroniem zijn moeten twee keer voorkomen: een @@ -66,6 +68,11 @@ + API + + + + APIC @@ -121,7 +128,9 @@ Toegangscontrole Lijst ACL - + Een lijst toestemmingen gekoppeld aan een object, meestal + òfwel een bestand òfwel een netwerkapparaat. + @@ -142,12 +151,27 @@ + + Application Programming Interface + API + + Een verzameling procedures, protocollen en gereedschappen + dat de canonieke interactie van één of meer + programmadelen specificeert; hoe, wanneer en waarom ze + samenwerken, en welke gegevens ze delen of bewerken. + + + - Advanced Power Management (Geavanceerd Energie - Beheer) + Advanced Power Management (Geavanceerd Energie Beheer) + APM - + Een API dat het besturingssysteem in + staat stelt om samen te werken met het BIOS + om zo energiebeheer na te streven. APM is + voor de meeste toepassingen ingehaald door de veel generiekere + en krachtigere ACPI-specificatie. @@ -197,6 +221,11 @@ B + BAR + + + + BIND @@ -211,11 +240,28 @@ + + Base Address Register + + De registers die bepalen op welk adresbereik een + PCI-apparaat zal reageren. + + + Basic Input/Output System BIOS - + De definitie van BIOS hangt enigszins + af van de context. Sommige mensen verwijzen ernaar als de + ROM-chip met een basisverzameling routines + om een interface tussen software en hardware te bieden. + Anderen verwijzen ernaar als de verzameling routines die de + chip bevat die helpen het systeem op te starten. Sommigen + kunnen er ook naar verwijzen als het scherm dat gebruikt wordt + om het opstartproces te configureren. Het + BIOS is PC-specifiek maar andere systemen + hebben iets soortgelijks. @@ -223,7 +269,8 @@ Berkeley Internet Name Domain BIND - + Een implementatie van de DNS + protocollen. @@ -295,26 +342,31 @@ Carrier Detect CD - Een RS232C signaal dat aangeeft dat er een drager is - ontdekt. + Een RS232C signaal dat aangeeft dat er + een drager is ontdekt. - Central Processing Unit (Centrale - Verwerkingseenheid) + Central Processing Unit (Centrale Verwerkingseenheid) + CPU - + Ook bekend als de processor. Dit zijn de hersenen van de + computer waar alle berekeningen plaatsvinden. Er zijn een + aantal verschillende architecturen met verschillende + instructieverzamelingen. Onder de bekendere bevinden zich de + Intel-x86 en afgeleiden, Sun SPARC, PowerPC, en Alpha. - Challenge Handshake Authentication - Protocol + Challenge Handshake Authentication Protocol CHAP - + Een methode om een gebruiker te authenticeren, gebaseerd + op een geheim gedeeld tussen te cliënt en de server. + @@ -331,8 +383,9 @@ Clear To Send CTS - Een RS232C signaal dat het andere systeem permissie geeft - om gegevens te sturen. + Een RS232C signaal dat het andere + systeem toestemming geeft om gegevens te sturen. + @@ -348,7 +401,13 @@ Concurrent Versions System CVS - + Een versiebeheersysteem, dat een methode biedt om te + werken met vele verschillende revisies van bestanden en deze + bij te houden. CVS biedt de mogelijkheid om individuele + veranderingen te extraheren, samen te voegen, en terug te + draaien, en het biedt te mogelijkheid om bij te houden welke + veranderingen waren gemaakt, door wie en om welke reden. + @@ -413,7 +472,9 @@ Data Encryption Standard DES - + Een methode om informatie te versleutelen, traditioneel + gebruikt als de methode om &unix;-wachtwoorden te versleutelen + en als de functie &man.crypt.3;. @@ -421,7 +482,10 @@ Data Set Ready DSR - + Een RS232C signaal verzonden van het + modem naar de computer of terminal om een bereidheid om + gegevens te versturen en te ontvangen aan te geven. + @@ -429,7 +493,9 @@ Data Terminal Ready DTR - + Een RS232C signaal verzonden van de + computer of terminal naar het modem om een bereidheid om + gegevens te versturen en ontvangen aan te geven. @@ -437,7 +503,10 @@ Debugger DDB - + Een interactieve in-kernel faciliteit om de toestand van + een systeem te onderzoeken, vaak gebruikt nadat een systeem + gecrasht is om de gebeurtenissen rondom de storing te bepalen. + @@ -445,7 +514,9 @@ Differentiated System Description Table DSDT - + Een ACPI tabel die + basisconfiguratie-informatie over het basissysteem biedt. + @@ -461,7 +532,9 @@ Domain Name System DNS - + Het systeem dat menselijk leesbare hostnamen (i.e. + mail.example.net) omzet in Internetadressen en andersom. + @@ -469,7 +542,9 @@ Dynamic Host Configuration Protocol DHCP - + Een protocol dat dynamisch IP-adressen aan een computer + (host) toekent wanneer het er een vraagt van de server. De + adrestoekenning wordt een lease genoemd. @@ -560,7 +635,10 @@ File Transfer Protocol FTP - + Een lid van de familie van hoogniveau protocollen + geïmplementeerd bovenop TCP dat + gebruikt kan worden om bestanden over een + TCP/IP netwerk te versturen. @@ -698,7 +776,11 @@ IP Versie 4 IPv4 - + Versie 4 van het IP protocol, dat 32 + bits gebruikt voor adressering. Deze versie wordt nog steeds + het meest gebruikt, maar het wordt langzaam vervangen door + IPv6. + @@ -706,7 +788,9 @@ IP Versie 6 IPv6 - + Het nieuwe IP protocol. Uitgevonden + omdat de adresruimte in IPv4 opraakt. + Gebruikt 128 bits voor adressering. @@ -732,7 +816,10 @@ Internet Message Access Protocol IMAP - + Een protocol om emailberichten op een mailserver te + benaderen, gekarakteriseerd doordat de berichten normaliter op + de server worden gehouden in tegenstelling tot te worden + gedownload naar de mailleescliënt. @@ -748,7 +835,14 @@ Internet Protocol IP - + Het pakketverstuurprotocol dat het basisprotocol op het + Internet is. Oorspronkelijk ontwikkeld op het Ministerie van + Defensie van de Verenigde Staten en een extreem belangrijk + deel van de TCP/IP stack. Zonder het + Internet Protocol zou het Internet niet zijn geworden wat het + vandaag is. Zie voor meer informatie + RFC 791. @@ -756,7 +850,7 @@ Internet Service Provider ISP - + Een bedrijf dat toegang biedt tot het Internet. @@ -802,7 +896,9 @@ Kernel &man.ld.1; KLD - + Een methode om dynamisch functionaliteit in een + &os;-kernel te laden zonder het systeem opnieuw te starten. + @@ -825,8 +921,8 @@ - Sleutel Distributiecentrum (Key Distribution - Center) + Key Distribution Center (Sleutel Distributiecentrum) + KDC @@ -837,7 +933,10 @@ Kilo Bits Per Seconde Kbps - + Gebruikt om bandbreedte te meten (hoeveel gegevens kunnen + een gegeven punt in een gespecificeerde hoeveelheid tijd + passeren). Alternatieven voor de Kilo prefix omvatten Mega, + Giga, Tera, enzovoorts. @@ -861,7 +960,7 @@ - Lijnpinter Daemon (Line Printer Daemon) + Line Printer Daemon (Lijnprinter Daemon) LPD @@ -869,10 +968,11 @@ - Lokaal Netwerk (Local Area Network) + Local Area Network (Lokaal Netwerk) LAN - + Een netwerk gebruik in een lokaal gebied, bijvoorbeeld + kantoor, huis, enzovoorts. @@ -918,6 +1018,11 @@ + MFP4 + + + + MFS @@ -951,7 +1056,12 @@ Mail Transfer Agent MTA - + Een toepassing gebruikt om email te versturen. Een + MTA maakte traditioneel deel uit van het + basissysteem van BSD. Tegenwoordig zit Sendmail in het + basissysteem, maar er zijn vele andere MTAs, + + zoals postfix, qmail en Exim. @@ -959,7 +1069,8 @@ Mail User Agent MUA - + Een toepassing die door gebruikers wordt gebruikt om email + af te beelden en te schrijven. @@ -980,8 +1091,8 @@ - Samenvoegen vanuit Current (Merge From - Current) + Merge From Current (Samenvoegen vanuit Current) + MFC Functionaliteit of een patch samenvoegen vanuit de @@ -989,8 +1100,20 @@ + + Merge From Perforce (Samenvoegen vanuit Perforce) + + MFP4 + + Het samenvoegen van functionaliteit of een patch vanuit + het Perforce repository naar de -CURRENT tak. + + + + - Samenvoegen vanuit Stable + Merge From Stable (Samenvoegen vanuit Stable) + MFS In het &os ontwikkelproces wordt een wijziging gecommit @@ -1006,7 +1129,7 @@ - Bericht van de Dag (Message Of The Day) + Message Of The Day (Bericht van de Dag) MOTD Een bericht, meestal getoond bij aanmelden, dat vaak @@ -1015,8 +1138,8 @@ - Meerlaagse Beveiliging (Multi-Level - Security) + Multi-Level Security (Meerlaagse Beveiliging) + MLS @@ -1061,17 +1184,20 @@ - Netwerkadres Vertaling (Network Address - Translation) + Network Address Translation (Netwerkadresvertaling) + NAT - + Een techniek waarbij IP pakketten + worden herschreven tijdens de weg door een gateway, zodat + vele machines achter de gateway effectief een enkel + IP adres kunnen delen. - Netwerkbestandssysteem (Network File - System) + Network File System (Netwerkbestandssysteem) + NFS @@ -1079,8 +1205,8 @@ - Nieuwe Technologie Bestandssysteem (New Technology - File System) + New Technology File System (Nieuwe Technologie + Bestandssysteem) NTFS Een bestandssysteem dat door µsoft; is ontwikkeld en @@ -1091,11 +1217,12 @@ - Netwerk Tijdprotocol (Network Time - Protocol) + Network Time Protocol (Netwerk Tijdprotocol) + NTP - + Een middel om klokken over een netwerk te synchroniseren. + @@ -1127,10 +1254,17 @@ - Besturingssysteem (Operating System) + Operating System (Besturingssysteem) OS - + Een verzameling programma's, bibliotheken en + gereedschappen die toegang geeft tot de hardwarebronnen van + een computer. Tegenwoordig variëren besturingssystemen + van simplistische ontwerpen die slechts één + programma tegelijk kunnen draaien dat slechts + één apparaat benadert, tot volledige + meergebruikers-, meertaaks- en meerprocessystemen, waarbij elk + van hen tientallen verschillende toepassingen draaien. @@ -1151,6 +1285,11 @@ P + p4 + + + + PAE @@ -1249,14 +1388,29 @@ - Wachtwoord Authenticatieprotocol (Password - Authentication Protocol) + Password Authentication Protocol (Wachtwoord + Authenticatieprotocol) PAP + + Perforce + + Een broncodebeheerproduct gemaakt door Perforce Software dat + geavanceerder is dan CVS. Hoewel niet opensource, is het + kosteloos te gebruiken voor opensourceprojecten zoals &os;. + + + Sommige &os;-ontwikkelaars gebruiken een Perforce + repository als een ontwikkelgebied voor code die te + experimenteel voor de -CURRENT tak wordt geacht. + + + Personal Computer PC @@ -1266,8 +1420,8 @@ - PC Netwerkbestandssysteem Daemon (Personal Computer - Network File System Daemon) + Personal Computer Network File System Daemon (PC + Netwerkbestandssysteem Daemon) PCNFSD @@ -1275,8 +1429,8 @@ - Fysieke Adresextensies (Physical Address - Extensions + Physical Address Extensions (Fysieke + Adresuitbreidingen) PAE Een methode voor het inschakelen van toegang tot @@ -1330,6 +1484,7 @@ POP + @@ -1337,7 +1492,11 @@ Post Office Protocol Version 3 POP3 - + Een protocol om emailberichten op een mailserver te + benaderen, gekarakteriseerd doordat berichten normaliter + worden gedownload van de server naar de cliënt, in + tegenstelling tot op de server te blijven staan. + @@ -1358,7 +1517,8 @@ - Principe van Kleinste Verrassing (Principle Of Least Astonishment) + Principle Of Least Astonishment (Principe van Kleinste + Verbazing) POLA In de evolutie van &os; moeten zichtbare wijzigingen voor @@ -1376,7 +1536,11 @@ Problem Report PR - + Een beschrijving van een probleem dat gevonden is in + òfwel de broncode òfwel de documentatie van + &os;. Zie Writing &os; + Problem Reports. @@ -1468,7 +1632,9 @@ Received Data RD - + Een RS232C pin of draad waarop gegevens + worden ontvangen. + @@ -1485,7 +1651,12 @@ Reduced Instruction Set Computer RISC - + Een benadering van processorontwerp waarbij de bewerkingen + die de hardware kan uitvoeren versimpeld en zo generiek + mogelijk zijn. Dit kan leiden tot lager energieverbruik, + minder transistors en in sommige gevallen, betere prestaties + en verhoogde codedichtheid. Voorbeelden van RISC processoren + omvatten de Alpha, &sparc;, &arm;, en &powerpc;. @@ -1505,11 +1676,45 @@ + + repocopy + + + + + Repository Copy + + Het direct kopiëren van bestanden binnen het CVS + repository. + + Zonder een repocopy, als een bestand gekopieerd of + verplaatst moest worden, zou de committer cvs + add draaien om het bestand op de nieuwe plaats te + zetten, en vervolgens cvs rm op het oude + bestand als de oude kopie werd verwijderd. + + Het nadeel van deze methode is dat de geschiedenis (i.e. + de ingangen in de CVS logs) van het bestand niet gekopieerd + werd naar de nieuwe plaats. Aangezien het &os; Project deze + geschiedenis zeer bruikbaar acht, wordt in plaats hiervan vaak + een repocopy gebruikt. Dit is een proces waarbij een van de + repository meisters de bestanden direct binnen het repository + kopiëren, in plaats van het programma &man.cvs.1; te + gebruiken. + + + Request For Comments RFC - + Een verzameling documenten die Internetstandaarden, + protocollen, enzovoorts definiëren. Zie www.rfc-editor.org. + + + Ook gebruikt als algemene term wanneer iemand een + verandering voorstelt en terugkoppeling wil. @@ -1517,7 +1722,9 @@ Request To Send RTS - + Een RS232C signaal dat verzoekt dat het + verre systeem begint met het versturen van gegevens. + @@ -1578,6 +1785,11 @@ + + SVN + + + SMTP Authentication SMTP AUTH @@ -1598,8 +1810,8 @@ Signal Ground SG - E7eacute;n RS232 pin of draad is de aardereferentie voor - het signaal. + Een RS232 pin of draad die de + aardereferentie voor het signaal is. @@ -1627,6 +1839,16 @@ + + Subversion + SVN + + Subversion is een versiebeheersysteem, vergelijkbaar met + CVS, maar met een uitgebreidere lijst mogelijkheden. + + + + Suspend To RAM STR @@ -1661,6 +1883,11 @@ + TCP/IP + + + + TD @@ -1703,7 +1930,21 @@ Transmission Control Protocol TCP - + Een protocol dat bovenop (b.v.) het IP + protocol zit en garandeert dat pakketten in een betrouwbare en + ordelijke manier worden afgeleverd. + + + + + Transmission Control Protocol/Internet Protocol + + TCP/IP + + De term oor de combinatie van het TCP + protocol dat over het IP protocol draait. + Veel van het Internet draait op TCP/IP. + @@ -1711,7 +1952,8 @@ Transmitted Data TD - + Een RS232C pin of draad waarover + gegevens worden verstuurd. From owner-p4-projects@FreeBSD.ORG Wed Sep 10 22:26:12 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A0F0F1065673; Wed, 10 Sep 2008 22:26: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 62E25106566B for ; Wed, 10 Sep 2008 22:26:12 +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 4F72B8FC15 for ; Wed, 10 Sep 2008 22:26:12 +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 m8AMQCw5090774 for ; Wed, 10 Sep 2008 22:26:12 GMT (envelope-from trasz@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m8AMQBMQ090641 for perforce@freebsd.org; Wed, 10 Sep 2008 22:26:11 GMT (envelope-from trasz@freebsd.org) Date: Wed, 10 Sep 2008 22:26:11 GMT Message-Id: <200809102226.m8AMQBMQ090641@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 149579 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, 10 Sep 2008 22:26:12 -0000 http://perforce.freebsd.org/chv.cgi?CH=149579 Change 149579 by trasz@trasz_traszkan on 2008/09/10 22:25:56 IFC. Affected files ... .. //depot/projects/soc2008/trasz_nfs4acl/ObsoleteFiles.inc#10 integrate .. //depot/projects/soc2008/trasz_nfs4acl/bin/cp/utils.c#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/bin/setfacl/setfacl.c#14 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/gcc/config/arm/arm.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/libparse/clk_rawdcf.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/etc/rc.initdiskless#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/include/rpc/svc_auth.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libarchive/archive_entry_link_resolver.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libarchive/archive_write_disk.3#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libarchive/archive_write_disk.c#7 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libarchive/test/Makefile#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libarchive/test/test_read_format_gtar_sparse.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libarchive/test/test_write_disk.c#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libarchive/test/test_write_disk_hardlink.c#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libarchive/test/test_write_disk_secure.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/gen/arc4random.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/regex/re_format.7#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/rpc/svc.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/rpc/svc_auth.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/stdlib/malloc.c#6 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libgeom/geom_util.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libgeom/libgeom.3#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libgeom/libgeom.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/librpcsec_gss/svc_rpcsec_gss.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libstand/stand.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libstand/ufs.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libstand/zalloc_malloc.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libthr/thread/thr_exit.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/release/Makefile.inc.docports#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/release/doc/en_US.ISO8859-1/relnotes/article.sgml#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sbin/fdisk/fdisk.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sbin/ipfw/ipfw2.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sbin/md5/md5.1#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sbin/natd/natd.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/share/man/man4/Makefile#7 integrate .. //depot/projects/soc2008/trasz_nfs4acl/share/man/man4/if_bridge.4#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/share/man/man4/man4.i386/Makefile#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/share/man/man4/man4.i386/sbni.4#3 branch .. //depot/projects/soc2008/trasz_nfs4acl/share/man/man4/pts.4#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/share/man/man4/tap.4#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/share/man/man9/CTASSERT.9#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/share/man/man9/bus_dma.9#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/share/misc/committers-ports.dot#6 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/amd64/amd64/cpu_switch.S#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/amd64/amd64/genassym.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/amd64/amd64/machdep.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/amd64/amd64/mp_machdep.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/amd64/amd64/trap.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/amd64/include/pcb.h#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/amd64/include/pcpu.h#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/amd64/include/segments.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/amd64/linux32/linux32_genassym.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/amd64/linux32/linux32_locore.s#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/amd64/linux32/linux32_machdep.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/amd64/pci/pci_cfgreg.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/arm/at91/at91.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/arm/at91/at91_mci.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/arm/at91/at91_ssc.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/arm/at91/kb920x_machdep.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/arm/conf/KB920X#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/arm/conf/NSLU#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/boot/common/dev_net.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/boot/common/devopen.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/boot/forth/loader.conf#9 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/boot/powerpc/uboot/start.S#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/boot/sparc64/loader/main.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/boot/uboot/common/main.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/boot/uboot/lib/glue.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/boot/uboot/lib/glue.h#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/cddl/contrib/opensolaris/uts/common/fs/gfs.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ctldir.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c#8 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_znode.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/compat/linux/linux_file.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/compat/linux/linux_socket.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/conf/NOTES#11 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/conf/files.i386#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/conf/files.pc98#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/conf/files.sparc64#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/conf/files.sun4v#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/contrib/dev/ath/public/mipsisa32-be-elf.hal.o.uu#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/contrib/dev/ath/public/wisoc.hal.o.uu#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/sys/contrib/dev/ath/public/wisoc.inc#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/sys/contrib/dev/ath/public/wisoc.opt_ah.h#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/acpi_support/acpi_fujitsu.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/asmc/asmc.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/asmc/asmcvar.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/ata/ata-chipset.c#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/ata/ata-pci.h#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/ath/if_athvar.h#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/bge/if_bge.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/cxgb/cxgb_adapter.h#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/cxgb/cxgb_main.c#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/cxgb/cxgb_sge.c#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/drm/ati_pcigart.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/drm/drm_bufs.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/drm/drm_pci.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/drm/i915_dma.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/drm/mach64_dma.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/esp/esp_sbus.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/esp/ncr53c9x.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/esp/ncr53c9xreg.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/esp/ncr53c9xvar.h#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/ic/i8251.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/ic/i8255.h#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/iicbus/ds133x.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/iicbus/ds1672.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/jme/if_jme.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/jme/if_jmereg.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/le/if_le_ledma.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/mii/e1000phy.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/mii/miidevs#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/re/if_re.c#6 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/sbni/if_sbni.c#3 branch .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/sbni/if_sbni_isa.c#3 branch .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/sbni/if_sbni_pci.c#3 branch .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/sbni/if_sbnireg.h#3 branch .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/sbni/if_sbnivar.h#3 branch .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/si/si.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/sound/pci/hda/hdac.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/uart/uart_cpu_pc98.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/if_zyd.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/if_zydreg.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/ucom.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/ucomvar.h#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/usb_quirks.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/usbdevs#7 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/fs/tmpfs/tmpfs.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/fs/tmpfs/tmpfs_fifoops.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/fs/tmpfs/tmpfs_fifoops.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/fs/tmpfs/tmpfs_subr.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/fs/tmpfs/tmpfs_vfsops.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/fs/tmpfs/tmpfs_vnops.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/fs/tmpfs/tmpfs_vnops.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/geom/geom_dev.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/geom/part/g_part.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/geom/part/g_part.h#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/geom/part/g_part_gpt.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/gnu/fs/xfs/FreeBSD/xfs_vnode.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/i386/conf/NOTES#6 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/i386/conf/XEN#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/i386/cpufreq/est.c#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/i386/i386/local_apic.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/i386/i386/machdep.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/i386/include/pmc_mdep.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/i386/include/xen/xenpmap.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/i386/include/xen/xenvar.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/i386/isa/isa.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/i386/linux/linux_genassym.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/i386/linux/linux_locore.s#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/i386/pci/pci_cfgreg.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/i386/xen/mp_machdep.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/sys/i386/xen/mptable.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/sys/i386/xen/pmap.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/i386/xen/xen_machdep.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/kern_exec.c#7 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/kern_lock.c#6 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/kern_mutex.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/kern_proc.c#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/kern_resource.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/kern_rmlock.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/kern_rwlock.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/kern_sx.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/subr_sleepqueue.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/subr_turnstile.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/subr_witness.c#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/tty.c#6 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/tty_compat.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/tty_pts.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/tty_ttydisc.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/uipc_mbuf.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/uipc_mqueue.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/uipc_sockbuf.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/vfs_mount.c#8 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/mips/adm5120/admpci.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/mips/adm5120/if_admsw.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/mips/adm5120/if_admswvar.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/mips/adm5120/obio.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/mips/adm5120/std.adm5120#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/mips/adm5120/uart_bus_adm5120.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/mips/adm5120/uart_cpu_adm5120.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/mips/adm5120/uart_dev_adm5120.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/mips/conf/ADM5120#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/mips/conf/IDT#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/mips/conf/MALTA#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/mips/conf/SENTRY5#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/mips/idt/idtpci.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/mips/idt/if_kr.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/mips/idt/obio.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/mips/idt/std.idt#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/mips/idt/uart_bus_rc32434.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/mips/malta/files.malta#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/mips/malta/gt.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/mips/malta/gt_pci.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/mips/malta/malta_machdep.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/mips/malta/obio.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/mips/malta/std.malta#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/mips/malta/uart_bus_maltausart.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/mips/malta/uart_cpu_maltausart.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/mips/malta/yamon.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/mips/mips/in_cksum.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/mips/mips/intr_machdep.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/mips/sentry5/obio.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/mips/sentry5/s5_machdep.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/mips/sentry5/uart_bus_sbusart.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/mips/sentry5/uart_cpu_sbusart.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/modules/Makefile#8 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/modules/sbni/Makefile#3 branch .. //depot/projects/soc2008/trasz_nfs4acl/sys/net/if_bridge.c#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/net/if_mib.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/net/if_tap.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/net/if_tap.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/net/route.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/net80211/ieee80211.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/net80211/ieee80211.h#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/net80211/ieee80211_ddb.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/net80211/ieee80211_freebsd.h#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/net80211/ieee80211_ht.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/net80211/ieee80211_ht.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/net80211/ieee80211_ioctl.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/net80211/ieee80211_ioctl.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/net80211/ieee80211_node.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/net80211/ieee80211_node.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/net80211/ieee80211_phy.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/net80211/ieee80211_sta.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netgraph/ng_pipe.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/sys/netgraph/ng_pipe.h#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet/if_ether.c#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet/ip_fw.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet/ip_fw2.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet/tcp_debug.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet/tcp_input.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet/tcp_output.c#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet/tcp_subr.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet/tcp_var.h#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet6/icmp6.c#6 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet6/mld6.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/pc98/cbus/sio.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/pc98/conf/NOTES#6 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/pc98/include/bus.h#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/pc98/pc98/busiosubr.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/security/audit/audit_syscalls.c#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/security/mac_bsdextended/mac_bsdextended.c#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/sparc64/include/asi.h#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/sparc64/include/clock.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/sparc64/include/cpu.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/sparc64/include/cpufunc.h#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/sparc64/include/dcr.h#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/sys/sparc64/include/pcpu.h#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/sparc64/include/smp.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/sparc64/include/tick.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/sparc64/include/tlb.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/sparc64/include/trap.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/sparc64/include/tte.h#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/sparc64/include/ver.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/sparc64/sbus/dma_sbus.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/sparc64/sbus/lsi64854.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/sparc64/sbus/lsi64854var.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/sparc64/sparc64/cheetah.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/sparc64/sparc64/clock.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/sparc64/sparc64/exception.S#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/sparc64/sparc64/genassym.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/sparc64/sparc64/jbusppm.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/sys/sparc64/sparc64/locore.S#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/sparc64/sparc64/machdep.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/sparc64/sparc64/mp_exception.S#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/sparc64/sparc64/mp_locore.S#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/sparc64/sparc64/mp_machdep.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/sparc64/sparc64/pmap.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/sparc64/sparc64/schppm.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/sys/sparc64/sparc64/support.S#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/sparc64/sparc64/swtch.S#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/sparc64/sparc64/tick.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/sparc64/sparc64/tlb.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/sparc64/sparc64/trap.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/sun4v/include/asi.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/sys/disk.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/sys/gpt.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/sys/lock.h#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/sys/param.h#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/sys/systm.h#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/sys/termios.h#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/sys/tty.h#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/sys/ttydevsw.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/sys/vnode.h#10 integrate .. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/sockets/sendfile/sendfile.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/tools/tools/nanobsd/nanobsd.sh#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.bin/cpio/cpio.c#8 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/boot0cfg/boot0cfg.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/crunch/crunchide/exec_elf32.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/cxgbtool/cxgbtool.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/fwcontrol/fwcontrol.8#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/fwcontrol/fwcontrol.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/setfib/setfib.c#4 integrate Differences ... ==== //depot/projects/soc2008/trasz_nfs4acl/ObsoleteFiles.inc#10 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/ObsoleteFiles.inc,v 1.157 2008/08/31 08:33:41 antoine Exp $ +# $FreeBSD: src/ObsoleteFiles.inc,v 1.158 2008/09/10 18:36:58 jhb Exp $ # # This file lists old files (OLD_FILES), libraries (OLD_LIBS) and # directories (OLD_DIRS) which should get removed at an update. Recently @@ -53,11 +53,6 @@ # 20080704: sbsh(4) removed OLD_FILES+=usr/share/man/man4/if_sbsh.4.gz OLD_FILES+=usr/share/man/man4/sbsh.4.gz -# 20080704: sbni(4) removed -.if ${TARGET_ARCH} == "i386" -OLD_FILES+=usr/share/man/man4/i386/if_sbni.4.gz -OLD_FILES+=usr/share/man/man4/i386/sbni.4.gz -.endif # 20080704: cnw(4) removed OLD_FILES+=usr/share/man/man4/if_cnw.4.gz OLD_FILES+=usr/share/man/man4/cnw.4.gz ==== //depot/projects/soc2008/trasz_nfs4acl/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.54 2008/08/07 07:29:26 trasz Exp $"); +__FBSDID("$FreeBSD: src/bin/cp/utils.c,v 1.55 2008/09/09 12:31:42 trasz Exp $"); #include #include @@ -224,7 +224,6 @@ rval = 1; if (pflag && preserve_fd_acls(from_fd, to_fd) != 0) rval = 1; - (void)close(from_fd); if (close(to_fd)) { warn("%s", to.p_path); rval = 1; ==== //depot/projects/soc2008/trasz_nfs4acl/bin/setfacl/setfacl.c#14 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/bin/setfacl/setfacl.c,v 1.13 2007/02/26 00:42:17 mckusick Exp $"); +__FBSDID("$FreeBSD: src/bin/setfacl/setfacl.c,v 1.14 2008/09/06 13:17:35 trasz Exp $"); #include #include ==== //depot/projects/soc2008/trasz_nfs4acl/contrib/gcc/config/arm/arm.h#2 (text+ko) ==== @@ -507,7 +507,7 @@ /* wchar_t is unsigned under the AAPCS. */ #ifndef WCHAR_TYPE #define WCHAR_TYPE (TARGET_AAPCS_BASED ? "unsigned int" : "int") - +#undef WCHAR_TYPE_SIZE #define WCHAR_TYPE_SIZE BITS_PER_WORD #endif ==== //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/libparse/clk_rawdcf.c#3 (text+ko) ==== @@ -229,7 +229,7 @@ unsigned char *c = dcfprm->zerobits; int i; - parseprintf(DD_RAWDCF,("parse: convert_rawdcf: \"%s\"\n", buffer)); + parseprintf(DD_RAWDCF,("parse: convert_rawdcf: \"%.*s\"\n", size, buffer)); if (size < 57) { @@ -320,7 +320,7 @@ * bad format - not for us */ #ifndef PARSEKERNEL - msyslog(LOG_ERR, "parse: convert_rawdcf: parity check FAILED for \"%s\"\n", buffer); + msyslog(LOG_ERR, "parse: convert_rawdcf: parity check FAILED for \"%.*s\"\n", size, buffer); #endif return CVT_FAIL|CVT_BADFMT; } ==== //depot/projects/soc2008/trasz_nfs4acl/etc/rc.initdiskless#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/rc.initdiskless,v 1.53 2008/05/15 11:00:23 bms Exp $ +# $FreeBSD: src/etc/rc.initdiskless,v 1.54 2008/09/09 18:40:50 bms Exp $ # On entry to this script the entire system consists of a read-only root # mounted via NFS. The kernel has run BOOTP and configured an interface @@ -73,6 +73,16 @@ # If this file exists, then failure to execute the mount # command contained in /conf/T/M/remount is non-fatal. # +# /conf/T/M/remount_subdir +# If this file exists, then the behaviour of /conf/T/M/remount +# changes as follows: +# 1. /conf/T/M/remount is invoked to mount the root of the +# filesystem where the configuration data exists on a +# temporary mountpoint. +# 2. /conf/T/M/remount_subdir is then invoked to mount a +# *subdirectory* of the filesystem mounted by +# /conf/T/M/remount on /conf/T/M/. +# # /conf/T/M/diskless_remount # The contents of the file points to an NFS filesystem, # possibly followed by mount_nfs options. If the server name @@ -296,10 +306,33 @@ # remount. Beware, the command is in the file itself! if [ -f $j/remount ]; then - nfspt=`/bin/cat $j/remount` - $nfspt $j - chkerr $? "$nfspt $j" - to_umount="$j ${to_umount}" # XXX hope it is really a mount! + if [ -f $j/remount_subdir ]; then + k="/conf.tmp/$i/$subdir" + [ -d $k ] || continue + + # Mount the filesystem root where the config data is + # on the temporary mount point. + nfspt=`/bin/cat $j/remount` + $nfspt $k + chkerr $? "$nfspt $k" + + # Now use a nullfs mount to get the data where we + # really want to see it. + remount_subdir=`/bin/cat $j/remount_subdir` + remount_subdir_cmd="mount -t nullfs $k/$remount_subdir" + + $remount_subdir_cmd $j + chkerr $? "$remount_subdir_cmd $j" + + # XXX check order -- we must force $k to be unmounted + # after j, as j depends on k. + to_umount="$j $k ${to_umount}" + else + nfspt=`/bin/cat $j/remount` + $nfspt $j + chkerr $? "$nfspt $j" + to_umount="$j ${to_umount}" # XXX hope it is really a mount! + fi fi # NFS remount ==== //depot/projects/soc2008/trasz_nfs4acl/include/rpc/svc_auth.h#2 (text+ko) ==== @@ -30,7 +30,7 @@ * * from: @(#)svc_auth.h 1.6 86/07/16 SMI * @(#)svc_auth.h 2.1 88/07/29 4.0 RPCSRC - * $FreeBSD: src/include/rpc/svc_auth.h,v 1.14 2002/03/23 17:24:55 imp Exp $ + * $FreeBSD: src/include/rpc/svc_auth.h,v 1.15 2008/09/09 14:15:55 dfr Exp $ */ /* @@ -46,6 +46,8 @@ * Server side authenticator */ __BEGIN_DECLS +extern struct svc_auth_ops svc_auth_null_ops; + extern enum auth_stat _authenticate(struct svc_req *, struct rpc_msg *); extern int svc_auth_reg(int, enum auth_stat (*)(struct svc_req *, struct rpc_msg *)); ==== //depot/projects/soc2008/trasz_nfs4acl/lib/libarchive/archive_entry_link_resolver.c#3 (text+ko) ==== @@ -24,7 +24,7 @@ */ #include "archive_platform.h" -__FBSDID("$FreeBSD: src/lib/libarchive/archive_entry_link_resolver.c,v 1.3 2008/06/15 04:31:43 kientzle Exp $"); +__FBSDID("$FreeBSD: src/lib/libarchive/archive_entry_link_resolver.c,v 1.4 2008/09/05 06:15:25 kientzle Exp $"); #ifdef HAVE_SYS_STAT_H #include @@ -189,7 +189,7 @@ case ARCHIVE_ENTRY_LINKIFY_LIKE_TAR: le = find_entry(res, *e); if (le != NULL) { - archive_entry_set_size(*e, 0); + archive_entry_unset_size(*e); archive_entry_copy_hardlink(*e, archive_entry_pathname(le->canonical)); } else @@ -217,7 +217,7 @@ *e = le->entry; le->entry = t; /* Make the old entry into a hardlink. */ - archive_entry_set_size(*e, 0); + archive_entry_unset_size(*e); archive_entry_copy_hardlink(*e, archive_entry_pathname(le->canonical)); /* If we ran out of links, return the ==== //depot/projects/soc2008/trasz_nfs4acl/lib/libarchive/archive_write_disk.3#3 (text+ko) ==== @@ -22,9 +22,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/lib/libarchive/archive_write_disk.3,v 1.3 2008/05/26 17:00:23 kientzle Exp $ +.\" $FreeBSD: src/lib/libarchive/archive_write_disk.3,v 1.4 2008/09/04 05:22:00 kientzle Exp $ .\" -.Dd March 2, 2007 +.Dd August 5, 2008 .Dt archive_write_disk 3 .Os .Sh NAME @@ -169,11 +169,11 @@ Note that paths ending in .Pa .. always cause an error, regardless of this flag. -.El .It Cm ARCHIVE_EXTRACT_SPARSE Scan data for blocks of NUL bytes and try to recreate them with holes. This results in sparse files, independent of whether the archive format supports or uses them. +.El .It Xo .Fn archive_write_disk_set_group_lookup , .Fn archive_write_disk_set_user_lookup ==== //depot/projects/soc2008/trasz_nfs4acl/lib/libarchive/archive_write_disk.c#7 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include "archive_platform.h" -__FBSDID("$FreeBSD: src/lib/libarchive/archive_write_disk.c,v 1.33 2008/09/01 02:50:24 kientzle Exp $"); +__FBSDID("$FreeBSD: src/lib/libarchive/archive_write_disk.c,v 1.36 2008/09/07 05:22:33 kientzle Exp $"); #ifdef HAVE_SYS_TYPES_H #include @@ -176,7 +176,7 @@ int fd; /* Current offset for writing data to the file. */ off_t offset; - /* Maximum size of file. */ + /* Maximum size of file, -1 if unknown. */ off_t filesize; /* Dir we were in before this restore; only for deep paths. */ int restore_pwd; @@ -231,7 +231,8 @@ static struct fixup_entry *sort_dir_list(struct fixup_entry *p); static gid_t trivial_lookup_gid(void *, const char *, gid_t); static uid_t trivial_lookup_uid(void *, const char *, uid_t); - +static ssize_t write_data_block(struct archive_write_disk *, + const char *, size_t, off_t); static struct archive_vtable *archive_write_disk_vtable(void); @@ -337,7 +338,10 @@ a->offset = 0; a->uid = a->user_uid; a->mode = archive_entry_mode(a->entry); - a->filesize = archive_entry_size(a->entry); + if (archive_entry_size_is_set(a->entry)) + a->filesize = archive_entry_size(a->entry); + else + a->filesize = -1; archive_strcpy(&(a->_name_data), archive_entry_pathname(a->entry)); a->name = a->_name_data.s; archive_clear_error(&a->archive); @@ -439,15 +443,25 @@ fe->mode = a->mode; } - if (a->deferred & TODO_TIMES) { + if ((a->deferred & TODO_TIMES) + && (archive_entry_mtime_is_set(entry) + || archive_entry_atime_is_set(entry))) { fe = current_fixup(a, archive_entry_pathname(entry)); fe->fixup |= TODO_TIMES; - fe->mtime = archive_entry_mtime(entry); - fe->mtime_nanos = archive_entry_mtime_nsec(entry); - fe->atime = archive_entry_atime(entry); - fe->atime_nanos = archive_entry_atime_nsec(entry); - if (fe->atime == 0 && fe->atime_nanos == 0) + if (archive_entry_mtime_is_set(entry)) { + fe->mtime = archive_entry_mtime(entry); + fe->mtime_nanos = archive_entry_mtime_nsec(entry); + } else { + fe->mtime = a->start_time; + fe->mtime_nanos = 0; + } + if (archive_entry_atime_is_set(entry)) { + fe->atime = archive_entry_atime(entry); + fe->atime_nanos = archive_entry_atime_nsec(entry); + } else { fe->atime = a->start_time; + fe->atime_nanos = 0; + } } if (a->deferred & TODO_FFLAGS) { @@ -486,89 +500,113 @@ } static ssize_t -_archive_write_data_block(struct archive *_a, - const void *buff, size_t size, off_t offset) +write_data_block(struct archive_write_disk *a, + const char *buff, size_t size, off_t offset) { - struct archive_write_disk *a = (struct archive_write_disk *)_a; ssize_t bytes_written = 0; - ssize_t block_size, bytes_to_write; - int r = ARCHIVE_OK; + ssize_t block_size = 0, bytes_to_write; + int r; - __archive_check_magic(&a->archive, ARCHIVE_WRITE_DISK_MAGIC, - ARCHIVE_STATE_DATA, "archive_write_disk_block"); - if (a->fd < 0) { - archive_set_error(&a->archive, 0, "File not open"); + if (a->filesize == 0 || a->fd < 0) { + archive_set_error(&a->archive, 0, + "Attempt to write to an empty file"); return (ARCHIVE_WARN); } - archive_clear_error(&a->archive); if (a->flags & ARCHIVE_EXTRACT_SPARSE) { if ((r = _archive_write_disk_lazy_stat(a)) != ARCHIVE_OK) return (r); block_size = a->pst->st_blksize; - } else - block_size = -1; + } - if ((off_t)(offset + size) > a->filesize) { - size = (size_t)(a->filesize - a->offset); - archive_set_error(&a->archive, 0, - "Write request too large"); - r = ARCHIVE_WARN; - } + if (a->filesize >= 0 && (off_t)(offset + size) > a->filesize) + size = (size_t)(a->filesize - offset); /* Write the data. */ while (size > 0) { - if (block_size != -1) { - const char *buf; + if (block_size == 0) { + bytes_to_write = size; + } else { + /* We're sparsifying the file. */ + const char *p, *end; + off_t block_end; - for (buf = buff; size; ++buf, --size, ++offset) { - if (*buf != '\0') + /* Skip leading zero bytes. */ + for (p = buff, end = buff + size; p < end; ++p) { + if (*p != '\0') break; } + offset += p - buff; + size -= p - buff; + buff = p; if (size == 0) break; - bytes_to_write = block_size - offset % block_size; - buff = buf; - } else + + /* Calculate next block boundary after offset. */ + block_end + = (offset / block_size) * block_size + block_size; + + /* If the adjusted write would cross block boundary, + * truncate it to the block boundary. */ bytes_to_write = size; + if (offset + bytes_to_write > block_end) + bytes_to_write = block_end - offset; + } + /* Seek if necessary to the specified offset. */ if (offset != a->last_offset) { if (lseek(a->fd, offset, SEEK_SET) < 0) { - archive_set_error(&a->archive, errno, "Seek failed"); + archive_set_error(&a->archive, errno, + "Seek failed"); return (ARCHIVE_FATAL); } } - bytes_written = write(a->fd, buff, size); + bytes_written = write(a->fd, buff, bytes_to_write); if (bytes_written < 0) { archive_set_error(&a->archive, errno, "Write failed"); return (ARCHIVE_WARN); } - buff = (const char *)buff + bytes_written; + buff += bytes_written; size -= bytes_written; offset += bytes_written; a->archive.file_position += bytes_written; a->archive.raw_position += bytes_written; a->last_offset = a->offset = offset; } - a->offset = offset; - return (r); + return (bytes_written); +} + +static ssize_t +_archive_write_data_block(struct archive *_a, + const void *buff, size_t size, off_t offset) +{ + struct archive_write_disk *a = (struct archive_write_disk *)_a; + ssize_t r; + + __archive_check_magic(&a->archive, ARCHIVE_WRITE_DISK_MAGIC, + ARCHIVE_STATE_DATA, "archive_write_disk_block"); + + r = write_data_block(a, buff, size, offset); + + if (r < 0) + return (r); + if ((size_t)r < size) { + archive_set_error(&a->archive, 0, + "Write request too large"); + return (ARCHIVE_WARN); + } + return (ARCHIVE_OK); } static ssize_t _archive_write_data(struct archive *_a, const void *buff, size_t size) { struct archive_write_disk *a = (struct archive_write_disk *)_a; - int r; __archive_check_magic(&a->archive, ARCHIVE_WRITE_DISK_MAGIC, ARCHIVE_STATE_DATA, "archive_write_data"); - if (a->fd < 0) - return (ARCHIVE_OK); - r = _archive_write_data_block(_a, buff, size, a->offset); - if (r < ARCHIVE_OK) - return (r); - return size; + return (write_data_block(a, buff, size, a->offset)); } static int @@ -584,7 +622,15 @@ return (ARCHIVE_OK); archive_clear_error(&a->archive); - if (a->last_offset != a->filesize && a->fd >= 0) { + /* Pad or truncate file to the right size. */ + if (a->fd < 0) { + /* There's no file. */ + } else if (a->filesize < 0) { + /* File size is unknown, so we can't set the size. */ + } else if (a->last_offset == a->filesize) { + /* Last write ended at exactly the filesize; we're done. */ + /* Hopefully, this is the common case. */ + } else { if (ftruncate(a->fd, a->filesize) == -1 && a->filesize == 0) { archive_set_error(&a->archive, errno, @@ -601,7 +647,8 @@ if (a->st.st_size != a->filesize) { const char nul = '\0'; if (lseek(a->fd, a->st.st_size - 1, SEEK_SET) < 0) { - archive_set_error(&a->archive, errno, "Seek failed"); + archive_set_error(&a->archive, errno, + "Seek failed"); return (ARCHIVE_FATAL); } if (write(a->fd, &nul, 1) < 0) { @@ -609,6 +656,7 @@ "Write to restore size failed"); return (ARCHIVE_FATAL); } + a->pst = NULL; } } @@ -859,14 +907,26 @@ * We know something is in the way, but we don't know what; * we need to find out before we go any further. */ - if (lstat(a->name, &a->st) != 0) { + int r = 0; + /* + * The SECURE_SYMLINK logic has already removed a + * symlink to a dir if the client wants that. So + * follow the symlink if we're creating a dir. + */ + if (S_ISDIR(a->mode)) + r = stat(a->name, &a->st); + /* + * If it's not a dir (or it's a broken symlink), + * then don't follow it. + */ + if (r != 0 || !S_ISDIR(a->mode)) + r = lstat(a->name, &a->st); + if (r != 0) { archive_set_error(&a->archive, errno, "Can't stat existing object"); return (ARCHIVE_WARN); } - /* TODO: if it's a symlink... */ - /* * NO_OVERWRITE_NEWER doesn't apply to directories. */ @@ -963,7 +1023,7 @@ * If the hardlink does carry data, let the last * archive entry decide ownership. */ - if (r == 0 && a->filesize == 0) { + if (r == 0 && a->filesize <= 0) { a->todo = 0; a->deferred = 0; } if (r == 0 && a->filesize > 0) { @@ -1623,18 +1683,31 @@ { struct timeval times[2]; - times[1].tv_sec = archive_entry_mtime(a->entry); - times[1].tv_usec = archive_entry_mtime_nsec(a->entry) / 1000; + /* If no time was provided, we're done. */ + if (!archive_entry_atime_is_set(a->entry) + && !archive_entry_mtime_is_set(a->entry)) + return (ARCHIVE_OK); - times[0].tv_sec = archive_entry_atime(a->entry); - times[0].tv_usec = archive_entry_atime_nsec(a->entry) / 1000; + /* We know at least one is set, so... */ + if (archive_entry_mtime_is_set(a->entry)) { + times[1].tv_sec = archive_entry_mtime(a->entry); + times[1].tv_usec = archive_entry_mtime_nsec(a->entry) / 1000; + } else { + times[1].tv_sec = a->start_time; + times[1].tv_usec = 0; + } /* If no atime was specified, use start time instead. */ /* In theory, it would be marginally more correct to use * time(NULL) here, but that would cost us an extra syscall * for little gain. */ - if (times[0].tv_sec == 0 && times[0].tv_usec == 0) + if (archive_entry_atime_is_set(a->entry)) { + times[0].tv_sec = archive_entry_atime(a->entry); + times[0].tv_usec = archive_entry_atime_nsec(a->entry) / 1000; + } else { times[0].tv_sec = a->start_time; + times[0].tv_usec = 0; + } #ifdef HAVE_FUTIMES if (a->fd >= 0 && futimes(a->fd, times) == 0) { @@ -1672,10 +1745,24 @@ { struct utimbuf times; - times.modtime = archive_entry_mtime(a->entry); - times.actime = archive_entry_atime(a->entry); - if (times.actime == 0) + /* If no time was provided, we're done. */ + if (!archive_entry_atime_is_set(a->entry) + && !archive_entry_mtime_is_set(a->entry)) + return (ARCHIVE_OK); + + /* We know at least one is set, so... */ + /* Set mtime from mtime if set, else start time. */ + if (archive_entry_mtime_is_set(a->entry)) + times.modtime = archive_entry_mtime(a->entry); + else + times.modtime = a->start_time; + + /* Set atime from provided atime, else mtime. */ + if (archive_entry_atime_is_set(a->entry)) + times.actime = archive_entry_atime(a->entry); + else times.actime = a->start_time; + if (!S_ISLNK(a->mode) && utime(a->name, ×) != 0) { archive_set_error(&a->archive, errno, "Can't update time for %s", a->name); ==== //depot/projects/soc2008/trasz_nfs4acl/lib/libarchive/test/Makefile#4 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/lib/libarchive/test/Makefile,v 1.24 2008/08/25 06:08:22 kientzle Exp $ +# $FreeBSD: src/lib/libarchive/test/Makefile,v 1.25 2008/09/08 00:58:12 kientzle Exp $ # Where to find the libarchive sources LA_SRCDIR=${.CURDIR}/.. @@ -89,7 +89,7 @@ # Uncomment to link against dmalloc #LDADD+= -L/usr/local/lib -ldmalloc #CFLAGS+= -I/usr/local/include -DUSE_DMALLOC -#WARNS=6 +WARNS=6 # Build libarchive_test and run it. check test: libarchive_test ==== //depot/projects/soc2008/trasz_nfs4acl/lib/libarchive/test/test_read_format_gtar_sparse.c#3 (text+ko) ==== @@ -23,7 +23,7 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ #include "test.h" -__FBSDID("$FreeBSD: src/lib/libarchive/test/test_read_format_gtar_sparse.c,v 1.9 2008/09/01 05:38:33 kientzle Exp $"); +__FBSDID("$FreeBSD: src/lib/libarchive/test/test_read_format_gtar_sparse.c,v 1.10 2008/09/08 00:58:12 kientzle Exp $"); struct contents { @@ -187,6 +187,7 @@ struct contents expect; /* data, size, offset of block read from archive. */ struct contents actual; + const void *p; struct archive *a; extract_reference_file(name); @@ -206,10 +207,10 @@ expect = *cts++; while (0 == (err = archive_read_data_block(a, - (const void **)&actual.d, - &actual.s, &actual.o))) { + &p, &actual.s, &actual.o))) { + actual.d = p; while (actual.s > 0) { - char c = *(const char *)actual.d; + char c = *actual.d; if(actual.o < expect.o) { /* * Any byte before the expected ==== //depot/projects/soc2008/trasz_nfs4acl/lib/libarchive/test/test_write_disk.c#5 (text+ko) ==== @@ -23,7 +23,7 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ #include "test.h" -__FBSDID("$FreeBSD: src/lib/libarchive/test/test_write_disk.c,v 1.13 2008/09/01 05:38:33 kientzle Exp $"); +__FBSDID("$FreeBSD: src/lib/libarchive/test/test_write_disk.c,v 1.14 2008/09/05 06:13:11 kientzle Exp $"); #if ARCHIVE_VERSION_NUMBER >= 1009000 @@ -84,7 +84,7 @@ * the entry being a maximum size. */ archive_entry_set_size(ae, sizeof(data)); - archive_entry_set_mtime(ae, 123456789, 0); + archive_entry_set_mtime(ae, 123456789, 0); assertEqualIntA(ad, 0, archive_write_header(ad, ae)); assertEqualInt(sizeof(data), archive_write_data(ad, data, sizeof(data))); assertEqualIntA(ad, 0, archive_write_finish_entry(ad)); @@ -152,8 +152,63 @@ free(compare); free(data); } + +static void create_reg_file3(struct archive_entry *ae, const char *msg) +{ + static const char data[]="abcdefghijklmnopqrstuvwxyz"; + struct archive *ad; + struct stat st; + + /* Write the entry to disk. */ + assert((ad = archive_write_disk_new()) != NULL); + failure("%s", msg); + /* Set the size smaller than the data and verify the truncation. */ + archive_entry_set_size(ae, 5); + assertEqualIntA(ad, 0, archive_write_header(ad, ae)); + assertEqualInt(5, archive_write_data(ad, data, sizeof(data))); + assertEqualIntA(ad, 0, archive_write_finish_entry(ad)); +#if ARCHIVE_VERSION_NUMBER < 2000000 + archive_write_finish(ad); +#else + assertEqualInt(0, archive_write_finish(ad)); #endif + /* Test the entry on disk. */ + assert(0 == stat(archive_entry_pathname(ae), &st)); >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Wed Sep 10 23:24:12 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1FBE31065676; Wed, 10 Sep 2008 23:24: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 D70991065672 for ; Wed, 10 Sep 2008 23:24:11 +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 C2BFB8FC17 for ; Wed, 10 Sep 2008 23:24: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 m8ANOBWt000455 for ; Wed, 10 Sep 2008 23:24:11 GMT (envelope-from peter-gmail@wemm.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m8ANOBxP000431 for perforce@freebsd.org; Wed, 10 Sep 2008 23:24:11 GMT (envelope-from peter-gmail@wemm.org) Date: Wed, 10 Sep 2008 23:24:11 GMT Message-Id: <200809102324.m8ANOBxP000431@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 149582 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, 10 Sep 2008 23:24:12 -0000 http://perforce.freebsd.org/chv.cgi?CH=149582 Change 149582 by peter@peter_daintree on 2008/09/10 23:23:26 IFC @149581 Affected files ... .. //depot/projects/hammer/ObsoleteFiles.inc#58 integrate .. //depot/projects/hammer/bin/cp/utils.c#13 integrate .. //depot/projects/hammer/contrib/gcc/config/arm/arm.h#7 integrate .. //depot/projects/hammer/etc/rc.initdiskless#9 integrate .. //depot/projects/hammer/include/rpc/svc_auth.h#2 integrate .. //depot/projects/hammer/lib/libc/gen/arc4random.c#8 integrate .. //depot/projects/hammer/lib/libc/rpc/svc.c#6 integrate .. //depot/projects/hammer/lib/libc/rpc/svc_auth.c#5 integrate .. //depot/projects/hammer/lib/libc/stdlib/malloc.c#48 integrate .. //depot/projects/hammer/lib/libthr/thread/thr_exit.c#28 integrate .. //depot/projects/hammer/share/man/man4/man4.i386/Makefile#39 integrate .. //depot/projects/hammer/share/man/man4/man4.i386/sbni.4#4 branch .. //depot/projects/hammer/share/man/man4/tap.4#9 integrate .. //depot/projects/hammer/sys/amd64/pci/pci_cfgreg.c#29 integrate .. //depot/projects/hammer/sys/boot/common/dev_net.c#7 integrate .. //depot/projects/hammer/sys/boot/forth/loader.conf#42 integrate .. //depot/projects/hammer/sys/boot/sparc64/loader/main.c#17 integrate .. //depot/projects/hammer/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c#4 integrate .. //depot/projects/hammer/sys/compat/linux/linux_file.c#32 integrate .. //depot/projects/hammer/sys/compat/linux/linux_socket.c#32 integrate .. //depot/projects/hammer/sys/conf/files.i386#96 integrate .. //depot/projects/hammer/sys/conf/files.pc98#71 integrate .. //depot/projects/hammer/sys/conf/files.sparc64#46 integrate .. //depot/projects/hammer/sys/dev/ath/if_athvar.h#32 integrate .. //depot/projects/hammer/sys/dev/cxgb/cxgb_adapter.h#19 integrate .. //depot/projects/hammer/sys/dev/cxgb/cxgb_main.c#23 integrate .. //depot/projects/hammer/sys/dev/cxgb/cxgb_sge.c#21 integrate .. //depot/projects/hammer/sys/dev/drm/ati_pcigart.c#5 integrate .. //depot/projects/hammer/sys/dev/drm/drm_bufs.c#5 integrate .. //depot/projects/hammer/sys/dev/drm/drm_pci.c#4 integrate .. //depot/projects/hammer/sys/dev/drm/i915_dma.c#9 integrate .. //depot/projects/hammer/sys/dev/drm/mach64_dma.c#4 integrate .. //depot/projects/hammer/sys/dev/esp/esp_sbus.c#15 integrate .. //depot/projects/hammer/sys/dev/esp/ncr53c9x.c#14 integrate .. //depot/projects/hammer/sys/dev/esp/ncr53c9xreg.h#6 integrate .. //depot/projects/hammer/sys/dev/esp/ncr53c9xvar.h#9 integrate .. //depot/projects/hammer/sys/dev/jme/if_jme.c#3 integrate .. //depot/projects/hammer/sys/dev/jme/if_jmereg.h#2 integrate .. //depot/projects/hammer/sys/dev/le/if_le_ledma.c#5 integrate .. //depot/projects/hammer/sys/dev/sbni/if_sbni.c#21 branch .. //depot/projects/hammer/sys/dev/sbni/if_sbni_isa.c#11 branch .. //depot/projects/hammer/sys/dev/sbni/if_sbni_pci.c#8 branch .. //depot/projects/hammer/sys/dev/sbni/if_sbnireg.h#4 branch .. //depot/projects/hammer/sys/dev/sbni/if_sbnivar.h#5 branch .. //depot/projects/hammer/sys/dev/usb/if_zyd.c#14 integrate .. //depot/projects/hammer/sys/dev/usb/if_zydreg.h#5 integrate .. //depot/projects/hammer/sys/dev/usb/usb_quirks.c#24 integrate .. //depot/projects/hammer/sys/dev/usb/usbdevs#108 integrate .. //depot/projects/hammer/sys/gnu/fs/xfs/FreeBSD/xfs_vnode.h#3 integrate .. //depot/projects/hammer/sys/i386/conf/NOTES#107 integrate .. //depot/projects/hammer/sys/i386/conf/XEN#2 integrate .. //depot/projects/hammer/sys/i386/cpufreq/est.c#13 integrate .. //depot/projects/hammer/sys/i386/i386/local_apic.c#38 integrate .. //depot/projects/hammer/sys/i386/i386/machdep.c#89 integrate .. //depot/projects/hammer/sys/i386/include/xen/xenpmap.h#2 integrate .. //depot/projects/hammer/sys/i386/include/xen/xenvar.h#2 integrate .. //depot/projects/hammer/sys/i386/pci/pci_cfgreg.c#30 integrate .. //depot/projects/hammer/sys/i386/xen/mp_machdep.c#1 branch .. //depot/projects/hammer/sys/i386/xen/mptable.c#1 branch .. //depot/projects/hammer/sys/i386/xen/pmap.c#2 integrate .. //depot/projects/hammer/sys/i386/xen/xen_machdep.c#2 integrate .. //depot/projects/hammer/sys/kern/kern_exec.c#84 integrate .. //depot/projects/hammer/sys/kern/kern_lock.c#43 integrate .. //depot/projects/hammer/sys/kern/kern_mutex.c#54 integrate .. //depot/projects/hammer/sys/kern/kern_rmlock.c#3 integrate .. //depot/projects/hammer/sys/kern/kern_rwlock.c#19 integrate .. //depot/projects/hammer/sys/kern/kern_sx.c#24 integrate .. //depot/projects/hammer/sys/kern/subr_turnstile.c#29 integrate .. //depot/projects/hammer/sys/kern/subr_witness.c#74 integrate .. //depot/projects/hammer/sys/kern/tty_ttydisc.c#2 integrate .. //depot/projects/hammer/sys/mips/adm5120/admpci.c#2 integrate .. //depot/projects/hammer/sys/mips/adm5120/if_admsw.c#2 integrate .. //depot/projects/hammer/sys/mips/adm5120/if_admswvar.h#2 integrate .. //depot/projects/hammer/sys/mips/adm5120/obio.c#2 integrate .. //depot/projects/hammer/sys/mips/adm5120/uart_bus_adm5120.c#2 integrate .. //depot/projects/hammer/sys/mips/adm5120/uart_cpu_adm5120.c#2 integrate .. //depot/projects/hammer/sys/mips/adm5120/uart_dev_adm5120.c#2 integrate .. //depot/projects/hammer/sys/mips/idt/idtpci.c#2 integrate .. //depot/projects/hammer/sys/mips/idt/if_kr.c#2 integrate .. //depot/projects/hammer/sys/mips/idt/obio.c#2 integrate .. //depot/projects/hammer/sys/mips/idt/uart_bus_rc32434.c#2 integrate .. //depot/projects/hammer/sys/mips/malta/gt.c#2 integrate .. //depot/projects/hammer/sys/mips/malta/gt_pci.c#2 integrate .. //depot/projects/hammer/sys/mips/malta/malta_machdep.c#2 integrate .. //depot/projects/hammer/sys/mips/malta/obio.c#2 integrate .. //depot/projects/hammer/sys/mips/malta/uart_bus_maltausart.c#2 integrate .. //depot/projects/hammer/sys/mips/malta/uart_cpu_maltausart.c#2 integrate .. //depot/projects/hammer/sys/mips/malta/yamon.c#2 integrate .. //depot/projects/hammer/sys/mips/sentry5/obio.c#2 integrate .. //depot/projects/hammer/sys/mips/sentry5/s5_machdep.c#2 integrate .. //depot/projects/hammer/sys/mips/sentry5/uart_bus_sbusart.c#2 integrate .. //depot/projects/hammer/sys/mips/sentry5/uart_cpu_sbusart.c#2 integrate .. //depot/projects/hammer/sys/modules/Makefile#131 integrate .. //depot/projects/hammer/sys/modules/sbni/Makefile#3 branch .. //depot/projects/hammer/sys/net/if_mib.c#9 integrate .. //depot/projects/hammer/sys/net/if_tap.c#35 integrate .. //depot/projects/hammer/sys/net/if_tap.h#4 integrate .. //depot/projects/hammer/sys/netinet/tcp_input.c#87 integrate .. //depot/projects/hammer/sys/netinet6/mld6.c#24 integrate .. //depot/projects/hammer/sys/pc98/conf/NOTES#68 integrate .. //depot/projects/hammer/sys/security/mac_bsdextended/mac_bsdextended.c#31 integrate .. //depot/projects/hammer/sys/sparc64/include/asi.h#5 integrate .. //depot/projects/hammer/sys/sparc64/include/tlb.h#6 integrate .. //depot/projects/hammer/sys/sparc64/sbus/dma_sbus.c#6 integrate .. //depot/projects/hammer/sys/sparc64/sbus/lsi64854.c#6 integrate .. //depot/projects/hammer/sys/sparc64/sbus/lsi64854var.h#5 integrate .. //depot/projects/hammer/sys/sparc64/sparc64/cheetah.c#8 integrate .. //depot/projects/hammer/sys/sparc64/sparc64/exception.S#22 integrate .. //depot/projects/hammer/sys/sparc64/sparc64/genassym.c#17 integrate .. //depot/projects/hammer/sys/sparc64/sparc64/jbusppm.c#1 branch .. //depot/projects/hammer/sys/sparc64/sparc64/mp_exception.S#9 integrate .. //depot/projects/hammer/sys/sparc64/sparc64/mp_locore.S#7 integrate .. //depot/projects/hammer/sys/sparc64/sparc64/pmap.c#54 integrate .. //depot/projects/hammer/sys/sparc64/sparc64/schppm.c#1 branch .. //depot/projects/hammer/sys/sparc64/sparc64/support.S#12 integrate .. //depot/projects/hammer/sys/sparc64/sparc64/swtch.S#11 integrate .. //depot/projects/hammer/sys/sparc64/sparc64/tlb.c#8 integrate .. //depot/projects/hammer/sys/sun4v/include/asi.h#2 integrate .. //depot/projects/hammer/sys/sys/lock.h#26 integrate .. //depot/projects/hammer/sys/sys/param.h#117 integrate .. //depot/projects/hammer/sys/sys/systm.h#56 integrate .. //depot/projects/hammer/sys/sys/vnode.h#82 integrate .. //depot/projects/hammer/tools/regression/sockets/sendfile/sendfile.c#3 integrate .. //depot/projects/hammer/usr.sbin/cxgbtool/cxgbtool.c#3 integrate .. //depot/projects/hammer/usr.sbin/fwcontrol/fwcontrol.8#16 integrate .. //depot/projects/hammer/usr.sbin/fwcontrol/fwcontrol.c#15 integrate Differences ... ==== //depot/projects/hammer/ObsoleteFiles.inc#58 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/ObsoleteFiles.inc,v 1.157 2008/08/31 08:33:41 antoine Exp $ +# $FreeBSD: src/ObsoleteFiles.inc,v 1.158 2008/09/10 18:36:58 jhb Exp $ # # This file lists old files (OLD_FILES), libraries (OLD_LIBS) and # directories (OLD_DIRS) which should get removed at an update. Recently @@ -53,11 +53,6 @@ # 20080704: sbsh(4) removed OLD_FILES+=usr/share/man/man4/if_sbsh.4.gz OLD_FILES+=usr/share/man/man4/sbsh.4.gz -# 20080704: sbni(4) removed -.if ${TARGET_ARCH} == "i386" -OLD_FILES+=usr/share/man/man4/i386/if_sbni.4.gz -OLD_FILES+=usr/share/man/man4/i386/sbni.4.gz -.endif # 20080704: cnw(4) removed OLD_FILES+=usr/share/man/man4/if_cnw.4.gz OLD_FILES+=usr/share/man/man4/cnw.4.gz ==== //depot/projects/hammer/bin/cp/utils.c#13 (text+ko) ==== @@ -33,7 +33,7 @@ #endif #endif /* not lint */ #include -__FBSDID("$FreeBSD: src/bin/cp/utils.c,v 1.54 2008/08/07 07:29:26 trasz Exp $"); +__FBSDID("$FreeBSD: src/bin/cp/utils.c,v 1.55 2008/09/09 12:31:42 trasz Exp $"); #include #include @@ -224,7 +224,6 @@ rval = 1; if (pflag && preserve_fd_acls(from_fd, to_fd) != 0) rval = 1; - (void)close(from_fd); if (close(to_fd)) { warn("%s", to.p_path); rval = 1; ==== //depot/projects/hammer/contrib/gcc/config/arm/arm.h#7 (text+ko) ==== @@ -507,7 +507,7 @@ /* wchar_t is unsigned under the AAPCS. */ #ifndef WCHAR_TYPE #define WCHAR_TYPE (TARGET_AAPCS_BASED ? "unsigned int" : "int") - +#undef WCHAR_TYPE_SIZE #define WCHAR_TYPE_SIZE BITS_PER_WORD #endif ==== //depot/projects/hammer/etc/rc.initdiskless#9 (text+ko) ==== @@ -24,7 +24,7 @@ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # -# $FreeBSD: src/etc/rc.initdiskless,v 1.53 2008/05/15 11:00:23 bms Exp $ +# $FreeBSD: src/etc/rc.initdiskless,v 1.54 2008/09/09 18:40:50 bms Exp $ # On entry to this script the entire system consists of a read-only root # mounted via NFS. The kernel has run BOOTP and configured an interface @@ -73,6 +73,16 @@ # If this file exists, then failure to execute the mount # command contained in /conf/T/M/remount is non-fatal. # +# /conf/T/M/remount_subdir +# If this file exists, then the behaviour of /conf/T/M/remount +# changes as follows: +# 1. /conf/T/M/remount is invoked to mount the root of the +# filesystem where the configuration data exists on a +# temporary mountpoint. +# 2. /conf/T/M/remount_subdir is then invoked to mount a +# *subdirectory* of the filesystem mounted by +# /conf/T/M/remount on /conf/T/M/. +# # /conf/T/M/diskless_remount # The contents of the file points to an NFS filesystem, # possibly followed by mount_nfs options. If the server name @@ -296,10 +306,33 @@ # remount. Beware, the command is in the file itself! if [ -f $j/remount ]; then - nfspt=`/bin/cat $j/remount` - $nfspt $j - chkerr $? "$nfspt $j" - to_umount="$j ${to_umount}" # XXX hope it is really a mount! + if [ -f $j/remount_subdir ]; then + k="/conf.tmp/$i/$subdir" + [ -d $k ] || continue + + # Mount the filesystem root where the config data is + # on the temporary mount point. + nfspt=`/bin/cat $j/remount` + $nfspt $k + chkerr $? "$nfspt $k" + + # Now use a nullfs mount to get the data where we + # really want to see it. + remount_subdir=`/bin/cat $j/remount_subdir` + remount_subdir_cmd="mount -t nullfs $k/$remount_subdir" + + $remount_subdir_cmd $j + chkerr $? "$remount_subdir_cmd $j" + + # XXX check order -- we must force $k to be unmounted + # after j, as j depends on k. + to_umount="$j $k ${to_umount}" + else + nfspt=`/bin/cat $j/remount` + $nfspt $j + chkerr $? "$nfspt $j" + to_umount="$j ${to_umount}" # XXX hope it is really a mount! + fi fi # NFS remount ==== //depot/projects/hammer/include/rpc/svc_auth.h#2 (text+ko) ==== @@ -30,7 +30,7 @@ * * from: @(#)svc_auth.h 1.6 86/07/16 SMI * @(#)svc_auth.h 2.1 88/07/29 4.0 RPCSRC - * $FreeBSD: src/include/rpc/svc_auth.h,v 1.14 2002/03/23 17:24:55 imp Exp $ + * $FreeBSD: src/include/rpc/svc_auth.h,v 1.15 2008/09/09 14:15:55 dfr Exp $ */ /* @@ -46,6 +46,8 @@ * Server side authenticator */ __BEGIN_DECLS +extern struct svc_auth_ops svc_auth_null_ops; + extern enum auth_stat _authenticate(struct svc_req *, struct rpc_msg *); extern int svc_auth_reg(int, enum auth_stat (*)(struct svc_req *, struct rpc_msg *)); ==== //depot/projects/hammer/lib/libc/gen/arc4random.c#8 (text+ko) ==== @@ -33,7 +33,7 @@ */ #include -__FBSDID("$FreeBSD: src/lib/libc/gen/arc4random.c,v 1.24 2008/08/03 20:15:22 ache Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/gen/arc4random.c,v 1.25 2008/09/09 09:46:36 ache Exp $"); #include "namespace.h" #include @@ -54,7 +54,7 @@ static pthread_mutex_t arc4random_mtx = PTHREAD_MUTEX_INITIALIZER; -#define RANDOMDEV "/dev/urandom" +#define RANDOMDEV "/dev/random" #define KEYSIZE 128 #define THREAD_LOCK() \ do { \ @@ -193,6 +193,7 @@ THREAD_LOCK(); arc4_check_init(); arc4_stir(); + rs_stired = 1; THREAD_UNLOCK(); } ==== //depot/projects/hammer/lib/libc/rpc/svc.c#6 (text+ko) ==== @@ -34,7 +34,7 @@ static char *sccsid = "@(#)svc.c 2.4 88/08/11 4.0 RPCSRC"; #endif #include -__FBSDID("$FreeBSD: src/lib/libc/rpc/svc.c,v 1.25 2008/08/06 14:02:05 dfr Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/rpc/svc.c,v 1.26 2008/09/09 14:15:55 dfr Exp $"); /* * svc.c, Server-side remote procedure call interface. @@ -569,6 +569,7 @@ ext = mem_alloc(sizeof(SVCXPRT_EXT)); memset(ext, 0, sizeof(SVCXPRT_EXT)); xprt->xp_p3 = ext; + ext->xp_auth.svc_ah_ops = &svc_auth_null_ops; return (xprt); } ==== //depot/projects/hammer/lib/libc/rpc/svc_auth.c#5 (text+ko) ==== @@ -37,7 +37,7 @@ static char sccsid[] = "@(#)svc_auth.c 1.26 89/02/07 Copyr 1984 Sun Micro"; #endif #include -__FBSDID("$FreeBSD: src/lib/libc/rpc/svc_auth.c,v 1.14 2008/08/06 14:02:05 dfr Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/rpc/svc_auth.c,v 1.15 2008/09/09 14:15:55 dfr Exp $"); /* * svc_auth.c, Server-side rpc authenticator interface. @@ -75,7 +75,7 @@ }; static struct authsvc *Auths = NULL; -static struct svc_auth_ops svc_auth_null_ops; +struct svc_auth_ops svc_auth_null_ops; /* * The call rpc message, msg has been obtained from the wire. The msg contains @@ -162,7 +162,7 @@ return (xdr_func(xdrs, xdr_ptr)); } -static struct svc_auth_ops svc_auth_null_ops = { +struct svc_auth_ops svc_auth_null_ops = { svcauth_null_wrap, svcauth_null_wrap, }; ==== //depot/projects/hammer/lib/libc/stdlib/malloc.c#48 (text+ko) ==== @@ -156,7 +156,7 @@ #define MALLOC_DSS #include -__FBSDID("$FreeBSD: src/lib/libc/stdlib/malloc.c,v 1.178 2008/09/06 05:26:31 marcel Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/stdlib/malloc.c,v 1.179 2008/09/10 14:27:34 jasone Exp $"); #include "libc_private.h" #ifdef MALLOC_DEBUG @@ -174,6 +174,7 @@ #include /* Must come after several other sys/ includes. */ #include +#include #include #include @@ -213,55 +214,43 @@ #define STRERROR_BUF 64 /* - * The const_size2bin table is sized according to PAGESIZE_2POW, but for - * correctness reasons, we never assume that - * (pagesize == (1U << * PAGESIZE_2POW)). - * * Minimum alignment of allocations is 2^QUANTUM_2POW bytes. */ #ifdef __i386__ -# define PAGESIZE_2POW 12 # define QUANTUM_2POW 4 # define SIZEOF_PTR_2POW 2 # define CPU_SPINWAIT __asm__ volatile("pause") #endif #ifdef __ia64__ -# define PAGESIZE_2POW 13 # define QUANTUM_2POW 4 # define SIZEOF_PTR_2POW 3 #endif #ifdef __alpha__ -# define PAGESIZE_2POW 13 # define QUANTUM_2POW 4 # define SIZEOF_PTR_2POW 3 # define NO_TLS #endif #ifdef __sparc64__ -# define PAGESIZE_2POW 13 # define QUANTUM_2POW 4 # define SIZEOF_PTR_2POW 3 # define NO_TLS #endif #ifdef __amd64__ -# define PAGESIZE_2POW 12 # define QUANTUM_2POW 4 # define SIZEOF_PTR_2POW 3 # define CPU_SPINWAIT __asm__ volatile("pause") #endif #ifdef __arm__ -# define PAGESIZE_2POW 12 # define QUANTUM_2POW 3 # define SIZEOF_PTR_2POW 2 # define NO_TLS #endif #ifdef __mips__ -# define PAGESIZE_2POW 12 # define QUANTUM_2POW 3 # define SIZEOF_PTR_2POW 2 # define NO_TLS #endif #ifdef __powerpc__ -# define PAGESIZE_2POW 12 # define QUANTUM_2POW 4 # define SIZEOF_PTR_2POW 2 #endif @@ -361,7 +350,7 @@ #define RUN_MAX_OVRHD_RELAX 0x00001800U /* Put a cap on small object run size. This overrides RUN_MAX_OVRHD. */ -#define RUN_MAX_SMALL (12 * pagesize) +#define RUN_MAX_SMALL (12 * PAGE_SIZE) /* * Hyper-threaded CPUs may need a special instruction inside spin loops in @@ -733,7 +722,8 @@ /* * bins is used to store rings of free regions of the following sizes, - * assuming a 16-byte quantum, 4kB pagesize, and default MALLOC_OPTIONS. + * assuming a 16-byte quantum, 4kB page size, and default + * MALLOC_OPTIONS. * * bins[i] | size | * --------+------+ @@ -794,11 +784,6 @@ /* Number of CPUs. */ static unsigned ncpus; -/* VM page size. */ -static size_t pagesize; -static size_t pagesize_mask; -static size_t pagesize_2pow; - /* Various bin-related settings. */ #ifdef MALLOC_TINY /* Number of (2^n)-spaced tiny bins. */ # define ntbins ((unsigned)(QUANTUM_2POW - TINY_MIN_2POW)) @@ -835,7 +820,7 @@ #define S2B_64(i) S2B_32(i) S2B_32(i) #define S2B_128(i) S2B_64(i) S2B_64(i) #define S2B_256(i) S2B_128(i) S2B_128(i) -static const uint8_t const_size2bin[(1U << PAGESIZE_2POW) - 255] = { +static const uint8_t const_size2bin[PAGE_SIZE - 255] = { S2B_1(0xffU) /* 0 */ #if (QUANTUM_2POW == 4) /* 64-bit system ************************/ @@ -906,7 +891,7 @@ S2B_256(S2B_SMIN + 10) /* 3328 */ S2B_256(S2B_SMIN + 11) /* 3584 */ S2B_256(S2B_SMIN + 12) /* 3840 */ -#if (PAGESIZE_2POW == 13) +#if (PAGE_SHIFT == 13) S2B_256(S2B_SMIN + 13) /* 4096 */ S2B_256(S2B_SMIN + 14) /* 4352 */ S2B_256(S2B_SMIN + 15) /* 4608 */ @@ -1345,9 +1330,9 @@ #define SUBPAGE_CEILING(s) \ (((s) + SUBPAGE_MASK) & ~SUBPAGE_MASK) -/* Return the smallest pagesize multiple that is >= s. */ +/* Return the smallest PAGE_SIZE multiple that is >= s. */ #define PAGE_CEILING(s) \ - (((s) + pagesize_mask) & ~pagesize_mask) + (((s) + PAGE_MASK) & ~PAGE_MASK) #ifdef MALLOC_TINY /* Compute the smallest power of 2 that is >= x. */ @@ -1693,7 +1678,7 @@ i < ntbins + nqbins + ncbins ? "C" : "S", arena->bins[i].reg_size, arena->bins[i].nregs, - arena->bins[i].run_size >> pagesize_2pow, + arena->bins[i].run_size >> PAGE_SHIFT, #ifdef MALLOC_MAG (__isthreaded && opt_mag) ? arena->bins[i].stats.nmags : @@ -2335,8 +2320,8 @@ arena_avail_comp(arena_chunk_map_t *a, arena_chunk_map_t *b) { int ret; - size_t a_size = a->bits & ~pagesize_mask; - size_t b_size = b->bits & ~pagesize_mask; + size_t a_size = a->bits & ~PAGE_MASK; + size_t b_size = b->bits & ~PAGE_MASK; ret = (a_size > b_size) - (a_size < b_size); if (ret == 0) { @@ -2521,7 +2506,7 @@ SSIZE_INV(4), SSIZE_INV(5), SSIZE_INV(6), SSIZE_INV(7), SSIZE_INV(8), SSIZE_INV(9), SSIZE_INV(10), SSIZE_INV(11), SSIZE_INV(12), SSIZE_INV(13), SSIZE_INV(14), SSIZE_INV(15) -#if (PAGESIZE_2POW == 13) +#if (PAGE_SHIFT == 13) , SSIZE_INV(16), SSIZE_INV(17), SSIZE_INV(18), SSIZE_INV(19), SSIZE_INV(20), SSIZE_INV(21), SSIZE_INV(22), SSIZE_INV(23), @@ -2530,7 +2515,7 @@ #endif }; assert(SUBPAGE * (((sizeof(ssize_invs)) / sizeof(unsigned)) + 3) - >= (1U << PAGESIZE_2POW)); + >= PAGE_SIZE); if (size < (((sizeof(ssize_invs) / sizeof(unsigned)) + 2) << SUBPAGE_2POW)) { @@ -2562,10 +2547,10 @@ chunk = (arena_chunk_t *)CHUNK_ADDR2BASE(run); old_ndirty = chunk->ndirty; run_ind = (unsigned)(((uintptr_t)run - (uintptr_t)chunk) - >> pagesize_2pow); - total_pages = (chunk->map[run_ind].bits & ~pagesize_mask) >> - pagesize_2pow; - need_pages = (size >> pagesize_2pow); + >> PAGE_SHIFT); + total_pages = (chunk->map[run_ind].bits & ~PAGE_MASK) >> + PAGE_SHIFT; + need_pages = (size >> PAGE_SHIFT); assert(need_pages > 0); assert(need_pages <= total_pages); rem_pages = total_pages - need_pages; @@ -2575,11 +2560,11 @@ /* Keep track of trailing unused pages for later use. */ if (rem_pages > 0) { chunk->map[run_ind+need_pages].bits = (rem_pages << - pagesize_2pow) | (chunk->map[run_ind+need_pages].bits & - pagesize_mask); + PAGE_SHIFT) | (chunk->map[run_ind+need_pages].bits & + PAGE_MASK); chunk->map[run_ind+total_pages-1].bits = (rem_pages << - pagesize_2pow) | (chunk->map[run_ind+total_pages-1].bits & - pagesize_mask); + PAGE_SHIFT) | (chunk->map[run_ind+total_pages-1].bits & + PAGE_MASK); arena_avail_tree_insert(&arena->runs_avail, &chunk->map[run_ind+need_pages]); } @@ -2590,7 +2575,7 @@ if ((chunk->map[run_ind + i].bits & CHUNK_MAP_ZEROED) == 0) { memset((void *)((uintptr_t)chunk + ((run_ind - + i) << pagesize_2pow)), 0, pagesize); + + i) << PAGE_SHIFT)), 0, PAGE_SIZE); /* CHUNK_MAP_ZEROED is cleared below. */ } } @@ -2706,7 +2691,7 @@ arena_chunk_map_t *mapelm, key; assert(size <= arena_maxclass); - assert((size & pagesize_mask) == 0); + assert((size & PAGE_MASK) == 0); /* Search the arena's chunks for the lowest best fit. */ key.bits = size | CHUNK_MAP_KEY; @@ -2717,7 +2702,7 @@ / sizeof(arena_chunk_map_t); run = (arena_run_t *)((uintptr_t)run_chunk + (pageind - << pagesize_2pow)); + << PAGE_SHIFT)); arena_run_split(arena, run, size, large, zero); return (run); } @@ -2729,7 +2714,7 @@ if (chunk == NULL) return (NULL); run = (arena_run_t *)((uintptr_t)chunk + (arena_chunk_header_npages << - pagesize_2pow)); + PAGE_SHIFT)); /* Update page map. */ arena_run_split(arena, run, size, large, zero); return (run); @@ -2781,7 +2766,7 @@ arena->ndirty -= npages; madvise((void *)((uintptr_t)chunk + (i << - pagesize_2pow)), (npages << pagesize_2pow), + PAGE_SHIFT)), (npages << PAGE_SHIFT), MADV_FREE); #ifdef MALLOC_STATS arena->stats.nmadvise++; @@ -2807,14 +2792,14 @@ chunk = (arena_chunk_t *)CHUNK_ADDR2BASE(run); run_ind = (size_t)(((uintptr_t)run - (uintptr_t)chunk) - >> pagesize_2pow); + >> PAGE_SHIFT); assert(run_ind >= arena_chunk_header_npages); assert(run_ind < chunk_npages); if ((chunk->map[run_ind].bits & CHUNK_MAP_LARGE) != 0) - size = chunk->map[run_ind].bits & ~pagesize_mask; + size = chunk->map[run_ind].bits & ~PAGE_MASK; else size = run->bin->run_size; - run_pages = (size >> pagesize_2pow); + run_pages = (size >> PAGE_SHIFT); /* Mark pages as unallocated in the chunk map. */ if (dirty) { @@ -2841,15 +2826,15 @@ } } chunk->map[run_ind].bits = size | (chunk->map[run_ind].bits & - pagesize_mask); + PAGE_MASK); chunk->map[run_ind+run_pages-1].bits = size | - (chunk->map[run_ind+run_pages-1].bits & pagesize_mask); + (chunk->map[run_ind+run_pages-1].bits & PAGE_MASK); /* Try to coalesce forward. */ if (run_ind + run_pages < chunk_npages && (chunk->map[run_ind+run_pages].bits & CHUNK_MAP_ALLOCATED) == 0) { size_t nrun_size = chunk->map[run_ind+run_pages].bits & - ~pagesize_mask; + ~PAGE_MASK; /* * Remove successor from runs_avail; the coalesced run is @@ -2859,22 +2844,22 @@ &chunk->map[run_ind+run_pages]); size += nrun_size; - run_pages = size >> pagesize_2pow; + run_pages = size >> PAGE_SHIFT; - assert((chunk->map[run_ind+run_pages-1].bits & ~pagesize_mask) + assert((chunk->map[run_ind+run_pages-1].bits & ~PAGE_MASK) == nrun_size); chunk->map[run_ind].bits = size | (chunk->map[run_ind].bits & - pagesize_mask); + PAGE_MASK); chunk->map[run_ind+run_pages-1].bits = size | - (chunk->map[run_ind+run_pages-1].bits & pagesize_mask); + (chunk->map[run_ind+run_pages-1].bits & PAGE_MASK); } /* Try to coalesce backward. */ if (run_ind > arena_chunk_header_npages && (chunk->map[run_ind-1].bits & CHUNK_MAP_ALLOCATED) == 0) { - size_t prun_size = chunk->map[run_ind-1].bits & ~pagesize_mask; + size_t prun_size = chunk->map[run_ind-1].bits & ~PAGE_MASK; - run_ind -= prun_size >> pagesize_2pow; + run_ind -= prun_size >> PAGE_SHIFT; /* * Remove predecessor from runs_avail; the coalesced run is @@ -2884,21 +2869,21 @@ &chunk->map[run_ind]); size += prun_size; - run_pages = size >> pagesize_2pow; + run_pages = size >> PAGE_SHIFT; - assert((chunk->map[run_ind].bits & ~pagesize_mask) == + assert((chunk->map[run_ind].bits & ~PAGE_MASK) == prun_size); chunk->map[run_ind].bits = size | (chunk->map[run_ind].bits & - pagesize_mask); + PAGE_MASK); chunk->map[run_ind+run_pages-1].bits = size | - (chunk->map[run_ind+run_pages-1].bits & pagesize_mask); + (chunk->map[run_ind+run_pages-1].bits & PAGE_MASK); } /* Insert into runs_avail, now that coalescing is complete. */ arena_avail_tree_insert(&arena->runs_avail, &chunk->map[run_ind]); /* Deallocate chunk if it is now completely unused. */ - if ((chunk->map[arena_chunk_header_npages].bits & (~pagesize_mask | + if ((chunk->map[arena_chunk_header_npages].bits & (~PAGE_MASK | CHUNK_MAP_ALLOCATED)) == arena_maxclass) arena_chunk_dealloc(arena, chunk); @@ -2911,8 +2896,8 @@ arena_run_trim_head(arena_t *arena, arena_chunk_t *chunk, arena_run_t *run, size_t oldsize, size_t newsize) { - size_t pageind = ((uintptr_t)run - (uintptr_t)chunk) >> pagesize_2pow; - size_t head_npages = (oldsize - newsize) >> pagesize_2pow; + size_t pageind = ((uintptr_t)run - (uintptr_t)chunk) >> PAGE_SHIFT; + size_t head_npages = (oldsize - newsize) >> PAGE_SHIFT; assert(oldsize > newsize); @@ -2932,8 +2917,8 @@ arena_run_trim_tail(arena_t *arena, arena_chunk_t *chunk, arena_run_t *run, size_t oldsize, size_t newsize, bool dirty) { - size_t pageind = ((uintptr_t)run - (uintptr_t)chunk) >> pagesize_2pow; - size_t npages = newsize >> pagesize_2pow; + size_t pageind = ((uintptr_t)run - (uintptr_t)chunk) >> PAGE_SHIFT; + size_t npages = newsize >> PAGE_SHIFT; assert(oldsize > newsize); @@ -2962,7 +2947,7 @@ if (mapelm != NULL) { /* run is guaranteed to have available space. */ arena_run_tree_remove(&bin->runs, mapelm); - run = (arena_run_t *)(mapelm->bits & ~pagesize_mask); + run = (arena_run_t *)(mapelm->bits & ~PAGE_MASK); #ifdef MALLOC_STATS bin->stats.reruns++; #endif @@ -3053,7 +3038,7 @@ unsigned good_nregs, good_mask_nelms, good_reg0_offset; unsigned try_nregs, try_mask_nelms, try_reg0_offset; - assert(min_run_size >= pagesize); + assert(min_run_size >= PAGE_SIZE); assert(min_run_size <= arena_maxclass); assert(min_run_size <= RUN_MAX_SMALL); @@ -3089,7 +3074,7 @@ good_reg0_offset = try_reg0_offset; /* Try more aggressive settings. */ - try_run_size += pagesize; + try_run_size += PAGE_SIZE; try_nregs = ((try_run_size - sizeof(arena_run_t)) / bin->reg_size) + 1; /* Counter-act try_nregs-- in loop. */ do { @@ -3405,8 +3390,8 @@ size_t offset; arena_chunk_t *chunk; - assert((size & pagesize_mask) == 0); - assert((alignment & pagesize_mask) == 0); + assert((size & PAGE_MASK) == 0); + assert((alignment & PAGE_MASK) == 0); #ifdef MALLOC_BALANCE arena_lock_balance(arena); @@ -3422,7 +3407,7 @@ chunk = (arena_chunk_t *)CHUNK_ADDR2BASE(ret); offset = (uintptr_t)ret & (alignment - 1); - assert((offset & pagesize_mask) == 0); + assert((offset & PAGE_MASK) == 0); assert(offset < alloc_size); if (offset == 0) arena_run_trim_tail(arena, chunk, ret, alloc_size, size, false); @@ -3492,7 +3477,7 @@ return (NULL); } - if (ceil_size <= pagesize || (alignment <= pagesize + if (ceil_size <= PAGE_SIZE || (alignment <= PAGE_SIZE && ceil_size <= arena_maxclass)) ret = arena_malloc(choose_arena(), ceil_size, false); else { @@ -3506,7 +3491,7 @@ ceil_size = PAGE_CEILING(size); /* * (ceil_size < size) protects against very large sizes within - * pagesize of SIZE_T_MAX. + * PAGE_SIZE of SIZE_T_MAX. * * (ceil_size + alignment < ceil_size) protects against the * combination of maximal alignment and ceil_size large enough @@ -3526,18 +3511,18 @@ * would need to allocate in order to guarantee the alignment. */ if (ceil_size >= alignment) - run_size = ceil_size + alignment - pagesize; + run_size = ceil_size + alignment - PAGE_SIZE; else { /* * It is possible that (alignment << 1) will cause * overflow, but it doesn't matter because we also - * subtract pagesize, which in the case of overflow + * subtract PAGE_SIZE, which in the case of overflow * leaves us with a very large run_size. That causes * the first conditional below to fail, which means * that the bogus run_size value never gets used for * anything important. */ - run_size = (alignment << 1) - pagesize; + run_size = (alignment << 1) - PAGE_SIZE; } if (run_size <= arena_maxclass) { @@ -3565,15 +3550,15 @@ assert(CHUNK_ADDR2BASE(ptr) != ptr); chunk = (arena_chunk_t *)CHUNK_ADDR2BASE(ptr); - pageind = (((uintptr_t)ptr - (uintptr_t)chunk) >> pagesize_2pow); + pageind = (((uintptr_t)ptr - (uintptr_t)chunk) >> PAGE_SHIFT); mapbits = chunk->map[pageind].bits; assert((mapbits & CHUNK_MAP_ALLOCATED) != 0); if ((mapbits & CHUNK_MAP_LARGE) == 0) { - arena_run_t *run = (arena_run_t *)(mapbits & ~pagesize_mask); + arena_run_t *run = (arena_run_t *)(mapbits & ~PAGE_MASK); assert(run->magic == ARENA_RUN_MAGIC); ret = run->bin->reg_size; } else { - ret = mapbits & ~pagesize_mask; + ret = mapbits & ~PAGE_MASK; assert(ret != 0); } @@ -3622,7 +3607,7 @@ arena_bin_t *bin; size_t size; - run = (arena_run_t *)(mapelm->bits & ~pagesize_mask); + run = (arena_run_t *)(mapelm->bits & ~PAGE_MASK); assert(run->magic == ARENA_RUN_MAGIC); bin = run->bin; size = bin->reg_size; @@ -3639,7 +3624,7 @@ bin->runcur = NULL; else if (bin->nregs != 1) { size_t run_pageind = (((uintptr_t)run - - (uintptr_t)chunk)) >> pagesize_2pow; + (uintptr_t)chunk)) >> PAGE_SHIFT; arena_chunk_map_t *run_mapelm = &chunk->map[run_pageind]; /* @@ -3670,7 +3655,7 @@ CHUNK_ADDR2BASE(bin->runcur); size_t runcur_pageind = (((uintptr_t)bin->runcur - - (uintptr_t)runcur_chunk)) >> pagesize_2pow; + (uintptr_t)runcur_chunk)) >> PAGE_SHIFT; arena_chunk_map_t *runcur_mapelm = &runcur_chunk->map[runcur_pageind]; @@ -3681,7 +3666,7 @@ bin->runcur = run; } else { size_t run_pageind = (((uintptr_t)run - - (uintptr_t)chunk)) >> pagesize_2pow; + (uintptr_t)chunk)) >> PAGE_SHIFT; arena_chunk_map_t *run_mapelm = &chunk->map[run_pageind]; @@ -3721,7 +3706,7 @@ chunk = (arena_chunk_t *)CHUNK_ADDR2BASE(round); if (chunk->arena == arena) { size_t pageind = (((uintptr_t)round - - (uintptr_t)chunk) >> pagesize_2pow); + (uintptr_t)chunk) >> PAGE_SHIFT); arena_chunk_map_t *mapelm = &chunk->map[pageind]; arena_dalloc_small(arena, chunk, round, mapelm); @@ -3756,9 +3741,9 @@ chunk = (arena_chunk_t *)CHUNK_ADDR2BASE(ptr); arena = chunk->arena; - pageind = (((uintptr_t)ptr - (uintptr_t)chunk) >> pagesize_2pow); + pageind = (((uintptr_t)ptr - (uintptr_t)chunk) >> PAGE_SHIFT); mapelm = &chunk->map[pageind]; - run = (arena_run_t *)(mapelm->bits & ~pagesize_mask); + run = (arena_run_t *)(mapelm->bits & ~PAGE_MASK); assert(run->magic == ARENA_RUN_MAGIC); bin = run->bin; binind = ((uintptr_t)bin - (uintptr_t)&arena->bins) / @@ -3823,8 +3808,8 @@ #endif { size_t pageind = ((uintptr_t)ptr - (uintptr_t)chunk) >> - pagesize_2pow; - size_t size = chunk->map[pageind].bits & ~pagesize_mask; + PAGE_SHIFT; + size_t size = chunk->map[pageind].bits & ~PAGE_MASK; #ifdef MALLOC_STATS if (opt_junk) @@ -3854,7 +3839,7 @@ assert(ptr != NULL); assert(CHUNK_ADDR2BASE(ptr) != ptr); - pageind = (((uintptr_t)ptr - (uintptr_t)chunk) >> pagesize_2pow); + pageind = (((uintptr_t)ptr - (uintptr_t)chunk) >> PAGE_SHIFT); mapelm = &chunk->map[pageind]; assert((mapelm->bits & CHUNK_MAP_ALLOCATED) != 0); if ((mapelm->bits & CHUNK_MAP_LARGE) == 0) { @@ -3927,10 +3912,10 @@ arena_ralloc_large_grow(arena_t *arena, arena_chunk_t *chunk, void *ptr, size_t size, size_t oldsize) { - size_t pageind = ((uintptr_t)ptr - (uintptr_t)chunk) >> pagesize_2pow; - size_t npages = oldsize >> pagesize_2pow; + size_t pageind = ((uintptr_t)ptr - (uintptr_t)chunk) >> PAGE_SHIFT; + size_t npages = oldsize >> PAGE_SHIFT; - assert(oldsize == (chunk->map[pageind].bits & ~pagesize_mask)); + assert(oldsize == (chunk->map[pageind].bits & ~PAGE_MASK)); /* Try to extend the run. */ assert(size > oldsize); @@ -3941,14 +3926,14 @@ #endif if (pageind + npages < chunk_npages && (chunk->map[pageind+npages].bits & CHUNK_MAP_ALLOCATED) == 0 && (chunk->map[pageind+npages].bits & - ~pagesize_mask) >= size - oldsize) { + ~PAGE_MASK) >= size - oldsize) { /* * The next run is available and sufficiently large. Split the * following run, then merge the first part with the existing * allocation. */ arena_run_split(arena, (arena_run_t *)((uintptr_t)chunk + - ((pageind+npages) << pagesize_2pow)), size - oldsize, true, + ((pageind+npages) << PAGE_SHIFT)), size - oldsize, true, false); chunk->map[pageind].bits = size | CHUNK_MAP_LARGE | @@ -4097,7 +4082,7 @@ #endif /* Initialize bins. */ - prev_run_size = pagesize; + prev_run_size = PAGE_SIZE; i = 0; #ifdef MALLOC_TINY @@ -4232,7 +4217,7 @@ chunk = CHUNK_ADDR2BASE(mag); arena = chunk->arena; - pageind = (((uintptr_t)mag - (uintptr_t)chunk) >> pagesize_2pow); + pageind = (((uintptr_t)mag - (uintptr_t)chunk) >> PAGE_SHIFT); mapelm = &chunk->map[pageind]; assert(mag->nrounds == 0); @@ -4280,7 +4265,7 @@ chunk = CHUNK_ADDR2BASE(rack); arena = chunk->arena; - pageind = (((uintptr_t)rack - (uintptr_t)chunk) >> pagesize_2pow); + pageind = (((uintptr_t)rack - (uintptr_t)chunk) >> PAGE_SHIFT); mapelm = &chunk->map[pageind]; malloc_spin_lock(&arena->lock); @@ -4803,23 +4788,6 @@ } } - /* Get page size. */ - { - long result; - - result = sysconf(_SC_PAGESIZE); - assert(result != -1); - pagesize = (unsigned)result; - - /* - * We assume that pagesize is a power of 2 when calculating - * pagesize_mask and pagesize_2pow. - */ - assert(((result - 1) & result) == 0); - pagesize_mask = result - 1; - pagesize_2pow = ffs((int)result) - 1; - } - for (i = 0; i < 3; i++) { unsigned j; @@ -4923,7 +4891,7 @@ opt_cspace_max_2pow--; break; case 'C': - if (opt_cspace_max_2pow < pagesize_2pow + if (opt_cspace_max_2pow < PAGE_SHIFT - 1) opt_cspace_max_2pow++; break; @@ -4966,7 +4934,7 @@ * header page, so chunks can never be * smaller than two pages. */ - if (opt_chunk_2pow > pagesize_2pow + 1) >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Thu Sep 11 05:00:59 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C96841065678; Thu, 11 Sep 2008 05:00: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 4FE5D106566C for ; Thu, 11 Sep 2008 05:00:59 +0000 (UTC) (envelope-from rfrench@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 238DB8FC0C for ; Thu, 11 Sep 2008 05:00:59 +0000 (UTC) (envelope-from rfrench@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 m8B50wN8073401 for ; Thu, 11 Sep 2008 05:00:58 GMT (envelope-from rfrench@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m8B50wgm073395 for perforce@freebsd.org; Thu, 11 Sep 2008 05:00:58 GMT (envelope-from rfrench@FreeBSD.org) Date: Thu, 11 Sep 2008 05:00:58 GMT Message-Id: <200809110500.m8B50wgm073395@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rfrench@FreeBSD.org using -f From: Ryan French To: Perforce Change Reviews Cc: Subject: PERFORCE change 149585 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 11 Sep 2008 05:01:00 -0000 http://perforce.freebsd.org/chv.cgi?CH=149585 Change 149585 by rfrench@rfrench_mpls on 2008/09/11 04:59:58 Added #define ETHERTYPE_MPLS and ETHERNET_MPLS_MCAST Affected files ... .. //depot/projects/soc2008/rfrench_mpls/net/ethernet.h#1 add Differences ... From owner-p4-projects@FreeBSD.ORG Thu Sep 11 06:35:41 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id DF26A106567D; Thu, 11 Sep 2008 06:35:40 +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 A2702106567A for ; Thu, 11 Sep 2008 06:35:40 +0000 (UTC) (envelope-from weongyo@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 7404C8FC23 for ; Thu, 11 Sep 2008 06:35:40 +0000 (UTC) (envelope-from weongyo@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 m8B6ZeO4000287 for ; Thu, 11 Sep 2008 06:35:40 GMT (envelope-from weongyo@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m8B6Zek0000280 for perforce@freebsd.org; Thu, 11 Sep 2008 06:35:40 GMT (envelope-from weongyo@FreeBSD.org) Date: Thu, 11 Sep 2008 06:35:40 GMT Message-Id: <200809110635.m8B6Zek0000280@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to weongyo@FreeBSD.org using -f From: Weongyo Jeong To: Perforce Change Reviews Cc: Subject: PERFORCE change 149587 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 11 Sep 2008 06:35:41 -0000 http://perforce.freebsd.org/chv.cgi?CH=149587 Change 149587 by weongyo@weongyo_ws on 2008/09/11 06:35:26 When we're using USB as modules we need a dependency to USB if we try to load ndis because it uses M_USBDEV variable defined at usb module. Pointed by: Paul B. Mahol Affected files ... .. //depot/projects/ndisusb/sys/compat/ndis/subr_usbd.c#13 edit Differences ... ==== //depot/projects/ndisusb/sys/compat/ndis/subr_usbd.c#13 (text+ko) ==== @@ -1211,3 +1211,6 @@ { NULL, NULL, NULL } }; + +MODULE_DEPEND(ndis, usb, 1, 1, 1); + From owner-p4-projects@FreeBSD.ORG Thu Sep 11 07:58:04 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 609FE1065675; Thu, 11 Sep 2008 07:58: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 251861065672 for ; Thu, 11 Sep 2008 07:58:04 +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 0EE898FC1D for ; Thu, 11 Sep 2008 07:58:04 +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 m8B7w3rn047800 for ; Thu, 11 Sep 2008 07:58:03 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m8B7w3Q4047793 for perforce@freebsd.org; Thu, 11 Sep 2008 07:58:03 GMT (envelope-from hselasky@FreeBSD.org) Date: Thu, 11 Sep 2008 07:58:03 GMT Message-Id: <200809110758.m8B7w3Q4047793@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 149588 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 11 Sep 2008 07:58:04 -0000 http://perforce.freebsd.org/chv.cgi?CH=149588 Change 149588 by hselasky@hselasky_laptop001 on 2008/09/11 07:57:17 Add support for preselected endpoint numbers. Affected files ... .. //depot/projects/usb/src/sys/dev/usb2/template/usb2_template.c#10 edit .. //depot/projects/usb/src/sys/dev/usb2/template/usb2_template.h#5 edit .. //depot/projects/usb/src/sys/dev/usb2/template/usb2_template_cdce.c#7 edit .. //depot/projects/usb/src/sys/dev/usb2/template/usb2_template_msc.c#6 edit .. //depot/projects/usb/src/sys/dev/usb2/template/usb2_template_mtp.c#6 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb2/template/usb2_template.c#10 (text+ko) ==== @@ -164,7 +164,7 @@ /* escape for Zero Max Packet Size */ mps = 0; } - ea = (ted->direction & (UE_DIR_IN | UE_DIR_OUT)); + ea = (ted->bEndpointAddress & (UE_ADDR | UE_DIR_IN | UE_DIR_OUT)); et = (ted->bmAttributes & UE_XFERTYPE); /* @@ -503,7 +503,12 @@ distance = 0xFFFF; best_n = 0; + if ((!ep->needs_in) && (!ep->needs_out)) { + return (0); /* we are done */ + } if (ep->needs_ep_type == UE_CONTROL) { + ep->needs_in = 0; + ep->needs_out = 0; dir_in = 1; dir_out = 1; } else { @@ -572,12 +577,6 @@ /* get the correct profile */ pf = ep->pf; - /* get maximum frame size */ - if (dir_in) - max_frame_size = pf->max_in_frame_size; - else - max_frame_size = pf->max_out_frame_size; - /* reserve IN-endpoint */ if (dir_in || pf->is_simplex) { ues->bmInAlloc[best_n / 8] |= @@ -609,6 +608,7 @@ usb2_hw_ep_get_needs(struct usb2_hw_ep_scratch *ues, uint8_t ep_type, uint8_t is_complete) { + const struct usb2_hw_ep_profile *pf; struct usb2_hw_ep_scratch_sub *ep_iface; struct usb2_hw_ep_scratch_sub *ep_curr; struct usb2_hw_ep_scratch_sub *ep_max; @@ -619,6 +619,7 @@ uint16_t wMaxPacketSize; uint16_t temp; uint8_t speed; + uint8_t ep_no; ep_iface = ues->ep_max; ep_curr = ues->ep_max; @@ -670,13 +671,58 @@ /* handle packet multiplier */ temp = (wMaxPacketSize >> 11) & 3; wMaxPacketSize &= 0x7FF; - if (temp == 2) { + if (temp == 1) { wMaxPacketSize *= 2; } else { wMaxPacketSize *= 3; } } - if (is_complete) { + /* + * Check if we have a fixed endpoint number, else the + * endpoint number is allocated dynamically: + */ + ep_no = (ed->bEndpointAddress & UE_ADDR); + if (ep_no != 0) { + + /* get HW endpoint profile */ + (ues->methods->get_hw_ep_profile) + (ues->udev, &pf, ep_no); + if (pf == NULL) { + /* HW profile does not exist - failure */ + DPRINTFN(0, "Endpoint profile %u " + "does not exist\n", ep_no); + return (1); + } + /* reserve fixed endpoint number */ + if (ep_type == UE_CONTROL) { + ues->bmInAlloc[ep_no / 8] |= + (1 << (ep_no % 8)); + ues->bmOutAlloc[ep_no / 8] |= + (1 << (ep_no % 8)); + if ((pf->max_in_frame_size < wMaxPacketSize) || + (pf->max_out_frame_size < wMaxPacketSize)) { + DPRINTFN(0, "Endpoint profile %u " + "has too small buffer!\n", ep_no); + return (1); + } + } else if (ed->bEndpointAddress & UE_DIR_IN) { + ues->bmInAlloc[ep_no / 8] |= + (1 << (ep_no % 8)); + if (pf->max_in_frame_size < wMaxPacketSize) { + DPRINTFN(0, "Endpoint profile %u " + "has too small buffer!\n", ep_no); + return (1); + } + } else { + ues->bmOutAlloc[ep_no / 8] |= + (1 << (ep_no % 8)); + if (pf->max_out_frame_size < wMaxPacketSize) { + DPRINTFN(0, "Endpoint profile %u " + "has too small buffer!\n", ep_no); + return (1); + } + } + } else if (is_complete) { /* check if we have enough buffer space */ if (wMaxPacketSize > ==== //depot/projects/usb/src/sys/dev/usb2/template/usb2_template.h#5 (text+ko) ==== @@ -45,7 +45,12 @@ const void **ppRawDesc; const struct usb2_temp_packet_size *pPacketSize; const struct usb2_temp_interval *pIntervals; - uint8_t direction; /* UE_DIR_IN or UE_DIR_OUT */ + /* + * If (bEndpointAddress & UE_ADDR) is non-zero the endpoint number + * is pre-selected for this endpoint descriptor. Else an endpoint + * number is automatically chosen. + */ + uint8_t bEndpointAddress; /* UE_DIR_IN or UE_DIR_OUT */ uint8_t bmAttributes; }; ==== //depot/projects/usb/src/sys/dev/usb2/template/usb2_template_cdce.c#7 (text+ko) ==== @@ -184,19 +184,27 @@ static const struct usb2_temp_endpoint_desc bulk_in_ep = { .pPacketSize = &bulk_mps, - .direction = UE_DIR_IN, +#ifdef USB_HIP_IN_EP_0 + .bEndpointAddress = USB_HIP_IN_EP_0, +#else + .bEndpointAddress = UE_DIR_IN, +#endif .bmAttributes = UE_BULK, }; static const struct usb2_temp_endpoint_desc bulk_out_ep = { .pPacketSize = &bulk_mps, - .direction = UE_DIR_OUT, +#ifdef USB_HIP_OUT_EP_0 + .bEndpointAddress = USB_HIP_OUT_EP_0, +#else + .bEndpointAddress = UE_DIR_OUT, +#endif .bmAttributes = UE_BULK, }; static const struct usb2_temp_endpoint_desc intr_in_ep = { .pPacketSize = &intr_mps, - .direction = UE_DIR_IN, + .bEndpointAddress = UE_DIR_IN, .bmAttributes = UE_INTERRUPT, }; ==== //depot/projects/usb/src/sys/dev/usb2/template/usb2_template_msc.c#6 (text+ko) ==== @@ -104,13 +104,21 @@ static const struct usb2_temp_endpoint_desc bulk_in_ep = { .pPacketSize = &bulk_mps, - .direction = UE_DIR_IN, +#ifdef USB_HIP_IN_EP_0 + .bEndpointAddress = USB_HIP_IN_EP_0, +#else + .bEndpointAddress = UE_DIR_IN, +#endif .bmAttributes = UE_BULK, }; static const struct usb2_temp_endpoint_desc bulk_out_ep = { .pPacketSize = &bulk_mps, - .direction = UE_DIR_OUT, +#ifdef USB_HIP_OUT_EP_0 + .bEndpointAddress = USB_HIP_OUT_EP_0, +#else + .bEndpointAddress = UE_DIR_OUT, +#endif .bmAttributes = UE_BULK, }; ==== //depot/projects/usb/src/sys/dev/usb2/template/usb2_template_mtp.c#6 (text+ko) ==== @@ -108,21 +108,34 @@ .mps[USB_SPEED_HIGH] = 512, }; +static const struct usb2_temp_packet_size intr_mps = { + .mps[USB_SPEED_FULL] = 64, + .mps[USB_SPEED_HIGH] = 64, +}; + static const struct usb2_temp_endpoint_desc bulk_out_ep = { .pPacketSize = &bulk_mps, - .direction = UE_DIR_OUT, +#ifdef USB_HIP_OUT_EP_0 + .bEndpointAddress = USB_HIP_OUT_EP_0, +#else + .bEndpointAddress = UE_DIR_OUT, +#endif .bmAttributes = UE_BULK, }; static const struct usb2_temp_endpoint_desc intr_in_ep = { - .pPacketSize = &bulk_mps, - .direction = UE_DIR_IN, + .pPacketSize = &intr_mps, + .bEndpointAddress = UE_DIR_IN, .bmAttributes = UE_INTERRUPT, }; static const struct usb2_temp_endpoint_desc bulk_in_ep = { .pPacketSize = &bulk_mps, - .direction = UE_DIR_IN, +#ifdef USB_HIP_IN_EP_0 + .bEndpointAddress = USB_HIP_IN_EP_0, +#else + .bEndpointAddress = UE_DIR_IN, +#endif .bmAttributes = UE_BULK, }; From owner-p4-projects@FreeBSD.ORG Thu Sep 11 08:00:12 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1B43B1065678; Thu, 11 Sep 2008 08:00: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 D3B74106567E for ; Thu, 11 Sep 2008 08:00:11 +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 40F938FC1C for ; Thu, 11 Sep 2008 08:00:06 +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 m8B806rF057196 for ; Thu, 11 Sep 2008 08:00:06 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m8B806ei057194 for perforce@freebsd.org; Thu, 11 Sep 2008 08:00:06 GMT (envelope-from hselasky@FreeBSD.org) Date: Thu, 11 Sep 2008 08:00:06 GMT Message-Id: <200809110800.m8B806ei057194@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 149589 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 11 Sep 2008 08:00:12 -0000 http://perforce.freebsd.org/chv.cgi?CH=149589 Change 149589 by hselasky@hselasky_laptop001 on 2008/09/11 07:59:52 Remove support for DMA until further. The DMA logic needs to be reworked to support multiple USB packets to gain performance. Loop one extra time in the interrupt handler. Affected files ... .. //depot/projects/usb/src/sys/dev/usb2/controller/musb2_otg.c#12 edit .. //depot/projects/usb/src/sys/dev/usb2/controller/musb2_otg.h#7 edit .. //depot/projects/usb/src/sys/dev/usb2/controller/musb2_otg_atmelarm.c#5 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb2/controller/musb2_otg.c#12 (text+ko) ==== @@ -650,33 +650,6 @@ return (0); /* complete */ } -#ifdef MUSB2_DMA_ENABLED -void -musbotg_complete_dma_cb(void *arg, uint32_t is_error) -{ - struct musbotg_dma *dma = arg; - struct musbotg_softc *sc; - - sc = dma->sc; - - mtx_lock(&sc->sc_bus.mtx); - - dma->busy = 0; - - if (is_error) { - dma->error = 1; - } - DPRINTFN(4, "DMA interrupt\n"); - - musbotg_interrupt_poll(sc); - - mtx_unlock(&sc->sc_bus.mtx); - - return; -} - -#endif - static uint8_t musbotg_data_rx(struct musbotg_td *td) { @@ -693,11 +666,6 @@ /* get pointer to softc */ sc = MUSBOTG_PC2SC(td->pc); -#ifdef MUSB2_DMA_ENABLED - if (sc->sc_rx_dma[td->ep_no].busy) { - return (1); /* not complete */ - } -#endif /* select endpoint */ MUSB2_WRITE_1(sc, MUSB2_REG_EPINDEX, td->ep_no); @@ -723,21 +691,8 @@ DPRINTFN(4, "count=0x%04x\n", count); /* - * First check for DMA complete and then check for short or - * invalid packet: + * Check for short or invalid packet: */ -#ifdef MUSB2_DMA_ENABLED - if (sc->sc_rx_dma[td->ep_no].complete) { - sc->sc_rx_dma[td->ep_no].complete = 0; - /* check for errors */ - if ((count >= td->max_frame_size) || - (sc->sc_rx_dma[td->ep_no].error)) { - /* invalid USB packet */ - td->error = 1; - return (0); /* we are complete */ - } - } else -#endif if (count != td->max_frame_size) { if (count < td->max_frame_size) { /* we have a short packet */ @@ -790,48 +745,6 @@ td->remainder -= count; break; } -#ifdef MUSB2_DMA_ENABLED - if (td->dma_enabled) { - /* - * Compute the least number of bytes to the next DMA - * alignment address: - */ - temp = sc->sc_dma_align - - (USB_P2U(buf_res.buffer) & (sc->sc_dma_align - 1)); - - /* check if we can do DMA */ - if ((temp == sc->sc_dma_align) && - (buf_res.length >= sc->sc_dma_align)) { - - temp = buf_res.length & ~(sc->sc_dma_align - 1); - - /* set some status bits */ - sc->sc_rx_dma[td->ep_no].busy = 1; - sc->sc_rx_dma[td->ep_no].complete = 1; - sc->sc_rx_dma[td->ep_no].error = 0; - - /* start DMA job */ - if (musbotg_start_rxdma(sc->sc_rx_dma[td->ep_no].dma_chan, - sc->sc_rx_dma + td->ep_no, buf_res.buffer, temp)) { - /* DMA failure */ - td->error = 1; - /* we are complete */ - return (0); - } - /* - * Pre-advance buffer pointers because the - * USB chip will update its counters: - */ - td->offset += temp; - td->remainder -= temp; - return (1); /* wait for callback */ - } - /* minimise data transfer length */ - if (buf_res.length > temp) { - buf_res.length = temp; - } - } -#endif /* check if we can optimise */ if (buf_res.length >= 4) { @@ -890,11 +803,6 @@ /* get pointer to softc */ sc = MUSBOTG_PC2SC(td->pc); -#ifdef MUSB2_DMA_ENABLED - if (sc->sc_tx_dma[td->ep_no].busy) { - return (1); /* not complete */ - } -#endif /* select endpoint */ MUSB2_WRITE_1(sc, MUSB2_REG_EPINDEX, td->ep_no); @@ -955,63 +863,6 @@ td->remainder -= count; break; } -#ifdef MUSB2_DMA_ENABLED - if (td->dma_enabled) { - /* - * Compute the least number of bytes to the next DMA - * alignment address: - */ - temp = sc->sc_dma_align - - (USB_P2U(buf_res.buffer) & (sc->sc_dma_align - 1)); - - /* check if we can do DMA */ - if ((temp == sc->sc_dma_align) && - (buf_res.length >= sc->sc_dma_align)) { - - temp = buf_res.length & ~(sc->sc_dma_align - 1); - - /* - * Check for DMA complete or if we should - * start DMA: - */ - if (sc->sc_tx_dma[td->ep_no].complete) { - sc->sc_tx_dma[td->ep_no].complete = 0; - - /* check for errors */ - if (sc->sc_tx_dma[td->ep_no].error) { - /* invalid USB packet */ - td->error = 1; - /* we are complete */ - return (0); - } - /* update counters */ - count -= temp; - td->offset += temp; - td->remainder -= temp; - continue; - } else { - /* set some status bits */ - sc->sc_tx_dma[td->ep_no].busy = 1; - sc->sc_tx_dma[td->ep_no].complete = 1; - sc->sc_tx_dma[td->ep_no].error = 0; - - /* start DMA job */ - if (musbotg_start_txdma(sc->sc_tx_dma[td->ep_no].dma_chan, - sc->sc_tx_dma + td->ep_no, buf_res.buffer, temp)) { - /* DMA failure */ - td->error = 1; - /* we are complete */ - return (0); - } - return (1); /* wait for callback */ - } - } - /* minimise data transfer length */ - if (buf_res.length > temp) { - buf_res.length = temp; - } - } -#endif /* check if we can optimise */ if (buf_res.length >= 4) { @@ -1107,7 +958,6 @@ musbotg_interrupt_poll(struct musbotg_softc *sc) { struct usb2_xfer *xfer; - uint8_t to = 2; repeat: TAILQ_FOREACH(xfer, &sc->sc_bus.intr_q.head, wait_entry) { @@ -1116,8 +966,7 @@ goto repeat; } } - if (--to) - goto repeat; + return; } @@ -1161,13 +1010,16 @@ void musbotg_interrupt(struct musbotg_softc *sc) { + uint16_t rx_status; + uint16_t tx_status; uint8_t usb_status; - uint8_t rx_status; - uint8_t tx_status; uint8_t temp; + uint8_t to = 2; mtx_lock(&sc->sc_bus.mtx); +repeat: + /* read all interrupt registers */ usb_status = MUSB2_READ_1(sc, MUSB2_REG_INTUSB); @@ -1249,12 +1101,16 @@ /* check for any endpoint interrupts */ if (rx_status || tx_status) { - DPRINTFN(4, "real endpoint interrupt " "rx=0x%04x, tx=0x%04x\n", rx_status, tx_status); + } + /* poll one time regardless of FIFO status */ + + musbotg_interrupt_poll(sc); + + if (--to) + goto repeat; - musbotg_interrupt_poll(sc); - } mtx_unlock(&sc->sc_bus.mtx); return; @@ -1451,20 +1307,6 @@ temp &= ~MUSB2_MASK_EPINT(ep_no); MUSB2_WRITE_2(sc, MUSB2_REG_INTRXE, temp); -#ifdef MUSB2_DMA_ENABLED - if (on == 0) { - if (sc->sc_rx_dma[ep_no].busy) { - /* - * The USB driver uses a DMA delay - * so there is no need for an - * immediate DMA stop! - */ - musbotg_stop_rxdma_async(sc->sc_tx_dma[ep_no].dma_chan); - } - sc->sc_rx_dma[ep_no].complete = 0; - sc->sc_rx_dma[ep_no].busy = 0; - } -#endif } else { temp = MUSB2_READ_2(sc, MUSB2_REG_INTTXE); if (on) @@ -1472,21 +1314,6 @@ else temp &= ~MUSB2_MASK_EPINT(ep_no); MUSB2_WRITE_2(sc, MUSB2_REG_INTTXE, temp); - -#ifdef MUSB2_DMA_ENABLED - if (on == 0) { - if (sc->sc_tx_dma[ep_no].busy) { - /* - * The USB driver uses a DMA delay - * so there is no need for an - * immediate DMA stop! - */ - musbotg_stop_txdma_async(sc->sc_tx_dma[ep_no].dma_chan); - } - sc->sc_tx_dma[ep_no].complete = 0; - sc->sc_tx_dma[ep_no].busy = 0; - } -#endif } } return; @@ -1740,17 +1567,7 @@ if (ep_dir == UE_DIR_IN) { -#ifdef MUSB2_DMA_ENABLED - /* check if we support DMA */ - if (sc->sc_tx_dma_res[ep_no] != NULL) { - temp = MUSB2_MASK_CSRH_TXDMAREQMODE | - MUSB2_MASK_CSRH_TXDMAREQENA; - } else { - temp = 0; - } -#else temp = 0; -#endif /* Configure endpoint */ switch (ep_type) { @@ -1811,17 +1628,7 @@ } } else { -#ifdef MUSB2_DMA_ENABLED - /* check if we support DMA */ - if (sc->sc_rx_dma_res[ep_no] != NULL) { - temp = MUSB2_MASK_CSRH_RXDMAREQMODE | - MUSB2_MASK_CSRH_RXDMAREQENA; - } else { - temp = 0; - } -#else temp = 0; -#endif /* Configure endpoint */ switch (ep_type) { @@ -1929,15 +1736,6 @@ sc->sc_bus.usbrev = USB_REV_2_0; sc->sc_bus.methods = &musbotg_bus_methods; -#ifdef MUSB2_DMA_ENABLED - /* initialise DMA structures */ - for (temp = 0; temp != 16; temp++) { - sc->sc_rx_dma[temp].sc = sc; - sc->sc_tx_dma[temp].sc = sc; - } - sc->sc_dma_align = musbotg_get_dma_align(); -#endif - mtx_lock(&sc->sc_bus.mtx); /* turn on clocks */ @@ -3053,19 +2851,6 @@ td->ep_no = ep_no; td->obj_next = last_obj; -#ifdef MUSB2_DMA_ENABLED - /* check for DMA support */ - if ((xfer->endpoint & (UE_DIR_IN | - UE_DIR_OUT)) == UE_DIR_IN) { - if (sc->sc_tx_dma_res[ep_no] != NULL) { - td->dma_enabled = 1; - } - } else { - if (sc->sc_rx_dma_res[ep_no] != NULL) { - td->dma_enabled = 1; - } - } -#endif last_obj = td; } parm->size[0] += sizeof(*td); ==== //depot/projects/usb/src/sys/dev/usb2/controller/musb2_otg.h#7 (text+ko) ==== @@ -365,12 +365,6 @@ struct usb2_sw_transfer sc_root_intr; struct usb2_config_td sc_config_td; struct usb2_hw_ep_profile sc_hw_ep_profile[16]; -#ifdef MUSB2_DMA_ENABLED - struct musbotg_dma sc_rx_dma[16]; - struct musbotg_dma sc_tx_dma[16]; - struct resource *sc_rx_dma_res[16]; - struct resource *sc_tx_dma_res[16]; -#endif struct resource *sc_io_res; struct resource *sc_irq_res; void *sc_intr_hdl; @@ -382,7 +376,6 @@ void (*sc_clocks_off) (void *arg); void *sc_clocks_arg; - uint32_t sc_dma_align; /* DMA buffer alignment */ uint32_t sc_bounce_buf[(1024 * 3) / 4]; /* bounce buffer */ uint8_t sc_ep_max; /* maximum number of RX and TX @@ -407,15 +400,4 @@ void musbotg_resume(struct musbotg_softc *sc); void musbotg_interrupt(struct musbotg_softc *sc); -#ifdef MUSB2_DMA_ENABLED -/* These functions needs to be implemented for your DMA controller */ -int musbotg_start_rxdma(uint32_t dma_chan, void *arg, const void *dstaddr, uint32_t bytecount); -int musbotg_start_txdma(uint32_t dma_chan, void *arg, const void *srcaddr, uint32_t bytecount); -uint32_t musbotg_get_dma_align(void); -void musbotg_complete_dma_cb(void *arg, uint32_t is_error); -void musbotg_stop_rxdma_async(uint32_t dma_chan); -void musbotg_stop_txdma_async(uint32_t dma_chan); - -#endif - #endif /* _MUSB2_OTG_H_ */ ==== //depot/projects/usb/src/sys/dev/usb2/controller/musb2_otg_atmelarm.c#5 (text+ko) ==== @@ -98,11 +98,6 @@ int err; int rid; -#ifdef MUSB2_DMA_ENABLED - int temp; - -#endif - if (sc == NULL) { return (ENXIO); } @@ -118,25 +113,6 @@ USB_GET_DMA_TAG(dev), NULL)) { return (ENOMEM); } -#ifdef MUSB2_DMA_ENABLED - /* allocate all DMA channels */ - for (temp = 0; temp != 16; temp++) { - rid = temp; /* OUT endpoint */ - sc->sc_otg.sc_rx_dma_res[temp] = - bus_alloc_resource_any(dev, SYS_RES_DRQ, &rid, RF_ACTIVE); - if (sc->sc_otg.sc_rx_dma_res[temp]) { - sc->sc_otg.sc_rx_dma[temp].dma_chan = - rman_get_start(sc->sc_otg.sc_rx_dma_res[temp]); - } - rid = temp | 0x80; /* IN endpoint */ - sc->sc_otg.sc_tx_dma_res[temp] = - bus_alloc_resource_any(dev, SYS_RES_DRQ, &rid, RF_ACTIVE); - if (sc->sc_otg.sc_tx_dma_res[temp]) { - sc->sc_otg.sc_tx_dma[temp].dma_chan = - rman_get_start(sc->sc_otg.sc_tx_dma_res[temp]); - } - } -#endif rid = 0; sc->sc_otg.sc_io_res = bus_alloc_resource_any(dev, SYS_RES_MEMORY, &rid, RF_ACTIVE); @@ -202,10 +178,6 @@ device_t bdev; int err; -#ifdef MUSB2_DMA_ENABLED - int temp; - -#endif if (sc->sc_otg.sc_bus.bdev) { bdev = sc->sc_otg.sc_bus.bdev; device_detach(bdev); @@ -224,19 +196,6 @@ sc->sc_otg.sc_intr_hdl); sc->sc_otg.sc_intr_hdl = NULL; } -#ifdef MUSB2_DMA_ENABLED - /* free all DMA channels */ - for (temp = 0; temp != 16; temp++) { - if (sc->sc_otg.sc_rx_dma_res[temp]) { - bus_release_resource(dev, SYS_RES_DRQ, - temp, sc->sc_otg.sc_rx_dma_res[temp]); - } - if (sc->sc_otg.sc_tx_dma_res[temp]) { - bus_release_resource(dev, SYS_RES_DRQ, - temp | 0x80, sc->sc_otg.sc_tx_dma_res[temp]); - } - } -#endif /* free IRQ channel, if any */ if (sc->sc_otg.sc_irq_res) { bus_release_resource(dev, SYS_RES_IRQ, 0, From owner-p4-projects@FreeBSD.ORG Thu Sep 11 08:02:09 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 04FC51065673; Thu, 11 Sep 2008 08:02: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 BDE9E1065671 for ; Thu, 11 Sep 2008 08:02:08 +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 A7F458FC1F for ; Thu, 11 Sep 2008 08:02:08 +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 m8B828DX068836 for ; Thu, 11 Sep 2008 08:02:08 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m8B828rd068818 for perforce@freebsd.org; Thu, 11 Sep 2008 08:02:08 GMT (envelope-from hselasky@FreeBSD.org) Date: Thu, 11 Sep 2008 08:02:08 GMT Message-Id: <200809110802.m8B828rd068818@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 149590 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 11 Sep 2008 08:02:09 -0000 http://perforce.freebsd.org/chv.cgi?CH=149590 Change 149590 by hselasky@hselasky_laptop001 on 2008/09/11 08:01:24 When there is no buffer we need to call start_read/start_write function. Maybe it will create a buffer, which is the case for UGEN. Affected files ... .. //depot/projects/usb/src/sys/dev/usb2/core/usb2_dev.c#28 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb2/core/usb2_dev.c#28 (text+ko) ==== @@ -847,6 +847,7 @@ f->flag_iserror = 1; /* need to wait until all callers have exited */ while (f->refcount != 0) { + mtx_unlock(&usb2_ref_lock); /* avoid LOR */ mtx_lock(f->priv_mtx); /* get I/O thread out of any sleep state */ if (f->flag_sleeping) { @@ -854,6 +855,7 @@ usb2_cv_broadcast(&f->cv_io); } mtx_unlock(f->priv_mtx); + mtx_lock(&usb2_ref_lock); /* wait for sync */ usb2_cv_wait(&f->cv_drain, &usb2_ref_lock); @@ -1462,7 +1464,8 @@ } static int -usb2_ioctl_f_sub(struct usb2_fifo *f, u_long cmd, void *addr, struct thread *td) +usb2_ioctl_f_sub(struct usb2_fifo *f, u_long cmd, void *addr, + struct thread *td) { int error = 0; @@ -1526,17 +1529,10 @@ if (fflags & FREAD) { if (fflags & FWRITE) { /* - * Automagically figure out if we have an IOCTL that - * should not be replicated to both FIFOs: + * Make sure that the IOCTL is not + * duplicated: */ - if ((loc.rxfifo->priv_sc0 == - loc.txfifo->priv_sc0) && - (loc.rxfifo->priv_sc1 == - loc.txfifo->priv_sc1) && - (loc.rxfifo->methods == - loc.txfifo->methods)) { - is_common = 1; - } + is_common = 1; } err_rx = usb2_ioctl_f_sub(loc.rxfifo, cmd, addr, td); if (err_rx == ENOTTY) { @@ -1624,6 +1620,13 @@ /* we got an error */ m = (void *)1; } else { + if (f->queue_data == NULL) { + /* + * start write transfer, if not + * already started + */ + (f->methods->f_start_write) (f); + } /* check if any packets are available */ USB_IF_POLL(&f->free_q, m); } @@ -1656,6 +1659,13 @@ /* we have and error */ m = (void *)1; } else { + if (f->queue_data == NULL) { + /* + * start read transfer, if not + * already started + */ + (f->methods->f_start_read) (f); + } /* check if any packets are available */ USB_IF_POLL(&f->used_q, m); } @@ -1860,6 +1870,10 @@ err = EIO; goto done; } + if ((f->queue_data == NULL) && (f->fs_ep_max == 0)) { + /* start write transfer, if not already started */ + (f->methods->f_start_write) (f); + } while (uio->uio_resid > 0) { if (f->fs_ep_max == 0) { From owner-p4-projects@FreeBSD.ORG Thu Sep 11 08:05:12 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3F6491065671; Thu, 11 Sep 2008 08:05: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 03065106566B for ; Thu, 11 Sep 2008 08:05: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 E0B458FC0C for ; Thu, 11 Sep 2008 08:05:11 +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 m8B85BOi091216 for ; Thu, 11 Sep 2008 08:05:11 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m8B85BZU091209 for perforce@freebsd.org; Thu, 11 Sep 2008 08:05:11 GMT (envelope-from hselasky@FreeBSD.org) Date: Thu, 11 Sep 2008 08:05:11 GMT Message-Id: <200809110805.m8B85BZU091209@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 149591 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 11 Sep 2008 08:05:12 -0000 http://perforce.freebsd.org/chv.cgi?CH=149591 Change 149591 by hselasky@hselasky_laptop001 on 2008/09/11 08:04:35 The new UGEN ioctls needs to be split in RX and TX part, else all the parameters will not be accessable in case an endpoint is opened for read and write! Affected files ... .. //depot/projects/usb/src/sys/dev/usb2/core/usb2_generic.c#23 edit .. //depot/projects/usb/src/sys/dev/usb2/include/usb2_ioctl.h#15 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb2/core/usb2_generic.c#23 (text+ko) ==== @@ -442,8 +442,8 @@ case USB_ST_SETUP: case USB_ST_TRANSFERRED: /* - * If writing is in stall, just jump to clear stall callback and - * solve the situation. + * If writing is in stall, just jump to clear stall + * callback and solve the situation. */ if (f->flag_stall) { usb2_transfer_start(f->xfer[1]); @@ -1633,99 +1633,227 @@ } static int -ugen_iface_ioctl(struct usb2_fifo *f, u_long cmd, void *addr, int fflags) +ugen_set_short_xfer(struct usb2_fifo *f, void *addr) +{ + if (f->xfer[0] || f->xfer[1]) { + /* cannot change this during transfer */ + return (EBUSY); + } + if (*(int *)addr) + f->flag_short = 1; + else + f->flag_short = 0; + return (0); +} + +static int +ugen_set_timeout(struct usb2_fifo *f, void *addr) +{ + f->timeout = *(int *)addr; + if (f->timeout > 65535) { + /* limit user input */ + f->timeout = 65535; + } + return (0); +} + +static int +ugen_get_frame_size(struct usb2_fifo *f, void *addr) +{ + if (f->xfer[0]) { + *(int *)addr = f->xfer[0]->max_frame_size; + } else { + return (EINVAL); + } + return (0); +} + +static int +ugen_set_buffer_size(struct usb2_fifo *f, void *addr) +{ + if (f->xfer[0] || f->xfer[1]) { + /* cannot change this during transfer */ + return (EBUSY); + } + if (*(int *)addr < 1024) + f->bufsize = 1024; + else if (*(int *)addr < (256 * 1024)) + f->bufsize = *(int *)addr; + else + f->bufsize = 256 * 1024; + return (0); +} + +static int +ugen_get_buffer_size(struct usb2_fifo *f, void *addr) +{ + *(int *)addr = f->bufsize; + return (0); +} + +static int +ugen_get_iface_desc(struct usb2_fifo *f, + struct usb2_interface_descriptor *idesc) { - union { - struct usb2_interface_descriptor *idesc; - struct usb2_endpoint_descriptor *ed; - struct usb2_alt_interface *ai; - int *pint; - void *addr; - } u; struct usb2_interface *iface; + + iface = usb2_get_iface(f->udev, f->iface_index); + if (iface && iface->idesc) { + *idesc = *(iface->idesc); + } else { + return (EIO); + } + return (0); +} + +static int +ugen_get_endpoint_desc(struct usb2_fifo *f, + struct usb2_endpoint_descriptor *ed) +{ struct usb2_pipe *pipe; + + pipe = f->priv_sc0; + + if (pipe && pipe->edesc) { + *ed = *pipe->edesc; + } else { + return (EINVAL); + } + return (0); +} + +static int +ugen_iface_ioctl(struct usb2_fifo *f, u_long cmd, void *addr, int fflags) +{ + struct usb2_fifo *f_rx; + struct usb2_fifo *f_tx; int error = 0; - u.addr = addr; + f_rx = f->udev->fifo[(f->fifo_index & ~1) + USB_FIFO_RX]; + f_tx = f->udev->fifo[(f->fifo_index & ~1) + USB_FIFO_TX]; switch (cmd) { - case USB_SET_SHORT_XFER: - if (f->xfer[0] || f->xfer[1]) { - /* cannot change this during transfer */ - error = EBUSY; - break; + case USB_SET_RX_SHORT_XFER: + if (fflags & FREAD) { + error = ugen_set_short_xfer(f_rx, addr); + } else { + error = EINVAL; + } + break; + + case USB_SET_TX_FORCE_SHORT: + if (fflags & FWRITE) { + error = ugen_set_short_xfer(f_tx, addr); + } else { + error = EINVAL; + } + break; + + case USB_SET_RX_TIMEOUT: + if (fflags & FREAD) { + error = ugen_set_timeout(f_rx, addr); + } else { + error = EINVAL; + } + break; + + case USB_SET_TX_TIMEOUT: + if (fflags & FWRITE) { + error = ugen_set_timeout(f_tx, addr); + } else { + error = EINVAL; + } + break; + + case USB_GET_RX_FRAME_SIZE: + if (fflags & FREAD) { + error = ugen_get_frame_size(f_rx, addr); + } else { + error = EINVAL; + } + break; + + case USB_GET_TX_FRAME_SIZE: + if (fflags & FWRITE) { + error = ugen_get_frame_size(f_tx, addr); + } else { + error = EINVAL; } - if (*(int *)addr) - f->flag_short = 1; - else - f->flag_short = 0; break; - case USB_SET_TIMEOUT: - f->timeout = *(int *)addr; - if (f->timeout > 65535) { - /* limit user input */ - f->timeout = 65535; + case USB_SET_RX_BUFFER_SIZE: + if (fflags & FREAD) { + error = ugen_set_buffer_size(f_rx, addr); + } else { + error = EINVAL; } break; - case USB_GET_FRAME_SIZE: - if (f->xfer[0]) { - *(int *)addr = f->xfer[0]->max_frame_size; + case USB_SET_TX_BUFFER_SIZE: + if (fflags & FWRITE) { + error = ugen_set_buffer_size(f_tx, addr); } else { error = EINVAL; } break; - case USB_SET_BUFFER_SIZE: - if (f->xfer[0] || f->xfer[1]) { - /* cannot change this during transfer */ - error = EBUSY; - break; + case USB_GET_RX_BUFFER_SIZE: + if (fflags & FREAD) { + error = ugen_get_buffer_size(f_rx, addr); + } else { + error = EINVAL; } - if (*(int *)addr < 1024) - f->bufsize = 1024; - else if (*(int *)addr < (256 * 1024)) - f->bufsize = *(int *)addr; - else - f->bufsize = 256 * 1024; break; - case USB_GET_BUFFER_SIZE: - *(int *)addr = f->bufsize; + case USB_GET_TX_BUFFER_SIZE: + if (fflags & FWRITE) { + error = ugen_get_buffer_size(f_tx, addr); + } else { + error = EINVAL; + } break; - case USB_GET_INTERFACE_DESC: - iface = usb2_get_iface(f->udev, f->iface_index); - if (iface && iface->idesc) { - *u.idesc = *(iface->idesc); + case USB_GET_RX_INTERFACE_DESC: + if (fflags & FREAD) { + error = ugen_get_iface_desc(f_rx, addr); } else { - error = EIO; - break; + error = EINVAL; } break; - case USB_GET_ENDPOINT_DESC: + case USB_GET_TX_INTERFACE_DESC: + if (fflags & FWRITE) { + error = ugen_get_iface_desc(f_tx, addr); + } else { + error = EINVAL; + } + break; - pipe = f->priv_sc0; + case USB_GET_RX_ENDPOINT_DESC: + if (fflags & FREAD) { + error = ugen_get_endpoint_desc(f_rx, addr); + } else { + error = EINVAL; + } + break; - if (pipe && pipe->edesc) { - *u.ed = *pipe->edesc; + case USB_GET_TX_ENDPOINT_DESC: + if (fflags & FWRITE) { + error = ugen_get_endpoint_desc(f_tx, addr); } else { error = EINVAL; - break; } break; case USB_SET_RX_STALL_FLAG: - if ((fflags & FREAD) && (*u.pint)) { - f->flag_stall = 1; + if ((fflags & FREAD) && (*(int *)addr)) { + f_rx->flag_stall = 1; } break; case USB_SET_TX_STALL_FLAG: - if ((fflags & FWRITE) && (*u.pint)) { - f->flag_stall = 1; + if ((fflags & FWRITE) && (*(int *)addr)) { + f_tx->flag_stall = 1; } break; ==== //depot/projects/usb/src/sys/dev/usb2/include/usb2_ioctl.h#15 (text+ko) ==== @@ -217,17 +217,17 @@ #define USB_SET_ALTINTERFACE _IOWR('U', 103, struct usb2_alt_interface) #define USB_GET_DEVICE_DESC _IOR ('U', 105, struct usb2_device_descriptor) #define USB_GET_CONFIG_DESC _IOR ('U', 106, struct usb2_config_descriptor) -#define USB_GET_INTERFACE_DESC _IOR ('U', 107, struct usb2_interface_descriptor) -#define USB_GET_ENDPOINT_DESC _IOR ('U', 108, struct usb2_endpoint_descriptor) +#define USB_GET_RX_INTERFACE_DESC _IOR ('U', 107, struct usb2_interface_descriptor) +#define USB_GET_RX_ENDPOINT_DESC _IOR ('U', 108, struct usb2_endpoint_descriptor) #define USB_GET_FULL_DESC _IOWR('U', 109, struct usb2_gen_descriptor) #define USB_GET_STRING_DESC _IOWR('U', 110, struct usb2_gen_descriptor) #define USB_DO_REQUEST _IOWR('U', 111, struct usb2_ctl_request) #define USB_GET_DEVICEINFO _IOR ('U', 112, struct usb2_device_info) -#define USB_SET_SHORT_XFER _IOW ('U', 113, int) -#define USB_SET_TIMEOUT _IOW ('U', 114, uint32_t) -#define USB_GET_FRAME_SIZE _IOR ('U', 115, uint32_t) -#define USB_GET_BUFFER_SIZE _IOR ('U', 117, uint32_t) -#define USB_SET_BUFFER_SIZE _IOW ('U', 118, uint32_t) +#define USB_SET_RX_SHORT_XFER _IOW ('U', 113, int) +#define USB_SET_RX_TIMEOUT _IOW ('U', 114, int) +#define USB_GET_RX_FRAME_SIZE _IOR ('U', 115, int) +#define USB_GET_RX_BUFFER_SIZE _IOR ('U', 117, int) +#define USB_SET_RX_BUFFER_SIZE _IOW ('U', 118, int) #define USB_SET_RX_STALL_FLAG _IOW ('U', 119, int) #define USB_SET_TX_STALL_FLAG _IOW ('U', 120, int) #define USB_GET_DEVICENAMES _IOW ('U', 121, struct usb2_device_names) @@ -245,6 +245,13 @@ #define USB_GET_BUS_PERM _IOW ('U', 133, struct usb2_dev_perm) #define USB_GET_DEVICE_PERM _IOW ('U', 134, struct usb2_dev_perm) #define USB_GET_IFACE_PERM _IOW ('U', 135, struct usb2_dev_perm) +#define USB_SET_TX_FORCE_SHORT _IOW ('U', 136, int) +#define USB_SET_TX_TIMEOUT _IOW ('U', 137, int) +#define USB_GET_TX_FRAME_SIZE _IOR ('U', 138, int) +#define USB_GET_TX_BUFFER_SIZE _IOR ('U', 139, int) +#define USB_SET_TX_BUFFER_SIZE _IOW ('U', 140, int) +#define USB_GET_TX_INTERFACE_DESC _IOR ('U', 141, struct usb2_interface_descriptor) +#define USB_GET_TX_ENDPOINT_DESC _IOR ('U', 142, struct usb2_endpoint_descriptor) /* Modem device */ #define USB_GET_CM_OVER_DATA _IOR ('U', 160, int) From owner-p4-projects@FreeBSD.ORG Thu Sep 11 08:06:13 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 67DE01065673; Thu, 11 Sep 2008 08:06: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 2C6FE106564A for ; Thu, 11 Sep 2008 08:06:13 +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 16C798FC0A for ; Thu, 11 Sep 2008 08:06:13 +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 m8B86CDp099971 for ; Thu, 11 Sep 2008 08:06:12 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m8B86ClY099965 for perforce@freebsd.org; Thu, 11 Sep 2008 08:06:12 GMT (envelope-from hselasky@FreeBSD.org) Date: Thu, 11 Sep 2008 08:06:12 GMT Message-Id: <200809110806.m8B86ClY099965@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 149592 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 11 Sep 2008 08:06:13 -0000 http://perforce.freebsd.org/chv.cgi?CH=149592 Change 149592 by hselasky@hselasky_laptop001 on 2008/09/11 08:05:36 Add support for nframes == 0, in case of clearing and setting stall. Affected files ... .. //depot/projects/usb/src/sys/dev/usb2/core/usb2_transfer.c#25 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb2/core/usb2_transfer.c#25 (text+ko) ==== @@ -1336,6 +1336,20 @@ /* sanity check */ if (xfer->nframes == 0) { + if (xfer->flags.stall_pipe) { + /* + * Special case - want to stall without transferring + * any data: + */ + DPRINTF("xfer=%p nframes=0: stall " + "or clear stall!\n", xfer); + mtx_lock(xfer->usb2_mtx); + xfer->flags_int.can_cancel_immed = 1; + /* start the transfer */ + usb2_command_wrapper(&xfer->pipe->pipe_q, xfer); + mtx_unlock(xfer->usb2_mtx); + return; + } mtx_lock(xfer->usb2_mtx); usb2_transfer_done(xfer, USB_ERR_INVAL); mtx_unlock(xfer->usb2_mtx); @@ -2141,6 +2155,13 @@ return; } } + /* Set or clear stall complete - special case */ + if (xfer->nframes == 0) { + /* we are complete */ + xfer->aframes = 0; + usb2_transfer_done(xfer, 0); + return; + } /* * Handled cases: * From owner-p4-projects@FreeBSD.ORG Thu Sep 11 08:09:16 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9F7BD1065676; Thu, 11 Sep 2008 08:09: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 633B11065674 for ; Thu, 11 Sep 2008 08:09:16 +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 4CC768FC1E for ; Thu, 11 Sep 2008 08:09:16 +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 m8B89GEL018541 for ; Thu, 11 Sep 2008 08:09:16 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m8B89Gvh018539 for perforce@freebsd.org; Thu, 11 Sep 2008 08:09:16 GMT (envelope-from hselasky@FreeBSD.org) Date: Thu, 11 Sep 2008 08:09:16 GMT Message-Id: <200809110809.m8B89Gvh018539@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 149593 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 11 Sep 2008 08:09:16 -0000 http://perforce.freebsd.org/chv.cgi?CH=149593 Change 149593 by hselasky@hselasky_laptop001 on 2008/09/11 08:08:55 1) Make usb2_template variable globally accessable. 2) Cleanup FIFO free handling. Currently there were some bugs there, for example that the interface data was freed before freeing the FIFO which led to some NULL pointer accesses. 3) Add support for ugen attach/detach device notifications through devd. Affected files ... .. //depot/projects/usb/src/sys/dev/usb2/core/usb2_device.c#23 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb2/core/usb2_device.c#23 (text+ko) ==== @@ -64,6 +64,8 @@ static void usb2_clear_stall_proc(struct usb2_proc_msg *_pm); static void usb2_check_strings(struct usb2_device *udev); static usb2_error_t usb2_fill_iface_data(struct usb2_device *udev, uint8_t iface_index, uint8_t alt_index); +static void usb2_notify_addq(const char *type, struct usb2_device *udev); +static void usb2_fifo_free_wrap(struct usb2_device *udev, uint8_t iface_index, uint8_t free_all); /* static structures */ @@ -77,7 +79,9 @@ [USB_SPEED_LOW][USB_SPEED_LOW] = 1, }; -static int usb2_template = 0; +/* This variable is global to allow easy access to it: */ + +int usb2_template = 0; SYSCTL_INT(_hw_usb2, OID_AUTO, template, CTLFLAG_RW, &usb2_template, 0, "Selected USB device side template"); @@ -337,13 +341,12 @@ uint8_t iface_index, uint8_t alt_index) { struct usb2_interface *iface = usb2_get_iface(udev, iface_index); - struct usb2_pipe *pipe = udev->pipes; - struct usb2_pipe *pipe_end = udev->pipes + USB_EP_MAX; + struct usb2_pipe *pipe; + struct usb2_pipe *pipe_end; struct usb2_interface_descriptor *id; struct usb2_endpoint_descriptor *ed = NULL; struct usb2_descriptor *desc; uint8_t nendpt; - uint8_t i; if (iface == NULL) { return (USB_ERR_INVAL); @@ -353,15 +356,8 @@ sx_assert(udev->default_sx + 1, SA_LOCKED); - /* - * Free any USB FIFO on the interface: - */ - for (i = 2; i != USB_FIFO_MAX; i++) { - if (udev->fifo[i] && - (udev->fifo[i]->iface_index == iface_index)) { - usb2_fifo_free(udev->fifo[i]); - } - } + pipe = udev->pipes; + pipe_end = udev->pipes + USB_EP_MAX; /* * Check if any USB pipes on the given USB interface are in @@ -448,7 +444,6 @@ { struct usb2_interface *iface = udev->ifaces; struct usb2_interface *iface_end = udev->ifaces + USB_IFACE_MAX; - uint8_t n; /* mtx_assert() */ @@ -457,12 +452,6 @@ usb_linux_free_device(udev->linux_dev); udev->linux_dev = NULL; } - /* free all generic USB FIFOs except the control endpoint FIFO */ - for (n = 2; n != USB_FIFO_MAX; n++) { - usb2_fifo_free(udev->fifo[n]); - udev->fifo[n] = NULL; - } - /* free all pipes, if any */ usb2_free_pipe_data(udev, 0, 0); @@ -523,6 +512,9 @@ /* detach all interface drivers */ usb2_detach_device(udev, USB_IFACE_INDEX_ANY, 1); + /* free all FIFOs except control endpoint FIFOs */ + usb2_fifo_free_wrap(udev, USB_IFACE_INDEX_ANY, 0); + /* free all configuration data structures */ usb2_free_iface_data(udev); @@ -679,6 +671,9 @@ if (udev->flags.usb2_mode == USB_MODE_DEVICE) { usb2_detach_device(udev, iface_index, 1); } + /* free all FIFOs for this interface */ + usb2_fifo_free_wrap(udev, iface_index, 0); + err = usb2_fill_iface_data(udev, iface_index, alt_index); if (err) { goto done; @@ -1633,6 +1628,8 @@ device_get_unit(udev->bus->bdev), udev->device_index, udev->manufacturer, device_get_nameunit(udev->bus->bdev)); + + usb2_notify_addq("+", udev); done: if (err) { /* free device */ @@ -1658,6 +1655,8 @@ } DPRINTFN(4, "udev=%p port=%d\n", udev, udev->port_no); + usb2_notify_addq("-", udev); + bus = udev->bus; /* @@ -1688,13 +1687,14 @@ /* stop receiving any control transfers (Device Side Mode) */ usb2_transfer_unsetup(udev->default_xfer, USB_DEFAULT_XFER_MAX); } - /* free all interface related data and FIFOs, if any */ + /* free all FIFOs */ + usb2_fifo_free_wrap(udev, USB_IFACE_INDEX_ANY, 1); + + /* + * Free all interface related data and FIFOs, if any. + */ usb2_free_iface_data(udev); - /* free generic control endpoint FIFOs, if any */ - usb2_fifo_free(udev->fifo[0]); - usb2_fifo_free(udev->fifo[1]); - /* unsetup any leftover default USB transfers */ usb2_transfer_unsetup(udev->default_xfer, USB_DEFAULT_XFER_MAX); @@ -1987,3 +1987,111 @@ { return (udev->device_index); } + +/*------------------------------------------------------------------------* + * usb2_notify_addq + * + * This function will generate events for dev. + *------------------------------------------------------------------------*/ +static void +usb2_notify_addq(const char *type, struct usb2_device *udev) +{ + char *data = NULL; + struct malloc_type *mt; + + mtx_lock(&malloc_mtx); + mt = malloc_desc2type("bus"); /* XXX M_BUS */ + mtx_unlock(&malloc_mtx); + if (mt == NULL) + return; + + data = malloc(512, mt, M_NOWAIT); + if (data == NULL) + return; + + /* String it all together. */ + if (udev->parent_hub) { + snprintf(data, 1024, + "%s" + "ugen%u.%u " + "vendor=0x%04x " + "product=0x%04x " + "devclass=0x%02x " + "devsubclass=0x%02x " + "sernum=\"%s\" " + "at " + "port=%u " + "on " + "ugen%u.%u\n", + type, + device_get_unit(udev->bus->bdev), + udev->device_index, + UGETW(udev->ddesc.idVendor), + UGETW(udev->ddesc.idProduct), + udev->ddesc.bDeviceClass, + udev->ddesc.bDeviceSubClass, + udev->serial, + udev->port_no, + device_get_unit(udev->bus->bdev), + udev->parent_hub->device_index); + } else { + snprintf(data, 1024, + "%s" + "ugen%u.%u " + "vendor=0x%04x " + "product=0x%04x " + "devclass=0x%02x " + "devsubclass=0x%02x " + "sernum=\"%s\" " + "at port=%u " + "on " + "%s\n", + type, + device_get_unit(udev->bus->bdev), + udev->device_index, + UGETW(udev->ddesc.idVendor), + UGETW(udev->ddesc.idProduct), + udev->ddesc.bDeviceClass, + udev->ddesc.bDeviceSubClass, + udev->serial, + udev->port_no, + device_get_nameunit(device_get_parent(udev->bus->bdev))); + } + devctl_queue_data(data); + return; +} + +/*------------------------------------------------------------------------* + * usb2_fifo_free_wrap + * + * The function will free the FIFOs. + *------------------------------------------------------------------------*/ +static void +usb2_fifo_free_wrap(struct usb2_device *udev, + uint8_t iface_index, uint8_t free_all) +{ + struct usb2_fifo *f; + struct usb2_pipe *pipe; + uint16_t i; + + /* + * Free any USB FIFOs on the given interface: + */ + for (i = 0; i != USB_FIFO_MAX; i++) { + f = udev->fifo[i]; + if (f == NULL) { + continue; + } + pipe = f->priv_sc0; + if ((pipe == &udev->default_pipe) && (free_all == 0)) { + /* don't free UGEN control endpoint yet */ + continue; + } + /* Check if the interface index matches */ + if ((iface_index == f->iface_index) || + (iface_index == USB_IFACE_INDEX_ANY)) { + usb2_fifo_free(f); + } + } + return; +} From owner-p4-projects@FreeBSD.ORG Thu Sep 11 09:05:13 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7C9F71065697; Thu, 11 Sep 2008 09:05: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 3FD44106568A for ; Thu, 11 Sep 2008 09:05:13 +0000 (UTC) (envelope-from raj@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 1030D8FC27 for ; Thu, 11 Sep 2008 09:05:13 +0000 (UTC) (envelope-from raj@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 m8B95CBv031723 for ; Thu, 11 Sep 2008 09:05:12 GMT (envelope-from raj@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m8B95CrL031716 for perforce@freebsd.org; Thu, 11 Sep 2008 09:05:12 GMT (envelope-from raj@freebsd.org) Date: Thu, 11 Sep 2008 09:05:12 GMT Message-Id: <200809110905.m8B95CrL031716@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to raj@freebsd.org using -f From: Rafal Jaworowski To: Perforce Change Reviews Cc: Subject: PERFORCE change 149594 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 11 Sep 2008 09:05:13 -0000 http://perforce.freebsd.org/chv.cgi?CH=149594 Change 149594 by raj@raj_mimi on 2008/09/11 09:04:13 Introduce driver for integrated Marvell RTC module (found on 88F6281 and 88F6192 SOCs). Obtained from: Marvell, Semihalf Affected files ... .. //depot/projects/arm/src/sys/arm/mv/kirkwood/files.db88f6xxx#2 edit .. //depot/projects/arm/src/sys/arm/mv/rtc.c#1 add Differences ... ==== //depot/projects/arm/src/sys/arm/mv/kirkwood/files.db88f6xxx#2 (text+ko) ==== @@ -1,4 +1,5 @@ # $FreeBSD$ +arm/mv/rtc.c standard arm/mv/kirkwood/kirkwood.c standard arm/mv/kirkwood/db88f6xxx.c standard From owner-p4-projects@FreeBSD.ORG Thu Sep 11 09:54:03 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E9A78106567A; Thu, 11 Sep 2008 09:54: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 AC6DA1065674 for ; Thu, 11 Sep 2008 09:54:02 +0000 (UTC) (envelope-from raj@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 95BCA8FC17 for ; Thu, 11 Sep 2008 09:54:02 +0000 (UTC) (envelope-from raj@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 m8B9s2P8025299 for ; Thu, 11 Sep 2008 09:54:02 GMT (envelope-from raj@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m8B9s2gh025297 for perforce@freebsd.org; Thu, 11 Sep 2008 09:54:02 GMT (envelope-from raj@freebsd.org) Date: Thu, 11 Sep 2008 09:54:02 GMT Message-Id: <200809110954.m8B9s2gh025297@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to raj@freebsd.org using -f From: Rafal Jaworowski To: Perforce Change Reviews Cc: Subject: PERFORCE change 149595 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 11 Sep 2008 09:54:03 -0000 http://perforce.freebsd.org/chv.cgi?CH=149595 Change 149595 by raj@raj_mimi on 2008/09/11 09:53:15 Introduce support for Marvell Discovery family of SOCs, based on the Feroceon/Shiva 88FR571 core. The new kernel config file is DB-78XXX. The code was tested on MV78100 chips with the DB-78100-BP evaluation system. 1. build the kernel: make buildkernel TARGET_ARCH=arm KERNCONF=DB-78XXX 2. run from U-Boot: >> tftpboot 200000 mv78100/kernel.bin >> go 200000 Obtained from: Marvell, Semihalf Affected files ... .. //depot/projects/arm/src/sys/arm/conf/DB-78XXX#1 add .. //depot/projects/arm/src/sys/arm/mv/discovery/db78xxx.c#1 add .. //depot/projects/arm/src/sys/arm/mv/discovery/discovery.c#1 add .. //depot/projects/arm/src/sys/arm/mv/discovery/files.db78xxx#1 add .. //depot/projects/arm/src/sys/arm/mv/discovery/std.db78xxx#1 add .. //depot/projects/arm/src/sys/arm/mv/kirkwood/db88f6xxx.c#2 edit .. //depot/projects/arm/src/sys/conf/options.arm#30 edit Differences ... ==== //depot/projects/arm/src/sys/arm/mv/kirkwood/db88f6xxx.c#2 (text+ko) ==== @@ -29,6 +29,9 @@ * SUCH DAMAGE. */ +#include +__FBSDID("$FreeBSD$"); + #include #include #include ==== //depot/projects/arm/src/sys/conf/options.arm#30 (text+ko) ==== @@ -23,6 +23,7 @@ LOADERRAMADDR opt_global.h PHYSADDR opt_global.h SKYEYE_WORKAROUNDS opt_global.h +SOC_MV_DISCOVERY opt_global.h SOC_MV_KIRKWOOD opt_global.h SOC_MV_ORION opt_global.h STARTUP_PAGETABLE_ADDR opt_global.h From owner-p4-projects@FreeBSD.ORG Thu Sep 11 12:53:06 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 527C21065671; Thu, 11 Sep 2008 12:53: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 15A69106566C for ; Thu, 11 Sep 2008 12:53:06 +0000 (UTC) (envelope-from raj@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id F06D58FC13 for ; Thu, 11 Sep 2008 12:53:05 +0000 (UTC) (envelope-from raj@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 m8BCr5ks035028 for ; Thu, 11 Sep 2008 12:53:05 GMT (envelope-from raj@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m8BCr5gQ035026 for perforce@freebsd.org; Thu, 11 Sep 2008 12:53:05 GMT (envelope-from raj@freebsd.org) Date: Thu, 11 Sep 2008 12:53:05 GMT Message-Id: <200809111253.m8BCr5gQ035026@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to raj@freebsd.org using -f From: Rafal Jaworowski To: Perforce Change Reviews Cc: Subject: PERFORCE change 149603 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 11 Sep 2008 12:53:06 -0000 http://perforce.freebsd.org/chv.cgi?CH=149603 Change 149603 by raj@raj_mimi on 2008/09/11 12:53:05 IFC @149602 Affected files ... .. //depot/projects/arm/src/ObsoleteFiles.inc#39 integrate .. //depot/projects/arm/src/bin/cp/utils.c#6 integrate .. //depot/projects/arm/src/contrib/gcc/config/arm/arm.h#3 integrate .. //depot/projects/arm/src/etc/rc.initdiskless#6 integrate .. //depot/projects/arm/src/include/rpc/svc_auth.h#2 integrate .. //depot/projects/arm/src/lib/libc/gen/arc4random.c#5 integrate .. //depot/projects/arm/src/lib/libc/rpc/svc.c#3 integrate .. //depot/projects/arm/src/lib/libc/rpc/svc_auth.c#3 integrate .. //depot/projects/arm/src/lib/libc/stdlib/malloc.c#18 integrate .. //depot/projects/arm/src/lib/libthr/thread/thr_exit.c#10 integrate .. //depot/projects/arm/src/release/doc/en_US.ISO8859-1/relnotes/article.sgml#32 integrate .. //depot/projects/arm/src/share/man/man4/man4.i386/Makefile#4 integrate .. //depot/projects/arm/src/share/man/man4/man4.i386/sbni.4#3 branch .. //depot/projects/arm/src/share/man/man4/tap.4#4 integrate .. //depot/projects/arm/src/share/man/man9/dev_clone.9#1 branch .. //depot/projects/arm/src/share/man/man9/devfs_set_cdevpriv.9#1 branch .. //depot/projects/arm/src/share/man/man9/insmntque.9#2 integrate .. //depot/projects/arm/src/share/man/man9/make_dev.9#4 integrate .. //depot/projects/arm/src/sys/amd64/pci/pci_cfgreg.c#5 integrate .. //depot/projects/arm/src/sys/arm/arm/intr.c#17 integrate .. //depot/projects/arm/src/sys/arm/arm/nexus.c#8 integrate .. //depot/projects/arm/src/sys/arm/include/intr.h#10 integrate .. //depot/projects/arm/src/sys/arm/xscale/ixp425/ixp425_qmgr.c#7 integrate .. //depot/projects/arm/src/sys/boot/common/dev_net.c#4 integrate .. //depot/projects/arm/src/sys/boot/forth/loader.conf#20 integrate .. //depot/projects/arm/src/sys/boot/sparc64/loader/main.c#9 integrate .. //depot/projects/arm/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c#5 integrate .. //depot/projects/arm/src/sys/compat/linux/linux_file.c#20 integrate .. //depot/projects/arm/src/sys/compat/linux/linux_socket.c#16 integrate .. //depot/projects/arm/src/sys/conf/files.i386#37 integrate .. //depot/projects/arm/src/sys/conf/files.pc98#23 integrate .. //depot/projects/arm/src/sys/conf/files.sparc64#17 integrate .. //depot/projects/arm/src/sys/dev/ath/if_athvar.h#21 integrate .. //depot/projects/arm/src/sys/dev/bge/if_bge.c#41 integrate .. //depot/projects/arm/src/sys/dev/cxgb/cxgb_adapter.h#12 integrate .. //depot/projects/arm/src/sys/dev/cxgb/cxgb_main.c#19 integrate .. //depot/projects/arm/src/sys/dev/cxgb/cxgb_sge.c#16 integrate .. //depot/projects/arm/src/sys/dev/drm/ati_pcigart.c#4 integrate .. //depot/projects/arm/src/sys/dev/drm/drm_bufs.c#4 integrate .. //depot/projects/arm/src/sys/dev/drm/drm_pci.c#4 integrate .. //depot/projects/arm/src/sys/dev/drm/i915_dma.c#9 integrate .. //depot/projects/arm/src/sys/dev/drm/mach64_dma.c#4 integrate .. //depot/projects/arm/src/sys/dev/esp/esp_sbus.c#9 integrate .. //depot/projects/arm/src/sys/dev/esp/ncr53c9x.c#9 integrate .. //depot/projects/arm/src/sys/dev/esp/ncr53c9xreg.h#3 integrate .. //depot/projects/arm/src/sys/dev/esp/ncr53c9xvar.h#5 integrate .. //depot/projects/arm/src/sys/dev/iicbus/ds133x.c#3 integrate .. //depot/projects/arm/src/sys/dev/iicbus/ds1672.c#2 integrate .. //depot/projects/arm/src/sys/dev/jme/if_jme.c#2 integrate .. //depot/projects/arm/src/sys/dev/jme/if_jmereg.h#2 integrate .. //depot/projects/arm/src/sys/dev/le/if_le_ledma.c#5 integrate .. //depot/projects/arm/src/sys/dev/sbni/if_sbni.c#6 branch .. //depot/projects/arm/src/sys/dev/sbni/if_sbni_isa.c#5 branch .. //depot/projects/arm/src/sys/dev/sbni/if_sbni_pci.c#4 branch .. //depot/projects/arm/src/sys/dev/sbni/if_sbnireg.h#3 branch .. //depot/projects/arm/src/sys/dev/sbni/if_sbnivar.h#4 branch .. //depot/projects/arm/src/sys/dev/usb/if_zyd.c#9 integrate .. //depot/projects/arm/src/sys/dev/usb/if_zydreg.h#5 integrate .. //depot/projects/arm/src/sys/dev/usb/usb_quirks.c#20 integrate .. //depot/projects/arm/src/sys/dev/usb/usbdevs#49 integrate .. //depot/projects/arm/src/sys/gnu/fs/xfs/FreeBSD/xfs_vnode.h#3 integrate .. //depot/projects/arm/src/sys/i386/conf/NOTES#32 integrate .. //depot/projects/arm/src/sys/i386/conf/XEN#2 integrate .. //depot/projects/arm/src/sys/i386/cpufreq/est.c#10 integrate .. //depot/projects/arm/src/sys/i386/i386/local_apic.c#24 integrate .. //depot/projects/arm/src/sys/i386/i386/machdep.c#36 integrate .. //depot/projects/arm/src/sys/i386/include/xen/xenpmap.h#2 integrate .. //depot/projects/arm/src/sys/i386/include/xen/xenvar.h#2 integrate .. //depot/projects/arm/src/sys/i386/pci/pci_cfgreg.c#7 integrate .. //depot/projects/arm/src/sys/i386/xen/mp_machdep.c#1 branch .. //depot/projects/arm/src/sys/i386/xen/mptable.c#1 branch .. //depot/projects/arm/src/sys/i386/xen/pmap.c#2 integrate .. //depot/projects/arm/src/sys/i386/xen/xen_machdep.c#3 integrate .. //depot/projects/arm/src/sys/kern/kern_exec.c#28 integrate .. //depot/projects/arm/src/sys/kern/kern_lock.c#20 integrate .. //depot/projects/arm/src/sys/kern/kern_mutex.c#22 integrate .. //depot/projects/arm/src/sys/kern/kern_rmlock.c#2 integrate .. //depot/projects/arm/src/sys/kern/kern_rwlock.c#18 integrate .. //depot/projects/arm/src/sys/kern/kern_sx.c#18 integrate .. //depot/projects/arm/src/sys/kern/subr_sleepqueue.c#24 integrate .. //depot/projects/arm/src/sys/kern/subr_turnstile.c#15 integrate .. //depot/projects/arm/src/sys/kern/subr_witness.c#31 integrate .. //depot/projects/arm/src/sys/kern/tty_ttydisc.c#4 integrate .. //depot/projects/arm/src/sys/mips/adm5120/admpci.c#2 integrate .. //depot/projects/arm/src/sys/mips/adm5120/if_admsw.c#2 integrate .. //depot/projects/arm/src/sys/mips/adm5120/if_admswvar.h#2 integrate .. //depot/projects/arm/src/sys/mips/adm5120/obio.c#2 integrate .. //depot/projects/arm/src/sys/mips/adm5120/uart_bus_adm5120.c#2 integrate .. //depot/projects/arm/src/sys/mips/adm5120/uart_cpu_adm5120.c#2 integrate .. //depot/projects/arm/src/sys/mips/adm5120/uart_dev_adm5120.c#2 integrate .. //depot/projects/arm/src/sys/mips/idt/idtpci.c#2 integrate .. //depot/projects/arm/src/sys/mips/idt/if_kr.c#2 integrate .. //depot/projects/arm/src/sys/mips/idt/obio.c#2 integrate .. //depot/projects/arm/src/sys/mips/idt/uart_bus_rc32434.c#2 integrate .. //depot/projects/arm/src/sys/mips/malta/gt.c#2 integrate .. //depot/projects/arm/src/sys/mips/malta/gt_pci.c#2 integrate .. //depot/projects/arm/src/sys/mips/malta/malta_machdep.c#2 integrate .. //depot/projects/arm/src/sys/mips/malta/obio.c#2 integrate .. //depot/projects/arm/src/sys/mips/malta/uart_bus_maltausart.c#2 integrate .. //depot/projects/arm/src/sys/mips/malta/uart_cpu_maltausart.c#2 integrate .. //depot/projects/arm/src/sys/mips/malta/yamon.c#2 integrate .. //depot/projects/arm/src/sys/mips/sentry5/obio.c#2 integrate .. //depot/projects/arm/src/sys/mips/sentry5/s5_machdep.c#2 integrate .. //depot/projects/arm/src/sys/mips/sentry5/uart_bus_sbusart.c#2 integrate .. //depot/projects/arm/src/sys/mips/sentry5/uart_cpu_sbusart.c#2 integrate .. //depot/projects/arm/src/sys/modules/Makefile#59 integrate .. //depot/projects/arm/src/sys/modules/sbni/Makefile#3 branch .. //depot/projects/arm/src/sys/net/if_mib.c#5 integrate .. //depot/projects/arm/src/sys/net/if_tap.c#14 integrate .. //depot/projects/arm/src/sys/net/if_tap.h#3 integrate .. //depot/projects/arm/src/sys/netinet/tcp_input.c#44 integrate .. //depot/projects/arm/src/sys/netinet6/mld6.c#11 integrate .. //depot/projects/arm/src/sys/pc98/conf/NOTES#19 integrate .. //depot/projects/arm/src/sys/security/mac_bsdextended/mac_bsdextended.c#17 integrate .. //depot/projects/arm/src/sys/sparc64/include/asi.h#5 integrate .. //depot/projects/arm/src/sys/sparc64/include/tlb.h#3 integrate .. //depot/projects/arm/src/sys/sparc64/sbus/dma_sbus.c#7 integrate .. //depot/projects/arm/src/sys/sparc64/sbus/lsi64854.c#4 integrate .. //depot/projects/arm/src/sys/sparc64/sbus/lsi64854var.h#4 integrate .. //depot/projects/arm/src/sys/sparc64/sparc64/cheetah.c#5 integrate .. //depot/projects/arm/src/sys/sparc64/sparc64/exception.S#11 integrate .. //depot/projects/arm/src/sys/sparc64/sparc64/genassym.c#12 integrate .. //depot/projects/arm/src/sys/sparc64/sparc64/jbusppm.c#1 branch .. //depot/projects/arm/src/sys/sparc64/sparc64/mp_exception.S#4 integrate .. //depot/projects/arm/src/sys/sparc64/sparc64/mp_locore.S#5 integrate .. //depot/projects/arm/src/sys/sparc64/sparc64/pmap.c#21 integrate .. //depot/projects/arm/src/sys/sparc64/sparc64/schppm.c#1 branch .. //depot/projects/arm/src/sys/sparc64/sparc64/support.S#6 integrate .. //depot/projects/arm/src/sys/sparc64/sparc64/swtch.S#4 integrate .. //depot/projects/arm/src/sys/sparc64/sparc64/tlb.c#4 integrate .. //depot/projects/arm/src/sys/sun4v/include/asi.h#3 integrate .. //depot/projects/arm/src/sys/sys/lock.h#17 integrate .. //depot/projects/arm/src/sys/sys/param.h#48 integrate .. //depot/projects/arm/src/sys/sys/systm.h#32 integrate .. //depot/projects/arm/src/sys/sys/vnode.h#29 integrate .. //depot/projects/arm/src/tools/regression/sockets/sendfile/sendfile.c#3 integrate .. //depot/projects/arm/src/usr.sbin/cxgbtool/cxgbtool.c#3 integrate .. //depot/projects/arm/src/usr.sbin/fwcontrol/fwcontrol.8#6 integrate .. //depot/projects/arm/src/usr.sbin/fwcontrol/fwcontrol.c#4 integrate .. //depot/projects/arm/src/usr.sbin/iostat/iostat.c#8 integrate Differences ... ==== //depot/projects/arm/src/ObsoleteFiles.inc#39 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/ObsoleteFiles.inc,v 1.157 2008/08/31 08:33:41 antoine Exp $ +# $FreeBSD: src/ObsoleteFiles.inc,v 1.158 2008/09/10 18:36:58 jhb Exp $ # # This file lists old files (OLD_FILES), libraries (OLD_LIBS) and # directories (OLD_DIRS) which should get removed at an update. Recently @@ -53,11 +53,6 @@ # 20080704: sbsh(4) removed OLD_FILES+=usr/share/man/man4/if_sbsh.4.gz OLD_FILES+=usr/share/man/man4/sbsh.4.gz -# 20080704: sbni(4) removed -.if ${TARGET_ARCH} == "i386" -OLD_FILES+=usr/share/man/man4/i386/if_sbni.4.gz -OLD_FILES+=usr/share/man/man4/i386/sbni.4.gz -.endif # 20080704: cnw(4) removed OLD_FILES+=usr/share/man/man4/if_cnw.4.gz OLD_FILES+=usr/share/man/man4/cnw.4.gz ==== //depot/projects/arm/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.54 2008/08/07 07:29:26 trasz Exp $"); +__FBSDID("$FreeBSD: src/bin/cp/utils.c,v 1.55 2008/09/09 12:31:42 trasz Exp $"); #include #include @@ -224,7 +224,6 @@ rval = 1; if (pflag && preserve_fd_acls(from_fd, to_fd) != 0) rval = 1; - (void)close(from_fd); if (close(to_fd)) { warn("%s", to.p_path); rval = 1; ==== //depot/projects/arm/src/contrib/gcc/config/arm/arm.h#3 (text+ko) ==== @@ -507,7 +507,7 @@ /* wchar_t is unsigned under the AAPCS. */ #ifndef WCHAR_TYPE #define WCHAR_TYPE (TARGET_AAPCS_BASED ? "unsigned int" : "int") - +#undef WCHAR_TYPE_SIZE #define WCHAR_TYPE_SIZE BITS_PER_WORD #endif ==== //depot/projects/arm/src/etc/rc.initdiskless#6 (text+ko) ==== @@ -24,7 +24,7 @@ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # -# $FreeBSD: src/etc/rc.initdiskless,v 1.53 2008/05/15 11:00:23 bms Exp $ +# $FreeBSD: src/etc/rc.initdiskless,v 1.54 2008/09/09 18:40:50 bms Exp $ # On entry to this script the entire system consists of a read-only root # mounted via NFS. The kernel has run BOOTP and configured an interface @@ -73,6 +73,16 @@ # If this file exists, then failure to execute the mount # command contained in /conf/T/M/remount is non-fatal. # +# /conf/T/M/remount_subdir +# If this file exists, then the behaviour of /conf/T/M/remount +# changes as follows: +# 1. /conf/T/M/remount is invoked to mount the root of the +# filesystem where the configuration data exists on a +# temporary mountpoint. +# 2. /conf/T/M/remount_subdir is then invoked to mount a +# *subdirectory* of the filesystem mounted by +# /conf/T/M/remount on /conf/T/M/. +# # /conf/T/M/diskless_remount # The contents of the file points to an NFS filesystem, # possibly followed by mount_nfs options. If the server name @@ -296,10 +306,33 @@ # remount. Beware, the command is in the file itself! if [ -f $j/remount ]; then - nfspt=`/bin/cat $j/remount` - $nfspt $j - chkerr $? "$nfspt $j" - to_umount="$j ${to_umount}" # XXX hope it is really a mount! + if [ -f $j/remount_subdir ]; then + k="/conf.tmp/$i/$subdir" + [ -d $k ] || continue + + # Mount the filesystem root where the config data is + # on the temporary mount point. + nfspt=`/bin/cat $j/remount` + $nfspt $k + chkerr $? "$nfspt $k" + + # Now use a nullfs mount to get the data where we + # really want to see it. + remount_subdir=`/bin/cat $j/remount_subdir` + remount_subdir_cmd="mount -t nullfs $k/$remount_subdir" + + $remount_subdir_cmd $j + chkerr $? "$remount_subdir_cmd $j" + + # XXX check order -- we must force $k to be unmounted + # after j, as j depends on k. + to_umount="$j $k ${to_umount}" + else + nfspt=`/bin/cat $j/remount` + $nfspt $j + chkerr $? "$nfspt $j" + to_umount="$j ${to_umount}" # XXX hope it is really a mount! + fi fi # NFS remount ==== //depot/projects/arm/src/include/rpc/svc_auth.h#2 (text+ko) ==== @@ -30,7 +30,7 @@ * * from: @(#)svc_auth.h 1.6 86/07/16 SMI * @(#)svc_auth.h 2.1 88/07/29 4.0 RPCSRC - * $FreeBSD: src/include/rpc/svc_auth.h,v 1.14 2002/03/23 17:24:55 imp Exp $ + * $FreeBSD: src/include/rpc/svc_auth.h,v 1.15 2008/09/09 14:15:55 dfr Exp $ */ /* @@ -46,6 +46,8 @@ * Server side authenticator */ __BEGIN_DECLS +extern struct svc_auth_ops svc_auth_null_ops; + extern enum auth_stat _authenticate(struct svc_req *, struct rpc_msg *); extern int svc_auth_reg(int, enum auth_stat (*)(struct svc_req *, struct rpc_msg *)); ==== //depot/projects/arm/src/lib/libc/gen/arc4random.c#5 (text+ko) ==== @@ -33,7 +33,7 @@ */ #include -__FBSDID("$FreeBSD: src/lib/libc/gen/arc4random.c,v 1.24 2008/08/03 20:15:22 ache Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/gen/arc4random.c,v 1.25 2008/09/09 09:46:36 ache Exp $"); #include "namespace.h" #include @@ -54,7 +54,7 @@ static pthread_mutex_t arc4random_mtx = PTHREAD_MUTEX_INITIALIZER; -#define RANDOMDEV "/dev/urandom" +#define RANDOMDEV "/dev/random" #define KEYSIZE 128 #define THREAD_LOCK() \ do { \ @@ -193,6 +193,7 @@ THREAD_LOCK(); arc4_check_init(); arc4_stir(); + rs_stired = 1; THREAD_UNLOCK(); } ==== //depot/projects/arm/src/lib/libc/rpc/svc.c#3 (text+ko) ==== @@ -34,7 +34,7 @@ static char *sccsid = "@(#)svc.c 2.4 88/08/11 4.0 RPCSRC"; #endif #include -__FBSDID("$FreeBSD: src/lib/libc/rpc/svc.c,v 1.25 2008/08/06 14:02:05 dfr Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/rpc/svc.c,v 1.26 2008/09/09 14:15:55 dfr Exp $"); /* * svc.c, Server-side remote procedure call interface. @@ -569,6 +569,7 @@ ext = mem_alloc(sizeof(SVCXPRT_EXT)); memset(ext, 0, sizeof(SVCXPRT_EXT)); xprt->xp_p3 = ext; + ext->xp_auth.svc_ah_ops = &svc_auth_null_ops; return (xprt); } ==== //depot/projects/arm/src/lib/libc/rpc/svc_auth.c#3 (text+ko) ==== @@ -37,7 +37,7 @@ static char sccsid[] = "@(#)svc_auth.c 1.26 89/02/07 Copyr 1984 Sun Micro"; #endif #include -__FBSDID("$FreeBSD: src/lib/libc/rpc/svc_auth.c,v 1.14 2008/08/06 14:02:05 dfr Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/rpc/svc_auth.c,v 1.15 2008/09/09 14:15:55 dfr Exp $"); /* * svc_auth.c, Server-side rpc authenticator interface. @@ -75,7 +75,7 @@ }; static struct authsvc *Auths = NULL; -static struct svc_auth_ops svc_auth_null_ops; +struct svc_auth_ops svc_auth_null_ops; /* * The call rpc message, msg has been obtained from the wire. The msg contains @@ -162,7 +162,7 @@ return (xdr_func(xdrs, xdr_ptr)); } -static struct svc_auth_ops svc_auth_null_ops = { +struct svc_auth_ops svc_auth_null_ops = { svcauth_null_wrap, svcauth_null_wrap, }; ==== //depot/projects/arm/src/lib/libc/stdlib/malloc.c#18 (text+ko) ==== @@ -156,7 +156,7 @@ #define MALLOC_DSS #include -__FBSDID("$FreeBSD: src/lib/libc/stdlib/malloc.c,v 1.178 2008/09/06 05:26:31 marcel Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/stdlib/malloc.c,v 1.179 2008/09/10 14:27:34 jasone Exp $"); #include "libc_private.h" #ifdef MALLOC_DEBUG @@ -174,6 +174,7 @@ #include /* Must come after several other sys/ includes. */ #include +#include #include #include @@ -213,55 +214,43 @@ #define STRERROR_BUF 64 /* - * The const_size2bin table is sized according to PAGESIZE_2POW, but for - * correctness reasons, we never assume that - * (pagesize == (1U << * PAGESIZE_2POW)). - * * Minimum alignment of allocations is 2^QUANTUM_2POW bytes. */ #ifdef __i386__ -# define PAGESIZE_2POW 12 # define QUANTUM_2POW 4 # define SIZEOF_PTR_2POW 2 # define CPU_SPINWAIT __asm__ volatile("pause") #endif #ifdef __ia64__ -# define PAGESIZE_2POW 13 # define QUANTUM_2POW 4 # define SIZEOF_PTR_2POW 3 #endif #ifdef __alpha__ -# define PAGESIZE_2POW 13 # define QUANTUM_2POW 4 # define SIZEOF_PTR_2POW 3 # define NO_TLS #endif #ifdef __sparc64__ -# define PAGESIZE_2POW 13 # define QUANTUM_2POW 4 # define SIZEOF_PTR_2POW 3 # define NO_TLS #endif #ifdef __amd64__ -# define PAGESIZE_2POW 12 # define QUANTUM_2POW 4 # define SIZEOF_PTR_2POW 3 # define CPU_SPINWAIT __asm__ volatile("pause") #endif #ifdef __arm__ -# define PAGESIZE_2POW 12 # define QUANTUM_2POW 3 # define SIZEOF_PTR_2POW 2 # define NO_TLS #endif #ifdef __mips__ -# define PAGESIZE_2POW 12 # define QUANTUM_2POW 3 # define SIZEOF_PTR_2POW 2 # define NO_TLS #endif #ifdef __powerpc__ -# define PAGESIZE_2POW 12 # define QUANTUM_2POW 4 # define SIZEOF_PTR_2POW 2 #endif @@ -361,7 +350,7 @@ #define RUN_MAX_OVRHD_RELAX 0x00001800U /* Put a cap on small object run size. This overrides RUN_MAX_OVRHD. */ -#define RUN_MAX_SMALL (12 * pagesize) +#define RUN_MAX_SMALL (12 * PAGE_SIZE) /* * Hyper-threaded CPUs may need a special instruction inside spin loops in @@ -733,7 +722,8 @@ /* * bins is used to store rings of free regions of the following sizes, - * assuming a 16-byte quantum, 4kB pagesize, and default MALLOC_OPTIONS. + * assuming a 16-byte quantum, 4kB page size, and default + * MALLOC_OPTIONS. * * bins[i] | size | * --------+------+ @@ -794,11 +784,6 @@ /* Number of CPUs. */ static unsigned ncpus; -/* VM page size. */ -static size_t pagesize; -static size_t pagesize_mask; -static size_t pagesize_2pow; - /* Various bin-related settings. */ #ifdef MALLOC_TINY /* Number of (2^n)-spaced tiny bins. */ # define ntbins ((unsigned)(QUANTUM_2POW - TINY_MIN_2POW)) @@ -835,7 +820,7 @@ #define S2B_64(i) S2B_32(i) S2B_32(i) #define S2B_128(i) S2B_64(i) S2B_64(i) #define S2B_256(i) S2B_128(i) S2B_128(i) -static const uint8_t const_size2bin[(1U << PAGESIZE_2POW) - 255] = { +static const uint8_t const_size2bin[PAGE_SIZE - 255] = { S2B_1(0xffU) /* 0 */ #if (QUANTUM_2POW == 4) /* 64-bit system ************************/ @@ -906,7 +891,7 @@ S2B_256(S2B_SMIN + 10) /* 3328 */ S2B_256(S2B_SMIN + 11) /* 3584 */ S2B_256(S2B_SMIN + 12) /* 3840 */ -#if (PAGESIZE_2POW == 13) +#if (PAGE_SHIFT == 13) S2B_256(S2B_SMIN + 13) /* 4096 */ S2B_256(S2B_SMIN + 14) /* 4352 */ S2B_256(S2B_SMIN + 15) /* 4608 */ @@ -1345,9 +1330,9 @@ #define SUBPAGE_CEILING(s) \ (((s) + SUBPAGE_MASK) & ~SUBPAGE_MASK) -/* Return the smallest pagesize multiple that is >= s. */ +/* Return the smallest PAGE_SIZE multiple that is >= s. */ #define PAGE_CEILING(s) \ - (((s) + pagesize_mask) & ~pagesize_mask) + (((s) + PAGE_MASK) & ~PAGE_MASK) #ifdef MALLOC_TINY /* Compute the smallest power of 2 that is >= x. */ @@ -1693,7 +1678,7 @@ i < ntbins + nqbins + ncbins ? "C" : "S", arena->bins[i].reg_size, arena->bins[i].nregs, - arena->bins[i].run_size >> pagesize_2pow, + arena->bins[i].run_size >> PAGE_SHIFT, #ifdef MALLOC_MAG (__isthreaded && opt_mag) ? arena->bins[i].stats.nmags : @@ -2335,8 +2320,8 @@ arena_avail_comp(arena_chunk_map_t *a, arena_chunk_map_t *b) { int ret; - size_t a_size = a->bits & ~pagesize_mask; - size_t b_size = b->bits & ~pagesize_mask; + size_t a_size = a->bits & ~PAGE_MASK; + size_t b_size = b->bits & ~PAGE_MASK; ret = (a_size > b_size) - (a_size < b_size); if (ret == 0) { @@ -2521,7 +2506,7 @@ SSIZE_INV(4), SSIZE_INV(5), SSIZE_INV(6), SSIZE_INV(7), SSIZE_INV(8), SSIZE_INV(9), SSIZE_INV(10), SSIZE_INV(11), SSIZE_INV(12), SSIZE_INV(13), SSIZE_INV(14), SSIZE_INV(15) -#if (PAGESIZE_2POW == 13) +#if (PAGE_SHIFT == 13) , SSIZE_INV(16), SSIZE_INV(17), SSIZE_INV(18), SSIZE_INV(19), SSIZE_INV(20), SSIZE_INV(21), SSIZE_INV(22), SSIZE_INV(23), @@ -2530,7 +2515,7 @@ #endif }; assert(SUBPAGE * (((sizeof(ssize_invs)) / sizeof(unsigned)) + 3) - >= (1U << PAGESIZE_2POW)); + >= PAGE_SIZE); if (size < (((sizeof(ssize_invs) / sizeof(unsigned)) + 2) << SUBPAGE_2POW)) { @@ -2562,10 +2547,10 @@ chunk = (arena_chunk_t *)CHUNK_ADDR2BASE(run); old_ndirty = chunk->ndirty; run_ind = (unsigned)(((uintptr_t)run - (uintptr_t)chunk) - >> pagesize_2pow); - total_pages = (chunk->map[run_ind].bits & ~pagesize_mask) >> - pagesize_2pow; - need_pages = (size >> pagesize_2pow); + >> PAGE_SHIFT); + total_pages = (chunk->map[run_ind].bits & ~PAGE_MASK) >> + PAGE_SHIFT; + need_pages = (size >> PAGE_SHIFT); assert(need_pages > 0); assert(need_pages <= total_pages); rem_pages = total_pages - need_pages; @@ -2575,11 +2560,11 @@ /* Keep track of trailing unused pages for later use. */ if (rem_pages > 0) { chunk->map[run_ind+need_pages].bits = (rem_pages << - pagesize_2pow) | (chunk->map[run_ind+need_pages].bits & - pagesize_mask); + PAGE_SHIFT) | (chunk->map[run_ind+need_pages].bits & + PAGE_MASK); chunk->map[run_ind+total_pages-1].bits = (rem_pages << - pagesize_2pow) | (chunk->map[run_ind+total_pages-1].bits & - pagesize_mask); + PAGE_SHIFT) | (chunk->map[run_ind+total_pages-1].bits & + PAGE_MASK); arena_avail_tree_insert(&arena->runs_avail, &chunk->map[run_ind+need_pages]); } @@ -2590,7 +2575,7 @@ if ((chunk->map[run_ind + i].bits & CHUNK_MAP_ZEROED) == 0) { memset((void *)((uintptr_t)chunk + ((run_ind - + i) << pagesize_2pow)), 0, pagesize); + + i) << PAGE_SHIFT)), 0, PAGE_SIZE); /* CHUNK_MAP_ZEROED is cleared below. */ } } @@ -2706,7 +2691,7 @@ arena_chunk_map_t *mapelm, key; assert(size <= arena_maxclass); - assert((size & pagesize_mask) == 0); + assert((size & PAGE_MASK) == 0); /* Search the arena's chunks for the lowest best fit. */ key.bits = size | CHUNK_MAP_KEY; @@ -2717,7 +2702,7 @@ / sizeof(arena_chunk_map_t); run = (arena_run_t *)((uintptr_t)run_chunk + (pageind - << pagesize_2pow)); + << PAGE_SHIFT)); arena_run_split(arena, run, size, large, zero); return (run); } @@ -2729,7 +2714,7 @@ if (chunk == NULL) return (NULL); run = (arena_run_t *)((uintptr_t)chunk + (arena_chunk_header_npages << - pagesize_2pow)); + PAGE_SHIFT)); /* Update page map. */ arena_run_split(arena, run, size, large, zero); return (run); @@ -2781,7 +2766,7 @@ arena->ndirty -= npages; madvise((void *)((uintptr_t)chunk + (i << - pagesize_2pow)), (npages << pagesize_2pow), + PAGE_SHIFT)), (npages << PAGE_SHIFT), MADV_FREE); #ifdef MALLOC_STATS arena->stats.nmadvise++; @@ -2807,14 +2792,14 @@ chunk = (arena_chunk_t *)CHUNK_ADDR2BASE(run); run_ind = (size_t)(((uintptr_t)run - (uintptr_t)chunk) - >> pagesize_2pow); + >> PAGE_SHIFT); assert(run_ind >= arena_chunk_header_npages); assert(run_ind < chunk_npages); if ((chunk->map[run_ind].bits & CHUNK_MAP_LARGE) != 0) - size = chunk->map[run_ind].bits & ~pagesize_mask; + size = chunk->map[run_ind].bits & ~PAGE_MASK; else size = run->bin->run_size; - run_pages = (size >> pagesize_2pow); + run_pages = (size >> PAGE_SHIFT); /* Mark pages as unallocated in the chunk map. */ if (dirty) { @@ -2841,15 +2826,15 @@ } } chunk->map[run_ind].bits = size | (chunk->map[run_ind].bits & - pagesize_mask); + PAGE_MASK); chunk->map[run_ind+run_pages-1].bits = size | - (chunk->map[run_ind+run_pages-1].bits & pagesize_mask); + (chunk->map[run_ind+run_pages-1].bits & PAGE_MASK); /* Try to coalesce forward. */ if (run_ind + run_pages < chunk_npages && (chunk->map[run_ind+run_pages].bits & CHUNK_MAP_ALLOCATED) == 0) { size_t nrun_size = chunk->map[run_ind+run_pages].bits & - ~pagesize_mask; + ~PAGE_MASK; /* * Remove successor from runs_avail; the coalesced run is @@ -2859,22 +2844,22 @@ &chunk->map[run_ind+run_pages]); size += nrun_size; - run_pages = size >> pagesize_2pow; + run_pages = size >> PAGE_SHIFT; - assert((chunk->map[run_ind+run_pages-1].bits & ~pagesize_mask) + assert((chunk->map[run_ind+run_pages-1].bits & ~PAGE_MASK) == nrun_size); chunk->map[run_ind].bits = size | (chunk->map[run_ind].bits & - pagesize_mask); + PAGE_MASK); chunk->map[run_ind+run_pages-1].bits = size | - (chunk->map[run_ind+run_pages-1].bits & pagesize_mask); + (chunk->map[run_ind+run_pages-1].bits & PAGE_MASK); } /* Try to coalesce backward. */ if (run_ind > arena_chunk_header_npages && (chunk->map[run_ind-1].bits & CHUNK_MAP_ALLOCATED) == 0) { - size_t prun_size = chunk->map[run_ind-1].bits & ~pagesize_mask; + size_t prun_size = chunk->map[run_ind-1].bits & ~PAGE_MASK; - run_ind -= prun_size >> pagesize_2pow; + run_ind -= prun_size >> PAGE_SHIFT; /* * Remove predecessor from runs_avail; the coalesced run is @@ -2884,21 +2869,21 @@ &chunk->map[run_ind]); size += prun_size; - run_pages = size >> pagesize_2pow; + run_pages = size >> PAGE_SHIFT; - assert((chunk->map[run_ind].bits & ~pagesize_mask) == + assert((chunk->map[run_ind].bits & ~PAGE_MASK) == prun_size); chunk->map[run_ind].bits = size | (chunk->map[run_ind].bits & - pagesize_mask); + PAGE_MASK); chunk->map[run_ind+run_pages-1].bits = size | - (chunk->map[run_ind+run_pages-1].bits & pagesize_mask); + (chunk->map[run_ind+run_pages-1].bits & PAGE_MASK); } /* Insert into runs_avail, now that coalescing is complete. */ arena_avail_tree_insert(&arena->runs_avail, &chunk->map[run_ind]); /* Deallocate chunk if it is now completely unused. */ - if ((chunk->map[arena_chunk_header_npages].bits & (~pagesize_mask | + if ((chunk->map[arena_chunk_header_npages].bits & (~PAGE_MASK | CHUNK_MAP_ALLOCATED)) == arena_maxclass) arena_chunk_dealloc(arena, chunk); @@ -2911,8 +2896,8 @@ arena_run_trim_head(arena_t *arena, arena_chunk_t *chunk, arena_run_t *run, size_t oldsize, size_t newsize) { - size_t pageind = ((uintptr_t)run - (uintptr_t)chunk) >> pagesize_2pow; - size_t head_npages = (oldsize - newsize) >> pagesize_2pow; + size_t pageind = ((uintptr_t)run - (uintptr_t)chunk) >> PAGE_SHIFT; + size_t head_npages = (oldsize - newsize) >> PAGE_SHIFT; assert(oldsize > newsize); @@ -2932,8 +2917,8 @@ arena_run_trim_tail(arena_t *arena, arena_chunk_t *chunk, arena_run_t *run, size_t oldsize, size_t newsize, bool dirty) { - size_t pageind = ((uintptr_t)run - (uintptr_t)chunk) >> pagesize_2pow; - size_t npages = newsize >> pagesize_2pow; + size_t pageind = ((uintptr_t)run - (uintptr_t)chunk) >> PAGE_SHIFT; + size_t npages = newsize >> PAGE_SHIFT; assert(oldsize > newsize); @@ -2962,7 +2947,7 @@ if (mapelm != NULL) { /* run is guaranteed to have available space. */ arena_run_tree_remove(&bin->runs, mapelm); - run = (arena_run_t *)(mapelm->bits & ~pagesize_mask); + run = (arena_run_t *)(mapelm->bits & ~PAGE_MASK); #ifdef MALLOC_STATS bin->stats.reruns++; #endif @@ -3053,7 +3038,7 @@ unsigned good_nregs, good_mask_nelms, good_reg0_offset; unsigned try_nregs, try_mask_nelms, try_reg0_offset; - assert(min_run_size >= pagesize); + assert(min_run_size >= PAGE_SIZE); assert(min_run_size <= arena_maxclass); assert(min_run_size <= RUN_MAX_SMALL); @@ -3089,7 +3074,7 @@ good_reg0_offset = try_reg0_offset; /* Try more aggressive settings. */ - try_run_size += pagesize; + try_run_size += PAGE_SIZE; try_nregs = ((try_run_size - sizeof(arena_run_t)) / bin->reg_size) + 1; /* Counter-act try_nregs-- in loop. */ do { @@ -3405,8 +3390,8 @@ size_t offset; arena_chunk_t *chunk; - assert((size & pagesize_mask) == 0); - assert((alignment & pagesize_mask) == 0); + assert((size & PAGE_MASK) == 0); + assert((alignment & PAGE_MASK) == 0); #ifdef MALLOC_BALANCE arena_lock_balance(arena); @@ -3422,7 +3407,7 @@ chunk = (arena_chunk_t *)CHUNK_ADDR2BASE(ret); offset = (uintptr_t)ret & (alignment - 1); - assert((offset & pagesize_mask) == 0); + assert((offset & PAGE_MASK) == 0); assert(offset < alloc_size); if (offset == 0) arena_run_trim_tail(arena, chunk, ret, alloc_size, size, false); @@ -3492,7 +3477,7 @@ return (NULL); } - if (ceil_size <= pagesize || (alignment <= pagesize + if (ceil_size <= PAGE_SIZE || (alignment <= PAGE_SIZE && ceil_size <= arena_maxclass)) ret = arena_malloc(choose_arena(), ceil_size, false); else { @@ -3506,7 +3491,7 @@ ceil_size = PAGE_CEILING(size); /* * (ceil_size < size) protects against very large sizes within - * pagesize of SIZE_T_MAX. + * PAGE_SIZE of SIZE_T_MAX. * * (ceil_size + alignment < ceil_size) protects against the * combination of maximal alignment and ceil_size large enough @@ -3526,18 +3511,18 @@ * would need to allocate in order to guarantee the alignment. */ if (ceil_size >= alignment) - run_size = ceil_size + alignment - pagesize; + run_size = ceil_size + alignment - PAGE_SIZE; else { /* * It is possible that (alignment << 1) will cause * overflow, but it doesn't matter because we also - * subtract pagesize, which in the case of overflow + * subtract PAGE_SIZE, which in the case of overflow * leaves us with a very large run_size. That causes * the first conditional below to fail, which means * that the bogus run_size value never gets used for * anything important. */ - run_size = (alignment << 1) - pagesize; + run_size = (alignment << 1) - PAGE_SIZE; } if (run_size <= arena_maxclass) { @@ -3565,15 +3550,15 @@ assert(CHUNK_ADDR2BASE(ptr) != ptr); chunk = (arena_chunk_t *)CHUNK_ADDR2BASE(ptr); - pageind = (((uintptr_t)ptr - (uintptr_t)chunk) >> pagesize_2pow); + pageind = (((uintptr_t)ptr - (uintptr_t)chunk) >> PAGE_SHIFT); mapbits = chunk->map[pageind].bits; assert((mapbits & CHUNK_MAP_ALLOCATED) != 0); if ((mapbits & CHUNK_MAP_LARGE) == 0) { - arena_run_t *run = (arena_run_t *)(mapbits & ~pagesize_mask); + arena_run_t *run = (arena_run_t *)(mapbits & ~PAGE_MASK); assert(run->magic == ARENA_RUN_MAGIC); ret = run->bin->reg_size; } else { - ret = mapbits & ~pagesize_mask; + ret = mapbits & ~PAGE_MASK; assert(ret != 0); } @@ -3622,7 +3607,7 @@ arena_bin_t *bin; size_t size; - run = (arena_run_t *)(mapelm->bits & ~pagesize_mask); + run = (arena_run_t *)(mapelm->bits & ~PAGE_MASK); assert(run->magic == ARENA_RUN_MAGIC); bin = run->bin; size = bin->reg_size; @@ -3639,7 +3624,7 @@ bin->runcur = NULL; else if (bin->nregs != 1) { size_t run_pageind = (((uintptr_t)run - - (uintptr_t)chunk)) >> pagesize_2pow; + (uintptr_t)chunk)) >> PAGE_SHIFT; arena_chunk_map_t *run_mapelm = &chunk->map[run_pageind]; /* @@ -3670,7 +3655,7 @@ CHUNK_ADDR2BASE(bin->runcur); size_t runcur_pageind = (((uintptr_t)bin->runcur - - (uintptr_t)runcur_chunk)) >> pagesize_2pow; + (uintptr_t)runcur_chunk)) >> PAGE_SHIFT; arena_chunk_map_t *runcur_mapelm = &runcur_chunk->map[runcur_pageind]; @@ -3681,7 +3666,7 @@ bin->runcur = run; } else { size_t run_pageind = (((uintptr_t)run - - (uintptr_t)chunk)) >> pagesize_2pow; + (uintptr_t)chunk)) >> PAGE_SHIFT; arena_chunk_map_t *run_mapelm = &chunk->map[run_pageind]; @@ -3721,7 +3706,7 @@ chunk = (arena_chunk_t *)CHUNK_ADDR2BASE(round); if (chunk->arena == arena) { size_t pageind = (((uintptr_t)round - - (uintptr_t)chunk) >> pagesize_2pow); + (uintptr_t)chunk) >> PAGE_SHIFT); arena_chunk_map_t *mapelm = &chunk->map[pageind]; arena_dalloc_small(arena, chunk, round, mapelm); @@ -3756,9 +3741,9 @@ chunk = (arena_chunk_t *)CHUNK_ADDR2BASE(ptr); arena = chunk->arena; - pageind = (((uintptr_t)ptr - (uintptr_t)chunk) >> pagesize_2pow); + pageind = (((uintptr_t)ptr - (uintptr_t)chunk) >> PAGE_SHIFT); mapelm = &chunk->map[pageind]; - run = (arena_run_t *)(mapelm->bits & ~pagesize_mask); + run = (arena_run_t *)(mapelm->bits & ~PAGE_MASK); assert(run->magic == ARENA_RUN_MAGIC); bin = run->bin; binind = ((uintptr_t)bin - (uintptr_t)&arena->bins) / @@ -3823,8 +3808,8 @@ #endif { size_t pageind = ((uintptr_t)ptr - (uintptr_t)chunk) >> - pagesize_2pow; - size_t size = chunk->map[pageind].bits & ~pagesize_mask; + PAGE_SHIFT; + size_t size = chunk->map[pageind].bits & ~PAGE_MASK; #ifdef MALLOC_STATS if (opt_junk) @@ -3854,7 +3839,7 @@ assert(ptr != NULL); assert(CHUNK_ADDR2BASE(ptr) != ptr); - pageind = (((uintptr_t)ptr - (uintptr_t)chunk) >> pagesize_2pow); + pageind = (((uintptr_t)ptr - (uintptr_t)chunk) >> PAGE_SHIFT); mapelm = &chunk->map[pageind]; assert((mapelm->bits & CHUNK_MAP_ALLOCATED) != 0); if ((mapelm->bits & CHUNK_MAP_LARGE) == 0) { @@ -3927,10 +3912,10 @@ arena_ralloc_large_grow(arena_t *arena, arena_chunk_t *chunk, void *ptr, size_t size, size_t oldsize) { - size_t pageind = ((uintptr_t)ptr - (uintptr_t)chunk) >> pagesize_2pow; - size_t npages = oldsize >> pagesize_2pow; + size_t pageind = ((uintptr_t)ptr - (uintptr_t)chunk) >> PAGE_SHIFT; + size_t npages = oldsize >> PAGE_SHIFT; - assert(oldsize == (chunk->map[pageind].bits & ~pagesize_mask)); + assert(oldsize == (chunk->map[pageind].bits & ~PAGE_MASK)); /* Try to extend the run. */ assert(size > oldsize); @@ -3941,14 +3926,14 @@ #endif if (pageind + npages < chunk_npages && (chunk->map[pageind+npages].bits & CHUNK_MAP_ALLOCATED) == 0 && (chunk->map[pageind+npages].bits & - ~pagesize_mask) >= size - oldsize) { + ~PAGE_MASK) >= size - oldsize) { /* * The next run is available and sufficiently large. Split the * following run, then merge the first part with the existing * allocation. */ arena_run_split(arena, (arena_run_t *)((uintptr_t)chunk + - ((pageind+npages) << pagesize_2pow)), size - oldsize, true, + ((pageind+npages) << PAGE_SHIFT)), size - oldsize, true, false); chunk->map[pageind].bits = size | CHUNK_MAP_LARGE | @@ -4097,7 +4082,7 @@ #endif /* Initialize bins. */ - prev_run_size = pagesize; + prev_run_size = PAGE_SIZE; i = 0; #ifdef MALLOC_TINY @@ -4232,7 +4217,7 @@ chunk = CHUNK_ADDR2BASE(mag); arena = chunk->arena; - pageind = (((uintptr_t)mag - (uintptr_t)chunk) >> pagesize_2pow); + pageind = (((uintptr_t)mag - (uintptr_t)chunk) >> PAGE_SHIFT); mapelm = &chunk->map[pageind]; assert(mag->nrounds == 0); @@ -4280,7 +4265,7 @@ chunk = CHUNK_ADDR2BASE(rack); arena = chunk->arena; - pageind = (((uintptr_t)rack - (uintptr_t)chunk) >> pagesize_2pow); + pageind = (((uintptr_t)rack - (uintptr_t)chunk) >> PAGE_SHIFT); mapelm = &chunk->map[pageind]; malloc_spin_lock(&arena->lock); @@ -4803,23 +4788,6 @@ } } - /* Get page size. */ - { - long result; - - result = sysconf(_SC_PAGESIZE); - assert(result != -1); - pagesize = (unsigned)result; - - /* - * We assume that pagesize is a power of 2 when calculating - * pagesize_mask and pagesize_2pow. - */ - assert(((result - 1) & result) == 0); - pagesize_mask = result - 1; - pagesize_2pow = ffs((int)result) - 1; - } - for (i = 0; i < 3; i++) { unsigned j; >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Thu Sep 11 23:27:31 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9C5751065682; Thu, 11 Sep 2008 23:27: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 600AF106567E for ; Thu, 11 Sep 2008 23:27:31 +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 505348FC25 for ; Thu, 11 Sep 2008 23:27:31 +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 m8BNRVRw046106 for ; Thu, 11 Sep 2008 23:27:31 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m8BNRV6P046104 for perforce@freebsd.org; Thu, 11 Sep 2008 23:27:31 GMT (envelope-from sam@freebsd.org) Date: Thu, 11 Sep 2008 23:27:31 GMT Message-Id: <200809112327.m8BNRV6P046104@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 149633 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 11 Sep 2008 23:27:31 -0000 http://perforce.freebsd.org/chv.cgi?CH=149633 Change 149633 by sam@sam_ebb on 2008/09/11 23:27:03 o deal with a pending bar tx when a node is cleaned up o pull tx ampdu setup/cleanup work into functions; more stuff will be added later Affected files ... .. //depot/projects/vap/sys/net80211/ieee80211_ht.c#51 edit Differences ... ==== //depot/projects/vap/sys/net80211/ieee80211_ht.c#51 (text+ko) ==== @@ -118,6 +118,8 @@ const uint8_t *frm, const uint8_t *efrm); static void ieee80211_bar_response(struct ieee80211_node *ni, struct ieee80211_tx_ampdu *tap, int status); +static void ampdu_tx_stop(struct ieee80211_tx_ampdu *tap); +static void bar_stop_timer(struct ieee80211_tx_ampdu *tap); void ieee80211_ht_attach(struct ieee80211com *ic) @@ -821,7 +823,6 @@ void ieee80211_ht_node_cleanup(struct ieee80211_node *ni) { - struct ieee80211com *ic = ni->ni_ic; int i; KASSERT(ni->ni_flags & IEEE80211_NODE_HT, ("not an HT node")); @@ -829,18 +830,8 @@ /* XXX optimize this */ for (i = 0; i < WME_NUM_AC; i++) { struct ieee80211_tx_ampdu *tap = &ni->ni_tx_ampdu[i]; - if (tap->txa_flags & IEEE80211_AGGR_SETUP) { - /* - * Stop BA stream if setup so driver has a chance - * to reclaim any resources it might have allocated. - */ - ic->ic_addba_stop(ni, tap); - tap->txa_lastsample = 0; - tap->txa_avgpps = 0; - /* NB: clearing NAK means we may re-send ADDBA */ - tap->txa_flags &= - ~(IEEE80211_AGGR_SETUP | IEEE80211_AGGR_NAK); - } + if (tap->txa_flags & IEEE80211_AGGR_SETUP) + ampdu_tx_stop(tap); } for (i = 0; i < WME_NUM_TID; i++) ampdu_rx_stop(&ni->ni_rx_ampdu[i]); @@ -1429,6 +1420,38 @@ } static void +ampdu_tx_setup(struct ieee80211_tx_ampdu *tap) +{ + callout_init(&tap->txa_timer, CALLOUT_MPSAFE); + tap->txa_flags |= IEEE80211_AGGR_SETUP; +} + +static void +ampdu_tx_stop(struct ieee80211_tx_ampdu *tap) +{ + struct ieee80211_node *ni = tap->txa_ni; + struct ieee80211com *ic = ni->ni_ic; + + KASSERT(tap->txa_flags & IEEE80211_AGGR_SETUP, + ("txa_flags 0x%x ac %d", tap->txa_flags, tap->txa_ac)); + + /* + * Stop BA stream if setup so driver has a chance + * to reclaim any resources it might have allocated. + */ + ic->ic_addba_stop(ni, tap); + /* + * Stop any pending BAR transmit. + */ + bar_stop_timer(tap); + + tap->txa_lastsample = 0; + tap->txa_avgpps = 0; + /* NB: clearing NAK means we may re-send ADDBA */ + tap->txa_flags &= ~(IEEE80211_AGGR_SETUP | IEEE80211_AGGR_NAK); +} + +static void addba_timeout(void *arg) { struct ieee80211_tx_ampdu *tap = arg; @@ -1828,8 +1851,7 @@ /* XXX locking */ if ((tap->txa_flags & IEEE80211_AGGR_SETUP) == 0) { /* do deferred setup of state */ - callout_init(&tap->txa_timer, CALLOUT_MPSAFE); - tap->txa_flags |= IEEE80211_AGGR_SETUP; + ampdu_tx_setup(tap); } /* XXX hack for not doing proper locking */ tap->txa_flags &= ~IEEE80211_AGGR_NAK; @@ -1952,7 +1974,6 @@ if (status) /* ACK'd */ bar_stop_timer(tap); ic->ic_bar_response(ni, tap, status); - } else { /* NB: just let timer expire so we pace requests */ } } From owner-p4-projects@FreeBSD.ORG Fri Sep 12 03:59:50 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C8897106567A; Fri, 12 Sep 2008 03:59: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 72790106566C for ; Fri, 12 Sep 2008 03:59:50 +0000 (UTC) (envelope-from sson@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 5FE4F8FC20 for ; Fri, 12 Sep 2008 03:59:50 +0000 (UTC) (envelope-from sson@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 m8C3xo7B053008 for ; Fri, 12 Sep 2008 03:59:50 GMT (envelope-from sson@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m8C3xCbO052968 for perforce@freebsd.org; Fri, 12 Sep 2008 03:59:12 GMT (envelope-from sson@FreeBSD.org) Date: Fri, 12 Sep 2008 03:59:12 GMT Message-Id: <200809120359.m8C3xCbO052968@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sson@FreeBSD.org using -f From: Stacey Son To: Perforce Change Reviews Cc: Subject: PERFORCE change 149637 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, 12 Sep 2008 03:59:51 -0000 http://perforce.freebsd.org/chv.cgi?CH=149637 Change 149637 by sson@sson_amd64 on 2008/09/12 03:58:25 MFC Affected files ... .. //depot/projects/trustedbsd/openbsm/bin/auditreduce/auditreduce.c#27 edit .. //depot/user/sson/audit/sys/Makefile#2 integrate .. //depot/user/sson/audit/sys/amd64/amd64/bpf_jit_machdep.c#2 integrate .. //depot/user/sson/audit/sys/amd64/amd64/bpf_jit_machdep.h#2 integrate .. //depot/user/sson/audit/sys/amd64/amd64/cpu_switch.S#2 integrate .. //depot/user/sson/audit/sys/amd64/amd64/db_disasm.c#2 integrate .. //depot/user/sson/audit/sys/amd64/amd64/dump_machdep.c#2 integrate .. //depot/user/sson/audit/sys/amd64/amd64/exception.S#2 integrate .. //depot/user/sson/audit/sys/amd64/amd64/genassym.c#2 integrate .. //depot/user/sson/audit/sys/amd64/amd64/local_apic.c#2 integrate .. //depot/user/sson/audit/sys/amd64/amd64/machdep.c#2 integrate .. //depot/user/sson/audit/sys/amd64/amd64/minidump_machdep.c#2 integrate .. //depot/user/sson/audit/sys/amd64/amd64/mp_machdep.c#2 integrate .. //depot/user/sson/audit/sys/amd64/amd64/pmap.c#2 integrate .. //depot/user/sson/audit/sys/amd64/amd64/support.S#2 integrate .. //depot/user/sson/audit/sys/amd64/amd64/trap.c#2 integrate .. //depot/user/sson/audit/sys/amd64/amd64/vm_machdep.c#2 integrate .. //depot/user/sson/audit/sys/amd64/conf/GENERIC#2 integrate .. //depot/user/sson/audit/sys/amd64/conf/NOTES#2 integrate .. //depot/user/sson/audit/sys/amd64/ia32/ia32_signal.c#2 integrate .. //depot/user/sson/audit/sys/amd64/include/cpufunc.h#2 integrate .. //depot/user/sson/audit/sys/amd64/include/pcb.h#2 integrate .. //depot/user/sson/audit/sys/amd64/include/pci_cfgreg.h#2 integrate .. //depot/user/sson/audit/sys/amd64/include/pcpu.h#2 integrate .. //depot/user/sson/audit/sys/amd64/include/segments.h#2 integrate .. //depot/user/sson/audit/sys/amd64/include/specialreg.h#2 integrate .. //depot/user/sson/audit/sys/amd64/linux32/linux32_genassym.c#2 integrate .. //depot/user/sson/audit/sys/amd64/linux32/linux32_locore.s#2 integrate .. //depot/user/sson/audit/sys/amd64/linux32/linux32_machdep.c#2 integrate .. //depot/user/sson/audit/sys/amd64/pci/pci_cfgreg.c#2 integrate .. //depot/user/sson/audit/sys/arm/arm/dump_machdep.c#2 integrate .. //depot/user/sson/audit/sys/arm/arm/intr.c#2 integrate .. //depot/user/sson/audit/sys/arm/arm/nexus.c#2 integrate .. //depot/user/sson/audit/sys/arm/at91/at91.c#2 integrate .. //depot/user/sson/audit/sys/arm/at91/at91_mci.c#2 integrate .. //depot/user/sson/audit/sys/arm/at91/at91_pio.c#2 integrate .. //depot/user/sson/audit/sys/arm/at91/at91_piovar.h#2 integrate .. //depot/user/sson/audit/sys/arm/at91/at91_pmc.c#2 integrate .. //depot/user/sson/audit/sys/arm/at91/at91_ssc.c#2 integrate .. //depot/user/sson/audit/sys/arm/at91/if_ate.c#2 integrate .. //depot/user/sson/audit/sys/arm/at91/kb920x_machdep.c#2 integrate .. //depot/user/sson/audit/sys/arm/conf/KB920X#2 integrate .. //depot/user/sson/audit/sys/arm/conf/NSLU#2 integrate .. //depot/user/sson/audit/sys/arm/include/endian.h#2 integrate .. //depot/user/sson/audit/sys/arm/include/intr.h#2 integrate .. //depot/user/sson/audit/sys/arm/include/pcpu.h#2 integrate .. //depot/user/sson/audit/sys/arm/xscale/ixp425/ixp425.c#2 integrate .. //depot/user/sson/audit/sys/arm/xscale/ixp425/ixp425_qmgr.c#2 integrate .. //depot/user/sson/audit/sys/boot/common/dev_net.c#2 integrate .. //depot/user/sson/audit/sys/boot/common/devopen.c#2 integrate .. //depot/user/sson/audit/sys/boot/forth/loader.conf#2 integrate .. //depot/user/sson/audit/sys/boot/i386/boot2/boot2.c#2 integrate .. //depot/user/sson/audit/sys/boot/i386/btx/btx/btx.S#2 integrate .. //depot/user/sson/audit/sys/boot/i386/gptboot/gptboot.c#2 integrate .. //depot/user/sson/audit/sys/boot/i386/loader/main.c#2 integrate .. //depot/user/sson/audit/sys/boot/pc98/loader/main.c#2 integrate .. //depot/user/sson/audit/sys/boot/powerpc/uboot/Makefile#2 integrate .. //depot/user/sson/audit/sys/boot/powerpc/uboot/metadata.c#2 delete .. //depot/user/sson/audit/sys/boot/powerpc/uboot/start.S#2 integrate .. //depot/user/sson/audit/sys/boot/sparc64/loader/locore.S#2 integrate .. //depot/user/sson/audit/sys/boot/sparc64/loader/main.c#2 integrate .. //depot/user/sson/audit/sys/boot/uboot/common/Makefile.inc#2 integrate .. //depot/user/sson/audit/sys/boot/uboot/common/main.c#2 integrate .. //depot/user/sson/audit/sys/boot/uboot/common/metadata.c#1 branch .. //depot/user/sson/audit/sys/boot/uboot/lib/Makefile#2 integrate .. //depot/user/sson/audit/sys/boot/uboot/lib/console.c#2 integrate .. //depot/user/sson/audit/sys/boot/uboot/lib/elf_freebsd.c#2 integrate .. //depot/user/sson/audit/sys/boot/uboot/lib/glue.c#2 integrate .. //depot/user/sson/audit/sys/boot/uboot/lib/glue.h#2 integrate .. //depot/user/sson/audit/sys/boot/uboot/lib/net.c#2 integrate .. //depot/user/sson/audit/sys/boot/uboot/lib/reboot.c#2 integrate .. //depot/user/sson/audit/sys/boot/uboot/lib/time.c#2 integrate .. //depot/user/sson/audit/sys/bsm/audit_kevents.h#2 integrate .. //depot/user/sson/audit/sys/cam/scsi/scsi_all.c#2 integrate .. //depot/user/sson/audit/sys/cam/scsi/scsi_da.c#2 integrate .. //depot/user/sson/audit/sys/cddl/compat/opensolaris/kern/opensolaris_kobj.c#2 integrate .. //depot/user/sson/audit/sys/cddl/compat/opensolaris/kern/opensolaris_vfs.c#2 integrate .. //depot/user/sson/audit/sys/cddl/compat/opensolaris/sys/cpuvar.h#2 integrate .. //depot/user/sson/audit/sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.c#2 integrate .. //depot/user/sson/audit/sys/cddl/contrib/opensolaris/uts/common/fs/gfs.c#2 integrate .. //depot/user/sson/audit/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_file.c#2 integrate .. //depot/user/sson/audit/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ctldir.c#2 integrate .. //depot/user/sson/audit/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_replay.c#2 integrate .. //depot/user/sson/audit/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c#2 integrate .. //depot/user/sson/audit/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_znode.c#2 integrate .. //depot/user/sson/audit/sys/cddl/contrib/opensolaris/uts/common/sys/isa_defs.h#2 integrate .. //depot/user/sson/audit/sys/compat/freebsd32/freebsd32_proto.h#2 integrate .. //depot/user/sson/audit/sys/compat/freebsd32/freebsd32_syscall.h#2 integrate .. //depot/user/sson/audit/sys/compat/freebsd32/freebsd32_syscalls.c#2 integrate .. //depot/user/sson/audit/sys/compat/freebsd32/freebsd32_sysent.c#2 integrate .. //depot/user/sson/audit/sys/compat/freebsd32/syscalls.master#2 integrate .. //depot/user/sson/audit/sys/compat/linprocfs/linprocfs.c#2 integrate .. //depot/user/sson/audit/sys/compat/linux/linux_file.c#2 integrate .. //depot/user/sson/audit/sys/compat/linux/linux_getcwd.c#2 integrate .. //depot/user/sson/audit/sys/compat/linux/linux_ioctl.c#2 integrate .. //depot/user/sson/audit/sys/compat/linux/linux_misc.c#2 integrate .. //depot/user/sson/audit/sys/compat/linux/linux_socket.c#2 integrate .. //depot/user/sson/audit/sys/compat/linux/linux_stats.c#2 integrate .. //depot/user/sson/audit/sys/compat/ndis/subr_ndis.c#2 integrate .. //depot/user/sson/audit/sys/compat/svr4/svr4_fcntl.c#2 integrate .. //depot/user/sson/audit/sys/compat/svr4/svr4_sockio.c#2 integrate .. //depot/user/sson/audit/sys/compat/svr4/svr4_stat.c#2 integrate .. //depot/user/sson/audit/sys/conf/NOTES#2 integrate .. //depot/user/sson/audit/sys/conf/files#2 integrate .. //depot/user/sson/audit/sys/conf/files.amd64#2 integrate .. //depot/user/sson/audit/sys/conf/files.i386#2 integrate .. //depot/user/sson/audit/sys/conf/files.mips#2 integrate .. //depot/user/sson/audit/sys/conf/files.pc98#2 integrate .. //depot/user/sson/audit/sys/conf/files.powerpc#2 integrate .. //depot/user/sson/audit/sys/conf/files.sparc64#2 integrate .. //depot/user/sson/audit/sys/conf/files.sun4v#2 integrate .. //depot/user/sson/audit/sys/conf/options#2 integrate .. //depot/user/sson/audit/sys/conf/options.i386#2 integrate .. //depot/user/sson/audit/sys/conf/options.sparc64#2 integrate .. //depot/user/sson/audit/sys/contrib/altq/altq/altq_subr.c#2 integrate .. //depot/user/sson/audit/sys/contrib/dev/ath/COPYRIGHT#2 integrate .. //depot/user/sson/audit/sys/contrib/dev/ath/README#2 integrate .. //depot/user/sson/audit/sys/contrib/dev/ath/ah.h#2 integrate .. //depot/user/sson/audit/sys/contrib/dev/ath/ah_desc.h#2 integrate .. //depot/user/sson/audit/sys/contrib/dev/ath/ah_devid.h#2 integrate .. //depot/user/sson/audit/sys/contrib/dev/ath/ah_soc.h#2 integrate .. //depot/user/sson/audit/sys/contrib/dev/ath/public/alpha-elf.hal.o.uu#2 integrate .. //depot/user/sson/audit/sys/contrib/dev/ath/public/alpha-elf.inc#2 integrate .. //depot/user/sson/audit/sys/contrib/dev/ath/public/alpha-elf.opt_ah.h#2 integrate .. //depot/user/sson/audit/sys/contrib/dev/ath/public/ap30.hal.o.uu#2 integrate .. //depot/user/sson/audit/sys/contrib/dev/ath/public/ap30.inc#2 integrate .. //depot/user/sson/audit/sys/contrib/dev/ath/public/ap43.hal.o.uu#2 integrate .. //depot/user/sson/audit/sys/contrib/dev/ath/public/ap43.inc#2 integrate .. //depot/user/sson/audit/sys/contrib/dev/ath/public/ap51.hal.o.uu#2 integrate .. //depot/user/sson/audit/sys/contrib/dev/ath/public/ap51.inc#2 integrate .. //depot/user/sson/audit/sys/contrib/dev/ath/public/ap61.hal.o.uu#2 integrate .. //depot/user/sson/audit/sys/contrib/dev/ath/public/ap61.inc#2 integrate .. //depot/user/sson/audit/sys/contrib/dev/ath/public/arm9-le-thumb-elf.hal.o.uu#2 integrate .. //depot/user/sson/audit/sys/contrib/dev/ath/public/arm9-le-thumb-elf.inc#2 integrate .. //depot/user/sson/audit/sys/contrib/dev/ath/public/arm9-le-thumb-elf.opt_ah.h#2 integrate .. //depot/user/sson/audit/sys/contrib/dev/ath/public/armv4-be-elf.hal.o.uu#2 integrate .. //depot/user/sson/audit/sys/contrib/dev/ath/public/armv4-be-elf.inc#2 integrate .. //depot/user/sson/audit/sys/contrib/dev/ath/public/armv4-be-elf.opt_ah.h#2 integrate .. //depot/user/sson/audit/sys/contrib/dev/ath/public/armv4-le-elf.hal.o.uu#2 integrate .. //depot/user/sson/audit/sys/contrib/dev/ath/public/armv4-le-elf.inc#2 integrate .. //depot/user/sson/audit/sys/contrib/dev/ath/public/armv4-le-elf.opt_ah.h#2 integrate .. //depot/user/sson/audit/sys/contrib/dev/ath/public/i386-elf.hal.o.uu#2 integrate .. //depot/user/sson/audit/sys/contrib/dev/ath/public/i386-elf.inc#2 integrate .. //depot/user/sson/audit/sys/contrib/dev/ath/public/i386-elf.opt_ah.h#2 integrate .. //depot/user/sson/audit/sys/contrib/dev/ath/public/mips-be-elf.hal.o.uu#2 integrate .. //depot/user/sson/audit/sys/contrib/dev/ath/public/mips-be-elf.inc#2 integrate .. //depot/user/sson/audit/sys/contrib/dev/ath/public/mips-be-elf.opt_ah.h#2 integrate .. //depot/user/sson/audit/sys/contrib/dev/ath/public/mips-le-elf.hal.o.uu#2 integrate .. //depot/user/sson/audit/sys/contrib/dev/ath/public/mips-le-elf.inc#2 integrate .. //depot/user/sson/audit/sys/contrib/dev/ath/public/mips-le-elf.opt_ah.h#2 integrate .. //depot/user/sson/audit/sys/contrib/dev/ath/public/mips1-be-elf.hal.o.uu#2 integrate .. //depot/user/sson/audit/sys/contrib/dev/ath/public/mips1-be-elf.inc#2 integrate .. //depot/user/sson/audit/sys/contrib/dev/ath/public/mips1-be-elf.opt_ah.h#2 integrate .. //depot/user/sson/audit/sys/contrib/dev/ath/public/mips1-le-elf.hal.o.uu#2 integrate .. //depot/user/sson/audit/sys/contrib/dev/ath/public/mips1-le-elf.inc#2 integrate .. //depot/user/sson/audit/sys/contrib/dev/ath/public/mips1-le-elf.opt_ah.h#2 integrate .. //depot/user/sson/audit/sys/contrib/dev/ath/public/mipsisa32-be-elf.hal.o.uu#2 integrate .. //depot/user/sson/audit/sys/contrib/dev/ath/public/mipsisa32-be-elf.inc#2 integrate .. //depot/user/sson/audit/sys/contrib/dev/ath/public/mipsisa32-be-elf.opt_ah.h#2 integrate .. //depot/user/sson/audit/sys/contrib/dev/ath/public/mipsisa32-le-elf.hal.o.uu#2 integrate .. //depot/user/sson/audit/sys/contrib/dev/ath/public/mipsisa32-le-elf.inc#2 integrate .. //depot/user/sson/audit/sys/contrib/dev/ath/public/mipsisa32-le-elf.opt_ah.h#2 integrate .. //depot/user/sson/audit/sys/contrib/dev/ath/public/powerpc-be-eabi.hal.o.uu#2 integrate .. //depot/user/sson/audit/sys/contrib/dev/ath/public/powerpc-be-eabi.inc#2 integrate .. //depot/user/sson/audit/sys/contrib/dev/ath/public/powerpc-be-eabi.opt_ah.h#2 integrate .. //depot/user/sson/audit/sys/contrib/dev/ath/public/powerpc-be-elf.hal.o.uu#2 integrate .. //depot/user/sson/audit/sys/contrib/dev/ath/public/powerpc-be-elf.inc#2 integrate .. //depot/user/sson/audit/sys/contrib/dev/ath/public/powerpc-be-elf.opt_ah.h#2 integrate .. //depot/user/sson/audit/sys/contrib/dev/ath/public/powerpc-le-eabi.hal.o.uu#2 integrate .. //depot/user/sson/audit/sys/contrib/dev/ath/public/powerpc-le-eabi.inc#2 integrate .. //depot/user/sson/audit/sys/contrib/dev/ath/public/powerpc-le-eabi.opt_ah.h#2 integrate .. //depot/user/sson/audit/sys/contrib/dev/ath/public/sh4-le-elf.hal.o.uu#2 integrate .. //depot/user/sson/audit/sys/contrib/dev/ath/public/sh4-le-elf.inc#2 integrate .. //depot/user/sson/audit/sys/contrib/dev/ath/public/sh4-le-elf.opt_ah.h#2 integrate .. //depot/user/sson/audit/sys/contrib/dev/ath/public/sparc-be-elf.hal.o.uu#2 integrate .. //depot/user/sson/audit/sys/contrib/dev/ath/public/sparc-be-elf.inc#2 integrate .. //depot/user/sson/audit/sys/contrib/dev/ath/public/sparc-be-elf.opt_ah.h#2 integrate .. //depot/user/sson/audit/sys/contrib/dev/ath/public/sparc64-be-elf.hal.o.uu#2 integrate .. //depot/user/sson/audit/sys/contrib/dev/ath/public/sparc64-be-elf.inc#2 integrate .. //depot/user/sson/audit/sys/contrib/dev/ath/public/sparc64-be-elf.opt_ah.h#2 integrate .. //depot/user/sson/audit/sys/contrib/dev/ath/public/wackelf.c#2 integrate .. //depot/user/sson/audit/sys/contrib/dev/ath/public/wisoc.hal.o.uu#1 branch .. //depot/user/sson/audit/sys/contrib/dev/ath/public/wisoc.inc#1 branch .. //depot/user/sson/audit/sys/contrib/dev/ath/public/wisoc.opt_ah.h#1 branch .. //depot/user/sson/audit/sys/contrib/dev/ath/public/x86_64-elf.hal.o.uu#2 integrate .. //depot/user/sson/audit/sys/contrib/dev/ath/public/x86_64-elf.inc#2 integrate .. //depot/user/sson/audit/sys/contrib/dev/ath/public/x86_64-elf.opt_ah.h#2 integrate .. //depot/user/sson/audit/sys/contrib/dev/ath/public/xscale-be-elf.hal.o.uu#2 integrate .. //depot/user/sson/audit/sys/contrib/dev/ath/public/xscale-be-elf.inc#2 integrate .. //depot/user/sson/audit/sys/contrib/dev/ath/public/xscale-be-elf.opt_ah.h#2 integrate .. //depot/user/sson/audit/sys/contrib/dev/ath/public/xscale-le-elf.hal.o.uu#2 integrate .. //depot/user/sson/audit/sys/contrib/dev/ath/public/xscale-le-elf.inc#2 integrate .. //depot/user/sson/audit/sys/contrib/dev/ath/public/xscale-le-elf.opt_ah.h#2 integrate .. //depot/user/sson/audit/sys/contrib/dev/ath/version.h#2 integrate .. //depot/user/sson/audit/sys/contrib/ipfilter/netinet/fil.c#2 integrate .. //depot/user/sson/audit/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c#2 integrate .. //depot/user/sson/audit/sys/contrib/pf/net/pf.c#2 integrate .. //depot/user/sson/audit/sys/contrib/pf/net/pf_if.c#2 integrate .. //depot/user/sson/audit/sys/contrib/pf/net/pf_ioctl.c#2 integrate .. //depot/user/sson/audit/sys/contrib/pf/net/pf_subr.c#2 integrate .. //depot/user/sson/audit/sys/contrib/rdma/rdma_cma.c#2 integrate .. //depot/user/sson/audit/sys/crypto/via/padlock.c#2 integrate .. //depot/user/sson/audit/sys/ddb/db_output.c#2 integrate .. //depot/user/sson/audit/sys/ddb/db_textdump.c#2 integrate .. //depot/user/sson/audit/sys/dev/acpi_support/acpi_asus.c#2 integrate .. //depot/user/sson/audit/sys/dev/acpi_support/acpi_fujitsu.c#2 integrate .. //depot/user/sson/audit/sys/dev/acpica/acpi.c#2 integrate .. //depot/user/sson/audit/sys/dev/age/if_age.c#2 integrate .. //depot/user/sson/audit/sys/dev/agp/agp.c#2 integrate .. //depot/user/sson/audit/sys/dev/aha/aha.c#2 integrate .. //depot/user/sson/audit/sys/dev/asmc/asmc.c#2 integrate .. //depot/user/sson/audit/sys/dev/asmc/asmcvar.h#2 integrate .. //depot/user/sson/audit/sys/dev/ata/ata-all.c#2 integrate .. //depot/user/sson/audit/sys/dev/ata/ata-all.h#2 integrate .. //depot/user/sson/audit/sys/dev/ata/ata-chipset.c#2 integrate .. //depot/user/sson/audit/sys/dev/ata/ata-pci.h#2 integrate .. //depot/user/sson/audit/sys/dev/ath/if_athvar.h#2 integrate .. //depot/user/sson/audit/sys/dev/bce/if_bce.c#2 integrate .. //depot/user/sson/audit/sys/dev/bce/if_bcereg.h#2 integrate .. //depot/user/sson/audit/sys/dev/bfe/if_bfe.c#2 integrate .. //depot/user/sson/audit/sys/dev/bfe/if_bfereg.h#2 integrate .. //depot/user/sson/audit/sys/dev/bge/if_bge.c#2 integrate .. //depot/user/sson/audit/sys/dev/bm/if_bm.c#2 integrate .. //depot/user/sson/audit/sys/dev/ciss/ciss.c#2 integrate .. //depot/user/sson/audit/sys/dev/ciss/cissreg.h#2 integrate .. //depot/user/sson/audit/sys/dev/cpuctl/cpuctl.c#1 branch .. //depot/user/sson/audit/sys/dev/cpufreq/ichss.c#2 integrate .. //depot/user/sson/audit/sys/dev/cxgb/common/cxgb_ael1002.c#2 integrate .. //depot/user/sson/audit/sys/dev/cxgb/common/cxgb_common.h#2 integrate .. //depot/user/sson/audit/sys/dev/cxgb/common/cxgb_t3_cpl.h#2 integrate .. //depot/user/sson/audit/sys/dev/cxgb/common/cxgb_t3_hw.c#2 integrate .. //depot/user/sson/audit/sys/dev/cxgb/common/cxgb_xgmac.c#2 integrate .. //depot/user/sson/audit/sys/dev/cxgb/cxgb_adapter.h#2 integrate .. //depot/user/sson/audit/sys/dev/cxgb/cxgb_ioctl.h#2 integrate .. //depot/user/sson/audit/sys/dev/cxgb/cxgb_lro.c#2 delete .. //depot/user/sson/audit/sys/dev/cxgb/cxgb_main.c#2 integrate .. //depot/user/sson/audit/sys/dev/cxgb/cxgb_sge.c#2 integrate .. //depot/user/sson/audit/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb.c#2 integrate .. //depot/user/sson/audit/sys/dev/cxgb/ulp/toecore/toedev.c#2 integrate .. //depot/user/sson/audit/sys/dev/cxgb/ulp/tom/cxgb_cpl_io.c#2 integrate .. //depot/user/sson/audit/sys/dev/dc/if_dc.c#2 integrate .. //depot/user/sson/audit/sys/dev/dc/if_dcreg.h#2 integrate .. //depot/user/sson/audit/sys/dev/dcons/dcons.h#2 integrate .. //depot/user/sson/audit/sys/dev/dcons/dcons_os.c#2 integrate .. //depot/user/sson/audit/sys/dev/drm/ati_pcigart.c#2 integrate .. //depot/user/sson/audit/sys/dev/drm/drm-subprocess.pl#2 integrate .. //depot/user/sson/audit/sys/dev/drm/drm.h#2 integrate .. //depot/user/sson/audit/sys/dev/drm/drmP.h#2 integrate .. //depot/user/sson/audit/sys/dev/drm/drm_agpsupport.c#2 integrate .. //depot/user/sson/audit/sys/dev/drm/drm_auth.c#2 integrate .. //depot/user/sson/audit/sys/dev/drm/drm_bufs.c#2 integrate .. //depot/user/sson/audit/sys/dev/drm/drm_context.c#2 integrate .. //depot/user/sson/audit/sys/dev/drm/drm_dma.c#2 integrate .. //depot/user/sson/audit/sys/dev/drm/drm_drawable.c#2 integrate .. //depot/user/sson/audit/sys/dev/drm/drm_drv.c#2 integrate .. //depot/user/sson/audit/sys/dev/drm/drm_fops.c#2 integrate .. //depot/user/sson/audit/sys/dev/drm/drm_internal.h#1 branch .. //depot/user/sson/audit/sys/dev/drm/drm_ioctl.c#2 integrate .. //depot/user/sson/audit/sys/dev/drm/drm_irq.c#2 integrate .. //depot/user/sson/audit/sys/dev/drm/drm_lock.c#2 integrate .. //depot/user/sson/audit/sys/dev/drm/drm_memory.c#2 integrate .. //depot/user/sson/audit/sys/dev/drm/drm_pci.c#2 integrate .. //depot/user/sson/audit/sys/dev/drm/drm_pciids.h#2 integrate .. //depot/user/sson/audit/sys/dev/drm/drm_sarea.h#2 integrate .. //depot/user/sson/audit/sys/dev/drm/drm_scatter.c#2 integrate .. //depot/user/sson/audit/sys/dev/drm/drm_sysctl.c#2 integrate .. //depot/user/sson/audit/sys/dev/drm/drm_vm.c#2 integrate .. //depot/user/sson/audit/sys/dev/drm/i915_dma.c#2 integrate .. //depot/user/sson/audit/sys/dev/drm/i915_drm.h#2 integrate .. //depot/user/sson/audit/sys/dev/drm/i915_drv.c#2 integrate .. //depot/user/sson/audit/sys/dev/drm/i915_drv.h#2 integrate .. //depot/user/sson/audit/sys/dev/drm/i915_irq.c#2 integrate .. //depot/user/sson/audit/sys/dev/drm/i915_mem.c#2 integrate .. //depot/user/sson/audit/sys/dev/drm/i915_suspend.c#1 branch .. //depot/user/sson/audit/sys/dev/drm/mach64_dma.c#2 integrate .. //depot/user/sson/audit/sys/dev/drm/mach64_drm.h#2 integrate .. //depot/user/sson/audit/sys/dev/drm/mach64_drv.c#2 integrate .. //depot/user/sson/audit/sys/dev/drm/mach64_drv.h#2 integrate .. //depot/user/sson/audit/sys/dev/drm/mach64_irq.c#2 integrate .. //depot/user/sson/audit/sys/dev/drm/mach64_state.c#2 integrate .. //depot/user/sson/audit/sys/dev/drm/mga_dma.c#2 integrate .. //depot/user/sson/audit/sys/dev/drm/mga_drm.h#2 integrate .. //depot/user/sson/audit/sys/dev/drm/mga_drv.c#2 integrate .. //depot/user/sson/audit/sys/dev/drm/mga_drv.h#2 integrate .. //depot/user/sson/audit/sys/dev/drm/mga_irq.c#2 integrate .. //depot/user/sson/audit/sys/dev/drm/mga_state.c#2 integrate .. //depot/user/sson/audit/sys/dev/drm/mga_warp.c#2 integrate .. //depot/user/sson/audit/sys/dev/drm/r128_cce.c#2 integrate .. //depot/user/sson/audit/sys/dev/drm/r128_drm.h#2 integrate .. //depot/user/sson/audit/sys/dev/drm/r128_drv.c#2 integrate .. //depot/user/sson/audit/sys/dev/drm/r128_drv.h#2 integrate .. //depot/user/sson/audit/sys/dev/drm/r128_irq.c#2 integrate .. //depot/user/sson/audit/sys/dev/drm/r128_state.c#2 integrate .. //depot/user/sson/audit/sys/dev/drm/r300_cmdbuf.c#2 integrate .. //depot/user/sson/audit/sys/dev/drm/r300_reg.h#2 integrate .. //depot/user/sson/audit/sys/dev/drm/radeon_cp.c#2 integrate .. //depot/user/sson/audit/sys/dev/drm/radeon_drm.h#2 integrate .. //depot/user/sson/audit/sys/dev/drm/radeon_drv.c#2 integrate .. //depot/user/sson/audit/sys/dev/drm/radeon_drv.h#2 integrate .. //depot/user/sson/audit/sys/dev/drm/radeon_irq.c#2 integrate .. //depot/user/sson/audit/sys/dev/drm/radeon_mem.c#2 integrate .. //depot/user/sson/audit/sys/dev/drm/radeon_microcode.h#1 branch .. //depot/user/sson/audit/sys/dev/drm/radeon_state.c#2 integrate .. //depot/user/sson/audit/sys/dev/drm/savage_bci.c#2 integrate .. //depot/user/sson/audit/sys/dev/drm/savage_drm.h#2 integrate .. //depot/user/sson/audit/sys/dev/drm/savage_drv.c#2 integrate .. //depot/user/sson/audit/sys/dev/drm/savage_drv.h#2 integrate .. //depot/user/sson/audit/sys/dev/drm/savage_state.c#2 integrate .. //depot/user/sson/audit/sys/dev/drm/sis_drv.c#2 integrate .. //depot/user/sson/audit/sys/dev/drm/sis_drv.h#2 integrate .. //depot/user/sson/audit/sys/dev/drm/sis_mm.c#2 integrate .. //depot/user/sson/audit/sys/dev/drm/tdfx_drv.c#2 integrate .. //depot/user/sson/audit/sys/dev/e1000/if_igb.c#2 integrate .. //depot/user/sson/audit/sys/dev/e1000/if_igb.h#2 integrate .. //depot/user/sson/audit/sys/dev/esp/esp_sbus.c#2 integrate .. //depot/user/sson/audit/sys/dev/esp/ncr53c9x.c#2 integrate .. //depot/user/sson/audit/sys/dev/esp/ncr53c9xreg.h#2 integrate .. //depot/user/sson/audit/sys/dev/esp/ncr53c9xvar.h#2 integrate .. //depot/user/sson/audit/sys/dev/ex/if_ex.c#2 integrate .. //depot/user/sson/audit/sys/dev/ex/if_ex_isa.c#2 integrate .. //depot/user/sson/audit/sys/dev/ex/if_ex_pccard.c#2 integrate .. //depot/user/sson/audit/sys/dev/ex/if_exvar.h#2 integrate .. //depot/user/sson/audit/sys/dev/firewire/firewire.c#2 integrate .. //depot/user/sson/audit/sys/dev/gem/if_gem.c#2 integrate .. //depot/user/sson/audit/sys/dev/glxsb/glxsb.c#1 branch .. //depot/user/sson/audit/sys/dev/glxsb/glxsb.h#1 branch .. //depot/user/sson/audit/sys/dev/glxsb/glxsb_hash.c#1 branch .. //depot/user/sson/audit/sys/dev/ic/i8251.h#2 integrate .. //depot/user/sson/audit/sys/dev/ic/i8255.h#1 branch .. //depot/user/sson/audit/sys/dev/ic/ns16550.h#2 integrate .. //depot/user/sson/audit/sys/dev/ichwd/ichwd.c#2 integrate .. //depot/user/sson/audit/sys/dev/ichwd/ichwd.h#2 integrate .. //depot/user/sson/audit/sys/dev/iicbus/ad7418.c#2 integrate .. //depot/user/sson/audit/sys/dev/iicbus/ds1339.c#2 delete .. //depot/user/sson/audit/sys/dev/iicbus/ds133x.c#1 branch .. //depot/user/sson/audit/sys/dev/iicbus/ds1672.c#2 integrate .. //depot/user/sson/audit/sys/dev/iicbus/iiconf.c#2 integrate .. //depot/user/sson/audit/sys/dev/io/iodev.c#2 integrate .. //depot/user/sson/audit/sys/dev/ipmi/ipmi.c#2 integrate .. //depot/user/sson/audit/sys/dev/ipmi/ipmi_kcs.c#2 integrate .. //depot/user/sson/audit/sys/dev/ipmi/ipmivars.h#2 integrate .. //depot/user/sson/audit/sys/dev/jme/if_jme.c#2 integrate .. //depot/user/sson/audit/sys/dev/jme/if_jmereg.h#2 integrate .. //depot/user/sson/audit/sys/dev/k8temp/k8temp.c#2 integrate .. //depot/user/sson/audit/sys/dev/le/if_le_ledma.c#2 integrate .. //depot/user/sson/audit/sys/dev/led/led.c#2 integrate .. //depot/user/sson/audit/sys/dev/lmc/if_lmc.c#2 integrate .. //depot/user/sson/audit/sys/dev/md/md.c#2 integrate .. //depot/user/sson/audit/sys/dev/mfi/mfi.c#2 integrate .. //depot/user/sson/audit/sys/dev/mii/brgphy.c#2 integrate .. //depot/user/sson/audit/sys/dev/mii/e1000phy.c#2 integrate .. //depot/user/sson/audit/sys/dev/mii/mii.c#2 integrate .. //depot/user/sson/audit/sys/dev/mii/miidevs#2 integrate .. //depot/user/sson/audit/sys/dev/mii/mlphy.c#2 integrate .. //depot/user/sson/audit/sys/dev/mii/tlphy.c#2 integrate .. //depot/user/sson/audit/sys/dev/mxge/if_mxge_var.h#2 integrate .. //depot/user/sson/audit/sys/dev/nmdm/nmdm.c#2 integrate .. //depot/user/sson/audit/sys/dev/ofw/ofw_console.c#2 integrate .. //depot/user/sson/audit/sys/dev/pccard/pccard_cis.c#2 integrate .. //depot/user/sson/audit/sys/dev/pccard/pccard_cis_quirks.c#2 integrate .. //depot/user/sson/audit/sys/dev/pccard/pccarddevs#2 integrate .. //depot/user/sson/audit/sys/dev/pccbb/pccbb.c#2 integrate .. //depot/user/sson/audit/sys/dev/pci/pci.c#2 integrate .. //depot/user/sson/audit/sys/dev/pci/pci_pci.c#2 integrate .. //depot/user/sson/audit/sys/dev/pci/pcib_private.h#2 integrate .. //depot/user/sson/audit/sys/dev/pci/pcireg.h#2 integrate .. //depot/user/sson/audit/sys/dev/pcn/if_pcn.c#1 branch .. //depot/user/sson/audit/sys/dev/pcn/if_pcnreg.h#1 branch .. //depot/user/sson/audit/sys/dev/ppbus/if_plip.c#2 integrate .. //depot/user/sson/audit/sys/dev/ppbus/ppbconf.c#2 integrate .. //depot/user/sson/audit/sys/dev/ppc/ppc.c#2 integrate .. //depot/user/sson/audit/sys/dev/ppc/ppc_acpi.c#2 integrate .. //depot/user/sson/audit/sys/dev/ppc/ppc_isa.c#2 integrate .. //depot/user/sson/audit/sys/dev/ppc/ppcreg.h#2 integrate .. //depot/user/sson/audit/sys/dev/puc/pucdata.c#2 integrate .. //depot/user/sson/audit/sys/dev/re/if_re.c#2 integrate .. //depot/user/sson/audit/sys/dev/sbni/if_sbni.c#1 branch .. //depot/user/sson/audit/sys/dev/sbni/if_sbni_isa.c#1 branch .. //depot/user/sson/audit/sys/dev/sbni/if_sbni_pci.c#1 branch .. //depot/user/sson/audit/sys/dev/sbni/if_sbnireg.h#1 branch .. //depot/user/sson/audit/sys/dev/sbni/if_sbnivar.h#1 branch .. //depot/user/sson/audit/sys/dev/si/si.c#2 integrate .. //depot/user/sson/audit/sys/dev/sis/if_sis.c#1 branch .. //depot/user/sson/audit/sys/dev/sis/if_sisreg.h#1 branch .. //depot/user/sson/audit/sys/dev/snp/snp.c#2 integrate .. //depot/user/sson/audit/sys/dev/sound/midi/sequencer.c#2 integrate .. //depot/user/sson/audit/sys/dev/sound/pci/csa.c#2 integrate .. //depot/user/sson/audit/sys/dev/sound/pci/hda/hdac.c#2 integrate .. //depot/user/sson/audit/sys/dev/sound/pcm/sound.h#2 integrate .. //depot/user/sson/audit/sys/dev/sound/usb/uaudio.c#2 integrate .. //depot/user/sson/audit/sys/dev/ste/if_ste.c#1 branch .. //depot/user/sson/audit/sys/dev/ste/if_stereg.h#1 branch .. //depot/user/sson/audit/sys/dev/sym/sym_hipd.c#2 integrate .. //depot/user/sson/audit/sys/dev/syscons/daemon/daemon_saver.c#2 integrate .. //depot/user/sson/audit/sys/dev/syscons/schistory.c#2 integrate .. //depot/user/sson/audit/sys/dev/syscons/scmouse.c#2 integrate .. //depot/user/sson/audit/sys/dev/syscons/scterm-sc.c#2 integrate .. //depot/user/sson/audit/sys/dev/syscons/scvesactl.c#2 integrate .. //depot/user/sson/audit/sys/dev/syscons/scvidctl.c#2 integrate .. //depot/user/sson/audit/sys/dev/syscons/syscons.c#2 integrate .. //depot/user/sson/audit/sys/dev/syscons/syscons.h#2 integrate .. //depot/user/sson/audit/sys/dev/syscons/sysmouse.c#2 integrate .. //depot/user/sson/audit/sys/dev/tl/if_tl.c#1 branch .. //depot/user/sson/audit/sys/dev/tl/if_tlreg.h#1 branch .. //depot/user/sson/audit/sys/dev/tsec/if_tsec.c#2 integrate .. //depot/user/sson/audit/sys/dev/tsec/if_tsec.h#2 integrate .. //depot/user/sson/audit/sys/dev/tsec/if_tsec_ocp.c#1 branch .. //depot/user/sson/audit/sys/dev/uart/uart.h#2 integrate .. //depot/user/sson/audit/sys/dev/uart/uart_bus_isa.c#2 integrate .. //depot/user/sson/audit/sys/dev/uart/uart_core.c#2 integrate .. //depot/user/sson/audit/sys/dev/uart/uart_cpu_pc98.c#2 integrate .. //depot/user/sson/audit/sys/dev/uart/uart_tty.c#2 integrate .. //depot/user/sson/audit/sys/dev/usb/ehci.c#2 integrate .. //depot/user/sson/audit/sys/dev/usb/ehci_pci.c#2 integrate .. //depot/user/sson/audit/sys/dev/usb/ehcireg.h#2 integrate .. //depot/user/sson/audit/sys/dev/usb/ehcivar.h#2 integrate .. //depot/user/sson/audit/sys/dev/usb/hid.c#2 integrate .. //depot/user/sson/audit/sys/dev/usb/if_rum.c#2 integrate .. //depot/user/sson/audit/sys/dev/usb/if_upgt.c#1 branch .. //depot/user/sson/audit/sys/dev/usb/if_upgtvar.h#1 branch .. //depot/user/sson/audit/sys/dev/usb/if_zyd.c#2 integrate .. //depot/user/sson/audit/sys/dev/usb/if_zydreg.h#2 integrate .. //depot/user/sson/audit/sys/dev/usb/ohci_pci.c#2 integrate .. //depot/user/sson/audit/sys/dev/usb/ubsa.c#2 integrate .. //depot/user/sson/audit/sys/dev/usb/ucom.c#2 integrate .. //depot/user/sson/audit/sys/dev/usb/ucomvar.h#2 integrate .. //depot/user/sson/audit/sys/dev/usb/ufoma.c#2 integrate .. //depot/user/sson/audit/sys/dev/usb/uftdi.c#2 integrate .. //depot/user/sson/audit/sys/dev/usb/uhci_pci.c#2 integrate .. //depot/user/sson/audit/sys/dev/usb/uipaq.c#2 integrate .. //depot/user/sson/audit/sys/dev/usb/umass.c#2 integrate .. //depot/user/sson/audit/sys/dev/usb/umodem.c#2 integrate .. //depot/user/sson/audit/sys/dev/usb/ums.c#2 integrate .. //depot/user/sson/audit/sys/dev/usb/uplcom.c#2 integrate .. //depot/user/sson/audit/sys/dev/usb/usb.h#2 integrate .. //depot/user/sson/audit/sys/dev/usb/usb_quirks.c#2 integrate .. //depot/user/sson/audit/sys/dev/usb/usbdevs#2 integrate .. //depot/user/sson/audit/sys/dev/usb/uvisor.c#2 integrate .. //depot/user/sson/audit/sys/dev/usb/uvscom.c#2 integrate .. //depot/user/sson/audit/sys/dev/vx/if_vx_eisa.c#2 integrate .. //depot/user/sson/audit/sys/dev/wb/if_wb.c#1 branch .. //depot/user/sson/audit/sys/dev/wb/if_wbreg.h#1 branch .. //depot/user/sson/audit/sys/dev/wi/if_wi_pccard.c#2 integrate .. //depot/user/sson/audit/sys/dev/wpi/if_wpi.c#2 integrate .. //depot/user/sson/audit/sys/dev/xen/balloon/balloon.c#1 branch .. //depot/user/sson/audit/sys/dev/xen/blkback/blkback.c#1 branch .. //depot/user/sson/audit/sys/dev/xen/blkfront/blkfront.c#1 branch .. //depot/user/sson/audit/sys/dev/xen/blkfront/block.h#1 branch .. //depot/user/sson/audit/sys/dev/xen/console/console.c#1 branch .. //depot/user/sson/audit/sys/dev/xen/console/xencons_ring.c#1 branch .. //depot/user/sson/audit/sys/dev/xen/console/xencons_ring.h#1 branch .. //depot/user/sson/audit/sys/dev/xen/evtchn/evtchn_dev.c#1 branch .. //depot/user/sson/audit/sys/dev/xen/netback/netback.c#1 branch .. //depot/user/sson/audit/sys/dev/xen/netfront/mbufq.h#1 branch .. //depot/user/sson/audit/sys/dev/xen/netfront/netfront.c#1 branch .. //depot/user/sson/audit/sys/dev/xen/pcifront/pcifront.c#1 branch .. //depot/user/sson/audit/sys/dev/xl/if_xl.c#1 branch .. //depot/user/sson/audit/sys/dev/xl/if_xlreg.h#1 branch .. //depot/user/sson/audit/sys/fs/cd9660/cd9660_rrip.c#2 integrate .. //depot/user/sson/audit/sys/fs/cd9660/cd9660_vnops.c#2 integrate .. //depot/user/sson/audit/sys/fs/coda/coda_venus.c#2 integrate .. //depot/user/sson/audit/sys/fs/coda/coda_venus.h#2 integrate .. //depot/user/sson/audit/sys/fs/coda/coda_vnops.c#2 integrate .. //depot/user/sson/audit/sys/fs/devfs/devfs_vnops.c#2 integrate .. //depot/user/sson/audit/sys/fs/fdescfs/fdesc_vnops.c#2 integrate .. //depot/user/sson/audit/sys/fs/hpfs/hpfs_vnops.c#2 integrate .. //depot/user/sson/audit/sys/fs/msdosfs/msdosfs_fat.c#2 integrate .. //depot/user/sson/audit/sys/fs/msdosfs/msdosfs_vnops.c#2 integrate .. //depot/user/sson/audit/sys/fs/nullfs/null_vnops.c#2 integrate .. //depot/user/sson/audit/sys/fs/nwfs/nwfs_io.c#2 integrate .. //depot/user/sson/audit/sys/fs/nwfs/nwfs_vnops.c#2 integrate .. //depot/user/sson/audit/sys/fs/portalfs/portal_vnops.c#2 integrate .. //depot/user/sson/audit/sys/fs/pseudofs/pseudofs_vnops.c#2 integrate .. //depot/user/sson/audit/sys/fs/smbfs/smbfs_io.c#2 integrate .. //depot/user/sson/audit/sys/fs/smbfs/smbfs_node.c#2 integrate .. //depot/user/sson/audit/sys/fs/smbfs/smbfs_vnops.c#2 integrate .. //depot/user/sson/audit/sys/fs/tmpfs/tmpfs.h#2 integrate .. //depot/user/sson/audit/sys/fs/tmpfs/tmpfs_fifoops.c#2 integrate .. //depot/user/sson/audit/sys/fs/tmpfs/tmpfs_fifoops.h#2 integrate .. //depot/user/sson/audit/sys/fs/tmpfs/tmpfs_subr.c#2 integrate .. //depot/user/sson/audit/sys/fs/tmpfs/tmpfs_vfsops.c#2 integrate .. //depot/user/sson/audit/sys/fs/tmpfs/tmpfs_vnops.c#2 integrate .. //depot/user/sson/audit/sys/fs/tmpfs/tmpfs_vnops.h#2 integrate .. //depot/user/sson/audit/sys/fs/unionfs/union_subr.c#2 integrate .. //depot/user/sson/audit/sys/fs/unionfs/union_vfsops.c#2 integrate .. //depot/user/sson/audit/sys/fs/unionfs/union_vnops.c#2 integrate .. //depot/user/sson/audit/sys/geom/concat/g_concat.c#2 integrate .. //depot/user/sson/audit/sys/geom/eli/g_eli.c#2 integrate .. //depot/user/sson/audit/sys/geom/geom_ccd.c#2 integrate .. //depot/user/sson/audit/sys/geom/geom_ctl.c#2 integrate .. //depot/user/sson/audit/sys/geom/geom_dev.c#2 integrate .. //depot/user/sson/audit/sys/geom/geom_disk.c#2 integrate .. //depot/user/sson/audit/sys/geom/geom_kern.c#2 integrate .. //depot/user/sson/audit/sys/geom/geom_slice.c#2 integrate .. //depot/user/sson/audit/sys/geom/geom_subr.c#2 integrate .. //depot/user/sson/audit/sys/geom/journal/g_journal.c#2 integrate .. //depot/user/sson/audit/sys/geom/part/g_part.c#2 integrate .. //depot/user/sson/audit/sys/geom/part/g_part.h#2 integrate .. //depot/user/sson/audit/sys/geom/part/g_part_gpt.c#2 integrate .. //depot/user/sson/audit/sys/geom/stripe/g_stripe.c#2 integrate .. //depot/user/sson/audit/sys/geom/vinum/geom_vinum_drive.c#2 integrate .. //depot/user/sson/audit/sys/gnu/fs/ext2fs/ext2_vfsops.c#2 integrate .. //depot/user/sson/audit/sys/gnu/fs/ext2fs/ext2_vnops.c#2 integrate .. //depot/user/sson/audit/sys/gnu/fs/xfs/FreeBSD/xfs_vnode.h#2 integrate .. //depot/user/sson/audit/sys/gnu/fs/xfs/FreeBSD/xfs_vnops.c#2 integrate .. //depot/user/sson/audit/sys/i386/conf/DEFAULTS#2 integrate .. //depot/user/sson/audit/sys/i386/conf/GENERIC#2 integrate .. //depot/user/sson/audit/sys/i386/conf/NOTES#2 integrate .. //depot/user/sson/audit/sys/i386/conf/XBOX#2 integrate .. //depot/user/sson/audit/sys/i386/conf/XEN#1 branch .. //depot/user/sson/audit/sys/i386/cpufreq/est.c#2 integrate .. //depot/user/sson/audit/sys/i386/cpufreq/p4tcc.c#2 integrate .. //depot/user/sson/audit/sys/i386/cpufreq/powernow.c#2 integrate .. //depot/user/sson/audit/sys/i386/cpufreq/smist.c#2 integrate .. //depot/user/sson/audit/sys/i386/i386/bpf_jit_machdep.c#2 integrate .. //depot/user/sson/audit/sys/i386/i386/bpf_jit_machdep.h#2 integrate .. //depot/user/sson/audit/sys/i386/i386/busdma_machdep.c#2 integrate .. //depot/user/sson/audit/sys/i386/i386/db_disasm.c#2 integrate .. //depot/user/sson/audit/sys/i386/i386/dump_machdep.c#2 integrate .. //depot/user/sson/audit/sys/i386/i386/genassym.c#2 integrate .. //depot/user/sson/audit/sys/i386/i386/local_apic.c#2 integrate .. //depot/user/sson/audit/sys/i386/i386/machdep.c#2 integrate .. //depot/user/sson/audit/sys/i386/i386/minidump_machdep.c#2 integrate .. //depot/user/sson/audit/sys/i386/i386/support.s#2 integrate .. //depot/user/sson/audit/sys/i386/i386/swtch.s#2 integrate .. //depot/user/sson/audit/sys/i386/i386/sys_machdep.c#2 integrate .. //depot/user/sson/audit/sys/i386/i386/trap.c#2 integrate .. //depot/user/sson/audit/sys/i386/i386/vm_machdep.c#2 integrate .. //depot/user/sson/audit/sys/i386/ibcs2/ibcs2_ioctl.c#2 integrate .. //depot/user/sson/audit/sys/i386/ibcs2/ibcs2_socksys.c#2 integrate .. //depot/user/sson/audit/sys/i386/ibcs2/imgact_coff.c#2 integrate .. //depot/user/sson/audit/sys/i386/include/asmacros.h#2 integrate .. //depot/user/sson/audit/sys/i386/include/cpufunc.h#2 integrate .. //depot/user/sson/audit/sys/i386/include/pci_cfgreg.h#2 integrate .. //depot/user/sson/audit/sys/i386/include/pcpu.h#2 integrate .. //depot/user/sson/audit/sys/i386/include/pmap.h#2 integrate .. //depot/user/sson/audit/sys/i386/include/pmc_mdep.h#2 integrate .. //depot/user/sson/audit/sys/i386/include/segments.h#2 integrate .. //depot/user/sson/audit/sys/i386/include/specialreg.h#2 integrate .. //depot/user/sson/audit/sys/i386/include/trap.h#2 integrate .. //depot/user/sson/audit/sys/i386/include/vmparam.h#2 integrate .. //depot/user/sson/audit/sys/i386/include/xen/evtchn.h#1 branch .. //depot/user/sson/audit/sys/i386/include/xen/features.h#1 branch .. //depot/user/sson/audit/sys/i386/include/xen/hypercall.h#1 branch .. //depot/user/sson/audit/sys/i386/include/xen/hypervisor.h#1 branch .. //depot/user/sson/audit/sys/i386/include/xen/synch_bitops.h#1 branch .. //depot/user/sson/audit/sys/i386/include/xen/xen-os.h#1 branch .. //depot/user/sson/audit/sys/i386/include/xen/xen_intr.h#1 branch .. //depot/user/sson/audit/sys/i386/include/xen/xenbus.h#1 branch .. //depot/user/sson/audit/sys/i386/include/xen/xenfunc.h#1 branch .. //depot/user/sson/audit/sys/i386/include/xen/xenpmap.h#1 branch .. //depot/user/sson/audit/sys/i386/include/xen/xenstored.h#1 branch .. //depot/user/sson/audit/sys/i386/include/xen/xenvar.h#1 branch .. //depot/user/sson/audit/sys/i386/isa/dpms.c#1 branch .. //depot/user/sson/audit/sys/i386/isa/isa.c#2 integrate .. //depot/user/sson/audit/sys/i386/isa/npx.c#2 integrate .. //depot/user/sson/audit/sys/i386/linux/linux_genassym.c#2 integrate .. //depot/user/sson/audit/sys/i386/linux/linux_locore.s#2 integrate .. //depot/user/sson/audit/sys/i386/pci/pci_cfgreg.c#2 integrate .. //depot/user/sson/audit/sys/i386/pci/pci_pir.c#2 integrate .. //depot/user/sson/audit/sys/i386/xen/clock.c#1 branch .. //depot/user/sson/audit/sys/i386/xen/exception.s#1 branch .. //depot/user/sson/audit/sys/i386/xen/locore.s#1 branch .. //depot/user/sson/audit/sys/i386/xen/mp_machdep.c#1 branch .. //depot/user/sson/audit/sys/i386/xen/mptable.c#1 branch .. //depot/user/sson/audit/sys/i386/xen/pmap.c#1 branch .. //depot/user/sson/audit/sys/i386/xen/xen_machdep.c#1 branch .. //depot/user/sson/audit/sys/ia64/conf/GENERIC#2 integrate .. //depot/user/sson/audit/sys/ia64/conf/SKI#2 integrate .. //depot/user/sson/audit/sys/ia64/ia64/dump_machdep.c#2 integrate .. //depot/user/sson/audit/sys/ia64/ia64/ssc.c#2 integrate .. //depot/user/sson/audit/sys/ia64/include/pcpu.h#2 integrate .. //depot/user/sson/audit/sys/isa/isa_common.c#2 integrate .. //depot/user/sson/audit/sys/isa/isavar.h#2 integrate .. //depot/user/sson/audit/sys/kern/imgact_shell.c#2 integrate .. //depot/user/sson/audit/sys/kern/init_main.c#2 integrate .. //depot/user/sson/audit/sys/kern/init_sysent.c#2 integrate .. //depot/user/sson/audit/sys/kern/kern_acct.c#2 integrate .. //depot/user/sson/audit/sys/kern/kern_conf.c#2 integrate .. //depot/user/sson/audit/sys/kern/kern_descrip.c#2 integrate .. //depot/user/sson/audit/sys/kern/kern_exec.c#2 integrate .. //depot/user/sson/audit/sys/kern/kern_exit.c#2 integrate .. //depot/user/sson/audit/sys/kern/kern_intr.c#2 integrate .. //depot/user/sson/audit/sys/kern/kern_jail.c#2 integrate .. //depot/user/sson/audit/sys/kern/kern_linker.c#2 integrate .. //depot/user/sson/audit/sys/kern/kern_lock.c#2 integrate .. //depot/user/sson/audit/sys/kern/kern_mib.c#2 integrate .. //depot/user/sson/audit/sys/kern/kern_mutex.c#2 integrate .. //depot/user/sson/audit/sys/kern/kern_poll.c#2 integrate .. //depot/user/sson/audit/sys/kern/kern_proc.c#2 integrate .. //depot/user/sson/audit/sys/kern/kern_resource.c#2 integrate .. //depot/user/sson/audit/sys/kern/kern_rmlock.c#2 integrate .. //depot/user/sson/audit/sys/kern/kern_rwlock.c#2 integrate .. //depot/user/sson/audit/sys/kern/kern_sig.c#2 integrate .. //depot/user/sson/audit/sys/kern/kern_subr.c#2 integrate .. //depot/user/sson/audit/sys/kern/kern_sx.c#2 integrate .. //depot/user/sson/audit/sys/kern/kern_synch.c#2 integrate .. //depot/user/sson/audit/sys/kern/kern_thread.c#2 integrate .. //depot/user/sson/audit/sys/kern/kern_uuid.c#2 integrate .. //depot/user/sson/audit/sys/kern/kern_xxx.c#2 integrate .. //depot/user/sson/audit/sys/kern/subr_prf.c#2 integrate .. //depot/user/sson/audit/sys/kern/subr_rman.c#2 integrate .. //depot/user/sson/audit/sys/kern/subr_sbuf.c#2 integrate .. //depot/user/sson/audit/sys/kern/subr_sleepqueue.c#2 integrate .. //depot/user/sson/audit/sys/kern/subr_smp.c#2 integrate .. //depot/user/sson/audit/sys/kern/subr_turnstile.c#2 integrate .. //depot/user/sson/audit/sys/kern/subr_witness.c#2 integrate .. //depot/user/sson/audit/sys/kern/syscalls.c#2 integrate .. //depot/user/sson/audit/sys/kern/syscalls.master#2 integrate .. //depot/user/sson/audit/sys/kern/systrace_args.c#2 integrate .. //depot/user/sson/audit/sys/kern/tty.c#2 integrate .. //depot/user/sson/audit/sys/kern/tty_compat.c#2 integrate .. //depot/user/sson/audit/sys/kern/tty_conf.c#2 delete .. //depot/user/sson/audit/sys/kern/tty_cons.c#2 integrate .. //depot/user/sson/audit/sys/kern/tty_info.c#2 integrate .. //depot/user/sson/audit/sys/kern/tty_inq.c#1 branch .. //depot/user/sson/audit/sys/kern/tty_outq.c#1 branch .. //depot/user/sson/audit/sys/kern/tty_pts.c#2 integrate .. //depot/user/sson/audit/sys/kern/tty_pty.c#2 integrate .. //depot/user/sson/audit/sys/kern/tty_ttydisc.c#1 branch .. //depot/user/sson/audit/sys/kern/uipc_mbuf.c#2 integrate .. //depot/user/sson/audit/sys/kern/uipc_mqueue.c#2 integrate .. //depot/user/sson/audit/sys/kern/uipc_sockbuf.c#2 integrate .. //depot/user/sson/audit/sys/kern/uipc_socket.c#2 integrate .. //depot/user/sson/audit/sys/kern/vfs_bio.c#2 integrate .. //depot/user/sson/audit/sys/kern/vfs_cache.c#2 integrate .. //depot/user/sson/audit/sys/kern/vfs_default.c#2 integrate .. //depot/user/sson/audit/sys/kern/vfs_lookup.c#2 integrate .. //depot/user/sson/audit/sys/kern/vfs_mount.c#2 integrate .. //depot/user/sson/audit/sys/kern/vfs_subr.c#2 integrate .. //depot/user/sson/audit/sys/kern/vfs_syscalls.c#2 integrate .. //depot/user/sson/audit/sys/kern/vfs_vnops.c#2 integrate .. //depot/user/sson/audit/sys/kern/vnode_if.src#2 integrate .. //depot/user/sson/audit/sys/libkern/strcspn.c#1 branch .. //depot/user/sson/audit/sys/mips/adm5120/admpci.c#2 integrate .. //depot/user/sson/audit/sys/mips/adm5120/if_admsw.c#2 integrate .. //depot/user/sson/audit/sys/mips/adm5120/if_admswvar.h#2 integrate .. //depot/user/sson/audit/sys/mips/adm5120/obio.c#2 integrate .. //depot/user/sson/audit/sys/mips/adm5120/std.adm5120#2 integrate .. //depot/user/sson/audit/sys/mips/adm5120/uart_bus_adm5120.c#2 integrate .. //depot/user/sson/audit/sys/mips/adm5120/uart_cpu_adm5120.c#2 integrate .. //depot/user/sson/audit/sys/mips/adm5120/uart_dev_adm5120.c#2 integrate .. //depot/user/sson/audit/sys/mips/conf/ADM5120#2 integrate .. //depot/user/sson/audit/sys/mips/conf/IDT#2 integrate .. //depot/user/sson/audit/sys/mips/conf/MALTA#2 integrate .. //depot/user/sson/audit/sys/mips/conf/SENTRY5#2 integrate .. //depot/user/sson/audit/sys/mips/idt/idtpci.c#2 integrate .. //depot/user/sson/audit/sys/mips/idt/if_kr.c#2 integrate .. //depot/user/sson/audit/sys/mips/idt/obio.c#2 integrate .. //depot/user/sson/audit/sys/mips/idt/std.idt#2 integrate .. //depot/user/sson/audit/sys/mips/idt/uart_bus_rc32434.c#2 integrate .. //depot/user/sson/audit/sys/mips/include/pcpu.h#2 integrate .. //depot/user/sson/audit/sys/mips/malta/files.malta#2 integrate .. //depot/user/sson/audit/sys/mips/malta/gt.c#2 integrate .. //depot/user/sson/audit/sys/mips/malta/gt_pci.c#2 integrate .. //depot/user/sson/audit/sys/mips/malta/malta_machdep.c#2 integrate .. //depot/user/sson/audit/sys/mips/malta/obio.c#2 integrate .. //depot/user/sson/audit/sys/mips/malta/std.malta#2 integrate .. //depot/user/sson/audit/sys/mips/malta/uart_bus_maltausart.c#2 integrate .. //depot/user/sson/audit/sys/mips/malta/uart_cpu_maltausart.c#2 integrate .. //depot/user/sson/audit/sys/mips/malta/yamon.c#2 integrate .. //depot/user/sson/audit/sys/mips/mips/in_cksum.c#2 integrate .. //depot/user/sson/audit/sys/mips/mips/intr_machdep.c#2 integrate .. //depot/user/sson/audit/sys/mips/mips/mp_machdep.c#2 integrate .. //depot/user/sson/audit/sys/mips/sentry5/obio.c#2 integrate .. //depot/user/sson/audit/sys/mips/sentry5/s5_machdep.c#2 integrate .. //depot/user/sson/audit/sys/mips/sentry5/uart_bus_sbusart.c#2 integrate .. //depot/user/sson/audit/sys/mips/sentry5/uart_cpu_sbusart.c#2 integrate .. //depot/user/sson/audit/sys/modules/Makefile#2 integrate .. //depot/user/sson/audit/sys/modules/aha/Makefile#2 integrate .. //depot/user/sson/audit/sys/modules/ahb/Makefile#2 integrate .. //depot/user/sson/audit/sys/modules/an/Makefile#2 integrate .. //depot/user/sson/audit/sys/modules/ar/Makefile#2 integrate .. //depot/user/sson/audit/sys/modules/ath_rate_amrr/Makefile#2 integrate .. //depot/user/sson/audit/sys/modules/ath_rate_onoe/Makefile#2 integrate .. //depot/user/sson/audit/sys/modules/ath_rate_sample/Makefile#2 integrate .. //depot/user/sson/audit/sys/modules/ce/Makefile#2 integrate .. //depot/user/sson/audit/sys/modules/cp/Makefile#2 integrate .. //depot/user/sson/audit/sys/modules/cpuctl/Makefile#1 branch .. //depot/user/sson/audit/sys/modules/ctau/Makefile#2 integrate .. //depot/user/sson/audit/sys/modules/cx/Makefile#2 integrate .. //depot/user/sson/audit/sys/modules/cxgb/cxgb/Makefile#2 integrate .. //depot/user/sson/audit/sys/modules/digi/digi/Makefile#2 integrate .. //depot/user/sson/audit/sys/modules/dpms/Makefile#1 branch .. //depot/user/sson/audit/sys/modules/drm/i915/Makefile#2 integrate .. //depot/user/sson/audit/sys/modules/fatm/Makefile#2 integrate .. //depot/user/sson/audit/sys/modules/glxsb/Makefile#1 branch .. //depot/user/sson/audit/sys/modules/hatm/Makefile#2 integrate .. //depot/user/sson/audit/sys/modules/hifn/Makefile#2 integrate .. //depot/user/sson/audit/sys/modules/if_tap/Makefile#2 integrate .. //depot/user/sson/audit/sys/modules/linux/Makefile#2 integrate .. //depot/user/sson/audit/sys/modules/netgraph/sync_ar/Makefile#2 integrate .. //depot/user/sson/audit/sys/modules/netgraph/sync_sr/Makefile#2 integrate .. //depot/user/sson/audit/sys/modules/nmdm/Makefile#2 integrate .. //depot/user/sson/audit/sys/modules/patm/Makefile#2 integrate .. //depot/user/sson/audit/sys/modules/pcn/Makefile#2 integrate .. //depot/user/sson/audit/sys/modules/pf/Makefile#2 integrate .. //depot/user/sson/audit/sys/modules/pflog/Makefile#2 integrate .. //depot/user/sson/audit/sys/modules/rc/Makefile#2 integrate .. //depot/user/sson/audit/sys/modules/rp/Makefile#2 integrate .. //depot/user/sson/audit/sys/modules/safe/Makefile#2 integrate .. //depot/user/sson/audit/sys/modules/sbni/Makefile#1 branch .. //depot/user/sson/audit/sys/modules/sis/Makefile#2 integrate .. //depot/user/sson/audit/sys/modules/sppp/Makefile#2 integrate .. //depot/user/sson/audit/sys/modules/sr/Makefile#2 integrate .. //depot/user/sson/audit/sys/modules/ste/Makefile#2 integrate .. //depot/user/sson/audit/sys/modules/svr4/Makefile#2 integrate .. //depot/user/sson/audit/sys/modules/tl/Makefile#2 integrate .. //depot/user/sson/audit/sys/modules/trm/Makefile#2 integrate .. //depot/user/sson/audit/sys/modules/ubsec/Makefile#2 integrate .. //depot/user/sson/audit/sys/modules/upgt/Makefile#1 branch .. //depot/user/sson/audit/sys/modules/usb/Makefile#2 integrate .. //depot/user/sson/audit/sys/modules/wb/Makefile#2 integrate .. //depot/user/sson/audit/sys/modules/wi/Makefile#2 integrate .. //depot/user/sson/audit/sys/modules/wlan/Makefile#2 integrate .. //depot/user/sson/audit/sys/modules/wlan_acl/Makefile#2 integrate .. //depot/user/sson/audit/sys/modules/wlan_amrr/Makefile#2 integrate .. //depot/user/sson/audit/sys/modules/wlan_ccmp/Makefile#2 integrate .. //depot/user/sson/audit/sys/modules/wlan_rssadapt/Makefile#2 integrate .. //depot/user/sson/audit/sys/modules/wlan_tkip/Makefile#2 integrate .. //depot/user/sson/audit/sys/modules/wlan_wep/Makefile#2 integrate .. //depot/user/sson/audit/sys/modules/wlan_xauth/Makefile#2 integrate .. //depot/user/sson/audit/sys/modules/xl/Makefile#2 integrate .. //depot/user/sson/audit/sys/net/bpf.c#2 integrate .. //depot/user/sson/audit/sys/net/bpf.h#2 integrate .. //depot/user/sson/audit/sys/net/bpf_filter.c#2 integrate .. //depot/user/sson/audit/sys/net/bpf_jitter.c#2 integrate .. //depot/user/sson/audit/sys/net/bpf_jitter.h#2 integrate .. //depot/user/sson/audit/sys/net/bridgestp.c#2 integrate .. //depot/user/sson/audit/sys/net/ethernet.h#2 integrate .. //depot/user/sson/audit/sys/net/if.c#2 integrate .. //depot/user/sson/audit/sys/net/if.h#2 integrate .. //depot/user/sson/audit/sys/net/if_bridge.c#2 integrate .. //depot/user/sson/audit/sys/net/if_ef.c#2 integrate .. //depot/user/sson/audit/sys/net/if_enc.c#2 integrate .. //depot/user/sson/audit/sys/net/if_enc.h#1 branch .. //depot/user/sson/audit/sys/net/if_ethersubr.c#2 integrate .. //depot/user/sson/audit/sys/net/if_faith.c#2 integrate .. //depot/user/sson/audit/sys/net/if_gif.c#2 integrate .. //depot/user/sson/audit/sys/net/if_loop.c#2 integrate .. //depot/user/sson/audit/sys/net/if_mib.c#2 integrate .. //depot/user/sson/audit/sys/net/if_spppsubr.c#2 integrate .. //depot/user/sson/audit/sys/net/if_stf.c#2 integrate .. //depot/user/sson/audit/sys/net/if_tap.c#2 integrate .. //depot/user/sson/audit/sys/net/if_tap.h#2 integrate .. //depot/user/sson/audit/sys/net/if_var.h#2 integrate .. //depot/user/sson/audit/sys/net/if_vlan.c#2 integrate .. //depot/user/sson/audit/sys/net/raw_cb.c#2 integrate .. //depot/user/sson/audit/sys/net/raw_usrreq.c#2 integrate .. //depot/user/sson/audit/sys/net/route.c#2 integrate .. //depot/user/sson/audit/sys/net/route.h#2 integrate .. //depot/user/sson/audit/sys/net/rtsock.c#2 integrate .. //depot/user/sson/audit/sys/net80211/ieee80211.c#2 integrate .. //depot/user/sson/audit/sys/net80211/ieee80211.h#2 integrate .. //depot/user/sson/audit/sys/net80211/ieee80211_crypto_tkip.c#2 integrate .. //depot/user/sson/audit/sys/net80211/ieee80211_ddb.c#2 integrate .. //depot/user/sson/audit/sys/net80211/ieee80211_freebsd.h#2 integrate .. //depot/user/sson/audit/sys/net80211/ieee80211_ht.c#2 integrate .. //depot/user/sson/audit/sys/net80211/ieee80211_ht.h#2 integrate .. //depot/user/sson/audit/sys/net80211/ieee80211_ioctl.c#2 integrate .. //depot/user/sson/audit/sys/net80211/ieee80211_ioctl.h#2 integrate .. //depot/user/sson/audit/sys/net80211/ieee80211_node.c#2 integrate .. //depot/user/sson/audit/sys/net80211/ieee80211_node.h#2 integrate .. //depot/user/sson/audit/sys/net80211/ieee80211_phy.c#2 integrate .. //depot/user/sson/audit/sys/net80211/ieee80211_sta.c#2 integrate .. //depot/user/sson/audit/sys/netgraph/atm/ng_atm.c#2 integrate .. //depot/user/sson/audit/sys/netgraph/ng_base.c#2 integrate .. //depot/user/sson/audit/sys/netgraph/ng_bpf.c#2 integrate .. //depot/user/sson/audit/sys/netgraph/ng_bridge.c#2 integrate .. //depot/user/sson/audit/sys/netgraph/ng_eiface.c#2 integrate .. //depot/user/sson/audit/sys/netgraph/ng_ether.c#2 integrate .. //depot/user/sson/audit/sys/netgraph/ng_gif.c#2 integrate .. //depot/user/sson/audit/sys/netgraph/ng_iface.c#2 integrate .. //depot/user/sson/audit/sys/netgraph/ng_pipe.c#1 branch .. //depot/user/sson/audit/sys/netgraph/ng_pipe.h#1 branch .. //depot/user/sson/audit/sys/netgraph/ng_source.c#2 integrate .. //depot/user/sson/audit/sys/netinet/if_ether.c#2 integrate .. //depot/user/sson/audit/sys/netinet/igmp.c#2 integrate .. //depot/user/sson/audit/sys/netinet/in.c#2 integrate .. //depot/user/sson/audit/sys/netinet/in_gif.c#2 integrate .. //depot/user/sson/audit/sys/netinet/in_mcast.c#2 integrate .. //depot/user/sson/audit/sys/netinet/in_pcb.c#2 integrate .. //depot/user/sson/audit/sys/netinet/in_rmx.c#2 integrate .. //depot/user/sson/audit/sys/netinet/in_var.h#2 integrate .. //depot/user/sson/audit/sys/netinet/ip6.h#2 integrate .. //depot/user/sson/audit/sys/netinet/ip_carp.c#2 integrate .. //depot/user/sson/audit/sys/netinet/ip_divert.c#2 integrate .. //depot/user/sson/audit/sys/netinet/ip_fastfwd.c#2 integrate .. //depot/user/sson/audit/sys/netinet/ip_fw.h#2 integrate .. //depot/user/sson/audit/sys/netinet/ip_fw2.c#2 integrate .. //depot/user/sson/audit/sys/netinet/ip_fw_nat.c#2 integrate .. //depot/user/sson/audit/sys/netinet/ip_fw_pfil.c#2 integrate .. //depot/user/sson/audit/sys/netinet/ip_icmp.c#2 integrate .. //depot/user/sson/audit/sys/netinet/ip_input.c#2 integrate .. //depot/user/sson/audit/sys/netinet/ip_ipsec.c#2 integrate .. //depot/user/sson/audit/sys/netinet/ip_mroute.c#2 integrate .. //depot/user/sson/audit/sys/netinet/ip_options.c#2 integrate .. //depot/user/sson/audit/sys/netinet/ip_output.c#2 integrate .. //depot/user/sson/audit/sys/netinet/ip_var.h#2 integrate .. //depot/user/sson/audit/sys/netinet/libalias/alias_db.c#2 integrate .. //depot/user/sson/audit/sys/netinet/raw_ip.c#2 integrate .. //depot/user/sson/audit/sys/netinet/sctp_bsd_addr.c#2 integrate .. //depot/user/sson/audit/sys/netinet/sctp_indata.c#2 integrate .. //depot/user/sson/audit/sys/netinet/sctp_lock_bsd.h#2 integrate .. //depot/user/sson/audit/sys/netinet/sctp_os_bsd.h#2 integrate .. //depot/user/sson/audit/sys/netinet/sctp_output.c#2 integrate .. //depot/user/sson/audit/sys/netinet/sctp_pcb.c#2 integrate .. //depot/user/sson/audit/sys/netinet/sctp_sysctl.h#2 integrate .. //depot/user/sson/audit/sys/netinet/sctp_timer.c#2 integrate .. //depot/user/sson/audit/sys/netinet/sctp_timer.h#2 integrate .. //depot/user/sson/audit/sys/netinet/sctp_var.h#2 integrate .. //depot/user/sson/audit/sys/netinet/sctputil.c#2 integrate .. //depot/user/sson/audit/sys/netinet/tcp_debug.c#2 integrate .. //depot/user/sson/audit/sys/netinet/tcp_hostcache.c#2 integrate .. //depot/user/sson/audit/sys/netinet/tcp_input.c#2 integrate .. //depot/user/sson/audit/sys/netinet/tcp_lro.c#2 integrate .. //depot/user/sson/audit/sys/netinet/tcp_offload.c#2 integrate .. //depot/user/sson/audit/sys/netinet/tcp_output.c#2 integrate .. //depot/user/sson/audit/sys/netinet/tcp_reass.c#2 integrate .. //depot/user/sson/audit/sys/netinet/tcp_sack.c#2 integrate .. //depot/user/sson/audit/sys/netinet/tcp_subr.c#2 integrate .. //depot/user/sson/audit/sys/netinet/tcp_syncache.c#2 integrate .. //depot/user/sson/audit/sys/netinet/tcp_syncache.h#2 integrate .. //depot/user/sson/audit/sys/netinet/tcp_timer.c#2 integrate .. //depot/user/sson/audit/sys/netinet/tcp_timewait.c#2 integrate .. //depot/user/sson/audit/sys/netinet/tcp_usrreq.c#2 integrate .. //depot/user/sson/audit/sys/netinet/tcp_var.h#2 integrate .. //depot/user/sson/audit/sys/netinet/toedev.h#2 integrate .. //depot/user/sson/audit/sys/netinet/udp_usrreq.c#2 integrate .. //depot/user/sson/audit/sys/netinet6/dest6.c#2 integrate .. //depot/user/sson/audit/sys/netinet6/frag6.c#2 integrate .. //depot/user/sson/audit/sys/netinet6/icmp6.c#2 integrate .. //depot/user/sson/audit/sys/netinet6/in6.c#2 integrate .. //depot/user/sson/audit/sys/netinet6/in6_gif.c#2 integrate .. //depot/user/sson/audit/sys/netinet6/in6_ifattach.c#2 integrate .. //depot/user/sson/audit/sys/netinet6/in6_pcb.c#2 integrate .. //depot/user/sson/audit/sys/netinet6/in6_proto.c#2 integrate .. //depot/user/sson/audit/sys/netinet6/in6_rmx.c#2 integrate .. //depot/user/sson/audit/sys/netinet6/in6_src.c#2 integrate .. //depot/user/sson/audit/sys/netinet6/ip6_forward.c#2 integrate .. //depot/user/sson/audit/sys/netinet6/ip6_input.c#2 integrate .. //depot/user/sson/audit/sys/netinet6/ip6_ipsec.c#2 integrate .. //depot/user/sson/audit/sys/netinet6/ip6_mroute.c#2 integrate .. //depot/user/sson/audit/sys/netinet6/ip6_output.c#2 integrate .. //depot/user/sson/audit/sys/netinet6/ip6_var.h#2 integrate .. //depot/user/sson/audit/sys/netinet6/mld6.c#2 integrate .. //depot/user/sson/audit/sys/netinet6/nd6.c#2 integrate .. //depot/user/sson/audit/sys/netinet6/nd6.h#2 integrate .. //depot/user/sson/audit/sys/netinet6/nd6_nbr.c#2 integrate .. //depot/user/sson/audit/sys/netinet6/nd6_rtr.c#2 integrate .. //depot/user/sson/audit/sys/netinet6/raw_ip6.c#2 integrate .. //depot/user/sson/audit/sys/netinet6/route6.c#2 integrate .. //depot/user/sson/audit/sys/netinet6/scope6.c#2 integrate .. //depot/user/sson/audit/sys/netinet6/udp6_usrreq.c#2 integrate .. //depot/user/sson/audit/sys/netipsec/ipsec.c#2 integrate .. //depot/user/sson/audit/sys/netipsec/ipsec.h#2 integrate .. //depot/user/sson/audit/sys/netipsec/ipsec_input.c#2 integrate .. //depot/user/sson/audit/sys/netipsec/ipsec_mbuf.c#2 integrate .. //depot/user/sson/audit/sys/netipsec/ipsec_output.c#2 integrate .. //depot/user/sson/audit/sys/netipsec/key.c#2 integrate .. //depot/user/sson/audit/sys/netipsec/key_debug.h#2 integrate .. //depot/user/sson/audit/sys/netipsec/keysock.c#2 integrate .. //depot/user/sson/audit/sys/netipsec/xform_ah.c#2 integrate .. //depot/user/sson/audit/sys/netipsec/xform_esp.c#2 integrate .. //depot/user/sson/audit/sys/netipsec/xform_ipcomp.c#2 integrate .. //depot/user/sson/audit/sys/netipsec/xform_ipip.c#2 integrate .. //depot/user/sson/audit/sys/nfs4client/nfs4_vnops.c#2 integrate .. //depot/user/sson/audit/sys/nfsclient/bootp_subr.c#2 integrate .. //depot/user/sson/audit/sys/nfsclient/nfs_bio.c#2 integrate .. //depot/user/sson/audit/sys/nfsclient/nfs_diskless.c#2 integrate .. //depot/user/sson/audit/sys/nfsclient/nfs_vfsops.c#2 integrate .. //depot/user/sson/audit/sys/nfsclient/nfs_vnops.c#2 integrate .. //depot/user/sson/audit/sys/nfsserver/nfs_serv.c#2 integrate .. //depot/user/sson/audit/sys/nfsserver/nfs_srvsubs.c#2 integrate .. //depot/user/sson/audit/sys/nlm/nlm_prot_impl.c#2 integrate .. //depot/user/sson/audit/sys/nlm/nlm_prot_server.c#2 integrate .. //depot/user/sson/audit/sys/pc98/cbus/scterm-sck.c#2 integrate .. //depot/user/sson/audit/sys/pc98/cbus/sio.c#2 integrate .. //depot/user/sson/audit/sys/pc98/conf/GENERIC#2 integrate .. //depot/user/sson/audit/sys/pc98/conf/GENERIC.hints#2 integrate .. //depot/user/sson/audit/sys/pc98/conf/NOTES#2 integrate .. //depot/user/sson/audit/sys/pc98/include/bus.h#2 integrate .. //depot/user/sson/audit/sys/pc98/pc98/busiosubr.c#2 integrate .. //depot/user/sson/audit/sys/pci/if_pcn.c#2 delete .. //depot/user/sson/audit/sys/pci/if_pcnreg.h#2 delete .. //depot/user/sson/audit/sys/pci/if_sis.c#2 delete .. //depot/user/sson/audit/sys/pci/if_sisreg.h#2 delete .. //depot/user/sson/audit/sys/pci/if_ste.c#2 delete .. //depot/user/sson/audit/sys/pci/if_stereg.h#2 delete .. //depot/user/sson/audit/sys/pci/if_tl.c#2 delete .. //depot/user/sson/audit/sys/pci/if_tlreg.h#2 delete .. //depot/user/sson/audit/sys/pci/if_wb.c#2 delete .. //depot/user/sson/audit/sys/pci/if_wbreg.h#2 delete .. //depot/user/sson/audit/sys/pci/if_xl.c#2 delete .. //depot/user/sson/audit/sys/pci/if_xlreg.h#2 delete .. //depot/user/sson/audit/sys/powerpc/aim/clock.c#2 integrate .. //depot/user/sson/audit/sys/powerpc/aim/interrupt.c#2 integrate .. //depot/user/sson/audit/sys/powerpc/aim/machdep.c#2 integrate .. //depot/user/sson/audit/sys/powerpc/aim/mmu_oea.c#2 integrate .. //depot/user/sson/audit/sys/powerpc/aim/vm_machdep.c#2 integrate .. //depot/user/sson/audit/sys/powerpc/booke/locore.S#2 integrate .. //depot/user/sson/audit/sys/powerpc/booke/machdep.c#2 integrate .. //depot/user/sson/audit/sys/powerpc/booke/pmap.c#2 integrate .. //depot/user/sson/audit/sys/powerpc/conf/GENERIC#2 integrate .. //depot/user/sson/audit/sys/powerpc/include/cpufunc.h#2 integrate .. //depot/user/sson/audit/sys/powerpc/include/pcpu.h#2 integrate .. //depot/user/sson/audit/sys/powerpc/powerpc/db_interface.c#2 integrate .. //depot/user/sson/audit/sys/powerpc/powerpc/pmap_dispatch.c#2 integrate .. //depot/user/sson/audit/sys/rpc/authunix_prot.c#2 integrate .. //depot/user/sson/audit/sys/rpc/clnt_rc.c#2 integrate .. //depot/user/sson/audit/sys/rpc/pmap_prot.h#2 integrate .. //depot/user/sson/audit/sys/rpc/rpcb_prot.c#2 integrate .. //depot/user/sson/audit/sys/rpc/rpcclnt.c#2 integrate .. //depot/user/sson/audit/sys/security/audit/audit.c#2 integrate .. //depot/user/sson/audit/sys/security/audit/audit_arg.c#2 integrate .. //depot/user/sson/audit/sys/security/audit/audit_bsm.c#2 integrate .. //depot/user/sson/audit/sys/security/audit/audit_bsm_klib.c#2 integrate .. //depot/user/sson/audit/sys/security/audit/audit_syscalls.c#2 integrate .. //depot/user/sson/audit/sys/security/audit/audit_worker.c#2 integrate .. //depot/user/sson/audit/sys/security/mac/mac_framework.c#2 integrate .. //depot/user/sson/audit/sys/security/mac/mac_framework.h#2 integrate .. //depot/user/sson/audit/sys/security/mac/mac_inet.c#2 integrate .. //depot/user/sson/audit/sys/security/mac/mac_internal.h#2 integrate .. //depot/user/sson/audit/sys/security/mac/mac_net.c#2 integrate .. //depot/user/sson/audit/sys/security/mac/mac_pipe.c#2 integrate .. //depot/user/sson/audit/sys/security/mac/mac_policy.h#2 integrate .. //depot/user/sson/audit/sys/security/mac/mac_posix_sem.c#2 integrate .. //depot/user/sson/audit/sys/security/mac/mac_posix_shm.c#2 integrate .. //depot/user/sson/audit/sys/security/mac/mac_process.c#2 integrate .. //depot/user/sson/audit/sys/security/mac/mac_socket.c#2 integrate .. //depot/user/sson/audit/sys/security/mac/mac_syscalls.c#2 integrate .. //depot/user/sson/audit/sys/security/mac/mac_sysv_msg.c#2 integrate .. //depot/user/sson/audit/sys/security/mac/mac_sysv_sem.c#2 integrate .. //depot/user/sson/audit/sys/security/mac/mac_sysv_shm.c#2 integrate .. //depot/user/sson/audit/sys/security/mac/mac_vfs.c#2 integrate .. //depot/user/sson/audit/sys/security/mac_biba/mac_biba.c#2 integrate .. //depot/user/sson/audit/sys/security/mac_bsdextended/mac_bsdextended.c#2 integrate .. //depot/user/sson/audit/sys/security/mac_ifoff/mac_ifoff.c#2 integrate .. //depot/user/sson/audit/sys/security/mac_lomac/mac_lomac.c#2 integrate .. //depot/user/sson/audit/sys/security/mac_mls/mac_mls.c#2 integrate .. //depot/user/sson/audit/sys/security/mac_none/mac_none.c#2 integrate .. //depot/user/sson/audit/sys/security/mac_partition/mac_partition.c#2 integrate .. //depot/user/sson/audit/sys/security/mac_portacl/mac_portacl.c#2 integrate .. //depot/user/sson/audit/sys/security/mac_seeotheruids/mac_seeotheruids.c#2 integrate .. //depot/user/sson/audit/sys/security/mac_stub/mac_stub.c#2 integrate .. //depot/user/sson/audit/sys/security/mac_test/mac_test.c#2 integrate .. //depot/user/sson/audit/sys/sparc64/central/central.c#2 integrate .. //depot/user/sson/audit/sys/sparc64/conf/GENERIC#2 integrate .. //depot/user/sson/audit/sys/sparc64/conf/NOTES#2 integrate .. //depot/user/sson/audit/sys/sparc64/ebus/ebus.c#2 integrate .. //depot/user/sson/audit/sys/sparc64/fhc/fhc.c#2 integrate .. //depot/user/sson/audit/sys/sparc64/include/asi.h#2 integrate .. //depot/user/sson/audit/sys/sparc64/include/cache.h#2 integrate .. //depot/user/sson/audit/sys/sparc64/include/clock.h#2 integrate .. //depot/user/sson/audit/sys/sparc64/include/cpu.h#2 integrate .. //depot/user/sson/audit/sys/sparc64/include/cpufunc.h#2 integrate .. //depot/user/sson/audit/sys/sparc64/include/dcr.h#1 branch .. //depot/user/sson/audit/sys/sparc64/include/pcpu.h#2 integrate .. //depot/user/sson/audit/sys/sparc64/include/smp.h#2 integrate .. //depot/user/sson/audit/sys/sparc64/include/tick.h#2 integrate .. //depot/user/sson/audit/sys/sparc64/include/tlb.h#2 integrate .. //depot/user/sson/audit/sys/sparc64/include/trap.h#2 integrate .. //depot/user/sson/audit/sys/sparc64/include/tte.h#2 integrate .. //depot/user/sson/audit/sys/sparc64/include/ver.h#2 integrate .. //depot/user/sson/audit/sys/sparc64/include/vmparam.h#2 integrate .. //depot/user/sson/audit/sys/sparc64/pci/ofw_pci.h#2 integrate .. //depot/user/sson/audit/sys/sparc64/pci/ofw_pcibus.c#2 integrate .. //depot/user/sson/audit/sys/sparc64/pci/psycho.c#2 integrate .. //depot/user/sson/audit/sys/sparc64/sbus/dma_sbus.c#2 integrate .. //depot/user/sson/audit/sys/sparc64/sbus/lsi64854.c#2 integrate .. //depot/user/sson/audit/sys/sparc64/sbus/lsi64854var.h#2 integrate .. //depot/user/sson/audit/sys/sparc64/sbus/sbus.c#2 integrate .. //depot/user/sson/audit/sys/sparc64/sparc64/autoconf.c#2 integrate .. //depot/user/sson/audit/sys/sparc64/sparc64/cache.c#2 integrate .. //depot/user/sson/audit/sys/sparc64/sparc64/cheetah.c#2 integrate .. //depot/user/sson/audit/sys/sparc64/sparc64/clock.c#2 integrate .. //depot/user/sson/audit/sys/sparc64/sparc64/db_disasm.c#2 integrate .. //depot/user/sson/audit/sys/sparc64/sparc64/dump_machdep.c#2 integrate .. //depot/user/sson/audit/sys/sparc64/sparc64/exception.S#2 integrate .. //depot/user/sson/audit/sys/sparc64/sparc64/genassym.c#2 integrate .. //depot/user/sson/audit/sys/sparc64/sparc64/jbusppm.c#1 branch .. //depot/user/sson/audit/sys/sparc64/sparc64/locore.S#2 integrate .. //depot/user/sson/audit/sys/sparc64/sparc64/machdep.c#2 integrate .. //depot/user/sson/audit/sys/sparc64/sparc64/mp_exception.S#2 integrate .. //depot/user/sson/audit/sys/sparc64/sparc64/mp_locore.S#2 integrate .. //depot/user/sson/audit/sys/sparc64/sparc64/mp_machdep.c#2 integrate .. //depot/user/sson/audit/sys/sparc64/sparc64/pmap.c#2 integrate .. //depot/user/sson/audit/sys/sparc64/sparc64/prof_machdep.c#2 integrate .. //depot/user/sson/audit/sys/sparc64/sparc64/schppm.c#1 branch .. //depot/user/sson/audit/sys/sparc64/sparc64/spitfire.c#2 integrate .. //depot/user/sson/audit/sys/sparc64/sparc64/stack_machdep.c#2 integrate .. //depot/user/sson/audit/sys/sparc64/sparc64/support.S#2 integrate .. //depot/user/sson/audit/sys/sparc64/sparc64/swtch.S#2 integrate .. //depot/user/sson/audit/sys/sparc64/sparc64/tick.c#2 integrate >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Fri Sep 12 04:34:26 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E27511065674; Fri, 12 Sep 2008 04:34: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 A5D5E106564A for ; Fri, 12 Sep 2008 04:34:25 +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 93DC98FC1D for ; Fri, 12 Sep 2008 04:34:25 +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 m8C4YPDw067040 for ; Fri, 12 Sep 2008 04:34:25 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m8C4YP47067037 for perforce@freebsd.org; Fri, 12 Sep 2008 04:34:25 GMT (envelope-from sam@freebsd.org) Date: Fri, 12 Sep 2008 04:34:25 GMT Message-Id: <200809120434.m8C4YP47067037@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 149638 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, 12 Sep 2008 04:34:26 -0000 http://perforce.freebsd.org/chv.cgi?CH=149638 Change 149638 by sam@sam_ebb on 2008/09/12 04:34:14 Cleanup starting seq# for tx ampdu: o use txa_start to form the addba request and purge txa_seqstart o fill txa_start before calling ic_addba_request to permit drivers to override when they handle seq# generation (e.g. mwl) Affected files ... .. //depot/projects/vap/sys/net80211/ieee80211_ddb.c#27 edit .. //depot/projects/vap/sys/net80211/ieee80211_ht.c#52 edit .. //depot/projects/vap/sys/net80211/ieee80211_ht.h#22 edit Differences ... ==== //depot/projects/vap/sys/net80211/ieee80211_ddb.c#27 (text+ko) ==== @@ -215,9 +215,9 @@ { db_printf("%stxampdu[%d]: %p flags %b ac %u\n", sep, ix, tap, tap->txa_flags, IEEE80211_AGGR_BITS, tap->txa_ac); - db_printf("%s token %u qbytes %d qframes %d seqstart %u start %u wnd %u\n", + db_printf("%s token %u qbytes %d qframes %d start %u wnd %u\n", sep, tap->txa_token, tap->txa_qbytes, tap->txa_qframes, - tap->txa_seqstart, tap->txa_start, tap->txa_wnd); + tap->txa_start, tap->txa_wnd); db_printf("%s attempts %d nextrequest %d\n", sep, tap->txa_attempts, tap->txa_nextrequest); /* XXX packet q + timer */ ==== //depot/projects/vap/sys/net80211/ieee80211_ht.c#52 (text+ko) ==== @@ -1496,7 +1496,6 @@ /* XXX locking */ tap->txa_token = dialogtoken; tap->txa_flags |= IEEE80211_AGGR_IMMEDIATE; - tap->txa_start = tap->txa_seqstart = 0; bufsiz = MS(baparamset, IEEE80211_BAPS_BUFSIZ); tap->txa_wnd = (bufsiz == 0) ? IEEE80211_AGGR_BAWMAX : min(bufsiz, IEEE80211_AGGR_BAWMAX); @@ -1525,7 +1524,6 @@ IEEE80211_AGGR_BAWMAX : min(bufsiz, IEEE80211_AGGR_BAWMAX); /* XXX AC/TID */ tid = MS(baparamset, IEEE80211_BAPS_TID); - tap->txa_seqstart = tap->txa_start = ni->ni_txseqs[tid]; tap->txa_flags |= IEEE80211_AGGR_RUNNING; tap->txa_attempts = 0; } else { @@ -1857,8 +1855,9 @@ tap->txa_flags &= ~IEEE80211_AGGR_NAK; dialogtoken = (tokens+1) % 63; /* XXX */ + tid = WME_AC_TO_TID(tap->txa_ac); + tap->txa_start = ni->ni_txseqs[tid]; - tid = WME_AC_TO_TID(tap->txa_ac); args[0] = dialogtoken; args[1] = IEEE80211_BAPS_POLICY_IMMEDIATE | SM(tid, IEEE80211_BAPS_TID) @@ -1879,8 +1878,8 @@ return 0; } tokens = dialogtoken; /* allocate token */ - /* NB: after calling ic_addba_request so driver can set seqstart */ - args[3] = SM(tap->txa_seqstart, IEEE80211_BASEQ_START) + /* NB: after calling ic_addba_request so driver can set txa_start */ + args[3] = SM(tap->txa_start, IEEE80211_BASEQ_START) | SM(0, IEEE80211_BASEQ_FRAG) ; return ic->ic_send_action(ni, IEEE80211_ACTION_CAT_BA, ==== //depot/projects/vap/sys/net80211/ieee80211_ht.h#22 (text+ko) ==== @@ -53,9 +53,8 @@ int txa_avgpps; /* filtered traffic over window */ int txa_qbytes; /* data queued (bytes) */ short txa_qframes; /* data queued (frames) */ - ieee80211_seq txa_seqstart; - ieee80211_seq txa_start; - ieee80211_seq txa_seqpending; /* new start pending BAR response */ + ieee80211_seq txa_start; /* BA window left edge */ + ieee80211_seq txa_seqpending; /* new txa_start pending BAR response */ uint16_t txa_wnd; /* BA window size */ uint8_t txa_attempts; /* # ADDBA/BAR requests w/o a response*/ int txa_nextrequest;/* soonest to make next request */ From owner-p4-projects@FreeBSD.ORG Fri Sep 12 04:36:28 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1E8A81065674; Fri, 12 Sep 2008 04:36:28 +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 D6BAB1065672 for ; Fri, 12 Sep 2008 04:36: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 C4F258FC0C for ; Fri, 12 Sep 2008 04:36: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 m8C4aRL7079919 for ; Fri, 12 Sep 2008 04:36:27 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m8C4aRLH079917 for perforce@freebsd.org; Fri, 12 Sep 2008 04:36:27 GMT (envelope-from sam@freebsd.org) Date: Fri, 12 Sep 2008 04:36:27 GMT Message-Id: <200809120436.m8C4aRLH079917@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 149639 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, 12 Sep 2008 04:36:28 -0000 http://perforce.freebsd.org/chv.cgi?CH=149639 Change 149639 by sam@sam_ebb on 2008/09/12 04:35:39 o track txa_seqstart->txa_start change o fix hvap local sta db delete for station mode (use the correct mac) Affected files ... .. //depot/projects/vap/sys/dev/mwl/if_mwl.c#16 edit Differences ... ==== //depot/projects/vap/sys/dev/mwl/if_mwl.c#16 (text+ko) ==== @@ -2682,8 +2682,12 @@ if (mn->mn_staid != 0) { struct ieee80211vap *vap = ni->ni_vap; - if (mn->mn_hvap != NULL) - mwl_hal_delstation(mn->mn_hvap, ni->ni_macaddr); + if (mn->mn_hvap != NULL) { + if (vap->iv_opmode == IEEE80211_M_STA) + mwl_hal_delstation(mn->mn_hvap, vap->iv_myaddr); + else + mwl_hal_delstation(mn->mn_hvap, ni->ni_macaddr); + } /* * NB: legacy WDS peer sta db entry is installed using * the associate ap's hvap; use it again to delete it. @@ -4085,9 +4089,10 @@ bas->bastream = sp; tap->txa_private = bas; } + /* fetch current seq# from the firmware; if available */ if (mwl_hal_bastream_get_seqno(sc->sc_mh, bas->bastream, - &tap->txa_seqstart) != 0) - tap->txa_seqstart = 0; + &tap->txa_start) != 0) + tap->txa_start = 0; return sc->sc_addba_request(ni, tap, dialogtoken, baparamset, batimeout); } @@ -4118,8 +4123,8 @@ bufsiz = MS(baparamset, IEEE80211_BAPS_BUFSIZ); if (bufsiz == 0) bufsiz = IEEE80211_AGGR_BAWMAX; - error = mwl_hal_bastream_create(sc->sc_mh, bas->bastream, - bufsiz, bufsiz-1, tap->txa_seqstart); + error = mwl_hal_bastream_create(sc->sc_mh, bas->bastream, + bufsiz, bufsiz-1, tap->txa_start); if (error != 0) { /* * Setup failed, return immediately so no a-mpdu From owner-p4-projects@FreeBSD.ORG Fri Sep 12 14:14:16 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C0DC7106567B; Fri, 12 Sep 2008 14:14: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 7CA7C1065675 for ; Fri, 12 Sep 2008 14:14:16 +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 67D868FC1A for ; Fri, 12 Sep 2008 14:14:16 +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 m8CEEGp6099719 for ; Fri, 12 Sep 2008 14:14:16 GMT (envelope-from gabor@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m8CEEGpY099717 for perforce@freebsd.org; Fri, 12 Sep 2008 14:14:16 GMT (envelope-from gabor@freebsd.org) Date: Fri, 12 Sep 2008 14:14:16 GMT Message-Id: <200809121414.m8CEEGpY099717@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 149662 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, 12 Sep 2008 14:14:17 -0000 http://perforce.freebsd.org/chv.cgi?CH=149662 Change 149662 by gabor@gabor_server on 2008/09/12 14:13:41 - Eliminate some widechar-incompatible parts. The -i fixed string search is not 100% correct yet, and there are other snippets to fix. Reported by: ache Affected files ... .. //depot/projects/soc2008/gabor_textproc/grep/fastgrep.c#9 edit Differences ... ==== //depot/projects/soc2008/gabor_textproc/grep/fastgrep.c#9 (text+ko) ==== @@ -61,31 +61,13 @@ fg->eol = 0; fg->reversed = 0; - /* - * Make a copy and upper case it for later if in -i mode, - * else just copy the pointer. - */ - if (iflag) { - fg->pattern = grep_malloc(fg->len + 1); - for (i = 0; i < fg->len; i++) - fg->pattern[i] = toupper(pattern[i]); - fg->pattern[fg->len] = '\0'; - } else - fg->pattern = (unsigned char *)pattern; /* really const */ + fg->pattern = (unsigned char *)pattern; /* really const */ /* Preprocess pattern. */ for (i = 0; i <= UCHAR_MAX; i++) fg->qsBc[i] = fg->len; - for (i = 1; i < fg->len; i++) { + for (i = 1; i < fg->len; i++) fg->qsBc[fg->pattern[i]] = fg->len - i; - /* - * If case is ignored, make the jump apply to both upper and - * lower cased characters. As the pattern is stored in upper - * case, apply the same to the lower case equivalents. - */ - if (iflag) - fg->qsBc[tolower(fg->pattern[i])] = fg->len - i; - } } /* @@ -144,14 +126,7 @@ for (i = 0; i < fg->len; i++) { /* Can still cheat? */ - if ((isalnum(fg->pattern[i])) || isspace(fg->pattern[i]) || - (fg->pattern[i] == '_') || (fg->pattern[i] == ',') || - (fg->pattern[i] == '=') || (fg->pattern[i] == '-') || - (fg->pattern[i] == ':') || (fg->pattern[i] == '/')) { - /* As long as it is good, upper case it for later. */ - if (iflag) - fg->pattern[i] = toupper(fg->pattern[i]); - } else if (fg->pattern[i] == '.') { + if (fg->pattern[i] == '.') { hasDot = i; if (i < fg->len / 2) { if (firstHalfDot < 0) @@ -211,13 +186,6 @@ fg->qsBc[i] = shiftPatternLen; for (i = hasDot + 1; i < fg->len; i++) { fg->qsBc[fg->pattern[i]] = fg->len - i; - /* - * If case is ignored, make the jump apply to both upper and - * lower cased characters. As the pattern is stored in upper - * case, apply the same to the lower case equivalents. - */ - if (iflag) - fg->qsBc[tolower(fg->pattern[i])] = fg->len - i; } /* @@ -316,7 +284,7 @@ for (i = 0; i < len; i++) { if (((pattern[i] == data[i]) || ((grepbehave != GREP_FIXED) && pattern[i] == '.')) - || (iflag && pattern[i] == toupper(data[i]))) + || (iflag && toupper(pattern[i]) == toupper(data[i]))) continue; return (i); } From owner-p4-projects@FreeBSD.ORG Fri Sep 12 14:40:19 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 19CDD1065672; Fri, 12 Sep 2008 14:40:19 +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 D13101065678 for ; Fri, 12 Sep 2008 14:40:18 +0000 (UTC) (envelope-from marius@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id BB02B8FC0A for ; Fri, 12 Sep 2008 14:40:18 +0000 (UTC) (envelope-from marius@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 m8CEeIAE059025 for ; Fri, 12 Sep 2008 14:40:18 GMT (envelope-from marius@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m8CEdgmm058734 for perforce@freebsd.org; Fri, 12 Sep 2008 14:39:42 GMT (envelope-from marius@freebsd.org) Date: Fri, 12 Sep 2008 14:39:42 GMT Message-Id: <200809121439.m8CEdgmm058734@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marius@freebsd.org using -f From: Marius Strobl To: Perforce Change Reviews Cc: Subject: PERFORCE change 149663 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, 12 Sep 2008 14:40:19 -0000 http://perforce.freebsd.org/chv.cgi?CH=149663 Change 149663 by marius@flak on 2008/09/12 14:39:15 IFC @149569 Affected files ... .. //depot/projects/usiii/amd64/amd64/bpf_jit_machdep.c#4 integrate .. //depot/projects/usiii/amd64/amd64/bpf_jit_machdep.h#4 integrate .. //depot/projects/usiii/amd64/amd64/cpu_switch.S#4 integrate .. //depot/projects/usiii/amd64/amd64/genassym.c#7 integrate .. //depot/projects/usiii/amd64/amd64/machdep.c#9 integrate .. //depot/projects/usiii/amd64/amd64/mp_machdep.c#5 integrate .. //depot/projects/usiii/amd64/amd64/trap.c#6 integrate .. //depot/projects/usiii/amd64/ia32/ia32_signal.c#4 integrate .. //depot/projects/usiii/amd64/include/pcb.h#4 integrate .. //depot/projects/usiii/amd64/include/pcpu.h#4 integrate .. //depot/projects/usiii/amd64/include/segments.h#2 integrate .. //depot/projects/usiii/amd64/linux32/linux32_genassym.c#2 integrate .. //depot/projects/usiii/amd64/linux32/linux32_locore.s#2 integrate .. //depot/projects/usiii/amd64/linux32/linux32_machdep.c#4 integrate .. //depot/projects/usiii/amd64/pci/pci_cfgreg.c#4 integrate .. //depot/projects/usiii/arm/at91/at91.c#5 integrate .. //depot/projects/usiii/arm/at91/at91_mci.c#3 integrate .. //depot/projects/usiii/arm/at91/at91_ssc.c#2 integrate .. //depot/projects/usiii/arm/at91/if_ate.c#5 integrate .. //depot/projects/usiii/arm/at91/kb920x_machdep.c#5 integrate .. //depot/projects/usiii/arm/conf/KB920X#6 integrate .. //depot/projects/usiii/arm/conf/NSLU#2 integrate .. //depot/projects/usiii/boot/common/dev_net.c#4 integrate .. //depot/projects/usiii/boot/common/devopen.c#2 integrate .. //depot/projects/usiii/boot/forth/loader.conf#6 integrate .. //depot/projects/usiii/boot/powerpc/uboot/Makefile#2 integrate .. //depot/projects/usiii/boot/powerpc/uboot/metadata.c#3 delete .. //depot/projects/usiii/boot/powerpc/uboot/start.S#2 integrate .. //depot/projects/usiii/boot/sparc64/loader/main.c#5 integrate .. //depot/projects/usiii/boot/uboot/common/Makefile.inc#2 integrate .. //depot/projects/usiii/boot/uboot/common/main.c#3 integrate .. //depot/projects/usiii/boot/uboot/common/metadata.c#1 branch .. //depot/projects/usiii/boot/uboot/lib/Makefile#3 integrate .. //depot/projects/usiii/boot/uboot/lib/console.c#3 integrate .. //depot/projects/usiii/boot/uboot/lib/elf_freebsd.c#3 integrate .. //depot/projects/usiii/boot/uboot/lib/glue.c#4 integrate .. //depot/projects/usiii/boot/uboot/lib/glue.h#3 integrate .. //depot/projects/usiii/boot/uboot/lib/net.c#4 integrate .. //depot/projects/usiii/boot/uboot/lib/reboot.c#3 integrate .. //depot/projects/usiii/boot/uboot/lib/time.c#3 integrate .. //depot/projects/usiii/bsm/audit_kevents.h#4 integrate .. //depot/projects/usiii/cam/scsi/scsi_da.c#4 integrate .. //depot/projects/usiii/cddl/compat/opensolaris/kern/opensolaris_kobj.c#2 integrate .. //depot/projects/usiii/cddl/compat/opensolaris/kern/opensolaris_vfs.c#3 integrate .. //depot/projects/usiii/cddl/compat/opensolaris/sys/cpuvar.h#4 integrate .. //depot/projects/usiii/cddl/contrib/opensolaris/uts/common/fs/gfs.c#2 integrate .. //depot/projects/usiii/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_file.c#2 integrate .. //depot/projects/usiii/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ctldir.c#2 integrate .. //depot/projects/usiii/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_replay.c#2 integrate .. //depot/projects/usiii/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c#2 integrate .. //depot/projects/usiii/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_znode.c#3 integrate .. //depot/projects/usiii/compat/freebsd32/freebsd32_proto.h#9 integrate .. //depot/projects/usiii/compat/freebsd32/freebsd32_syscall.h#9 integrate .. //depot/projects/usiii/compat/freebsd32/freebsd32_syscalls.c#9 integrate .. //depot/projects/usiii/compat/freebsd32/freebsd32_sysent.c#9 integrate .. //depot/projects/usiii/compat/freebsd32/syscalls.master#9 integrate .. //depot/projects/usiii/compat/linprocfs/linprocfs.c#6 integrate .. //depot/projects/usiii/compat/linux/linux_file.c#7 integrate .. //depot/projects/usiii/compat/linux/linux_getcwd.c#4 integrate .. //depot/projects/usiii/compat/linux/linux_ioctl.c#5 integrate .. //depot/projects/usiii/compat/linux/linux_misc.c#9 integrate .. //depot/projects/usiii/compat/linux/linux_socket.c#3 integrate .. //depot/projects/usiii/compat/ndis/subr_ndis.c#6 integrate .. //depot/projects/usiii/compat/svr4/svr4_fcntl.c#5 integrate .. //depot/projects/usiii/compat/svr4/svr4_sockio.c#3 integrate .. //depot/projects/usiii/conf/NOTES#14 integrate .. //depot/projects/usiii/conf/files.i386#10 integrate .. //depot/projects/usiii/conf/files.mips#2 integrate .. //depot/projects/usiii/conf/files.pc98#6 integrate .. //depot/projects/usiii/conf/files.powerpc#8 integrate .. //depot/projects/usiii/conf/files.sparc64#9 integrate .. //depot/projects/usiii/conf/files.sun4v#5 integrate .. //depot/projects/usiii/conf/options#15 integrate .. //depot/projects/usiii/contrib/altq/altq/altq_subr.c#3 integrate .. //depot/projects/usiii/contrib/dev/ath/COPYRIGHT#2 integrate .. //depot/projects/usiii/contrib/dev/ath/README#2 integrate .. //depot/projects/usiii/contrib/dev/ath/ah.h#2 integrate .. //depot/projects/usiii/contrib/dev/ath/ah_desc.h#2 integrate .. //depot/projects/usiii/contrib/dev/ath/ah_devid.h#2 integrate .. //depot/projects/usiii/contrib/dev/ath/ah_soc.h#2 integrate .. //depot/projects/usiii/contrib/dev/ath/public/alpha-elf.hal.o.uu#2 integrate .. //depot/projects/usiii/contrib/dev/ath/public/alpha-elf.inc#2 integrate .. //depot/projects/usiii/contrib/dev/ath/public/alpha-elf.opt_ah.h#2 integrate .. //depot/projects/usiii/contrib/dev/ath/public/ap30.hal.o.uu#2 integrate .. //depot/projects/usiii/contrib/dev/ath/public/ap30.inc#2 integrate .. //depot/projects/usiii/contrib/dev/ath/public/ap43.hal.o.uu#2 integrate .. //depot/projects/usiii/contrib/dev/ath/public/ap43.inc#2 integrate .. //depot/projects/usiii/contrib/dev/ath/public/ap51.hal.o.uu#2 integrate .. //depot/projects/usiii/contrib/dev/ath/public/ap51.inc#2 integrate .. //depot/projects/usiii/contrib/dev/ath/public/ap61.hal.o.uu#2 integrate .. //depot/projects/usiii/contrib/dev/ath/public/ap61.inc#2 integrate .. //depot/projects/usiii/contrib/dev/ath/public/arm9-le-thumb-elf.hal.o.uu#2 integrate .. //depot/projects/usiii/contrib/dev/ath/public/arm9-le-thumb-elf.inc#2 integrate .. //depot/projects/usiii/contrib/dev/ath/public/arm9-le-thumb-elf.opt_ah.h#2 integrate .. //depot/projects/usiii/contrib/dev/ath/public/armv4-be-elf.hal.o.uu#2 integrate .. //depot/projects/usiii/contrib/dev/ath/public/armv4-be-elf.inc#2 integrate .. //depot/projects/usiii/contrib/dev/ath/public/armv4-be-elf.opt_ah.h#2 integrate .. //depot/projects/usiii/contrib/dev/ath/public/armv4-le-elf.hal.o.uu#2 integrate .. //depot/projects/usiii/contrib/dev/ath/public/armv4-le-elf.inc#2 integrate .. //depot/projects/usiii/contrib/dev/ath/public/armv4-le-elf.opt_ah.h#2 integrate .. //depot/projects/usiii/contrib/dev/ath/public/i386-elf.hal.o.uu#2 integrate .. //depot/projects/usiii/contrib/dev/ath/public/i386-elf.inc#2 integrate .. //depot/projects/usiii/contrib/dev/ath/public/i386-elf.opt_ah.h#2 integrate .. //depot/projects/usiii/contrib/dev/ath/public/mips-be-elf.hal.o.uu#2 integrate .. //depot/projects/usiii/contrib/dev/ath/public/mips-be-elf.inc#2 integrate .. //depot/projects/usiii/contrib/dev/ath/public/mips-be-elf.opt_ah.h#2 integrate .. //depot/projects/usiii/contrib/dev/ath/public/mips-le-elf.hal.o.uu#2 integrate .. //depot/projects/usiii/contrib/dev/ath/public/mips-le-elf.inc#2 integrate .. //depot/projects/usiii/contrib/dev/ath/public/mips-le-elf.opt_ah.h#2 integrate .. //depot/projects/usiii/contrib/dev/ath/public/mips1-be-elf.hal.o.uu#2 integrate .. //depot/projects/usiii/contrib/dev/ath/public/mips1-be-elf.inc#2 integrate .. //depot/projects/usiii/contrib/dev/ath/public/mips1-be-elf.opt_ah.h#2 integrate .. //depot/projects/usiii/contrib/dev/ath/public/mips1-le-elf.hal.o.uu#2 integrate .. //depot/projects/usiii/contrib/dev/ath/public/mips1-le-elf.inc#2 integrate .. //depot/projects/usiii/contrib/dev/ath/public/mips1-le-elf.opt_ah.h#2 integrate .. //depot/projects/usiii/contrib/dev/ath/public/mipsisa32-be-elf.hal.o.uu#2 integrate .. //depot/projects/usiii/contrib/dev/ath/public/mipsisa32-be-elf.inc#2 integrate .. //depot/projects/usiii/contrib/dev/ath/public/mipsisa32-be-elf.opt_ah.h#2 integrate .. //depot/projects/usiii/contrib/dev/ath/public/mipsisa32-le-elf.hal.o.uu#2 integrate .. //depot/projects/usiii/contrib/dev/ath/public/mipsisa32-le-elf.inc#2 integrate .. //depot/projects/usiii/contrib/dev/ath/public/mipsisa32-le-elf.opt_ah.h#2 integrate .. //depot/projects/usiii/contrib/dev/ath/public/powerpc-be-eabi.hal.o.uu#2 integrate .. //depot/projects/usiii/contrib/dev/ath/public/powerpc-be-eabi.inc#2 integrate .. //depot/projects/usiii/contrib/dev/ath/public/powerpc-be-eabi.opt_ah.h#2 integrate .. //depot/projects/usiii/contrib/dev/ath/public/powerpc-be-elf.hal.o.uu#2 integrate .. //depot/projects/usiii/contrib/dev/ath/public/powerpc-be-elf.inc#2 integrate .. //depot/projects/usiii/contrib/dev/ath/public/powerpc-be-elf.opt_ah.h#2 integrate .. //depot/projects/usiii/contrib/dev/ath/public/powerpc-le-eabi.hal.o.uu#2 integrate .. //depot/projects/usiii/contrib/dev/ath/public/powerpc-le-eabi.inc#2 integrate .. //depot/projects/usiii/contrib/dev/ath/public/powerpc-le-eabi.opt_ah.h#2 integrate .. //depot/projects/usiii/contrib/dev/ath/public/sh4-le-elf.hal.o.uu#2 integrate .. //depot/projects/usiii/contrib/dev/ath/public/sh4-le-elf.inc#2 integrate .. //depot/projects/usiii/contrib/dev/ath/public/sh4-le-elf.opt_ah.h#2 integrate .. //depot/projects/usiii/contrib/dev/ath/public/sparc-be-elf.hal.o.uu#2 integrate .. //depot/projects/usiii/contrib/dev/ath/public/sparc-be-elf.inc#2 integrate .. //depot/projects/usiii/contrib/dev/ath/public/sparc-be-elf.opt_ah.h#2 integrate .. //depot/projects/usiii/contrib/dev/ath/public/sparc64-be-elf.hal.o.uu#2 integrate .. //depot/projects/usiii/contrib/dev/ath/public/sparc64-be-elf.inc#2 integrate .. //depot/projects/usiii/contrib/dev/ath/public/sparc64-be-elf.opt_ah.h#2 integrate .. //depot/projects/usiii/contrib/dev/ath/public/wackelf.c#2 integrate .. //depot/projects/usiii/contrib/dev/ath/public/wisoc.hal.o.uu#1 branch .. //depot/projects/usiii/contrib/dev/ath/public/wisoc.inc#1 branch .. //depot/projects/usiii/contrib/dev/ath/public/wisoc.opt_ah.h#1 branch .. //depot/projects/usiii/contrib/dev/ath/public/x86_64-elf.hal.o.uu#2 integrate .. //depot/projects/usiii/contrib/dev/ath/public/x86_64-elf.inc#2 integrate .. //depot/projects/usiii/contrib/dev/ath/public/x86_64-elf.opt_ah.h#2 integrate .. //depot/projects/usiii/contrib/dev/ath/public/xscale-be-elf.hal.o.uu#2 integrate .. //depot/projects/usiii/contrib/dev/ath/public/xscale-be-elf.inc#2 integrate .. //depot/projects/usiii/contrib/dev/ath/public/xscale-be-elf.opt_ah.h#2 integrate .. //depot/projects/usiii/contrib/dev/ath/public/xscale-le-elf.hal.o.uu#2 integrate .. //depot/projects/usiii/contrib/dev/ath/public/xscale-le-elf.inc#2 integrate .. //depot/projects/usiii/contrib/dev/ath/public/xscale-le-elf.opt_ah.h#2 integrate .. //depot/projects/usiii/contrib/dev/ath/version.h#2 integrate .. //depot/projects/usiii/dev/acpi_support/acpi_fujitsu.c#2 integrate .. //depot/projects/usiii/dev/asmc/asmc.c#3 integrate .. //depot/projects/usiii/dev/asmc/asmcvar.h#3 integrate .. //depot/projects/usiii/dev/ata/ata-chipset.c#10 integrate .. //depot/projects/usiii/dev/ata/ata-pci.h#8 integrate .. //depot/projects/usiii/dev/ath/if_athvar.h#5 integrate .. //depot/projects/usiii/dev/bce/if_bce.c#7 integrate .. //depot/projects/usiii/dev/bce/if_bcereg.h#5 integrate .. //depot/projects/usiii/dev/bge/if_bge.c#12 integrate .. //depot/projects/usiii/dev/bm/if_bm.c#2 integrate .. //depot/projects/usiii/dev/cas/if_casreg.h#2 edit .. //depot/projects/usiii/dev/ciss/ciss.c#7 integrate .. //depot/projects/usiii/dev/ciss/cissreg.h#3 integrate .. //depot/projects/usiii/dev/cpuctl/cpuctl.c#2 integrate .. //depot/projects/usiii/dev/cxgb/cxgb_adapter.h#7 integrate .. //depot/projects/usiii/dev/cxgb/cxgb_ioctl.h#4 integrate .. //depot/projects/usiii/dev/cxgb/cxgb_main.c#9 integrate .. //depot/projects/usiii/dev/cxgb/cxgb_sge.c#7 integrate .. //depot/projects/usiii/dev/cxgb/ulp/iw_cxgb/iw_cxgb.c#2 integrate .. //depot/projects/usiii/dev/cxgb/ulp/toecore/toedev.c#2 integrate .. //depot/projects/usiii/dev/dc/if_dc.c#6 integrate .. //depot/projects/usiii/dev/dc/if_dcreg.h#3 integrate .. //depot/projects/usiii/dev/drm/ati_pcigart.c#3 integrate .. //depot/projects/usiii/dev/drm/drm_bufs.c#3 integrate .. //depot/projects/usiii/dev/drm/drm_drv.c#4 integrate .. //depot/projects/usiii/dev/drm/drm_lock.c#3 integrate .. //depot/projects/usiii/dev/drm/drm_pci.c#3 integrate .. //depot/projects/usiii/dev/drm/i915_dma.c#4 integrate .. //depot/projects/usiii/dev/drm/mach64_dma.c#3 integrate .. //depot/projects/usiii/dev/e1000/if_igb.c#2 integrate .. //depot/projects/usiii/dev/e1000/if_igb.h#2 integrate .. //depot/projects/usiii/dev/esp/esp_sbus.c#4 integrate .. //depot/projects/usiii/dev/esp/ncr53c9x.c#3 integrate .. //depot/projects/usiii/dev/esp/ncr53c9xreg.h#2 integrate .. //depot/projects/usiii/dev/esp/ncr53c9xvar.h#3 integrate .. //depot/projects/usiii/dev/ex/if_ex_pccard.c#3 integrate .. //depot/projects/usiii/dev/ic/i8251.h#2 integrate .. //depot/projects/usiii/dev/ic/i8255.h#1 branch .. //depot/projects/usiii/dev/ic/ns16550.h#2 integrate .. //depot/projects/usiii/dev/ichwd/ichwd.c#4 integrate .. //depot/projects/usiii/dev/ichwd/ichwd.h#4 integrate .. //depot/projects/usiii/dev/iicbus/ds133x.c#2 integrate .. //depot/projects/usiii/dev/iicbus/ds1672.c#2 integrate .. //depot/projects/usiii/dev/ipmi/ipmi.c#2 integrate .. //depot/projects/usiii/dev/ipmi/ipmi_kcs.c#3 integrate .. //depot/projects/usiii/dev/ipmi/ipmivars.h#2 integrate .. //depot/projects/usiii/dev/jme/if_jme.c#2 integrate .. //depot/projects/usiii/dev/jme/if_jmereg.h#2 integrate .. //depot/projects/usiii/dev/k8temp/k8temp.c#5 integrate .. //depot/projects/usiii/dev/le/if_le_ledma.c#2 integrate .. //depot/projects/usiii/dev/md/md.c#6 integrate .. //depot/projects/usiii/dev/mii/e1000phy.c#3 integrate .. //depot/projects/usiii/dev/mii/miidevs#9 integrate .. //depot/projects/usiii/dev/pccard/pccard_cis.c#3 integrate .. //depot/projects/usiii/dev/pccard/pccard_cis_quirks.c#3 integrate .. //depot/projects/usiii/dev/pccard/pccarddevs#5 integrate .. //depot/projects/usiii/dev/pci/pci_pci.c#5 integrate .. //depot/projects/usiii/dev/ppc/ppc_isa.c#3 integrate .. //depot/projects/usiii/dev/re/if_re.c#7 integrate .. //depot/projects/usiii/dev/si/si.c#3 integrate .. //depot/projects/usiii/dev/sound/pci/hda/hdac.c#8 integrate .. //depot/projects/usiii/dev/syscons/syscons.c#8 integrate .. //depot/projects/usiii/dev/tsec/if_tsec.c#3 integrate .. //depot/projects/usiii/dev/tsec/if_tsec.h#3 integrate .. //depot/projects/usiii/dev/tsec/if_tsec_ocp.c#1 branch .. //depot/projects/usiii/dev/uart/uart.h#4 integrate .. //depot/projects/usiii/dev/uart/uart_bus_isa.c#2 integrate .. //depot/projects/usiii/dev/uart/uart_cpu_pc98.c#2 integrate .. //depot/projects/usiii/dev/usb/ehci_pci.c#7 integrate .. //depot/projects/usiii/dev/usb/if_zyd.c#11 integrate .. //depot/projects/usiii/dev/usb/if_zydreg.h#4 integrate .. //depot/projects/usiii/dev/usb/ohci_pci.c#2 integrate .. //depot/projects/usiii/dev/usb/ucom.c#5 integrate .. //depot/projects/usiii/dev/usb/ucomvar.h#4 integrate .. //depot/projects/usiii/dev/usb/ufoma.c#3 integrate .. //depot/projects/usiii/dev/usb/uhci_pci.c#4 integrate .. //depot/projects/usiii/dev/usb/uipaq.c#7 integrate .. //depot/projects/usiii/dev/usb/umodem.c#3 integrate .. //depot/projects/usiii/dev/usb/uplcom.c#4 integrate .. //depot/projects/usiii/dev/usb/usb_quirks.c#5 integrate .. //depot/projects/usiii/dev/usb/usbdevs#14 integrate .. //depot/projects/usiii/dev/usb/uvscom.c#2 integrate .. //depot/projects/usiii/dev/vx/if_vx_eisa.c#2 integrate .. //depot/projects/usiii/dev/wi/if_wi_pccard.c#4 integrate .. //depot/projects/usiii/dev/wpi/if_wpi.c#8 integrate .. //depot/projects/usiii/dev/xen/blkback/blkback.c#2 integrate .. //depot/projects/usiii/fs/cd9660/cd9660_vnops.c#3 integrate .. //depot/projects/usiii/fs/coda/coda_venus.c#3 integrate .. //depot/projects/usiii/fs/coda/coda_venus.h#3 integrate .. //depot/projects/usiii/fs/coda/coda_vnops.c#4 integrate .. //depot/projects/usiii/fs/devfs/devfs_vnops.c#9 integrate .. //depot/projects/usiii/fs/fdescfs/fdesc_vnops.c#6 integrate .. //depot/projects/usiii/fs/hpfs/hpfs_vnops.c#3 integrate .. //depot/projects/usiii/fs/msdosfs/msdosfs_fat.c#4 integrate .. //depot/projects/usiii/fs/msdosfs/msdosfs_vnops.c#7 integrate .. //depot/projects/usiii/fs/nwfs/nwfs_io.c#2 integrate .. //depot/projects/usiii/fs/nwfs/nwfs_vnops.c#3 integrate .. //depot/projects/usiii/fs/portalfs/portal_vnops.c#3 integrate .. //depot/projects/usiii/fs/pseudofs/pseudofs_vnops.c#4 integrate .. //depot/projects/usiii/fs/smbfs/smbfs_io.c#4 integrate .. //depot/projects/usiii/fs/smbfs/smbfs_node.c#6 integrate .. //depot/projects/usiii/fs/smbfs/smbfs_vnops.c#4 integrate .. //depot/projects/usiii/fs/tmpfs/tmpfs.h#4 integrate .. //depot/projects/usiii/fs/tmpfs/tmpfs_fifoops.c#2 integrate .. //depot/projects/usiii/fs/tmpfs/tmpfs_fifoops.h#2 integrate .. //depot/projects/usiii/fs/tmpfs/tmpfs_subr.c#6 integrate .. //depot/projects/usiii/fs/tmpfs/tmpfs_vfsops.c#5 integrate .. //depot/projects/usiii/fs/tmpfs/tmpfs_vnops.c#6 integrate .. //depot/projects/usiii/fs/tmpfs/tmpfs_vnops.h#2 integrate .. //depot/projects/usiii/fs/unionfs/union_subr.c#7 integrate .. //depot/projects/usiii/fs/unionfs/union_vfsops.c#6 integrate .. //depot/projects/usiii/fs/unionfs/union_vnops.c#6 integrate .. //depot/projects/usiii/geom/geom_dev.c#4 integrate .. //depot/projects/usiii/geom/journal/g_journal.c#4 integrate .. //depot/projects/usiii/geom/part/g_part.c#6 integrate .. //depot/projects/usiii/geom/part/g_part.h#5 integrate .. //depot/projects/usiii/geom/part/g_part_gpt.c#6 integrate .. //depot/projects/usiii/gnu/fs/ext2fs/ext2_vfsops.c#5 integrate .. //depot/projects/usiii/gnu/fs/ext2fs/ext2_vnops.c#4 integrate .. //depot/projects/usiii/gnu/fs/xfs/FreeBSD/xfs_vnode.h#2 integrate .. //depot/projects/usiii/gnu/fs/xfs/FreeBSD/xfs_vnops.c#4 integrate .. //depot/projects/usiii/i386/conf/NOTES#9 integrate .. //depot/projects/usiii/i386/conf/XEN#2 integrate .. //depot/projects/usiii/i386/cpufreq/est.c#9 integrate .. //depot/projects/usiii/i386/cpufreq/powernow.c#3 integrate .. //depot/projects/usiii/i386/cpufreq/smist.c#3 integrate .. //depot/projects/usiii/i386/i386/bpf_jit_machdep.c#4 integrate .. //depot/projects/usiii/i386/i386/bpf_jit_machdep.h#4 integrate .. //depot/projects/usiii/i386/i386/local_apic.c#6 integrate .. //depot/projects/usiii/i386/i386/machdep.c#8 integrate .. //depot/projects/usiii/i386/ibcs2/imgact_coff.c#5 integrate .. //depot/projects/usiii/i386/include/pmc_mdep.h#3 integrate .. //depot/projects/usiii/i386/include/xen/xenpmap.h#3 integrate .. //depot/projects/usiii/i386/include/xen/xenvar.h#3 integrate .. //depot/projects/usiii/i386/isa/isa.c#3 integrate .. //depot/projects/usiii/i386/linux/linux_genassym.c#2 integrate .. //depot/projects/usiii/i386/linux/linux_locore.s#2 integrate .. //depot/projects/usiii/i386/pci/pci_cfgreg.c#4 integrate .. //depot/projects/usiii/i386/xen/locore.s#3 integrate .. //depot/projects/usiii/i386/xen/mp_machdep.c#1 branch .. //depot/projects/usiii/i386/xen/mptable.c#1 branch .. //depot/projects/usiii/i386/xen/pmap.c#3 integrate .. //depot/projects/usiii/i386/xen/xen_machdep.c#3 integrate .. //depot/projects/usiii/kern/imgact_shell.c#2 integrate .. //depot/projects/usiii/kern/init_sysent.c#9 integrate .. //depot/projects/usiii/kern/kern_exec.c#10 integrate .. //depot/projects/usiii/kern/kern_exit.c#8 integrate .. //depot/projects/usiii/kern/kern_linker.c#7 integrate .. //depot/projects/usiii/kern/kern_lock.c#9 integrate .. //depot/projects/usiii/kern/kern_mib.c#7 integrate .. //depot/projects/usiii/kern/kern_mutex.c#5 integrate .. //depot/projects/usiii/kern/kern_proc.c#10 integrate .. //depot/projects/usiii/kern/kern_resource.c#6 integrate .. //depot/projects/usiii/kern/kern_rmlock.c#2 integrate .. //depot/projects/usiii/kern/kern_rwlock.c#7 integrate .. //depot/projects/usiii/kern/kern_sig.c#9 integrate .. //depot/projects/usiii/kern/kern_subr.c#3 integrate .. //depot/projects/usiii/kern/kern_sx.c#7 integrate .. //depot/projects/usiii/kern/subr_rman.c#2 integrate .. //depot/projects/usiii/kern/subr_sleepqueue.c#9 integrate .. //depot/projects/usiii/kern/subr_smp.c#9 integrate .. //depot/projects/usiii/kern/subr_turnstile.c#5 integrate .. //depot/projects/usiii/kern/subr_witness.c#12 integrate .. //depot/projects/usiii/kern/syscalls.c#9 integrate .. //depot/projects/usiii/kern/syscalls.master#10 integrate .. //depot/projects/usiii/kern/tty.c#8 integrate .. //depot/projects/usiii/kern/tty_compat.c#3 integrate .. //depot/projects/usiii/kern/tty_inq.c#2 integrate .. //depot/projects/usiii/kern/tty_outq.c#3 integrate .. //depot/projects/usiii/kern/tty_pts.c#5 integrate .. //depot/projects/usiii/kern/tty_ttydisc.c#2 integrate .. //depot/projects/usiii/kern/uipc_mbuf.c#6 integrate .. //depot/projects/usiii/kern/uipc_mqueue.c#4 integrate .. //depot/projects/usiii/kern/uipc_sockbuf.c#6 integrate .. //depot/projects/usiii/kern/uipc_socket.c#8 integrate .. //depot/projects/usiii/kern/vfs_default.c#5 integrate .. //depot/projects/usiii/kern/vfs_lookup.c#7 integrate .. //depot/projects/usiii/kern/vfs_mount.c#12 integrate .. //depot/projects/usiii/kern/vfs_subr.c#13 integrate .. //depot/projects/usiii/kern/vfs_syscalls.c#8 integrate .. //depot/projects/usiii/kern/vfs_vnops.c#6 integrate .. //depot/projects/usiii/kern/vnode_if.src#5 integrate .. //depot/projects/usiii/mips/adm5120/admpci.c#2 integrate .. //depot/projects/usiii/mips/adm5120/if_admsw.c#2 integrate .. //depot/projects/usiii/mips/adm5120/if_admswvar.h#2 integrate .. //depot/projects/usiii/mips/adm5120/obio.c#2 integrate .. //depot/projects/usiii/mips/adm5120/std.adm5120#2 integrate .. //depot/projects/usiii/mips/adm5120/uart_bus_adm5120.c#2 integrate .. //depot/projects/usiii/mips/adm5120/uart_cpu_adm5120.c#2 integrate .. //depot/projects/usiii/mips/adm5120/uart_dev_adm5120.c#2 integrate .. //depot/projects/usiii/mips/conf/ADM5120#3 integrate .. //depot/projects/usiii/mips/conf/IDT#3 integrate .. //depot/projects/usiii/mips/conf/MALTA#3 integrate .. //depot/projects/usiii/mips/conf/SENTRY5#3 integrate .. //depot/projects/usiii/mips/idt/idtpci.c#2 integrate .. //depot/projects/usiii/mips/idt/if_kr.c#2 integrate .. //depot/projects/usiii/mips/idt/obio.c#2 integrate .. //depot/projects/usiii/mips/idt/std.idt#2 integrate .. //depot/projects/usiii/mips/idt/uart_bus_rc32434.c#2 integrate .. //depot/projects/usiii/mips/malta/files.malta#2 integrate .. //depot/projects/usiii/mips/malta/gt.c#2 integrate .. //depot/projects/usiii/mips/malta/gt_pci.c#2 integrate .. //depot/projects/usiii/mips/malta/malta_machdep.c#2 integrate .. //depot/projects/usiii/mips/malta/obio.c#2 integrate .. //depot/projects/usiii/mips/malta/std.malta#2 integrate .. //depot/projects/usiii/mips/malta/uart_bus_maltausart.c#2 integrate .. //depot/projects/usiii/mips/malta/uart_cpu_maltausart.c#2 integrate .. //depot/projects/usiii/mips/malta/yamon.c#2 integrate .. //depot/projects/usiii/mips/mips/in_cksum.c#2 integrate .. //depot/projects/usiii/mips/mips/intr_machdep.c#2 integrate .. //depot/projects/usiii/mips/sentry5/obio.c#2 integrate .. //depot/projects/usiii/mips/sentry5/s5_machdep.c#2 integrate .. //depot/projects/usiii/mips/sentry5/uart_bus_sbusart.c#2 integrate .. //depot/projects/usiii/mips/sentry5/uart_cpu_sbusart.c#2 integrate .. //depot/projects/usiii/modules/Makefile#14 integrate .. //depot/projects/usiii/modules/aha/Makefile#2 integrate .. //depot/projects/usiii/modules/ahb/Makefile#2 integrate .. //depot/projects/usiii/modules/an/Makefile#2 integrate .. //depot/projects/usiii/modules/ar/Makefile#2 integrate .. //depot/projects/usiii/modules/ath_rate_amrr/Makefile#4 integrate .. //depot/projects/usiii/modules/ath_rate_onoe/Makefile#4 integrate .. //depot/projects/usiii/modules/ath_rate_sample/Makefile#4 integrate .. //depot/projects/usiii/modules/ce/Makefile#2 integrate .. //depot/projects/usiii/modules/cp/Makefile#2 integrate .. //depot/projects/usiii/modules/ctau/Makefile#2 integrate .. //depot/projects/usiii/modules/cx/Makefile#2 integrate .. //depot/projects/usiii/modules/digi/digi/Makefile#2 integrate .. //depot/projects/usiii/modules/fatm/Makefile#2 integrate .. //depot/projects/usiii/modules/hatm/Makefile#2 integrate .. //depot/projects/usiii/modules/hifn/Makefile#2 integrate .. //depot/projects/usiii/modules/if_tap/Makefile#2 integrate .. //depot/projects/usiii/modules/linux/Makefile#2 integrate .. //depot/projects/usiii/modules/netgraph/sync_ar/Makefile#2 integrate .. //depot/projects/usiii/modules/netgraph/sync_sr/Makefile#2 integrate .. //depot/projects/usiii/modules/patm/Makefile#2 integrate .. //depot/projects/usiii/modules/pf/Makefile#2 integrate .. //depot/projects/usiii/modules/pflog/Makefile#2 integrate .. //depot/projects/usiii/modules/rp/Makefile#2 integrate .. //depot/projects/usiii/modules/safe/Makefile#2 integrate .. //depot/projects/usiii/modules/sppp/Makefile#2 integrate .. //depot/projects/usiii/modules/sr/Makefile#2 integrate .. //depot/projects/usiii/modules/svr4/Makefile#2 integrate .. //depot/projects/usiii/modules/trm/Makefile#2 integrate .. //depot/projects/usiii/modules/ubsec/Makefile#2 integrate .. //depot/projects/usiii/modules/usb/Makefile#2 integrate .. //depot/projects/usiii/modules/wi/Makefile#2 integrate .. //depot/projects/usiii/modules/wlan/Makefile#4 integrate .. //depot/projects/usiii/modules/wlan_acl/Makefile#3 integrate .. //depot/projects/usiii/modules/wlan_amrr/Makefile#3 integrate .. //depot/projects/usiii/modules/wlan_ccmp/Makefile#3 integrate .. //depot/projects/usiii/modules/wlan_rssadapt/Makefile#2 integrate .. //depot/projects/usiii/modules/wlan_tkip/Makefile#3 integrate .. //depot/projects/usiii/modules/wlan_wep/Makefile#3 integrate .. //depot/projects/usiii/modules/wlan_xauth/Makefile#3 integrate .. //depot/projects/usiii/net/bpf.c#9 integrate .. //depot/projects/usiii/net/bpf.h#6 integrate .. //depot/projects/usiii/net/bpf_filter.c#5 integrate .. //depot/projects/usiii/net/bpf_jitter.c#3 integrate .. //depot/projects/usiii/net/bpf_jitter.h#3 integrate .. //depot/projects/usiii/net/ethernet.h#4 integrate .. //depot/projects/usiii/net/if.h#5 integrate .. //depot/projects/usiii/net/if_bridge.c#7 integrate .. //depot/projects/usiii/net/if_ethersubr.c#9 integrate .. //depot/projects/usiii/net/if_mib.c#3 integrate .. //depot/projects/usiii/net/if_tap.c#4 integrate .. //depot/projects/usiii/net/if_tap.h#2 integrate .. //depot/projects/usiii/net/if_vlan.c#5 integrate .. //depot/projects/usiii/net/route.c#9 integrate .. //depot/projects/usiii/net/route.h#5 integrate .. //depot/projects/usiii/net80211/ieee80211.c#9 integrate .. //depot/projects/usiii/net80211/ieee80211.h#7 integrate .. //depot/projects/usiii/net80211/ieee80211_crypto_tkip.c#4 integrate .. //depot/projects/usiii/net80211/ieee80211_ddb.c#4 integrate .. //depot/projects/usiii/net80211/ieee80211_freebsd.h#6 integrate .. //depot/projects/usiii/net80211/ieee80211_ht.c#9 integrate .. //depot/projects/usiii/net80211/ieee80211_ht.h#7 integrate .. //depot/projects/usiii/net80211/ieee80211_ioctl.c#7 integrate .. //depot/projects/usiii/net80211/ieee80211_ioctl.h#6 integrate .. //depot/projects/usiii/net80211/ieee80211_node.c#9 integrate .. //depot/projects/usiii/net80211/ieee80211_node.h#5 integrate .. //depot/projects/usiii/net80211/ieee80211_phy.c#3 integrate .. //depot/projects/usiii/net80211/ieee80211_sta.c#2 integrate .. //depot/projects/usiii/netgraph/ng_bpf.c#4 integrate .. //depot/projects/usiii/netgraph/ng_pipe.c#1 branch .. //depot/projects/usiii/netgraph/ng_pipe.h#1 branch .. //depot/projects/usiii/netinet/if_ether.c#7 integrate .. //depot/projects/usiii/netinet/ip_fw.h#6 integrate .. //depot/projects/usiii/netinet/ip_fw2.c#12 integrate .. //depot/projects/usiii/netinet/ip_input.c#7 integrate .. //depot/projects/usiii/netinet/ip_options.c#7 integrate .. //depot/projects/usiii/netinet/ip_var.h#4 integrate .. //depot/projects/usiii/netinet/libalias/alias_db.c#4 integrate .. //depot/projects/usiii/netinet/sctp_indata.c#8 integrate .. //depot/projects/usiii/netinet/sctp_lock_bsd.h#5 integrate .. //depot/projects/usiii/netinet/sctp_output.c#9 integrate .. //depot/projects/usiii/netinet/sctp_pcb.c#10 integrate .. //depot/projects/usiii/netinet/sctp_sysctl.h#5 integrate .. //depot/projects/usiii/netinet/sctp_timer.c#6 integrate .. //depot/projects/usiii/netinet/sctp_timer.h#4 integrate .. //depot/projects/usiii/netinet/sctp_var.h#7 integrate .. //depot/projects/usiii/netinet/sctputil.c#8 integrate .. //depot/projects/usiii/netinet/tcp_debug.c#3 integrate .. //depot/projects/usiii/netinet/tcp_hostcache.c#4 integrate .. //depot/projects/usiii/netinet/tcp_input.c#10 integrate .. //depot/projects/usiii/netinet/tcp_offload.c#4 integrate .. //depot/projects/usiii/netinet/tcp_output.c#8 integrate .. //depot/projects/usiii/netinet/tcp_subr.c#10 integrate .. //depot/projects/usiii/netinet/tcp_syncache.c#9 integrate .. //depot/projects/usiii/netinet/tcp_syncache.h#4 integrate .. //depot/projects/usiii/netinet/tcp_var.h#9 integrate .. //depot/projects/usiii/netinet/toedev.h#3 integrate .. //depot/projects/usiii/netinet/udp_usrreq.c#8 integrate .. //depot/projects/usiii/netinet6/icmp6.c#6 integrate .. //depot/projects/usiii/netinet6/mld6.c#4 integrate .. //depot/projects/usiii/netinet6/nd6_nbr.c#5 integrate .. //depot/projects/usiii/netinet6/udp6_usrreq.c#8 integrate .. //depot/projects/usiii/nfs4client/nfs4_vnops.c#6 integrate .. //depot/projects/usiii/nfsclient/nfs_bio.c#4 integrate .. //depot/projects/usiii/nfsclient/nfs_vfsops.c#11 integrate .. //depot/projects/usiii/nfsclient/nfs_vnops.c#8 integrate .. //depot/projects/usiii/nfsserver/nfs_serv.c#7 integrate .. //depot/projects/usiii/nfsserver/nfs_srvsubs.c#5 integrate .. //depot/projects/usiii/nlm/nlm_prot_impl.c#3 integrate .. //depot/projects/usiii/nlm/nlm_prot_server.c#3 integrate .. //depot/projects/usiii/pc98/cbus/sio.c#6 integrate .. //depot/projects/usiii/pc98/conf/GENERIC#12 integrate .. //depot/projects/usiii/pc98/conf/GENERIC.hints#3 integrate .. //depot/projects/usiii/pc98/conf/NOTES#5 integrate .. //depot/projects/usiii/pc98/include/bus.h#3 integrate .. //depot/projects/usiii/pc98/pc98/busiosubr.c#3 integrate .. //depot/projects/usiii/powerpc/aim/clock.c#5 integrate .. //depot/projects/usiii/powerpc/aim/interrupt.c#2 integrate .. //depot/projects/usiii/powerpc/aim/machdep.c#9 integrate .. //depot/projects/usiii/powerpc/aim/mmu_oea.c#5 integrate .. //depot/projects/usiii/powerpc/aim/vm_machdep.c#5 integrate .. //depot/projects/usiii/powerpc/booke/locore.S#2 integrate .. //depot/projects/usiii/powerpc/booke/machdep.c#6 integrate .. //depot/projects/usiii/powerpc/booke/pmap.c#5 integrate .. //depot/projects/usiii/powerpc/include/cpufunc.h#3 integrate .. //depot/projects/usiii/powerpc/powerpc/db_interface.c#2 integrate .. //depot/projects/usiii/powerpc/powerpc/pmap_dispatch.c#5 integrate .. //depot/projects/usiii/rpc/pmap_prot.h#2 integrate .. //depot/projects/usiii/rpc/rpcb_prot.c#2 integrate .. //depot/projects/usiii/security/audit/audit_arg.c#7 integrate .. //depot/projects/usiii/security/audit/audit_bsm.c#7 integrate .. //depot/projects/usiii/security/audit/audit_syscalls.c#8 integrate .. //depot/projects/usiii/security/audit/audit_worker.c#10 integrate .. //depot/projects/usiii/security/mac_bsdextended/mac_bsdextended.c#6 integrate .. //depot/projects/usiii/security/mac_lomac/mac_lomac.c#6 integrate .. //depot/projects/usiii/sparc64/conf/GENERIC#13 integrate .. //depot/projects/usiii/sparc64/include/asi.h#3 integrate .. //depot/projects/usiii/sparc64/include/cache.h#4 integrate .. //depot/projects/usiii/sparc64/include/clock.h#4 integrate .. //depot/projects/usiii/sparc64/include/cpu.h#3 integrate .. //depot/projects/usiii/sparc64/include/cpufunc.h#5 integrate .. //depot/projects/usiii/sparc64/include/pcpu.h#5 integrate .. //depot/projects/usiii/sparc64/include/smp.h#4 integrate .. //depot/projects/usiii/sparc64/include/tick.h#3 integrate .. //depot/projects/usiii/sparc64/include/tlb.h#5 integrate .. //depot/projects/usiii/sparc64/include/trap.h#3 integrate .. //depot/projects/usiii/sparc64/include/tte.h#4 integrate .. //depot/projects/usiii/sparc64/include/ver.h#3 integrate .. //depot/projects/usiii/sparc64/sbus/dma_sbus.c#3 integrate .. //depot/projects/usiii/sparc64/sbus/lsi64854.c#2 integrate .. //depot/projects/usiii/sparc64/sbus/lsi64854var.h#2 integrate .. //depot/projects/usiii/sparc64/sparc64/autoconf.c#3 integrate .. //depot/projects/usiii/sparc64/sparc64/cache.c#4 integrate .. //depot/projects/usiii/sparc64/sparc64/cheetah.c#6 integrate .. //depot/projects/usiii/sparc64/sparc64/clock.c#5 integrate .. //depot/projects/usiii/sparc64/sparc64/exception.S#7 integrate .. //depot/projects/usiii/sparc64/sparc64/genassym.c#4 integrate .. //depot/projects/usiii/sparc64/sparc64/locore.S#5 integrate .. //depot/projects/usiii/sparc64/sparc64/machdep.c#7 integrate .. //depot/projects/usiii/sparc64/sparc64/mp_exception.S#3 integrate .. //depot/projects/usiii/sparc64/sparc64/mp_locore.S#4 integrate .. //depot/projects/usiii/sparc64/sparc64/mp_machdep.c#8 integrate .. //depot/projects/usiii/sparc64/sparc64/pmap.c#8 integrate .. //depot/projects/usiii/sparc64/sparc64/spitfire.c#5 integrate .. //depot/projects/usiii/sparc64/sparc64/support.S#4 integrate .. //depot/projects/usiii/sparc64/sparc64/swtch.S#4 integrate .. //depot/projects/usiii/sparc64/sparc64/tick.c#6 integrate .. //depot/projects/usiii/sparc64/sparc64/tlb.c#5 integrate .. //depot/projects/usiii/sparc64/sparc64/trap.c#7 integrate .. //depot/projects/usiii/sun4v/include/asi.h#2 integrate .. //depot/projects/usiii/sun4v/sun4v/clock.c#1 branch .. //depot/projects/usiii/sys/disk.h#2 integrate .. //depot/projects/usiii/sys/gpt.h#3 integrate .. //depot/projects/usiii/sys/ioccom.h#2 integrate .. //depot/projects/usiii/sys/lock.h#7 integrate .. //depot/projects/usiii/sys/mount.h#6 integrate .. //depot/projects/usiii/sys/param.h#13 integrate .. //depot/projects/usiii/sys/syscall.h#9 integrate .. //depot/projects/usiii/sys/syscall.mk#9 integrate .. //depot/projects/usiii/sys/sysproto.h#9 integrate .. //depot/projects/usiii/sys/systm.h#8 integrate .. //depot/projects/usiii/sys/termios.h#5 integrate .. //depot/projects/usiii/sys/tty.h#5 integrate .. //depot/projects/usiii/sys/ttydevsw.h#2 integrate .. //depot/projects/usiii/sys/ttydisc.h#2 integrate .. //depot/projects/usiii/sys/ttyqueue.h#2 integrate .. //depot/projects/usiii/sys/vimage.h#2 integrate .. //depot/projects/usiii/sys/vnode.h#8 integrate .. //depot/projects/usiii/sys/wait.h#2 integrate .. //depot/projects/usiii/ufs/ffs/ffs_alloc.c#4 integrate .. //depot/projects/usiii/ufs/ffs/ffs_extern.h#2 integrate .. //depot/projects/usiii/ufs/ffs/ffs_snapshot.c#5 integrate .. //depot/projects/usiii/ufs/ffs/ffs_softdep.c#7 integrate .. //depot/projects/usiii/ufs/ffs/ffs_vfsops.c#9 integrate .. //depot/projects/usiii/ufs/ffs/ffs_vnops.c#6 integrate .. //depot/projects/usiii/ufs/ufs/ufs_extattr.c#4 integrate .. //depot/projects/usiii/ufs/ufs/ufs_vfsops.c#2 integrate .. //depot/projects/usiii/ufs/ufs/ufs_vnops.c#6 integrate .. //depot/projects/usiii/vm/swap_pager.c#6 integrate .. //depot/projects/usiii/vm/vm_mmap.c#8 integrate .. //depot/projects/usiii/vm/vnode_pager.c#6 integrate Differences ... ==== //depot/projects/usiii/amd64/amd64/bpf_jit_machdep.c#4 (text+ko) ==== @@ -23,14 +23,14 @@ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - * DATA, OR PROFITS; OR BUSINESS intERRUPTION) HOWEVER CAUSED AND ON ANY + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/bpf_jit_machdep.c,v 1.12 2008/08/18 19:14:26 jkim Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/bpf_jit_machdep.c,v 1.14 2008/08/26 21:06:31 jkim Exp $"); #ifdef _KERNEL #include "opt_bpf.h" @@ -107,10 +107,6 @@ */ emit_func emitm; - /* Do not compile an empty filter. */ - if (nins == 0) - return (NULL); - /* Allocate the reference table for the jumps */ #ifdef _KERNEL stream.refs = (u_int *)malloc((nins + 1) * sizeof(u_int), ==== //depot/projects/usiii/amd64/amd64/bpf_jit_machdep.h#4 (text+ko) ==== @@ -23,12 +23,12 @@ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - * DATA, OR PROFITS; OR BUSINESS intERRUPTION) HOWEVER CAUSED AND ON ANY + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/amd64/amd64/bpf_jit_machdep.h,v 1.9 2008/08/18 19:14:26 jkim Exp $ + * $FreeBSD: src/sys/amd64/amd64/bpf_jit_machdep.h,v 1.10 2008/08/25 20:43:13 jkim Exp $ */ #ifndef _BPF_JIT_MACHDEP_H_ ==== //depot/projects/usiii/amd64/amd64/cpu_switch.S#4 (text+ko) ==== @@ -30,7 +30,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/amd64/amd64/cpu_switch.S,v 1.162 2008/07/30 11:30:55 kib Exp $ + * $FreeBSD: src/sys/amd64/amd64/cpu_switch.S,v 1.164 2008/09/08 09:59:05 kib Exp $ */ #include @@ -109,8 +109,24 @@ movq %rsp,PCB_RSP(%r8) movq %rbx,PCB_RBX(%r8) movq %rax,PCB_RIP(%r8) - movq PCB_FSBASE(%r8),%r9 - movq PCB_GSBASE(%r8),%r10 + + /* + * Reread fs and gs bases. Explicit fs segment register load + * by the usermode code may change actual fs base without + * updating pcb_{fs,gs}base. + * + * %rdx still contains the mtx, save %rdx around rdmsr. + */ + movq %rdx,%r11 + movl $MSR_FSBASE,%ecx + rdmsr + shlq $32,%rdx + leaq (%rax,%rdx),%r9 + movl $MSR_KGSBASE,%ecx + rdmsr + shlq $32,%rdx + leaq (%rax,%rdx),%r10 + movq %r11,%rdx testl $PCB_32BIT,PCB_FLAGS(%r8) jnz store_seg @@ -250,7 +266,7 @@ movl %es,PCB_ES(%r8) movl %fs,PCB_FS(%r8) jmp done_store_seg -2: movq PCB_GS32P(%r8),%rax +2: movq PCPU(GS32P),%rax movq (%rax),%rax movq %rax,PCB_GS32SD(%r8) jmp 1b @@ -267,7 +283,7 @@ movl PCB_FS(%r8),%fs jmp done_load_seg /* Restore userland %gs while preserving kernel gsbase */ -2: movq PCB_GS32P(%r8),%rax +2: movq PCPU(GS32P),%rax movq PCB_GS32SD(%r8),%rcx movq %rcx,(%rax) jmp 1b ==== //depot/projects/usiii/amd64/amd64/genassym.c#7 (text+ko) ==== @@ -33,7 +33,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/genassym.c,v 1.169 2008/07/30 11:30:55 kib Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/genassym.c,v 1.170 2008/09/08 09:59:05 kib Exp $"); #include "opt_compat.h" #include "opt_kstack_pages.h" @@ -147,7 +147,6 @@ ASSYM(PCB_SAVEFPU, offsetof(struct pcb, pcb_save)); ASSYM(PCB_SAVEFPU_SIZE, sizeof(struct savefpu)); ASSYM(PCB_ONFAULT, offsetof(struct pcb, pcb_onfault)); -ASSYM(PCB_GS32P, offsetof(struct pcb, pcb_gs32p)); ASSYM(PCB_GS32SD, offsetof(struct pcb, pcb_gs32sd)); ASSYM(PCB_SIZE, sizeof(struct pcb)); @@ -199,6 +198,7 @@ ASSYM(PC_CURPMAP, offsetof(struct pcpu, pc_curpmap)); ASSYM(PC_TSSP, offsetof(struct pcpu, pc_tssp)); ASSYM(PC_RSP0, offsetof(struct pcpu, pc_rsp0)); +ASSYM(PC_GS32P, offsetof(struct pcpu, pc_gs32p)); ASSYM(LA_VER, offsetof(struct LAPIC, version)); ASSYM(LA_TPR, offsetof(struct LAPIC, tpr)); ==== //depot/projects/usiii/amd64/amd64/machdep.c#9 (text+ko) ==== @@ -39,7 +39,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/machdep.c,v 1.687 2008/07/09 19:44:37 peter Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/machdep.c,v 1.690 2008/09/08 09:59:05 kib Exp $"); #include "opt_atalk.h" #include "opt_atpic.h" @@ -734,6 +734,7 @@ pcb->pcb_fsbase = 0; pcb->pcb_gsbase = 0; critical_exit(); + pcb->pcb_flags &= ~(PCB_32BIT | PCB_GS32BIT); load_ds(_udatasel); load_es(_udatasel); load_fs(_udatasel); @@ -802,7 +803,7 @@ * Initialize segments & interrupt table */ -struct user_segment_descriptor gdt[NGDT * MAXCPU];/* global descriptor table */ +struct user_segment_descriptor gdt[NGDT * MAXCPU];/* global descriptor tables */ static struct gate_descriptor idt0[NIDT]; struct gate_descriptor *idt = &idt0[0]; /* interrupt descriptor table */ @@ -869,7 +870,7 @@ /* GPROC0_SEL 6 Proc 0 Tss Descriptor */ { 0x0, /* segment base address */ - sizeof(struct amd64tss)-1,/* length - all address space */ + sizeof(struct amd64tss)-1,/* length */ SDT_SYSTSS, /* segment type */ SEL_KPL, /* segment descriptor priority level */ 1, /* segment descriptor present */ @@ -1346,6 +1347,7 @@ PCPU_SET(curthread, &thread0); PCPU_SET(curpcb, thread0.td_pcb); PCPU_SET(tssp, &common_tss[0]); + PCPU_SET(gs32p, &gdt[GUGS32_SEL]); /* * Initialize mutexes. ==== //depot/projects/usiii/amd64/amd64/mp_machdep.c#5 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/mp_machdep.c,v 1.291 2008/07/09 19:44:37 peter Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/mp_machdep.c,v 1.293 2008/09/08 09:59:05 kib Exp $"); #include "opt_cpu.h" #include "opt_kstack_pages.h" @@ -436,7 +436,8 @@ { struct pcpu *pc; u_int64_t msr, cr0; - int cpu, gsel_tss; + int cpu, gsel_tss, x; + struct region_descriptor ap_gdt; /* Set by the startup code for us to use */ cpu = bootAP; @@ -447,11 +448,17 @@ common_tss[cpu].tss_iobase = sizeof(struct amd64tss); common_tss[cpu].tss_ist1 = (long)&doublefault_stack[PAGE_SIZE]; + /* Prepare private GDT */ gdt_segs[GPROC0_SEL].ssd_base = (long) &common_tss[cpu]; ssdtosyssd(&gdt_segs[GPROC0_SEL], - (struct system_segment_descriptor *)&gdt[GPROC0_SEL]); - - lgdt(&r_gdt); /* does magic intra-segment return */ + (struct system_segment_descriptor *)&gdt[NGDT * cpu + GPROC0_SEL]); + for (x = 0; x < NGDT; x++) { + if (x != GPROC0_SEL && x != (GPROC0_SEL + 1)) + ssdtosd(&gdt_segs[x], &gdt[NGDT * cpu + x]); + } + ap_gdt.rd_limit = NGDT * sizeof(gdt[0]) - 1; + ap_gdt.rd_base = (long) &gdt[NGDT * cpu]; + lgdt(&ap_gdt); /* does magic intra-segment return */ /* Get per-cpu data */ pc = &__pcpu[cpu]; @@ -463,6 +470,7 @@ pc->pc_curthread = 0; pc->pc_tssp = &common_tss[cpu]; pc->pc_rsp0 = 0; + pc->pc_gs32p = &gdt[NGDT * cpu + GUGS32_SEL]; wrmsr(MSR_FSBASE, 0); /* User value */ wrmsr(MSR_GSBASE, (u_int64_t)pc); ==== //depot/projects/usiii/amd64/amd64/trap.c#6 (text+ko) ==== @@ -38,7 +38,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/trap.c,v 1.327 2008/06/20 05:22:09 alc Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/trap.c,v 1.328 2008/09/08 09:55:51 kib Exp $"); /* * AMD64 Trap and System call handling @@ -692,7 +692,8 @@ code = frame->tf_err; type = frame->tf_trapno; - sdtossd(&gdt[IDXSEL(frame->tf_cs & 0xffff)], &softseg); + sdtossd(&gdt[NGDT * PCPU_GET(cpuid) + IDXSEL(frame->tf_cs & 0xffff)], + &softseg); if (type <= MAX_TRAP_MSG) msg = trap_msg[type]; ==== //depot/projects/usiii/amd64/ia32/ia32_signal.c#4 (text+ko) ==== @@ -32,7 +32,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/ia32/ia32_signal.c,v 1.18 2008/07/30 11:30:55 kib Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/ia32/ia32_signal.c,v 1.19 2008/09/02 17:52:11 kib Exp $"); #include "opt_compat.h" @@ -742,5 +742,6 @@ /* Return via doreti so that we can change to a different %cs */ pcb->pcb_flags |= PCB_FULLCTX | PCB_32BIT; + pcb->pcb_flags &= ~PCB_GS32BIT; td->td_retval[1] = 0; } ==== //depot/projects/usiii/amd64/include/pcb.h#4 (text+ko) ==== @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * from: @(#)pcb.h 5.10 (Berkeley) 5/12/91 - * $FreeBSD: src/sys/amd64/include/pcb.h,v 1.65 2008/07/30 11:30:55 kib Exp $ + * $FreeBSD: src/sys/amd64/include/pcb.h,v 1.66 2008/09/08 09:59:05 kib Exp $ */ #ifndef _AMD64_PCB_H_ @@ -77,7 +77,6 @@ caddr_t pcb_onfault; /* copyin/out fault recovery */ /* 32-bit segment descriptor */ - struct user_segment_descriptor *pcb_gs32p; struct user_segment_descriptor pcb_gs32sd; }; ==== //depot/projects/usiii/amd64/include/pcpu.h#4 (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/amd64/include/pcpu.h,v 1.50 2008/08/19 19:53:52 jhb Exp $ + * $FreeBSD: src/sys/amd64/include/pcpu.h,v 1.51 2008/09/08 09:59:05 kib Exp $ */ #ifndef _MACHINE_PCPU_H_ @@ -48,7 +48,8 @@ register_t pc_rsp0; \ register_t pc_scratch_rsp; /* User %rsp in syscall */ \ u_int pc_apic_id; \ - u_int pc_acpi_id /* ACPI CPU id */ + u_int pc_acpi_id; /* ACPI CPU id */ \ + struct user_segment_descriptor *pc_gs32p #ifdef _KERNEL ==== //depot/projects/usiii/amd64/include/segments.h#2 (text+ko) ==== @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * from: @(#)segments.h 7.1 (Berkeley) 5/9/91 - * $FreeBSD: src/sys/amd64/include/segments.h,v 1.39 2007/03/30 00:06:21 jkim Exp $ + * $FreeBSD: src/sys/amd64/include/segments.h,v 1.40 2008/09/08 08:58:29 kib Exp $ */ #ifndef _MACHINE_SEGMENTS_H_ @@ -201,7 +201,7 @@ #define GUDATA_SEL 4 /* User 32/64 bit Data Descriptor */ #define GUCODE_SEL 5 /* User 64 bit Code Descriptor */ #define GPROC0_SEL 6 /* TSS for entering kernel etc */ -/* slot 6 is second half of GPROC0_SEL */ +/* slot 7 is second half of GPROC0_SEL */ #define GUGS32_SEL 8 /* User 32 bit GS Descriptor */ #define NGDT 9 ==== //depot/projects/usiii/amd64/linux32/linux32_genassym.c#2 (text+ko) ==== @@ -1,5 +1,5 @@ #include -__FBSDID("$FreeBSD: src/sys/amd64/linux32/linux32_genassym.c,v 1.1 2004/08/16 07:55:06 tjr Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/linux32/linux32_genassym.c,v 1.2 2008/09/07 16:39:21 kib Exp $"); #include #include @@ -9,9 +9,8 @@ ASSYM(LINUX_SIGF_HANDLER, offsetof(struct l_sigframe, sf_handler)); ASSYM(LINUX_SIGF_SC, offsetof(struct l_sigframe, sf_sc)); -ASSYM(LINUX_SC_GS, offsetof(struct l_sigcontext, sc_gs)); -ASSYM(LINUX_SC_FS, offsetof(struct l_sigcontext, sc_fs)); ASSYM(LINUX_SC_ES, offsetof(struct l_sigcontext, sc_es)); ASSYM(LINUX_SC_DS, offsetof(struct l_sigcontext, sc_ds)); ASSYM(LINUX_RT_SIGF_HANDLER, offsetof(struct l_rt_sigframe, sf_handler)); ASSYM(LINUX_RT_SIGF_UC, offsetof(struct l_rt_sigframe, sf_sc)); +ASSYM(LINUX_RT_SIGF_SC, offsetof(struct l_ucontext, uc_mcontext)); ==== //depot/projects/usiii/amd64/linux32/linux32_locore.s#2 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/amd64/linux32/linux32_locore.s,v 1.2 2007/03/30 00:06:21 jkim Exp $ */ +/* $FreeBSD: src/sys/amd64/linux32/linux32_locore.s,v 1.3 2008/09/07 16:39:21 kib Exp $ */ #include "linux32_assym.h" /* system definitions */ #include /* miscellaneous asm macros */ @@ -23,8 +23,9 @@ linux_rt_sigcode: call *LINUX_RT_SIGF_HANDLER(%esp) leal LINUX_RT_SIGF_UC(%esp),%ebx /* linux ucp */ - movl LINUX_SC_ES(%ebx),%es - movl LINUX_SC_DS(%ebx),%ds + leal LINUX_RT_SIGF_SC(%ebx),%ecx /* linux sigcontext */ + movl LINUX_SC_ES(%ecx),%es + movl LINUX_SC_DS(%ecx),%ds push %eax /* fake ret addr */ movl $LINUX_SYS_linux_rt_sigreturn,%eax /* linux_rt_sigreturn() */ int $0x80 /* enter kernel with args */ ==== //depot/projects/usiii/amd64/linux32/linux32_machdep.c#4 (text+ko) ==== @@ -29,7 +29,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/linux32/linux32_machdep.c,v 1.47 2008/07/30 11:30:55 kib Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/linux32/linux32_machdep.c,v 1.49 2008/09/08 09:59:05 kib Exp $"); #include #include @@ -694,7 +694,6 @@ #endif td2->td_pcb->pcb_gsbase = (register_t)info.base_addr; td2->td_pcb->pcb_gs32sd = sd; - td2->td_pcb->pcb_gs32p = &gdt[GUGS32_SEL]; td2->td_pcb->pcb_gs = GSEL(GUGS32_SEL, SEL_UPL); td2->td_pcb->pcb_flags |= PCB_GS32BIT | PCB_32BIT; } @@ -1352,9 +1351,8 @@ critical_enter(); td->td_pcb->pcb_gsbase = (register_t)info.base_addr; - td->td_pcb->pcb_gs32sd = gdt[GUGS32_SEL] = sd; - td->td_pcb->pcb_gs32p = &gdt[GUGS32_SEL]; - td->td_pcb->pcb_flags |= PCB_32BIT; + td->td_pcb->pcb_gs32sd = *PCPU_GET(gs32p) = sd; + td->td_pcb->pcb_flags |= PCB_32BIT | PCB_GS32BIT; wrmsr(MSR_KGSBASE, td->td_pcb->pcb_gsbase); critical_exit(); ==== //depot/projects/usiii/amd64/pci/pci_cfgreg.c#4 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/pci/pci_cfgreg.c,v 1.111 2008/08/22 02:14:23 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/pci/pci_cfgreg.c,v 1.112 2008/09/10 18:06:08 jhb Exp $"); #include #include @@ -46,6 +46,8 @@ CFGMECH_PCIE, }; >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Fri Sep 12 14:54:33 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C8028106567B; Fri, 12 Sep 2008 14:54: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 8AFC11065679 for ; Fri, 12 Sep 2008 14:54: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 757C98FC16 for ; Fri, 12 Sep 2008 14:54: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 m8CEsXNi050700 for ; Fri, 12 Sep 2008 14:54:33 GMT (envelope-from rene@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m8CEsXhV050692 for perforce@freebsd.org; Fri, 12 Sep 2008 14:54:33 GMT (envelope-from rene@FreeBSD.org) Date: Fri, 12 Sep 2008 14:54:33 GMT Message-Id: <200809121454.m8CEsXhV050692@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 149665 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, 12 Sep 2008 14:54:34 -0000 http://perforce.freebsd.org/chv.cgi?CH=149665 Change 149665 by rene@rene_self on 2008/09/12 14:54:12 MFen books/handbook/ x11/chapter.sgml 1.173 -> 1.187 (plus local fixes) install/chapter.sgml 1.334 -> 1.390 (plus local fixes) Makefile 1.97 -> 1.109 (I only saw the MAINTAINER line later, sorry) Checked for whitespace, spelling, and build Affected files ... .. //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/Makefile#7 edit .. //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/install/chapter.sgml#3 edit .. //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/x11/chapter.sgml#3 edit Differences ... ==== //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/Makefile#7 (text+ko) ==== @@ -1,9 +1,11 @@ # # $FreeBSD: doc/nl_NL.ISO8859-1/books/handbook/Makefile,v 1.11 2008/05/21 20:35:08 remko Exp $ # $FreeBSDnl: doc/nl_NL.ISO8859-1/books/handbook/Makefile,v 1.19 2006/01/03 21:17:07 siebrand Exp $ -# Gebaseerd op: 1.97 +# +# %SOURCE% en_US.ISO8859-1/books/handbook/Makefile +# %SRCID% 1.109 # -# Build the FreeBSD Dutch Handbook. +# Bouw het Nederlandse FreeBSD Handboek. # # ------------------------------------------------------------------------ @@ -50,12 +52,13 @@ IMAGES_EN+= install/adduser1.scr IMAGES_EN+= install/adduser2.scr IMAGES_EN+= install/adduser3.scr +IMAGES_EN+= install/boot-loader-menu.scr IMAGES_EN+= install/boot-mgr.scr +IMAGES_EN+= install/config-country.scr IMAGES_EN+= install/console-saver1.scr IMAGES_EN+= install/console-saver2.scr IMAGES_EN+= install/console-saver3.scr IMAGES_EN+= install/console-saver4.scr -IMAGES_EN+= install/desktop.scr IMAGES_EN+= install/disklabel-auto.scr IMAGES_EN+= install/disklabel-ed1.scr IMAGES_EN+= install/disklabel-ed2.scr @@ -110,7 +113,6 @@ IMAGES_EN+= install/timezone3.scr IMAGES_EN+= install/userconfig.scr IMAGES_EN+= install/userconfig2.scr -IMAGES_EN+= install/xf86setup.scr IMAGES_EN+= mail/mutt1.scr IMAGES_EN+= mail/mutt2.scr IMAGES_EN+= mail/mutt3.scr @@ -186,8 +188,13 @@ IMAGES_LIB+= callouts/8.png IMAGES_LIB+= callouts/9.png IMAGES_LIB+= callouts/10.png +IMAGES_LIB+= callouts/11.png +IMAGES_LIB+= callouts/12.png +IMAGES_LIB+= callouts/13.png +IMAGES_LIB+= callouts/14.png +IMAGES_LIB+= callouts/15.png -# +# # SRCS lists the individual SGML files that make up the document. Changes # to any of these files will force a rebuild # @@ -232,7 +239,7 @@ SRCS+= x11/chapter.sgml # Entities -SRCS+= chapters.ent +SRCS+= chapters.ent SYMLINKS= ${DESTDIR} index.html handbook.html ==== //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/install/chapter.sgml#3 (text+ko) ==== @@ -3,7 +3,9 @@ $FreeBSD: doc/nl_NL.ISO8859-1/books/handbook/install/chapter.sgml,v 1.10 2007/06/28 02:46:38 chinsan Exp $ $FreeBSDnl: doc/nl_NL.ISO8859-1/books/handbook/install/chapter.sgml,v 1.55 2006/08/24 23:15:43 remko Exp $ - Gebaseerd op: 1.334 + + %SOURCE% en_US.ISO8859-1/books/handbook/install/chapter.sgml + %SRCID% 1.390 --> @@ -95,6 +97,131 @@ + + Hardware-eisen + + + Minimale configuratie + + De minimale configuratie om &os; te installeren varieert met + de versie van &os; en de hardware-architectuur. + + Informatie over de minimale configuratie is beschikbaar in + de Installatie Notes op de Uitgave + Informatie pagina op de &os; website. Een samenvatting + van deze informatie is gegeven in de volgende secties. + Afhankelijk van de methode die u kiest om &os; te installeren, + heeft u misschien ook een floppydrive, een ondersteunde CDROM + drive, en in sommige gevallen een netwerkadapter nodig. Dit zal + worden behandeld door het . + + + + &os;/&arch.i386; en &os;/&arch.pc98; + + Zowel &os;/&arch.i386; en &os;/&arch.pc98; hebben een 486 + of betere processor en tenminste 24 MB aan RAM nodig. U + zult tenminste 150 MB aan vrije hardeschijfruimte nodig + hebben voor de meest minimale installatie. + + + In het geval van oude configuraties is het verkrijgen + van meer RAM en meer hardeschijfruimte meestal belangrijker + dan het verkrijgen van een snellere processor. + + + + + &os;/&arch.alpha; + + Alpha + + Om &os;/&arch.alpha; te installeren heeft u een + ondersteund platform (zie ) en een toegewijde + schijf voor &os; nodig. Het is momenteel niet mogelijk om een + schijf met een ander besturingssysteem te delen. Deze schijf + dient aan een SCSI-controller gekoppeld te worden die wordt + ondersteund door de SRM firmware of een IDE-schijf aangenomen + dat de SRM in uw machine het opstarten van IDE-schijven + ondersteunt. + + ARC + + Alpha BIOS + + SRM + + U zult de SRM consolefirmware nodig hebben voor uw + platform. In sommige gevallen is het mogelijk om te wisselen + tussen AlphaBIOS (of ARC) firmware en SRM. In andere gevallen + zal het nodig zijn om nieuwe firmware van de website van de + verkoper te downloaden. + + + Ondersteuning voor de Alpha was verwijderd te beginnen + met &os; 7.0. De + &os; 6.X uitgaveserie is de + laatste die ondersteuning bevat voor deze architectuur. + + + + + + &os;/&arch.amd64; + + Er zijn twee klassen processoren die &os;/&arch.amd64; + kunnen draaien. De eerste zijn AMD64 processoren, inclusief + de &amd.athlon;64, &amd.athlon;64-FX, &amd.opteron; of betere + processoren. + + De tweede klasse van processoren die &os;/&arch.amd64; + kan gebruiken omvat die die de &intel; EM64T architectuur + gebruiken. Voorbeelden van deze processoren omvatten de + &intel; &core; 2 Duo, Quad, en Extreme + processorfamilies en de &intel; &xeon; 3000, 5000, en + 7000 rijen van processoren. + + Indien u een machine heeft die gebaseerd is op een nVidia + nForce3 Pro-150, moet u de BIOS-setup + gebruiken om IO APIC uit te zetten. Indien u geen optie heeft + om dit te doen, moet u waarschijnlijk in plaats hiervan ACPI + uitzetten. Er zitten bugs in de Pro-150 chipset waarvoor we + nog geen oplossing hebben gevonden. + + + + &os;/&arch.sparc64; + + Om &os;/&arch.sparc64; te installeren heeft u een + ondersteund platform nodig (zie ). + + U heeft een toegewijde schijf nodig voor + &os;/&arch.sparc64;. Het is momenteel niet mogelijk om een + schijf met een ander besturingssysteem te delen. + + + + + Ondersteunde hardware + + Een lijst van ondersteunde hardware wordt geleverd bij elke + uitgave van &os; in de &os; Hardware Notes. Dit document + kan normaliter worden gevonden in een bestand genaamd + HARDWARE.TXT, in de bovenste map van een + CDROM- of FTP-distributie of in het documentatiemenu van + sysinstall. Het somt, voor een + gegeven architectuur, op welke hardware-apparaten door welke + uitgave van &os; worden ondersteund. Kopiën van de lijst + van ondersteunde hardware voor verschillende uitgaven en + architecturen kunnen ook gevonden worden op de Uitgave + Informatie pagina van de &os; website. + + + Voorbereidende taken @@ -216,6 +343,10 @@ + + Nadat de inventarisatie van de componenten in uw computer + voltooid is, dient u te controleren of ze aan de hardware-eisen + van de uitgave van &os; die u wilt installeren voldoen. @@ -243,19 +374,25 @@ heeft. - Indeling van schrijven voor &i386; + Indeling van schrijven voor &os;/&arch.i386; Een PC schijf kan worden onderverdeeld in aparte stukken. - Deze stukken heten partities. In het - ontwerp van de PC is opgenomen dat een schijf slechts vier - partities kan bevatten. Deze partities heten de - primaire partities. Om deze beperking - te omzeilen is een nieuwe soort partitie bedacht, de - extended partitie. Een schijf kan - slechts één extended partitie bevatten. - Binnen een extended partitie kunnen speciale partities, - genaamd logische partities, worden - aangemaakt. + Deze stukken heten partities. + Aangezien &os; intern ook partities heeft, kan de naamgeving + snel verwarrend worden, daarom wordt naar deze schijfstukken + verwezen als schijfsnedes of simpelweg snedes (slices) in &os; + zelf. Het &os; gereedschap fdisk + bijvoorbeeld, dat met PC diskpartities werkt, verwijst naar + snedes in plaats van partities. In het ontwerp van de PC is + opgenomen dat een schijf slechts vier partities kan bevatten. + Deze partities heten de primaire + partities. Om deze beperking te omzeilen is een + nieuwe soort partitie bedacht, de extended + partitie. Een schijf kan slechts + één extended partitie bevatten. Binnen een + extended partitie kunnen speciale partities, genaamd + logische partities, worden aangemaakt. + Elke partitie heeft een partitie-ID, een getal dat aangeeft @@ -300,21 +437,31 @@ nodig. Met commerciële software zoals - &partitionmagic; kunnen partities - van grootte gewijzigd worden om ruimte te maken voor &os;. - De map tools op de cd-rom bevat twee - freeware programma's die dit ook kunnen, + &partitionmagic;, of gratis + software zoals GPartEd, kunnen + partities van grootte gewijzigd worden om ruimte te maken voor + &os;. De map tools op de CDROM bevat + twee freeware programma's die dit ook kunnen, FIPS en PResizer. Handleidingen hiervoor staan in dezelfde map. FIPS, PResizer en &partitionmagic; kunnen - FAT16 en - FAT32-partities wijzigen als ze gebruikt - worden in &ms-dos; tot &windows; ME. - &partitionmagic; is het enige van - de bovenstaande programma's dat - NTFS-partities kan wijzigen. + FAT16 en FAT32-partities + wijzigen als ze gebruikt worden in &ms-dos; tot &windows; ME. + Van zowel &partitionmagic; als + GPartEd is bekend dat ze met + NTFS kunnen werken. + GPartEd is beschikbaar op een + aantal Live CD Linux-distributies, zoals SystemRescueCD. + + Er zijn problemen gemeld met het veranderen van de grootte + van µsoft; Vista-partities. Het beschikbaar hebben van + een Vista installatie-CDROM tijdens het pogen van zo'n + bewerking is aanbevolen. Zoals met al zulke + schijfonderhoudtaken is een recente verzameling backups ook + sterk aangeraden. Verkeerd gebruik van deze programma's kan gegevens van @@ -431,7 +578,7 @@ Netwerkgegevens verzamelen - Als bij de installatie van &os; gebruik gemaakt wordtvan + Als bij de installatie van &os; gebruik gemaakt wordt van een netwerk (bijvoorbeeld bij een installatie vanaf een FTP site of een NFS server), dan moeten de netwerkinstellingen bekend zijn. Deze informatie wordt gevraagd tijdens het @@ -439,11 +586,11 @@ installatie te voltooien. - Contact maken met een ethernet netwerk of + <title>Contact maken met een Ethernet netwerk of kabel/DSL modem - Als er contact gemaakt wordt met een ethernet netwerk of - een internetverbinding met een ethernet netwerkkaart via de + Als er contact gemaakt wordt met een Ethernet netwerk of + een Internetverbinding met een Ethernet netwerkkaart via de kabel of DSL, dan is de volgende informatie nodig: @@ -456,7 +603,7 @@ - Hostname + Hostnaam @@ -479,9 +626,9 @@ Contact maken met een modem - Ook door middel van inbellen bij een internet service + Ook door middel van inbellen bij een Internet service provider met een gewoon modem kan &os; geïnstalleerd - worden via internet, het duurt alleen erg lang. + worden via Internet, het duurt alleen erg lang. Dan is nodig: @@ -569,7 +716,7 @@ Als de installatiebestanden nog niet beschikbaar zijn wordt in uitgelegd hoe de - installatie via bovenstande methoden voorbereid kan worden. + installatie via bovenstaande methoden voorbereid kan worden. Nadat de installatiebestanden beschikbaar zijn kunnen de voorbereidingen voor de installatie verdergaan in . @@ -614,7 +761,7 @@ door de architectuur en het versienummer dat geïnstalleerd moet worden. De images voor bootdiskettes voor bijvoorbeeld - &os; &rel.current;-RELEASE voor &i386; zijn + &os;/&arch.i386; &rel.current;-RELEASE zijn beschikbaar op . @@ -623,16 +770,17 @@ floppies/ bevat een aantal images en het hangt af van de gewenste &os; versie, en in sommige gevallen ook van de hardware, welke images nodig zijn. - In de meeste gevallen zijn er drie floppies nodig, + In de meeste gevallen zijn er vier floppies nodig, boot.flp, - kern1.flp en - kern2.flp. In dezelfde map staat + kern1.flp, + kern2.flp, en + kern3.flp. In dezelfde map staat README.TXT voor de laatste informatie over de diskette-images. Het FTP-programma moet ingesteld staan in - binary mode om de disk-images te + binary modus om de disk-images te downloaden. Sommige webbrowsers blijken de text (of ASCII) modus te gebruiken en dan kan er niet van de diskettes @@ -686,7 +834,7 @@ cd-rom station is E:, dan kan dit als volgt: - E:\> tools\fdimage floppies\kern.flp A: + E:\> tools\fdimage floppies\boot.flp A: Herhaal dit commando voor elk .flp-bestand, waarbij steeds een @@ -705,7 +853,7 @@ worden om de imagebestanden naar diskette te kopiëren. Onder &os;: - &prompt.root; dd if=kern.flp of=/dev/fd0 + &prompt.root; dd if=boot.flp of=/dev/fd0 Onder &os; verwijst /dev/fd0 naar het eerste diskettestation @@ -749,107 +897,111 @@ Opstarten van &i386; - - - Begin met een computer die uit staat. - + + + Begin met een computer die uit staat. + + + + Zet de computer aan. Als hij aangaat laat hij een + optie zien om het systeeminstelmenu, of BIOS, te bereiken, + gewoonlijk via F2, F10, + Del, of AltS + . Gebruik de toets die op het scherm wordt + aangegeven. In sommige gevallen laat de computer een + plaatje zien terwijl hij opstart. Gewoonlijk verdwijnt + dit plaatje door het intypen van Esc + zodat eventuele verborgen berichten zichtbaar worden. + + - - Zet de computer aan. Als hij aangaat laat hij een - optie zien om het systeeminstelmenu, of BIOS, te bereiken, - gewoonlijk via F2, F10, - Del, of AltS. - Gebruik de toets die op het scherm wordt aangegeven. In - sommige gevallen laat de computer een plaatje zien terwijl - hij opstart. Gewoonlijk verdwijnt dit plaatje door het - intypen van Esc zodat eventuele verborgen - berichten zichtbaar worden. - + + Zoek de instelling die bepaalt vanaf welk medium de + computer opstart. Dit wordt meestal aangeduid met + Boot Order en laat een lijst met media + zien, zoals Floppy, + CD-ROM, + eerste harde schijf, enzovoorts. - - Zoek de instelling die bepaalt vanaf welk medium de - computer opstart. Dit wordt meestal aangeduid met - Boot Order en laat een lijst met media zien, - zoals Floppy, CD-ROM, - eerste harde schijf, enzovoorts. + Als het nodig was om diskettes aan te maken, stel dan + floppy disk in. Als wordt opstart van een cd-rom stel dat + dan in. Raadpleeg in geval van twijfel de documentatie + van de computer en/of het moederbord. - Als het nodig was om diskettes aan te maken, stel dan - floppy disk in. Als wordt opstart van een cd-rom stel dat - dan in. Raadpleeg in geval van twijfel de documentatie van - de computer en/of het moederbord. + Maak de instellingen, bewaar de veranderingen en sluit + het instelprogramma af. De computer moet dan opnieuw + starten. + - Maak de instellingen, bewaar de veranderingen en sluit - het instelprogramma af. De computer moet dan opnieuw - starten. - + + Als het nodig was opstartdiskettes te maken, zoals + beschreven in , dan is er + één opstartschijf, waarschijnlijk die met + boot.flp erop. Stop die diskette in + het diskettestation. - - Als het nodig was opstartdiskettes te maken, zoals - beschreven in , dan is er - één opstartschijf, waarschijnlijk die met - kern.flp erop. Stop die diskette in - het diskettestation. + Bij opstarten vanaf CD moet na het aanzetten van de + computer zo snel mogelijk de cd-rom ingestoken worden. + - Bij opstarten vanaf CD moet na het aanzetten van de - computer zo snel mogelijk de cd-rom ingestoken - worden. + Als de computer opstart zoals altijd en met het + huidige besturingssysteem begint, dan kan dat om de + volgende redenen zijn: - Als de computer opstart zoals altijd en met het huidige - besturingssysteem begint, dan kan dat om de volgende - redenen zijn: + + + De opstartschijven waren niet vroeg genoeg in de + computer gedaan om ervan op te starten. Laat ze er + dan inzitten en probeer de computer te herstarten. + + - - - De opstartschijven waren niet vroeg genoeg in de - computer gedaan om ervan op te starten. Laat ze er dan - inzitten en probeer de computer te herstarten. - + + De gemaakte wijzigingen in de BIOS zijn niet goed + doorgekomen. Doe dat dan nog een keer totdat de + juiste instelling gevonden is. + - - De gemaakte wijzigingen in de BIOS zijn niet goed - doorgekomen. Doe dat dan nog een keer totdat de juiste - instelling gevonden is. - + + De BIOS ondersteunt het opstarten van het gekozen + medium niet. + + + - - De BIOS ondersteunt het opstarten van het gekozen - medium niet. - - - + + &os; start nu op. Bij opstarten vanaf cd-rom is iets + als het volgende op het scherm te zien (versie-informatie + weggelaten): - - &os; start nu op. Bij opstarten vanaf cd-rom is iets - als het volgende op het scherm te zien (versie-informatie - weggelaten): + Booting from CD-Rom... +CD Loader 1.2 - Verifying DMI Pool Data ........ -Boot from ATAPI CD-ROM : - 1. FD 2.88MB System Type-(00) -Uncompressing ... done +Building the boot loader arguments +Looking up /BOOT/LOADER... Found +Relocating the loader and the BTX +Starting the BTX loader BTX loader 1.00 BTX version is 1.01 Console: internal video/keyboard -BIOS drive A: is disk0 -BIOS drive B: is disk1 -BIOS drive C: is disk2 -BIOS drive D: is disk3 +BIOS CD is cd0 +BIOS drive C: is disk0 +BIOS drive D: is disk1 BIOS 639kB/261120kB available memory -FreeBSD/i386 bootstrap loader, Revision 0.8 +FreeBSD/i386 bootstrap loader, Revision 1.1 -/kernel text=0x277391 data=0x3268c+0x332a8 | +Loading /boot/defaults/loader.conf +/boot/kernel/kernel text=0x64daa0 data=0xa4e80+0xa9e40 syms=[0x4+0x6cac0+0x4+0x88e9d] +\ -| -Hit [Enter] to boot immediately, or any other key for command prompt. -Booting [kernel] in 9 seconds... _ + Bij opstarten vanaf diskette is iets als het volgende + op het scherm te zien (versie-informatie + weggelaten): - Bij opstarten vanaf diskette is iets als het volgende - op het scherm te zien (versie-informatie - weggelaten): - - Verifying DMI Pool Data + Booting from Floppy... +Uncompressing ... done BTX loader 1.00 BTX version is 1.01 Console: internal video/keyboard @@ -857,32 +1009,40 @@ BIOS drive C: is disk1 BIOS 639kB/261120kB available memory -FreeBSD/i386 bootstrap loader, Revision 0.8 +FreeBSD/i386 bootstrap loader, Revision 1.1 +Loading /boot/defaults/loader.conf /kernel text=0x277391 data=0x3268c+0x332a8 | -Please insert MFS root floppy and press enter: +Insert disk labelled "Kernel floppy 1" and press any key... - Volg de instructies op en haal de diskette met - boot.flp eruit, stop de diskette met - kern1.flp in het station en - druk op Enter. - Start op vanaf de eerste diskette en geef volgende - diskettes in als daarom wordt gevraagd. - + Volg de instructies op en haal de diskette met + boot.flp eruit, stop de diskette met + kern1.flp in het station en druk op + Enter. Start op vanaf de eerste diskette + en geef volgende diskettes in als daarom wordt gevraagd. + + - - Of nu wordt opstart van diskette of cd-rom, de - opstartprocedure komt op een gegeven moment op het volgende - punt: + + Of nu wordt opstart van diskette of cd-rom, de + opstartprocedure komt op een gegeven moment bij het + bootloader-menu van &os;: - Hit [Enter] to boot immediately, or any other key for command prompt. -Booting [kernel] in 9 seconds... _ +
                  + &os; bootloader-menu - Wacht 10 seconden of druk op Enter. - - + + + + + +
                  + Wacht 10 seconden of druk op Enter. + +                   +                   @@ -890,63 +1050,117 @@ Alpha - - - Begin met een computer die uit staat. - + + + Begin met een computer die uit staat. + - - Zet de computer aan en wacht op de boot monitor - prompt. - + + Zet de computer aan en wacht op de boot monitor + prompt. + + - - Als het nodig was opstartdiskettes te maken, zoals - beschreven in , dan is er - één opstartschijf, waarschijnlijk die met - kern.flp erop. Stop die diskette in - het diskettestation en geef het volgende commando om op te - starten vanaf die schijf (vervang de naam van het - diskettestation waar nodig): + + Als het nodig was opstartdiskettes te maken, zoals + beschreven in , dan is er + één eerste opstartschijf, waarschijnlijk die + met boot.flp erop. Stop deze + diskette in het diskettestation en geef het volgende + commando om op te starten vanaf die schijf (vervang de + naam van het diskettestation waar nodig): - >>>BOOT DVA0 -FLAGS '' -FILE '' + >>>BOOT DVA0 -FLAGS '' -FILE '' - Bij opstarten vanaf cd-rom: stop dan de cd-rom in het - cd-rom station en geef het volgende commando om de - installatie te starten (vervang daarbij de naam van het - cd-rom station als nodig): + Bij opstarten vanaf cd-rom: stop dan de cd-rom in het + cd-rom station en geef het volgende commando om de + installatie te starten (vervang daarbij de naam van het + cd-rom station als nodig): - >>>BOOT DKA0 -FLAGS '' -FILE '' - + >>>BOOT DKA0 -FLAGS '' -FILE '' + - - &os; start nu op. Bij opstarten vanaf diskette is op - een gegeven moment het volgende op het scherm te - zien: + + &os; start nu op. Bij opstarten vanaf diskette is op + een gegeven moment het volgende op het scherm te zien: + - Please insert MFS root floppy and press enter: + Insert disk labelled "Kernel floppy 1" and press any key... - Volg de instructies op en haal de - kern.flp diskette eruit, stop de - mfsroot.flp diskette erin en druk op - Enter. - + Volg de instructies op en haal de + boot.flp diskette eruit, stop de + kern1.flp diskette erin en druk op + Enter. + - - Of nu wordt opstart van diskette of cd-rom, de - opstartprocedure komt op een gegeven moment op het volgende - punt: + + Of nu wordt opstart van diskette of cd-rom, de + opstartprocedure komt op een gegeven moment op het + volgende punt: - Hit [Enter] to boot immediately, or any other key for command prompt. + Hit [Enter] to boot immediately, or any other key for command prompt. Booting [kernel] in 9 seconds... _ - Wacht 10 seconden of druk op Enter. - Nu start het menu voor kernelinstellingen. - - + Wacht 10 seconden of druk op Enter. + Nu start het menu voor kernelinstellingen. + + + + + + Opstarten voor &sparc64; + + De meeste &sparc64;-systemen zijn ingesteld om automatisch + vanaf schijf op te starten. Om &os; te installeren dient u + over het netwerk of vanaf een CDROM op te starten, waarvoor u + in de PROM (OpenFirmware) dient te breken. + + Start het systeem opnieuw op, en wacht totdat te + opstartboodschappen verschijnen om dit te doen. Het hangt af + van het model, maar het zou er ongeveer zo uit moeten zien: + + + Sun Blade 100 (UltraSPARC-IIe), Keyboard Present +Copyright 1998-2001 Sun Microsystems, Inc. All rights reserved. +OpenBoot 4.2, 128 MB memory installed, Serial #51090132. +Ethernet address 0:3:ba:b:92:d4, Host ID: 830b92d4. + + Als uw systeem vanaf hier verder gaat met opstarten vanaf + schijf, dient u L1A + of StopA + op het toetsenbord in te drukken, of een + BREAK over de seriële console te + versturen (door bijvoorbeeld ~# in + &man.tip.1; of &man.cu.1; te gebruiken) om bij de PROM-prompt + te komen. Het ziet er als volgt uit: + + + + + + + + ok +ok {0} + + + + Deze prompt wordt gebruikt op systemen met slechts + één CPU. + + + + Deze prompt wordt op SMP-systemen gebruikt, het + cijfer geeft het aantal actieve CPUs aan. + + + + Stop hier de CDROM in uw drive, en typ op de PROM-prompt + boot cdrom. -                   @@ -1011,7 +1225,7 @@ orm0: <Option ROM> at iomem 0xc0000-0xc7fff on isa0 fdc0: <NEC 72065B or clone> at port 0x3f0-0x3f5,0x3f7 irq 6 drq2 on isa0 fdc0: FIFO enabled, 8 bytes threshold -fd0: <1440-KB 3.5" drive> on fdc0 drive 0 +fd0: <1440-KB 3.5” drive> on fdc0 drive 0 atkbdc0: <Keyboard controller (i8042)> at port 0x60,0x64 on isa0 atkbd0: <AT Keyboard> flags 0x1 irq1 on atkbdc0 kbd0 at atkbd0 @@ -1037,16 +1251,29 @@ Controleer de resultaten van het hardware-onderzoek nauwgezet om er zeker van te zijn dat &os; alle componenten gevonden heeft die verwacht worden. Als een - component niet is gevonden, dan komt die niet voor. Als het - nodig was de instellingen van het stuurprogramma voor een - component te wijzigen, controleer dan of de juiste waarden zijn - ingevuld. + component niet is gevonden, dan wordt die niet genoemd. Een + eigen kernel staat u toe om + apparaten te ondersteunen die niet in de + GENERIC kernel zitten, zoals + geluidskaarten.                   + + Voor &os; 6.2 en later ziet u na de procedure voor het + opsporen van apparaten . Gebruik + de pijltoetsen om een land, regio, of groep te kiezen. Druk + daarna op Enter, dit stelt gemakkelijk uw land + en toetsenafbeelding in. Het is ook gemakkelijk om het + programma sysinstall te verlaten en + opnieuw te beginnen. + +
                  + Landmenu kiezen - Als er wijzigingen gemaakt moeten worden dan is de meest - eenvoudige wijze het programma - sysinstall te beëindigen en - opnieuw te beginnen. Dit is tevens een goede manier om - vertrouwd te raken met het installatieproces. + + + + + +
                  Sysinstall verlaten @@ -1064,7 +1291,7 @@ User Confirmation Requested Are you sure you wish to exit? The system will reboot - (be sure to remove any floppies from the drives). + (be sure to remove any floppies/CDs/DVDs from the drives). [ Yes ] No @@ -1072,9 +1299,8 @@ het station zit en &gui.yes; gekozen wordt. Bij opstarten van diskettes is het nodig om de diskette met - mfsroot.flp uit het station te halen en te - vervangen door de diskette met kern.flp - voor opnieuw wordt gestart. + boot.flp uit de drive te halen voordat + opnieuw wordt gestart. @@ -1089,9 +1315,9 @@ Het menu van sysinstall wordt bestuurd met de pijltjestoetsen, Enter, - Space en andere toetsen. Een gedetailleerde - beschrijving van de gebruikte toetsen en wat ze doen is - opgenomen in de gebruikersinformatie voor + Tab, Space en andere toetsen. + Een gedetailleerde beschrijving van de gebruikte toetsen en wat ze + doen is opgenomen in de gebruikersinformatie voor sysinstall. Selecteer de optie Usage om deze @@ -1175,7 +1401,7 @@
                  Een andere toetsenbordindeling is te kiezen door het - menuitem te selecteren met omhoog/omlaag en dan op + menu-item te selecteren met omhoog/omlaag en dan op Space te drukken. Nog een keer Space deselecteert het item. Nadat de keuze is gemaakt kan met de pijltjestoetsen &gui.ok; gekozen worden @@ -1289,7 +1515,7 @@ een andere schijf dan de zogenaamde primary master. Dit is erg handig voor gebruikers die er achter zijn gekomen dat de gemakkelijkste en goedkoopste - manier om een systeemback-up te maken het plaatsen van een + manier om een systeembackup te maken het plaatsen van een identieke tweede harde schijf is en het daarop regelmatig kopieëren van de inhoud van de eerste schijf met Ghost @@ -1315,7 +1541,7 @@ heeft dus geen kennis van logical BIOS drive mapping. Dit kan leiden tot verbazingwekkende situaties, met name als de schijven fysiek gelijk zijn in - geometrie en ook de data clonen van elkaar zijn. + geometrie en ook de data klonen van elkaar zijn. Bij het gebruik van &os; moet altijd de natuurlijke schijfnummering hersteld worden voordat een installatie wordt @@ -1356,7 +1582,7 @@ instabiel en vervangt hem door een andere schijf uit het archief. Willem installeert vervolgens de nieuwe versie van &os; op de nieuwe SCSI ID 0 met Fred's - magische internet FTP diskettes. De installatie gaat + magische Internet FTP diskettes. De installatie gaat goed. Fred gebruikt de nieuwe versie van &os; een paar dagen @@ -1456,7 +1682,7 @@ ad1, dan zou het allemaal werken. - Maar als dan een derde schijf wordt toevoegd, als slave + Maar als dan een derde schijf wordt toegevoegd, als slave op de eerste IDE controller, dan wordt die ad1 en de vorige ad1 wordt dan @@ -1497,7 +1723,7 @@ Het tweede deel laat de slices zien die momenteel op de schijf aanwezig zijn, waar ze beginnen en eindigen, hoe groot ze zijn en de namen die &os; ze geeft, hun omschrijving en - sub-type. In dit voorbeeld zijn twee kleine ongebruikte delen + subtype. In dit voorbeeld zijn twee kleine ongebruikte delen te zien, die een afspiegeling zijn van de schijfindeling op het systeem. Het laat ook een grote FAT-slice zien, die bijna zeker zichtbaar is als @@ -1529,7 +1755,7 @@ Disk. De bestaande delen worden verwijderd en daarvoor in de plaats komt een klein gebied, dat als unused wordt aangegeven (alweer een - afspiegeling van de PC schijf-opmaak) en dan een groot deel + afspiegeling van de PC schijfopmaak) en dan een groot deel voor &os;. Hierna dient het nieuwe &os;-deel met de pijltjestoetsen geselecteerd te worden en daarna kan S ingetoetst worden om het deel @@ -1612,7 +1838,7 @@ - Het helpscherm, bereikbaar via F1, + Het hulpscherm, bereikbaar via F1, beschrijft de problemen die mogelijk zijn als de harde schijf voor meerdere besturingssystemen gebruikt gaat worden.                   @@ -1704,14 +1930,14 @@ / - 100 MB + 512 MB Dit is het root-bestandssysteem. Elk ander - bestandssyteem wordt ergens in dit systeem gemount. - 100 MB is een redelijke grootte voor dit + bestandssyteem wordt ergens in dit systeem aangekoppeld. + 512 MB is een redelijke grootte voor dit bestandssysteem. Er wordt niet al te veel data in opgeslagen, want een normale &os; installatie slaat - hier ongeveer 40 MB aan gegevens op. De rest van >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Fri Sep 12 15:21:00 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A77F41065678; Fri, 12 Sep 2008 15:21: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 691531065673 for ; Fri, 12 Sep 2008 15:21: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 56C638FC16 for ; Fri, 12 Sep 2008 15:21: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 m8CFL0p8048592 for ; Fri, 12 Sep 2008 15:21:00 GMT (envelope-from rene@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m8CFL0Xx048586 for perforce@freebsd.org; Fri, 12 Sep 2008 15:21:00 GMT (envelope-from rene@FreeBSD.org) Date: Fri, 12 Sep 2008 15:21:00 GMT Message-Id: <200809121521.m8CFL0Xx048586@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 149666 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, 12 Sep 2008 15:21:01 -0000 http://perforce.freebsd.org/chv.cgi?CH=149666 Change 149666 by rene@rene_self on 2008/09/12 15:20:21 MFen: txtfiles.ent 1.2 -> 1.4 Check build with FORMATS=html-split and FORMATS=txt Affected files ... .. //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/txtfiles.ent#3 edit Differences ... ==== //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/txtfiles.ent#3 (text+ko) ==== @@ -9,18 +9,20 @@ Entities should be listed in alphabetical order. $FreeBSD: doc/nl_NL.ISO8859-1/books/handbook/txtfiles.ent,v 1.3 2007/06/28 02:46:38 chinsan Exp $ - gebaseerd op: 1.2 + + %SOURCE% en_US.ISO8859-1/books/handbook/txtfiles.ent + %SRCID% 1.4 --> + - @@ -69,4 +71,3 @@ - From owner-p4-projects@FreeBSD.ORG Fri Sep 12 15:29:09 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5D413106566C; Fri, 12 Sep 2008 15:29: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 21608106564A for ; Fri, 12 Sep 2008 15:29:09 +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 0F8068FC1A for ; Fri, 12 Sep 2008 15:29:09 +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 m8CFT8dk005049 for ; Fri, 12 Sep 2008 15:29:08 GMT (envelope-from rene@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m8CFT8aO004993 for perforce@freebsd.org; Fri, 12 Sep 2008 15:29:08 GMT (envelope-from rene@FreeBSD.org) Date: Fri, 12 Sep 2008 15:29:08 GMT Message-Id: <200809121529.m8CFT8aO004993@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 149667 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, 12 Sep 2008 15:29:09 -0000 http://perforce.freebsd.org/chv.cgi?CH=149667 Change 149667 by rene@rene_self on 2008/09/12 15:28:52 MFen: cutting-edge/chapter.sgml 1.227 -> 1.228 Checked: whitespace, build Affected files ... .. //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/cutting-edge/chapter.sgml#3 edit Differences ... ==== //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/cutting-edge/chapter.sgml#3 (text+ko) ==== @@ -3,7 +3,9 @@ $FreeBSD: doc/nl_NL.ISO8859-1/books/handbook/cutting-edge/chapter.sgml,v 1.6 2007/12/27 20:03:26 remko Exp $ $FreeBSDnl: doc/nl_NL.ISO8859-1/books/handbook/cutting-edge/chapter.sgml,v 1.47 2006/01/07 11:27:42 siebrand Exp $ - Gebaseerd op: 1.227 + + %SOURCE% en_US.ISO8859-1/books/handbook/cutting-edge/chapter.sgml + %SRCID% 1.228 --> @@ -1831,7 +1833,8 @@ overige machines. Zorg er als laatste voor dat - /etc/make.conf op alle machines in de + /etc/make.conf en + /etc/src.conf op alle machines in de bouwgroep het eens zijn met de bouwmachine. Dat betekent dat de bouwmachine alle delen van het basissysteem moet bouwen die elke machine in de bouwgroep installeert. Ook heeft elke From owner-p4-projects@FreeBSD.ORG Fri Sep 12 17:55:38 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 43C771065673; Fri, 12 Sep 2008 17:55: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 E31221065671 for ; Fri, 12 Sep 2008 17:55:37 +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 D15A68FC19 for ; Fri, 12 Sep 2008 17:55:37 +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 m8CHtba4053865 for ; Fri, 12 Sep 2008 17:55:37 GMT (envelope-from rene@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m8CHtboU053863 for perforce@freebsd.org; Fri, 12 Sep 2008 17:55:37 GMT (envelope-from rene@FreeBSD.org) Date: Fri, 12 Sep 2008 17:55:37 GMT Message-Id: <200809121755.m8CHtboU053863@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 149669 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, 12 Sep 2008 17:55:38 -0000 http://perforce.freebsd.org/chv.cgi?CH=149669 Change 149669 by rene@rene_self on 2008/09/12 17:54:43 MFen desktop/chapter.sgml 1.65 -> 1.76 (plus local fixes) Checked: spelling, whitespace (rewrap lines), build Affected files ... .. //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/desktop/chapter.sgml#3 edit Differences ... ==== //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/desktop/chapter.sgml#3 (text+ko) ==== @@ -3,7 +3,9 @@ $FreeBSD: doc/nl_NL.ISO8859-1/books/handbook/desktop/chapter.sgml,v 1.12 2006/08/25 16:14:57 remko Exp $ $FreeBSDnl: doc/nl_NL.ISO8859-1/books/handbook/desktop/chapter.sgml,v 1.37 2006/08/25 16:14:06 remko Exp $ - Gebaseerd op: 1.65 + + %SOURCE% en_US.ISO8859-1/books/handbook/desktop/chapter.sgml + %SRCID% 1.76 --> @@ -29,21 +31,20 @@ Overzicht - &os; kan een groot aantal bureaubladapplicaties draaien, - zoals browsers en tekstverwerkers. De meeste hiervan zijn - beschikbaar als packages of kunnen automatisch vanuit de - Portscollectie gebouwd worden. Veel nieuwe gebruikers - verwachten dit soort applicaties op hun bureaublad. Dit - hoofdstuk laat zien hoe populaire bureaubladapplicaties - moeiteloos geïnstalleerd kunnen worden vanuit een package - of vanuit de Portscollectie. + &os; kan een groot aantal bureaubladapplicaties draaien, zoals browsers en tekstverwerkers. De meeste hiervan zijn beschikbaar + als pakketten of kunnen automatisch vanuit de Portscollectie + gebouwd worden. Veel nieuwe gebruikers verwachten dit soort + applicaties op hun bureaublad. Dit hoofdstuk laat zien hoe + populaire bureaubladapplicaties moeiteloos geïnstalleerd + kunnen worden vanuit een pakket of vanuit de Portscollectie. + Als programma's vanuit ports geïnstalleerd worden, wordt hun broncode gecompileerd. Dit kan erg lang duren, afhankelijk van wat er gecompileerd wordt en de rekenkracht van een machine. - Als compileren vanuit broncode te veel tijd kost, kunnen de - meeste programma's van de Portscollectie als een voorafgebouwd - package geïnstalleerd worden. + Als compileren vanuit broncode te veel tijd kost, kunnen de meeste + programma's van de Portscollectie als een voorgebouwd pakket + geïnstalleerd worden. Omdat &os; compatibel is met &linux;, zijn veel applicaties die voor &linux; zijn ontwikkeld beschikbaar een &os; bureaublad. @@ -53,11 +54,11 @@ linux-. Dit is handig om te onthouden wanneer er naar een port gezocht wordt met bijvoorbeeld &man.whereis.1;. In dit hoofdstuk wordt aangenomen dat &linux; binaire - compatibiliteit is ingeschakeld voordat &linux; applicaties - worden geïnstalleerd. + compatibiliteit is ingeschakeld voordat &linux; applicaties worden + geïnstalleerd. - In dit hoofdstuk worden de volgende categoriën - behandeld: + In dit hoofdstuk worden de volgende categoriën behandeld: + @@ -106,7 +107,7 @@ Meer informatie over een multimedia-omgeving staat in - . Installatie van e-mail staat + . Installatie van email staat beschreven in .                   @@ -119,17 +120,17 @@ web - &os; wordt zonder een voor-geïnstalleerde browser + &os; wordt zonder een voorgeïnstalleerde browser geleverd. In plaats hiervan bevat de www map van de Portscollectie browsers om te installeren. Het is ook mogelijk - voor de meeste ports een package te installeren als compileren - niet gewenst is. Compileren kan soms lang duren. + voor de meeste ports een pakket te installeren als compileren niet + gewenst is. Compileren kan soms lang duren. KDE en - GNOME bevatten reeds HTML-browsers. - In staat meer informatie over de - installatie van deze complete bureaubladen. + GNOME bevatten reeds HTML-browsers. In + staat meer informatie over de installatie + van deze complete bureaubladen. Lichtgewicht browsers uit de Portscollectie zijn onder andere www/dillo, @@ -205,30 +206,31 @@ Mozilla Mozilla is een moderne en - stabiele browser die volledig geschikt gemaakt is voor - &os;. De HTML-weergave - engine voldoet in grote mate aan de standaarden. Er worden een - mail- en nieuwslezer bijleverd en het pakket bevat zelfs een - HTML-bewerker voor het maken van webpagina's. - Mozilla heeft dezelfde broncodebasis - met &netscape; - Communicator. + stabiele browser die volledig geschikt gemaakt is voor &os;; de + HTML-weergave engine voldoet in grote mate aan de standaarden; + er worden een mail- en nieuwslezer bijgeleverd en het pakket + bevat zelfs een HTML-bewerker voor het maken van webpagina's. + Gebruikers van &netscape; zullen de + gelijkheden met Communicator suite + herkennen, aangezien beide browsers wat ontwikkelgeschiedenis + delen. Op langzame machines, met een CPU-snelheid van 233MHz of minder dan 64MB aan RAM, kan Mozilla - te veeleisend zijn om volledig bruikbaar te zijn. In dat - geval is Opera browser een mogelijke - vervanger. + te veeleisend zijn om volledig bruikbaar te zijn. In dat geval + is Opera browser een mogelijke + vervanger, dat iets later in dit hoofdstuk beschreven wordt. + Als het niet wenselijk of mogelijk is om Mozilla te compileren, dan is dit al - door het &os; GNOME team gedaan. Het package kan - geïnstalleerd worden met: + door het &os; GNOME team gedaan. Het pakket kan vanaf het + netwerk geïnstalleerd worden met: &prompt.root; pkg_add -r mozilla - Als het package niet beschikbaar is en er genoeg tijd en - schijfruimte schikbaar zijn, kan de broncode van + Als het pakket niet beschikbaar is en er genoeg tijd en + schijfruimte beschikbaar zijn, kan de broncode van Mozilla gedownload, gecompileerd en geïnstalleerd worden. Dit gaat met: @@ -239,8 +241,8 @@ correcte installatie door de chrome registry setup met root rechten te draaien. Als echter ook - toevoegingen zoals muisgebaren geïnstalleerd moeten - worden, dan moet Mozilla als + toevoegingen zoals muisgebaren geïnstalleerd moeten worden, + dan moet Mozilla als root gedraaid worden om dat op de juiste wijze geïnstalleerd te krijgen. @@ -274,7 +276,7 @@ &prompt.root; pkg_add -r firefox - De Portscollectie kan ook gebruikt worden als je liever + De Portscollectie kan ook gebruikt worden als u liever vanuit de broncode installeert. &prompt.root; cd /usr/ports/www/firefox @@ -285,19 +287,19 @@ Firefox, Mozilla en &java; plugin - In deze en de volgende sectie wordt er vanuit gegaan - dat Firefox of + In deze en de volgende sectie wordt er vanuit gegaan dat + Firefox of Mozilla reeds geïnstalleerd is. - De &os; Foundation heeft een licentie overeenkomst met - Sun Microsystems om &os; binaries te distribueren voor de - Java Runtime Environment (&jre;) en voor de Java Development - kit (&jdk;). Binaire pakketen voor &os; zijn beschikbaar op - de &os; - Foundation web site. + De &os; Foundation heeft een licentie overeenkomst met Sun + Microsystems om &os; binaries te distribueren voor de Java + Runtime Environment (&jre;) en voor de Java Development kit + (&jdk;). Binaire pakketten voor &os; zijn beschikbaar op de + + &os; Foundation website. Om &java; ondersteuning toe te voegen aan Firefox of @@ -308,11 +310,17 @@ url="http://www.freebsdfoundation.org/downloads/java.shtml">, en installeer deze met &man.pkg.add.1;. - Start nu de browser en voer in de adresbalk het volgende in - about:plugins en druk op + Start nu de browser en voer in de adresbalk + about:plugins in en druk op Enter. Een pagina met geïnstalleerde - plugins wordt nu getoond. De &java; plugin zou hier nu tussen - moeten staan. + plugins wordt nu getoond; de &java; plugin zou hier nu tussen + moeten staan. Als dit niet het geval is, draai dan als + root het volgende commando: + + &prompt.root; ln -s /usr/local/diablo-jre1.5.0/plugin/i386/ns7/libjavaplugin_oji.so \ + /usr/local/lib/browser_plugins/ + + Start daarna de browser opnieuw. @@ -321,56 +329,27 @@ ¯omedia; &flash; plugin is niet beschikbaar voor &os;. Er is echter wel een softwarelaag (wrapper) om de &linux;-versie van de plugin te draaien. Deze wrapper - ondersteunt ook &adobe; &acrobat; plugin, RealPlayer plugin en - meer. + ondersteunt ook &adobe; &acrobat; plugin, &realplayer; plugin en + meer. Installeer de port www/linuxpluginwrapper. Deze - is afhankelijk van www/nspluginwrapper. Deze is + afhankelijk van emulators/linux_base wat een grote - port is. Volg de instructies die door de port worden - weergegeven om /etc/libmap.conf juist in - te stellen! Voorbeeldinstellingen worden geïnstalleerd in - de map - /usr/local/share/examples/linuxpluginwrapper/. + port is. De volgende stap is het installeren van de www/linux-flashplugin7 port. Zodra - de plugin geinstalleerd is, start dan de browser en voer het - volgende in op de adresbalk about:plugins - en druk op Enter. Een pagina met - geïnstalleerde plugins wordt nu getoond, de flashplugin - zou hier nu tussen moeten staan. + de plugin geïnstalleerd is, moet de plugin door elke + gebruiker geïnstalleerd worden met + nspluginwrapper: - Als de flashplugin niet getoond wordt komt dit meestal door - een verkeerde symlink. Voer het volgende commando's uit als - root: + &prompt.user; nspluginwrapper -v -a -i - &prompt.root; ln -s /usr/X11R6/lib/linux-flashplugin7/libflashplayer.so \ - /usr/X11R6/lib/browser_plugins/ -&prompt.root; ln -s /usr/X11R6/lib/linux-flashplugin7/flashplayer.xpt \ - /usr/X11R6/lib/browser_plugins/ - - Als nu de browser opnieuw gestart wordt moet de plugin in - de reeds genoemde lijst voorkomen. Het kan gebeuren dat de - browser crashed bij bepaalde &flash; animaties, in dat geval - kan de volgende patch uitkomst bieden: - - &prompt.root; cd /usr/src -&prompt.root; fetch http://people.FreeBSD.org/~nork/rtld_dlsym_hack.diff -&prompt.root; patch < rtld_dlsym_hack.diff -&prompt.root; cd libexec/rtld-elf/ -&prompt.root; make clean -&prompt.root; make obj -&prompt.root; make depend -&prompt.root; make && make install - - Herstart hierna de computer. - - - De linuxpluginwrapper werkt - alleen op de &i386; systeemarchitectuur. - + Start dan de browser en voer op de adresbalk + about:plugins in en druk op + Enter. Een pagina met alle geïnstalleerde + plugins wordt nu getoond. @@ -378,35 +357,35 @@ Opera - Opera is een volledige en - een standaard volgende browser. Hij wordt standaard - geleverd met een ingebouwde email-client, een nieuwslezer, - een IRC client, een RSS/ATOM feed lezer en nog veel meer. - Ondanks dat is Opera relatief gezien - niet zwaar en erg snel. Hij komt in twee smaken: een - &os; versie en een versie die draait onder &linux; emulatie. + Opera is een volledige en een + standaard volgende browser. Hij wordt standaard geleverd met + een ingebouwde email-client, een nieuwslezer, een IRC client, + een RSS/ATOM feed lezer en nog veel meer. Ondanks dat is + Opera relatief gezien niet zwaar en + erg snel. Hij komt in twee smaken: een &os; versie en een + versie die draait onder &linux; emulatie. - De &os; package versie van Opera + De &os; pakketversie van Opera wordt zo geïnstalleerd: &prompt.root; pkg_add -r opera - Sommige FTP-sites hebben niet alle packages, maar hetzelfde - resultaat kan worden behaald met de Portscollectie door te - typen: + Sommige FTP-sites hebben niet alle pakketten, maar + Operakan worden nog altijd via de + Portscollectie worden verkregen door te typen: &prompt.root; cd /usr/ports/www/opera &prompt.root; make install clean - De &linux; versie van Opera - kan geïnstlleerd worden door bij de bovenstaande - voorbeelden linux-opera te gebruiken in - plaats van opera. De &linux; versie is - nuttig in situaties waarin plugins nodig zijn die alleen voor - &linux; beschikbaar zijn, zoals + De &linux; versie van Opera kan + geïnstlleerd worden door bij de bovenstaande voorbeelden + linux-opera te gebruiken in plaats van + opera. De &linux; versie is nuttig in + situaties waarin plugins nodig zijn die alleen voor &linux; + beschikbaar zijn, zoals Adobe &acrobat.reader;. In alle - andere opzichten lijken de &os; en &linux; versies - identiek. + andere opzichten zouden de &os; en &linux; versies identiek + moeten zijn. @@ -418,16 +397,18 @@ KDE, maar kan ook buiten KDE gebruikt worden door x11/kdebase3 te installeren. - Konqueror is meer dan een browser. - Het is ook een bestandsbeheerder en multimedia-viewer. + Konqueror is meer dan een browser, + het is ook een bestandsbeheerder en multimedia-viewer. - Konqueror wordt ook met een - verzameling plugins geleverd, beschikbaar in Er is ook een verzameling plugins beschikbaar voor + Konqueror, beschikbaar in misc/konq-plugins. Konqueror ondersteunt ook - &flash;. Daarover is meer - informatie beschikbaar op &flash;; een How To + gids om ondersteuning voor &flash; in + Konqueror te krijgen is beschikbaar + op . @@ -439,11 +420,12 @@ vaak een goed kantoorpakket of een vriendelijke tekstverwerker. Hoewel sommige bureaubladomgevingen zoals KDE reeds een kantoorpakket - verschaffen, is er geen standaardapplicatie. &os; verschaft - alles wat nodig is, ongeacht de bureaubladomgeving. + verschaffen, is er geen standaard produktiviteitspakket. &os; + kan alles verschaffen wat nodig is, ongeacht de + bureaubladomgeving. - In dit gedeelte worden de onderstaande applicaties - beschreven: + In dit gedeelte worden de onderstaande applicaties beschreven: + @@ -517,25 +499,24 @@ De KDE-gemeenschap heeft zijn bureaubladomgeving met een - kantoorpakket geleverd dat buiten - KDE gebruikt kan worden. Het bevat - de vier standaardcomponenten uit andere kantoorpakketten. - KWord is de tekstverwerker, - KSpread is het spreadsheetprogramma, - KPresenter beheert diapresentaties - en Kontour voorziet in grafische - mogelijkheden. + kantoorpakket geleverd dat buiten KDE + gebruikt kan worden. Het bevat de vier standaardcomponenten uit + andere kantoorpakketten. KWord is de + tekstverwerker, KSpread is het + spreadsheetprogramma, KPresenter + beheert diapresentaties en Kontour + voorziet in grafische mogelijkheden. Voordat de nieuwste KOffice wordt geïnstalleert, moet er een recente versie van KDE geïnstalleerd zijn. - KOffice als package installeren + KOffice als pakket installeren gaat met het volgende commando: &prompt.root; pkg_add -r koffice - Als het package niet beschikbaar is, kan de Portscollectie + Als het pakket niet beschikbaar is, kan de Portscollectie gebruiken worden. Om KOffice voor KDE3 te installeren: @@ -550,22 +531,21 @@ AbiWord is een vrij tekstverwerkingsprogramma, ongeveer gelijk aandoet als - µsoft; Word. Het is geschikt - om verslagen, brieven, rapporten, memo's, enzovoort mee te - typen. Het programma is snel, bevat veel mogelijkheden en is + µsoft; Word. Het is geschikt om + verslagen, brieven, rapporten, memo's, enzovoort mee te typen. + Het programma is snel, bevat veel mogelijkheden en is gebruikersvriendelijk. - AbiWord kan veel - bestandsformaten importeren en exporteren, waaronder enkele - gesloten formaten, zoals µsoft; - .doc. + AbiWord kan veel bestandsformaten + importeren en exporteren, waaronder enkele gesloten formaten, + zoals µsoft;'s .doc. - AbiWord is beschikbaar als - package en te installeren met: + AbiWord is beschikbaar als pakket + en te installeren met: &prompt.root; pkg_add -r abiword - Als het package niet beschikbaar is, kan het worden + Als het pakket niet beschikbaar is, kan het worden gecompileerd vanuit de Portscollectie. De Portscollectie is meer recent. Dat kan als volgt: @@ -585,14 +565,14 @@ het retoucheren van foto's. Het ondersteunt een groot aantal plugins en bevat een scripting interface. The GIMP kan een groot aantal - bestandsformaten lezen en schrijven. Het ondersteunt - interfaces met scanners en tabletten. + bestandsformaten lezen en schrijven. Het ondersteunt interfaces + met scanners en tabletten. - Het pakket is te installeren als package met: + Het pakket is te installeren met: &prompt.root; pkg_add -r gimp - Als een FTP-site dit package niet heeft, kan de + Als een FTP-site dit pakket niet heeft, kan de Portscollectie gebruikt worden. De graphics map van de Portscollectie bevat ook @@ -610,9 +590,9 @@ map van de Portscollectie bevat de ontwikkelversie van The GIMP in graphics/gimp-devel. Een HTML - versie van The GIMP Manual staan - in graphics/gimp-manual-html. + versie van The GIMP Manual staan in + graphics/gimp-manual-html. + @@ -629,13 +609,13 @@ OpenOffice.org bevat alle noodzakelijke applicaties in een compleet - kantoorproductiviteitspakket: een tekstverwerker, - een spreadsheet, een presentatiebeheerder en een - tekenprogramma. De gebruikersinterface is vrijwel gelijk aan - die van andere kantoorpakketten en het kan veel populaire - bestandsformaten in- en uitvoeren. Het is beschikbaar in een - aantal verschillende talen met interfaces, spellingcontrole en - woordenboeken. + kantoorproductiviteitspakket: een tekstverwerker, een + spreadsheet, een presentatiebeheerder en een tekenprogramma. De + gebruikersinterface is vrijwel gelijk aan die van andere + kantoorpakketten en het kan veel populaire bestandsformaten + in- en uitvoeren. Het is beschikbaar in een aantal + verschillende talen — internationalisatie is uitgebreid + tot interfaces, spellingcontrole, en woordenboeken. De tekstverwerker van OpenOffice.org gebruikt een eigen @@ -648,49 +628,48 @@ OpenOffice.org staat op de OpenOffice.org website. Voor specifieke &os; informatie en om - direct packages te downloaden is er de website van het &os; OpenOffice.org Porting Team. - Om OpenOffice.org te - installeren: + Om OpenOffice.org te installeren: + - &prompt.root; pkg_add -r openoffice + &prompt.root; pkg_add -r openoffice.org Dit hoort te werken als er een -RELEASE versie van &os; wordt gedraaid. In andere gevallen is het verstandig om te kijken op de website van het &os; OpenOffice.org Porting Team - en het juiste package met &man.pkg.add.1;te downloaden en te + en het juiste pakket met &man.pkg.add.1; te downloaden en te installeren. Zowel de huidige release als de ontwikkelversie kunnen op die locatie gedownload worden. - Als het package geïnstalleerd is, start dan met het - volgende commando - OpenOffice.org: + Als het pakket geïnstalleerd is, start dan met het + volgende commando OpenOffice.org: + &prompt.user; openoffice.org - Tijdens de eerste keer starten worden er een aantal - vragen gesteld en wordt de map - .openoffice.org2 in de thuismap van de - aangemelde gebruiker gemaakt + Tijdens de eerste keer starten worden er een aantal vragen + gesteld en wordt de map .openoffice.org2 + in de thuismap van de aangemelde gebruiker gemaakt. - Als de OpenOffice.org packages - niet beschikbaar zijn, kan het uit de ports gecompileerd - worden. Hiervoer is veel schijfruimte en tijd nodig: + Als de OpenOffice.org pakketten + niet beschikbaar zijn, kan het uit de ports gecompileerd worden. + Hiervoor is veel schijfruimte en tijd nodig: - &prompt.root; cd /usr/ports/editors/openoffice.org-2.0 + &prompt.root; cd /usr/ports/editors/openoffice.org-2 &prompt.root; make install clean - Vervang om een gelocaliseerde versie te bouwen de + Vervang om een gelokaliseerde versie te bouwen de voorgaande commandoregel door de volgende: - &prompt.root; make LOCALIZED_LANG=your_language install clean + &prompt.root; make LOCALIZED_LANG=uw_taal install clean Vervang taal door de juiste ISO-taalcode. Een lijst met ondersteunde taalcodes is @@ -709,10 +688,11 @@ Documentviewers - Het kan zijn dat de standaardviewers voor een aantal - populaire bestandsformaten niet in het basissysteem zitten. In - dit gedeelte wordt aangegeven hoe die geïnstalleerd kunnen - worden. + Sommige nieuwe documentformaten hebben aan populariteit + gewonnen sinds de komst van &unix;; het kan zijn dat de + standaardviewers die ze vereisen niet in het basissysteem zitten. + In dit gedeelte wordt aangegeven hoe zulke viewers + geïnstalleerd kunnen worden. Dit gedeelte behandelt de onderstaande applicaties: @@ -799,7 +779,7 @@ &prompt.root; cd /usr/ports/print/acroread7 &prompt.root; make install clean - Vanwege de licentie is een package niet beschikbaar. + Vanwege de licentie is een pakket niet beschikbaar. @@ -824,12 +804,12 @@ ghostview maar heeft een vriendelijker uiterlijk dankzij de Xaw3d bibliotheek. Het is snel en - heeft mogelijkheden als oriëntatie, papiergrootte, schalen - en anti-aliassen. Bijna elke bewerking kan met het + heeft mogelijkheden, zoals oriëntatie, papiergrootte, + schalen en anti-aliassen. Bijna elke bewerking kan met het toetsenbord of de muis worden gedaan. - gv is als package te - installeren: + gv is als pakket te installeren: + &prompt.root; pkg_add -r gv @@ -851,12 +831,12 @@ Xpdf een efficiënte - lichtgewicht PDF-viewer voor &os;. Het heeft erg weinig - bronnen nodig en is zeer stabiel. Het gebruikt de standaard - X-fonts en is niet afhankelijk van - &motif; of andere X-toolkits. + lichtgewicht PDF-viewer voor &os;. Het heeft erg weinig bronnen + nodig en is zeer stabiel. Het gebruikt de standaard X-fonts en + is niet afhankelijk van &motif; of + andere X-toolkits. - Xpdf is als package te + Xpdf is als pakket te installeren: &prompt.root; pkg_add -r xpdf @@ -879,14 +859,14 @@ GQview is een afbeeldingenbeheerder. Een bestand kan met één klik bekeken worden, er kan een externe editor opgestart worden - er kunnen thumbnail-voorbeelden gemaakt worden en nog veel - meer. Het bevat ook een diapresentatie-modus en enkele - standaard bestandsoperaties. Er kunnen - afbeeldingsverzamelingen beheerd worden en eenvoudig duplicaten - gevonden worden. GQview kan het - complete scherm gebruiken en ondersteunt meerdere talen. + er kunnen thumbnail-voorbeelden gemaakt worden en nog veel meer. + Het bevat ook een diapresentatie-modus en enkele standaard + bestandsoperaties. Er kunnen afbeeldingsverzamelingen beheerd + worden en eenvoudig duplicaten gevonden worden. + GQview kan het complete scherm + gebruiken en ondersteunt meerdere talen. - GQview is als package te + GQview is als pakket te installeren: &prompt.root; pkg_add -r gqview @@ -904,11 +884,12 @@ Om financiën via het &os; bureaublad te beheren zijn er krachtige en gemakkelijk te gebruiken applicaties om te installeren. Sommige zijn compatibel met wijdverbreide - bestandsformaten zoals Quicken of - Excel documenten. + bestandsformaten, zoals de formaten gebruikt door + Quicken en + Excel om documenten op te slaan. - Dit gedeelte behandelt deze applicaties: + Dit gedeelte behandelt deze programma's: @@ -954,6 +935,16 @@ Tcl/Tk + + + KMyMoney + + weinig + + zwaar + + KDE + @@ -966,21 +957,21 @@ GnuCash is onderdeel van GNOME dat gebruikersvriendelijke en krachtige applicaties aan eindgebruikers wil leveren. Met - GnuCash kunnen inkomsten en - uitgaven, bankrekeningen en voorraden bijgehouden worden. Het - bevat een intuïtieve interface terwijl het erg - professioneel blijft. + GnuCash kunnen inkomsten en uitgaven, + bankrekeningen en voorraden bijgehouden worden. Het bevat een + intuïtieve interface terwijl het erg professioneel blijft. + GnuCash levert een slim kasboek, - een hiërarchisch systeem van rekeningen, veel - toetsenbordversnellers en auto-invul mogelijkheden. Het een + een hiërarchisch systeem van rekeningen, en veel + toetsenbordversnellers en auto-invul mogelijkheden. Het kan een transactie splitsen in meer gedetailleerde stukken. GnuCash kan Quicken QIF-bestanden invoeren en - samenvoegen. Het kan ook met de meeste internationale datum- - en valutaformaten omgaan. + samenvoegen. Het kan ook met de meeste internationale datum- en + valutaformaten omgaan. - GnuCash is als package te + GnuCash is als pakket te installeren: &prompt.root; pkg_add -r gnucash @@ -1002,11 +993,12 @@ Gnumeric - Gnumeric is een spreadsheet uit - de GNOME bureaubladomgeving. Het - maakt gebruikt van auto-invullen afhankelijk van - het celformaat. Het kan bestanden in een aantal populaire - formaten zoals Excel, + Gnumeric is een + spreadsheetprogramma uit de GNOME + bureaubladomgeving. Het maakt gebruikt van + auto-invullen afhankelijk van het celformaat. + Het kan bestanden in een aantal populaire formaten zoals + Excel, Lotus 1-2-3 en Quattro Pro inlezen. Gnumeric ondersteunt grafieken door @@ -1015,7 +1007,7 @@ aantal ingebouwde functies en kent gebruikelijke celformaten als nummer, valuta, datum, tijd en veel meer. - Gnumeric is als package te + Gnumeric is als pakket te installeren: &prompt.root; pkg_add -r gnumeric @@ -1038,14 +1030,14 @@ Abacus is een kleine en - gemakkelijk te gebruiken spreadsheet en bevat veel ingebouwde - functies die nuttig zijn in verschillende domeinen zoals - statistiek, financiën, en wiskunde. Het kan - Excelbestanden lezen en schrijven. + gemakkelijk te gebruiken spreadsheetprogramma. Het bevat veel + ingebouwde functies die nuttig zijn in verschillende domeinen + zoals statistiek, financiën, en wiskunde. Het kan + Excel-bestanden lezen en schrijven. Abacus kan &postscript; uitvoer produceren. - Abacus is als package te + Abacus is als pakket te installeren: &prompt.root; pkg_add -r abacus @@ -1055,6 +1047,43 @@ &prompt.root; cd /usr/ports/deskutils/abacus &prompt.root; make install clean + + + KMyMoney + + KMyMoney + + + spreadsheet + + KMyMoney + + + KMyMoney is een persoonlijke + financiële beheerder gebouwd voor + KDE. + KMyMoney poogt om alle belangrijke + eigenschappen die in commerciële persoonlijke + financiële beheerders zitten te bieden en te integreren. + Gebruiksgemak en degelijke dubbele accounting zijn eigenschappen + die worden benadrukt. KMyMoney + importeert vanuit standaard Quicken Interchange Format (QIF) + bestanden, houdt investeringen bij, kan met meerdere + munteenheden overweg, en biedt een waaier aan rapporten. + Mogelijkheden om OFX te importeren zijn via een aparte plugin + beschikbaar. + + Om KMyMoney als een pakket te + installeren: + + &prompt.root; pkg_add -r kmymoney2 + + Als het pakket niet beschikbaar is, kan de Portscollectie + gebruikt worden: + + &prompt.root; cd /usr/ports/finance/kmymoney2 +&prompt.root; make install clean + @@ -1063,23 +1092,10 @@ Hoewel &os; populair is bij ISP's om zijn prestaties en stabiliteit, is het behoorlijk klaar voor dagelijks gebruik als een bureaublad. Met enkele duizenden applicaties als packages of pakketten of ports, is een perfect bureaublad te bouwen dat aan alle noden voldoet. - Als een bureaublad is geïnstalleerd is het mogelijk een - stap verder te gaan met misc/instant-workstation. Met deze - meta-port kan een verzameling ports gebouwd worden - die aangepast kan worden door - /usr/ports/misc/instant-workstation/Makefile - te bewerken en de gebruikte syntaxis voor de standaardverzameling - om ports toe te voegen of te verwijderen te gebruiken. Het - bouwen gaat volgens de gebruikelijke procedure. Uiteindelijk is - het zo mogelijk één groot package te creëren - voldoet aan de persoonlijke eisen van een gebruiker dat te - installeren is op alle gebruikte werkstations! - Nu volgt nog een overzicht van alle bureaubladapplicaties die in dit hoofdstuk zijn behandeld: From owner-p4-projects@FreeBSD.ORG Fri Sep 12 18:32:15 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 888391065673; Fri, 12 Sep 2008 18:32: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 4C83A106564A for ; Fri, 12 Sep 2008 18:32:15 +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 3C8A18FC15 for ; Fri, 12 Sep 2008 18:32:15 +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 m8CIWFII093475 for ; Fri, 12 Sep 2008 18:32:15 GMT (envelope-from rene@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m8CIWFMP093473 for perforce@freebsd.org; Fri, 12 Sep 2008 18:32:15 GMT (envelope-from rene@FreeBSD.org) Date: Fri, 12 Sep 2008 18:32:15 GMT Message-Id: <200809121832.m8CIWFMP093473@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 149671 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, 12 Sep 2008 18:32:15 -0000 http://perforce.freebsd.org/chv.cgi?CH=149671 Change 149671 by rene@rene_self on 2008/09/12 18:31:14 Correct old mis-MFen (acroread5 -> acroread) Affected files ... .. //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/desktop/chapter.sgml#4 edit Differences ... ==== //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/desktop/chapter.sgml#4 (text+ko) ==== @@ -1171,7 +1171,7 @@ &acrobat.reader; - acroread5 + acroread print/acroread7 From owner-p4-projects@FreeBSD.ORG Fri Sep 12 20:49:36 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 256921065671; Fri, 12 Sep 2008 20:49: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 C52EE106566C for ; Fri, 12 Sep 2008 20:49:35 +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 B30A58FC1C for ; Fri, 12 Sep 2008 20:49:35 +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 m8CKnZS1004768 for ; Fri, 12 Sep 2008 20:49:35 GMT (envelope-from rene@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m8CKnZrJ004766 for perforce@freebsd.org; Fri, 12 Sep 2008 20:49:35 GMT (envelope-from rene@FreeBSD.org) Date: Fri, 12 Sep 2008 20:49:35 GMT Message-Id: <200809122049.m8CKnZrJ004766@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 149678 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, 12 Sep 2008 20:49:36 -0000 http://perforce.freebsd.org/chv.cgi?CH=149678 Change 149678 by rene@rene_self on 2008/09/12 20:48:52 MFen disks/chapter.sgml 1.279 -> 1.286 (plus 1.277) Checked whitespace, build Affected files ... .. //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/disks/chapter.sgml#3 edit Differences ... ==== //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/disks/chapter.sgml#3 (text+ko) ==== @@ -1,9 +1,11 @@ - @@ -294,16 +296,16 @@ <application>fdisk</application> partitie-bewerker - Eenmaal binnen fdisk kan - a ingetypt worden om de gehele + Eenmaal binnen fdisk kan op + A gedrukt worden om de gehele schijf voor &os; te gebruiken. Wanneer gevraagd wordt of het systeem compatibel dient te blijven met mogelijk toekomstige besturingssystemen, dient met YES geantwoord te worden. Met - W kunnen de veranderingen naar de + W kunnen de veranderingen naar de schijf worden geschreven. Nu dient de FDISK-bewerker - verlaten te worden door het intypen van - q. Vervolgens wordt er een vraag + verlaten te worden door op Q te drukken. + Vervolgens wordt er een vraag gesteld over het Master Boot Record. Omdat er een schijf aan een reeds draaiend systeem wordt toegevoegd, dient hier None gekozen te @@ -338,7 +340,7 @@ heeft een voorkeur voor de partitie e voor niet-root-niet-swap-partities. Binnen de Labelbewerker dient een enkel bestandssysteem te worden - aangemaakt door C in te typen. Kies + aangemaakt door op C te drukken. Kies FS wanneer gevraagd wordt of dit een FS (file system) of swap wordt, en geef een mountpunt in (bijvoorbeeld /mnt). Wanneer een @@ -349,8 +351,8 @@ Nu kan het nieuwe label naar de schijf worden geschreven en er een bestandssysteem op aangemaakt worden. - Dit kan gedaan worden door W in te - typen. Fouten van sysinstall + Dit kan gedaan worden door op W te + drukken. Fouten van sysinstall dat de nieuwe partitie niet gemount kon worden kunnen genegeerd worden. De Labelbewerker en sysinstall kunnen nu volledig @@ -384,7 +386,7 @@ &prompt.root; dd if=/dev/zero of/dev/da1 bs=1k count=1 &prompt.root; fdisk -BI da1 # Initialiseer de nieuwe schijf. -&prompt.root; bsdlabel -B -w -r da1s1 auto # Label de schijf. +&prompt.root; bsdlabel -B -w da1s1 auto # Label de schijf. &prompt.root; bsdlabel -e da1s1 # Bewerk de zojuist aangemaakte schijflabel en voeg partities toe. &prompt.root; mkdir -p /1 &prompt.root; newfs /dev/da1s1e # Herhaal dit voor alle aangemaakte partities. @@ -409,9 +411,9 @@ begrijpt. &prompt.root; dd if=/dev/zero of=/dev/da1 bs=1k count=1 -&prompt.root; bsdlabel -Brw da1 auto +&prompt.root; bsdlabel -Bw da1 auto &prompt.root; bsdlabel -e da1 # Maak de `e'-partitie aan. -&prompt.root; newfs -d0 /dev/da1e +&prompt.root; newfs /dev/da1e &prompt.root; mkdir -p /1 &prompt.root; vi /etc/fstab # Voeg een regel voor /dev/da1e toe. &prompt.root; mount /1 @@ -419,7 +421,7 @@ Een alternatieve methode is: &prompt.root; dd if=/dev/zero of=/dev/da1 count=2 -&prompt.root; bsdlabel /dev/da1 | bsdlabel -BrR da1 /dev/stdin +&prompt.root; bsdlabel /dev/da1 | bsdlabel -BR da1 /dev/stdin &prompt.root; newfs /dev/da1e &prompt.root; mkdir -p /1 # Voeg een regel voor /dev/da1e toe. &prompt.root; mount /1 @@ -549,9 +551,9 @@ &man.bsdlabel.8; gebruikt te worden om de schijven te labelen: - bsdlabel -r -w -ad1 auto -bsdlabel -r -w ad2 auto -bsdlabel -r -w ad3 auto + bsdlabel -w -ad1 auto +bsdlabel -w ad2 auto +bsdlabel -w ad3 auto Bovenstaande maakt een schijflabel aan voor ad1c, @@ -996,12 +998,12 @@ Een manier om dat te bewerkstelligen is door met de gebruiker root een subdirectory aan te maken die eigendom is van de gebruiker als - /mnt$USER - (verander $USER door de login - naam van de daadwerkelijke gebruiker): + /mntgebruikersnaam + (verander gebruikersnaam door de + loginnaam van de daadwerkelijke gebruiker): - &prompt.root; mkdir /mnt/$USER -&prompt.root; chown $USER:$USER /mnt/$USER + &prompt.root; mkdir /mnt/gebruikersnaam +&prompt.root; chown gebruiker:gebruiker /mnt/gebruiker Stel dat er vervolgens een USB stick ingeplugged wordt en er een /dev/da0s1 aangemaakt wordt. @@ -1009,7 +1011,7 @@ FAT bestandssysteem komen, kan deze als volgende gekoppeld worden: - &prompt.user; mount -t msdosfs -m 644 -M 755 /dev/da0s1 /mnt/$USER + &prompt.user; mount -t msdosfs -m 644 -M 755 /dev/da0s1 /mnt/gebruikersnaam Indien het apparaat losgekoppeld wordt (nadat de schijf gedismount is), dient in de buffer voor systeemmeldingen iets @@ -2016,7 +2018,7 @@ DVD-RAM gebruiken DVD - + DVD-RAM @@ -2042,7 +2044,7 @@ In het voorbeeld wordt alle beschikbare ruimte gebruikt voor een standaard UFS2 bestandssysteem: - &prompt.root; dd if=/dev/zero of=/dev/acd0 count=2 + &prompt.root; dd if=/dev/zero of=/dev/acd0 bs=2k count=1 &prompt.root; bsdlabel -Bw acd0 &prompt.root; newfs /dev/acd0 @@ -2155,7 +2157,7 @@ Nu kan &man.bsdlabel.8; als volgt gedraaid worden: - &prompt.root; /sbin/bsdlabel -B -r -w /dev/fd0 fd1440 + &prompt.root; /sbin/bsdlabel -B -w /dev/fd0 fd1440 @@ -3350,7 +3352,7 @@ 5120+0 records in 5120+0 records out &prompt.root; mdconfig -a -t vnode -f nieuwbeeld -u 0 -&prompt.root; bsdlabel -r -w md0 auto +&prompt.root; bsdlabel -w md0 auto &prompt.root; newfs md0a /dev/md0a: 5.0MB (10240 sectors) block size 16384, fragment size 2048 using 4 cylinder groups of 1.25MB, 80 blks, 192 inodes. @@ -3869,7 +3871,7 @@ Vervolgens dient inetd opnieuw gestart te worden: - &prompt.root; kill -HUP `cat /var/run/inetd.pid` + &prompt.root; /etc/rc.d/inetd restart @@ -4024,7 +4026,7 @@ gebruikt. Deze initialisatie dient slechts eenmalig uitgevoerd te worden: - &prompt.root; gbde init /dev/ad4s1c -i -L /etc/gbde/ad4s1c + &prompt.root; gbde init /dev/ad4s1c -i -L /etc/gbde/ad4s1c.lock &man.gbde.8; opent een tekstverwerker om verschillende instellingen in een sjabloon te kunnen instellen. Stel de @@ -4053,8 +4055,8 @@ Tips met betrekking tot het kiezen van veilige wachtwoordzinnen die gemakkelijk te onthouden zijn staan op de website Diceware - Passphrase. + url="http://world.std.com/~reinhold/diceware.html"> + Diceware Passphrase. @@ -4062,7 +4064,11 @@ lockbestand aan voor de gbde-partitie die in dit voorbeeld is opgeslagen als - /etc/gbde/ad4s1c. + /etc/gbde/ad4s1c.lock. + gdbde slotbestanden moeten + eindigen op .lock om correct door het + opstartscript /etc/rc.d/gbde + gedetecteerd te worden. gbde lockbestanden @@ -4083,7 +4089,7 @@ Koppel de versleutelde partitie aan de kernel - &prompt.root gbde attach /dev/ad4s1c -l /etc/gbde/ad4s1c + &prompt.root gbde attach /dev/ad4s1c -l /etc/gbde/ad4s1c.lock Er wordt om de wachtwoordzin gevraagd die gekozen is tijdens de initialisatie van de versleutelde partitie. Het @@ -4091,7 +4097,7 @@ /dev als /dev/apparaatnaam.bde: - &prompt.root; ls /dev/ad* + &prompt.root; ls /dev/ad* /dev/ad0 /dev/ad0s1b /dev/ad0s1e /dev/ad4s1 /dev/ad0s1 /dev/ad0s1c /dev/ad0s1f /dev/ad4s1c /dev/ad0s1a /dev/ad0s1d /dev/ad4 /dev/ad4s1c.bde @@ -4167,7 +4173,7 @@ Koppel de gbde-partitie aan de kernel - &prompt.root gbde attach /dev/ad4s1c -l /etc/gbde/ad4s1c + &prompt.root gbde attach /dev/ad4s1c -l /etc/gbde/ad4s1c.lock Er wordt om de wachtwoordzin gevraagd die gekozen is tijdens de initialisatie van de versleutelde @@ -4213,7 +4219,8 @@ doorgegeven worden. Bijvoorbeeld: gbde_autoattach_all="YES" -gbde_devices="ad4s1c" +gbde_devices="ad4s1c" +gbde_lockdir="/etc/gbde" Hierdoor is het noodzakelijk dat de wachtwoordzin voor gbde bij het starten wordt @@ -4371,7 +4378,7 @@ sleutelbestand te maken, dat wordt gebruikt als onderdeel van de Master Key voor de versleutelde dienst die wordt gemount onder /private. Het sleutelbestand + class="directory">/private. Het sleutelbestand zorgt voor wat willekeurige gegevens die worden gebruikt om de Master Key te versleutelen. De Master Key wordt ook door een wachtwoordzin beschermd. De sectorgrootte van de @@ -4445,7 +4452,7 @@ Als het werk met de versleutelde partitie is afgehandeld en de /private-partitie is niet + class="directory">/private-partitie is niet langer nodig, dan is het verstandig te overwegen de met geli versleutelde partitie te unmounten en af te koppelen van de kernel. @@ -4604,7 +4611,7 @@ geli_swap_flags="-e blowfish -l 128 -s 4096 -d" - Voor systemen gedateerd van voor &os; 6.0-RELEASE moet + Voor systemen gedateerd van voor &os; 6.2-RELEASE moet de volgende regel gebruikt worden: geli_swap_flags="-a blowfish -l 128 -s 4096 -d" From owner-p4-projects@FreeBSD.ORG Fri Sep 12 21:04:52 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id ED2B6106567B; Fri, 12 Sep 2008 21:04: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 AFF361065670 for ; Fri, 12 Sep 2008 21:04:51 +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 859628FC24 for ; Fri, 12 Sep 2008 21:04:51 +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 m8CL4p4x002051 for ; Fri, 12 Sep 2008 21:04:51 GMT (envelope-from gonzo@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m8CL4pfr002045 for perforce@freebsd.org; Fri, 12 Sep 2008 21:04:51 GMT (envelope-from gonzo@FreeBSD.org) Date: Fri, 12 Sep 2008 21:04:51 GMT Message-Id: <200809122104.m8CL4pfr002045@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 149679 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, 12 Sep 2008 21:04:52 -0000 http://perforce.freebsd.org/chv.cgi?CH=149679 Change 149679 by gonzo@gonzo_jeeves on 2008/09/12 21:04:43 Clean out typo that was brought in by integration from mips2-jnpr Affected files ... .. //depot/projects/mips2/src/lib/msun/src/e_rem_pio2.c#7 edit Differences ... ==== //depot/projects/mips2/src/lib/msun/src/e_rem_pio2.c#7 (text+ko) ==== @@ -126,7 +126,7 @@ } } if(ix<0x413921fb) { /* |x| ~< 2^20*(pi/2), medium size */ -medium:; +medium: /* Use a specialized rint() to get fn. Assume round-to-nearest. */ STRICT_ASSIGN(double,fn,x*invpio2+0x1.8p52); fn = fn-0x1.8p52; From owner-p4-projects@FreeBSD.ORG Fri Sep 12 21:20:07 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id ADEDD1065684; Fri, 12 Sep 2008 21:20:07 +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 6E16C106566C for ; Fri, 12 Sep 2008 21:20:07 +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 43C188FC21 for ; Fri, 12 Sep 2008 21:20:07 +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 m8CLK7tm036133 for ; Fri, 12 Sep 2008 21:20:07 GMT (envelope-from gonzo@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m8CLK7Wg036131 for perforce@freebsd.org; Fri, 12 Sep 2008 21:20:07 GMT (envelope-from gonzo@FreeBSD.org) Date: Fri, 12 Sep 2008 21:20:07 GMT Message-Id: <200809122120.m8CLK7Wg036131@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 149681 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, 12 Sep 2008 21:20:07 -0000 http://perforce.freebsd.org/chv.cgi?CH=149681 Change 149681 by gonzo@gonzo_jeeves on 2008/09/12 21:19:25 I believe this was brought by incorrect merge to mips2-jnpr Affected files ... .. //depot/projects/mips2/src/lib/msun/src/math_private.h#6 edit Differences ... ==== //depot/projects/mips2/src/lib/msun/src/math_private.h#6 (text+ko) ==== @@ -172,8 +172,6 @@ } \ } while (0) #endif -#else -#define STRICT_ASSIGN(type, lval, rval) ((lval) = (rval)) #endif /* From owner-p4-projects@FreeBSD.ORG Fri Sep 12 22:27:17 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D83131065670; Fri, 12 Sep 2008 22: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 69A29106564A for ; Fri, 12 Sep 2008 22:27:16 +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 56B9E8FC14 for ; Fri, 12 Sep 2008 22:27:16 +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 m8CMRGSL096873 for ; Fri, 12 Sep 2008 22:27:16 GMT (envelope-from gonzo@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m8CMRGgO096871 for perforce@freebsd.org; Fri, 12 Sep 2008 22:27:16 GMT (envelope-from gonzo@FreeBSD.org) Date: Fri, 12 Sep 2008 22:27:16 GMT Message-Id: <200809122227.m8CMRGgO096871@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 149688 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, 12 Sep 2008 22:27:17 -0000 http://perforce.freebsd.org/chv.cgi?CH=149688 Change 149688 by gonzo@gonzo_jeeves on 2008/09/12 22:26:58 Catching up with HEAD: Add __FBSDID for MIPS libc files. Affected files ... .. //depot/projects/mips2/src/lib/libc/mips/gen/_setjmp.S#7 edit .. //depot/projects/mips2/src/lib/libc/mips/gen/byte_swap_2.S#2 edit .. //depot/projects/mips2/src/lib/libc/mips/gen/byte_swap_4.S#2 edit .. //depot/projects/mips2/src/lib/libc/mips/gen/fabs.S#4 edit .. //depot/projects/mips2/src/lib/libc/mips/gen/isinf.S#2 edit .. //depot/projects/mips2/src/lib/libc/mips/gen/ldexp.S#4 edit .. //depot/projects/mips2/src/lib/libc/mips/gen/longjmp.c#4 edit .. //depot/projects/mips2/src/lib/libc/mips/gen/modf.S#4 edit .. //depot/projects/mips2/src/lib/libc/mips/gen/setjmp.S#6 edit .. //depot/projects/mips2/src/lib/libc/mips/gen/sigsetjmp.S#5 edit .. //depot/projects/mips2/src/lib/libc/mips/net/ntohs.S#4 edit .. //depot/projects/mips2/src/lib/libc/mips/string/bcopy.S#3 edit .. //depot/projects/mips2/src/lib/libc/mips/string/memcpy.S#3 edit .. //depot/projects/mips2/src/lib/libc/mips/string/memmove.S#3 edit .. //depot/projects/mips2/src/lib/libc/mips/sys/Ovfork.S#3 edit .. //depot/projects/mips2/src/lib/libc/mips/sys/brk.S#4 edit .. //depot/projects/mips2/src/lib/libc/mips/sys/cerror.S#5 edit .. //depot/projects/mips2/src/lib/libc/mips/sys/exect.S#3 edit .. //depot/projects/mips2/src/lib/libc/mips/sys/fork.S#4 edit .. //depot/projects/mips2/src/lib/libc/mips/sys/pipe.S#4 edit .. //depot/projects/mips2/src/lib/libc/mips/sys/ptrace.S#4 edit .. //depot/projects/mips2/src/lib/libc/mips/sys/sbrk.S#9 edit .. //depot/projects/mips2/src/lib/libc/mips/sys/shmat.S#3 edit .. //depot/projects/mips2/src/lib/libc/mips/sys/syscall.S#4 edit Differences ... ==== //depot/projects/mips2/src/lib/libc/mips/gen/_setjmp.S#7 (text+ko) ==== @@ -32,8 +32,9 @@ * SUCH DAMAGE. */ +#include +__FBSDID("$FreeBSD$"); #include -#include #if defined(LIBC_SCCS) && !defined(lint) ASMSTR("from: @(#)_setjmp.s 8.1 (Berkeley) 6/4/93") ==== //depot/projects/mips2/src/lib/libc/mips/gen/byte_swap_2.S#2 (text+ko) ==== ==== //depot/projects/mips2/src/lib/libc/mips/gen/byte_swap_4.S#2 (text+ko) ==== ==== //depot/projects/mips2/src/lib/libc/mips/gen/fabs.S#4 (text+ko) ==== @@ -33,6 +33,7 @@ */ #include +__FBSDID("$FreeBSD$"); #if defined(LIBC_SCCS) && !defined(lint) ASMSTR("from: @(#)fabs.s 8.1 (Berkeley) 2/16/94") ==== //depot/projects/mips2/src/lib/libc/mips/gen/isinf.S#2 (text+ko) ==== ==== //depot/projects/mips2/src/lib/libc/mips/gen/ldexp.S#4 (text+ko) ==== @@ -33,6 +33,7 @@ */ #include +__FBSDID("$FreeBSD$"); #if defined(LIBC_SCCS) && !defined(lint) ASMSTR("from: @(#)ldexp.s 8.1 (Berkeley) 6/4/93") ==== //depot/projects/mips2/src/lib/libc/mips/gen/longjmp.c#4 (text+ko) ==== @@ -36,6 +36,8 @@ * POSSIBILITY OF SUCH DAMAGE. */ +#include +__FBSDID("$FreeBSD$"); #include "namespace.h" #include #include ==== //depot/projects/mips2/src/lib/libc/mips/gen/modf.S#4 (text+ko) ==== @@ -33,6 +33,7 @@ */ #include +__FBSDID("$FreeBSD$"); #if defined(LIBC_SCCS) && !defined(lint) ASMSTR("from: @(#)modf.s 8.1 (Berkeley) 6/4/93") ==== //depot/projects/mips2/src/lib/libc/mips/gen/setjmp.S#6 (text+ko) ==== @@ -32,8 +32,9 @@ * SUCH DAMAGE. */ +#include +__FBSDID("$FreeBSD$"); #include -#include #if defined(LIBC_SCCS) && !defined(lint) ASMSTR("from: @(#)setjmp.s 8.1 (Berkeley) 6/4/93") ==== //depot/projects/mips2/src/lib/libc/mips/gen/sigsetjmp.S#5 (text+ko) ==== @@ -32,9 +32,9 @@ * SUCH DAMAGE. */ +#include +__FBSDID("$FreeBSD$"); #include -#include - #if defined(LIBC_SCCS) && !defined(lint) ASMSTR("from: @(#)setjmp.s 8.1 (Berkeley) 6/4/93") ASMSTR("$NetBSD: sigsetjmp.S,v 1.8 2005/09/17 11:49:39 tsutsui Exp $") ==== //depot/projects/mips2/src/lib/libc/mips/net/ntohs.S#4 (text+ko) ==== @@ -37,8 +37,7 @@ */ #include - -__FBSDID("$FreeBSD: src/lib/libc/arm/net/ntohs.S,v 1.1 2004/05/14 12:04:30 cognet Exp $"); +__FBSDID("$FreeBSD$"); LEAF(ntohs) #ifdef __MIPSEB__ ==== //depot/projects/mips2/src/lib/libc/mips/string/bcopy.S#3 (text+ko) ==== @@ -36,7 +36,7 @@ #include - +__FBSDID("$FreeBSD$"); #if defined(LIBC_SCCS) && !defined(lint) ASMSTR("from: @(#)mips_bcopy.s 2.2 CMU 18/06/93") ==== //depot/projects/mips2/src/lib/libc/mips/string/memcpy.S#3 (text+ko) ==== @@ -1,5 +1,7 @@ /* $NetBSD: memcpy.S,v 1.1 2005/12/20 19:28:50 christos Exp $ */ +#include +__FBSDID("$FreeBSD$"); #define MEMCOPY #include "bcopy.S" ==== //depot/projects/mips2/src/lib/libc/mips/string/memmove.S#3 (text+ko) ==== @@ -1,5 +1,7 @@ /* $NetBSD: memmove.S,v 1.1 2005/12/20 19:28:50 christos Exp $ */ +#include +__FBSDID("$FreeBSD$"); #define MEMMOVE #include "bcopy.S" ==== //depot/projects/mips2/src/lib/libc/mips/sys/Ovfork.S#3 (text+ko) ==== @@ -31,8 +31,9 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. */ + #include - +__FBSDID("$FreeBSD$"); #include "SYS.h" #if defined(LIBC_SCCS) && !defined(lint) ==== //depot/projects/mips2/src/lib/libc/mips/sys/brk.S#4 (text+ko) ==== @@ -32,6 +32,8 @@ * SUCH DAMAGE. */ +#include +__FBSDID("$FreeBSD$"); #include "SYS.h" #if defined(LIBC_SCCS) && !defined(lint) ==== //depot/projects/mips2/src/lib/libc/mips/sys/cerror.S#5 (text+ko) ==== @@ -32,6 +32,8 @@ * SUCH DAMAGE. */ +#include +__FBSDID("$FreeBSD$"); #include "SYS.h" #if defined(LIBC_SCCS) && !defined(lint) ==== //depot/projects/mips2/src/lib/libc/mips/sys/exect.S#3 (text+ko) ==== @@ -31,6 +31,8 @@ * SUCH DAMAGE. */ +#include +__FBSDID("$FreeBSD$"); #include "SYS.h" #if defined(LIBC_SCCS) && !defined(lint) ==== //depot/projects/mips2/src/lib/libc/mips/sys/fork.S#4 (text+ko) ==== @@ -32,6 +32,8 @@ * SUCH DAMAGE. */ +#include +__FBSDID("$FreeBSD$"); #include "SYS.h" #if defined(LIBC_SCCS) && !defined(lint) ==== //depot/projects/mips2/src/lib/libc/mips/sys/pipe.S#4 (text+ko) ==== @@ -32,6 +32,8 @@ * SUCH DAMAGE. */ +#include +__FBSDID("$FreeBSD$"); #include "SYS.h" #if defined(LIBC_SCCS) && !defined(lint) ==== //depot/projects/mips2/src/lib/libc/mips/sys/ptrace.S#4 (text+ko) ==== @@ -32,6 +32,8 @@ * SUCH DAMAGE. */ +#include +__FBSDID("$FreeBSD$"); #include "SYS.h" #if defined(LIBC_SCCS) && !defined(lint) ==== //depot/projects/mips2/src/lib/libc/mips/sys/sbrk.S#9 (text+ko) ==== @@ -32,6 +32,8 @@ * SUCH DAMAGE. */ +#include +__FBSDID("$FreeBSD$"); #include "SYS.h" #if defined(LIBC_SCCS) && !defined(lint) ==== //depot/projects/mips2/src/lib/libc/mips/sys/shmat.S#3 (text+ko) ==== @@ -1,5 +1,7 @@ /* $NetBSD: shmat.S,v 1.1 2000/07/07 08:20:52 itohy Exp $ */ +#include +__FBSDID("$FreeBSD$"); #include "SYS.h" RSYSCALL(shmat) ==== //depot/projects/mips2/src/lib/libc/mips/sys/syscall.S#4 (text+ko) ==== @@ -32,6 +32,8 @@ * SUCH DAMAGE. */ +#include +__FBSDID("$FreeBSD$"); #include "SYS.h" #if defined(LIBC_SCCS) && !defined(lint) From owner-p4-projects@FreeBSD.ORG Fri Sep 12 22:31:21 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E674D1065674; Fri, 12 Sep 2008 22:31:20 +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 AA2BF106566C for ; Fri, 12 Sep 2008 22:31:20 +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 976C28FC16 for ; Fri, 12 Sep 2008 22:31:20 +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 m8CMVK9e014823 for ; Fri, 12 Sep 2008 22:31:20 GMT (envelope-from rene@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m8CMVKFa014817 for perforce@freebsd.org; Fri, 12 Sep 2008 22:31:20 GMT (envelope-from rene@FreeBSD.org) Date: Fri, 12 Sep 2008 22:31:20 GMT Message-Id: <200809122231.m8CMVKFa014817@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 149689 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, 12 Sep 2008 22:31:21 -0000 http://perforce.freebsd.org/chv.cgi?CH=149689 Change 149689 by rene@rene_self on 2008/09/12 22:31:13 MFen eresources/chapter.sgml 1.183 -> 1.186 Also fix a few typos in mailing-lists.ent Checked build, spelling, whitespace Affected files ... .. //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/eresources/chapter.sgml#3 edit .. //depot/projects/docproj_nl/nl_NL.ISO8859-1/share/sgml/mailing-lists.ent#3 edit Differences ... ==== //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/eresources/chapter.sgml#3 (text+ko) ==== @@ -3,8 +3,10 @@ $FreeBSD: doc/nl_NL.ISO8859-1/books/handbook/eresources/chapter.sgml,v 1.12 2007/12/23 16:01:02 remko Exp $ $FreeBSDnl: doc/nl_NL.ISO8859-1/books/handbook/eresources/chapter.sgml,v 1.35 2006/08/25 10:44:57 remko Exp $ - Gebaseerd op: 1.183 Vertaald door: Siebrand Mazeland + + %SOURCE% en_US.ISO8859-1/books/handbook/eresources/chapter.sgml + %SRCID% 1.186 --> @@ -36,9 +38,9 @@ in ieder geval tijdiger, antwoord is gegarandaard. De doelstellingen van de verschillende lijsten staan - onderaan dit document. Lees alsjeblieft de - doelstellingen alvorens lid te worden of mail te - sturen. De meeste leden ontvangen tegenwoordig vaak + onderaan dit document. Lees alstublieft de + doelstellingen alvorens lid te worden of mail te + sturen. De meeste leden ontvangen tegenwoordig vaak honderden &os; gerelateerde berichten per dag, en door de doelstellingen en gebruiksregels op te stellen wordt gestreefd om zo min mogelijk ruis op de lijn te krijgen. Door de voorgaande @@ -46,7 +48,7 @@ een effectief communicatiemedium over het project. - Als je wilt testen of je naar de &os; lijsten + Als u wilt testen of u naar de &os; lijsten email kunt versturen, stuur dan een bericht naar &a.test.name;. Stuur alstublieft geen test berichten naar andere lijsten. @@ -574,6 +576,12 @@ + &a.ruby.name; + + &os;-specifieke discussies over Ruby + + + &a.scsi.name; Het SCSI subsysteem @@ -646,6 +654,13 @@ + &a.virtualization.name; + + Discussies over verscheidene + virtualisatietechnieken ondersteund door &os; + + + &a.vuxml.name; Discussie over VuXML infrastructuur @@ -700,6 +715,12 @@ + &a.wip-status.name; + + &os; Werk-In-Uitvoering status + + + &a.www.name; Beheerders van - &a.acpi.name; @@ -1583,6 +1603,24 @@ + &a.ruby.name; + + + &os;-specifieke discussies over + Ruby + + Dit is een lijst voor discussies gerelateerd aan de + Ruby-ondersteuning op &os;. Dit is een technische + mailinglijst. Het is bedoeld voor individuen die aan + Ruby-ports, bibliotheken van derde partijen, en raamwerken + werken. + + Individuen die geïnteresseerd zijn in de + technische discussie zijn ook welkom. + + + + &a.scsi.name; @@ -1712,6 +1750,52 @@ + + &a.virtualization.name; + + + Discussies over verscheidene + virtualisatietechnieken ondersteund door &os; + + + Een lijst om de verscheidene virtualisatietechnieken + die door &os; worden ondersteund te bespreken. Aan de ene + kant zal de nadruk liggen op de implementatie van de + basale functionaliteit alsook op het toevoegen van nieuwe + mogelijkheden. Aan de andere kant zullen gebruikers een + forum hebben om om hulp te vragen bij problemen of om hun + usecases te bespreken. + + + + + &a.wip-status.name; + + + &os; Werk-In-Uitvoering status + + + Deze mailinglijst kan gebruikt worden om de schepping + en voortgang van uw &os;-gerelateerd werk aan te kondigen. + Berichten zullen gemodereerd worden. Het wordt + gesuggereerd om het bericht "Aan:" een &os;-mailinglijst + dat het onderwerp beter dekt te sturen en deze lijst + alleen te "BCC:"-en. Op deze manier kan uw + werk-in-uitvoering ook op de onderwerpslijst worden + bediscussieerd, aangezien discussies op deze lijst niet + zijn toegestaan. + + Kijk in de archieven voor voorbeelden van geschikte + berichten. + + Een redactioneel overzicht van de berichten aan deze + lijst kan om de paar maanden naar de &os;-website gezonden + worden als deel van de Status Reports + . + Meer voorbeelden en oude rapportages zijn daar ook te + vinden. + + ==== //depot/projects/docproj_nl/nl_NL.ISO8859-1/share/sgml/mailing-lists.ent#3 (text+ko) ==== @@ -170,7 +170,7 @@ FreeBSD-emulatie mailinglijst"> -freebsd-emulatie"> +freebsd-emulation"> FreeBSD-eol mailinglijst"> @@ -354,7 +354,7 @@ FreeBSD realtime extensions mailinglijst"> freebsd-realtime"> - + FreeBSD Ruby mailinglijst"> freebsd-ruby"> @@ -436,7 +436,7 @@ Discussies over de VuXML infrastructuur"> freebsd-vuxml"> - + FreeBSD Werk-In-Uitvoering Status"> freebsd-wip-status"> From owner-p4-projects@FreeBSD.ORG Sat Sep 13 03:58:54 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 62B4D106567B; Sat, 13 Sep 2008 03:58: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 1C57E106566B for ; Sat, 13 Sep 2008 03:58:54 +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 E74BD8FC0A for ; Sat, 13 Sep 2008 03:58:53 +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 m8D3wr8x047701 for ; Sat, 13 Sep 2008 03:58:53 GMT (envelope-from gonzo@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m8D3wra5047699 for perforce@freebsd.org; Sat, 13 Sep 2008 03:58:53 GMT (envelope-from gonzo@FreeBSD.org) Date: Sat, 13 Sep 2008 03:58:53 GMT Message-Id: <200809130358.m8D3wra5047699@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 149693 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, 13 Sep 2008 03:58:54 -0000 http://perforce.freebsd.org/chv.cgi?CH=149693 Change 149693 by gonzo@gonzo_jeeves on 2008/09/13 03:58:25 Remove duplicate for "mips" platform Affected files ... .. //depot/projects/mips2/src/gnu/usr.bin/cc/Makefile.tgt#7 edit Differences ... ==== //depot/projects/mips2/src/gnu/usr.bin/cc/Makefile.tgt#7 (text+ko) ==== @@ -4,9 +4,6 @@ .if ${TARGET_ARCH} == "amd64" GCC_CPU= i386 -.elif ${TARGET_ARCH} == "mips" -GCC_CPU= mips -TARGET_CPU_DEFAULT= 16 .elif ${TARGET_ARCH} == "powerpc" GCC_CPU= rs6000 .elif ${TARGET_ARCH} == "sparc64" From owner-p4-projects@FreeBSD.ORG Sat Sep 13 04:05:00 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A1523106567C; Sat, 13 Sep 2008 04:05: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 65D461065677 for ; Sat, 13 Sep 2008 04:05:00 +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 55F1A8FC13 for ; Sat, 13 Sep 2008 04:05:00 +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 m8D450uK059490 for ; Sat, 13 Sep 2008 04:05:00 GMT (envelope-from gonzo@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m8D450sj059488 for perforce@freebsd.org; Sat, 13 Sep 2008 04:05:00 GMT (envelope-from gonzo@FreeBSD.org) Date: Sat, 13 Sep 2008 04:05:00 GMT Message-Id: <200809130405.m8D450sj059488@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 149694 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, 13 Sep 2008 04:05:00 -0000 http://perforce.freebsd.org/chv.cgi?CH=149694 Change 149694 by gonzo@gonzo_jeeves on 2008/09/13 04:04:39 Fix typo Affected files ... .. //depot/projects/mips2/src/sys/mips/mips/trap.c#27 edit Differences ... ==== //depot/projects/mips2/src/sys/mips/mips/trap.c#27 (text+ko) ==== @@ -140,7 +140,7 @@ MipsKernGenException, /* coprocessor unusable */ MipsKernGenException, /* arithmetic overflow */ MipsKernGenException, /* trap exception */ - MipsKernGenException, /* viritual coherence exception inst */ + MipsKernGenException, /* virtual coherence exception inst */ MipsKernGenException, /* floating point exception */ MipsKernGenException, /* reserved */ MipsKernGenException, /* reserved */ @@ -157,7 +157,7 @@ MipsKernGenException, /* reserved */ MipsKernGenException, /* reserved */ MipsKernGenException, /* reserved */ - MipsKernGenException, /* viritual coherence exception data */ + MipsKernGenException, /* virtual coherence exception data */ /* * The user exception handlers. */ @@ -210,7 +210,7 @@ "coprocessor unusable", "arithmetic overflow", "trap", - "viritual coherency instruction", + "virtual coherency instruction", "floating point", "reserved 16", "reserved 17", @@ -227,7 +227,7 @@ "reserved 28", "reserved 29", "reserved 30", - "viritual coherency data", + "virtual coherency data", }; #if !defined(SMP) && (defined(DDB) || defined(DEBUG)) From owner-p4-projects@FreeBSD.ORG Sat Sep 13 04:12:08 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1A8011065678; Sat, 13 Sep 2008 04:12: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 D14BC1065676 for ; Sat, 13 Sep 2008 04:12:07 +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 A83DC8FC16 for ; Sat, 13 Sep 2008 04:12:07 +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 m8D4C7ds071199 for ; Sat, 13 Sep 2008 04:12:07 GMT (envelope-from gonzo@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m8D4C7hs071193 for perforce@freebsd.org; Sat, 13 Sep 2008 04:12:07 GMT (envelope-from gonzo@FreeBSD.org) Date: Sat, 13 Sep 2008 04:12:07 GMT Message-Id: <200809130412.m8D4C7hs071193@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 149695 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, 13 Sep 2008 04:12:08 -0000 http://perforce.freebsd.org/chv.cgi?CH=149695 Change 149695 by gonzo@gonzo_jeeves on 2008/09/13 04:11:13 segments.h belongs to the world of x86/amd64 Affected files ... .. //depot/projects/mips2/src/sys/mips/include/segments.h#3 delete Differences ... From owner-p4-projects@FreeBSD.ORG Sat Sep 13 04:18:14 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7CA2E1065675; Sat, 13 Sep 2008 04:18:14 +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 314CB1065674 for ; Sat, 13 Sep 2008 04:18:14 +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 08A0A8FC0A for ; Sat, 13 Sep 2008 04:18:14 +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 m8D4IDHl011597 for ; Sat, 13 Sep 2008 04:18:13 GMT (envelope-from gonzo@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m8D4IDWx011595 for perforce@freebsd.org; Sat, 13 Sep 2008 04:18:13 GMT (envelope-from gonzo@FreeBSD.org) Date: Sat, 13 Sep 2008 04:18:13 GMT Message-Id: <200809130418.m8D4IDWx011595@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 149696 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, 13 Sep 2008 04:18:14 -0000 http://perforce.freebsd.org/chv.cgi?CH=149696 Change 149696 by gonzo@gonzo_jeeves on 2008/09/13 04:17:55 Remove amd64-ism Affected files ... .. //depot/projects/mips2/src/sys/mips/include/minidump.h#3 edit Differences ... ==== //depot/projects/mips2/src/sys/mips/include/minidump.h#3 (text+ko) ==== @@ -29,7 +29,7 @@ #ifndef _MACHINE_MINIDUMP_H_ #define _MACHINE_MINIDUMP_H_ 1 -#define MINIDUMP_MAGIC "minidump FreeBSD/amd64" +#define MINIDUMP_MAGIC "minidump FreeBSD/mips" #define MINIDUMP_VERSION 1 struct minidumphdr { From owner-p4-projects@FreeBSD.ORG Sat Sep 13 04:22:18 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id AB8BE106566C; Sat, 13 Sep 2008 04:22: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 6FD321065672 for ; Sat, 13 Sep 2008 04:22:18 +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 46E588FC1D for ; Sat, 13 Sep 2008 04:22:18 +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 m8D4MIDA034401 for ; Sat, 13 Sep 2008 04:22:18 GMT (envelope-from gonzo@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m8D4MIXe034399 for perforce@freebsd.org; Sat, 13 Sep 2008 04:22:18 GMT (envelope-from gonzo@FreeBSD.org) Date: Sat, 13 Sep 2008 04:22:18 GMT Message-Id: <200809130422.m8D4MIXe034399@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 149697 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, 13 Sep 2008 04:22:18 -0000 http://perforce.freebsd.org/chv.cgi?CH=149697 Change 149697 by gonzo@gonzo_jeeves on 2008/09/13 04:21:19 Merge r179990 from svn that somehow didn't make it to mips2 tree Affected files ... .. //depot/projects/mips2/src/sys/mips/include/memdev.h#5 edit Differences ... ==== //depot/projects/mips2/src/sys/mips/include/memdev.h#5 (text+ko) ==== @@ -27,7 +27,6 @@ * $FreeBSD: src/sys/mips/include/memdev.h,v 1.2 2008/06/25 07:45:31 ed Exp $ */ -#define CDEV_MAJOR 2 #define CDEV_MINOR_MEM 0 #define CDEV_MINOR_KMEM 1 From owner-p4-projects@FreeBSD.ORG Sat Sep 13 04:23:20 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id F39EB106567A; Sat, 13 Sep 2008 04:23:19 +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 B88A21065671 for ; Sat, 13 Sep 2008 04:23:19 +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 8F66C8FC0C for ; Sat, 13 Sep 2008 04:23:19 +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 m8D4NJ9A039459 for ; Sat, 13 Sep 2008 04:23:19 GMT (envelope-from gonzo@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m8D4NJWG039434 for perforce@freebsd.org; Sat, 13 Sep 2008 04:23:19 GMT (envelope-from gonzo@FreeBSD.org) Date: Sat, 13 Sep 2008 04:23:19 GMT Message-Id: <200809130423.m8D4NJWG039434@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 149698 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, 13 Sep 2008 04:23:20 -0000 http://perforce.freebsd.org/chv.cgi?CH=149698 Change 149698 by gonzo@gonzo_jeeves on 2008/09/13 04:23:14 AFAIR $P4$ in file is a bad sign. So replace it with generic $FreeBSD$ Affected files ... .. //depot/projects/mips2/src/sys/mips/include/intr_machdep.h#6 edit Differences ... ==== //depot/projects/mips2/src/sys/mips/include/intr_machdep.h#6 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/mips2/src/sys/mips/include/intr_machdep.h#5 $ + * $FreeBSD$ */ #ifndef _MACHINE_INTR_MACHDEP_H_ From owner-p4-projects@FreeBSD.ORG Sat Sep 13 04:25:22 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3BCFA106567A; Sat, 13 Sep 2008 04:25:22 +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 005C81065678 for ; Sat, 13 Sep 2008 04:25:21 +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 CBBCB8FC15 for ; Sat, 13 Sep 2008 04:25:21 +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 m8D4PLWi052137 for ; Sat, 13 Sep 2008 04:25:21 GMT (envelope-from gonzo@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m8D4PL3k052131 for perforce@freebsd.org; Sat, 13 Sep 2008 04:25:21 GMT (envelope-from gonzo@FreeBSD.org) Date: Sat, 13 Sep 2008 04:25:21 GMT Message-Id: <200809130425.m8D4PL3k052131@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 149699 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, 13 Sep 2008 04:25:22 -0000 http://perforce.freebsd.org/chv.cgi?CH=149699 Change 149699 by gonzo@gonzo_jeeves on 2008/09/13 04:25:12 cputypes.h is just like segments.h, belongs to the Dark Side Affected files ... .. //depot/projects/mips2/src/sys/mips/include/cputypes.h#3 delete Differences ... From owner-p4-projects@FreeBSD.ORG Sat Sep 13 11:48:52 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 73EB61065673; Sat, 13 Sep 2008 11:48: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 361C11065682 for ; Sat, 13 Sep 2008 11:48:52 +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 2037D8FC0C for ; Sat, 13 Sep 2008 11:48:52 +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 m8DBmp7i006188 for ; Sat, 13 Sep 2008 11:48:51 GMT (envelope-from gabor@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m8DBmpp6006186 for perforce@freebsd.org; Sat, 13 Sep 2008 11:48:51 GMT (envelope-from gabor@freebsd.org) Date: Sat, 13 Sep 2008 11:48:51 GMT Message-Id: <200809131148.m8DBmpp6006186@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 149702 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, 13 Sep 2008 11:48:52 -0000 http://perforce.freebsd.org/chv.cgi?CH=149702 Change 149702 by gabor@gabor_server on 2008/09/13 11:48:42 - Make the -i fixed string search wide char compliant Reported by: ache Affected files ... .. //depot/projects/soc2008/gabor_textproc/grep/fastgrep.c#10 edit Differences ... ==== //depot/projects/soc2008/gabor_textproc/grep/fastgrep.c#10 (text+ko) ==== @@ -40,10 +40,11 @@ __FBSDID("$FreeBSD$"); #endif /* not lint */ -#include #include #include #include +#include +#include #include "grep.h" @@ -281,14 +282,39 @@ grep_cmp(const unsigned char *pattern, const unsigned char *data, size_t len) { int i; + size_t size; + wchar_t *wdata, *wpat; + + if (iflag) { + if ((size = mbstowcs(NULL, data, 0)) == -1) + return (-1); + + wdata = grep_malloc(size * sizeof(wint_t)); + + if (mbstowcs(wdata, data, size) == -1) + return (-1); + + if ((size = mbstowcs(NULL, pattern, 0)) == -1) + return (-1); - for (i = 0; i < len; i++) { - if (((pattern[i] == data[i]) || ((grepbehave != GREP_FIXED) && pattern[i] == '.')) - || (iflag && toupper(pattern[i]) == toupper(data[i]))) - continue; - return (i); + wpat = grep_malloc(size * sizeof(wint_t)); + + if (mbstowcs(wpat, pattern, size) == -1) + return (-1); + for (i = 0; i < len; i++) { + if ((towlower(wpat[i]) == towlower(wdata[i])) || ((grepbehave != GREP_FIXED) && wpat[i] == L'.')) + continue; + free(wpat); + free(wdata); + return (i); + } + } else { + for (i = 0; i < len; i++) { + if ((pattern[i] == data[i]) || ((grepbehave != GREP_FIXED) && pattern[i] == '.')) + continue; + return (i); + } } - return (-1); } From owner-p4-projects@FreeBSD.ORG Sat Sep 13 12:31:36 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id ADDBD1065679; Sat, 13 Sep 2008 12:31:35 +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 6FD751065673 for ; Sat, 13 Sep 2008 12:31:35 +0000 (UTC) (envelope-from mayur@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 56EEC8FC14 for ; Sat, 13 Sep 2008 12:31:35 +0000 (UTC) (envelope-from mayur@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 m8DCVZaq058749 for ; Sat, 13 Sep 2008 12:31:35 GMT (envelope-from mayur@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m8DCVZd9058747 for perforce@freebsd.org; Sat, 13 Sep 2008 12:31:35 GMT (envelope-from mayur@FreeBSD.org) Date: Sat, 13 Sep 2008 12:31:35 GMT Message-Id: <200809131231.m8DCVZd9058747@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to mayur@FreeBSD.org using -f From: Mayur Shardul To: Perforce Change Reviews Cc: Subject: PERFORCE change 149703 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, 13 Sep 2008 12:31:36 -0000 http://perforce.freebsd.org/chv.cgi?CH=149703 Change 149703 by mayur@mayur_freebsd_vm on 2008/09/13 12:31:01 Adding copyrights. Affected files ... .. //depot/projects/soc2008/mayur_vmalgo/README#4 edit .. //depot/projects/soc2008/mayur_vmalgo/uspace/Makefile#3 edit .. //depot/projects/soc2008/mayur_vmalgo/uspace/benchmarking/Makefile#2 edit .. //depot/projects/soc2008/mayur_vmalgo/uspace/benchmarking/rtree_stree.c#3 edit .. //depot/projects/soc2008/mayur_vmalgo/uspace/benchmarking/splay_tree.c#2 edit .. //depot/projects/soc2008/mayur_vmalgo/uspace/benchmarking/splay_tree.h#3 edit .. //depot/projects/soc2008/mayur_vmalgo/uspace/radix_tree.c#7 edit .. //depot/projects/soc2008/mayur_vmalgo/uspace/radix_tree.h#4 edit .. //depot/projects/soc2008/mayur_vmalgo/uspace/rtree_test.c#3 edit Differences ... ==== //depot/projects/soc2008/mayur_vmalgo/README#4 (text+ko) ==== @@ -1,20 +1,35 @@ +Contents: + 1. Introduction + 2. How to use + +THE CODE CONTAINS SOME CLEANUPS AND MINOR FIXES AFTER 18TH AUG. ALL THE TASKS WERE COMPLETED BEFORE 18TH. + +INTRODUCTION: + The objective is to replace splay trees by a suitable data structure for management of resident pages. Initial idea is to implement a radix tree like data structure that will grow or shrink its height according to largest index of the page inserted in to the object. There will be user-space implementation of the tree first, which will be integrated in the kernel later on. -UPDATE: + +HOW TO USE: -User space implementation and test program in uspace/ -kernel source and new code in kern/ +There are three different parts + a. Radix tree implementation in userspace. + b. Splay Vs radix tree benchmarking. + c. Kernel integrated with radix tree. -Memory is preallocated for radix nodes at the boot time. Currently the -both splay and radix trees are used in parallel with asserts on return -values. Once the integration is complete and tested the splay tree will be -removed. +For a. and b. read the READMEs in uspace and uspace/benchmarking directories. -Benchmarking is done, check the wiki page for updates. -http://wiki.freebsd.org/MayurShardul/VM_Algorithm_Improvement +To use the kernel follow instructions below. +[You need FreeBSD 7.0 OS to use the kernel] +1. go to kern/src directory. +2. give following commands + 2a. make buildkernel KERNCONF=GENERIC + 2b. make installkernel +3. Reboot +Upon reboot you will boot modified kernel where radix tree is used for +management of resident pages instead of splay trees. ==== //depot/projects/soc2008/mayur_vmalgo/uspace/Makefile#3 (text+ko) ==== @@ -1,3 +1,29 @@ +# +# Copyright (c) 2008 Mayur Shardul +# All rights reserved. +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions +# are met: +# 1. Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# 2. Redistributions in binary form must reproduce the above copyright +# notice, this list of conditions and the following disclaimer in the +# documentation and/or other materials provided with the distribution. +# +# THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND +# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +# ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE +# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL +# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS +# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) +# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT +# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY +# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF +# SUCH DAMAGE. +# +# C = gcc CFLAGS = -ggdb -Wall TARGET = rtree.out ==== //depot/projects/soc2008/mayur_vmalgo/uspace/benchmarking/Makefile#2 (text+ko) ==== @@ -1,3 +1,29 @@ +# +# Copyright (c) 2008 Mayur Shardul +# All rights reserved. +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions +# are met: +# 1. Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# 2. Redistributions in binary form must reproduce the above copyright +# notice, this list of conditions and the following disclaimer in the +# documentation and/or other materials provided with the distribution. +# +# THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND +# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +# ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE +# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL +# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS +# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) +# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT +# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY +# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF +# SUCH DAMAGE. +# +# C = gcc CFLAGS = -ggdb -Wall TARGET = benchmarking.out ==== //depot/projects/soc2008/mayur_vmalgo/uspace/benchmarking/rtree_stree.c#3 (text+ko) ==== @@ -1,3 +1,29 @@ +/*- + * Copyright (c) 2008 Mayur Shardul + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + * + */ #include #include #include ==== //depot/projects/soc2008/mayur_vmalgo/uspace/benchmarking/splay_tree.c#2 (text+ko) ==== @@ -1,3 +1,29 @@ +/*- + * Copyright (c) 2008 Mayur Shardul + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + * + */ #include #include #include ==== //depot/projects/soc2008/mayur_vmalgo/uspace/benchmarking/splay_tree.h#3 (text+ko) ==== @@ -1,6 +1,30 @@ +/*- + * Copyright (c) 2008 Mayur Shardul + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + * + */ #include - - #ifndef __SPLAY_TREE__ #define __SPLAY_TREE__ ==== //depot/projects/soc2008/mayur_vmalgo/uspace/radix_tree.c#7 (text+ko) ==== @@ -1,3 +1,30 @@ +/*- + * Copyright (c) 2008 Mayur Shardul + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + * + */ + /* * Radix tree implementation. * Number of bits per level are configurable. ==== //depot/projects/soc2008/mayur_vmalgo/uspace/radix_tree.h#4 (text+ko) ==== @@ -1,4 +1,29 @@ - +/*- + * Copyright (c) 2008 Mayur Shardul + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + * + */ /* * radix tree */ ==== //depot/projects/soc2008/mayur_vmalgo/uspace/rtree_test.c#3 (text+ko) ==== @@ -1,3 +1,29 @@ +/*- + * Copyright (c) 2008 Mayur Shardul + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + * + */ #include #include #include From owner-p4-projects@FreeBSD.ORG Sat Sep 13 14:34:40 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B3FEE1065675; Sat, 13 Sep 2008 14:34:40 +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 77FCE106566B for ; Sat, 13 Sep 2008 14:34:40 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 5E8838FC13 for ; Sat, 13 Sep 2008 14:34:40 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id m8DEYeHc068844 for ; Sat, 13 Sep 2008 14:34:40 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m8DEYewx068838 for perforce@freebsd.org; Sat, 13 Sep 2008 14:34:40 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sat, 13 Sep 2008 14:34:40 GMT Message-Id: <200809131434.m8DEYewx068838@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 149705 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, 13 Sep 2008 14:34:41 -0000 http://perforce.freebsd.org/chv.cgi?CH=149705 Change 149705 by rwatson@rwatson_fledge on 2008/09/13 14:34:27 Fix typo. Affected files ... .. //depot/projects/trustedbsd/www/openbsm.page#31 edit Differences ... ==== //depot/projects/trustedbsd/www/openbsm.page#31 (text+ko) ==== @@ -29,7 +29,7 @@ - $P4: //depot/projects/trustedbsd/www/openbsm.page#30 $ + $P4: //depot/projects/trustedbsd/www/openbsm.page#31 $ @@ -225,7 +225,7 @@ 1.0 alpha 14 openbsm-1.0-alpha14.tgz - 480KK + 480K 2007-04-16

                  Support for the zonename token type added, a variety of From owner-p4-projects@FreeBSD.ORG Sat Sep 13 15:59:45 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 91AEE1065671; Sat, 13 Sep 2008 15:59:45 +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 49CA5106567F for ; Sat, 13 Sep 2008 15:59:45 +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 2E9E08FC13 for ; Sat, 13 Sep 2008 15:59:45 +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 m8DFxjsx012524 for ; Sat, 13 Sep 2008 15:59:45 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m8DFx7S7008534 for perforce@freebsd.org; Sat, 13 Sep 2008 15:59:07 GMT (envelope-from hselasky@FreeBSD.org) Date: Sat, 13 Sep 2008 15:59:07 GMT Message-Id: <200809131559.m8DFx7S7008534@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 149713 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, 13 Sep 2008 15:59:45 -0000 http://perforce.freebsd.org/chv.cgi?CH=149713 Change 149713 by hselasky@hselasky_laptop001 on 2008/09/13 15:58:44 IFC @ 149701 Affected files ... .. //depot/projects/usb/src/sys/Makefile#9 integrate .. //depot/projects/usb/src/sys/amd64/amd64/bpf_jit_machdep.c#3 integrate .. //depot/projects/usb/src/sys/amd64/amd64/bpf_jit_machdep.h#3 integrate .. //depot/projects/usb/src/sys/amd64/amd64/cpu_switch.S#8 integrate .. //depot/projects/usb/src/sys/amd64/amd64/db_disasm.c#3 integrate .. //depot/projects/usb/src/sys/amd64/amd64/dump_machdep.c#3 integrate .. //depot/projects/usb/src/sys/amd64/amd64/exception.S#6 integrate .. //depot/projects/usb/src/sys/amd64/amd64/genassym.c#9 integrate .. //depot/projects/usb/src/sys/amd64/amd64/local_apic.c#9 integrate .. //depot/projects/usb/src/sys/amd64/amd64/machdep.c#11 integrate .. //depot/projects/usb/src/sys/amd64/amd64/minidump_machdep.c#6 integrate .. //depot/projects/usb/src/sys/amd64/amd64/mp_machdep.c#12 integrate .. //depot/projects/usb/src/sys/amd64/amd64/trap.c#10 integrate .. //depot/projects/usb/src/sys/amd64/amd64/vm_machdep.c#8 integrate .. //depot/projects/usb/src/sys/amd64/conf/GENERIC#14 integrate .. //depot/projects/usb/src/sys/amd64/ia32/ia32_signal.c#5 integrate .. //depot/projects/usb/src/sys/amd64/include/pcb.h#5 integrate .. //depot/projects/usb/src/sys/amd64/include/pci_cfgreg.h#3 integrate .. //depot/projects/usb/src/sys/amd64/include/pcpu.h#5 integrate .. //depot/projects/usb/src/sys/amd64/include/segments.h#3 integrate .. //depot/projects/usb/src/sys/amd64/linux32/linux32_genassym.c#2 integrate .. //depot/projects/usb/src/sys/amd64/linux32/linux32_locore.s#3 integrate .. //depot/projects/usb/src/sys/amd64/linux32/linux32_machdep.c#9 integrate .. //depot/projects/usb/src/sys/amd64/pci/pci_cfgreg.c#3 integrate .. //depot/projects/usb/src/sys/arm/arm/dump_machdep.c#3 integrate .. //depot/projects/usb/src/sys/arm/arm/intr.c#9 integrate .. //depot/projects/usb/src/sys/arm/arm/nexus.c#5 integrate .. //depot/projects/usb/src/sys/arm/at91/at91.c#10 integrate .. //depot/projects/usb/src/sys/arm/at91/at91_mci.c#5 integrate .. //depot/projects/usb/src/sys/arm/at91/at91_pio.c#9 integrate .. //depot/projects/usb/src/sys/arm/at91/at91_piovar.h#8 integrate .. //depot/projects/usb/src/sys/arm/at91/at91_pmc.c#7 integrate .. //depot/projects/usb/src/sys/arm/at91/at91_ssc.c#5 integrate .. //depot/projects/usb/src/sys/arm/at91/if_ate.c#9 integrate .. //depot/projects/usb/src/sys/arm/at91/kb920x_machdep.c#8 integrate .. //depot/projects/usb/src/sys/arm/conf/KB920X#13 integrate .. //depot/projects/usb/src/sys/arm/conf/NSLU#2 integrate .. //depot/projects/usb/src/sys/arm/include/endian.h#3 integrate .. //depot/projects/usb/src/sys/arm/include/intr.h#6 integrate .. //depot/projects/usb/src/sys/arm/include/pcpu.h#4 integrate .. //depot/projects/usb/src/sys/arm/xscale/ixp425/ixp425.c#5 integrate .. //depot/projects/usb/src/sys/arm/xscale/ixp425/ixp425_qmgr.c#4 integrate .. //depot/projects/usb/src/sys/boot/common/dev_net.c#3 integrate .. //depot/projects/usb/src/sys/boot/common/devopen.c#3 integrate .. //depot/projects/usb/src/sys/boot/forth/loader.conf#11 integrate .. //depot/projects/usb/src/sys/boot/powerpc/uboot/Makefile#2 integrate .. //depot/projects/usb/src/sys/boot/powerpc/uboot/metadata.c#2 delete .. //depot/projects/usb/src/sys/boot/powerpc/uboot/start.S#2 integrate .. //depot/projects/usb/src/sys/boot/sparc64/loader/main.c#5 integrate .. //depot/projects/usb/src/sys/boot/uboot/common/Makefile.inc#2 integrate .. //depot/projects/usb/src/sys/boot/uboot/common/main.c#2 integrate .. //depot/projects/usb/src/sys/boot/uboot/common/metadata.c#1 branch .. //depot/projects/usb/src/sys/boot/uboot/lib/Makefile#2 integrate .. //depot/projects/usb/src/sys/boot/uboot/lib/console.c#2 integrate .. //depot/projects/usb/src/sys/boot/uboot/lib/elf_freebsd.c#2 integrate .. //depot/projects/usb/src/sys/boot/uboot/lib/glue.c#2 integrate .. //depot/projects/usb/src/sys/boot/uboot/lib/glue.h#2 integrate .. //depot/projects/usb/src/sys/boot/uboot/lib/net.c#2 integrate .. //depot/projects/usb/src/sys/boot/uboot/lib/reboot.c#2 integrate .. //depot/projects/usb/src/sys/boot/uboot/lib/time.c#2 integrate .. //depot/projects/usb/src/sys/bsm/audit_kevents.h#7 integrate .. //depot/projects/usb/src/sys/cam/scsi/scsi_all.c#5 integrate .. //depot/projects/usb/src/sys/cam/scsi/scsi_da.c#10 integrate .. //depot/projects/usb/src/sys/cddl/compat/opensolaris/kern/opensolaris_kobj.c#2 integrate .. //depot/projects/usb/src/sys/cddl/compat/opensolaris/kern/opensolaris_vfs.c#3 integrate .. //depot/projects/usb/src/sys/cddl/compat/opensolaris/sys/cpuvar.h#3 integrate .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.c#3 integrate .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/gfs.c#2 integrate .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_file.c#2 integrate .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ctldir.c#2 integrate .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_replay.c#2 integrate .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c#2 integrate .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_znode.c#3 integrate .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/sys/isa_defs.h#3 integrate .. //depot/projects/usb/src/sys/compat/freebsd32/freebsd32_proto.h#8 integrate .. //depot/projects/usb/src/sys/compat/freebsd32/freebsd32_syscall.h#8 integrate .. //depot/projects/usb/src/sys/compat/freebsd32/freebsd32_syscalls.c#8 integrate .. //depot/projects/usb/src/sys/compat/freebsd32/freebsd32_sysent.c#8 integrate .. //depot/projects/usb/src/sys/compat/freebsd32/syscalls.master#8 integrate .. //depot/projects/usb/src/sys/compat/linprocfs/linprocfs.c#9 integrate .. //depot/projects/usb/src/sys/compat/linux/linux_file.c#10 integrate .. //depot/projects/usb/src/sys/compat/linux/linux_getcwd.c#5 integrate .. //depot/projects/usb/src/sys/compat/linux/linux_ioctl.c#6 integrate .. //depot/projects/usb/src/sys/compat/linux/linux_misc.c#12 integrate .. //depot/projects/usb/src/sys/compat/linux/linux_socket.c#6 integrate .. //depot/projects/usb/src/sys/compat/linux/linux_stats.c#8 integrate .. //depot/projects/usb/src/sys/compat/ndis/subr_ndis.c#9 integrate .. //depot/projects/usb/src/sys/compat/svr4/svr4_fcntl.c#6 integrate .. //depot/projects/usb/src/sys/compat/svr4/svr4_sockio.c#3 integrate .. //depot/projects/usb/src/sys/compat/svr4/svr4_stat.c#4 integrate .. //depot/projects/usb/src/sys/conf/NOTES#18 integrate .. //depot/projects/usb/src/sys/conf/files#34 integrate .. //depot/projects/usb/src/sys/conf/files.i386#12 integrate .. //depot/projects/usb/src/sys/conf/files.mips#2 integrate .. //depot/projects/usb/src/sys/conf/files.pc98#11 integrate .. //depot/projects/usb/src/sys/conf/files.powerpc#10 integrate .. //depot/projects/usb/src/sys/conf/files.sparc64#7 integrate .. //depot/projects/usb/src/sys/conf/files.sun4v#6 integrate .. //depot/projects/usb/src/sys/conf/options#11 integrate .. //depot/projects/usb/src/sys/conf/options.i386#8 integrate .. //depot/projects/usb/src/sys/conf/options.sparc64#3 integrate .. //depot/projects/usb/src/sys/contrib/altq/altq/altq_subr.c#4 integrate .. //depot/projects/usb/src/sys/contrib/dev/ath/COPYRIGHT#3 integrate .. //depot/projects/usb/src/sys/contrib/dev/ath/README#3 integrate .. //depot/projects/usb/src/sys/contrib/dev/ath/ah.h#4 integrate .. //depot/projects/usb/src/sys/contrib/dev/ath/ah_desc.h#4 integrate .. //depot/projects/usb/src/sys/contrib/dev/ath/ah_devid.h#4 integrate .. //depot/projects/usb/src/sys/contrib/dev/ath/ah_soc.h#2 integrate .. //depot/projects/usb/src/sys/contrib/dev/ath/public/alpha-elf.hal.o.uu#4 integrate .. //depot/projects/usb/src/sys/contrib/dev/ath/public/alpha-elf.inc#3 integrate .. //depot/projects/usb/src/sys/contrib/dev/ath/public/alpha-elf.opt_ah.h#2 integrate .. //depot/projects/usb/src/sys/contrib/dev/ath/public/ap30.hal.o.uu#3 integrate .. //depot/projects/usb/src/sys/contrib/dev/ath/public/ap30.inc#2 integrate .. //depot/projects/usb/src/sys/contrib/dev/ath/public/ap43.hal.o.uu#3 integrate .. //depot/projects/usb/src/sys/contrib/dev/ath/public/ap43.inc#2 integrate .. //depot/projects/usb/src/sys/contrib/dev/ath/public/ap51.hal.o.uu#3 integrate .. //depot/projects/usb/src/sys/contrib/dev/ath/public/ap51.inc#2 integrate .. //depot/projects/usb/src/sys/contrib/dev/ath/public/ap61.hal.o.uu#3 integrate .. //depot/projects/usb/src/sys/contrib/dev/ath/public/ap61.inc#2 integrate .. //depot/projects/usb/src/sys/contrib/dev/ath/public/arm9-le-thumb-elf.hal.o.uu#4 integrate .. //depot/projects/usb/src/sys/contrib/dev/ath/public/arm9-le-thumb-elf.inc#4 integrate .. //depot/projects/usb/src/sys/contrib/dev/ath/public/arm9-le-thumb-elf.opt_ah.h#2 integrate .. //depot/projects/usb/src/sys/contrib/dev/ath/public/armv4-be-elf.hal.o.uu#4 integrate .. //depot/projects/usb/src/sys/contrib/dev/ath/public/armv4-be-elf.inc#4 integrate .. //depot/projects/usb/src/sys/contrib/dev/ath/public/armv4-be-elf.opt_ah.h#3 integrate .. //depot/projects/usb/src/sys/contrib/dev/ath/public/armv4-le-elf.hal.o.uu#4 integrate .. //depot/projects/usb/src/sys/contrib/dev/ath/public/armv4-le-elf.inc#4 integrate .. //depot/projects/usb/src/sys/contrib/dev/ath/public/armv4-le-elf.opt_ah.h#3 integrate .. //depot/projects/usb/src/sys/contrib/dev/ath/public/i386-elf.hal.o.uu#4 integrate .. //depot/projects/usb/src/sys/contrib/dev/ath/public/i386-elf.inc#3 integrate .. //depot/projects/usb/src/sys/contrib/dev/ath/public/i386-elf.opt_ah.h#2 integrate .. //depot/projects/usb/src/sys/contrib/dev/ath/public/mips-be-elf.hal.o.uu#4 integrate .. //depot/projects/usb/src/sys/contrib/dev/ath/public/mips-be-elf.inc#3 integrate .. //depot/projects/usb/src/sys/contrib/dev/ath/public/mips-be-elf.opt_ah.h#3 integrate .. //depot/projects/usb/src/sys/contrib/dev/ath/public/mips-le-elf.hal.o.uu#4 integrate .. //depot/projects/usb/src/sys/contrib/dev/ath/public/mips-le-elf.inc#3 integrate .. //depot/projects/usb/src/sys/contrib/dev/ath/public/mips-le-elf.opt_ah.h#3 integrate .. //depot/projects/usb/src/sys/contrib/dev/ath/public/mips1-be-elf.hal.o.uu#4 integrate .. //depot/projects/usb/src/sys/contrib/dev/ath/public/mips1-be-elf.inc#3 integrate .. //depot/projects/usb/src/sys/contrib/dev/ath/public/mips1-be-elf.opt_ah.h#3 integrate .. //depot/projects/usb/src/sys/contrib/dev/ath/public/mips1-le-elf.hal.o.uu#4 integrate .. //depot/projects/usb/src/sys/contrib/dev/ath/public/mips1-le-elf.inc#3 integrate .. //depot/projects/usb/src/sys/contrib/dev/ath/public/mips1-le-elf.opt_ah.h#3 integrate .. //depot/projects/usb/src/sys/contrib/dev/ath/public/mipsisa32-be-elf.hal.o.uu#4 integrate .. //depot/projects/usb/src/sys/contrib/dev/ath/public/mipsisa32-be-elf.inc#3 integrate .. //depot/projects/usb/src/sys/contrib/dev/ath/public/mipsisa32-be-elf.opt_ah.h#3 integrate .. //depot/projects/usb/src/sys/contrib/dev/ath/public/mipsisa32-le-elf.hal.o.uu#4 integrate .. //depot/projects/usb/src/sys/contrib/dev/ath/public/mipsisa32-le-elf.inc#3 integrate .. //depot/projects/usb/src/sys/contrib/dev/ath/public/mipsisa32-le-elf.opt_ah.h#3 integrate .. //depot/projects/usb/src/sys/contrib/dev/ath/public/powerpc-be-eabi.hal.o.uu#4 integrate .. //depot/projects/usb/src/sys/contrib/dev/ath/public/powerpc-be-eabi.inc#3 integrate .. //depot/projects/usb/src/sys/contrib/dev/ath/public/powerpc-be-eabi.opt_ah.h#3 integrate .. //depot/projects/usb/src/sys/contrib/dev/ath/public/powerpc-be-elf.hal.o.uu#4 integrate .. //depot/projects/usb/src/sys/contrib/dev/ath/public/powerpc-be-elf.inc#3 integrate .. //depot/projects/usb/src/sys/contrib/dev/ath/public/powerpc-be-elf.opt_ah.h#3 integrate .. //depot/projects/usb/src/sys/contrib/dev/ath/public/powerpc-le-eabi.hal.o.uu#4 integrate .. //depot/projects/usb/src/sys/contrib/dev/ath/public/powerpc-le-eabi.inc#3 integrate .. //depot/projects/usb/src/sys/contrib/dev/ath/public/powerpc-le-eabi.opt_ah.h#3 integrate .. //depot/projects/usb/src/sys/contrib/dev/ath/public/sh4-le-elf.hal.o.uu#4 integrate .. //depot/projects/usb/src/sys/contrib/dev/ath/public/sh4-le-elf.inc#3 integrate .. //depot/projects/usb/src/sys/contrib/dev/ath/public/sh4-le-elf.opt_ah.h#2 integrate .. //depot/projects/usb/src/sys/contrib/dev/ath/public/sparc-be-elf.hal.o.uu#3 integrate .. //depot/projects/usb/src/sys/contrib/dev/ath/public/sparc-be-elf.inc#2 integrate .. //depot/projects/usb/src/sys/contrib/dev/ath/public/sparc-be-elf.opt_ah.h#2 integrate .. //depot/projects/usb/src/sys/contrib/dev/ath/public/sparc64-be-elf.hal.o.uu#4 integrate .. //depot/projects/usb/src/sys/contrib/dev/ath/public/sparc64-be-elf.inc#3 integrate .. //depot/projects/usb/src/sys/contrib/dev/ath/public/sparc64-be-elf.opt_ah.h#2 integrate .. //depot/projects/usb/src/sys/contrib/dev/ath/public/wackelf.c#2 integrate .. //depot/projects/usb/src/sys/contrib/dev/ath/public/wisoc.hal.o.uu#1 branch .. //depot/projects/usb/src/sys/contrib/dev/ath/public/wisoc.inc#1 branch .. //depot/projects/usb/src/sys/contrib/dev/ath/public/wisoc.opt_ah.h#1 branch .. //depot/projects/usb/src/sys/contrib/dev/ath/public/x86_64-elf.hal.o.uu#4 integrate .. //depot/projects/usb/src/sys/contrib/dev/ath/public/x86_64-elf.inc#3 integrate .. //depot/projects/usb/src/sys/contrib/dev/ath/public/x86_64-elf.opt_ah.h#2 integrate .. //depot/projects/usb/src/sys/contrib/dev/ath/public/xscale-be-elf.hal.o.uu#4 integrate .. //depot/projects/usb/src/sys/contrib/dev/ath/public/xscale-be-elf.inc#4 integrate .. //depot/projects/usb/src/sys/contrib/dev/ath/public/xscale-be-elf.opt_ah.h#3 integrate .. //depot/projects/usb/src/sys/contrib/dev/ath/public/xscale-le-elf.hal.o.uu#4 integrate .. //depot/projects/usb/src/sys/contrib/dev/ath/public/xscale-le-elf.inc#4 integrate .. //depot/projects/usb/src/sys/contrib/dev/ath/public/xscale-le-elf.opt_ah.h#3 integrate .. //depot/projects/usb/src/sys/contrib/dev/ath/version.h#4 integrate .. //depot/projects/usb/src/sys/contrib/ipfilter/netinet/fil.c#5 integrate .. //depot/projects/usb/src/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c#7 integrate .. //depot/projects/usb/src/sys/contrib/pf/net/pf.c#8 integrate .. //depot/projects/usb/src/sys/contrib/pf/net/pf_if.c#5 integrate .. //depot/projects/usb/src/sys/contrib/pf/net/pf_ioctl.c#9 integrate .. //depot/projects/usb/src/sys/contrib/pf/net/pf_subr.c#3 integrate .. //depot/projects/usb/src/sys/contrib/rdma/rdma_cma.c#2 integrate .. //depot/projects/usb/src/sys/ddb/db_output.c#5 integrate .. //depot/projects/usb/src/sys/ddb/db_textdump.c#2 integrate .. //depot/projects/usb/src/sys/dev/aac/aac_pci.c#7 integrate .. //depot/projects/usb/src/sys/dev/acpi_support/acpi_asus.c#8 integrate .. //depot/projects/usb/src/sys/dev/acpi_support/acpi_fujitsu.c#3 integrate .. //depot/projects/usb/src/sys/dev/acpica/acpi.c#11 integrate .. //depot/projects/usb/src/sys/dev/age/if_age.c#4 integrate .. //depot/projects/usb/src/sys/dev/agp/agp.c#2 integrate .. //depot/projects/usb/src/sys/dev/asmc/asmc.c#3 integrate .. //depot/projects/usb/src/sys/dev/asmc/asmcvar.h#3 integrate .. //depot/projects/usb/src/sys/dev/ata/ata-all.c#10 integrate .. //depot/projects/usb/src/sys/dev/ata/ata-all.h#7 integrate .. //depot/projects/usb/src/sys/dev/ata/ata-chipset.c#13 integrate .. //depot/projects/usb/src/sys/dev/ata/ata-pci.h#11 integrate .. //depot/projects/usb/src/sys/dev/ath/if_athvar.h#7 integrate .. //depot/projects/usb/src/sys/dev/bce/if_bce.c#11 integrate .. //depot/projects/usb/src/sys/dev/bce/if_bcereg.h#8 integrate .. //depot/projects/usb/src/sys/dev/bfe/if_bfe.c#9 integrate .. //depot/projects/usb/src/sys/dev/bfe/if_bfereg.h#5 integrate .. //depot/projects/usb/src/sys/dev/bge/if_bge.c#10 integrate .. //depot/projects/usb/src/sys/dev/bm/if_bm.c#3 integrate .. //depot/projects/usb/src/sys/dev/ciss/ciss.c#12 integrate .. //depot/projects/usb/src/sys/dev/ciss/cissreg.h#3 integrate .. //depot/projects/usb/src/sys/dev/cpuctl/cpuctl.c#2 integrate .. //depot/projects/usb/src/sys/dev/cpufreq/ichss.c#3 integrate .. //depot/projects/usb/src/sys/dev/cxgb/common/cxgb_ael1002.c#5 integrate .. //depot/projects/usb/src/sys/dev/cxgb/common/cxgb_common.h#6 integrate .. //depot/projects/usb/src/sys/dev/cxgb/common/cxgb_t3_cpl.h#6 integrate .. //depot/projects/usb/src/sys/dev/cxgb/common/cxgb_t3_hw.c#6 integrate .. //depot/projects/usb/src/sys/dev/cxgb/common/cxgb_xgmac.c#6 integrate .. //depot/projects/usb/src/sys/dev/cxgb/cxgb_adapter.h#6 integrate .. //depot/projects/usb/src/sys/dev/cxgb/cxgb_ioctl.h#5 integrate .. //depot/projects/usb/src/sys/dev/cxgb/cxgb_lro.c#4 delete .. //depot/projects/usb/src/sys/dev/cxgb/cxgb_main.c#7 integrate .. //depot/projects/usb/src/sys/dev/cxgb/cxgb_sge.c#6 integrate .. //depot/projects/usb/src/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb.c#2 integrate .. //depot/projects/usb/src/sys/dev/cxgb/ulp/toecore/toedev.c#2 integrate .. //depot/projects/usb/src/sys/dev/cxgb/ulp/tom/cxgb_cpl_io.c#4 integrate .. //depot/projects/usb/src/sys/dev/dc/if_dc.c#8 integrate .. //depot/projects/usb/src/sys/dev/dc/if_dcreg.h#6 integrate .. //depot/projects/usb/src/sys/dev/dcons/dcons.h#3 integrate .. //depot/projects/usb/src/sys/dev/dcons/dcons_os.c#7 integrate .. //depot/projects/usb/src/sys/dev/drm/ati_pcigart.c#2 integrate .. //depot/projects/usb/src/sys/dev/drm/drm-subprocess.pl#2 integrate .. //depot/projects/usb/src/sys/dev/drm/drm.h#2 integrate .. //depot/projects/usb/src/sys/dev/drm/drmP.h#5 integrate .. //depot/projects/usb/src/sys/dev/drm/drm_agpsupport.c#4 integrate .. //depot/projects/usb/src/sys/dev/drm/drm_auth.c#2 integrate .. //depot/projects/usb/src/sys/dev/drm/drm_bufs.c#2 integrate .. //depot/projects/usb/src/sys/dev/drm/drm_context.c#2 integrate .. //depot/projects/usb/src/sys/dev/drm/drm_dma.c#2 integrate .. //depot/projects/usb/src/sys/dev/drm/drm_drawable.c#2 integrate .. //depot/projects/usb/src/sys/dev/drm/drm_drv.c#4 integrate .. //depot/projects/usb/src/sys/dev/drm/drm_fops.c#2 integrate .. //depot/projects/usb/src/sys/dev/drm/drm_internal.h#1 branch .. //depot/projects/usb/src/sys/dev/drm/drm_ioctl.c#2 integrate .. //depot/projects/usb/src/sys/dev/drm/drm_irq.c#3 integrate .. //depot/projects/usb/src/sys/dev/drm/drm_lock.c#2 integrate .. //depot/projects/usb/src/sys/dev/drm/drm_memory.c#2 integrate .. //depot/projects/usb/src/sys/dev/drm/drm_pci.c#2 integrate .. //depot/projects/usb/src/sys/dev/drm/drm_pciids.h#4 integrate .. //depot/projects/usb/src/sys/dev/drm/drm_sarea.h#2 integrate .. //depot/projects/usb/src/sys/dev/drm/drm_scatter.c#2 integrate .. //depot/projects/usb/src/sys/dev/drm/drm_sysctl.c#2 integrate .. //depot/projects/usb/src/sys/dev/drm/drm_vm.c#2 integrate .. //depot/projects/usb/src/sys/dev/drm/i915_dma.c#6 integrate .. //depot/projects/usb/src/sys/dev/drm/i915_drm.h#3 integrate .. //depot/projects/usb/src/sys/dev/drm/i915_drv.c#2 integrate .. //depot/projects/usb/src/sys/dev/drm/i915_drv.h#3 integrate .. //depot/projects/usb/src/sys/dev/drm/i915_irq.c#3 integrate .. //depot/projects/usb/src/sys/dev/drm/i915_mem.c#2 integrate .. //depot/projects/usb/src/sys/dev/drm/i915_suspend.c#1 branch .. //depot/projects/usb/src/sys/dev/drm/mach64_dma.c#2 integrate .. //depot/projects/usb/src/sys/dev/drm/mach64_drm.h#3 integrate .. //depot/projects/usb/src/sys/dev/drm/mach64_drv.c#2 integrate .. //depot/projects/usb/src/sys/dev/drm/mach64_drv.h#2 integrate .. //depot/projects/usb/src/sys/dev/drm/mach64_irq.c#2 integrate .. //depot/projects/usb/src/sys/dev/drm/mach64_state.c#2 integrate .. //depot/projects/usb/src/sys/dev/drm/mga_dma.c#2 integrate .. //depot/projects/usb/src/sys/dev/drm/mga_drm.h#2 integrate .. //depot/projects/usb/src/sys/dev/drm/mga_drv.c#2 integrate .. //depot/projects/usb/src/sys/dev/drm/mga_drv.h#2 integrate .. //depot/projects/usb/src/sys/dev/drm/mga_irq.c#2 integrate .. //depot/projects/usb/src/sys/dev/drm/mga_state.c#2 integrate .. //depot/projects/usb/src/sys/dev/drm/mga_warp.c#2 integrate .. //depot/projects/usb/src/sys/dev/drm/r128_cce.c#2 integrate .. //depot/projects/usb/src/sys/dev/drm/r128_drm.h#2 integrate .. //depot/projects/usb/src/sys/dev/drm/r128_drv.c#2 integrate .. //depot/projects/usb/src/sys/dev/drm/r128_drv.h#2 integrate .. //depot/projects/usb/src/sys/dev/drm/r128_irq.c#2 integrate .. //depot/projects/usb/src/sys/dev/drm/r128_state.c#2 integrate .. //depot/projects/usb/src/sys/dev/drm/r300_cmdbuf.c#2 integrate .. //depot/projects/usb/src/sys/dev/drm/r300_reg.h#2 integrate .. //depot/projects/usb/src/sys/dev/drm/radeon_cp.c#3 integrate .. //depot/projects/usb/src/sys/dev/drm/radeon_drm.h#3 integrate .. //depot/projects/usb/src/sys/dev/drm/radeon_drv.c#2 integrate .. //depot/projects/usb/src/sys/dev/drm/radeon_drv.h#3 integrate .. //depot/projects/usb/src/sys/dev/drm/radeon_irq.c#2 integrate .. //depot/projects/usb/src/sys/dev/drm/radeon_mem.c#2 integrate .. //depot/projects/usb/src/sys/dev/drm/radeon_microcode.h#1 branch .. //depot/projects/usb/src/sys/dev/drm/radeon_state.c#3 integrate .. //depot/projects/usb/src/sys/dev/drm/savage_bci.c#2 integrate .. //depot/projects/usb/src/sys/dev/drm/savage_drm.h#2 integrate .. //depot/projects/usb/src/sys/dev/drm/savage_drv.c#2 integrate .. //depot/projects/usb/src/sys/dev/drm/savage_drv.h#2 integrate .. //depot/projects/usb/src/sys/dev/drm/savage_state.c#2 integrate .. //depot/projects/usb/src/sys/dev/drm/sis_drv.c#2 integrate .. //depot/projects/usb/src/sys/dev/drm/sis_drv.h#2 integrate .. //depot/projects/usb/src/sys/dev/drm/sis_mm.c#2 integrate .. //depot/projects/usb/src/sys/dev/drm/tdfx_drv.c#2 integrate .. //depot/projects/usb/src/sys/dev/e1000/if_igb.c#2 integrate .. //depot/projects/usb/src/sys/dev/e1000/if_igb.h#2 integrate .. //depot/projects/usb/src/sys/dev/esp/esp_sbus.c#7 integrate .. //depot/projects/usb/src/sys/dev/esp/ncr53c9x.c#6 integrate .. //depot/projects/usb/src/sys/dev/esp/ncr53c9xreg.h#2 integrate .. //depot/projects/usb/src/sys/dev/esp/ncr53c9xvar.h#3 integrate .. //depot/projects/usb/src/sys/dev/ex/if_ex.c#3 integrate .. //depot/projects/usb/src/sys/dev/ex/if_ex_isa.c#4 integrate .. //depot/projects/usb/src/sys/dev/ex/if_ex_pccard.c#4 integrate .. //depot/projects/usb/src/sys/dev/ex/if_exvar.h#4 integrate .. //depot/projects/usb/src/sys/dev/firewire/firewire.c#7 integrate .. //depot/projects/usb/src/sys/dev/gem/if_gem.c#9 integrate .. //depot/projects/usb/src/sys/dev/ic/i8251.h#2 integrate .. //depot/projects/usb/src/sys/dev/ic/i8255.h#1 branch .. //depot/projects/usb/src/sys/dev/ic/ns16550.h#2 integrate .. //depot/projects/usb/src/sys/dev/ichwd/ichwd.c#6 integrate .. //depot/projects/usb/src/sys/dev/ichwd/ichwd.h#4 integrate .. //depot/projects/usb/src/sys/dev/iicbus/ad7418.c#3 integrate .. //depot/projects/usb/src/sys/dev/iicbus/ds1339.c#2 delete .. //depot/projects/usb/src/sys/dev/iicbus/ds133x.c#1 branch .. //depot/projects/usb/src/sys/dev/iicbus/ds1672.c#2 integrate .. //depot/projects/usb/src/sys/dev/iicbus/iiconf.c#6 integrate .. //depot/projects/usb/src/sys/dev/ipmi/ipmi.c#4 integrate .. //depot/projects/usb/src/sys/dev/ipmi/ipmi_kcs.c#3 integrate .. //depot/projects/usb/src/sys/dev/ipmi/ipmivars.h#3 integrate .. //depot/projects/usb/src/sys/dev/jme/if_jme.c#3 integrate .. //depot/projects/usb/src/sys/dev/jme/if_jmereg.h#2 integrate .. //depot/projects/usb/src/sys/dev/k8temp/k8temp.c#4 integrate .. //depot/projects/usb/src/sys/dev/le/if_le_ledma.c#4 integrate .. //depot/projects/usb/src/sys/dev/lmc/if_lmc.c#7 integrate .. //depot/projects/usb/src/sys/dev/md/md.c#7 integrate .. //depot/projects/usb/src/sys/dev/mfi/mfi.c#11 integrate .. //depot/projects/usb/src/sys/dev/mii/brgphy.c#10 integrate .. //depot/projects/usb/src/sys/dev/mii/e1000phy.c#5 integrate .. //depot/projects/usb/src/sys/dev/mii/mii.c#4 integrate .. //depot/projects/usb/src/sys/dev/mii/miidevs#10 integrate .. //depot/projects/usb/src/sys/dev/mii/mlphy.c#5 integrate .. //depot/projects/usb/src/sys/dev/mii/tlphy.c#5 integrate .. //depot/projects/usb/src/sys/dev/mlx/mlx.c#3 integrate .. //depot/projects/usb/src/sys/dev/mxge/if_mxge_var.h#7 integrate .. //depot/projects/usb/src/sys/dev/nmdm/nmdm.c#5 integrate .. //depot/projects/usb/src/sys/dev/ofw/ofw_console.c#6 integrate .. //depot/projects/usb/src/sys/dev/pccard/pccard_cis.c#5 integrate .. //depot/projects/usb/src/sys/dev/pccard/pccard_cis_quirks.c#3 integrate .. //depot/projects/usb/src/sys/dev/pccard/pccarddevs#9 integrate .. //depot/projects/usb/src/sys/dev/pci/pci.c#10 integrate .. //depot/projects/usb/src/sys/dev/pci/pci_pci.c#8 integrate .. //depot/projects/usb/src/sys/dev/pci/pcib_private.h#5 integrate .. //depot/projects/usb/src/sys/dev/pci/pcireg.h#7 integrate .. //depot/projects/usb/src/sys/dev/pcn/if_pcn.c#1 branch .. //depot/projects/usb/src/sys/dev/pcn/if_pcnreg.h#1 branch .. //depot/projects/usb/src/sys/dev/ppbus/if_plip.c#4 integrate .. //depot/projects/usb/src/sys/dev/ppbus/ppbconf.c#5 integrate .. //depot/projects/usb/src/sys/dev/ppc/ppc.c#4 integrate .. //depot/projects/usb/src/sys/dev/ppc/ppc_acpi.c#2 integrate .. //depot/projects/usb/src/sys/dev/ppc/ppc_isa.c#2 integrate .. //depot/projects/usb/src/sys/dev/ppc/ppcreg.h#2 integrate .. //depot/projects/usb/src/sys/dev/puc/pucdata.c#6 integrate .. //depot/projects/usb/src/sys/dev/re/if_re.c#11 integrate .. //depot/projects/usb/src/sys/dev/si/si.c#5 integrate .. //depot/projects/usb/src/sys/dev/sis/if_sis.c#2 integrate .. //depot/projects/usb/src/sys/dev/snp/snp.c#6 integrate .. //depot/projects/usb/src/sys/dev/sound/midi/sequencer.c#7 integrate .. //depot/projects/usb/src/sys/dev/sound/pci/csa.c#4 integrate .. //depot/projects/usb/src/sys/dev/sound/pci/hda/hdac.c#9 integrate .. //depot/projects/usb/src/sys/dev/sound/pcm/sound.h#7 integrate .. //depot/projects/usb/src/sys/dev/sound/usb/uaudio.c#35 integrate .. //depot/projects/usb/src/sys/dev/ste/if_ste.c#1 branch .. //depot/projects/usb/src/sys/dev/ste/if_stereg.h#1 branch .. //depot/projects/usb/src/sys/dev/syscons/daemon/daemon_saver.c#4 integrate .. //depot/projects/usb/src/sys/dev/syscons/schistory.c#2 integrate .. //depot/projects/usb/src/sys/dev/syscons/scmouse.c#4 integrate .. //depot/projects/usb/src/sys/dev/syscons/scterm-sc.c#2 integrate .. //depot/projects/usb/src/sys/dev/syscons/scvesactl.c#3 integrate .. //depot/projects/usb/src/sys/dev/syscons/scvidctl.c#4 integrate .. //depot/projects/usb/src/sys/dev/syscons/syscons.c#8 integrate .. //depot/projects/usb/src/sys/dev/syscons/syscons.h#5 integrate .. //depot/projects/usb/src/sys/dev/syscons/sysmouse.c#4 integrate .. //depot/projects/usb/src/sys/dev/tl/if_tl.c#1 branch .. //depot/projects/usb/src/sys/dev/tl/if_tlreg.h#1 branch .. //depot/projects/usb/src/sys/dev/tsec/if_tsec.c#2 integrate .. //depot/projects/usb/src/sys/dev/tsec/if_tsec.h#2 integrate .. //depot/projects/usb/src/sys/dev/tsec/if_tsec_ocp.c#1 branch .. //depot/projects/usb/src/sys/dev/tx/if_tx.c#4 integrate .. //depot/projects/usb/src/sys/dev/uart/uart.h#4 integrate .. //depot/projects/usb/src/sys/dev/uart/uart_bus_isa.c#2 integrate .. //depot/projects/usb/src/sys/dev/uart/uart_core.c#5 integrate .. //depot/projects/usb/src/sys/dev/uart/uart_cpu_pc98.c#3 integrate .. //depot/projects/usb/src/sys/dev/uart/uart_tty.c#3 integrate .. //depot/projects/usb/src/sys/dev/usb/ehci.c#82 integrate .. //depot/projects/usb/src/sys/dev/usb/ehci_pci.c#38 integrate .. //depot/projects/usb/src/sys/dev/usb/ehcireg.h#5 integrate .. //depot/projects/usb/src/sys/dev/usb/ehcivar.h#4 integrate .. //depot/projects/usb/src/sys/dev/usb/hid.c#6 integrate .. //depot/projects/usb/src/sys/dev/usb/if_rum.c#36 integrate .. //depot/projects/usb/src/sys/dev/usb/if_zyd.c#43 integrate .. //depot/projects/usb/src/sys/dev/usb/if_zydreg.h#18 integrate .. //depot/projects/usb/src/sys/dev/usb/ohci_pci.c#32 integrate .. //depot/projects/usb/src/sys/dev/usb/ubsa.c#43 integrate .. //depot/projects/usb/src/sys/dev/usb/ucom.c#32 integrate .. //depot/projects/usb/src/sys/dev/usb/ucomvar.h#17 integrate .. //depot/projects/usb/src/sys/dev/usb/ufoma.c#42 integrate .. //depot/projects/usb/src/sys/dev/usb/uftdi.c#39 integrate .. //depot/projects/usb/src/sys/dev/usb/uhci_pci.c#34 integrate .. //depot/projects/usb/src/sys/dev/usb/uipaq.c#28 integrate .. //depot/projects/usb/src/sys/dev/usb/umass.c#50 integrate .. //depot/projects/usb/src/sys/dev/usb/umodem.c#44 integrate .. //depot/projects/usb/src/sys/dev/usb/ums.c#46 integrate .. //depot/projects/usb/src/sys/dev/usb/uplcom.c#45 integrate .. //depot/projects/usb/src/sys/dev/usb/usb.h#34 integrate .. //depot/projects/usb/src/sys/dev/usb/usb_quirks.c#20 integrate .. //depot/projects/usb/src/sys/dev/usb/usbdevs#22 integrate .. //depot/projects/usb/src/sys/dev/usb/uvisor.c#38 integrate .. //depot/projects/usb/src/sys/dev/usb/uvscom.c#41 integrate .. //depot/projects/usb/src/sys/dev/usb2/core/usb2_hid.c#6 edit .. //depot/projects/usb/src/sys/dev/usb2/core/usbdevs#6 edit .. //depot/projects/usb/src/sys/dev/usb2/include/usb2_devid.h#6 edit .. //depot/projects/usb/src/sys/dev/usb2/include/usb2_devtable.h#6 edit .. //depot/projects/usb/src/sys/dev/usb2/input/ums2.c#7 edit .. //depot/projects/usb/src/sys/dev/usb2/quirk/usb2_quirk.c#6 edit .. //depot/projects/usb/src/sys/dev/usb2/serial/ubsa2.c#6 edit .. //depot/projects/usb/src/sys/dev/usb2/serial/ufoma2.c#7 edit .. //depot/projects/usb/src/sys/dev/usb2/serial/uipaq2.c#7 edit .. //depot/projects/usb/src/sys/dev/usb2/serial/umodem2.c#6 edit .. //depot/projects/usb/src/sys/dev/usb2/serial/usb2_serial.c#9 edit .. //depot/projects/usb/src/sys/dev/usb2/serial/usb2_serial.h#5 edit .. //depot/projects/usb/src/sys/dev/usb2/storage/umass2.c#8 edit .. //depot/projects/usb/src/sys/dev/usb2/wlan/if_rum2.c#10 edit .. //depot/projects/usb/src/sys/dev/usb2/wlan/if_zyd2.c#11 edit .. //depot/projects/usb/src/sys/dev/vx/if_vx_eisa.c#3 integrate .. //depot/projects/usb/src/sys/dev/wb/if_wb.c#1 branch .. //depot/projects/usb/src/sys/dev/wb/if_wbreg.h#1 branch .. //depot/projects/usb/src/sys/dev/wi/if_wi_pccard.c#4 integrate .. //depot/projects/usb/src/sys/dev/wpi/if_wpi.c#6 integrate .. //depot/projects/usb/src/sys/dev/xen/balloon/balloon.c#1 branch .. //depot/projects/usb/src/sys/dev/xen/blkback/blkback.c#1 branch .. //depot/projects/usb/src/sys/dev/xen/blkfront/blkfront.c#1 branch .. //depot/projects/usb/src/sys/dev/xen/blkfront/block.h#1 branch .. //depot/projects/usb/src/sys/dev/xen/console/console.c#1 branch .. //depot/projects/usb/src/sys/dev/xen/console/xencons_ring.c#1 branch .. //depot/projects/usb/src/sys/dev/xen/console/xencons_ring.h#1 branch .. //depot/projects/usb/src/sys/dev/xen/evtchn/evtchn_dev.c#1 branch .. //depot/projects/usb/src/sys/dev/xen/netback/netback.c#1 branch .. //depot/projects/usb/src/sys/dev/xen/netfront/mbufq.h#1 branch .. //depot/projects/usb/src/sys/dev/xen/netfront/netfront.c#1 branch .. //depot/projects/usb/src/sys/dev/xen/pcifront/pcifront.c#1 branch .. //depot/projects/usb/src/sys/fs/cd9660/cd9660_rrip.c#3 integrate .. //depot/projects/usb/src/sys/fs/cd9660/cd9660_vnops.c#3 integrate .. //depot/projects/usb/src/sys/fs/coda/coda_venus.c#3 integrate .. //depot/projects/usb/src/sys/fs/coda/coda_venus.h#3 integrate .. //depot/projects/usb/src/sys/fs/coda/coda_vnops.c#4 integrate .. //depot/projects/usb/src/sys/fs/devfs/devfs_vnops.c#10 integrate .. //depot/projects/usb/src/sys/fs/fdescfs/fdesc_vnops.c#5 integrate .. //depot/projects/usb/src/sys/fs/hpfs/hpfs_vnops.c#5 integrate .. //depot/projects/usb/src/sys/fs/msdosfs/msdosfs_fat.c#5 integrate .. //depot/projects/usb/src/sys/fs/msdosfs/msdosfs_vnops.c#8 integrate .. //depot/projects/usb/src/sys/fs/nullfs/null_vnops.c#8 integrate .. //depot/projects/usb/src/sys/fs/nwfs/nwfs_io.c#4 integrate .. //depot/projects/usb/src/sys/fs/nwfs/nwfs_vnops.c#3 integrate .. //depot/projects/usb/src/sys/fs/portalfs/portal_vnops.c#5 integrate .. //depot/projects/usb/src/sys/fs/pseudofs/pseudofs_vnops.c#7 integrate .. //depot/projects/usb/src/sys/fs/smbfs/smbfs_io.c#6 integrate .. //depot/projects/usb/src/sys/fs/smbfs/smbfs_node.c#7 integrate .. //depot/projects/usb/src/sys/fs/smbfs/smbfs_vnops.c#6 integrate .. //depot/projects/usb/src/sys/fs/tmpfs/tmpfs.h#4 integrate .. //depot/projects/usb/src/sys/fs/tmpfs/tmpfs_fifoops.c#2 integrate .. //depot/projects/usb/src/sys/fs/tmpfs/tmpfs_fifoops.h#2 integrate .. //depot/projects/usb/src/sys/fs/tmpfs/tmpfs_subr.c#5 integrate .. //depot/projects/usb/src/sys/fs/tmpfs/tmpfs_vfsops.c#4 integrate .. //depot/projects/usb/src/sys/fs/tmpfs/tmpfs_vnops.c#4 integrate .. //depot/projects/usb/src/sys/fs/tmpfs/tmpfs_vnops.h#2 integrate .. //depot/projects/usb/src/sys/fs/unionfs/union_subr.c#8 integrate .. //depot/projects/usb/src/sys/fs/unionfs/union_vfsops.c#6 integrate .. //depot/projects/usb/src/sys/fs/unionfs/union_vnops.c#10 integrate .. //depot/projects/usb/src/sys/geom/eli/g_eli.c#8 integrate .. //depot/projects/usb/src/sys/geom/geom_dev.c#7 integrate .. //depot/projects/usb/src/sys/geom/journal/g_journal.c#6 integrate .. //depot/projects/usb/src/sys/geom/part/g_part.c#9 integrate .. //depot/projects/usb/src/sys/geom/part/g_part.h#7 integrate .. //depot/projects/usb/src/sys/geom/part/g_part_gpt.c#8 integrate .. //depot/projects/usb/src/sys/geom/vinum/geom_vinum_drive.c#5 integrate .. //depot/projects/usb/src/sys/gnu/fs/ext2fs/ext2_vfsops.c#7 integrate .. //depot/projects/usb/src/sys/gnu/fs/ext2fs/ext2_vnops.c#6 integrate .. //depot/projects/usb/src/sys/gnu/fs/xfs/FreeBSD/xfs_vnode.h#3 integrate .. //depot/projects/usb/src/sys/gnu/fs/xfs/FreeBSD/xfs_vnops.c#5 integrate .. //depot/projects/usb/src/sys/i386/conf/DEFAULTS#7 integrate .. //depot/projects/usb/src/sys/i386/conf/GENERIC#13 integrate .. //depot/projects/usb/src/sys/i386/conf/NOTES#13 integrate .. //depot/projects/usb/src/sys/i386/conf/XBOX#5 integrate .. //depot/projects/usb/src/sys/i386/conf/XEN#1 branch .. //depot/projects/usb/src/sys/i386/cpufreq/est.c#4 integrate .. //depot/projects/usb/src/sys/i386/cpufreq/p4tcc.c#3 integrate .. //depot/projects/usb/src/sys/i386/cpufreq/powernow.c#3 integrate .. //depot/projects/usb/src/sys/i386/cpufreq/smist.c#3 integrate .. //depot/projects/usb/src/sys/i386/i386/bpf_jit_machdep.c#3 integrate .. //depot/projects/usb/src/sys/i386/i386/bpf_jit_machdep.h#3 integrate .. //depot/projects/usb/src/sys/i386/i386/busdma_machdep.c#9 integrate .. //depot/projects/usb/src/sys/i386/i386/db_disasm.c#2 integrate .. //depot/projects/usb/src/sys/i386/i386/dump_machdep.c#3 integrate .. //depot/projects/usb/src/sys/i386/i386/genassym.c#6 integrate .. //depot/projects/usb/src/sys/i386/i386/local_apic.c#9 integrate .. //depot/projects/usb/src/sys/i386/i386/machdep.c#10 integrate .. //depot/projects/usb/src/sys/i386/i386/minidump_machdep.c#5 integrate .. //depot/projects/usb/src/sys/i386/i386/support.s#8 integrate .. //depot/projects/usb/src/sys/i386/i386/swtch.s#5 integrate .. //depot/projects/usb/src/sys/i386/i386/sys_machdep.c#7 integrate .. //depot/projects/usb/src/sys/i386/i386/trap.c#9 integrate .. //depot/projects/usb/src/sys/i386/i386/vm_machdep.c#8 integrate .. //depot/projects/usb/src/sys/i386/ibcs2/ibcs2_ioctl.c#2 integrate .. //depot/projects/usb/src/sys/i386/ibcs2/ibcs2_socksys.c#4 integrate .. //depot/projects/usb/src/sys/i386/ibcs2/imgact_coff.c#6 integrate .. //depot/projects/usb/src/sys/i386/include/asmacros.h#4 integrate .. //depot/projects/usb/src/sys/i386/include/cpufunc.h#5 integrate .. //depot/projects/usb/src/sys/i386/include/pci_cfgreg.h#2 integrate .. //depot/projects/usb/src/sys/i386/include/pcpu.h#5 integrate .. //depot/projects/usb/src/sys/i386/include/pmap.h#8 integrate .. //depot/projects/usb/src/sys/i386/include/pmc_mdep.h#3 integrate .. //depot/projects/usb/src/sys/i386/include/proc.h#4 integrate .. //depot/projects/usb/src/sys/i386/include/segments.h#2 integrate .. //depot/projects/usb/src/sys/i386/include/trap.h#2 integrate .. //depot/projects/usb/src/sys/i386/include/vmparam.h#7 integrate .. //depot/projects/usb/src/sys/i386/include/xen/evtchn.h#1 branch .. //depot/projects/usb/src/sys/i386/include/xen/features.h#1 branch .. //depot/projects/usb/src/sys/i386/include/xen/hypercall.h#1 branch .. //depot/projects/usb/src/sys/i386/include/xen/hypervisor.h#1 branch .. //depot/projects/usb/src/sys/i386/include/xen/synch_bitops.h#1 branch .. //depot/projects/usb/src/sys/i386/include/xen/xen-os.h#1 branch .. //depot/projects/usb/src/sys/i386/include/xen/xen_intr.h#1 branch .. //depot/projects/usb/src/sys/i386/include/xen/xenbus.h#1 branch .. //depot/projects/usb/src/sys/i386/include/xen/xenfunc.h#1 branch .. //depot/projects/usb/src/sys/i386/include/xen/xenpmap.h#1 branch .. //depot/projects/usb/src/sys/i386/include/xen/xenstored.h#1 branch .. //depot/projects/usb/src/sys/i386/include/xen/xenvar.h#1 branch .. //depot/projects/usb/src/sys/i386/isa/dpms.c#1 branch .. //depot/projects/usb/src/sys/i386/isa/isa.c#4 integrate .. //depot/projects/usb/src/sys/i386/isa/npx.c#5 integrate .. //depot/projects/usb/src/sys/i386/linux/linux_genassym.c#2 integrate .. //depot/projects/usb/src/sys/i386/linux/linux_locore.s#2 integrate .. //depot/projects/usb/src/sys/i386/pci/pci_cfgreg.c#4 integrate .. //depot/projects/usb/src/sys/i386/pci/pci_pir.c#4 integrate .. //depot/projects/usb/src/sys/i386/xen/clock.c#1 branch .. //depot/projects/usb/src/sys/i386/xen/exception.s#1 branch .. //depot/projects/usb/src/sys/i386/xen/locore.s#1 branch .. //depot/projects/usb/src/sys/i386/xen/mp_machdep.c#1 branch .. //depot/projects/usb/src/sys/i386/xen/mptable.c#1 branch .. //depot/projects/usb/src/sys/i386/xen/pmap.c#1 branch .. //depot/projects/usb/src/sys/i386/xen/xen_machdep.c#1 branch .. //depot/projects/usb/src/sys/ia64/conf/GENERIC#9 integrate .. //depot/projects/usb/src/sys/ia64/conf/SKI#4 integrate .. //depot/projects/usb/src/sys/ia64/ia64/dump_machdep.c#3 integrate .. //depot/projects/usb/src/sys/ia64/ia64/ssc.c#4 integrate .. //depot/projects/usb/src/sys/ia64/include/pcpu.h#5 integrate .. //depot/projects/usb/src/sys/isa/isa_common.c#5 integrate .. //depot/projects/usb/src/sys/isa/isavar.h#2 integrate .. //depot/projects/usb/src/sys/kern/imgact_shell.c#2 integrate .. //depot/projects/usb/src/sys/kern/init_main.c#9 integrate .. //depot/projects/usb/src/sys/kern/init_sysent.c#8 integrate .. //depot/projects/usb/src/sys/kern/kern_acct.c#8 integrate .. //depot/projects/usb/src/sys/kern/kern_conf.c#10 integrate .. //depot/projects/usb/src/sys/kern/kern_descrip.c#12 integrate .. //depot/projects/usb/src/sys/kern/kern_exec.c#11 integrate .. //depot/projects/usb/src/sys/kern/kern_exit.c#10 integrate .. //depot/projects/usb/src/sys/kern/kern_intr.c#11 integrate .. //depot/projects/usb/src/sys/kern/kern_jail.c#8 integrate .. //depot/projects/usb/src/sys/kern/kern_linker.c#9 integrate .. //depot/projects/usb/src/sys/kern/kern_lock.c#10 integrate .. //depot/projects/usb/src/sys/kern/kern_mib.c#8 integrate .. //depot/projects/usb/src/sys/kern/kern_mutex.c#11 integrate .. //depot/projects/usb/src/sys/kern/kern_poll.c#7 integrate .. //depot/projects/usb/src/sys/kern/kern_proc.c#9 integrate .. //depot/projects/usb/src/sys/kern/kern_resource.c#9 integrate .. //depot/projects/usb/src/sys/kern/kern_rmlock.c#2 integrate .. //depot/projects/usb/src/sys/kern/kern_rwlock.c#10 integrate .. //depot/projects/usb/src/sys/kern/kern_sig.c#9 integrate .. //depot/projects/usb/src/sys/kern/kern_subr.c#6 integrate .. //depot/projects/usb/src/sys/kern/kern_sx.c#12 integrate .. //depot/projects/usb/src/sys/kern/kern_synch.c#11 integrate .. //depot/projects/usb/src/sys/kern/kern_thread.c#10 integrate .. //depot/projects/usb/src/sys/kern/kern_uuid.c#4 integrate .. //depot/projects/usb/src/sys/kern/kern_xxx.c#6 integrate .. //depot/projects/usb/src/sys/kern/subr_prf.c#5 integrate .. //depot/projects/usb/src/sys/kern/subr_rman.c#6 integrate .. //depot/projects/usb/src/sys/kern/subr_sleepqueue.c#8 integrate .. //depot/projects/usb/src/sys/kern/subr_smp.c#7 integrate .. //depot/projects/usb/src/sys/kern/subr_turnstile.c#8 integrate .. //depot/projects/usb/src/sys/kern/subr_witness.c#10 integrate .. //depot/projects/usb/src/sys/kern/syscalls.c#8 integrate .. //depot/projects/usb/src/sys/kern/syscalls.master#8 integrate .. //depot/projects/usb/src/sys/kern/systrace_args.c#7 integrate .. //depot/projects/usb/src/sys/kern/tty.c#9 integrate .. //depot/projects/usb/src/sys/kern/tty_compat.c#2 integrate .. //depot/projects/usb/src/sys/kern/tty_conf.c#2 delete .. //depot/projects/usb/src/sys/kern/tty_cons.c#6 integrate .. //depot/projects/usb/src/sys/kern/tty_info.c#2 integrate .. //depot/projects/usb/src/sys/kern/tty_inq.c#1 branch .. //depot/projects/usb/src/sys/kern/tty_outq.c#1 branch .. //depot/projects/usb/src/sys/kern/tty_pts.c#6 integrate .. //depot/projects/usb/src/sys/kern/tty_pty.c#7 integrate .. //depot/projects/usb/src/sys/kern/tty_ttydisc.c#1 branch .. //depot/projects/usb/src/sys/kern/uipc_mbuf.c#9 integrate .. //depot/projects/usb/src/sys/kern/uipc_mqueue.c#6 integrate .. //depot/projects/usb/src/sys/kern/uipc_sockbuf.c#8 integrate .. //depot/projects/usb/src/sys/kern/uipc_socket.c#12 integrate .. //depot/projects/usb/src/sys/kern/vfs_bio.c#10 integrate .. //depot/projects/usb/src/sys/kern/vfs_cache.c#8 integrate .. //depot/projects/usb/src/sys/kern/vfs_default.c#6 integrate .. //depot/projects/usb/src/sys/kern/vfs_lookup.c#8 integrate .. //depot/projects/usb/src/sys/kern/vfs_mount.c#13 integrate .. //depot/projects/usb/src/sys/kern/vfs_subr.c#11 integrate .. //depot/projects/usb/src/sys/kern/vfs_syscalls.c#10 integrate .. //depot/projects/usb/src/sys/kern/vfs_vnops.c#10 integrate .. //depot/projects/usb/src/sys/kern/vnode_if.src#8 integrate .. //depot/projects/usb/src/sys/libkern/strcspn.c#1 branch .. //depot/projects/usb/src/sys/mips/adm5120/admpci.c#2 integrate .. //depot/projects/usb/src/sys/mips/adm5120/if_admsw.c#2 integrate .. //depot/projects/usb/src/sys/mips/adm5120/if_admswvar.h#2 integrate .. //depot/projects/usb/src/sys/mips/adm5120/obio.c#2 integrate .. //depot/projects/usb/src/sys/mips/adm5120/std.adm5120#2 integrate .. //depot/projects/usb/src/sys/mips/adm5120/uart_bus_adm5120.c#2 integrate .. //depot/projects/usb/src/sys/mips/adm5120/uart_cpu_adm5120.c#2 integrate .. //depot/projects/usb/src/sys/mips/adm5120/uart_dev_adm5120.c#2 integrate .. //depot/projects/usb/src/sys/mips/conf/ADM5120#3 integrate .. //depot/projects/usb/src/sys/mips/conf/IDT#3 integrate .. //depot/projects/usb/src/sys/mips/conf/MALTA#3 integrate .. //depot/projects/usb/src/sys/mips/conf/SENTRY5#3 integrate .. //depot/projects/usb/src/sys/mips/idt/idtpci.c#2 integrate .. //depot/projects/usb/src/sys/mips/idt/if_kr.c#2 integrate .. //depot/projects/usb/src/sys/mips/idt/obio.c#2 integrate .. //depot/projects/usb/src/sys/mips/idt/std.idt#2 integrate .. //depot/projects/usb/src/sys/mips/idt/uart_bus_rc32434.c#2 integrate .. //depot/projects/usb/src/sys/mips/include/pcpu.h#2 integrate .. //depot/projects/usb/src/sys/mips/malta/files.malta#2 integrate .. //depot/projects/usb/src/sys/mips/malta/gt.c#2 integrate .. //depot/projects/usb/src/sys/mips/malta/gt_pci.c#2 integrate .. //depot/projects/usb/src/sys/mips/malta/malta_machdep.c#2 integrate .. //depot/projects/usb/src/sys/mips/malta/obio.c#2 integrate .. //depot/projects/usb/src/sys/mips/malta/std.malta#2 integrate .. //depot/projects/usb/src/sys/mips/malta/uart_bus_maltausart.c#2 integrate .. //depot/projects/usb/src/sys/mips/malta/uart_cpu_maltausart.c#2 integrate .. //depot/projects/usb/src/sys/mips/malta/yamon.c#2 integrate .. //depot/projects/usb/src/sys/mips/mips/in_cksum.c#2 integrate .. //depot/projects/usb/src/sys/mips/mips/intr_machdep.c#2 integrate .. //depot/projects/usb/src/sys/mips/mips/mp_machdep.c#2 integrate .. //depot/projects/usb/src/sys/mips/sentry5/obio.c#2 integrate .. //depot/projects/usb/src/sys/mips/sentry5/s5_machdep.c#2 integrate .. //depot/projects/usb/src/sys/mips/sentry5/uart_bus_sbusart.c#2 integrate .. //depot/projects/usb/src/sys/mips/sentry5/uart_cpu_sbusart.c#2 integrate .. //depot/projects/usb/src/sys/modules/Makefile#20 integrate .. //depot/projects/usb/src/sys/modules/aha/Makefile#2 integrate .. //depot/projects/usb/src/sys/modules/ahb/Makefile#2 integrate .. //depot/projects/usb/src/sys/modules/an/Makefile#2 integrate .. //depot/projects/usb/src/sys/modules/ar/Makefile#2 integrate .. //depot/projects/usb/src/sys/modules/ath_rate_amrr/Makefile#6 integrate .. //depot/projects/usb/src/sys/modules/ath_rate_onoe/Makefile#5 integrate .. //depot/projects/usb/src/sys/modules/ath_rate_sample/Makefile#4 integrate .. //depot/projects/usb/src/sys/modules/ce/Makefile#2 integrate .. //depot/projects/usb/src/sys/modules/cp/Makefile#2 integrate .. //depot/projects/usb/src/sys/modules/ctau/Makefile#2 integrate .. //depot/projects/usb/src/sys/modules/cx/Makefile#2 integrate .. //depot/projects/usb/src/sys/modules/cxgb/cxgb/Makefile#4 integrate .. //depot/projects/usb/src/sys/modules/digi/digi/Makefile#3 integrate .. //depot/projects/usb/src/sys/modules/dpms/Makefile#1 branch .. //depot/projects/usb/src/sys/modules/drm/i915/Makefile#2 integrate .. //depot/projects/usb/src/sys/modules/fatm/Makefile#2 integrate .. //depot/projects/usb/src/sys/modules/hatm/Makefile#2 integrate .. //depot/projects/usb/src/sys/modules/hifn/Makefile#3 integrate .. //depot/projects/usb/src/sys/modules/if_tap/Makefile#3 integrate .. //depot/projects/usb/src/sys/modules/linux/Makefile#5 integrate .. //depot/projects/usb/src/sys/modules/netgraph/sync_ar/Makefile#2 integrate .. //depot/projects/usb/src/sys/modules/netgraph/sync_sr/Makefile#2 integrate .. //depot/projects/usb/src/sys/modules/nmdm/Makefile#2 integrate .. //depot/projects/usb/src/sys/modules/patm/Makefile#2 integrate .. //depot/projects/usb/src/sys/modules/pcn/Makefile#2 integrate .. //depot/projects/usb/src/sys/modules/pf/Makefile#4 integrate .. //depot/projects/usb/src/sys/modules/pflog/Makefile#2 integrate .. //depot/projects/usb/src/sys/modules/rc/Makefile#2 integrate .. //depot/projects/usb/src/sys/modules/rp/Makefile#2 integrate .. //depot/projects/usb/src/sys/modules/safe/Makefile#3 integrate .. //depot/projects/usb/src/sys/modules/sppp/Makefile#2 integrate .. //depot/projects/usb/src/sys/modules/sr/Makefile#2 integrate .. //depot/projects/usb/src/sys/modules/ste/Makefile#2 integrate .. //depot/projects/usb/src/sys/modules/svr4/Makefile#3 integrate .. //depot/projects/usb/src/sys/modules/tl/Makefile#2 integrate .. //depot/projects/usb/src/sys/modules/trm/Makefile#2 integrate .. //depot/projects/usb/src/sys/modules/ubsec/Makefile#3 integrate .. //depot/projects/usb/src/sys/modules/usb/Makefile#11 integrate .. //depot/projects/usb/src/sys/modules/wb/Makefile#2 integrate .. //depot/projects/usb/src/sys/modules/wi/Makefile#2 integrate .. //depot/projects/usb/src/sys/modules/wlan/Makefile#5 integrate .. //depot/projects/usb/src/sys/modules/wlan_acl/Makefile#3 integrate .. //depot/projects/usb/src/sys/modules/wlan_amrr/Makefile#3 integrate .. //depot/projects/usb/src/sys/modules/wlan_ccmp/Makefile#3 integrate .. //depot/projects/usb/src/sys/modules/wlan_rssadapt/Makefile#2 integrate .. //depot/projects/usb/src/sys/modules/wlan_tkip/Makefile#3 integrate .. //depot/projects/usb/src/sys/modules/wlan_wep/Makefile#3 integrate .. //depot/projects/usb/src/sys/modules/wlan_xauth/Makefile#3 integrate .. //depot/projects/usb/src/sys/net/bpf.c#11 integrate .. //depot/projects/usb/src/sys/net/bpf.h#7 integrate .. //depot/projects/usb/src/sys/net/bpf_filter.c#5 integrate .. //depot/projects/usb/src/sys/net/bpf_jitter.c#2 integrate .. //depot/projects/usb/src/sys/net/bpf_jitter.h#2 integrate .. //depot/projects/usb/src/sys/net/bridgestp.c#8 integrate .. //depot/projects/usb/src/sys/net/ethernet.h#8 integrate .. //depot/projects/usb/src/sys/net/if.c#10 integrate .. //depot/projects/usb/src/sys/net/if.h#7 integrate .. //depot/projects/usb/src/sys/net/if_bridge.c#9 integrate .. //depot/projects/usb/src/sys/net/if_ef.c#3 integrate .. //depot/projects/usb/src/sys/net/if_enc.c#5 integrate .. //depot/projects/usb/src/sys/net/if_enc.h#1 branch .. //depot/projects/usb/src/sys/net/if_ethersubr.c#9 integrate .. //depot/projects/usb/src/sys/net/if_faith.c#3 integrate .. //depot/projects/usb/src/sys/net/if_gif.c#7 integrate .. //depot/projects/usb/src/sys/net/if_loop.c#10 integrate .. //depot/projects/usb/src/sys/net/if_mib.c#2 integrate .. //depot/projects/usb/src/sys/net/if_spppsubr.c#5 integrate .. //depot/projects/usb/src/sys/net/if_stf.c#6 integrate .. //depot/projects/usb/src/sys/net/if_tap.c#7 integrate .. //depot/projects/usb/src/sys/net/if_tap.h#3 integrate .. //depot/projects/usb/src/sys/net/if_var.h#8 integrate .. //depot/projects/usb/src/sys/net/if_vlan.c#7 integrate .. //depot/projects/usb/src/sys/net/raw_cb.c#6 integrate .. //depot/projects/usb/src/sys/net/raw_usrreq.c#6 integrate .. //depot/projects/usb/src/sys/net/route.c#9 integrate .. //depot/projects/usb/src/sys/net/route.h#4 integrate .. //depot/projects/usb/src/sys/net/rtsock.c#10 integrate .. //depot/projects/usb/src/sys/net80211/ieee80211.c#9 integrate .. //depot/projects/usb/src/sys/net80211/ieee80211.h#8 integrate .. //depot/projects/usb/src/sys/net80211/ieee80211_crypto_tkip.c#4 integrate .. //depot/projects/usb/src/sys/net80211/ieee80211_ddb.c#2 integrate .. //depot/projects/usb/src/sys/net80211/ieee80211_freebsd.h#8 integrate .. //depot/projects/usb/src/sys/net80211/ieee80211_ht.c#7 integrate .. //depot/projects/usb/src/sys/net80211/ieee80211_ht.h#5 integrate .. //depot/projects/usb/src/sys/net80211/ieee80211_ioctl.c#9 integrate .. //depot/projects/usb/src/sys/net80211/ieee80211_ioctl.h#6 integrate .. //depot/projects/usb/src/sys/net80211/ieee80211_node.c#9 integrate .. //depot/projects/usb/src/sys/net80211/ieee80211_node.h#6 integrate .. //depot/projects/usb/src/sys/net80211/ieee80211_phy.c#2 integrate .. //depot/projects/usb/src/sys/net80211/ieee80211_sta.c#2 integrate .. //depot/projects/usb/src/sys/netgraph/atm/ng_atm.c#2 integrate .. //depot/projects/usb/src/sys/netgraph/ng_base.c#10 integrate .. //depot/projects/usb/src/sys/netgraph/ng_bpf.c#4 integrate .. //depot/projects/usb/src/sys/netgraph/ng_bridge.c#2 integrate .. //depot/projects/usb/src/sys/netgraph/ng_eiface.c#5 integrate .. //depot/projects/usb/src/sys/netgraph/ng_ether.c#4 integrate .. //depot/projects/usb/src/sys/netgraph/ng_gif.c#2 integrate .. //depot/projects/usb/src/sys/netgraph/ng_iface.c#5 integrate .. //depot/projects/usb/src/sys/netgraph/ng_pipe.c#1 branch .. //depot/projects/usb/src/sys/netgraph/ng_pipe.h#1 branch .. //depot/projects/usb/src/sys/netgraph/ng_source.c#3 integrate .. //depot/projects/usb/src/sys/netinet/if_ether.c#10 integrate .. //depot/projects/usb/src/sys/netinet/igmp.c#4 integrate .. //depot/projects/usb/src/sys/netinet/in.c#9 integrate .. //depot/projects/usb/src/sys/netinet/in_gif.c#6 integrate .. //depot/projects/usb/src/sys/netinet/in_mcast.c#4 integrate .. //depot/projects/usb/src/sys/netinet/in_pcb.c#12 integrate .. //depot/projects/usb/src/sys/netinet/in_rmx.c#7 integrate .. //depot/projects/usb/src/sys/netinet/in_var.h#6 integrate .. //depot/projects/usb/src/sys/netinet/ip6.h#2 integrate .. //depot/projects/usb/src/sys/netinet/ip_carp.c#10 integrate .. //depot/projects/usb/src/sys/netinet/ip_divert.c#8 integrate .. //depot/projects/usb/src/sys/netinet/ip_fastfwd.c#6 integrate .. //depot/projects/usb/src/sys/netinet/ip_fw.h#7 integrate .. //depot/projects/usb/src/sys/netinet/ip_fw2.c#11 integrate .. //depot/projects/usb/src/sys/netinet/ip_fw_nat.c#3 integrate .. //depot/projects/usb/src/sys/netinet/ip_fw_pfil.c#5 integrate .. //depot/projects/usb/src/sys/netinet/ip_icmp.c#8 integrate .. //depot/projects/usb/src/sys/netinet/ip_input.c#12 integrate .. //depot/projects/usb/src/sys/netinet/ip_ipsec.c#7 integrate .. //depot/projects/usb/src/sys/netinet/ip_mroute.c#7 integrate .. //depot/projects/usb/src/sys/netinet/ip_options.c#7 integrate .. //depot/projects/usb/src/sys/netinet/ip_output.c#10 integrate .. //depot/projects/usb/src/sys/netinet/ip_var.h#6 integrate .. //depot/projects/usb/src/sys/netinet/libalias/alias_db.c#7 integrate .. //depot/projects/usb/src/sys/netinet/raw_ip.c#11 integrate .. //depot/projects/usb/src/sys/netinet/sctp_indata.c#10 integrate .. //depot/projects/usb/src/sys/netinet/sctp_lock_bsd.h#8 integrate .. //depot/projects/usb/src/sys/netinet/sctp_os_bsd.h#9 integrate .. //depot/projects/usb/src/sys/netinet/sctp_output.c#11 integrate .. //depot/projects/usb/src/sys/netinet/sctp_pcb.c#11 integrate .. //depot/projects/usb/src/sys/netinet/sctp_sysctl.h#8 integrate .. //depot/projects/usb/src/sys/netinet/sctp_timer.c#10 integrate .. //depot/projects/usb/src/sys/netinet/sctp_timer.h#6 integrate .. //depot/projects/usb/src/sys/netinet/sctp_var.h#11 integrate .. //depot/projects/usb/src/sys/netinet/sctputil.c#11 integrate .. //depot/projects/usb/src/sys/netinet/tcp_debug.c#4 integrate .. //depot/projects/usb/src/sys/netinet/tcp_hostcache.c#6 integrate .. //depot/projects/usb/src/sys/netinet/tcp_input.c#11 integrate .. //depot/projects/usb/src/sys/netinet/tcp_lro.c#2 integrate .. //depot/projects/usb/src/sys/netinet/tcp_offload.c#3 integrate .. //depot/projects/usb/src/sys/netinet/tcp_output.c#11 integrate .. //depot/projects/usb/src/sys/netinet/tcp_reass.c#4 integrate .. //depot/projects/usb/src/sys/netinet/tcp_sack.c#5 integrate .. //depot/projects/usb/src/sys/netinet/tcp_subr.c#10 integrate .. //depot/projects/usb/src/sys/netinet/tcp_syncache.c#13 integrate .. //depot/projects/usb/src/sys/netinet/tcp_syncache.h#4 integrate .. //depot/projects/usb/src/sys/netinet/tcp_timer.c#9 integrate .. //depot/projects/usb/src/sys/netinet/tcp_timewait.c#5 integrate .. //depot/projects/usb/src/sys/netinet/tcp_usrreq.c#11 integrate .. //depot/projects/usb/src/sys/netinet/tcp_var.h#10 integrate .. //depot/projects/usb/src/sys/netinet/toedev.h#3 integrate .. //depot/projects/usb/src/sys/netinet/udp_usrreq.c#12 integrate .. //depot/projects/usb/src/sys/netinet6/dest6.c#4 integrate .. //depot/projects/usb/src/sys/netinet6/frag6.c#7 integrate .. //depot/projects/usb/src/sys/netinet6/icmp6.c#11 integrate .. //depot/projects/usb/src/sys/netinet6/in6.c#9 integrate .. //depot/projects/usb/src/sys/netinet6/in6_gif.c#6 integrate .. //depot/projects/usb/src/sys/netinet6/in6_ifattach.c#8 integrate .. //depot/projects/usb/src/sys/netinet6/in6_pcb.c#11 integrate .. //depot/projects/usb/src/sys/netinet6/in6_proto.c#8 integrate .. //depot/projects/usb/src/sys/netinet6/in6_rmx.c#7 integrate .. //depot/projects/usb/src/sys/netinet6/in6_src.c#11 integrate .. //depot/projects/usb/src/sys/netinet6/ip6_forward.c#7 integrate .. //depot/projects/usb/src/sys/netinet6/ip6_input.c#11 integrate .. //depot/projects/usb/src/sys/netinet6/ip6_ipsec.c#5 integrate .. //depot/projects/usb/src/sys/netinet6/ip6_mroute.c#7 integrate .. //depot/projects/usb/src/sys/netinet6/ip6_output.c#7 integrate .. //depot/projects/usb/src/sys/netinet6/ip6_var.h#7 integrate .. //depot/projects/usb/src/sys/netinet6/mld6.c#7 integrate .. //depot/projects/usb/src/sys/netinet6/nd6.c#9 integrate .. //depot/projects/usb/src/sys/netinet6/nd6.h#3 integrate .. //depot/projects/usb/src/sys/netinet6/nd6_nbr.c#7 integrate .. //depot/projects/usb/src/sys/netinet6/nd6_rtr.c#7 integrate .. //depot/projects/usb/src/sys/netinet6/raw_ip6.c#11 integrate .. //depot/projects/usb/src/sys/netinet6/route6.c#5 integrate .. //depot/projects/usb/src/sys/netinet6/scope6.c#5 integrate .. //depot/projects/usb/src/sys/netinet6/udp6_usrreq.c#11 integrate .. //depot/projects/usb/src/sys/netipsec/ipsec.c#10 integrate .. //depot/projects/usb/src/sys/netipsec/ipsec.h#7 integrate .. //depot/projects/usb/src/sys/netipsec/ipsec_input.c#7 integrate .. //depot/projects/usb/src/sys/netipsec/ipsec_mbuf.c#3 integrate .. //depot/projects/usb/src/sys/netipsec/ipsec_output.c#7 integrate .. //depot/projects/usb/src/sys/netipsec/key.c#6 integrate .. //depot/projects/usb/src/sys/netipsec/key_debug.h#2 integrate .. //depot/projects/usb/src/sys/netipsec/keysock.c#6 integrate .. //depot/projects/usb/src/sys/netipsec/xform_ah.c#5 integrate .. //depot/projects/usb/src/sys/netipsec/xform_esp.c#5 integrate .. //depot/projects/usb/src/sys/netipsec/xform_ipcomp.c#4 integrate .. //depot/projects/usb/src/sys/netipsec/xform_ipip.c#6 integrate .. //depot/projects/usb/src/sys/nfs4client/nfs4_vnops.c#7 integrate .. //depot/projects/usb/src/sys/nfsclient/bootp_subr.c#8 integrate .. //depot/projects/usb/src/sys/nfsclient/nfs_bio.c#8 integrate .. //depot/projects/usb/src/sys/nfsclient/nfs_diskless.c#5 integrate .. //depot/projects/usb/src/sys/nfsclient/nfs_vfsops.c#11 integrate .. //depot/projects/usb/src/sys/nfsclient/nfs_vnops.c#10 integrate .. //depot/projects/usb/src/sys/nfsserver/nfs_serv.c#9 integrate .. //depot/projects/usb/src/sys/nfsserver/nfs_srvsubs.c#7 integrate .. //depot/projects/usb/src/sys/nlm/nlm_prot_impl.c#4 integrate .. //depot/projects/usb/src/sys/nlm/nlm_prot_server.c#3 integrate .. //depot/projects/usb/src/sys/pc98/cbus/scterm-sck.c#2 integrate .. //depot/projects/usb/src/sys/pc98/cbus/sio.c#7 integrate .. //depot/projects/usb/src/sys/pc98/conf/GENERIC#13 integrate .. //depot/projects/usb/src/sys/pc98/conf/GENERIC.hints#3 integrate .. //depot/projects/usb/src/sys/pc98/conf/NOTES#12 integrate .. //depot/projects/usb/src/sys/pc98/include/bus.h#3 integrate .. //depot/projects/usb/src/sys/pc98/pc98/busiosubr.c#3 integrate .. //depot/projects/usb/src/sys/pci/if_pcn.c#4 delete .. //depot/projects/usb/src/sys/pci/if_pcnreg.h#3 delete .. //depot/projects/usb/src/sys/pci/if_ste.c#6 delete .. //depot/projects/usb/src/sys/pci/if_stereg.h#3 delete .. //depot/projects/usb/src/sys/pci/if_tl.c#5 delete .. //depot/projects/usb/src/sys/pci/if_tlreg.h#3 delete .. //depot/projects/usb/src/sys/pci/if_wb.c#6 delete .. //depot/projects/usb/src/sys/pci/if_wbreg.h#3 delete .. //depot/projects/usb/src/sys/powerpc/aim/clock.c#3 integrate .. //depot/projects/usb/src/sys/powerpc/aim/interrupt.c#2 integrate .. //depot/projects/usb/src/sys/powerpc/aim/machdep.c#3 integrate .. //depot/projects/usb/src/sys/powerpc/aim/mmu_oea.c#3 integrate .. //depot/projects/usb/src/sys/powerpc/aim/vm_machdep.c#3 integrate .. //depot/projects/usb/src/sys/powerpc/booke/locore.S#2 integrate .. //depot/projects/usb/src/sys/powerpc/booke/machdep.c#3 integrate .. //depot/projects/usb/src/sys/powerpc/booke/pmap.c#4 integrate .. //depot/projects/usb/src/sys/powerpc/conf/GENERIC#12 integrate .. //depot/projects/usb/src/sys/powerpc/include/cpufunc.h#3 integrate .. //depot/projects/usb/src/sys/powerpc/include/pcpu.h#6 integrate .. //depot/projects/usb/src/sys/powerpc/powerpc/db_interface.c#4 integrate .. //depot/projects/usb/src/sys/powerpc/powerpc/pmap_dispatch.c#7 integrate .. //depot/projects/usb/src/sys/rpc/authunix_prot.c#4 integrate .. //depot/projects/usb/src/sys/rpc/clnt_rc.c#3 integrate .. //depot/projects/usb/src/sys/rpc/pmap_prot.h#2 integrate .. //depot/projects/usb/src/sys/rpc/rpcb_prot.c#2 integrate .. //depot/projects/usb/src/sys/rpc/rpcclnt.c#7 integrate .. //depot/projects/usb/src/sys/security/audit/audit.c#10 integrate .. //depot/projects/usb/src/sys/security/audit/audit_arg.c#9 integrate .. //depot/projects/usb/src/sys/security/audit/audit_bsm.c#9 integrate .. //depot/projects/usb/src/sys/security/audit/audit_bsm_klib.c#9 integrate .. //depot/projects/usb/src/sys/security/audit/audit_syscalls.c#9 integrate .. //depot/projects/usb/src/sys/security/audit/audit_worker.c#10 integrate .. //depot/projects/usb/src/sys/security/mac/mac_framework.c#2 integrate .. //depot/projects/usb/src/sys/security/mac/mac_framework.h#7 integrate .. //depot/projects/usb/src/sys/security/mac/mac_inet.c#8 integrate .. //depot/projects/usb/src/sys/security/mac/mac_internal.h#6 integrate .. //depot/projects/usb/src/sys/security/mac/mac_net.c#5 integrate .. //depot/projects/usb/src/sys/security/mac/mac_pipe.c#5 integrate .. //depot/projects/usb/src/sys/security/mac/mac_policy.h#7 integrate .. //depot/projects/usb/src/sys/security/mac/mac_posix_sem.c#7 integrate .. //depot/projects/usb/src/sys/security/mac/mac_posix_shm.c#2 integrate .. //depot/projects/usb/src/sys/security/mac/mac_process.c#6 integrate .. //depot/projects/usb/src/sys/security/mac/mac_socket.c#5 integrate .. //depot/projects/usb/src/sys/security/mac/mac_syscalls.c#5 integrate .. //depot/projects/usb/src/sys/security/mac/mac_sysv_msg.c#5 integrate .. //depot/projects/usb/src/sys/security/mac/mac_sysv_sem.c#5 integrate .. //depot/projects/usb/src/sys/security/mac/mac_sysv_shm.c#5 integrate .. //depot/projects/usb/src/sys/security/mac/mac_vfs.c#6 integrate .. //depot/projects/usb/src/sys/security/mac_biba/mac_biba.c#8 integrate .. //depot/projects/usb/src/sys/security/mac_bsdextended/mac_bsdextended.c#7 integrate .. //depot/projects/usb/src/sys/security/mac_ifoff/mac_ifoff.c#5 integrate .. //depot/projects/usb/src/sys/security/mac_lomac/mac_lomac.c#9 integrate .. //depot/projects/usb/src/sys/security/mac_mls/mac_mls.c#9 integrate .. //depot/projects/usb/src/sys/security/mac_none/mac_none.c#5 integrate .. //depot/projects/usb/src/sys/security/mac_partition/mac_partition.c#6 integrate .. //depot/projects/usb/src/sys/security/mac_portacl/mac_portacl.c#7 integrate .. //depot/projects/usb/src/sys/security/mac_seeotheruids/mac_seeotheruids.c#6 integrate .. //depot/projects/usb/src/sys/security/mac_stub/mac_stub.c#8 integrate .. //depot/projects/usb/src/sys/security/mac_test/mac_test.c#8 integrate .. //depot/projects/usb/src/sys/sparc64/central/central.c#3 integrate .. //depot/projects/usb/src/sys/sparc64/conf/GENERIC#11 integrate .. //depot/projects/usb/src/sys/sparc64/conf/NOTES#5 integrate .. //depot/projects/usb/src/sys/sparc64/ebus/ebus.c#2 integrate .. //depot/projects/usb/src/sys/sparc64/fhc/fhc.c#6 integrate .. //depot/projects/usb/src/sys/sparc64/include/asi.h#3 integrate .. //depot/projects/usb/src/sys/sparc64/include/cache.h#3 integrate .. //depot/projects/usb/src/sys/sparc64/include/clock.h#4 integrate .. //depot/projects/usb/src/sys/sparc64/include/cpu.h#2 integrate .. //depot/projects/usb/src/sys/sparc64/include/cpufunc.h#2 integrate .. //depot/projects/usb/src/sys/sparc64/include/dcr.h#1 branch .. //depot/projects/usb/src/sys/sparc64/include/pcpu.h#4 integrate .. //depot/projects/usb/src/sys/sparc64/include/smp.h#5 integrate .. //depot/projects/usb/src/sys/sparc64/include/tick.h#2 integrate .. //depot/projects/usb/src/sys/sparc64/include/tlb.h#3 integrate .. //depot/projects/usb/src/sys/sparc64/include/trap.h#2 integrate .. //depot/projects/usb/src/sys/sparc64/include/tte.h#3 integrate .. //depot/projects/usb/src/sys/sparc64/include/ver.h#3 integrate .. //depot/projects/usb/src/sys/sparc64/include/vmparam.h#7 integrate .. //depot/projects/usb/src/sys/sparc64/pci/ofw_pci.h#4 integrate .. //depot/projects/usb/src/sys/sparc64/pci/ofw_pcibus.c#7 integrate .. //depot/projects/usb/src/sys/sparc64/pci/psycho.c#8 integrate .. //depot/projects/usb/src/sys/sparc64/sbus/dma_sbus.c#3 integrate .. //depot/projects/usb/src/sys/sparc64/sbus/lsi64854.c#2 integrate .. //depot/projects/usb/src/sys/sparc64/sbus/lsi64854var.h#2 integrate .. //depot/projects/usb/src/sys/sparc64/sbus/sbus.c#8 integrate .. //depot/projects/usb/src/sys/sparc64/sparc64/autoconf.c#4 integrate .. //depot/projects/usb/src/sys/sparc64/sparc64/cache.c#3 integrate .. //depot/projects/usb/src/sys/sparc64/sparc64/cheetah.c#3 integrate .. //depot/projects/usb/src/sys/sparc64/sparc64/clock.c#3 integrate .. //depot/projects/usb/src/sys/sparc64/sparc64/db_disasm.c#2 integrate .. //depot/projects/usb/src/sys/sparc64/sparc64/dump_machdep.c#3 integrate .. //depot/projects/usb/src/sys/sparc64/sparc64/exception.S#4 integrate .. //depot/projects/usb/src/sys/sparc64/sparc64/genassym.c#4 integrate .. //depot/projects/usb/src/sys/sparc64/sparc64/jbusppm.c#1 branch .. //depot/projects/usb/src/sys/sparc64/sparc64/locore.S#2 integrate .. //depot/projects/usb/src/sys/sparc64/sparc64/machdep.c#9 integrate .. //depot/projects/usb/src/sys/sparc64/sparc64/mp_exception.S#3 integrate .. //depot/projects/usb/src/sys/sparc64/sparc64/mp_locore.S#3 integrate .. //depot/projects/usb/src/sys/sparc64/sparc64/mp_machdep.c#6 integrate .. //depot/projects/usb/src/sys/sparc64/sparc64/pmap.c#9 integrate .. //depot/projects/usb/src/sys/sparc64/sparc64/prof_machdep.c#2 integrate .. //depot/projects/usb/src/sys/sparc64/sparc64/schppm.c#1 branch .. //depot/projects/usb/src/sys/sparc64/sparc64/spitfire.c#3 integrate .. //depot/projects/usb/src/sys/sparc64/sparc64/stack_machdep.c#2 integrate .. //depot/projects/usb/src/sys/sparc64/sparc64/support.S#4 integrate .. //depot/projects/usb/src/sys/sparc64/sparc64/swtch.S#3 integrate .. //depot/projects/usb/src/sys/sparc64/sparc64/tick.c#3 integrate .. //depot/projects/usb/src/sys/sparc64/sparc64/tlb.c#3 integrate .. //depot/projects/usb/src/sys/sparc64/sparc64/trap.c#7 integrate .. //depot/projects/usb/src/sys/sun4v/conf/GENERIC#9 integrate .. //depot/projects/usb/src/sys/sun4v/include/asi.h#2 integrate .. //depot/projects/usb/src/sys/sun4v/include/pcpu.h#5 integrate .. //depot/projects/usb/src/sys/sun4v/sun4v/clock.c#1 branch .. //depot/projects/usb/src/sys/sun4v/sun4v/dump_machdep.c#3 integrate .. //depot/projects/usb/src/sys/sun4v/sun4v/hvcons.c#5 integrate .. //depot/projects/usb/src/sys/sys/conf.h#10 integrate .. //depot/projects/usb/src/sys/sys/copyright.h#4 integrate .. //depot/projects/usb/src/sys/sys/disk.h#3 integrate .. //depot/projects/usb/src/sys/sys/file.h#6 integrate .. //depot/projects/usb/src/sys/sys/gpt.h#4 integrate .. //depot/projects/usb/src/sys/sys/ioccom.h#3 integrate .. //depot/projects/usb/src/sys/sys/kernel.h#10 integrate .. //depot/projects/usb/src/sys/sys/libkern.h#6 integrate .. //depot/projects/usb/src/sys/sys/linedisc.h#2 delete .. //depot/projects/usb/src/sys/sys/lock.h#7 integrate .. //depot/projects/usb/src/sys/sys/mount.h#9 integrate .. //depot/projects/usb/src/sys/sys/param.h#13 integrate .. //depot/projects/usb/src/sys/sys/pcpu.h#7 integrate .. //depot/projects/usb/src/sys/sys/proc.h#10 integrate .. //depot/projects/usb/src/sys/sys/resource.h#4 integrate .. //depot/projects/usb/src/sys/sys/resourcevar.h#4 integrate .. //depot/projects/usb/src/sys/sys/sx.h#8 integrate .. //depot/projects/usb/src/sys/sys/syscall.h#8 integrate .. //depot/projects/usb/src/sys/sys/syscall.mk#8 integrate .. //depot/projects/usb/src/sys/sys/sysctl.h#10 integrate .. //depot/projects/usb/src/sys/sys/sysproto.h#8 integrate .. //depot/projects/usb/src/sys/sys/systm.h#10 integrate .. //depot/projects/usb/src/sys/sys/termios.h#4 integrate .. //depot/projects/usb/src/sys/sys/tty.h#4 integrate .. //depot/projects/usb/src/sys/sys/ttycom.h#5 integrate >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sat Sep 13 16:08:55 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 156401065675; Sat, 13 Sep 2008 16:08: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 CD83F1065672 for ; Sat, 13 Sep 2008 16:08:54 +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 B531B8FC16 for ; Sat, 13 Sep 2008 16:08:54 +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 m8DG8sEo070789 for ; Sat, 13 Sep 2008 16:08:54 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m8DG8sbp070787 for perforce@freebsd.org; Sat, 13 Sep 2008 16:08:54 GMT (envelope-from hselasky@FreeBSD.org) Date: Sat, 13 Sep 2008 16:08:54 GMT Message-Id: <200809131608.m8DG8sbp070787@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 149715 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, 13 Sep 2008 16:08:55 -0000 http://perforce.freebsd.org/chv.cgi?CH=149715 Change 149715 by hselasky@hselasky_laptop001 on 2008/09/13 16:08:28 Re-introduce bypass functionality in USB TTY interface. Thanks to ED. Affected files ... .. //depot/projects/usb/src/sys/dev/usb2/serial/usb2_serial.c#10 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb2/serial/usb2_serial.c#10 (text+ko) ==== @@ -1064,6 +1064,16 @@ buf = res.buffer; + /* first check if we can pass the buffer directly */ + + if (ttydisc_can_bypass(tp)) { + if (ttydisc_rint_bypass(tp, buf, cnt) != cnt) { + DPRINTF("tp=%p, data lost\n", tp); + } + continue; + } + /* need to loop */ + for (cnt = 0; cnt != res.length; cnt++) { if (ttydisc_rint(tp, buf[cnt], 0) == -1) { /* XXX what should we do? */ From owner-p4-projects@FreeBSD.ORG Sat Sep 13 17:17:04 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 98793106567A; Sat, 13 Sep 2008 17:17: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 5CA5B1065678 for ; Sat, 13 Sep 2008 17:17:04 +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 42D648FC0A for ; Sat, 13 Sep 2008 17:17:04 +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 m8DHH4Tu039205 for ; Sat, 13 Sep 2008 17:17:04 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m8DHH4Dl039197 for perforce@freebsd.org; Sat, 13 Sep 2008 17:17:04 GMT (envelope-from hselasky@FreeBSD.org) Date: Sat, 13 Sep 2008 17:17:04 GMT Message-Id: <200809131717.m8DHH4Dl039197@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 149717 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, 13 Sep 2008 17:17:04 -0000 http://perforce.freebsd.org/chv.cgi?CH=149717 Change 149717 by hselasky@hselasky_laptop001 on 2008/09/13 17:16:08 Integrate some files because the problems I've tried to fix have been fixed. And the fixes are not inter compatible. That means you will get a panic with the P4 USB kernel unless you have this change included, after my last IFC. Affected files ... .. //depot/projects/usb/src/sys/kern/kern_condvar.c#9 integrate .. //depot/projects/usb/src/sys/kern/kern_synch.c#12 integrate .. //depot/projects/usb/src/sys/kern/subr_bus.c#12 integrate .. //depot/projects/usb/src/sys/sys/mutex.h#9 integrate Differences ... ==== //depot/projects/usb/src/sys/kern/kern_condvar.c#9 (text+ko) ==== @@ -124,7 +124,7 @@ sleepq_lock(cvp); cvp->cv_waiters++; - DROP_GIANT(lock); + DROP_GIANT(); sleepq_add(cvp, lock, cvp->cv_description, SLEEPQ_CONDVAR, 0); if (lock != &Giant.lock_object) { @@ -183,7 +183,7 @@ sleepq_lock(cvp); cvp->cv_waiters++; - DROP_GIANT(lock); + DROP_GIANT(); sleepq_add(cvp, lock, cvp->cv_description, SLEEPQ_CONDVAR, 0); if (class->lc_flags & LC_SLEEPABLE) @@ -241,7 +241,7 @@ sleepq_lock(cvp); cvp->cv_waiters++; - DROP_GIANT(lock); + DROP_GIANT(); sleepq_add(cvp, lock, cvp->cv_description, SLEEPQ_CONDVAR | SLEEPQ_INTERRUPTIBLE, 0); @@ -306,7 +306,7 @@ sleepq_lock(cvp); cvp->cv_waiters++; - DROP_GIANT(lock); + DROP_GIANT(); sleepq_add(cvp, lock, cvp->cv_description, SLEEPQ_CONDVAR, 0); sleepq_set_timeout(cvp, timo); @@ -374,7 +374,7 @@ sleepq_lock(cvp); cvp->cv_waiters++; - DROP_GIANT(lock); + DROP_GIANT(); sleepq_add(cvp, lock, cvp->cv_description, SLEEPQ_CONDVAR | SLEEPQ_INTERRUPTIBLE, 0); ==== //depot/projects/usb/src/sys/kern/kern_synch.c#12 (text+ko) ==== @@ -181,7 +181,7 @@ CTR5(KTR_PROC, "sleep: thread %ld (pid %ld, %s) on %s (%p)", td->td_tid, p->p_pid, td->td_name, wmesg, ident); - DROP_GIANT(lock); + DROP_GIANT(); if (lock != NULL && lock != &Giant.lock_object && !(class->lc_flags & LC_SLEEPABLE)) { WITNESS_SAVE(lock, lock_witness); ==== //depot/projects/usb/src/sys/kern/subr_bus.c#12 (text+ko) ==== ==== //depot/projects/usb/src/sys/sys/mutex.h#9 (text+ko) ==== @@ -366,44 +366,17 @@ * * Note that DROP_GIANT*() needs to be paired with PICKUP_GIANT() * The #ifndef is to allow lint-like tools to redefine DROP_GIANT. - * - * Note that by default DROP_GIANT takes no argument. Optionally you - * can specify an argument which explicitly has the name "lock" and - * type "struct lock_object *". If this "lock" pointer is equal to - * "&Giant", the DROP_GIANT macro will not do the final drop on the - * Giant mutex, but expects the calling code to do so. This feature is - * used by condition variables to allow sleeping on Giant. The - * condition variable code will then do the final drop! */ #ifndef DROP_GIANT -#define DROP_GIANT(arg) DROP_GIANT_SUB_##arg(arg) -#define DROP_GIANT_SUB_lock(arg) DROP_GIANT_SUB(arg) /* "lock" argument */ -#define DROP_GIANT_SUB_(arg) DROP_GIANT_SUB(NULL) /* no argument */ -#define DROP_GIANT_SUB(lock) \ +#define DROP_GIANT() \ do { \ - unsigned int _giantcnt; \ + int _giantcnt = 0; \ WITNESS_SAVE_DECL(Giant); \ \ if (mtx_owned(&Giant)) { \ - unsigned int _giantn; \ - if (((void *)(lock)) == ((void *)&Giant)) { \ - /* special case */ \ - _giantn = Giant.mtx_recurse; \ - } else { \ - /* default case */ \ - _giantn = Giant.mtx_recurse + 1; \ - } \ - if (_giantn != 0) { \ - WITNESS_SAVE(&Giant.lock_object, Giant); \ - _giantcnt = _giantn; \ - do { \ - mtx_unlock(&Giant); \ - } while (--_giantn); \ - } else { \ - _giantcnt = 0; \ - } \ - } else { \ - _giantcnt = 0; \ + WITNESS_SAVE(&Giant.lock_object, Giant); \ + for (_giantcnt = 0; mtx_owned(&Giant); _giantcnt++) \ + mtx_unlock(&Giant); \ } #define PICKUP_GIANT() \ From owner-p4-projects@FreeBSD.ORG Sat Sep 13 18:04:54 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0092F1065675; Sat, 13 Sep 2008 18:04: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 B8A951065671 for ; Sat, 13 Sep 2008 18:04:53 +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 9E7278FC0A for ; Sat, 13 Sep 2008 18:04:53 +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 m8DI4ruW073239 for ; Sat, 13 Sep 2008 18:04:53 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m8DI4qaR073228 for perforce@freebsd.org; Sat, 13 Sep 2008 18:04:52 GMT (envelope-from hselasky@FreeBSD.org) Date: Sat, 13 Sep 2008 18:04:52 GMT Message-Id: <200809131804.m8DI4qaR073228@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 149720 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, 13 Sep 2008 18:04:54 -0000 http://perforce.freebsd.org/chv.cgi?CH=149720 Change 149720 by hselasky@hselasky_laptop001 on 2008/09/13 18:04:00 Fix some issues popping up while testing. 1) Need to call rint_done in the TTY layer. 2) The config TD check gone needs to be called locked. Affected files ... .. //depot/projects/usb/src/sys/dev/usb2/serial/usb2_serial.c#11 edit .. //depot/projects/usb/src/sys/dev/usb2/wlan/if_rum2.c#11 edit .. //depot/projects/usb/src/sys/dev/usb2/wlan/if_ural2.c#11 edit .. //depot/projects/usb/src/sys/dev/usb2/wlan/if_zyd2.c#12 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb2/serial/usb2_serial.c#11 (text+ko) ==== @@ -1048,6 +1048,9 @@ (!(sc->sc_flag & UCOM_FLAG_GP_DATA))) { return; /* multiport device polling */ } + if (len == 0) + return; /* no data */ + /* set a flag to prevent recursation ? */ while (len > 0) { @@ -1084,6 +1087,7 @@ } } } + ttydisc_rint_done(tp); return; } ==== //depot/projects/usb/src/sys/dev/usb2/wlan/if_rum2.c#11 (text+ko) ==== @@ -1535,15 +1535,16 @@ DPRINTF("setting new state: %d\n", nstate); + mtx_lock(&sc->sc_mtx); if (usb2_config_td_is_gone(&sc->sc_config_td)) { + mtx_unlock(&sc->sc_mtx); + /* Special case which happens at detach. */ if (nstate == IEEE80211_S_INIT) { (uvp->newstate) (vap, nstate, arg); } return (0); /* nothing to do */ } - mtx_lock(&sc->sc_mtx); - /* store next state */ sc->sc_ns_state = nstate; sc->sc_ns_arg = arg; ==== //depot/projects/usb/src/sys/dev/usb2/wlan/if_ural2.c#11 (text+ko) ==== @@ -1526,15 +1526,16 @@ DPRINTF("setting new state: %d\n", nstate); + mtx_lock(&sc->sc_mtx); if (usb2_config_td_is_gone(&sc->sc_config_td)) { + mtx_unlock(&sc->sc_mtx); + /* Special case which happens at detach. */ if (nstate == IEEE80211_S_INIT) { (uvp->newstate) (vap, nstate, arg); } return (0); /* nothing to do */ } - mtx_lock(&sc->sc_mtx); - /* store next state */ sc->sc_ns_state = nstate; sc->sc_ns_arg = arg; ==== //depot/projects/usb/src/sys/dev/usb2/wlan/if_zyd2.c#12 (text+ko) ==== @@ -2140,15 +2140,15 @@ DPRINTF("setting new state: %d\n", nstate); + mtx_lock(&sc->sc_mtx); if (usb2_config_td_is_gone(&sc->sc_config_td)) { + mtx_unlock(&sc->sc_mtx); /* Special case which happens at detach. */ if (nstate == IEEE80211_S_INIT) { (uvp->newstate) (vap, nstate, arg); } return (0); /* nothing to do */ } - mtx_lock(&sc->sc_mtx); - /* store next state */ sc->sc_ns_state = nstate; sc->sc_ns_arg = arg; From owner-p4-projects@FreeBSD.ORG Sat Sep 13 20:26:18 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 38FD81065675; Sat, 13 Sep 2008 20:26: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 F08EE1065673 for ; Sat, 13 Sep 2008 20:26:17 +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 DC90E8FC0A for ; Sat, 13 Sep 2008 20:26:17 +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 m8DKQH1o024388 for ; Sat, 13 Sep 2008 20:26:17 GMT (envelope-from ed@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m8DKQG26024386 for perforce@freebsd.org; Sat, 13 Sep 2008 20:26:16 GMT (envelope-from ed@FreeBSD.org) Date: Sat, 13 Sep 2008 20:26:16 GMT Message-Id: <200809132026.m8DKQG26024386@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 149724 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, 13 Sep 2008 20:26:18 -0000 http://perforce.freebsd.org/chv.cgi?CH=149724 Change 149724 by ed@ed_dull on 2008/09/13 20:25:25 IFC. Affected files ... .. //depot/projects/mpsafetty/ObsoleteFiles.inc#10 integrate .. //depot/projects/mpsafetty/contrib/gcc/config/arm/arm.h#2 integrate .. //depot/projects/mpsafetty/contrib/telnet/arpa/telnet.h#2 integrate .. //depot/projects/mpsafetty/etc/rc.initdiskless#2 integrate .. //depot/projects/mpsafetty/include/arpa/telnet.h#2 integrate .. //depot/projects/mpsafetty/lib/libarchive/archive_platform.h#2 integrate .. //depot/projects/mpsafetty/lib/libarchive/archive_read_support_compression_program.c#2 integrate .. //depot/projects/mpsafetty/lib/libarchive/archive_write_disk.c#7 integrate .. //depot/projects/mpsafetty/lib/libarchive/config_freebsd.h#2 integrate .. //depot/projects/mpsafetty/lib/libarchive/filter_fork.c#2 integrate .. //depot/projects/mpsafetty/lib/libc/stdlib/malloc.c#7 integrate .. //depot/projects/mpsafetty/lib/libthr/thread/thr_exit.c#3 integrate .. //depot/projects/mpsafetty/share/man/man4/man4.i386/Makefile#6 integrate .. //depot/projects/mpsafetty/share/man/man4/man4.i386/sbni.4#1 branch .. //depot/projects/mpsafetty/share/man/man4/snd_hda.4#2 integrate .. //depot/projects/mpsafetty/share/man/man9/bus_dma.9#3 integrate .. //depot/projects/mpsafetty/share/man/man9/dev_clone.9#1 branch .. //depot/projects/mpsafetty/share/man/man9/devfs_set_cdevpriv.9#1 branch .. //depot/projects/mpsafetty/share/man/man9/insmntque.9#2 integrate .. //depot/projects/mpsafetty/share/man/man9/make_dev.9#2 integrate .. //depot/projects/mpsafetty/sys/amd64/amd64/vm_machdep.c#2 integrate .. //depot/projects/mpsafetty/sys/amd64/pci/pci_cfgreg.c#3 integrate .. //depot/projects/mpsafetty/sys/arm/arm/intr.c#3 integrate .. //depot/projects/mpsafetty/sys/arm/arm/nexus.c#2 integrate .. //depot/projects/mpsafetty/sys/arm/include/intr.h#2 integrate .. //depot/projects/mpsafetty/sys/arm/include/pcpu.h#3 integrate .. //depot/projects/mpsafetty/sys/arm/xscale/ixp425/ixp425.c#2 integrate .. //depot/projects/mpsafetty/sys/arm/xscale/ixp425/ixp425_qmgr.c#2 integrate .. //depot/projects/mpsafetty/sys/boot/common/dev_net.c#3 integrate .. //depot/projects/mpsafetty/sys/boot/forth/loader.conf#6 integrate .. //depot/projects/mpsafetty/sys/boot/sparc64/loader/main.c#7 integrate .. //depot/projects/mpsafetty/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c#4 integrate .. //depot/projects/mpsafetty/sys/compat/linux/linux_misc.c#5 integrate .. //depot/projects/mpsafetty/sys/compat/ndis/ntoskrnl_var.h#2 integrate .. //depot/projects/mpsafetty/sys/conf/NOTES#10 integrate .. //depot/projects/mpsafetty/sys/conf/files.i386#7 integrate .. //depot/projects/mpsafetty/sys/conf/files.pc98#2 integrate .. //depot/projects/mpsafetty/sys/conf/files.sparc64#3 integrate .. //depot/projects/mpsafetty/sys/dev/aac/aac_pci.c#2 integrate .. //depot/projects/mpsafetty/sys/dev/mlx/mlx.c#2 integrate .. //depot/projects/mpsafetty/sys/dev/sbni/if_sbni.c#1 branch .. //depot/projects/mpsafetty/sys/dev/sbni/if_sbni_isa.c#1 branch .. //depot/projects/mpsafetty/sys/dev/sbni/if_sbni_pci.c#1 branch .. //depot/projects/mpsafetty/sys/dev/sbni/if_sbnireg.h#1 branch .. //depot/projects/mpsafetty/sys/dev/sbni/if_sbnivar.h#1 branch .. //depot/projects/mpsafetty/sys/dev/sound/pci/hda/hda_reg.h#2 integrate .. //depot/projects/mpsafetty/sys/dev/sound/pci/hda/hdac.c#4 integrate .. //depot/projects/mpsafetty/sys/dev/sound/pci/hda/hdac_private.h#2 integrate .. //depot/projects/mpsafetty/sys/dev/tx/if_tx.c#2 integrate .. //depot/projects/mpsafetty/sys/dev/usb/if_zyd.c#3 integrate .. //depot/projects/mpsafetty/sys/dev/usb/if_zydreg.h#2 integrate .. //depot/projects/mpsafetty/sys/dev/usb/ufoma.c#4 integrate .. //depot/projects/mpsafetty/sys/dev/usb/usb_quirks.c#3 integrate .. //depot/projects/mpsafetty/sys/dev/usb/usbdevs#9 integrate .. //depot/projects/mpsafetty/sys/fs/nullfs/null_vnops.c#2 integrate .. //depot/projects/mpsafetty/sys/gnu/fs/xfs/FreeBSD/xfs_vnode.h#2 integrate .. //depot/projects/mpsafetty/sys/i386/conf/NOTES#6 integrate .. //depot/projects/mpsafetty/sys/i386/conf/XEN#3 integrate .. //depot/projects/mpsafetty/sys/i386/cpufreq/est.c#5 integrate .. //depot/projects/mpsafetty/sys/i386/i386/local_apic.c#4 integrate .. //depot/projects/mpsafetty/sys/i386/i386/machdep.c#6 integrate .. //depot/projects/mpsafetty/sys/i386/i386/sys_machdep.c#3 integrate .. //depot/projects/mpsafetty/sys/i386/i386/vm_machdep.c#5 integrate .. //depot/projects/mpsafetty/sys/i386/include/proc.h#2 integrate .. //depot/projects/mpsafetty/sys/i386/include/xen/xenpmap.h#4 integrate .. //depot/projects/mpsafetty/sys/i386/include/xen/xenvar.h#3 integrate .. //depot/projects/mpsafetty/sys/i386/pci/pci_cfgreg.c#5 integrate .. //depot/projects/mpsafetty/sys/i386/xen/mp_machdep.c#1 branch .. //depot/projects/mpsafetty/sys/i386/xen/mptable.c#1 branch .. //depot/projects/mpsafetty/sys/i386/xen/pmap.c#5 integrate .. //depot/projects/mpsafetty/sys/i386/xen/xen_machdep.c#7 integrate .. //depot/projects/mpsafetty/sys/kern/kern_exec.c#8 integrate .. //depot/projects/mpsafetty/sys/kern/kern_lock.c#5 integrate .. //depot/projects/mpsafetty/sys/kern/kern_mutex.c#2 integrate .. //depot/projects/mpsafetty/sys/kern/kern_rmlock.c#2 integrate .. //depot/projects/mpsafetty/sys/kern/kern_rwlock.c#2 integrate .. //depot/projects/mpsafetty/sys/kern/kern_sx.c#3 integrate .. //depot/projects/mpsafetty/sys/kern/subr_witness.c#6 integrate .. //depot/projects/mpsafetty/sys/kern/tty_ttydisc.c#21 integrate .. //depot/projects/mpsafetty/sys/mips/adm5120/admpci.c#2 integrate .. //depot/projects/mpsafetty/sys/mips/adm5120/if_admsw.c#2 integrate .. //depot/projects/mpsafetty/sys/mips/adm5120/if_admswvar.h#2 integrate .. //depot/projects/mpsafetty/sys/mips/adm5120/obio.c#2 integrate .. //depot/projects/mpsafetty/sys/mips/adm5120/uart_bus_adm5120.c#2 integrate .. //depot/projects/mpsafetty/sys/mips/adm5120/uart_cpu_adm5120.c#2 integrate .. //depot/projects/mpsafetty/sys/mips/adm5120/uart_dev_adm5120.c#2 integrate .. //depot/projects/mpsafetty/sys/mips/idt/idtpci.c#2 integrate .. //depot/projects/mpsafetty/sys/mips/idt/if_kr.c#2 integrate .. //depot/projects/mpsafetty/sys/mips/idt/obio.c#2 integrate .. //depot/projects/mpsafetty/sys/mips/idt/uart_bus_rc32434.c#2 integrate .. //depot/projects/mpsafetty/sys/mips/malta/gt.c#2 integrate .. //depot/projects/mpsafetty/sys/mips/malta/gt_pci.c#2 integrate .. //depot/projects/mpsafetty/sys/mips/malta/malta_machdep.c#2 integrate .. //depot/projects/mpsafetty/sys/mips/malta/obio.c#2 integrate .. //depot/projects/mpsafetty/sys/mips/malta/uart_bus_maltausart.c#2 integrate .. //depot/projects/mpsafetty/sys/mips/malta/uart_cpu_maltausart.c#2 integrate .. //depot/projects/mpsafetty/sys/mips/malta/yamon.c#2 integrate .. //depot/projects/mpsafetty/sys/mips/sentry5/obio.c#2 integrate .. //depot/projects/mpsafetty/sys/mips/sentry5/s5_machdep.c#2 integrate .. //depot/projects/mpsafetty/sys/mips/sentry5/uart_bus_sbusart.c#2 integrate .. //depot/projects/mpsafetty/sys/mips/sentry5/uart_cpu_sbusart.c#2 integrate .. //depot/projects/mpsafetty/sys/modules/Makefile#12 integrate .. //depot/projects/mpsafetty/sys/modules/sbni/Makefile#1 branch .. //depot/projects/mpsafetty/sys/net/if_mib.c#3 integrate .. //depot/projects/mpsafetty/sys/netgraph/ng_base.c#4 integrate .. //depot/projects/mpsafetty/sys/netinet/tcp_output.c#6 integrate .. //depot/projects/mpsafetty/sys/netinet/tcp_subr.c#5 integrate .. //depot/projects/mpsafetty/sys/netinet/tcp_syncache.c#9 integrate .. //depot/projects/mpsafetty/sys/netinet6/mld6.c#4 integrate .. //depot/projects/mpsafetty/sys/nfsclient/nfs_vfsops.c#7 integrate .. //depot/projects/mpsafetty/sys/pc98/conf/NOTES#4 integrate .. //depot/projects/mpsafetty/sys/security/mac_bsdextended/mac_bsdextended.c#5 integrate .. //depot/projects/mpsafetty/sys/sparc64/sparc64/genassym.c#5 integrate .. //depot/projects/mpsafetty/sys/sparc64/sparc64/jbusppm.c#1 branch .. //depot/projects/mpsafetty/sys/sparc64/sparc64/mp_locore.S#4 integrate .. //depot/projects/mpsafetty/sys/sparc64/sparc64/schppm.c#1 branch .. //depot/projects/mpsafetty/sys/sun4v/include/asi.h#2 integrate .. //depot/projects/mpsafetty/sys/sys/lock.h#3 integrate .. //depot/projects/mpsafetty/sys/sys/param.h#9 integrate .. //depot/projects/mpsafetty/sys/sys/systm.h#2 integrate .. //depot/projects/mpsafetty/sys/sys/vnode.h#4 integrate .. //depot/projects/mpsafetty/tools/build/mk/OptionalObsoleteFiles.inc#3 integrate .. //depot/projects/mpsafetty/tools/regression/sockets/sendfile/sendfile.c#2 integrate .. //depot/projects/mpsafetty/usr.bin/top/machine.c#2 integrate .. //depot/projects/mpsafetty/usr.sbin/cxgbtool/cxgbtool.c#3 integrate .. //depot/projects/mpsafetty/usr.sbin/fwcontrol/fwcontrol.8#2 integrate .. //depot/projects/mpsafetty/usr.sbin/fwcontrol/fwcontrol.c#2 integrate .. //depot/projects/mpsafetty/usr.sbin/iostat/iostat.c#3 integrate .. //depot/projects/mpsafetty/usr.sbin/mlxcontrol/command.c#2 integrate .. //depot/projects/mpsafetty/usr.sbin/mlxcontrol/interface.c#2 integrate .. //depot/projects/mpsafetty/usr.sbin/ntp/config.h#4 integrate Differences ... ==== //depot/projects/mpsafetty/ObsoleteFiles.inc#10 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/ObsoleteFiles.inc,v 1.157 2008/08/31 08:33:41 antoine Exp $ +# $FreeBSD: src/ObsoleteFiles.inc,v 1.159 2008/09/13 17:29:49 antoine Exp $ # # This file lists old files (OLD_FILES), libraries (OLD_LIBS) and # directories (OLD_DIRS) which should get removed at an update. Recently @@ -53,11 +53,6 @@ # 20080704: sbsh(4) removed OLD_FILES+=usr/share/man/man4/if_sbsh.4.gz OLD_FILES+=usr/share/man/man4/sbsh.4.gz -# 20080704: sbni(4) removed -.if ${TARGET_ARCH} == "i386" -OLD_FILES+=usr/share/man/man4/i386/if_sbni.4.gz -OLD_FILES+=usr/share/man/man4/i386/sbni.4.gz -.endif # 20080704: cnw(4) removed OLD_FILES+=usr/share/man/man4/if_cnw.4.gz OLD_FILES+=usr/share/man/man4/cnw.4.gz @@ -3799,7 +3794,6 @@ OLD_FILES+=usr/games/worms OLD_FILES+=usr/games/wump OLD_FILES+=sbin/mount_reiserfs -OLD_FILES+=usr/bin/hesinfo OLD_FILES+=usr/include/c++/3.4/ext/demangle.h OLD_FILES+=usr/include/cam/cam_extend.h OLD_FILES+=usr/include/dev/wi/wi_hostap.h @@ -4209,10 +4203,8 @@ OLD_FILES+=usr/share/doc/ntp/tickadj.htm OLD_FILES+=usr/share/doc/papers/nqnfs.ascii.gz OLD_FILES+=usr/share/doc/papers/px.ascii.gz -OLD_FILES+=usr/share/man/man1/hesinfo.1.gz OLD_FILES+=usr/share/man/man3/mbrune.3.gz OLD_FILES+=usr/share/man/man3/rune.3.gz -OLD_FILES+=usr/share/man/man3/hesiod.3.gz OLD_FILES+=usr/share/man/man3/mac_is_present_np.3.gz OLD_FILES+=usr/share/man/man3/fpsetsticky.3.gz OLD_FILES+=usr/share/man/man3/gss_krb5_copy_ccache.3.gz @@ -4227,7 +4219,6 @@ OLD_FILES+=usr/share/man/man3/setinvalidrune.3.gz OLD_FILES+=usr/share/man/man3/mbrune.3.gz OLD_FILES+=usr/share/man/man3/rune.3.gz -OLD_FILES+=usr/share/man/man3/hesiod.3.gz OLD_FILES+=usr/share/man/man3/mac_is_present_np.3.gz OLD_FILES+=usr/share/man/man3/fpsetsticky.3.gz OLD_FILES+=usr/share/man/man3/gss_krb5_copy_ccache.3.gz @@ -4243,7 +4234,6 @@ OLD_FILES+=usr/share/man/man3/fungetrune.3.gz OLD_FILES+=usr/share/man/man3/fputrune.3.gz OLD_FILES+=usr/share/man/man3/fgetrune.3.gz -OLD_FILES+=usr/share/man/man5/hesiod.conf.5.gz OLD_FILES+=usr/share/man/man5/usbd.conf.5.gz .if ${TARGET_ARCH} != "i386" && ${TARGET_ARCH} != "amd64" OLD_FILES+=usr/share/man/man8/boot_i386.8.gz ==== //depot/projects/mpsafetty/contrib/gcc/config/arm/arm.h#2 (text+ko) ==== @@ -507,7 +507,7 @@ /* wchar_t is unsigned under the AAPCS. */ #ifndef WCHAR_TYPE #define WCHAR_TYPE (TARGET_AAPCS_BASED ? "unsigned int" : "int") - +#undef WCHAR_TYPE_SIZE #define WCHAR_TYPE_SIZE BITS_PER_WORD #endif ==== //depot/projects/mpsafetty/contrib/telnet/arpa/telnet.h#2 (text+ko) ==== @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)telnet.h 8.2 (Berkeley) 12/15/93 - * $FreeBSD: src/contrib/telnet/arpa/telnet.h,v 1.9 2003/01/18 06:10:21 billf Exp $ + * $FreeBSD: src/contrib/telnet/arpa/telnet.h,v 1.10 2008/09/13 17:46:50 antoine Exp $ */ #ifndef _ARPA_TELNET_H_ @@ -140,8 +140,8 @@ "TACACS UID", "OUTPUT MARKING", "TTYLOC", "3270 REGIME", "X.3 PAD", "NAWS", "TSPEED", "LFLOW", "LINEMODE", "XDISPLOC", "OLD-ENVIRON", "AUTHENTICATION", - "ENCRYPT", "NEW-ENVIRON", "TN3270E", "CHARSET", "COM-PORT", - "KERMIT", + "ENCRYPT", "NEW-ENVIRON", "TN3270E", "XAUTH", "CHARSET", + "RSP", "COM-PORT", "SLE", "STARTTLS", "KERMIT", 0 }; #define TELOPT_FIRST TELOPT_BINARY ==== //depot/projects/mpsafetty/etc/rc.initdiskless#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/rc.initdiskless,v 1.53 2008/05/15 11:00:23 bms Exp $ +# $FreeBSD: src/etc/rc.initdiskless,v 1.54 2008/09/09 18:40:50 bms Exp $ # On entry to this script the entire system consists of a read-only root # mounted via NFS. The kernel has run BOOTP and configured an interface @@ -73,6 +73,16 @@ # If this file exists, then failure to execute the mount # command contained in /conf/T/M/remount is non-fatal. # +# /conf/T/M/remount_subdir +# If this file exists, then the behaviour of /conf/T/M/remount +# changes as follows: +# 1. /conf/T/M/remount is invoked to mount the root of the +# filesystem where the configuration data exists on a +# temporary mountpoint. +# 2. /conf/T/M/remount_subdir is then invoked to mount a +# *subdirectory* of the filesystem mounted by +# /conf/T/M/remount on /conf/T/M/. +# # /conf/T/M/diskless_remount # The contents of the file points to an NFS filesystem, # possibly followed by mount_nfs options. If the server name @@ -296,10 +306,33 @@ # remount. Beware, the command is in the file itself! if [ -f $j/remount ]; then - nfspt=`/bin/cat $j/remount` - $nfspt $j - chkerr $? "$nfspt $j" - to_umount="$j ${to_umount}" # XXX hope it is really a mount! + if [ -f $j/remount_subdir ]; then + k="/conf.tmp/$i/$subdir" + [ -d $k ] || continue + + # Mount the filesystem root where the config data is + # on the temporary mount point. + nfspt=`/bin/cat $j/remount` + $nfspt $k + chkerr $? "$nfspt $k" + + # Now use a nullfs mount to get the data where we + # really want to see it. + remount_subdir=`/bin/cat $j/remount_subdir` + remount_subdir_cmd="mount -t nullfs $k/$remount_subdir" + + $remount_subdir_cmd $j + chkerr $? "$remount_subdir_cmd $j" + + # XXX check order -- we must force $k to be unmounted + # after j, as j depends on k. + to_umount="$j $k ${to_umount}" + else + nfspt=`/bin/cat $j/remount` + $nfspt $j + chkerr $? "$nfspt $j" + to_umount="$j ${to_umount}" # XXX hope it is really a mount! + fi fi # NFS remount ==== //depot/projects/mpsafetty/include/arpa/telnet.h#2 (text+ko) ==== @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)telnet.h 8.2 (Berkeley) 12/15/93 - * $FreeBSD: src/include/arpa/telnet.h,v 1.9 2003/01/18 06:13:57 billf Exp $ + * $FreeBSD: src/include/arpa/telnet.h,v 1.10 2008/09/13 17:46:50 antoine Exp $ */ #ifndef _ARPA_TELNET_H_ @@ -140,8 +140,8 @@ "TACACS UID", "OUTPUT MARKING", "TTYLOC", "3270 REGIME", "X.3 PAD", "NAWS", "TSPEED", "LFLOW", "LINEMODE", "XDISPLOC", "OLD-ENVIRON", "AUTHENTICATION", - "ENCRYPT", "NEW-ENVIRON", "TN3270E", "CHARSET", "COM-PORT", - "KERMIT", + "ENCRYPT", "NEW-ENVIRON", "TN3270E", "XAUTH", "CHARSET", + "RSP", "COM-PORT", "SLE", "STARTTLS", "KERMIT", 0 }; #define TELOPT_FIRST TELOPT_BINARY ==== //depot/projects/mpsafetty/lib/libarchive/archive_platform.h#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/lib/libarchive/archive_platform.h,v 1.30 2008/05/26 17:00:22 kientzle Exp $ + * $FreeBSD: src/lib/libarchive/archive_platform.h,v 1.31 2008/09/12 04:03:34 kientzle Exp $ */ /* @@ -78,6 +78,9 @@ #if !HAVE_DECL_SIZE_MAX #define SIZE_MAX (~(size_t)0) #endif +#if !HAVE_DECL_SSIZE_MAX +#define SSIZE_MAX ((ssize_t)(SIZE_MAX >> 1)) +#endif #if !HAVE_DECL_UINT32_MAX #define UINT32_MAX (~(uint32_t)0) #endif ==== //depot/projects/mpsafetty/lib/libarchive/archive_read_support_compression_program.c#2 (text+ko) ==== @@ -24,13 +24,15 @@ */ #include "archive_platform.h" -__FBSDID("$FreeBSD: src/lib/libarchive/archive_read_support_compression_program.c,v 1.4 2008/06/15 10:45:57 kientzle Exp $"); +__FBSDID("$FreeBSD: src/lib/libarchive/archive_read_support_compression_program.c,v 1.5 2008/09/12 03:53:54 kientzle Exp $"); /* This capability is only available on POSIX systems. */ #if !defined(HAVE_PIPE) || !defined(HAVE_FCNTL) || \ !(defined(HAVE_FORK) || defined(HAVE_VFORK)) +#include "archive.h" + /* * On non-Posix systems, allow the program to build, but choke if * this function is actually invoked. ==== //depot/projects/mpsafetty/lib/libarchive/archive_write_disk.c#7 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include "archive_platform.h" -__FBSDID("$FreeBSD: src/lib/libarchive/archive_write_disk.c,v 1.36 2008/09/07 05:22:33 kientzle Exp $"); +__FBSDID("$FreeBSD: src/lib/libarchive/archive_write_disk.c,v 1.38 2008/09/12 04:08:11 kientzle Exp $"); #ifdef HAVE_SYS_TYPES_H #include @@ -514,9 +514,15 @@ } if (a->flags & ARCHIVE_EXTRACT_SPARSE) { +#if HAVE_STRUCT_STAT_ST_BLKSIZE if ((r = _archive_write_disk_lazy_stat(a)) != ARCHIVE_OK) return (r); block_size = a->pst->st_blksize; +#else + /* XXX TODO XXX Is there a more appropriate choice here ? */ + /* This needn't match the filesystem allocation size. */ + block_size = 16*1024; +#endif } if (a->filesize >= 0 && (off_t)(offset + size) > a->filesize) @@ -631,12 +637,14 @@ /* Last write ended at exactly the filesize; we're done. */ /* Hopefully, this is the common case. */ } else { +#if HAVE_FTRUNCATE if (ftruncate(a->fd, a->filesize) == -1 && a->filesize == 0) { archive_set_error(&a->archive, errno, "File size could not be restored"); return (ARCHIVE_FAILED); } +#endif /* * Explicitly stat the file as some platforms might not * implement the XSI option to extend files via ftruncate. ==== //depot/projects/mpsafetty/lib/libarchive/config_freebsd.h#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/lib/libarchive/config_freebsd.h,v 1.11 2008/07/05 01:50:07 kientzle Exp $ + * $FreeBSD: src/lib/libarchive/config_freebsd.h,v 1.13 2008/09/12 04:08:11 kientzle Exp $ */ /* FreeBSD 5.0 and later have ACL support. */ @@ -41,6 +41,7 @@ #define HAVE_DECL_INT64_MAX 1 #define HAVE_DECL_INT64_MIN 1 #define HAVE_DECL_SIZE_MAX 1 +#define HAVE_DECL_SSIZE_MAX 1 #define HAVE_DECL_STRERROR_R 1 #define HAVE_DECL_UINT32_MAX 1 #define HAVE_DECL_UINT64_MAX 1 @@ -55,6 +56,7 @@ #define HAVE_FCNTL_H 1 #define HAVE_FSEEKO 1 #define HAVE_FSTAT 1 +#define HAVE_FTRUNCATE 1 #define HAVE_FUTIMES 1 #define HAVE_GETEUID 1 #define HAVE_GETPID 1 @@ -86,6 +88,7 @@ #define HAVE_STRINGS_H 1 #define HAVE_STRING_H 1 #define HAVE_STRRCHR 1 +#define HAVE_STRUCT_STAT_ST_BLKSIZE 1 #define HAVE_STRUCT_STAT_ST_MTIMESPEC_TV_NSEC 1 #define HAVE_SYS_ACL_H 1 #define HAVE_SYS_IOCTL_H 1 ==== //depot/projects/mpsafetty/lib/libarchive/filter_fork.c#2 (text+ko) ==== @@ -29,7 +29,7 @@ #if defined(HAVE_PIPE) && defined(HAVE_FCNTL) && \ (defined(HAVE_FORK) || defined(HAVE_VFORK)) -__FBSDID("$FreeBSD: src/lib/libarchive/filter_fork.c,v 1.4 2008/06/15 10:45:57 kientzle Exp $"); +__FBSDID("$FreeBSD: src/lib/libarchive/filter_fork.c,v 1.5 2008/09/12 05:33:00 kientzle Exp $"); #if defined(HAVE_POLL) # if defined(HAVE_POLL_H) @@ -61,7 +61,7 @@ if (pipe(stdin_pipe) == -1) goto state_allocated; - if (stdin_pipe[0] == STDOUT_FILENO) { + if (stdin_pipe[0] == 1 /* stdout */) { if ((tmp = dup(stdin_pipe[0])) == -1) goto stdin_opened; close(stdin_pipe[0]); @@ -69,7 +69,7 @@ } if (pipe(stdout_pipe) == -1) goto stdin_opened; - if (stdout_pipe[1] == STDIN_FILENO) { + if (stdout_pipe[1] == 0 /* stdin */) { if ((tmp = dup(stdout_pipe[1])) == -1) goto stdout_opened; close(stdout_pipe[1]); @@ -86,16 +86,16 @@ case 0: close(stdin_pipe[1]); close(stdout_pipe[0]); - if (dup2(stdin_pipe[0], STDIN_FILENO) == -1) + if (dup2(stdin_pipe[0], 0 /* stdin */) == -1) _exit(254); - if (stdin_pipe[0] != STDIN_FILENO) + if (stdin_pipe[0] != 0 /* stdin */) close(stdin_pipe[0]); - if (dup2(stdout_pipe[1], STDOUT_FILENO) == -1) + if (dup2(stdout_pipe[1], 1 /* stdout */) == -1) _exit(254); - if (stdout_pipe[1] != STDOUT_FILENO) + if (stdout_pipe[1] != 1 /* stdout */) close(stdout_pipe[1]); execlp(path, path, (char *)NULL); - _exit(254); + _exit(254); default: close(stdin_pipe[0]); close(stdout_pipe[1]); ==== //depot/projects/mpsafetty/lib/libc/stdlib/malloc.c#7 (text+ko) ==== @@ -156,7 +156,7 @@ #define MALLOC_DSS #include -__FBSDID("$FreeBSD: src/lib/libc/stdlib/malloc.c,v 1.178 2008/09/06 05:26:31 marcel Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/stdlib/malloc.c,v 1.179 2008/09/10 14:27:34 jasone Exp $"); #include "libc_private.h" #ifdef MALLOC_DEBUG @@ -174,6 +174,7 @@ #include /* Must come after several other sys/ includes. */ #include +#include #include #include @@ -213,55 +214,43 @@ #define STRERROR_BUF 64 /* - * The const_size2bin table is sized according to PAGESIZE_2POW, but for - * correctness reasons, we never assume that - * (pagesize == (1U << * PAGESIZE_2POW)). - * * Minimum alignment of allocations is 2^QUANTUM_2POW bytes. */ #ifdef __i386__ -# define PAGESIZE_2POW 12 # define QUANTUM_2POW 4 # define SIZEOF_PTR_2POW 2 # define CPU_SPINWAIT __asm__ volatile("pause") #endif #ifdef __ia64__ -# define PAGESIZE_2POW 13 # define QUANTUM_2POW 4 # define SIZEOF_PTR_2POW 3 #endif #ifdef __alpha__ -# define PAGESIZE_2POW 13 # define QUANTUM_2POW 4 # define SIZEOF_PTR_2POW 3 # define NO_TLS #endif #ifdef __sparc64__ -# define PAGESIZE_2POW 13 # define QUANTUM_2POW 4 # define SIZEOF_PTR_2POW 3 # define NO_TLS #endif #ifdef __amd64__ -# define PAGESIZE_2POW 12 # define QUANTUM_2POW 4 # define SIZEOF_PTR_2POW 3 # define CPU_SPINWAIT __asm__ volatile("pause") #endif #ifdef __arm__ -# define PAGESIZE_2POW 12 # define QUANTUM_2POW 3 # define SIZEOF_PTR_2POW 2 # define NO_TLS #endif #ifdef __mips__ -# define PAGESIZE_2POW 12 # define QUANTUM_2POW 3 # define SIZEOF_PTR_2POW 2 # define NO_TLS #endif #ifdef __powerpc__ -# define PAGESIZE_2POW 12 # define QUANTUM_2POW 4 # define SIZEOF_PTR_2POW 2 #endif @@ -361,7 +350,7 @@ #define RUN_MAX_OVRHD_RELAX 0x00001800U /* Put a cap on small object run size. This overrides RUN_MAX_OVRHD. */ -#define RUN_MAX_SMALL (12 * pagesize) +#define RUN_MAX_SMALL (12 * PAGE_SIZE) /* * Hyper-threaded CPUs may need a special instruction inside spin loops in @@ -733,7 +722,8 @@ /* * bins is used to store rings of free regions of the following sizes, - * assuming a 16-byte quantum, 4kB pagesize, and default MALLOC_OPTIONS. + * assuming a 16-byte quantum, 4kB page size, and default + * MALLOC_OPTIONS. * * bins[i] | size | * --------+------+ @@ -794,11 +784,6 @@ /* Number of CPUs. */ static unsigned ncpus; -/* VM page size. */ -static size_t pagesize; -static size_t pagesize_mask; -static size_t pagesize_2pow; - /* Various bin-related settings. */ #ifdef MALLOC_TINY /* Number of (2^n)-spaced tiny bins. */ # define ntbins ((unsigned)(QUANTUM_2POW - TINY_MIN_2POW)) @@ -835,7 +820,7 @@ #define S2B_64(i) S2B_32(i) S2B_32(i) #define S2B_128(i) S2B_64(i) S2B_64(i) #define S2B_256(i) S2B_128(i) S2B_128(i) -static const uint8_t const_size2bin[(1U << PAGESIZE_2POW) - 255] = { +static const uint8_t const_size2bin[PAGE_SIZE - 255] = { S2B_1(0xffU) /* 0 */ #if (QUANTUM_2POW == 4) /* 64-bit system ************************/ @@ -906,7 +891,7 @@ S2B_256(S2B_SMIN + 10) /* 3328 */ S2B_256(S2B_SMIN + 11) /* 3584 */ S2B_256(S2B_SMIN + 12) /* 3840 */ -#if (PAGESIZE_2POW == 13) +#if (PAGE_SHIFT == 13) S2B_256(S2B_SMIN + 13) /* 4096 */ S2B_256(S2B_SMIN + 14) /* 4352 */ S2B_256(S2B_SMIN + 15) /* 4608 */ @@ -1345,9 +1330,9 @@ #define SUBPAGE_CEILING(s) \ (((s) + SUBPAGE_MASK) & ~SUBPAGE_MASK) -/* Return the smallest pagesize multiple that is >= s. */ +/* Return the smallest PAGE_SIZE multiple that is >= s. */ #define PAGE_CEILING(s) \ - (((s) + pagesize_mask) & ~pagesize_mask) + (((s) + PAGE_MASK) & ~PAGE_MASK) #ifdef MALLOC_TINY /* Compute the smallest power of 2 that is >= x. */ @@ -1693,7 +1678,7 @@ i < ntbins + nqbins + ncbins ? "C" : "S", arena->bins[i].reg_size, arena->bins[i].nregs, - arena->bins[i].run_size >> pagesize_2pow, + arena->bins[i].run_size >> PAGE_SHIFT, #ifdef MALLOC_MAG (__isthreaded && opt_mag) ? arena->bins[i].stats.nmags : @@ -2335,8 +2320,8 @@ arena_avail_comp(arena_chunk_map_t *a, arena_chunk_map_t *b) { int ret; - size_t a_size = a->bits & ~pagesize_mask; - size_t b_size = b->bits & ~pagesize_mask; + size_t a_size = a->bits & ~PAGE_MASK; + size_t b_size = b->bits & ~PAGE_MASK; ret = (a_size > b_size) - (a_size < b_size); if (ret == 0) { @@ -2521,7 +2506,7 @@ SSIZE_INV(4), SSIZE_INV(5), SSIZE_INV(6), SSIZE_INV(7), SSIZE_INV(8), SSIZE_INV(9), SSIZE_INV(10), SSIZE_INV(11), SSIZE_INV(12), SSIZE_INV(13), SSIZE_INV(14), SSIZE_INV(15) -#if (PAGESIZE_2POW == 13) +#if (PAGE_SHIFT == 13) , SSIZE_INV(16), SSIZE_INV(17), SSIZE_INV(18), SSIZE_INV(19), SSIZE_INV(20), SSIZE_INV(21), SSIZE_INV(22), SSIZE_INV(23), @@ -2530,7 +2515,7 @@ #endif }; assert(SUBPAGE * (((sizeof(ssize_invs)) / sizeof(unsigned)) + 3) - >= (1U << PAGESIZE_2POW)); + >= PAGE_SIZE); if (size < (((sizeof(ssize_invs) / sizeof(unsigned)) + 2) << SUBPAGE_2POW)) { @@ -2562,10 +2547,10 @@ chunk = (arena_chunk_t *)CHUNK_ADDR2BASE(run); old_ndirty = chunk->ndirty; run_ind = (unsigned)(((uintptr_t)run - (uintptr_t)chunk) - >> pagesize_2pow); - total_pages = (chunk->map[run_ind].bits & ~pagesize_mask) >> - pagesize_2pow; - need_pages = (size >> pagesize_2pow); + >> PAGE_SHIFT); + total_pages = (chunk->map[run_ind].bits & ~PAGE_MASK) >> + PAGE_SHIFT; + need_pages = (size >> PAGE_SHIFT); assert(need_pages > 0); assert(need_pages <= total_pages); rem_pages = total_pages - need_pages; @@ -2575,11 +2560,11 @@ /* Keep track of trailing unused pages for later use. */ if (rem_pages > 0) { chunk->map[run_ind+need_pages].bits = (rem_pages << - pagesize_2pow) | (chunk->map[run_ind+need_pages].bits & - pagesize_mask); + PAGE_SHIFT) | (chunk->map[run_ind+need_pages].bits & + PAGE_MASK); chunk->map[run_ind+total_pages-1].bits = (rem_pages << - pagesize_2pow) | (chunk->map[run_ind+total_pages-1].bits & - pagesize_mask); + PAGE_SHIFT) | (chunk->map[run_ind+total_pages-1].bits & + PAGE_MASK); arena_avail_tree_insert(&arena->runs_avail, &chunk->map[run_ind+need_pages]); } @@ -2590,7 +2575,7 @@ if ((chunk->map[run_ind + i].bits & CHUNK_MAP_ZEROED) == 0) { memset((void *)((uintptr_t)chunk + ((run_ind - + i) << pagesize_2pow)), 0, pagesize); + + i) << PAGE_SHIFT)), 0, PAGE_SIZE); /* CHUNK_MAP_ZEROED is cleared below. */ } } @@ -2706,7 +2691,7 @@ arena_chunk_map_t *mapelm, key; assert(size <= arena_maxclass); - assert((size & pagesize_mask) == 0); + assert((size & PAGE_MASK) == 0); /* Search the arena's chunks for the lowest best fit. */ key.bits = size | CHUNK_MAP_KEY; @@ -2717,7 +2702,7 @@ / sizeof(arena_chunk_map_t); run = (arena_run_t *)((uintptr_t)run_chunk + (pageind - << pagesize_2pow)); + << PAGE_SHIFT)); arena_run_split(arena, run, size, large, zero); return (run); } @@ -2729,7 +2714,7 @@ if (chunk == NULL) return (NULL); run = (arena_run_t *)((uintptr_t)chunk + (arena_chunk_header_npages << - pagesize_2pow)); + PAGE_SHIFT)); /* Update page map. */ arena_run_split(arena, run, size, large, zero); return (run); @@ -2781,7 +2766,7 @@ arena->ndirty -= npages; madvise((void *)((uintptr_t)chunk + (i << - pagesize_2pow)), (npages << pagesize_2pow), + PAGE_SHIFT)), (npages << PAGE_SHIFT), MADV_FREE); #ifdef MALLOC_STATS arena->stats.nmadvise++; @@ -2807,14 +2792,14 @@ chunk = (arena_chunk_t *)CHUNK_ADDR2BASE(run); run_ind = (size_t)(((uintptr_t)run - (uintptr_t)chunk) - >> pagesize_2pow); + >> PAGE_SHIFT); assert(run_ind >= arena_chunk_header_npages); assert(run_ind < chunk_npages); if ((chunk->map[run_ind].bits & CHUNK_MAP_LARGE) != 0) - size = chunk->map[run_ind].bits & ~pagesize_mask; + size = chunk->map[run_ind].bits & ~PAGE_MASK; else size = run->bin->run_size; - run_pages = (size >> pagesize_2pow); + run_pages = (size >> PAGE_SHIFT); /* Mark pages as unallocated in the chunk map. */ if (dirty) { @@ -2841,15 +2826,15 @@ } } chunk->map[run_ind].bits = size | (chunk->map[run_ind].bits & - pagesize_mask); + PAGE_MASK); chunk->map[run_ind+run_pages-1].bits = size | - (chunk->map[run_ind+run_pages-1].bits & pagesize_mask); + (chunk->map[run_ind+run_pages-1].bits & PAGE_MASK); /* Try to coalesce forward. */ if (run_ind + run_pages < chunk_npages && (chunk->map[run_ind+run_pages].bits & CHUNK_MAP_ALLOCATED) == 0) { size_t nrun_size = chunk->map[run_ind+run_pages].bits & - ~pagesize_mask; + ~PAGE_MASK; /* * Remove successor from runs_avail; the coalesced run is @@ -2859,22 +2844,22 @@ &chunk->map[run_ind+run_pages]); size += nrun_size; - run_pages = size >> pagesize_2pow; + run_pages = size >> PAGE_SHIFT; - assert((chunk->map[run_ind+run_pages-1].bits & ~pagesize_mask) + assert((chunk->map[run_ind+run_pages-1].bits & ~PAGE_MASK) == nrun_size); chunk->map[run_ind].bits = size | (chunk->map[run_ind].bits & - pagesize_mask); + PAGE_MASK); chunk->map[run_ind+run_pages-1].bits = size | - (chunk->map[run_ind+run_pages-1].bits & pagesize_mask); + (chunk->map[run_ind+run_pages-1].bits & PAGE_MASK); } /* Try to coalesce backward. */ if (run_ind > arena_chunk_header_npages && (chunk->map[run_ind-1].bits & CHUNK_MAP_ALLOCATED) == 0) { - size_t prun_size = chunk->map[run_ind-1].bits & ~pagesize_mask; + size_t prun_size = chunk->map[run_ind-1].bits & ~PAGE_MASK; - run_ind -= prun_size >> pagesize_2pow; + run_ind -= prun_size >> PAGE_SHIFT; /* * Remove predecessor from runs_avail; the coalesced run is @@ -2884,21 +2869,21 @@ &chunk->map[run_ind]); size += prun_size; - run_pages = size >> pagesize_2pow; + run_pages = size >> PAGE_SHIFT; - assert((chunk->map[run_ind].bits & ~pagesize_mask) == + assert((chunk->map[run_ind].bits & ~PAGE_MASK) == prun_size); chunk->map[run_ind].bits = size | (chunk->map[run_ind].bits & - pagesize_mask); + PAGE_MASK); chunk->map[run_ind+run_pages-1].bits = size | - (chunk->map[run_ind+run_pages-1].bits & pagesize_mask); + (chunk->map[run_ind+run_pages-1].bits & PAGE_MASK); } /* Insert into runs_avail, now that coalescing is complete. */ arena_avail_tree_insert(&arena->runs_avail, &chunk->map[run_ind]); /* Deallocate chunk if it is now completely unused. */ - if ((chunk->map[arena_chunk_header_npages].bits & (~pagesize_mask | + if ((chunk->map[arena_chunk_header_npages].bits & (~PAGE_MASK | CHUNK_MAP_ALLOCATED)) == arena_maxclass) arena_chunk_dealloc(arena, chunk); @@ -2911,8 +2896,8 @@ arena_run_trim_head(arena_t *arena, arena_chunk_t *chunk, arena_run_t *run, size_t oldsize, size_t newsize) { - size_t pageind = ((uintptr_t)run - (uintptr_t)chunk) >> pagesize_2pow; - size_t head_npages = (oldsize - newsize) >> pagesize_2pow; + size_t pageind = ((uintptr_t)run - (uintptr_t)chunk) >> PAGE_SHIFT; + size_t head_npages = (oldsize - newsize) >> PAGE_SHIFT; assert(oldsize > newsize); @@ -2932,8 +2917,8 @@ arena_run_trim_tail(arena_t *arena, arena_chunk_t *chunk, arena_run_t *run, size_t oldsize, size_t newsize, bool dirty) { - size_t pageind = ((uintptr_t)run - (uintptr_t)chunk) >> pagesize_2pow; - size_t npages = newsize >> pagesize_2pow; + size_t pageind = ((uintptr_t)run - (uintptr_t)chunk) >> PAGE_SHIFT; + size_t npages = newsize >> PAGE_SHIFT; assert(oldsize > newsize); @@ -2962,7 +2947,7 @@ if (mapelm != NULL) { /* run is guaranteed to have available space. */ arena_run_tree_remove(&bin->runs, mapelm); - run = (arena_run_t *)(mapelm->bits & ~pagesize_mask); + run = (arena_run_t *)(mapelm->bits & ~PAGE_MASK); #ifdef MALLOC_STATS bin->stats.reruns++; #endif @@ -3053,7 +3038,7 @@ unsigned good_nregs, good_mask_nelms, good_reg0_offset; unsigned try_nregs, try_mask_nelms, try_reg0_offset; - assert(min_run_size >= pagesize); + assert(min_run_size >= PAGE_SIZE); assert(min_run_size <= arena_maxclass); assert(min_run_size <= RUN_MAX_SMALL); @@ -3089,7 +3074,7 @@ good_reg0_offset = try_reg0_offset; /* Try more aggressive settings. */ - try_run_size += pagesize; + try_run_size += PAGE_SIZE; try_nregs = ((try_run_size - sizeof(arena_run_t)) / bin->reg_size) + 1; /* Counter-act try_nregs-- in loop. */ do { @@ -3405,8 +3390,8 @@ size_t offset; arena_chunk_t *chunk; - assert((size & pagesize_mask) == 0); - assert((alignment & pagesize_mask) == 0); + assert((size & PAGE_MASK) == 0); + assert((alignment & PAGE_MASK) == 0); #ifdef MALLOC_BALANCE arena_lock_balance(arena); @@ -3422,7 +3407,7 @@ chunk = (arena_chunk_t *)CHUNK_ADDR2BASE(ret); offset = (uintptr_t)ret & (alignment - 1); - assert((offset & pagesize_mask) == 0); + assert((offset & PAGE_MASK) == 0); assert(offset < alloc_size); if (offset == 0) arena_run_trim_tail(arena, chunk, ret, alloc_size, size, false); @@ -3492,7 +3477,7 @@ return (NULL); } - if (ceil_size <= pagesize || (alignment <= pagesize + if (ceil_size <= PAGE_SIZE || (alignment <= PAGE_SIZE && ceil_size <= arena_maxclass)) ret = arena_malloc(choose_arena(), ceil_size, false); else { @@ -3506,7 +3491,7 @@ ceil_size = PAGE_CEILING(size); /* * (ceil_size < size) protects against very large sizes within - * pagesize of SIZE_T_MAX. + * PAGE_SIZE of SIZE_T_MAX. * * (ceil_size + alignment < ceil_size) protects against the * combination of maximal alignment and ceil_size large enough @@ -3526,18 +3511,18 @@ * would need to allocate in order to guarantee the alignment. */ if (ceil_size >= alignment) - run_size = ceil_size + alignment - pagesize; + run_size = ceil_size + alignment - PAGE_SIZE; else { /* * It is possible that (alignment << 1) will cause * overflow, but it doesn't matter because we also - * subtract pagesize, which in the case of overflow + * subtract PAGE_SIZE, which in the case of overflow * leaves us with a very large run_size. That causes * the first conditional below to fail, which means * that the bogus run_size value never gets used for * anything important. */ - run_size = (alignment << 1) - pagesize; + run_size = (alignment << 1) - PAGE_SIZE; } if (run_size <= arena_maxclass) { @@ -3565,15 +3550,15 @@ assert(CHUNK_ADDR2BASE(ptr) != ptr); chunk = (arena_chunk_t *)CHUNK_ADDR2BASE(ptr); - pageind = (((uintptr_t)ptr - (uintptr_t)chunk) >> pagesize_2pow); + pageind = (((uintptr_t)ptr - (uintptr_t)chunk) >> PAGE_SHIFT); mapbits = chunk->map[pageind].bits; assert((mapbits & CHUNK_MAP_ALLOCATED) != 0); if ((mapbits & CHUNK_MAP_LARGE) == 0) { - arena_run_t *run = (arena_run_t *)(mapbits & ~pagesize_mask); + arena_run_t *run = (arena_run_t *)(mapbits & ~PAGE_MASK); assert(run->magic == ARENA_RUN_MAGIC); ret = run->bin->reg_size; } else { - ret = mapbits & ~pagesize_mask; + ret = mapbits & ~PAGE_MASK; assert(ret != 0); } @@ -3622,7 +3607,7 @@ arena_bin_t *bin; size_t size; - run = (arena_run_t *)(mapelm->bits & ~pagesize_mask); + run = (arena_run_t *)(mapelm->bits & ~PAGE_MASK); assert(run->magic == ARENA_RUN_MAGIC); bin = run->bin; size = bin->reg_size; @@ -3639,7 +3624,7 @@ bin->runcur = NULL; else if (bin->nregs != 1) { size_t run_pageind = (((uintptr_t)run - - (uintptr_t)chunk)) >> pagesize_2pow; + (uintptr_t)chunk)) >> PAGE_SHIFT; arena_chunk_map_t *run_mapelm = &chunk->map[run_pageind]; /* @@ -3670,7 +3655,7 @@ CHUNK_ADDR2BASE(bin->runcur); size_t runcur_pageind = (((uintptr_t)bin->runcur - - (uintptr_t)runcur_chunk)) >> pagesize_2pow; + (uintptr_t)runcur_chunk)) >> PAGE_SHIFT; arena_chunk_map_t *runcur_mapelm = &runcur_chunk->map[runcur_pageind]; @@ -3681,7 +3666,7 @@ bin->runcur = run; } else { size_t run_pageind = (((uintptr_t)run - - (uintptr_t)chunk)) >> pagesize_2pow; + (uintptr_t)chunk)) >> PAGE_SHIFT; arena_chunk_map_t *run_mapelm = >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sat Sep 13 22:20:14 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 554521065675; Sat, 13 Sep 2008 22:20:14 +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 18B661065672 for ; Sat, 13 Sep 2008 22:20: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 0EC568FC1D for ; Sat, 13 Sep 2008 22:20: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 m8DMKDAR047883 for ; Sat, 13 Sep 2008 22:20:13 GMT (envelope-from rene@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m8DMKDx0047782 for perforce@freebsd.org; Sat, 13 Sep 2008 22:20:13 GMT (envelope-from rene@FreeBSD.org) Date: Sat, 13 Sep 2008 22:20:13 GMT Message-Id: <200809132220.m8DMKDx0047782@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 149727 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, 13 Sep 2008 22:20:14 -0000 http://perforce.freebsd.org/chv.cgi?CH=149727 Change 149727 by rene@rene_self on 2008/09/13 22:19:12 MFen firewalls/chapter.sgml 1.78 -> 1.85 Checked for build, whitespace, spelling Affected files ... .. //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/firewalls/chapter.sgml#3 edit Differences ... ==== //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/firewalls/chapter.sgml#3 (text+ko) ==== @@ -3,7 +3,9 @@ $FreeBSD: doc/nl_NL.ISO8859-1/books/handbook/firewalls/chapter.sgml,v 1.8 2007/12/31 08:01:12 remko Exp $ $FreeBSDnl: doc/nl_NL.ISO8859-1/books/handbook/firewalls/chapter.sgml,v 1.33 2006/01/05 21:13:21 siebrand Exp $ - Gebaseerd op: 1.78 + + %SOURCE% en_US.ISO8859-1/books/handbook/firewalls/chapter.sgml + %SRCID% 1.85 --> @@ -62,11 +64,11 @@ Applicaties, diensten en machines op een intern netwerk te beschermen tegen ongewild verkeer van het - internet. + Internet. - Toegang tot internet voor interne hosts te limiteren + Toegang tot Internet voor interne hosts te limiteren of uitschakelen. @@ -75,7 +77,7 @@ (network address translation of NAT), waarmee er vanaf een intern netwerk met private IP adressen een - internetverbinding gedeeld kan worden met één + Internetverbinding gedeeld kan worden met één IP adres of met een groep van publieke adressen die automatisch wordt toegewezen. @@ -114,7 +116,7 @@ - Basisbegrip heeft van &os; en internetconcepten. + Basisbegrip heeft van &os; en Internetconcepten. @@ -144,7 +146,7 @@ stateful firewall. Een stateful firewall houdt bij welke connecties er door de firewall tot stand zijn gekomen en laat alleen verkeer door dat bij een bestaande connectie hoort - of onderdeeel is van een connectie in opbouw. Het nadeel van een + of onderdeel is van een connectie in opbouw. Het nadeel van een stateful firewall is dat die kwetsbaar kan zijn voor Ontzegging van Dienst (DoS) aanvallen als er een groot aantal nieuwe verbindingen binnen korte tijd wordt opgezet. Met de meeste @@ -164,7 +166,12 @@ beheersen van bandbreedtegebruik): &man.altq.4; en &man.dummynet.4;. Dummynet is traditioneel sterk verbonden met IPFW en ALTQ met - IPF/PF. IPF, IPFW en PF + PF. Het vormgeven van verkeer voor + IPFILTER kan momenteel gedaan worden met + IPFILTER voor NAT en filtering en + IPFW met &man.dummynet.4; + of door PF met + ALTQ te gebruiken. IPFW en PF gebruiken allemaal regels om de toegang van pakketten tot een systeem te regelen, hoewel ze dat op andere manieren doen en de syntaxis voor regels anders is. @@ -176,7 +183,7 @@ De schrijver van dit artikel geeft de voorkeur aan IPFILTER omdat daarmee stateful regels minder complex zijn toe te passen in een omgeving waar NAT wordt gebruikt en - IPF heeft een ingebouwde ftp proxy waardoor de regels voor het + IPF heeft een ingebouwde FTP proxy waardoor de regels voor het veilig gebruiken van FTP eenvoudiger worden. Omdat alle firewalls gebaseerd zijn op het inspecteren van @@ -189,6 +196,17 @@ + + + + John + Ferrell + Herzien en bijgewerkt door + + + + + De OpenBSD Packet Filter (PF) en <acronym>ALTQ</acronym> @@ -200,63 +218,72 @@ Vanaf juli 2003 is de OpenBSD firewalltoepassing PF geporteerd naar &os; en beschikbaar gekomen - in de &os; Portscollectie. In november 2004 was &os; 5.3 de + in de &os; Portscollectie. In 2004 was &os; 5.3 de eerste release die PF bevatte is integraal onderdeel van het basissysteem. PF is een complete en volledige firewall die optioneel ALTQ bevat (Alternate Queuing). ALTQ biedt Quality of Service - (QoS) bandbreedtebeheersing waardoor een - bepaalde bandbreedte gegarandeerd kan worden aan verschillende - diensten op basis van filterregels. Het OpenBSD project zorgt - voor een erg goed gebruikershandboek voor PF (PF User's Guide) - dat niet in dit onderdeel wordt opgenomen omdat dat niet nodig - is. + (QoS) functionaliteit. + + het OpenBSD Project levert een uitstekend werk wat betreft het + onderhouden van de PF FAQ. Zodoende + zal deze sectie van het handboek zich richten op + PF met betrekking tot &os; terwijl het ook wat + algemene informatie over het gebruik zal geven. Voor + gedetailleerde gebruikersinformatie wordt naar de PF FAQ verwezen. + - Meer informatie staat op de PF voor &os; - website: . + Meer informatie over PF voor &os; staat op + . - PF inschakelen + De laadbare kernelmodule voor PF gebruiken - PF zit in de basisinstallatie van &os; voor versies vanaf - 5.3 als aparte run time laadbare module. Een - systeem laadt de PF laadbare module dynamisch in de kernel als - pf_enable="YES" in - rc.conf staat. In de laadbare module is - loggen via &man.pflog.4; ingeschakeld. + Sinds de uitgave van &os; 5.3 wordt PF geleverd in de + basisinstallatie als een aparte runtime laadbare module. Het + systeem zal de PF kernelmodule dynamisch laden wanneer het + statement pf_enable="YES" voor + &man.rc.conf.5; aanwezig is. De PF module + zal echter niet laden als het systeem geen instellingenbestand + met een PF ruleset kan vinden. De + standaardplaats is /etc/pf.conf. Indien uw + PF ruleset ergens anders staat, voeg dan + pf_rules="/pad/pf.rules" + aan uw instellingenbestand /etc/rc.conf toe + om de plaats te specificeren. - De module verwacht dat options INET en - device bpf beschikbaar zijn. Tenzij - NOINET6 was ingesteld voor &os; versies die - dateren voor 6.0-RELEASE, en NO_INET6 voor - latere releases. (bijvoorbeeld in - &man.make.conf.5;) tijdens het bouwen, is ook - options INET6 nodig. + Sinds &os; 7.0 is het voorbeeld + pf.conf dat in /etc/ stond verplaatst naar + /usr/share/examples/pf/. + Voor versies van &os; voor 7.0 is er standaard een + /etc/pf.conf aanwezig. - Zora de kernel module geladen is of als PF ondersteuning - statisch in de kernel ingebakken is, is het mogelijk om pf met - het pfctl commando aan en uit te zetten: - - &prompt.root; pfctl -e + De module PF kan ook handmatig vanaf de + opdrachtregel geladen worden: + + &prompt.root; kldload pf.ko - Het pfctl commando levert een manier om - te werken met de pf firewall. Het - is een goed idee om de &man.pfctl.8; handleiding te bekijken - voor meer informatie over het gebruik. + De laadbare module was gemaakt met &man.pflog.4; aangezet + dat ondersteuning biedt voor logging. Indien u andere + mogelijkheden van PF nodig heeft dient u + ondersteuning voor PF in de kernel te + compileren. - Kernelopties + Kernelopties voor PF kernelopties device pf - + kernelopties @@ -270,73 +297,171 @@ device pfsync - Het is niet verplicht om PF in te schakelen door het mee - te compileren in de &os; kernel. Dit wordt alleen beschreven - als achtergrondinformatie. Door PF in de kernel te - compileren wordt de laadbare module niet gebruikt. + Hoewel het niet nodig is om ondersteuning voor + PF in de kernel te compileren, biedt dit wel + de mogelijkheid om van een van PF's geavanceerde mogelijkheden + gebruik te maken die niet in de laadbare module zitten, namelijk + &man.pfsync.4;, dat een pseudo-apparaat is dat zekere + veranderingen aan de toestandstabel die door + PF wordt gebruikt prijsgeeft. Het kan worden + gecombineerd met &man.carp.4; om failover firewalls aan te maken + die gebruik maken van PF. Meer informatie + over CARP kan gevonden worden in hoofdstuk 29 van het handboek. + + De kernelopties voor PF kunnen gevonden + worden in /usr/src/sys/conf/NOTES en zijn + hieronder gereproduceerd: - Voorbeeld kernelinstellingen voor PF staan beschreven in - de /usr/src/sys/conf/NOTES kernel source - en worden hier weergegeven: device pf device pflog device pfsync - device pf schakelt ondersteuning voor de - Packet Filter firewall in. + De optie device pf schakelt ondersteuning + voor de Packet Filter firewall (&man.pf.4;) in. + - device pflog schakelt het - optionele &man.pflog.4; pseudo netwerkapparaat in dat gebruikt + De optie device pflog schakelt het + optionele &man.pflog.4; pseudo-netwerkapparaat in dat gebruikt kan worden om verkeer te loggen naar een &man.bpf.4; descriptor. De &man.pflogd.8; daemon kan gebruikt worden om de logboekinformatie naar schijf te schrijven. - device pfsync schakelt het + De optie device pfsync schakelt het optionele &man.pfsync.4; pseudo netwerkapparaat in waarmee de - state wijzigingen gemonitord kunnen worden. - Omdat dit geen onderdeel is van de laadbare module, moet dit - in een aangepaste kernel gebouwd worden om het te kunnen - gebruiken. - - Deze instellingen worden pas actief nadat een kernel - waarvoor deze instellingen zijn gemaakt is gebouwd en - geïnstalleerd. + toestandswijzigingen gemonitord kunnen worden. + - Beschikbare opties voor - <filename>rc.conf</filename> + Beschikbare opties voor <filename>rc.conf</filename> + - De volgende instellingen moeten in /etc/rc.conf - staan om PF bij het booten te activeren: + De volgende &man.rc.conf.5; statements stellen + PF en &man.pflog.4; in tijdens het opstarten: + pf_enable="YES" # Schakel PF in (laad module als nodig) pf_rules="/etc/pf.conf" # bestand met regels voor pf -pf_flags="" # aanvullende vraagen voor opstarten pfctl +pf_flags="" # aanvullende vragen voor opstarten pfctl pflog_enable="YES" # start pflogd(8) pflog_logfile="/var/log/pflog" # waar pflogd het logboekbestand moet opslaan pflog_flags="" # aanvullende vlaggen voor opstarten pflogd Als er een LAN achter de firewall staat en er pakketten - doorgestuurd moeten worden naar computers op dat LAN of als - NAT actief is, dan moet de volgende optie ook ingesteld - worden: + doorgestuurd moeten worden naar computers op het LAN of als + NAT actief is, dan is de volgende optie ook nodig: gateway_enable="YES" # Schakel in als LAN gateway + Filterregels aanmaken + + PF leest de instelregels van + &man.pf.conf.5; (standaard /etc/pf.conf) en + het verandert, verwijdert, of geeft pakketten door aan de hand + van de regels of definities die daar zijn gespecificeerd. De + &os;-installatie bevat een aantal voorbeeldbestanden in + /usr/share/examples/pf/. In de PF FAQ staat een + complete behandeling van de PF regels. + + + Houd tijdens het doornemen van de PF FAQ in de gaten + dat verschillende versies van &os; verschillende versies van + PF bevatten: + + + + &os; 5.X — + PF is op OpenBSD 3.5 + + + + &os; 6.X — + PF is op OpenBSD 3.7 + + + + &os; 7.X — + PF is op OpenBSD 4.1 + + + + + De &a.pf; is een goede plaats om vragen over het instellen + en draaien van de PF firewall te stellen. + Vergeet niet de mailinglijstarchieven te controleren alvorens + vragen te stellen! + + + + Werken met PF + + Gebruik &man.pfctl.8; om PF te beheren. + Hieronder staan wat nuttige commando's (bekijk de hulppagina + &man.pfctl.8; voor alle beschikbare opties): + + + + + + Commando + Doel + + + + + + pfctl + + PF aanzetten + + + + pfctl + + PF uitzetten + + + + pfctl all /etc/pf.conf + + Spoel alle regels door (nat, filter, toestand, + tabel, etc.) en herlaad vanuit het bestand + /etc/pf.conf + + pfctl [ rules | nat | state ] + + Rapporteer over de filterregels, NAT-regels, of + toestandstabel + + + + pfctl /etc/pf.conf + + Controleer /etc/pf.conf op + fouten, maar laad de ruleset niet + + + + + + + <acronym>ALTQ</acronym> inschakelen - ALTQ is alleen beschikbaar door de - opties in de &os; Kernel te compileren. - ALTQ wordt niet door alle - netwerkkaartstuurprogramma's ondersteund. In &man.altq.4; - staat een lijst met ondersteunde stuurprogramma's voor de - betreffende versie. Met de volgende opties wordt - ALTQ ingeschakeld en additionele - functionaliteit toegevoegd: + ALTQ is alleen beschikbaar ondersteuning + ervoor in de &os; Kernel te compileren. ALTQ + wordt niet door alle netwerkkaartstuurprogramma's ondersteund. + In &man.altq.4; staat een lijst met ondersteunde + stuurprogramma's voor de betreffende versie. + + Met de volgende opties wordt ALTQ + ingeschakeld en additionele functionaliteit toegevoegd: options ALTQ options ALTQ_CBQ # Class Bases Queuing (CBQ) @@ -347,12 +472,12 @@ options ALTQ_NOPCC # Required for SMP build options ALTQ schakelt het - ALTQ framework in. + ALTQ raamwerk in. options ALTQ_CBQ schakelt Class Based Queuing (CBQ) in. Met CBQ kan de bandbreedte van een verbinding - worden opgedeeld in verschillende klasses of wachtrijen om + worden opgedeeld in verschillende klassen of wachtrijen om verkeer te prioriteren op basis van filterregels. options ALTQ_RED schakelt Random Early @@ -383,38 +508,6 @@ ALTQ in. Deze optie is verplicht op SMP systemen. - - - Filter regels aanmaken - - De pakket filter leest zijn configuratie regels uit het - &man.pf.conf.5; bestand en het veranderd, dropt, of accepteert - pakketjes zoals gedefinieerd in de filter regels. De &os; - installatie komt met een standaard - /etc/pf.conf waarin nuttige voorbeelden - en uitleg staat. - - Ook al heeft &os; zijn eigen /etc/pf.conf - bestand, de configuratie is hetzelfde als in OpenBSD. Een - geweldige bron voor het configureren van - pf is geschreven door het OpenBSD - team en is beschikbaar op . - - - Wanneer door de pf gebruikers handleiding wordt - gebladerd, houd er dan rekening mee dat elke &os; - versie een andere versie van pf gebruikt. De - pf firewall in &os; 5.X zit - op het niveau van OpenBSD versie 3.5 en in &os; 6.X zit - het op het niveau van OpenBSD versie 3.7 - - - De &a.pf; is een goede plek om vragen te stellen over het - configureren en het draaien van de pf. - Vergeet niet om eerst de mailing lijst te controleren voor er - vragen gesteld worden. - @@ -451,7 +544,7 @@ IPF is oorspronkelijk geschreven met logica die regels verwerkte volgens het principe de laatst passende regel - wint en gebruikte toen alleen staatloze regels. In de + wint en gebruikte toen alleen staatloze regels. In de loop der tijd is IPF verbeterd en zijn de opties quick en keep state toegevoegd waarmee de logica van het verwerken van regels @@ -471,7 +564,7 @@ voldoen aan de regels. Op die manier kan er in de hand gehouden worden welke diensten van binnen de firewall naar buiten mogen en welke diensten op het private netwerk vanaf - het internet bereikbaar zijn. Al het andere verkeer wordt + het Internet bereikbaar zijn. Al het andere verkeer wordt vanuit het ontwerp standaard geblokkeerd en gelogd. Inclusieve firewalls zijn veel veiliger dan exclusieve firewalls. Het is ook de enige wijze voor de opzet van een @@ -741,7 +834,7 @@ gebeurtenissen in het verleden te bekijken. Zo zijn &os; en IPFILTER ingesteld om samen te werken. &os; heeft ingebouwde mogelijkheden om automatisch syslogs te roteren. Daarom is - het beter om de uitvoer naar &man.syslogd.8; te geschrijven + het beter om de uitvoer naar &man.syslogd.8; te schrijven dan naar een gewoon bestand. In rc.conf is te zien dat de instelling ipmon_flags de waarde heeft: @@ -994,7 +1087,7 @@ scripts niet direct lezen. Dit script kan gebruikt worden op één van de - volgende twee manieren: + volgende twee manieren: @@ -1043,9 +1136,9 @@ bi-directionele uitwisseling van pakketten tussen hosts bestaat uit een gesprek dat een sessie heet. De set van firewallregels beoordeelt pakketten twee keer: als het - aankomt van de host op het publieke internet en als het de + aankomt van de host op het publieke Internet en als het de host weer verlaat op de weg terug naar de host op het - publieke internet. Iedere TCP/IP dienst + publieke Internet. Iedere TCP/IP dienst als telnet, www, mail, etc, heeft zijn eigen protocol, bron IP adres en bestemmings IP adres of de bron- en bestemmingspoort. @@ -1077,7 +1170,7 @@ voldoen aan de regels. Op die manier kan er in de hand gehouden worden welke diensten van binnen de firewall naar buiten mogen en welke diensten op het private netwerk vanaf - het internet bereikbaar zijn. Al het andere verkeer wordt + het Internet bereikbaar zijn. Al het andere verkeer wordt vanuit het ontwerp standaard geblokkeerd en gelogd. Inclusieve firewalls zijn veel veiliger dan exclusieve firewalls. Het is ook de enige wijze voor de opzet van een @@ -1375,7 +1468,7 @@ Met stateful filteren wordt verkeer benaderd als een uitwisseling van pakketten tussen twee kanten die een sessie zijn. Als het is ingeschakeld, dan maakt het - mechamisme dynamisch interne + mechanisme dynamisch interne regels voor pakketten die in de sessie horen te volgen. Het kan bekijken of de karakteristieken van de sessie tussen verzender en ontvanger de juiste procedure volgen. Alle @@ -1392,7 +1485,7 @@ zijn. Wat er gebeurt: pakketten die naar buiten gaan op de - interface die met internet is verbonden worden eerst + interface die met Internet is verbonden worden eerst vergeleken met de dynamische staattabel. Als een pakket voldoet aan de verwachting van het volgende pakket in de sessie, dan mag het de firewall verlaten en wordt de @@ -1401,7 +1494,7 @@ verkeer. Pakketten die binnenkomen op de interface die met - internet is verbonden worden eerst vergeleken met de + Internet is verbonden worden eerst vergeleken met de dynamische staattabel. Als een pakket voldoet aan de verwachting van het volgende pakket in de sessie, dan mag het de firewall verlaten en wordt de staattabel bijgewerkt. De @@ -1415,11 +1508,11 @@ leggen op het blokkeren of toestaan van nieuwe sessies. Als een nieuwe sessie tot stand mag komen, dan worden alle volgende pakketten automatisch doorgelaten en al het - vervalste verkeer wordt automatisch tegegehouden. Als een + vervalste verkeer wordt automatisch tegengehouden. Als een nieuwe sessie wordt geweigerd, dan wordt geen enkel pakket doorgelaten. Met stateful filteren zijn er uitgebreide mogelijkheden voor onderzoek om bescherming te bieden tegen - de veelheid aan aanvallen die tegenwoorden door aanvallers + de veelheid aan aanvallen die tegenwoordig door aanvallers worden uitgevoerd. @@ -1442,8 +1535,8 @@ vinden. Voor de interface die is verbonden met het publieke - internet worden regels gemaakt waarmee sessies naar het - internet mogelijk gemaakt worden en toegang wordt gegeven + Internet worden regels gemaakt waarmee sessies naar het + Internet mogelijk gemaakt worden en toegang wordt gegeven voor pakketten die uit die sessies terug komen. Dit kan de PPP interface tun0 zijn of de netwerkkaart die is verbonden met een xDSL of @@ -1466,7 +1559,7 @@ In het onderdeel Uitgaand staan alleen regels met pass die parameters bevatten om - individuele diensten beschikbaar te maken zodat er internet + individuele diensten beschikbaar te maken zodat er Internet toegang is. Al die regels moeten gebruik maken van quick, on, proto, port en @@ -1517,7 +1610,7 @@ De onderstaande set regels is een complete en erg veilige inclusieve set met regels voor een firewall die de auteur - zelf heeft gebruikt op zijn syteem. Deze set met regels is + zelf heeft gebruikt op zijn systeem. Deze set met regels is een aanrader en eenvoudig aan te passen door commentaar te maken van een regel voor een dienst die niet gewenst is. @@ -1529,7 +1622,7 @@ Voor de onderstaande regels dient de dc0 interfacenaam in iedere regel vervangen te worden door de interfacenaam van de netwerkkaart - in het systeem die met het publieke internet is verbonden. + in het systeem die met het publieke Internet is verbonden. Voor gebruikers van PPP zou dat tun0 zijn. @@ -1551,22 +1644,22 @@ pass out quick on lo0 all ################################################################# -# Interface aan het publieke internet (onderdeel Uitgaand). +# Interface aan het publieke Internet (onderdeel Uitgaand). # Inspecteer verzoeken om een sessie te starten van achter de # firewall op het private netwerk of vanaf de server zelf naar -# het publieke internet. +# het publieke Internet. ################################################################# # Geef toegang tot de DNS server van de ISP. # xxx moet het IP adres van de DNS van de ISP zijn. -# Dupliceer deze regels als een ISP meedere DNS servers heeft. +# Dupliceer deze regels als een ISP meerdere DNS servers heeft. # Haal het IP adres evt. uit /etc/resolv.conf. pass out quick on dc0 proto tcp from any to xxx port = 53 flags S keep state pass out quick on dc0 proto udp from any to xxx port = 53 keep state # Geef toegang tot de DHCP server van de ISP voor kabel- en # xDSL-netwerken. Deze regel is niet nodig als gebruik gemaakt worden -# van PPP naar het publieke internet. In dat geval kan de hele groep +# van PPP naar het publieke Internet. In dat geval kan de hele groep # verwijderd worden. Gebruik de volgende regel en controleer het # logboek voor het IP adres. Wijzig dan het IP adres in de regel # commentaar hieronder en verwijder de eerste regel. @@ -1593,7 +1686,7 @@ # (zowel passieve als actieve modes). Deze functie maakt gebruik van # de in IPNAT ingebouwde FTP proxy die in het bestand met nat regels # staat om dit in één regel te laten werken. Als er met -# pkg_add packages toegevoegd moeten kunnen worden op een systeem, dan +# pkg_add pakketten toegevoegd moeten kunnen worden op een systeem, dan # is deze regel nodig. pass out quick on dc0 proto tcp from any to any port = 21 flags S keep state @@ -1607,10 +1700,10 @@ # Sta de &os; CVSUP functie toe. pass out quick on dc0 proto tcp from any to any port = 5999 flags S keep state -# Sta ping toe naar het publieke internet. +# Sta ping toe naar het publieke Internet. pass out quick on dc0 proto icmp from any to any icmp–type 8 keep state -# Sta whois toe vanaf overal naar het publieke internet. +# Sta whois toe vanaf overal naar het publieke Internet. pass out quick on dc0 proto tcp from any to any port = 43 flags S keep state # Blokkeer en log het eerste voorkomen van al het andere dat probeert @@ -1618,8 +1711,8 @@ block out log first quick on dc0 all ################################################################# -# Interface aan het publieke internet (onderdeel Inkomend). -# Inspecteert pakketten die van het publieke internet komen +# Interface aan het publieke Internet (onderdeel Inkomend). +# Inspecteert pakketten die van het publieke Internet komen # met als bestemming de host zelf of het private netwerk. ################################################################# @@ -1638,7 +1731,7 @@ ##### Blokkeer wat vervelende dingen ############ # die niet in de logboeken moeten komen. -# Blokkeer flagmenten. +# Blokkeer fragmenten. block in quick on dc0 all with frags # Block korte TCP pakketten. @@ -1673,21 +1766,21 @@ # moet het IP adres van de DHCP server van de ISP bevatten omdat die # de enige toegestane bron van dit type pakketten moet zijn. Alleen # van belang voor kabel en xDSL instellingen. Deze regel is niet nodig -# voor PPP verbindingen naar het publieke internet. Dit is hetzelfde +# voor PPP verbindingen naar het publieke Internet. Dit is hetzelfde # IP adres dat in het Uitgaande onderdeel is opgezocht. pass in quick on dc0 proto udp from z.z.z.z to any port = 68 keep state # Sta inkomend webverkeer toe omdat er een Apache server draait. pass in quick on dc0 proto tcp from any to any port = 80 flags S keep state -# Sta niet beveiligde telnet sessie toe vanaf het publieke internet. +# Sta niet beveiligde telnet sessie toe vanaf het publieke Internet. # Dit heeft het label niet veilig omdat gebruikersnaam en -# wachtwoord als platte tekst over internet gaan. Als er geen telnet +# wachtwoord als platte tekst over Internet gaan. Als er geen telnet # server draait, hoeft deze regel niet actief te zijn. #pass in quick on dc0 proto tcp from any to any port = 23 flags S keep state -# Sta beveiligde FTP, telnet en SCP toe vanaf internet. -# Deze functie gebruik SSH(secure shell). +# Sta beveiligde FTP, telnet en SCP toe vanaf Internet. +# Deze functie gebruik SSH (secure shell). pass in quick on dc0 proto tcp from any to any port = 22 flags S keep state # Blokkeer en log het eerste voorkomen van al het andere dat probeert @@ -1714,20 +1807,20 @@ network address translation NAT - + netwerkadres vertaling NAT - + NAT staat voor Network Address Translation (netwerkadres vertaling). In &linux; heet dit IP Masquerading. Een van de vele mogelijkheden die IPF NAT kan bieden is het delen van één IP adres op het publieke - internet met een LAN achter een firewall. + Internet met een LAN achter een firewall. De vraag zou kunnen rijzen waarom iemand dat zou willen. ISP's wijzen normaliter namelijk dynamisch een @@ -1737,10 +1830,10 @@ dat de kabel- of xDSL-modem uit- en aangeschakeld wordt anders kan zijn. Dit IP adres is het adres waarmee een netwerkapparaat bekend is op het publieke - internet. + Internet. Stel dat er vijf PC's in een huis staan en iedere - computer in dat huis heeft toegang tot internet nodig. Dan + computer in dat huis heeft toegang tot Internet nodig. Dan zouden er bij een ISP vijf individuele accounts moeten zijn en vijf telefoonlijnen om dat te realiseren. @@ -1751,13 +1844,13 @@ NAT zal automatisch de private LAN IP adressen van alle PC's vertalen naar een enkel publiek IP adres als de - pakketten de firewall naar het internet verlaten. + pakketten de firewall naar het Internet verlaten. NAT wordt vaak gebruikt zonder toestemming of wetenschap van een ISP en in de meeste gevallen is het, als het wordt ontdekt, grond voor een ISP om de account op te zeggen. Commerciële gebruikers - betalen veel meer voor hun internet verbindingen en krijgen + betalen veel meer voor hun Internet verbindingen en krijgen vaak een reeks statische IP adressen die nooit verandert. Een ISP verwacht en staat toe dat commerciële gebruikers NAT inzetten @@ -1767,7 +1860,7 @@ adressen gereserveerd voor NAT op LANs. Volgens RFC 1918 kunnen de volgende reeksen IP adressen gebruikt worden op private - netwerken die nooit direct op het publieke internet + netwerken die nooit direct op het publieke Internet gerouteerd worden. @@ -1915,7 +2008,7 @@ met het sleutelwoord 0.32. NAT werkt dan zijn interne NAT tabel bij, zodat als er een pakket uit - die sessie terugkomt van het publieke internet, dat pakket + die sessie terugkomt van het publieke Internet, dat pakket weer gepast kan worden bij het originele private IP adres en door de firewallregels gefilterd kan worden om daarna, als dat mag, naar een client @@ -1985,7 +2078,7 @@ In grote netwerken komt er een moment waarop er gewoon te veel adressen zijn om te bedienen met één IP adres. Als er een blok van publiekelijke - IP addressen beschikbaar is, dan kunnen deze adressen + IP adressen beschikbaar is, dan kunnen deze adressen gebruikt worden in een poel, welke door IPNAT gebruikt kan worden om één van de adressen te gebruiken als uitgaand @@ -2030,7 +2123,7 @@ rdr dc0 0.0.0.0/32 port 80 -> 10.0.10.25 port 80 - Voor een DNS server op een LAN die ook vanuit internet + Voor een DNS server op een LAN die ook vanuit Internet bereikbaar met zijn en die draait op 10.0.10.33 zou de regel er als volgt uit zien: @@ -2041,7 +2134,7 @@ FTP en <acronym>NAT</acronym> - FTP is dinosaurus uit het tijdperk van voor internet was + FTP is dinosaurus uit het tijdperk van voor Internet was zoals het nu is, toen onderzoeksinstellingen met elkaar verbonden waren via huurlijnen en FTP de aangewezen methode was om bestanden met elkaar uit te wisselen. Maar bij het @@ -2108,7 +2201,7 @@ nodig. Zonder de FTP proxy zouden er drie regels nodig zijn: - # Sta LAN client toe te FTP-en naar internet + # Sta LAN client toe te FTP-en naar Internet # Actieve en passieve modes pass out quick on rl0 proto tcp from any to any port = 21 flags S keep state @@ -2178,7 +2271,7 @@ IPFW zit bij de basisinstallatie van &os; als een losse - in run-time laadbare module. Het systeem laadt de kernel + in runtime laadbare module. Het systeem laadt de kernel module dynamisch als in rc.conf firewall_enable="YES" staat. IPFW hoeft niet in de &os; kernel gecompileerd te worden, tenzij het @@ -2358,7 +2451,7 @@ Aan de andere kant is het mogelijk om de firewall_script variabele te zetten naar een absoluut pad van een uitvoerbaar bestand, welke inclusief - ipfw commandos uitgevoerd wordt tijdens het + ipfw commando's uitgevoerd wordt tijdens het opstarten van het systeem. Een geldig ruleset script dat gelijkwaardig is aan het ruleset bestand hierboven, zou het volgende zijn: @@ -2377,7 +2470,7 @@ /etc/rc.firewall gecontroleerd worden om te zien of deze configuratie voldoet voor de machine. Let ook op dat alle voorbeelden die gebruikt zijn in dit hoofdstuk - ervanuit gaan dat de firewall_script + ervan uitgaan dat de firewall_script variabele gezet is naar /etc/ipfw.rules. @@ -2387,7 +2480,7 @@ Het enige dat de variabele - firewall_logging doet is de sysctlt + firewall_logging doet is de sysctl variabele net.inet.ip.fw.verbose op de waarde 1 zetten (zie ). Er is geen variabele in @@ -2402,8 +2495,8 @@ Als de machine in kwestie een gateway is, dus Network Address Translation (NAT) diensten levert via &man.natd.8;, dan staat in meer informatie over de - benodigde installingen voor - /etc/rc.conf. + benodigde instellingen voor + /etc/rc.conf. @@ -2437,7 +2530,7 @@ &prompt.root; ipfw –t list Het volgende commando kan gebruikt worden om de - verantwoordingsinformatie, pakettellers en de regel zelf te + verantwoordingsinformatie, pakkettellers en de regel zelf te tonen. De eerste kolom is het regelnummer met daarachter het aantal keren dat de regel van toepassing was voor inkomend verkeer, gevolgd door het aantal keren dat de regel @@ -2474,8 +2567,8 @@ uitwisseling van pakketten tussen hosts bestaat uit een gesprek dat een sessie heet. De set van firewallregels beoordeelt pakketten twee keer: als het aankomt van de host - op het publieke internet en als het de host weer verlaat op - de weg terug naar de host op het publieke internet. Iedere + op het publieke Internet en als het de host weer verlaat op + de weg terug naar de host op het publieke Internet. Iedere TCP/IP dienst als telnet, www, mail, etc, heeft zijn eigen protocol, bron IP adres en bestemmings @@ -2484,7 +2577,7 @@ regels waarmee diensten toegelaten of geblokkeerd kunnen worden. - + IPFW volgorde regelverwerking @@ -2518,7 +2611,7 @@ voldoen aan de regels. Op die manier kan er in de hand gehouden worden welke diensten van binnen de firewall naar buiten mogen en welke diensten op het private netwerk vanaf - het internet bereikbaar zijn. Al het andere verkeer wordt + het Internet bereikbaar zijn. Al het andere verkeer wordt vanuit het ontwerp standaard geblokkeerd en gelogd. Inclusieve firewalls zijn veel veiliger dan exclusieve firewalls. Het is ook de enige wijze voor de opzet van een @@ -2542,7 +2635,7 @@ De regelsyntaxis zoals hier toegelicht is vereenvoudigd door alleen te tonen wat nodig is om een standaard inclusieve set met firewallregels te maken. De complete - beschijving van alle mogelijkheden staat in + beschrijving van alle mogelijkheden staat in &man.ipfw.8;. Regels bevatten sleutelwoorden die in een bepaalde @@ -2618,7 +2711,7 @@ Als een regel met het sleutelwoord log van toepassing is op een pakket, dan wordt er een bericht naar &man.syslogd.8; - geschreven met de facilitynaam SECURITY. Er wordt alleen + geschreven met de faciliteitsnaam SECURITY. Er wordt alleen een bericht geschreven als het aantal voor die regel gelogde pakketten niet groter is dan de instelling logamount. Als @@ -2628,7 +2721,7 @@ bestaat er in het geval de waarde nul is geen limiet. Als de limiet is bereikt, dan kan het loggen weer ingeschakeld worden door de teller voor het loggen weer - op nul te stlelen voor die regel met + op nul te stellen voor die regel met ipfw zero. @@ -2925,8 +3018,8 @@ vinden. Voor de interface die is verbonden met het publieke - internet worden regels gemaakt waarmee sessies naar het - internet mogelijk gemaakt worden en toegang wordt gegeven + Internet worden regels gemaakt waarmee sessies naar het + Internet mogelijk gemaakt worden en toegang wordt gegeven voor pakketten die uit die sessies terug komen. Dit kan de PPP interface tun0 zijn of de netwerkkaart die is verbonden met een xDSL of @@ -2952,7 +3045,7 @@ In het onderdeel Uitgaand staan alleen regels met allow die parameters bevatten om - individuele diensten beschikbaar te maken zodat er internet + individuele diensten beschikbaar te maken zodat er Internet toegang is. Al die regels moeten gebruik maken van proto, port, in/out, via @@ -3003,7 +3096,7 @@ onderstaande regels dient de dc0 interfacenaam in iedere regel vervangen te worden door de interfacenaam van de netwerkkaart in het systeem die met - het publieke internet is verbonden. Voor gebruikers van + het publieke Internet is verbonden. Voor gebruikers van PPP zou dat tun0 zijn. Er zit een structuur in de regels: @@ -3016,7 +3109,7 @@ - Alle diensten die vanaf internet bereikbaar zijn + Alle diensten die vanaf Internet bereikbaar zijn gebruiken limit om flooding te voorkomen. @@ -3044,7 +3137,7 @@ # Stel commando voorvoegsel in. cmd="ipfw –q add" pif="dc0" # Interfacenaam van NIC die verbinding - # met het publieke internet heeft. + # met het publieke Internet heeft. ################################################################# # Geen beperkingen op de interface aan de LAN kant. Alleen nodig @@ -3064,22 +3157,22 @@ $cmd 00015 check–state ################################################################# -# Interface aan het publieke internet (onderdeel Uitgaand). +# Interface aan het publieke Internet (onderdeel Uitgaand). # Inspecteer verzoeken om een sessie te starten van achter de # firewall op het private netwerk of vanaf de server zelf naar -# het publieke internet. +# het publieke Internet. ################################################################# # Geef toegang tot de DNS server van de ISP. # x.x.x.x moet het IP adres van de DNS van de ISP zijn. -# Dupliceer deze regels als een ISP meedere DNS servers heeft. +# Dupliceer deze regels als een ISP meerdere DNS servers heeft. # Haal het IP adres evt. uit /etc/resolv.conf $cmd 00110 allow tcp from any to x.x.x.x 53 out via $pif setup keep–state $cmd 00111 allow udp from any to x.x.x.x 53 out via $pif keep–state # Geef toegang tot de DHCP server van de ISP voor kabel- en # xDSL-netwerken. Deze regel is niet nodig als gebruik gemaakt worden -# van PPP naar het publieke internet. In dat geval kan de hele groep +# van PPP naar het publieke Internet. In dat geval kan de hele groep # verwijderd worden. Gebruik de volgende regel en controleer het # logboek voor het IP adres. Wijzig dan het IP adres in de regel >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sat Sep 13 22:26:21 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E3107106568A; Sat, 13 Sep 2008 22:26:20 +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 A6E831065684 for ; Sat, 13 Sep 2008 22:26:20 +0000 (UTC) (envelope-from thompsa@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 5C6588FC1D for ; Sat, 13 Sep 2008 22:26:20 +0000 (UTC) (envelope-from thompsa@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 m8DMQKCn085735 for ; Sat, 13 Sep 2008 22:26:20 GMT (envelope-from thompsa@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m8DMQKXA085729 for perforce@freebsd.org; Sat, 13 Sep 2008 22:26:20 GMT (envelope-from thompsa@freebsd.org) Date: Sat, 13 Sep 2008 22:26:20 GMT Message-Id: <200809132226.m8DMQKXA085729@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to thompsa@freebsd.org using -f From: Andrew Thompson To: Perforce Change Reviews Cc: Subject: PERFORCE change 149728 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, 13 Sep 2008 22:26:21 -0000 http://perforce.freebsd.org/chv.cgi?CH=149728 Change 149728 by thompsa@thompsa_burger on 2008/09/13 22:25:47 Initialise cnt. Affected files ... .. //depot/projects/usb/src/sys/dev/usb2/serial/usb2_serial.c#12 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb2/serial/usb2_serial.c#12 (text+ko) ==== @@ -1066,6 +1066,7 @@ /* pass characters to tty layer */ buf = res.buffer; + cnt = res.length; /* first check if we can pass the buffer directly */