From owner-svn-src-projects@FreeBSD.ORG Sun Nov 3 09:08:36 2013 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id D45471DE; Sun, 3 Nov 2013 09:08:36 +0000 (UTC) (envelope-from andrew@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id C20D72503; Sun, 3 Nov 2013 09:08:36 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rA398aLH092737; Sun, 3 Nov 2013 09:08:36 GMT (envelope-from andrew@svn.freebsd.org) Received: (from andrew@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id rA398aqp092736; Sun, 3 Nov 2013 09:08:36 GMT (envelope-from andrew@svn.freebsd.org) Message-Id: <201311030908.rA398aqp092736@svn.freebsd.org> From: Andrew Turner Date: Sun, 3 Nov 2013 09:08:36 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r257567 - projects/specific_leg/sys/conf X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 03 Nov 2013 09:08:36 -0000 Author: andrew Date: Sun Nov 3 09:08:36 2013 New Revision: 257567 URL: http://svnweb.freebsd.org/changeset/base/257567 Log: Disable the trampoline kernel for now, it needs to know PHYSBASE which will be going away. Modified: projects/specific_leg/sys/conf/Makefile.arm Modified: projects/specific_leg/sys/conf/Makefile.arm ============================================================================== --- projects/specific_leg/sys/conf/Makefile.arm Sun Nov 3 08:56:08 2013 (r257566) +++ projects/specific_leg/sys/conf/Makefile.arm Sun Nov 3 09:08:36 2013 (r257567) @@ -78,8 +78,8 @@ FILES_CPU_FUNC = $S/$M/$M/cpufunc_asm_ar $S/$M/$M/cpufunc_asm_pj4b.S $S/$M/$M/cpufunc_asm_armv6.S \ $S/$M/$M/cpufunc_asm_armv7.S -KERNEL_EXTRA=trampoline -KERNEL_EXTRA_INSTALL=kernel.gz.tramp +#KERNEL_EXTRA=trampoline +#KERNEL_EXTRA_INSTALL=kernel.gz.tramp trampoline: ${KERNEL_KO}.tramp ${KERNEL_KO}.tramp: ${KERNEL_KO} $S/$M/$M/inckern.S $S/$M/$M/elf_trampoline.c echo "#define KERNNAME \"${KERNEL_KO}.tmp\"" >opt_kernname.h From owner-svn-src-projects@FreeBSD.ORG Sun Nov 3 10:01:54 2013 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id 98F4DD09; Sun, 3 Nov 2013 10:01:54 +0000 (UTC) (envelope-from andrew@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 84FA826FB; Sun, 3 Nov 2013 10:01:54 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rA3A1s0u012506; Sun, 3 Nov 2013 10:01:54 GMT (envelope-from andrew@svn.freebsd.org) Received: (from andrew@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id rA3A1sA2012505; Sun, 3 Nov 2013 10:01:54 GMT (envelope-from andrew@svn.freebsd.org) Message-Id: <201311031001.rA3A1sA2012505@svn.freebsd.org> From: Andrew Turner Date: Sun, 3 Nov 2013 10:01:54 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r257568 - projects/specific_leg/sys/arm/arm X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 03 Nov 2013 10:01:54 -0000 Author: andrew Date: Sun Nov 3 10:01:53 2013 New Revision: 257568 URL: http://svnweb.freebsd.org/changeset/base/257568 Log: Remove more uses of PHYSADDR. It is still used when FLASHADDR and LOADERRAMADDR is set, and in the SMP code. The former use can be moved to a new file for legacy booting. The latter appears to be incorrect as the result of the calculation PHYSADDR is used in is not used. Modified: projects/specific_leg/sys/arm/arm/locore.S Modified: projects/specific_leg/sys/arm/arm/locore.S ============================================================================== --- projects/specific_leg/sys/arm/arm/locore.S Sun Nov 3 09:08:36 2013 (r257567) +++ projects/specific_leg/sys/arm/arm/locore.S Sun Nov 3 10:01:53 2013 (r257568) @@ -60,8 +60,6 @@ __FBSDID("$FreeBSD$"); .align 0 .globl kernbase .set kernbase,KERNBASE -.globl physaddr -.set physaddr,PHYSADDR /* * On entry for FreeBSD boot ABI: @@ -125,25 +123,7 @@ Lram_offset: .word from_ram-_C_LABEL(_st from_ram: nop #endif - adr r7, Lunmapped - bic r7, r7, #0xf0000000 - orr r7, r7, #PHYSADDR - -disable_mmu: - /* Disable MMU for a while */ - mrc p15, 0, r2, c1, c0, 0 - bic r2, r2, #(CPU_CONTROL_MMU_ENABLE | CPU_CONTROL_DC_ENABLE |\ - CPU_CONTROL_WBUF_ENABLE) - bic r2, r2, #(CPU_CONTROL_IC_ENABLE) - bic r2, r2, #(CPU_CONTROL_BPRD_ENABLE) - mcr p15, 0, r2, c1, c0, 0 - - nop - nop - nop - mov pc, r7 -Lunmapped: /* * Build page table from scratch. */ @@ -292,8 +272,6 @@ Lpagetable: Lvirtaddr: .word KERNVIRTADDR -Lphysaddr: - .word KERNPHYSADDR #if defined (FLASHADDR) && defined(LOADERRAMADDR) Lreal_start: From owner-svn-src-projects@FreeBSD.ORG Sun Nov 3 12:03:41 2013 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id 96A6130B; Sun, 3 Nov 2013 12:03:41 +0000 (UTC) (envelope-from andrew@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 8426F2B73; Sun, 3 Nov 2013 12:03:41 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rA3C3fKe053043; Sun, 3 Nov 2013 12:03:41 GMT (envelope-from andrew@svn.freebsd.org) Received: (from andrew@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id rA3C3fv5053042; Sun, 3 Nov 2013 12:03:41 GMT (envelope-from andrew@svn.freebsd.org) Message-Id: <201311031203.rA3C3fv5053042@svn.freebsd.org> From: Andrew Turner Date: Sun, 3 Nov 2013 12:03:41 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r257569 - projects/specific_leg/sys/arm/arm X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 03 Nov 2013 12:03:41 -0000 Author: andrew Date: Sun Nov 3 12:03:41 2013 New Revision: 257569 URL: http://svnweb.freebsd.org/changeset/base/257569 Log: Use _ARM_ARCH_6 instead of listing all CPU types we support. Modified: projects/specific_leg/sys/arm/arm/locore.S Modified: projects/specific_leg/sys/arm/arm/locore.S ============================================================================== --- projects/specific_leg/sys/arm/arm/locore.S Sun Nov 3 10:01:53 2013 (r257568) +++ projects/specific_leg/sys/arm/arm/locore.S Sun Nov 3 12:03:41 2013 (r257569) @@ -171,7 +171,7 @@ from_ram: mcr p15, 0, r0, c2, c0, 0 /* Set TTB */ mcr p15, 0, r0, c8, c7, 0 /* Flush TLB */ -#if defined(CPU_ARM1136) || defined(CPU_ARM1176) || defined(CPU_CORTEXA) || defined(CPU_MV_PJ4B) +#ifdef _ARM_ARCH_6 mov r0, #0 mcr p15, 0, r0, c13, c0, 1 /* Set ASID to 0 */ #endif From owner-svn-src-projects@FreeBSD.ORG Sun Nov 3 12:14:53 2013 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id DF0A8455; Sun, 3 Nov 2013 12:14:53 +0000 (UTC) (envelope-from andrew@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id CAFAF2BCA; Sun, 3 Nov 2013 12:14:53 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rA3CErHl056869; Sun, 3 Nov 2013 12:14:53 GMT (envelope-from andrew@svn.freebsd.org) Received: (from andrew@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id rA3CErbK056868; Sun, 3 Nov 2013 12:14:53 GMT (envelope-from andrew@svn.freebsd.org) Message-Id: <201311031214.rA3CErbK056868@svn.freebsd.org> From: Andrew Turner Date: Sun, 3 Nov 2013 12:14:53 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r257570 - projects/specific_leg/sys/arm/arm X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 03 Nov 2013 12:14:53 -0000 Author: andrew Date: Sun Nov 3 12:14:53 2013 New Revision: 257570 URL: http://svnweb.freebsd.org/changeset/base/257570 Log: Use the FDT data to build dump_avail. Modified: projects/specific_leg/sys/arm/arm/machdep.c Modified: projects/specific_leg/sys/arm/arm/machdep.c ============================================================================== --- projects/specific_leg/sys/arm/arm/machdep.c Sun Nov 3 12:03:41 2013 (r257569) +++ projects/specific_leg/sys/arm/arm/machdep.c Sun Nov 3 12:14:53 2013 (r257570) @@ -776,6 +776,7 @@ makectx(struct trapframe *tf, struct pcb pcb->un_32.pcb32_sp = tf->tf_usr_sp; } +#ifndef FDT /* * Make a standard dump_avail array. Can't make the phys_avail * since we need to do that after we call pmap_bootstrap, but this @@ -816,6 +817,7 @@ arm_dump_avail_init(vm_offset_t ramsize, dump_avail[2] = 0; dump_avail[3] = 0; } +#endif /* * Fake up a boot descriptor table @@ -1244,7 +1246,18 @@ initarm(struct arm_boot_params *abp) /* Grab physical memory regions information from device tree. */ if (fdt_get_reserved_regions(reserved_regions, &reserved_regions_sz) != 0) reserved_regions_sz = 0; - + + /* + * Build the dump_avail table + */ + start = memory_regions[i].mr_start; + end = start + memory_regions[i].mr_size; + + dump_avail[0] = round_page(start); + dump_avail[1] = trunc_page(end); + dump_avail[2] = 0; + dump_avail[3] = 0; + /* * Now exclude all the reserved regions */ @@ -1493,7 +1506,6 @@ initarm(struct arm_boot_params *abp) arm_intrnames_init(); arm_vector_init(ARM_VECTORS_HIGH, ARM_VEC_ALL); - arm_dump_avail_init(memsize, sizeof(dump_avail) / sizeof(dump_avail[0])); pmap_bootstrap(freemempos, &kernel_l1pt); msgbufp = (void *)msgbufpv.pv_va; msgbufinit(msgbufp, msgbufsize); From owner-svn-src-projects@FreeBSD.ORG Sun Nov 3 18:14:46 2013 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id A1643F2A; Sun, 3 Nov 2013 18:14:46 +0000 (UTC) (envelope-from marcel@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 8EF122B2C; Sun, 3 Nov 2013 18:14:46 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rA3IEkqI080697; Sun, 3 Nov 2013 18:14:46 GMT (envelope-from marcel@svn.freebsd.org) Received: (from marcel@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id rA3IEkBE080696; Sun, 3 Nov 2013 18:14:46 GMT (envelope-from marcel@svn.freebsd.org) Message-Id: <201311031814.rA3IEkBE080696@svn.freebsd.org> From: Marcel Moolenaar Date: Sun, 3 Nov 2013 18:14:46 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r257581 - projects/altix2/sys/ia64/sgisn X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 03 Nov 2013 18:14:46 -0000 Author: marcel Date: Sun Nov 3 18:14:46 2013 New Revision: 257581 URL: http://svnweb.freebsd.org/changeset/base/257581 Log: o Update copyright o Add a comment explaining what's happening with the PCI bridge discovery and in particular the conditional involving the NASID. Modified: projects/altix2/sys/ia64/sgisn/sgisn_shub.c Modified: projects/altix2/sys/ia64/sgisn/sgisn_shub.c ============================================================================== --- projects/altix2/sys/ia64/sgisn/sgisn_shub.c Sun Nov 3 17:19:17 2013 (r257580) +++ projects/altix2/sys/ia64/sgisn/sgisn_shub.c Sun Nov 3 18:14:46 2013 (r257581) @@ -1,5 +1,5 @@ /*- - * Copyright (c) 2011 Marcel Moolenaar + * Copyright (c) 2011-2013 Marcel Moolenaar * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -474,6 +474,14 @@ sgisn_shub_attach(device_t dev) if (r.sal_status != 0 || addr == 0) continue; + /* + * Filter PCI bridges not connected to the SHub + * instance in question. We use the NASID to match + * bridges to SHubs. + * Note that the TIOCP bridge has bit 0 of the + * NASID set, which is why we want to ignore bit 0. + * Subtracting 1 from the mask does the trick. + */ fwbus = (void *)IA64_PHYS_TO_RR7(addr); if (((fwbus->bus_base >> sc->sc_nasid_shft) & (sc->sc_nasid_mask - 1)) != sc->sc_nasid) From owner-svn-src-projects@FreeBSD.ORG Sun Nov 3 19:15:18 2013 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id 636EFE8A; Sun, 3 Nov 2013 19:15:18 +0000 (UTC) (envelope-from marcel@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 4270F2D85; Sun, 3 Nov 2013 19:15:18 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rA3JFI37001098; Sun, 3 Nov 2013 19:15:18 GMT (envelope-from marcel@svn.freebsd.org) Received: (from marcel@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id rA3JFIUm001097; Sun, 3 Nov 2013 19:15:18 GMT (envelope-from marcel@svn.freebsd.org) Message-Id: <201311031915.rA3JFIUm001097@svn.freebsd.org> From: Marcel Moolenaar Date: Sun, 3 Nov 2013 19:15:18 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r257584 - projects/altix2/sys/ia64/sgisn X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 03 Nov 2013 19:15:18 -0000 Author: marcel Date: Sun Nov 3 19:15:17 2013 New Revision: 257584 URL: http://svnweb.freebsd.org/changeset/base/257584 Log: o Refactor the attach method and move the collection of the flush list to sgisn_pcib_setup_flush(). Collecting this information causes a machine check on the Altix 450, which makes me belief is specific to either the SHub1 or the PCI bridge. With this change we now boot all the way to the root mount! o Make it easier to enable the debugging printfs I added and commented out. We may need this... Sponsored by: HOB GmbH & Co. KG Modified: projects/altix2/sys/ia64/sgisn/sgisn_pcib.c Modified: projects/altix2/sys/ia64/sgisn/sgisn_pcib.c ============================================================================== --- projects/altix2/sys/ia64/sgisn/sgisn_pcib.c Sun Nov 3 19:04:57 2013 (r257583) +++ projects/altix2/sys/ia64/sgisn/sgisn_pcib.c Sun Nov 3 19:15:17 2013 (r257584) @@ -204,10 +204,12 @@ sgisn_pcib_activate_resource(device_t de { int error; - // device_printf(dev, "%s(dev=%s, child=%s, type=%u, rid=%u, res=%p" - // "[%#lx-%#lx])\n", __func__, device_get_nameunit(dev), - // device_get_nameunit(child), type, rid, res, rman_get_start(res), - // rman_get_end(res)); +#ifdef SGISN_PCIB_DEBUG + device_printf(dev, "%s(dev=%s, child=%s, type=%u, rid=%u, res=%p" + "[%#lx-%#lx])\n", __func__, device_get_nameunit(dev), + device_get_nameunit(child), type, rid, res, rman_get_start(res), + rman_get_end(res)); +#endif error = rman_activate_resource(res); return (error); @@ -227,10 +229,12 @@ sgisn_pcib_alloc_resource(device_t dev, uintptr_t func, slot; int bar, error; - // device_printf(dev, "%s(dev=%s, child=%s, type=%u, rid=%u, " - // "start=%#lx, end=%#lx, count=%#lx, flags=%x)\n", __func__, - // device_get_nameunit(dev), device_get_nameunit(child), type, - // *rid, start, end, count, flags); +#ifdef SGISN_PCIB_DEBUG + device_printf(dev, "%s(dev=%s, child=%s, type=%u, rid=%u, " + "start=%#lx, end=%#lx, count=%#lx, flags=%x)\n", __func__, + device_get_nameunit(dev), device_get_nameunit(child), type, + *rid, start, end, count, flags); +#endif if (type == SYS_RES_IRQ) return (bus_generic_alloc_resource(dev, child, type, rid, @@ -265,14 +269,16 @@ sgisn_pcib_alloc_resource(device_t dev, device_printf(dev, "PCI bus address %#lx mapped to CPU " "address %#lx\n", start, base); - // device_printf(child, "nas=%#x, slice=%#x, cpuid=%#x, nr=%#x, " - // "pin=%#x, xtaddr=%#lx, br_type=%#x, bridge=%p, dev=%p, " - // "last=%#x, cookie=%#x, flags=%#x, refcnt=%#x\n", - // sgisn_irq.irq_nasid, sgisn_irq.irq_slice, sgisn_irq.irq_cpuid, - // sgisn_irq.irq_nr, sgisn_irq.irq_pin, sgisn_irq.irq_xtaddr, - // sgisn_irq.irq_br_type, sgisn_irq.irq_bridge, sgisn_irq.irq_dev, - // sgisn_irq.irq_last, sgisn_irq.irq_cookie, sgisn_irq.irq_flags, - // sgisn_irq.irq_refcnt); +#ifdef SGISN_PCIB_DEBUG + device_printf(child, "nas=%#x, slice=%#x, cpuid=%#x, nr=%#x, " + "pin=%#x, xtaddr=%#lx, br_type=%#x, bridge=%p, dev=%p, " + "last=%#x, cookie=%#x, flags=%#x, refcnt=%#x\n", + sgisn_irq.irq_nasid, sgisn_irq.irq_slice, sgisn_irq.irq_cpuid, + sgisn_irq.irq_nr, sgisn_irq.irq_pin, sgisn_irq.irq_xtaddr, + sgisn_irq.irq_br_type, sgisn_irq.irq_bridge, sgisn_irq.irq_dev, + sgisn_irq.irq_last, sgisn_irq.irq_cookie, sgisn_irq.irq_flags, + sgisn_irq.irq_refcnt); +#endif /* I/O port space is presented as memory mapped I/O. */ rman_set_bustag(rv, IA64_BUS_SPACE_MEM); @@ -293,10 +299,12 @@ sgisn_pcib_deactivate_resource(device_t { int error; - // device_printf(dev, "%s(dev=%s, child=%s, type=%u, rid=%u, res=%p" - // "[%#lx-%#lx])\n", __func__, device_get_nameunit(dev), - // device_get_nameunit(child), type, rid, res, rman_get_start(res), - // rman_get_end(res)); +#ifdef SGISN_PCIB_DEBUG + device_printf(dev, "%s(dev=%s, child=%s, type=%u, rid=%u, res=%p" + "[%#lx-%#lx])\n", __func__, device_get_nameunit(dev), + device_get_nameunit(child), type, rid, res, rman_get_start(res), + rman_get_end(res)); +#endif error = rman_deactivate_resource(res); return (error); @@ -306,9 +314,11 @@ static void sgisn_pcib_delete_resource(device_t dev, device_t child, int type, int rid) { - // device_printf(dev, "%s(dev=%s, child=%s, type=%u, rid=%u)\n", - // __func__, device_get_nameunit(dev), device_get_nameunit(child), - // type, rid); +#ifdef SGISN_PCIB_DEBUG + device_printf(dev, "%s(dev=%s, child=%s, type=%u, rid=%u)\n", + __func__, device_get_nameunit(dev), device_get_nameunit(child), + type, rid); +#endif } static int @@ -316,9 +326,11 @@ sgisn_pcib_get_resource(device_t dev, de u_long *startp, u_long *countp) { - // device_printf(dev, "%s(dev=%s, child=%s, type=%u, rid=%u, " - // "startp=%p, countp=%p)\n", __func__, device_get_nameunit(dev), - // device_get_nameunit(child), type, rid, startp, countp); +#ifdef SGISN_PCIB_DEBUG + device_printf(dev, "%s(dev=%s, child=%s, type=%u, rid=%u, " + "startp=%p, countp=%p)\n", __func__, device_get_nameunit(dev), + device_get_nameunit(child), type, rid, startp, countp); +#endif return (ENOENT); } @@ -326,8 +338,10 @@ static struct resource_list * sgisn_pcib_get_resource_list(device_t dev, device_t child) { - // device_printf(dev, "%s(dev=%s, child=%s)\n", __func__, - // device_get_nameunit(dev), device_get_nameunit(child)); +#ifdef SGISN_PCIB_DEBUG + device_printf(dev, "%s(dev=%s, child=%s)\n", __func__, + device_get_nameunit(dev), device_get_nameunit(child)); +#endif return (NULL); } @@ -337,10 +351,12 @@ sgisn_pcib_release_resource(device_t dev { int error; - // device_printf(dev, "%s(dev=%s, child=%s, type=%u, rid=%u, res=%p" - // "[%#lx-%#lx])\n", __func__, device_get_nameunit(dev), - // device_get_nameunit(child), type, rid, res, rman_get_start(res), - // rman_get_end(res)); +#ifdef SGISN_PCIB_DEBUG + device_printf(dev, "%s(dev=%s, child=%s, type=%u, rid=%u, res=%p" + "[%#lx-%#lx])\n", __func__, device_get_nameunit(dev), + device_get_nameunit(child), type, rid, res, rman_get_start(res), + rman_get_end(res)); +#endif if (rman_get_flags(res) & RF_ACTIVE) { error = rman_deactivate_resource(res); @@ -356,9 +372,12 @@ sgisn_pcib_set_resource(device_t dev, de u_long start, u_long count) { - // device_printf(dev, "%s(dev=%s, child=%s, type=%u, rid=%u, " - // "start=%#lx, count=%#lx)\n", __func__, device_get_nameunit(dev), - // device_get_nameunit(child), type, rid, start, count); +#ifdef SGISN_PCIB_DEBUG + device_printf(dev, "%s(dev=%s, child=%s, type=%u, rid=%u, " + "start=%#lx, count=%#lx)\n", __func__, device_get_nameunit(dev), + device_get_nameunit(child), type, rid, start, count); +#endif + return (ENXIO); } @@ -371,14 +390,19 @@ sgisn_pcib_setup_intr(device_t dev, devi uint64_t ie; int error; - // device_printf(dev, "%s(dev=%s, child=%s, irq=%lu, flags=%#x, " - // "ifltr=%p, ihdlr=%p, arg=%p, cookiep=%p)\n", __func__, - // device_get_nameunit(dev), device_get_nameunit(child), - // rman_get_start(irq), flags, ifltr, ihdlr, arg, cookiep); +#ifdef SGISN_PCIB_DEBUG + device_printf(dev, "%s(dev=%s, child=%s, irq=%lu, flags=%#x, " + "ifltr=%p, ihdlr=%p, arg=%p, cookiep=%p)\n", __func__, + device_get_nameunit(dev), device_get_nameunit(child), + rman_get_start(irq), flags, ifltr, ihdlr, arg, cookiep); +#endif sc = device_get_softc(dev); ie = bus_space_read_8(sc->sc_tag, sc->sc_hndl, PCIB_REG_INT_ENABLE); - // device_printf(dev, "INT_ENABLE=%#lx\n", ie); + +#ifdef SGISN_PCIB_DEBUG + device_printf(dev, "INT_ENABLE=%#lx\n", ie); +#endif error = bus_generic_setup_intr(dev, child, irq, flags, ifltr, ihdlr, arg, cookiep); @@ -446,14 +470,46 @@ sgisn_pcib_rm_init(struct sgisn_pcib_sof return (error); } -static int -sgisn_pcib_attach(device_t dev) +static void +sgisn_pcib_setup_flush(struct sgisn_pcib_softc *sc) { struct ia64_sal_result r; - struct sgisn_pcib_softc *sc; struct sgisn_fwflush *fwflush; device_t parent; + uintptr_t nasid; size_t fwflushsz; + u_int i, slot; + + fwflushsz = (PCI_SLOTMAX + 1) * sizeof(struct sgisn_fwflush); + fwflush = contigmalloc(fwflushsz, M_TEMP, M_ZERO, 0UL, ~0UL, 16, 0); + parent = device_get_parent(sc->sc_dev); + BUS_READ_IVAR(parent, sc->sc_dev, SHUB_IVAR_NASID, &nasid); + r = ia64_sal_entry(SAL_SGISN_IOBUS_FLUSH, nasid, + sc->sc_fwbus->fw_common.bus_xid, ia64_tpa((uintptr_t)fwflush), + 0, 0, 0, 0); + if (r.sal_status == 0) { + for (i = 0; i <= PCI_SLOTMAX; i++) { + if (fwflush[i].fld_pci_segment != sc->sc_domain || + fwflush[i].fld_pci_bus != sc->sc_busnr) + continue; + slot = fwflush[i].fld_slot; + if (slot > PCI_SLOTMAX) + continue; + sc->sc_flush_intr[slot] = fwflush[i].fld_intr; + sc->sc_flush_addr[slot] = fwflush[i].fld_addr; + device_printf(sc->sc_dev, "slot=%d: flush addr=%p, " + "intr=%p\n", slot, fwflush[i].fld_addr, + fwflush[i].fld_intr); + } + } + contigfree(fwflush, fwflushsz, M_TEMP); +} + +static int +sgisn_pcib_attach(device_t dev) +{ + struct sgisn_pcib_softc *sc; + device_t parent; uintptr_t addr, ivar; uint64_t ctrl; int error; @@ -501,27 +557,8 @@ sgisn_pcib_attach(device_t dev) mtx_init(&sc->sc_ate_mtx, device_get_nameunit(dev), NULL, MTX_SPIN); - fwflushsz = (PCI_SLOTMAX + 1) * sizeof(struct sgisn_fwflush); - fwflush = contigmalloc(fwflushsz, M_TEMP, M_ZERO, 0UL, ~0UL, 16, 0); - BUS_READ_IVAR(parent, dev, SHUB_IVAR_NASID, &ivar); - r = ia64_sal_entry(SAL_SGISN_IOBUS_FLUSH, ivar, - sc->sc_fwbus->fw_common.bus_xid, ia64_tpa((uintptr_t)fwflush), - 0, 0, 0, 0); - if (r.sal_status == 0) { - int i, slot; - - for (i = 0; i <= PCI_SLOTMAX; i++) { - if (fwflush[i].fld_pci_segment != sc->sc_domain || - fwflush[i].fld_pci_bus != sc->sc_busnr) - continue; - slot = fwflush[i].fld_slot; - sc->sc_flush_intr[slot] = fwflush[i].fld_intr; - sc->sc_flush_addr[slot] = fwflush[i].fld_addr; - device_printf(dev, "slot=%d: flush addr=%p, intr=%p\n", - slot, fwflush[i].fld_addr, fwflush[i].fld_intr); - } - } - contigfree(fwflush, fwflushsz, M_TEMP); + if (sc->sc_fwbus->fw_common.bus_asic == SGISN_PCIB_PIC) + sgisn_pcib_setup_flush(sc); device_add_child(dev, "pci", -1); error = bus_generic_attach(dev); From owner-svn-src-projects@FreeBSD.ORG Sun Nov 3 22:58:01 2013 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id E43A1D74; Sun, 3 Nov 2013 22:58:00 +0000 (UTC) (envelope-from marcel@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id D07E1285A; Sun, 3 Nov 2013 22:58:00 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rA3Mw0Zm081320; Sun, 3 Nov 2013 22:58:00 GMT (envelope-from marcel@svn.freebsd.org) Received: (from marcel@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id rA3Mw08k081316; Sun, 3 Nov 2013 22:58:00 GMT (envelope-from marcel@svn.freebsd.org) Message-Id: <201311032258.rA3Mw08k081316@svn.freebsd.org> From: Marcel Moolenaar Date: Sun, 3 Nov 2013 22:58:00 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r257596 - in projects/altix2/sys/ia64: ia64 include X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 03 Nov 2013 22:58:01 -0000 Author: marcel Date: Sun Nov 3 22:57:59 2013 New Revision: 257596 URL: http://svnweb.freebsd.org/changeset/base/257596 Log: Make IPIs work on the Altix 450. We kluged support by hardcoding specifics of the SHub1 in ipi_send(). Improve the kluge a bit by saving the IPI register address of the SHub in the PCPU structure and initialize it when we create the PCPU. There we can ask the firmware about the SHub and handle the difference between SHub1 and SHub2. This makes SMP work. Sponsored by: HOB GmbH & Co. KG Modified: projects/altix2/sys/ia64/ia64/machdep.c projects/altix2/sys/ia64/ia64/mp_machdep.c projects/altix2/sys/ia64/include/pcpu.h Modified: projects/altix2/sys/ia64/ia64/machdep.c ============================================================================== --- projects/altix2/sys/ia64/ia64/machdep.c Sun Nov 3 22:55:33 2013 (r257595) +++ projects/altix2/sys/ia64/ia64/machdep.c Sun Nov 3 22:57:59 2013 (r257596) @@ -529,16 +529,25 @@ void cpu_pcpu_setup(struct pcpu *pc, u_int acpi_id, u_int sapic_id) { struct ia64_sal_result r; + uint64_t mmr; + u_int shft, shub; pc->pc_acpi_id = acpi_id; pc->pc_md.lid = IA64_LID_SET_SAPIC_ID(sapic_id); r = ia64_sal_entry(SAL_SGISN_SAPIC_INFO, sapic_id, 0, 0, 0, 0, 0, 0); - if (r.sal_status == 0) { - pc->pc_md.sgisn_nasid = r.sal_result[0]; - pc->pc_md.sgisn_subnode = r.sal_result[1]; - pc->pc_md.sgisn_slice = r.sal_result[2]; - } + if (r.sal_status != 0) + return; + pc->pc_md.sgisn_nasid = r.sal_result[0]; + + r = ia64_sal_entry(SAL_SGISN_SN_INFO, 0, 0, 0, 0, 0, 0, 0); + if (r.sal_status != 0) + return; + shub = r.sal_result[0] & 0xff; + shft = (r.sal_result[1] >> 16) & 0xff; + mmr = ((u_long)pc->pc_md.sgisn_nasid << shft) | + (((shub == 0) ? 9UL : 3UL) << 32); + pc->pc_md.sgisn_ipip = IA64_PHYS_TO_RR6(mmr + 0x10000380UL); } void Modified: projects/altix2/sys/ia64/ia64/mp_machdep.c ============================================================================== --- projects/altix2/sys/ia64/ia64/mp_machdep.c Sun Nov 3 22:55:33 2013 (r257595) +++ projects/altix2/sys/ia64/ia64/mp_machdep.c Sun Nov 3 22:57:59 2013 (r257596) @@ -526,7 +526,9 @@ ipi_send(struct pcpu *cpu, int xiv) uint64_t ipi; u_int sapic_id; - KASSERT(xiv != 0, ("ipi_send")); + KASSERT(xiv != 0, ("%s: xiv==0", __func__)); + + critical_enter(); sapic_id = IA64_LID_GET_SAPIC_ID(cpu->pc_md.lid); @@ -534,14 +536,17 @@ ipi_send(struct pcpu *cpu, int xiv) ipip = &(ia64_pib->ib_ipi[sapic_id][0]); ipi = xiv; } else { - ipip = (void *)(IA64_PHYS_TO_RR6(0x800000000UL) | - ((u_long)cpu->pc_md.sgisn_nasid << 38) | 0x110000380UL); + ipip = (uint64_t *)(cpu->pc_md.sgisn_ipip); ipi = 0x80000001fdc00000UL | ((u_long)xiv << 52) | (sapic_id << 4); } + KASSERT(ipip != NULL, ("%s: ipip==NULL", __func__)); ia64_mf(); ia64_st8(ipip, ipi); ia64_mf_a(); + CTR3(KTR_SMP, "ipi_send(%p, %d): cpuid=%d", cpu, xiv, PCPU_GET(cpuid)); + + critical_exit(); } Modified: projects/altix2/sys/ia64/include/pcpu.h ============================================================================== --- projects/altix2/sys/ia64/include/pcpu.h Sun Nov 3 22:55:33 2013 (r257595) +++ projects/altix2/sys/ia64/include/pcpu.h Sun Nov 3 22:57:59 2013 (r257596) @@ -55,8 +55,7 @@ struct pcpu_md { uint64_t clock_load; /* Clock reload value. */ uint32_t clock_mode; /* Clock ET mode */ uint32_t sgisn_nasid; - uint32_t sgisn_subnode; - uint32_t sgisn_slice; + uint64_t sgisn_ipip; uint32_t awake:1; /* CPU is awake? */ struct pcpu_stats stats; /* Interrupt stats. */ #ifdef _KERNEL From owner-svn-src-projects@FreeBSD.ORG Mon Nov 4 00:33:30 2013 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id A52A9469; Mon, 4 Nov 2013 00:33:30 +0000 (UTC) (envelope-from marcel@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 912862C90; Mon, 4 Nov 2013 00:33:30 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rA40XUxG015442; Mon, 4 Nov 2013 00:33:30 GMT (envelope-from marcel@svn.freebsd.org) Received: (from marcel@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id rA40XUoA015441; Mon, 4 Nov 2013 00:33:30 GMT (envelope-from marcel@svn.freebsd.org) Message-Id: <201311040033.rA40XUoA015441@svn.freebsd.org> From: Marcel Moolenaar Date: Mon, 4 Nov 2013 00:33:30 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r257599 - projects/altix2/sys/ia64/conf X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 04 Nov 2013 00:33:30 -0000 Author: marcel Date: Mon Nov 4 00:33:30 2013 New Revision: 257599 URL: http://svnweb.freebsd.org/changeset/base/257599 Log: Add drivers for H/W found in the Altix 450: mpt(4), ohci(4) and ehci(4) Of these, mpt(4) is already rewritten to use busdma/mi and since it's the first PCI device we probe and attach, we're in a good shape to finalize the TIOCP bridge support. Note also the the Altix 450 doesn't have an ioc4-base ATA controller. It uses a SII controller. With that, we're also setup to rewrite ata(4) to use busdma/mi. Thus: Most of the support for the Altix 350 and Altix 450 pivots around proper DMA handling -- i.e. busdma/mi. Sponsored by: HOB GmbH & Co. KG Modified: projects/altix2/sys/ia64/conf/ALTIX Modified: projects/altix2/sys/ia64/conf/ALTIX ============================================================================== --- projects/altix2/sys/ia64/conf/ALTIX Sun Nov 3 23:17:30 2013 (r257598) +++ projects/altix2/sys/ia64/conf/ALTIX Mon Nov 4 00:33:30 2013 (r257599) @@ -11,6 +11,7 @@ device bge device bpf device cd device da +device ehci device ether device firmware device ioc4 @@ -18,12 +19,16 @@ device isp device loop device md device miibus +device mpt +device ohci device pass device pci device random device scbus device tun device uart +device umass +device usb device vlan options ALT_BREAK_TO_DEBUGGER From owner-svn-src-projects@FreeBSD.ORG Mon Nov 4 14:24:57 2013 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id CC83E55E; Mon, 4 Nov 2013 14:24:57 +0000 (UTC) (envelope-from andre@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id A0301287C; Mon, 4 Nov 2013 14:24:57 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rA4EOvBf002822; Mon, 4 Nov 2013 14:24:57 GMT (envelope-from andre@svn.freebsd.org) Received: (from andre@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id rA4EOviF002821; Mon, 4 Nov 2013 14:24:57 GMT (envelope-from andre@svn.freebsd.org) Message-Id: <201311041424.rA4EOviF002821@svn.freebsd.org> From: Andre Oppermann Date: Mon, 4 Nov 2013 14:24:57 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r257635 - projects/ifq X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 04 Nov 2013 14:24:57 -0000 Author: andre Date: Mon Nov 4 14:24:57 2013 New Revision: 257635 URL: http://svnweb.freebsd.org/changeset/base/257635 Log: Create a project branch for prototyping the modernized network interface queue strategies and implementations. Sponsored by: The FreeBSD Foundation Added: - copied from r257634, head/ Directory Properties: projects/ifq/ (props changed) From owner-svn-src-projects@FreeBSD.ORG Mon Nov 4 16:18:17 2013 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id 54BA7470; Mon, 4 Nov 2013 16:18:17 +0000 (UTC) (envelope-from andre@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 41D1820BF; Mon, 4 Nov 2013 16:18:17 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rA4GIHXd040934; Mon, 4 Nov 2013 16:18:17 GMT (envelope-from andre@svn.freebsd.org) Received: (from andre@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id rA4GIHUt040933; Mon, 4 Nov 2013 16:18:17 GMT (envelope-from andre@svn.freebsd.org) Message-Id: <201311041618.rA4GIHUt040933@svn.freebsd.org> From: Andre Oppermann Date: Mon, 4 Nov 2013 16:18:17 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r257640 - in projects/ifq/sys/dev: ifq_bge ifq_e1000 ifq_fxp ifq_ixgbe ifq_re X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 04 Nov 2013 16:18:17 -0000 Author: andre Date: Mon Nov 4 16:18:16 2013 New Revision: 257640 URL: http://svnweb.freebsd.org/changeset/base/257640 Log: Create copies of the fxp(4), re(4), bge(4), igb(4) and ixgbe(4) drivers for prototyping of different interface queuing strategies. The drivers are copied to prevent complications from periodic integrations from HEAD. The amount of changes may be significant and arbitrary during the experimentation phase making conflict resolution a huge pain otherwise. These drivers are chosen for the simple reason that they have sufficient to adequate to good public documentation and that I have them readily available in my local test bench for fast turnaround times. Once a winning strategy has emerged and is accepted by the kernel hacker community all other drivers get converted/adjusted too. Sponsored by: The FreeBSD Foundation Added: projects/ifq/sys/dev/ifq_bge/ - copied from r257635, projects/ifq/sys/dev/bge/ projects/ifq/sys/dev/ifq_e1000/ - copied from r257635, projects/ifq/sys/dev/e1000/ projects/ifq/sys/dev/ifq_fxp/ - copied from r257635, projects/ifq/sys/dev/fxp/ projects/ifq/sys/dev/ifq_ixgbe/ - copied from r257635, projects/ifq/sys/dev/ixgbe/ projects/ifq/sys/dev/ifq_re/ - copied from r257635, projects/ifq/sys/dev/re/ From owner-svn-src-projects@FreeBSD.ORG Mon Nov 4 18:14:51 2013 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id 3EBADFA1; Mon, 4 Nov 2013 18:14:51 +0000 (UTC) (envelope-from adrian@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 1189F2811; Mon, 4 Nov 2013 18:14:51 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rA4IEoV0081211; Mon, 4 Nov 2013 18:14:50 GMT (envelope-from adrian@svn.freebsd.org) Received: (from adrian@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id rA4IEowC081210; Mon, 4 Nov 2013 18:14:50 GMT (envelope-from adrian@svn.freebsd.org) Message-Id: <201311041814.rA4IEowC081210@svn.freebsd.org> From: Adrian Chadd Date: Mon, 4 Nov 2013 18:14:50 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r257644 - projects/mbuf_iovec X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 04 Nov 2013 18:14:51 -0000 Author: adrian Date: Mon Nov 4 18:14:50 2013 New Revision: 257644 URL: http://svnweb.freebsd.org/changeset/base/257644 Log: Create a branch for mbuf iovec work. Sponsored by: Netflix, Inc. Added: - copied from r257643, head/ Directory Properties: projects/mbuf_iovec/ (props changed) From owner-svn-src-projects@FreeBSD.ORG Mon Nov 4 20:38:32 2013 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id D6C0A5B4; Mon, 4 Nov 2013 20:38:32 +0000 (UTC) (envelope-from adrian@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id A78EB2161; Mon, 4 Nov 2013 20:38:32 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rA4KcWKC030415; Mon, 4 Nov 2013 20:38:32 GMT (envelope-from adrian@svn.freebsd.org) Received: (from adrian@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id rA4KcWZ0030414; Mon, 4 Nov 2013 20:38:32 GMT (envelope-from adrian@svn.freebsd.org) Message-Id: <201311042038.rA4KcWZ0030414@svn.freebsd.org> From: Adrian Chadd Date: Mon, 4 Nov 2013 20:38:32 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r257653 - projects/mbuf_iovec/sys/netinet X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 04 Nov 2013 20:38:32 -0000 Author: adrian Date: Mon Nov 4 20:38:32 2013 New Revision: 257653 URL: http://svnweb.freebsd.org/changeset/base/257653 Log: Convert m->m_data referneces to mtod(m, const char *). Sponsored by: Netflix, inc. Modified: projects/mbuf_iovec/sys/netinet/tcp_input.c Modified: projects/mbuf_iovec/sys/netinet/tcp_input.c ============================================================================== --- projects/mbuf_iovec/sys/netinet/tcp_input.c Mon Nov 4 20:37:12 2013 (r257652) +++ projects/mbuf_iovec/sys/netinet/tcp_input.c Mon Nov 4 20:38:32 2013 (r257653) @@ -1394,7 +1394,7 @@ relocked: } #endif - TCP_PROBE5(receive, NULL, tp, m->m_data, tp, th); + TCP_PROBE5(receive, NULL, tp, mtod(m, const char *), tp, th); /* * Segment belongs to a connection in SYN_SENT, ESTABLISHED or later @@ -1406,7 +1406,7 @@ relocked: return; dropwithreset: - TCP_PROBE5(receive, NULL, tp, m->m_data, tp, th); + TCP_PROBE5(receive, NULL, tp, mtod(m, const char *), tp, th); if (ti_locked == TI_WLOCKED) { INP_INFO_WUNLOCK(&V_tcbinfo); @@ -1430,7 +1430,7 @@ dropwithreset: dropunlock: if (m != NULL) - TCP_PROBE5(receive, NULL, tp, m->m_data, tp, th); + TCP_PROBE5(receive, NULL, tp, mtod(m, const char *), tp, th); if (ti_locked == TI_WLOCKED) { INP_INFO_WUNLOCK(&V_tcbinfo); @@ -1929,7 +1929,7 @@ tcp_do_segment(struct mbuf *m, struct tc goto dropwithreset; } if ((thflags & (TH_ACK|TH_RST)) == (TH_ACK|TH_RST)) { - TCP_PROBE5(connect_refused, NULL, tp, m->m_data, tp, + TCP_PROBE5(connect_refused, NULL, tp, mtod(m, const char *), tp, th); tp = tcp_drop(tp, ECONNREFUSED); } @@ -1983,7 +1983,7 @@ tcp_do_segment(struct mbuf *m, struct tc } else { tcp_state_change(tp, TCPS_ESTABLISHED); TCP_PROBE5(connect_established, NULL, tp, - m->m_data, tp, th); + mtod(m, const char *), tp, th); cc_conn_init(tp); tcp_timer_activate(tp, TT_KEEP, TP_KEEPIDLE(tp)); @@ -2388,7 +2388,7 @@ tcp_do_segment(struct mbuf *m, struct tc tp->t_flags &= ~TF_NEEDFIN; } else { tcp_state_change(tp, TCPS_ESTABLISHED); - TCP_PROBE5(accept_established, NULL, tp, m->m_data, tp, + TCP_PROBE5(accept_established, NULL, tp, mtod(m, const char *), tp, th); cc_conn_init(tp); tcp_timer_activate(tp, TT_KEEP, TP_KEEPIDLE(tp)); From owner-svn-src-projects@FreeBSD.ORG Mon Nov 4 22:12:27 2013 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id 6787ACF1; Mon, 4 Nov 2013 22:12:27 +0000 (UTC) (envelope-from adrian@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 45CD72733; Mon, 4 Nov 2013 22:12:27 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rA4MCRrO063953; Mon, 4 Nov 2013 22:12:27 GMT (envelope-from adrian@svn.freebsd.org) Received: (from adrian@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id rA4MCP5v063940; Mon, 4 Nov 2013 22:12:25 GMT (envelope-from adrian@svn.freebsd.org) Message-Id: <201311042212.rA4MCP5v063940@svn.freebsd.org> From: Adrian Chadd Date: Mon, 4 Nov 2013 22:12:25 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r257659 - in projects/mbuf_iovec/sys: kern netinet sys X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 04 Nov 2013 22:12:27 -0000 Author: adrian Date: Mon Nov 4 22:12:25 2013 New Revision: 257659 URL: http://svnweb.freebsd.org/changeset/base/257659 Log: Start fleshing out some experimental hacks to start tidying up the mbuf access in preparation for mbuf iovec support (multiple buffers per mbuf.) There are a bunch of fundamental problems: * There's too much direct access of m_data, m_len, m_pktlen and even the underlying buffer (m_pktdat and friends.) If we're going down the path of turning mbufs into iovecs, these need to be tidied up. * The direct method access of m_data / m_len / etc hides away the intent of the action from the actual action itself. For example, there's direct gymnastics of m_data to do headroom reservation. There should be an mbuf method that reserves an amount of headroom in the mbuf. Same with allocating tailroom. There are also plenty of cases where stuff will "skip" a header temporarily by modify m_data / m_len to skip _over_ the header, then adjust them back. * The direct gynmastics with m_len vs m_pktlen is also fraught with danger. * There's lots of hand written mbuf iterators over lists of mbufs that represent frames (chained with m_nextpkt) and lists of mbufs inside a given frame (chained with m_next.) This is again annoying to diagnose, debug and modify. So, to make iovec stuff possible: * The data versus state/flags bits need to be separated out. That way the data storage stuff can be optionally turned into an array. * All the direct access of m_data / m_len / m_pkgdat / etc needs to go away. They are now per-buffer versus per-mbuf things. Right now that's the same thing, but that does need to change. * An iterator for mbufs needs to be written and sprinkled around the codebase. Specifically for this particular effort, m_next needs to be taken out and shot, replaced with an iterator that will iterate over mbufs and then either bump the mbuf data index or follow m->m_next to the next mbuf in the chain. This is still all early days. I'm going through the exercise of converting things to methods and killing direct m->m_data access (which should be mtod() in almost all instances) as part of a general tidyup that will be good regardless of whether this work goes anywhere or not. Sponsored by: Netflix, Inc. Modified: projects/mbuf_iovec/sys/kern/uipc_mbuf.c projects/mbuf_iovec/sys/netinet/ip_icmp.c projects/mbuf_iovec/sys/netinet/ip_input.c projects/mbuf_iovec/sys/netinet/ip_output.c projects/mbuf_iovec/sys/netinet/tcp_output.c projects/mbuf_iovec/sys/netinet/tcp_subr.c projects/mbuf_iovec/sys/netinet/tcp_syncache.c projects/mbuf_iovec/sys/sys/mbuf.h Modified: projects/mbuf_iovec/sys/kern/uipc_mbuf.c ============================================================================== --- projects/mbuf_iovec/sys/kern/uipc_mbuf.c Mon Nov 4 21:54:56 2013 (r257658) +++ projects/mbuf_iovec/sys/kern/uipc_mbuf.c Mon Nov 4 22:12:25 2013 (r257659) @@ -2180,3 +2180,59 @@ SYSCTL_PROC(_kern_ipc, OID_AUTO, mbufpro NULL, 0, mbprof_clr_handler, "I", "clear mbuf profiling statistics"); #endif +int +m_adj_data_head_rel(struct mbuf *m, int adj) +{ + + m->m_data += adj; + m->m_len -= adj; + return (0); +} + +int +m_adj_data_head_abs(struct mbuf *m, unsigned int val) +{ + + panic("%s: not yet implemented!\n", __func__); + return (0); +} + +int +m_adj_pktlen_head_rel(struct mbuf *m, int adj) +{ + + m->m_pkthdr.len += adj; + return (0); +} + +int +m_adj_pktlen_head_abs(struct mbuf *m, unsigned int val) +{ + + m->m_pkthdr.len = val; + return (0); +} + +int +m_reserv_data_head(struct mbuf *m, unsigned int adj) +{ + + m->m_data += adj; + return (0); +} + +int +m_len_set_abs(struct mbuf *m, unsigned int len) +{ + + m->m_len = len; + return (0); +} + +int +m_len_set_rel(struct mbuf *m, int adj) +{ + + m->m_len += adj; + return (0); +} Modified: projects/mbuf_iovec/sys/netinet/ip_icmp.c ============================================================================== --- projects/mbuf_iovec/sys/netinet/ip_icmp.c Mon Nov 4 21:54:56 2013 (r257658) +++ projects/mbuf_iovec/sys/netinet/ip_icmp.c Mon Nov 4 22:12:25 2013 (r257659) @@ -337,9 +337,8 @@ stdreply: icmpelen = max(8, min(V_icmp_q * reply should bypass as well. */ m->m_flags |= n->m_flags & M_SKIP_FIREWALL; - m->m_data -= sizeof(struct ip); - m->m_len += sizeof(struct ip); - m->m_pkthdr.len = m->m_len; + m_adj_data_head_rel(m, - ((int) sizeof(struct ip))); + m_adj_pktlen_head_abs(m, m_get_len(m)); m->m_pkthdr.rcvif = n->m_pkthdr.rcvif; nip = mtod(m, struct ip *); bcopy((caddr_t)oip, (caddr_t)nip, sizeof(struct ip)); @@ -392,15 +391,13 @@ icmp_input(struct mbuf *m, int off) return; } ip = mtod(m, struct ip *); - m->m_len -= hlen; - m->m_data += hlen; + m_adj_data_head_rel(m, hlen); icp = mtod(m, struct icmp *); if (in_cksum(m, icmplen)) { ICMPSTAT_INC(icps_checksum); goto freeit; } - m->m_len += hlen; - m->m_data -= hlen; + m_adj_data_head_rel(m, -hlen); if (m->m_pkthdr.rcvif && m->m_pkthdr.rcvif->if_type == IFT_FAITH) { /* @@ -885,13 +882,11 @@ icmp_send(struct mbuf *m, struct mbuf *o register struct icmp *icp; hlen = ip->ip_hl << 2; - m->m_data += hlen; - m->m_len -= hlen; + m_adj_data_head_rel(m, hlen); icp = mtod(m, struct icmp *); icp->icmp_cksum = 0; icp->icmp_cksum = in_cksum(m, ntohs(ip->ip_len) - hlen); - m->m_data -= hlen; - m->m_len += hlen; + m_adj_data_head_rel(m, -hlen); m->m_pkthdr.rcvif = (struct ifnet *)0; #ifdef ICMPPRINTFS if (icmpprintfs) { Modified: projects/mbuf_iovec/sys/netinet/ip_input.c ============================================================================== --- projects/mbuf_iovec/sys/netinet/ip_input.c Mon Nov 4 21:54:56 2013 (r257658) +++ projects/mbuf_iovec/sys/netinet/ip_input.c Mon Nov 4 22:12:25 2013 (r257659) @@ -934,8 +934,7 @@ found: * Presence of header sizes in mbufs * would confuse code below. */ - m->m_data += hlen; - m->m_len -= hlen; + m_adj_data_head_rel(m, hlen); /* * If first fragment to arrive, create a reassembly queue. @@ -1125,8 +1124,7 @@ found: TAILQ_REMOVE(head, fp, ipq_list); V_nipq--; uma_zfree(V_ipq_zone, fp); - m->m_len += (ip->ip_hl << 2); - m->m_data -= (ip->ip_hl << 2); + m_adj_data_head_rel(m, -(ip->ip_hl << 2)); /* some debugging cruft by sklower, below, will go away soon */ if (m->m_flags & M_PKTHDR) /* XXX this should be done elsewhere */ m_fixhdr(m); Modified: projects/mbuf_iovec/sys/netinet/ip_output.c ============================================================================== --- projects/mbuf_iovec/sys/netinet/ip_output.c Mon Nov 4 21:54:56 2013 (r257658) +++ projects/mbuf_iovec/sys/netinet/ip_output.c Mon Nov 4 22:12:25 2013 (r257659) @@ -806,7 +806,7 @@ smart_frag_failure: mhip->ip_v = IPVERSION; mhip->ip_hl = mhlen >> 2; } - m->m_len = mhlen; + m_len_set_abs(m, mhlen); /* XXX do we need to add ip_off below ? */ mhip->ip_off = ((off - hlen) >> 3) + ip_off; if (off + len >= ip_len) Modified: projects/mbuf_iovec/sys/netinet/tcp_output.c ============================================================================== --- projects/mbuf_iovec/sys/netinet/tcp_output.c Mon Nov 4 21:54:56 2013 (r257658) +++ projects/mbuf_iovec/sys/netinet/tcp_output.c Mon Nov 4 22:12:25 2013 (r257659) @@ -860,8 +860,8 @@ send: goto out; } - m->m_data += max_linkhdr; - m->m_len = hdrlen; + m_reserv_data_head(m, max_linkhdr); + m_len_set_abs(m, hdrlen); /* * Start the m_copy functions from the closest mbuf @@ -916,8 +916,8 @@ send: MH_ALIGN(m, hdrlen); } else #endif - m->m_data += max_linkhdr; - m->m_len = hdrlen; + m_reserv_data_head(m, max_linkhdr); + m_len_set_abs(m, hdrlen); } SOCKBUF_UNLOCK_ASSERT(&so->so_snd); m->m_pkthdr.rcvif = (struct ifnet *)0; @@ -1080,7 +1080,7 @@ send: * Put TCP length in extended header, and then * checksum extended header and data. */ - m->m_pkthdr.len = hdrlen + len; /* in6_cksum() need this */ + m_adj_pktlen_head_abs(m, hdrlen + len); /* in6_cksum() need this */ m->m_pkthdr.csum_data = offsetof(struct tcphdr, th_sum); #ifdef INET6 if (isipv6) { Modified: projects/mbuf_iovec/sys/netinet/tcp_subr.c ============================================================================== --- projects/mbuf_iovec/sys/netinet/tcp_subr.c Mon Nov 4 21:54:56 2013 (r257658) +++ projects/mbuf_iovec/sys/netinet/tcp_subr.c Mon Nov 4 22:12:25 2013 (r257659) @@ -582,7 +582,7 @@ tcp_respond(struct tcpcb *tp, void *ipge if (m == NULL) return; tlen = 0; - m->m_data += max_linkhdr; + m_reserv_data_head(m, max_linkhdr); #ifdef INET6 if (isipv6) { bcopy((caddr_t)ip6, mtod(m, caddr_t), Modified: projects/mbuf_iovec/sys/netinet/tcp_syncache.c ============================================================================== --- projects/mbuf_iovec/sys/netinet/tcp_syncache.c Mon Nov 4 21:54:56 2013 (r257658) +++ projects/mbuf_iovec/sys/netinet/tcp_syncache.c Mon Nov 4 22:12:25 2013 (r257659) @@ -1424,9 +1424,9 @@ syncache_respond(struct syncache *sc) #ifdef MAC mac_syncache_create_mbuf(sc->sc_label, m); #endif - m->m_data += max_linkhdr; - m->m_len = tlen; - m->m_pkthdr.len = tlen; + m_reserv_data_head(m, max_linkhdr); + m_len_set_abs(m, tlen); + m_adj_pktlen_head_abs(m, tlen); m->m_pkthdr.rcvif = NULL; #ifdef INET6 Modified: projects/mbuf_iovec/sys/sys/mbuf.h ============================================================================== --- projects/mbuf_iovec/sys/sys/mbuf.h Mon Nov 4 21:54:56 2013 (r257658) +++ projects/mbuf_iovec/sys/sys/mbuf.h Mon Nov 4 22:12:25 2013 (r257659) @@ -1171,5 +1171,51 @@ rt_m_getfib(struct mbuf *m) #define M_PROFILE(m) #endif +/* + * Bump the leading part of m_data by the given amount. + * This is relative to what m_data is currently set to. + * The value can be positive or negative. + * + * This will update m_data and m_len, but not m_pktlen. + */ +extern int m_adj_data_head_rel(struct mbuf *, int); +extern int m_adj_data_head_abs(struct mbuf *, unsigned int); + +/* + * Bump the trailer part of m_len by the given amount. + * This is relative to what m_len is currently set to. + * The value can be positive or negative. + * + * This will update m_len but not m_pktlen. + */ +extern int m_adj_pktlen_head_rel(struct mbuf *, int); +extern int m_adj_pktlen_head_abs(struct mbuf *, unsigned int); + +/* + * Get the m_len field. + */ +static inline int m_get_len(struct mbuf *m) +{ + return (m->m_len); + +} + +/* + * Reserve the given amount of data in the front of the mbuf. + * This doesn't update m_len, because reserving header data + * doesn't necessarily imply changing the length of the + * payload. + */ +extern int m_reserv_data_head(struct mbuf *, unsigned int); + +/* + * Set the mbuf length to the given value. + */ +extern int m_len_set_abs(struct mbuf *, unsigned int); + +/* + * Adjust the mbuf length by the given value. + */ +extern int m_len_set_rel(struct mbuf *, int); #endif /* !_SYS_MBUF_H_ */ From owner-svn-src-projects@FreeBSD.ORG Tue Nov 5 04:51:08 2013 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id 0B2A886B; Tue, 5 Nov 2013 04:51:08 +0000 (UTC) (envelope-from marcel@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id EDC642B36; Tue, 5 Nov 2013 04:51:07 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rA54p7CF002737; Tue, 5 Nov 2013 04:51:07 GMT (envelope-from marcel@svn.freebsd.org) Received: (from marcel@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id rA54p7Gn002736; Tue, 5 Nov 2013 04:51:07 GMT (envelope-from marcel@svn.freebsd.org) Message-Id: <201311050451.rA54p7Gn002736@svn.freebsd.org> From: Marcel Moolenaar Date: Tue, 5 Nov 2013 04:51:07 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r257675 - projects/altix2/sys/ia64/ia64 X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 05 Nov 2013 04:51:08 -0000 Author: marcel Date: Tue Nov 5 04:51:07 2013 New Revision: 257675 URL: http://svnweb.freebsd.org/changeset/base/257675 Log: We get a stray interrupt 54 on the Altic 450 and the problem is that there's no way to mask interrupts. So, until I know where it comes from or what device generates the interrupt, let's not panic... Modified: projects/altix2/sys/ia64/ia64/interrupt.c Modified: projects/altix2/sys/ia64/ia64/interrupt.c ============================================================================== --- projects/altix2/sys/ia64/ia64/interrupt.c Tue Nov 5 04:40:28 2013 (r257674) +++ projects/altix2/sys/ia64/ia64/interrupt.c Tue Nov 5 04:51:07 2013 (r257675) @@ -410,7 +410,7 @@ static u_int ia64_ih_invalid(struct thread *td, u_int xiv, struct trapframe *tf) { - panic("invalid XIV: %u", xiv); + printf("invalid XIV: %u", xiv); return (0); } From owner-svn-src-projects@FreeBSD.ORG Tue Nov 5 05:02:09 2013 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id 3D4CFAFB; Tue, 5 Nov 2013 05:02:09 +0000 (UTC) (envelope-from marcel@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 2B3C12B93; Tue, 5 Nov 2013 05:02:09 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rA5529jZ006247; Tue, 5 Nov 2013 05:02:09 GMT (envelope-from marcel@svn.freebsd.org) Received: (from marcel@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id rA5528iF006245; Tue, 5 Nov 2013 05:02:08 GMT (envelope-from marcel@svn.freebsd.org) Message-Id: <201311050502.rA5528iF006245@svn.freebsd.org> From: Marcel Moolenaar Date: Tue, 5 Nov 2013 05:02:08 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r257677 - projects/altix2/sys/ia64/sgisn X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 05 Nov 2013 05:02:09 -0000 Author: marcel Date: Tue Nov 5 05:02:08 2013 New Revision: 257677 URL: http://svnweb.freebsd.org/changeset/base/257677 Log: Implement SHub2 & TIOCP bridge address translations. With this change, mpt(4) seems to work. Modified: projects/altix2/sys/ia64/sgisn/sgisn_pcib.c projects/altix2/sys/ia64/sgisn/sgisn_shub.c Modified: projects/altix2/sys/ia64/sgisn/sgisn_pcib.c ============================================================================== --- projects/altix2/sys/ia64/sgisn/sgisn_pcib.c Tue Nov 5 05:01:46 2013 (r257676) +++ projects/altix2/sys/ia64/sgisn/sgisn_pcib.c Tue Nov 5 05:02:08 2013 (r257677) @@ -637,7 +637,7 @@ sgisn_pcib_iommu_map(device_t bus, devic struct sgisn_pcib_softc *sc = device_get_softc(bus); busdma_tag_t tag; bus_addr_t maxaddr = 0x80000000UL; - bus_addr_t ba, size; + bus_addr_t addr, ba, size; uint64_t bits; u_int ate, bitshft, count, entry, flags; @@ -645,15 +645,24 @@ sgisn_pcib_iommu_map(device_t bus, devic flags = busdma_md_get_flags(md); if ((flags & BUSDMA_MD_IA64_DIRECT32) && ba < maxaddr) { - *ba_p = ba | maxaddr; + addr = ba | maxaddr; + *ba_p = addr; return (0); } tag = busdma_md_get_tag(md); maxaddr = busdma_tag_get_maxaddr(tag); if (maxaddr == BUS_SPACE_MAXADDR) { - *ba_p = ba | ((u_long)sc->sc_fwbus->fw_hub_xid << 60) | - (1UL << ((flags & BUSDMA_ALLOC_CONSISTENT) ? 56 : 59)); + addr = ba; + if (flags & BUSDMA_ALLOC_CONSISTENT) + addr |= 1UL << 56; /* bar */ + if ((sc->sc_fwbus->fw_mode & 1) == 0) + addr |= 1UL << 59; /* prefetch */ + if (sc->sc_fwbus->fw_common.bus_asic == SGISN_PCIB_PIC) + addr |= (u_long)sc->sc_fwbus->fw_hub_xid << 60; + else + addr |= 1UL << 60; /* memory */ + *ba_p = addr; return (0); } @@ -732,9 +741,13 @@ sgisn_pcib_iommu_map(device_t bus, devic (SGISN_PCIB_PAGE_SIZE * entry); ba &= ~SGISN_PCIB_PAGE_MASK; - ba |= 1 << 0; /* valid */ - ba |= 1 << ((flags & BUSDMA_ALLOC_CONSISTENT) ? 4 : 3); - ba |= (u_long)sc->sc_fwbus->fw_hub_xid << 8; + ba |= 1 << 0; /* valid */ + if ((sc->sc_fwbus->fw_mode & 1) == 0) + ba |= 1 << 3; /* prefetch */ + if (flags & BUSDMA_ALLOC_CONSISTENT) + ba |= 1 << 4; /* bar */ + if (sc->sc_fwbus->fw_common.bus_asic == SGISN_PCIB_PIC) + ba |= (u_long)sc->sc_fwbus->fw_hub_xid << 8; while (count > 0) { bus_space_write_8(sc->sc_tag, sc->sc_hndl, PCIB_REG_ATE(entry), ba); Modified: projects/altix2/sys/ia64/sgisn/sgisn_shub.c ============================================================================== --- projects/altix2/sys/ia64/sgisn/sgisn_shub.c Tue Nov 5 05:01:46 2013 (r257676) +++ projects/altix2/sys/ia64/sgisn/sgisn_shub.c Tue Nov 5 05:02:08 2013 (r257677) @@ -557,7 +557,7 @@ sgisn_shub_iommu_map(device_t bus, devic bus_addr_t *ba_p) { struct sgisn_shub_softc *sc; - bus_addr_t ba, mask; + bus_addr_t addr, ba, mask; u_int flags; sc = device_get_softc(bus); @@ -579,8 +579,17 @@ sgisn_shub_iommu_map(device_t bus, devic * For all other memory addresses, map to a fully qualified bus * address. */ - mask = (1UL << (sc->sc_nasid_shft - 2)) - 1; - *ba_p = ((ba >> 2) & ~mask) | (ba & mask); + if (sc->sc_hubtype == 0) { + /* XXX assumes a PIC bridge. */ + mask = (1UL << (sc->sc_nasid_shft - 2)) - 1; + addr = ((ba >> 2) & ~mask) | (ba & mask); + } else { + /* XXX assumes TIOCP bridge. */ + addr = (ba >> sc->sc_nasid_shft) << 40; + addr |= ((ba >> (sc->sc_nasid_shft - 4)) & 0x3UL) << 36; + addr |= ba & ((1UL << (sc->sc_nasid_shft - 4)) - 1); + } + *ba_p = addr; return (0); } From owner-svn-src-projects@FreeBSD.ORG Tue Nov 5 11:19:39 2013 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id 14FF5936; Tue, 5 Nov 2013 11:19:39 +0000 (UTC) (envelope-from glebius@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id F2E3B2E8A; Tue, 5 Nov 2013 11:19:38 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rA5BJcq3034656; Tue, 5 Nov 2013 11:19:38 GMT (envelope-from glebius@svn.freebsd.org) Received: (from glebius@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id rA5BJZ6V034633; Tue, 5 Nov 2013 11:19:35 GMT (envelope-from glebius@svn.freebsd.org) Message-Id: <201311051119.rA5BJZ6V034633@svn.freebsd.org> From: Gleb Smirnoff Date: Tue, 5 Nov 2013 11:19:35 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r257698 - in projects/ifnet: . bin/sh cddl/contrib/opensolaris/common/ctf cddl/contrib/opensolaris/lib/libnvpair cddl/lib/libnvpair contrib/libreadline contrib/libreadline/support contr... X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 05 Nov 2013 11:19:39 -0000 Author: glebius Date: Tue Nov 5 11:19:34 2013 New Revision: 257698 URL: http://svnweb.freebsd.org/changeset/base/257698 Log: Merge head r256150 through r257697. Added: projects/ifnet/contrib/tzdata/leap-seconds.list - copied unchanged from r257697, head/contrib/tzdata/leap-seconds.list projects/ifnet/lib/libc/capability/cap_rights_init.3 - copied unchanged from r257697, head/lib/libc/capability/cap_rights_init.3 projects/ifnet/lib/libc/gen/cap_rights_get.3 - copied unchanged from r257697, head/lib/libc/gen/cap_rights_get.3 projects/ifnet/share/man/man4/rights.4 - copied unchanged from r257697, head/share/man/man4/rights.4 projects/ifnet/sys/arm/arm/devmap.c - copied unchanged from r257697, head/sys/arm/arm/devmap.c projects/ifnet/sys/arm/conf/WANDBOARD.common - copied unchanged from r257697, head/sys/arm/conf/WANDBOARD.common projects/ifnet/sys/arm/include/devmap.h - copied unchanged from r257697, head/sys/arm/include/devmap.h projects/ifnet/sys/dev/netmap/netmap_mem2.h - copied unchanged from r257697, head/sys/dev/netmap/netmap_mem2.h projects/ifnet/sys/x86/iommu/intel_qi.c - copied unchanged from r257697, head/sys/x86/iommu/intel_qi.c Deleted: projects/ifnet/etc/namedb/ projects/ifnet/etc/periodic/daily/470.status-named projects/ifnet/etc/rc.d/named projects/ifnet/lib/libiconv_compat/ projects/ifnet/sys/amd64/vmm/io/vdev.c projects/ifnet/sys/amd64/vmm/io/vdev.h projects/ifnet/sys/arm/conf/WANDBOARD-COMMON Modified: projects/ifnet/Makefile.inc1 projects/ifnet/ObsoleteFiles.inc projects/ifnet/bin/sh/nodetypes projects/ifnet/bin/sh/sh.1 projects/ifnet/cddl/contrib/opensolaris/common/ctf/ctf_create.c projects/ifnet/cddl/contrib/opensolaris/lib/libnvpair/libnvpair.c projects/ifnet/cddl/lib/libnvpair/Makefile projects/ifnet/contrib/libreadline/display.c projects/ifnet/contrib/libreadline/input.c projects/ifnet/contrib/libreadline/search.c projects/ifnet/contrib/libreadline/support/shobj-conf projects/ifnet/contrib/tzdata/africa projects/ifnet/contrib/tzdata/antarctica projects/ifnet/contrib/tzdata/asia projects/ifnet/contrib/tzdata/australasia projects/ifnet/contrib/tzdata/backward projects/ifnet/contrib/tzdata/etcetera projects/ifnet/contrib/tzdata/europe projects/ifnet/contrib/tzdata/northamerica projects/ifnet/contrib/tzdata/southamerica projects/ifnet/contrib/tzdata/zone.tab projects/ifnet/etc/defaults/periodic.conf projects/ifnet/etc/defaults/rc.conf projects/ifnet/etc/freebsd-update.conf projects/ifnet/etc/pkg/FreeBSD.conf projects/ifnet/etc/rc.d/Makefile projects/ifnet/etc/rc.d/ntpdate projects/ifnet/etc/rc.d/rpcbind projects/ifnet/etc/rc.d/syslogd projects/ifnet/gnu/lib/libgcc/Makefile projects/ifnet/gnu/usr.bin/binutils/ld/Makefile projects/ifnet/include/Makefile projects/ifnet/include/iconv.h projects/ifnet/lib/Makefile projects/ifnet/lib/libc/capability/Makefile.inc projects/ifnet/lib/libc/gen/Makefile.inc projects/ifnet/lib/libc/iconv/Symbol.map projects/ifnet/lib/libc/iconv/iconv.c projects/ifnet/lib/libc/string/strlcpy.3 projects/ifnet/lib/libc/sys/cap_ioctls_limit.2 projects/ifnet/lib/libc/sys/cap_rights_limit.2 projects/ifnet/lib/libc/sys/kqueue.2 projects/ifnet/lib/libproc/proc_bkpt.c projects/ifnet/libexec/rbootd/bpf.c projects/ifnet/release/picobsd/build/picobsd projects/ifnet/release/release.sh projects/ifnet/sbin/hastd/hastd.8 projects/ifnet/sbin/nvmecontrol/perftest.c projects/ifnet/share/i18n/csmapper/JIS/JISX0201-KANA%UCS.src projects/ifnet/share/i18n/csmapper/JIS/JISX0208@1990%UCS.src projects/ifnet/share/i18n/csmapper/JIS/UCS%JISX0201-KANA.src projects/ifnet/share/i18n/csmapper/JIS/UCS%JISX0208@1990.src projects/ifnet/share/i18n/csmapper/JIS/charset.pivot.JIS.src projects/ifnet/share/i18n/csmapper/JIS/mapper.dir.JIS.src projects/ifnet/share/i18n/esdb/EUC/EUC-JP.src projects/ifnet/share/man/man3/tree.3 projects/ifnet/share/man/man4/Makefile projects/ifnet/share/man/man4/altera_atse.4 projects/ifnet/share/man/man4/capsicum.4 projects/ifnet/share/man/man4/natm.4 projects/ifnet/share/man/man4/netmap.4 projects/ifnet/share/man/man9/ifnet.9 projects/ifnet/share/misc/bsd-family-tree projects/ifnet/share/misc/committers-src.dot projects/ifnet/share/mk/bsd.own.mk projects/ifnet/share/mk/bsd.prog.mk projects/ifnet/sys/amd64/vmm/io/vlapic.c projects/ifnet/sys/amd64/vmm/io/vlapic.h projects/ifnet/sys/amd64/vmm/vmm_lapic.c projects/ifnet/sys/arm/allwinner/a10_machdep.c projects/ifnet/sys/arm/arm/bus_space_generic.c projects/ifnet/sys/arm/arm/machdep.c projects/ifnet/sys/arm/arm/pmap-v6.c projects/ifnet/sys/arm/arm/pmap.c projects/ifnet/sys/arm/at91/at91.c projects/ifnet/sys/arm/at91/at91_machdep.c projects/ifnet/sys/arm/broadcom/bcm2835/bcm2835_machdep.c projects/ifnet/sys/arm/conf/WANDBOARD-DUAL projects/ifnet/sys/arm/conf/WANDBOARD-QUAD projects/ifnet/sys/arm/conf/WANDBOARD-SOLO projects/ifnet/sys/arm/econa/econa_machdep.c projects/ifnet/sys/arm/freescale/imx/imx51_machdep.c projects/ifnet/sys/arm/freescale/imx/imx53_machdep.c projects/ifnet/sys/arm/freescale/imx/imx6_anatopreg.h projects/ifnet/sys/arm/freescale/imx/imx6_machdep.c projects/ifnet/sys/arm/freescale/imx/imx_machdep.c projects/ifnet/sys/arm/freescale/imx/imx_sdhci.c projects/ifnet/sys/arm/include/fdt.h projects/ifnet/sys/arm/include/machdep.h projects/ifnet/sys/arm/include/pmap.h projects/ifnet/sys/arm/include/vmparam.h projects/ifnet/sys/arm/lpc/lpc_machdep.c projects/ifnet/sys/arm/mv/mv_localbus.c projects/ifnet/sys/arm/mv/mv_machdep.c projects/ifnet/sys/arm/mv/mvvar.h projects/ifnet/sys/arm/rockchip/rk30xx_machdep.c projects/ifnet/sys/arm/s3c2xx0/files.s3c2xx0 projects/ifnet/sys/arm/s3c2xx0/s3c24x0_machdep.c projects/ifnet/sys/arm/s3c2xx0/s3c2xx0_space.c projects/ifnet/sys/arm/sa11x0/assabet_machdep.c projects/ifnet/sys/arm/samsung/exynos/exynos5_machdep.c projects/ifnet/sys/arm/tegra/tegra2_machdep.c projects/ifnet/sys/arm/ti/ti_machdep.c projects/ifnet/sys/arm/ti/ti_sdhci.c projects/ifnet/sys/arm/versatile/versatile_machdep.c projects/ifnet/sys/arm/xilinx/zy7_machdep.c projects/ifnet/sys/arm/xscale/i80321/ep80219_machdep.c projects/ifnet/sys/arm/xscale/i80321/iq31244_machdep.c projects/ifnet/sys/arm/xscale/i8134x/crb_machdep.c projects/ifnet/sys/arm/xscale/ixp425/avila_machdep.c projects/ifnet/sys/arm/xscale/pxa/pxa_machdep.c projects/ifnet/sys/boot/fdt/dts/am335x.dtsi projects/ifnet/sys/boot/fdt/dts/beaglebone-black.dts projects/ifnet/sys/boot/forth/beastie.4th projects/ifnet/sys/boot/forth/loader.4th projects/ifnet/sys/boot/forth/loader.4th.8 projects/ifnet/sys/boot/forth/loader.conf projects/ifnet/sys/boot/forth/loader.conf.5 projects/ifnet/sys/boot/forth/loader.rc projects/ifnet/sys/boot/forth/menu-commands.4th projects/ifnet/sys/boot/forth/menu.4th projects/ifnet/sys/boot/forth/menu.rc projects/ifnet/sys/boot/forth/menusets.4th projects/ifnet/sys/boot/i386/loader/loader.rc projects/ifnet/sys/cddl/contrib/opensolaris/uts/common/sys/fasttrap_impl.h projects/ifnet/sys/cddl/contrib/opensolaris/uts/intel/dtrace/fasttrap_isa.c projects/ifnet/sys/compat/svr4/svr4_sockio.c projects/ifnet/sys/conf/files projects/ifnet/sys/conf/files.amd64 projects/ifnet/sys/conf/files.arm projects/ifnet/sys/conf/files.i386 projects/ifnet/sys/dev/aic7xxx/aicasm/Makefile projects/ifnet/sys/dev/cxgbe/t4_main.c projects/ifnet/sys/dev/e1000/if_em.c projects/ifnet/sys/dev/e1000/if_igb.c projects/ifnet/sys/dev/e1000/if_lem.c projects/ifnet/sys/dev/e1000/if_lem.h projects/ifnet/sys/dev/fdt/fdt_pci.c projects/ifnet/sys/dev/iwn/if_iwn_debug.h projects/ifnet/sys/dev/iwn/if_iwn_devid.h projects/ifnet/sys/dev/iwn/if_iwnreg.h projects/ifnet/sys/dev/ixgbe/ixgbe.c projects/ifnet/sys/dev/netmap/if_em_netmap.h projects/ifnet/sys/dev/netmap/if_igb_netmap.h projects/ifnet/sys/dev/netmap/if_lem_netmap.h projects/ifnet/sys/dev/netmap/if_re_netmap.h projects/ifnet/sys/dev/netmap/ixgbe_netmap.h projects/ifnet/sys/dev/netmap/netmap.c projects/ifnet/sys/dev/netmap/netmap_kern.h projects/ifnet/sys/dev/netmap/netmap_mem2.c projects/ifnet/sys/dev/nvme/nvme_ctrlr.c projects/ifnet/sys/dev/nvme/nvme_ns.c projects/ifnet/sys/dev/random/harvest.c projects/ifnet/sys/dev/re/if_re.c projects/ifnet/sys/dev/uart/uart.h projects/ifnet/sys/dev/uart/uart_bus_fdt.c projects/ifnet/sys/dev/uart/uart_cpu_fdt.c projects/ifnet/sys/dev/usb/controller/ehci_pci.c projects/ifnet/sys/dev/usb/wlan/if_urtwn.c projects/ifnet/sys/dev/xen/netback/netback.c projects/ifnet/sys/dev/xen/netback/netback_unit_tests.c projects/ifnet/sys/dev/xen/netfront/netfront.c projects/ifnet/sys/fs/nfs/nfs_commonkrpc.c projects/ifnet/sys/geom/eli/g_eli_ctl.c projects/ifnet/sys/kern/kern_event.c projects/ifnet/sys/modules/aic7xxx/Makefile projects/ifnet/sys/modules/aic7xxx/ahc/Makefile projects/ifnet/sys/modules/aic7xxx/ahd/Makefile projects/ifnet/sys/modules/vmm/Makefile projects/ifnet/sys/net/bpf.c projects/ifnet/sys/net/if.c projects/ifnet/sys/net/if.h projects/ifnet/sys/net/if_tap.c projects/ifnet/sys/net/if_var.h projects/ifnet/sys/net/netmap.h projects/ifnet/sys/netinet/if_ether.c projects/ifnet/sys/netinet/in.c projects/ifnet/sys/netinet/raw_ip.c projects/ifnet/sys/netinet/sctp_asconf.c projects/ifnet/sys/netinet/sctp_output.c projects/ifnet/sys/netinet/sctp_pcb.c projects/ifnet/sys/netinet/sctp_usrreq.c projects/ifnet/sys/netinet/sctputil.c projects/ifnet/sys/netinet6/sctp6_usrreq.c projects/ifnet/sys/netpfil/ipfw/ip_fw2.c projects/ifnet/sys/netpfil/pf/pf.c projects/ifnet/sys/netpfil/pf/pf.h projects/ifnet/sys/netpfil/pf/pf_ioctl.c projects/ifnet/sys/ofed/drivers/net/mlx4/en_netdev.c projects/ifnet/sys/sys/param.h projects/ifnet/sys/sys/random.h projects/ifnet/sys/sys/sockio.h projects/ifnet/sys/vm/vm_object.c projects/ifnet/sys/x86/iommu/intel_ctx.c projects/ifnet/sys/x86/iommu/intel_dmar.h projects/ifnet/sys/x86/iommu/intel_drv.c projects/ifnet/sys/x86/iommu/intel_fault.c projects/ifnet/sys/x86/iommu/intel_gas.c projects/ifnet/sys/x86/iommu/intel_idpgtbl.c projects/ifnet/sys/x86/iommu/intel_reg.h projects/ifnet/sys/x86/iommu/intel_utils.c projects/ifnet/tools/build/mk/OptionalObsoleteFiles.inc projects/ifnet/tools/tools/ath/athstats/Makefile projects/ifnet/tools/tools/netmap/nm_util.c projects/ifnet/tools/tools/netmap/pkt-gen.c projects/ifnet/usr.bin/calendar/calendars/calendar.freebsd projects/ifnet/usr.bin/limits/limits.1 projects/ifnet/usr.sbin/arp/arp.4 projects/ifnet/usr.sbin/newsyslog/newsyslog.c projects/ifnet/usr.sbin/pkg/pkg.7 projects/ifnet/usr.sbin/pkg/pkg.c projects/ifnet/usr.sbin/utx/Makefile projects/ifnet/usr.sbin/utx/utx.8 projects/ifnet/usr.sbin/utx/utx.c Directory Properties: projects/ifnet/ (props changed) projects/ifnet/cddl/ (props changed) projects/ifnet/cddl/contrib/opensolaris/ (props changed) projects/ifnet/contrib/tzdata/ (props changed) projects/ifnet/gnu/lib/ (props changed) projects/ifnet/gnu/usr.bin/binutils/ (props changed) projects/ifnet/lib/libc/ (props changed) projects/ifnet/sbin/ (props changed) projects/ifnet/share/man/man4/ (props changed) projects/ifnet/sys/ (props changed) projects/ifnet/sys/amd64/vmm/ (props changed) projects/ifnet/sys/boot/ (props changed) projects/ifnet/sys/cddl/contrib/opensolaris/ (props changed) projects/ifnet/sys/conf/ (props changed) projects/ifnet/sys/modules/vmm/ (props changed) projects/ifnet/usr.bin/calendar/ (props changed) Modified: projects/ifnet/Makefile.inc1 ============================================================================== --- projects/ifnet/Makefile.inc1 Tue Nov 5 10:58:38 2013 (r257697) +++ projects/ifnet/Makefile.inc1 Tue Nov 5 11:19:34 2013 (r257698) @@ -1019,20 +1019,7 @@ buildkernel: @echo "--------------------------------------------------------------" @echo ">>> stage 2.3: build tools" @echo "--------------------------------------------------------------" - cd ${KRNLOBJDIR}/${_kernel}; \ - PATH=${BPATH}:${PATH} \ - MAKESRCPATH=${KERNSRCDIR}/dev/aic7xxx/aicasm \ - ${MAKE} SSP_CFLAGS= -DNO_CPU_CFLAGS -DNO_CTF -DEARLY_BUILD \ - -f ${KERNSRCDIR}/dev/aic7xxx/aicasm/Makefile -# XXX - Gratuitously builds aicasm in the ``makeoptions NO_MODULES'' case. -.if !defined(MODULES_WITH_WORLD) && !defined(NO_MODULES) && exists(${KERNSRCDIR}/modules) -.for target in obj depend all - cd ${KERNSRCDIR}/modules/aic7xxx/aicasm; \ - PATH=${BPATH}:${PATH} \ - MAKEOBJDIRPREFIX=${KRNLOBJDIR}/${_kernel}/modules \ - ${MAKE} SSP_CFLAGS= -DNO_CPU_CFLAGS -DNO_CTF -DEARLY_BUILD ${target} -.endfor -.endif + @# Currently no special kernel tools to build. .if !defined(NO_KERNELDEPEND) @echo @echo "--------------------------------------------------------------" @@ -1319,10 +1306,6 @@ bootstrap-tools: .MAKE # # build-tools: Build special purpose build tools # -.if defined(MODULES_WITH_WORLD) && exists(${KERNSRCDIR}/modules) -_aicasm= sys/modules/aic7xxx/aicasm -.endif - .if !defined(NO_SHARE) _share= share/syscons/scrnmaps .endif @@ -1344,7 +1327,6 @@ build-tools: .MAKE lib/ncurses/ncurses \ lib/ncurses/ncursesw \ ${_share} \ - ${_aicasm} \ usr.bin/awk \ lib/libmagic \ usr.bin/mkesdb_static \ @@ -1410,7 +1392,8 @@ cross-tools: .MAKE usr.bin/xlint/lint1 usr.bin/xlint/lint2 usr.bin/xlint/xlint \ ${_btxld} \ ${_crunchide} \ - ${_kgzip} + ${_kgzip} \ + sys/dev/aic7xxx/aicasm ${_+_}@${ECHODIR} "===> ${_tool} (obj,depend,all,install)"; \ cd ${.CURDIR}/${_tool} && \ ${MAKE} DIRPRFX=${_tool}/ obj && \ Modified: projects/ifnet/ObsoleteFiles.inc ============================================================================== --- projects/ifnet/ObsoleteFiles.inc Tue Nov 5 10:58:38 2013 (r257697) +++ projects/ifnet/ObsoleteFiles.inc Tue Nov 5 11:19:34 2013 (r257698) @@ -38,6 +38,15 @@ # xargs -n1 | sort | uniq -d; # done +# 20131103: WITH_LIBICONV_COMPAT removal +OLD_FILES+=usr/include/_libiconv_compat.h +OLD_FILES+=usr/lib/libiconv.a +OLD_FILES+=usr/lib/libiconv.so +OLD_FILES+=usr/lib/libiconv.so.3 +OLD_FILES+=usr/lib/libiconv_p.a +# 20131103: removal of utxrm(8), use 'utx rm' instead. +OLD_FILES+=usr/sbin/utxrm +OLD_FILES+=usr/share/man/man8/utxrm.8.gz # 20131031: pkg_install has been removed OLD_FILES+=etc/periodic/daily/220.backup-pkgdb OLD_FILES+=etc/periodic/daily/490.status-pkg-changes Modified: projects/ifnet/bin/sh/nodetypes ============================================================================== --- projects/ifnet/bin/sh/nodetypes Tue Nov 5 10:58:38 2013 (r257697) +++ projects/ifnet/bin/sh/nodetypes Tue Nov 5 11:19:34 2013 (r257698) @@ -118,16 +118,16 @@ NFROMTO nfile # fd<> fname NAPPEND nfile # fd>> fname NCLOBBER nfile # fd>| fname type int - next nodeptr # next redirection in list fd int # file descriptor being redirected + next nodeptr # next redirection in list fname nodeptr # file name, in a NARG node expfname temp char *expfname # actual file name NTOFD ndup # fd<&dupfd NFROMFD ndup # fd>&dupfd type int - next nodeptr # next redirection in list fd int # file descriptor being redirected + next nodeptr # next redirection in list dupfd int # file descriptor to duplicate vname nodeptr # file name if fd>&$var @@ -135,8 +135,8 @@ NFROMFD ndup # fd>&dupfd NHERE nhere # fd<<\! NXHERE nhere # fd< Modified: projects/ifnet/contrib/libreadline/display.c ============================================================================== --- projects/ifnet/contrib/libreadline/display.c Tue Nov 5 10:58:38 2013 (r257697) +++ projects/ifnet/contrib/libreadline/display.c Tue Nov 5 11:19:34 2013 (r257698) @@ -392,14 +392,14 @@ rl_expand_prompt (prompt) t = ++p; local_prompt = expand_prompt (p, &prompt_visible_length, &prompt_last_invisible, - (int *)NULL, + &prompt_invis_chars_first_line, &prompt_physical_chars); c = *t; *t = '\0'; /* The portion of the prompt string up to and including the final newline is now null-terminated. */ local_prompt_prefix = expand_prompt (prompt, &prompt_prefix_length, (int *)NULL, - &prompt_invis_chars_first_line, + (int *)NULL, (int *)NULL); *t = c; local_prompt_len = local_prompt ? strlen (local_prompt) : 0; @@ -911,6 +911,10 @@ rl_redisplay () second and subsequent lines start at inv_lbreaks[N], offset by OFFSET (which has already been calculated above). */ +#define INVIS_FIRST() (prompt_physical_chars > _rl_screenwidth ? prompt_invis_chars_first_line : wrap_offset) +#define WRAP_OFFSET(line, offset) ((line == 0) \ + ? (offset ? INVIS_FIRST() : 0) \ + : ((line == prompt_last_screen_line) ? wrap_offset-prompt_invis_chars_first_line : 0)) #define W_OFFSET(line, offset) ((line) == 0 ? offset : 0) #define VIS_LLEN(l) ((l) > _rl_vis_botlin ? 0 : (vis_lbreaks[l+1] - vis_lbreaks[l])) #define INV_LLEN(l) (inv_lbreaks[l+1] - inv_lbreaks[l]) @@ -945,7 +949,13 @@ rl_redisplay () _rl_last_c_pos != o_cpos && _rl_last_c_pos > wrap_offset && o_cpos < prompt_last_invisible) - _rl_last_c_pos -= wrap_offset; + _rl_last_c_pos -= prompt_invis_chars_first_line; /* XXX - was wrap_offset */ + else if (linenum == prompt_last_screen_line && prompt_physical_chars > _rl_screenwidth && + (MB_CUR_MAX > 1 && rl_byte_oriented == 0) && + cpos_adjusted == 0 && + _rl_last_c_pos != o_cpos && + _rl_last_c_pos > (prompt_last_invisible - _rl_screenwidth - prompt_invis_chars_first_line)) + _rl_last_c_pos -= (wrap_offset-prompt_invis_chars_first_line); /* If this is the line with the prompt, we might need to compensate for invisible characters in the new line. Do @@ -1049,7 +1059,7 @@ rl_redisplay () tx = _rl_col_width (&visible_line[pos], 0, nleft) - visible_wrap_offset; else tx = nleft; - if (_rl_last_c_pos > tx) + if (tx >= 0 && _rl_last_c_pos > tx) { _rl_backspace (_rl_last_c_pos - tx); /* XXX */ _rl_last_c_pos = tx; @@ -1205,7 +1215,7 @@ update_line (old, new, current_line, oma int current_line, omax, nmax, inv_botlin; { register char *ofd, *ols, *oe, *nfd, *nls, *ne; - int temp, lendiff, wsatend, od, nd; + int temp, lendiff, wsatend, od, nd, twidth, o_cpos; int current_invis_chars; int col_lendiff, col_temp; #if defined (HANDLE_MULTIBYTE) @@ -1221,7 +1231,7 @@ update_line (old, new, current_line, oma if (MB_CUR_MAX > 1 && rl_byte_oriented == 0) temp = _rl_last_c_pos; else - temp = _rl_last_c_pos - W_OFFSET(_rl_last_v_pos, visible_wrap_offset); + temp = _rl_last_c_pos - WRAP_OFFSET (_rl_last_v_pos, visible_wrap_offset); if (temp == _rl_screenwidth && _rl_term_autowrap && !_rl_horizontal_scroll_mode && _rl_last_v_pos == current_line - 1) { @@ -1466,6 +1476,8 @@ update_line (old, new, current_line, oma _rl_last_c_pos = lendiff; } + o_cpos = _rl_last_c_pos; + /* When this function returns, _rl_last_c_pos is correct, and an absolute cursor postion in multibyte mode, but a buffer index when not in a multibyte locale. */ @@ -1475,7 +1487,9 @@ update_line (old, new, current_line, oma /* We need to indicate that the cursor position is correct in the presence of invisible characters in the prompt string. Let's see if setting this when we make sure we're at the end of the drawn prompt string works. */ - if (current_line == 0 && MB_CUR_MAX > 1 && rl_byte_oriented == 0 && _rl_last_c_pos == prompt_physical_chars) + if (current_line == 0 && MB_CUR_MAX > 1 && rl_byte_oriented == 0 && + (_rl_last_c_pos > 0 || o_cpos > 0) && + _rl_last_c_pos == prompt_physical_chars) cpos_adjusted = 1; #endif #endif @@ -1566,11 +1580,16 @@ update_line (old, new, current_line, oma } else { - /* We have horizontal scrolling and we are not inserting at - the end. We have invisible characters in this line. This - is a dumb update. */ _rl_output_some_chars (nfd, temp); _rl_last_c_pos += col_temp; + /* If nfd begins before any invisible characters in the prompt, + adjust _rl_last_c_pos to account for wrap_offset and set + cpos_adjusted to let the caller know. */ + if (current_line == 0 && wrap_offset && ((nfd - new) <= prompt_last_invisible)) + { + _rl_last_c_pos -= wrap_offset; + cpos_adjusted = 1; + } return; } /* Copy (new) chars to screen from first diff to last match. */ @@ -1578,15 +1597,15 @@ update_line (old, new, current_line, oma if ((temp - lendiff) > 0) { _rl_output_some_chars (nfd + lendiff, temp - lendiff); -#if 1 /* XXX -- this bears closer inspection. Fixes a redisplay bug reported against bash-3.0-alpha by Andreas Schwab involving multibyte characters and prompt strings with invisible characters, but was previously disabled. */ - _rl_last_c_pos += _rl_col_width (nfd+lendiff, 0, temp-col_lendiff); -#else - _rl_last_c_pos += _rl_col_width (nfd+lendiff, 0, temp-lendiff); -#endif + if (MB_CUR_MAX > 1 && rl_byte_oriented == 0) + twidth = _rl_col_width (nfd+lendiff, 0, temp-col_lendiff); + else + twidth = temp - lendiff; + _rl_last_c_pos += twidth; } } else @@ -1780,7 +1799,7 @@ _rl_move_cursor_relative (new, data) int woff; /* number of invisible chars on current line */ int cpos, dpos; /* current and desired cursor positions */ - woff = W_OFFSET (_rl_last_v_pos, wrap_offset); + woff = WRAP_OFFSET (_rl_last_v_pos, wrap_offset); cpos = _rl_last_c_pos; #if defined (HANDLE_MULTIBYTE) /* If we have multibyte characters, NEW is indexed by the buffer point in @@ -1794,7 +1813,11 @@ _rl_move_cursor_relative (new, data) /* Use NEW when comparing against the last invisible character in the prompt string, since they're both buffer indices and DPOS is a desired display position. */ - if (new > prompt_last_invisible) /* XXX - don't use woff here */ + if ((new > prompt_last_invisible) || /* XXX - don't use woff here */ + (prompt_physical_chars > _rl_screenwidth && + _rl_last_v_pos == prompt_last_screen_line && + wrap_offset != woff && + new > (prompt_last_invisible-_rl_screenwidth-wrap_offset))) { dpos -= woff; /* Since this will be assigned to _rl_last_c_pos at the end (more Modified: projects/ifnet/contrib/libreadline/input.c ============================================================================== --- projects/ifnet/contrib/libreadline/input.c Tue Nov 5 10:58:38 2013 (r257697) +++ projects/ifnet/contrib/libreadline/input.c Tue Nov 5 11:19:34 2013 (r257698) @@ -154,7 +154,7 @@ _rl_unget_char (key) { pop_index--; if (pop_index < 0) - pop_index = ibuffer_len - 1; + pop_index = ibuffer_len; ibuffer[pop_index] = key; return (1); } Modified: projects/ifnet/contrib/libreadline/search.c ============================================================================== --- projects/ifnet/contrib/libreadline/search.c Tue Nov 5 10:58:38 2013 (r257697) +++ projects/ifnet/contrib/libreadline/search.c Tue Nov 5 11:19:34 2013 (r257698) @@ -211,7 +211,11 @@ _rl_nsearch_init (dir, pchar) rl_end = rl_point = 0; p = _rl_make_prompt_for_search (pchar ? pchar : ':'); +#if defined (PREFER_STDARG) + rl_message ("%s", p); +#else rl_message ("%s", p, 0); +#endif free (p); RL_SETSTATE(RL_STATE_NSEARCH); Modified: projects/ifnet/contrib/libreadline/support/shobj-conf ============================================================================== --- projects/ifnet/contrib/libreadline/support/shobj-conf Tue Nov 5 10:58:38 2013 (r257697) +++ projects/ifnet/contrib/libreadline/support/shobj-conf Tue Nov 5 11:19:34 2013 (r257698) @@ -10,7 +10,7 @@ # Chet Ramey # chet@po.cwru.edu -# Copyright (C) 1996-2002 Free Software Foundation, Inc. +# Copyright (C) 1996-2007 Free Software Foundation, Inc. # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -114,7 +114,7 @@ linux*-*|gnu*-*|k*bsd*-gnu-*) SHLIB_LIBVERSION='$(SHLIB_LIBSUFF).$(SHLIB_MAJOR)$(SHLIB_MINOR)' ;; -freebsd2* | netbsd*) +freebsd2*) SHOBJ_CFLAGS=-fpic SHOBJ_LD=ld SHOBJ_LDFLAGS='-x -Bshareable' @@ -125,7 +125,7 @@ freebsd2* | netbsd*) # FreeBSD-3.x ELF freebsd[3-9]*|freebsdelf[3-9]*|freebsdaout[3-9]*|dragonfly*) - SHOBJ_CFLAGS=-fpic + SHOBJ_CFLAGS=-fPIC SHOBJ_LD='${CC}' if [ -x /usr/bin/objformat ] && [ "`/usr/bin/objformat`" = "elf" ]; then @@ -142,7 +142,7 @@ freebsd[3-9]*|freebsdelf[3-9]*|freebsdao ;; # Darwin/MacOS X -darwin8*) +darwin[89]*) SHOBJ_STATUS=supported SHLIB_STATUS=supported @@ -153,7 +153,7 @@ darwin8*) SHLIB_LIBVERSION='$(SHLIB_MAJOR)$(SHLIB_MINOR).$(SHLIB_LIBSUFF)' SHLIB_LIBSUFF='dylib' - SHOBJ_LDFLAGS='-undefined dynamic_lookup' + SHOBJ_LDFLAGS='-dynamiclib -dynamic -undefined dynamic_lookup -arch_only `/usr/bin/arch`' SHLIB_XLDFLAGS='-dynamiclib -arch_only `/usr/bin/arch` -install_name $(libdir)/$@ -current_version $(SHLIB_MAJOR)$(SHLIB_MINOR) -compatibility_version $(SHLIB_MAJOR) -v' SHLIB_LIBS='-lncurses' # see if -lcurses works on MacOS X 10.1 @@ -171,7 +171,7 @@ darwin*|macosx*) SHLIB_LIBSUFF='dylib' case "${host_os}" in - darwin[78]*) SHOBJ_LDFLAGS='' + darwin[789]*) SHOBJ_LDFLAGS='' SHLIB_XLDFLAGS='-dynamiclib -arch_only `/usr/bin/arch` -install_name $(libdir)/$@ -current_version $(SHLIB_MAJOR)$(SHLIB_MINOR) -compatibility_version $(SHLIB_MAJOR) -v' ;; *) SHOBJ_LDFLAGS='-dynamic' @@ -182,7 +182,7 @@ darwin*|macosx*) SHLIB_LIBS='-lncurses' # see if -lcurses works on MacOS X 10.1 ;; -openbsd*) +openbsd*|netbsd*) SHOBJ_CFLAGS=-fPIC SHOBJ_LD='${CC}' SHOBJ_LDFLAGS='-shared' @@ -247,7 +247,7 @@ osf*) SHLIB_LIBVERSION='$(SHLIB_LIBSUFF).$(SHLIB_MAJOR)' ;; -aix4.[2-9]*-*gcc*) # lightly tested by jik@cisco.com +aix4.[2-9]*-*gcc*|aix[5-9].*-*gcc*) # lightly tested by jik@cisco.com SHOBJ_CFLAGS=-fpic SHOBJ_LD='ld' SHOBJ_LDFLAGS='-bdynamic -bnoentry -bexpall' @@ -258,7 +258,7 @@ aix4.[2-9]*-*gcc*) # lightly tested by SHLIB_LIBVERSION='$(SHLIB_LIBSUFF).$(SHLIB_MAJOR)' ;; -aix4.[2-9]*) +aix4.[2-9]*|aix[5-9].*) SHOBJ_CFLAGS=-K SHOBJ_LD='ld' SHOBJ_LDFLAGS='-bdynamic -bnoentry -bexpall' @@ -329,7 +329,7 @@ hpux10*-*gcc*) SHOBJ_LD='${CC}' # if you have problems linking here, moving the `-Wl,+h,$@' from # SHLIB_XLDFLAGS to SHOBJ_LDFLAGS has been reported to work - SHOBJ_LDFLAGS='-shared -Wl,-b -Wl,+s' + SHOBJ_LDFLAGS='-shared -fpic -Wl,-b -Wl,+s' SHLIB_XLDFLAGS='-Wl,+h,$@ -Wl,+b,$(libdir)' SHLIB_LIBSUFF='sl' Modified: projects/ifnet/contrib/tzdata/africa ============================================================================== --- projects/ifnet/contrib/tzdata/africa Tue Nov 5 10:58:38 2013 (r257697) +++ projects/ifnet/contrib/tzdata/africa Tue Nov 5 11:19:34 2013 (r257698) @@ -451,6 +451,14 @@ Zone Africa/Monrovia -0:43:08 - LMT 1882 # (either two days before them or five days after them, so as to fall on # lastFri instead of lastSun). +# From Even Scharning (2013-10-25): +# The scheduled end of DST in Libya on Friday, October 25, 2013 was +# cancelled yesterday.... +# http://www.libyaherald.com/2013/10/24/correction-no-time-change-tomorrow/ +# +# From Paul Eggert (2013-10-25): +# For now, assume they're reverting to the pre-2012 rules of permanent UTC+2. + # Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S Rule Libya 1951 only - Oct 14 2:00 1:00 S Rule Libya 1952 only - Jan 1 0:00 0 - @@ -467,8 +475,8 @@ Rule Libya 1987 1989 - Apr 1 0:00 1:00 Rule Libya 1987 1989 - Oct 1 0:00 0 - Rule Libya 1997 only - Apr 4 0:00 1:00 S Rule Libya 1997 only - Oct 4 0:00 0 - -Rule Libya 2013 max - Mar lastFri 1:00 1:00 S -Rule Libya 2013 max - Oct lastFri 2:00 0 - +Rule Libya 2013 only - Mar lastFri 1:00 1:00 S +Rule Libya 2013 only - Oct lastFri 2:00 0 - # Zone NAME GMTOFF RULES FORMAT [UNTIL] Zone Africa/Tripoli 0:52:44 - LMT 1920 1:00 Libya CE%sT 1959 @@ -479,7 +487,8 @@ Zone Africa/Tripoli 0:52:44 - LMT 1920 2:00 - EET 1996 Sep 30 1:00 Libya CE%sT 1997 Oct 4 2:00 - EET 2012 Nov 10 2:00 - 1:00 Libya CE%sT + 1:00 Libya CE%sT 2013 Oct 25 2:00 + 2:00 - EET # Madagascar # Zone NAME GMTOFF RULES FORMAT [UNTIL] @@ -684,15 +693,6 @@ Zone Indian/Mayotte 3:00:56 - LMT 1911 J # http://www.google.com/search?hl=en&q=Conseil+de+gouvernement+maroc+heure+avance&btnG=Search # -# From Alex Krivenyshev (2008-05-09): -# Is Western Sahara (part which administrated by Morocco) going to follow -# Morocco DST changes? Any information? What about other part of -# Western Sahara - under administration of POLISARIO Front (also named -# SADR Saharawi Arab Democratic Republic)? - -# From Arthur David Olson (2008-05-09): -# XXX--guess that it is only Morocco for now; guess only 2008 for now. - # From Steffen Thorsen (2008-08-27): # Morocco will change the clocks back on the midnight between August 31 # and September 1. They originally planned to observe DST to near the end @@ -858,13 +858,23 @@ Zone Indian/Mayotte 3:00:56 - LMT 1911 J # transitions would be 2013-07-07 and 2013-08-10; see: # http://www.maroc.ma/en/news/morocco-suspends-daylight-saving-time-july-7-aug10 -# From Paul Eggert (2013-07-03): +# From Steffen Thorsen (2013-09-28): +# Morocco extends DST by one month, on very short notice, just 1 day +# before it was going to end. There is a new decree (2.13.781) for +# this, where DST from now on goes from last Sunday of March at 02:00 +# to last Sunday of October at 03:00, similar to EU rules. Official +# source (French): +# http://www.maroc.gov.ma/fr/actualites/lhoraire-dete-gmt1-maintenu-jusquau-27-octobre-2013 +# Another source (specifying the time for start and end in the decree): +# http://www.lemag.ma/Heure-d-ete-au-Maroc-jusqu-au-27-octobre_a75620.html + +# From Paul Eggert (2013-10-03): # To estimate what the Moroccan government will do in future years, -# transition dates for 2014 through 2021 were determined by running +# transition dates for 2014 through 2038 were determined by running # the following program under GNU Emacs 24.3: # # (let ((islamic-year 1435)) -# (while (< islamic-year 1444) +# (while (< islamic-year 1461) # (let ((a # (calendar-gregorian-from-absolute # (calendar-islamic-to-absolute (list 9 1 islamic-year)))) @@ -879,13 +889,18 @@ Zone Indian/Mayotte 3:00:56 - LMT 1911 J # (car (cdr (cdr b))) (calendar-month-name (car b) t) (car (cdr b))))) # (setq islamic-year (+ 1 islamic-year)))) # -# with the results hand-edited for 2020-2022, when the normal spring-forward -# date falls during the estimated Ramadan. -# -# From 2023 through 2038 Ramadan is not predicted to overlap with -# daylight saving time. Starting in 2039 there will be overlap again, -# but 32-bit time_t values roll around in 2038 so for now do not worry -# about dates after 2038. +# with spring-forward transitions removed for 2023-2025, when the +# normal spring-forward date falls during the estimated Ramadan; with +# all transitions removed for 2026-2035, where the estimated Ramadan +# falls entirely outside daylight-saving time; and with fall-back +# transitions removed for 2036-2037, where the normal fall-back +# date falls during the estimated Ramadan. Normally, the table would +# stop after 2037 because 32-bit time_t values roll around early in 2038, +# but that would imply a prediction of perpetual DST after March 2038 +# due to the year-2037 glitches. So, this table instead stops after +# 2038, the first non-glitchy year after the 32-bit rollover. +# An advantage of stopping after 2038 is that it lets zic guess +# TZ='WET0WEST,M3.5.0,M10.5.0/3' for time stamps far in the future. # RULE NAME FROM TO TYPE IN ON AT SAVE LETTER/S @@ -912,12 +927,14 @@ Rule Morocco 2010 only - May 2 0:00 1: Rule Morocco 2010 only - Aug 8 0:00 0 - Rule Morocco 2011 only - Apr 3 0:00 1:00 S Rule Morocco 2011 only - Jul 31 0 0 - -Rule Morocco 2012 2019 - Apr lastSun 2:00 1:00 S -Rule Morocco 2012 max - Sep lastSun 3:00 0 - +Rule Morocco 2012 2013 - Apr lastSun 2:00 1:00 S +Rule Morocco 2012 only - Sep 30 3:00 0 - Rule Morocco 2012 only - Jul 20 3:00 0 - Rule Morocco 2012 only - Aug 20 2:00 1:00 S Rule Morocco 2013 only - Jul 7 3:00 0 - Rule Morocco 2013 only - Aug 10 2:00 1:00 S +Rule Morocco 2013 2035 - Oct lastSun 3:00 0 - +Rule Morocco 2014 2022 - Mar lastSun 2:00 1:00 S Rule Morocco 2014 only - Jun 29 3:00 0 - Rule Morocco 2014 only - Jul 29 2:00 1:00 S Rule Morocco 2015 only - Jun 18 3:00 0 - @@ -930,20 +947,42 @@ Rule Morocco 2018 only - May 16 3:00 0 Rule Morocco 2018 only - Jun 15 2:00 1:00 S Rule Morocco 2019 only - May 6 3:00 0 - Rule Morocco 2019 only - Jun 5 2:00 1:00 S +Rule Morocco 2020 only - Apr 24 3:00 0 - Rule Morocco 2020 only - May 24 2:00 1:00 S +Rule Morocco 2021 only - Apr 13 3:00 0 - Rule Morocco 2021 only - May 13 2:00 1:00 S +Rule Morocco 2022 only - Apr 3 3:00 0 - Rule Morocco 2022 only - May 3 2:00 1:00 S -Rule Morocco 2023 max - Apr lastSun 2:00 1:00 S +Rule Morocco 2023 only - Apr 22 2:00 1:00 S +Rule Morocco 2024 only - Apr 10 2:00 1:00 S +Rule Morocco 2025 only - Mar 31 2:00 1:00 S +Rule Morocco 2026 max - Mar lastSun 2:00 1:00 S +Rule Morocco 2036 only - Oct 21 3:00 0 - +Rule Morocco 2037 only - Oct 11 3:00 0 - +Rule Morocco 2038 only - Sep 30 3:00 0 - +Rule Morocco 2038 only - Oct 30 2:00 1:00 S +Rule Morocco 2038 max - Oct lastSun 3:00 0 - # Zone NAME GMTOFF RULES FORMAT [UNTIL] Zone Africa/Casablanca -0:30:20 - LMT 1913 Oct 26 0:00 Morocco WE%sT 1984 Mar 16 1:00 - CET 1986 0:00 Morocco WE%sT + # Western Sahara +# +# From Gwillim Law (2013-10-22): +# A correspondent who is usually well informed about time zone matters +# ... says that Western Sahara observes daylight saving time, just as +# Morocco does. +# +# From Paul Eggert (2013-10-23): +# Assume that this has been true since Western Sahara switched to GMT, +# since most of it was then controlled by Morocco. + Zone Africa/El_Aaiun -0:52:48 - LMT 1934 Jan -1:00 - WAT 1976 Apr 14 - 0:00 - WET + 0:00 Morocco WE%sT # Mozambique # Zone NAME GMTOFF RULES FORMAT [UNTIL] @@ -1100,9 +1139,7 @@ Zone Africa/Khartoum 2:10:08 - LMT 1931 3:00 - EAT # South Sudan -Zone Africa/Juba 2:06:24 - LMT 1931 - 2:00 Sudan CA%sT 2000 Jan 15 12:00 - 3:00 - EAT +Link Africa/Khartoum Africa/Juba # Swaziland # Zone NAME GMTOFF RULES FORMAT [UNTIL] Modified: projects/ifnet/contrib/tzdata/antarctica ============================================================================== --- projects/ifnet/contrib/tzdata/antarctica Tue Nov 5 10:58:38 2013 (r257697) +++ projects/ifnet/contrib/tzdata/antarctica Tue Nov 5 11:19:34 2013 (r257698) @@ -16,9 +16,9 @@ # # Except for the French entries, # I made up all time zone abbreviations mentioned here; corrections welcome! -# FORMAT is `zzz' and GMTOFF is 0 for locations while uninhabited. +# FORMAT is 'zzz' and GMTOFF is 0 for locations while uninhabited. -# These rules are stolen from the `southamerica' file. +# These rules are stolen from the 'southamerica' file. # Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S Rule ArgAQ 1964 1966 - Mar 1 0:00 0 - Rule ArgAQ 1964 1966 - Oct 15 0:00 1:00 S @@ -228,9 +228,10 @@ Zone Antarctica/Syowa 0 - zzz 1957 Jan 2 # Scott Island (never inhabited) # # year-round base -# Scott, Ross Island, since 1957-01, is like Antarctica/McMurdo. +# Scott Base, Ross Island, since 1957-01. +# See Pacific/Auckland. # -# These rules for New Zealand are stolen from the `australasia' file. +# These rules for New Zealand are stolen from the 'australasia' file. # Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S Rule NZAQ 1974 only - Nov 3 2:00s 1:00 D Rule NZAQ 1975 1988 - Oct lastSun 2:00s 1:00 D @@ -268,11 +269,11 @@ Rule NZAQ 2008 max - Apr Sun>=1 2:00s 0 # From Lee Hotz (2001-03-08): # I queried the folks at Columbia who spent the summer at Vostok and this is # what they had to say about time there: -# ``in the US Camp (East Camp) we have been on New Zealand (McMurdo) +# "in the US Camp (East Camp) we have been on New Zealand (McMurdo) # time, which is 12 hours ahead of GMT. The Russian Station Vostok was # 6 hours behind that (although only 2 miles away, i.e. 6 hours ahead # of GMT). This is a time zone I think two hours east of Moscow. The -# natural time zone is in between the two: 8 hours ahead of GMT.'' +# natural time zone is in between the two: 8 hours ahead of GMT." # # From Paul Eggert (2001-05-04): # This seems to be hopelessly confusing, so I asked Lee Hotz about it @@ -337,16 +338,8 @@ Zone Antarctica/Palmer 0 - zzz 1965 -4:00 ChileAQ CL%sT # # -# McMurdo, Ross Island, since 1955-12 -# Zone NAME GMTOFF RULES FORMAT [UNTIL] -Zone Antarctica/McMurdo 0 - zzz 1956 - 12:00 NZAQ NZ%sT -# -# Amundsen-Scott, South Pole, continuously occupied since 1956-11-20 -# -# From Paul Eggert (1996-09-03): -# Normally it wouldn't have a separate entry, since it's like the -# larger Antarctica/McMurdo since 1970, but it's too famous to omit. +# McMurdo Station, Ross Island, since 1955-12 +# Amundsen-Scott South Pole Station, continuously occupied since 1956-11-20 # # From Chris Carrier (1996-06-27): # Siple, the first commander of the South Pole station, @@ -368,4 +361,4 @@ Zone Antarctica/McMurdo 0 - zzz 1956 # we have to go around and set them back 5 minutes or so. # Maybe if we let them run fast all of the time, we'd get to leave here sooner!! # -Link Antarctica/McMurdo Antarctica/South_Pole +# See 'australasia' for Antarctica/McMurdo. Modified: projects/ifnet/contrib/tzdata/asia ============================================================================== --- projects/ifnet/contrib/tzdata/asia Tue Nov 5 10:58:38 2013 (r257697) +++ projects/ifnet/contrib/tzdata/asia Tue Nov 5 11:19:34 2013 (r257698) @@ -6,7 +6,7 @@ # go ahead and edit the file (and please send any changes to # tz@iana.org for general use in the future). -# From Paul Eggert (2013-02-21): +# From Paul Eggert (2013-08-11): # # A good source for time zone historical data outside the U.S. is # Thomas G. Shanks and Rique Pottenger, The International Atlas (6th edition), @@ -44,11 +44,11 @@ # 4:00 GST Gulf* # 5:30 IST India # 7:00 ICT Indochina* -# 7:00 WIT west Indonesia -# 8:00 CIT central Indonesia +# 7:00 WIB west Indonesia (Waktu Indonesia Barat) +# 8:00 WITA central Indonesia (Waktu Indonesia Tengah) # 8:00 CST China # 9:00 CJT Central Japanese Time (1896/1937)* -# 9:00 EIT east Indonesia +# 9:00 WIT east Indonesia (Waktu Indonesia Timur) # 9:00 JST JDT Japan # 9:00 KST KDT Korea # 9:30 CST (Australian) Central Standard Time @@ -756,7 +756,7 @@ Zone Asia/Dili 8:22:20 - LMT 1912 8:00 - TLT 1942 Feb 21 23:00 # E Timor Time 9:00 - JST 1945 Sep 23 9:00 - TLT 1976 May 3 - 8:00 - CIT 2000 Sep 17 00:00 + 8:00 - WITA 2000 Sep 17 00:00 9:00 - TLT # India @@ -793,36 +793,53 @@ Zone Asia/Kolkata 5:53:28 - LMT 1880 # K # (Hollandia). For now, assume all Indonesian locations other than Jayapura # switched on 1945-09-23. # +# From Paul Eggert (2013-08-11): +# Normally the tz database uses English-language abbreviations, but in +# Indonesia it's typical to use Indonesian-language abbreviations even +# when writing in English. For example, see the English-language +# summary published by the Time and Frequency Laboratory of the +# Research Center for Calibration, Instrumentation and Metrology, +# Indonesia, (2006-09-29). +# The abbreviations are: +# +# WIB - UTC+7 - Waktu Indonesia Barat (Indonesia western time) +# WITA - UTC+8 - Waktu Indonesia Tengah (Indonesia central time) +# WIT - UTC+9 - Waktu Indonesia Timur (Indonesia eastern time) +# # Zone NAME GMTOFF RULES FORMAT [UNTIL] +# Java, Sumatra Zone Asia/Jakarta 7:07:12 - LMT 1867 Aug 10 # Shanks & Pottenger say the next transition was at 1924 Jan 1 0:13, # but this must be a typo. - 7:07:12 - JMT 1923 Dec 31 23:47:12 # Jakarta + 7:07:12 - BMT 1923 Dec 31 23:47:12 # Batavia 7:20 - JAVT 1932 Nov # Java Time - 7:30 - WIT 1942 Mar 23 + 7:30 - WIB 1942 Mar 23 9:00 - JST 1945 Sep 23 - 7:30 - WIT 1948 May - 8:00 - WIT 1950 May - 7:30 - WIT 1964 - 7:00 - WIT + 7:30 - WIB 1948 May + 8:00 - WIB 1950 May + 7:30 - WIB 1964 + 7:00 - WIB +# west and central Borneo Zone Asia/Pontianak 7:17:20 - LMT 1908 May 7:17:20 - PMT 1932 Nov # Pontianak MT - 7:30 - WIT 1942 Jan 29 + 7:30 - WIB 1942 Jan 29 9:00 - JST 1945 Sep 23 - 7:30 - WIT 1948 May - 8:00 - WIT 1950 May - 7:30 - WIT 1964 - 8:00 - CIT 1988 Jan 1 - 7:00 - WIT + 7:30 - WIB 1948 May + 8:00 - WIB 1950 May + 7:30 - WIB 1964 + 8:00 - WITA 1988 Jan 1 + 7:00 - WIB +# Sulawesi, Lesser Sundas, east and south Borneo Zone Asia/Makassar 7:57:36 - LMT 1920 7:57:36 - MMT 1932 Nov # Macassar MT - 8:00 - CIT 1942 Feb 9 + 8:00 - WITA 1942 Feb 9 9:00 - JST 1945 Sep 23 - 8:00 - CIT + 8:00 - WITA +# Maluku Islands, West Papua, Papua Zone Asia/Jayapura 9:22:48 - LMT 1932 Nov - 9:00 - EIT 1944 Sep 1 + 9:00 - WIT 1944 Sep 1 9:30 - CST 1964 - 9:00 - EIT + 9:00 - WIT # Iran @@ -1364,9 +1381,11 @@ Zone Asia/Tokyo 9:18:59 - LMT 1887 Dec 3 # until about the same time next year (at least). # http://www.petra.gov.jo/Public_News/Nws_NewsDetails.aspx?NewsID=88950 # -# From Paul Eggert (2012-10-25): -# For now, assume this is just a one-year measure. If it becomes -# permanent, we should move Jordan from EET to AST effective tomorrow. +# From Paul Eggert (2013-09-21): +# It's looking like this change will be permanent; see +# Petra News Agency, Cancelling winter saved Jordan $7 million (2013-02-20) +# . +# So move Jordan to UTC+3 as of the abovementioned date. # Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S Rule Jordan 1973 only - Jun 6 0:00 1:00 S @@ -1392,15 +1411,15 @@ Rule Jordan 1995 1998 - Sep Fri>=15 0:00 Rule Jordan 1999 only - Jul 1 0:00s 1:00 S Rule Jordan 1999 2002 - Sep lastFri 0:00s 0 - Rule Jordan 2000 2001 - Mar lastThu 0:00s 1:00 S -Rule Jordan 2002 max - Mar lastThu 24:00 1:00 S +Rule Jordan 2002 2012 - Mar lastThu 24:00 1:00 S Rule Jordan 2003 only - Oct 24 0:00s 0 - Rule Jordan 2004 only - Oct 15 0:00s 0 - Rule Jordan 2005 only - Sep lastFri 0:00s 0 - -Rule Jordan 2006 2011 - Oct lastFri 0:00s 0 - -Rule Jordan 2013 max - Oct lastFri 0:00s 0 - +Rule Jordan 2006 2012 - Oct lastFri 0:00s 0 - # Zone NAME GMTOFF RULES FORMAT [UNTIL] Zone Asia/Amman 2:23:44 - LMT 1931 - 2:00 Jordan EE%sT + 2:00 Jordan EE%sT 2012 Oct 26 0:00s + 3:00 - AST # Kazakhstan @@ -2280,9 +2299,18 @@ Zone Asia/Karachi 4:28:12 - LMT 1907 # http://www.samanews.com/index.php?act=Show&id=154120 # http://safa.ps/details/news/99844/%D8%B1%D8%A7%D9%85-%D8%A7%D9%84%D9%84%D9%87-%D8%A8%D8%AF%D8%A1-%D8%A7%D9%84%D8%AA%D9%88%D9%82%D9%8A%D8%AA-%D8%A7%D9%84%D8%B5%D9%8A%D9%81%D9%8A-29-%D8%A7%D9%84%D8%AC%D8%A7%D8%B1%D9%8A.html -# From Paul Eggert (2013-04-15): +# From Steffen Thorsen (2013-09-24): +# The Gaza and West Bank are ending DST Thursday at midnight +# (2013-09-27 00:00:00) (one hour earlier than last year...). +# This source in English, says "that winter time will go into effect +# at midnight on Thursday in the West Bank and Gaza Strip": +# http://english.wafa.ps/index.php?action=detail&id=23246 +# official source...: +# http://www.palestinecabinet.gov.ps/ar/Views/ViewDetails.aspx?pid=1252 + +# From Paul Eggert (2013-09-24): # For future dates, guess the last Thursday in March at 24:00 through -# the first Friday on or after September 21 at 01:00. This is consistent with +# the first Friday on or after September 21 at 00:00. This is consistent with # the predictions in today's editions of the following URLs, # which are for Gaza and Hebron respectively: # http://www.timeanddate.com/worldclock/timezone.html?n=702 @@ -2313,7 +2341,8 @@ Rule Palestine 2011 only - Aug 1 0:00 0 Rule Palestine 2011 only - Aug 30 0:00 1:00 S Rule Palestine 2011 only - Sep 30 0:00 0 - Rule Palestine 2012 max - Mar lastThu 24:00 1:00 S -Rule Palestine 2012 max - Sep Fri>=21 1:00 0 - +Rule Palestine 2012 only - Sep 21 1:00 0 - +Rule Palestine 2013 max - Sep Fri>=21 0:00 0 - # Zone NAME GMTOFF RULES FORMAT [UNTIL] Zone Asia/Gaza 2:17:52 - LMT 1900 Oct Modified: projects/ifnet/contrib/tzdata/australasia ============================================================================== --- projects/ifnet/contrib/tzdata/australasia Tue Nov 5 10:58:38 2013 (r257697) +++ projects/ifnet/contrib/tzdata/australasia Tue Nov 5 11:19:34 2013 (r257698) @@ -352,16 +352,25 @@ Zone Indian/Cocos 6:27:40 - LMT 1900 # today confirmed that Fiji will start daylight savings at 2 am on Sunday 21st # October 2012 and end at 3 am on Sunday 20th January 2013. # http://www.fiji.gov.fj/index.php?option=com_content&view=article&id=6702&catid=71&Itemid=155 -# -# From Paul Eggert (2012-08-31): -# For now, guess a pattern of the penultimate Sundays in October and January. + +# From the Fijian Government Media Center (2013-08-30) via David Wheeler: +# Fiji will start daylight savings on Sunday 27th October, 2013 and end at 3am +# on Sunday 19th January, 2014.... move clocks forward by one hour from 2am +# http://www.fiji.gov.fj/Media-Center/Press-Releases/DAYLIGHT-SAVING-STARTS-ON-SUNDAY,-27th-OCTOBER-201.aspx +# +# From Paul Eggert (2013-09-09): +# For now, guess that Fiji springs forward the Sunday before the fourth +# Monday in October. This matches both recent practice and +# timeanddate.com's current spring-forward prediction. +# For the January 2014 transition we guessed right while timeanddate.com +# guessed wrong, so leave the fall-back prediction alone. # Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S Rule Fiji 1998 1999 - Nov Sun>=1 2:00 1:00 S Rule Fiji 1999 2000 - Feb lastSun 3:00 0 - Rule Fiji 2009 only - Nov 29 2:00 1:00 S Rule Fiji 2010 only - Mar lastSun 3:00 0 - -Rule Fiji 2010 max - Oct Sun>=18 2:00 1:00 S +Rule Fiji 2010 max - Oct Sun>=21 2:00 1:00 S Rule Fiji 2011 only - Mar Sun>=1 3:00 0 - Rule Fiji 2012 max - Jan Sun>=18 3:00 0 - # Zone NAME GMTOFF RULES FORMAT [UNTIL] @@ -487,6 +496,7 @@ Zone Pacific/Auckland 11:39:04 - LMT 186 Zone Pacific/Chatham 12:13:48 - LMT 1957 Jan 1 12:45 Chatham CHA%sT +Link Pacific/Auckland Antarctica/McMurdo # Auckland Is # uninhabited; Maori and Moriori, colonial settlers, pastoralists, sealers, @@ -736,7 +746,7 @@ Zone Pacific/Funafuti 11:56:52 - LMT 190 # 1886-1891; Baker was similar but exact dates are not known. # Inhabited by civilians 1935-1942; U.S. military bases 1943-1944; # uninhabited thereafter. -# Howland observed Hawaii Standard Time (UTC-10:30) in 1937; +# Howland observed Hawaii Standard Time (UT-10:30) in 1937; # see page 206 of Elgen M. Long and Marie K. Long, # Amelia Earhart: the Mystery Solved, Simon & Schuster (2000). # So most likely Howland and Baker observed Hawaii Time from 1935 @@ -749,8 +759,17 @@ Zone Pacific/Funafuti 11:56:52 - LMT 190 # no information; was probably like Pacific/Kiritimati # Johnston -# Zone NAME GMTOFF RULES FORMAT [UNTIL] -Zone Pacific/Johnston -10:00 - HST +# +# From Paul Eggert (2013-09-03): +# In his memoirs of June 6th to October 4, 1945 +# (2005), Herbert C. Bach writes, +# "We started our letdown to Kwajalein Atoll and landed there at 5:00 AM +# Johnston time, 1:30 AM Kwajalein time." This was in June 1945, and +# confirms that Johnston kept the same time as Honolulu in summer 1945. +# We have no better information, so for now, assume this has been true +# indefinitely into the past. +# +# See 'northamerica' for Pacific/Johnston. # Kingman # uninhabited Modified: projects/ifnet/contrib/tzdata/backward ============================================================================== --- projects/ifnet/contrib/tzdata/backward Tue Nov 5 10:58:38 2013 (r257697) +++ projects/ifnet/contrib/tzdata/backward Tue Nov 5 11:19:34 2013 (r257698) @@ -22,15 +22,17 @@ Link America/Kentucky/Louisville America Link America/Argentina/Mendoza America/Mendoza Link America/Rio_Branco America/Porto_Acre Link America/Argentina/Cordoba America/Rosario -Link America/St_Thomas America/Virgin +Link America/Denver America/Shiprock +Link America/Port_of_Spain America/Virgin +Link Pacific/Auckland Antarctica/South_Pole Link Asia/Ashgabat Asia/Ashkhabad +Link Asia/Kolkata Asia/Calcutta Link Asia/Chongqing Asia/Chungking Link Asia/Dhaka Asia/Dacca Link Asia/Kathmandu Asia/Katmandu -Link Asia/Kolkata Asia/Calcutta Link Asia/Macau Asia/Macao -Link Asia/Jerusalem Asia/Tel_Aviv Link Asia/Ho_Chi_Minh Asia/Saigon +Link Asia/Jerusalem Asia/Tel_Aviv Link Asia/Thimphu Asia/Thimbu Link Asia/Makassar Asia/Ujung_Pandang Link Asia/Ulaanbaatar Asia/Ulan_Bator @@ -88,10 +90,10 @@ Link Pacific/Auckland NZ Link Pacific/Chatham NZ-CHAT Link America/Denver Navajo Link Asia/Shanghai PRC +Link Pacific/Pohnpei Pacific/Ponape Link Pacific/Pago_Pago Pacific/Samoa -Link Pacific/Chuuk Pacific/Yap Link Pacific/Chuuk Pacific/Truk -Link Pacific/Pohnpei Pacific/Ponape +Link Pacific/Chuuk Pacific/Yap Link Europe/Warsaw Poland Link Europe/Lisbon Portugal Link Asia/Taipei ROC Modified: projects/ifnet/contrib/tzdata/etcetera ============================================================================== --- projects/ifnet/contrib/tzdata/etcetera Tue Nov 5 10:58:38 2013 (r257697) +++ projects/ifnet/contrib/tzdata/etcetera Tue Nov 5 11:19:34 2013 (r257698) @@ -31,9 +31,9 @@ Link Etc/GMT Etc/GMT0 # even though this is the opposite of what many people expect. # POSIX has positive signs west of Greenwich, but many people expect # positive signs east of Greenwich. For example, TZ='Etc/GMT+4' uses -# the abbreviation "GMT+4" and corresponds to 4 hours behind UTC +# the abbreviation "GMT+4" and corresponds to 4 hours behind UT # (i.e. west of Greenwich) even though many people would expect it to -# mean 4 hours ahead of UTC (i.e. east of Greenwich). +# mean 4 hours ahead of UT (i.e. east of Greenwich). # # In the draft 5 of POSIX 1003.1-200x, the angle bracket notation allows for # TZ='+4'; if you want time zone abbreviations conforming to Modified: projects/ifnet/contrib/tzdata/europe ============================================================================== --- projects/ifnet/contrib/tzdata/europe Tue Nov 5 10:58:38 2013 (r257697) +++ projects/ifnet/contrib/tzdata/europe Tue Nov 5 11:19:34 2013 (r257698) @@ -42,7 +42,7 @@ # (1998-09-21, in Portuguese) # -# I invented the abbreviations marked `*' in the following table; +# I invented the abbreviations marked '*' in the following table; # the rest are from earlier versions of this file, or from other sources. # Corrections are welcome! # std dst 2dst @@ -96,7 +96,7 @@ # and a sketch map showing some of the sightlines involved. One paragraph # of the text said: # -# `An old stone obelisk marking a forgotten terrestrial meridian stands +# 'An old stone obelisk marking a forgotten terrestrial meridian stands # beside the river at Kew. In the 18th century, before time and longitude # was standardised by the Royal Observatory in Greenwich, scholars observed # this stone and the movement of stars from Kew Observatory nearby. They *** DIFF OUTPUT TRUNCATED AT 1000 LINES *** From owner-svn-src-projects@FreeBSD.ORG Tue Nov 5 19:40:35 2013 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id A34E1D97; Tue, 5 Nov 2013 19:40:35 +0000 (UTC) (envelope-from andrew@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 903582175; Tue, 5 Nov 2013 19:40:35 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rA5JeZKn010231; Tue, 5 Nov 2013 19:40:35 GMT (envelope-from andrew@svn.freebsd.org) Received: (from andrew@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id rA5JeZgr010229; Tue, 5 Nov 2013 19:40:35 GMT (envelope-from andrew@svn.freebsd.org) Message-Id: <201311051940.rA5JeZgr010229@svn.freebsd.org> From: Andrew Turner Date: Tue, 5 Nov 2013 19:40:35 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r257714 - in projects/specific_leg/sys: arm/broadcom/bcm2835 conf X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 05 Nov 2013 19:40:35 -0000 Author: andrew Date: Tue Nov 5 19:40:34 2013 New Revision: 257714 URL: http://svnweb.freebsd.org/changeset/base/257714 Log: Move dwc_otg_fdt.c to the global files file. Modified: projects/specific_leg/sys/arm/broadcom/bcm2835/files.bcm2835 projects/specific_leg/sys/conf/files Modified: projects/specific_leg/sys/arm/broadcom/bcm2835/files.bcm2835 ============================================================================== --- projects/specific_leg/sys/arm/broadcom/bcm2835/files.bcm2835 Tue Nov 5 19:17:19 2013 (r257713) +++ projects/specific_leg/sys/arm/broadcom/bcm2835/files.bcm2835 Tue Nov 5 19:40:34 2013 (r257714) @@ -13,7 +13,6 @@ arm/broadcom/bcm2835/bcm2835_systimer.c arm/broadcom/bcm2835/bcm2835_wdog.c standard arm/broadcom/bcm2835/bus_space.c optional fdt arm/broadcom/bcm2835/common.c optional fdt -dev/usb/controller/dwc_otg_fdt.c optional dwcotg arm/arm/bus_space_generic.c standard arm/arm/bus_space_asm_generic.S standard Modified: projects/specific_leg/sys/conf/files ============================================================================== --- projects/specific_leg/sys/conf/files Tue Nov 5 19:17:19 2013 (r257713) +++ projects/specific_leg/sys/conf/files Tue Nov 5 19:40:34 2013 (r257714) @@ -2266,6 +2266,7 @@ dev/usb/controller/at91dci_atmelarm.c op dev/usb/controller/musb_otg.c optional musb dev/usb/controller/musb_otg_atmelarm.c optional musb at91rm9200 dev/usb/controller/dwc_otg.c optional dwcotg +dev/usb/controller/dwc_otg_fdt.c optional dwcotg fdt dev/usb/controller/ehci.c optional ehci dev/usb/controller/ehci_pci.c optional ehci pci dev/usb/controller/ohci.c optional ohci From owner-svn-src-projects@FreeBSD.ORG Fri Nov 8 05:20:52 2013 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id E3B1FD1A; Fri, 8 Nov 2013 05:20:51 +0000 (UTC) (envelope-from marcel@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id D1DA82DC0; Fri, 8 Nov 2013 05:20:51 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rA85Kpox030737; Fri, 8 Nov 2013 05:20:51 GMT (envelope-from marcel@svn.freebsd.org) Received: (from marcel@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id rA85Kps0030736; Fri, 8 Nov 2013 05:20:51 GMT (envelope-from marcel@svn.freebsd.org) Message-Id: <201311080520.rA85Kps0030736@svn.freebsd.org> From: Marcel Moolenaar Date: Fri, 8 Nov 2013 05:20:51 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r257839 - projects/altix2/sys/kern X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 08 Nov 2013 05:20:52 -0000 Author: marcel Date: Fri Nov 8 05:20:51 2013 New Revision: 257839 URL: http://svnweb.freebsd.org/changeset/base/257839 Log: o Implement busdma_md_load_mbuf() o The behaviour provided by bus_dmamap_load_mbuf_sg() is achieved by passing a NULL pointer for the callback function. Change existing load functions to do the same. o Allow per-device busdma flags to be set using hints. A typical use would be for debugging and tracing on a per device basis. Modified: projects/altix2/sys/kern/subr_busdma.c Modified: projects/altix2/sys/kern/subr_busdma.c ============================================================================== --- projects/altix2/sys/kern/subr_busdma.c Fri Nov 8 05:11:32 2013 (r257838) +++ projects/altix2/sys/kern/subr_busdma.c Fri Nov 8 05:20:51 2013 (r257839) @@ -33,6 +33,7 @@ __FBSDID("$FreeBSD$"); #include #include #include +#include #include #include #include @@ -251,12 +252,20 @@ _busdma_data_dump(const char *func, stru static u_int _busdma_flags(const char *func, device_t dev, u_int flags) { + int res; - if (flags & BUSDMA_MD_PLATFORM_FLAGS) + if (flags & BUSDMA_MD_PLATFORM_FLAGS) { device_printf(dev, "called %s() with invalid flags %#x\n", func, flags); + flags &= ~BUSDMA_MD_PLATFORM_FLAGS; + } + + if (resource_int_value(device_get_name(dev), device_get_unit(dev), + "busdma", &res) != 0) + res = 0; + flags |= res; - return (flags & ~BUSDMA_MD_PLATFORM_FLAGS); + return (flags); } static struct busdma_md_seg * @@ -760,7 +769,8 @@ busdma_md_load_ccb(busdma_md_t md, union ccb_h = &ccb->ccb_h; if ((ccb_h->flags & CAM_DIR_MASK) == CAM_DIR_NONE) { - (*cb)(arg, NULL, 0); + if (cb != NULL) + (*cb)(arg, NULL, 0); return (0); } @@ -801,8 +811,9 @@ busdma_md_load_ccb(busdma_md_t md, union if (error) printf("_busdma_iommu_map: error=%d\n", error); } - (*cb)(arg, md, error); - return (0); + if (cb != NULL) + (*cb)(arg, md, error); + return (error); } int @@ -825,8 +836,41 @@ busdma_md_load_linear(struct busdma_md * if (error) printf("_busdma_iommu_map: error=%d\n", error); } - (*cb)(arg, md, error); - return (0); + if (cb != NULL) + (*cb)(arg, md, error); + return (error); +} + +int +busdma_md_load_mbuf(struct busdma_md *md, struct mbuf *m0, + busdma_callback_f cb, void *arg, u_int flags) +{ + struct mbuf *m; + int error; + + CTR6(KTR_BUSDMA, "%s: md=%p, m0=%p, cb=%p, arg=%p, flags=%#x", + __func__, md, m0, cb, arg, flags); + + flags = _busdma_flags(__func__, md->md_tag->dt_device, flags); + + if (md == NULL || m0 == NULL) + return (EINVAL); + + error = 0; + for (m = m0; m != NULL && error == 0; m = m->m_next) { + if (m->m_len == 0) + continue; + error = _busdma_md_load(md, NULL, (uintptr_t)(m->m_data), + m->m_len); + } + if (!error) { + error = _busdma_iommu_map(md->md_tag->dt_device, md); + if (error) + printf("_busdma_iommu_map: error=%d\n", error); + } + if (cb != NULL) + (*cb)(arg, md, error); + return (error); } int @@ -841,8 +885,9 @@ busdma_md_load_phys(struct busdma_md *md flags = _busdma_flags(__func__, md->md_tag->dt_device, flags); panic(__func__); - (*cb)(arg, md, ENOSYS); - return (0); + if (cb != NULL) + (*cb)(arg, md, ENOSYS); + return (ENOSYS); } int @@ -856,8 +901,9 @@ busdma_md_load_uio(struct busdma_md *md, flags = _busdma_flags(__func__, md->md_tag->dt_device, flags); panic(__func__); - (*cb)(arg, md, ENOSYS); - return (0); + if (cb != NULL) + (*cb)(arg, md, ENOSYS); + return (ENOSYS); } int From owner-svn-src-projects@FreeBSD.ORG Fri Nov 8 05:26:31 2013 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id 7FDA6F83; Fri, 8 Nov 2013 05:26:31 +0000 (UTC) (envelope-from marcel@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 6BCF12DFB; Fri, 8 Nov 2013 05:26:31 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rA85QV7u031576; Fri, 8 Nov 2013 05:26:31 GMT (envelope-from marcel@svn.freebsd.org) Received: (from marcel@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id rA85QUY9031573; Fri, 8 Nov 2013 05:26:30 GMT (envelope-from marcel@svn.freebsd.org) Message-Id: <201311080526.rA85QUY9031573@svn.freebsd.org> From: Marcel Moolenaar Date: Fri, 8 Nov 2013 05:26:30 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r257840 - in projects/altix2/sys/dev: bge mii X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 08 Nov 2013 05:26:31 -0000 Author: marcel Date: Fri Nov 8 05:26:30 2013 New Revision: 257840 URL: http://svnweb.freebsd.org/changeset/base/257840 Log: Port bge(4) to busdma/mi. We now have networking. After some time we do get: pcib0: IOMMU: cannot find 1 free entries for DMA _busdma_iommu_map: error=28 This'll have to be fixed. Modified: projects/altix2/sys/dev/bge/if_bge.c projects/altix2/sys/dev/bge/if_bgereg.h projects/altix2/sys/dev/mii/brgphy.c Modified: projects/altix2/sys/dev/bge/if_bge.c ============================================================================== --- projects/altix2/sys/dev/bge/if_bge.c Fri Nov 8 05:20:51 2013 (r257839) +++ projects/altix2/sys/dev/bge/if_bge.c Fri Nov 8 05:26:30 2013 (r257840) @@ -74,6 +74,7 @@ __FBSDID("$FreeBSD$"); #include #include #include +#include #include #include #include @@ -385,11 +386,10 @@ static int bge_detach(device_t); static int bge_suspend(device_t); static int bge_resume(device_t); static void bge_release_resources(struct bge_softc *); -static void bge_dma_map_addr(void *, bus_dma_segment_t *, int, int); static int bge_dma_alloc(struct bge_softc *); static void bge_dma_free(struct bge_softc *); static int bge_dma_ring_alloc(struct bge_softc *, bus_size_t, bus_size_t, - bus_dma_tag_t *, uint8_t **, bus_dmamap_t *, bus_addr_t *, const char *); + busdma_tag_t *, uint8_t **, busdma_md_t *, bus_addr_t *, const char *); static void bge_devinfo(struct bge_softc *); static int bge_mbox_reorder(struct bge_softc *); @@ -978,20 +978,6 @@ bge_ape_driver_state_change(struct bge_s * Map a single buffer address. */ -static void -bge_dma_map_addr(void *arg, bus_dma_segment_t *segs, int nseg, int error) -{ - struct bge_dmamap_arg *ctx; - - if (error) - return; - - KASSERT(nseg == 1, ("%s: %d segments returned!", __func__, nseg)); - - ctx = arg; - ctx->bge_busaddr = segs->ds_addr; -} - static uint8_t bge_nvram_getbyte(struct bge_softc *sc, int addr, uint8_t *dest) { @@ -1312,9 +1298,10 @@ bge_newbuf_std(struct bge_softc *sc, int { struct mbuf *m; struct bge_rx_bd *r; - bus_dma_segment_t segs[1]; - bus_dmamap_t map; - int error, nsegs; + busdma_md_t map; + bus_addr_t addr; + vm_size_t size; + int error; if (sc->bge_flags & BGE_FLAG_JUMBO_STD && (sc->bge_ifp->if_mtu + ETHER_HDR_LEN + ETHER_CRC_LEN + @@ -1332,32 +1319,34 @@ bge_newbuf_std(struct bge_softc *sc, int if ((sc->bge_flags & BGE_FLAG_RX_ALIGNBUG) == 0) m_adj(m, ETHER_ALIGN); - error = bus_dmamap_load_mbuf_sg(sc->bge_cdata.bge_rx_mtag, - sc->bge_cdata.bge_rx_std_sparemap, m, segs, &nsegs, 0); + error = busdma_md_load_mbuf(sc->bge_cdata.bge_rx_std_sparemap, m, + NULL, NULL, 0); if (error != 0) { m_freem(m); return (error); } if (sc->bge_cdata.bge_rx_std_chain[i] != NULL) { - bus_dmamap_sync(sc->bge_cdata.bge_rx_mtag, - sc->bge_cdata.bge_rx_std_dmamap[i], BUS_DMASYNC_POSTREAD); - bus_dmamap_unload(sc->bge_cdata.bge_rx_mtag, - sc->bge_cdata.bge_rx_std_dmamap[i]); + busdma_sync(sc->bge_cdata.bge_rx_std_dmamap[i], + BUSDMA_SYNC_POSTREAD); + busdma_md_unload(sc->bge_cdata.bge_rx_std_dmamap[i]); } map = sc->bge_cdata.bge_rx_std_dmamap[i]; sc->bge_cdata.bge_rx_std_dmamap[i] = sc->bge_cdata.bge_rx_std_sparemap; sc->bge_cdata.bge_rx_std_sparemap = map; + + map = sc->bge_cdata.bge_rx_std_dmamap[i]; + addr = busdma_md_get_busaddr(map, 0); + size = busdma_md_get_size(map, 0); sc->bge_cdata.bge_rx_std_chain[i] = m; - sc->bge_cdata.bge_rx_std_seglen[i] = segs[0].ds_len; + sc->bge_cdata.bge_rx_std_seglen[i] = size; r = &sc->bge_ldata.bge_rx_std_ring[sc->bge_std]; - r->bge_addr.bge_addr_lo = BGE_ADDR_LO(segs[0].ds_addr); - r->bge_addr.bge_addr_hi = BGE_ADDR_HI(segs[0].ds_addr); + r->bge_addr.bge_addr_lo = BGE_ADDR_LO(addr); + r->bge_addr.bge_addr_hi = BGE_ADDR_HI(addr); r->bge_flags = BGE_RXBDFLAG_END; - r->bge_len = segs[0].ds_len; + r->bge_len = sc->bge_cdata.bge_rx_std_seglen[i]; r->bge_idx = i; - bus_dmamap_sync(sc->bge_cdata.bge_rx_mtag, - sc->bge_cdata.bge_rx_std_dmamap[i], BUS_DMASYNC_PREREAD); + busdma_sync(map, BUSDMA_SYNC_PREREAD); return (0); } @@ -1369,11 +1358,13 @@ bge_newbuf_std(struct bge_softc *sc, int static int bge_newbuf_jumbo(struct bge_softc *sc, int i) { - bus_dma_segment_t segs[BGE_NSEG_JUMBO]; - bus_dmamap_t map; struct bge_extrx_bd *r; struct mbuf *m; - int error, nsegs; + busdma_md_t map; + bus_addr_t addr; + vm_size_t size; + u_int nsegs; + int error; MGETHDR(m, M_NOWAIT, MT_DATA); if (m == NULL) @@ -1388,18 +1379,17 @@ bge_newbuf_jumbo(struct bge_softc *sc, i if ((sc->bge_flags & BGE_FLAG_RX_ALIGNBUG) == 0) m_adj(m, ETHER_ALIGN); - error = bus_dmamap_load_mbuf_sg(sc->bge_cdata.bge_mtag_jumbo, - sc->bge_cdata.bge_rx_jumbo_sparemap, m, segs, &nsegs, 0); + error = busdma_md_load_mbuf(sc->bge_cdata.bge_rx_jumbo_sparemap, m, + NULL, NULL, 0); if (error != 0) { m_freem(m); return (error); } if (sc->bge_cdata.bge_rx_jumbo_chain[i] != NULL) { - bus_dmamap_sync(sc->bge_cdata.bge_mtag_jumbo, - sc->bge_cdata.bge_rx_jumbo_dmamap[i], BUS_DMASYNC_POSTREAD); - bus_dmamap_unload(sc->bge_cdata.bge_mtag_jumbo, - sc->bge_cdata.bge_rx_jumbo_dmamap[i]); + busdma_sync(sc->bge_cdata.bge_rx_jumbo_dmamap[i], + BUSDMA_SYNC_POSTREAD); + busdma_md_unload(sc->bge_cdata.bge_rx_jumbo_dmamap[i]); } map = sc->bge_cdata.bge_rx_jumbo_dmamap[i]; sc->bge_cdata.bge_rx_jumbo_dmamap[i] = @@ -1418,34 +1408,43 @@ bge_newbuf_jumbo(struct bge_softc *sc, i r->bge_flags = BGE_RXBDFLAG_JUMBO_RING | BGE_RXBDFLAG_END; r->bge_idx = i; r->bge_len3 = r->bge_len2 = r->bge_len1 = 0; + map = sc->bge_cdata.bge_rx_jumbo_sparemap; + nsegs = busdma_md_get_nsegs(map); switch (nsegs) { case 4: - r->bge_addr3.bge_addr_lo = BGE_ADDR_LO(segs[3].ds_addr); - r->bge_addr3.bge_addr_hi = BGE_ADDR_HI(segs[3].ds_addr); - r->bge_len3 = segs[3].ds_len; - sc->bge_cdata.bge_rx_jumbo_seglen[i][3] = segs[3].ds_len; + addr = busdma_md_get_busaddr(map, 3); + size = busdma_md_get_size(map, 3); + r->bge_addr3.bge_addr_lo = BGE_ADDR_LO(addr); + r->bge_addr3.bge_addr_hi = BGE_ADDR_HI(addr); + r->bge_len3 = size; + sc->bge_cdata.bge_rx_jumbo_seglen[i][3] = size; case 3: - r->bge_addr2.bge_addr_lo = BGE_ADDR_LO(segs[2].ds_addr); - r->bge_addr2.bge_addr_hi = BGE_ADDR_HI(segs[2].ds_addr); - r->bge_len2 = segs[2].ds_len; - sc->bge_cdata.bge_rx_jumbo_seglen[i][2] = segs[2].ds_len; + addr = busdma_md_get_busaddr(map, 2); + size = busdma_md_get_size(map, 2); + r->bge_addr2.bge_addr_lo = BGE_ADDR_LO(addr); + r->bge_addr2.bge_addr_hi = BGE_ADDR_HI(addr); + r->bge_len2 = size; + sc->bge_cdata.bge_rx_jumbo_seglen[i][2] = size; case 2: - r->bge_addr1.bge_addr_lo = BGE_ADDR_LO(segs[1].ds_addr); - r->bge_addr1.bge_addr_hi = BGE_ADDR_HI(segs[1].ds_addr); - r->bge_len1 = segs[1].ds_len; - sc->bge_cdata.bge_rx_jumbo_seglen[i][1] = segs[1].ds_len; + addr = busdma_md_get_busaddr(map, 1); + size = busdma_md_get_size(map, 1); + r->bge_addr1.bge_addr_lo = BGE_ADDR_LO(addr); + r->bge_addr1.bge_addr_hi = BGE_ADDR_HI(addr); + r->bge_len1 = size; + sc->bge_cdata.bge_rx_jumbo_seglen[i][1] = size; case 1: - r->bge_addr0.bge_addr_lo = BGE_ADDR_LO(segs[0].ds_addr); - r->bge_addr0.bge_addr_hi = BGE_ADDR_HI(segs[0].ds_addr); - r->bge_len0 = segs[0].ds_len; - sc->bge_cdata.bge_rx_jumbo_seglen[i][0] = segs[0].ds_len; + addr = busdma_md_get_busaddr(map, 0); + size = busdma_md_get_size(map, 0); + r->bge_addr0.bge_addr_lo = BGE_ADDR_LO(addr); + r->bge_addr0.bge_addr_hi = BGE_ADDR_HI(addr); + r->bge_len0 = size; + sc->bge_cdata.bge_rx_jumbo_seglen[i][0] = size; break; default: panic("%s: %d segments\n", __func__, nsegs); } - bus_dmamap_sync(sc->bge_cdata.bge_mtag_jumbo, - sc->bge_cdata.bge_rx_jumbo_dmamap[i], BUS_DMASYNC_PREREAD); + busdma_sync(sc->bge_cdata.bge_rx_jumbo_dmamap[i], BUSDMA_SYNC_PREREAD); return (0); } @@ -1463,8 +1462,7 @@ bge_init_rx_ring_std(struct bge_softc *s BGE_INC(sc->bge_std, BGE_STD_RX_RING_CNT); } - bus_dmamap_sync(sc->bge_cdata.bge_rx_std_ring_tag, - sc->bge_cdata.bge_rx_std_ring_map, BUS_DMASYNC_PREWRITE); + busdma_sync(sc->bge_cdata.bge_rx_std_ring_map, BUSDMA_SYNC_PREWRITE); sc->bge_std = 0; bge_writembx(sc, BGE_MBX_RX_STD_PROD_LO, BGE_STD_RX_RING_CNT - 1); @@ -1479,11 +1477,9 @@ bge_free_rx_ring_std(struct bge_softc *s for (i = 0; i < BGE_STD_RX_RING_CNT; i++) { if (sc->bge_cdata.bge_rx_std_chain[i] != NULL) { - bus_dmamap_sync(sc->bge_cdata.bge_rx_mtag, - sc->bge_cdata.bge_rx_std_dmamap[i], - BUS_DMASYNC_POSTREAD); - bus_dmamap_unload(sc->bge_cdata.bge_rx_mtag, - sc->bge_cdata.bge_rx_std_dmamap[i]); + busdma_sync(sc->bge_cdata.bge_rx_std_dmamap[i], + BUSDMA_SYNC_POSTREAD); + busdma_md_unload(sc->bge_cdata.bge_rx_std_dmamap[i]); m_freem(sc->bge_cdata.bge_rx_std_chain[i]); sc->bge_cdata.bge_rx_std_chain[i] = NULL; } @@ -1506,8 +1502,7 @@ bge_init_rx_ring_jumbo(struct bge_softc BGE_INC(sc->bge_jumbo, BGE_JUMBO_RX_RING_CNT); } - bus_dmamap_sync(sc->bge_cdata.bge_rx_jumbo_ring_tag, - sc->bge_cdata.bge_rx_jumbo_ring_map, BUS_DMASYNC_PREWRITE); + busdma_sync(sc->bge_cdata.bge_rx_jumbo_ring_map, BUSDMA_SYNC_PREWRITE); sc->bge_jumbo = 0; @@ -1529,11 +1524,9 @@ bge_free_rx_ring_jumbo(struct bge_softc for (i = 0; i < BGE_JUMBO_RX_RING_CNT; i++) { if (sc->bge_cdata.bge_rx_jumbo_chain[i] != NULL) { - bus_dmamap_sync(sc->bge_cdata.bge_mtag_jumbo, - sc->bge_cdata.bge_rx_jumbo_dmamap[i], - BUS_DMASYNC_POSTREAD); - bus_dmamap_unload(sc->bge_cdata.bge_mtag_jumbo, - sc->bge_cdata.bge_rx_jumbo_dmamap[i]); + busdma_sync(sc->bge_cdata.bge_rx_jumbo_dmamap[i], + BUSDMA_SYNC_POSTREAD); + busdma_md_unload(sc->bge_cdata.bge_rx_jumbo_dmamap[i]); m_freem(sc->bge_cdata.bge_rx_jumbo_chain[i]); sc->bge_cdata.bge_rx_jumbo_chain[i] = NULL; } @@ -1552,11 +1545,9 @@ bge_free_tx_ring(struct bge_softc *sc) for (i = 0; i < BGE_TX_RING_CNT; i++) { if (sc->bge_cdata.bge_tx_chain[i] != NULL) { - bus_dmamap_sync(sc->bge_cdata.bge_tx_mtag, - sc->bge_cdata.bge_tx_dmamap[i], - BUS_DMASYNC_POSTWRITE); - bus_dmamap_unload(sc->bge_cdata.bge_tx_mtag, - sc->bge_cdata.bge_tx_dmamap[i]); + busdma_sync(sc->bge_cdata.bge_tx_dmamap[i], + BUSDMA_SYNC_POSTWRITE); + busdma_md_unload(sc->bge_cdata.bge_tx_dmamap[i]); m_freem(sc->bge_cdata.bge_tx_chain[i]); sc->bge_cdata.bge_tx_chain[i] = NULL; } @@ -1572,8 +1563,7 @@ bge_init_tx_ring(struct bge_softc *sc) sc->bge_tx_saved_considx = 0; bzero(sc->bge_ldata.bge_tx_ring, BGE_TX_RING_SZ); - bus_dmamap_sync(sc->bge_cdata.bge_tx_ring_tag, - sc->bge_cdata.bge_tx_ring_map, BUS_DMASYNC_PREWRITE); + busdma_sync(sc->bge_cdata.bge_tx_ring_map, BUSDMA_SYNC_PREWRITE); /* Initialize transmit producer index for host-memory send ring. */ sc->bge_tx_prodidx = 0; @@ -2093,8 +2083,7 @@ bge_blockinit(struct bge_softc *sc) BGE_ADDR_LO(sc->bge_ldata.bge_rx_std_ring_paddr); rcb->bge_hostaddr.bge_addr_hi = BGE_ADDR_HI(sc->bge_ldata.bge_rx_std_ring_paddr); - bus_dmamap_sync(sc->bge_cdata.bge_rx_std_ring_tag, - sc->bge_cdata.bge_rx_std_ring_map, BUS_DMASYNC_PREREAD); + busdma_sync(sc->bge_cdata.bge_rx_std_ring_map, BUSDMA_SYNC_PREREAD); if (BGE_IS_5717_PLUS(sc)) { /* * Bits 31-16: Programmable ring size (2048, 1024, 512, .., 32) @@ -2152,9 +2141,8 @@ bge_blockinit(struct bge_softc *sc) BGE_ADDR_LO(sc->bge_ldata.bge_rx_jumbo_ring_paddr); rcb->bge_hostaddr.bge_addr_hi = BGE_ADDR_HI(sc->bge_ldata.bge_rx_jumbo_ring_paddr); - bus_dmamap_sync(sc->bge_cdata.bge_rx_jumbo_ring_tag, - sc->bge_cdata.bge_rx_jumbo_ring_map, - BUS_DMASYNC_PREREAD); + busdma_sync(sc->bge_cdata.bge_rx_jumbo_ring_map, + BUSDMA_SYNC_PREREAD); rcb->bge_maxlen_flags = BGE_RCB_MAXLEN_FLAGS(0, BGE_RCB_FLAG_USE_EXT_RX_BD | BGE_RCB_FLAG_RING_DISABLED); if (sc->bge_asicrev == BGE_ASICREV_BCM5717 || @@ -2391,9 +2379,8 @@ bge_blockinit(struct bge_softc *sc) val = BGE_STATBLKSZ_32BYTE; bzero(sc->bge_ldata.bge_status_block, 32); } - bus_dmamap_sync(sc->bge_cdata.bge_status_tag, - sc->bge_cdata.bge_status_map, - BUS_DMASYNC_PREREAD | BUS_DMASYNC_PREWRITE); + busdma_sync(sc->bge_cdata.bge_status_map, + BUSDMA_SYNC_PREREAD | BUSDMA_SYNC_PREWRITE); /* Turn on host coalescing state machine */ CSR_WRITE_4(sc, BGE_HCC_MODE, val | BGE_HCCMODE_ENABLE); @@ -2775,158 +2762,109 @@ bge_dma_free(struct bge_softc *sc) /* Destroy DMA maps for RX buffers. */ for (i = 0; i < BGE_STD_RX_RING_CNT; i++) { if (sc->bge_cdata.bge_rx_std_dmamap[i]) - bus_dmamap_destroy(sc->bge_cdata.bge_rx_mtag, - sc->bge_cdata.bge_rx_std_dmamap[i]); + busdma_md_destroy(sc->bge_cdata.bge_rx_std_dmamap[i]); } if (sc->bge_cdata.bge_rx_std_sparemap) - bus_dmamap_destroy(sc->bge_cdata.bge_rx_mtag, - sc->bge_cdata.bge_rx_std_sparemap); + busdma_md_destroy(sc->bge_cdata.bge_rx_std_sparemap); /* Destroy DMA maps for jumbo RX buffers. */ for (i = 0; i < BGE_JUMBO_RX_RING_CNT; i++) { if (sc->bge_cdata.bge_rx_jumbo_dmamap[i]) - bus_dmamap_destroy(sc->bge_cdata.bge_mtag_jumbo, - sc->bge_cdata.bge_rx_jumbo_dmamap[i]); + busdma_md_destroy(sc->bge_cdata.bge_rx_jumbo_dmamap[i]); } if (sc->bge_cdata.bge_rx_jumbo_sparemap) - bus_dmamap_destroy(sc->bge_cdata.bge_mtag_jumbo, - sc->bge_cdata.bge_rx_jumbo_sparemap); + busdma_md_destroy(sc->bge_cdata.bge_rx_jumbo_sparemap); /* Destroy DMA maps for TX buffers. */ for (i = 0; i < BGE_TX_RING_CNT; i++) { if (sc->bge_cdata.bge_tx_dmamap[i]) - bus_dmamap_destroy(sc->bge_cdata.bge_tx_mtag, - sc->bge_cdata.bge_tx_dmamap[i]); + busdma_md_destroy(sc->bge_cdata.bge_tx_dmamap[i]); } if (sc->bge_cdata.bge_rx_mtag) - bus_dma_tag_destroy(sc->bge_cdata.bge_rx_mtag); + busdma_tag_destroy(sc->bge_cdata.bge_rx_mtag); if (sc->bge_cdata.bge_mtag_jumbo) - bus_dma_tag_destroy(sc->bge_cdata.bge_mtag_jumbo); + busdma_tag_destroy(sc->bge_cdata.bge_mtag_jumbo); if (sc->bge_cdata.bge_tx_mtag) - bus_dma_tag_destroy(sc->bge_cdata.bge_tx_mtag); + busdma_tag_destroy(sc->bge_cdata.bge_tx_mtag); /* Destroy standard RX ring. */ - if (sc->bge_cdata.bge_rx_std_ring_map) - bus_dmamap_unload(sc->bge_cdata.bge_rx_std_ring_tag, - sc->bge_cdata.bge_rx_std_ring_map); if (sc->bge_cdata.bge_rx_std_ring_map && sc->bge_ldata.bge_rx_std_ring) - bus_dmamem_free(sc->bge_cdata.bge_rx_std_ring_tag, - sc->bge_ldata.bge_rx_std_ring, - sc->bge_cdata.bge_rx_std_ring_map); + busdma_mem_free(sc->bge_cdata.bge_rx_std_ring_map); if (sc->bge_cdata.bge_rx_std_ring_tag) - bus_dma_tag_destroy(sc->bge_cdata.bge_rx_std_ring_tag); + busdma_tag_destroy(sc->bge_cdata.bge_rx_std_ring_tag); /* Destroy jumbo RX ring. */ - if (sc->bge_cdata.bge_rx_jumbo_ring_map) - bus_dmamap_unload(sc->bge_cdata.bge_rx_jumbo_ring_tag, - sc->bge_cdata.bge_rx_jumbo_ring_map); - if (sc->bge_cdata.bge_rx_jumbo_ring_map && sc->bge_ldata.bge_rx_jumbo_ring) - bus_dmamem_free(sc->bge_cdata.bge_rx_jumbo_ring_tag, - sc->bge_ldata.bge_rx_jumbo_ring, - sc->bge_cdata.bge_rx_jumbo_ring_map); + busdma_mem_free(sc->bge_cdata.bge_rx_jumbo_ring_map); if (sc->bge_cdata.bge_rx_jumbo_ring_tag) - bus_dma_tag_destroy(sc->bge_cdata.bge_rx_jumbo_ring_tag); + busdma_tag_destroy(sc->bge_cdata.bge_rx_jumbo_ring_tag); /* Destroy RX return ring. */ - if (sc->bge_cdata.bge_rx_return_ring_map) - bus_dmamap_unload(sc->bge_cdata.bge_rx_return_ring_tag, - sc->bge_cdata.bge_rx_return_ring_map); - if (sc->bge_cdata.bge_rx_return_ring_map && sc->bge_ldata.bge_rx_return_ring) - bus_dmamem_free(sc->bge_cdata.bge_rx_return_ring_tag, - sc->bge_ldata.bge_rx_return_ring, - sc->bge_cdata.bge_rx_return_ring_map); + busdma_mem_free(sc->bge_cdata.bge_rx_return_ring_map); if (sc->bge_cdata.bge_rx_return_ring_tag) - bus_dma_tag_destroy(sc->bge_cdata.bge_rx_return_ring_tag); + busdma_tag_destroy(sc->bge_cdata.bge_rx_return_ring_tag); /* Destroy TX ring. */ - if (sc->bge_cdata.bge_tx_ring_map) - bus_dmamap_unload(sc->bge_cdata.bge_tx_ring_tag, - sc->bge_cdata.bge_tx_ring_map); - if (sc->bge_cdata.bge_tx_ring_map && sc->bge_ldata.bge_tx_ring) - bus_dmamem_free(sc->bge_cdata.bge_tx_ring_tag, - sc->bge_ldata.bge_tx_ring, - sc->bge_cdata.bge_tx_ring_map); + busdma_mem_free(sc->bge_cdata.bge_tx_ring_map); if (sc->bge_cdata.bge_tx_ring_tag) - bus_dma_tag_destroy(sc->bge_cdata.bge_tx_ring_tag); + busdma_tag_destroy(sc->bge_cdata.bge_tx_ring_tag); /* Destroy status block. */ - if (sc->bge_cdata.bge_status_map) - bus_dmamap_unload(sc->bge_cdata.bge_status_tag, - sc->bge_cdata.bge_status_map); - if (sc->bge_cdata.bge_status_map && sc->bge_ldata.bge_status_block) - bus_dmamem_free(sc->bge_cdata.bge_status_tag, - sc->bge_ldata.bge_status_block, - sc->bge_cdata.bge_status_map); + busdma_mem_free(sc->bge_cdata.bge_status_map); if (sc->bge_cdata.bge_status_tag) - bus_dma_tag_destroy(sc->bge_cdata.bge_status_tag); + busdma_tag_destroy(sc->bge_cdata.bge_status_tag); /* Destroy statistics block. */ - if (sc->bge_cdata.bge_stats_map) - bus_dmamap_unload(sc->bge_cdata.bge_stats_tag, - sc->bge_cdata.bge_stats_map); - if (sc->bge_cdata.bge_stats_map && sc->bge_ldata.bge_stats) - bus_dmamem_free(sc->bge_cdata.bge_stats_tag, - sc->bge_ldata.bge_stats, - sc->bge_cdata.bge_stats_map); + busdma_mem_free(sc->bge_cdata.bge_stats_map); if (sc->bge_cdata.bge_stats_tag) - bus_dma_tag_destroy(sc->bge_cdata.bge_stats_tag); + busdma_tag_destroy(sc->bge_cdata.bge_stats_tag); if (sc->bge_cdata.bge_buffer_tag) - bus_dma_tag_destroy(sc->bge_cdata.bge_buffer_tag); + busdma_tag_destroy(sc->bge_cdata.bge_buffer_tag); /* Destroy the parent tag. */ if (sc->bge_cdata.bge_parent_tag) - bus_dma_tag_destroy(sc->bge_cdata.bge_parent_tag); + busdma_tag_destroy(sc->bge_cdata.bge_parent_tag); } static int bge_dma_ring_alloc(struct bge_softc *sc, bus_size_t alignment, - bus_size_t maxsize, bus_dma_tag_t *tag, uint8_t **ring, bus_dmamap_t *map, + bus_size_t maxsize, busdma_tag_t *tag, uint8_t **ring, busdma_md_t *map, bus_addr_t *paddr, const char *msg) { - struct bge_dmamap_arg ctx; int error; - error = bus_dma_tag_create(sc->bge_cdata.bge_parent_tag, - alignment, 0, BUS_SPACE_MAXADDR, BUS_SPACE_MAXADDR, NULL, - NULL, maxsize, 1, maxsize, 0, NULL, NULL, tag); + error = busdma_tag_derive(sc->bge_cdata.bge_parent_tag, alignment, 0, + BUS_SPACE_MAXADDR, maxsize, 1, maxsize, 0, 0, tag); if (error != 0) { device_printf(sc->bge_dev, "could not create %s dma tag\n", msg); return (ENOMEM); } /* Allocate DMA'able memory for ring. */ - error = bus_dmamem_alloc(*tag, (void **)ring, - BUS_DMA_NOWAIT | BUS_DMA_ZERO | BUS_DMA_COHERENT, map); + error = busdma_mem_alloc(*tag, + BUSDMA_ALLOC_ZERO | BUSDMA_ALLOC_CONSISTENT, map); if (error != 0) { - device_printf(sc->bge_dev, - "could not allocate DMA'able memory for %s\n", msg); - return (ENOMEM); - } - /* Load the address of the ring. */ - ctx.bge_busaddr = 0; - error = bus_dmamap_load(*tag, *map, *ring, maxsize, bge_dma_map_addr, - &ctx, BUS_DMA_NOWAIT); - if (error != 0) { - device_printf(sc->bge_dev, - "could not load DMA'able memory for %s\n", msg); - return (ENOMEM); + device_printf(sc->bge_dev, + "could not allocate DMA'able memory for %s (error %d)\n", + msg, error); + return (error); } - *paddr = ctx.bge_busaddr; + *ring = busdma_md_get_pointer(*map, 0); + *paddr = busdma_md_get_busaddr(*map, 0); return (0); } @@ -2943,10 +2881,9 @@ bge_dma_alloc(struct bge_softc *sc) /* * Allocate the parent bus DMA tag appropriate for PCI. */ - error = bus_dma_tag_create(bus_get_dma_tag(sc->bge_dev), - 1, 0, lowaddr, BUS_SPACE_MAXADDR, NULL, - NULL, BUS_SPACE_MAXSIZE_32BIT, 0, BUS_SPACE_MAXSIZE_32BIT, - 0, NULL, NULL, &sc->bge_cdata.bge_parent_tag); + error = busdma_tag_create(sc->bge_dev, 1, 0, lowaddr, + BUS_SPACE_MAXSIZE_32BIT, ~0, BUS_SPACE_MAXSIZE_32BIT, 0, 0, + &sc->bge_cdata.bge_parent_tag); if (error != 0) { device_printf(sc->bge_dev, "could not allocate parent dma tag\n"); @@ -3032,9 +2969,8 @@ bge_dma_alloc(struct bge_softc *sc) if (sc->bge_pcixcap != 0) lowaddr = BUS_SPACE_MAXADDR_32BIT; } - error = bus_dma_tag_create(bus_get_dma_tag(sc->bge_dev), 1, 0, lowaddr, - BUS_SPACE_MAXADDR, NULL, NULL, BUS_SPACE_MAXSIZE_32BIT, 0, - BUS_SPACE_MAXSIZE_32BIT, 0, NULL, NULL, + error = busdma_tag_create(sc->bge_dev, 1, 0, lowaddr, + BUS_SPACE_MAXSIZE_32BIT, ~0, BUS_SPACE_MAXSIZE_32BIT, 0, 0, &sc->bge_cdata.bge_buffer_tag); if (error != 0) { device_printf(sc->bge_dev, @@ -3049,9 +2985,8 @@ bge_dma_alloc(struct bge_softc *sc) txsegsz = MCLBYTES; txmaxsegsz = MCLBYTES * BGE_NSEG_NEW; } - error = bus_dma_tag_create(sc->bge_cdata.bge_buffer_tag, 1, - 0, BUS_SPACE_MAXADDR, BUS_SPACE_MAXADDR, NULL, NULL, - txmaxsegsz, BGE_NSEG_NEW, txsegsz, 0, NULL, NULL, + error = busdma_tag_derive(sc->bge_cdata.bge_buffer_tag, 1, 0, + BUS_SPACE_MAXADDR, txmaxsegsz, BGE_NSEG_NEW, txsegsz, 0, 0, &sc->bge_cdata.bge_tx_mtag); if (error) { @@ -3064,9 +2999,9 @@ bge_dma_alloc(struct bge_softc *sc) rxmaxsegsz = MJUM9BYTES; else rxmaxsegsz = MCLBYTES; - error = bus_dma_tag_create(sc->bge_cdata.bge_buffer_tag, 1, 0, - BUS_SPACE_MAXADDR, BUS_SPACE_MAXADDR, NULL, NULL, rxmaxsegsz, 1, - rxmaxsegsz, 0, NULL, NULL, &sc->bge_cdata.bge_rx_mtag); + error = busdma_tag_derive(sc->bge_cdata.bge_buffer_tag, 1, 0, + BUS_SPACE_MAXADDR, rxmaxsegsz, 1, rxmaxsegsz, 0, 0, + &sc->bge_cdata.bge_rx_mtag); if (error) { device_printf(sc->bge_dev, "could not allocate RX dma tag\n"); @@ -3074,7 +3009,7 @@ bge_dma_alloc(struct bge_softc *sc) } /* Create DMA maps for RX buffers. */ - error = bus_dmamap_create(sc->bge_cdata.bge_rx_mtag, 0, + error = busdma_md_create(sc->bge_cdata.bge_rx_mtag, 0, &sc->bge_cdata.bge_rx_std_sparemap); if (error) { device_printf(sc->bge_dev, @@ -3082,7 +3017,7 @@ bge_dma_alloc(struct bge_softc *sc) return (ENOMEM); } for (i = 0; i < BGE_STD_RX_RING_CNT; i++) { - error = bus_dmamap_create(sc->bge_cdata.bge_rx_mtag, 0, + error = busdma_md_create(sc->bge_cdata.bge_rx_mtag, 0, &sc->bge_cdata.bge_rx_std_dmamap[i]); if (error) { device_printf(sc->bge_dev, @@ -3093,7 +3028,7 @@ bge_dma_alloc(struct bge_softc *sc) /* Create DMA maps for TX buffers. */ for (i = 0; i < BGE_TX_RING_CNT; i++) { - error = bus_dmamap_create(sc->bge_cdata.bge_tx_mtag, 0, + error = busdma_md_create(sc->bge_cdata.bge_tx_mtag, 0, &sc->bge_cdata.bge_tx_dmamap[i]); if (error) { device_printf(sc->bge_dev, @@ -3104,17 +3039,16 @@ bge_dma_alloc(struct bge_softc *sc) /* Create tags for jumbo RX buffers. */ if (BGE_IS_JUMBO_CAPABLE(sc)) { - error = bus_dma_tag_create(sc->bge_cdata.bge_buffer_tag, - 1, 0, BUS_SPACE_MAXADDR, BUS_SPACE_MAXADDR, NULL, - NULL, MJUM9BYTES, BGE_NSEG_JUMBO, PAGE_SIZE, - 0, NULL, NULL, &sc->bge_cdata.bge_mtag_jumbo); + error = busdma_tag_derive(sc->bge_cdata.bge_buffer_tag, 1, 0, + BUS_SPACE_MAXADDR, MJUM9BYTES, BGE_NSEG_JUMBO, PAGE_SIZE, + 0, 0, &sc->bge_cdata.bge_mtag_jumbo); if (error) { device_printf(sc->bge_dev, "could not allocate jumbo dma tag\n"); return (ENOMEM); } /* Create DMA maps for jumbo RX buffers. */ - error = bus_dmamap_create(sc->bge_cdata.bge_mtag_jumbo, + error = busdma_md_create(sc->bge_cdata.bge_mtag_jumbo, 0, &sc->bge_cdata.bge_rx_jumbo_sparemap); if (error) { device_printf(sc->bge_dev, @@ -3122,7 +3056,7 @@ bge_dma_alloc(struct bge_softc *sc) return (ENOMEM); } for (i = 0; i < BGE_JUMBO_RX_RING_CNT; i++) { - error = bus_dmamap_create(sc->bge_cdata.bge_mtag_jumbo, + error = busdma_md_create(sc->bge_cdata.bge_mtag_jumbo, 0, &sc->bge_cdata.bge_rx_jumbo_dmamap[i]); if (error) { device_printf(sc->bge_dev, @@ -4310,15 +4244,13 @@ bge_rxeof(struct bge_softc *sc, uint16_t ifp = sc->bge_ifp; - bus_dmamap_sync(sc->bge_cdata.bge_rx_return_ring_tag, - sc->bge_cdata.bge_rx_return_ring_map, BUS_DMASYNC_POSTREAD); - bus_dmamap_sync(sc->bge_cdata.bge_rx_std_ring_tag, - sc->bge_cdata.bge_rx_std_ring_map, BUS_DMASYNC_POSTWRITE); + busdma_sync(sc->bge_cdata.bge_rx_return_ring_map, BUSDMA_SYNC_POSTREAD); + busdma_sync(sc->bge_cdata.bge_rx_std_ring_map, BUSDMA_SYNC_POSTWRITE); if (BGE_IS_JUMBO_CAPABLE(sc) && ifp->if_mtu + ETHER_HDR_LEN + ETHER_CRC_LEN + ETHER_VLAN_ENCAP_LEN > (MCLBYTES - ETHER_ALIGN)) - bus_dmamap_sync(sc->bge_cdata.bge_rx_jumbo_ring_tag, - sc->bge_cdata.bge_rx_jumbo_ring_map, BUS_DMASYNC_POSTWRITE); + busdma_sync(sc->bge_cdata.bge_rx_jumbo_ring_map, + BUSDMA_SYNC_POSTWRITE); while (rx_cons != rx_prod) { struct bge_rx_bd *cur_rx; @@ -4413,15 +4345,14 @@ bge_rxeof(struct bge_softc *sc, uint16_t return (rx_npkts); } - bus_dmamap_sync(sc->bge_cdata.bge_rx_return_ring_tag, - sc->bge_cdata.bge_rx_return_ring_map, BUS_DMASYNC_PREREAD); + busdma_sync(sc->bge_cdata.bge_rx_return_ring_map, BUSDMA_SYNC_PREREAD); if (stdcnt > 0) - bus_dmamap_sync(sc->bge_cdata.bge_rx_std_ring_tag, - sc->bge_cdata.bge_rx_std_ring_map, BUS_DMASYNC_PREWRITE); + busdma_sync(sc->bge_cdata.bge_rx_std_ring_map, + BUSDMA_SYNC_PREWRITE); if (jumbocnt > 0) - bus_dmamap_sync(sc->bge_cdata.bge_rx_jumbo_ring_tag, - sc->bge_cdata.bge_rx_jumbo_ring_map, BUS_DMASYNC_PREWRITE); + busdma_sync(sc->bge_cdata.bge_rx_jumbo_ring_map, + BUSDMA_SYNC_PREWRITE); sc->bge_rx_saved_considx = rx_cons; bge_writembx(sc, BGE_MBX_RX_CONS0_LO, sc->bge_rx_saved_considx); @@ -4491,8 +4422,7 @@ bge_txeof(struct bge_softc *sc, uint16_t ifp = sc->bge_ifp; - bus_dmamap_sync(sc->bge_cdata.bge_tx_ring_tag, - sc->bge_cdata.bge_tx_ring_map, BUS_DMASYNC_POSTWRITE); + busdma_sync(sc->bge_cdata.bge_tx_ring_map, BUSDMA_SYNC_POSTWRITE); /* * Go through our tx ring and free mbufs for those * frames that have been sent. @@ -4505,11 +4435,9 @@ bge_txeof(struct bge_softc *sc, uint16_t if (cur_tx->bge_flags & BGE_TXBDFLAG_END) ifp->if_opackets++; if (sc->bge_cdata.bge_tx_chain[idx] != NULL) { - bus_dmamap_sync(sc->bge_cdata.bge_tx_mtag, - sc->bge_cdata.bge_tx_dmamap[idx], - BUS_DMASYNC_POSTWRITE); - bus_dmamap_unload(sc->bge_cdata.bge_tx_mtag, - sc->bge_cdata.bge_tx_dmamap[idx]); + busdma_sync(sc->bge_cdata.bge_tx_dmamap[idx], + BUSDMA_SYNC_POSTWRITE); + busdma_md_unload(sc->bge_cdata.bge_tx_dmamap[idx]); m_freem(sc->bge_cdata.bge_tx_chain[idx]); sc->bge_cdata.bge_tx_chain[idx] = NULL; } @@ -4537,9 +4465,8 @@ bge_poll(struct ifnet *ifp, enum poll_cm return (rx_npkts); } - bus_dmamap_sync(sc->bge_cdata.bge_status_tag, - sc->bge_cdata.bge_status_map, - BUS_DMASYNC_POSTREAD | BUS_DMASYNC_POSTWRITE); + busdma_sync(sc->bge_cdata.bge_status_map, + BUSDMA_SYNC_POSTREAD | BUSDMA_SYNC_POSTWRITE); /* Fetch updates from the status block. */ rx_prod = sc->bge_ldata.bge_status_block->bge_idx[0].bge_rx_prod_idx; tx_cons = sc->bge_ldata.bge_status_block->bge_idx[0].bge_tx_cons_idx; @@ -4548,9 +4475,8 @@ bge_poll(struct ifnet *ifp, enum poll_cm /* Clear the status so the next pass only sees the changes. */ sc->bge_ldata.bge_status_block->bge_status = 0; - bus_dmamap_sync(sc->bge_cdata.bge_status_tag, - sc->bge_cdata.bge_status_map, - BUS_DMASYNC_PREREAD | BUS_DMASYNC_PREWRITE); + busdma_sync(sc->bge_cdata.bge_status_map, + BUSDMA_SYNC_PREREAD | BUSDMA_SYNC_PREWRITE); /* Note link event. It will be processed by POLL_AND_CHECK_STATUS. */ if (statusword & BGE_STATFLAG_LINKSTATE_CHANGED) @@ -4609,9 +4535,8 @@ bge_intr_task(void *arg, int pending) } /* Get updated status block. */ - bus_dmamap_sync(sc->bge_cdata.bge_status_tag, - sc->bge_cdata.bge_status_map, - BUS_DMASYNC_POSTREAD | BUS_DMASYNC_POSTWRITE); + busdma_sync(sc->bge_cdata.bge_status_map, + BUSDMA_SYNC_POSTREAD | BUSDMA_SYNC_POSTWRITE); /* Save producer/consumer indices. */ rx_prod = sc->bge_ldata.bge_status_block->bge_idx[0].bge_rx_prod_idx; @@ -4620,9 +4545,8 @@ bge_intr_task(void *arg, int pending) status_tag = sc->bge_ldata.bge_status_block->bge_status_tag << 24; /* Dirty the status flag. */ sc->bge_ldata.bge_status_block->bge_status = 0; - bus_dmamap_sync(sc->bge_cdata.bge_status_tag, - sc->bge_cdata.bge_status_map, - BUS_DMASYNC_PREREAD | BUS_DMASYNC_PREWRITE); + busdma_sync(sc->bge_cdata.bge_status_map, + BUSDMA_SYNC_PREREAD | BUSDMA_SYNC_PREWRITE); if ((sc->bge_flags & BGE_FLAG_TAGGED_STATUS) == 0) status_tag = 0; @@ -4697,15 +4621,13 @@ bge_intr(void *xsc) statusword = CSR_READ_4(sc, BGE_MAC_STS) & BGE_MACSTAT_LINK_CHANGED; /* Make sure the descriptor ring indexes are coherent. */ - bus_dmamap_sync(sc->bge_cdata.bge_status_tag, - sc->bge_cdata.bge_status_map, - BUS_DMASYNC_POSTREAD | BUS_DMASYNC_POSTWRITE); + busdma_sync(sc->bge_cdata.bge_status_map, + BUSDMA_SYNC_POSTREAD | BUSDMA_SYNC_POSTWRITE); rx_prod = sc->bge_ldata.bge_status_block->bge_idx[0].bge_rx_prod_idx; tx_cons = sc->bge_ldata.bge_status_block->bge_idx[0].bge_tx_cons_idx; sc->bge_ldata.bge_status_block->bge_status = 0; - bus_dmamap_sync(sc->bge_cdata.bge_status_tag, - sc->bge_cdata.bge_status_map, - BUS_DMASYNC_PREREAD | BUS_DMASYNC_PREWRITE); + busdma_sync(sc->bge_cdata.bge_status_map, + BUSDMA_SYNC_PREREAD | BUSDMA_SYNC_PREWRITE); if ((sc->bge_asicrev == BGE_ASICREV_BCM5700 && sc->bge_chipid != BGE_CHIPID_BCM5700_B2) || @@ -5165,10 +5087,11 @@ bge_setup_tso(struct bge_softc *sc, stru static int bge_encap(struct bge_softc *sc, struct mbuf **m_head, uint32_t *txidx) { - bus_dma_segment_t segs[BGE_NSEG_NEW]; - bus_dmamap_t map; + busdma_md_t map; struct bge_tx_bd *d; struct mbuf *m = *m_head; + vm_paddr_t addr; + vm_size_t size; uint32_t idx = *txidx; uint16_t csum_flags, mss, vlan_tag; int nsegs, i, error; @@ -5226,8 +5149,7 @@ bge_encap(struct bge_softc *sc, struct m } map = sc->bge_cdata.bge_tx_dmamap[idx]; - error = bus_dmamap_load_mbuf_sg(sc->bge_cdata.bge_tx_mtag, map, m, segs, - &nsegs, BUS_DMA_NOWAIT); + error = busdma_md_load_mbuf(map, m, NULL, NULL, 0); if (error == EFBIG) { m = m_collapse(m, M_NOWAIT, BGE_NSEG_NEW); if (m == NULL) { @@ -5236,8 +5158,7 @@ bge_encap(struct bge_softc *sc, struct m return (ENOBUFS); } *m_head = m; - error = bus_dmamap_load_mbuf_sg(sc->bge_cdata.bge_tx_mtag, map, - m, segs, &nsegs, BUS_DMA_NOWAIT); + error = busdma_md_load_mbuf(map, m, NULL, NULL, 0); if (error) { m_freem(m); *m_head = NULL; @@ -5247,12 +5168,13 @@ bge_encap(struct bge_softc *sc, struct m return (error); /* Check if we have enough free send BDs. */ + nsegs = busdma_md_get_nsegs(map); if (sc->bge_txcnt + nsegs >= BGE_TX_RING_CNT) { - bus_dmamap_unload(sc->bge_cdata.bge_tx_mtag, map); + busdma_md_unload(map); return (ENOBUFS); } - bus_dmamap_sync(sc->bge_cdata.bge_tx_mtag, map, BUS_DMASYNC_PREWRITE); + busdma_sync(map, BUSDMA_SYNC_PREWRITE); if (m->m_flags & M_VLANTAG) { csum_flags |= BGE_TXBDFLAG_VLAN_TAG; @@ -5268,11 +5190,13 @@ bge_encap(struct bge_softc *sc, struct m * packet. */ for (i = 0; ; i++) { + addr = busdma_md_get_busaddr(map, i); + size = busdma_md_get_size(map, i); d = &sc->bge_ldata.bge_tx_ring[idx]; - d->bge_addr.bge_addr_lo = BGE_ADDR_LO(segs[i].ds_addr); - d->bge_addr.bge_addr_hi = BGE_ADDR_HI(segs[i].ds_addr); - d->bge_len = segs[i].ds_len; - if (d->bge_addr.bge_addr_lo + segs[i].ds_len + mss < + d->bge_addr.bge_addr_lo = BGE_ADDR_LO(addr); + d->bge_addr.bge_addr_hi = BGE_ADDR_HI(addr); + d->bge_len = size; + if (d->bge_addr.bge_addr_lo + size + mss < d->bge_addr.bge_addr_lo) break; d->bge_flags = csum_flags; @@ -5283,19 +5207,20 @@ bge_encap(struct bge_softc *sc, struct m BGE_INC(idx, BGE_TX_RING_CNT); } if (i != nsegs - 1) { - bus_dmamap_sync(sc->bge_cdata.bge_tx_mtag, map, - BUS_DMASYNC_POSTWRITE); - bus_dmamap_unload(sc->bge_cdata.bge_tx_mtag, map); + busdma_sync(map, BUS_DMASYNC_POSTWRITE); + busdma_md_unload(map); m_freem(*m_head); *m_head = NULL; return (EIO); } } else { for (i = 0; ; i++) { + addr = busdma_md_get_busaddr(map, i); + size = busdma_md_get_size(map, i); d = &sc->bge_ldata.bge_tx_ring[idx]; - d->bge_addr.bge_addr_lo = BGE_ADDR_LO(segs[i].ds_addr); - d->bge_addr.bge_addr_hi = BGE_ADDR_HI(segs[i].ds_addr); - d->bge_len = segs[i].ds_len; + d->bge_addr.bge_addr_lo = BGE_ADDR_LO(addr); + d->bge_addr.bge_addr_hi = BGE_ADDR_HI(addr); + d->bge_len = size; d->bge_flags = csum_flags; d->bge_vlan_tag = vlan_tag; d->bge_mss = mss; @@ -5381,8 +5306,8 @@ bge_start_locked(struct ifnet *ifp) } if (count > 0) { - bus_dmamap_sync(sc->bge_cdata.bge_tx_ring_tag, - sc->bge_cdata.bge_tx_ring_map, BUS_DMASYNC_PREWRITE); + busdma_sync(sc->bge_cdata.bge_tx_ring_map, + BUSDMA_SYNC_PREWRITE); /* Transmit. */ bge_writembx(sc, BGE_MBX_TX_HOST_PROD0_LO, prodidx); /* 5700 b2 errata */ @@ -6579,9 +6504,8 @@ bge_sysctl_debug_info(SYSCTL_HANDLER_ARG sbdata = (uint16_t *)sc->bge_ldata.bge_status_block; printf("Status Block:\n"); BGE_LOCK(sc); - bus_dmamap_sync(sc->bge_cdata.bge_status_tag, - sc->bge_cdata.bge_status_map, - BUS_DMASYNC_POSTREAD | BUS_DMASYNC_POSTWRITE); + busdma_sync(sc->bge_cdata.bge_status_map, + BUSDMA_SYNC_POSTREAD | BUSDMA_SYNC_POSTWRITE); for (i = 0x0; i < sbsz / sizeof(uint16_t); ) { printf("%06x:", i); for (j = 0; j < 8; j++) Modified: projects/altix2/sys/dev/bge/if_bgereg.h ============================================================================== --- projects/altix2/sys/dev/bge/if_bgereg.h Fri Nov 8 05:20:51 2013 (r257839) +++ projects/altix2/sys/dev/bge/if_bgereg.h Fri Nov 8 05:26:30 2013 (r257840) @@ -2899,28 +2899,28 @@ struct bge_ring_data { * not the other way around. */ struct bge_chain_data { - bus_dma_tag_t bge_parent_tag; - bus_dma_tag_t bge_buffer_tag; - bus_dma_tag_t bge_rx_std_ring_tag; - bus_dma_tag_t bge_rx_jumbo_ring_tag; - bus_dma_tag_t bge_rx_return_ring_tag; - bus_dma_tag_t bge_tx_ring_tag; - bus_dma_tag_t bge_status_tag; - bus_dma_tag_t bge_stats_tag; - bus_dma_tag_t bge_rx_mtag; /* Rx mbuf mapping tag */ - bus_dma_tag_t bge_tx_mtag; /* Tx mbuf mapping tag */ - bus_dma_tag_t bge_mtag_jumbo; /* Jumbo mbuf mapping tag */ - bus_dmamap_t bge_tx_dmamap[BGE_TX_RING_CNT]; - bus_dmamap_t bge_rx_std_sparemap; - bus_dmamap_t bge_rx_std_dmamap[BGE_STD_RX_RING_CNT]; - bus_dmamap_t bge_rx_jumbo_sparemap; - bus_dmamap_t bge_rx_jumbo_dmamap[BGE_JUMBO_RX_RING_CNT]; - bus_dmamap_t bge_rx_std_ring_map; - bus_dmamap_t bge_rx_jumbo_ring_map; - bus_dmamap_t bge_tx_ring_map; - bus_dmamap_t bge_rx_return_ring_map; - bus_dmamap_t bge_status_map; - bus_dmamap_t bge_stats_map; + busdma_tag_t bge_parent_tag; + busdma_tag_t bge_buffer_tag; + busdma_tag_t bge_rx_std_ring_tag; + busdma_tag_t bge_rx_jumbo_ring_tag; + busdma_tag_t bge_rx_return_ring_tag; + busdma_tag_t bge_tx_ring_tag; + busdma_tag_t bge_status_tag; + busdma_tag_t bge_stats_tag; + busdma_tag_t bge_rx_mtag; /* Rx mbuf mapping tag */ + busdma_tag_t bge_tx_mtag; /* Tx mbuf mapping tag */ + busdma_tag_t bge_mtag_jumbo; /* Jumbo mbuf mapping tag */ + busdma_md_t bge_tx_dmamap[BGE_TX_RING_CNT]; + busdma_md_t bge_rx_std_sparemap; + busdma_md_t bge_rx_std_dmamap[BGE_STD_RX_RING_CNT]; + busdma_md_t bge_rx_jumbo_sparemap; + busdma_md_t bge_rx_jumbo_dmamap[BGE_JUMBO_RX_RING_CNT]; + busdma_md_t bge_rx_std_ring_map; + busdma_md_t bge_rx_jumbo_ring_map; + busdma_md_t bge_tx_ring_map; + busdma_md_t bge_rx_return_ring_map; + busdma_md_t bge_status_map; + busdma_md_t bge_stats_map; struct mbuf *bge_tx_chain[BGE_TX_RING_CNT]; struct mbuf *bge_rx_std_chain[BGE_STD_RX_RING_CNT]; struct mbuf *bge_rx_jumbo_chain[BGE_JUMBO_RX_RING_CNT]; Modified: projects/altix2/sys/dev/mii/brgphy.c ============================================================================== --- projects/altix2/sys/dev/mii/brgphy.c Fri Nov 8 05:20:51 2013 (r257839) +++ projects/altix2/sys/dev/mii/brgphy.c Fri Nov 8 05:26:30 2013 (r257840) @@ -43,6 +43,7 @@ __FBSDID("$FreeBSD$"); #include #include #include +#include #include #include From owner-svn-src-projects@FreeBSD.ORG Sat Nov 9 04:40:33 2013 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id 3FB92477; Sat, 9 Nov 2013 04:40:33 +0000 (UTC) (envelope-from marcel@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 2E5652698; Sat, 9 Nov 2013 04:40:33 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rA94eXxP008219; Sat, 9 Nov 2013 04:40:33 GMT (envelope-from marcel@svn.freebsd.org) Received: (from marcel@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id rA94eXYi008218; Sat, 9 Nov 2013 04:40:33 GMT (envelope-from marcel@svn.freebsd.org) Message-Id: <201311090440.rA94eXYi008218@svn.freebsd.org> From: Marcel Moolenaar Date: Sat, 9 Nov 2013 04:40:33 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r257878 - projects/altix2/sys/ia64/ia64 X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 09 Nov 2013 04:40:33 -0000 Author: marcel Date: Sat Nov 9 04:40:32 2013 New Revision: 257878 URL: http://svnweb.freebsd.org/changeset/base/257878 Log: Don't enable interrupts before we call sched_throw(). Interrupts are expected to be disabled by virtue of md_spinlock_count==1 assumed to hold. Modified: projects/altix2/sys/ia64/ia64/mp_machdep.c Modified: projects/altix2/sys/ia64/ia64/mp_machdep.c ============================================================================== --- projects/altix2/sys/ia64/ia64/mp_machdep.c Sat Nov 9 04:38:16 2013 (r257877) +++ projects/altix2/sys/ia64/ia64/mp_machdep.c Sat Nov 9 04:40:32 2013 (r257878) @@ -253,8 +253,6 @@ ia64_ap_startup(void) ia64_set_tpr(0); ia64_srlz_d(); - ia64_enable_intr(); - sched_throw(NULL); /* NOTREACHED */ } From owner-svn-src-projects@FreeBSD.ORG Sat Nov 9 10:35:36 2013 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id 34BBD5C9; Sat, 9 Nov 2013 10:35:36 +0000 (UTC) (envelope-from markm@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 1E5CB261B; Sat, 9 Nov 2013 10:35:36 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rA9AZaho025796; Sat, 9 Nov 2013 10:35:36 GMT (envelope-from markm@svn.freebsd.org) Received: (from markm@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id rA9AZXbq025783; Sat, 9 Nov 2013 10:35:33 GMT (envelope-from markm@svn.freebsd.org) Message-Id: <201311091035.rA9AZXbq025783@svn.freebsd.org> From: Mark Murray Date: Sat, 9 Nov 2013 10:35:33 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r257886 - in projects/random_number_generator: . bin/df bin/ps bin/sh cddl/contrib/opensolaris/cmd/lockstat cddl/contrib/opensolaris/cmd/zfs cddl/contrib/opensolaris/common/ctf cddl/con... X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 09 Nov 2013 10:35:36 -0000 Author: markm Date: Sat Nov 9 10:35:29 2013 New Revision: 257886 URL: http://svnweb.freebsd.org/changeset/base/257886 Log: MFC - Tracking commit. Added: projects/random_number_generator/contrib/byacc/package/mingw-byacc.spec - copied unchanged from r257885, head/contrib/byacc/package/mingw-byacc.spec projects/random_number_generator/contrib/tzdata/leap-seconds.list - copied unchanged from r257885, head/contrib/tzdata/leap-seconds.list projects/random_number_generator/etc/mtree/BSD.tests.dist - copied unchanged from r257885, head/etc/mtree/BSD.tests.dist projects/random_number_generator/etc/pkg/ - copied from r257885, head/etc/pkg/ projects/random_number_generator/lib/atf/libatf-c++/Makefile.inc - copied unchanged from r257885, head/lib/atf/libatf-c++/Makefile.inc projects/random_number_generator/lib/atf/libatf-c++/tests/ - copied from r257885, head/lib/atf/libatf-c++/tests/ projects/random_number_generator/lib/atf/libatf-c/Makefile.inc - copied unchanged from r257885, head/lib/atf/libatf-c/Makefile.inc projects/random_number_generator/lib/atf/libatf-c/tests/ - copied from r257885, head/lib/atf/libatf-c/tests/ projects/random_number_generator/lib/atf/tests/ - copied from r257885, head/lib/atf/tests/ projects/random_number_generator/lib/libc/capability/cap_rights_init.3 - copied unchanged from r257885, head/lib/libc/capability/cap_rights_init.3 projects/random_number_generator/lib/libc/gen/cap_rights_get.3 - copied unchanged from r257885, head/lib/libc/gen/cap_rights_get.3 projects/random_number_generator/lib/tests/ - copied from r257885, head/lib/tests/ projects/random_number_generator/libexec/atf/atf-check/Makefile.inc - copied unchanged from r257885, head/libexec/atf/atf-check/Makefile.inc projects/random_number_generator/libexec/atf/atf-check/tests/ - copied from r257885, head/libexec/atf/atf-check/tests/ projects/random_number_generator/libexec/atf/tests/ - copied from r257885, head/libexec/atf/tests/ projects/random_number_generator/libexec/tests/ - copied from r257885, head/libexec/tests/ projects/random_number_generator/share/examples/libusb20/util.c - copied unchanged from r257885, head/share/examples/libusb20/util.c projects/random_number_generator/share/examples/libusb20/util.h - copied unchanged from r257885, head/share/examples/libusb20/util.h projects/random_number_generator/share/keys/ - copied from r257885, head/share/keys/ projects/random_number_generator/share/man/man4/altera_atse.4 - copied unchanged from r257885, head/share/man/man4/altera_atse.4 projects/random_number_generator/share/man/man4/rights.4 - copied unchanged from r257885, head/share/man/man4/rights.4 projects/random_number_generator/share/man/man4/urtwnfw.4 - copied unchanged from r257885, head/share/man/man4/urtwnfw.4 projects/random_number_generator/share/man/man7/tests.7 - copied unchanged from r257885, head/share/man/man7/tests.7 projects/random_number_generator/share/man/man9/getenv.9 - copied unchanged from r257885, head/share/man/man9/getenv.9 projects/random_number_generator/share/mk/plain.test.mk - copied unchanged from r257885, head/share/mk/plain.test.mk projects/random_number_generator/sys/arm/arm/bus_space-v6.c - copied unchanged from r257885, head/sys/arm/arm/bus_space-v6.c projects/random_number_generator/sys/arm/arm/devmap.c - copied unchanged from r257885, head/sys/arm/arm/devmap.c projects/random_number_generator/sys/arm/broadcom/bcm2835/bcm2835_bsc.c - copied unchanged from r257885, head/sys/arm/broadcom/bcm2835/bcm2835_bsc.c projects/random_number_generator/sys/arm/broadcom/bcm2835/bcm2835_bscreg.h - copied unchanged from r257885, head/sys/arm/broadcom/bcm2835/bcm2835_bscreg.h projects/random_number_generator/sys/arm/broadcom/bcm2835/bcm2835_bscvar.h - copied unchanged from r257885, head/sys/arm/broadcom/bcm2835/bcm2835_bscvar.h projects/random_number_generator/sys/arm/broadcom/bcm2835/bcm2835_spi.c - copied unchanged from r257885, head/sys/arm/broadcom/bcm2835/bcm2835_spi.c projects/random_number_generator/sys/arm/broadcom/bcm2835/bcm2835_spireg.h - copied unchanged from r257885, head/sys/arm/broadcom/bcm2835/bcm2835_spireg.h projects/random_number_generator/sys/arm/broadcom/bcm2835/bcm2835_spivar.h - copied unchanged from r257885, head/sys/arm/broadcom/bcm2835/bcm2835_spivar.h projects/random_number_generator/sys/arm/conf/IMX53-QSB - copied unchanged from r257885, head/sys/arm/conf/IMX53-QSB projects/random_number_generator/sys/arm/conf/RADXA - copied unchanged from r257885, head/sys/arm/conf/RADXA projects/random_number_generator/sys/arm/conf/WANDBOARD-DUAL - copied unchanged from r257885, head/sys/arm/conf/WANDBOARD-DUAL projects/random_number_generator/sys/arm/conf/WANDBOARD-QUAD - copied unchanged from r257885, head/sys/arm/conf/WANDBOARD-QUAD projects/random_number_generator/sys/arm/conf/WANDBOARD-SOLO - copied unchanged from r257885, head/sys/arm/conf/WANDBOARD-SOLO projects/random_number_generator/sys/arm/conf/WANDBOARD.common - copied unchanged from r257885, head/sys/arm/conf/WANDBOARD.common projects/random_number_generator/sys/arm/freescale/imx/files.imx6 - copied unchanged from r257885, head/sys/arm/freescale/imx/files.imx6 projects/random_number_generator/sys/arm/freescale/imx/imx6_anatop.c - copied unchanged from r257885, head/sys/arm/freescale/imx/imx6_anatop.c projects/random_number_generator/sys/arm/freescale/imx/imx6_anatopreg.h - copied unchanged from r257885, head/sys/arm/freescale/imx/imx6_anatopreg.h projects/random_number_generator/sys/arm/freescale/imx/imx6_anatopvar.h - copied unchanged from r257885, head/sys/arm/freescale/imx/imx6_anatopvar.h projects/random_number_generator/sys/arm/freescale/imx/imx6_ccm.c - copied unchanged from r257885, head/sys/arm/freescale/imx/imx6_ccm.c projects/random_number_generator/sys/arm/freescale/imx/imx6_ccmreg.h - copied unchanged from r257885, head/sys/arm/freescale/imx/imx6_ccmreg.h projects/random_number_generator/sys/arm/freescale/imx/imx6_machdep.c - copied unchanged from r257885, head/sys/arm/freescale/imx/imx6_machdep.c projects/random_number_generator/sys/arm/freescale/imx/imx6_pl310.c - copied unchanged from r257885, head/sys/arm/freescale/imx/imx6_pl310.c projects/random_number_generator/sys/arm/freescale/imx/imx6_usbphy.c - copied unchanged from r257885, head/sys/arm/freescale/imx/imx6_usbphy.c projects/random_number_generator/sys/arm/freescale/imx/imx_machdep.c - copied unchanged from r257885, head/sys/arm/freescale/imx/imx_machdep.c projects/random_number_generator/sys/arm/freescale/imx/imx_machdep.h - copied unchanged from r257885, head/sys/arm/freescale/imx/imx_machdep.h projects/random_number_generator/sys/arm/freescale/imx/imx_nop_usbphy.c - copied unchanged from r257885, head/sys/arm/freescale/imx/imx_nop_usbphy.c projects/random_number_generator/sys/arm/freescale/imx/imx_sdhci.c - copied unchanged from r257885, head/sys/arm/freescale/imx/imx_sdhci.c projects/random_number_generator/sys/arm/freescale/imx/std.imx6 - copied unchanged from r257885, head/sys/arm/freescale/imx/std.imx6 projects/random_number_generator/sys/arm/include/devmap.h - copied unchanged from r257885, head/sys/arm/include/devmap.h projects/random_number_generator/sys/arm/rockchip/ - copied from r257885, head/sys/arm/rockchip/ projects/random_number_generator/sys/boot/fdt/dts/beri-sim.dts - copied unchanged from r257885, head/sys/boot/fdt/dts/beri-sim.dts projects/random_number_generator/sys/boot/fdt/dts/beripad-de4.dts - copied unchanged from r257885, head/sys/boot/fdt/dts/beripad-de4.dts projects/random_number_generator/sys/boot/fdt/dts/imx53-qsb.dts - copied unchanged from r257885, head/sys/boot/fdt/dts/imx53-qsb.dts projects/random_number_generator/sys/boot/fdt/dts/imx6.dtsi - copied unchanged from r257885, head/sys/boot/fdt/dts/imx6.dtsi projects/random_number_generator/sys/boot/fdt/dts/rk3188-radxa.dts - copied unchanged from r257885, head/sys/boot/fdt/dts/rk3188-radxa.dts projects/random_number_generator/sys/boot/fdt/dts/rk3188.dtsi - copied unchanged from r257885, head/sys/boot/fdt/dts/rk3188.dtsi projects/random_number_generator/sys/boot/fdt/dts/wandboard-dual.dts - copied unchanged from r257885, head/sys/boot/fdt/dts/wandboard-dual.dts projects/random_number_generator/sys/boot/fdt/dts/wandboard-quad.dts - copied unchanged from r257885, head/sys/boot/fdt/dts/wandboard-quad.dts projects/random_number_generator/sys/boot/fdt/dts/wandboard-solo.dts - copied unchanged from r257885, head/sys/boot/fdt/dts/wandboard-solo.dts projects/random_number_generator/sys/dev/altera/atse/ - copied from r257885, head/sys/dev/altera/atse/ projects/random_number_generator/sys/dev/cxgbe/firmware/t4fw-1.9.12.0.bin.uu - copied unchanged from r257885, head/sys/dev/cxgbe/firmware/t4fw-1.9.12.0.bin.uu projects/random_number_generator/sys/dev/cxgbe/firmware/t5fw-1.9.12.0.bin.uu - copied unchanged from r257885, head/sys/dev/cxgbe/firmware/t5fw-1.9.12.0.bin.uu projects/random_number_generator/sys/dev/cxgbe/iw_cxgbe/ - copied from r257885, head/sys/dev/cxgbe/iw_cxgbe/ projects/random_number_generator/sys/dev/etherswitch/arswitch/arswitch_9340.c - copied unchanged from r257885, head/sys/dev/etherswitch/arswitch/arswitch_9340.c projects/random_number_generator/sys/dev/etherswitch/arswitch/arswitch_9340.h - copied unchanged from r257885, head/sys/dev/etherswitch/arswitch/arswitch_9340.h - copied unchanged from r257885, head/sys/dev/fdt/fdt_ic_if.m projects/random_number_generator/sys/dev/ffec/ - copied from r257885, head/sys/dev/ffec/ projects/random_number_generator/sys/dev/iwn/if_iwn_debug.h - copied unchanged from r257885, head/sys/dev/iwn/if_iwn_debug.h projects/random_number_generator/sys/dev/netmap/netmap_mem2.h - copied unchanged from r257885, head/sys/dev/netmap/netmap_mem2.h projects/random_number_generator/sys/dev/ofw/ofw_nexus.c - copied unchanged from r257885, head/sys/dev/ofw/ofw_nexus.c projects/random_number_generator/sys/dev/ofw/ofw_nexus.h - copied unchanged from r257885, head/sys/dev/ofw/ofw_nexus.h projects/random_number_generator/sys/dev/spibus/ofw_spibus.c - copied unchanged from r257885, head/sys/dev/spibus/ofw_spibus.c projects/random_number_generator/sys/dev/usb/controller/dwc_otg_fdt.c - copied unchanged from r257885, head/sys/dev/usb/controller/dwc_otg_fdt.c projects/random_number_generator/sys/mips/beri/beri_pic.c - copied unchanged from r257885, head/sys/mips/beri/beri_pic.c projects/random_number_generator/sys/mips/conf/ALFA_HORNET_UB - copied unchanged from r257885, head/sys/mips/conf/ALFA_HORNET_UB projects/random_number_generator/sys/mips/conf/ALFA_HORNET_UB.hints - copied unchanged from r257885, head/sys/mips/conf/ALFA_HORNET_UB.hints projects/random_number_generator/sys/mips/conf/BERI_DE4_BASE - copied unchanged from r257885, head/sys/mips/conf/BERI_DE4_BASE projects/random_number_generator/sys/mips/conf/BERI_SIM_BASE - copied unchanged from r257885, head/sys/mips/conf/BERI_SIM_BASE projects/random_number_generator/sys/mips/conf/BERI_SIM_SDROOT - copied unchanged from r257885, head/sys/mips/conf/BERI_SIM_SDROOT projects/random_number_generator/sys/modules/cxgbe/iw_cxgbe/ - copied from r257885, head/sys/modules/cxgbe/iw_cxgbe/ projects/random_number_generator/sys/net/ifq.h - copied unchanged from r257885, head/sys/net/ifq.h projects/random_number_generator/sys/netpfil/pf/pf.h - copied unchanged from r257885, head/sys/netpfil/pf/pf.h projects/random_number_generator/sys/netpfil/pf/pf_altq.h - copied unchanged from r257885, head/sys/netpfil/pf/pf_altq.h projects/random_number_generator/sys/netpfil/pf/pf_mtag.h - copied unchanged from r257885, head/sys/netpfil/pf/pf_mtag.h projects/random_number_generator/sys/powerpc/mpc85xx/pci_mpc85xx.c - copied unchanged from r257885, head/sys/powerpc/mpc85xx/pci_mpc85xx.c projects/random_number_generator/sys/powerpc/ofw/openpic_ofw.c - copied unchanged from r257885, head/sys/powerpc/ofw/openpic_ofw.c projects/random_number_generator/sys/powerpc/powerpc/clock.c - copied unchanged from r257885, head/sys/powerpc/powerpc/clock.c projects/random_number_generator/sys/powerpc/powerpc/nexus.c - copied unchanged from r257885, head/sys/powerpc/powerpc/nexus.c projects/random_number_generator/sys/powerpc/powerpc/vm_machdep.c - copied unchanged from r257885, head/sys/powerpc/powerpc/vm_machdep.c projects/random_number_generator/sys/powerpc/pseries/phyp_llan.c - copied unchanged from r257885, head/sys/powerpc/pseries/phyp_llan.c projects/random_number_generator/sys/x86/include/busdma_impl.h - copied unchanged from r257885, head/sys/x86/include/busdma_impl.h projects/random_number_generator/sys/x86/iommu/ - copied from r257885, head/sys/x86/iommu/ projects/random_number_generator/sys/x86/x86/busdma_bounce.c - copied unchanged from r257885, head/sys/x86/x86/busdma_bounce.c projects/random_number_generator/tests/ - copied from r257885, head/tests/ projects/random_number_generator/tools/build/options/WITHOUT_NMTREE - copied unchanged from r257885, head/tools/build/options/WITHOUT_NMTREE projects/random_number_generator/tools/build/options/WITHOUT_TESTS - copied unchanged from r257885, head/tools/build/options/WITHOUT_TESTS projects/random_number_generator/tools/regression/bin/sh/builtins/trap13.0 - copied unchanged from r257885, head/tools/regression/bin/sh/builtins/trap13.0 projects/random_number_generator/tools/regression/bin/sh/builtins/trap14.0 - copied unchanged from r257885, head/tools/regression/bin/sh/builtins/trap14.0 projects/random_number_generator/tools/tools/atsectl/ - copied from r257885, head/tools/tools/atsectl/ projects/random_number_generator/usr.bin/atf/atf-sh/tests/ - copied from r257885, head/usr.bin/atf/atf-sh/tests/ projects/random_number_generator/usr.bin/atf/tests/ - copied from r257885, head/usr.bin/atf/tests/ projects/random_number_generator/usr.bin/tests/ - copied from r257885, head/usr.bin/tests/ projects/random_number_generator/usr.sbin/bhyve/legacy_irq.c - copied unchanged from r257885, head/usr.sbin/bhyve/legacy_irq.c projects/random_number_generator/usr.sbin/bhyve/legacy_irq.h - copied unchanged from r257885, head/usr.sbin/bhyve/legacy_irq.h projects/random_number_generator/usr.sbin/bhyve/pci_lpc.c - copied unchanged from r257885, head/usr.sbin/bhyve/pci_lpc.c projects/random_number_generator/usr.sbin/bhyve/pci_lpc.h - copied unchanged from r257885, head/usr.sbin/bhyve/pci_lpc.h projects/random_number_generator/usr.sbin/bhyve/uart_emul.c - copied unchanged from r257885, head/usr.sbin/bhyve/uart_emul.c projects/random_number_generator/usr.sbin/bhyve/uart_emul.h - copied unchanged from r257885, head/usr.sbin/bhyve/uart_emul.h projects/random_number_generator/usr.sbin/mfiutil/mfi_properties.c - copied unchanged from r257885, head/usr.sbin/mfiutil/mfi_properties.c projects/random_number_generator/usr.sbin/pkg/pkg.7 - copied unchanged from r257885, head/usr.sbin/pkg/pkg.7 Directory Properties: projects/random_number_generator/sys/dev/fdt/fdt_ic_if.m (props changed) Deleted: projects/random_number_generator/etc/namedb/ projects/random_number_generator/etc/periodic/daily/220.backup-pkgdb projects/random_number_generator/etc/periodic/daily/470.status-named projects/random_number_generator/etc/periodic/daily/490.status-pkg-changes projects/random_number_generator/etc/periodic/security/460.chkportsum projects/random_number_generator/etc/periodic/weekly/400.status-pkg projects/random_number_generator/etc/rc.d/initrandom projects/random_number_generator/etc/rc.d/named projects/random_number_generator/lib/libiconv_compat/ projects/random_number_generator/lib/libyaml/libbsdyml.3 projects/random_number_generator/release/doc/fr_FR.ISO8859-1/installation/common/abstract.xml projects/random_number_generator/release/doc/ru_RU.KOI8-R/installation/common/abstract.xml projects/random_number_generator/release/generate-release.sh projects/random_number_generator/share/examples/libusb20/aux.c projects/random_number_generator/share/examples/libusb20/aux.h projects/random_number_generator/share/man/man4/isf.4 projects/random_number_generator/share/man/man4/ng_fec.4 projects/random_number_generator/sys/amd64/vmm/io/vdev.c projects/random_number_generator/sys/amd64/vmm/io/vdev.h projects/random_number_generator/sys/arm/allwinner/bus_space.c projects/random_number_generator/sys/arm/broadcom/bcm2835/bus_space.c projects/random_number_generator/sys/arm/broadcom/bcm2835/dwc_otg_brcm.c projects/random_number_generator/sys/arm/freescale/imx/bus_space.c projects/random_number_generator/sys/arm/ti/bus_space.c projects/random_number_generator/sys/contrib/rdma/core_priv.h projects/random_number_generator/sys/contrib/rdma/ib_addr.h projects/random_number_generator/sys/contrib/rdma/ib_cache.h projects/random_number_generator/sys/contrib/rdma/ib_cm.h projects/random_number_generator/sys/contrib/rdma/ib_fmr_pool.h projects/random_number_generator/sys/contrib/rdma/ib_mad.h projects/random_number_generator/sys/contrib/rdma/ib_marshall.h projects/random_number_generator/sys/contrib/rdma/ib_pack.h projects/random_number_generator/sys/contrib/rdma/ib_sa.h projects/random_number_generator/sys/contrib/rdma/ib_smi.h projects/random_number_generator/sys/contrib/rdma/ib_umem.h projects/random_number_generator/sys/contrib/rdma/ib_user_cm.h projects/random_number_generator/sys/contrib/rdma/ib_user_mad.h projects/random_number_generator/sys/contrib/rdma/ib_user_sa.h projects/random_number_generator/sys/contrib/rdma/ib_user_verbs.h projects/random_number_generator/sys/contrib/rdma/ib_verbs.h projects/random_number_generator/sys/contrib/rdma/iw_cm.h projects/random_number_generator/sys/contrib/rdma/rdma_addr.c projects/random_number_generator/sys/contrib/rdma/rdma_cache.c projects/random_number_generator/sys/contrib/rdma/rdma_cm.h projects/random_number_generator/sys/contrib/rdma/rdma_cm_ib.h projects/random_number_generator/sys/contrib/rdma/rdma_cma.c projects/random_number_generator/sys/contrib/rdma/rdma_device.c projects/random_number_generator/sys/contrib/rdma/rdma_iwcm.c projects/random_number_generator/sys/contrib/rdma/rdma_user_cm.h projects/random_number_generator/sys/contrib/rdma/rdma_verbs.c projects/random_number_generator/sys/contrib/rdma/types.h projects/random_number_generator/sys/dev/cxgbe/firmware/t4fw-1.8.11.0.bin.uu projects/random_number_generator/sys/dev/cxgbe/firmware/t5fw-1.8.22.0.bin.uu projects/random_number_generator/sys/dev/isf/ projects/random_number_generator/sys/kern/dtio_kdtrace.c projects/random_number_generator/sys/mips/conf/BERI_SIM.hints projects/random_number_generator/sys/modules/dtrace/dtio/ projects/random_number_generator/sys/modules/netgraph/fec/ projects/random_number_generator/sys/modules/rdma/addr/ projects/random_number_generator/sys/modules/rdma/cma/ projects/random_number_generator/sys/modules/rdma/core/ projects/random_number_generator/sys/modules/rdma/iwcm/ projects/random_number_generator/sys/net/pf_mtag.h projects/random_number_generator/sys/netgraph/ng_fec.c projects/random_number_generator/sys/netgraph/ng_fec.h projects/random_number_generator/sys/powerpc/aim/clock.c projects/random_number_generator/sys/powerpc/aim/nexus.c projects/random_number_generator/sys/powerpc/aim/vm_machdep.c projects/random_number_generator/sys/powerpc/booke/clock.c projects/random_number_generator/sys/powerpc/booke/vm_machdep.c projects/random_number_generator/sys/powerpc/include/trap_aim.h projects/random_number_generator/sys/powerpc/include/trap_booke.h projects/random_number_generator/sys/powerpc/mambo/mambo_openpic.c projects/random_number_generator/sys/powerpc/mpc85xx/nexus.c projects/random_number_generator/sys/powerpc/mpc85xx/pci_fdt.c projects/random_number_generator/sys/powerpc/powermac/openpic_macio.c projects/random_number_generator/sys/powerpc/powerpc/openpic_fdt.c projects/random_number_generator/tools/build/options/WITH_NMTREE projects/random_number_generator/tools/build/options/WITH_PKGTOOLS projects/random_number_generator/usr.sbin/isfctl/ projects/random_number_generator/usr.sbin/pkg_install/ Modified: projects/random_number_generator/Makefile.inc1 projects/random_number_generator/ObsoleteFiles.inc projects/random_number_generator/UPDATING projects/random_number_generator/bin/df/df.1 projects/random_number_generator/bin/ps/print.c projects/random_number_generator/bin/sh/jobs.c projects/random_number_generator/bin/sh/miscbltin.c projects/random_number_generator/bin/sh/nodetypes projects/random_number_generator/bin/sh/sh.1 projects/random_number_generator/bin/sh/trap.c projects/random_number_generator/cddl/contrib/opensolaris/cmd/lockstat/lockstat.1 projects/random_number_generator/cddl/contrib/opensolaris/cmd/lockstat/sym.c projects/random_number_generator/cddl/contrib/opensolaris/cmd/zfs/zfs.8 projects/random_number_generator/cddl/contrib/opensolaris/cmd/zfs/zfs_main.c projects/random_number_generator/cddl/contrib/opensolaris/common/ctf/ctf_create.c projects/random_number_generator/cddl/contrib/opensolaris/lib/libdtrace/common/dt_link.c projects/random_number_generator/cddl/contrib/opensolaris/lib/libdtrace/common/dt_open.c projects/random_number_generator/cddl/contrib/opensolaris/lib/libdtrace/powerpc/dt_isadep.c projects/random_number_generator/cddl/contrib/opensolaris/lib/libnvpair/libnvpair.c projects/random_number_generator/cddl/lib/libdtrace/psinfo.d projects/random_number_generator/cddl/lib/libnvpair/Makefile projects/random_number_generator/cddl/usr.sbin/lockstat/Makefile projects/random_number_generator/contrib/binutils/bfd/elf32-score.c projects/random_number_generator/contrib/binutils/bfd/elflink.c projects/random_number_generator/contrib/binutils/bfd/po/bfd.pot projects/random_number_generator/contrib/binutils/binutils/readelf.c projects/random_number_generator/contrib/binutils/gas/config/atof-ieee.c projects/random_number_generator/contrib/binutils/gas/config/tc-arm.c projects/random_number_generator/contrib/binutils/gas/config/tc-mips.c projects/random_number_generator/contrib/binutils/gas/config/tc-mips.h projects/random_number_generator/contrib/binutils/gas/dwarf2dbg.c projects/random_number_generator/contrib/binutils/gas/symbols.c projects/random_number_generator/contrib/binutils/opcodes/i386-dis.c projects/random_number_generator/contrib/bsnmp/lib/snmp.c projects/random_number_generator/contrib/bsnmp/lib/snmp.h projects/random_number_generator/contrib/bsnmp/lib/snmpagent.c projects/random_number_generator/contrib/byacc/CHANGES projects/random_number_generator/contrib/byacc/VERSION projects/random_number_generator/contrib/byacc/aclocal.m4 projects/random_number_generator/contrib/byacc/config.guess projects/random_number_generator/contrib/byacc/config.sub projects/random_number_generator/contrib/byacc/configure projects/random_number_generator/contrib/byacc/package/byacc.spec projects/random_number_generator/contrib/byacc/package/debian/changelog projects/random_number_generator/contrib/byacc/reader.c projects/random_number_generator/contrib/byacc/skeleton.c projects/random_number_generator/contrib/byacc/test/calc.tab.c projects/random_number_generator/contrib/byacc/test/calc1.tab.c projects/random_number_generator/contrib/byacc/test/calc2.tab.c projects/random_number_generator/contrib/byacc/test/calc3.tab.c projects/random_number_generator/contrib/byacc/test/code_calc.code.c projects/random_number_generator/contrib/byacc/test/code_error.code.c projects/random_number_generator/contrib/byacc/test/error.tab.c projects/random_number_generator/contrib/byacc/test/ftp.tab.c projects/random_number_generator/contrib/byacc/test/grammar.tab.c projects/random_number_generator/contrib/byacc/test/pure_calc.tab.c projects/random_number_generator/contrib/byacc/test/pure_error.tab.c projects/random_number_generator/contrib/byacc/test/quote_calc-s.tab.c projects/random_number_generator/contrib/byacc/test/quote_calc.tab.c projects/random_number_generator/contrib/byacc/test/quote_calc2-s.tab.c projects/random_number_generator/contrib/byacc/test/quote_calc2.tab.c projects/random_number_generator/contrib/byacc/test/quote_calc3-s.tab.c projects/random_number_generator/contrib/byacc/test/quote_calc3.tab.c projects/random_number_generator/contrib/byacc/test/quote_calc4-s.tab.c projects/random_number_generator/contrib/byacc/test/quote_calc4.tab.c projects/random_number_generator/contrib/gcclibs/libssp/ssp.c projects/random_number_generator/contrib/gperf/src/options.cc projects/random_number_generator/contrib/gperf/src/search.cc projects/random_number_generator/contrib/groff/src/roff/troff/input.cpp projects/random_number_generator/contrib/groff/src/roff/troff/mtsm.cpp projects/random_number_generator/contrib/groff/src/roff/troff/node.cpp projects/random_number_generator/contrib/ipfilter/ipf.h projects/random_number_generator/contrib/jemalloc/ChangeLog projects/random_number_generator/contrib/jemalloc/FREEBSD-diffs projects/random_number_generator/contrib/jemalloc/FREEBSD-upgrade projects/random_number_generator/contrib/jemalloc/VERSION projects/random_number_generator/contrib/jemalloc/doc/jemalloc.3 projects/random_number_generator/contrib/jemalloc/include/jemalloc/internal/arena.h projects/random_number_generator/contrib/jemalloc/include/jemalloc/internal/jemalloc_internal.h projects/random_number_generator/contrib/jemalloc/include/jemalloc/internal/private_namespace.h projects/random_number_generator/contrib/jemalloc/include/jemalloc/internal/tcache.h projects/random_number_generator/contrib/jemalloc/include/jemalloc/jemalloc.h projects/random_number_generator/contrib/jemalloc/src/arena.c projects/random_number_generator/contrib/jemalloc/src/chunk.c projects/random_number_generator/contrib/jemalloc/src/ctl.c projects/random_number_generator/contrib/jemalloc/src/jemalloc.c projects/random_number_generator/contrib/libcxxrt/typeinfo.cc projects/random_number_generator/contrib/libpcap/bpf/net/bpf_filter.c projects/random_number_generator/contrib/libpcap/bpf_dump.c projects/random_number_generator/contrib/libpcap/bpf_image.c projects/random_number_generator/contrib/libpcap/grammar.y projects/random_number_generator/contrib/libpcap/pcap/bpf.h projects/random_number_generator/contrib/libpcap/pcap/pcap.h projects/random_number_generator/contrib/libreadline/bind.c projects/random_number_generator/contrib/libreadline/complete.c projects/random_number_generator/contrib/libreadline/display.c projects/random_number_generator/contrib/libreadline/histexpand.c projects/random_number_generator/contrib/libreadline/history.c projects/random_number_generator/contrib/libreadline/input.c projects/random_number_generator/contrib/libreadline/search.c projects/random_number_generator/contrib/libreadline/support/shobj-conf projects/random_number_generator/contrib/libreadline/tilde.c projects/random_number_generator/contrib/llvm/tools/clang/tools/driver/driver.cpp projects/random_number_generator/contrib/mtree/compare.c projects/random_number_generator/contrib/mtree/create.c projects/random_number_generator/contrib/mtree/getid.c projects/random_number_generator/contrib/mtree/spec.c projects/random_number_generator/contrib/opie/libopie/accessfile.c projects/random_number_generator/contrib/opie/libopie/generator.c projects/random_number_generator/contrib/opie/libopie/lookup.c projects/random_number_generator/contrib/opie/libopie/newseed.c projects/random_number_generator/contrib/opie/libopie/parsechallenge.c projects/random_number_generator/contrib/opie/libopie/passwd.c projects/random_number_generator/contrib/opie/libopie/randomchallenge.c projects/random_number_generator/contrib/opie/libopie/verify.c projects/random_number_generator/contrib/opie/libopie/version.c projects/random_number_generator/contrib/opie/opie.h projects/random_number_generator/contrib/opie/opieinfo.c projects/random_number_generator/contrib/opie/opiekey.c projects/random_number_generator/contrib/subversion/subversion/libsvn_subr/opt.c projects/random_number_generator/contrib/subversion/subversion/libsvn_subr/version.c projects/random_number_generator/contrib/tcp_wrappers/clean_exit.c projects/random_number_generator/contrib/tcp_wrappers/hosts_access.c projects/random_number_generator/contrib/tcp_wrappers/options.c projects/random_number_generator/contrib/tcp_wrappers/percent_x.c projects/random_number_generator/contrib/tcp_wrappers/rfc931.c projects/random_number_generator/contrib/tcp_wrappers/shell_cmd.c projects/random_number_generator/contrib/tcp_wrappers/update.c projects/random_number_generator/contrib/tcpdump/print-ip.c projects/random_number_generator/contrib/telnet/telnetd/sys_term.c projects/random_number_generator/contrib/tzdata/africa projects/random_number_generator/contrib/tzdata/antarctica projects/random_number_generator/contrib/tzdata/asia projects/random_number_generator/contrib/tzdata/australasia projects/random_number_generator/contrib/tzdata/backward projects/random_number_generator/contrib/tzdata/etcetera projects/random_number_generator/contrib/tzdata/europe projects/random_number_generator/contrib/tzdata/northamerica projects/random_number_generator/contrib/tzdata/southamerica projects/random_number_generator/contrib/tzdata/zone.tab projects/random_number_generator/contrib/wpa/src/utils/radiotap.h projects/random_number_generator/etc/Makefile projects/random_number_generator/etc/defaults/periodic.conf projects/random_number_generator/etc/defaults/rc.conf projects/random_number_generator/etc/freebsd-update.conf projects/random_number_generator/etc/login.conf projects/random_number_generator/etc/mtree/BSD.include.dist projects/random_number_generator/etc/mtree/BSD.root.dist projects/random_number_generator/etc/mtree/BSD.usr.dist projects/random_number_generator/etc/netstart projects/random_number_generator/etc/network.subr projects/random_number_generator/etc/periodic/daily/Makefile projects/random_number_generator/etc/periodic/security/Makefile projects/random_number_generator/etc/periodic/weekly/Makefile projects/random_number_generator/etc/rc projects/random_number_generator/etc/rc.d/Makefile projects/random_number_generator/etc/rc.d/geli projects/random_number_generator/etc/rc.d/jail projects/random_number_generator/etc/rc.d/netif projects/random_number_generator/etc/rc.d/ntpdate projects/random_number_generator/etc/rc.d/postrandom projects/random_number_generator/etc/rc.d/random projects/random_number_generator/etc/rc.d/rpcbind projects/random_number_generator/etc/rc.d/rtadvd projects/random_number_generator/etc/rc.d/sendmail projects/random_number_generator/etc/rc.d/syslogd projects/random_number_generator/etc/sendmail/freebsd.mc projects/random_number_generator/gnu/usr.bin/binutils/ld/Makefile projects/random_number_generator/gnu/usr.bin/binutils/ld/ld.1 projects/random_number_generator/include/Makefile projects/random_number_generator/include/iconv.h projects/random_number_generator/include/pthread.h projects/random_number_generator/lib/Makefile projects/random_number_generator/lib/atf/Makefile projects/random_number_generator/lib/atf/Makefile.inc projects/random_number_generator/lib/atf/libatf-c++/Makefile projects/random_number_generator/lib/atf/libatf-c/Makefile projects/random_number_generator/lib/csu/arm/crt1.c projects/random_number_generator/lib/libc/capability/Makefile.inc projects/random_number_generator/lib/libc/gen/Makefile.inc projects/random_number_generator/lib/libc/gen/getutxent.c projects/random_number_generator/lib/libc/gen/popen.c projects/random_number_generator/lib/libc/gen/syslog.c projects/random_number_generator/lib/libc/iconv/Symbol.map projects/random_number_generator/lib/libc/iconv/citrus_csmapper.h projects/random_number_generator/lib/libc/iconv/citrus_mapper.c projects/random_number_generator/lib/libc/iconv/iconv.c projects/random_number_generator/lib/libc/string/strlcpy.3 projects/random_number_generator/lib/libc/sys/Makefile.inc projects/random_number_generator/lib/libc/sys/cap_ioctls_limit.2 projects/random_number_generator/lib/libc/sys/cap_rights_limit.2 projects/random_number_generator/lib/libc/sys/getrlimit.2 projects/random_number_generator/lib/libc/sys/kqueue.2 projects/random_number_generator/lib/libcam/camlib.c projects/random_number_generator/lib/libcrypt/Makefile projects/random_number_generator/lib/libcrypt/tests/Makefile projects/random_number_generator/lib/libnetgraph/debug.c projects/random_number_generator/lib/libproc/_libproc.h projects/random_number_generator/lib/libproc/proc_bkpt.c projects/random_number_generator/lib/libproc/proc_create.c projects/random_number_generator/lib/libproc/proc_regs.c projects/random_number_generator/lib/libproc/proc_sym.c projects/random_number_generator/lib/libproc/proc_util.c projects/random_number_generator/lib/libutil/login.conf.5 projects/random_number_generator/lib/libutil/login_class.3 projects/random_number_generator/lib/libutil/login_class.c projects/random_number_generator/lib/libvmmapi/vmmapi.c projects/random_number_generator/lib/libyaml/Makefile projects/random_number_generator/lib/libz/FREEBSD-upgrade (contents, props changed) projects/random_number_generator/lib/libz/Makefile (contents, props changed) projects/random_number_generator/lib/libz/Symbol.map (contents, props changed) projects/random_number_generator/lib/libz/Versions.def (contents, props changed) projects/random_number_generator/lib/libz/zopen.c (contents, props changed) projects/random_number_generator/lib/msun/Makefile projects/random_number_generator/lib/msun/arm/fenv.h projects/random_number_generator/lib/msun/src/s_round.c projects/random_number_generator/lib/msun/src/s_roundf.c projects/random_number_generator/lib/msun/src/s_roundl.c projects/random_number_generator/libexec/Makefile projects/random_number_generator/libexec/atf/Makefile projects/random_number_generator/libexec/atf/Makefile.inc projects/random_number_generator/libexec/atf/atf-check/Makefile projects/random_number_generator/libexec/rbootd/bpf.c projects/random_number_generator/libexec/rtld-elf/rtld.c projects/random_number_generator/release/Makefile projects/random_number_generator/release/doc/de_DE.ISO8859-1/early-adopter/article.xml projects/random_number_generator/release/doc/de_DE.ISO8859-1/errata/article.xml projects/random_number_generator/release/doc/de_DE.ISO8859-1/hardware/alpha/article.xml projects/random_number_generator/release/doc/de_DE.ISO8859-1/hardware/alpha/proc-alpha.xml projects/random_number_generator/release/doc/de_DE.ISO8859-1/hardware/common/artheader.xml projects/random_number_generator/release/doc/de_DE.ISO8859-1/hardware/common/dev.xml projects/random_number_generator/release/doc/de_DE.ISO8859-1/hardware/common/intro.xml projects/random_number_generator/release/doc/de_DE.ISO8859-1/hardware/i386/article.xml projects/random_number_generator/release/doc/de_DE.ISO8859-1/hardware/i386/proc-i386.xml projects/random_number_generator/release/doc/de_DE.ISO8859-1/hardware/ia64/article.xml projects/random_number_generator/release/doc/de_DE.ISO8859-1/hardware/ia64/proc-ia64.xml projects/random_number_generator/release/doc/de_DE.ISO8859-1/hardware/pc98/article.xml projects/random_number_generator/release/doc/de_DE.ISO8859-1/hardware/pc98/proc-pc98.xml projects/random_number_generator/release/doc/de_DE.ISO8859-1/hardware/sparc64/article.xml projects/random_number_generator/release/doc/de_DE.ISO8859-1/hardware/sparc64/dev-sparc64.xml projects/random_number_generator/release/doc/de_DE.ISO8859-1/hardware/sparc64/proc-sparc64.xml projects/random_number_generator/release/doc/de_DE.ISO8859-1/installation/alpha/Makefile projects/random_number_generator/release/doc/de_DE.ISO8859-1/installation/alpha/article.xml projects/random_number_generator/release/doc/de_DE.ISO8859-1/installation/common/abstract.xml projects/random_number_generator/release/doc/de_DE.ISO8859-1/installation/common/artheader.xml projects/random_number_generator/release/doc/de_DE.ISO8859-1/installation/common/install.ent projects/random_number_generator/release/doc/de_DE.ISO8859-1/installation/common/install.xml projects/random_number_generator/release/doc/de_DE.ISO8859-1/installation/common/layout.xml projects/random_number_generator/release/doc/de_DE.ISO8859-1/installation/common/trouble.xml projects/random_number_generator/release/doc/de_DE.ISO8859-1/installation/common/upgrade.xml projects/random_number_generator/release/doc/de_DE.ISO8859-1/installation/i386/Makefile projects/random_number_generator/release/doc/de_DE.ISO8859-1/installation/i386/article.xml projects/random_number_generator/release/doc/de_DE.ISO8859-1/installation/ia64/Makefile projects/random_number_generator/release/doc/de_DE.ISO8859-1/installation/ia64/article.xml projects/random_number_generator/release/doc/de_DE.ISO8859-1/installation/pc98/Makefile projects/random_number_generator/release/doc/de_DE.ISO8859-1/installation/pc98/article.xml projects/random_number_generator/release/doc/de_DE.ISO8859-1/installation/sparc64/article.xml projects/random_number_generator/release/doc/de_DE.ISO8859-1/installation/sparc64/install.xml projects/random_number_generator/release/doc/de_DE.ISO8859-1/readme/article.xml projects/random_number_generator/release/doc/de_DE.ISO8859-1/relnotes/alpha/article.xml projects/random_number_generator/release/doc/de_DE.ISO8859-1/relnotes/common/new.xml projects/random_number_generator/release/doc/de_DE.ISO8859-1/relnotes/i386/article.xml projects/random_number_generator/release/doc/de_DE.ISO8859-1/relnotes/ia64/article.xml projects/random_number_generator/release/doc/de_DE.ISO8859-1/relnotes/pc98/article.xml projects/random_number_generator/release/doc/de_DE.ISO8859-1/relnotes/sparc64/article.xml projects/random_number_generator/release/doc/en_US.ISO8859-1/errata/article.xml projects/random_number_generator/release/doc/en_US.ISO8859-1/hardware/article.xml projects/random_number_generator/release/doc/en_US.ISO8859-1/readme/article.xml projects/random_number_generator/release/doc/en_US.ISO8859-1/relnotes/article.xml projects/random_number_generator/release/doc/fr_FR.ISO8859-1/early-adopter/article.xml projects/random_number_generator/release/doc/fr_FR.ISO8859-1/errata/article.xml projects/random_number_generator/release/doc/fr_FR.ISO8859-1/hardware/alpha/article.xml projects/random_number_generator/release/doc/fr_FR.ISO8859-1/hardware/alpha/proc-alpha.xml projects/random_number_generator/release/doc/fr_FR.ISO8859-1/hardware/common/artheader.xml projects/random_number_generator/release/doc/fr_FR.ISO8859-1/hardware/common/dev.xml projects/random_number_generator/release/doc/fr_FR.ISO8859-1/hardware/common/intro.xml projects/random_number_generator/release/doc/fr_FR.ISO8859-1/hardware/i386/article.xml projects/random_number_generator/release/doc/fr_FR.ISO8859-1/hardware/i386/proc-i386.xml projects/random_number_generator/release/doc/fr_FR.ISO8859-1/hardware/ia64/article.xml projects/random_number_generator/release/doc/fr_FR.ISO8859-1/hardware/ia64/proc-ia64.xml projects/random_number_generator/release/doc/fr_FR.ISO8859-1/hardware/pc98/article.xml projects/random_number_generator/release/doc/fr_FR.ISO8859-1/hardware/pc98/proc-pc98.xml projects/random_number_generator/release/doc/fr_FR.ISO8859-1/hardware/sparc64/article.xml projects/random_number_generator/release/doc/fr_FR.ISO8859-1/hardware/sparc64/dev-sparc64.xml projects/random_number_generator/release/doc/fr_FR.ISO8859-1/hardware/sparc64/proc-sparc64.xml projects/random_number_generator/release/doc/fr_FR.ISO8859-1/installation/alpha/Makefile projects/random_number_generator/release/doc/fr_FR.ISO8859-1/installation/alpha/article.xml projects/random_number_generator/release/doc/fr_FR.ISO8859-1/installation/common/artheader.xml projects/random_number_generator/release/doc/fr_FR.ISO8859-1/installation/common/install.ent projects/random_number_generator/release/doc/fr_FR.ISO8859-1/installation/common/install.xml projects/random_number_generator/release/doc/fr_FR.ISO8859-1/installation/common/layout.xml projects/random_number_generator/release/doc/fr_FR.ISO8859-1/installation/common/trouble.xml projects/random_number_generator/release/doc/fr_FR.ISO8859-1/installation/common/upgrade.xml projects/random_number_generator/release/doc/fr_FR.ISO8859-1/installation/i386/Makefile projects/random_number_generator/release/doc/fr_FR.ISO8859-1/installation/i386/article.xml projects/random_number_generator/release/doc/fr_FR.ISO8859-1/installation/pc98/Makefile projects/random_number_generator/release/doc/fr_FR.ISO8859-1/installation/pc98/article.xml projects/random_number_generator/release/doc/fr_FR.ISO8859-1/installation/sparc64/article.xml projects/random_number_generator/release/doc/fr_FR.ISO8859-1/installation/sparc64/install.xml projects/random_number_generator/release/doc/fr_FR.ISO8859-1/relnotes/alpha/article.xml projects/random_number_generator/release/doc/fr_FR.ISO8859-1/relnotes/common/new.xml projects/random_number_generator/release/doc/fr_FR.ISO8859-1/relnotes/i386/article.xml projects/random_number_generator/release/doc/ja_JP.eucJP/errata/article.xml projects/random_number_generator/release/doc/ja_JP.eucJP/hardware/alpha/article.xml projects/random_number_generator/release/doc/ja_JP.eucJP/hardware/amd64/article.xml projects/random_number_generator/release/doc/ja_JP.eucJP/hardware/amd64/proc-amd64.xml projects/random_number_generator/release/doc/ja_JP.eucJP/hardware/common/artheader.xml projects/random_number_generator/release/doc/ja_JP.eucJP/hardware/common/dev.xml projects/random_number_generator/release/doc/ja_JP.eucJP/hardware/common/intro.xml projects/random_number_generator/release/doc/ja_JP.eucJP/hardware/i386/article.xml projects/random_number_generator/release/doc/ja_JP.eucJP/hardware/i386/proc-i386.xml projects/random_number_generator/release/doc/ja_JP.eucJP/hardware/ia64/article.xml projects/random_number_generator/release/doc/ja_JP.eucJP/hardware/ia64/proc-ia64.xml projects/random_number_generator/release/doc/ja_JP.eucJP/hardware/pc98/article.xml projects/random_number_generator/release/doc/ja_JP.eucJP/hardware/pc98/proc-pc98.xml projects/random_number_generator/release/doc/ja_JP.eucJP/hardware/sparc64/article.xml projects/random_number_generator/release/doc/ja_JP.eucJP/hardware/sparc64/proc-sparc64.xml projects/random_number_generator/release/doc/ja_JP.eucJP/relnotes/alpha/article.xml projects/random_number_generator/release/doc/ja_JP.eucJP/relnotes/amd64/article.xml projects/random_number_generator/release/doc/ja_JP.eucJP/relnotes/common/new.xml projects/random_number_generator/release/doc/ja_JP.eucJP/relnotes/i386/article.xml projects/random_number_generator/release/doc/ja_JP.eucJP/relnotes/ia64/article.xml projects/random_number_generator/release/doc/ja_JP.eucJP/relnotes/pc98/article.xml projects/random_number_generator/release/doc/ja_JP.eucJP/relnotes/sparc64/article.xml projects/random_number_generator/release/doc/ja_JP.eucJP/share/xml/catalog.xml projects/random_number_generator/release/doc/ru_RU.KOI8-R/errata/article.xml projects/random_number_generator/release/doc/ru_RU.KOI8-R/hardware/alpha/article.xml projects/random_number_generator/release/doc/ru_RU.KOI8-R/hardware/amd64/article.xml projects/random_number_generator/release/doc/ru_RU.KOI8-R/hardware/amd64/proc-amd64.xml projects/random_number_generator/release/doc/ru_RU.KOI8-R/hardware/common/artheader.xml projects/random_number_generator/release/doc/ru_RU.KOI8-R/hardware/common/dev.xml projects/random_number_generator/release/doc/ru_RU.KOI8-R/hardware/common/intro.xml projects/random_number_generator/release/doc/ru_RU.KOI8-R/hardware/i386/article.xml projects/random_number_generator/release/doc/ru_RU.KOI8-R/hardware/i386/proc-i386.xml projects/random_number_generator/release/doc/ru_RU.KOI8-R/hardware/ia64/article.xml projects/random_number_generator/release/doc/ru_RU.KOI8-R/hardware/ia64/proc-ia64.xml projects/random_number_generator/release/doc/ru_RU.KOI8-R/hardware/pc98/article.xml projects/random_number_generator/release/doc/ru_RU.KOI8-R/hardware/pc98/proc-pc98.xml projects/random_number_generator/release/doc/ru_RU.KOI8-R/hardware/sparc64/article.xml projects/random_number_generator/release/doc/ru_RU.KOI8-R/hardware/sparc64/proc-sparc64.xml projects/random_number_generator/release/doc/ru_RU.KOI8-R/installation/alpha/Makefile projects/random_number_generator/release/doc/ru_RU.KOI8-R/installation/alpha/article.xml projects/random_number_generator/release/doc/ru_RU.KOI8-R/installation/amd64/Makefile projects/random_number_generator/release/doc/ru_RU.KOI8-R/installation/amd64/article.xml projects/random_number_generator/release/doc/ru_RU.KOI8-R/installation/common/artheader.xml projects/random_number_generator/release/doc/ru_RU.KOI8-R/installation/common/install.ent projects/random_number_generator/release/doc/ru_RU.KOI8-R/installation/common/install.xml projects/random_number_generator/release/doc/ru_RU.KOI8-R/installation/common/layout.xml projects/random_number_generator/release/doc/ru_RU.KOI8-R/installation/common/trouble.xml projects/random_number_generator/release/doc/ru_RU.KOI8-R/installation/common/upgrade.xml projects/random_number_generator/release/doc/ru_RU.KOI8-R/installation/i386/Makefile projects/random_number_generator/release/doc/ru_RU.KOI8-R/installation/i386/article.xml projects/random_number_generator/release/doc/ru_RU.KOI8-R/installation/ia64/Makefile projects/random_number_generator/release/doc/ru_RU.KOI8-R/installation/ia64/article.xml projects/random_number_generator/release/doc/ru_RU.KOI8-R/installation/pc98/Makefile projects/random_number_generator/release/doc/ru_RU.KOI8-R/installation/pc98/article.xml projects/random_number_generator/release/doc/ru_RU.KOI8-R/installation/sparc64/Makefile projects/random_number_generator/release/doc/ru_RU.KOI8-R/installation/sparc64/article.xml projects/random_number_generator/release/doc/ru_RU.KOI8-R/readme/article.xml projects/random_number_generator/release/doc/ru_RU.KOI8-R/relnotes/alpha/article.xml projects/random_number_generator/release/doc/ru_RU.KOI8-R/relnotes/amd64/article.xml projects/random_number_generator/release/doc/ru_RU.KOI8-R/relnotes/common/new.xml projects/random_number_generator/release/doc/ru_RU.KOI8-R/relnotes/i386/article.xml projects/random_number_generator/release/doc/ru_RU.KOI8-R/relnotes/ia64/article.xml projects/random_number_generator/release/doc/ru_RU.KOI8-R/relnotes/pc98/article.xml projects/random_number_generator/release/doc/ru_RU.KOI8-R/relnotes/sparc64/article.xml projects/random_number_generator/release/doc/ru_RU.KOI8-R/share/xml/catalog.xml projects/random_number_generator/release/doc/share/misc/man2hwnotes.pl projects/random_number_generator/release/doc/share/xml/catalog.xml projects/random_number_generator/release/doc/zh_CN.GB2312/errata/article.xml projects/random_number_generator/release/doc/zh_CN.GB2312/hardware/article.xml projects/random_number_generator/release/doc/zh_CN.GB2312/readme/article.xml projects/random_number_generator/release/doc/zh_CN.GB2312/relnotes/article.xml projects/random_number_generator/release/picobsd/build/picobsd projects/random_number_generator/release/picobsd/floppy.tree/etc/rc1 projects/random_number_generator/release/picobsd/floppy.tree/etc/ssh/sshd_config projects/random_number_generator/release/release.sh projects/random_number_generator/sbin/camcontrol/camcontrol.c projects/random_number_generator/sbin/devd/devd.cc projects/random_number_generator/sbin/fsck_ffs/ea.c projects/random_number_generator/sbin/geom/class/part/geom_part.c projects/random_number_generator/sbin/growfs/debug.c projects/random_number_generator/sbin/gvinum/gvinum.c projects/random_number_generator/sbin/hastctl/hastctl.c projects/random_number_generator/sbin/hastd/control.c projects/random_number_generator/sbin/hastd/hast.h projects/random_number_generator/sbin/hastd/hastd.8 projects/random_number_generator/sbin/hastd/primary.c projects/random_number_generator/sbin/hastd/secondary.c projects/random_number_generator/sbin/ifconfig/Makefile projects/random_number_generator/sbin/ifconfig/ifconfig.8 projects/random_number_generator/sbin/ifconfig/ifconfig.c projects/random_number_generator/sbin/ifconfig/ifgroup.c projects/random_number_generator/sbin/iscontrol/fsm.c projects/random_number_generator/sbin/mdconfig/mdconfig.8 projects/random_number_generator/sbin/mdconfig/mdconfig.c projects/random_number_generator/sbin/newfs/mkfs.c projects/random_number_generator/sbin/nos-tun/nos-tun.c projects/random_number_generator/sbin/nvmecontrol/perftest.c projects/random_number_generator/sbin/pfctl/pf_print_state.c projects/random_number_generator/sbin/route/keywords projects/random_number_generator/sbin/route/route.8 projects/random_number_generator/sbin/route/route.c projects/random_number_generator/share/Makefile projects/random_number_generator/share/doc/Makefile projects/random_number_generator/share/examples/Makefile projects/random_number_generator/share/examples/bhyve/vmrun.sh projects/random_number_generator/share/examples/libusb20/Makefile projects/random_number_generator/share/examples/libusb20/bulk.c projects/random_number_generator/share/examples/libusb20/control.c projects/random_number_generator/share/i18n/csmapper/JIS/JISX0201-KANA%UCS.src projects/random_number_generator/share/i18n/csmapper/JIS/JISX0208@1990%UCS.src projects/random_number_generator/share/i18n/csmapper/JIS/UCS%JISX0201-KANA.src projects/random_number_generator/share/i18n/csmapper/JIS/UCS%JISX0208@1990.src projects/random_number_generator/share/i18n/csmapper/JIS/charset.pivot.JIS.src projects/random_number_generator/share/i18n/csmapper/JIS/mapper.dir.JIS.src projects/random_number_generator/share/i18n/esdb/EUC/EUC-JP.src projects/random_number_generator/share/man/man1/Makefile projects/random_number_generator/share/man/man3/tree.3 projects/random_number_generator/share/man/man4/Makefile projects/random_number_generator/share/man/man4/ahci.4 projects/random_number_generator/share/man/man4/bpf.4 projects/random_number_generator/share/man/man4/capsicum.4 projects/random_number_generator/share/man/man4/ddb.4 projects/random_number_generator/share/man/man4/lagg.4 projects/random_number_generator/share/man/man4/natm.4 projects/random_number_generator/share/man/man4/netgraph.4 projects/random_number_generator/share/man/man4/netmap.4 projects/random_number_generator/share/man/man4/tcp.4 projects/random_number_generator/share/man/man4/urtwn.4 projects/random_number_generator/share/man/man5/rc.conf.5 projects/random_number_generator/share/man/man5/src.conf.5 projects/random_number_generator/share/man/man7/Makefile projects/random_number_generator/share/man/man7/hier.7 projects/random_number_generator/share/man/man7/release.7 projects/random_number_generator/share/man/man8/rc.8 projects/random_number_generator/share/man/man8/rc.sendmail.8 projects/random_number_generator/share/man/man9/Makefile projects/random_number_generator/share/man/man9/disk.9 projects/random_number_generator/share/man/man9/ifnet.9 projects/random_number_generator/share/man/man9/rtentry.9 projects/random_number_generator/share/misc/bsd-family-tree projects/random_number_generator/share/misc/committers-ports.dot projects/random_number_generator/share/misc/committers-src.dot projects/random_number_generator/share/mk/Makefile projects/random_number_generator/share/mk/atf.test.mk projects/random_number_generator/share/mk/bsd.files.mk projects/random_number_generator/share/mk/bsd.libnames.mk projects/random_number_generator/share/mk/bsd.own.mk projects/random_number_generator/share/mk/bsd.prog.mk projects/random_number_generator/share/mk/bsd.test.mk projects/random_number_generator/sys/amd64/amd64/bpf_jit_machdep.c projects/random_number_generator/sys/amd64/amd64/identcpu.c projects/random_number_generator/sys/amd64/amd64/minidump_machdep.c projects/random_number_generator/sys/amd64/amd64/pmap.c projects/random_number_generator/sys/amd64/amd64/trap.c projects/random_number_generator/sys/amd64/conf/GENERIC projects/random_number_generator/sys/amd64/conf/NOTES projects/random_number_generator/sys/amd64/include/vmm.h (contents, props changed) projects/random_number_generator/sys/amd64/include/vmparam.h projects/random_number_generator/sys/amd64/vmm/intel/vmcs.c projects/random_number_generator/sys/amd64/vmm/intel/vmx.c projects/random_number_generator/sys/amd64/vmm/intel/vmx.h projects/random_number_generator/sys/amd64/vmm/intel/vmx_controls.h projects/random_number_generator/sys/amd64/vmm/intel/vmx_genassym.c projects/random_number_generator/sys/amd64/vmm/intel/vtd.c projects/random_number_generator/sys/amd64/vmm/io/vlapic.c projects/random_number_generator/sys/amd64/vmm/io/vlapic.h projects/random_number_generator/sys/amd64/vmm/vmm.c projects/random_number_generator/sys/amd64/vmm/vmm_dev.c projects/random_number_generator/sys/amd64/vmm/vmm_instruction_emul.c projects/random_number_generator/sys/amd64/vmm/vmm_ktr.h projects/random_number_generator/sys/amd64/vmm/vmm_lapic.c projects/random_number_generator/sys/amd64/vmm/x86.c projects/random_number_generator/sys/arm/allwinner/a10_clk.c projects/random_number_generator/sys/arm/allwinner/a10_gpio.c projects/random_number_generator/sys/arm/allwinner/a10_machdep.c projects/random_number_generator/sys/arm/allwinner/a10_wdog.c projects/random_number_generator/sys/arm/allwinner/a20/a20_cpu_cfg.c projects/random_number_generator/sys/arm/allwinner/a20/files.a20 projects/random_number_generator/sys/arm/allwinner/files.a10 projects/random_number_generator/sys/arm/allwinner/timer.c projects/random_number_generator/sys/arm/arm/bus_space_generic.c projects/random_number_generator/sys/arm/arm/busdma_machdep-v6.c projects/random_number_generator/sys/arm/arm/busdma_machdep.c projects/random_number_generator/sys/arm/arm/cpufunc.c projects/random_number_generator/sys/arm/arm/cpufunc_asm_armv7.S projects/random_number_generator/sys/arm/arm/cpufunc_asm_pj4b.S projects/random_number_generator/sys/arm/arm/fusu.S projects/random_number_generator/sys/arm/arm/genassym.c projects/random_number_generator/sys/arm/arm/generic_timer.c projects/random_number_generator/sys/arm/arm/gic.c projects/random_number_generator/sys/arm/arm/identcpu.c projects/random_number_generator/sys/arm/arm/locore.S projects/random_number_generator/sys/arm/arm/machdep.c projects/random_number_generator/sys/arm/arm/minidump_machdep.c projects/random_number_generator/sys/arm/arm/mp_machdep.c projects/random_number_generator/sys/arm/arm/mpcore_timer.c projects/random_number_generator/sys/arm/arm/nexus.c projects/random_number_generator/sys/arm/arm/pl310.c projects/random_number_generator/sys/arm/arm/pmap-v6.c projects/random_number_generator/sys/arm/arm/pmap.c projects/random_number_generator/sys/arm/arm/stack_machdep.c projects/random_number_generator/sys/arm/arm/trap.c projects/random_number_generator/sys/arm/arm/undefined.c projects/random_number_generator/sys/arm/arm/vfp.c projects/random_number_generator/sys/arm/arm/vm_machdep.c projects/random_number_generator/sys/arm/at91/at91.c projects/random_number_generator/sys/arm/at91/at91_machdep.c projects/random_number_generator/sys/arm/at91/at91_mci.c projects/random_number_generator/sys/arm/at91/at91_pmc.c projects/random_number_generator/sys/arm/at91/if_ate.c projects/random_number_generator/sys/arm/broadcom/bcm2835/bcm2835_dma.c projects/random_number_generator/sys/arm/broadcom/bcm2835/bcm2835_fb.c projects/random_number_generator/sys/arm/broadcom/bcm2835/bcm2835_gpio.c projects/random_number_generator/sys/arm/broadcom/bcm2835/bcm2835_machdep.c projects/random_number_generator/sys/arm/broadcom/bcm2835/bcm2835_mbox.c projects/random_number_generator/sys/arm/broadcom/bcm2835/bcm2835_sdhci.c projects/random_number_generator/sys/arm/broadcom/bcm2835/bcm2835_systimer.c projects/random_number_generator/sys/arm/broadcom/bcm2835/bcm2835_wdog.c projects/random_number_generator/sys/arm/broadcom/bcm2835/files.bcm2835 projects/random_number_generator/sys/arm/conf/ARMADAXP projects/random_number_generator/sys/arm/conf/DIGI-CCWMX53 projects/random_number_generator/sys/arm/conf/RPI-B projects/random_number_generator/sys/arm/econa/econa.c projects/random_number_generator/sys/arm/econa/econa_machdep.c projects/random_number_generator/sys/arm/econa/if_ece.c projects/random_number_generator/sys/arm/econa/timer.c projects/random_number_generator/sys/arm/freescale/imx/files.imx51 projects/random_number_generator/sys/arm/freescale/imx/files.imx53 projects/random_number_generator/sys/arm/freescale/imx/imx51_ccm.c projects/random_number_generator/sys/arm/freescale/imx/imx51_ccmreg.h projects/random_number_generator/sys/arm/freescale/imx/imx51_ipuv3.c projects/random_number_generator/sys/arm/freescale/imx/imx51_machdep.c projects/random_number_generator/sys/arm/freescale/imx/imx53_machdep.c projects/random_number_generator/sys/arm/freescale/imx/imx_gpt.c projects/random_number_generator/sys/arm/freescale/imx/tzic.c projects/random_number_generator/sys/arm/include/armreg.h projects/random_number_generator/sys/arm/include/atomic.h projects/random_number_generator/sys/arm/include/cpu.h projects/random_number_generator/sys/arm/include/cpufunc.h projects/random_number_generator/sys/arm/include/fdt.h projects/random_number_generator/sys/arm/include/frame.h projects/random_number_generator/sys/arm/include/machdep.h projects/random_number_generator/sys/arm/include/pcb.h projects/random_number_generator/sys/arm/include/pcpu.h projects/random_number_generator/sys/arm/include/pmap.h projects/random_number_generator/sys/arm/include/undefined.h projects/random_number_generator/sys/arm/include/vmparam.h projects/random_number_generator/sys/arm/lpc/if_lpe.c projects/random_number_generator/sys/arm/lpc/lpc_fb.c projects/random_number_generator/sys/arm/lpc/lpc_gpio.c projects/random_number_generator/sys/arm/lpc/lpc_machdep.c projects/random_number_generator/sys/arm/lpc/lpc_mmc.c projects/random_number_generator/sys/arm/lpc/lpc_spi.c projects/random_number_generator/sys/arm/lpc/lpc_timer.c projects/random_number_generator/sys/arm/mv/armadaxp/std.armadaxp projects/random_number_generator/sys/arm/mv/common.c projects/random_number_generator/sys/arm/mv/gpio.c projects/random_number_generator/sys/arm/mv/mv_localbus.c projects/random_number_generator/sys/arm/mv/mv_machdep.c projects/random_number_generator/sys/arm/mv/mv_pci.c projects/random_number_generator/sys/arm/mv/mv_sata.c projects/random_number_generator/sys/arm/mv/mvreg.h projects/random_number_generator/sys/arm/mv/mvvar.h projects/random_number_generator/sys/arm/mv/orion/db88f5xxx.c projects/random_number_generator/sys/arm/mv/timer.c projects/random_number_generator/sys/arm/s3c2xx0/files.s3c2xx0 projects/random_number_generator/sys/arm/s3c2xx0/s3c24x0.c projects/random_number_generator/sys/arm/s3c2xx0/s3c24x0_machdep.c projects/random_number_generator/sys/arm/s3c2xx0/s3c2xx0_space.c projects/random_number_generator/sys/arm/sa11x0/assabet_machdep.c projects/random_number_generator/sys/arm/sa11x0/sa11x0.c projects/random_number_generator/sys/arm/sa11x0/sa11x0_io.c projects/random_number_generator/sys/arm/samsung/exynos/arch_timer.c projects/random_number_generator/sys/arm/samsung/exynos/exynos5_machdep.c projects/random_number_generator/sys/arm/tegra/tegra2_machdep.c projects/random_number_generator/sys/arm/ti/am335x/am335x_dmtimer.c projects/random_number_generator/sys/arm/ti/am335x/am335x_lcd_syscons.c projects/random_number_generator/sys/arm/ti/am335x/am335x_prcm.c projects/random_number_generator/sys/arm/ti/am335x/am335x_scm_padconf.c projects/random_number_generator/sys/arm/ti/cpsw/if_cpsw.c projects/random_number_generator/sys/arm/ti/files.ti projects/random_number_generator/sys/arm/ti/omap4/omap4_prcm_clks.c projects/random_number_generator/sys/arm/ti/omap4/omap4_scm_padconf.c projects/random_number_generator/sys/arm/ti/omap4/pandaboard/pandaboard.c projects/random_number_generator/sys/arm/ti/ti_cpuid.c projects/random_number_generator/sys/arm/ti/ti_machdep.c projects/random_number_generator/sys/arm/ti/ti_mmchs.c projects/random_number_generator/sys/arm/ti/ti_prcm.c projects/random_number_generator/sys/arm/ti/ti_scm.c projects/random_number_generator/sys/arm/ti/ti_sdhci.c projects/random_number_generator/sys/arm/ti/twl/twl.c projects/random_number_generator/sys/arm/ti/twl/twl_clks.c projects/random_number_generator/sys/arm/ti/twl/twl_vreg.c projects/random_number_generator/sys/arm/versatile/if_smc_fdt.c projects/random_number_generator/sys/arm/versatile/pl050.c projects/random_number_generator/sys/arm/versatile/sp804.c projects/random_number_generator/sys/arm/versatile/versatile_clcd.c projects/random_number_generator/sys/arm/versatile/versatile_machdep.c projects/random_number_generator/sys/arm/versatile/versatile_pci.c projects/random_number_generator/sys/arm/versatile/versatile_timer.c projects/random_number_generator/sys/arm/xilinx/zy7_machdep.c projects/random_number_generator/sys/arm/xscale/i80321/ep80219_machdep.c projects/random_number_generator/sys/arm/xscale/i80321/i80321_pci.c projects/random_number_generator/sys/arm/xscale/i80321/iq31244_machdep.c projects/random_number_generator/sys/arm/xscale/i80321/iq80321.c projects/random_number_generator/sys/arm/xscale/i8134x/crb_machdep.c projects/random_number_generator/sys/arm/xscale/i8134x/i81342_pci.c projects/random_number_generator/sys/arm/xscale/ixp425/avila_machdep.c projects/random_number_generator/sys/arm/xscale/ixp425/if_npe.c projects/random_number_generator/sys/arm/xscale/ixp425/ixp425_mem.c projects/random_number_generator/sys/arm/xscale/ixp425/ixp425_pci.c projects/random_number_generator/sys/arm/xscale/ixp425/ixp425_wdog.c projects/random_number_generator/sys/arm/xscale/pxa/if_smc_smi.c projects/random_number_generator/sys/arm/xscale/pxa/pxa_machdep.c projects/random_number_generator/sys/arm/xscale/pxa/pxa_obio.c projects/random_number_generator/sys/boot/arm/uboot/Makefile projects/random_number_generator/sys/boot/fdt/dts/am335x.dtsi projects/random_number_generator/sys/boot/fdt/dts/bcm2835.dtsi projects/random_number_generator/sys/boot/fdt/dts/beaglebone-black.dts projects/random_number_generator/sys/boot/fdt/dts/db78460.dts projects/random_number_generator/sys/boot/fdt/dts/digi-ccwmx53.dts projects/random_number_generator/sys/boot/fdt/dts/efikamx.dts projects/random_number_generator/sys/boot/fdt/dts/imx51x.dtsi projects/random_number_generator/sys/boot/fdt/dts/imx53x.dtsi projects/random_number_generator/sys/boot/forth/beastie.4th projects/random_number_generator/sys/boot/forth/loader.4th projects/random_number_generator/sys/boot/forth/loader.4th.8 projects/random_number_generator/sys/boot/forth/loader.conf projects/random_number_generator/sys/boot/forth/loader.conf.5 projects/random_number_generator/sys/boot/forth/loader.rc projects/random_number_generator/sys/boot/forth/menu-commands.4th projects/random_number_generator/sys/boot/forth/menu.4th projects/random_number_generator/sys/boot/forth/menu.rc projects/random_number_generator/sys/boot/forth/menusets.4th projects/random_number_generator/sys/boot/i386/libi386/Makefile projects/random_number_generator/sys/boot/i386/libi386/smbios.c projects/random_number_generator/sys/boot/i386/loader/loader.rc projects/random_number_generator/sys/boot/powerpc/ps3/start.S projects/random_number_generator/sys/boot/uboot/lib/disk.c projects/random_number_generator/sys/boot/uboot/lib/glue.c projects/random_number_generator/sys/cam/ata/ata_all.c projects/random_number_generator/sys/cam/ata/ata_all.h projects/random_number_generator/sys/cam/ata/ata_da.c projects/random_number_generator/sys/cam/ata/ata_pmp.c projects/random_number_generator/sys/cam/ata/ata_xpt.c projects/random_number_generator/sys/cam/cam.h projects/random_number_generator/sys/cam/cam_ccb.h projects/random_number_generator/sys/cam/cam_periph.c projects/random_number_generator/sys/cam/cam_periph.h projects/random_number_generator/sys/cam/cam_queue.c projects/random_number_generator/sys/cam/cam_queue.h projects/random_number_generator/sys/cam/cam_sim.c projects/random_number_generator/sys/cam/cam_sim.h projects/random_number_generator/sys/cam/cam_xpt.c projects/random_number_generator/sys/cam/cam_xpt.h projects/random_number_generator/sys/cam/cam_xpt_internal.h projects/random_number_generator/sys/cam/cam_xpt_periph.h projects/random_number_generator/sys/cam/cam_xpt_sim.h projects/random_number_generator/sys/cam/ctl/ctl_backend_block.c projects/random_number_generator/sys/cam/ctl/ctl_frontend_cam_sim.c projects/random_number_generator/sys/cam/ctl/scsi_ctl.c projects/random_number_generator/sys/cam/scsi/scsi_all.c projects/random_number_generator/sys/cam/scsi/scsi_all.h projects/random_number_generator/sys/cam/scsi/scsi_cd.c projects/random_number_generator/sys/cam/scsi/scsi_ch.c projects/random_number_generator/sys/cam/scsi/scsi_da.c projects/random_number_generator/sys/cam/scsi/scsi_enc.c projects/random_number_generator/sys/cam/scsi/scsi_enc_internal.h projects/random_number_generator/sys/cam/scsi/scsi_enc_safte.c projects/random_number_generator/sys/cam/scsi/scsi_enc_ses.c projects/random_number_generator/sys/cam/scsi/scsi_pass.c projects/random_number_generator/sys/cam/scsi/scsi_pt.c projects/random_number_generator/sys/cam/scsi/scsi_sa.c projects/random_number_generator/sys/cam/scsi/scsi_sg.c projects/random_number_generator/sys/cam/scsi/scsi_targ_bh.c projects/random_number_generator/sys/cam/scsi/scsi_target.c projects/random_number_generator/sys/cam/scsi/scsi_xpt.c projects/random_number_generator/sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.c projects/random_number_generator/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c projects/random_number_generator/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/vdev.h projects/random_number_generator/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/vdev_impl.h projects/random_number_generator/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_geom.c projects/random_number_generator/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_mirror.c projects/random_number_generator/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_queue.c projects/random_number_generator/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zvol.c projects/random_number_generator/sys/cddl/contrib/opensolaris/uts/common/sys/dtrace.h projects/random_number_generator/sys/cddl/contrib/opensolaris/uts/common/sys/fasttrap_impl.h projects/random_number_generator/sys/cddl/contrib/opensolaris/uts/intel/dtrace/fasttrap_isa.c projects/random_number_generator/sys/cddl/contrib/opensolaris/uts/powerpc/dtrace/fasttrap_isa.c projects/random_number_generator/sys/cddl/contrib/opensolaris/uts/powerpc/sys/fasttrap_isa.h projects/random_number_generator/sys/cddl/dev/dtrace/amd64/dtrace_isa.c projects/random_number_generator/sys/cddl/dev/dtrace/amd64/dtrace_subr.c projects/random_number_generator/sys/cddl/dev/dtrace/dtrace_sysctl.c projects/random_number_generator/sys/cddl/dev/dtrace/powerpc/dtrace_isa.c projects/random_number_generator/sys/cddl/dev/sdt/sdt.c projects/random_number_generator/sys/compat/linprocfs/linprocfs.c projects/random_number_generator/sys/compat/linsysfs/linsysfs.c projects/random_number_generator/sys/compat/linux/linux_ioctl.c projects/random_number_generator/sys/compat/linux/linux_socket.c projects/random_number_generator/sys/compat/ndis/kern_ndis.c projects/random_number_generator/sys/compat/ndis/subr_ndis.c projects/random_number_generator/sys/compat/ndis/subr_usbd.c projects/random_number_generator/sys/compat/svr4/svr4_sockio.c projects/random_number_generator/sys/conf/Makefile.arm projects/random_number_generator/sys/conf/NOTES projects/random_number_generator/sys/conf/files projects/random_number_generator/sys/conf/files.amd64 projects/random_number_generator/sys/conf/files.arm projects/random_number_generator/sys/conf/files.i386 projects/random_number_generator/sys/conf/files.pc98 projects/random_number_generator/sys/conf/files.powerpc projects/random_number_generator/sys/conf/kern.pre.mk projects/random_number_generator/sys/conf/kmod.mk projects/random_number_generator/sys/conf/newvers.sh projects/random_number_generator/sys/conf/options projects/random_number_generator/sys/conf/options.mips projects/random_number_generator/sys/contrib/altq/altq/altq_cbq.c projects/random_number_generator/sys/contrib/altq/altq/altq_cdnr.c projects/random_number_generator/sys/contrib/altq/altq/altq_hfsc.c projects/random_number_generator/sys/contrib/altq/altq/altq_priq.c projects/random_number_generator/sys/contrib/altq/altq/altq_red.c projects/random_number_generator/sys/contrib/altq/altq/altq_rio.c projects/random_number_generator/sys/contrib/altq/altq/altq_rmclass.c projects/random_number_generator/sys/contrib/altq/altq/altq_subr.c projects/random_number_generator/sys/contrib/dev/ath/ath_hal/ar9300/ar9300_reset.c projects/random_number_generator/sys/contrib/dev/run/rt2870.fw.uu projects/random_number_generator/sys/contrib/ipfilter/netinet/ip_compat.h projects/random_number_generator/sys/contrib/ipfilter/netinet/radix_ipf.c projects/random_number_generator/sys/contrib/rdma/krping/getopt.c projects/random_number_generator/sys/contrib/rdma/krping/krping.c projects/random_number_generator/sys/contrib/rdma/krping/krping.h projects/random_number_generator/sys/contrib/rdma/krping/krping_dev.c projects/random_number_generator/sys/crypto/aesni/aesencdec.h projects/random_number_generator/sys/crypto/aesni/aesni.h projects/random_number_generator/sys/crypto/aesni/aesni_wrap.c projects/random_number_generator/sys/dev/aacraid/aacraid.c projects/random_number_generator/sys/dev/aacraid/aacraid_cam.c projects/random_number_generator/sys/dev/aacraid/aacraid_reg.h projects/random_number_generator/sys/dev/aacraid/aacraid_var.h projects/random_number_generator/sys/dev/acpica/acpi.c projects/random_number_generator/sys/dev/acpica/acpi_pci.c projects/random_number_generator/sys/dev/adb/adb_kbd.c projects/random_number_generator/sys/dev/ae/if_ae.c projects/random_number_generator/sys/dev/age/if_age.c projects/random_number_generator/sys/dev/aha/aha.c projects/random_number_generator/sys/dev/ahci/ahci.c projects/random_number_generator/sys/dev/ahci/ahci.h projects/random_number_generator/sys/dev/aic7xxx/aic79xx.c projects/random_number_generator/sys/dev/aic7xxx/aic7xxx.c projects/random_number_generator/sys/dev/aic7xxx/aicasm/Makefile projects/random_number_generator/sys/dev/alc/if_alc.c projects/random_number_generator/sys/dev/ale/if_ale.c projects/random_number_generator/sys/dev/altera/avgen/altera_avgen_nexus.c projects/random_number_generator/sys/dev/altera/jtag_uart/altera_jtag_uart_nexus.c projects/random_number_generator/sys/dev/altera/sdcard/altera_sdcard.c projects/random_number_generator/sys/dev/altera/sdcard/altera_sdcard_io.c projects/random_number_generator/sys/dev/altera/sdcard/altera_sdcard_nexus.c projects/random_number_generator/sys/dev/an/if_an.c projects/random_number_generator/sys/dev/arcmsr/arcmsr.c projects/random_number_generator/sys/dev/asr/asr.c projects/random_number_generator/sys/dev/ata/ata-all.c projects/random_number_generator/sys/dev/ath/ath_dfs/null/dfs_null.c projects/random_number_generator/sys/dev/ath/ath_rate/sample/sample.c projects/random_number_generator/sys/dev/ath/if_ath.c projects/random_number_generator/sys/dev/ath/if_ath_ahb.c projects/random_number_generator/sys/dev/ath/if_ath_beacon.c projects/random_number_generator/sys/dev/ath/if_ath_btcoex.c projects/random_number_generator/sys/dev/ath/if_ath_keycache.c projects/random_number_generator/sys/dev/ath/if_ath_lna_div.c projects/random_number_generator/sys/dev/ath/if_ath_pci.c projects/random_number_generator/sys/dev/ath/if_ath_rx.c projects/random_number_generator/sys/dev/ath/if_ath_rx_edma.c projects/random_number_generator/sys/dev/ath/if_ath_spectral.c projects/random_number_generator/sys/dev/ath/if_ath_sysctl.c projects/random_number_generator/sys/dev/ath/if_ath_tdma.c projects/random_number_generator/sys/dev/ath/if_ath_tx.c projects/random_number_generator/sys/dev/ath/if_ath_tx_edma.c projects/random_number_generator/sys/dev/bce/if_bce.c projects/random_number_generator/sys/dev/bce/if_bcereg.h projects/random_number_generator/sys/dev/bfe/if_bfe.c projects/random_number_generator/sys/dev/bge/if_bge.c projects/random_number_generator/sys/dev/bm/if_bm.c projects/random_number_generator/sys/dev/buslogic/bt.c projects/random_number_generator/sys/dev/bwi/bwimac.c projects/random_number_generator/sys/dev/bwi/bwiphy.c projects/random_number_generator/sys/dev/bwi/bwirf.c projects/random_number_generator/sys/dev/bwi/if_bwi.c projects/random_number_generator/sys/dev/bwi/if_bwi_pci.c projects/random_number_generator/sys/dev/bwn/if_bwn.c projects/random_number_generator/sys/dev/cadence/if_cgem.c projects/random_number_generator/sys/dev/cas/if_cas.c projects/random_number_generator/sys/dev/ce/if_ce.c projects/random_number_generator/sys/dev/cesa/cesa.c projects/random_number_generator/sys/dev/cfe/cfe_resource.c projects/random_number_generator/sys/dev/cfi/cfi_bus_nexus.c projects/random_number_generator/sys/dev/cfi/cfi_core.c projects/random_number_generator/sys/dev/cm/if_cm_isa.c projects/random_number_generator/sys/dev/cm/smc90cx6.c projects/random_number_generator/sys/dev/cp/if_cp.c projects/random_number_generator/sys/dev/cs/if_cs.c projects/random_number_generator/sys/dev/cs/if_cs_isa.c projects/random_number_generator/sys/dev/cs/if_cs_pccard.c projects/random_number_generator/sys/dev/cs/if_csvar.h projects/random_number_generator/sys/dev/ctau/if_ct.c projects/random_number_generator/sys/dev/cx/if_cx.c projects/random_number_generator/sys/dev/cxgb/cxgb_adapter.h projects/random_number_generator/sys/dev/cxgb/cxgb_main.c projects/random_number_generator/sys/dev/cxgb/cxgb_sge.c projects/random_number_generator/sys/dev/cxgb/ulp/tom/cxgb_cpl_io.c projects/random_number_generator/sys/dev/cxgb/ulp/tom/cxgb_listen.c projects/random_number_generator/sys/dev/cxgbe/adapter.h projects/random_number_generator/sys/dev/cxgbe/common/common.h projects/random_number_generator/sys/dev/cxgbe/common/t4_hw.c projects/random_number_generator/sys/dev/cxgbe/firmware/t4fw_cfg.txt projects/random_number_generator/sys/dev/cxgbe/firmware/t4fw_cfg_uwire.txt projects/random_number_generator/sys/dev/cxgbe/firmware/t4fw_interface.h projects/random_number_generator/sys/dev/cxgbe/firmware/t5fw_cfg.txt projects/random_number_generator/sys/dev/cxgbe/firmware/t5fw_cfg_uwire.txt projects/random_number_generator/sys/dev/cxgbe/t4_l2t.c projects/random_number_generator/sys/dev/cxgbe/t4_main.c projects/random_number_generator/sys/dev/cxgbe/t4_sge.c projects/random_number_generator/sys/dev/cxgbe/t4_tracer.c projects/random_number_generator/sys/dev/cxgbe/tom/t4_connect.c projects/random_number_generator/sys/dev/cxgbe/tom/t4_cpl_io.c projects/random_number_generator/sys/dev/cxgbe/tom/t4_tom.c projects/random_number_generator/sys/dev/dc/dcphy.c projects/random_number_generator/sys/dev/dc/if_dc.c projects/random_number_generator/sys/dev/dc/pnphy.c projects/random_number_generator/sys/dev/de/if_de.c projects/random_number_generator/sys/dev/drm2/drm_crtc.c projects/random_number_generator/sys/dev/drm2/i915/i915_drv.c projects/random_number_generator/sys/dev/drm2/radeon/radeon_display.c projects/random_number_generator/sys/dev/drm2/radeon/radeon_drv.c projects/random_number_generator/sys/dev/drm2/radeon/radeon_gem.c projects/random_number_generator/sys/dev/e1000/if_em.c projects/random_number_generator/sys/dev/e1000/if_igb.c projects/random_number_generator/sys/dev/e1000/if_lem.c projects/random_number_generator/sys/dev/e1000/if_lem.h projects/random_number_generator/sys/dev/ed/if_ed.c projects/random_number_generator/sys/dev/ed/if_ed_3c503.c projects/random_number_generator/sys/dev/ed/if_ed_hpp.c projects/random_number_generator/sys/dev/ed/if_ed_pccard.c projects/random_number_generator/sys/dev/ed/if_ed_rtl80x9.c projects/random_number_generator/sys/dev/en/if_en_pci.c projects/random_number_generator/sys/dev/en/midway.c projects/random_number_generator/sys/dev/ep/if_ep.c projects/random_number_generator/sys/dev/ep/if_ep_mca.c projects/random_number_generator/sys/dev/et/if_et.c projects/random_number_generator/sys/dev/etherswitch/arswitch/arswitch.c projects/random_number_generator/sys/dev/etherswitch/arswitch/arswitch_phy.c projects/random_number_generator/sys/dev/etherswitch/arswitch/arswitch_vlans.c projects/random_number_generator/sys/dev/etherswitch/arswitch/arswitchreg.h projects/random_number_generator/sys/dev/etherswitch/arswitch/arswitchvar.h projects/random_number_generator/sys/dev/etherswitch/miiproxy.c projects/random_number_generator/sys/dev/etherswitch/rtl8366/rtl8366rb.c projects/random_number_generator/sys/dev/etherswitch/ukswitch/ukswitch.c projects/random_number_generator/sys/dev/ex/if_ex.c projects/random_number_generator/sys/dev/fatm/if_fatm.c projects/random_number_generator/sys/dev/fdt/fdt_common.c projects/random_number_generator/sys/dev/fdt/fdt_common.h projects/random_number_generator/sys/dev/fdt/fdt_mips.c projects/random_number_generator/sys/dev/fdt/fdt_pci.c projects/random_number_generator/sys/dev/fdt/fdt_powerpc.c projects/random_number_generator/sys/dev/fdt/fdt_slicer.c projects/random_number_generator/sys/dev/fdt/fdtbus.c projects/random_number_generator/sys/dev/fdt/simplebus.c projects/random_number_generator/sys/dev/fe/if_fe.c projects/random_number_generator/sys/dev/fe/if_fe_pccard.c projects/random_number_generator/sys/dev/firewire/if_fwe.c projects/random_number_generator/sys/dev/firewire/if_fwip.c projects/random_number_generator/sys/dev/firewire/sbp.c projects/random_number_generator/sys/dev/firewire/sbp_targ.c projects/random_number_generator/sys/dev/fxp/if_fxp.c projects/random_number_generator/sys/dev/fxp/inphy.c projects/random_number_generator/sys/dev/gem/if_gem.c projects/random_number_generator/sys/dev/gxemul/disk/gxemul_disk.c projects/random_number_generator/sys/dev/gxemul/ether/if_gx.c projects/random_number_generator/sys/dev/hatm/if_hatm.c projects/random_number_generator/sys/dev/hatm/if_hatm_intr.c projects/random_number_generator/sys/dev/hatm/if_hatm_ioctl.c projects/random_number_generator/sys/dev/hatm/if_hatm_rx.c projects/random_number_generator/sys/dev/hatm/if_hatm_tx.c projects/random_number_generator/sys/dev/hme/if_hme.c projects/random_number_generator/sys/dev/hme/if_hme_pci.c projects/random_number_generator/sys/dev/hme/if_hme_sbus.c projects/random_number_generator/sys/dev/hptiop/hptiop.c projects/random_number_generator/sys/dev/hyperv/netvsc/hv_net_vsc.c projects/random_number_generator/sys/dev/hyperv/netvsc/hv_netvsc_drv_freebsd.c projects/random_number_generator/sys/dev/hyperv/vmbus/hv_vmbus_drv_freebsd.c projects/random_number_generator/sys/dev/ic/ns16550.h projects/random_number_generator/sys/dev/ie/if_ie.c projects/random_number_generator/sys/dev/ie/if_ie_isa.c projects/random_number_generator/sys/dev/if_ndis/if_ndis.c projects/random_number_generator/sys/dev/if_ndis/if_ndis_pccard.c projects/random_number_generator/sys/dev/if_ndis/if_ndis_pci.c projects/random_number_generator/sys/dev/if_ndis/if_ndis_usb.c projects/random_number_generator/sys/dev/iicbus/if_ic.c projects/random_number_generator/sys/dev/ipmi/ipmi.c projects/random_number_generator/sys/dev/ipw/if_ipw.c projects/random_number_generator/sys/dev/iscsi/icl.c projects/random_number_generator/sys/dev/iscsi_initiator/isc_cam.c projects/random_number_generator/sys/dev/isp/isp.c projects/random_number_generator/sys/dev/isp/isp_freebsd.c projects/random_number_generator/sys/dev/isp/isp_freebsd.h projects/random_number_generator/sys/dev/isp/ispvar.h projects/random_number_generator/sys/dev/iwi/if_iwi.c projects/random_number_generator/sys/dev/iwn/if_iwn.c projects/random_number_generator/sys/dev/iwn/if_iwn_devid.h projects/random_number_generator/sys/dev/iwn/if_iwnreg.h projects/random_number_generator/sys/dev/iwn/if_iwnvar.h projects/random_number_generator/sys/dev/ixgb/if_ixgb.h projects/random_number_generator/sys/dev/ixgbe/ixgbe.c projects/random_number_generator/sys/dev/ixgbe/ixgbe.h projects/random_number_generator/sys/dev/ixgbe/ixv.h projects/random_number_generator/sys/dev/jme/if_jme.c projects/random_number_generator/sys/dev/le/if_le_ledma.c projects/random_number_generator/sys/dev/le/lance.c projects/random_number_generator/sys/dev/lge/if_lge.c projects/random_number_generator/sys/dev/lmc/if_lmc.c projects/random_number_generator/sys/dev/lmc/if_lmc.h projects/random_number_generator/sys/dev/malo/if_malo.c projects/random_number_generator/sys/dev/malo/if_malo_pci.c projects/random_number_generator/sys/dev/malo/if_malohal.c projects/random_number_generator/sys/dev/md/md.c projects/random_number_generator/sys/dev/mge/if_mge.c projects/random_number_generator/sys/dev/mii/acphy.c projects/random_number_generator/sys/dev/mii/amphy.c projects/random_number_generator/sys/dev/mii/atphy.c projects/random_number_generator/sys/dev/mii/axphy.c projects/random_number_generator/sys/dev/mii/bmtphy.c projects/random_number_generator/sys/dev/mii/brgphy.c projects/random_number_generator/sys/dev/mii/ciphy.c projects/random_number_generator/sys/dev/mii/e1000phy.c projects/random_number_generator/sys/dev/mii/gentbi.c projects/random_number_generator/sys/dev/mii/icsphy.c projects/random_number_generator/sys/dev/mii/ip1000phy.c projects/random_number_generator/sys/dev/mii/jmphy.c projects/random_number_generator/sys/dev/mii/lxtphy.c projects/random_number_generator/sys/dev/mii/mii.c projects/random_number_generator/sys/dev/mii/mii_physubr.c projects/random_number_generator/sys/dev/mii/miidevs projects/random_number_generator/sys/dev/mii/mlphy.c projects/random_number_generator/sys/dev/mii/nsgphy.c projects/random_number_generator/sys/dev/mii/nsphy.c projects/random_number_generator/sys/dev/mii/nsphyter.c projects/random_number_generator/sys/dev/mii/pnaphy.c projects/random_number_generator/sys/dev/mii/qsphy.c projects/random_number_generator/sys/dev/mii/rdcphy.c projects/random_number_generator/sys/dev/mii/rgephy.c projects/random_number_generator/sys/dev/mii/rlphy.c projects/random_number_generator/sys/dev/mii/rlswitch.c projects/random_number_generator/sys/dev/mii/smcphy.c projects/random_number_generator/sys/dev/mii/smscphy.c projects/random_number_generator/sys/dev/mii/tdkphy.c projects/random_number_generator/sys/dev/mii/tlphy.c projects/random_number_generator/sys/dev/mii/truephy.c projects/random_number_generator/sys/dev/mii/ukphy.c projects/random_number_generator/sys/dev/mii/xmphy.c projects/random_number_generator/sys/dev/mps/mps_sas.c projects/random_number_generator/sys/dev/mpt/mpt_cam.c projects/random_number_generator/sys/dev/msk/if_msk.c projects/random_number_generator/sys/dev/mvs/mvs.c projects/random_number_generator/sys/dev/mvs/mvs_soc.c projects/random_number_generator/sys/dev/mwl/if_mwl.c projects/random_number_generator/sys/dev/mwl/if_mwl_pci.c projects/random_number_generator/sys/dev/mxge/if_mxge.c projects/random_number_generator/sys/dev/my/if_my.c projects/random_number_generator/sys/dev/netmap/if_em_netmap.h projects/random_number_generator/sys/dev/netmap/if_igb_netmap.h projects/random_number_generator/sys/dev/netmap/if_lem_netmap.h projects/random_number_generator/sys/dev/netmap/if_re_netmap.h projects/random_number_generator/sys/dev/netmap/ixgbe_netmap.h projects/random_number_generator/sys/dev/netmap/netmap.c projects/random_number_generator/sys/dev/netmap/netmap_kern.h projects/random_number_generator/sys/dev/netmap/netmap_mem2.c projects/random_number_generator/sys/dev/nfe/if_nfe.c projects/random_number_generator/sys/dev/nge/if_nge.c projects/random_number_generator/sys/dev/nve/if_nve.c projects/random_number_generator/sys/dev/nvme/nvme_ctrlr.c projects/random_number_generator/sys/dev/nvme/nvme_ns.c projects/random_number_generator/sys/dev/nxge/if_nxge.c projects/random_number_generator/sys/dev/oce/oce_hw.c projects/random_number_generator/sys/dev/oce/oce_hw.h projects/random_number_generator/sys/dev/oce/oce_if.c projects/random_number_generator/sys/dev/oce/oce_if.h projects/random_number_generator/sys/dev/oce/oce_mbox.c projects/random_number_generator/sys/dev/oce/oce_queue.c projects/random_number_generator/sys/dev/oce/oce_sysctl.c projects/random_number_generator/sys/dev/oce/oce_util.c projects/random_number_generator/sys/dev/ofw/ofw_bus.h projects/random_number_generator/sys/dev/ofw/ofw_bus_if.m projects/random_number_generator/sys/dev/ofw/ofw_bus_subr.c projects/random_number_generator/sys/dev/ofw/ofw_bus_subr.h projects/random_number_generator/sys/dev/ofw/ofw_console.c projects/random_number_generator/sys/dev/ofw/ofw_fdt.c projects/random_number_generator/sys/dev/ofw/ofw_iicbus.c projects/random_number_generator/sys/dev/ofw/openfirm.c projects/random_number_generator/sys/dev/ofw/openfirm.h projects/random_number_generator/sys/dev/patm/if_patm.c projects/random_number_generator/sys/dev/patm/if_patm_attach.c projects/random_number_generator/sys/dev/patm/if_patm_intr.c projects/random_number_generator/sys/dev/patm/if_patm_ioctl.c projects/random_number_generator/sys/dev/patm/if_patm_rx.c projects/random_number_generator/sys/dev/patm/if_patm_tx.c projects/random_number_generator/sys/dev/pci/pci.c projects/random_number_generator/sys/dev/pci/pci_private.h projects/random_number_generator/sys/dev/pci/pcireg.h projects/random_number_generator/sys/dev/pci/pcivar.h projects/random_number_generator/sys/dev/pcn/if_pcn.c projects/random_number_generator/sys/dev/pdq/if_fea.c projects/random_number_generator/sys/dev/pdq/if_fpa.c projects/random_number_generator/sys/dev/pdq/pdq_freebsd.h projects/random_number_generator/sys/dev/pdq/pdq_ifsubr.c projects/random_number_generator/sys/dev/ppbus/if_plip.c projects/random_number_generator/sys/dev/ppc/ppc_pci.c projects/random_number_generator/sys/dev/qlxgb/qla_os.h projects/random_number_generator/sys/dev/qlxgbe/ql_os.h projects/random_number_generator/sys/dev/qlxge/qls_os.h projects/random_number_generator/sys/dev/ral/rt2560.c projects/random_number_generator/sys/dev/ral/rt2661.c projects/random_number_generator/sys/dev/ral/rt2860.c projects/random_number_generator/sys/dev/random/harvest.c projects/random_number_generator/sys/dev/random/ivy.c projects/random_number_generator/sys/dev/random/nehemiah.c projects/random_number_generator/sys/dev/random/random_adaptors.c projects/random_number_generator/sys/dev/random/random_harvestq.c projects/random_number_generator/sys/dev/random/rwfile.c projects/random_number_generator/sys/dev/random/rwfile.h projects/random_number_generator/sys/dev/re/if_re.c projects/random_number_generator/sys/dev/rt/if_rt.c projects/random_number_generator/sys/dev/sbni/if_sbni.c projects/random_number_generator/sys/dev/sbni/if_sbni_isa.c projects/random_number_generator/sys/dev/sf/if_sf.c projects/random_number_generator/sys/dev/sfxge/sfxge.c projects/random_number_generator/sys/dev/sfxge/sfxge.h projects/random_number_generator/sys/dev/sfxge/sfxge_dma.c projects/random_number_generator/sys/dev/sfxge/sfxge_ev.c projects/random_number_generator/sys/dev/sfxge/sfxge_intr.c projects/random_number_generator/sys/dev/sge/if_sge.c projects/random_number_generator/sys/dev/siba/siba_bwn.c projects/random_number_generator/sys/dev/siba/siba_core.c projects/random_number_generator/sys/dev/siis/siis.c projects/random_number_generator/sys/dev/sis/if_sis.c projects/random_number_generator/sys/dev/sk/if_sk.c projects/random_number_generator/sys/dev/smc/if_smc.c projects/random_number_generator/sys/dev/sn/if_sn.c projects/random_number_generator/sys/dev/sn/if_sn_isa.c projects/random_number_generator/sys/dev/snc/dp83932.c projects/random_number_generator/sys/dev/snc/if_snc.c projects/random_number_generator/sys/dev/snc/if_snc_pccard.c projects/random_number_generator/sys/dev/spibus/spibus.c projects/random_number_generator/sys/dev/spibus/spibusvar.h projects/random_number_generator/sys/dev/ste/if_ste.c projects/random_number_generator/sys/dev/stge/if_stge.c projects/random_number_generator/sys/dev/terasic/de4led/terasic_de4led_nexus.c projects/random_number_generator/sys/dev/terasic/mtl/terasic_mtl_nexus.c projects/random_number_generator/sys/dev/ti/if_ti.c projects/random_number_generator/sys/dev/tl/if_tl.c projects/random_number_generator/sys/dev/tsec/if_tsec.c projects/random_number_generator/sys/dev/tsec/if_tsec_fdt.c projects/random_number_generator/sys/dev/twa/tw_osl_cam.c projects/random_number_generator/sys/dev/tx/if_tx.c projects/random_number_generator/sys/dev/txp/if_txp.c projects/random_number_generator/sys/dev/uart/uart.h projects/random_number_generator/sys/dev/uart/uart_bus_fdt.c projects/random_number_generator/sys/dev/uart/uart_bus_pci.c projects/random_number_generator/sys/dev/uart/uart_cpu_fdt.c projects/random_number_generator/sys/dev/uart/uart_dev_imx.c projects/random_number_generator/sys/dev/uart/uart_dev_ns8250.c projects/random_number_generator/sys/dev/uart/uart_dev_pl011.c projects/random_number_generator/sys/dev/usb/controller/ehci_imx.c projects/random_number_generator/sys/dev/usb/controller/ehci_pci.c projects/random_number_generator/sys/dev/usb/controller/musb_otg.c projects/random_number_generator/sys/dev/usb/controller/musb_otg.h projects/random_number_generator/sys/dev/usb/controller/xhci.c projects/random_number_generator/sys/dev/usb/net/if_aue.c projects/random_number_generator/sys/dev/usb/net/if_axe.c projects/random_number_generator/sys/dev/usb/net/if_cdce.c projects/random_number_generator/sys/dev/usb/net/if_cue.c projects/random_number_generator/sys/dev/usb/net/if_ipheth.c projects/random_number_generator/sys/dev/usb/net/if_kue.c projects/random_number_generator/sys/dev/usb/net/if_mos.c projects/random_number_generator/sys/dev/usb/net/if_rue.c projects/random_number_generator/sys/dev/usb/net/if_smsc.c projects/random_number_generator/sys/dev/usb/net/if_udav.c projects/random_number_generator/sys/dev/usb/net/if_usie.c projects/random_number_generator/sys/dev/usb/net/ruephy.c projects/random_number_generator/sys/dev/usb/net/uhso.c projects/random_number_generator/sys/dev/usb/net/usb_ethernet.c projects/random_number_generator/sys/dev/usb/serial/u3g.c projects/random_number_generator/sys/dev/usb/serial/umodem.c projects/random_number_generator/sys/dev/usb/serial/uslcom.c projects/random_number_generator/sys/dev/usb/storage/umass.c projects/random_number_generator/sys/dev/usb/usb.h projects/random_number_generator/sys/dev/usb/usb_dev.c projects/random_number_generator/sys/dev/usb/usb_device.h projects/random_number_generator/sys/dev/usb/usb_generic.c projects/random_number_generator/sys/dev/usb/usb_hub.c projects/random_number_generator/sys/dev/usb/usb_pf.c projects/random_number_generator/sys/dev/usb/usbdevs projects/random_number_generator/sys/dev/usb/wlan/if_rsu.c projects/random_number_generator/sys/dev/usb/wlan/if_rum.c projects/random_number_generator/sys/dev/usb/wlan/if_run.c projects/random_number_generator/sys/dev/usb/wlan/if_runreg.h projects/random_number_generator/sys/dev/usb/wlan/if_uath.c projects/random_number_generator/sys/dev/usb/wlan/if_upgt.c projects/random_number_generator/sys/dev/usb/wlan/if_ural.c projects/random_number_generator/sys/dev/usb/wlan/if_urtw.c projects/random_number_generator/sys/dev/usb/wlan/if_urtwn.c projects/random_number_generator/sys/dev/usb/wlan/if_zyd.c projects/random_number_generator/sys/dev/vge/if_vge.c projects/random_number_generator/sys/dev/virtio/network/if_vtnet.c projects/random_number_generator/sys/dev/vmware/vmxnet3/if_vmx.c projects/random_number_generator/sys/dev/vr/if_vr.c projects/random_number_generator/sys/dev/vte/if_vte.c projects/random_number_generator/sys/dev/vx/if_vx.c projects/random_number_generator/sys/dev/vx/if_vx_eisa.c projects/random_number_generator/sys/dev/vx/if_vx_pci.c projects/random_number_generator/sys/dev/wb/if_wb.c projects/random_number_generator/sys/dev/wds/wd7000.c projects/random_number_generator/sys/dev/wi/if_wi.c projects/random_number_generator/sys/dev/wi/if_wi_pccard.c projects/random_number_generator/sys/dev/wi/if_wi_pci.c projects/random_number_generator/sys/dev/wl/if_wl.c projects/random_number_generator/sys/dev/wpi/if_wpi.c projects/random_number_generator/sys/dev/xe/if_xe.c projects/random_number_generator/sys/dev/xe/if_xe_pccard.c projects/random_number_generator/sys/dev/xen/console/console.c projects/random_number_generator/sys/dev/xen/control/control.c projects/random_number_generator/sys/dev/xen/netback/netback.c projects/random_number_generator/sys/dev/xen/netback/netback_unit_tests.c projects/random_number_generator/sys/dev/xen/netfront/netfront.c projects/random_number_generator/sys/dev/xen/pcifront/pcifront.c projects/random_number_generator/sys/dev/xen/timer/timer.c projects/random_number_generator/sys/dev/xl/if_xl.c projects/random_number_generator/sys/dev/xl/xlphy.c projects/random_number_generator/sys/fs/devfs/devfs_vnops.c projects/random_number_generator/sys/fs/ext2fs/ext2_vnops.c projects/random_number_generator/sys/fs/nfs/nfs_commonkrpc.c projects/random_number_generator/sys/fs/nfs/nfsport.h projects/random_number_generator/sys/geom/concat/g_concat.c projects/random_number_generator/sys/geom/concat/g_concat.h projects/random_number_generator/sys/geom/eli/g_eli_ctl.c projects/random_number_generator/sys/geom/gate/g_gate.c projects/random_number_generator/sys/geom/geom.h projects/random_number_generator/sys/geom/geom_dev.c projects/random_number_generator/sys/geom/geom_disk.c projects/random_number_generator/sys/geom/geom_disk.h projects/random_number_generator/sys/geom/geom_int.h projects/random_number_generator/sys/geom/geom_io.c projects/random_number_generator/sys/geom/geom_kern.c projects/random_number_generator/sys/geom/geom_slice.c projects/random_number_generator/sys/geom/geom_subr.c projects/random_number_generator/sys/geom/geom_vfs.c projects/random_number_generator/sys/geom/label/g_label.c projects/random_number_generator/sys/geom/mirror/g_mirror.c projects/random_number_generator/sys/geom/mirror/g_mirror.h projects/random_number_generator/sys/geom/multipath/g_multipath.c projects/random_number_generator/sys/geom/nop/g_nop.c projects/random_number_generator/sys/geom/nop/g_nop.h projects/random_number_generator/sys/geom/part/g_part.c projects/random_number_generator/sys/geom/part/g_part_apm.c projects/random_number_generator/sys/geom/part/g_part_bsd.c projects/random_number_generator/sys/geom/part/g_part_ebr.c projects/random_number_generator/sys/geom/part/g_part_gpt.c projects/random_number_generator/sys/geom/part/g_part_mbr.c projects/random_number_generator/sys/geom/part/g_part_pc98.c projects/random_number_generator/sys/geom/part/g_part_vtoc8.c projects/random_number_generator/sys/geom/raid/g_raid.c projects/random_number_generator/sys/geom/raid/g_raid.h projects/random_number_generator/sys/geom/raid/md_ddf.c projects/random_number_generator/sys/geom/raid/md_intel.c projects/random_number_generator/sys/geom/raid/md_jmicron.c projects/random_number_generator/sys/geom/raid/md_nvidia.c projects/random_number_generator/sys/geom/raid/md_promise.c projects/random_number_generator/sys/geom/raid/md_sii.c projects/random_number_generator/sys/geom/raid/tr_concat.c projects/random_number_generator/sys/geom/raid/tr_raid0.c projects/random_number_generator/sys/geom/raid/tr_raid1.c projects/random_number_generator/sys/geom/raid/tr_raid1e.c projects/random_number_generator/sys/geom/raid/tr_raid5.c projects/random_number_generator/sys/geom/stripe/g_stripe.c projects/random_number_generator/sys/geom/stripe/g_stripe.h projects/random_number_generator/sys/geom/zero/g_zero.c projects/random_number_generator/sys/i386/conf/NOTES projects/random_number_generator/sys/i386/i386/bpf_jit_machdep.c projects/random_number_generator/sys/i386/i386/identcpu.c projects/random_number_generator/sys/i386/i386/machdep.c projects/random_number_generator/sys/i386/i386/trap.c projects/random_number_generator/sys/i386/include/vmparam.h projects/random_number_generator/sys/ia64/ia64/busdma_machdep.c projects/random_number_generator/sys/ia64/ia64/machdep.c projects/random_number_generator/sys/ia64/ia64/mp_machdep.c projects/random_number_generator/sys/ia64/ia64/pmap.c projects/random_number_generator/sys/ia64/include/param.h projects/random_number_generator/sys/ia64/include/pmap.h projects/random_number_generator/sys/ia64/include/vmparam.h projects/random_number_generator/sys/kern/capabilities.conf projects/random_number_generator/sys/kern/init_main.c projects/random_number_generator/sys/kern/kern_conf.c projects/random_number_generator/sys/kern/kern_environment.c projects/random_number_generator/sys/kern/kern_event.c projects/random_number_generator/sys/kern/kern_exec.c projects/random_number_generator/sys/kern/kern_jail.c projects/random_number_generator/sys/kern/kern_malloc.c projects/random_number_generator/sys/kern/kern_poll.c projects/random_number_generator/sys/kern/kern_resource.c projects/random_number_generator/sys/kern/makesyscalls.sh projects/random_number_generator/sys/kern/subr_bus_dma.c projects/random_number_generator/sys/kern/subr_devstat.c projects/random_number_generator/sys/kern/subr_kdb.c projects/random_number_generator/sys/kern/subr_param.c projects/random_number_generator/sys/kern/subr_taskqueue.c projects/random_number_generator/sys/kern/sys_generic.c projects/random_number_generator/sys/kern/sys_socket.c projects/random_number_generator/sys/kern/uipc_socket.c projects/random_number_generator/sys/kern/uipc_syscalls.c projects/random_number_generator/sys/kern/vfs_bio.c projects/random_number_generator/sys/mips/adm5120/if_admsw.c projects/random_number_generator/sys/mips/adm5120/obio.c projects/random_number_generator/sys/mips/alchemy/obio.c projects/random_number_generator/sys/mips/atheros/apb.c projects/random_number_generator/sys/mips/atheros/ar71xx_chip.c projects/random_number_generator/sys/mips/atheros/ar71xx_cpudef.h projects/random_number_generator/sys/mips/atheros/ar71xx_ehci.c projects/random_number_generator/sys/mips/atheros/ar71xx_machdep.c projects/random_number_generator/sys/mips/atheros/ar71xx_pci.c projects/random_number_generator/sys/mips/atheros/ar71xx_spi.c projects/random_number_generator/sys/mips/atheros/ar71xx_wdog.c projects/random_number_generator/sys/mips/atheros/ar724x_chip.c projects/random_number_generator/sys/mips/atheros/ar724x_pci.c projects/random_number_generator/sys/mips/atheros/ar91xx_chip.c projects/random_number_generator/sys/mips/atheros/ar933x_chip.c projects/random_number_generator/sys/mips/atheros/ar933xreg.h projects/random_number_generator/sys/mips/atheros/ar934x_chip.c projects/random_number_generator/sys/mips/atheros/ar934xreg.h projects/random_number_generator/sys/mips/atheros/if_arge.c projects/random_number_generator/sys/mips/atheros/if_argevar.h projects/random_number_generator/sys/mips/beri/beri_machdep.c projects/random_number_generator/sys/mips/beri/files.beri projects/random_number_generator/sys/mips/beri/std.beri projects/random_number_generator/sys/mips/cavium/ciu.c projects/random_number_generator/sys/mips/cavium/octe/ethernet-common.c projects/random_number_generator/sys/mips/cavium/octe/ethernet-mdio.c projects/random_number_generator/sys/mips/cavium/octe/ethernet-mem.c projects/random_number_generator/sys/mips/cavium/octe/ethernet-rgmii.c projects/random_number_generator/sys/mips/cavium/octe/ethernet-rx.c projects/random_number_generator/sys/mips/cavium/octe/ethernet-sgmii.c projects/random_number_generator/sys/mips/cavium/octe/ethernet-spi.c projects/random_number_generator/sys/mips/cavium/octe/ethernet-tx.c projects/random_number_generator/sys/mips/cavium/octe/ethernet-xaui.c projects/random_number_generator/sys/mips/cavium/octe/ethernet.c projects/random_number_generator/sys/mips/cavium/octeon_ebt3000_cf.c projects/random_number_generator/sys/mips/cavium/octeon_pmc.c projects/random_number_generator/sys/mips/cavium/octeon_rnd.c projects/random_number_generator/sys/mips/cavium/octeon_rtc.c projects/random_number_generator/sys/mips/cavium/std.octeon1 projects/random_number_generator/sys/mips/conf/BERI_DE4.hints projects/random_number_generator/sys/mips/conf/BERI_DE4_MDROOT projects/random_number_generator/sys/mips/conf/BERI_DE4_SDROOT projects/random_number_generator/sys/mips/conf/BERI_SIM_MDROOT projects/random_number_generator/sys/mips/conf/BERI_TEMPLATE projects/random_number_generator/sys/mips/conf/DB120 projects/random_number_generator/sys/mips/conf/DB120.hints projects/random_number_generator/sys/mips/idt/if_kr.c projects/random_number_generator/sys/mips/idt/obio.c projects/random_number_generator/sys/mips/include/asm.h projects/random_number_generator/sys/mips/include/cpufunc.h projects/random_number_generator/sys/mips/include/pcb.h projects/random_number_generator/sys/mips/include/pte.h projects/random_number_generator/sys/mips/include/vmparam.h projects/random_number_generator/sys/mips/malta/gt.c projects/random_number_generator/sys/mips/mips/bcopy.S projects/random_number_generator/sys/mips/mips/busdma_machdep.c projects/random_number_generator/sys/mips/mips/cache.c projects/random_number_generator/sys/mips/mips/cpu.c projects/random_number_generator/sys/mips/mips/exception.S projects/random_number_generator/sys/mips/mips/fp.S projects/random_number_generator/sys/mips/mips/nexus.c projects/random_number_generator/sys/mips/mips/support.S projects/random_number_generator/sys/mips/mips/swtch.S projects/random_number_generator/sys/mips/mips/tick.c projects/random_number_generator/sys/mips/mips/trap.c projects/random_number_generator/sys/mips/nlm/dev/net/xlpge.c projects/random_number_generator/sys/mips/nlm/tick.c projects/random_number_generator/sys/mips/nlm/xlp_pci.c projects/random_number_generator/sys/mips/rmi/dev/nlge/if_nlge.c projects/random_number_generator/sys/mips/rmi/iodi.c projects/random_number_generator/sys/mips/rmi/tick.c projects/random_number_generator/sys/mips/rt305x/obio.c projects/random_number_generator/sys/mips/sibyte/sb_zbbus.c projects/random_number_generator/sys/modules/Makefile projects/random_number_generator/sys/modules/aic7xxx/Makefile projects/random_number_generator/sys/modules/aic7xxx/ahc/Makefile projects/random_number_generator/sys/modules/aic7xxx/ahd/Makefile projects/random_number_generator/sys/modules/bwi/Makefile projects/random_number_generator/sys/modules/cxgb/Makefile projects/random_number_generator/sys/modules/cxgbe/Makefile projects/random_number_generator/sys/modules/cxgbe/t4_firmware/Makefile projects/random_number_generator/sys/modules/cxgbe/t5_firmware/Makefile projects/random_number_generator/sys/modules/dtrace/Makefile projects/random_number_generator/sys/modules/dtrace/dtraceall/dtraceall.c projects/random_number_generator/sys/modules/dtrace/fasttrap/Makefile projects/random_number_generator/sys/modules/iwnfw/Makefile projects/random_number_generator/sys/modules/netgraph/Makefile projects/random_number_generator/sys/modules/random/Makefile projects/random_number_generator/sys/modules/rdma/Makefile projects/random_number_generator/sys/modules/vmm/Makefile projects/random_number_generator/sys/net/bpf.c projects/random_number_generator/sys/net/bpf.h projects/random_number_generator/sys/net/bridgestp.c projects/random_number_generator/sys/net/flowtable.c projects/random_number_generator/sys/net/ieee8023ad_lacp.c projects/random_number_generator/sys/net/if.c projects/random_number_generator/sys/net/if.h projects/random_number_generator/sys/net/if_arcsubr.c projects/random_number_generator/sys/net/if_atmsubr.c projects/random_number_generator/sys/net/if_bridge.c projects/random_number_generator/sys/net/if_clone.c projects/random_number_generator/sys/net/if_clone.h projects/random_number_generator/sys/net/if_disc.c projects/random_number_generator/sys/net/if_edsc.c projects/random_number_generator/sys/net/if_ef.c projects/random_number_generator/sys/net/if_enc.c projects/random_number_generator/sys/net/if_epair.c projects/random_number_generator/sys/net/if_ethersubr.c projects/random_number_generator/sys/net/if_faith.c projects/random_number_generator/sys/net/if_fddisubr.c projects/random_number_generator/sys/net/if_fwsubr.c projects/random_number_generator/sys/net/if_gif.c projects/random_number_generator/sys/net/if_gre.c projects/random_number_generator/sys/net/if_iso88025subr.c projects/random_number_generator/sys/net/if_loop.c projects/random_number_generator/sys/net/if_media.h projects/random_number_generator/sys/net/if_mib.c projects/random_number_generator/sys/net/if_spppfr.c projects/random_number_generator/sys/net/if_spppsubr.c projects/random_number_generator/sys/net/if_stf.c projects/random_number_generator/sys/net/if_tap.c projects/random_number_generator/sys/net/if_tun.c projects/random_number_generator/sys/net/if_var.h projects/random_number_generator/sys/net/if_vlan.c projects/random_number_generator/sys/net/if_vlan_var.h projects/random_number_generator/sys/net/netmap.h projects/random_number_generator/sys/net/pfil.c projects/random_number_generator/sys/net/pfvar.h projects/random_number_generator/sys/net/radix.c projects/random_number_generator/sys/net/radix.h projects/random_number_generator/sys/net/raw_cb.c projects/random_number_generator/sys/net/raw_usrreq.c projects/random_number_generator/sys/net/route.c projects/random_number_generator/sys/net/rtsock.c projects/random_number_generator/sys/net80211/ieee80211.c projects/random_number_generator/sys/net80211/ieee80211_action.c projects/random_number_generator/sys/net80211/ieee80211_adhoc.c projects/random_number_generator/sys/net80211/ieee80211_ageq.c projects/random_number_generator/sys/net80211/ieee80211_alq.c projects/random_number_generator/sys/net80211/ieee80211_amrr.c projects/random_number_generator/sys/net80211/ieee80211_ddb.c projects/random_number_generator/sys/net80211/ieee80211_dfs.c projects/random_number_generator/sys/net80211/ieee80211_freebsd.c projects/random_number_generator/sys/net80211/ieee80211_hostap.c projects/random_number_generator/sys/net80211/ieee80211_ht.c projects/random_number_generator/sys/net80211/ieee80211_input.c projects/random_number_generator/sys/net80211/ieee80211_ioctl.c projects/random_number_generator/sys/net80211/ieee80211_mesh.c projects/random_number_generator/sys/net80211/ieee80211_monitor.c projects/random_number_generator/sys/net80211/ieee80211_node.c projects/random_number_generator/sys/net80211/ieee80211_output.c projects/random_number_generator/sys/net80211/ieee80211_phy.c projects/random_number_generator/sys/net80211/ieee80211_power.c projects/random_number_generator/sys/net80211/ieee80211_proto.c projects/random_number_generator/sys/net80211/ieee80211_proto.h projects/random_number_generator/sys/net80211/ieee80211_radiotap.c projects/random_number_generator/sys/net80211/ieee80211_ratectl.c projects/random_number_generator/sys/net80211/ieee80211_ratectl_none.c projects/random_number_generator/sys/net80211/ieee80211_regdomain.c projects/random_number_generator/sys/net80211/ieee80211_rssadapt.c projects/random_number_generator/sys/net80211/ieee80211_scan.c projects/random_number_generator/sys/net80211/ieee80211_scan_sta.c projects/random_number_generator/sys/net80211/ieee80211_superg.c projects/random_number_generator/sys/net80211/ieee80211_wds.c projects/random_number_generator/sys/netatalk/aarp.c projects/random_number_generator/sys/netatalk/at_control.c projects/random_number_generator/sys/netatalk/ddp_input.c projects/random_number_generator/sys/netatalk/ddp_output.c projects/random_number_generator/sys/netatalk/ddp_pcb.c projects/random_number_generator/sys/netatalk/ddp_usrreq.c projects/random_number_generator/sys/netgraph/netflow/netflow.c projects/random_number_generator/sys/netgraph/ng_base.c projects/random_number_generator/sys/netgraph/ng_bridge.c projects/random_number_generator/sys/netgraph/ng_cisco.c projects/random_number_generator/sys/netgraph/ng_eiface.c projects/random_number_generator/sys/netgraph/ng_ether.c projects/random_number_generator/sys/netgraph/ng_iface.c projects/random_number_generator/sys/netgraph/ng_ipfw.c projects/random_number_generator/sys/netgraph/ng_one2many.c projects/random_number_generator/sys/netgraph/ng_pipe.c projects/random_number_generator/sys/netgraph/ng_sppp.c projects/random_number_generator/sys/netinet/if_atm.c projects/random_number_generator/sys/netinet/if_ether.c projects/random_number_generator/sys/netinet/igmp.c projects/random_number_generator/sys/netinet/in.c projects/random_number_generator/sys/netinet/in.h projects/random_number_generator/sys/netinet/in_gif.c projects/random_number_generator/sys/netinet/in_mcast.c projects/random_number_generator/sys/netinet/in_pcb.c projects/random_number_generator/sys/netinet/in_proto.c projects/random_number_generator/sys/netinet/in_rmx.c projects/random_number_generator/sys/netinet/in_var.h projects/random_number_generator/sys/netinet/ip_carp.c projects/random_number_generator/sys/netinet/ip_divert.c projects/random_number_generator/sys/netinet/ip_gre.c projects/random_number_generator/sys/netinet/ip_icmp.c projects/random_number_generator/sys/netinet/ip_input.c projects/random_number_generator/sys/netinet/ip_ipsec.c projects/random_number_generator/sys/netinet/ip_mroute.c projects/random_number_generator/sys/netinet/ip_output.c projects/random_number_generator/sys/netinet/libalias/alias_db.c projects/random_number_generator/sys/netinet/raw_ip.c projects/random_number_generator/sys/netinet/sctp_asconf.c projects/random_number_generator/sys/netinet/sctp_auth.c projects/random_number_generator/sys/netinet/sctp_auth.h projects/random_number_generator/sys/netinet/sctp_constants.h projects/random_number_generator/sys/netinet/sctp_output.c projects/random_number_generator/sys/netinet/sctp_pcb.c projects/random_number_generator/sys/netinet/sctp_timer.c projects/random_number_generator/sys/netinet/sctp_usrreq.c projects/random_number_generator/sys/netinet/sctputil.c projects/random_number_generator/sys/netinet/siftr.c projects/random_number_generator/sys/netinet/tcp_hostcache.c projects/random_number_generator/sys/netinet/tcp_input.c projects/random_number_generator/sys/netinet/tcp_offload.c projects/random_number_generator/sys/netinet/tcp_reass.c projects/random_number_generator/sys/netinet/tcp_sack.c projects/random_number_generator/sys/netinet/tcp_subr.c projects/random_number_generator/sys/netinet/tcp_syncache.c projects/random_number_generator/sys/netinet/tcp_timewait.c projects/random_number_generator/sys/netinet/tcp_usrreq.c projects/random_number_generator/sys/netinet/toecore.c projects/random_number_generator/sys/netinet/udp_usrreq.c projects/random_number_generator/sys/netinet6/dest6.c projects/random_number_generator/sys/netinet6/frag6.c projects/random_number_generator/sys/netinet6/icmp6.c projects/random_number_generator/sys/netinet6/in6.c projects/random_number_generator/sys/netinet6/in6_gif.c projects/random_number_generator/sys/netinet6/in6_ifattach.c projects/random_number_generator/sys/netinet6/in6_mcast.c projects/random_number_generator/sys/netinet6/in6_pcb.c projects/random_number_generator/sys/netinet6/in6_proto.c projects/random_number_generator/sys/netinet6/in6_rmx.c projects/random_number_generator/sys/netinet6/in6_src.c projects/random_number_generator/sys/netinet6/in6_var.h projects/random_number_generator/sys/netinet6/ip6_forward.c projects/random_number_generator/sys/netinet6/ip6_id.c projects/random_number_generator/sys/netinet6/ip6_input.c projects/random_number_generator/sys/netinet6/ip6_ipsec.c projects/random_number_generator/sys/netinet6/ip6_mroute.c projects/random_number_generator/sys/netinet6/ip6_output.c projects/random_number_generator/sys/netinet6/mld6.c projects/random_number_generator/sys/netinet6/nd6.c projects/random_number_generator/sys/netinet6/nd6_rtr.c projects/random_number_generator/sys/netinet6/raw_ip6.c projects/random_number_generator/sys/netinet6/route6.c projects/random_number_generator/sys/netinet6/scope6.c projects/random_number_generator/sys/netinet6/sctp6_usrreq.c projects/random_number_generator/sys/netinet6/udp6_usrreq.c projects/random_number_generator/sys/netipsec/ipsec.c projects/random_number_generator/sys/netipsec/ipsec_input.c projects/random_number_generator/sys/netipsec/ipsec_output.c projects/random_number_generator/sys/netipsec/key.c projects/random_number_generator/sys/netipsec/keysock.c projects/random_number_generator/sys/netipsec/xform_ah.c projects/random_number_generator/sys/netipsec/xform_esp.c projects/random_number_generator/sys/netipsec/xform_ipip.c projects/random_number_generator/sys/netipx/ipx.c projects/random_number_generator/sys/netipx/ipx_if.h projects/random_number_generator/sys/netipx/ipx_input.c projects/random_number_generator/sys/netipx/ipx_outputfl.c projects/random_number_generator/sys/netipx/ipx_pcb.c projects/random_number_generator/sys/netipx/ipx_usrreq.c projects/random_number_generator/sys/netnatm/natm.c projects/random_number_generator/sys/netnatm/natm_pcb.c projects/random_number_generator/sys/netnatm/natm_proto.c projects/random_number_generator/sys/netpfil/ipfw/ip_dn_io.c projects/random_number_generator/sys/netpfil/ipfw/ip_dummynet.c projects/random_number_generator/sys/netpfil/ipfw/ip_fw2.c projects/random_number_generator/sys/netpfil/ipfw/ip_fw_dynamic.c projects/random_number_generator/sys/netpfil/ipfw/ip_fw_log.c projects/random_number_generator/sys/netpfil/ipfw/ip_fw_nat.c projects/random_number_generator/sys/netpfil/pf/if_pflog.c projects/random_number_generator/sys/netpfil/pf/if_pfsync.c projects/random_number_generator/sys/netpfil/pf/pf.c projects/random_number_generator/sys/netpfil/pf/pf_if.c projects/random_number_generator/sys/netpfil/pf/pf_ioctl.c projects/random_number_generator/sys/netpfil/pf/pf_lb.c projects/random_number_generator/sys/netpfil/pf/pf_norm.c projects/random_number_generator/sys/netpfil/pf/pf_osfp.c projects/random_number_generator/sys/netpfil/pf/pf_ruleset.c projects/random_number_generator/sys/netpfil/pf/pf_table.c projects/random_number_generator/sys/netsmb/smb_trantcp.c projects/random_number_generator/sys/nfs/bootp_subr.c projects/random_number_generator/sys/nfsclient/nfs_vfsops.c projects/random_number_generator/sys/nfsclient/nfs_vnops.c projects/random_number_generator/sys/nfsserver/nfs_srvkrpc.c projects/random_number_generator/sys/ofed/drivers/infiniband/ulp/ipoib/ipoib.h projects/random_number_generator/sys/ofed/drivers/infiniband/ulp/sdp/sdp.h projects/random_number_generator/sys/ofed/drivers/net/mlx4/en_ethtool.c projects/random_number_generator/sys/ofed/drivers/net/mlx4/en_netdev.c projects/random_number_generator/sys/ofed/drivers/net/mlx4/mlx4_en.h projects/random_number_generator/sys/ofed/include/linux/bitops.h projects/random_number_generator/sys/ofed/include/linux/gfp.h projects/random_number_generator/sys/ofed/include/linux/list.h projects/random_number_generator/sys/pci/if_rl.c projects/random_number_generator/sys/pci/if_rlreg.h projects/random_number_generator/sys/powerpc/aim/interrupt.c projects/random_number_generator/sys/powerpc/aim/machdep.c projects/random_number_generator/sys/powerpc/aim/mmu_oea.c projects/random_number_generator/sys/powerpc/aim/mmu_oea64.c projects/random_number_generator/sys/powerpc/aim/mp_cpudep.c projects/random_number_generator/sys/powerpc/aim/trap.c projects/random_number_generator/sys/powerpc/booke/locore.S projects/random_number_generator/sys/powerpc/booke/machdep.c projects/random_number_generator/sys/powerpc/booke/machdep_e500.c projects/random_number_generator/sys/powerpc/booke/platform_bare.c projects/random_number_generator/sys/powerpc/booke/pmap.c projects/random_number_generator/sys/powerpc/conf/GENERIC64 projects/random_number_generator/sys/powerpc/include/intr_machdep.h projects/random_number_generator/sys/powerpc/include/pmap.h projects/random_number_generator/sys/powerpc/include/psl.h projects/random_number_generator/sys/powerpc/include/tlb.h projects/random_number_generator/sys/powerpc/include/trap.h projects/random_number_generator/sys/powerpc/include/vmparam.h projects/random_number_generator/sys/powerpc/mpc85xx/atpic.c projects/random_number_generator/sys/powerpc/mpc85xx/fsl_sdhc.c projects/random_number_generator/sys/powerpc/mpc85xx/lbc.c projects/random_number_generator/sys/powerpc/mpc85xx/mpc85xx.c projects/random_number_generator/sys/powerpc/mpc85xx/mpc85xx.h projects/random_number_generator/sys/powerpc/ofw/ofw_pci.c projects/random_number_generator/sys/powerpc/ofw/ofw_pci.h projects/random_number_generator/sys/powerpc/ofw/ofw_pcib_pci.c projects/random_number_generator/sys/powerpc/ofw/ofw_pcibus.c projects/random_number_generator/sys/powerpc/powermac/ata_kauai.c projects/random_number_generator/sys/powerpc/powermac/ata_macio.c projects/random_number_generator/sys/powerpc/powermac/powermac_thermal.c projects/random_number_generator/sys/powerpc/powerpc/bus_machdep.c projects/random_number_generator/sys/powerpc/powerpc/busdma_machdep.c projects/random_number_generator/sys/powerpc/powerpc/dump_machdep.c projects/random_number_generator/sys/powerpc/powerpc/exec_machdep.c projects/random_number_generator/sys/powerpc/powerpc/genassym.c projects/random_number_generator/sys/powerpc/powerpc/intr_machdep.c projects/random_number_generator/sys/powerpc/powerpc/pic_if.m projects/random_number_generator/sys/powerpc/ps3/if_glc.c projects/random_number_generator/sys/powerpc/pseries/mmu_phyp.c projects/random_number_generator/sys/powerpc/pseries/phyp-hvcall.S projects/random_number_generator/sys/powerpc/pseries/phyp_vscsi.c projects/random_number_generator/sys/powerpc/pseries/platform_chrp.c projects/random_number_generator/sys/powerpc/pseries/plpar_iommu.c projects/random_number_generator/sys/powerpc/pseries/vdevice.c projects/random_number_generator/sys/security/mac_ifoff/mac_ifoff.c projects/random_number_generator/sys/sparc64/include/bus.h projects/random_number_generator/sys/sparc64/include/bus_dma.h projects/random_number_generator/sys/sparc64/include/bus_private.h projects/random_number_generator/sys/sparc64/include/vmparam.h projects/random_number_generator/sys/sparc64/pci/fire.c projects/random_number_generator/sys/sparc64/pci/psycho.c projects/random_number_generator/sys/sparc64/pci/schizo.c projects/random_number_generator/sys/sparc64/sbus/sbus.c projects/random_number_generator/sys/sparc64/sparc64/bus_machdep.c projects/random_number_generator/sys/sys/ata.h projects/random_number_generator/sys/sys/bus_dma.h projects/random_number_generator/sys/sys/counter.h projects/random_number_generator/sys/sys/devicestat.h projects/random_number_generator/sys/sys/dtrace_bsd.h projects/random_number_generator/sys/sys/eventhandler.h projects/random_number_generator/sys/sys/eventvar.h projects/random_number_generator/sys/sys/jail.h projects/random_number_generator/sys/sys/mount.h projects/random_number_generator/sys/sys/param.h projects/random_number_generator/sys/sys/proc.h projects/random_number_generator/sys/sys/random.h projects/random_number_generator/sys/sys/resource.h projects/random_number_generator/sys/sys/resourcevar.h projects/random_number_generator/sys/sys/sdt.h projects/random_number_generator/sys/sys/sockio.h projects/random_number_generator/sys/sys/systm.h projects/random_number_generator/sys/ufs/ffs/ffs_extern.h projects/random_number_generator/sys/ufs/ffs/ffs_softdep.c projects/random_number_generator/sys/ufs/ffs/ffs_vfsops.c projects/random_number_generator/sys/ufs/ffs/ffs_vnops.c projects/random_number_generator/sys/ufs/ffs/softdep.h projects/random_number_generator/sys/ufs/ufs/dinode.h projects/random_number_generator/sys/ufs/ufs/ufs_extern.h projects/random_number_generator/sys/ufs/ufs/ufsmount.h projects/random_number_generator/sys/vm/vm_object.c projects/random_number_generator/sys/x86/cpufreq/hwpstate.c projects/random_number_generator/sys/x86/include/specialreg.h projects/random_number_generator/sys/x86/include/trap.h projects/random_number_generator/sys/x86/x86/busdma_machdep.c projects/random_number_generator/sys/x86/x86/io_apic.c projects/random_number_generator/sys/xen/xen-os.h projects/random_number_generator/tools/build/mk/OptionalObsoleteFiles.inc projects/random_number_generator/tools/build/options/WITHOUT_PKGBOOTSTRAP projects/random_number_generator/tools/make_libdeps.sh projects/random_number_generator/tools/regression/pjdfstest/Makefile projects/random_number_generator/tools/regression/pjdfstest/pjdfstest.c projects/random_number_generator/tools/tools/ath/athstats/Makefile projects/random_number_generator/tools/tools/netmap/nm_util.c projects/random_number_generator/tools/tools/netmap/pkt-gen.c projects/random_number_generator/tools/tools/syscall_timing/syscall_timing.c projects/random_number_generator/usr.bin/Makefile projects/random_number_generator/usr.bin/atf/Makefile projects/random_number_generator/usr.bin/atf/Makefile.inc projects/random_number_generator/usr.bin/atf/atf-sh/Makefile projects/random_number_generator/usr.bin/calendar/calendars/calendar.freebsd projects/random_number_generator/usr.bin/dtc/fdt.cc projects/random_number_generator/usr.bin/iscsictl/iscsictl.8 projects/random_number_generator/usr.bin/iscsictl/iscsictl.c projects/random_number_generator/usr.bin/limits/limits.1 projects/random_number_generator/usr.bin/limits/limits.c projects/random_number_generator/usr.bin/netstat/Makefile projects/random_number_generator/usr.bin/netstat/if.c projects/random_number_generator/usr.bin/netstat/main.c projects/random_number_generator/usr.bin/netstat/mbuf.c projects/random_number_generator/usr.bin/netstat/netstat.1 projects/random_number_generator/usr.bin/netstat/netstat.h projects/random_number_generator/usr.bin/netstat/route.c projects/random_number_generator/usr.bin/pathchk/pathchk.c projects/random_number_generator/usr.bin/procstat/procstat.1 projects/random_number_generator/usr.bin/procstat/procstat_rlimit.c projects/random_number_generator/usr.bin/rpcinfo/rpcinfo.c projects/random_number_generator/usr.bin/split/Makefile projects/random_number_generator/usr.bin/split/split.c projects/random_number_generator/usr.bin/systat/netcmds.c projects/random_number_generator/usr.bin/uname/uname.1 projects/random_number_generator/usr.bin/uname/uname.c projects/random_number_generator/usr.bin/xinstall/xinstall.c projects/random_number_generator/usr.sbin/Makefile projects/random_number_generator/usr.sbin/arp/arp.4 projects/random_number_generator/usr.sbin/bhyve/Makefile projects/random_number_generator/usr.sbin/bhyve/acpi.c projects/random_number_generator/usr.sbin/bhyve/acpi.h projects/random_number_generator/usr.sbin/bhyve/bhyverun.c projects/random_number_generator/usr.sbin/bhyve/bhyverun.h projects/random_number_generator/usr.sbin/bhyve/block_if.c projects/random_number_generator/usr.sbin/bhyve/inout.c projects/random_number_generator/usr.sbin/bhyve/inout.h projects/random_number_generator/usr.sbin/bhyve/ioapic.c projects/random_number_generator/usr.sbin/bhyve/mevent.c projects/random_number_generator/usr.sbin/bhyve/mptbl.c projects/random_number_generator/usr.sbin/bhyve/mptbl.h projects/random_number_generator/usr.sbin/bhyve/pci_ahci.c projects/random_number_generator/usr.sbin/bhyve/pci_emul.c projects/random_number_generator/usr.sbin/bhyve/pci_emul.h projects/random_number_generator/usr.sbin/bhyve/pci_hostbridge.c projects/random_number_generator/usr.sbin/bhyve/pci_uart.c projects/random_number_generator/usr.sbin/bhyve/pci_virtio_block.c projects/random_number_generator/usr.sbin/bhyve/pci_virtio_net.c projects/random_number_generator/usr.sbin/bhyve/rtc.c projects/random_number_generator/usr.sbin/bhyve/spinup_ap.c projects/random_number_generator/usr.sbin/bhyvectl/bhyvectl.c projects/random_number_generator/usr.sbin/bhyveload/bhyveload.8 projects/random_number_generator/usr.sbin/bhyveload/bhyveload.c projects/random_number_generator/usr.sbin/bootparamd/bootparamd/main.c projects/random_number_generator/usr.sbin/bootparamd/callbootd/callbootd.c projects/random_number_generator/usr.sbin/bsdconfig/bsdconfig projects/random_number_generator/usr.sbin/bsdconfig/include/messages.subr projects/random_number_generator/usr.sbin/bsdconfig/share/common.subr projects/random_number_generator/usr.sbin/bsdconfig/share/dialog.subr projects/random_number_generator/usr.sbin/bsdconfig/share/media/http.subr projects/random_number_generator/usr.sbin/bsdconfig/share/media/tcpip.subr projects/random_number_generator/usr.sbin/bsdconfig/share/packages/index.subr projects/random_number_generator/usr.sbin/bsdconfig/share/packages/packages.subr projects/random_number_generator/usr.sbin/bsdconfig/share/strings.subr projects/random_number_generator/usr.sbin/bsdconfig/startup/share/rcconf.subr projects/random_number_generator/usr.sbin/bsdinstall/bsdinstall projects/random_number_generator/usr.sbin/bsdinstall/bsdinstall.8 projects/random_number_generator/usr.sbin/bsdinstall/scripts/auto projects/random_number_generator/usr.sbin/bsdinstall/scripts/config projects/random_number_generator/usr.sbin/bsdinstall/scripts/docsinstall (contents, props changed) projects/random_number_generator/usr.sbin/bsdinstall/scripts/jail projects/random_number_generator/usr.sbin/bsdinstall/scripts/netconfig_ipv4 projects/random_number_generator/usr.sbin/bsdinstall/scripts/netconfig_ipv6 projects/random_number_generator/usr.sbin/bsdinstall/scripts/script projects/random_number_generator/usr.sbin/bsdinstall/scripts/wlanconfig projects/random_number_generator/usr.sbin/bsdinstall/scripts/zfsboot projects/random_number_generator/usr.sbin/crashinfo/crashinfo.sh projects/random_number_generator/usr.sbin/ctladm/ctladm.8 projects/random_number_generator/usr.sbin/ctladm/ctladm.c projects/random_number_generator/usr.sbin/edquota/edquota.c projects/random_number_generator/usr.sbin/freebsd-update/freebsd-update.sh projects/random_number_generator/usr.sbin/ifmcstat/ifmcstat.c projects/random_number_generator/usr.sbin/kldxref/kldxref.c projects/random_number_generator/usr.sbin/mfiutil/Makefile projects/random_number_generator/usr.sbin/mfiutil/mfiutil.8 projects/random_number_generator/usr.sbin/mfiutil/mfiutil.c projects/random_number_generator/usr.sbin/newsyslog/newsyslog.c projects/random_number_generator/usr.sbin/pkg/Makefile projects/random_number_generator/usr.sbin/pkg/config.c projects/random_number_generator/usr.sbin/pkg/config.h projects/random_number_generator/usr.sbin/pkg/dns_utils.c projects/random_number_generator/usr.sbin/pkg/dns_utils.h projects/random_number_generator/usr.sbin/pkg/pkg.c projects/random_number_generator/usr.sbin/portsnap/portsnap/portsnap.8 projects/random_number_generator/usr.sbin/portsnap/portsnap/portsnap.sh projects/random_number_generator/usr.sbin/ppp/mppe.c projects/random_number_generator/usr.sbin/route6d/route6d.c projects/random_number_generator/usr.sbin/sysrc/sysrc projects/random_number_generator/usr.sbin/sysrc/sysrc.8 projects/random_number_generator/usr.sbin/tcpdump/tcpdump/Makefile projects/random_number_generator/usr.sbin/utx/Makefile projects/random_number_generator/usr.sbin/utx/utx.8 projects/random_number_generator/usr.sbin/utx/utx.c projects/random_number_generator/usr.sbin/ypset/ypset.c Directory Properties: projects/random_number_generator/ (props changed) projects/random_number_generator/cddl/ (props changed) projects/random_number_generator/cddl/contrib/opensolaris/ (props changed) projects/random_number_generator/cddl/contrib/opensolaris/cmd/zfs/ (props changed) projects/random_number_generator/contrib/binutils/ (props changed) projects/random_number_generator/contrib/byacc/ (props changed) projects/random_number_generator/contrib/groff/ (props changed) projects/random_number_generator/contrib/ipfilter/ (props changed) projects/random_number_generator/contrib/libcxxrt/ (props changed) projects/random_number_generator/contrib/libpcap/ (props changed) projects/random_number_generator/contrib/llvm/ (props changed) projects/random_number_generator/contrib/llvm/tools/clang/ (props changed) projects/random_number_generator/contrib/mtree/ (props changed) projects/random_number_generator/contrib/subversion/ (props changed) projects/random_number_generator/contrib/tcpdump/ (props changed) projects/random_number_generator/contrib/tzdata/ (props changed) projects/random_number_generator/contrib/wpa/ (props changed) projects/random_number_generator/gnu/usr.bin/binutils/ (props changed) projects/random_number_generator/lib/libc/ (props changed) projects/random_number_generator/lib/libutil/ (props changed) projects/random_number_generator/lib/libvmmapi/ (props changed) projects/random_number_generator/lib/libz/ (props changed) projects/random_number_generator/sbin/ (props changed) projects/random_number_generator/share/man/man4/ (props changed) projects/random_number_generator/sys/ (props changed) projects/random_number_generator/sys/amd64/vmm/ (props changed) projects/random_number_generator/sys/boot/ (props changed) projects/random_number_generator/sys/cddl/contrib/opensolaris/ (props changed) projects/random_number_generator/sys/conf/ (props changed) projects/random_number_generator/sys/contrib/ipfilter/ (props changed) projects/random_number_generator/sys/dev/hyperv/ (props changed) projects/random_number_generator/sys/modules/vmm/ (props changed) projects/random_number_generator/usr.bin/calendar/ (props changed) projects/random_number_generator/usr.bin/procstat/ (props changed) projects/random_number_generator/usr.sbin/bhyve/ (props changed) projects/random_number_generator/usr.sbin/bhyvectl/ (props changed) projects/random_number_generator/usr.sbin/bhyveload/ (props changed) projects/random_number_generator/usr.sbin/bsdinstall/scripts/entropy (props changed) Modified: projects/random_number_generator/Makefile.inc1 ============================================================================== --- projects/random_number_generator/Makefile.inc1 Sat Nov 9 09:05:50 2013 (r257885) +++ projects/random_number_generator/Makefile.inc1 Sat Nov 9 10:35:29 2013 (r257886) @@ -58,6 +58,7 @@ # use that new version. And the new (dynamically-linked) /bin/sh # will expect to find appropriate libraries in /lib and /libexec. # +SRCDIR?= ${.CURDIR} .if defined(SUBDIR_OVERRIDE) SUBDIR= ${SUBDIR_OVERRIDE} .else @@ -84,6 +85,9 @@ SUBDIR+=secure SUBDIR+=share .endif SUBDIR+=sys usr.bin usr.sbin +.if ${MK_TESTS} != "no" +SUBDIR+= tests +.endif .if ${MK_OFED} != "no" SUBDIR+=contrib/ofed .endif @@ -128,8 +132,11 @@ OSRELDATE= 0 .endif .if !defined(VERSION) -VERSION!= uname -srp -VERSION+= ${OSRELDATE} +REVISION!= make -C ${SRCDIR}/release -V REVISION +BRANCH!= make -C ${SRCDIR}/release -V BRANCH +SRCRELDATE!= awk '/^\#define[[:space:]]*__FreeBSD_version/ { print $$3 }' \ + ${SRCDIR}/sys/sys/param.h +VERSION= FreeBSD ${REVISION}-${BRANCH} ${TARGET_ARCH} ${SRCRELDATE} .endif KNOWN_ARCHES?= amd64 arm armeb/arm armv6/arm i386 i386/pc98 ia64 mips mipsel/mips mips64el/mips mips64/mips mipsn32el/mips mipsn32/mips powerpc powerpc64/powerpc sparc64 @@ -256,6 +263,21 @@ XMAKE= TOOLS_PREFIX=${WORLDTMP} ${BMAKE TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH} \ -DWITHOUT_GDB +# kernel-tools stage +KTMAKEENV= INSTALL="sh ${.CURDIR}/tools/install.sh" \ + PATH=${BPATH}:${PATH} \ + WORLDTMP=${WORLDTMP} \ + VERSION="${VERSION}" \ + COMPILER_TYPE=${COMPILER_TYPE} +KTMAKE= TOOLS_PREFIX=${WORLDTMP} MAKEOBJDIRPREFIX=${WORLDTMP} \ + ${KTMAKEENV} ${MAKE} ${WORLD_FLAGS} -f Makefile.inc1 \ + DESTDIR= \ + BOOTSTRAPPING=${OSRELDATE} \ + SSP_CFLAGS= \ + -DWITHOUT_HTML -DWITHOUT_INFO -DNO_LINT -DWITHOUT_MAN \ + -DNO_PIC -DNO_PROFILE -DNO_SHARED \ + -DNO_CPU_CFLAGS -DNO_WARNS -DNO_CTF -DEARLY_BUILD + # world stage WMAKEENV= ${CROSSENV} \ _SHLIBDIRPREFIX=${WORLDTMP} \ @@ -485,6 +507,10 @@ _worldtmp: mtree -deU -f ${.CURDIR}/etc/mtree/BSD.debug.dist \ -p ${WORLDTMP}/usr/lib >/dev/null .endif +.if ${MK_TESTS} != "no" + mtree -deU -f ${.CURDIR}/etc/mtree/BSD.tests.dist \ + -p ${WORLDTMP}${TESTSBASE} >/dev/null +.endif .for _mtree in ${LOCAL_MTREE} mtree -deU -f ${.CURDIR}/${_mtree} -p ${WORLDTMP} > /dev/null .endfor @@ -529,6 +555,7 @@ _cross-tools: @echo ">>> stage 3: cross tools" @echo "--------------------------------------------------------------" ${_+_}cd ${.CURDIR}; ${XMAKE} cross-tools + ${_+_}cd ${.CURDIR}; ${XMAKE} kernel-tools _includes: @echo @echo "--------------------------------------------------------------" @@ -1008,20 +1035,7 @@ buildkernel: @echo "--------------------------------------------------------------" @echo ">>> stage 2.3: build tools" @echo "--------------------------------------------------------------" - cd ${KRNLOBJDIR}/${_kernel}; \ - PATH=${BPATH}:${PATH} \ - MAKESRCPATH=${KERNSRCDIR}/dev/aic7xxx/aicasm \ - ${MAKE} SSP_CFLAGS= -DNO_CPU_CFLAGS -DNO_CTF -DEARLY_BUILD \ - -f ${KERNSRCDIR}/dev/aic7xxx/aicasm/Makefile -# XXX - Gratuitously builds aicasm in the ``makeoptions NO_MODULES'' case. -.if !defined(MODULES_WITH_WORLD) && !defined(NO_MODULES) && exists(${KERNSRCDIR}/modules) -.for target in obj depend all - cd ${KERNSRCDIR}/modules/aic7xxx/aicasm; \ - PATH=${BPATH}:${PATH} \ - MAKEOBJDIRPREFIX=${KRNLOBJDIR}/${_kernel}/modules \ - ${MAKE} SSP_CFLAGS= -DNO_CPU_CFLAGS -DNO_CTF -DEARLY_BUILD ${target} -.endfor -.endif + ${_+_}cd ${.CURDIR}; ${KTMAKE} kernel-tools .if !defined(NO_KERNELDEPEND) @echo @echo "--------------------------------------------------------------" @@ -1308,10 +1322,6 @@ bootstrap-tools: .MAKE # # build-tools: Build special purpose build tools # -.if defined(MODULES_WITH_WORLD) && exists(${KERNSRCDIR}/modules) -_aicasm= sys/modules/aic7xxx/aicasm -.endif - .if !defined(NO_SHARE) _share= share/syscons/scrnmaps .endif @@ -1333,7 +1343,6 @@ build-tools: .MAKE lib/ncurses/ncurses \ lib/ncurses/ncursesw \ ${_share} \ - ${_aicasm} \ usr.bin/awk \ lib/libmagic \ usr.bin/mkesdb_static \ @@ -1354,6 +1363,23 @@ build-tools: .MAKE .endfor # +# kernel-tools: Build kernel-building tools +# +kernel-tools: .MAKE + mkdir -p ${MAKEOBJDIRPREFIX}/usr + mtree -deU -f ${.CURDIR}/etc/mtree/BSD.usr.dist \ + -p ${MAKEOBJDIRPREFIX}/usr >/dev/null +.for _tool in \ + sys/dev/aic7xxx/aicasm + ${_+_}@${ECHODIR} "===> ${_tool} (obj,depend,all,install)"; \ + cd ${.CURDIR}/${_tool} && \ + ${MAKE} DIRPRFX=${_tool}/ obj && \ + ${MAKE} DIRPRFX=${_tool}/ depend && \ + ${MAKE} DIRPRFX=${_tool}/ all && \ + ${MAKE} DIRPRFX=${_tool}/ DESTDIR=${MAKEOBJDIRPREFIX} install +.endfor + +# # cross-tools: Build cross-building tools # .if ${TARGET_ARCH} != ${MACHINE_ARCH} || ${BOOTSTRAPPING} < 800035 @@ -1377,12 +1403,15 @@ _binutils= gnu/usr.bin/binutils # If an full path to an external cross compiler is given, don't build # a cross compiler. .if ${XCC:M/*} == "" && ${MK_CROSS_COMPILER} != "no" -.if ${MK_CLANG} != "no" && (${MK_CLANG_IS_CC} != "no" || ${CC:T:Mclang} == "clang") +.if ${MK_CLANG_IS_CC} != "no" || ${CC:T:Mclang} == "clang" _clang= usr.bin/clang _clang_libs= lib/clang +.else +_cc= gnu/usr.bin/cc .endif -.if ${MK_GCC} != "no" && (${MK_CLANG_IS_CC} == "no" || ${TARGET} == "pc98") +# The boot2 for pc98 requires gcc. +.if ${TARGET} == "pc98" _cc= gnu/usr.bin/cc .endif .endif @@ -1464,7 +1493,7 @@ _prebuild_libs= ${_kerberos5_lib_libasn1 ${_kerberos5_lib_libhx509} ${_kerberos5_lib_libkrb5} \ ${_kerberos5_lib_libroken} \ ${_kerberos5_lib_libwind} \ - ${_lib_atf_libatf_c} \ + ${_lib_atf} \ lib/libbz2 ${_libcom_err} lib/libcrypt \ lib/libelf lib/libexpat \ ${_lib_libgssapi} ${_lib_libipx} \ @@ -1478,8 +1507,8 @@ _prebuild_libs= ${_kerberos5_lib_libasn1 ${_secure_lib_libcrypto} ${_lib_libldns} \ ${_secure_lib_libssh} ${_secure_lib_libssl} -.if ${MK_ATF} != "no" -_lib_atf_libatf_c= lib/atf/libatf-c +.if ${MK_TESTS} != "no" +_lib_atf= lib/atf .endif .if ${MK_LIBTHR} != "no" @@ -1588,10 +1617,12 @@ ${_lib}__PL: .PHONY .MAKE .if exists(${.CURDIR}/${_lib}) ${_+_}@${ECHODIR} "===> ${_lib} (obj,depend,all,install)"; \ cd ${.CURDIR}/${_lib} && \ - ${MAKE} DIRPRFX=${_lib}/ obj && \ - ${MAKE} DIRPRFX=${_lib}/ depend && \ - ${MAKE} -DNO_PROFILE -DNO_PIC DIRPRFX=${_lib}/ all && \ - ${MAKE} -DNO_PROFILE -DNO_PIC DIRPRFX=${_lib}/ install + ${MAKE} -DNO_TESTS DIRPRFX=${_lib}/ obj && \ + ${MAKE} -DNO_TESTS DIRPRFX=${_lib}/ depend && \ + ${MAKE} -DNO_TESTS -DNO_PROFILE -DNO_PIC \ + DIRPRFX=${_lib}/ all && \ + ${MAKE} -DNO_TESTS -DNO_PROFILE -DNO_PIC \ + DIRPRFX=${_lib}/ install .endif .endfor @@ -1600,10 +1631,10 @@ ${_lib}__L: .PHONY .MAKE .if exists(${.CURDIR}/${_lib}) ${_+_}@${ECHODIR} "===> ${_lib} (obj,depend,all,install)"; \ cd ${.CURDIR}/${_lib} && \ - ${MAKE} DIRPRFX=${_lib}/ obj && \ - ${MAKE} DIRPRFX=${_lib}/ depend && \ - ${MAKE} DIRPRFX=${_lib}/ all && \ - ${MAKE} DIRPRFX=${_lib}/ install + ${MAKE} -DNO_TESTS DIRPRFX=${_lib}/ obj && \ + ${MAKE} -DNO_TESTS DIRPRFX=${_lib}/ depend && \ + ${MAKE} -DNO_TESTS DIRPRFX=${_lib}/ all && \ + ${MAKE} -DNO_TESTS DIRPRFX=${_lib}/ install .endif .endfor @@ -1613,10 +1644,12 @@ ${_lib}__L: .PHONY .MAKE lib/libpam__L: .PHONY .MAKE ${_+_}@${ECHODIR} "===> lib/libpam (obj,depend,all,install)"; \ cd ${.CURDIR}/lib/libpam && \ - ${MAKE} DIRPRFX=lib/libpam/ obj && \ - ${MAKE} DIRPRFX=lib/libpam/ depend && \ - ${MAKE} DIRPRFX=lib/libpam/ -D_NO_LIBPAM_SO_YET all && \ - ${MAKE} DIRPRFX=lib/libpam/ -D_NO_LIBPAM_SO_YET install + ${MAKE} -DNO_TESTS DIRPRFX=lib/libpam/ obj && \ + ${MAKE} -DNO_TESTS DIRPRFX=lib/libpam/ depend && \ + ${MAKE} -DNO_TESTS DIRPRFX=lib/libpam/ \ + -D_NO_LIBPAM_SO_YET all && \ + ${MAKE} -DNO_TESTS DIRPRFX=lib/libpam/ \ + -D_NO_LIBPAM_SO_YET install _prereq_libs: ${_prereq_libs:S/$/__PL/} _startup_libs: ${_startup_libs:S/$/__L/} @@ -1672,6 +1705,7 @@ delete-old-files: # argument list will get too long. Using .for/.endfor make "loops" will make # the Makefile parser segfault. @exec 3<&0; \ + cd ${.CURDIR}; \ ${MAKE} -f ${.CURDIR}/Makefile.inc1 ${.MAKEFLAGS} ${.TARGET} \ -V OLD_FILES -V "OLD_FILES:Musr/share/*.gz:R" | xargs -n1 | \ while read file; do \ @@ -1694,7 +1728,8 @@ delete-old-files: check-old-files: @echo ">>> Checking for old files" - @${MAKE} -f ${.CURDIR}/Makefile.inc1 ${.MAKEFLAGS} ${.TARGET} \ + @cd ${.CURDIR}; \ + ${MAKE} -f ${.CURDIR}/Makefile.inc1 ${.MAKEFLAGS} ${.TARGET} \ -V OLD_FILES -V "OLD_FILES:Musr/share/*.gz:R" | xargs -n1 | \ while read file; do \ if [ -f "${DESTDIR}/$${file}" -o -L "${DESTDIR}/$${file}" ]; then \ @@ -1715,6 +1750,7 @@ delete-old-libs: @echo ">>> Removing old libraries" @echo "${OLD_LIBS_MESSAGE}" | fmt @exec 3<&0; \ + cd ${.CURDIR}; \ ${MAKE} -f ${.CURDIR}/Makefile.inc1 ${.MAKEFLAGS} ${.TARGET} \ -V OLD_LIBS | xargs -n1 | \ while read file; do \ @@ -1722,22 +1758,36 @@ delete-old-libs: chflags noschg "${DESTDIR}/$${file}" 2>/dev/null || true; \ rm ${RM_I} "${DESTDIR}/$${file}" <&3; \ fi; \ + for ext in debug symbols; do \ + if ! [ -e "${DESTDIR}/$${file}" ] && [ -f \ + "${DESTDIR}${DEBUGDIR}/$${file}.$${ext}" ]; then \ + rm ${RM_I} "${DESTDIR}${DEBUGDIR}/$${file}.$${ext}" \ + <&3; \ + fi; \ + done; \ done @echo ">>> Old libraries removed" check-old-libs: @echo ">>> Checking for old libraries" - @${MAKE} -f ${.CURDIR}/Makefile.inc1 ${.MAKEFLAGS} ${.TARGET} \ + @cd ${.CURDIR}; \ + ${MAKE} -f ${.CURDIR}/Makefile.inc1 ${.MAKEFLAGS} ${.TARGET} \ -V OLD_LIBS | xargs -n1 | \ while read file; do \ if [ -f "${DESTDIR}/$${file}" -o -L "${DESTDIR}/$${file}" ]; then \ echo "${DESTDIR}/$${file}"; \ fi; \ + for ext in debug symbols; do \ + if [ -f "${DESTDIR}${DEBUGDIR}/$${file}.$${ext}" ]; then \ + echo "${DESTDIR}${DEBUGDIR}/$${file}.$${ext}"; \ + fi; \ + done; \ done delete-old-dirs: @echo ">>> Removing old directories" - @${MAKE} -f ${.CURDIR}/Makefile.inc1 ${.MAKEFLAGS} ${.TARGET} \ + @cd ${.CURDIR}; \ + ${MAKE} -f ${.CURDIR}/Makefile.inc1 ${.MAKEFLAGS} ${.TARGET} \ -V OLD_DIRS | xargs -n1 | sort -r | \ while read dir; do \ if [ -d "${DESTDIR}/$${dir}" ]; then \ @@ -1750,7 +1800,8 @@ delete-old-dirs: check-old-dirs: @echo ">>> Checking for old directories" - @${MAKE} -f ${.CURDIR}/Makefile.inc1 ${.MAKEFLAGS} ${.TARGET} \ + @cd ${.CURDIR}; \ + ${MAKE} -f ${.CURDIR}/Makefile.inc1 ${.MAKEFLAGS} ${.TARGET} \ -V OLD_DIRS | xargs -n1 | \ while read dir; do \ if [ -d "${DESTDIR}/$${dir}" ]; then \ @@ -1830,7 +1881,7 @@ NOFUN=-DNO_FSCHG -DWITHOUT_HTML -DWITHOU CPUTYPE=${XDEV_CPUTYPE} XDDIR=${XDEV_ARCH}-freebsd -XDTP=/usr/${XDDIR} +XDTP=usr/${XDDIR} CDBENV=MAKEOBJDIRPREFIX=${MAKEOBJDIRPREFIX}/${XDDIR} \ INSTALL="sh ${.CURDIR}/tools/install.sh" CDENV= ${CDBENV} \ @@ -1843,8 +1894,8 @@ CD2ENV=${CDENV} CC="${CC} ${CD2CFLAGS}" CDTMP= ${MAKEOBJDIRPREFIX}/${XDDIR}/${.CURDIR}/tmp CDMAKE=${CDENV} PATH=${CDTMP}/usr/bin:${PATH} ${MAKE} ${NOFUN} -CD2MAKE=${CD2ENV} PATH=${CDTMP}/usr/bin:${XDTP}/usr/bin:${PATH} ${MAKE} ${NOFUN} -XDDESTDIR=${DESTDIR}${XDTP} +CD2MAKE=${CD2ENV} PATH=${CDTMP}/usr/bin:${XDDESTDIR}/usr/bin:${PATH} ${MAKE} ${NOFUN} +XDDESTDIR=${DESTDIR}/${XDTP} .if !defined(OSREL) OSREL!= uname -r | sed -e 's/[-(].*//' .endif @@ -1924,6 +1975,7 @@ _xi-libraries: _xi-links: ${_+_}cd ${XDDESTDIR}/usr/bin; \ + mkdir -p ../../../../usr/bin; \ for i in *; do \ ln -sf ../../${XDTP}/usr/bin/$$i \ ../../../../usr/bin/${XDDIR}-$$i; \ Modified: projects/random_number_generator/ObsoleteFiles.inc ============================================================================== --- projects/random_number_generator/ObsoleteFiles.inc Sat Nov 9 09:05:50 2013 (r257885) +++ projects/random_number_generator/ObsoleteFiles.inc Sat Nov 9 10:35:29 2013 (r257886) @@ -38,6 +38,60 @@ # xargs -n1 | sort | uniq -d; # done +# 20131109: extattr(2) mlinks fixed +OLD_FILES+=usr/share/man/man2/extattr_delete_list.2.gz +OLD_FILES+=usr/share/man/man2/extattr_get_list.2.gz +# 20131107: example files removed +OLD_FILES+=usr/share/examples/libusb20/aux.c +OLD_FILES+=usr/share/examples/libusb20/aux.h +# 20131103: WITH_LIBICONV_COMPAT removal +OLD_FILES+=usr/include/_libiconv_compat.h +OLD_FILES+=usr/lib/libiconv.a +OLD_FILES+=usr/lib/libiconv.so +OLD_FILES+=usr/lib/libiconv.so.3 +OLD_FILES+=usr/lib/libiconv_p.a +# 20131103: removal of utxrm(8), use 'utx rm' instead. +OLD_FILES+=usr/sbin/utxrm +OLD_FILES+=usr/share/man/man8/utxrm.8.gz +# 20131031: pkg_install has been removed +OLD_FILES+=etc/periodic/daily/220.backup-pkgdb +OLD_FILES+=etc/periodic/daily/490.status-pkg-changes +OLD_FILES+=etc/periodic/security/460.chkportsum +OLD_FILES+=etc/periodic/weekly/400.status-pkg +OLD_FILES+=usr/sbin/pkg_add +OLD_FILES+=usr/sbin/pkg_create +OLD_FILES+=usr/sbin/pkg_delete +OLD_FILES+=usr/sbin/pkg_info +OLD_FILES+=usr/sbin/pkg_updating +OLD_FILES+=usr/sbin/pkg_version +OLD_FILES+=usr/share/man/man1/pkg_add.1.gz +OLD_FILES+=usr/share/man/man1/pkg_create.1.gz +OLD_FILES+=usr/share/man/man1/pkg_delete.1.gz +OLD_FILES+=usr/share/man/man1/pkg_info.1.gz +OLD_FILES+=usr/share/man/man1/pkg_updating.1.gz +OLD_FILES+=usr/share/man/man1/pkg_version.1.gz +# 20131030: /etc/keys moved to /usr/share/keys +OLD_DIRS+=etc/keys +OLD_DIRS+=etc/keys/pkg +OLD_DIRS+=etc/keys/pkg/revoked +OLD_DIRS+=etc/keys/pkg/trusted +OLD_FILES+=etc/keys/pkg/trusted/pkg.freebsd.org.2013102301 +# 20131028: ng_fec(4) removed +OLD_FILES+=usr/include/netgraph/ng_fec.h +OLD_FILES+=usr/share/man/man4/ng_fec.4.gz +# 20131023: remove never used iscsi directory +OLD_DIRS+=usr/share/examples/iscsi +# 20131014: libbsdyml becomes private +OLD_FILES+=usr/lib/libbsdyml.a +OLD_FILES+=usr/lib/libbsdyml.so +OLD_LIBS+=usr/lib/libbsdyml.so.0 +OLD_FILES+=usr/lib/libbsdyml_p.a +OLD_FILES+=usr/lib32/libbsdyml.a +OLD_FILES+=usr/lib32/libbsdyml.so +OLD_LIBS+=usr/lib32/libbsdyml.so.0 +OLD_FILES+=usr/lib32/libbsdyml_p.a +OLD_FILES+=usr/share/man/man3/libbsdyml.3.gz +OLD_FILES+=usr/include/bsdyml.h # 20131013: Removal of the ATF tools OLD_FILES+=etc/atf/FreeBSD.conf OLD_FILES+=etc/atf/atf-run.hooks @@ -86,7 +140,7 @@ OLD_FILES+=usr/include/lwres/result.h OLD_FILES+=usr/include/lwres/version.h OLD_FILES+=usr/lib/liblwres.a OLD_FILES+=usr/lib/liblwres.so -OLD_LIBS+=usr/lib/liblwres.so.50 +OLD_LIBS+=usr/lib/liblwres.so.90 OLD_FILES+=usr/lib/liblwres_p.a OLD_FILES+=usr/sbin/arpaname OLD_FILES+=usr/sbin/ddns-confgen @@ -96,6 +150,7 @@ OLD_FILES+=usr/sbin/dnssec-keygen OLD_FILES+=usr/sbin/dnssec-revoke OLD_FILES+=usr/sbin/dnssec-settime OLD_FILES+=usr/sbin/dnssec-signzone +OLD_FILES+=usr/sbin/dnssec-verify OLD_FILES+=usr/sbin/genrandom OLD_FILES+=usr/sbin/isc-hmac-fixup OLD_FILES+=usr/sbin/lwresd @@ -259,6 +314,7 @@ OLD_FILES+=usr/share/man/man8/dnssec-key OLD_FILES+=usr/share/man/man8/dnssec-revoke.8.gz OLD_FILES+=usr/share/man/man8/dnssec-settime.8.gz OLD_FILES+=usr/share/man/man8/dnssec-signzone.8.gz +OLD_FILES+=usr/share/man/man8/dnssec-verify.8.gz OLD_FILES+=usr/share/man/man8/genrandom.8.gz OLD_FILES+=usr/share/man/man8/isc-hmac-fixup.8.gz OLD_FILES+=usr/share/man/man8/lwresd.8.gz @@ -293,6 +349,8 @@ OLD_DIRS+=var/named/var/run OLD_DIRS+=var/named/var/run/named OLD_DIRS+=var/named/var/stats OLD_DIRS+=var/run/named +# 20130923: example moved +OLD_FILES+=usr/share/examples/bsdconfig/browse_packages.sh # 20130908: libssh becomes private OLD_FILES+=usr/lib/libssh.a OLD_FILES+=usr/lib/libssh.so @@ -2476,6 +2534,7 @@ OLD_FILES+=usr/sbin/zfs OLD_FILES+=usr/sbin/zpool # 20070423: rc.bluetooth (examples) removed OLD_FILES+=usr/share/examples/netgraph/bluetooth/rc.bluetooth +OLD_DIRS+=usr/share/examples/netgraph/bluetooth # 20070421: worm.4 removed OLD_FILES+=usr/share/man/man4/worm.4.gz # 20070417: trunk(4) renamed to lagg(4) Modified: projects/random_number_generator/UPDATING ============================================================================== --- projects/random_number_generator/UPDATING Sat Nov 9 09:05:50 2013 (r257885) +++ projects/random_number_generator/UPDATING Sat Nov 9 10:35:29 2013 (r257886) @@ -31,6 +31,28 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 11 disable the most expensive debugging functionality run "ln -s 'abort:false,junk:false' /etc/malloc.conf".) +20131108: + The WITHOUT_ATF build knob has been removed and its functionality + has been subsumed into the more generic WITHOUT_TESTS. If you were + using the former to disable the build of the ATF libraries, you + should change your settings to use the latter. + +20131025: + The default version of mtree is nmtree which is obtained from + NetBSD. The output is generally the same, but may vary + slightly. If you found you need identical output adding + "-F freebsd9" to the command line should do the trick. For the + time being, the old mtree is available as fmtree. + +20131014: + libbsdyml has been renamed to libyaml and moved to /usr/lib/private. + This will break ports-mgmt/pkg. Rebuild the port, or upgrade to pkg + 1.1.4_8 and verify bsdyml not linked in, before running "make + delete-old-libs": + # make -C /usr/ports/ports-mgmt/pkg build deinstall install clean + or + # pkg install pkg; ldd /usr/local/sbin/pkg | grep bsdyml + 20131010: The rc.d/jail script has been updated to support jail(8) configuration file. The "jail__*" rc.conf(5) variables Modified: projects/random_number_generator/bin/df/df.1 ============================================================================== --- projects/random_number_generator/bin/df/df.1 Sat Nov 9 09:05:50 2013 (r257885) +++ projects/random_number_generator/bin/df/df.1 Sat Nov 9 10:35:29 2013 (r257886) @@ -198,7 +198,7 @@ If the value is outside, it will be set .Xr mount 8 , .Xr pstat 8 , .Xr quot 8 , -.Xr swapinfo 8 . +.Xr swapinfo 8 .Sh STANDARDS With the exception of most options, the Modified: projects/random_number_generator/bin/ps/print.c ============================================================================== --- projects/random_number_generator/bin/ps/print.c Sat Nov 9 09:05:50 2013 (r257885) +++ projects/random_number_generator/bin/ps/print.c Sat Nov 9 10:35:29 2013 (r257886) @@ -797,8 +797,6 @@ char * emulname(KINFO *k, VARENT *ve __unused) { - if (k->ki_p->ki_emul == NULL) - return (NULL); return (strdup(k->ki_p->ki_emul)); } @@ -827,7 +825,6 @@ out: char * loginclass(KINFO *k, VARENT *ve __unused) { - char *s; /* * Don't display login class for system processes; @@ -837,8 +834,5 @@ loginclass(KINFO *k, VARENT *ve __unused if (k->ki_p->ki_flag & P_SYSTEM) { return (strdup("-")); } - s = k->ki_p->ki_loginclass; - if (s == NULL) - return (NULL); - return (strdup(s)); + return (strdup(k->ki_p->ki_loginclass)); } Modified: projects/random_number_generator/bin/sh/jobs.c ============================================================================== --- projects/random_number_generator/bin/sh/jobs.c Sat Nov 9 09:05:50 2013 (r257885) +++ projects/random_number_generator/bin/sh/jobs.c Sat Nov 9 10:35:29 2013 (r257886) @@ -978,7 +978,6 @@ int waitforjob(struct job *jp, int *origstatus) { #if JOBS - pid_t mypgrp = getpgrp(); int propagate_int = jp->jobctl && jp->foreground; #endif int status; @@ -992,7 +991,7 @@ waitforjob(struct job *jp, int *origstat dotrap(); #if JOBS if (jp->jobctl) { - if (tcsetpgrp(ttyfd, mypgrp) < 0) + if (tcsetpgrp(ttyfd, rootpid) < 0) error("tcsetpgrp failed, errno=%d\n", errno); } if (jp->state == JOBSTOPPED) Modified: projects/random_number_generator/bin/sh/miscbltin.c ============================================================================== --- projects/random_number_generator/bin/sh/miscbltin.c Sat Nov 9 09:05:50 2013 (r257885) +++ projects/random_number_generator/bin/sh/miscbltin.c Sat Nov 9 10:35:29 2013 (r257886) @@ -405,6 +405,9 @@ static const struct limits limits[] = { #ifdef RLIMIT_NPTS { "pseudo-terminals", (char *)0, RLIMIT_NPTS, 1, 'p' }, #endif +#ifdef RLIMIT_KQUEUES + { "kqueues", (char *)0, RLIMIT_KQUEUES, 1, 'k' }, +#endif { (char *) 0, (char *)0, 0, 0, '\0' } }; @@ -421,7 +424,7 @@ ulimitcmd(int argc __unused, char **argv struct rlimit limit; what = 'f'; - while ((optc = nextopt("HSatfdsmcnuvlbpw")) != '\0') + while ((optc = nextopt("HSatfdsmcnuvlbpwk")) != '\0') switch (optc) { case 'H': how = HARD; Modified: projects/random_number_generator/bin/sh/nodetypes ============================================================================== --- projects/random_number_generator/bin/sh/nodetypes Sat Nov 9 09:05:50 2013 (r257885) +++ projects/random_number_generator/bin/sh/nodetypes Sat Nov 9 10:35:29 2013 (r257886) @@ -118,16 +118,16 @@ NFROMTO nfile # fd<> fname NAPPEND nfile # fd>> fname NCLOBBER nfile # fd>| fname type int - next nodeptr # next redirection in list fd int # file descriptor being redirected + next nodeptr # next redirection in list fname nodeptr # file name, in a NARG node expfname temp char *expfname # actual file name NTOFD ndup # fd<&dupfd NFROMFD ndup # fd>&dupfd type int - next nodeptr # next redirection in list fd int # file descriptor being redirected + next nodeptr # next redirection in list dupfd int # file descriptor to duplicate vname nodeptr # file name if fd>&$var @@ -135,8 +135,8 @@ NFROMFD ndup # fd>&dupfd NHERE nhere # fd<<\! NXHERE nhere # fd< Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id 7294A1B0; Sat, 9 Nov 2013 14:46:26 +0000 (UTC) (envelope-from andre@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 512C021D2; Sat, 9 Nov 2013 14:46:26 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rA9EkQgb009503; Sat, 9 Nov 2013 14:46:26 GMT (envelope-from andre@svn.freebsd.org) Received: (from andre@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id rA9EkOxN009491; Sat, 9 Nov 2013 14:46:24 GMT (envelope-from andre@svn.freebsd.org) Message-Id: <201311091446.rA9EkOxN009491@svn.freebsd.org> From: Andre Oppermann Date: Sat, 9 Nov 2013 14:46:24 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r257887 - in projects/ifq/sys: amd64/conf conf modules modules/ifq_bge modules/ifq_fxp modules/ifq_igb modules/ifq_ixgbe modules/ifq_re X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 09 Nov 2013 14:46:26 -0000 Author: andre Date: Sat Nov 9 14:46:24 2013 New Revision: 257887 URL: http://svnweb.freebsd.org/changeset/base/257887 Log: Hook the to be modified copies of bge(4), fxp(4), igb(4), ixgbe(4) and re(4) to the build under the ifq_ prefix. Provide a stripped IFQ kernel configuration with them replacing the stock drivers. Sponsored by: The FreeBSD Foundation Added: projects/ifq/sys/amd64/conf/IFQ projects/ifq/sys/modules/ifq_bge/ - copied from r257886, projects/ifq/sys/modules/bge/ projects/ifq/sys/modules/ifq_fxp/ - copied from r257886, projects/ifq/sys/modules/fxp/ projects/ifq/sys/modules/ifq_igb/ - copied from r257886, projects/ifq/sys/modules/igb/ projects/ifq/sys/modules/ifq_ixgbe/ - copied from r257886, projects/ifq/sys/modules/ixgbe/ projects/ifq/sys/modules/ifq_re/ - copied from r257886, projects/ifq/sys/modules/re/ Modified: projects/ifq/sys/conf/files projects/ifq/sys/modules/Makefile projects/ifq/sys/modules/ifq_bge/Makefile projects/ifq/sys/modules/ifq_fxp/Makefile projects/ifq/sys/modules/ifq_igb/Makefile projects/ifq/sys/modules/ifq_ixgbe/Makefile projects/ifq/sys/modules/ifq_re/Makefile Added: projects/ifq/sys/amd64/conf/IFQ ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/ifq/sys/amd64/conf/IFQ Sat Nov 9 14:46:24 2013 (r257887) @@ -0,0 +1,196 @@ +# +# $FreeBSD: projects/ifq/sys/amd64/conf/GENERIC 257251 2013-10-28 13:33:29Z kib $ + +cpu HAMMER +ident IFQ + +makeoptions DEBUG=-g # Build kernel with gdb(1) debug symbols +makeoptions WITH_CTF=1 # Run ctfconvert(1) for DTrace support + +options SCHED_ULE # ULE scheduler +options PREEMPTION # Enable kernel thread preemption +options INET # InterNETworking +options INET6 # IPv6 communications protocols +options SCTP # Stream Control Transmission Protocol +options FFS # Berkeley Fast Filesystem +options SOFTUPDATES # Enable FFS soft updates support +options UFS_DIRHASH # Improve performance on big directories +options QUOTA # Enable disk quotas for UFS +options CD9660 # ISO 9660 Filesystem +options PROCFS # Process filesystem (requires PSEUDOFS) +options PSEUDOFS # Pseudo-filesystem framework +options GEOM_PART_GPT # GUID Partition Tables. +options GEOM_RAID # Soft RAID functionality. +options GEOM_LABEL # Provides labelization +options COMPAT_FREEBSD32 # Compatible with i386 binaries +options COMPAT_FREEBSD4 # Compatible with FreeBSD4 +options COMPAT_FREEBSD5 # Compatible with FreeBSD5 +options COMPAT_FREEBSD6 # Compatible with FreeBSD6 +options COMPAT_FREEBSD7 # Compatible with FreeBSD7 +options SCSI_DELAY=5000 # Delay (in ms) before probing SCSI +options KTRACE # ktrace(1) support +options STACK # stack(9) support +options SYSVSHM # SYSV-style shared memory +options SYSVMSG # SYSV-style message queues +options SYSVSEM # SYSV-style semaphores +options _KPOSIX_PRIORITY_SCHEDULING # POSIX P1003_1B real-time extensions +options PRINTF_BUFR_SIZE=128 # Prevent printf output being interspersed. +options KBD_INSTALL_CDEV # install a CDEV entry in /dev +options HWPMC_HOOKS # Necessary kernel hooks for hwpmc(4) +options PROCDESC # Support for process descriptors +options KDTRACE_FRAME # Ensure frames are compiled in +options KDTRACE_HOOKS # Kernel DTrace hooks +options DDB_CTF # Kernel ELF linker loads CTF data +options INCLUDE_CONFIG_FILE # Include this file in kernel + +# Debugging support. Always need this: +options KDB # Enable kernel debugger support. +options KDB_TRACE # Print a stack trace for a panic. +# For full debugger support use (turn off in stable branch): +options DDB # Support DDB. +options GDB # Support remote GDB. +options DEADLKRES # Enable the deadlock resolver +options INVARIANTS # Enable calls of extra sanity checking +options INVARIANT_SUPPORT # Extra sanity checks of internal structures, required by INVARIANTS +options WITNESS # Enable checks to detect deadlocks and cycles +options WITNESS_SKIPSPIN # Don't run witness on spinlocks for speed +options MALLOC_DEBUG_MAXZONES=8 # Separate malloc(9) zones + +# Make an SMP-capable kernel by default +options SMP # Symmetric MultiProcessor Kernel + +# CPU frequency control +device cpufreq + +# Bus support. +device acpi +options ACPI_DMAR +device pci + +# ATA controllers +device ahci # AHCI-compatible SATA controllers +device ata # Legacy ATA/SATA controllers +options ATA_STATIC_ID # Static device numbering +device mvs # Marvell 88SX50XX/88SX60XX/88SX70XX/SoC SATA +device siis # SiliconImage SiI3124/SiI3132/SiI3531 SATA + +# SCSI Controllers +device mpt # LSI-Logic MPT-Fusion +device mps # LSI-Logic MPT-Fusion 2 + +# ATA/SCSI peripherals +device scbus # SCSI bus (required for ATA/SCSI) +device ch # SCSI media changers +device da # Direct Access (disks) +device sa # Sequential Access (tape etc) +device cd # CD +device pass # Passthrough device (direct ATA/SCSI access) +device ses # Enclosure Services (SES and SAF-TE) +#device ctl # CAM Target Layer + +# RAID controllers + +# atkbdc0 controls both the keyboard and the PS/2 mouse +device atkbdc # AT keyboard controller +device atkbd # AT keyboard +device psm # PS/2 mouse + +device kbdmux # keyboard multiplexer + +device vga # VGA video card driver +options VESA # Add support for VESA BIOS Extensions (VBE) + +device splash # Splash screen and screen saver support + +# syscons is the default console driver, resembling an SCO console +device sc +options SC_PIXEL_MODE # add support for the raster text mode + +device agp # support several AGP chipsets + +# Serial (COM) ports +device uart # Generic UART driver + +# Parallel port +device ppc +device ppbus # Parallel port bus (required) + +# PCI Ethernet NICs. +device ifq_igb # Intel PRO/1000 PCIE Server Gigabit Family +device ifq_ixgbe # Intel PRO/10GbE PCIE Ethernet Family + +# PCI Ethernet NICs that use the common MII bus controller code. +# NOTE: Be sure to keep the 'device miibus' line in order to use these NICs! +device miibus # MII bus support +device ifq_bge # Broadcom BCM570xx Gigabit Ethernet +device ifq_fxp # Intel EtherExpress PRO/100B (82557, 82558) +device ifq_re # RealTek 8139C+/8169/8169S/8110S + +# Wireless NIC cards +device wlan # 802.11 support +options IEEE80211_DEBUG # enable debug msgs +options IEEE80211_AMPDU_AGE # age frames in AMPDU reorder q's +options IEEE80211_SUPPORT_MESH # enable 802.11s draft support +device wlan_wep # 802.11 WEP support +device wlan_ccmp # 802.11 CCMP support +device wlan_tkip # 802.11 TKIP support +device wlan_amrr # AMRR transmit rate control algorithm +device ath # Atheros NICs +device ath_pci # Atheros pci/cardbus glue +device ath_hal # pci/cardbus chip support +options AH_SUPPORT_AR5416 # enable AR5416 tx/rx descriptors +options AH_AR5416_INTERRUPT_MITIGATION # AR5416 interrupt mitigation +options ATH_ENABLE_11N # Enable 802.11n support for AR5416 and later +device ath_rate_sample # SampleRate tx rate control for ath + +# Pseudo devices. +device loop # Network loopback +device random # Entropy device +device padlock_rng # VIA Padlock RNG +device rdrand_rng # Intel Bull Mountain RNG +device ether # Ethernet support +device vlan # 802.1Q VLAN support +device tun # Packet tunnel. +device md # Memory "disks" +device gif # IPv6 and IPv4 tunneling +device faith # IPv6-to-IPv4 relaying (translation) +device firmware # firmware assist module + +# The `bpf' device enables the Berkeley Packet Filter. +# Be aware of the administrative consequences of enabling this! +# Note that 'bpf' is required for DHCP. +device bpf # Berkeley packet filter + +# USB support +options USB_DEBUG # enable debug msgs +device uhci # UHCI PCI->USB interface +device ohci # OHCI PCI->USB interface +device ehci # EHCI PCI->USB interface (USB 2.0) +device xhci # XHCI PCI->USB interface (USB 3.0) +device usb # USB Bus (required) +device ukbd # Keyboard +device umass # Disks/Mass storage - Requires scbus and da + +# MMC/SD +device mmc # MMC/SD bus +device mmcsd # MMC/SD memory card +device sdhci # Generic PCI SD Host Controller + +# VirtIO support +device virtio # Generic VirtIO bus (required) +device virtio_pci # VirtIO PCI device +device vtnet # VirtIO Ethernet device +device virtio_blk # VirtIO Block device +device virtio_scsi # VirtIO SCSI device +device virtio_balloon # VirtIO Memory Balloon device + +# HyperV drivers +device hyperv # HyperV drivers + +# Xen HVM Guest Optimizations +# NOTE: XENHVM depends on xenpci. They must be added or removed together. +options XENHVM # Xen HVM kernel infrastructure +device xenpci # Xen HVM Hypervisor services driver + +# VMware support +device vmx # VMware VMXNET3 Ethernet Modified: projects/ifq/sys/conf/files ============================================================================== --- projects/ifq/sys/conf/files Sat Nov 9 10:35:29 2013 (r257886) +++ projects/ifq/sys/conf/files Sat Nov 9 14:46:24 2013 (r257887) @@ -1096,6 +1096,7 @@ dev/ath/ath_dfs/null/dfs_null.c optional dev/bce/if_bce.c optional bce dev/bfe/if_bfe.c optional bfe dev/bge/if_bge.c optional bge +dev/ifq_bge/if_bge.c optional ifq_bge dev/bktr/bktr_audio.c optional bktr pci dev/bktr/bktr_card.c optional bktr pci dev/bktr/bktr_core.c optional bktr pci @@ -1363,6 +1364,42 @@ dev/e1000/e1000_mbx.c optional em | igb compile-with "${NORMAL_C} -I$S/dev/e1000" dev/e1000/e1000_osdep.c optional em | igb \ compile-with "${NORMAL_C} -I$S/dev/e1000" +dev/ifq_e1000/if_igb.c optional ifq_igb \ + compile-with "${NORMAL_C} -I$S/dev/ifq_e1000" +dev/ifq_e1000/e1000_80003es2lan.c optional ifq_igb \ + compile-with "${NORMAL_C} -I$S/dev/ifq_e1000" +dev/ifq_e1000/e1000_82540.c optional ifq_igb \ + compile-with "${NORMAL_C} -I$S/dev/ifq_e1000" +dev/ifq_e1000/e1000_82541.c optional ifq_igb \ + compile-with "${NORMAL_C} -I$S/dev/ifq_e1000" +dev/ifq_e1000/e1000_82542.c optional ifq_igb \ + compile-with "${NORMAL_C} -I$S/dev/ifq_e1000" +dev/ifq_e1000/e1000_82543.c optional ifq_igb \ + compile-with "${NORMAL_C} -I$S/dev/ifq_e1000" +dev/ifq_e1000/e1000_82571.c optional ifq_igb \ + compile-with "${NORMAL_C} -I$S/dev/ifq_e1000" +dev/ifq_e1000/e1000_82575.c optional ifq_igb \ + compile-with "${NORMAL_C} -I$S/dev/ifq_e1000" +dev/ifq_e1000/e1000_ich8lan.c optional ifq_igb \ + compile-with "${NORMAL_C} -I$S/dev/ifq_e1000" +dev/ifq_e1000/e1000_i210.c optional ifq_igb \ + compile-with "${NORMAL_C} -I$S/dev/ifq_e1000" +dev/ifq_e1000/e1000_api.c optional ifq_igb \ + compile-with "${NORMAL_C} -I$S/dev/ifq_e1000" +dev/ifq_e1000/e1000_mac.c optional ifq_igb \ + compile-with "${NORMAL_C} -I$S/dev/ifq_e1000" +dev/ifq_e1000/e1000_manage.c optional ifq_igb \ + compile-with "${NORMAL_C} -I$S/dev/ifq_e1000" +dev/ifq_e1000/e1000_nvm.c optional ifq_igb \ + compile-with "${NORMAL_C} -I$S/dev/ifq_e1000" +dev/ifq_e1000/e1000_phy.c optional ifq_igb \ + compile-with "${NORMAL_C} -I$S/dev/ifq_e1000" +dev/ifq_e1000/e1000_vf.c optional ifq_igb \ + compile-with "${NORMAL_C} -I$S/dev/ifq_e1000" +dev/ifq_e1000/e1000_mbx.c optional ifq_igb \ + compile-with "${NORMAL_C} -I$S/dev/ifq_e1000" +dev/ifq_e1000/e1000_osdep.c optional ifq_igb \ + compile-with "${NORMAL_C} -I$S/dev/ifq_e1000" dev/et/if_et.c optional et dev/en/if_en_pci.c optional en pci dev/en/midway.c optional en @@ -1425,6 +1462,7 @@ dev/firewire/sbp_targ.c optional sbp_ta dev/flash/at45d.c optional at45d dev/flash/mx25l.c optional mx25l dev/fxp/if_fxp.c optional fxp +dev/ifq_fxp/if_fxp.c optional ifq_fxp dev/fxp/inphy.c optional fxp dev/gem/if_gem.c optional gem dev/gem/if_gem_pci.c optional gem pci @@ -1732,7 +1770,33 @@ dev/ixgbe/ixgbe_dcb.c optional ixgbe in dev/ixgbe/ixgbe_dcb_82598.c optional ixgbe inet \ compile-with "${NORMAL_C} -I$S/dev/ixgbe" dev/ixgbe/ixgbe_dcb_82599.c optional ixgbe inet \ - compile-with "${NORMAL_C} -I$S/dev/ixgbe" + compile-with "${NORMAL_C} -I$S/dev/ifq_ixgbe" +dev/ifq_ixgbe/ixgbe.c optional ifq_ixgbe inet \ + compile-with "${NORMAL_C} -I$S/dev/ifq_ixgbe -DSMP -DIXGBE_FDIR" +dev/ifq_ixgbe/ixv.c optional ifq_ixgbe inet \ + compile-with "${NORMAL_C} -I$S/dev/ifq_ixgbe" +dev/ifq_ixgbe/ixgbe_phy.c optional ifq_ixgbe inet \ + compile-with "${NORMAL_C} -I$S/dev/ifq_ixgbe" +dev/ifq_ixgbe/ixgbe_api.c optional ifq_ixgbe inet \ + compile-with "${NORMAL_C} -I$S/dev/ifq_ixgbe" +dev/ifq_ixgbe/ixgbe_common.c optional ifq_ixgbe inet \ + compile-with "${NORMAL_C} -I$S/dev/ifq_ixgbe" +dev/ifq_ixgbe/ixgbe_mbx.c optional ifq_ixgbe inet \ + compile-with "${NORMAL_C} -I$S/dev/ifq_ixgbe" +dev/ifq_ixgbe/ixgbe_vf.c optional ifq_ixgbe inet \ + compile-with "${NORMAL_C} -I$S/dev/ifq_ixgbe" +dev/ifq_ixgbe/ixgbe_82598.c optional ifq_ixgbe inet \ + compile-with "${NORMAL_C} -I$S/dev/ifq_ixgbe" +dev/ifq_ixgbe/ixgbe_82599.c optional ifq_ixgbe inet \ + compile-with "${NORMAL_C} -I$S/dev/ifq_ixgbe" +dev/ifq_ixgbe/ixgbe_x540.c optional ifq_ixgbe inet \ + compile-with "${NORMAL_C} -I$S/dev/ifq_ixgbe" +dev/ifq_ixgbe/ixgbe_dcb.c optional ifq_ixgbe inet \ + compile-with "${NORMAL_C} -I$S/dev/ifq_ixgbe" +dev/ifq_ixgbe/ixgbe_dcb_82598.c optional ifq_ixgbe inet \ + compile-with "${NORMAL_C} -I$S/dev/ifq_ixgbe" +dev/ifq_ixgbe/ixgbe_dcb_82599.c optional ifq_ixgbe inet \ + compile-with "${NORMAL_C} -I$S/dev/ifq_ixgbe" dev/jme/if_jme.c optional jme pci dev/joy/joy.c optional joy dev/joy/joy_isa.c optional joy isa @@ -2057,6 +2121,7 @@ dev/random/hash.c optional random dev/random/rwfile.c optional random dev/rc/rc.c optional rc dev/re/if_re.c optional re +dev/ifq_re/if_re.c optional ifq_re dev/rndtest/rndtest.c optional rndtest dev/rp/rp.c optional rp dev/rp/rp_isa.c optional rp isa Modified: projects/ifq/sys/modules/Makefile ============================================================================== --- projects/ifq/sys/modules/Makefile Sat Nov 9 10:35:29 2013 (r257886) +++ projects/ifq/sys/modules/Makefile Sat Nov 9 14:46:24 2013 (r257887) @@ -154,6 +154,11 @@ SUBDIR= \ ${_ipdivert} \ ${_ipfilter} \ ${_ipfw} \ + ifq_bge \ + ifq_fxp \ + ifq_igb \ + ifq_ixgbe \ + ifq_re \ ipfw_nat \ ${_ipmi} \ ip6_mroute_mod \ Modified: projects/ifq/sys/modules/ifq_bge/Makefile ============================================================================== --- projects/ifq/sys/modules/bge/Makefile Sat Nov 9 10:35:29 2013 (r257886) +++ projects/ifq/sys/modules/ifq_bge/Makefile Sat Nov 9 14:46:24 2013 (r257887) @@ -1,8 +1,8 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../dev/bge +.PATH: ${.CURDIR}/../../dev/ifq_bge -KMOD= if_bge +KMOD= ifq_bge SRCS= if_bge.c miibus_if.h miidevs.h device_if.h bus_if.h pci_if.h .if ${MACHINE_CPUARCH} == sparc64 Modified: projects/ifq/sys/modules/ifq_fxp/Makefile ============================================================================== --- projects/ifq/sys/modules/fxp/Makefile Sat Nov 9 10:35:29 2013 (r257886) +++ projects/ifq/sys/modules/ifq_fxp/Makefile Sat Nov 9 14:46:24 2013 (r257887) @@ -1,8 +1,8 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../dev/fxp +.PATH: ${.CURDIR}/../../dev/ifq_fxp -KMOD= if_fxp +KMOD= ifq_fxp SRCS= device_if.h bus_if.h if_fxp.c inphy.c miibus_if.h miidevs.h pci_if.h .include Modified: projects/ifq/sys/modules/ifq_igb/Makefile ============================================================================== --- projects/ifq/sys/modules/igb/Makefile Sat Nov 9 10:35:29 2013 (r257886) +++ projects/ifq/sys/modules/ifq_igb/Makefile Sat Nov 9 14:46:24 2013 (r257887) @@ -2,8 +2,8 @@ .include -.PATH: ${.CURDIR}/../../dev/e1000 -KMOD = if_igb +.PATH: ${.CURDIR}/../../dev/ifq_e1000 +KMOD = ifq_igb SRCS = device_if.h bus_if.h pci_if.h opt_inet.h opt_inet6.h SRCS += if_igb.c $(SHARED_SRCS) SHARED_SRCS = e1000_api.c e1000_phy.c e1000_nvm.c e1000_mac.c e1000_manage.c @@ -11,7 +11,7 @@ SHARED_SRCS += e1000_80003es2lan.c e1000 SHARED_SRCS += e1000_82540.c e1000_ich8lan.c e1000_82571.c e1000_osdep.c SHARED_SRCS += e1000_82575.c e1000_vf.c e1000_mbx.c e1000_i210.c -CFLAGS += -I${.CURDIR}/../../dev/e1000 -DSMP +CFLAGS += -I${.CURDIR}/../../dev/ifq_e1000 -DSMP # DEVICE_POLLING gives you non-interrupt handling # not advisable since MSIX gives better results Modified: projects/ifq/sys/modules/ifq_ixgbe/Makefile ============================================================================== --- projects/ifq/sys/modules/ixgbe/Makefile Sat Nov 9 10:35:29 2013 (r257886) +++ projects/ifq/sys/modules/ifq_ixgbe/Makefile Sat Nov 9 14:46:24 2013 (r257887) @@ -2,9 +2,9 @@ .include -.PATH: ${.CURDIR}/../../dev/ixgbe +.PATH: ${.CURDIR}/../../dev/ifq_ixgbe -KMOD = if_ixgbe +KMOD = ifq_ixgbe SRCS = device_if.h bus_if.h pci_if.h SRCS += opt_inet.h opt_inet6.h SRCS += ixgbe.c ixv.c @@ -12,7 +12,7 @@ SRCS += ixgbe.c ixv.c SRCS += ixgbe_common.c ixgbe_api.c ixgbe_phy.c ixgbe_mbx.c ixgbe_vf.c SRCS += ixgbe_dcb.c ixgbe_dcb_82598.c ixgbe_dcb_82599.c SRCS += ixgbe_82599.c ixgbe_82598.c ixgbe_x540.c -CFLAGS+= -I${.CURDIR}/../../dev/ixgbe -DSMP -DIXGBE_FDIR +CFLAGS+= -I${.CURDIR}/../../dev/ifq_ixgbe -DSMP -DIXGBE_FDIR .if !defined(KERNBUILDDIR) .if ${MK_INET_SUPPORT} != "no" Modified: projects/ifq/sys/modules/ifq_re/Makefile ============================================================================== --- projects/ifq/sys/modules/re/Makefile Sat Nov 9 10:35:29 2013 (r257886) +++ projects/ifq/sys/modules/ifq_re/Makefile Sat Nov 9 14:46:24 2013 (r257887) @@ -1,8 +1,8 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../dev/re +.PATH: ${.CURDIR}/../../dev/ifq_re -KMOD= if_re +KMOD= ifq_re SRCS= if_re.c device_if.h bus_if.h pci_if.h SRCS+= miibus_if.h From owner-svn-src-projects@FreeBSD.ORG Sat Nov 9 15:05:01 2013 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id 84949675; Sat, 9 Nov 2013 15:05:01 +0000 (UTC) (envelope-from andre@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 6F4E022D7; Sat, 9 Nov 2013 15:05:01 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rA9F51fG016092; Sat, 9 Nov 2013 15:05:01 GMT (envelope-from andre@svn.freebsd.org) Received: (from andre@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id rA9F4vw3016034; Sat, 9 Nov 2013 15:04:57 GMT (envelope-from andre@svn.freebsd.org) Message-Id: <201311091504.rA9F4vw3016034@svn.freebsd.org> From: Andre Oppermann Date: Sat, 9 Nov 2013 15:04:57 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r257889 - in projects/ifq: . cddl/contrib/opensolaris/common/ctf cddl/contrib/opensolaris/lib/libdtrace/common cddl/contrib/opensolaris/lib/libnvpair cddl/lib/libnvpair contrib/libreadl... X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 09 Nov 2013 15:05:01 -0000 Author: andre Date: Sat Nov 9 15:04:56 2013 New Revision: 257889 URL: http://svnweb.freebsd.org/changeset/base/257889 Log: IFC @257888. Sponsored by: The FreeBSD Foundation Added: projects/ifq/contrib/tzdata/leap-seconds.list - copied unchanged from r257888, head/contrib/tzdata/leap-seconds.list projects/ifq/lib/atf/libatf-c++/Makefile.inc - copied unchanged from r257888, head/lib/atf/libatf-c++/Makefile.inc projects/ifq/lib/atf/libatf-c++/tests/ - copied from r257888, head/lib/atf/libatf-c++/tests/ projects/ifq/lib/atf/libatf-c/Makefile.inc - copied unchanged from r257888, head/lib/atf/libatf-c/Makefile.inc projects/ifq/lib/atf/libatf-c/tests/ - copied from r257888, head/lib/atf/libatf-c/tests/ projects/ifq/lib/atf/tests/ - copied from r257888, head/lib/atf/tests/ projects/ifq/lib/tests/ - copied from r257888, head/lib/tests/ projects/ifq/libexec/atf/atf-check/Makefile.inc - copied unchanged from r257888, head/libexec/atf/atf-check/Makefile.inc projects/ifq/libexec/atf/atf-check/tests/ - copied from r257888, head/libexec/atf/atf-check/tests/ projects/ifq/libexec/atf/tests/ - copied from r257888, head/libexec/atf/tests/ projects/ifq/libexec/tests/ - copied from r257888, head/libexec/tests/ projects/ifq/share/examples/libusb20/util.c - copied unchanged from r257888, head/share/examples/libusb20/util.c projects/ifq/share/examples/libusb20/util.h - copied unchanged from r257888, head/share/examples/libusb20/util.h projects/ifq/sys/arm/arm/bus_space-v6.c - copied unchanged from r257888, head/sys/arm/arm/bus_space-v6.c projects/ifq/sys/arm/arm/devmap.c - copied unchanged from r257888, head/sys/arm/arm/devmap.c projects/ifq/sys/arm/include/devmap.h - copied unchanged from r257888, head/sys/arm/include/devmap.h projects/ifq/usr.bin/atf/atf-sh/tests/ - copied from r257888, head/usr.bin/atf/atf-sh/tests/ projects/ifq/usr.bin/atf/tests/ - copied from r257888, head/usr.bin/atf/tests/ projects/ifq/usr.bin/tests/ - copied from r257888, head/usr.bin/tests/ projects/ifq/usr.sbin/mfiutil/mfi_properties.c - copied unchanged from r257888, head/usr.sbin/mfiutil/mfi_properties.c Deleted: projects/ifq/etc/namedb/ projects/ifq/etc/periodic/daily/470.status-named projects/ifq/etc/rc.d/named projects/ifq/release/doc/fr_FR.ISO8859-1/installation/common/abstract.xml projects/ifq/release/doc/ru_RU.KOI8-R/installation/common/abstract.xml projects/ifq/release/generate-release.sh projects/ifq/share/examples/libusb20/aux.c projects/ifq/share/examples/libusb20/aux.h projects/ifq/sys/amd64/vmm/io/vdev.c projects/ifq/sys/amd64/vmm/io/vdev.h projects/ifq/sys/arm/allwinner/bus_space.c projects/ifq/sys/arm/broadcom/bcm2835/bus_space.c projects/ifq/sys/arm/freescale/imx/bus_space.c projects/ifq/sys/arm/rockchip/bus_space.c projects/ifq/sys/arm/ti/bus_space.c Modified: projects/ifq/Makefile.inc1 projects/ifq/ObsoleteFiles.inc projects/ifq/UPDATING projects/ifq/cddl/contrib/opensolaris/common/ctf/ctf_create.c projects/ifq/cddl/contrib/opensolaris/lib/libdtrace/common/dt_link.c projects/ifq/cddl/contrib/opensolaris/lib/libnvpair/libnvpair.c projects/ifq/cddl/lib/libnvpair/Makefile projects/ifq/contrib/libreadline/search.c projects/ifq/contrib/smbfs/lib/smb/nls.c projects/ifq/contrib/telnet/telnetd/sys_term.c projects/ifq/contrib/tzdata/africa projects/ifq/contrib/tzdata/antarctica projects/ifq/contrib/tzdata/asia projects/ifq/contrib/tzdata/australasia projects/ifq/contrib/tzdata/backward projects/ifq/contrib/tzdata/etcetera projects/ifq/contrib/tzdata/europe projects/ifq/contrib/tzdata/northamerica projects/ifq/contrib/tzdata/southamerica projects/ifq/contrib/tzdata/zone.tab projects/ifq/etc/defaults/periodic.conf projects/ifq/etc/defaults/rc.conf projects/ifq/etc/freebsd-update.conf projects/ifq/etc/mtree/BSD.tests.dist projects/ifq/etc/network.subr projects/ifq/etc/pkg/FreeBSD.conf projects/ifq/etc/rc.d/Makefile projects/ifq/etc/rc.d/ntpdate projects/ifq/etc/rc.d/rpcbind projects/ifq/etc/rc.d/syslogd projects/ifq/lib/Makefile projects/ifq/lib/atf/Makefile projects/ifq/lib/atf/Makefile.inc projects/ifq/lib/atf/libatf-c++/Makefile projects/ifq/lib/atf/libatf-c/Makefile projects/ifq/lib/libc/iconv/citrus_csmapper.h projects/ifq/lib/libc/string/strlcpy.3 projects/ifq/lib/libc/sys/Makefile.inc projects/ifq/lib/libproc/proc_bkpt.c projects/ifq/lib/msun/Makefile projects/ifq/lib/msun/src/s_round.c projects/ifq/lib/msun/src/s_roundf.c projects/ifq/lib/msun/src/s_roundl.c projects/ifq/libexec/Makefile projects/ifq/libexec/atf/Makefile projects/ifq/libexec/atf/Makefile.inc projects/ifq/libexec/atf/atf-check/Makefile projects/ifq/libexec/rbootd/bpf.c projects/ifq/libexec/rtld-elf/rtld.c projects/ifq/release/Makefile projects/ifq/release/doc/de_DE.ISO8859-1/early-adopter/article.xml projects/ifq/release/doc/de_DE.ISO8859-1/errata/article.xml projects/ifq/release/doc/de_DE.ISO8859-1/hardware/alpha/article.xml projects/ifq/release/doc/de_DE.ISO8859-1/hardware/alpha/proc-alpha.xml projects/ifq/release/doc/de_DE.ISO8859-1/hardware/common/artheader.xml projects/ifq/release/doc/de_DE.ISO8859-1/hardware/common/dev.xml projects/ifq/release/doc/de_DE.ISO8859-1/hardware/common/intro.xml projects/ifq/release/doc/de_DE.ISO8859-1/hardware/i386/article.xml projects/ifq/release/doc/de_DE.ISO8859-1/hardware/i386/proc-i386.xml projects/ifq/release/doc/de_DE.ISO8859-1/hardware/ia64/article.xml projects/ifq/release/doc/de_DE.ISO8859-1/hardware/ia64/proc-ia64.xml projects/ifq/release/doc/de_DE.ISO8859-1/hardware/pc98/article.xml projects/ifq/release/doc/de_DE.ISO8859-1/hardware/pc98/proc-pc98.xml projects/ifq/release/doc/de_DE.ISO8859-1/hardware/sparc64/article.xml projects/ifq/release/doc/de_DE.ISO8859-1/hardware/sparc64/dev-sparc64.xml projects/ifq/release/doc/de_DE.ISO8859-1/hardware/sparc64/proc-sparc64.xml projects/ifq/release/doc/de_DE.ISO8859-1/installation/alpha/Makefile projects/ifq/release/doc/de_DE.ISO8859-1/installation/alpha/article.xml projects/ifq/release/doc/de_DE.ISO8859-1/installation/common/abstract.xml projects/ifq/release/doc/de_DE.ISO8859-1/installation/common/artheader.xml projects/ifq/release/doc/de_DE.ISO8859-1/installation/common/install.ent projects/ifq/release/doc/de_DE.ISO8859-1/installation/common/install.xml projects/ifq/release/doc/de_DE.ISO8859-1/installation/common/layout.xml projects/ifq/release/doc/de_DE.ISO8859-1/installation/common/trouble.xml projects/ifq/release/doc/de_DE.ISO8859-1/installation/common/upgrade.xml projects/ifq/release/doc/de_DE.ISO8859-1/installation/i386/Makefile projects/ifq/release/doc/de_DE.ISO8859-1/installation/i386/article.xml projects/ifq/release/doc/de_DE.ISO8859-1/installation/ia64/Makefile projects/ifq/release/doc/de_DE.ISO8859-1/installation/ia64/article.xml projects/ifq/release/doc/de_DE.ISO8859-1/installation/pc98/Makefile projects/ifq/release/doc/de_DE.ISO8859-1/installation/pc98/article.xml projects/ifq/release/doc/de_DE.ISO8859-1/installation/sparc64/article.xml projects/ifq/release/doc/de_DE.ISO8859-1/installation/sparc64/install.xml projects/ifq/release/doc/de_DE.ISO8859-1/readme/article.xml projects/ifq/release/doc/de_DE.ISO8859-1/relnotes/alpha/article.xml projects/ifq/release/doc/de_DE.ISO8859-1/relnotes/common/new.xml projects/ifq/release/doc/de_DE.ISO8859-1/relnotes/i386/article.xml projects/ifq/release/doc/de_DE.ISO8859-1/relnotes/ia64/article.xml projects/ifq/release/doc/de_DE.ISO8859-1/relnotes/pc98/article.xml projects/ifq/release/doc/de_DE.ISO8859-1/relnotes/sparc64/article.xml projects/ifq/release/doc/en_US.ISO8859-1/errata/article.xml projects/ifq/release/doc/en_US.ISO8859-1/hardware/article.xml projects/ifq/release/doc/en_US.ISO8859-1/readme/article.xml projects/ifq/release/doc/en_US.ISO8859-1/relnotes/article.xml projects/ifq/release/doc/fr_FR.ISO8859-1/early-adopter/article.xml projects/ifq/release/doc/fr_FR.ISO8859-1/errata/article.xml projects/ifq/release/doc/fr_FR.ISO8859-1/hardware/alpha/article.xml projects/ifq/release/doc/fr_FR.ISO8859-1/hardware/alpha/proc-alpha.xml projects/ifq/release/doc/fr_FR.ISO8859-1/hardware/common/artheader.xml projects/ifq/release/doc/fr_FR.ISO8859-1/hardware/common/dev.xml projects/ifq/release/doc/fr_FR.ISO8859-1/hardware/common/intro.xml projects/ifq/release/doc/fr_FR.ISO8859-1/hardware/i386/article.xml projects/ifq/release/doc/fr_FR.ISO8859-1/hardware/i386/proc-i386.xml projects/ifq/release/doc/fr_FR.ISO8859-1/hardware/ia64/article.xml projects/ifq/release/doc/fr_FR.ISO8859-1/hardware/ia64/proc-ia64.xml projects/ifq/release/doc/fr_FR.ISO8859-1/hardware/pc98/article.xml projects/ifq/release/doc/fr_FR.ISO8859-1/hardware/pc98/proc-pc98.xml projects/ifq/release/doc/fr_FR.ISO8859-1/hardware/sparc64/article.xml projects/ifq/release/doc/fr_FR.ISO8859-1/hardware/sparc64/dev-sparc64.xml projects/ifq/release/doc/fr_FR.ISO8859-1/hardware/sparc64/proc-sparc64.xml projects/ifq/release/doc/fr_FR.ISO8859-1/installation/alpha/Makefile projects/ifq/release/doc/fr_FR.ISO8859-1/installation/alpha/article.xml projects/ifq/release/doc/fr_FR.ISO8859-1/installation/common/artheader.xml projects/ifq/release/doc/fr_FR.ISO8859-1/installation/common/install.ent projects/ifq/release/doc/fr_FR.ISO8859-1/installation/common/install.xml projects/ifq/release/doc/fr_FR.ISO8859-1/installation/common/layout.xml projects/ifq/release/doc/fr_FR.ISO8859-1/installation/common/trouble.xml projects/ifq/release/doc/fr_FR.ISO8859-1/installation/common/upgrade.xml projects/ifq/release/doc/fr_FR.ISO8859-1/installation/i386/Makefile projects/ifq/release/doc/fr_FR.ISO8859-1/installation/i386/article.xml projects/ifq/release/doc/fr_FR.ISO8859-1/installation/pc98/Makefile projects/ifq/release/doc/fr_FR.ISO8859-1/installation/pc98/article.xml projects/ifq/release/doc/fr_FR.ISO8859-1/installation/sparc64/article.xml projects/ifq/release/doc/fr_FR.ISO8859-1/installation/sparc64/install.xml projects/ifq/release/doc/fr_FR.ISO8859-1/relnotes/alpha/article.xml projects/ifq/release/doc/fr_FR.ISO8859-1/relnotes/common/new.xml projects/ifq/release/doc/fr_FR.ISO8859-1/relnotes/i386/article.xml projects/ifq/release/doc/ja_JP.eucJP/errata/article.xml projects/ifq/release/doc/ja_JP.eucJP/hardware/alpha/article.xml projects/ifq/release/doc/ja_JP.eucJP/hardware/amd64/article.xml projects/ifq/release/doc/ja_JP.eucJP/hardware/amd64/proc-amd64.xml projects/ifq/release/doc/ja_JP.eucJP/hardware/common/artheader.xml projects/ifq/release/doc/ja_JP.eucJP/hardware/common/dev.xml projects/ifq/release/doc/ja_JP.eucJP/hardware/common/intro.xml projects/ifq/release/doc/ja_JP.eucJP/hardware/i386/article.xml projects/ifq/release/doc/ja_JP.eucJP/hardware/i386/proc-i386.xml projects/ifq/release/doc/ja_JP.eucJP/hardware/ia64/article.xml projects/ifq/release/doc/ja_JP.eucJP/hardware/ia64/proc-ia64.xml projects/ifq/release/doc/ja_JP.eucJP/hardware/pc98/article.xml projects/ifq/release/doc/ja_JP.eucJP/hardware/pc98/proc-pc98.xml projects/ifq/release/doc/ja_JP.eucJP/hardware/sparc64/article.xml projects/ifq/release/doc/ja_JP.eucJP/hardware/sparc64/proc-sparc64.xml projects/ifq/release/doc/ja_JP.eucJP/relnotes/alpha/article.xml projects/ifq/release/doc/ja_JP.eucJP/relnotes/amd64/article.xml projects/ifq/release/doc/ja_JP.eucJP/relnotes/common/new.xml projects/ifq/release/doc/ja_JP.eucJP/relnotes/i386/article.xml projects/ifq/release/doc/ja_JP.eucJP/relnotes/ia64/article.xml projects/ifq/release/doc/ja_JP.eucJP/relnotes/pc98/article.xml projects/ifq/release/doc/ja_JP.eucJP/relnotes/sparc64/article.xml projects/ifq/release/doc/ja_JP.eucJP/share/xml/catalog.xml projects/ifq/release/doc/ru_RU.KOI8-R/errata/article.xml projects/ifq/release/doc/ru_RU.KOI8-R/hardware/alpha/article.xml projects/ifq/release/doc/ru_RU.KOI8-R/hardware/amd64/article.xml projects/ifq/release/doc/ru_RU.KOI8-R/hardware/amd64/proc-amd64.xml projects/ifq/release/doc/ru_RU.KOI8-R/hardware/common/artheader.xml projects/ifq/release/doc/ru_RU.KOI8-R/hardware/common/dev.xml projects/ifq/release/doc/ru_RU.KOI8-R/hardware/common/intro.xml projects/ifq/release/doc/ru_RU.KOI8-R/hardware/i386/article.xml projects/ifq/release/doc/ru_RU.KOI8-R/hardware/i386/proc-i386.xml projects/ifq/release/doc/ru_RU.KOI8-R/hardware/ia64/article.xml projects/ifq/release/doc/ru_RU.KOI8-R/hardware/ia64/proc-ia64.xml projects/ifq/release/doc/ru_RU.KOI8-R/hardware/pc98/article.xml projects/ifq/release/doc/ru_RU.KOI8-R/hardware/pc98/proc-pc98.xml projects/ifq/release/doc/ru_RU.KOI8-R/hardware/sparc64/article.xml projects/ifq/release/doc/ru_RU.KOI8-R/hardware/sparc64/proc-sparc64.xml projects/ifq/release/doc/ru_RU.KOI8-R/installation/alpha/Makefile projects/ifq/release/doc/ru_RU.KOI8-R/installation/alpha/article.xml projects/ifq/release/doc/ru_RU.KOI8-R/installation/amd64/Makefile projects/ifq/release/doc/ru_RU.KOI8-R/installation/amd64/article.xml projects/ifq/release/doc/ru_RU.KOI8-R/installation/common/artheader.xml projects/ifq/release/doc/ru_RU.KOI8-R/installation/common/install.ent projects/ifq/release/doc/ru_RU.KOI8-R/installation/common/install.xml projects/ifq/release/doc/ru_RU.KOI8-R/installation/common/layout.xml projects/ifq/release/doc/ru_RU.KOI8-R/installation/common/trouble.xml projects/ifq/release/doc/ru_RU.KOI8-R/installation/common/upgrade.xml projects/ifq/release/doc/ru_RU.KOI8-R/installation/i386/Makefile projects/ifq/release/doc/ru_RU.KOI8-R/installation/i386/article.xml projects/ifq/release/doc/ru_RU.KOI8-R/installation/ia64/Makefile projects/ifq/release/doc/ru_RU.KOI8-R/installation/ia64/article.xml projects/ifq/release/doc/ru_RU.KOI8-R/installation/pc98/Makefile projects/ifq/release/doc/ru_RU.KOI8-R/installation/pc98/article.xml projects/ifq/release/doc/ru_RU.KOI8-R/installation/sparc64/Makefile projects/ifq/release/doc/ru_RU.KOI8-R/installation/sparc64/article.xml projects/ifq/release/doc/ru_RU.KOI8-R/readme/article.xml projects/ifq/release/doc/ru_RU.KOI8-R/relnotes/alpha/article.xml projects/ifq/release/doc/ru_RU.KOI8-R/relnotes/amd64/article.xml projects/ifq/release/doc/ru_RU.KOI8-R/relnotes/common/new.xml projects/ifq/release/doc/ru_RU.KOI8-R/relnotes/i386/article.xml projects/ifq/release/doc/ru_RU.KOI8-R/relnotes/ia64/article.xml projects/ifq/release/doc/ru_RU.KOI8-R/relnotes/pc98/article.xml projects/ifq/release/doc/ru_RU.KOI8-R/relnotes/sparc64/article.xml projects/ifq/release/doc/ru_RU.KOI8-R/share/xml/catalog.xml projects/ifq/release/doc/share/misc/man2hwnotes.pl projects/ifq/release/doc/share/xml/catalog.xml projects/ifq/release/doc/zh_CN.GB2312/errata/article.xml projects/ifq/release/doc/zh_CN.GB2312/hardware/article.xml projects/ifq/release/doc/zh_CN.GB2312/readme/article.xml projects/ifq/release/doc/zh_CN.GB2312/relnotes/article.xml projects/ifq/release/picobsd/build/picobsd projects/ifq/release/release.sh projects/ifq/sbin/devd/devd.cc projects/ifq/sbin/ifconfig/ifconfig.c projects/ifq/share/doc/Makefile projects/ifq/share/examples/Makefile projects/ifq/share/examples/libusb20/Makefile projects/ifq/share/examples/libusb20/bulk.c projects/ifq/share/examples/libusb20/control.c projects/ifq/share/i18n/csmapper/JIS/JISX0201-KANA%UCS.src projects/ifq/share/i18n/csmapper/JIS/JISX0208@1990%UCS.src projects/ifq/share/i18n/csmapper/JIS/UCS%JISX0201-KANA.src projects/ifq/share/i18n/csmapper/JIS/UCS%JISX0208@1990.src projects/ifq/share/i18n/csmapper/JIS/charset.pivot.JIS.src projects/ifq/share/i18n/csmapper/JIS/mapper.dir.JIS.src projects/ifq/share/i18n/esdb/EUC/EUC-JP.src projects/ifq/share/man/man1/Makefile projects/ifq/share/man/man3/tree.3 projects/ifq/share/man/man4/Makefile projects/ifq/share/man/man4/altera_atse.4 projects/ifq/share/man/man4/ddb.4 projects/ifq/share/man/man4/natm.4 projects/ifq/share/man/man4/netmap.4 projects/ifq/share/man/man4/rights.4 projects/ifq/share/man/man4/tcp.4 projects/ifq/share/man/man7/release.7 projects/ifq/share/man/man9/ifnet.9 projects/ifq/share/mk/Makefile projects/ifq/share/mk/bsd.own.mk projects/ifq/share/mk/bsd.prog.mk projects/ifq/sys/amd64/amd64/identcpu.c projects/ifq/sys/amd64/include/vmparam.h projects/ifq/sys/amd64/vmm/io/vlapic.c projects/ifq/sys/amd64/vmm/io/vlapic.h projects/ifq/sys/amd64/vmm/vmm_lapic.c projects/ifq/sys/arm/allwinner/a10_machdep.c projects/ifq/sys/arm/allwinner/a20/files.a20 projects/ifq/sys/arm/allwinner/files.a10 projects/ifq/sys/arm/arm/bus_space_generic.c projects/ifq/sys/arm/arm/machdep.c projects/ifq/sys/arm/arm/nexus.c projects/ifq/sys/arm/arm/pmap-v6.c projects/ifq/sys/arm/arm/pmap.c projects/ifq/sys/arm/at91/at91.c projects/ifq/sys/arm/at91/at91_machdep.c projects/ifq/sys/arm/broadcom/bcm2835/bcm2835_fb.c projects/ifq/sys/arm/broadcom/bcm2835/bcm2835_machdep.c projects/ifq/sys/arm/broadcom/bcm2835/files.bcm2835 projects/ifq/sys/arm/econa/econa_machdep.c projects/ifq/sys/arm/freescale/imx/files.imx51 projects/ifq/sys/arm/freescale/imx/files.imx53 projects/ifq/sys/arm/freescale/imx/files.imx6 projects/ifq/sys/arm/freescale/imx/imx51_machdep.c projects/ifq/sys/arm/freescale/imx/imx53_machdep.c projects/ifq/sys/arm/freescale/imx/imx6_machdep.c projects/ifq/sys/arm/freescale/imx/imx_machdep.c projects/ifq/sys/arm/freescale/imx/tzic.c projects/ifq/sys/arm/include/fdt.h projects/ifq/sys/arm/include/machdep.h projects/ifq/sys/arm/include/pmap.h projects/ifq/sys/arm/include/vmparam.h projects/ifq/sys/arm/lpc/lpc_machdep.c projects/ifq/sys/arm/mv/mv_localbus.c projects/ifq/sys/arm/mv/mv_machdep.c projects/ifq/sys/arm/mv/mv_pci.c projects/ifq/sys/arm/mv/mvvar.h projects/ifq/sys/arm/rockchip/files.rk30xx projects/ifq/sys/arm/rockchip/rk30xx_machdep.c projects/ifq/sys/arm/s3c2xx0/files.s3c2xx0 projects/ifq/sys/arm/s3c2xx0/s3c24x0_machdep.c projects/ifq/sys/arm/s3c2xx0/s3c2xx0_space.c projects/ifq/sys/arm/sa11x0/assabet_machdep.c projects/ifq/sys/arm/samsung/exynos/exynos5_machdep.c projects/ifq/sys/arm/tegra/tegra2_machdep.c projects/ifq/sys/arm/ti/files.ti projects/ifq/sys/arm/ti/ti_machdep.c projects/ifq/sys/arm/versatile/versatile_machdep.c projects/ifq/sys/arm/xilinx/zy7_machdep.c projects/ifq/sys/arm/xscale/i80321/ep80219_machdep.c projects/ifq/sys/arm/xscale/i80321/iq31244_machdep.c projects/ifq/sys/arm/xscale/i8134x/crb_machdep.c projects/ifq/sys/arm/xscale/ixp425/avila_machdep.c projects/ifq/sys/arm/xscale/pxa/pxa_machdep.c projects/ifq/sys/boot/forth/beastie.4th projects/ifq/sys/boot/forth/loader.4th projects/ifq/sys/boot/forth/loader.4th.8 projects/ifq/sys/boot/forth/loader.conf projects/ifq/sys/boot/forth/loader.conf.5 projects/ifq/sys/boot/forth/loader.rc projects/ifq/sys/boot/forth/menu-commands.4th projects/ifq/sys/boot/forth/menu.4th projects/ifq/sys/boot/forth/menu.rc projects/ifq/sys/boot/forth/menusets.4th projects/ifq/sys/boot/i386/loader/loader.rc projects/ifq/sys/cam/scsi/scsi_da.c projects/ifq/sys/cddl/contrib/opensolaris/uts/common/sys/fasttrap_impl.h projects/ifq/sys/cddl/contrib/opensolaris/uts/intel/dtrace/fasttrap_isa.c projects/ifq/sys/compat/linux/linux_ioctl.c projects/ifq/sys/compat/svr4/svr4_sockio.c projects/ifq/sys/conf/files projects/ifq/sys/conf/files.arm projects/ifq/sys/conf/kern.pre.mk projects/ifq/sys/contrib/dev/ath/ath_hal/ar9300/ar9300_reset.c projects/ifq/sys/crypto/aesni/aesencdec.h projects/ifq/sys/crypto/aesni/aesni.h projects/ifq/sys/crypto/aesni/aesni_wrap.c projects/ifq/sys/dev/aacraid/aacraid.c projects/ifq/sys/dev/aacraid/aacraid_cam.c projects/ifq/sys/dev/aacraid/aacraid_reg.h projects/ifq/sys/dev/aacraid/aacraid_var.h projects/ifq/sys/dev/aic7xxx/aicasm/Makefile projects/ifq/sys/dev/cxgbe/t4_main.c projects/ifq/sys/dev/drm2/drm_crtc.c projects/ifq/sys/dev/drm2/radeon/radeon_display.c projects/ifq/sys/dev/drm2/radeon/radeon_gem.c projects/ifq/sys/dev/fdt/fdt_pci.c projects/ifq/sys/dev/fdt/simplebus.c projects/ifq/sys/dev/iwn/if_iwnreg.h projects/ifq/sys/dev/ixgbe/ixgbe.c projects/ifq/sys/dev/mii/atphy.c projects/ifq/sys/dev/mii/miidevs projects/ifq/sys/dev/netmap/netmap.c projects/ifq/sys/dev/ofw/ofw_fdt.c projects/ifq/sys/dev/ppc/ppc_pci.c projects/ifq/sys/dev/uart/uart_bus_pci.c projects/ifq/sys/dev/usb/wlan/if_rsu.c projects/ifq/sys/dev/usb/wlan/if_rum.c projects/ifq/sys/dev/usb/wlan/if_run.c projects/ifq/sys/dev/usb/wlan/if_uath.c projects/ifq/sys/dev/usb/wlan/if_upgt.c projects/ifq/sys/dev/usb/wlan/if_ural.c projects/ifq/sys/dev/usb/wlan/if_urtw.c projects/ifq/sys/dev/usb/wlan/if_urtwn.c projects/ifq/sys/dev/usb/wlan/if_zyd.c projects/ifq/sys/dev/xen/control/control.c projects/ifq/sys/i386/i386/identcpu.c projects/ifq/sys/i386/i386/machdep.c projects/ifq/sys/i386/include/vmparam.h projects/ifq/sys/ia64/include/vmparam.h projects/ifq/sys/kern/capabilities.conf projects/ifq/sys/kern/kern_malloc.c projects/ifq/sys/kern/uipc_socket.c projects/ifq/sys/mips/cavium/std.octeon1 projects/ifq/sys/mips/include/vmparam.h projects/ifq/sys/mips/mips/nexus.c projects/ifq/sys/modules/aic7xxx/Makefile projects/ifq/sys/modules/aic7xxx/ahc/Makefile projects/ifq/sys/modules/aic7xxx/ahd/Makefile projects/ifq/sys/modules/bwi/Makefile projects/ifq/sys/modules/iwnfw/Makefile projects/ifq/sys/modules/vmm/Makefile projects/ifq/sys/net/if.c projects/ifq/sys/net/if.h projects/ifq/sys/net/if_tap.c projects/ifq/sys/net/if_var.h projects/ifq/sys/net80211/ieee80211_amrr.c projects/ifq/sys/net80211/ieee80211_output.c projects/ifq/sys/netgraph/ng_pipe.c projects/ifq/sys/netinet/if_ether.c projects/ifq/sys/netinet/in.c projects/ifq/sys/netinet/raw_ip.c projects/ifq/sys/netinet/sctp_asconf.c projects/ifq/sys/netinet/sctp_auth.c projects/ifq/sys/netinet/sctp_auth.h projects/ifq/sys/netinet/sctputil.c projects/ifq/sys/netinet/tcp_usrreq.c projects/ifq/sys/netpfil/ipfw/ip_fw2.c projects/ifq/sys/netpfil/pf/pf.c projects/ifq/sys/netsmb/smb_trantcp.c projects/ifq/sys/ofed/drivers/net/mlx4/en_ethtool.c projects/ifq/sys/ofed/drivers/net/mlx4/en_netdev.c projects/ifq/sys/ofed/drivers/net/mlx4/mlx4_en.h projects/ifq/sys/ofed/include/linux/bitops.h projects/ifq/sys/powerpc/booke/pmap.c projects/ifq/sys/powerpc/include/vmparam.h projects/ifq/sys/powerpc/mpc85xx/lbc.c projects/ifq/sys/powerpc/mpc85xx/pci_mpc85xx.c projects/ifq/sys/powerpc/powerpc/dump_machdep.c projects/ifq/sys/sparc64/include/vmparam.h projects/ifq/sys/sys/param.h projects/ifq/sys/sys/sockio.h projects/ifq/sys/vm/vm_object.c projects/ifq/sys/x86/cpufreq/hwpstate.c projects/ifq/sys/x86/include/specialreg.h projects/ifq/sys/x86/iommu/busdma_dmar.c projects/ifq/tests/Makefile projects/ifq/tests/README projects/ifq/tools/build/mk/OptionalObsoleteFiles.inc projects/ifq/tools/tools/syscall_timing/syscall_timing.c projects/ifq/usr.bin/Makefile projects/ifq/usr.bin/atf/Makefile projects/ifq/usr.bin/atf/Makefile.inc projects/ifq/usr.bin/atf/atf-sh/Makefile projects/ifq/usr.bin/calendar/calendars/calendar.freebsd projects/ifq/usr.bin/dtc/fdt.cc projects/ifq/usr.bin/split/Makefile projects/ifq/usr.bin/split/split.c projects/ifq/usr.sbin/arp/arp.4 projects/ifq/usr.sbin/bhyve/bhyverun.c projects/ifq/usr.sbin/bhyve/block_if.c projects/ifq/usr.sbin/bhyve/mevent.c projects/ifq/usr.sbin/bhyve/pci_ahci.c projects/ifq/usr.sbin/bhyve/pci_emul.c projects/ifq/usr.sbin/bhyve/pci_virtio_net.c projects/ifq/usr.sbin/bsdconfig/bsdconfig projects/ifq/usr.sbin/bsdconfig/include/messages.subr projects/ifq/usr.sbin/bsdconfig/share/common.subr projects/ifq/usr.sbin/bsdconfig/share/dialog.subr projects/ifq/usr.sbin/bsdconfig/share/media/http.subr projects/ifq/usr.sbin/bsdconfig/share/media/tcpip.subr projects/ifq/usr.sbin/bsdconfig/share/packages/index.subr projects/ifq/usr.sbin/bsdconfig/share/packages/packages.subr projects/ifq/usr.sbin/bsdconfig/share/strings.subr projects/ifq/usr.sbin/bsdconfig/startup/share/rcconf.subr projects/ifq/usr.sbin/bsdinstall/bsdinstall projects/ifq/usr.sbin/bsdinstall/bsdinstall.8 projects/ifq/usr.sbin/bsdinstall/scripts/auto projects/ifq/usr.sbin/bsdinstall/scripts/config projects/ifq/usr.sbin/bsdinstall/scripts/docsinstall projects/ifq/usr.sbin/bsdinstall/scripts/jail projects/ifq/usr.sbin/bsdinstall/scripts/netconfig_ipv4 projects/ifq/usr.sbin/bsdinstall/scripts/netconfig_ipv6 projects/ifq/usr.sbin/bsdinstall/scripts/script projects/ifq/usr.sbin/bsdinstall/scripts/wlanconfig projects/ifq/usr.sbin/bsdinstall/scripts/zfsboot projects/ifq/usr.sbin/freebsd-update/freebsd-update.sh projects/ifq/usr.sbin/mfiutil/Makefile projects/ifq/usr.sbin/mfiutil/mfiutil.8 projects/ifq/usr.sbin/mfiutil/mfiutil.c projects/ifq/usr.sbin/mount_smbfs/Makefile projects/ifq/usr.sbin/pkg/pkg.7 projects/ifq/usr.sbin/pkg/pkg.c projects/ifq/usr.sbin/route6d/route6d.c projects/ifq/usr.sbin/sysrc/sysrc projects/ifq/usr.sbin/sysrc/sysrc.8 Directory Properties: projects/ifq/ (props changed) projects/ifq/cddl/ (props changed) projects/ifq/cddl/contrib/opensolaris/ (props changed) projects/ifq/contrib/tzdata/ (props changed) projects/ifq/lib/libc/ (props changed) projects/ifq/sbin/ (props changed) projects/ifq/share/man/man4/ (props changed) projects/ifq/sys/ (props changed) projects/ifq/sys/amd64/vmm/ (props changed) projects/ifq/sys/boot/ (props changed) projects/ifq/sys/cddl/contrib/opensolaris/ (props changed) projects/ifq/sys/conf/ (props changed) projects/ifq/sys/modules/vmm/ (props changed) projects/ifq/usr.bin/calendar/ (props changed) projects/ifq/usr.sbin/bhyve/ (props changed) Modified: projects/ifq/Makefile.inc1 ============================================================================== --- projects/ifq/Makefile.inc1 Sat Nov 9 14:48:50 2013 (r257888) +++ projects/ifq/Makefile.inc1 Sat Nov 9 15:04:56 2013 (r257889) @@ -263,6 +263,21 @@ XMAKE= TOOLS_PREFIX=${WORLDTMP} ${BMAKE TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH} \ -DWITHOUT_GDB +# kernel-tools stage +KTMAKEENV= INSTALL="sh ${.CURDIR}/tools/install.sh" \ + PATH=${BPATH}:${PATH} \ + WORLDTMP=${WORLDTMP} \ + VERSION="${VERSION}" \ + COMPILER_TYPE=${COMPILER_TYPE} +KTMAKE= TOOLS_PREFIX=${WORLDTMP} MAKEOBJDIRPREFIX=${WORLDTMP} \ + ${KTMAKEENV} ${MAKE} ${WORLD_FLAGS} -f Makefile.inc1 \ + DESTDIR= \ + BOOTSTRAPPING=${OSRELDATE} \ + SSP_CFLAGS= \ + -DWITHOUT_HTML -DWITHOUT_INFO -DNO_LINT -DWITHOUT_MAN \ + -DNO_PIC -DNO_PROFILE -DNO_SHARED \ + -DNO_CPU_CFLAGS -DNO_WARNS -DNO_CTF -DEARLY_BUILD + # world stage WMAKEENV= ${CROSSENV} \ _SHLIBDIRPREFIX=${WORLDTMP} \ @@ -540,6 +555,7 @@ _cross-tools: @echo ">>> stage 3: cross tools" @echo "--------------------------------------------------------------" ${_+_}cd ${.CURDIR}; ${XMAKE} cross-tools + ${_+_}cd ${.CURDIR}; ${XMAKE} kernel-tools _includes: @echo @echo "--------------------------------------------------------------" @@ -1019,20 +1035,7 @@ buildkernel: @echo "--------------------------------------------------------------" @echo ">>> stage 2.3: build tools" @echo "--------------------------------------------------------------" - cd ${KRNLOBJDIR}/${_kernel}; \ - PATH=${BPATH}:${PATH} \ - MAKESRCPATH=${KERNSRCDIR}/dev/aic7xxx/aicasm \ - ${MAKE} SSP_CFLAGS= -DNO_CPU_CFLAGS -DNO_CTF -DEARLY_BUILD \ - -f ${KERNSRCDIR}/dev/aic7xxx/aicasm/Makefile -# XXX - Gratuitously builds aicasm in the ``makeoptions NO_MODULES'' case. -.if !defined(MODULES_WITH_WORLD) && !defined(NO_MODULES) && exists(${KERNSRCDIR}/modules) -.for target in obj depend all - cd ${KERNSRCDIR}/modules/aic7xxx/aicasm; \ - PATH=${BPATH}:${PATH} \ - MAKEOBJDIRPREFIX=${KRNLOBJDIR}/${_kernel}/modules \ - ${MAKE} SSP_CFLAGS= -DNO_CPU_CFLAGS -DNO_CTF -DEARLY_BUILD ${target} -.endfor -.endif + ${_+_}cd ${.CURDIR}; ${KTMAKE} kernel-tools .if !defined(NO_KERNELDEPEND) @echo @echo "--------------------------------------------------------------" @@ -1319,10 +1322,6 @@ bootstrap-tools: .MAKE # # build-tools: Build special purpose build tools # -.if defined(MODULES_WITH_WORLD) && exists(${KERNSRCDIR}/modules) -_aicasm= sys/modules/aic7xxx/aicasm -.endif - .if !defined(NO_SHARE) _share= share/syscons/scrnmaps .endif @@ -1344,7 +1343,6 @@ build-tools: .MAKE lib/ncurses/ncurses \ lib/ncurses/ncursesw \ ${_share} \ - ${_aicasm} \ usr.bin/awk \ lib/libmagic \ usr.bin/mkesdb_static \ @@ -1365,6 +1363,23 @@ build-tools: .MAKE .endfor # +# kernel-tools: Build kernel-building tools +# +kernel-tools: .MAKE + mkdir -p ${MAKEOBJDIRPREFIX}/usr + mtree -deU -f ${.CURDIR}/etc/mtree/BSD.usr.dist \ + -p ${MAKEOBJDIRPREFIX}/usr >/dev/null +.for _tool in \ + sys/dev/aic7xxx/aicasm + ${_+_}@${ECHODIR} "===> ${_tool} (obj,depend,all,install)"; \ + cd ${.CURDIR}/${_tool} && \ + ${MAKE} DIRPRFX=${_tool}/ obj && \ + ${MAKE} DIRPRFX=${_tool}/ depend && \ + ${MAKE} DIRPRFX=${_tool}/ all && \ + ${MAKE} DIRPRFX=${_tool}/ DESTDIR=${MAKEOBJDIRPREFIX} install +.endfor + +# # cross-tools: Build cross-building tools # .if ${TARGET_ARCH} != ${MACHINE_ARCH} || ${BOOTSTRAPPING} < 800035 @@ -1478,7 +1493,7 @@ _prebuild_libs= ${_kerberos5_lib_libasn1 ${_kerberos5_lib_libhx509} ${_kerberos5_lib_libkrb5} \ ${_kerberos5_lib_libroken} \ ${_kerberos5_lib_libwind} \ - ${_lib_atf_libatf_c} \ + ${_lib_atf} \ lib/libbz2 ${_libcom_err} lib/libcrypt \ lib/libelf lib/libexpat \ ${_lib_libgssapi} ${_lib_libipx} \ @@ -1492,8 +1507,8 @@ _prebuild_libs= ${_kerberos5_lib_libasn1 ${_secure_lib_libcrypto} ${_lib_libldns} \ ${_secure_lib_libssh} ${_secure_lib_libssl} -.if ${MK_ATF} != "no" -_lib_atf_libatf_c= lib/atf/libatf-c +.if ${MK_TESTS} != "no" +_lib_atf= lib/atf .endif .if ${MK_LIBTHR} != "no" @@ -1602,10 +1617,12 @@ ${_lib}__PL: .PHONY .MAKE .if exists(${.CURDIR}/${_lib}) ${_+_}@${ECHODIR} "===> ${_lib} (obj,depend,all,install)"; \ cd ${.CURDIR}/${_lib} && \ - ${MAKE} DIRPRFX=${_lib}/ obj && \ - ${MAKE} DIRPRFX=${_lib}/ depend && \ - ${MAKE} -DNO_PROFILE -DNO_PIC DIRPRFX=${_lib}/ all && \ - ${MAKE} -DNO_PROFILE -DNO_PIC DIRPRFX=${_lib}/ install + ${MAKE} -DNO_TESTS DIRPRFX=${_lib}/ obj && \ + ${MAKE} -DNO_TESTS DIRPRFX=${_lib}/ depend && \ + ${MAKE} -DNO_TESTS -DNO_PROFILE -DNO_PIC \ + DIRPRFX=${_lib}/ all && \ + ${MAKE} -DNO_TESTS -DNO_PROFILE -DNO_PIC \ + DIRPRFX=${_lib}/ install .endif .endfor @@ -1614,10 +1631,10 @@ ${_lib}__L: .PHONY .MAKE .if exists(${.CURDIR}/${_lib}) ${_+_}@${ECHODIR} "===> ${_lib} (obj,depend,all,install)"; \ cd ${.CURDIR}/${_lib} && \ - ${MAKE} DIRPRFX=${_lib}/ obj && \ - ${MAKE} DIRPRFX=${_lib}/ depend && \ - ${MAKE} DIRPRFX=${_lib}/ all && \ - ${MAKE} DIRPRFX=${_lib}/ install + ${MAKE} -DNO_TESTS DIRPRFX=${_lib}/ obj && \ + ${MAKE} -DNO_TESTS DIRPRFX=${_lib}/ depend && \ + ${MAKE} -DNO_TESTS DIRPRFX=${_lib}/ all && \ + ${MAKE} -DNO_TESTS DIRPRFX=${_lib}/ install .endif .endfor @@ -1627,10 +1644,12 @@ ${_lib}__L: .PHONY .MAKE lib/libpam__L: .PHONY .MAKE ${_+_}@${ECHODIR} "===> lib/libpam (obj,depend,all,install)"; \ cd ${.CURDIR}/lib/libpam && \ - ${MAKE} DIRPRFX=lib/libpam/ obj && \ - ${MAKE} DIRPRFX=lib/libpam/ depend && \ - ${MAKE} DIRPRFX=lib/libpam/ -D_NO_LIBPAM_SO_YET all && \ - ${MAKE} DIRPRFX=lib/libpam/ -D_NO_LIBPAM_SO_YET install + ${MAKE} -DNO_TESTS DIRPRFX=lib/libpam/ obj && \ + ${MAKE} -DNO_TESTS DIRPRFX=lib/libpam/ depend && \ + ${MAKE} -DNO_TESTS DIRPRFX=lib/libpam/ \ + -D_NO_LIBPAM_SO_YET all && \ + ${MAKE} -DNO_TESTS DIRPRFX=lib/libpam/ \ + -D_NO_LIBPAM_SO_YET install _prereq_libs: ${_prereq_libs:S/$/__PL/} _startup_libs: ${_startup_libs:S/$/__L/} Modified: projects/ifq/ObsoleteFiles.inc ============================================================================== --- projects/ifq/ObsoleteFiles.inc Sat Nov 9 14:48:50 2013 (r257888) +++ projects/ifq/ObsoleteFiles.inc Sat Nov 9 15:04:56 2013 (r257889) @@ -38,6 +38,12 @@ # xargs -n1 | sort | uniq -d; # done +# 20131109: extattr(2) mlinks fixed +OLD_FILES+=usr/share/man/man2/extattr_delete_list.2.gz +OLD_FILES+=usr/share/man/man2/extattr_get_list.2.gz +# 20131107: example files removed +OLD_FILES+=usr/share/examples/libusb20/aux.c +OLD_FILES+=usr/share/examples/libusb20/aux.h # 20131103: WITH_LIBICONV_COMPAT removal OLD_FILES+=usr/include/_libiconv_compat.h OLD_FILES+=usr/lib/libiconv.a Modified: projects/ifq/UPDATING ============================================================================== --- projects/ifq/UPDATING Sat Nov 9 14:48:50 2013 (r257888) +++ projects/ifq/UPDATING Sat Nov 9 15:04:56 2013 (r257889) @@ -31,6 +31,12 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 11 disable the most expensive debugging functionality run "ln -s 'abort:false,junk:false' /etc/malloc.conf".) +20131108: + The WITHOUT_ATF build knob has been removed and its functionality + has been subsumed into the more generic WITHOUT_TESTS. If you were + using the former to disable the build of the ATF libraries, you + should change your settings to use the latter. + 20131025: The default version of mtree is nmtree which is obtained from NetBSD. The output is generally the same, but may vary Modified: projects/ifq/cddl/contrib/opensolaris/common/ctf/ctf_create.c ============================================================================== --- projects/ifq/cddl/contrib/opensolaris/common/ctf/ctf_create.c Sat Nov 9 14:48:50 2013 (r257888) +++ projects/ifq/cddl/contrib/opensolaris/common/ctf/ctf_create.c Sat Nov 9 15:04:56 2013 (r257889) @@ -65,7 +65,7 @@ ctf_create(int *errp) cts.cts_name = _CTF_SECTION; cts.cts_type = SHT_PROGBITS; cts.cts_flags = 0; - cts.cts_data = &hdr; + cts.cts_data = (void *)&hdr; cts.cts_size = sizeof (hdr); cts.cts_entsize = 1; cts.cts_offset = 0; Modified: projects/ifq/cddl/contrib/opensolaris/lib/libdtrace/common/dt_link.c ============================================================================== --- projects/ifq/cddl/contrib/opensolaris/lib/libdtrace/common/dt_link.c Sat Nov 9 14:48:50 2013 (r257888) +++ projects/ifq/cddl/contrib/opensolaris/lib/libdtrace/common/dt_link.c Sat Nov 9 15:04:56 2013 (r257889) @@ -1864,7 +1864,7 @@ dtrace_program_link(dtrace_hdl_t *dtp, d * Arches which default to 64-bit need to explicitly use * the 32-bit library path. */ - int use_32 = !(dtp->dt_oflags & DTRACE_O_LP64); + int use_32 = (dtp->dt_oflags & DTRACE_O_ILP32); #else /* * Arches which are 32-bit only just use the normal @@ -1879,9 +1879,7 @@ dtrace_program_link(dtrace_hdl_t *dtp, d len = snprintf(&tmp, 1, fmt, dtp->dt_ld_path, file, tfile, drti) + 1; -#if !defined(sun) len *= 2; -#endif cmd = alloca(len); (void) snprintf(cmd, len, fmt, dtp->dt_ld_path, file, Modified: projects/ifq/cddl/contrib/opensolaris/lib/libnvpair/libnvpair.c ============================================================================== --- projects/ifq/cddl/contrib/opensolaris/lib/libnvpair/libnvpair.c Sat Nov 9 14:48:50 2013 (r257888) +++ projects/ifq/cddl/contrib/opensolaris/lib/libnvpair/libnvpair.c Sat Nov 9 15:04:56 2013 (r257889) @@ -210,7 +210,7 @@ NVLIST_PRTFUNC(int32, int32_t, int32_t, NVLIST_PRTFUNC(uint32, uint32_t, uint32_t, "0x%x") NVLIST_PRTFUNC(int64, int64_t, longlong_t, "%lld") NVLIST_PRTFUNC(uint64, uint64_t, u_longlong_t, "0x%llx") -NVLIST_PRTFUNC(double, double, double, "0x%llf") +NVLIST_PRTFUNC(double, double, double, "0x%f") NVLIST_PRTFUNC(string, char *, char *, "%s") NVLIST_PRTFUNC(hrtime, hrtime_t, hrtime_t, "0x%llx") Modified: projects/ifq/cddl/lib/libnvpair/Makefile ============================================================================== --- projects/ifq/cddl/lib/libnvpair/Makefile Sat Nov 9 14:48:50 2013 (r257888) +++ projects/ifq/cddl/lib/libnvpair/Makefile Sat Nov 9 15:04:56 2013 (r257889) @@ -21,9 +21,9 @@ CFLAGS+= -I${.CURDIR}/../../../sys CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/head CFLAGS+= -I${.CURDIR}/../../../cddl/compat/opensolaris/lib/libumem -# This library uses macros to define fprintf behvavior for several object types +# This library uses macros to define fprintf behavior for several object types # The compiler will see the non-string literal arguments to the fprintf calls and -# omit warnings for them. Quiese these warnings in contrib code: +# omit warnings for them. Quiesce these warnings in contrib code: # # cddl/contrib/opensolaris/lib/libnvpair/libnvpair.c:743:12: warning: format # string is not a string literal (potentially insecure) [-Wformat-security] Modified: projects/ifq/contrib/libreadline/search.c ============================================================================== --- projects/ifq/contrib/libreadline/search.c Sat Nov 9 14:48:50 2013 (r257888) +++ projects/ifq/contrib/libreadline/search.c Sat Nov 9 15:04:56 2013 (r257889) @@ -211,7 +211,11 @@ _rl_nsearch_init (dir, pchar) rl_end = rl_point = 0; p = _rl_make_prompt_for_search (pchar ? pchar : ':'); +#if defined (PREFER_STDARG) + rl_message ("%s", p); +#else rl_message ("%s", p, 0); +#endif free (p); RL_SETSTATE(RL_STATE_NSEARCH); Modified: projects/ifq/contrib/smbfs/lib/smb/nls.c ============================================================================== --- projects/ifq/contrib/smbfs/lib/smb/nls.c Sat Nov 9 14:48:50 2013 (r257888) +++ projects/ifq/contrib/smbfs/lib/smb/nls.c Sat Nov 9 15:04:56 2013 (r257889) @@ -36,12 +36,9 @@ __FBSDID("$FreeBSD$"); #include -#include +#include #include #include -#ifndef APPLE -#include -#endif #include #include #include @@ -50,21 +47,10 @@ __FBSDID("$FreeBSD$"); #include #include -/* - * prototype iconv* functions - */ -typedef void *iconv_t; - -static iconv_t (*my_iconv_open)(const char *, const char *); -static size_t(*my_iconv)(iconv_t, const char **, size_t *, char **, size_t *); -static int(*my_iconv_close)(iconv_t); - u_char nls_lower[256]; u_char nls_upper[256]; static iconv_t nls_toext, nls_toloc; -static int iconv_loaded; -static void *iconv_lib; int nls_setlocale(const char *name) @@ -90,32 +76,18 @@ nls_setrecode(const char *local, const c #else iconv_t icd; - if (iconv_loaded == 2) - return ENOENT; - else if (iconv_loaded == 0) { - iconv_loaded++; - iconv_lib = dlopen("libiconv.so", RTLD_LAZY | RTLD_GLOBAL); - if (iconv_lib == NULL) { - warn("Unable to load iconv library: %s\n", dlerror()); - iconv_loaded++; - return ENOENT; - } - my_iconv_open = dlsym(iconv_lib, "iconv_open"); - my_iconv = dlsym(iconv_lib, "iconv"); - my_iconv_close = dlsym(iconv_lib, "iconv_close"); - } if (nls_toext) - my_iconv_close(nls_toext); + iconv_close(nls_toext); if (nls_toloc) - my_iconv_close(nls_toloc); + iconv_close(nls_toloc); nls_toext = nls_toloc = (iconv_t)0; - icd = my_iconv_open(external, local); + icd = iconv_open(external, local); if (icd == (iconv_t)-1) return errno; nls_toext = icd; - icd = my_iconv_open(local, external); + icd = iconv_open(local, external); if (icd == (iconv_t)-1) { - my_iconv_close(nls_toext); + iconv_close(nls_toext); nls_toext = (iconv_t)0; return errno; } @@ -130,14 +102,11 @@ nls_str_toloc(char *dst, const char *src char *p = dst; size_t inlen, outlen; - if (!iconv_loaded) - return strcpy(dst, src); - if (nls_toloc == (iconv_t)0) return strcpy(dst, src); inlen = outlen = strlen(src); - my_iconv(nls_toloc, NULL, NULL, &p, &outlen); - while (my_iconv(nls_toloc, &src, &inlen, &p, &outlen) == -1) { + iconv(nls_toloc, NULL, NULL, &p, &outlen); + while (iconv(nls_toloc, &src, &inlen, &p, &outlen) == -1) { *p++ = *src++; inlen--; outlen--; @@ -152,14 +121,11 @@ nls_str_toext(char *dst, const char *src char *p = dst; size_t inlen, outlen; - if (!iconv_loaded) - return strcpy(dst, src); - if (nls_toext == (iconv_t)0) return strcpy(dst, src); inlen = outlen = strlen(src); - my_iconv(nls_toext, NULL, NULL, &p, &outlen); - while (my_iconv(nls_toext, &src, &inlen, &p, &outlen) == -1) { + iconv(nls_toext, NULL, NULL, &p, &outlen); + while (iconv(nls_toext, &src, &inlen, &p, &outlen) == -1) { *p++ = *src++; inlen--; outlen--; @@ -175,17 +141,14 @@ nls_mem_toloc(void *dst, const void *src const char *s = src; size_t inlen, outlen; - if (!iconv_loaded) - return memcpy(dst, src, size); - if (size == 0) return NULL; if (nls_toloc == (iconv_t)0) return memcpy(dst, src, size); inlen = outlen = size; - my_iconv(nls_toloc, NULL, NULL, &p, &outlen); - while (my_iconv(nls_toloc, &s, &inlen, &p, &outlen) == -1) { + iconv(nls_toloc, NULL, NULL, &p, &outlen); + while (iconv(nls_toloc, &s, &inlen, &p, &outlen) == -1) { *p++ = *s++; inlen--; outlen--; @@ -203,12 +166,12 @@ nls_mem_toext(void *dst, const void *src if (size == 0) return NULL; - if (!iconv_loaded || nls_toext == (iconv_t)0) + if (nls_toext == (iconv_t)0) return memcpy(dst, src, size); inlen = outlen = size; - my_iconv(nls_toext, NULL, NULL, &p, &outlen); - while (my_iconv(nls_toext, &s, &inlen, &p, &outlen) == -1) { + iconv(nls_toext, NULL, NULL, &p, &outlen); + while (iconv(nls_toext, &s, &inlen, &p, &outlen) == -1) { *p++ = *s++; inlen--; outlen--; Modified: projects/ifq/contrib/telnet/telnetd/sys_term.c ============================================================================== --- projects/ifq/contrib/telnet/telnetd/sys_term.c Sat Nov 9 14:48:50 2013 (r257888) +++ projects/ifq/contrib/telnet/telnetd/sys_term.c Sat Nov 9 15:04:56 2013 (r257889) @@ -1052,11 +1052,11 @@ start_login(char *host undef1, int autol */ if ((auth_level < 0) || (autologin != AUTH_VALID)) # endif +#endif /* AUTHENTICATION */ { argv = addarg(argv, "-h"); argv = addarg(argv, host); } -#endif /* AUTHENTICATION */ #endif #if !defined(NO_LOGIN_P) argv = addarg(argv, "-p"); Modified: projects/ifq/contrib/tzdata/africa ============================================================================== --- projects/ifq/contrib/tzdata/africa Sat Nov 9 14:48:50 2013 (r257888) +++ projects/ifq/contrib/tzdata/africa Sat Nov 9 15:04:56 2013 (r257889) @@ -451,6 +451,14 @@ Zone Africa/Monrovia -0:43:08 - LMT 1882 # (either two days before them or five days after them, so as to fall on # lastFri instead of lastSun). +# From Even Scharning (2013-10-25): +# The scheduled end of DST in Libya on Friday, October 25, 2013 was +# cancelled yesterday.... +# http://www.libyaherald.com/2013/10/24/correction-no-time-change-tomorrow/ +# +# From Paul Eggert (2013-10-25): +# For now, assume they're reverting to the pre-2012 rules of permanent UTC+2. + # Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S Rule Libya 1951 only - Oct 14 2:00 1:00 S Rule Libya 1952 only - Jan 1 0:00 0 - @@ -467,8 +475,8 @@ Rule Libya 1987 1989 - Apr 1 0:00 1:00 Rule Libya 1987 1989 - Oct 1 0:00 0 - Rule Libya 1997 only - Apr 4 0:00 1:00 S Rule Libya 1997 only - Oct 4 0:00 0 - -Rule Libya 2013 max - Mar lastFri 1:00 1:00 S -Rule Libya 2013 max - Oct lastFri 2:00 0 - +Rule Libya 2013 only - Mar lastFri 1:00 1:00 S +Rule Libya 2013 only - Oct lastFri 2:00 0 - # Zone NAME GMTOFF RULES FORMAT [UNTIL] Zone Africa/Tripoli 0:52:44 - LMT 1920 1:00 Libya CE%sT 1959 @@ -479,7 +487,8 @@ Zone Africa/Tripoli 0:52:44 - LMT 1920 2:00 - EET 1996 Sep 30 1:00 Libya CE%sT 1997 Oct 4 2:00 - EET 2012 Nov 10 2:00 - 1:00 Libya CE%sT + 1:00 Libya CE%sT 2013 Oct 25 2:00 + 2:00 - EET # Madagascar # Zone NAME GMTOFF RULES FORMAT [UNTIL] @@ -684,15 +693,6 @@ Zone Indian/Mayotte 3:00:56 - LMT 1911 J # http://www.google.com/search?hl=en&q=Conseil+de+gouvernement+maroc+heure+avance&btnG=Search # -# From Alex Krivenyshev (2008-05-09): -# Is Western Sahara (part which administrated by Morocco) going to follow -# Morocco DST changes? Any information? What about other part of -# Western Sahara - under administration of POLISARIO Front (also named -# SADR Saharawi Arab Democratic Republic)? - -# From Arthur David Olson (2008-05-09): -# XXX--guess that it is only Morocco for now; guess only 2008 for now. - # From Steffen Thorsen (2008-08-27): # Morocco will change the clocks back on the midnight between August 31 # and September 1. They originally planned to observe DST to near the end @@ -858,13 +858,23 @@ Zone Indian/Mayotte 3:00:56 - LMT 1911 J # transitions would be 2013-07-07 and 2013-08-10; see: # http://www.maroc.ma/en/news/morocco-suspends-daylight-saving-time-july-7-aug10 -# From Paul Eggert (2013-07-03): +# From Steffen Thorsen (2013-09-28): +# Morocco extends DST by one month, on very short notice, just 1 day +# before it was going to end. There is a new decree (2.13.781) for +# this, where DST from now on goes from last Sunday of March at 02:00 +# to last Sunday of October at 03:00, similar to EU rules. Official +# source (French): +# http://www.maroc.gov.ma/fr/actualites/lhoraire-dete-gmt1-maintenu-jusquau-27-octobre-2013 +# Another source (specifying the time for start and end in the decree): +# http://www.lemag.ma/Heure-d-ete-au-Maroc-jusqu-au-27-octobre_a75620.html + +# From Paul Eggert (2013-10-03): # To estimate what the Moroccan government will do in future years, -# transition dates for 2014 through 2021 were determined by running +# transition dates for 2014 through 2038 were determined by running # the following program under GNU Emacs 24.3: # # (let ((islamic-year 1435)) -# (while (< islamic-year 1444) +# (while (< islamic-year 1461) # (let ((a # (calendar-gregorian-from-absolute # (calendar-islamic-to-absolute (list 9 1 islamic-year)))) @@ -879,13 +889,18 @@ Zone Indian/Mayotte 3:00:56 - LMT 1911 J # (car (cdr (cdr b))) (calendar-month-name (car b) t) (car (cdr b))))) # (setq islamic-year (+ 1 islamic-year)))) # -# with the results hand-edited for 2020-2022, when the normal spring-forward -# date falls during the estimated Ramadan. -# -# From 2023 through 2038 Ramadan is not predicted to overlap with -# daylight saving time. Starting in 2039 there will be overlap again, -# but 32-bit time_t values roll around in 2038 so for now do not worry -# about dates after 2038. +# with spring-forward transitions removed for 2023-2025, when the +# normal spring-forward date falls during the estimated Ramadan; with +# all transitions removed for 2026-2035, where the estimated Ramadan +# falls entirely outside daylight-saving time; and with fall-back +# transitions removed for 2036-2037, where the normal fall-back +# date falls during the estimated Ramadan. Normally, the table would +# stop after 2037 because 32-bit time_t values roll around early in 2038, +# but that would imply a prediction of perpetual DST after March 2038 +# due to the year-2037 glitches. So, this table instead stops after +# 2038, the first non-glitchy year after the 32-bit rollover. +# An advantage of stopping after 2038 is that it lets zic guess +# TZ='WET0WEST,M3.5.0,M10.5.0/3' for time stamps far in the future. # RULE NAME FROM TO TYPE IN ON AT SAVE LETTER/S @@ -912,12 +927,14 @@ Rule Morocco 2010 only - May 2 0:00 1: Rule Morocco 2010 only - Aug 8 0:00 0 - Rule Morocco 2011 only - Apr 3 0:00 1:00 S Rule Morocco 2011 only - Jul 31 0 0 - -Rule Morocco 2012 2019 - Apr lastSun 2:00 1:00 S -Rule Morocco 2012 max - Sep lastSun 3:00 0 - +Rule Morocco 2012 2013 - Apr lastSun 2:00 1:00 S +Rule Morocco 2012 only - Sep 30 3:00 0 - Rule Morocco 2012 only - Jul 20 3:00 0 - Rule Morocco 2012 only - Aug 20 2:00 1:00 S Rule Morocco 2013 only - Jul 7 3:00 0 - Rule Morocco 2013 only - Aug 10 2:00 1:00 S +Rule Morocco 2013 2035 - Oct lastSun 3:00 0 - +Rule Morocco 2014 2022 - Mar lastSun 2:00 1:00 S Rule Morocco 2014 only - Jun 29 3:00 0 - Rule Morocco 2014 only - Jul 29 2:00 1:00 S Rule Morocco 2015 only - Jun 18 3:00 0 - @@ -930,20 +947,42 @@ Rule Morocco 2018 only - May 16 3:00 0 Rule Morocco 2018 only - Jun 15 2:00 1:00 S Rule Morocco 2019 only - May 6 3:00 0 - Rule Morocco 2019 only - Jun 5 2:00 1:00 S +Rule Morocco 2020 only - Apr 24 3:00 0 - Rule Morocco 2020 only - May 24 2:00 1:00 S +Rule Morocco 2021 only - Apr 13 3:00 0 - Rule Morocco 2021 only - May 13 2:00 1:00 S +Rule Morocco 2022 only - Apr 3 3:00 0 - Rule Morocco 2022 only - May 3 2:00 1:00 S -Rule Morocco 2023 max - Apr lastSun 2:00 1:00 S +Rule Morocco 2023 only - Apr 22 2:00 1:00 S +Rule Morocco 2024 only - Apr 10 2:00 1:00 S +Rule Morocco 2025 only - Mar 31 2:00 1:00 S +Rule Morocco 2026 max - Mar lastSun 2:00 1:00 S +Rule Morocco 2036 only - Oct 21 3:00 0 - +Rule Morocco 2037 only - Oct 11 3:00 0 - +Rule Morocco 2038 only - Sep 30 3:00 0 - +Rule Morocco 2038 only - Oct 30 2:00 1:00 S +Rule Morocco 2038 max - Oct lastSun 3:00 0 - # Zone NAME GMTOFF RULES FORMAT [UNTIL] Zone Africa/Casablanca -0:30:20 - LMT 1913 Oct 26 0:00 Morocco WE%sT 1984 Mar 16 1:00 - CET 1986 0:00 Morocco WE%sT + # Western Sahara +# +# From Gwillim Law (2013-10-22): +# A correspondent who is usually well informed about time zone matters +# ... says that Western Sahara observes daylight saving time, just as +# Morocco does. +# +# From Paul Eggert (2013-10-23): +# Assume that this has been true since Western Sahara switched to GMT, +# since most of it was then controlled by Morocco. + Zone Africa/El_Aaiun -0:52:48 - LMT 1934 Jan -1:00 - WAT 1976 Apr 14 - 0:00 - WET + 0:00 Morocco WE%sT # Mozambique # Zone NAME GMTOFF RULES FORMAT [UNTIL] @@ -1100,9 +1139,7 @@ Zone Africa/Khartoum 2:10:08 - LMT 1931 3:00 - EAT # South Sudan -Zone Africa/Juba 2:06:24 - LMT 1931 - 2:00 Sudan CA%sT 2000 Jan 15 12:00 - 3:00 - EAT +Link Africa/Khartoum Africa/Juba # Swaziland # Zone NAME GMTOFF RULES FORMAT [UNTIL] Modified: projects/ifq/contrib/tzdata/antarctica ============================================================================== --- projects/ifq/contrib/tzdata/antarctica Sat Nov 9 14:48:50 2013 (r257888) +++ projects/ifq/contrib/tzdata/antarctica Sat Nov 9 15:04:56 2013 (r257889) @@ -16,9 +16,9 @@ # # Except for the French entries, # I made up all time zone abbreviations mentioned here; corrections welcome! -# FORMAT is `zzz' and GMTOFF is 0 for locations while uninhabited. +# FORMAT is 'zzz' and GMTOFF is 0 for locations while uninhabited. -# These rules are stolen from the `southamerica' file. +# These rules are stolen from the 'southamerica' file. # Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S Rule ArgAQ 1964 1966 - Mar 1 0:00 0 - Rule ArgAQ 1964 1966 - Oct 15 0:00 1:00 S @@ -228,9 +228,10 @@ Zone Antarctica/Syowa 0 - zzz 1957 Jan 2 # Scott Island (never inhabited) # # year-round base -# Scott, Ross Island, since 1957-01, is like Antarctica/McMurdo. +# Scott Base, Ross Island, since 1957-01. +# See Pacific/Auckland. # -# These rules for New Zealand are stolen from the `australasia' file. +# These rules for New Zealand are stolen from the 'australasia' file. # Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S Rule NZAQ 1974 only - Nov 3 2:00s 1:00 D Rule NZAQ 1975 1988 - Oct lastSun 2:00s 1:00 D @@ -268,11 +269,11 @@ Rule NZAQ 2008 max - Apr Sun>=1 2:00s 0 # From Lee Hotz (2001-03-08): # I queried the folks at Columbia who spent the summer at Vostok and this is # what they had to say about time there: -# ``in the US Camp (East Camp) we have been on New Zealand (McMurdo) +# "in the US Camp (East Camp) we have been on New Zealand (McMurdo) # time, which is 12 hours ahead of GMT. The Russian Station Vostok was # 6 hours behind that (although only 2 miles away, i.e. 6 hours ahead # of GMT). This is a time zone I think two hours east of Moscow. The -# natural time zone is in between the two: 8 hours ahead of GMT.'' +# natural time zone is in between the two: 8 hours ahead of GMT." # # From Paul Eggert (2001-05-04): # This seems to be hopelessly confusing, so I asked Lee Hotz about it @@ -337,16 +338,8 @@ Zone Antarctica/Palmer 0 - zzz 1965 -4:00 ChileAQ CL%sT # # -# McMurdo, Ross Island, since 1955-12 -# Zone NAME GMTOFF RULES FORMAT [UNTIL] -Zone Antarctica/McMurdo 0 - zzz 1956 - 12:00 NZAQ NZ%sT -# -# Amundsen-Scott, South Pole, continuously occupied since 1956-11-20 -# -# From Paul Eggert (1996-09-03): -# Normally it wouldn't have a separate entry, since it's like the -# larger Antarctica/McMurdo since 1970, but it's too famous to omit. +# McMurdo Station, Ross Island, since 1955-12 +# Amundsen-Scott South Pole Station, continuously occupied since 1956-11-20 # # From Chris Carrier (1996-06-27): # Siple, the first commander of the South Pole station, @@ -368,4 +361,4 @@ Zone Antarctica/McMurdo 0 - zzz 1956 # we have to go around and set them back 5 minutes or so. # Maybe if we let them run fast all of the time, we'd get to leave here sooner!! # -Link Antarctica/McMurdo Antarctica/South_Pole +# See 'australasia' for Antarctica/McMurdo. Modified: projects/ifq/contrib/tzdata/asia ============================================================================== --- projects/ifq/contrib/tzdata/asia Sat Nov 9 14:48:50 2013 (r257888) +++ projects/ifq/contrib/tzdata/asia Sat Nov 9 15:04:56 2013 (r257889) @@ -6,7 +6,7 @@ # go ahead and edit the file (and please send any changes to # tz@iana.org for general use in the future). -# From Paul Eggert (2013-02-21): +# From Paul Eggert (2013-08-11): # # A good source for time zone historical data outside the U.S. is # Thomas G. Shanks and Rique Pottenger, The International Atlas (6th edition), @@ -44,11 +44,11 @@ # 4:00 GST Gulf* # 5:30 IST India # 7:00 ICT Indochina* -# 7:00 WIT west Indonesia -# 8:00 CIT central Indonesia +# 7:00 WIB west Indonesia (Waktu Indonesia Barat) +# 8:00 WITA central Indonesia (Waktu Indonesia Tengah) # 8:00 CST China # 9:00 CJT Central Japanese Time (1896/1937)* -# 9:00 EIT east Indonesia +# 9:00 WIT east Indonesia (Waktu Indonesia Timur) # 9:00 JST JDT Japan # 9:00 KST KDT Korea # 9:30 CST (Australian) Central Standard Time @@ -756,7 +756,7 @@ Zone Asia/Dili 8:22:20 - LMT 1912 8:00 - TLT 1942 Feb 21 23:00 # E Timor Time 9:00 - JST 1945 Sep 23 9:00 - TLT 1976 May 3 - 8:00 - CIT 2000 Sep 17 00:00 + 8:00 - WITA 2000 Sep 17 00:00 9:00 - TLT # India @@ -793,36 +793,53 @@ Zone Asia/Kolkata 5:53:28 - LMT 1880 # K # (Hollandia). For now, assume all Indonesian locations other than Jayapura # switched on 1945-09-23. # +# From Paul Eggert (2013-08-11): +# Normally the tz database uses English-language abbreviations, but in +# Indonesia it's typical to use Indonesian-language abbreviations even +# when writing in English. For example, see the English-language +# summary published by the Time and Frequency Laboratory of the +# Research Center for Calibration, Instrumentation and Metrology, +# Indonesia, (2006-09-29). +# The abbreviations are: +# +# WIB - UTC+7 - Waktu Indonesia Barat (Indonesia western time) +# WITA - UTC+8 - Waktu Indonesia Tengah (Indonesia central time) +# WIT - UTC+9 - Waktu Indonesia Timur (Indonesia eastern time) +# # Zone NAME GMTOFF RULES FORMAT [UNTIL] +# Java, Sumatra Zone Asia/Jakarta 7:07:12 - LMT 1867 Aug 10 # Shanks & Pottenger say the next transition was at 1924 Jan 1 0:13, # but this must be a typo. - 7:07:12 - JMT 1923 Dec 31 23:47:12 # Jakarta + 7:07:12 - BMT 1923 Dec 31 23:47:12 # Batavia 7:20 - JAVT 1932 Nov # Java Time - 7:30 - WIT 1942 Mar 23 + 7:30 - WIB 1942 Mar 23 9:00 - JST 1945 Sep 23 - 7:30 - WIT 1948 May - 8:00 - WIT 1950 May - 7:30 - WIT 1964 - 7:00 - WIT + 7:30 - WIB 1948 May + 8:00 - WIB 1950 May + 7:30 - WIB 1964 + 7:00 - WIB +# west and central Borneo Zone Asia/Pontianak 7:17:20 - LMT 1908 May 7:17:20 - PMT 1932 Nov # Pontianak MT - 7:30 - WIT 1942 Jan 29 + 7:30 - WIB 1942 Jan 29 9:00 - JST 1945 Sep 23 - 7:30 - WIT 1948 May - 8:00 - WIT 1950 May - 7:30 - WIT 1964 - 8:00 - CIT 1988 Jan 1 - 7:00 - WIT + 7:30 - WIB 1948 May + 8:00 - WIB 1950 May + 7:30 - WIB 1964 + 8:00 - WITA 1988 Jan 1 + 7:00 - WIB +# Sulawesi, Lesser Sundas, east and south Borneo Zone Asia/Makassar 7:57:36 - LMT 1920 7:57:36 - MMT 1932 Nov # Macassar MT - 8:00 - CIT 1942 Feb 9 + 8:00 - WITA 1942 Feb 9 9:00 - JST 1945 Sep 23 - 8:00 - CIT + 8:00 - WITA +# Maluku Islands, West Papua, Papua Zone Asia/Jayapura 9:22:48 - LMT 1932 Nov - 9:00 - EIT 1944 Sep 1 + 9:00 - WIT 1944 Sep 1 9:30 - CST 1964 - 9:00 - EIT + 9:00 - WIT # Iran @@ -1364,9 +1381,11 @@ Zone Asia/Tokyo 9:18:59 - LMT 1887 Dec 3 # until about the same time next year (at least). # http://www.petra.gov.jo/Public_News/Nws_NewsDetails.aspx?NewsID=88950 # -# From Paul Eggert (2012-10-25): -# For now, assume this is just a one-year measure. If it becomes -# permanent, we should move Jordan from EET to AST effective tomorrow. +# From Paul Eggert (2013-09-21): +# It's looking like this change will be permanent; see +# Petra News Agency, Cancelling winter saved Jordan $7 million (2013-02-20) +# . +# So move Jordan to UTC+3 as of the abovementioned date. # Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S Rule Jordan 1973 only - Jun 6 0:00 1:00 S @@ -1392,15 +1411,15 @@ Rule Jordan 1995 1998 - Sep Fri>=15 0:00 Rule Jordan 1999 only - Jul 1 0:00s 1:00 S Rule Jordan 1999 2002 - Sep lastFri 0:00s 0 - Rule Jordan 2000 2001 - Mar lastThu 0:00s 1:00 S -Rule Jordan 2002 max - Mar lastThu 24:00 1:00 S +Rule Jordan 2002 2012 - Mar lastThu 24:00 1:00 S Rule Jordan 2003 only - Oct 24 0:00s 0 - Rule Jordan 2004 only - Oct 15 0:00s 0 - Rule Jordan 2005 only - Sep lastFri 0:00s 0 - -Rule Jordan 2006 2011 - Oct lastFri 0:00s 0 - -Rule Jordan 2013 max - Oct lastFri 0:00s 0 - +Rule Jordan 2006 2012 - Oct lastFri 0:00s 0 - # Zone NAME GMTOFF RULES FORMAT [UNTIL] Zone Asia/Amman 2:23:44 - LMT 1931 - 2:00 Jordan EE%sT + 2:00 Jordan EE%sT 2012 Oct 26 0:00s + 3:00 - AST # Kazakhstan @@ -2280,9 +2299,18 @@ Zone Asia/Karachi 4:28:12 - LMT 1907 # http://www.samanews.com/index.php?act=Show&id=154120 # http://safa.ps/details/news/99844/%D8%B1%D8%A7%D9%85-%D8%A7%D9%84%D9%84%D9%87-%D8%A8%D8%AF%D8%A1-%D8%A7%D9%84%D8%AA%D9%88%D9%82%D9%8A%D8%AA-%D8%A7%D9%84%D8%B5%D9%8A%D9%81%D9%8A-29-%D8%A7%D9%84%D8%AC%D8%A7%D8%B1%D9%8A.html -# From Paul Eggert (2013-04-15): +# From Steffen Thorsen (2013-09-24): +# The Gaza and West Bank are ending DST Thursday at midnight +# (2013-09-27 00:00:00) (one hour earlier than last year...). +# This source in English, says "that winter time will go into effect +# at midnight on Thursday in the West Bank and Gaza Strip": +# http://english.wafa.ps/index.php?action=detail&id=23246 +# official source...: +# http://www.palestinecabinet.gov.ps/ar/Views/ViewDetails.aspx?pid=1252 + +# From Paul Eggert (2013-09-24): # For future dates, guess the last Thursday in March at 24:00 through -# the first Friday on or after September 21 at 01:00. This is consistent with +# the first Friday on or after September 21 at 00:00. This is consistent with # the predictions in today's editions of the following URLs, # which are for Gaza and Hebron respectively: # http://www.timeanddate.com/worldclock/timezone.html?n=702 @@ -2313,7 +2341,8 @@ Rule Palestine 2011 only - Aug 1 0:00 0 Rule Palestine 2011 only - Aug 30 0:00 1:00 S Rule Palestine 2011 only - Sep 30 0:00 0 - Rule Palestine 2012 max - Mar lastThu 24:00 1:00 S -Rule Palestine 2012 max - Sep Fri>=21 1:00 0 - +Rule Palestine 2012 only - Sep 21 1:00 0 - +Rule Palestine 2013 max - Sep Fri>=21 0:00 0 - # Zone NAME GMTOFF RULES FORMAT [UNTIL] Zone Asia/Gaza 2:17:52 - LMT 1900 Oct Modified: projects/ifq/contrib/tzdata/australasia ============================================================================== --- projects/ifq/contrib/tzdata/australasia Sat Nov 9 14:48:50 2013 (r257888) +++ projects/ifq/contrib/tzdata/australasia Sat Nov 9 15:04:56 2013 (r257889) @@ -352,16 +352,25 @@ Zone Indian/Cocos 6:27:40 - LMT 1900 # today confirmed that Fiji will start daylight savings at 2 am on Sunday 21st # October 2012 and end at 3 am on Sunday 20th January 2013. # http://www.fiji.gov.fj/index.php?option=com_content&view=article&id=6702&catid=71&Itemid=155 -# -# From Paul Eggert (2012-08-31): -# For now, guess a pattern of the penultimate Sundays in October and January. + +# From the Fijian Government Media Center (2013-08-30) via David Wheeler: +# Fiji will start daylight savings on Sunday 27th October, 2013 and end at 3am +# on Sunday 19th January, 2014.... move clocks forward by one hour from 2am +# http://www.fiji.gov.fj/Media-Center/Press-Releases/DAYLIGHT-SAVING-STARTS-ON-SUNDAY,-27th-OCTOBER-201.aspx +# +# From Paul Eggert (2013-09-09): +# For now, guess that Fiji springs forward the Sunday before the fourth +# Monday in October. This matches both recent practice and +# timeanddate.com's current spring-forward prediction. +# For the January 2014 transition we guessed right while timeanddate.com +# guessed wrong, so leave the fall-back prediction alone. # Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S Rule Fiji 1998 1999 - Nov Sun>=1 2:00 1:00 S Rule Fiji 1999 2000 - Feb lastSun 3:00 0 - Rule Fiji 2009 only - Nov 29 2:00 1:00 S Rule Fiji 2010 only - Mar lastSun 3:00 0 - -Rule Fiji 2010 max - Oct Sun>=18 2:00 1:00 S +Rule Fiji 2010 max - Oct Sun>=21 2:00 1:00 S Rule Fiji 2011 only - Mar Sun>=1 3:00 0 - Rule Fiji 2012 max - Jan Sun>=18 3:00 0 - # Zone NAME GMTOFF RULES FORMAT [UNTIL] @@ -487,6 +496,7 @@ Zone Pacific/Auckland 11:39:04 - LMT 186 Zone Pacific/Chatham 12:13:48 - LMT 1957 Jan 1 12:45 Chatham CHA%sT +Link Pacific/Auckland Antarctica/McMurdo # Auckland Is # uninhabited; Maori and Moriori, colonial settlers, pastoralists, sealers, @@ -736,7 +746,7 @@ Zone Pacific/Funafuti 11:56:52 - LMT 190 # 1886-1891; Baker was similar but exact dates are not known. # Inhabited by civilians 1935-1942; U.S. military bases 1943-1944; # uninhabited thereafter. -# Howland observed Hawaii Standard Time (UTC-10:30) in 1937; +# Howland observed Hawaii Standard Time (UT-10:30) in 1937; # see page 206 of Elgen M. Long and Marie K. Long, # Amelia Earhart: the Mystery Solved, Simon & Schuster (2000). # So most likely Howland and Baker observed Hawaii Time from 1935 @@ -749,8 +759,17 @@ Zone Pacific/Funafuti 11:56:52 - LMT 190 # no information; was probably like Pacific/Kiritimati # Johnston -# Zone NAME GMTOFF RULES FORMAT [UNTIL] -Zone Pacific/Johnston -10:00 - HST +# +# From Paul Eggert (2013-09-03): +# In his memoirs of June 6th to October 4, 1945 +# (2005), Herbert C. Bach writes, +# "We started our letdown to Kwajalein Atoll and landed there at 5:00 AM +# Johnston time, 1:30 AM Kwajalein time." This was in June 1945, and +# confirms that Johnston kept the same time as Honolulu in summer 1945. +# We have no better information, so for now, assume this has been true +# indefinitely into the past. +# +# See 'northamerica' for Pacific/Johnston. # Kingman # uninhabited Modified: projects/ifq/contrib/tzdata/backward ============================================================================== --- projects/ifq/contrib/tzdata/backward Sat Nov 9 14:48:50 2013 (r257888) +++ projects/ifq/contrib/tzdata/backward Sat Nov 9 15:04:56 2013 (r257889) @@ -22,15 +22,17 @@ Link America/Kentucky/Louisville America Link America/Argentina/Mendoza America/Mendoza Link America/Rio_Branco America/Porto_Acre Link America/Argentina/Cordoba America/Rosario -Link America/St_Thomas America/Virgin +Link America/Denver America/Shiprock +Link America/Port_of_Spain America/Virgin +Link Pacific/Auckland Antarctica/South_Pole Link Asia/Ashgabat Asia/Ashkhabad +Link Asia/Kolkata Asia/Calcutta Link Asia/Chongqing Asia/Chungking Link Asia/Dhaka Asia/Dacca Link Asia/Kathmandu Asia/Katmandu -Link Asia/Kolkata Asia/Calcutta Link Asia/Macau Asia/Macao -Link Asia/Jerusalem Asia/Tel_Aviv Link Asia/Ho_Chi_Minh Asia/Saigon +Link Asia/Jerusalem Asia/Tel_Aviv Link Asia/Thimphu Asia/Thimbu Link Asia/Makassar Asia/Ujung_Pandang Link Asia/Ulaanbaatar Asia/Ulan_Bator @@ -88,10 +90,10 @@ Link Pacific/Auckland NZ Link Pacific/Chatham NZ-CHAT Link America/Denver Navajo Link Asia/Shanghai PRC +Link Pacific/Pohnpei Pacific/Ponape Link Pacific/Pago_Pago Pacific/Samoa -Link Pacific/Chuuk Pacific/Yap Link Pacific/Chuuk Pacific/Truk -Link Pacific/Pohnpei Pacific/Ponape +Link Pacific/Chuuk Pacific/Yap Link Europe/Warsaw Poland Link Europe/Lisbon Portugal Link Asia/Taipei ROC Modified: projects/ifq/contrib/tzdata/etcetera ============================================================================== --- projects/ifq/contrib/tzdata/etcetera Sat Nov 9 14:48:50 2013 (r257888) +++ projects/ifq/contrib/tzdata/etcetera Sat Nov 9 15:04:56 2013 (r257889) @@ -31,9 +31,9 @@ Link Etc/GMT Etc/GMT0 # even though this is the opposite of what many people expect. # POSIX has positive signs west of Greenwich, but many people expect # positive signs east of Greenwich. For example, TZ='Etc/GMT+4' uses -# the abbreviation "GMT+4" and corresponds to 4 hours behind UTC +# the abbreviation "GMT+4" and corresponds to 4 hours behind UT # (i.e. west of Greenwich) even though many people would expect it to -# mean 4 hours ahead of UTC (i.e. east of Greenwich). +# mean 4 hours ahead of UT (i.e. east of Greenwich). # # In the draft 5 of POSIX 1003.1-200x, the angle bracket notation allows for # TZ='+4'; if you want time zone abbreviations conforming to Modified: projects/ifq/contrib/tzdata/europe ============================================================================== --- projects/ifq/contrib/tzdata/europe Sat Nov 9 14:48:50 2013 (r257888) +++ projects/ifq/contrib/tzdata/europe Sat Nov 9 15:04:56 2013 (r257889) @@ -42,7 +42,7 @@ # (1998-09-21, in Portuguese) # -# I invented the abbreviations marked `*' in the following table; +# I invented the abbreviations marked '*' in the following table; # the rest are from earlier versions of this file, or from other sources. # Corrections are welcome! # std dst 2dst @@ -96,7 +96,7 @@ # and a sketch map showing some of the sightlines involved. One paragraph # of the text said: # -# `An old stone obelisk marking a forgotten terrestrial meridian stands +# 'An old stone obelisk marking a forgotten terrestrial meridian stands # beside the river at Kew. In the 18th century, before time and longitude # was standardised by the Royal Observatory in Greenwich, scholars observed # this stone and the movement of stars from Kew Observatory nearby. They @@ -140,7 +140,7 @@ # From Paul Eggert (2003-09-27): # Summer Time was first seriously proposed by William Willett (1857-1915), # a London builder and member of the Royal Astronomical Society -# who circulated a pamphlet ``The Waste of Daylight'' (1907) +# who circulated a pamphlet "The Waste of Daylight" (1907) # that proposed advancing clocks 20 minutes on each of four Sundays in April, # and retarding them by the same amount on four Sundays in September. # A bill was drafted in 1909 and introduced in Parliament several times, @@ -165,10 +165,10 @@ # # From Paul Eggert (1996-09-03): -# The OED Supplement says that the English originally said ``Daylight Saving'' +# The OED Supplement says that the English originally said "Daylight Saving" # when they were debating the adoption of DST in 1908; but by 1916 this *** DIFF OUTPUT TRUNCATED AT 1000 LINES *** From owner-svn-src-projects@FreeBSD.ORG Sat Nov 9 15:10:08 2013 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id 8D4DE941; Sat, 9 Nov 2013 15:10:08 +0000 (UTC) (envelope-from andre@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 61F7D22F4; Sat, 9 Nov 2013 15:10:08 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rA9FA8PM017052; Sat, 9 Nov 2013 15:10:08 GMT (envelope-from andre@svn.freebsd.org) Received: (from andre@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id rA9FA8il017051; Sat, 9 Nov 2013 15:10:08 GMT (envelope-from andre@svn.freebsd.org) Message-Id: <201311091510.rA9FA8il017051@svn.freebsd.org> From: Andre Oppermann Date: Sat, 9 Nov 2013 15:10:08 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r257890 - projects/ifq/sys/dev/ifq_ixgbe X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 09 Nov 2013 15:10:08 -0000 Author: andre Date: Sat Nov 9 15:10:07 2013 New Revision: 257890 URL: http://svnweb.freebsd.org/changeset/base/257890 Log: Merge r257529 into sys/dev/ifq_ixgbe.c. Sponsored by: The FreeBSD Foundation Modified: projects/ifq/sys/dev/ifq_ixgbe/ixgbe.c Modified: projects/ifq/sys/dev/ifq_ixgbe/ixgbe.c ============================================================================== --- projects/ifq/sys/dev/ifq_ixgbe/ixgbe.c Sat Nov 9 15:04:56 2013 (r257889) +++ projects/ifq/sys/dev/ifq_ixgbe/ixgbe.c Sat Nov 9 15:10:07 2013 (r257890) @@ -1253,9 +1253,6 @@ ixgbe_init_locked(struct adapter *adapte IXGBE_WRITE_REG(hw, IXGBE_RDT(i), adapter->num_rx_desc - 1); } - /* Set up VLAN support and filter */ - ixgbe_setup_vlan_hw_support(adapter); - /* Enable Receive engine */ rxctrl = IXGBE_READ_REG(hw, IXGBE_RXCTRL); if (hw->mac.type == ixgbe_mac_82598EB) @@ -1339,6 +1336,9 @@ ixgbe_init_locked(struct adapter *adapte /* Initialize the FC settings */ ixgbe_start_hw(hw); + /* Set up VLAN support and filter */ + ixgbe_setup_vlan_hw_support(adapter); + /* And now turn on interrupts */ ixgbe_enable_intr(adapter); @@ -4688,7 +4688,7 @@ ixgbe_register_vlan(void *arg, struct if bit = vtag & 0x1F; adapter->shadow_vfta[index] |= (1 << bit); ++adapter->num_vlans; - ixgbe_init_locked(adapter); + ixgbe_setup_vlan_hw_support(adapter); IXGBE_CORE_UNLOCK(adapter); } @@ -4715,7 +4715,7 @@ ixgbe_unregister_vlan(void *arg, struct adapter->shadow_vfta[index] &= ~(1 << bit); --adapter->num_vlans; /* Re-init to load the changes */ - ixgbe_init_locked(adapter); + ixgbe_setup_vlan_hw_support(adapter); IXGBE_CORE_UNLOCK(adapter); } @@ -4737,6 +4737,20 @@ ixgbe_setup_vlan_hw_support(struct adapt if (adapter->num_vlans == 0) return; + /* Setup the queues for vlans */ + for (int i = 0; i < adapter->num_queues; i++) { + rxr = &adapter->rx_rings[i]; + /* On 82599 the VLAN enable is per/queue in RXDCTL */ + if (hw->mac.type != ixgbe_mac_82598EB) { + ctrl = IXGBE_READ_REG(hw, IXGBE_RXDCTL(i)); + ctrl |= IXGBE_RXDCTL_VME; + IXGBE_WRITE_REG(hw, IXGBE_RXDCTL(i), ctrl); + } + rxr->vtag_strip = TRUE; + } + + if ((ifp->if_capenable & IFCAP_VLAN_HWFILTER) == 0) + return; /* ** A soft reset zero's out the VFTA, so ** we need to repopulate it now. @@ -4755,18 +4769,6 @@ ixgbe_setup_vlan_hw_support(struct adapt if (hw->mac.type == ixgbe_mac_82598EB) ctrl |= IXGBE_VLNCTRL_VME; IXGBE_WRITE_REG(hw, IXGBE_VLNCTRL, ctrl); - - /* Setup the queues for vlans */ - for (int i = 0; i < adapter->num_queues; i++) { - rxr = &adapter->rx_rings[i]; - /* On 82599 the VLAN enable is per/queue in RXDCTL */ - if (hw->mac.type != ixgbe_mac_82598EB) { - ctrl = IXGBE_READ_REG(hw, IXGBE_RXDCTL(i)); - ctrl |= IXGBE_RXDCTL_VME; - IXGBE_WRITE_REG(hw, IXGBE_RXDCTL(i), ctrl); - } - rxr->vtag_strip = TRUE; - } } static void From owner-svn-src-projects@FreeBSD.ORG Sat Nov 9 19:43:16 2013 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id D374576F; Sat, 9 Nov 2013 19:43:16 +0000 (UTC) (envelope-from marcel@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id C10C92F48; Sat, 9 Nov 2013 19:43:16 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rA9JhGvc012260; Sat, 9 Nov 2013 19:43:16 GMT (envelope-from marcel@svn.freebsd.org) Received: (from marcel@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id rA9JhGo5012259; Sat, 9 Nov 2013 19:43:16 GMT (envelope-from marcel@svn.freebsd.org) Message-Id: <201311091943.rA9JhGo5012259@svn.freebsd.org> From: Marcel Moolenaar Date: Sat, 9 Nov 2013 19:43:16 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r257893 - projects/altix2/sys/dev/bge X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 09 Nov 2013 19:43:16 -0000 Author: marcel Date: Sat Nov 9 19:43:16 2013 New Revision: 257893 URL: http://svnweb.freebsd.org/changeset/base/257893 Log: Use the correct map to setup the jumbo RX ring entry. Modified: projects/altix2/sys/dev/bge/if_bge.c Modified: projects/altix2/sys/dev/bge/if_bge.c ============================================================================== --- projects/altix2/sys/dev/bge/if_bge.c Sat Nov 9 18:46:11 2013 (r257892) +++ projects/altix2/sys/dev/bge/if_bge.c Sat Nov 9 19:43:16 2013 (r257893) @@ -1408,7 +1408,7 @@ bge_newbuf_jumbo(struct bge_softc *sc, i r->bge_flags = BGE_RXBDFLAG_JUMBO_RING | BGE_RXBDFLAG_END; r->bge_idx = i; r->bge_len3 = r->bge_len2 = r->bge_len1 = 0; - map = sc->bge_cdata.bge_rx_jumbo_sparemap; + map = sc->bge_cdata.bge_rx_jumbo_dmamap[i]; nsegs = busdma_md_get_nsegs(map); switch (nsegs) { case 4: @@ -1444,7 +1444,7 @@ bge_newbuf_jumbo(struct bge_softc *sc, i panic("%s: %d segments\n", __func__, nsegs); } - busdma_sync(sc->bge_cdata.bge_rx_jumbo_dmamap[i], BUSDMA_SYNC_PREREAD); + busdma_sync(map, BUSDMA_SYNC_PREREAD); return (0); } From owner-svn-src-projects@FreeBSD.ORG Sat Nov 9 19:52:03 2013 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id 9446B91D; Sat, 9 Nov 2013 19:52:03 +0000 (UTC) (envelope-from marcel@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 815362F9A; Sat, 9 Nov 2013 19:52:03 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rA9Jq3fo015363; Sat, 9 Nov 2013 19:52:03 GMT (envelope-from marcel@svn.freebsd.org) Received: (from marcel@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id rA9Jq3KP015362; Sat, 9 Nov 2013 19:52:03 GMT (envelope-from marcel@svn.freebsd.org) Message-Id: <201311091952.rA9Jq3KP015362@svn.freebsd.org> From: Marcel Moolenaar Date: Sat, 9 Nov 2013 19:52:03 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r257894 - projects/altix2/sys/ia64/sgisn X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 09 Nov 2013 19:52:03 -0000 Author: marcel Date: Sat Nov 9 19:52:03 2013 New Revision: 257894 URL: http://svnweb.freebsd.org/changeset/base/257894 Log: Use the right operator to get the bit shift form the entry. We were mistakenly clearing bit 0 in the corresponding 64-bit integral. Modified: projects/altix2/sys/ia64/sgisn/sgisn_pcib.c Modified: projects/altix2/sys/ia64/sgisn/sgisn_pcib.c ============================================================================== --- projects/altix2/sys/ia64/sgisn/sgisn_pcib.c Sat Nov 9 19:43:16 2013 (r257893) +++ projects/altix2/sys/ia64/sgisn/sgisn_pcib.c Sat Nov 9 19:52:03 2013 (r257894) @@ -781,7 +781,7 @@ sgisn_pcib_iommu_unmap(device_t bus, dev KASSERT(count <= 64, ("foo: count")); KASSERT((entry + count) <= PCIB_REG_ATE_SIZE, ("foo")); - bitshft = entry & 64; + bitshft = entry % 64; KASSERT(bitshft <= (64 - count), ("foo: bitshft")); bits = (count < 64) ? ((1UL << count) - 1UL) << bitshft : ~0UL; ate = entry / 64; From owner-svn-src-projects@FreeBSD.ORG Sat Nov 9 20:01:09 2013 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id C7894D3E; Sat, 9 Nov 2013 20:01:09 +0000 (UTC) (envelope-from marcel@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id B4D022020; Sat, 9 Nov 2013 20:01:09 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rA9K1968018780; Sat, 9 Nov 2013 20:01:09 GMT (envelope-from marcel@svn.freebsd.org) Received: (from marcel@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id rA9K1907018779; Sat, 9 Nov 2013 20:01:09 GMT (envelope-from marcel@svn.freebsd.org) Message-Id: <201311092001.rA9K1907018779@svn.freebsd.org> From: Marcel Moolenaar Date: Sat, 9 Nov 2013 20:01:09 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r257895 - projects/altix2/sys/ia64/conf X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 09 Nov 2013 20:01:09 -0000 Author: marcel Date: Sat Nov 9 20:01:09 2013 New Revision: 257895 URL: http://svnweb.freebsd.org/changeset/base/257895 Log: Add PROCDESC Modified: projects/altix2/sys/ia64/conf/ALTIX Modified: projects/altix2/sys/ia64/conf/ALTIX ============================================================================== --- projects/altix2/sys/ia64/conf/ALTIX Sat Nov 9 19:52:03 2013 (r257894) +++ projects/altix2/sys/ia64/conf/ALTIX Sat Nov 9 20:01:09 2013 (r257895) @@ -52,6 +52,7 @@ options NULLFS options P1003_1B_SEMAPHORES #options PREEMPTION options PRINTF_BUFR_SIZE=128 +options PROCDESC options PROCFS options PSEUDOFS options SCHED_ULE From owner-svn-src-projects@FreeBSD.ORG Sat Nov 9 20:11:21 2013 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id EE795272; Sat, 9 Nov 2013 20:11:21 +0000 (UTC) (envelope-from marcel@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id D9E4E20D7; Sat, 9 Nov 2013 20:11:21 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rA9KBL6g022450; Sat, 9 Nov 2013 20:11:21 GMT (envelope-from marcel@svn.freebsd.org) Received: (from marcel@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id rA9KBLLK022449; Sat, 9 Nov 2013 20:11:21 GMT (envelope-from marcel@svn.freebsd.org) Message-Id: <201311092011.rA9KBLLK022449@svn.freebsd.org> From: Marcel Moolenaar Date: Sat, 9 Nov 2013 20:11:21 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r257897 - projects/altix2/sys/kern X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 09 Nov 2013 20:11:22 -0000 Author: marcel Date: Sat Nov 9 20:11:21 2013 New Revision: 257897 URL: http://svnweb.freebsd.org/changeset/base/257897 Log: Fix busdma_md_unload() to recursively call devices up the device tree. When we map we start at the root and recurse down to the leaf device. When we unmap, we go the reverse direction. This fix actually has us call the unmap function of the PCI bridge, which means we now free up I/O MMU mappings. This and previous few commits were all done from the Altix itself. Looking good... Modified: projects/altix2/sys/kern/subr_busdma.c Modified: projects/altix2/sys/kern/subr_busdma.c ============================================================================== --- projects/altix2/sys/kern/subr_busdma.c Sat Nov 9 20:09:02 2013 (r257896) +++ projects/altix2/sys/kern/subr_busdma.c Sat Nov 9 20:11:21 2013 (r257897) @@ -445,10 +445,15 @@ _busdma_iommu_unmap(device_t dev, struct device_t bus; int error; - bus = device_get_parent(dev); error = 0; TAILQ_FOREACH(seg, &md->md_seg, mds_chain) { - error = BUSDMA_IOMMU_UNMAP(bus, dev, md, seg->mds_idx); + bus = device_get_parent(dev); + while (bus != root_bus) { + error = BUSDMA_IOMMU_UNMAP(bus, dev, md, seg->mds_idx); + if (error) + break; + bus = device_get_parent(bus); + } if (error) break; } From owner-svn-src-projects@FreeBSD.ORG Sat Nov 9 23:27:38 2013 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id 86686246; Sat, 9 Nov 2013 23:27:38 +0000 (UTC) (envelope-from marcel@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 72AA32910; Sat, 9 Nov 2013 23:27:38 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rA9NRcaV088497; Sat, 9 Nov 2013 23:27:38 GMT (envelope-from marcel@svn.freebsd.org) Received: (from marcel@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id rA9NRc8L088496; Sat, 9 Nov 2013 23:27:38 GMT (envelope-from marcel@svn.freebsd.org) Message-Id: <201311092327.rA9NRc8L088496@svn.freebsd.org> From: Marcel Moolenaar Date: Sat, 9 Nov 2013 23:27:38 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r257905 - projects/altix2/sys/ia64/sgisn X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 09 Nov 2013 23:27:38 -0000 Author: marcel Date: Sat Nov 9 23:27:37 2013 New Revision: 257905 URL: http://svnweb.freebsd.org/changeset/base/257905 Log: Use an I/O MMU page size of 4KB when the kernel uses a page size less than 16KB. Use a 16KB I/O MMU page size otherwise. Modified: projects/altix2/sys/ia64/sgisn/sgisn_pcib.c Modified: projects/altix2/sys/ia64/sgisn/sgisn_pcib.c ============================================================================== --- projects/altix2/sys/ia64/sgisn/sgisn_pcib.c Sat Nov 9 22:28:04 2013 (r257904) +++ projects/altix2/sys/ia64/sgisn/sgisn_pcib.c Sat Nov 9 23:27:37 2013 (r257905) @@ -58,7 +58,11 @@ __FBSDID("$FreeBSD$"); #include -#define SGISN_PCIB_PAGE_SHIFT 14 /* 16KB; Use 12 for 4KB */ +#if PAGE_SIZE < 16384 +#define SGISN_PCIB_PAGE_SHIFT 12 /* 4KB */ +#else +#define SGISN_PCIB_PAGE_SHIFT 14 /* 16KB */ +#endif #define SGISN_PCIB_PAGE_SIZE (1UL << SGISN_PCIB_PAGE_SHIFT) #define SGISN_PCIB_PAGE_MASK (SGISN_PCIB_PAGE_SIZE - 1UL)