From owner-p4-projects@FreeBSD.ORG Sun May 7 01:41:20 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9E0D416A413; Sun, 7 May 2006 01:41:20 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 628CB16A400 for ; Sun, 7 May 2006 01:41:20 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id EDAFC43D49 for ; Sun, 7 May 2006 01:41:19 +0000 (GMT) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k471fJYC024215 for ; Sun, 7 May 2006 01:41:19 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k471fJeZ024209 for perforce@freebsd.org; Sun, 7 May 2006 01:41:19 GMT (envelope-from kmacy@freebsd.org) Date: Sun, 7 May 2006 01:41:19 GMT Message-Id: <200605070141.k471fJeZ024209@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 96758 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 07 May 2006 01:41:20 -0000 http://perforce.freebsd.org/chv.cgi?CH=96758 Change 96758 by kmacy@kmacy_storage:sun4v_rwbuf on 2006/05/07 01:41:12 close some races in bit clearing by adding new routine to atomically lookup a tte and clear bits on it Affected files ... .. //depot/projects/kmacy_sun4v/src/sys/sun4v/include/tte_hash.h#14 edit .. //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/tte.c#8 edit .. //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/tte_hash.c#24 edit Differences ... ==== //depot/projects/kmacy_sun4v/src/sys/sun4v/include/tte_hash.h#14 (text+ko) ==== @@ -12,6 +12,8 @@ void tte_hash_clear(tte_hash_t hash); +tte_t tte_hash_clear_bits(tte_hash_t hash, vm_offset_t va, uint64_t flags); + tte_hash_t tte_hash_kernel_create(vm_offset_t, uint64_t); tte_hash_t tte_hash_create(uint64_t context, uint64_t *scratchval); ==== //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/tte.c#8 (text+ko) ==== @@ -51,8 +51,6 @@ #include #include - - void tte_clear_phys_bit(vm_page_t m, uint64_t flags) { @@ -68,24 +66,18 @@ * setting RO do we need to clear the VAC? */ TAILQ_FOREACH(pv, &m->md.pv_list, pv_list) { - tte_t otte_data, tte_data; + tte_t otte_data; /* * don't write protect pager mappings */ if (flags == VTD_SW_W) { if (!pmap_track_modified(pv->pv_pmap, pv->pv_va)) continue; + flags = (VTD_SW_W|VTD_W); } - otte_data = tte_hash_lookup(pv->pv_pmap->pm_hash, pv->pv_va); + otte_data = tte_hash_clear_bits(pv->pv_pmap->pm_hash, pv->pv_va, flags); if (otte_data & flags) { - if (flags == VTD_SW_W) { - tte_data = otte_data & ~(VTD_SW_W | VTD_W); - } else { - tte_data = otte_data & ~flags; - } - otte_data = tte_hash_update(pv->pv_pmap->pm_hash, pv->pv_va, tte_data); - if (otte_data & VTD_W) vm_page_dirty(m); @@ -94,17 +86,11 @@ } - if (flags == VTD_SW_W) + if (flags & VTD_SW_W) vm_page_flag_clear(m, PG_WRITEABLE); sched_unpin(); } -void -tte_set_phys_bit(vm_page_t m, uint64_t flags) -{ - UNIMPLEMENTED; -} - boolean_t tte_get_phys_bit(vm_page_t m, uint64_t flags) { @@ -115,14 +101,18 @@ void tte_clear_virt_bit(struct pmap *pmap, vm_offset_t va, uint64_t flags) { - tte_t tte_data; + tte_t otte_data; + + if (flags == VTD_SW_W) { + if (!pmap_track_modified(pmap, va)) + return; + flags = (VTD_SW_W|VTD_W); + } - tte_data = tte_hash_lookup(pmap->pm_hash, va); + otte_data = tte_hash_clear_bits(pmap->pm_hash, va, flags); - if (tte_data) { - tte_hash_update(pmap->pm_hash, va, tte_data & ~flags); + if (otte_data & flags) pmap_invalidate_page(pmap, va); - } } void ==== //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/tte_hash.c#24 (text+ko) ==== @@ -404,6 +404,27 @@ } +tte_t +tte_hash_clear_bits(tte_hash_t th, vm_offset_t va, uint64_t flags) +{ + uint64_t hash_shift, hash_index; + tte_hash_field_t fields, lookup_field; + tte_t otte_data; + + /* XXX - only handle 8K pages for now */ + hash_shift = PAGE_SHIFT; + hash_index = (va >> hash_shift) & HASH_MASK(th); + fields = (th->th_hashtable[hash_index].the_fields); + + hash_bucket_lock(fields); + if((otte_data = tte_hash_lookup_inline(th, va, &lookup_field)) != 0) + tte_hash_set_field(lookup_field, lookup_field->tte.tag, + lookup_field->tte.data & ~flags); + + hash_bucket_unlock_inline(fields); + + return (otte_data); +} tte_t tte_hash_delete(tte_hash_t th, vm_offset_t va) From owner-p4-projects@FreeBSD.ORG Sun May 7 08:06:31 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 94E5916A405; Sun, 7 May 2006 08:06:31 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 46EE616A403 for ; Sun, 7 May 2006 08:06:31 +0000 (UTC) (envelope-from gnn@neville-neil.com) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id A44BB43D48 for ; Sun, 7 May 2006 08:06:30 +0000 (GMT) (envelope-from gnn@neville-neil.com) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k4786UmT042524 for ; Sun, 7 May 2006 08:06:30 GMT (envelope-from gnn@neville-neil.com) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k4786NXY042521 for perforce@freebsd.org; Sun, 7 May 2006 08:06:23 GMT (envelope-from gnn@neville-neil.com) Date: Sun, 7 May 2006 08:06:23 GMT Message-Id: <200605070806.k4786NXY042521@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to gnn@neville-neil.com using -f From: "George V. Neville-Neil" To: Perforce Change Reviews Cc: Subject: PERFORCE change 96767 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 07 May 2006 08:06:31 -0000 http://perforce.freebsd.org/chv.cgi?CH=96767 Change 96767 by gnn@gnn_para_sctp on 2006/05/07 08:05:29 First attempt at integrating SCTP into my P4 branch. Affected files ... .. //depot/projects/gnn_sctp/src/sys/alpha/conf/GENERIC#2 integrate .. //depot/projects/gnn_sctp/src/sys/alpha/isa/isa.c#2 integrate .. //depot/projects/gnn_sctp/src/sys/alpha/pci/apecs_pci.c#2 integrate .. //depot/projects/gnn_sctp/src/sys/alpha/pci/lca_pci.c#2 integrate .. //depot/projects/gnn_sctp/src/sys/alpha/pci/pcibus.c#2 integrate .. //depot/projects/gnn_sctp/src/sys/amd64/amd64/dump_machdep.c#2 integrate .. //depot/projects/gnn_sctp/src/sys/amd64/amd64/fpu.c#2 integrate .. //depot/projects/gnn_sctp/src/sys/amd64/amd64/identcpu.c#2 integrate .. //depot/projects/gnn_sctp/src/sys/amd64/amd64/minidump_machdep.c#1 branch .. //depot/projects/gnn_sctp/src/sys/amd64/amd64/mp_machdep.c#2 integrate .. //depot/projects/gnn_sctp/src/sys/amd64/amd64/nexus.c#2 integrate .. //depot/projects/gnn_sctp/src/sys/amd64/amd64/pmap.c#2 integrate .. //depot/projects/gnn_sctp/src/sys/amd64/amd64/uma_machdep.c#2 integrate .. //depot/projects/gnn_sctp/src/sys/amd64/conf/GENERIC#2 integrate .. //depot/projects/gnn_sctp/src/sys/amd64/include/md_var.h#2 integrate .. //depot/projects/gnn_sctp/src/sys/amd64/include/minidump.h#1 branch .. //depot/projects/gnn_sctp/src/sys/arm/arm/nexus.c#2 integrate .. //depot/projects/gnn_sctp/src/sys/arm/arm/pmap.c#2 integrate .. //depot/projects/gnn_sctp/src/sys/arm/at91/at91.c#2 integrate .. //depot/projects/gnn_sctp/src/sys/arm/include/asmacros.h#2 integrate .. //depot/projects/gnn_sctp/src/sys/arm/include/atomic.h#2 integrate .. //depot/projects/gnn_sctp/src/sys/arm/sa11x0/sa11x0.c#2 integrate .. //depot/projects/gnn_sctp/src/sys/arm/xscale/i80321/i80321_pci.c#2 integrate .. //depot/projects/gnn_sctp/src/sys/arm/xscale/i80321/iq80321.c#2 integrate .. //depot/projects/gnn_sctp/src/sys/arm/xscale/i80321/obio.c#2 integrate .. //depot/projects/gnn_sctp/src/sys/boot/arm/at91/Makefile#1 branch .. //depot/projects/gnn_sctp/src/sys/boot/arm/at91/Makefile.inc#1 branch .. //depot/projects/gnn_sctp/src/sys/boot/arm/at91/boot0/Makefile#2 integrate .. //depot/projects/gnn_sctp/src/sys/boot/arm/at91/boot0/at91rm9200_lowlevel.c#2 delete .. //depot/projects/gnn_sctp/src/sys/boot/arm/at91/boot0/at91rm9200_lowlevel.h#2 delete .. //depot/projects/gnn_sctp/src/sys/boot/arm/at91/boot0/lib.c#2 delete .. //depot/projects/gnn_sctp/src/sys/boot/arm/at91/boot0/lib.h#2 delete .. //depot/projects/gnn_sctp/src/sys/boot/arm/at91/boot0/main.c#2 integrate .. //depot/projects/gnn_sctp/src/sys/boot/arm/at91/boot0/xmodem.c#2 delete .. //depot/projects/gnn_sctp/src/sys/boot/arm/at91/boot0/xmodem.h#2 delete .. //depot/projects/gnn_sctp/src/sys/boot/arm/at91/boot0iic/Makefile#1 branch .. //depot/projects/gnn_sctp/src/sys/boot/arm/at91/boot0iic/doit.c#1 branch .. //depot/projects/gnn_sctp/src/sys/boot/arm/at91/boot0iic/main.c#1 branch .. //depot/projects/gnn_sctp/src/sys/boot/arm/at91/boot0spi/Makefile#1 branch .. //depot/projects/gnn_sctp/src/sys/boot/arm/at91/boot0spi/doit.c#1 branch .. //depot/projects/gnn_sctp/src/sys/boot/arm/at91/boot0spi/main.c#1 branch .. //depot/projects/gnn_sctp/src/sys/boot/arm/at91/bootiic/Makefile#1 branch .. //depot/projects/gnn_sctp/src/sys/boot/arm/at91/bootiic/README#1 branch .. //depot/projects/gnn_sctp/src/sys/boot/arm/at91/bootiic/arm_init.S#1 branch .. //depot/projects/gnn_sctp/src/sys/boot/arm/at91/bootiic/main.c#1 branch .. //depot/projects/gnn_sctp/src/sys/boot/arm/at91/bootspi/Makefile#1 branch .. //depot/projects/gnn_sctp/src/sys/boot/arm/at91/bootspi/README#1 branch .. //depot/projects/gnn_sctp/src/sys/boot/arm/at91/bootspi/arm_init.s#1 branch .. //depot/projects/gnn_sctp/src/sys/boot/arm/at91/bootspi/main.c#1 branch .. //depot/projects/gnn_sctp/src/sys/boot/arm/at91/inc/AT91RM9200.h#2 delete .. //depot/projects/gnn_sctp/src/sys/boot/arm/at91/libat91/Makefile#1 branch .. //depot/projects/gnn_sctp/src/sys/boot/arm/at91/libat91/at91rm9200.h#1 branch .. //depot/projects/gnn_sctp/src/sys/boot/arm/at91/libat91/at91rm9200_lowlevel.c#1 branch .. //depot/projects/gnn_sctp/src/sys/boot/arm/at91/libat91/at91rm9200_lowlevel.h#1 branch .. //depot/projects/gnn_sctp/src/sys/boot/arm/at91/libat91/eeprom.c#1 branch .. //depot/projects/gnn_sctp/src/sys/boot/arm/at91/libat91/eeprom.h#1 branch .. //depot/projects/gnn_sctp/src/sys/boot/arm/at91/libat91/emac.c#1 branch .. //depot/projects/gnn_sctp/src/sys/boot/arm/at91/libat91/emac.h#1 branch .. //depot/projects/gnn_sctp/src/sys/boot/arm/at91/libat91/env_vars.c#1 branch .. //depot/projects/gnn_sctp/src/sys/boot/arm/at91/libat91/env_vars.h#1 branch .. //depot/projects/gnn_sctp/src/sys/boot/arm/at91/libat91/getc.c#1 branch .. //depot/projects/gnn_sctp/src/sys/boot/arm/at91/libat91/lib.h#1 branch .. //depot/projects/gnn_sctp/src/sys/boot/arm/at91/libat91/loader_prompt.c#1 branch .. //depot/projects/gnn_sctp/src/sys/boot/arm/at91/libat91/loader_prompt.h#1 branch .. //depot/projects/gnn_sctp/src/sys/boot/arm/at91/libat91/p_string.c#1 branch .. //depot/projects/gnn_sctp/src/sys/boot/arm/at91/libat91/p_string.h#1 branch .. //depot/projects/gnn_sctp/src/sys/boot/arm/at91/libat91/printf.c#1 branch .. //depot/projects/gnn_sctp/src/sys/boot/arm/at91/libat91/putchar.c#1 branch .. //depot/projects/gnn_sctp/src/sys/boot/arm/at91/libat91/tag_list.c#1 branch .. //depot/projects/gnn_sctp/src/sys/boot/arm/at91/libat91/tag_list.h#1 branch .. //depot/projects/gnn_sctp/src/sys/boot/arm/at91/libat91/xmodem.c#1 branch .. //depot/projects/gnn_sctp/src/sys/boot/arm/at91/linker.cfg#1 branch .. //depot/projects/gnn_sctp/src/sys/boot/i386/libi386/biosacpi.c#2 integrate .. //depot/projects/gnn_sctp/src/sys/cam/cam.c#2 integrate .. //depot/projects/gnn_sctp/src/sys/cam/scsi/scsi_cd.c#2 integrate .. //depot/projects/gnn_sctp/src/sys/cam/scsi/scsi_da.c#2 integrate .. //depot/projects/gnn_sctp/src/sys/conf/NOTES#2 integrate .. //depot/projects/gnn_sctp/src/sys/conf/files#2 edit .. //depot/projects/gnn_sctp/src/sys/conf/files.alpha#2 integrate .. //depot/projects/gnn_sctp/src/sys/conf/files.amd64#2 integrate .. //depot/projects/gnn_sctp/src/sys/conf/files.i386#2 integrate .. //depot/projects/gnn_sctp/src/sys/conf/files.ia64#2 integrate .. //depot/projects/gnn_sctp/src/sys/conf/files.pc98#2 integrate .. //depot/projects/gnn_sctp/src/sys/conf/files.powerpc#2 integrate .. //depot/projects/gnn_sctp/src/sys/conf/options#2 edit .. //depot/projects/gnn_sctp/src/sys/conf/options.alpha#2 integrate .. //depot/projects/gnn_sctp/src/sys/conf/options.amd64#2 integrate .. //depot/projects/gnn_sctp/src/sys/conf/options.i386#2 integrate .. //depot/projects/gnn_sctp/src/sys/conf/options.ia64#2 integrate .. //depot/projects/gnn_sctp/src/sys/conf/options.pc98#2 integrate .. //depot/projects/gnn_sctp/src/sys/contrib/ipfilter/netinet/fil.c#2 integrate .. //depot/projects/gnn_sctp/src/sys/crypto/via/padlock.c#2 integrate .. //depot/projects/gnn_sctp/src/sys/ddb/db_command.c#2 integrate .. //depot/projects/gnn_sctp/src/sys/ddb/db_ps.c#2 integrate .. //depot/projects/gnn_sctp/src/sys/ddb/db_thread.c#2 integrate .. //depot/projects/gnn_sctp/src/sys/ddb/ddb.h#2 integrate .. //depot/projects/gnn_sctp/src/sys/dev/acpica/acpi.c#2 integrate .. //depot/projects/gnn_sctp/src/sys/dev/acpica/acpi_cmbat.c#2 integrate .. //depot/projects/gnn_sctp/src/sys/dev/acpica/acpi_dock.c#1 branch .. //depot/projects/gnn_sctp/src/sys/dev/acpica/acpi_powerres.c#2 integrate .. //depot/projects/gnn_sctp/src/sys/dev/amr/amr_linux.c#2 integrate .. //depot/projects/gnn_sctp/src/sys/dev/ata/ata-all.c#2 integrate .. //depot/projects/gnn_sctp/src/sys/dev/ata/ata-queue.c#2 integrate .. //depot/projects/gnn_sctp/src/sys/dev/ata/ata-raid.c#2 integrate .. //depot/projects/gnn_sctp/src/sys/dev/ath/if_ath.c#2 integrate .. //depot/projects/gnn_sctp/src/sys/dev/atkbdc/atkbd.c#2 integrate .. //depot/projects/gnn_sctp/src/sys/dev/atkbdc/atkbdc.c#2 integrate .. //depot/projects/gnn_sctp/src/sys/dev/atkbdc/atkbdc_isa.c#2 integrate .. //depot/projects/gnn_sctp/src/sys/dev/bce/if_bce.c#2 integrate .. //depot/projects/gnn_sctp/src/sys/dev/bce/if_bcereg.h#2 integrate .. //depot/projects/gnn_sctp/src/sys/dev/bge/if_bge.c#2 integrate .. //depot/projects/gnn_sctp/src/sys/dev/ciss/ciss.c#2 integrate .. //depot/projects/gnn_sctp/src/sys/dev/drm/drmP.h#2 integrate .. //depot/projects/gnn_sctp/src/sys/dev/drm/radeon_state.c#2 integrate .. //depot/projects/gnn_sctp/src/sys/dev/em/if_em_hw.c#2 integrate .. //depot/projects/gnn_sctp/src/sys/dev/fxp/if_fxp.c#2 integrate .. //depot/projects/gnn_sctp/src/sys/dev/hwpmc/hwpmc_mod.c#2 integrate .. //depot/projects/gnn_sctp/src/sys/dev/iicbus/iicbus.c#2 integrate .. //depot/projects/gnn_sctp/src/sys/dev/isp/isp.c#2 integrate .. //depot/projects/gnn_sctp/src/sys/dev/isp/isp_freebsd.c#2 integrate .. //depot/projects/gnn_sctp/src/sys/dev/isp/isp_freebsd.h#2 integrate .. //depot/projects/gnn_sctp/src/sys/dev/isp/isp_ioctl.h#2 integrate .. //depot/projects/gnn_sctp/src/sys/dev/isp/isp_library.c#2 integrate .. //depot/projects/gnn_sctp/src/sys/dev/isp/isp_pci.c#2 integrate .. //depot/projects/gnn_sctp/src/sys/dev/isp/isp_sbus.c#2 integrate .. //depot/projects/gnn_sctp/src/sys/dev/isp/isp_target.c#2 integrate .. //depot/projects/gnn_sctp/src/sys/dev/isp/isp_target.h#2 integrate .. //depot/projects/gnn_sctp/src/sys/dev/isp/isp_tpublic.h#2 integrate .. //depot/projects/gnn_sctp/src/sys/dev/isp/ispmbox.h#2 integrate .. //depot/projects/gnn_sctp/src/sys/dev/ispfw/asm_2300.h#2 integrate .. //depot/projects/gnn_sctp/src/sys/dev/mpt/mpt.c#2 integrate .. //depot/projects/gnn_sctp/src/sys/dev/mpt/mpt_cam.c#2 integrate .. //depot/projects/gnn_sctp/src/sys/dev/pccbb/pccbb.c#2 integrate .. //depot/projects/gnn_sctp/src/sys/dev/pci/pci_pci.c#2 integrate .. //depot/projects/gnn_sctp/src/sys/dev/ppbus/lpt.c#2 integrate .. //depot/projects/gnn_sctp/src/sys/dev/ppbus/ppbconf.c#2 integrate .. //depot/projects/gnn_sctp/src/sys/dev/ppc/ppc.c#2 integrate .. //depot/projects/gnn_sctp/src/sys/dev/ppc/ppc_acpi.c#1 branch .. //depot/projects/gnn_sctp/src/sys/dev/ppc/ppc_isa.c#1 branch .. //depot/projects/gnn_sctp/src/sys/dev/ppc/ppc_pci.c#1 branch .. //depot/projects/gnn_sctp/src/sys/dev/ppc/ppc_puc.c#2 integrate .. //depot/projects/gnn_sctp/src/sys/dev/ppc/ppcreg.h#2 integrate .. //depot/projects/gnn_sctp/src/sys/dev/ppc/ppcvar.h#2 integrate .. //depot/projects/gnn_sctp/src/sys/dev/random/randomdev_soft.c#2 integrate .. //depot/projects/gnn_sctp/src/sys/dev/sab/sab.c#2 delete .. //depot/projects/gnn_sctp/src/sys/dev/sab/sab82532reg.h#2 delete .. //depot/projects/gnn_sctp/src/sys/dev/sound/pci/via8233.c#2 integrate .. //depot/projects/gnn_sctp/src/sys/dev/uart/uart_dev_ns8250.c#2 integrate .. //depot/projects/gnn_sctp/src/sys/dev/xe/if_xe.c#2 integrate .. //depot/projects/gnn_sctp/src/sys/geom/eli/g_eli.c#2 integrate .. //depot/projects/gnn_sctp/src/sys/geom/eli/g_eli_crypto.c#2 integrate .. //depot/projects/gnn_sctp/src/sys/geom/geom_ccd.c#2 integrate .. //depot/projects/gnn_sctp/src/sys/geom/raid3/g_raid3.c#2 integrate .. //depot/projects/gnn_sctp/src/sys/gnu/fs/ext2fs/ext2_bitops.h#2 integrate .. //depot/projects/gnn_sctp/src/sys/i386/conf/GENERIC#2 integrate .. //depot/projects/gnn_sctp/src/sys/i386/conf/NOTES#2 integrate .. //depot/projects/gnn_sctp/src/sys/i386/i386/dump_machdep.c#2 integrate .. //depot/projects/gnn_sctp/src/sys/i386/i386/identcpu.c#2 integrate .. //depot/projects/gnn_sctp/src/sys/i386/i386/minidump_machdep.c#1 branch .. //depot/projects/gnn_sctp/src/sys/i386/i386/mp_machdep.c#2 integrate .. //depot/projects/gnn_sctp/src/sys/i386/i386/nexus.c#2 integrate .. //depot/projects/gnn_sctp/src/sys/i386/include/md_var.h#2 integrate .. //depot/projects/gnn_sctp/src/sys/i386/include/minidump.h#1 branch .. //depot/projects/gnn_sctp/src/sys/i386/isa/npx.c#2 integrate .. //depot/projects/gnn_sctp/src/sys/ia64/ia64/nexus.c#2 integrate .. //depot/projects/gnn_sctp/src/sys/kern/kern_clock.c#2 integrate .. //depot/projects/gnn_sctp/src/sys/kern/kern_event.c#2 integrate .. //depot/projects/gnn_sctp/src/sys/kern/kern_intr.c#2 integrate .. //depot/projects/gnn_sctp/src/sys/kern/kern_mbuf.c#2 integrate .. //depot/projects/gnn_sctp/src/sys/kern/kern_module.c#2 integrate .. //depot/projects/gnn_sctp/src/sys/kern/kern_mutex.c#2 integrate .. //depot/projects/gnn_sctp/src/sys/kern/kern_poll.c#2 integrate .. //depot/projects/gnn_sctp/src/sys/kern/kern_rwlock.c#2 integrate .. //depot/projects/gnn_sctp/src/sys/kern/kern_sig.c#2 integrate .. //depot/projects/gnn_sctp/src/sys/kern/kern_synch.c#2 integrate .. //depot/projects/gnn_sctp/src/sys/kern/kern_thr.c#2 integrate .. //depot/projects/gnn_sctp/src/sys/kern/kern_umtx.c#2 integrate .. //depot/projects/gnn_sctp/src/sys/kern/sched_4bsd.c#2 integrate .. //depot/projects/gnn_sctp/src/sys/kern/serdev_if.m#2 integrate .. //depot/projects/gnn_sctp/src/sys/kern/subr_bus.c#2 integrate .. //depot/projects/gnn_sctp/src/sys/kern/subr_rman.c#2 integrate .. //depot/projects/gnn_sctp/src/sys/kern/subr_sleepqueue.c#2 integrate .. //depot/projects/gnn_sctp/src/sys/kern/subr_taskqueue.c#2 integrate .. //depot/projects/gnn_sctp/src/sys/kern/subr_turnstile.c#2 integrate .. //depot/projects/gnn_sctp/src/sys/kern/subr_witness.c#2 integrate .. //depot/projects/gnn_sctp/src/sys/kern/syscalls.master#2 edit .. //depot/projects/gnn_sctp/src/sys/kern/uipc_domain.c#2 integrate .. //depot/projects/gnn_sctp/src/sys/kern/uipc_mqueue.c#2 integrate .. //depot/projects/gnn_sctp/src/sys/kern/uipc_socket.c#2 integrate .. //depot/projects/gnn_sctp/src/sys/kern/uipc_socket2.c#2 integrate .. //depot/projects/gnn_sctp/src/sys/kern/uipc_syscalls.c#2 edit .. //depot/projects/gnn_sctp/src/sys/kern/uipc_usrreq.c#2 integrate .. //depot/projects/gnn_sctp/src/sys/kern/vfs_cache.c#2 integrate .. //depot/projects/gnn_sctp/src/sys/kern/vfs_hash.c#2 integrate .. //depot/projects/gnn_sctp/src/sys/modules/acpi/Makefile#2 integrate .. //depot/projects/gnn_sctp/src/sys/modules/acpi/acpi_dock/Makefile#1 branch .. //depot/projects/gnn_sctp/src/sys/net/rtsock.c#2 edit .. //depot/projects/gnn_sctp/src/sys/netgraph/netflow/netflow.c#2 integrate .. //depot/projects/gnn_sctp/src/sys/netgraph/netflow/netflow.h#2 integrate .. //depot/projects/gnn_sctp/src/sys/netinet/in_pcb.c#2 integrate .. //depot/projects/gnn_sctp/src/sys/netinet/in_pcb.h#2 integrate .. //depot/projects/gnn_sctp/src/sys/netinet/in_proto.c#2 edit .. //depot/projects/gnn_sctp/src/sys/netinet/ip_divert.c#2 integrate .. //depot/projects/gnn_sctp/src/sys/netinet/ip_fastfwd.c#2 integrate .. //depot/projects/gnn_sctp/src/sys/netinet/ip_input.c#2 integrate .. //depot/projects/gnn_sctp/src/sys/netinet/raw_ip.c#2 integrate .. //depot/projects/gnn_sctp/src/sys/netinet/sctp.h#1 add .. //depot/projects/gnn_sctp/src/sys/netinet/sctp_asconf.c#1 add .. //depot/projects/gnn_sctp/src/sys/netinet/sctp_asconf.h#1 add .. //depot/projects/gnn_sctp/src/sys/netinet/sctp_auth.c#1 add .. //depot/projects/gnn_sctp/src/sys/netinet/sctp_auth.h#1 add .. //depot/projects/gnn_sctp/src/sys/netinet/sctp_constants.h#1 add .. //depot/projects/gnn_sctp/src/sys/netinet/sctp_crc32.c#1 add .. //depot/projects/gnn_sctp/src/sys/netinet/sctp_crc32.h#1 add .. //depot/projects/gnn_sctp/src/sys/netinet/sctp_hashdriver.c#1 add .. //depot/projects/gnn_sctp/src/sys/netinet/sctp_hashdriver.h#1 add .. //depot/projects/gnn_sctp/src/sys/netinet/sctp_header.h#1 add .. //depot/projects/gnn_sctp/src/sys/netinet/sctp_indata.c#1 add .. //depot/projects/gnn_sctp/src/sys/netinet/sctp_indata.h#1 add .. //depot/projects/gnn_sctp/src/sys/netinet/sctp_input.c#1 add .. //depot/projects/gnn_sctp/src/sys/netinet/sctp_input.h#1 add .. //depot/projects/gnn_sctp/src/sys/netinet/sctp_output.c#1 add .. //depot/projects/gnn_sctp/src/sys/netinet/sctp_output.h#1 add .. //depot/projects/gnn_sctp/src/sys/netinet/sctp_pcb.c#1 add .. //depot/projects/gnn_sctp/src/sys/netinet/sctp_pcb.h#1 add .. //depot/projects/gnn_sctp/src/sys/netinet/sctp_peeloff.c#1 add .. //depot/projects/gnn_sctp/src/sys/netinet/sctp_peeloff.h#1 add .. //depot/projects/gnn_sctp/src/sys/netinet/sctp_sack.h#1 add .. //depot/projects/gnn_sctp/src/sys/netinet/sctp_sha1.c#1 add .. //depot/projects/gnn_sctp/src/sys/netinet/sctp_sha1.h#1 add .. //depot/projects/gnn_sctp/src/sys/netinet/sctp_structs.h#1 add .. //depot/projects/gnn_sctp/src/sys/netinet/sctp_timer.c#1 add .. //depot/projects/gnn_sctp/src/sys/netinet/sctp_timer.h#1 add .. //depot/projects/gnn_sctp/src/sys/netinet/sctp_uio.h#1 add .. //depot/projects/gnn_sctp/src/sys/netinet/sctp_usrreq.c#1 add .. //depot/projects/gnn_sctp/src/sys/netinet/sctp_var.h#1 add .. //depot/projects/gnn_sctp/src/sys/netinet/sctputil.c#1 add .. //depot/projects/gnn_sctp/src/sys/netinet/sctputil.h#1 add .. //depot/projects/gnn_sctp/src/sys/netinet/tcp_input.c#2 integrate .. //depot/projects/gnn_sctp/src/sys/netinet/tcp_subr.c#2 integrate .. //depot/projects/gnn_sctp/src/sys/netinet/tcp_usrreq.c#2 integrate .. //depot/projects/gnn_sctp/src/sys/netinet/udp_usrreq.c#2 integrate .. //depot/projects/gnn_sctp/src/sys/netinet6/frag6.c#2 integrate .. //depot/projects/gnn_sctp/src/sys/netinet6/in6_ifattach.c#2 integrate .. //depot/projects/gnn_sctp/src/sys/netinet6/in6_pcb.c#2 integrate .. //depot/projects/gnn_sctp/src/sys/netinet6/in6_pcb.h#2 integrate .. //depot/projects/gnn_sctp/src/sys/netinet6/in6_proto.c#2 edit .. //depot/projects/gnn_sctp/src/sys/netinet6/in6_src.c#2 integrate .. //depot/projects/gnn_sctp/src/sys/netinet6/sctp6_usrreq.c#1 add .. //depot/projects/gnn_sctp/src/sys/netinet6/sctp6_var.h#1 add .. //depot/projects/gnn_sctp/src/sys/netnatm/natm.c#2 integrate .. //depot/projects/gnn_sctp/src/sys/netnatm/natm_pcb.c#2 integrate .. //depot/projects/gnn_sctp/src/sys/nfsserver/nfsrvcache.h#2 integrate .. //depot/projects/gnn_sctp/src/sys/pc98/cbus/ppc.c#2 delete .. //depot/projects/gnn_sctp/src/sys/pc98/cbus/ppcreg.h#2 delete .. //depot/projects/gnn_sctp/src/sys/pc98/include/minidump.h#1 branch .. //depot/projects/gnn_sctp/src/sys/pc98/pc98/machdep.c#2 integrate .. //depot/projects/gnn_sctp/src/sys/powerpc/powermac/grackle.c#2 integrate .. //depot/projects/gnn_sctp/src/sys/powerpc/powermac/hrowpic.c#2 integrate .. //depot/projects/gnn_sctp/src/sys/powerpc/powermac/macio.c#2 integrate .. //depot/projects/gnn_sctp/src/sys/powerpc/powermac/uninorth.c#2 integrate .. //depot/projects/gnn_sctp/src/sys/powerpc/powerpc/openpic.c#2 integrate .. //depot/projects/gnn_sctp/src/sys/powerpc/psim/iobus.c#2 integrate .. //depot/projects/gnn_sctp/src/sys/security/mac_bsdextended/mac_bsdextended.c#2 integrate .. //depot/projects/gnn_sctp/src/sys/security/mac_bsdextended/mac_bsdextended.h#2 integrate .. //depot/projects/gnn_sctp/src/sys/sparc64/conf/GENERIC#2 integrate .. //depot/projects/gnn_sctp/src/sys/sparc64/conf/NOTES#2 integrate .. //depot/projects/gnn_sctp/src/sys/sparc64/ebus/ebus.c#2 integrate .. //depot/projects/gnn_sctp/src/sys/sparc64/pci/psycho.c#2 integrate .. //depot/projects/gnn_sctp/src/sys/sparc64/sbus/sbus.c#2 integrate .. //depot/projects/gnn_sctp/src/sys/sparc64/sparc64/exception.S#2 integrate .. //depot/projects/gnn_sctp/src/sys/sparc64/sparc64/interrupt.S#2 integrate .. //depot/projects/gnn_sctp/src/sys/sparc64/sparc64/nexus.c#2 integrate .. //depot/projects/gnn_sctp/src/sys/sys/bus.h#2 integrate .. //depot/projects/gnn_sctp/src/sys/sys/eventhandler.h#2 integrate .. //depot/projects/gnn_sctp/src/sys/sys/lock.h#2 integrate .. //depot/projects/gnn_sctp/src/sys/sys/mbuf.h#2 edit .. //depot/projects/gnn_sctp/src/sys/sys/module.h#2 integrate .. //depot/projects/gnn_sctp/src/sys/sys/param.h#2 integrate .. //depot/projects/gnn_sctp/src/sys/sys/rwlock.h#2 integrate .. //depot/projects/gnn_sctp/src/sys/sys/socket.h#2 edit .. //depot/projects/gnn_sctp/src/sys/sys/turnstile.h#2 integrate .. //depot/projects/gnn_sctp/src/sys/sys/vnode.h#2 integrate .. //depot/projects/gnn_sctp/src/sys/ufs/ffs/ffs_softdep.c#2 integrate .. //depot/projects/gnn_sctp/src/sys/ufs/ffs/ffs_vfsops.c#2 integrate .. //depot/projects/gnn_sctp/src/sys/vm/vm_mmap.c#2 integrate .. //depot/projects/gnn_sctp/src/sys/vm/vm_page.c#2 integrate .. //depot/projects/gnn_sctp/src/sys/vm/vm_pageq.c#2 integrate .. //depot/projects/gnn_sctp/src/sys/vm/vm_zeroidle.c#2 integrate Differences ... ==== //depot/projects/gnn_sctp/src/sys/alpha/conf/GENERIC#2 (text+ko) ==== @@ -18,7 +18,7 @@ # # For hardware specific information check HARDWARE.TXT # -# $FreeBSD: src/sys/alpha/conf/GENERIC,v 1.192 2006/01/10 09:19:07 phk Exp $ +# $FreeBSD: src/sys/alpha/conf/GENERIC,v 1.193 2006/04/24 08:44:33 delphij Exp $ cpu EV4 cpu EV5 @@ -70,8 +70,6 @@ options SYSVMSG # SYSV-style message queues options SYSVSEM # SYSV-style semaphores options _KPOSIX_PRIORITY_SCHEDULING # POSIX P1003_1B real-time extensions -options AHC_REG_PRETTY_PRINT # Print register bitfields in debug - # output. Adds ~128k to driver. options ADAPTIVE_GIANT # Giant mutex is adaptive. # Debugging for use in -current @@ -106,6 +104,8 @@ # SCSI Controllers device ahc # AHA2940 and onboard AIC7xxx devices +options AHC_REG_PRETTY_PRINT # Print register bitfields in debug + # output. Adds ~128k to driver. device isp # Qlogic family device ispfw # Firmware module for Qlogic host adapters device mpt # LSI-Logic MPT-Fusion ==== //depot/projects/gnn_sctp/src/sys/alpha/isa/isa.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/alpha/isa/isa.c,v 1.38 2005/10/25 19:48:45 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/isa/isa.c,v 1.39 2006/04/20 04:16:02 imp Exp $"); #include #include @@ -231,6 +231,7 @@ res = rman_reserve_resource(&isa_drq_rman, start, start, 1, 0, child); + rman_set_rid(res, *rid); if (res && !passthrough) { rle = resource_list_find(rl, type, *rid); rle->start = rman_get_start(res); ==== //depot/projects/gnn_sctp/src/sys/alpha/pci/apecs_pci.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/alpha/pci/apecs_pci.c,v 1.15 2003/08/22 07:20:27 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/pci/apecs_pci.c,v 1.16 2006/04/20 04:16:02 imp Exp $"); #include #include @@ -79,12 +79,17 @@ apecs_pcib_alloc_resource(device_t bus, device_t child, int type, int *rid, u_long start, u_long end, u_long count, u_int flags) { + struct resource *rv = NULL; + if ((hwrpb->rpb_type == ST_DEC_2100_A50) && (type == SYS_RES_IRQ)) - return isa_alloc_intr(bus, child, start); + rv = isa_alloc_intr(bus, child, start); else - return alpha_pci_alloc_resource(bus, child, type, rid, - start, end, count, flags); + rv = alpha_pci_alloc_resource(bus, child, type, rid, + start, end, count, flags); + if (rv != NULL) + rman_set_rid(rv, *rid); + return (rv); } static int ==== //depot/projects/gnn_sctp/src/sys/alpha/pci/lca_pci.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/alpha/pci/lca_pci.c,v 1.17 2003/08/22 07:20:27 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/pci/lca_pci.c,v 1.18 2006/04/20 04:16:02 imp Exp $"); #include #include @@ -78,11 +78,16 @@ lca_pcib_alloc_resource(device_t bus, device_t child, int type, int *rid, u_long start, u_long end, u_long count, u_int flags) { + struct resource *rv = NULL; + if (type == SYS_RES_IRQ) - return isa_alloc_intr(bus, child, start); + rv = isa_alloc_intr(bus, child, start); else - return alpha_pci_alloc_resource(bus, child, type, rid, - start, end, count, flags); + rv = alpha_pci_alloc_resource(bus, child, type, rid, + start, end, count, flags); + if (rv != NULL) + rman_set_rid(rv, *rid); + return (rv); } static int ==== //depot/projects/gnn_sctp/src/sys/alpha/pci/pcibus.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/alpha/pci/pcibus.c,v 1.37 2005/09/25 20:12:29 phk Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/pci/pcibus.c,v 1.39 2006/04/22 19:04:21 marcel Exp $"); #include "opt_isa.h" @@ -96,7 +96,7 @@ alpha_platform_alloc_ide_intr(int chan) { int irqs[2] = { 14, 15 }; - return isa_alloc_intr(0, 0, irqs[chan]); + return (isa_alloc_intr(0, 0, irqs[chan])); } int @@ -230,9 +230,11 @@ #ifdef DEV_ISA if((start >= ISA_IRQ_OFFSET) && (end < ISA_IRQ_OFFSET + ISA_IRQ_LEN)) { - return isa_alloc_intrs(bus, child, - start - ISA_IRQ_OFFSET, - end - ISA_IRQ_OFFSET); + rv = isa_alloc_intrs(bus, child, + start - ISA_IRQ_OFFSET, end - ISA_IRQ_OFFSET); + if (rv != NULL) + rman_set_rid(rv, *rid); + return (rv); } else #endif @@ -252,6 +254,7 @@ if (rv == 0) return 0; + rman_set_rid(rv, *rid); rstart = rman_get_start(rv); rman_set_bustag(rv, ALPHAPCI_GET_BUSTAG(bus, type)); rman_set_bushandle(rv, rstart); ==== //depot/projects/gnn_sctp/src/sys/amd64/amd64/dump_machdep.c#2 (text+ko) ==== @@ -25,12 +25,13 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/dump_machdep.c,v 1.11 2005/07/02 19:57:30 marcel Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/dump_machdep.c,v 1.12 2006/04/21 04:24:50 peter Exp $"); #include #include #include #include +#include #include #include #include @@ -40,6 +41,11 @@ CTASSERT(sizeof(struct kerneldumpheader) == 512); +int do_minidump = 1; +TUNABLE_INT("debug.minidump", &do_minidump); +SYSCTL_INT(_debug, OID_AUTO, minidump, CTLFLAG_RW, &do_minidump, 0, + "Enable mini crash dumps"); + /* * Don't touch the first SIZEOF_METADATA bytes on the dump device. This * is to protect us from metadata and to protect metadata from us. @@ -272,6 +278,10 @@ size_t hdrsz; int error; + if (do_minidump) { + minidumpsys(di); + return; + } bzero(&ehdr, sizeof(ehdr)); ehdr.e_ident[EI_MAG0] = ELFMAG0; ehdr.e_ident[EI_MAG1] = ELFMAG1; ==== //depot/projects/gnn_sctp/src/sys/amd64/amd64/fpu.c#2 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/fpu.c,v 1.157 2005/03/11 22:16:09 peter Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/fpu.c,v 1.158 2006/04/19 07:00:19 cperciva Exp $"); #include #include @@ -96,6 +96,8 @@ typedef u_char bool_t; +static void fpu_clean_state(void); + int hw_float = 1; SYSCTL_INT(_hw,HW_FLOATINGPT, floatingpoint, CTLFLAG_RD, &hw_float, 0, @@ -407,6 +409,8 @@ PCPU_SET(fpcurthread, curthread); pcb = PCPU_GET(curpcb); + fpu_clean_state(); + if ((pcb->pcb_flags & PCB_FPUINITDONE) == 0) { /* * This is the first time this thread has used the FPU, @@ -474,6 +478,7 @@ s = intr_disable(); if (td == PCPU_GET(fpcurthread)) { + fpu_clean_state(); fxrstor(addr); intr_restore(s); } else { @@ -484,6 +489,37 @@ } /* + * On AuthenticAMD processors, the fxrstor instruction does not restore + * the x87's stored last instruction pointer, last data pointer, and last + * opcode values, except in the rare case in which the exception summary + * (ES) bit in the x87 status word is set to 1. + * + * In order to avoid leaking this information across processes, we clean + * these values by performing a dummy load before executing fxrstor(). + */ +static double dummy_variable = 0.0; +static void +fpu_clean_state(void) +{ + u_short status; + + /* + * Clear the ES bit in the x87 status word if it is currently + * set, in order to avoid causing a fault in the upcoming load. + */ + fnstsw(&status); + if (status & 0x80) + fnclex(); + + /* + * Load the dummy variable into the x87 stack. This mangles + * the x87 stack, but we don't care since we're about to call + * fxrstor() anyway. + */ + __asm __volatile("ffree %%st(7); fld %0" : : "m" (dummy_variable)); +} + +/* * This really sucks. We want the acpi version only, but it requires * the isa_if.h file in order to get the definitions. */ ==== //depot/projects/gnn_sctp/src/sys/amd64/amd64/identcpu.c#2 (text+ko) ==== @@ -39,7 +39,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/identcpu.c,v 1.144 2006/02/15 14:48:59 dwmalone Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/identcpu.c,v 1.146 2006/04/24 22:56:57 jkim Exp $"); #include "opt_cpu.h" @@ -233,7 +233,7 @@ "\014" "\015" "\016CX16" /* CMPXCHG16B Instruction */ - "\017" + "\017XTPR" /* Send Task Priority Messages*/ "\020" "\021" "\022" @@ -360,7 +360,8 @@ else if (strcmp(cpu_vendor, "GenuineIntel") == 0 && (cpu_high >= 4)) { cpuid_count(4, 0, regs); - cmp = ((regs[0] & 0xfc000000) >> 26) + 1; + if ((regs[0] & 0x1f) != 0) + cmp = ((regs[0] >> 26) & 0x3f) + 1; } if (cmp > 1) printf("\n Cores per package: %d", cmp); ==== //depot/projects/gnn_sctp/src/sys/amd64/amd64/mp_machdep.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/mp_machdep.c,v 1.271 2006/03/18 19:32:46 ups Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/mp_machdep.c,v 1.273 2006/04/25 00:06:37 jkim Exp $"); #include "opt_cpu.h" #include "opt_kstack_pages.h" @@ -183,6 +183,7 @@ mp_topology(void) { struct cpu_group *group; + u_int regs[4]; int logical_cpus; int apic_id; int groups; @@ -195,6 +196,13 @@ logical_cpus = (cpu_procinfo & CPUID_HTT_CORES) >> 16; if (logical_cpus <= 1) return; + /* Nothing to do if reported cores are physical cores. */ + if (strcmp(cpu_vendor, "GenuineIntel") == 0 && cpu_high >= 4) { + cpuid_count(4, 0, regs); + if ((regs[0] & 0x1f) != 0 && + logical_cpus <= ((regs[0] >> 26) & 0x3f) + 1) + return; + } group = &mp_groups[0]; groups = 1; for (cpu = 0, apic_id = 0; apic_id < MAXCPU; apic_id++) { @@ -385,8 +393,8 @@ * are available, use them. */ if (cpu_high >= 4) { - /* Ask the processor about up to 32 caches. */ - for (i = 0; i < 32; i++) { + /* Ask the processor about the L1 cache. */ + for (i = 0; i < 1; i++) { cpuid_count(4, i, p); threads_per_cache = ((p[0] & 0x3ffc000) >> 14) + 1; if (hyperthreading_cpus < threads_per_cache) ==== //depot/projects/gnn_sctp/src/sys/amd64/amd64/nexus.c#2 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/nexus.c,v 1.67 2005/09/25 20:03:41 phk Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/nexus.c,v 1.68 2006/04/20 04:16:34 imp Exp $"); /* * This code implements a `root nexus' for Intel Architecture @@ -340,7 +340,7 @@ rv = rman_reserve_resource(rm, start, end, count, flags, child); if (rv == 0) return 0; - + rman_set_rid(rv, *rid); if (type == SYS_RES_MEMORY) { rman_set_bustag(rv, AMD64_BUS_SPACE_MEM); } else if (type == SYS_RES_IOPORT) { ==== //depot/projects/gnn_sctp/src/sys/amd64/amd64/pmap.c#2 (text+ko) ==== @@ -77,7 +77,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.544 2006/04/12 04:22:50 alc Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.549 2006/04/21 04:50:18 peter Exp $"); /* * Manages physical address maps. @@ -106,6 +106,7 @@ */ #include "opt_msgbuf.h" +#include "opt_pmap.h" #include #include @@ -180,7 +181,7 @@ static u_int64_t KPTphys; /* phys addr of kernel level 1 */ static u_int64_t KPDphys; /* phys addr of kernel level 2 */ -static u_int64_t KPDPphys; /* phys addr of kernel level 3 */ +u_int64_t KPDPphys; /* phys addr of kernel level 3 */ u_int64_t KPML4phys; /* phys addr of kernel level 4 */ static u_int64_t DMPDphys; /* phys addr of direct mapped level 2 */ @@ -1546,7 +1547,7 @@ PV_STAT(pv_entry_frees++); PV_STAT(pv_entry_spare++); - PV_STAT(pv_entry_count--); + pv_entry_count--; pc = pv_to_chunk(pv); idx = pv - &pc->pc_pventry[0]; field = idx / 64; @@ -1564,6 +1565,7 @@ /* entire chunk is free, return it */ TAILQ_REMOVE(&pmap->pm_pvchunk, pc, pc_list); m = PHYS_TO_VM_PAGE(DMAP_TO_PHYS((vm_offset_t)pc)); + dump_drop_page(m->phys_addr); vm_page_lock_queues(); vm_page_free(m); vm_page_unlock_queues(); @@ -1587,7 +1589,7 @@ PMAP_LOCK_ASSERT(pmap, MA_OWNED); mtx_assert(&vm_page_queue_mtx, MA_OWNED); PV_STAT(pv_entry_allocs++); - PV_STAT(pv_entry_count++); + pv_entry_count++; if (pv_entry_count > pv_entry_high_water) pagedaemon_wakeup(); pc = TAILQ_FIRST(&pmap->pm_pvchunk); @@ -1615,6 +1617,7 @@ m = vm_page_alloc(NULL, colour, VM_ALLOC_SYSTEM | VM_ALLOC_NOOBJ); if (m == NULL) { if (try) { + pv_entry_count--; PV_STAT(pc_chunk_tryfail++); return (NULL); } @@ -1643,6 +1646,7 @@ PV_STAT(pc_chunk_count++); PV_STAT(pc_chunk_allocs++); colour++; + dump_add_page(m->phys_addr); pc = (void *)PHYS_TO_DMAP(m->phys_addr); pc->pc_pmap = pmap; pc->pc_map[0] = PC_FREE0 & ~1ul; /* preallocated bit 0 */ @@ -2776,7 +2780,7 @@ /* Mark free */ PV_STAT(pv_entry_frees++); PV_STAT(pv_entry_spare++); - PV_STAT(pv_entry_count--); + pv_entry_count--; pc->pc_map[field] |= bitmask; m->md.pv_list_count--; TAILQ_REMOVE(&m->md.pv_list, pv, pv_list); @@ -2792,6 +2796,7 @@ PV_STAT(pc_chunk_frees++); TAILQ_REMOVE(&pmap->pm_pvchunk, pc, pc_list); m = PHYS_TO_VM_PAGE(DMAP_TO_PHYS((vm_offset_t)pc)); + dump_drop_page(m->phys_addr); vm_page_lock_queues(); vm_page_free(m); vm_page_unlock_queues(); ==== //depot/projects/gnn_sctp/src/sys/amd64/amd64/uma_machdep.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/uma_machdep.c,v 1.1 2003/10/14 05:51:31 alc Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/uma_machdep.c,v 1.2 2006/04/21 04:24:50 peter Exp $"); #include #include @@ -44,6 +44,7 @@ { static vm_pindex_t colour; vm_page_t m; + vm_paddr_t pa; void *va; int pflags; @@ -64,7 +65,9 @@ } else break; } - va = (void *)PHYS_TO_DMAP(m->phys_addr); + pa = m->phys_addr; + dump_add_page(pa); + va = (void *)PHYS_TO_DMAP(pa); if ((wait & M_ZERO) && (m->flags & PG_ZERO) == 0) pagezero(va); return (va); @@ -74,8 +77,11 @@ uma_small_free(void *mem, int size, u_int8_t flags) { vm_page_t m; + vm_paddr_t pa; - m = PHYS_TO_VM_PAGE(DMAP_TO_PHYS((vm_offset_t)mem)); + pa = DMAP_TO_PHYS((vm_offset_t)mem); + dump_drop_page(pa); + m = PHYS_TO_VM_PAGE(pa); vm_page_lock_queues(); vm_page_free(m); vm_page_unlock_queues(); ==== //depot/projects/gnn_sctp/src/sys/amd64/conf/GENERIC#2 (text+ko) ==== @@ -16,7 +16,7 @@ # If you are in doubt as to the purpose or necessity of a line, check first # in NOTES. # -# $FreeBSD: src/sys/amd64/conf/GENERIC,v 1.452 2006/04/10 20:04:22 ps Exp $ +# $FreeBSD: src/sys/amd64/conf/GENERIC,v 1.453 2006/04/24 08:44:33 delphij Exp $ cpu HAMMER ident GENERIC @@ -57,10 +57,6 @@ options SYSVSEM # SYSV-style semaphores options _KPOSIX_PRIORITY_SCHEDULING # POSIX P1003_1B real-time extensions options KBD_INSTALL_CDEV # install a CDEV entry in /dev -options AHC_REG_PRETTY_PRINT # Print register bitfields in debug - # output. Adds ~128k to driver. -options AHD_REG_PRETTY_PRINT # Print register bitfields in debug - # output. Adds ~215k to driver. options ADAPTIVE_GIANT # Giant mutex is adaptive. options STOP_NMI # Stop CPUS using NMI instead of IPI @@ -98,7 +94,11 @@ # SCSI Controllers device ahc # AHA2940 and onboard AIC7xxx devices +options AHC_REG_PRETTY_PRINT # Print register bitfields in debug + # output. Adds ~128k to driver. device ahd # AHA39320/29320 and onboard AIC79xx devices +options AHD_REG_PRETTY_PRINT # Print register bitfields in debug + # output. Adds ~215k to driver. device amd # AMD 53C974 (Tekram DC-390(T)) device isp # Qlogic family #device ispfw # Firmware for QLogic HBAs- normally a module ==== //depot/projects/gnn_sctp/src/sys/amd64/include/md_var.h#2 (text+ko) ==== @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/amd64/include/md_var.h,v 1.76 2005/10/14 22:52:00 jkim Exp $ + * $FreeBSD: src/sys/amd64/include/md_var.h,v 1.77 2006/04/21 04:24:50 peter Exp $ */ #ifndef _MACHINE_MD_VAR_H_ @@ -53,6 +53,8 @@ extern char kstack[]; extern char sigcode[]; extern int szsigcode; +extern uint64_t *vm_page_dump; +extern int vm_page_dump_size; extern struct pcpu __pcpu[]; @@ -61,11 +63,14 @@ struct reg; struct fpreg; struct dbreg; +struct dumperinfo; void busdma_swi(void); void cpu_setregs(void); void doreti_iret(void) __asm(__STRING(doreti_iret)); void doreti_iret_fault(void) __asm(__STRING(doreti_iret_fault)); +void dump_add_page(vm_paddr_t); +void dump_drop_page(vm_paddr_t); void initializecpu(void); void fillw(int /*u_short*/ pat, void *base, size_t cnt); void fpstate_drop(struct thread *td); @@ -75,5 +80,6 @@ void pagezero(void *addr); void setidt(int idx, alias_for_inthand_t *func, int typ, int dpl, int ist); int user_dbreg_trap(void); +void minidumpsys(struct dumperinfo *); #endif /* !_MACHINE_MD_VAR_H_ */ ==== //depot/projects/gnn_sctp/src/sys/arm/arm/nexus.c#2 (text+ko) ==== @@ -40,7 +40,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/arm/arm/nexus.c,v 1.6 2005/09/25 21:06:49 cognet Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/arm/nexus.c,v 1.7 2006/04/20 04:12:02 imp Exp $"); #include #include @@ -214,6 +214,7 @@ if (rv == 0) return 0; + rman_set_rid(rv, *rid); rman_set_bustag(rv, (void*)ARM_BUS_SPACE_MEM); rman_set_bushandle(rv, rman_get_start(rv)); ==== //depot/projects/gnn_sctp/src/sys/arm/arm/pmap.c#2 (text+ko) ==== @@ -147,7 +147,7 @@ #include "opt_vm.h" #include -__FBSDID("$FreeBSD: src/sys/arm/arm/pmap.c,v 1.46 2006/04/03 21:16:07 peter Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/arm/pmap.c,v 1.47 2006/04/22 22:51:32 cognet Exp $"); #include #include #include @@ -1204,18 +1204,6 @@ } /* - * this routine defines the region(s) of memory that should - * not be tested for the modified bit. - */ -static PMAP_INLINE int -pmap_track_modified(vm_offset_t va) -{ - if ((va < kmi.clean_sva) || (va >= kmi.clean_eva)) - return 1; - else - return 0; -} -/* * PTE_SYNC_CURRENT: * * Make sure the pte is written out to RAM. @@ -1559,8 +1547,7 @@ ptep = &l2b->l2b_kva[l2pte_index(va)]; npte = opte = *ptep; - if (maskbits & (PVF_WRITE|PVF_MOD) && - !pmap_track_modified(pv->pv_va)) { + if (maskbits & (PVF_WRITE|PVF_MOD)) { if ((pv->pv_flags & PVF_NC)) { /* * Entry is not cacheable: @@ -1618,7 +1605,7 @@ } } - if (maskbits & PVF_REF && !pmap_track_modified(pv->pv_va)) { + if (maskbits & PVF_REF) { if ((pv->pv_flags & PVF_NC) == 0 && (maskbits & (PVF_WRITE|PVF_MOD)) == 0) { /* @@ -2056,10 +2043,8 @@ goto out; } - if (pmap_track_modified(pv->pv_va)) { - pg->md.pvh_attrs |= PVF_REF | PVF_MOD; - vm_page_dirty(pg); - } + pg->md.pvh_attrs |= PVF_REF | PVF_MOD; + vm_page_dirty(pg); pv->pv_flags |= PVF_REF | PVF_MOD; /* @@ -3267,8 +3252,7 @@ f = pmap_modify_pv(pg, pm, sva, PVF_WRITE, 0); pmap_vac_me_harder(pg, pm, sva); - if (pmap_track_modified(sva)) - vm_page_dirty(pg); + vm_page_dirty(pg); } else f = PVF_REF | PVF_EXEC; @@ -3391,8 +3375,7 @@ * writable from the outset. */ nflags |= PVF_MOD; - if (!(m->md.pvh_attrs & PVF_MOD) && - pmap_track_modified(va)) + if (!(m->md.pvh_attrs & PVF_MOD)) vm_page_dirty(m); } if (m && opte) @@ -3477,8 +3460,11 @@ if ((pve = pmap_get_pv_entry()) == NULL) { panic("pmap_enter: no pv entries"); } - if (m && !(m->flags & (PG_UNMANAGED | PG_FICTITIOUS))) + if (m && !(m->flags & (PG_UNMANAGED | PG_FICTITIOUS))) { + KASSERT(va < kmi.clean_sva || va >= kmi.clean_eva, + ("pmap_enter: managed mapping within the clean submap")); pmap_enter_pv(m, pve, pmap, va, nflags); + } } /* * Make sure userland mappings get the right permissions ==== //depot/projects/gnn_sctp/src/sys/arm/at91/at91.c#2 (text) ==== @@ -23,7 +23,7 @@ >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sun May 7 20:45:06 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 02D1516A48E; Sun, 7 May 2006 20:45:06 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id A174116A486 for ; Sun, 7 May 2006 20:45:04 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 553BF43D82 for ; Sun, 7 May 2006 20:44:47 +0000 (GMT) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k47KilxO093576 for ; Sun, 7 May 2006 20:44:47 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k47KilXM093564 for perforce@freebsd.org; Sun, 7 May 2006 20:44:47 GMT (envelope-from jb@freebsd.org) Date: Sun, 7 May 2006 20:44:47 GMT Message-Id: <200605072044.k47KilXM093564@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 96784 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 07 May 2006 20:45:09 -0000 http://perforce.freebsd.org/chv.cgi?CH=96784 Change 96784 by jb@jb_freebsd2 on 2006/05/07 20:44:16 We can't use this file directly. After being ifdef'ed it looks like the result of a terrorist attack. Affected files ... .. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/os/cyclic.c#2 delete Differences ... From owner-p4-projects@FreeBSD.ORG Sun May 7 21:06:21 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9964216A46E; Sun, 7 May 2006 21:06:21 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 5A40D16A45E for ; Sun, 7 May 2006 21:06:21 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 2589143D53 for ; Sun, 7 May 2006 21:06:13 +0000 (GMT) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k47L6Dno013586 for ; Sun, 7 May 2006 21:06:13 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k47L6DcA013583 for perforce@freebsd.org; Sun, 7 May 2006 21:06:13 GMT (envelope-from jb@freebsd.org) Date: Sun, 7 May 2006 21:06:13 GMT Message-Id: <200605072106.k47L6DcA013583@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 96785 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 07 May 2006 21:06:22 -0000 http://perforce.freebsd.org/chv.cgi?CH=96785 Change 96785 by jb@jb_freebsd2 on 2006/05/07 21:05:51 Having to do this is annoying. If we can specifiy 'compile-with' in files, why can't we share the definition with the depend stage?! Affected files ... .. //depot/projects/dtrace/src/sys/conf/kern.pre.mk#3 edit Differences ... ==== //depot/projects/dtrace/src/sys/conf/kern.pre.mk#3 (text+ko) ==== @@ -78,6 +78,9 @@ # ... and XFS INCLUDES+= -I$S/gnu/fs/xfs/FreeBSD -I$S/gnu/fs/xfs/FreeBSD/support -I$S/gnu/fs/xfs +# ... and OpenSolaris +INCLUDES+= -I$S/contrib/opensolaris/compat + .endif CFLAGS= ${COPTFLAGS} ${CWARNFLAGS} ${DEBUG} From owner-p4-projects@FreeBSD.ORG Sun May 7 21:19:30 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8431616A410; Sun, 7 May 2006 21:19:30 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 46A6416A40E for ; Sun, 7 May 2006 21:19:30 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 0B59C43D45 for ; Sun, 7 May 2006 21:19:30 +0000 (GMT) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k47LJTpq021068 for ; Sun, 7 May 2006 21:19:29 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k47LJTdu021065 for perforce@freebsd.org; Sun, 7 May 2006 21:19:29 GMT (envelope-from kmacy@freebsd.org) Date: Sun, 7 May 2006 21:19:29 GMT Message-Id: <200605072119.k47LJTdu021065@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 96786 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 07 May 2006 21:19:30 -0000 http://perforce.freebsd.org/chv.cgi?CH=96786 Change 96786 by kmacy@kmacy_storage:sun4v_rwbuf on 2006/05/07 21:19:03 limit the range that vm_page_alloc_contig can allocate from to work around its poor handling of small memory ranges scrub hash table when a process exits as a workaround for finding entries in the hash that don't exist in the pv list Affected files ... .. //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/tte_hash.c#25 edit Differences ... ==== //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/tte_hash.c#25 (text+ko) ==== @@ -180,7 +180,6 @@ uma_zone_set_obj(thzone, &thzone_obj, tte_hash_max); } - tte_hash_t tte_hash_kernel_create(vm_offset_t va, uint64_t size) { @@ -195,7 +194,6 @@ return th; } - tte_hash_t tte_hash_create(uint64_t context, uint64_t *scratchval) { @@ -212,17 +210,17 @@ m = NULL; while (m == NULL) { - m = vm_page_alloc_contig(HASH_SIZE, 2*PAGE_SIZE_4M, - (1UL<<34), PAGE_SIZE, (1UL<<34)); + m = vm_page_alloc_contig(HASH_SIZE, phys_avail[0], + phys_avail[1], PAGE_SIZE, (1UL<<34)); if (m == NULL) { printf("vm_page_alloc_contig failed - waiting to retry\n"); VM_WAIT; } } - for (i = 0, tm = m; i < HASH_SIZE; i++, tm++) { + for (i = 0, tm = m; i < HASH_SIZE; i++, tm++) if ((tm->flags & PG_ZERO) == 0) pmap_zero_page(tm); - } + th->th_hashtable = (void *)TLB_PHYS_TO_DIRECT(VM_PAGE_TO_PHYS(m)); m = NULL; while (m == NULL) { @@ -268,6 +266,9 @@ fh->thf_head.fh_free_head = 0; if (th->th_entries != 0) panic("%d remaining entries", th->th_entries); +#ifndef DONT_SCRUB_ENTRIES + pmap_scrub_pages(TLB_DIRECT_TO_PHYS((vm_offset_t)th->th_hashtable), th->th_size*PAGE_SIZE); +#endif } static __inline void From owner-p4-projects@FreeBSD.ORG Sun May 7 21:22:35 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D4D2316A404; Sun, 7 May 2006 21:22:34 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id B1C7116A401 for ; Sun, 7 May 2006 21:22:34 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 4D2D843D45 for ; Sun, 7 May 2006 21:22:34 +0000 (GMT) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k47LMYA6023574 for ; Sun, 7 May 2006 21:22:34 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k47LMXG5023563 for perforce@freebsd.org; Sun, 7 May 2006 21:22:33 GMT (envelope-from kmacy@freebsd.org) Date: Sun, 7 May 2006 21:22:33 GMT Message-Id: <200605072122.k47LMXG5023563@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 96787 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 07 May 2006 21:22:35 -0000 http://perforce.freebsd.org/chv.cgi?CH=96787 Change 96787 by kmacy@kmacy_storage:sun4v_rwbuf on 2006/05/07 21:22:08 largely more verbose error checking remove redundant page zeroing Affected files ... .. //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/pmap.c#47 edit Differences ... ==== //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/pmap.c#47 (text+ko) ==== @@ -179,7 +179,7 @@ #ifdef PMAP_DEBUG #define KDPRINTF if (pmap_debug) printf #define DPRINTF \ - if ((PCPU_GET(cpumask) & PCPU_GET(curpmap)->pm_active) == 0) \ + if ((PCPU_GET(curpmap)->pm_context != 0) && (PCPU_GET(cpumask) & PCPU_GET(curpmap)->pm_active) == 0) \ panic("cpumask(0x%x) & active (0x%x) == 0 pid == %d\n", \ PCPU_GET(cpumask), PCPU_GET(curpmap)->pm_active, curthread->td_proc->p_pid); \ if (pmap_debug) printf @@ -392,20 +392,18 @@ pmap_t pmap, oldpmap; DPRINTF("activating pmap for %d\n", td->td_tid); - spinlock_enter(); + critical_enter(); pmap = vmspace_pmap(td->td_proc->p_vmspace); oldpmap = PCPU_GET(curpmap); #if defined(SMP) atomic_clear_int(&oldpmap->pm_active, PCPU_GET(cpumask)); - pmap->pm_tlbactive = pmap->pm_active = PCPU_GET(cpumask); - + atomic_set_int(&pmap->pm_tlbactive, PCPU_GET(cpumask)); + atomic_set_int(&pmap->pm_active, PCPU_GET(cpumask)); #else oldpmap->pm_active &= ~1; pmap->pm_active |= 1; pmap->pm_tlbactive |= 1; #endif - /* XXX Is this necessary? */ - pmap_invalidate_all(pmap); pmap->pm_hashscratch = tte_hash_set_scratchpad_user(pmap->pm_hash, pmap->pm_context); pmap->pm_tsbscratch = tsb_set_scratchpad_user(&pmap->pm_tsb); @@ -413,7 +411,7 @@ hv_set_ctxnon0(1, pmap->pm_tsb_ra); stxa(MMU_CID_S, ASI_MMU_CONTEXTID, pmap->pm_context); membar(Sync); - spinlock_exit(); + critical_exit(); } vm_offset_t @@ -564,8 +562,6 @@ kernel_hash_pa = pmap_bootstrap_alloc(PAGE_SIZE_4M); if (kernel_hash_pa & PAGE_MASK_4M) panic("pmap_bootstrap: hashtable pa unaligned\n"); - pmap_scrub_pages(kernel_hash_pa, PAGE_SIZE_4M); - printf("allocated hash\n"); /* * Set up TSB descriptors for the hypervisor * @@ -620,11 +616,6 @@ kernel_td[TSB4M_INDEX].hvtsb_rsvd = 0; kernel_td[TSB4M_INDEX].hvtsb_pa = pa; - pmap_scrub_pages(kernel_td[TSB8K_INDEX].hvtsb_pa, tsb_8k_size); - - pmap_scrub_pages(kernel_td[TSB4M_INDEX].hvtsb_pa, tsb_4m_size); - - /* * allocate MMU fault status areas for all CPUS */ @@ -657,6 +648,9 @@ for (i = 0; phys_avail[i + 2] != 0; i += 2) KDPRINTF("phys_avail[%d]=0x%lx phys_avail[%d]=0x%lx\n", i, phys_avail[i], i+1, phys_avail[i+1]); + KDPRINTF("phys_avail[%d]=0x%lx phys_avail[%d]=0x%lx\n", + i, phys_avail[i], i+1, phys_avail[i+1]); + Maxmem = sparc64_btop(phys_avail[i + 1]); /* @@ -897,6 +891,14 @@ tte_data = pa = VM_PAGE_TO_PHYS(m); otte_data = tte_hash_lookup(pmap->pm_hash, va); opa = TTE_GET_PA(otte_data); +#ifdef PMAP_DEBUG + if (opa > (1 << 31)) + panic("opa out of range 0x%lx\n", opa); + if ((vm_offset_t)PHYS_TO_VM_PAGE(opa) > ((1UL << 31) | VM_MIN_DIRECT_ADDRESS)) { + DELAY(curcpu*5000); + panic("om out of range %p\n", PHYS_TO_VM_PAGE(opa)); + } +#endif /* * Mapping has not changed, must be protection or wiring change. */ @@ -1003,7 +1005,7 @@ tte_t tte_data; if (pmap->pm_context) - DPRINTF("pmap_enter_quick(ctx=0x%lx va=%lx, pa=0x%lx prot=%x)\n", + KDPRINTF("pmap_enter_quick(ctx=0x%lx va=%lx, pa=0x%lx prot=%x)\n", pmap->pm_context, va, VM_PAGE_TO_PHYS(m), prot); mtx_assert(&vm_page_queue_mtx, MA_OWNED); @@ -1128,7 +1130,7 @@ { pv_entry_t pv; - DPRINTF("pmap_insert_entry(va=0x%lx, pa=0x%lx)\n", va, VM_PAGE_TO_PHYS(m)); + KDPRINTF("pmap_insert_entry(va=0x%lx, pa=0x%lx)\n", va, VM_PAGE_TO_PHYS(m)); pv = get_pv_entry(pmap); pv->pv_va = va; pv->pv_pmap = pmap; @@ -1172,7 +1174,7 @@ if (cpumask == pmap->pm_tlbactive) return; - if (pmap != kernel_pmap) + if (pmap->pm_context != 0) active = (pmap->pm_tlbactive & ~cpumask); else active = PCPU_GET(other_cpus); @@ -1485,8 +1487,7 @@ pmap_pinit0(pmap_t pmap) { PMAP_LOCK_INIT(pmap); - pmap->pm_active = ~0; - pmap->pm_tlbactive = ~0; + pmap->pm_active = pmap->pm_tlbactive = ~0; pmap->pm_context = 0; PCPU_SET(curpmap, pmap); TAILQ_INIT(&pmap->pm_pvlist); @@ -1505,8 +1506,7 @@ pmap->pm_hash = tte_hash_create(pmap->pm_context, &pmap->pm_hashscratch); pmap->pm_tsb_ra = tsb_init(&pmap->pm_tsb, &pmap->pm_tsbscratch); - pmap->pm_active = 0; - pmap->pm_tlbactive = 0; + pmap->pm_active = pmap->pm_tlbactive = 0; TAILQ_INIT(&pmap->pm_pvlist); PMAP_LOCK_INIT(pmap); bzero(&pmap->pm_stats, sizeof pmap->pm_stats); @@ -1741,7 +1741,7 @@ break; } } - KASSERT(pv != NULL, ("pmap_remove_entry: pv not found")); + KASSERT(pv != NULL, ("pmap_remove_entry: pv not found va=0x%lx pa=0x%lx", va, VM_PAGE_TO_PHYS(m))); TAILQ_REMOVE(&m->md.pv_list, pv, pv_list); m->md.pv_list_count--; if (TAILQ_EMPTY(&m->md.pv_list)) From owner-p4-projects@FreeBSD.ORG Sun May 7 21:24:37 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9A18416A404; Sun, 7 May 2006 21:24:37 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 7A00416A401 for ; Sun, 7 May 2006 21:24:37 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 484CE43D46 for ; Sun, 7 May 2006 21:24:37 +0000 (GMT) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k47LObhU024257 for ; Sun, 7 May 2006 21:24:37 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k47LOahd024254 for perforce@freebsd.org; Sun, 7 May 2006 21:24:36 GMT (envelope-from kmacy@freebsd.org) Date: Sun, 7 May 2006 21:24:36 GMT Message-Id: <200605072124.k47LOahd024254@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 96788 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 07 May 2006 21:24:37 -0000 http://perforce.freebsd.org/chv.cgi?CH=96788 Change 96788 by kmacy@kmacy_storage:sun4v_rwbuf on 2006/05/07 21:24:32 remove unused functions Affected files ... .. //depot/projects/kmacy_sun4v/src/sys/sun4v/include/pmap.h#11 edit Differences ... ==== //depot/projects/kmacy_sun4v/src/sys/sun4v/include/pmap.h#11 (text+ko) ==== @@ -101,18 +101,12 @@ void pmap_bootstrap(vm_offset_t ekva); vm_paddr_t pmap_kextract(vm_offset_t va); -void pmap_kenter_flags(vm_offset_t va, vm_paddr_t pa, u_long flags); -void pmap_kremove_flags(vm_offset_t va); - -void pmap_clear_write(vm_page_t m); void pmap_invalidate_page(pmap_t pmap, vm_offset_t va); void pmap_invalidate_range(pmap_t pmap, vm_offset_t sva, vm_offset_t eva); void pmap_invalidate_all(pmap_t pmap); void pmap_scrub_pages(vm_paddr_t pa, int64_t size); - - #define vtophys(va) pmap_kextract((vm_offset_t)(va)) extern struct pmap kernel_pmap_store; From owner-p4-projects@FreeBSD.ORG Sun May 7 21:49:07 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id BB33A16A433; Sun, 7 May 2006 21:49:07 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 7C53F16A420 for ; Sun, 7 May 2006 21:49:07 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 350E343D45 for ; Sun, 7 May 2006 21:49:07 +0000 (GMT) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k47Ln7FZ035194 for ; Sun, 7 May 2006 21:49:07 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k47Ln66p035191 for perforce@freebsd.org; Sun, 7 May 2006 21:49:06 GMT (envelope-from kmacy@freebsd.org) Date: Sun, 7 May 2006 21:49:06 GMT Message-Id: <200605072149.k47Ln66p035191@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 96789 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 07 May 2006 21:49:08 -0000 http://perforce.freebsd.org/chv.cgi?CH=96789 Change 96789 by kmacy@kmacy_storage:sun4v_rwbuf on 2006/05/07 21:48:59 simple fix to stxa_sync Affected files ... .. //depot/projects/kmacy_sun4v/src/sys/sun4v/include/cpufunc.h#8 edit Differences ... ==== //depot/projects/kmacy_sun4v/src/sys/sun4v/include/cpufunc.h#8 (text+ko) ==== @@ -239,7 +239,7 @@ s = intr_disable_all(); \ __asm __volatile("stxa %0, [%1] %2; membar #Sync" \ : : "r" (val), "r" (va), "n" (asi)); \ - intr_restore(s); \ + intr_restore_all(s); \ } while (0) void ascopy(u_long asi, vm_offset_t src, vm_offset_t dst, size_t len); From owner-p4-projects@FreeBSD.ORG Sun May 7 22:04:29 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B00A716A404; Sun, 7 May 2006 22:04:29 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 6EAB716A400 for ; Sun, 7 May 2006 22:04:29 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 0E24A43D46 for ; Sun, 7 May 2006 22:04:29 +0000 (GMT) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k47M4TWD046720 for ; Sun, 7 May 2006 22:04:29 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k47M4P51046717 for perforce@freebsd.org; Sun, 7 May 2006 22:04:25 GMT (envelope-from kmacy@freebsd.org) Date: Sun, 7 May 2006 22:04:25 GMT Message-Id: <200605072204.k47M4P51046717@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 96790 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 07 May 2006 22:04:29 -0000 http://perforce.freebsd.org/chv.cgi?CH=96790 Change 96790 by kmacy@kmacy_storage:sun4v_rwbuf on 2006/05/07 22:04:06 IFC Affected files ... .. //depot/projects/kmacy_sun4v/src/sys/alpha/Makefile#3 integrate .. //depot/projects/kmacy_sun4v/src/sys/alpha/conf/DEFAULTS#3 integrate .. //depot/projects/kmacy_sun4v/src/sys/alpha/conf/GENERIC#3 integrate .. //depot/projects/kmacy_sun4v/src/sys/alpha/conf/NOTES#3 integrate .. //depot/projects/kmacy_sun4v/src/sys/alpha/isa/isa.c#3 integrate .. //depot/projects/kmacy_sun4v/src/sys/alpha/linux/linux_sysvec.c#4 integrate .. //depot/projects/kmacy_sun4v/src/sys/alpha/pci/apecs_pci.c#3 integrate .. //depot/projects/kmacy_sun4v/src/sys/alpha/pci/lca_pci.c#3 integrate .. //depot/projects/kmacy_sun4v/src/sys/alpha/pci/pcibus.c#3 integrate .. //depot/projects/kmacy_sun4v/src/sys/amd64/amd64/apic_vector.S#4 integrate .. //depot/projects/kmacy_sun4v/src/sys/amd64/amd64/busdma_machdep.c#3 integrate .. //depot/projects/kmacy_sun4v/src/sys/amd64/amd64/dump_machdep.c#3 integrate .. //depot/projects/kmacy_sun4v/src/sys/amd64/amd64/fpu.c#3 integrate .. //depot/projects/kmacy_sun4v/src/sys/amd64/amd64/identcpu.c#3 integrate .. //depot/projects/kmacy_sun4v/src/sys/amd64/amd64/minidump_machdep.c#1 branch .. //depot/projects/kmacy_sun4v/src/sys/amd64/amd64/mp_machdep.c#4 integrate .. //depot/projects/kmacy_sun4v/src/sys/amd64/amd64/nexus.c#3 integrate .. //depot/projects/kmacy_sun4v/src/sys/amd64/amd64/pmap.c#4 integrate .. //depot/projects/kmacy_sun4v/src/sys/amd64/amd64/uma_machdep.c#3 integrate .. //depot/projects/kmacy_sun4v/src/sys/amd64/conf/DEFAULTS#3 integrate .. //depot/projects/kmacy_sun4v/src/sys/amd64/conf/GENERIC#4 integrate .. //depot/projects/kmacy_sun4v/src/sys/amd64/conf/NOTES#4 integrate .. //depot/projects/kmacy_sun4v/src/sys/amd64/include/apicvar.h#4 integrate .. //depot/projects/kmacy_sun4v/src/sys/amd64/include/md_var.h#3 integrate .. //depot/projects/kmacy_sun4v/src/sys/amd64/include/minidump.h#1 branch .. //depot/projects/kmacy_sun4v/src/sys/amd64/include/pmap.h#4 integrate .. //depot/projects/kmacy_sun4v/src/sys/amd64/include/smp.h#3 integrate .. //depot/projects/kmacy_sun4v/src/sys/amd64/include/specialreg.h#3 integrate .. //depot/projects/kmacy_sun4v/src/sys/amd64/linux32/linux32_sysvec.c#4 integrate .. //depot/projects/kmacy_sun4v/src/sys/arm/arm/nexus.c#3 integrate .. //depot/projects/kmacy_sun4v/src/sys/arm/arm/pmap.c#4 integrate .. //depot/projects/kmacy_sun4v/src/sys/arm/at91/at91.c#4 integrate .. //depot/projects/kmacy_sun4v/src/sys/arm/sa11x0/sa11x0.c#3 integrate .. //depot/projects/kmacy_sun4v/src/sys/arm/xscale/i80321/i80321_pci.c#4 integrate .. //depot/projects/kmacy_sun4v/src/sys/arm/xscale/i80321/iq80321.c#3 integrate .. //depot/projects/kmacy_sun4v/src/sys/arm/xscale/i80321/obio.c#3 integrate .. //depot/projects/kmacy_sun4v/src/sys/boot/arm/at91/Makefile#1 branch .. //depot/projects/kmacy_sun4v/src/sys/boot/arm/at91/Makefile.inc#1 branch .. //depot/projects/kmacy_sun4v/src/sys/boot/arm/at91/boot0/Makefile#2 integrate .. //depot/projects/kmacy_sun4v/src/sys/boot/arm/at91/boot0/at91rm9200_lowlevel.c#2 delete .. //depot/projects/kmacy_sun4v/src/sys/boot/arm/at91/boot0/at91rm9200_lowlevel.h#2 delete .. //depot/projects/kmacy_sun4v/src/sys/boot/arm/at91/boot0/lib.c#2 delete .. //depot/projects/kmacy_sun4v/src/sys/boot/arm/at91/boot0/lib.h#2 delete .. //depot/projects/kmacy_sun4v/src/sys/boot/arm/at91/boot0/main.c#2 integrate .. //depot/projects/kmacy_sun4v/src/sys/boot/arm/at91/boot0/xmodem.c#2 delete .. //depot/projects/kmacy_sun4v/src/sys/boot/arm/at91/boot0/xmodem.h#2 delete .. //depot/projects/kmacy_sun4v/src/sys/boot/arm/at91/boot0iic/Makefile#1 branch .. //depot/projects/kmacy_sun4v/src/sys/boot/arm/at91/boot0iic/doit.c#1 branch .. //depot/projects/kmacy_sun4v/src/sys/boot/arm/at91/boot0iic/main.c#1 branch .. //depot/projects/kmacy_sun4v/src/sys/boot/arm/at91/boot0spi/Makefile#1 branch .. //depot/projects/kmacy_sun4v/src/sys/boot/arm/at91/boot0spi/doit.c#1 branch .. //depot/projects/kmacy_sun4v/src/sys/boot/arm/at91/boot0spi/main.c#1 branch .. //depot/projects/kmacy_sun4v/src/sys/boot/arm/at91/bootiic/Makefile#1 branch .. //depot/projects/kmacy_sun4v/src/sys/boot/arm/at91/bootiic/README#1 branch .. //depot/projects/kmacy_sun4v/src/sys/boot/arm/at91/bootiic/arm_init.S#1 branch .. //depot/projects/kmacy_sun4v/src/sys/boot/arm/at91/bootiic/main.c#1 branch .. //depot/projects/kmacy_sun4v/src/sys/boot/arm/at91/bootspi/Makefile#1 branch .. //depot/projects/kmacy_sun4v/src/sys/boot/arm/at91/bootspi/README#1 branch .. //depot/projects/kmacy_sun4v/src/sys/boot/arm/at91/bootspi/arm_init.s#1 branch .. //depot/projects/kmacy_sun4v/src/sys/boot/arm/at91/bootspi/main.c#1 branch .. //depot/projects/kmacy_sun4v/src/sys/boot/arm/at91/inc/AT91RM9200.h#2 delete .. //depot/projects/kmacy_sun4v/src/sys/boot/arm/at91/libat91/Makefile#1 branch .. //depot/projects/kmacy_sun4v/src/sys/boot/arm/at91/libat91/at91rm9200.h#1 branch .. //depot/projects/kmacy_sun4v/src/sys/boot/arm/at91/libat91/at91rm9200_lowlevel.c#1 branch .. //depot/projects/kmacy_sun4v/src/sys/boot/arm/at91/libat91/at91rm9200_lowlevel.h#1 branch .. //depot/projects/kmacy_sun4v/src/sys/boot/arm/at91/libat91/eeprom.c#1 branch .. //depot/projects/kmacy_sun4v/src/sys/boot/arm/at91/libat91/eeprom.h#1 branch .. //depot/projects/kmacy_sun4v/src/sys/boot/arm/at91/libat91/emac.c#1 branch .. //depot/projects/kmacy_sun4v/src/sys/boot/arm/at91/libat91/emac.h#1 branch .. //depot/projects/kmacy_sun4v/src/sys/boot/arm/at91/libat91/env_vars.c#1 branch .. //depot/projects/kmacy_sun4v/src/sys/boot/arm/at91/libat91/env_vars.h#1 branch .. //depot/projects/kmacy_sun4v/src/sys/boot/arm/at91/libat91/getc.c#1 branch .. //depot/projects/kmacy_sun4v/src/sys/boot/arm/at91/libat91/lib.h#1 branch .. //depot/projects/kmacy_sun4v/src/sys/boot/arm/at91/libat91/loader_prompt.c#1 branch .. //depot/projects/kmacy_sun4v/src/sys/boot/arm/at91/libat91/loader_prompt.h#1 branch .. //depot/projects/kmacy_sun4v/src/sys/boot/arm/at91/libat91/p_string.c#1 branch .. //depot/projects/kmacy_sun4v/src/sys/boot/arm/at91/libat91/p_string.h#1 branch .. //depot/projects/kmacy_sun4v/src/sys/boot/arm/at91/libat91/printf.c#1 branch .. //depot/projects/kmacy_sun4v/src/sys/boot/arm/at91/libat91/putchar.c#1 branch .. //depot/projects/kmacy_sun4v/src/sys/boot/arm/at91/libat91/tag_list.c#1 branch .. //depot/projects/kmacy_sun4v/src/sys/boot/arm/at91/libat91/tag_list.h#1 branch .. //depot/projects/kmacy_sun4v/src/sys/boot/arm/at91/libat91/xmodem.c#1 branch .. //depot/projects/kmacy_sun4v/src/sys/boot/arm/at91/linker.cfg#1 branch .. //depot/projects/kmacy_sun4v/src/sys/boot/i386/boot0/boot0.S#3 integrate .. //depot/projects/kmacy_sun4v/src/sys/boot/i386/libi386/biosacpi.c#3 integrate .. //depot/projects/kmacy_sun4v/src/sys/cam/cam.c#3 integrate .. //depot/projects/kmacy_sun4v/src/sys/cam/scsi/scsi_cd.c#3 integrate .. //depot/projects/kmacy_sun4v/src/sys/cam/scsi/scsi_da.c#4 integrate .. //depot/projects/kmacy_sun4v/src/sys/compat/linprocfs/linprocfs.c#3 integrate .. //depot/projects/kmacy_sun4v/src/sys/compat/linux/linux_stats.c#4 integrate .. //depot/projects/kmacy_sun4v/src/sys/compat/linux/linux_util.c#3 integrate .. //depot/projects/kmacy_sun4v/src/sys/compat/linux/linux_util.h#3 integrate .. //depot/projects/kmacy_sun4v/src/sys/conf/NOTES#4 integrate .. //depot/projects/kmacy_sun4v/src/sys/conf/files#4 integrate .. //depot/projects/kmacy_sun4v/src/sys/conf/files.alpha#4 integrate .. //depot/projects/kmacy_sun4v/src/sys/conf/files.amd64#4 integrate .. //depot/projects/kmacy_sun4v/src/sys/conf/files.i386#4 integrate .. //depot/projects/kmacy_sun4v/src/sys/conf/files.ia64#4 integrate .. //depot/projects/kmacy_sun4v/src/sys/conf/files.pc98#4 integrate .. //depot/projects/kmacy_sun4v/src/sys/conf/files.powerpc#4 integrate .. //depot/projects/kmacy_sun4v/src/sys/conf/kmod.mk#3 integrate .. //depot/projects/kmacy_sun4v/src/sys/conf/options#4 integrate .. //depot/projects/kmacy_sun4v/src/sys/conf/options.alpha#3 integrate .. //depot/projects/kmacy_sun4v/src/sys/conf/options.amd64#3 integrate .. //depot/projects/kmacy_sun4v/src/sys/conf/options.i386#4 integrate .. //depot/projects/kmacy_sun4v/src/sys/conf/options.ia64#3 integrate .. //depot/projects/kmacy_sun4v/src/sys/conf/options.pc98#4 integrate .. //depot/projects/kmacy_sun4v/src/sys/contrib/ipfilter/netinet/fil.c#3 integrate .. //depot/projects/kmacy_sun4v/src/sys/crypto/via/padlock.c#4 integrate .. //depot/projects/kmacy_sun4v/src/sys/ddb/db_command.c#4 integrate .. //depot/projects/kmacy_sun4v/src/sys/ddb/db_ps.c#3 integrate .. //depot/projects/kmacy_sun4v/src/sys/ddb/db_thread.c#3 integrate .. //depot/projects/kmacy_sun4v/src/sys/ddb/ddb.h#4 integrate .. //depot/projects/kmacy_sun4v/src/sys/dev/acpica/acpi.c#4 integrate .. //depot/projects/kmacy_sun4v/src/sys/dev/acpica/acpi_powerres.c#3 integrate .. //depot/projects/kmacy_sun4v/src/sys/dev/acpica/acpi_resource.c#3 integrate .. //depot/projects/kmacy_sun4v/src/sys/dev/advansys/advansys.c#3 integrate .. //depot/projects/kmacy_sun4v/src/sys/dev/amr/amr.c#4 integrate .. //depot/projects/kmacy_sun4v/src/sys/dev/amr/amr_linux.c#4 integrate .. //depot/projects/kmacy_sun4v/src/sys/dev/amr/amrvar.h#4 integrate .. //depot/projects/kmacy_sun4v/src/sys/dev/ath/if_ath.c#4 integrate .. //depot/projects/kmacy_sun4v/src/sys/dev/ath/if_athvar.h#4 integrate .. //depot/projects/kmacy_sun4v/src/sys/dev/atkbdc/atkbd.c#3 integrate .. //depot/projects/kmacy_sun4v/src/sys/dev/atkbdc/atkbdc.c#3 integrate .. //depot/projects/kmacy_sun4v/src/sys/dev/atkbdc/atkbdc_isa.c#3 integrate .. //depot/projects/kmacy_sun4v/src/sys/dev/bce/if_bcereg.h#2 integrate .. //depot/projects/kmacy_sun4v/src/sys/dev/bfe/if_bfe.c#4 integrate .. //depot/projects/kmacy_sun4v/src/sys/dev/bfe/if_bfereg.h#3 integrate .. //depot/projects/kmacy_sun4v/src/sys/dev/bge/if_bge.c#4 integrate .. //depot/projects/kmacy_sun4v/src/sys/dev/ciss/ciss.c#3 integrate .. //depot/projects/kmacy_sun4v/src/sys/dev/drm/drmP.h#3 integrate .. //depot/projects/kmacy_sun4v/src/sys/dev/hptmv/osbsd.h#3 integrate .. //depot/projects/kmacy_sun4v/src/sys/dev/hwpmc/hwpmc_mod.c#4 integrate .. //depot/projects/kmacy_sun4v/src/sys/dev/iicbus/iicbus.c#3 integrate .. //depot/projects/kmacy_sun4v/src/sys/dev/isp/isp.c#3 integrate .. //depot/projects/kmacy_sun4v/src/sys/dev/isp/isp_freebsd.c#4 integrate .. //depot/projects/kmacy_sun4v/src/sys/dev/isp/isp_freebsd.h#3 integrate .. //depot/projects/kmacy_sun4v/src/sys/dev/isp/isp_ioctl.h#3 integrate .. //depot/projects/kmacy_sun4v/src/sys/dev/isp/isp_library.c#3 integrate .. //depot/projects/kmacy_sun4v/src/sys/dev/isp/isp_pci.c#3 integrate .. //depot/projects/kmacy_sun4v/src/sys/dev/isp/isp_sbus.c#3 integrate .. //depot/projects/kmacy_sun4v/src/sys/dev/isp/isp_target.c#3 integrate .. //depot/projects/kmacy_sun4v/src/sys/dev/isp/isp_target.h#3 integrate .. //depot/projects/kmacy_sun4v/src/sys/dev/isp/isp_tpublic.h#3 integrate .. //depot/projects/kmacy_sun4v/src/sys/dev/isp/ispmbox.h#3 integrate .. //depot/projects/kmacy_sun4v/src/sys/dev/ispfw/asm_2300.h#3 integrate .. //depot/projects/kmacy_sun4v/src/sys/dev/iwi/if_iwi.c#4 integrate .. //depot/projects/kmacy_sun4v/src/sys/dev/iwi/if_iwireg.h#4 integrate .. //depot/projects/kmacy_sun4v/src/sys/dev/iwi/if_iwivar.h#4 integrate .. //depot/projects/kmacy_sun4v/src/sys/dev/mpt/mpt.c#4 integrate .. //depot/projects/kmacy_sun4v/src/sys/dev/mpt/mpt.h#4 integrate .. //depot/projects/kmacy_sun4v/src/sys/dev/mpt/mpt_cam.c#4 integrate .. //depot/projects/kmacy_sun4v/src/sys/dev/mpt/mpt_pci.c#4 integrate .. //depot/projects/kmacy_sun4v/src/sys/dev/nve/if_nve.c#3 integrate .. //depot/projects/kmacy_sun4v/src/sys/dev/pccard/pccard.c#3 integrate .. //depot/projects/kmacy_sun4v/src/sys/dev/pci/pci_pci.c#8 integrate .. //depot/projects/kmacy_sun4v/src/sys/dev/ppc/ppc.c#4 integrate .. //depot/projects/kmacy_sun4v/src/sys/dev/ppc/ppc_acpi.c#1 branch .. //depot/projects/kmacy_sun4v/src/sys/dev/ppc/ppc_isa.c#1 branch .. //depot/projects/kmacy_sun4v/src/sys/dev/ppc/ppc_pci.c#1 branch .. //depot/projects/kmacy_sun4v/src/sys/dev/ppc/ppc_puc.c#3 integrate .. //depot/projects/kmacy_sun4v/src/sys/dev/ppc/ppcreg.h#3 integrate .. //depot/projects/kmacy_sun4v/src/sys/dev/ppc/ppcvar.h#4 integrate .. //depot/projects/kmacy_sun4v/src/sys/dev/puc/puc.c#3 integrate .. //depot/projects/kmacy_sun4v/src/sys/dev/puc/puc_bfe.h#1 branch .. //depot/projects/kmacy_sun4v/src/sys/dev/puc/puc_bus.h#1 branch .. //depot/projects/kmacy_sun4v/src/sys/dev/puc/puc_cfg.c#1 branch .. //depot/projects/kmacy_sun4v/src/sys/dev/puc/puc_cfg.h#1 branch .. //depot/projects/kmacy_sun4v/src/sys/dev/puc/puc_ebus.c#4 delete .. //depot/projects/kmacy_sun4v/src/sys/dev/puc/puc_pccard.c#3 integrate .. //depot/projects/kmacy_sun4v/src/sys/dev/puc/puc_pci.c#3 integrate .. //depot/projects/kmacy_sun4v/src/sys/dev/puc/puc_sbus.c#4 delete .. //depot/projects/kmacy_sun4v/src/sys/dev/puc/pucdata.c#3 integrate .. //depot/projects/kmacy_sun4v/src/sys/dev/puc/pucvar.h#3 delete .. //depot/projects/kmacy_sun4v/src/sys/dev/random/randomdev_soft.c#3 integrate .. //depot/projects/kmacy_sun4v/src/sys/dev/rr232x/LICENSE#1 branch .. //depot/projects/kmacy_sun4v/src/sys/dev/rr232x/README#1 branch .. //depot/projects/kmacy_sun4v/src/sys/dev/rr232x/amd64-elf.rr232x_lib.o.uu#1 branch .. //depot/projects/kmacy_sun4v/src/sys/dev/rr232x/array.h#1 branch .. //depot/projects/kmacy_sun4v/src/sys/dev/rr232x/him.h#1 branch .. //depot/projects/kmacy_sun4v/src/sys/dev/rr232x/himfuncs.h#1 branch .. //depot/projects/kmacy_sun4v/src/sys/dev/rr232x/hptintf.h#1 branch .. //depot/projects/kmacy_sun4v/src/sys/dev/rr232x/i386-elf.rr232x_lib.o.uu#1 branch .. //depot/projects/kmacy_sun4v/src/sys/dev/rr232x/ldm.h#1 branch .. //depot/projects/kmacy_sun4v/src/sys/dev/rr232x/list.h#1 branch .. //depot/projects/kmacy_sun4v/src/sys/dev/rr232x/os_bsd.c#1 branch .. //depot/projects/kmacy_sun4v/src/sys/dev/rr232x/os_bsd.h#1 branch .. //depot/projects/kmacy_sun4v/src/sys/dev/rr232x/osm.h#1 branch .. //depot/projects/kmacy_sun4v/src/sys/dev/rr232x/osm_bsd.c#1 branch .. //depot/projects/kmacy_sun4v/src/sys/dev/rr232x/rr232x_config.c#1 branch .. //depot/projects/kmacy_sun4v/src/sys/dev/rr232x/rr232x_config.h#1 branch .. //depot/projects/kmacy_sun4v/src/sys/dev/sab/sab.c#3 delete .. //depot/projects/kmacy_sun4v/src/sys/dev/sab/sab82532reg.h#3 delete .. //depot/projects/kmacy_sun4v/src/sys/dev/sio/sio_puc.c#3 integrate .. //depot/projects/kmacy_sun4v/src/sys/dev/sk/if_sk.c#1 branch .. //depot/projects/kmacy_sun4v/src/sys/dev/sk/if_skreg.h#1 branch .. //depot/projects/kmacy_sun4v/src/sys/dev/sk/xmaciireg.h#1 branch .. //depot/projects/kmacy_sun4v/src/sys/dev/sk/yukonreg.h#1 branch .. //depot/projects/kmacy_sun4v/src/sys/dev/sound/pci/ich.c#4 integrate .. //depot/projects/kmacy_sun4v/src/sys/dev/sound/pci/via8233.c#3 integrate .. //depot/projects/kmacy_sun4v/src/sys/dev/twa/tw_osl_cam.c#3 integrate .. //depot/projects/kmacy_sun4v/src/sys/dev/uart/uart_bus.h#4 integrate .. //depot/projects/kmacy_sun4v/src/sys/dev/uart/uart_bus_pci.c#3 integrate .. //depot/projects/kmacy_sun4v/src/sys/dev/uart/uart_bus_puc.c#3 integrate .. //depot/projects/kmacy_sun4v/src/sys/dev/uart/uart_core.c#4 integrate .. //depot/projects/kmacy_sun4v/src/sys/dev/uart/uart_dev_ns8250.c#4 integrate .. //depot/projects/kmacy_sun4v/src/sys/dev/usb/usbdevs#4 integrate .. //depot/projects/kmacy_sun4v/src/sys/geom/eli/g_eli.c#4 integrate .. //depot/projects/kmacy_sun4v/src/sys/geom/eli/g_eli_crypto.c#3 integrate .. //depot/projects/kmacy_sun4v/src/sys/geom/mirror/g_mirror.c#4 integrate .. //depot/projects/kmacy_sun4v/src/sys/geom/raid3/g_raid3.c#4 integrate .. //depot/projects/kmacy_sun4v/src/sys/gnu/fs/xfs/FreeBSD/xfs_mountops.c#3 integrate .. //depot/projects/kmacy_sun4v/src/sys/i386/conf/DEFAULTS#3 integrate .. //depot/projects/kmacy_sun4v/src/sys/i386/conf/GENERIC#4 integrate .. //depot/projects/kmacy_sun4v/src/sys/i386/conf/NOTES#4 integrate .. //depot/projects/kmacy_sun4v/src/sys/i386/i386/apic_vector.s#3 integrate .. //depot/projects/kmacy_sun4v/src/sys/i386/i386/busdma_machdep.c#3 integrate .. //depot/projects/kmacy_sun4v/src/sys/i386/i386/dump_machdep.c#3 integrate .. //depot/projects/kmacy_sun4v/src/sys/i386/i386/identcpu.c#4 integrate .. //depot/projects/kmacy_sun4v/src/sys/i386/i386/minidump_machdep.c#1 branch .. //depot/projects/kmacy_sun4v/src/sys/i386/i386/mp_machdep.c#4 integrate .. //depot/projects/kmacy_sun4v/src/sys/i386/i386/nexus.c#3 integrate .. //depot/projects/kmacy_sun4v/src/sys/i386/i386/pmap.c#4 integrate .. //depot/projects/kmacy_sun4v/src/sys/i386/i386/vm_machdep.c#4 integrate .. //depot/projects/kmacy_sun4v/src/sys/i386/include/apicvar.h#4 integrate .. //depot/projects/kmacy_sun4v/src/sys/i386/include/md_var.h#3 integrate .. //depot/projects/kmacy_sun4v/src/sys/i386/include/minidump.h#1 branch .. //depot/projects/kmacy_sun4v/src/sys/i386/include/pmap.h#3 integrate .. //depot/projects/kmacy_sun4v/src/sys/i386/include/smp.h#3 integrate .. //depot/projects/kmacy_sun4v/src/sys/i386/include/specialreg.h#3 integrate .. //depot/projects/kmacy_sun4v/src/sys/i386/isa/npx.c#4 integrate .. //depot/projects/kmacy_sun4v/src/sys/i386/linux/linux_sysvec.c#4 integrate .. //depot/projects/kmacy_sun4v/src/sys/ia64/conf/DEFAULTS#3 integrate .. //depot/projects/kmacy_sun4v/src/sys/ia64/ia64/nexus.c#3 integrate .. //depot/projects/kmacy_sun4v/src/sys/kern/kern_clock.c#3 integrate .. //depot/projects/kmacy_sun4v/src/sys/kern/kern_exec.c#4 integrate .. //depot/projects/kmacy_sun4v/src/sys/kern/kern_intr.c#4 integrate .. //depot/projects/kmacy_sun4v/src/sys/kern/kern_mbuf.c#4 integrate .. //depot/projects/kmacy_sun4v/src/sys/kern/kern_module.c#3 integrate .. //depot/projects/kmacy_sun4v/src/sys/kern/kern_poll.c#3 integrate .. //depot/projects/kmacy_sun4v/src/sys/kern/kern_rwlock.c#3 integrate .. //depot/projects/kmacy_sun4v/src/sys/kern/kern_sig.c#4 integrate .. //depot/projects/kmacy_sun4v/src/sys/kern/kern_synch.c#3 integrate .. //depot/projects/kmacy_sun4v/src/sys/kern/kern_thr.c#3 integrate .. //depot/projects/kmacy_sun4v/src/sys/kern/kern_umtx.c#3 integrate .. //depot/projects/kmacy_sun4v/src/sys/kern/sched_4bsd.c#3 integrate .. //depot/projects/kmacy_sun4v/src/sys/kern/serdev_if.m#2 integrate .. //depot/projects/kmacy_sun4v/src/sys/kern/subr_bus.c#4 integrate .. //depot/projects/kmacy_sun4v/src/sys/kern/subr_rman.c#4 integrate .. //depot/projects/kmacy_sun4v/src/sys/kern/subr_sleepqueue.c#4 integrate .. //depot/projects/kmacy_sun4v/src/sys/kern/subr_taskqueue.c#4 integrate .. //depot/projects/kmacy_sun4v/src/sys/kern/subr_turnstile.c#4 integrate .. //depot/projects/kmacy_sun4v/src/sys/kern/subr_witness.c#4 integrate .. //depot/projects/kmacy_sun4v/src/sys/kern/tty_pts.c#3 integrate .. //depot/projects/kmacy_sun4v/src/sys/kern/uipc_domain.c#3 integrate .. //depot/projects/kmacy_sun4v/src/sys/kern/uipc_mqueue.c#4 integrate .. //depot/projects/kmacy_sun4v/src/sys/kern/uipc_socket.c#4 integrate .. //depot/projects/kmacy_sun4v/src/sys/kern/uipc_socket2.c#4 integrate .. //depot/projects/kmacy_sun4v/src/sys/kern/uipc_syscalls.c#4 integrate .. //depot/projects/kmacy_sun4v/src/sys/kern/uipc_usrreq.c#4 integrate .. //depot/projects/kmacy_sun4v/src/sys/kern/vfs_hash.c#3 integrate .. //depot/projects/kmacy_sun4v/src/sys/kern/vfs_lookup.c#4 integrate .. //depot/projects/kmacy_sun4v/src/sys/kern/vfs_subr.c#4 integrate .. //depot/projects/kmacy_sun4v/src/sys/kern/vfs_vnops.c#4 integrate .. //depot/projects/kmacy_sun4v/src/sys/modules/Makefile#4 integrate .. //depot/projects/kmacy_sun4v/src/sys/modules/ath_hal/Makefile#3 integrate .. //depot/projects/kmacy_sun4v/src/sys/modules/linux/Makefile#4 integrate .. //depot/projects/kmacy_sun4v/src/sys/modules/puc/Makefile#3 integrate .. //depot/projects/kmacy_sun4v/src/sys/modules/rr232x/Makefile#1 branch .. //depot/projects/kmacy_sun4v/src/sys/modules/sio/Makefile#3 integrate .. //depot/projects/kmacy_sun4v/src/sys/modules/sk/Makefile#3 integrate .. //depot/projects/kmacy_sun4v/src/sys/net/bpf.c#3 integrate .. //depot/projects/kmacy_sun4v/src/sys/net/if_bridge.c#4 integrate .. //depot/projects/kmacy_sun4v/src/sys/net/route.c#3 integrate .. //depot/projects/kmacy_sun4v/src/sys/net80211/ieee80211.c#3 integrate .. //depot/projects/kmacy_sun4v/src/sys/net80211/ieee80211_node.c#4 integrate .. //depot/projects/kmacy_sun4v/src/sys/netgraph/netflow/netflow.c#3 integrate .. //depot/projects/kmacy_sun4v/src/sys/netgraph/netflow/netflow.h#3 integrate .. //depot/projects/kmacy_sun4v/src/sys/netinet/in_pcb.c#4 integrate .. //depot/projects/kmacy_sun4v/src/sys/netinet/in_pcb.h#4 integrate .. //depot/projects/kmacy_sun4v/src/sys/netinet/ip_divert.c#4 integrate .. //depot/projects/kmacy_sun4v/src/sys/netinet/ip_fastfwd.c#3 integrate .. //depot/projects/kmacy_sun4v/src/sys/netinet/ip_input.c#3 integrate .. //depot/projects/kmacy_sun4v/src/sys/netinet/ip_ipsec.c#3 integrate .. //depot/projects/kmacy_sun4v/src/sys/netinet/raw_ip.c#4 integrate .. //depot/projects/kmacy_sun4v/src/sys/netinet/tcp_input.c#4 integrate .. //depot/projects/kmacy_sun4v/src/sys/netinet/tcp_subr.c#4 integrate .. //depot/projects/kmacy_sun4v/src/sys/netinet/tcp_timer.c#4 integrate .. //depot/projects/kmacy_sun4v/src/sys/netinet/tcp_usrreq.c#4 integrate .. //depot/projects/kmacy_sun4v/src/sys/netinet/udp_usrreq.c#4 integrate .. //depot/projects/kmacy_sun4v/src/sys/netinet6/frag6.c#4 integrate .. //depot/projects/kmacy_sun4v/src/sys/netinet6/in6_ifattach.c#3 integrate .. //depot/projects/kmacy_sun4v/src/sys/netinet6/in6_pcb.c#4 integrate .. //depot/projects/kmacy_sun4v/src/sys/netinet6/in6_pcb.h#4 integrate .. //depot/projects/kmacy_sun4v/src/sys/netinet6/in6_src.c#3 integrate .. //depot/projects/kmacy_sun4v/src/sys/netinet6/ip6_forward.c#3 integrate .. //depot/projects/kmacy_sun4v/src/sys/netinet6/udp6_usrreq.c#4 integrate .. //depot/projects/kmacy_sun4v/src/sys/netnatm/natm.c#4 integrate .. //depot/projects/kmacy_sun4v/src/sys/netnatm/natm_pcb.c#3 integrate .. //depot/projects/kmacy_sun4v/src/sys/nfsclient/nfs_socket.c#4 integrate .. //depot/projects/kmacy_sun4v/src/sys/nfsserver/nfsrvcache.h#3 integrate .. //depot/projects/kmacy_sun4v/src/sys/pc98/cbus/ppc.c#3 delete .. //depot/projects/kmacy_sun4v/src/sys/pc98/cbus/ppcreg.h#3 delete .. //depot/projects/kmacy_sun4v/src/sys/pc98/conf/DEFAULTS#3 integrate .. //depot/projects/kmacy_sun4v/src/sys/pc98/include/minidump.h#1 branch .. //depot/projects/kmacy_sun4v/src/sys/pc98/pc98/machdep.c#4 integrate .. //depot/projects/kmacy_sun4v/src/sys/pci/if_sk.c#3 delete .. //depot/projects/kmacy_sun4v/src/sys/pci/if_skreg.h#3 delete .. //depot/projects/kmacy_sun4v/src/sys/pci/xmaciireg.h#3 delete .. //depot/projects/kmacy_sun4v/src/sys/pci/yukonreg.h#3 delete .. //depot/projects/kmacy_sun4v/src/sys/powerpc/powermac/grackle.c#3 integrate .. //depot/projects/kmacy_sun4v/src/sys/powerpc/powermac/hrowpic.c#3 integrate .. //depot/projects/kmacy_sun4v/src/sys/powerpc/powermac/macio.c#3 integrate .. //depot/projects/kmacy_sun4v/src/sys/powerpc/powermac/uninorth.c#3 integrate .. //depot/projects/kmacy_sun4v/src/sys/powerpc/powerpc/openpic.c#3 integrate .. //depot/projects/kmacy_sun4v/src/sys/powerpc/psim/iobus.c#3 integrate .. //depot/projects/kmacy_sun4v/src/sys/security/mac_bsdextended/mac_bsdextended.c#4 integrate .. //depot/projects/kmacy_sun4v/src/sys/security/mac_bsdextended/mac_bsdextended.h#3 integrate .. //depot/projects/kmacy_sun4v/src/sys/sparc64/conf/GENERIC#4 integrate .. //depot/projects/kmacy_sun4v/src/sys/sparc64/conf/NOTES#3 integrate .. //depot/projects/kmacy_sun4v/src/sys/sparc64/ebus/ebus.c#3 integrate .. //depot/projects/kmacy_sun4v/src/sys/sparc64/pci/psycho.c#3 integrate .. //depot/projects/kmacy_sun4v/src/sys/sparc64/sbus/sbus.c#3 integrate .. //depot/projects/kmacy_sun4v/src/sys/sparc64/sparc64/exception.S#3 integrate .. //depot/projects/kmacy_sun4v/src/sys/sparc64/sparc64/interrupt.S#3 integrate .. //depot/projects/kmacy_sun4v/src/sys/sparc64/sparc64/nexus.c#3 integrate .. //depot/projects/kmacy_sun4v/src/sys/sys/bufobj.h#3 integrate .. //depot/projects/kmacy_sun4v/src/sys/sys/bus.h#5 integrate .. //depot/projects/kmacy_sun4v/src/sys/sys/eventhandler.h#3 integrate .. //depot/projects/kmacy_sun4v/src/sys/sys/lock.h#3 integrate .. //depot/projects/kmacy_sun4v/src/sys/sys/mac_policy.h#4 integrate .. //depot/projects/kmacy_sun4v/src/sys/sys/module.h#3 integrate .. //depot/projects/kmacy_sun4v/src/sys/sys/mount.h#4 integrate .. //depot/projects/kmacy_sun4v/src/sys/sys/param.h#4 integrate .. //depot/projects/kmacy_sun4v/src/sys/sys/rman.h#3 integrate .. //depot/projects/kmacy_sun4v/src/sys/sys/rwlock.h#3 integrate .. //depot/projects/kmacy_sun4v/src/sys/sys/turnstile.h#3 integrate .. //depot/projects/kmacy_sun4v/src/sys/sys/vnode.h#4 integrate .. //depot/projects/kmacy_sun4v/src/sys/ufs/ffs/ffs_rawread.c#4 integrate .. //depot/projects/kmacy_sun4v/src/sys/ufs/ffs/ffs_snapshot.c#4 integrate .. //depot/projects/kmacy_sun4v/src/sys/ufs/ffs/ffs_softdep.c#4 integrate .. //depot/projects/kmacy_sun4v/src/sys/ufs/ffs/ffs_vfsops.c#6 integrate .. //depot/projects/kmacy_sun4v/src/sys/ufs/ffs/ffs_vnops.c#3 integrate .. //depot/projects/kmacy_sun4v/src/sys/ufs/ufs/ufs_quota.c#4 integrate .. //depot/projects/kmacy_sun4v/src/sys/vm/vm_mmap.c#4 integrate .. //depot/projects/kmacy_sun4v/src/sys/vm/vm_page.c#4 integrate .. //depot/projects/kmacy_sun4v/src/sys/vm/vm_pageq.c#4 integrate .. //depot/projects/kmacy_sun4v/src/sys/vm/vm_zeroidle.c#3 integrate Differences ... ==== //depot/projects/kmacy_sun4v/src/sys/alpha/Makefile#3 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/alpha/Makefile,v 1.1 2000/12/31 23:26:34 mjacob Exp $ +# $FreeBSD: src/sys/alpha/Makefile,v 1.2 2006/05/07 18:12:18 netchild Exp $ # Makefile for alpha tags file @@ -15,8 +15,7 @@ SALPHA= ${SYS}/alpha/mcbus/*.[ch] ${SYS}/alpha/tlsb/*.[ch] \ ${SYS}/alpha/alpha/*.[ch] ${SYS}/alpha/pci/*.[ch] \ ${SYS}/alpha/include/*.[ch] ${SYS}/alpha/isa/*.[ch] \ - ${SYS}/alpha/tc/*.[ch] ${SYS}/alpha/osf1/*.[ch] \ - ${SYS}/alpha/linux/*.[ch] + ${SYS}/alpha/tc/*.[ch] ${SYS}/alpha/osf1/*.[ch] AALPHA= ${SYS}/alpha/alpha/*.s tags:: ==== //depot/projects/kmacy_sun4v/src/sys/alpha/conf/DEFAULTS#3 (text+ko) ==== @@ -1,11 +1,9 @@ # # DEFAULTS -- Default kernel configuration file for FreeBSD/alpha # -# $FreeBSD: src/sys/alpha/conf/DEFAULTS,v 1.3 2005/11/27 23:16:58 ru Exp $ +# $FreeBSD: src/sys/alpha/conf/DEFAULTS,v 1.4 2006/04/28 21:21:50 marcel Exp $ machine alpha # Pseudo devices. device mem # Memory and kernel memory devices - -options PUC_FASTINTR ==== //depot/projects/kmacy_sun4v/src/sys/alpha/conf/GENERIC#3 (text+ko) ==== @@ -18,7 +18,7 @@ # # For hardware specific information check HARDWARE.TXT # -# $FreeBSD: src/sys/alpha/conf/GENERIC,v 1.192 2006/01/10 09:19:07 phk Exp $ +# $FreeBSD: src/sys/alpha/conf/GENERIC,v 1.193 2006/04/24 08:44:33 delphij Exp $ cpu EV4 cpu EV5 @@ -70,8 +70,6 @@ options SYSVMSG # SYSV-style message queues options SYSVSEM # SYSV-style semaphores options _KPOSIX_PRIORITY_SCHEDULING # POSIX P1003_1B real-time extensions -options AHC_REG_PRETTY_PRINT # Print register bitfields in debug - # output. Adds ~128k to driver. options ADAPTIVE_GIANT # Giant mutex is adaptive. # Debugging for use in -current @@ -106,6 +104,8 @@ # SCSI Controllers device ahc # AHA2940 and onboard AIC7xxx devices +options AHC_REG_PRETTY_PRINT # Print register bitfields in debug + # output. Adds ~128k to driver. device isp # Qlogic family device ispfw # Firmware module for Qlogic host adapters device mpt # LSI-Logic MPT-Fusion ==== //depot/projects/kmacy_sun4v/src/sys/alpha/conf/NOTES#3 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/alpha/conf/NOTES,v 1.157 2005/11/27 23:16:58 ru Exp $ +# $FreeBSD: src/sys/alpha/conf/NOTES,v 1.158 2006/05/07 18:12:18 netchild Exp $ # # This file contains machine dependent kernel configuration notes. For # machine independent notes, look in /sys/conf/NOTES. @@ -62,10 +62,3 @@ # Enable OSF/1 ABI emulation options COMPAT_OSF1 - -# Enable Linux ABI emulation (requires COMPAT_OSF1) -options COMPAT_LINUX - -# Enable the linux-like proc filesystem support (requires COMPAT_LINUX -# and PSEUDOFS) -options LINPROCFS ==== //depot/projects/kmacy_sun4v/src/sys/alpha/isa/isa.c#3 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/alpha/isa/isa.c,v 1.38 2005/10/25 19:48:45 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/isa/isa.c,v 1.40 2006/05/02 23:27:15 marcel Exp $"); #include #include @@ -224,22 +224,21 @@ } } - if (type == SYS_RES_IRQ) - res = rman_reserve_resource(&isa_irq_rman, start, start, 1, - 0, child); - else - res = rman_reserve_resource(&isa_drq_rman, start, start, 1, - 0, child); - - if (res && !passthrough) { + res = rman_reserve_resource( + (type == SYS_RES_IRQ) ? &isa_irq_rman : &isa_drq_rman, + start, start, 1, 0, child); + if (res == NULL) + return (NULL); + + rman_set_rid(res, *rid); + if (!passthrough) { rle = resource_list_find(rl, type, *rid); rle->start = rman_get_start(res); rle->end = rman_get_end(res); rle->count = 1; rle->res = res; } - - return res; + return (res); } int ==== //depot/projects/kmacy_sun4v/src/sys/alpha/linux/linux_sysvec.c#4 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/alpha/linux/linux_sysvec.c,v 1.99 2006/03/18 18:24:38 netchild Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/linux/linux_sysvec.c,v 1.100 2006/05/05 16:10:44 ambrisko Exp $"); #include #include @@ -69,6 +69,7 @@ #endif SET_DECLARE(linux_ioctl_handler_set, struct linux_ioctl_handler); +SET_DECLARE(linux_device_handler_set, struct linux_device_handler); void osendsig(sig_t catcher, ksiginfo_t *kp, sigset_t *mask); @@ -227,6 +228,7 @@ Elf64_Brandinfo **brandinfo; int error; struct linux_ioctl_handler **lihp; + struct linux_device_handler **ldhp; error = 0; @@ -239,6 +241,8 @@ if (error == 0) { SET_FOREACH(lihp, linux_ioctl_handler_set) linux_ioctl_register_handler(*lihp); + SET_FOREACH(ldhp, linux_device_handler_set) + linux_device_register_handler(*ldhp); if (bootverbose) printf("Linux ELF exec handler installed\n"); } else @@ -258,6 +262,8 @@ if (error == 0) { SET_FOREACH(lihp, linux_ioctl_handler_set) linux_ioctl_unregister_handler(*lihp); + SET_FOREACH(ldhp, linux_device_handler_set) + linux_device_unregister_handler(*ldhp); if (bootverbose) printf("Linux ELF exec handler removed\n"); } else ==== //depot/projects/kmacy_sun4v/src/sys/alpha/pci/apecs_pci.c#3 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/alpha/pci/apecs_pci.c,v 1.15 2003/08/22 07:20:27 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/pci/apecs_pci.c,v 1.16 2006/04/20 04:16:02 imp Exp $"); #include #include @@ -79,12 +79,17 @@ apecs_pcib_alloc_resource(device_t bus, device_t child, int type, int *rid, u_long start, u_long end, u_long count, u_int flags) { + struct resource *rv = NULL; + if ((hwrpb->rpb_type == ST_DEC_2100_A50) && (type == SYS_RES_IRQ)) - return isa_alloc_intr(bus, child, start); + rv = isa_alloc_intr(bus, child, start); else - return alpha_pci_alloc_resource(bus, child, type, rid, - start, end, count, flags); + rv = alpha_pci_alloc_resource(bus, child, type, rid, + start, end, count, flags); + if (rv != NULL) + rman_set_rid(rv, *rid); + return (rv); } static int ==== //depot/projects/kmacy_sun4v/src/sys/alpha/pci/lca_pci.c#3 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/alpha/pci/lca_pci.c,v 1.17 2003/08/22 07:20:27 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/pci/lca_pci.c,v 1.18 2006/04/20 04:16:02 imp Exp $"); #include #include @@ -78,11 +78,16 @@ lca_pcib_alloc_resource(device_t bus, device_t child, int type, int *rid, u_long start, u_long end, u_long count, u_int flags) { + struct resource *rv = NULL; + if (type == SYS_RES_IRQ) - return isa_alloc_intr(bus, child, start); + rv = isa_alloc_intr(bus, child, start); else - return alpha_pci_alloc_resource(bus, child, type, rid, - start, end, count, flags); + rv = alpha_pci_alloc_resource(bus, child, type, rid, + start, end, count, flags); + if (rv != NULL) + rman_set_rid(rv, *rid); + return (rv); } static int ==== //depot/projects/kmacy_sun4v/src/sys/alpha/pci/pcibus.c#3 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/alpha/pci/pcibus.c,v 1.37 2005/09/25 20:12:29 phk Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/pci/pcibus.c,v 1.39 2006/04/22 19:04:21 marcel Exp $"); #include "opt_isa.h" @@ -96,7 +96,7 @@ alpha_platform_alloc_ide_intr(int chan) { int irqs[2] = { 14, 15 }; - return isa_alloc_intr(0, 0, irqs[chan]); + return (isa_alloc_intr(0, 0, irqs[chan])); } int @@ -230,9 +230,11 @@ #ifdef DEV_ISA if((start >= ISA_IRQ_OFFSET) && (end < ISA_IRQ_OFFSET + ISA_IRQ_LEN)) { - return isa_alloc_intrs(bus, child, - start - ISA_IRQ_OFFSET, - end - ISA_IRQ_OFFSET); + rv = isa_alloc_intrs(bus, child, + start - ISA_IRQ_OFFSET, end - ISA_IRQ_OFFSET); + if (rv != NULL) + rman_set_rid(rv, *rid); + return (rv); } else #endif @@ -252,6 +254,7 @@ if (rv == 0) return 0; + rman_set_rid(rv, *rid); rstart = rman_get_start(rv); rman_set_bustag(rv, ALPHAPCI_GET_BUSTAG(bus, type)); rman_set_bushandle(rv, rstart); ==== //depot/projects/kmacy_sun4v/src/sys/amd64/amd64/apic_vector.S#4 (text+ko) ==== @@ -28,7 +28,7 @@ * SUCH DAMAGE. * * from: vector.s, 386BSD 0.1 unknown origin - * $FreeBSD: src/sys/amd64/amd64/apic_vector.S,v 1.108 2006/03/13 23:55:31 peter Exp $ + * $FreeBSD: src/sys/amd64/amd64/apic_vector.S,v 1.109 2006/05/01 21:36:46 jhb Exp $ */ /* @@ -171,6 +171,25 @@ iretq /* + * Invalidate cache. + */ + .text + SUPERALIGN_TEXT +IDTVEC(invlcache) + pushq %rax + + wbinvd + + movq lapic, %rax + movl $0, LA_EOI(%rax) /* End Of Interrupt to APIC */ + + lock + incl smp_tlb_wait + + popq %rax + iretq + +/* * Handler for IPIs sent via the per-cpu IPI bitmap. */ .text ==== //depot/projects/kmacy_sun4v/src/sys/amd64/amd64/busdma_machdep.c#3 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/busdma_machdep.c,v 1.73 2006/01/14 17:22:46 scottl Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/busdma_machdep.c,v 1.74 2006/05/03 04:14:17 scottl Exp $"); #include #include @@ -703,9 +703,10 @@ error = _bus_dmamap_load_buffer(dmat, map, buf, buflen, NULL, flags, &lastaddr, dmat->segments, &nsegs, 1); + CTR5(KTR_BUSDMA, "%s: tag %p tag flags 0x%x error %d nsegs %d", + __func__, dmat, dmat->flags, error, nsegs + 1); + if (error == EINPROGRESS) { - CTR4(KTR_BUSDMA, "%s: tag %p tag flags 0x%x error %d", - __func__, dmat, dmat->flags, error); return (error); } @@ -714,8 +715,13 @@ else (*callback)(callback_arg, dmat->segments, nsegs + 1, 0); - CTR4(KTR_BUSDMA, "%s: tag %p tag flags 0x%x error 0 nsegs %d", - __func__, dmat, dmat->flags, nsegs + 1); + /* + * Return ENOMEM to the caller so that it can pass it up the stack. + * This error only happens when NOWAIT is set, so deferal is disabled. + */ + if (error == ENOMEM) + return (error); + return (0); } ==== //depot/projects/kmacy_sun4v/src/sys/amd64/amd64/dump_machdep.c#3 (text+ko) ==== @@ -25,12 +25,13 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/dump_machdep.c,v 1.11 2005/07/02 19:57:30 marcel Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/dump_machdep.c,v 1.12 2006/04/21 04:24:50 peter Exp $"); #include #include #include #include +#include #include #include #include @@ -40,6 +41,11 @@ CTASSERT(sizeof(struct kerneldumpheader) == 512); +int do_minidump = 1; +TUNABLE_INT("debug.minidump", &do_minidump); +SYSCTL_INT(_debug, OID_AUTO, minidump, CTLFLAG_RW, &do_minidump, 0, + "Enable mini crash dumps"); + /* * Don't touch the first SIZEOF_METADATA bytes on the dump device. This * is to protect us from metadata and to protect metadata from us. @@ -272,6 +278,10 @@ size_t hdrsz; int error; + if (do_minidump) { + minidumpsys(di); + return; + } bzero(&ehdr, sizeof(ehdr)); ehdr.e_ident[EI_MAG0] = ELFMAG0; ehdr.e_ident[EI_MAG1] = ELFMAG1; ==== //depot/projects/kmacy_sun4v/src/sys/amd64/amd64/fpu.c#3 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/fpu.c,v 1.157 2005/03/11 22:16:09 peter Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/fpu.c,v 1.158 2006/04/19 07:00:19 cperciva Exp $"); #include #include @@ -96,6 +96,8 @@ typedef u_char bool_t; +static void fpu_clean_state(void); + int hw_float = 1; SYSCTL_INT(_hw,HW_FLOATINGPT, floatingpoint, CTLFLAG_RD, &hw_float, 0, @@ -407,6 +409,8 @@ PCPU_SET(fpcurthread, curthread); pcb = PCPU_GET(curpcb); + fpu_clean_state(); + if ((pcb->pcb_flags & PCB_FPUINITDONE) == 0) { /* * This is the first time this thread has used the FPU, @@ -474,6 +478,7 @@ s = intr_disable(); if (td == PCPU_GET(fpcurthread)) { + fpu_clean_state(); fxrstor(addr); intr_restore(s); } else { @@ -484,6 +489,37 @@ } /* + * On AuthenticAMD processors, the fxrstor instruction does not restore + * the x87's stored last instruction pointer, last data pointer, and last + * opcode values, except in the rare case in which the exception summary + * (ES) bit in the x87 status word is set to 1. + * + * In order to avoid leaking this information across processes, we clean + * these values by performing a dummy load before executing fxrstor(). + */ +static double dummy_variable = 0.0; +static void +fpu_clean_state(void) +{ + u_short status; + + /* + * Clear the ES bit in the x87 status word if it is currently + * set, in order to avoid causing a fault in the upcoming load. + */ + fnstsw(&status); + if (status & 0x80) + fnclex(); + + /* + * Load the dummy variable into the x87 stack. This mangles + * the x87 stack, but we don't care since we're about to call + * fxrstor() anyway. + */ + __asm __volatile("ffree %%st(7); fld %0" : : "m" (dummy_variable)); +} + +/* * This really sucks. We want the acpi version only, but it requires * the isa_if.h file in order to get the definitions. */ ==== //depot/projects/kmacy_sun4v/src/sys/amd64/amd64/identcpu.c#3 (text+ko) ==== @@ -39,7 +39,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/identcpu.c,v 1.144 2006/02/15 14:48:59 dwmalone Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/identcpu.c,v 1.146 2006/04/24 22:56:57 jkim Exp $"); #include "opt_cpu.h" @@ -233,7 +233,7 @@ "\014" "\015" "\016CX16" /* CMPXCHG16B Instruction */ - "\017" + "\017XTPR" /* Send Task Priority Messages*/ "\020" "\021" "\022" @@ -360,7 +360,8 @@ else if (strcmp(cpu_vendor, "GenuineIntel") == 0 && (cpu_high >= 4)) { cpuid_count(4, 0, regs); - cmp = ((regs[0] & 0xfc000000) >> 26) + 1; + if ((regs[0] & 0x1f) != 0) + cmp = ((regs[0] >> 26) & 0x3f) + 1; } if (cmp > 1) printf("\n Cores per package: %d", cmp); ==== //depot/projects/kmacy_sun4v/src/sys/amd64/amd64/mp_machdep.c#4 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/mp_machdep.c,v 1.271 2006/03/18 19:32:46 ups Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/mp_machdep.c,v 1.275 2006/05/01 22:06:59 jhb Exp $"); #include "opt_cpu.h" #include "opt_kstack_pages.h" @@ -183,6 +183,7 @@ mp_topology(void) { struct cpu_group *group; + u_int regs[4]; int logical_cpus; int apic_id; int groups; @@ -195,6 +196,13 @@ logical_cpus = (cpu_procinfo & CPUID_HTT_CORES) >> 16; if (logical_cpus <= 1) return; + /* Nothing to do if reported cores are physical cores. */ + if (strcmp(cpu_vendor, "GenuineIntel") == 0 && cpu_high >= 4) { + cpuid_count(4, 0, regs); + if ((regs[0] & 0x1f) != 0 && + logical_cpus <= ((regs[0] >> 26) & 0x3f) + 1) + return; + } group = &mp_groups[0]; groups = 1; for (cpu = 0, apic_id = 0; apic_id < MAXCPU; apic_id++) { @@ -385,8 +393,8 @@ * are available, use them. */ if (cpu_high >= 4) { - /* Ask the processor about up to 32 caches. */ - for (i = 0; i < 32; i++) { + /* Ask the processor about the L1 cache. */ + for (i = 0; i < 1; i++) { cpuid_count(4, i, p); threads_per_cache = ((p[0] & 0x3ffc000) >> 14) + 1; if (hyperthreading_cpus < threads_per_cache) @@ -506,6 +514,9 @@ while (!aps_ready) ia32_pause(); + /* Initialize the PAT MSR. */ + pmap_init_pat(); + /* set up CPU registers and state */ cpu_setregs(); @@ -867,6 +878,14 @@ } void +smp_cache_flush(void) +{ + + if (smp_started) + smp_tlb_shootdown(IPI_INVLCACHE, 0, 0); +} + +void smp_invltlb(void) { ==== //depot/projects/kmacy_sun4v/src/sys/amd64/amd64/nexus.c#3 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/nexus.c,v 1.67 2005/09/25 20:03:41 phk Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/nexus.c,v 1.68 2006/04/20 04:16:34 imp Exp $"); /* * This code implements a `root nexus' for Intel Architecture @@ -340,7 +340,7 @@ rv = rman_reserve_resource(rm, start, end, count, flags, child); if (rv == 0) return 0; - + rman_set_rid(rv, *rid); if (type == SYS_RES_MEMORY) { rman_set_bustag(rv, AMD64_BUS_SPACE_MEM); } else if (type == SYS_RES_IOPORT) { ==== //depot/projects/kmacy_sun4v/src/sys/amd64/amd64/pmap.c#4 (text+ko) ==== @@ -77,7 +77,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.545 2006/04/13 03:31:48 alc Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.554 2006/05/01 22:06:59 jhb Exp $"); /* * Manages physical address maps. @@ -181,7 +181,7 @@ static u_int64_t KPTphys; /* phys addr of kernel level 1 */ static u_int64_t KPDphys; /* phys addr of kernel level 2 */ -static u_int64_t KPDPphys; /* phys addr of kernel level 3 */ +u_int64_t KPDPphys; /* phys addr of kernel level 3 */ u_int64_t KPML4phys; /* phys addr of kernel level 4 */ static u_int64_t DMPDphys; /* phys addr of direct mapped level 2 */ @@ -551,9 +551,54 @@ *CMAP1 = 0; invltlb(); + + /* Initialize the PAT MSR. */ + pmap_init_pat(); } /* + * Setup the PAT MSR. + */ +void +pmap_init_pat(void) +{ + uint64_t pat_msr; + + /* Bail if this CPU doesn't implement PAT. */ + if (!(cpu_feature & CPUID_PAT)) + panic("no PAT??"); + >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sun May 7 22:09:37 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id DA93B16A404; Sun, 7 May 2006 22:09:36 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id B862116A402 for ; Sun, 7 May 2006 22:09:36 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 4B59943D46 for ; Sun, 7 May 2006 22:09:36 +0000 (GMT) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k47M9agF046936 for ; Sun, 7 May 2006 22:09:36 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k47M9aj7046933 for perforce@freebsd.org; Sun, 7 May 2006 22:09:36 GMT (envelope-from jb@freebsd.org) Date: Sun, 7 May 2006 22:09:36 GMT Message-Id: <200605072209.k47M9aj7046933@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 96792 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 07 May 2006 22:09:37 -0000 http://perforce.freebsd.org/chv.cgi?CH=96792 Change 96792 by jb@jb_freebsd2 on 2006/05/07 22:09:19 Start building libproc, the process control library which behaves like the one on Solaris, but doesn't use 'procfs' like they do. Affected files ... .. //depot/projects/dtrace/src/cddl/lib/Makefile#3 edit Differences ... ==== //depot/projects/dtrace/src/cddl/lib/Makefile#3 (text+ko) ==== @@ -1,5 +1,5 @@ # $FreeBSD$ -SUBDIR= libctf libdtrace libelf +SUBDIR= libctf libdtrace libelf libproc .include From owner-p4-projects@FreeBSD.ORG Sun May 7 22:10:38 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5DD0C16A402; Sun, 7 May 2006 22:10:38 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 3D0C016A400 for ; Sun, 7 May 2006 22:10:38 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 09A5243D48 for ; Sun, 7 May 2006 22:10:38 +0000 (GMT) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k47MAbgr047296 for ; Sun, 7 May 2006 22:10:37 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k47MAbPQ047288 for perforce@freebsd.org; Sun, 7 May 2006 22:10:37 GMT (envelope-from jb@freebsd.org) Date: Sun, 7 May 2006 22:10:37 GMT Message-Id: <200605072210.k47MAbPQ047288@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 96793 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 07 May 2006 22:10:38 -0000 http://perforce.freebsd.org/chv.cgi?CH=96793 Change 96793 by jb@jb_freebsd2 on 2006/05/07 22:10:07 Use libproc. Affected files ... .. //depot/projects/dtrace/src/cddl/lib/libdtrace/Makefile#6 edit .. //depot/projects/dtrace/src/cddl/usr.sbin/dtrace/Makefile#3 edit Differences ... ==== //depot/projects/dtrace/src/cddl/lib/libdtrace/Makefile#6 (text+ko) ==== @@ -51,6 +51,7 @@ .PATH: ${OPENSOLARIS_USR_DISTDIR}/lib/libgen/common CFLAGS+= -I${.OBJDIR} \ + -I${.CURDIR}/../libproc \ -I${.CURDIR}/../../../contrib \ -I${.CURDIR}/../../../sys/contrib \ -I${.CURDIR}/../../../sys \ @@ -58,7 +59,8 @@ -I${OPENSOLARIS_USR_DISTDIR}/lib/libctf/common \ -I${OPENSOLARIS_USR_DISTDIR}/lib/libdtrace/common \ -I${OPENSOLARIS_USR_DISTDIR}/lib/libproc/common \ - -I${OPENSOLARIS_SYS_DISTDIR}/uts/common + -I${OPENSOLARIS_SYS_DISTDIR}/uts/common \ + -I${OPENSOLARIS_SYS_DISTDIR}/compat #CFLAGS+= -DYYDEBUG ==== //depot/projects/dtrace/src/cddl/usr.sbin/dtrace/Makefile#3 (text+ko) ==== @@ -16,7 +16,8 @@ -I${OPENSOLARIS_USR_DISTDIR}/head \ -I${OPENSOLARIS_USR_DISTDIR}/lib/libdtrace/common \ -I${OPENSOLARIS_USR_DISTDIR}/lib/libproc/common \ - -I${OPENSOLARIS_SYS_DISTDIR}/uts/common + -I${OPENSOLARIS_SYS_DISTDIR}/uts/common \ + -I${OPENSOLARIS_SYS_DISTDIR}/compat .PATH: ${OPENSOLARIS_USR_DISTDIR}/cmd/dtrace @@ -24,10 +25,11 @@ LDFLAGS+= -pthread \ -L${.OBJDIR}/../../lib/libdtrace \ + -L${.OBJDIR}/../../lib/libproc \ -L${.OBJDIR}/../../lib/libctf \ -L${.OBJDIR}/../../lib/libelf -LDADD+= -ldtrace -ly -ll -lctf -lelf -lz +LDADD+= -ldtrace -ly -ll -lproc -lctf -lelf -lz #DPADD+= ${LIBDTRACE} ${LIBPTHREAD} ${LIBL} ${LIBY} ${LIBZ} From owner-p4-projects@FreeBSD.ORG Sun May 7 22:11:40 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9ADD516A408; Sun, 7 May 2006 22:11:40 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 7A82416A406 for ; Sun, 7 May 2006 22:11:40 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id BF3A143D5A for ; Sun, 7 May 2006 22:11:39 +0000 (GMT) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k47MBdC1048220 for ; Sun, 7 May 2006 22:11:39 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k47MBdql048212 for perforce@freebsd.org; Sun, 7 May 2006 22:11:39 GMT (envelope-from jb@freebsd.org) Date: Sun, 7 May 2006 22:11:39 GMT Message-Id: <200605072211.k47MBdql048212@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 96794 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 07 May 2006 22:11:40 -0000 http://perforce.freebsd.org/chv.cgi?CH=96794 Change 96794 by jb@jb_freebsd2 on 2006/05/07 22:11:36 Use our libproc header. Affected files ... .. //depot/projects/dtrace/src/contrib/opensolaris/lib/libdtrace/common/dt_pid.h#4 edit Differences ... ==== //depot/projects/dtrace/src/contrib/opensolaris/lib/libdtrace/common/dt_pid.h#4 (text) ==== @@ -30,9 +30,7 @@ #pragma ident "@(#)dt_pid.h 1.7 06/02/08 SMI" -#if defined(sun) #include -#endif #include #include From owner-p4-projects@FreeBSD.ORG Sun May 7 22:15:45 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8D3AC16A40D; Sun, 7 May 2006 22:15:45 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 651B016A402 for ; Sun, 7 May 2006 22:15:45 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 341F343D46 for ; Sun, 7 May 2006 22:15:45 +0000 (GMT) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k47MFjvc051767 for ; Sun, 7 May 2006 22:15:45 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k47MFjWs051761 for perforce@freebsd.org; Sun, 7 May 2006 22:15:45 GMT (envelope-from jb@freebsd.org) Date: Sun, 7 May 2006 22:15:45 GMT Message-Id: <200605072215.k47MFjWs051761@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 96795 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 07 May 2006 22:15:45 -0000 http://perforce.freebsd.org/chv.cgi?CH=96795 Change 96795 by jb@jb_freebsd2 on 2006/05/07 22:15:40 Add the hook for the cyclic timer subsystem. The cyclic subsystem code which uses this is enabled using the CYCLIC kernel option. It's an option because the code is covered by Sun's CDDL. DTrace requires the cyclic subsystem to get high priority probes via an interrupt. Affected files ... .. //depot/projects/dtrace/src/sys/sys/pcpu.h#2 edit Differences ... ==== //depot/projects/dtrace/src/sys/sys/pcpu.h#2 (text+ko) ==== @@ -45,6 +45,7 @@ #include #include +struct cyc_cpu; struct pcb; struct thread; @@ -74,6 +75,7 @@ PCPU_MD_FIELDS; struct vmmeter pc_cnt; /* VM stats counters */ struct device *pc_device; + struct cyc_cpu *cpu_cyclic; /* Cyclic subsystem data */ }; SLIST_HEAD(cpuhead, pcpu); From owner-p4-projects@FreeBSD.ORG Sun May 7 22:17:48 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id BD05316A406; Sun, 7 May 2006 22:17:48 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 8551516A400 for ; Sun, 7 May 2006 22:17:48 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 2C15343D46 for ; Sun, 7 May 2006 22:17:48 +0000 (GMT) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k47MHmha053285 for ; Sun, 7 May 2006 22:17:48 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k47MHlO2053280 for perforce@freebsd.org; Sun, 7 May 2006 22:17:47 GMT (envelope-from jb@freebsd.org) Date: Sun, 7 May 2006 22:17:47 GMT Message-Id: <200605072217.k47MHlO2053280@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 96796 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 07 May 2006 22:17:49 -0000 http://perforce.freebsd.org/chv.cgi?CH=96796 Change 96796 by jb@jb_freebsd2 on 2006/05/07 22:17:21 Include path hell. Sigh. All these include paths are just there to avoid having to install headers that don't really belong in FreeBSD's /usr/include/sys. Affected files ... .. //depot/projects/dtrace/src/sys/modules/dtrace/dtrace/Makefile#4 edit .. //depot/projects/dtrace/src/sys/modules/dtrace/profile/Makefile#2 edit Differences ... ==== //depot/projects/dtrace/src/sys/modules/dtrace/dtrace/Makefile#4 (text+ko) ==== @@ -13,6 +13,7 @@ CFLAGS+= -I${.CURDIR}/../../../cddl/dev/dtrace \ -I${.CURDIR}/../../../cddl/dev/dtrace/${MACHINE_ARCH} \ + -I${.CURDIR}/../../../contrib/opensolaris/compat \ -I${.CURDIR}/../../../contrib/opensolaris/uts/common \ -I${.CURDIR}/../../../contrib \ -I${.CURDIR}/../../.. -DDIS_MEM -D_SOLARIS_C_SOURCE ==== //depot/projects/dtrace/src/sys/modules/dtrace/profile/Makefile#2 (text+ko) ==== @@ -8,6 +8,7 @@ CFLAGS+= -I${.CURDIR}/../../../cddl/dev/profile \ -I${.CURDIR}/../../../contrib/opensolaris/uts/common \ + -I${.CURDIR}/../../../contrib/opensolaris/compat \ -I${.CURDIR}/../../../contrib \ -I${.CURDIR}/../../.. -D_SOLARIS_C_SOURCE From owner-p4-projects@FreeBSD.ORG Sun May 7 22:40:16 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id DCBCB16A408; Sun, 7 May 2006 22:40:16 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id A1F0116A405 for ; Sun, 7 May 2006 22:40:16 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 4AB4743D49 for ; Sun, 7 May 2006 22:40:16 +0000 (GMT) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k47MeGFD066010 for ; Sun, 7 May 2006 22:40:16 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k47MeF7J066004 for perforce@freebsd.org; Sun, 7 May 2006 22:40:15 GMT (envelope-from jb@freebsd.org) Date: Sun, 7 May 2006 22:40:15 GMT Message-Id: <200605072240.k47MeF7J066004@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 96798 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 07 May 2006 22:40:17 -0000 http://perforce.freebsd.org/chv.cgi?CH=96798 Change 96798 by jb@jb_freebsd2 on 2006/05/07 22:39:24 Add an option to build in the cyclic subsystem. The timers are useful on their own, but they are required for DTrace. Affected files ... .. //depot/projects/dtrace/src/sys/conf/options#7 edit Differences ... ==== //depot/projects/dtrace/src/sys/conf/options#7 (text+ko) ==== @@ -69,6 +69,7 @@ COMPILING_LINT opt_global.h CONSPEED opt_comconsole.h CY_PCI_FASTINTR +CYCLIC opt_cyclic.h DIRECTIO FULL_PREEMPTION opt_sched.h IPI_PREEMPTION opt_sched.h From owner-p4-projects@FreeBSD.ORG Sun May 7 22:43:22 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D82FE16A40E; Sun, 7 May 2006 22:43:21 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id AD28816A408 for ; Sun, 7 May 2006 22:43:20 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 78CF643D49 for ; Sun, 7 May 2006 22:43:20 +0000 (GMT) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k47MhKqw068340 for ; Sun, 7 May 2006 22:43:20 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k47MhKi8068337 for perforce@freebsd.org; Sun, 7 May 2006 22:43:20 GMT (envelope-from jb@freebsd.org) Date: Sun, 7 May 2006 22:43:20 GMT Message-Id: <200605072243.k47MhKi8068337@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 96799 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 07 May 2006 22:43:22 -0000 http://perforce.freebsd.org/chv.cgi?CH=96799 Change 96799 by jb@jb_freebsd2 on 2006/05/07 22:42:28 Add the cyclic system front end. Split the vmem and kmem hacks into separate source files that can be filled in later with a proper implementation. It isn'y just DTrace that needs these now. Cyclic does too. Add the OpenSolaris compatibility header path so that the files compile without haveing to install a bunch of headers in FreeBSD where they don't belong. Affected files ... .. //depot/projects/dtrace/src/sys/conf/files#10 edit Differences ... ==== //depot/projects/dtrace/src/sys/conf/files#10 (text+ko) ==== @@ -92,9 +92,18 @@ cam/scsi/scsi_ses.c optional ses cam/scsi/scsi_targ_bh.c optional targbh cam/scsi/scsi_target.c optional targ -cddl/dev/dtrace/dtrace.c optional dtrace | fasttrap -cddl/dev/dtrace/dtrace_mutex.c optional dtrace | fasttrap -cddl/dev/fasttrap/fasttrap.c optional fasttrap +cddl/dev/dtrace/dtrace.c optional dtrace | fasttrap \ + compile-with "${NORMAL_C} -D_SOLARIS_C_SOURCE -I$S/contrib/opensolaris/compat" +cddl/dev/dtrace/dtrace_mutex.c optional dtrace | fasttrap \ + compile-with "${NORMAL_C} -D_SOLARIS_C_SOURCE -I$S/contrib/opensolaris/compat" +cddl/dev/fasttrap/fasttrap.c optional dtrace | fasttrap \ + compile-with "${NORMAL_C} -D_SOLARIS_C_SOURCE -I$S/contrib/opensolaris/compat" +cddl/kern/cyclic.c optional cyclic | kdtrace \ + compile-with "${NORMAL_C} -D_SOLARIS_C_SOURCE -I$S/contrib/opensolaris/compat" +cddl/kern/kmem.c optional cyclic | kdtrace \ + compile-with "${NORMAL_C} -D_SOLARIS_C_SOURCE -I$S/contrib/opensolaris/compat" +cddl/kern/vmem.c optional cyclic | kdtrace \ + compile-with "${NORMAL_C} -D_SOLARIS_C_SOURCE -I$S/contrib/opensolaris/compat" coda/coda_fbsd.c optional vcoda coda/coda_namecache.c optional vcoda coda/coda_psdev.c optional vcoda From owner-p4-projects@FreeBSD.ORG Sun May 7 22:48:29 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2CB3B16A417; Sun, 7 May 2006 22:48:29 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 0483C16A404 for ; Sun, 7 May 2006 22:48:29 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 032AB43D66 for ; Sun, 7 May 2006 22:48:27 +0000 (GMT) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k47MmQZZ068576 for ; Sun, 7 May 2006 22:48:26 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k47MmQbl068573 for perforce@freebsd.org; Sun, 7 May 2006 22:48:26 GMT (envelope-from jb@freebsd.org) Date: Sun, 7 May 2006 22:48:26 GMT Message-Id: <200605072248.k47MmQbl068573@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 96800 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 07 May 2006 22:48:29 -0000 http://perforce.freebsd.org/chv.cgi?CH=96800 Change 96800 by jb@jb_freebsd2 on 2006/05/07 22:48:14 Clean up the include file paths. Affected files ... .. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/sys/dtrace.h#15 edit Differences ... ==== //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/sys/dtrace.h#15 (text) ==== @@ -54,7 +54,7 @@ #include #include #else -#include +#include #include #include #include @@ -66,8 +66,8 @@ typedef struct linker_file modctl_t; #endif #include +#include #if defined(sun) -#include #include #else #include From owner-p4-projects@FreeBSD.ORG Sun May 7 22:52:02 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 11A3516A40B; Sun, 7 May 2006 22:52:02 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id D031F16A405 for ; Sun, 7 May 2006 22:52:01 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id A00FB43D6D for ; Sun, 7 May 2006 22:51:55 +0000 (GMT) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k47MptcC070241 for ; Sun, 7 May 2006 22:51:55 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k47Mptae070223 for perforce@freebsd.org; Sun, 7 May 2006 22:51:55 GMT (envelope-from jb@freebsd.org) Date: Sun, 7 May 2006 22:51:55 GMT Message-Id: <200605072251.k47Mptae070223@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 96801 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 07 May 2006 22:52:02 -0000 http://perforce.freebsd.org/chv.cgi?CH=96801 Change 96801 by jb@jb_freebsd2 on 2006/05/07 22:50:55 Clean up the include files. Move vmem_t out to a compatibility header. Fix a prototype to satisfy gcc's taste for all things consistent. Affected files ... .. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/sys/dtrace_impl.h#7 edit Differences ... ==== //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/sys/dtrace_impl.h#7 (text) ==== @@ -45,16 +45,13 @@ * Please refer to the "Solaris Dynamic Tracing Guide" for more information. */ -#if defined(sun) #include -#else -#include +#if !defined(sun) #ifdef __sparcv9 typedef uint32_t pc_t; #else typedef uintptr_t pc_t; #endif -typedef u_int32_t vmem_t; typedef u_int greg_t; #endif @@ -1127,10 +1124,8 @@ uint32_t dts_dblerrors; /* errors in ERROR probes */ uint32_t dts_reserve; /* space reserved for END */ hrtime_t dts_laststatus; /* time of last status */ -#ifdef DOODAD cyclic_id_t dts_cleaner; /* cleaning cyclic */ cyclic_id_t dts_deadman; /* deadman cyclic */ -#endif hrtime_t dts_alive; /* time last alive */ char dts_speculates; /* boolean: has speculations */ char dts_destructive; /* boolean: has dest. actions */ @@ -1246,7 +1241,7 @@ extern int dtrace_getipl(void); extern uintptr_t dtrace_caller(int); extern uint32_t dtrace_cas32(uint32_t *, uint32_t, uint32_t); -extern void *dtrace_casptr(void *, void *, void *); +extern void *dtrace_casptr(volatile void *, volatile void *, volatile void *); extern void dtrace_copyin(uintptr_t, uintptr_t, size_t); extern void dtrace_copyinstr(uintptr_t, uintptr_t, size_t); extern void dtrace_copyout(uintptr_t, uintptr_t, size_t); From owner-p4-projects@FreeBSD.ORG Sun May 7 23:10:39 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id CB09C16A403; Sun, 7 May 2006 23:10:39 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 8F75916A41F for ; Sun, 7 May 2006 23:10:39 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id D06C243D66 for ; Sun, 7 May 2006 23:10:18 +0000 (GMT) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k47NAIbh080806 for ; Sun, 7 May 2006 23:10:18 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k47NAIGE080800 for perforce@freebsd.org; Sun, 7 May 2006 23:10:18 GMT (envelope-from jb@freebsd.org) Date: Sun, 7 May 2006 23:10:18 GMT Message-Id: <200605072310.k47NAIGE080800@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 96803 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 07 May 2006 23:10:40 -0000 http://perforce.freebsd.org/chv.cgi?CH=96803 Change 96803 by jb@jb_freebsd2 on 2006/05/07 23:09:38 Move the vmem and kmem hacks out into separate files that can be filled in later with something less hackish. Affected files ... .. //depot/projects/dtrace/src/sys/cddl/dev/dtrace/dtrace_hacks.c#13 edit .. //depot/projects/dtrace/src/sys/cddl/dev/dtrace/dtrace_hacks.h#12 edit .. //depot/projects/dtrace/src/sys/cddl/kern/kmem.c#1 add .. //depot/projects/dtrace/src/sys/cddl/kern/vmem.c#1 add .. //depot/projects/dtrace/src/sys/contrib/opensolaris/compat/sys/kmem.h#1 add .. //depot/projects/dtrace/src/sys/contrib/opensolaris/compat/sys/vmem.h#1 add Differences ... ==== //depot/projects/dtrace/src/sys/cddl/dev/dtrace/dtrace_hacks.c#13 (text+ko) ==== @@ -1,69 +1,5 @@ /* XXX Hacks.... */ -vmem_t * -vmem_create(const char *name, void *base, size_t size, size_t quantum, - vmem_alloc_t *afunc, vmem_free_t *ffunc, vmem_t *source, - size_t qcache_max, int vmflag) -{ - return (malloc(sizeof(vmem_t), M_DTRACE, M_WAITOK | M_ZERO)); -} - -void * -vmem_alloc(vmem_t *vmp, size_t size, int vmflag) -{ - /* - * Hope like hell that the caller only uses the value - * returned as an integer, not a pointer! - */ - return ((void *) ++(*vmp)); -} - -void -vmem_free(vmem_t *vmp, void *vaddr, size_t size) -{ - /* - * Nothing to do here. We didn't really allocate memory - * in the first place. 8-) - */ -} -void -vmem_destroy(vmem_t *vmp) -{ - free(vmp, M_DTRACE); -} -kmem_cache_t * -kmem_cache_create( - char *name, /* descriptive name for this cache */ - size_t bufsize, /* size of the objects it manages */ - size_t align, /* required object alignment */ - int (*constructor)(void *, void *, int), /* object constructor */ - void (*destructor)(void *, void *), /* object destructor */ - void (*reclaim)(void *), /* memory reclaim callback */ - void *private, /* pass-thru arg for constr/destr/reclaim */ - vmem_t *vmp, /* vmem source for slab allocation */ - int cflags) /* cache creation flags */ - -{ - kmem_cache_t *p = malloc(sizeof(kmem_cache_t), M_DTRACE, M_WAITOK); - p->size = bufsize; - return(p); -} -void * -kmem_cache_alloc(kmem_cache_t *a, int b) -{ - return (malloc(a->size, M_DTRACE, M_WAITOK | M_ZERO)); -} -void -kmem_cache_free(kmem_cache_t *a, void *b) -{ - free(b, M_DTRACE); -} -void -kmem_cache_destroy(kmem_cache_t *a) -{ - free(a, M_DTRACE); -} - dtrace_cacheid_t dtrace_predcache_id; void *hack_refs[] = ==== //depot/projects/dtrace/src/sys/cddl/dev/dtrace/dtrace_hacks.h#12 (text+ko) ==== @@ -7,17 +7,6 @@ #define CPU curthread #define cpu_id td_oncpu -#define VM_SLEEP 0x00000000 /* same as KM_SLEEP */ -#define VM_BESTFIT 0x00000100 -#define VMC_IDENTIFIER 0x00040000 /* not backed by memory */ -typedef void *(vmem_alloc_t)(vmem_t *, size_t, int); -typedef void (vmem_free_t)(vmem_t *, void *, size_t); -vmem_t *vmem_create(const char *, void *, size_t, size_t, - vmem_alloc_t *, vmem_free_t *, vmem_t *, size_t, int); -void *vmem_alloc(vmem_t *, size_t, int); -void vmem_free(vmem_t *, void *, size_t); -void vmem_destroy(vmem_t *); - #define t_dtrace_start td_dtrace_start #define t_dtrace_vtime td_dtrace_vtime #define t_predcache td_predcache @@ -37,11 +26,6 @@ #define crgetuid(_a) _a->cr_uid #define crgetzoneid(_a) 0 #define SNOCD 0 -#define KM_SLEEP M_WAITOK -#define KM_NOSLEEP M_NOWAIT -#define kmem_zalloc(_a,_b) malloc(_a, M_DTRACE, _b | M_ZERO) -#define kmem_alloc(_a,_b) malloc(_a, M_DTRACE, _b) -#define kmem_free(_a,_b) free(_a, M_DTRACE) #define NCPU (mp_maxid + 1) #define delay(_a) DELAY(_a) #define vuprintf vprintf @@ -61,7 +45,6 @@ #define PRIV_PROC_OWNER (1UL << 4) #define PRIV_PROC_ZONE (1UL << 5) #define PRIV_ALL ~0UL -typedef struct pcpu cpu_t; typedef struct __dev_info *dev_info_t; typedef int minor_t; typedef int major_t; @@ -110,18 +93,6 @@ #define PRIV_POLICY_ONLY(cred, priv, all) \ priv_policy_only((cred), (priv), (all)) -typedef struct kmem_cache { - size_t size; -} kmem_cache_t; -kmem_cache_t *kmem_cache_create(char *, size_t, size_t, - int (*)(void *, void *, int), void (*)(void *, void *), - void (*)(void *), void *, vmem_t *, int); -void kmem_cache_destroy(kmem_cache_t *); -void *kmem_cache_alloc(kmem_cache_t *, int); -void kmem_cache_free(kmem_cache_t *, void *); -uint64_t kmem_cache_stat(kmem_cache_t *, char *); -void kmem_cache_reap_now(kmem_cache_t *); - typedef enum kdi_dtrace_set { KDI_DTSET_DTRACE_ACTIVATE, KDI_DTSET_DTRACE_DEACTIVATE, From owner-p4-projects@FreeBSD.ORG Sun May 7 23:11:25 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id DCB4216A435; Sun, 7 May 2006 23:11:24 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 61D4E16A431 for ; Sun, 7 May 2006 23:11:24 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 0ACDD43D58 for ; Sun, 7 May 2006 23:11:20 +0000 (GMT) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k47NBKXm081733 for ; Sun, 7 May 2006 23:11:20 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k47NBKcX081727 for perforce@freebsd.org; Sun, 7 May 2006 23:11:20 GMT (envelope-from jb@freebsd.org) Date: Sun, 7 May 2006 23:11:20 GMT Message-Id: <200605072311.k47NBKcX081727@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 96804 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 07 May 2006 23:11:27 -0000 http://perforce.freebsd.org/chv.cgi?CH=96804 Change 96804 by jb@jb_freebsd2 on 2006/05/07 23:10:30 Use the kmem compatibility header to translate Solaris-isms. Affected files ... .. //depot/projects/dtrace/src/sys/cddl/dev/systrace/systrace.c#5 edit Differences ... ==== //depot/projects/dtrace/src/sys/cddl/dev/systrace/systrace.c#5 (text+ko) ==== @@ -39,6 +39,7 @@ #include #include #include +#include #include #include #include From owner-p4-projects@FreeBSD.ORG Sun May 7 23:12:23 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 09C5D16A406; Sun, 7 May 2006 23:12:23 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id C422016A400 for ; Sun, 7 May 2006 23:12:22 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 9003543D45 for ; Sun, 7 May 2006 23:12:22 +0000 (GMT) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k47NCMRG082644 for ; Sun, 7 May 2006 23:12:22 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k47NCMDb082636 for perforce@freebsd.org; Sun, 7 May 2006 23:12:22 GMT (envelope-from jb@freebsd.org) Date: Sun, 7 May 2006 23:12:22 GMT Message-Id: <200605072312.k47NCMDb082636@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 96805 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 07 May 2006 23:12:23 -0000 http://perforce.freebsd.org/chv.cgi?CH=96805 Change 96805 by jb@jb_freebsd2 on 2006/05/07 23:11:28 Uncomment the lines which refer to cyclic timers now that we have them. Affected files ... .. //depot/projects/dtrace/src/sys/cddl/dev/dtrace/dtrace_state.c#6 edit Differences ... ==== //depot/projects/dtrace/src/sys/cddl/dev/dtrace/dtrace_state.c#6 (text+ko) ==== @@ -526,10 +526,8 @@ dtrace_optval_t *opt = state->dts_options, sz, nspec; dtrace_speculation_t *spec; dtrace_buffer_t *buf; -#ifdef DOODAD cyc_handler_t hdlr; cyc_time_t when; -#endif int rval = 0, i, bufsize = NCPU * sizeof (dtrace_buffer_t); dtrace_icookie_t cookie; @@ -707,36 +705,24 @@ if (opt[DTRACEOPT_CLEANRATE] > dtrace_cleanrate_max) opt[DTRACEOPT_CLEANRATE] = dtrace_cleanrate_max; -#ifdef DOODAD hdlr.cyh_func = (cyc_func_t)dtrace_state_clean; hdlr.cyh_arg = state; hdlr.cyh_level = CY_LOW_LEVEL; -#endif -#ifdef DOODAD when.cyt_when = 0; when.cyt_interval = opt[DTRACEOPT_CLEANRATE]; -#endif -#ifdef DOODAD state->dts_cleaner = cyclic_add(&hdlr, &when); -#endif -#ifdef DOODAD hdlr.cyh_func = (cyc_func_t)dtrace_state_deadman; hdlr.cyh_arg = state; hdlr.cyh_level = CY_LOW_LEVEL; -#endif -#ifdef DOODAD when.cyt_when = 0; when.cyt_interval = dtrace_deadman_interval; -#endif state->dts_alive = state->dts_laststatus = dtrace_gethrtime(); -#ifdef DOODAD state->dts_deadman = cyclic_add(&hdlr, &when); -#endif state->dts_activity = DTRACE_ACTIVITY_WARMUP; @@ -999,13 +985,11 @@ for (i = 0; i < nspec; i++) dtrace_buffer_free(spec[i].dtsp_buffer); -#ifdef DOODAD if (state->dts_cleaner != CYCLIC_NONE) cyclic_remove(state->dts_cleaner); if (state->dts_deadman != CYCLIC_NONE) cyclic_remove(state->dts_deadman); -#endif dtrace_dstate_fini(&vstate->dtvs_dynvars); dtrace_vstate_fini(vstate); From owner-p4-projects@FreeBSD.ORG Sun May 7 23:13:24 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id AF64516A407; Sun, 7 May 2006 23:13:24 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 8FA2B16A404 for ; Sun, 7 May 2006 23:13:24 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 4E60F43D46 for ; Sun, 7 May 2006 23:13:24 +0000 (GMT) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k47NDO5d083580 for ; Sun, 7 May 2006 23:13:24 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k47NDOe4083577 for perforce@freebsd.org; Sun, 7 May 2006 23:13:24 GMT (envelope-from jb@freebsd.org) Date: Sun, 7 May 2006 23:13:24 GMT Message-Id: <200605072313.k47NDOe4083577@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 96806 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 07 May 2006 23:13:24 -0000 http://perforce.freebsd.org/chv.cgi?CH=96806 Change 96806 by jb@jb_freebsd2 on 2006/05/07 23:12:24 Satisfy gcc's taste for things consistent. Affected files ... .. //depot/projects/dtrace/src/sys/cddl/dev/dtrace/dtrace_dynvar.c#3 edit Differences ... ==== //depot/projects/dtrace/src/sys/cddl/dev/dtrace/dtrace_dynvar.c#3 (text+ko) ==== @@ -182,8 +182,6 @@ */ bucket = hashval % dstate->dtds_hashsize; -printf("%s:%s(%d): DOODAD\n",__FUNCTION__,__FILE__,__LINE__); -#ifdef DOODAD if (op == DTRACE_DYNVAR_DEALLOC) { volatile uintptr_t *lockp = &hash[bucket].dtdh_lock; @@ -191,14 +189,13 @@ while ((lock = *lockp) & 1) continue; - if (dtrace_casptr((void *)lockp, - (void *)lock, (void *)(lock + 1)) == (void *)lock) + if (dtrace_casptr((volatile void *)lockp, + (volatile void *)lock, (volatile void *)(lock + 1)) == (void *)lock) break; } dtrace_membar_producer(); } -#endif top: prev = NULL; From owner-p4-projects@FreeBSD.ORG Sun May 7 23:14:29 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3A65016A40A; Sun, 7 May 2006 23:14:29 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id DB8D916A401 for ; Sun, 7 May 2006 23:14:28 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 2726D43D5E for ; Sun, 7 May 2006 23:14:26 +0000 (GMT) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k47NEQpr084381 for ; Sun, 7 May 2006 23:14:26 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k47NEPCi084373 for perforce@freebsd.org; Sun, 7 May 2006 23:14:25 GMT (envelope-from jb@freebsd.org) Date: Sun, 7 May 2006 23:14:25 GMT Message-Id: <200605072314.k47NEPCi084373@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 96807 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 07 May 2006 23:14:29 -0000 http://perforce.freebsd.org/chv.cgi?CH=96807 Change 96807 by jb@jb_freebsd2 on 2006/05/07 23:14:15 Fix assignments where gcc dislikes NULL being used instead of zero. Affected files ... .. //depot/projects/dtrace/src/sys/cddl/dev/dtrace/dtrace_dif.c#5 edit Differences ... ==== //depot/projects/dtrace/src/sys/cddl/dev/dtrace/dtrace_dif.c#5 (text+ko) ==== @@ -1154,8 +1154,6 @@ } case DIF_SUBR_STRJOIN: { -printf("%s:%s(%d): DOODAD\n",__FUNCTION__,__FILE__,__LINE__); -#ifdef DOODAD char *d = (char *)mstate->dtms_scratch_ptr; uint64_t size = state->dts_options[DTRACEOPT_STRSIZE]; uintptr_t s1 = tupregs[0].dttk_value; @@ -1165,14 +1163,14 @@ if (mstate->dtms_scratch_ptr + size > mstate->dtms_scratch_base + mstate->dtms_scratch_size) { DTRACE_CPUFLAG_SET(CPU_DTRACE_NOSCRATCH); - regs[rd] = NULL; + regs[rd] = 0; break; } for (;;) { if (i >= size) { DTRACE_CPUFLAG_SET(CPU_DTRACE_NOSCRATCH); - regs[rd] = NULL; + regs[rd] = 0; break; } @@ -1185,7 +1183,7 @@ for (;;) { if (i >= size) { DTRACE_CPUFLAG_SET(CPU_DTRACE_NOSCRATCH); - regs[rd] = NULL; + regs[rd] = 0; break; } @@ -1198,7 +1196,6 @@ regs[rd] = (uintptr_t)d; } -#endif break; } @@ -1363,8 +1360,6 @@ } case DIF_SUBR_CLEANPATH: { -printf("%s:%s(%d): DOODAD\n",__FUNCTION__,__FILE__,__LINE__); -#ifdef DOODAD char *dest = (char *)mstate->dtms_scratch_ptr, c; uint64_t size = state->dts_options[DTRACEOPT_STRSIZE]; uintptr_t src = tupregs[0].dttk_value; @@ -1373,7 +1368,7 @@ if (mstate->dtms_scratch_ptr + size > mstate->dtms_scratch_base + mstate->dtms_scratch_size) { DTRACE_CPUFLAG_SET(CPU_DTRACE_NOSCRATCH); - regs[rd] = NULL; + regs[rd] = 0; break; } @@ -1465,7 +1460,6 @@ dest[j] = '\0'; regs[rd] = (uintptr_t)dest; mstate->dtms_scratch_ptr += size; -#endif break; } } @@ -1487,9 +1481,7 @@ uint64_t rval = 0; dtrace_statvar_t *svar; -#ifdef DOODAD dtrace_dstate_t *dstate = &vstate->dtvs_dynvars; -#endif dtrace_difv_t *v; volatile uint16_t *flags = &cpu_core[CPU->cpu_id].cpuc_dtrace_flags; volatile uintptr_t *illval = &cpu_core[CPU->cpu_id].cpuc_dtrace_illval; @@ -1923,9 +1915,6 @@ break; case DIF_OP_LDTS: { -printf("%s(%d):\n",__FUNCTION__,__LINE__); -printf("%s:%s(%d): DOODAD\n",__FUNCTION__,__FILE__,__LINE__); -#ifdef DOODAD dtrace_dynvar_t *dvar; dtrace_key_t *key; @@ -1953,14 +1942,11 @@ } else { regs[rd] = *((uint64_t *)dvar->dtdv_data); } -#endif break; } case DIF_OP_STTS: { -printf("%s:%s(%d): DOODAD\n",__FUNCTION__,__FILE__,__LINE__); -#ifdef DOODAD dtrace_dynvar_t *dvar; dtrace_key_t *key; @@ -1985,7 +1971,7 @@ * Given that we're storing to thread-local data, * we need to flush our predicate cache. */ - curthread->t_predcache = NULL; + curthread->t_predcache = 0; if (dvar == NULL) break; @@ -1996,7 +1982,6 @@ } else { *((uint64_t *)dvar->dtdv_data) = regs[rd]; } -#endif break; } @@ -2057,8 +2042,6 @@ case DIF_OP_LDGAA: case DIF_OP_LDTAA: { -printf("%s:%s(%d): DOODAD\n",__FUNCTION__,__FILE__,__LINE__); -#ifdef DOODAD dtrace_dynvar_t *dvar; dtrace_key_t *key = tupregs; uint_t nkeys = ttop; @@ -2094,14 +2077,11 @@ regs[rd] = *((uint64_t *)dvar->dtdv_data); } -#endif break; } case DIF_OP_STGAA: case DIF_OP_STTAA: { -printf("%s:%s(%d): DOODAD\n",__FUNCTION__,__FILE__,__LINE__); -#ifdef DOODAD dtrace_dynvar_t *dvar; dtrace_key_t *key = tupregs; uint_t nkeys = ttop; @@ -2136,7 +2116,6 @@ } else { *((uint64_t *)dvar->dtdv_data) = regs[rd]; } -#endif break; } From owner-p4-projects@FreeBSD.ORG Sun May 7 23:16:35 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C3BEE16A406; Sun, 7 May 2006 23:16:35 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 4F58916A405 for ; Sun, 7 May 2006 23:16:35 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id A5AFC43D5E for ; Sun, 7 May 2006 23:16:29 +0000 (GMT) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k47NGTXk086078 for ; Sun, 7 May 2006 23:16:29 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k47NGSea086072 for perforce@freebsd.org; Sun, 7 May 2006 23:16:28 GMT (envelope-from jb@freebsd.org) Date: Sun, 7 May 2006 23:16:28 GMT Message-Id: <200605072316.k47NGSea086072@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 96808 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 07 May 2006 23:16:36 -0000 http://perforce.freebsd.org/chv.cgi?CH=96808 Change 96808 by jb@jb_freebsd2 on 2006/05/07 23:15:39 Clean up include file paths. Use the new kmem/vmem compatibility implementation. Simplify the thread-specific key macro to suit FreeBSD. Affected files ... .. //depot/projects/dtrace/src/sys/cddl/dev/dtrace/dtrace.c#20 edit Differences ... ==== //depot/projects/dtrace/src/sys/cddl/dev/dtrace/dtrace.c#20 (text+ko) ==== @@ -53,6 +53,7 @@ #include #include #include +#include #include #include #include @@ -70,13 +71,14 @@ #include #include -#include +#include #include #define DTRACE_MINOR 0 MALLOC_DECLARE(M_DTRACE); MALLOC_DEFINE(M_DTRACE, "dtrace", "Dynamic Trace"); +#define M_KMEM M_DTRACE static d_close_t dtrace_close; static d_ioctl_t dtrace_ioctl; @@ -338,6 +340,7 @@ * no way for a global variable key signature to match a thread-local key * signature. */ +#if defined(sun) #define DTRACE_TLS_THRKEY(where) { \ uint_t intr = 0; \ uint_t actv = CPU->cpu_intr_actv >> (LOCK_LEVEL + 1); \ @@ -347,6 +350,13 @@ (where) = ((curthread->t_did + DIF_VARIABLE_MAX) & \ (((uint64_t)1 << 61) - 1)) | ((uint64_t)intr << 61); \ } +#else +#define DTRACE_TLS_THRKEY(where) { \ + uint_t intr = 0; \ + (where) = ((curthread->td_tid + DIF_VARIABLE_MAX) & \ + (((uint64_t)1 << 61) - 1)) | ((uint64_t)intr << 61); \ +} +#endif #define DTRACE_STORE(type, tomax, offset, what) \ *((type *)((uintptr_t)(tomax) + (uintptr_t)offset)) = (type)(what); From owner-p4-projects@FreeBSD.ORG Mon May 8 00:32:00 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3CEC416A407; Mon, 8 May 2006 00:32:00 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id F379716A405 for ; Mon, 8 May 2006 00:31:59 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id BCA8B43D45 for ; Mon, 8 May 2006 00:31:59 +0000 (GMT) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k480VxEh036063 for ; Mon, 8 May 2006 00:31:59 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k480Vxba036060 for perforce@freebsd.org; Mon, 8 May 2006 00:31:59 GMT (envelope-from kmacy@freebsd.org) Date: Mon, 8 May 2006 00:31:59 GMT Message-Id: <200605080031.k480Vxba036060@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 96809 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 08 May 2006 00:32:00 -0000 http://perforce.freebsd.org/chv.cgi?CH=96809 Change 96809 by kmacy@kmacy_storage:sun4v_rwbuf on 2006/05/08 00:31:23 re-load floating point registers on fp not available trap if bit is set in PCB Affected files ... .. //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/exception.S#49 edit Differences ... ==== //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/exception.S#49 (text+ko) ==== @@ -591,35 +591,36 @@ .endm .macro tl0_fp_restore - ba,a %xcc, tl0_fp_restore - nop + GET_PCB(PCB_REG) ! 3 instructions + ldx [%g6 + PCB_FLAGS], %g1 + ba,pt %xcc, tl0_fp_restore + wr %g0, FPRS_FEF, %fprs .align 32 .endm .macro tl0_fp_enable - wr %g0, FPRS_FEF, %fprs + GET_PCB(PCB_REG) ! 3 instructions + ldx [PCB_REG + PCB_FLAGS], %g1 + andcc %g1, PCB_FEF, %g0 + bnz,pt %xcc, tl0_fp_restore + wr %g0, FPRS_FEF, %fprs retry .align 32 .endm ENTRY(tl0_fp_restore) - GET_PCB(PCB_REG) - - ldx [%g6 + PCB_FLAGS], %g1 andn %g1, PCB_FEF, %g1 stx %g1, [%g6 + PCB_FLAGS] - - wr %g0, FPRS_FEF, %fprs - wr %g0, ASI_BLK_S, %asi - ldda [PCB_REG + PCB_UFP + (0 * 64)] %asi, %f0 - ldda [PCB_REG + PCB_UFP + (1 * 64)] %asi, %f16 - ldda [PCB_REG + PCB_UFP + (2 * 64)] %asi, %f32 - ldda [PCB_REG + PCB_UFP + (3 * 64)] %asi, %f48 - membar #Sync - done + + ldd [PCB_REG + PCB_UFP + (0 * 64)], %f0 + ldd [PCB_REG + PCB_UFP + (1 * 64)], %f16 + ldd [PCB_REG + PCB_UFP + (2 * 64)], %f32 + ldd [PCB_REG + PCB_UFP + (3 * 64)], %f48 + retry END(tl0_fp_restore) .macro tl1_insn_excptn + nop .align 32 .endm From owner-p4-projects@FreeBSD.ORG Mon May 8 00:36:08 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5892416A41B; Mon, 8 May 2006 00:36:08 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 1A2B216A418 for ; Mon, 8 May 2006 00:36:08 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 313C543D49 for ; Mon, 8 May 2006 00:36:05 +0000 (GMT) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k480a5wm039546 for ; Mon, 8 May 2006 00:36:05 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k480a5fx039540 for perforce@freebsd.org; Mon, 8 May 2006 00:36:05 GMT (envelope-from kmacy@freebsd.org) Date: Mon, 8 May 2006 00:36:05 GMT Message-Id: <200605080036.k480a5fx039540@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 96810 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 08 May 2006 00:36:08 -0000 http://perforce.freebsd.org/chv.cgi?CH=96810 Change 96810 by kmacy@kmacy_storage:sun4v_rwbuf on 2006/05/08 00:35:29 don't use lduw to avoid stomping on bit 31 use membars when setting active Affected files ... .. //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/swtch.S#21 edit Differences ... ==== //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/swtch.S#21 (text+ko) ==== @@ -40,22 +40,28 @@ #define PCB_REG %g6 +#define MEMBAR_PRE membar #LoadStore|#StoreStore +#define MEMBAR_POST membar #LoadLoad + #define ATOMIC_CLEAR_INT_BIT(addr, old, bit, new, label) \ - lduw [addr], old ; \ + MEMBAR_PRE ; \ + ld [addr], old ; \ label: andn old, bit, new ; \ cas [addr], old, new ; \ cmp old, new ; \ - bne,pn %icc, label ## b ; \ - mov new, old - + bne,a,pn %icc, label ## b ; \ + ld [addr], old ; \ + MEMBAR_POST + #define ATOMIC_SET_INT_BIT(addr, old, bit, new, label) \ - lduw [addr], old ; \ + MEMBAR_PRE ; \ + ld [addr], old ; \ label: or old, bit, new ; \ cas [addr], old, new ; \ cmp old, new ; \ - bne,pn %icc, label ## b ; \ - mov new, old - + bne,a,pn %icc, label ## b ; \ + ld [addr], old ; \ + MEMBAR_POST /* * void cpu_throw(struct thread *old, struct thread *new) */ From owner-p4-projects@FreeBSD.ORG Mon May 8 05:13:41 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 072C616A406; Mon, 8 May 2006 05:13:41 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id B788D16A401 for ; Mon, 8 May 2006 05:13:40 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 6D6BD43D53 for ; Mon, 8 May 2006 05:13:40 +0000 (GMT) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k485Deoj010065 for ; Mon, 8 May 2006 05:13:40 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k485Dek7010059 for perforce@freebsd.org; Mon, 8 May 2006 05:13:40 GMT (envelope-from kmacy@freebsd.org) Date: Mon, 8 May 2006 05:13:40 GMT Message-Id: <200605080513.k485Dek7010059@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 96814 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 08 May 2006 05:13:41 -0000 http://perforce.freebsd.org/chv.cgi?CH=96814 Change 96814 by kmacy@kmacy_storage:sun4v_rwbuf on 2006/05/08 05:13:01 make sendsig more consistent with sparc64 Affected files ... .. //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/machdep.c#22 edit Differences ... ==== //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/machdep.c#22 (text+ko) ==== @@ -228,8 +228,6 @@ #ifdef notyet cpu_identify(rdpr(ver), tick_freq, PCPU_GET(cpuid)); -#else - printf("\tUltraSparc T1\n"); #endif } @@ -336,6 +334,9 @@ cninit(); tick_init(clock); + printf("cpu0: UltraSparc T1 Processor (%d.%02d MHz CPU)\n", + (clock + 4999) / 1000000, ((clock + 4999) / 10000) % 100); + /* * Panic is there is no metadata. Most likely the kernel was booted * directly, instead of through loader(8). @@ -521,12 +522,24 @@ /* Build the argument list for the signal handler. */ tf->tf_out[0] = sig; - tf->tf_out[1] = (register_t)&sfp->sf_si; tf->tf_out[2] = (register_t)&sfp->sf_uc; tf->tf_out[4] = (register_t)catcher; + /* Fill siginfo structure. */ sf.sf_si = ksi->ksi_info; sf.sf_si.si_addr = (void *)tf->tf_tpc; + if (SIGISMEMBER(psp->ps_siginfo, sig)) { + /* Signal handler installed with SA_SIGINFO. */ + tf->tf_out[1] = (register_t)&sfp->sf_si; + + /* Fill in POSIX parts. */ + sf.sf_si = ksi->ksi_info; + sf.sf_si.si_signo = sig; /* maybe a translated signal */ + } else { + /* Old FreeBSD-style arguments. */ + tf->tf_out[1] = ksi->ksi_code; + tf->tf_out[3] = (register_t)ksi->ksi_addr; + } /* Copy the sigframe out to the user's stack. */ if (rwindow_save(td) != 0 || copyout(&sf, sfp, sizeof(*sfp)) != 0 || From owner-p4-projects@FreeBSD.ORG Mon May 8 21:27:30 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id DC6E916A430; Mon, 8 May 2006 21:27:29 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id B937716A40B for ; Mon, 8 May 2006 21:27:29 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 70C7A43D46 for ; Mon, 8 May 2006 21:27:29 +0000 (GMT) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k48LRTNM073327 for ; Mon, 8 May 2006 21:27:29 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k48LRTQD073324 for perforce@freebsd.org; Mon, 8 May 2006 21:27:29 GMT (envelope-from jb@freebsd.org) Date: Mon, 8 May 2006 21:27:29 GMT Message-Id: <200605082127.k48LRTQD073324@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 96832 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 08 May 2006 21:27:30 -0000 http://perforce.freebsd.org/chv.cgi?CH=96832 Change 96832 by jb@jb_freebsd2 on 2006/05/08 21:27:19 Fix a mis-named field. Oops. Affected files ... .. //depot/projects/dtrace/src/sys/sys/pcpu.h#3 edit Differences ... ==== //depot/projects/dtrace/src/sys/sys/pcpu.h#3 (text+ko) ==== @@ -75,7 +75,7 @@ PCPU_MD_FIELDS; struct vmmeter pc_cnt; /* VM stats counters */ struct device *pc_device; - struct cyc_cpu *cpu_cyclic; /* Cyclic subsystem data */ + struct cyc_cpu *pc_cyclic; /* Cyclic subsystem data */ }; SLIST_HEAD(cpuhead, pcpu); From owner-p4-projects@FreeBSD.ORG Tue May 9 00:10:57 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 678E716A41F; Tue, 9 May 2006 00:10:57 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id CC50F16A404 for ; Tue, 9 May 2006 00:10:55 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id ADCCD43D5D for ; Tue, 9 May 2006 00:10:49 +0000 (GMT) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k490AntN064471 for ; Tue, 9 May 2006 00:10:49 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k490AnwG064464 for perforce@freebsd.org; Tue, 9 May 2006 00:10:49 GMT (envelope-from kmacy@freebsd.org) Date: Tue, 9 May 2006 00:10:49 GMT Message-Id: <200605090010.k490AnwG064464@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 96840 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 09 May 2006 00:11:00 -0000 http://perforce.freebsd.org/chv.cgi?CH=96840 Change 96840 by kmacy@kmacy_storage:sun4v_rwbuf on 2006/05/09 00:10:36 disable interrupts entirely when updating hash bucket Affected files ... .. //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/tte_hash.c#26 edit Differences ... ==== //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/tte_hash.c#26 (text+ko) ==== @@ -142,22 +142,24 @@ uma_zfree(thzone, th); } -static void +static int hash_bucket_lock(tte_hash_field_t fields) { uint64_t data; + int s; + s = intr_disable_all(); - spinlock_enter(); data = fields[0].tte.data & ~VTD_LOCK; while (atomic_cmpset_long(&fields[0].tte.data, data, data | VTD_LOCK)) data = fields[0].tte.data & ~VTD_LOCK; - membar(LoadLoad); + membar(Sync); + return s; } static __inline void -hash_bucket_unlock_inline(tte_hash_field_t fields) +hash_bucket_unlock_inline(tte_hash_field_t fields, int s) { membar(StoreStore|LoadStore); @@ -167,8 +169,8 @@ #endif fields[0].tte.data &= ~VTD_LOCK; - membar(StoreLoad); - spinlock_exit(); + membar(Sync); + intr_restore_all(s); } void @@ -411,18 +413,19 @@ uint64_t hash_shift, hash_index; tte_hash_field_t fields, lookup_field; tte_t otte_data; + int s; /* XXX - only handle 8K pages for now */ hash_shift = PAGE_SHIFT; hash_index = (va >> hash_shift) & HASH_MASK(th); fields = (th->th_hashtable[hash_index].the_fields); - hash_bucket_lock(fields); + s = hash_bucket_lock(fields); if((otte_data = tte_hash_lookup_inline(th, va, &lookup_field)) != 0) tte_hash_set_field(lookup_field, lookup_field->tte.tag, lookup_field->tte.data & ~flags); - hash_bucket_unlock_inline(fields); + hash_bucket_unlock_inline(fields, s); return (otte_data); } @@ -433,6 +436,7 @@ uint64_t hash_shift, hash_index; tte_hash_field_t fields, lookup_field, last_field; tte_t tte_data; + int s; /* XXX - only handle 8K pages for now */ @@ -440,7 +444,7 @@ hash_index = (va >> hash_shift) & HASH_MASK(th); fields = (th->th_hashtable[hash_index].the_fields); - hash_bucket_lock(fields); + s = hash_bucket_lock(fields); if ((tte_data = tte_hash_lookup_inline(th, va, &lookup_field)) == 0) goto done; @@ -459,7 +463,7 @@ tte_hash_set_field(last_field, 0, 0); done: - hash_bucket_unlock_inline(fields); + hash_bucket_unlock_inline(fields, s); return (tte_data); } @@ -471,7 +475,7 @@ uint64_t hash_shift, hash_index, tte_tag; tte_hash_field_t fields, lookup_field; tte_t otte_data; - + int s; /* XXX - only handle 8K pages for now */ hash_shift = PAGE_SHIFT; @@ -480,7 +484,7 @@ tte_tag = (((uint64_t)th->th_context << TTARGET_CTX_SHIFT)|(va >> TTARGET_VA_SHIFT)); - hash_bucket_lock(fields); + s = hash_bucket_lock(fields); otte_data = tte_hash_lookup_inline(th, va, &lookup_field); if (lookup_field->tte.tag != 0) lookup_field = tte_hash_allocate_fragment_entry(th, lookup_field); @@ -491,7 +495,7 @@ #endif tte_hash_set_field(lookup_field, tte_tag, tte_data); - hash_bucket_unlock_inline(fields); + hash_bucket_unlock_inline(fields, s); th->th_entries++; } @@ -516,15 +520,16 @@ uint64_t hash_shift, hash_index; tte_hash_field_t fields; tte_t tte_data; + int s; /* XXX - only handle 8K pages for now */ hash_shift = PAGE_SHIFT; hash_index = (va >> hash_shift) & HASH_MASK(th); fields = (th->th_hashtable[hash_index].the_fields); - hash_bucket_lock(fields); + s = hash_bucket_lock(fields); tte_data = tte_hash_lookup_inline(th, va, NULL); - hash_bucket_unlock_inline(fields); + hash_bucket_unlock_inline(fields, s); return (tte_data); } @@ -567,13 +572,14 @@ tte_hash_field_t fields, lookup_field; tte_t otte_data; uint64_t tag; + int s; /* XXX - only handle 8K pages for now */ hash_shift = PAGE_SHIFT; hash_index = (va >> hash_shift) & HASH_MASK(th); fields = (th->th_hashtable[hash_index].the_fields); - hash_bucket_lock(fields); + s = hash_bucket_lock(fields); otte_data = tte_hash_lookup_inline(th, va, &lookup_field); if (otte_data == 0 && lookup_field->tte.tag != 0) lookup_field = tte_hash_allocate_fragment_entry(th, lookup_field); @@ -582,7 +588,7 @@ tte_hash_set_field(lookup_field, tag, tte_data); - hash_bucket_unlock_inline(fields); + hash_bucket_unlock_inline(fields, s); if (otte_data == 0) th->th_entries++; From owner-p4-projects@FreeBSD.ORG Tue May 9 00:18:03 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8DE8516A432; Tue, 9 May 2006 00:18:03 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id F24B316A406 for ; Tue, 9 May 2006 00:18:02 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 72C6543D5C for ; Tue, 9 May 2006 00:17:59 +0000 (GMT) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k490Hx2i071466 for ; Tue, 9 May 2006 00:17:59 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k490Hw6x071443 for perforce@freebsd.org; Tue, 9 May 2006 00:17:58 GMT (envelope-from kmacy@freebsd.org) Date: Tue, 9 May 2006 00:17:58 GMT Message-Id: <200605090017.k490Hw6x071443@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 96842 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 09 May 2006 00:18:03 -0000 http://perforce.freebsd.org/chv.cgi?CH=96842 Change 96842 by kmacy@kmacy_storage:sun4v_rwbuf on 2006/05/09 00:17:16 use direct area for referencing TSB at TL < 2 once the TSB is installed clean up prologue to tsb miss handler - greatly simplifying don't always clear TSB in invalidate_range and invalidate_page - allowing us to pre-load the TSB in places make more aggressive use of membars when updating the TSB Affected files ... .. //depot/projects/kmacy_sun4v/src/sys/sun4v/include/pmap.h#12 edit .. //depot/projects/kmacy_sun4v/src/sys/sun4v/include/tsb.h#11 edit .. //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/exception.S#50 edit .. //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/pmap.c#48 edit .. //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/tsb.c#13 edit .. //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/tte.c#9 edit Differences ... ==== //depot/projects/kmacy_sun4v/src/sys/sun4v/include/pmap.h#12 (text+ko) ==== @@ -102,8 +102,8 @@ void pmap_bootstrap(vm_offset_t ekva); vm_paddr_t pmap_kextract(vm_offset_t va); -void pmap_invalidate_page(pmap_t pmap, vm_offset_t va); -void pmap_invalidate_range(pmap_t pmap, vm_offset_t sva, vm_offset_t eva); +void pmap_invalidate_page(pmap_t pmap, vm_offset_t va, int cleartsb); +void pmap_invalidate_range(pmap_t pmap, vm_offset_t sva, vm_offset_t eva, int cleartsb); void pmap_invalidate_all(pmap_t pmap); void pmap_scrub_pages(vm_paddr_t pa, int64_t size); ==== //depot/projects/kmacy_sun4v/src/sys/sun4v/include/tsb.h#11 (text+ko) ==== @@ -32,6 +32,8 @@ void tsb_set_tte(struct hv_tsb_info *tsb, vm_offset_t va, tte_t tte_data, uint64_t ctx); +void tsb_set_tte_real(struct hv_tsb_info *tsb, vm_offset_t va, tte_t tte_data, uint64_t ctx); + tte_t tsb_get_tte(struct hv_tsb_info *tsb, vm_offset_t va); tte_t tsb_lookup_tte(vm_offset_t va, uint64_t context); ==== //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/exception.S#50 (text+ko) ==== @@ -1393,67 +1393,41 @@ ! %g3==flag bits, TSB (RA) ! %g4==fault type,entry tag ! %g5==tag -! %g6==context,hash size, temp +! %g6==context ! %g7 temp ENTRY(tsb_miss_handler) ldxa [%g1 + %g7]ASI_REAL, %g6 ! load in the context - rdpr %tl, %g7 ! need to use real addresses - -#ifdef notyet - rdpr %cansave, %g1 -#else - mov 0, %g1 -#endif - - brz,pn %g1, 0f - nop - save -0: - cmp %g7, 1 ! for tl > 1 - bne,pn %xcc, 2f - nop - mov ASI_LDTD_N, %g3 - wr %g0, ASI_N, %asi - GET_PCPU_SCRATCH - cmp %g6, %g0 ! kernel? - be,pn %xcc, 1f - nop GET_HASH_SCRATCH_USER(%g2) GET_TSB_SCRATCH_USER(%g4) - brz,pn %g1, 4f - nop - ba,pt %xcc, 5f - nop -1: + + brnz,pn %g6, 2f + nop GET_HASH_SCRATCH_KERNEL(%g2) GET_TSB_SCRATCH_KERNEL(%g4) - brz,pn %g1, 4f - nop - ba,pt %xcc, 5f - nop 2: - mov ASI_LDTD_REAL, %g3 - wr %g0, ASI_REAL, %asi - GET_PCPU_PHYS_SCRATCH(%g4) - cmp %g6, %g0 ! kernel? - be,pn %xcc, 3f - nop - GET_HASH_PHYS_SCRATCH_USER(%g4, %g2) - GET_TSB_SCRATCH_USER(%g4) - brz,pn %g1, 4f - nop - ba,pt %xcc, 5f - nop -3: + rdpr %tl, %g1 ! need to use real addresses? + mov ASI_LDTD_N, %g3 + wr %g0, ASI_N, %asi + dec %g1 + GET_PCPU_SCRATCH - GET_HASH_PHYS_SCRATCH_KERNEL(%g4, %g2) - GET_TSB_SCRATCH_KERNEL(%g4) - brnz,pt %g1, 5f + brz,pt %g1, 3f ! for tl == 1 nop -4: + sethi %uhi(VM_MIN_DIRECT_ADDRESS), %g1 + wr %g0, ASI_REAL, %asi + sllx %g1, 32, %g1 + mov ASI_LDTD_REAL, %g3 + andn %g2, %g1, %g2 + andn %g4, %g1, %g4 + andn %g7, %g1, %g7 +3: +#ifdef notyet + rdpr %cansave, %g1 + /* XXX use save operation if %g1 > 0 and tl == 1 */ +#endif rdpr %tl, %g1 dec %g1 sll %g1, RW_SHIFT, %g1 @@ -1461,7 +1435,6 @@ add PCPU_REG, %g1, %g1 SAVE_LOCALS_ASI(%g1) mov 0, %g1 ! cansave is 0 -5: ! %g1 == %cansave ! %g2 == hash scratch value @@ -1588,10 +1561,10 @@ sllx %g3, TTE_SHIFT, %g3 ! masked byte offset add %g3, %l3, %g3 ! TTE RA - mov 8, %l4 #ifdef PMAP_DEBUG - ldda [%g3]ASI_LDTD_REAL, %l2 + ldxa [%g3]%asi, %l2 + ldxa [%g3 + 8]%asi, %l3 cmp %l3, %l7 bne,pt %xcc, 12f cmp %l2, %l6 @@ -1612,12 +1585,10 @@ #endif 12: #endif - stxa %g0, [%g3 + %l4]ASI_REAL ! invalidate data - membar #StoreStore - stxa %l6, [%g3]ASI_REAL ! store tag - membar #StoreStore - stxa %l7, [%g3 + %l4]ASI_REAL ! store data - stxa %l7, [%g2 + 8]%asi ! update TTE with ref bit + stxa %g0, [%g3 + 8]%asi ! invalidate data + stxa %l6, [%g3]%asi ! store tag + stxa %l7, [%g3 + 8]%asi ! store data + stxa %l7, [%g2 + 8]%asi ! update TTE with ref bit membar #StoreLoad THE_LOCK_EXIT(%l5, %l0, %l7) ==== //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/pmap.c#48 (text+ko) ==== @@ -332,7 +332,7 @@ vm_page_dirty(m); } - pmap_invalidate_page(pmap, va); + pmap_invalidate_page(pmap, va, TRUE); TAILQ_REMOVE(&pmap->pm_pvlist, pv, pv_plist); TAILQ_REMOVE(&m->md.pv_list, pv, pv_list); if (TAILQ_EMPTY(&m->md.pv_list)) @@ -639,7 +639,7 @@ for (i = 0; i < KSTACK_PAGES; i++) { pa = kstack0_phys + i * PAGE_SIZE; va = kstack0 + i * PAGE_SIZE; - tsb_set_tte(&kernel_td[TSB8K_INDEX], va, + tsb_set_tte_real(&kernel_td[TSB8K_INDEX], va, pa | TTE_KERNEL | VTD_8K, 0); } /* @@ -674,7 +674,7 @@ va = translations[i].om_start + off; pa = TTE_GET_PA(translations[i].om_tte) + off; tsb_assert_invalid(&kernel_td[TSB8K_INDEX], va); - tsb_set_tte(&kernel_td[TSB8K_INDEX], va, pa | + tsb_set_tte_real(&kernel_td[TSB8K_INDEX], va, pa | TTE_KERNEL | VTD_8K, 0); } } @@ -687,7 +687,7 @@ pa = PAGE_SIZE_4M; for (i = 0; phys_avail[i + 2] != 0; i += 2) for (; pa < phys_avail[i + 1]; pa += PAGE_SIZE_4M) { - tsb_set_tte(&kernel_td[TSB4M_INDEX], TLB_PHYS_TO_DIRECT(pa), + tsb_set_tte_real(&kernel_td[TSB4M_INDEX], TLB_PHYS_TO_DIRECT(pa), pa | TTE_KERNEL | VTD_4M, 0); } @@ -966,6 +966,8 @@ otte_data = tte_hash_update(pmap->pm_hash, va, tte_data | TTE_MINFLAGS); + tsb_set_tte(&pmap->pm_tsb, va, tte_data|TTE_MINFLAGS, pmap->pm_context); + invlva = FALSE; if ((otte_data & ~(VTD_W|VTD_REF)) != tte_data) { if (otte_data & VTD_V) { @@ -988,7 +990,7 @@ } if (invlva) - pmap_invalidate_page(pmap, va); + pmap_invalidate_page(pmap, va, FALSE); sched_unpin(); PMAP_UNLOCK(pmap); @@ -1229,11 +1231,12 @@ #endif void -pmap_invalidate_page(pmap_t pmap, vm_offset_t va) +pmap_invalidate_page(pmap_t pmap, vm_offset_t va, int cleartsb) { spinlock_enter(); - tsb_clear_tte(&pmap->pm_tsb, va); + if (cleartsb == TRUE) + tsb_clear_tte(&pmap->pm_tsb, va); DPRINTF("pmap_invalidate_page(va=0x%lx)\n", va); invlpg(va, pmap->pm_context); @@ -1247,7 +1250,7 @@ } void -pmap_invalidate_range(pmap_t pmap, vm_offset_t sva, vm_offset_t eva) +pmap_invalidate_range(pmap_t pmap, vm_offset_t sva, vm_offset_t eva, int cleartsb) { vm_offset_t tva; #ifdef SMP @@ -1256,14 +1259,12 @@ spinlock_enter(); - if (pmap != kernel_pmap) - DPRINTF("pmap_invalidate_range(sva=%lx, eva=%lx)\n", sva, eva); - - if ((((eva - sva) >> PAGE_SHIFT) < MAX_TSB_CLEARS) || - (pmap->pm_context == 0)) { - tsb_clear_range(&pmap->pm_tsb, sva, eva); - } else { - tsb_clear(&pmap->pm_tsb); + if (cleartsb == TRUE) { + if ((((eva - sva) >> PAGE_SHIFT) < MAX_TSB_CLEARS) || + (pmap->pm_context == 0)) + tsb_clear_range(&pmap->pm_tsb, sva, eva); + else + tsb_clear(&pmap->pm_tsb); } /* XXX */ @@ -1342,6 +1343,7 @@ pmap_kenter(vm_offset_t va, vm_paddr_t pa) { tte_hash_update(kernel_pmap->pm_hash, va, pa | TTE_KERNEL | VTD_8K); + tsb_set_tte(&kernel_td[TSB8K_INDEX], va, pa | TTE_KERNEL | VTD_8K, 0); } /* @@ -1402,7 +1404,7 @@ start += PAGE_SIZE; } - pmap_invalidate_range(kernel_pmap, sva, va); + pmap_invalidate_range(kernel_pmap, sva, va, FALSE); *virt = va; return (sva); @@ -1569,7 +1571,7 @@ sched_unpin(); if (anychanged) - pmap_invalidate_range(pmap, sva, eva); + pmap_invalidate_range(pmap, sva, eva, TRUE); vm_page_unlock_queues(); PMAP_UNLOCK(pmap); @@ -1591,7 +1593,7 @@ va += PAGE_SIZE; m++; } - pmap_invalidate_range(kernel_pmap, sva, va); + pmap_invalidate_range(kernel_pmap, sva, va, FALSE); } /* @@ -1608,7 +1610,7 @@ pmap_kremove(va); va += PAGE_SIZE; } - pmap_invalidate_range(kernel_pmap, sva, va); + pmap_invalidate_range(kernel_pmap, sva, va, TRUE); } @@ -1661,7 +1663,7 @@ sched_unpin(); vm_page_unlock_queues(); if (invlva) - pmap_invalidate_range(pmap, start, end); + pmap_invalidate_range(pmap, start, end, TRUE); PMAP_UNLOCK(pmap); @@ -1711,7 +1713,7 @@ vm_page_dirty(m); } - pmap_invalidate_page(pv->pv_pmap, pv->pv_va); + pmap_invalidate_page(pv->pv_pmap, pv->pv_va, TRUE); TAILQ_REMOVE(&pv->pv_pmap->pm_pvlist, pv, pv_plist); TAILQ_REMOVE(&m->md.pv_list, pv, pv_list); m->md.pv_list_count--; ==== //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/tsb.c#13 (text+ko) ==== @@ -51,6 +51,8 @@ #include #include #include +#include +#include CTASSERT(sizeof(tte_t) == sizeof(uint64_t)); #define TSB_MASK(tsb) ((tsb->hvtsb_ntte) - 1) @@ -92,7 +94,7 @@ hvtsb->hvtsb_pa = VM_PAGE_TO_PHYS(m); tsb_pages = hvtsb->hvtsb_ntte >> (PAGE_SHIFT - TTE_SHIFT); - *scratchval = hvtsb->hvtsb_pa | tsb_pages; + *scratchval = TLB_PHYS_TO_DIRECT(hvtsb->hvtsb_pa) | tsb_pages; return vtophys(hvtsb); } @@ -127,7 +129,7 @@ } void -tsb_set_tte(hv_tsb_info_t *tsb, vm_offset_t va, uint64_t tte_data, uint64_t ctx) +tsb_set_tte_real(hv_tsb_info_t *tsb, vm_offset_t va, uint64_t tte_data, uint64_t ctx) { vm_paddr_t tsb_store_pa; uint64_t tsb_index, tsb_shift, tte_tag; @@ -152,6 +154,30 @@ store_real(tsb_store_pa + sizeof(uint64_t), tte_data); } + +void +tsb_set_tte(hv_tsb_info_t *tsb, vm_offset_t va, uint64_t tte_data, uint64_t ctx) +{ + + uint64_t tsb_index, tsb_shift, tte_tag; + tte_t *entry; + + tsb_shift = TTE_PAGE_SHIFT(tsb->hvtsb_idxpgsz); + tsb_index = (va >> tsb_shift) & TSB_MASK(tsb); + entry = (tte_t *)TLB_PHYS_TO_DIRECT(tsb->hvtsb_pa + 2*tsb_index*sizeof(uint64_t)); + tte_tag = (ctx << TTARGET_CTX_SHIFT) | (va >> TTARGET_VA_SHIFT); + tte_data &= ~VTD_V; + /* store new value with valid bit cleared + * to avoid invalid intermediate value; + */ + *(entry + 1) = tte_data; + tte_data |= VTD_V; + *(entry) = tte_tag; + *(entry + 1) = tte_data; + membar(Sync); +} + + void tsb_clear(hv_tsb_info_t *tsb) { @@ -161,40 +187,60 @@ void tsb_clear_tte(hv_tsb_info_t *tsb, vm_offset_t va) { - vm_paddr_t tsb_store_pa; + tte_t *entry; uint64_t tsb_index, tsb_shift; tsb_shift = TTE_PAGE_SHIFT(tsb->hvtsb_idxpgsz); tsb_index = (va >> tsb_shift) & TSB_MASK(tsb); - tsb_store_pa = tsb->hvtsb_pa + 2*tsb_index*sizeof(uint64_t); + entry = (tte_t *)TLB_PHYS_TO_DIRECT(tsb->hvtsb_pa + 2*tsb_index*sizeof(uint64_t)); + + *(entry) = 0; + *(entry + 1) = 0; - store_real(tsb_store_pa, 0); - store_real(tsb_store_pa + sizeof(uint64_t), 0); + membar(Sync); } void tsb_clear_range(hv_tsb_info_t *tsb, vm_offset_t sva, vm_offset_t eva) { - vm_paddr_t tsb_store_pa; vm_offset_t tva; uint64_t tsb_index, tsb_shift, tsb_mask; - + tte_t *entry; + tsb_mask = TSB_MASK(tsb); tsb_shift = TTE_PAGE_SHIFT(tsb->hvtsb_idxpgsz); for (tva = sva; tva < eva; tva += PAGE_SIZE) { tsb_index = (tva >> tsb_shift) & tsb_mask; - tsb_store_pa = tsb->hvtsb_pa + 2*tsb_index*sizeof(uint64_t); - - store_real(tsb_store_pa, 0); - store_real(tsb_store_pa + sizeof(uint64_t), 0); + entry = (tte_t *)TLB_PHYS_TO_DIRECT(tsb->hvtsb_pa + 2*tsb_index*sizeof(uint64_t)); + *(entry) = 0; + *(entry + 1) = 0; } + membar(Sync); } tte_t tsb_get_tte(hv_tsb_info_t *tsb, vm_offset_t va) { + tte_t *entry; + uint64_t tsb_index, tsb_shift, tte_tag, tte_data; + + tsb_shift = TTE_PAGE_SHIFT(tsb->hvtsb_idxpgsz); + tsb_index = (va >> tsb_shift) & TSB_MASK(tsb); + entry = (tte_t *)TLB_PHYS_TO_DIRECT(tsb->hvtsb_pa + 2*tsb_index*sizeof(uint64_t)); + tte_tag = *(entry); + tte_data = *(entry + 1); + + if ((tte_tag << TTARGET_VA_SHIFT) == (va & ~PAGE_MASK_4M)) + return tte_data; + + return (0UL); +} +#if 0 +tte_t +tsb_get_tte_real(hv_tsb_info_t *tsb, vm_offset_t va) +{ vm_paddr_t tsb_load_pa; uint64_t tsb_index, tsb_shift, tte_tag, tte_data; @@ -213,6 +259,7 @@ return (0UL); } +#endif tte_t tsb_lookup_tte(vm_offset_t va, uint64_t ctx) @@ -238,7 +285,7 @@ { uint64_t tsb_pages, tsb_scratch; tsb_pages = tsb->hvtsb_ntte >> (PAGE_SHIFT - TTE_SHIFT); - tsb_scratch = tsb->hvtsb_pa | tsb_pages; + tsb_scratch = TLB_PHYS_TO_DIRECT(tsb->hvtsb_pa) | tsb_pages; set_tsb_kernel_scratchpad(tsb_scratch); membar(Sync); @@ -250,7 +297,7 @@ { uint64_t tsb_pages, tsb_scratch; tsb_pages = tsb->hvtsb_ntte >> (PAGE_SHIFT - TTE_SHIFT); - tsb_scratch = tsb->hvtsb_pa | tsb_pages; + tsb_scratch = TLB_PHYS_TO_DIRECT(tsb->hvtsb_pa) | tsb_pages; set_tsb_user_scratchpad(tsb_scratch); membar(Sync); return tsb_scratch; ==== //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/tte.c#9 (text+ko) ==== @@ -81,7 +81,7 @@ if (otte_data & VTD_W) vm_page_dirty(m); - pmap_invalidate_page(pv->pv_pmap, pv->pv_va); + pmap_invalidate_page(pv->pv_pmap, pv->pv_va, TRUE); } @@ -112,7 +112,7 @@ otte_data = tte_hash_clear_bits(pmap->pm_hash, va, flags); if (otte_data & flags) - pmap_invalidate_page(pmap, va); + pmap_invalidate_page(pmap, va, TRUE); } void From owner-p4-projects@FreeBSD.ORG Tue May 9 19:35:17 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id ED39D16A457; Tue, 9 May 2006 19:35:16 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id B16EC16A420 for ; Tue, 9 May 2006 19:35:16 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 63A6A43D46 for ; Tue, 9 May 2006 19:35:16 +0000 (GMT) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k49JZGPf057574 for ; Tue, 9 May 2006 19:35:16 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k49JZGRZ057566 for perforce@freebsd.org; Tue, 9 May 2006 19:35:16 GMT (envelope-from jb@freebsd.org) Date: Tue, 9 May 2006 19:35:16 GMT Message-Id: <200605091935.k49JZGRZ057566@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 96867 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 09 May 2006 19:35:17 -0000 http://perforce.freebsd.org/chv.cgi?CH=96867 Change 96867 by jb@jb_freebsd2 on 2006/05/09 19:34:16 Add a definition for the cyclic timer callback function. Affected files ... .. //depot/projects/dtrace/src/sys/sys/systm.h#3 edit Differences ... ==== //depot/projects/dtrace/src/sys/sys/systm.h#3 (text+ko) ==== @@ -207,6 +207,12 @@ void realitexpire(void *); +/* + * Cyclic clock function type definition used to hook the cyclic + * subsystem into the appropriate timer interrupt. + */ +typedef void (*cyclic_clock_func_t)(void); + void hardclock(int usermode, uintfptr_t pc); void hardclock_cpu(int usermode); void softclock(void *); From owner-p4-projects@FreeBSD.ORG Tue May 9 20:40:26 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2BCD216A7AF; Tue, 9 May 2006 20:40:26 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 3561516A7E3 for ; Tue, 9 May 2006 20:40:24 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 6B87343D6D for ; Tue, 9 May 2006 20:40:17 +0000 (GMT) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k49KeG3k070719 for ; Tue, 9 May 2006 20:40:16 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k49KeG0j070711 for perforce@freebsd.org; Tue, 9 May 2006 20:40:16 GMT (envelope-from jb@freebsd.org) Date: Tue, 9 May 2006 20:40:16 GMT Message-Id: <200605092040.k49KeG0j070711@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 96870 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 09 May 2006 20:40:31 -0000 http://perforce.freebsd.org/chv.cgi?CH=96870 Change 96870 by jb@jb_freebsd2 on 2006/05/09 20:39:56 Ahh Too he say: use big variable before calculation overflows and time go silly. Affected files ... .. //depot/projects/dtrace/src/sys/sys/time.h#3 edit Differences ... ==== //depot/projects/dtrace/src/sys/sys/time.h#3 (text+ko) ==== @@ -340,7 +340,7 @@ static __inline hrtime_t gethrtime() { struct timespec ts; clock_gettime(CLOCK_UPTIME,&ts); - return (ts.tv_sec * NANOSEC + ts.tv_nsec); + return (((u_int64_t) ts.tv_sec) * NANOSEC + ts.tv_nsec); } #endif #endif /* _SOLARIS_C_SOURCE */ From owner-p4-projects@FreeBSD.ORG Tue May 9 20:49:30 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E05A116A548; Tue, 9 May 2006 20:49:29 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id A1D6A16A4FB for ; Tue, 9 May 2006 20:49:29 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 6A95343D45 for ; Tue, 9 May 2006 20:49:29 +0000 (GMT) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k49KnTw1085434 for ; Tue, 9 May 2006 20:49:29 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k49KnTXQ085428 for perforce@freebsd.org; Tue, 9 May 2006 20:49:29 GMT (envelope-from jb@freebsd.org) Date: Tue, 9 May 2006 20:49:29 GMT Message-Id: <200605092049.k49KnTXQ085428@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 96873 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 09 May 2006 20:49:30 -0000 http://perforce.freebsd.org/chv.cgi?CH=96873 Change 96873 by jb@jb_freebsd2 on 2006/05/09 20:48:32 Add the hook for the cyclic timers for use when there isn't a higher performance time based interrupt source like the HPET. This hook allows the cyclic timers to function, but they can be fired no faster than 'hz' per second. If the CPU has a HPET, then the machine-dependent cyclic initialisation code should use that instead and leave the hook here NULL. The HPET was specified by Intel as recently as 2004, so as of today, most i386 systems in the wild won't have it. Affected files ... .. //depot/projects/dtrace/src/sys/i386/i386/local_apic.c#2 edit Differences ... ==== //depot/projects/dtrace/src/sys/i386/i386/local_apic.c#2 (text+ko) ==== @@ -36,7 +36,9 @@ #include "opt_hwpmc_hooks.h" +#include "opt_cyclic.h" #include "opt_ddb.h" +#include "opt_kdtrace.h" #include #include @@ -65,6 +67,10 @@ #include #endif +#if defined(CYCLIC) || defined(KDTRACE) +cyclic_clock_func_t lapic_cyclic_clock_func; +#endif + /* * We can handle up to 60 APICs via our logical cluster IDs, but currently * the physical IDs on Intel processors up to the Pentium 4 are limited to @@ -628,6 +634,19 @@ hardclock(TRAPF_USERMODE(&frame), TRAPF_PC(&frame)); else hardclock_cpu(TRAPF_USERMODE(&frame)); + + /* + * If the cyclic subsystem is configured and a callback + * function has been registered, then call it to process + * the high speed timers. If this function is registered + * here, then there mustn't be a High Performance Event + * Timer (HPET) on the CPU. A HPET provides higher + * performance timer interrupts. + */ +#if defined(CYCLIC) || defined(KDTRACE) + if (lapic_cyclic_clock_func != NULL) + (*lapic_cyclic_clock_func)(); +#endif } /* Fire statclock at stathz. */ From owner-p4-projects@FreeBSD.ORG Tue May 9 20:49:30 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3A9DC16A9A6; Tue, 9 May 2006 20:49:30 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 0E05D16A97E for ; Tue, 9 May 2006 20:49:30 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id B8B0943D45 for ; Tue, 9 May 2006 20:49:29 +0000 (GMT) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k49KnTMv085443 for ; Tue, 9 May 2006 20:49:29 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k49KnTdx085437 for perforce@freebsd.org; Tue, 9 May 2006 20:49:29 GMT (envelope-from jb@freebsd.org) Date: Tue, 9 May 2006 20:49:29 GMT Message-Id: <200605092049.k49KnTdx085437@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 96874 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 09 May 2006 20:49:30 -0000 http://perforce.freebsd.org/chv.cgi?CH=96874 Change 96874 by jb@jb_freebsd2 on 2006/05/09 20:49:25 Flush the output buffer as we go. Affected files ... .. //depot/projects/dtrace/src/contrib/opensolaris/lib/libdtrace/common/dt_subr.c#6 edit Differences ... ==== //depot/projects/dtrace/src/contrib/opensolaris/lib/libdtrace/common/dt_subr.c#6 (text) ==== @@ -652,6 +652,7 @@ } n = vfprintf(fp, format, ap); + fflush(fp); va_end(ap); if (n < 0) { From owner-p4-projects@FreeBSD.ORG Tue May 9 20:51:33 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1DAD616A527; Tue, 9 May 2006 20:51:33 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id E262A16A4ED for ; Tue, 9 May 2006 20:51:32 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id AEB9F43D48 for ; Tue, 9 May 2006 20:51:32 +0000 (GMT) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k49KpW4A086720 for ; Tue, 9 May 2006 20:51:32 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k49KpWi1086714 for perforce@freebsd.org; Tue, 9 May 2006 20:51:32 GMT (envelope-from jb@freebsd.org) Date: Tue, 9 May 2006 20:51:32 GMT Message-Id: <200605092051.k49KpWi1086714@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 96875 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 09 May 2006 20:51:33 -0000 http://perforce.freebsd.org/chv.cgi?CH=96875 Change 96875 by jb@jb_freebsd2 on 2006/05/09 20:51:20 Convert from 'uptime' times to 'real' times so that the timed wait does a sensible thing... like wait until the time we expected. Affected files ... .. //depot/projects/dtrace/src/contrib/opensolaris/lib/libdtrace/common/dt_work.c#8 edit Differences ... ==== //depot/projects/dtrace/src/contrib/opensolaris/lib/libdtrace/common/dt_work.c#8 (text) ==== @@ -75,7 +75,6 @@ (void) pthread_mutex_lock(&dph->dph_lock); -#if defined(sun) now = gethrtime(); if (earliest < now) { @@ -83,6 +82,7 @@ return; /* sleep duration has already past */ } +#if defined(sun) tv.tv_sec = (earliest - now) / NANOSEC; tv.tv_nsec = (earliest - now) % NANOSEC; @@ -93,6 +93,7 @@ */ (void) pthread_cond_reltimedwait_np(&dph->dph_cv, &dph->dph_lock, &tv); #else + earliest -= now; clock_gettime(CLOCK_REALTIME,&tv); tv.tv_sec += earliest / NANOSEC; tv.tv_nsec += earliest % NANOSEC; From owner-p4-projects@FreeBSD.ORG Tue May 9 20:53:36 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3268316A4CB; Tue, 9 May 2006 20:53:36 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id ED58416A4A7 for ; Tue, 9 May 2006 20:53:35 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id A4F9143D45 for ; Tue, 9 May 2006 20:53:35 +0000 (GMT) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k49KrZNc090071 for ; Tue, 9 May 2006 20:53:35 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k49KrZWC090065 for perforce@freebsd.org; Tue, 9 May 2006 20:53:35 GMT (envelope-from jb@freebsd.org) Date: Tue, 9 May 2006 20:53:35 GMT Message-Id: <200605092053.k49KrZWC090065@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 96876 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 09 May 2006 20:53:36 -0000 http://perforce.freebsd.org/chv.cgi?CH=96876 Change 96876 by jb@jb_freebsd2 on 2006/05/09 20:53:21 DTrace requires the cyclic timer module. Affected files ... .. //depot/projects/dtrace/src/sys/cddl/dev/dtrace/dtrace.c#21 edit Differences ... ==== //depot/projects/dtrace/src/sys/cddl/dev/dtrace/dtrace.c#21 (text+ko) ==== @@ -666,3 +666,4 @@ DEV_MODULE(dtrace, dtrace_modevent, NULL); MODULE_VERSION(dtrace, 1); +MODULE_DEPEND(dtrace, cyclic, 1, 1, 1); From owner-p4-projects@FreeBSD.ORG Tue May 9 20:54:38 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4D38B16A835; Tue, 9 May 2006 20:54:38 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id D17D916A820 for ; Tue, 9 May 2006 20:54:37 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 6529B43D45 for ; Tue, 9 May 2006 20:54:37 +0000 (GMT) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k49KsbBc090163 for ; Tue, 9 May 2006 20:54:37 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k49KsbR2090160 for perforce@freebsd.org; Tue, 9 May 2006 20:54:37 GMT (envelope-from jb@freebsd.org) Date: Tue, 9 May 2006 20:54:37 GMT Message-Id: <200605092054.k49KsbR2090160@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 96877 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 09 May 2006 20:54:39 -0000 http://perforce.freebsd.org/chv.cgi?CH=96877 Change 96877 by jb@jb_freebsd2 on 2006/05/09 20:54:13 Uncomment a couple of cyclic timer hooks I forgot. Affected files ... .. //depot/projects/dtrace/src/sys/cddl/dev/dtrace/dtrace_state.c#7 edit Differences ... ==== //depot/projects/dtrace/src/sys/cddl/dev/dtrace/dtrace_state.c#7 (text+ko) ==== @@ -243,10 +243,8 @@ */ state->dts_buffer = kmem_zalloc(bufsize, KM_SLEEP); state->dts_aggbuffer = kmem_zalloc(bufsize, KM_SLEEP); -#ifdef DOODAD state->dts_cleaner = CYCLIC_NONE; state->dts_deadman = CYCLIC_NONE; -#endif state->dts_vstate.dtvs_state = state; for (i = 0; i < DTRACEOPT_MAX; i++) From owner-p4-projects@FreeBSD.ORG Tue May 9 20:56:42 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E267716A427; Tue, 9 May 2006 20:56:41 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id A956116A40A for ; Tue, 9 May 2006 20:56:41 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 6554743D5A for ; Tue, 9 May 2006 20:56:40 +0000 (GMT) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k49KueeW090283 for ; Tue, 9 May 2006 20:56:40 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k49Kuege090280 for perforce@freebsd.org; Tue, 9 May 2006 20:56:40 GMT (envelope-from jb@freebsd.org) Date: Tue, 9 May 2006 20:56:40 GMT Message-Id: <200605092056.k49Kuege090280@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 96878 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 09 May 2006 20:56:42 -0000 http://perforce.freebsd.org/chv.cgi?CH=96878 Change 96878 by jb@jb_freebsd2 on 2006/05/09 20:56:09 Don't build the cyclic subsystem in with the KDTRACE. Do it as a module because it's supposed to be optional and it's easier to load it as a module. Affected files ... .. //depot/projects/dtrace/src/sys/conf/files#11 edit Differences ... ==== //depot/projects/dtrace/src/sys/conf/files#11 (text+ko) ==== @@ -98,7 +98,9 @@ compile-with "${NORMAL_C} -D_SOLARIS_C_SOURCE -I$S/contrib/opensolaris/compat" cddl/dev/fasttrap/fasttrap.c optional dtrace | fasttrap \ compile-with "${NORMAL_C} -D_SOLARIS_C_SOURCE -I$S/contrib/opensolaris/compat" -cddl/kern/cyclic.c optional cyclic | kdtrace \ +cddl/kern/cyclic.c optional cyclic \ + compile-with "${NORMAL_C} -D_SOLARIS_C_SOURCE -I$S/contrib/opensolaris/compat" +cddl/kern/kern_cyclic.c optional cyclic \ compile-with "${NORMAL_C} -D_SOLARIS_C_SOURCE -I$S/contrib/opensolaris/compat" cddl/kern/kmem.c optional cyclic | kdtrace \ compile-with "${NORMAL_C} -D_SOLARIS_C_SOURCE -I$S/contrib/opensolaris/compat" From owner-p4-projects@FreeBSD.ORG Tue May 9 20:57:43 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D0C8D16A447; Tue, 9 May 2006 20:57:42 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 6DF2D16A471 for ; Tue, 9 May 2006 20:57:42 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 25B6043D45 for ; Tue, 9 May 2006 20:57:42 +0000 (GMT) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k49KvgIM090305 for ; Tue, 9 May 2006 20:57:42 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k49Kvfa0090302 for perforce@freebsd.org; Tue, 9 May 2006 20:57:41 GMT (envelope-from jb@freebsd.org) Date: Tue, 9 May 2006 20:57:41 GMT Message-Id: <200605092057.k49Kvfa0090302@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 96879 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 09 May 2006 20:57:43 -0000 http://perforce.freebsd.org/chv.cgi?CH=96879 Change 96879 by jb@jb_freebsd2 on 2006/05/09 20:57:14 The backend of the cyclic timer subsystem is very machine dependent. Affected files ... .. //depot/projects/dtrace/src/sys/conf/files.i386#4 edit Differences ... ==== //depot/projects/dtrace/src/sys/conf/files.i386#4 (text+ko) ==== @@ -83,6 +83,8 @@ no-implicit-rule # # +cddl/i386/cyclic_machdep.c optional cyclic \ + compile-with "${NORMAL_C} -D_SOLARIS_C_SOURCE -I$S/contrib/opensolaris/compat" compat/linux/linux_file.c optional compat_linux compat/linux/linux_getcwd.c optional compat_linux compat/linux/linux_ioctl.c optional compat_linux From owner-p4-projects@FreeBSD.ORG Tue May 9 21:01:48 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2C91516A511; Tue, 9 May 2006 21:01:48 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id DD79A16A500 for ; Tue, 9 May 2006 21:01:47 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 9A54943D48 for ; Tue, 9 May 2006 21:01:47 +0000 (GMT) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k49L1ldj091814 for ; Tue, 9 May 2006 21:01:47 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k49L1lmT091806 for perforce@freebsd.org; Tue, 9 May 2006 21:01:47 GMT (envelope-from jb@freebsd.org) Date: Tue, 9 May 2006 21:01:47 GMT Message-Id: <200605092101.k49L1lmT091806@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 96880 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 09 May 2006 21:01:48 -0000 http://perforce.freebsd.org/chv.cgi?CH=96880 Change 96880 by jb@jb_freebsd2 on 2006/05/09 21:01:32 Add a field for the number of cyclic timers enabled. This value is actually in the cyclic structure that the hook points to, but it is probably quicker to check an integer variable. Affected files ... .. //depot/projects/dtrace/src/sys/sys/pcpu.h#4 edit Differences ... ==== //depot/projects/dtrace/src/sys/sys/pcpu.h#4 (text+ko) ==== @@ -75,6 +75,7 @@ PCPU_MD_FIELDS; struct vmmeter pc_cnt; /* VM stats counters */ struct device *pc_device; + int pc_ncyclic; /* Number of cyclic timers enabled. */ struct cyc_cpu *pc_cyclic; /* Cyclic subsystem data */ }; From owner-p4-projects@FreeBSD.ORG Tue May 9 21:07:56 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0FBC016A4E7; Tue, 9 May 2006 21:07:56 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id C0E3C16A4CF for ; Tue, 9 May 2006 21:07:55 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 5D67943D4C for ; Tue, 9 May 2006 21:07:55 +0000 (GMT) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k49L7t5Q097908 for ; Tue, 9 May 2006 21:07:55 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k49L7tof097902 for perforce@freebsd.org; Tue, 9 May 2006 21:07:55 GMT (envelope-from jb@freebsd.org) Date: Tue, 9 May 2006 21:07:55 GMT Message-Id: <200605092107.k49L7tof097902@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 96881 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 09 May 2006 21:07:56 -0000 http://perforce.freebsd.org/chv.cgi?CH=96881 Change 96881 by jb@jb_freebsd2 on 2006/05/09 21:07:10 Move the load/unload developer convenience targets to a common include. We need to load and unload the set in the right order. Affected files ... .. //depot/projects/dtrace/src/sys/modules/dtrace/Makefile#13 edit .. //depot/projects/dtrace/src/sys/modules/dtrace/Makefile.inc#1 add .. //depot/projects/dtrace/src/sys/modules/dtrace/dtrace/Makefile#5 edit .. //depot/projects/dtrace/src/sys/modules/dtrace/profile/Makefile#3 edit .. //depot/projects/dtrace/src/sys/modules/dtrace/systrace/Makefile#1 add Differences ... ==== //depot/projects/dtrace/src/sys/modules/dtrace/Makefile#13 (text+ko) ==== @@ -1,21 +1,10 @@ -# $FreeBSD# +# $FreeBSD$ .include +.include "Makefile.inc" SUBDIR= dtrace \ profile \ systrace -load : - -kldload dtrace - -kldload profile - -kldload systrace - kldstat - -unload : - -kldunload systrace - -kldunload profile - -kldunload dtrace - kldstat - .include ==== //depot/projects/dtrace/src/sys/modules/dtrace/dtrace/Makefile#5 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD# +# $FreeBSD$ .PATH: ${.CURDIR}/../../../cddl/dev/dtrace .PATH: ${.CURDIR}/../../../cddl/dev/dtrace/${MACHINE_ARCH} @@ -24,14 +24,4 @@ dtrace_unregister \ dtrace_probe_lookup -load : - -kldload dtrace - kldstat - -unload : - -kldunload systrace - -kldunload fasttrap - -kldunload dtrace - kldstat - .include ==== //depot/projects/dtrace/src/sys/modules/dtrace/profile/Makefile#3 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD# +# $FreeBSD$ .PATH: ${.CURDIR}/../../../cddl/dev/profile @@ -12,14 +12,4 @@ -I${.CURDIR}/../../../contrib \ -I${.CURDIR}/../../.. -D_SOLARIS_C_SOURCE -load : - -kldload dtrace - -kldload profile - kldstat - -unload : - -kldunload profile - -kldunload dtrace - kldstat - .include From owner-p4-projects@FreeBSD.ORG Tue May 9 21:09:01 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 550FF16A505; Tue, 9 May 2006 21:09:01 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 31D2116A4CE for ; Tue, 9 May 2006 21:09:01 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 21EE643D5F for ; Tue, 9 May 2006 21:08:57 +0000 (GMT) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k49L8vks098579 for ; Tue, 9 May 2006 21:08:57 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k49L8u1n098573 for perforce@freebsd.org; Tue, 9 May 2006 21:08:56 GMT (envelope-from jb@freebsd.org) Date: Tue, 9 May 2006 21:08:56 GMT Message-Id: <200605092108.k49L8u1n098573@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 96882 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 09 May 2006 21:09:01 -0000 http://perforce.freebsd.org/chv.cgi?CH=96882 Change 96882 by jb@jb_freebsd2 on 2006/05/09 21:08:26 Add the work-in-progress versions of the cyclic subsystem header files. Affected files ... .. //depot/projects/dtrace/src/sys/sys/cyclic.h#1 add .. //depot/projects/dtrace/src/sys/sys/cyclic_impl.h#1 add Differences ... From owner-p4-projects@FreeBSD.ORG Tue May 9 22:28:34 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id ACF6916A5D8; Tue, 9 May 2006 22:28:34 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 3546116A583 for ; Tue, 9 May 2006 22:28:34 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id D61C743D4C for ; Tue, 9 May 2006 22:28:33 +0000 (GMT) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k49MSXLX042709 for ; Tue, 9 May 2006 22:28:33 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k49MSXro042706 for perforce@freebsd.org; Tue, 9 May 2006 22:28:33 GMT (envelope-from jb@freebsd.org) Date: Tue, 9 May 2006 22:28:33 GMT Message-Id: <200605092228.k49MSXro042706@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 96885 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 09 May 2006 22:28:39 -0000 http://perforce.freebsd.org/chv.cgi?CH=96885 Change 96885 by jb@jb_freebsd2 on 2006/05/09 22:27:45 Add the machine-dependent backend for the cyclic subsystem. This defaults to use the interrupt that drives hardclock because on most Intel processors that's the best time-based interrupt source. To-Do: detect the presence of the HPET and use that if it. It will need to be enabled/disabled/reprogrammed so that it only interrupts when there is a pending cyclic timer and only at the next interval. Affected files ... .. //depot/projects/dtrace/src/sys/cddl/i386/cyclic_machdep.c#1 add Differences ... From owner-p4-projects@FreeBSD.ORG Tue May 9 22:30:39 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3250E16A424; Tue, 9 May 2006 22:30:39 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 1C2B316A407 for ; Tue, 9 May 2006 22:30:37 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id C66F043D48 for ; Tue, 9 May 2006 22:30:36 +0000 (GMT) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k49MUaBx044244 for ; Tue, 9 May 2006 22:30:36 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k49MUaQK044238 for perforce@freebsd.org; Tue, 9 May 2006 22:30:36 GMT (envelope-from jb@freebsd.org) Date: Tue, 9 May 2006 22:30:36 GMT Message-Id: <200605092230.k49MUaQK044238@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 96888 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 09 May 2006 22:30:40 -0000 http://perforce.freebsd.org/chv.cgi?CH=96888 Change 96888 by jb@jb_freebsd2 on 2006/05/09 22:30:19 Build the cyclic subsystem as a module. This is the BSD licensed part which just initialises/uninitialises the module. The guts of the subsystem is based on Sun's CDDL code, so it carries that license. Grumble. Affected files ... .. //depot/projects/dtrace/src/sys/cddl/kern/kern_cyclic.c#1 add Differences ... From owner-p4-projects@FreeBSD.ORG Tue May 9 22:34:45 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 87F9816A42A; Tue, 9 May 2006 22:34:45 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 26FA816A410 for ; Tue, 9 May 2006 22:34:44 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id A356743D60 for ; Tue, 9 May 2006 22:34:42 +0000 (GMT) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k49MYgEq046391 for ; Tue, 9 May 2006 22:34:42 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k49MYgMZ046388 for perforce@freebsd.org; Tue, 9 May 2006 22:34:42 GMT (envelope-from jb@freebsd.org) Date: Tue, 9 May 2006 22:34:42 GMT Message-Id: <200605092234.k49MYgMZ046388@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 96890 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 09 May 2006 22:34:47 -0000 http://perforce.freebsd.org/chv.cgi?CH=96890 Change 96890 by jb@jb_freebsd2 on 2006/05/09 22:34:09 This is the guts of the cyclic subsystem. This is still work-in-progress. Bits are still commented out and there is no code to drive the softints. Affected files ... .. //depot/projects/dtrace/src/sys/cddl/kern/cyclic.c#1 add Differences ... From owner-p4-projects@FreeBSD.ORG Wed May 10 10:44:49 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8B3EF16A408; Wed, 10 May 2006 10:44:49 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 46D4E16A400 for ; Wed, 10 May 2006 10:44:49 +0000 (UTC) (envelope-from soc-andrew@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 2199043D66 for ; Wed, 10 May 2006 10:44:46 +0000 (GMT) (envelope-from soc-andrew@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k4AAijfV078753 for ; Wed, 10 May 2006 10:44:45 GMT (envelope-from soc-andrew@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k4AAijcp078747 for perforce@freebsd.org; Wed, 10 May 2006 10:44:45 GMT (envelope-from soc-andrew@freebsd.org) Date: Wed, 10 May 2006 10:44:45 GMT Message-Id: <200605101044.k4AAijcp078747@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to soc-andrew@freebsd.org using -f From: soc-andrew To: Perforce Change Reviews Cc: Subject: PERFORCE change 96906 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 10 May 2006 10:44:49 -0000 http://perforce.freebsd.org/chv.cgi?CH=96906 Change 96906 by soc-andrew@soc-andrew_serv on 2006/05/10 10:44:24 Move the ports install dialog later to make space for a kernel dialog Affected files ... .. //depot/projects/soc2005/bsdinstaller/src/libexec/bsdinstaller/inst/431_ports.lua#4 delete .. //depot/projects/soc2005/bsdinstaller/src/libexec/bsdinstaller/inst/435_ports.lua#1 branch .. //depot/projects/soc2005/bsdinstaller/src/libexec/bsdinstaller/inst/Makefile#7 edit Differences ... ==== //depot/projects/soc2005/bsdinstaller/src/libexec/bsdinstaller/inst/Makefile#7 (text+ko) ==== @@ -10,7 +10,7 @@ 900_reboot.lua main.lua # Local scripts -FILES+= 430_select_dists.lua 431_ports.lua +FILES+= 430_select_dists.lua 435_ports.lua FILESDIR= ${INST_DIR}/install From owner-p4-projects@FreeBSD.ORG Wed May 10 10:47:51 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 214AF16A408; Wed, 10 May 2006 10:47:51 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id CCD7516A400 for ; Wed, 10 May 2006 10:47:50 +0000 (UTC) (envelope-from soc-andrew@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 9AC4543D53 for ; Wed, 10 May 2006 10:47:50 +0000 (GMT) (envelope-from soc-andrew@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k4AAloAi081093 for ; Wed, 10 May 2006 10:47:50 GMT (envelope-from soc-andrew@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k4AAlolB081084 for perforce@freebsd.org; Wed, 10 May 2006 10:47:50 GMT (envelope-from soc-andrew@freebsd.org) Date: Wed, 10 May 2006 10:47:50 GMT Message-Id: <200605101047.k4AAlolB081084@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to soc-andrew@freebsd.org using -f From: soc-andrew To: Perforce Change Reviews Cc: Subject: PERFORCE change 96907 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 10 May 2006 10:47:51 -0000 http://perforce.freebsd.org/chv.cgi?CH=96907 Change 96907 by soc-andrew@soc-andrew_serv on 2006/05/10 10:47:30 There is no need to patch Makefile.inc1 any more Affected files ... .. //depot/projects/soc2005/bsdinstaller/scripts/build_patch.sh#14 edit .. //depot/projects/soc2005/bsdinstaller/src/Makefile.inc1#15 delete Differences ... ==== //depot/projects/soc2005/bsdinstaller/scripts/build_patch.sh#14 (text+ko) ==== @@ -3,7 +3,7 @@ # Script to create a patch and tarballs of files to use in release(7) # The files to diff -FILES="Makefile.inc1 libexec/Makefile release/Makefile share/Makefile etc/mtree/BSD.usr.dist" +FILES="libexec/Makefile release/Makefile share/Makefile etc/mtree/BSD.usr.dist" # Dir's to create a tarball of:name for tarball DIRS="contrib/bsdinstaller:base_bsdinstaller libexec/bsdinstaller:libexec release/bsdinstaller:release share/bsdinstaller:share sys/i386/conf/NOPREEMPTION:sys" From owner-p4-projects@FreeBSD.ORG Wed May 10 22:05:09 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 19A7716A4C8; Wed, 10 May 2006 22:05:09 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id B873616A4AB for ; Wed, 10 May 2006 22:05:08 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 4E84943D46 for ; Wed, 10 May 2006 22:05:08 +0000 (GMT) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k4AM58Yu002358 for ; Wed, 10 May 2006 22:05:08 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k4AM57tS002355 for perforce@freebsd.org; Wed, 10 May 2006 22:05:07 GMT (envelope-from jb@freebsd.org) Date: Wed, 10 May 2006 22:05:07 GMT Message-Id: <200605102205.k4AM57tS002355@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 96929 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 10 May 2006 22:05:09 -0000 http://perforce.freebsd.org/chv.cgi?CH=96929 Change 96929 by jb@jb_freebsd2 on 2006/05/10 22:04:53 Implement the software interrupts CY_LOW_LEVEL and CY_LOCK_LEVEL. Map them to SWI_TQ and SWI_TQ_FAST. Enable the semaphores. This brings us to another milestone... the 'profile' provider works now. Only on a single CPU machine though. We still need a way to execute a task on another CPU. Affected files ... .. //depot/projects/dtrace/src/sys/cddl/i386/cyclic_machdep.c#2 edit .. //depot/projects/dtrace/src/sys/cddl/kern/cyclic.c#2 edit .. //depot/projects/dtrace/src/sys/cddl/kern/kern_cyclic.c#2 edit Differences ... ==== //depot/projects/dtrace/src/sys/cddl/i386/cyclic_machdep.c#2 (text+ko) ==== @@ -29,8 +29,10 @@ #include #include #include +#include +#include +#include #include -#include #include extern cyclic_clock_func_t lapic_cyclic_clock_func; @@ -62,8 +64,29 @@ NULL /* cyb_arg_t cyb_arg */ }; +static hrtime_t resolution; static int hpet_present = 0; -static hrtime_t resolution; +static void *cyclic_lock_ih; +static void *cyclic_low_ih; + +/* + * Software interrupt callbacks. + */ +static void +cyclic_swi_low(void *dummy) +{ + cpu_t *c = pcpu_find(curcpu); + + cyclic_softint(c, CY_LOW_LEVEL); +} + +static void +cyclic_swi_lock(void *dummy) +{ + cpu_t *c = pcpu_find(curcpu); + + cyclic_softint(c, CY_LOCK_LEVEL); +} /* * Machine dependent cyclic subsystem initialisation. @@ -76,6 +99,15 @@ /* XXX Need to check here if the HPET is available. */ + /* + * Add a software interrupt handlers for low priority cyclic + * events. + */ + swi_add(&clk_intr_event, "low cyclic", cyclic_swi_low, NULL, + SWI_TQ, 0, &cyclic_low_ih); + swi_add(&clk_intr_event, "lock cyclic", cyclic_swi_lock, NULL, + SWI_TQ_FAST, 0, &cyclic_lock_ih); + /* Register the cyclic backend. */ cyclic_init(&be, resolution); @@ -93,6 +125,10 @@ /* De-register the cyclic backend. */ cyclic_uninit(); + + /* Remove the software interrupt handlers. */ + swi_remove(cyclic_low_ih); + swi_remove(cyclic_lock_ih); } static cyb_arg_t configure(cpu_t *c) @@ -125,7 +161,21 @@ static void softint(cyb_arg_t arg, cyc_level_t level) { - printf("%s:%s(%d): Huh?\n",__FUNCTION__,__FILE__,__LINE__); + /* + * Schedule the software interrupt processing at the + * requested level. + */ + switch (level) { + case CY_LOW_LEVEL: + swi_sched(cyclic_low_ih, 0); + break; + case CY_LOCK_LEVEL: + swi_sched(cyclic_lock_ih, 0); + break; + default: + printf("%s:%s(%d): unexpected soft level %d\n",__FUNCTION__,__FILE__,__LINE__,level); + break; + } } static cyc_cookie_t set_level(cyb_arg_t arg, cyc_level_t level) ==== //depot/projects/dtrace/src/sys/cddl/kern/cyclic.c#2 (text+ko) ==== @@ -484,7 +484,7 @@ * * cyclic_expand() blocks on the cyp_modify_wait semaphore (a semaphore is * used instead of a condition variable because of the race between the - * sema_p() in cyclic_expand() and the sema_v() in cyclic_softint()). This + * sema_wait() in cyclic_expand() and the sema_post() in cyclic_softint()). This * allows cyclic_expand() to know when the resize operation is complete; * all of the old buffers (the heap, the cyclics array and the producer/ * consumer buffers) can be freed. @@ -560,12 +560,14 @@ #include #include #include +#include #include #include #include #include #include #include +#include MALLOC_DECLARE(M_CYCLIC); MALLOC_DEFINE(M_CYCLIC, "cyclic", "Cyclic Subsystem"); @@ -811,8 +813,6 @@ cyc_backend_t *be = cpu->cyp_backend; cyc_level_t level = cyclic->cy_level; -/* XXX Force everything via the CY_HIGH_LEVEL */ -level = CY_HIGH_LEVEL; /* * If this is a CY_HIGH_LEVEL cyclic, just call the handler; we don't * need to worry about the pend count for CY_HIGH_LEVEL cyclics. @@ -979,7 +979,6 @@ c->pc_ncyclic = cpu->cyp_nelems; } -#ifdef DOODAD static void cyclic_remove_pend(cyc_cpu_t *cpu, cyc_level_t level, cyclic_t *cyclic) { @@ -1007,7 +1006,7 @@ /* * We can now let the remove operation complete. */ - sema_v(&cpu->cyp_modify_wait); + sema_post(&cpu->cyp_modify_wait); } /* @@ -1061,7 +1060,7 @@ void cyclic_softint(cpu_t *c, cyc_level_t level) { - cyc_cpu_t *cpu = c->cpu_cyclic; + cyc_cpu_t *cpu = c->pc_cyclic; cyc_softbuf_t *softbuf; int soft, *buf, consndx, resized = 0, intr_resized = 0; cyc_pcbuffer_t *pc; @@ -1157,7 +1156,7 @@ } if ((opend = - cas32(&cyclic->cy_pend, pend, npend)) != pend) { + atomic_cmpset_int(&cyclic->cy_pend, pend, npend)) != pend) { /* * Our cas32 can fail for one of several * reasons: @@ -1249,7 +1248,7 @@ do { lev = cpu->cyp_modify_levels; nlev = lev + 1; - } while (cas32(&cpu->cyp_modify_levels, lev, nlev) != lev); + } while (atomic_cmpset_int(&cpu->cyp_modify_levels, lev, nlev) != lev); /* * If we are the last soft level to see the modification, @@ -1258,7 +1257,7 @@ */ if (nlev == CY_SOFT_LEVELS) { CYC_TRACE0(cpu, level, "resize-kick"); - sema_v(&cpu->cyp_modify_wait); + sema_post(&cpu->cyp_modify_wait); } else { ASSERT(nlev < CY_SOFT_LEVELS); if (level != CY_LOW_LEVEL) { @@ -1270,7 +1269,6 @@ } } } -#endif static void cyclic_expand_xcall(cyc_xcallarg_t *arg) @@ -1436,9 +1434,7 @@ /* * Now block, waiting for the resize operation to complete. */ -#ifdef DOODAD - sema_p(&cpu->cyp_modify_wait); -#endif + sema_wait(&cpu->cyp_modify_wait); ASSERT(cpu->cyp_modify_levels == CY_SOFT_LEVELS); /* @@ -1879,10 +1875,8 @@ return (0); } -#ifdef DOODAD if (cpu->cyp_rpend != 0) - sema_p(&cpu->cyp_modify_wait); -#endif + sema_wait(&cpu->cyp_modify_wait); ASSERT(cpu->cyp_state == CYS_REMOVING); @@ -1969,9 +1963,7 @@ if (delay > (cyclic->cy_interval >> 1)) delay = cyclic->cy_interval >> 1; -#ifdef DOODAD - drv_usecwait((clock_t)(delay / (NANOSEC / MICROSEC))); -#endif + DELAY((int)(delay / (NANOSEC / MICROSEC))); } /* @@ -2148,9 +2140,7 @@ cpu->cyp_cpu = c; -#ifdef DOODAD - sema_init(&cpu->cyp_modify_wait, 0, NULL, SEMA_DEFAULT, NULL); -#endif + sema_init(&cpu->cyp_modify_wait, 0, "cyclic modify"); cpu->cyp_size = 1; cpu->cyp_heap = kmem_zalloc(sizeof (cyc_index_t), KM_SLEEP); @@ -2231,6 +2221,8 @@ pc->cypc_buf = NULL; } + sema_destroy(&cpu->cyp_modify_wait); + /* * Finally, clean up our remaining dynamic structures and NULL out * the cpu_cyclic pointer. @@ -2637,19 +2629,20 @@ cyclic_add_omni(cyc_omni_handler_t *omni) { cyc_id_t *idp = cyclic_new_id(); -printf("%s: DOODAD\n",__FUNCTION__); -#ifdef DOODAD cyc_cpu_t *cpu; cpu_t *c; + int id; ASSERT(MUTEX_HELD(&cpu_lock)); ASSERT(omni != NULL && omni->cyo_online != NULL); idp->cyi_omni_hdlr = *omni; - c = cpu_list; - do { - if ((cpu = c->cpu_cyclic) == NULL) + for (id = 0; id <= mp_maxid; id++) { + if ((c = pcpu_find(id)) == NULL) + continue; + + if ((cpu = c->pc_cyclic) == NULL) continue; if (cpu->cyp_state != CYS_ONLINE) { @@ -2658,7 +2651,7 @@ } cyclic_omni_start(idp, cpu); - } while ((c = c->cpu_next) != cpu_list); + } /* * We must have found at least one online CPU on which to run @@ -2666,7 +2659,6 @@ */ ASSERT(idp->cyi_omni_list != NULL); ASSERT(idp->cyi_cpu == NULL); -#endif return ((uintptr_t)idp); } ==== //depot/projects/dtrace/src/sys/cddl/kern/kern_cyclic.c#2 (text+ko) ==== @@ -30,9 +30,9 @@ #include #include #include -#include #include #include +#include #include /* @@ -41,6 +41,7 @@ static void cyclic_load(void *dummy) { + /* Initialise the machine-dependent backend. */ cyclic_machdep_init(); } @@ -49,8 +50,10 @@ static void cyclic_unload(void) { + /* Uninitialise the machine-dependent backend. */ cyclic_machdep_uninit(); } + SYSUNINIT(ata_unregister, SI_SUB_CLOCKS, SI_ORDER_SECOND, cyclic_unload, NULL); /* From owner-p4-projects@FreeBSD.ORG Thu May 11 12:00:40 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5D52F16A5B0; Thu, 11 May 2006 12:00:38 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 8AB8616A49C for ; Thu, 11 May 2006 12:00:35 +0000 (UTC) (envelope-from soc-andrew@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id AC76943D6D for ; Thu, 11 May 2006 12:00:29 +0000 (GMT) (envelope-from soc-andrew@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k4BC0T0S072137 for ; Thu, 11 May 2006 12:00:29 GMT (envelope-from soc-andrew@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k4BC0Tdn072134 for perforce@freebsd.org; Thu, 11 May 2006 12:00:29 GMT (envelope-from soc-andrew@freebsd.org) Date: Thu, 11 May 2006 12:00:29 GMT Message-Id: <200605111200.k4BC0Tdn072134@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to soc-andrew@freebsd.org using -f From: soc-andrew To: Perforce Change Reviews Cc: Subject: PERFORCE change 96938 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 11 May 2006 12:01:06 -0000 http://perforce.freebsd.org/chv.cgi?CH=96938 Change 96938 by soc-andrew@soc-andrew_serv on 2006/05/11 12:00:10 Allow the selection of the kernels to install. This is generated from the kernel on the installation media. Affected files ... .. //depot/projects/soc2005/bsdinstaller/src/contrib/bsdinstaller/backend/lua/install/500_install_os.lua#9 edit .. //depot/projects/soc2005/bsdinstaller/src/libexec/bsdinstaller/inst/432_kernel.lua#1 add .. //depot/projects/soc2005/bsdinstaller/src/libexec/bsdinstaller/inst/Makefile#8 edit Differences ... ==== //depot/projects/soc2005/bsdinstaller/src/contrib/bsdinstaller/backend/lua/install/500_install_os.lua#9 (text+ko) ==== @@ -86,14 +86,27 @@ App.state.target:cmds_install_srcs(cmds, App.conf.install_items) --- Install the generic kernel + install_kernel = function(n, kernel) + cmds:add { + cmdline = "${root}${TAR} -x " .. + "-f ${root}usr/${uname}/kernels/${kernel}.tgz " .. + "-C ${root}${base}/boot", + replacements = { + base = base, + kernel = kernel, + uname = POSIX.uname("%r") + } + } + end + print("Kernels:") + table.foreach(App.conf.kernels, install_kernel) + + cmds:add { + cmdline = "${root}${RM} -fr ${root}${base}/boot/kernel" + } cmds:add { - cmdline = "${root}${TAR} -x " .. - "-f ${root}usr/${uname}/kernels/generic.tgz " .. - "-C ${root}${base}/usr", - replacements = { - base = base, - uname = POSIX.uname("%r") - } + cmdline="${root}${MV} ${root}${base}/boot/GENERIC " .. + "${root}${base}/boot/kernel" } --- Install the ports tree ==== //depot/projects/soc2005/bsdinstaller/src/libexec/bsdinstaller/inst/Makefile#8 (text+ko) ==== @@ -10,7 +10,7 @@ 900_reboot.lua main.lua # Local scripts -FILES+= 430_select_dists.lua 435_ports.lua +FILES+= 430_select_dists.lua 432_kernel.lua 435_ports.lua FILESDIR= ${INST_DIR}/install From owner-p4-projects@FreeBSD.ORG Thu May 11 18:41:43 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0991816A55A; Thu, 11 May 2006 18:41:43 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 0FABA16A519 for ; Thu, 11 May 2006 18:41:42 +0000 (UTC) (envelope-from gnn@neville-neil.com) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id EB952448A6 for ; Thu, 11 May 2006 18:40:18 +0000 (GMT) (envelope-from gnn@neville-neil.com) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k4BIeII1044190 for ; Thu, 11 May 2006 18:40:18 GMT (envelope-from gnn@neville-neil.com) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k4BIeIbU044173 for perforce@freebsd.org; Thu, 11 May 2006 18:40:18 GMT (envelope-from gnn@neville-neil.com) Date: Thu, 11 May 2006 18:40:18 GMT Message-Id: <200605111840.k4BIeIbU044173@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to gnn@neville-neil.com using -f From: "George V. Neville-Neil" To: Perforce Change Reviews Cc: Subject: PERFORCE change 96963 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 11 May 2006 18:41:48 -0000 http://perforce.freebsd.org/chv.cgi?CH=96963 Change 96963 by gnn@gnn_para_sctp on 2006/05/11 18:39:38 Add SCTP RFCs to the view. Affected files ... .. //depot/projects/gnn_sctp/src/sys/notes/rfcs/rfc2960.txt#1 add .. //depot/projects/gnn_sctp/src/sys/notes/rfcs/rfc3309.txt#1 add .. //depot/projects/gnn_sctp/src/sys/notes/rfcs/rfc3758.txt#1 add .. //depot/projects/gnn_sctp/src/sys/notes/rfcs/rfc4460.txt#1 add Differences ... From owner-p4-projects@FreeBSD.ORG Thu May 11 18:41:48 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A9AB816A466; Thu, 11 May 2006 18:41:45 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 1391916A51A for ; Thu, 11 May 2006 18:41:42 +0000 (UTC) (envelope-from gnn@neville-neil.com) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id C91E5448A8 for ; Thu, 11 May 2006 18:40:18 +0000 (GMT) (envelope-from gnn@neville-neil.com) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k4BIeIYf044189 for ; Thu, 11 May 2006 18:40:18 GMT (envelope-from gnn@neville-neil.com) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k4BIeISK044170 for perforce@freebsd.org; Thu, 11 May 2006 18:40:18 GMT (envelope-from gnn@neville-neil.com) Date: Thu, 11 May 2006 18:40:18 GMT Message-Id: <200605111840.k4BIeISK044170@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to gnn@neville-neil.com using -f From: "George V. Neville-Neil" To: Perforce Change Reviews Cc: Subject: PERFORCE change 96963 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 11 May 2006 18:41:51 -0000 http://perforce.freebsd.org/chv.cgi?CH=96963 Change 96963 by gnn@gnn_para_sctp on 2006/05/11 18:39:38 Add SCTP RFCs to the view. Affected files ... .. //depot/projects/gnn_sctp/src/sys/notes/rfcs/rfc2960.txt#1 add .. //depot/projects/gnn_sctp/src/sys/notes/rfcs/rfc3309.txt#1 add .. //depot/projects/gnn_sctp/src/sys/notes/rfcs/rfc3758.txt#1 add .. //depot/projects/gnn_sctp/src/sys/notes/rfcs/rfc4460.txt#1 add Differences ... From owner-p4-projects@FreeBSD.ORG Thu May 11 20:14:04 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D30B416A437; Thu, 11 May 2006 20:14:03 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 7339116A44A for ; Thu, 11 May 2006 20:14:02 +0000 (UTC) (envelope-from soc-andrew@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id D726C445F3 for ; Thu, 11 May 2006 19:55:04 +0000 (GMT) (envelope-from soc-andrew@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k4BJt4x3088661 for ; Thu, 11 May 2006 19:55:04 GMT (envelope-from soc-andrew@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k4BJt4MV088655 for perforce@freebsd.org; Thu, 11 May 2006 19:55:04 GMT (envelope-from soc-andrew@freebsd.org) Date: Thu, 11 May 2006 19:55:04 GMT Message-Id: <200605111955.k4BJt4MV088655@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to soc-andrew@freebsd.org using -f From: soc-andrew To: Perforce Change Reviews Cc: Subject: PERFORCE change 96969 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 11 May 2006 20:14:17 -0000 http://perforce.freebsd.org/chv.cgi?CH=96969 Change 96969 by soc-andrew@soc-andrew_serv on 2006/05/11 19:54:36 IFC Affected files ... .. //depot/projects/soc2005/bsdinstaller/src/release/doc/en_US.ISO8859-1/hardware/common/artheader.sgml#2 integrate .. //depot/projects/soc2005/bsdinstaller/src/release/doc/en_US.ISO8859-1/installation/common/artheader.sgml#2 integrate .. //depot/projects/soc2005/bsdinstaller/src/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#13 integrate Differences ... ==== //depot/projects/soc2005/bsdinstaller/src/release/doc/en_US.ISO8859-1/hardware/common/artheader.sgml#2 (text+ko) ==== @@ -1,4 +1,4 @@ - + &os;/&arch; &release.current; Hardware Notes @@ -12,6 +12,7 @@ 2003 2004 2005 + 2006 The &os; Documentation Project ==== //depot/projects/soc2005/bsdinstaller/src/release/doc/en_US.ISO8859-1/installation/common/artheader.sgml#2 (text+ko) ==== @@ -1,4 +1,4 @@ - + &os;/&arch; &release.current; Installation Instructions @@ -14,6 +14,7 @@ 2003 2004 2005 + 2006 The &os; Documentation Project ==== //depot/projects/soc2005/bsdinstaller/src/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#13 (text+ko) ==== @@ -3,7 +3,7 @@ The &os; Project - $FreeBSD: src/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml,v 1.918 2006/04/30 05:22:43 hrs Exp $ + $FreeBSD: src/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml,v 1.926 2006/05/11 19:17:17 bmah Exp $ 2000 @@ -151,6 +151,30 @@ For more details see security advisory FreeBSD-SA-06:07.pf. &merged; + A logic bug in the NFS server code, which could cause a crash when + the server received a message with a zero-length payload, has been fixed. + For more details see security advisory FreeBSD-SA-06:10.nfs. &merged; + + A programming error in the &man.fast.ipsec.4; implementation + results in the sequence number associated with a Security + Association not being updated, allowing packets to unconditionally + pass sequence number verification checks, has been fixed. + For more details see security advisory FreeBSD-SA-06:11.ipsec. &merged; + + A logic bug that could cause &man.opiepasswd.1; to allow an unprivileged + user to configure OPIE authentication for the root user under certain + circumstances, has been fixed. + For more details see security advisory FreeBSD-SA-06:12.opie. &merged; + + An asynchronous signal handling vulnerability in &man.sendmail.8;, + which could allow a remote attacker to execute arbitrary code with the + privileges of the user running sendmail, typically root, has been fixed. + For more details see security advisory FreeBSD-SA-06:13.sendmail. &merged; + An information disclosure issue found in the &os; kernel running on 7th- and 8th-generation AMD processors has been fixed. For more details see security advisory + Support for Linux emulation on the Alpha + platform has been removed, due to the lack of a + linux_base port that both supports the + Alpha architecture and is in good working condition. + RedZone, a buffer corruption protection for kernel &man.malloc.9; facility has been implemented. This detects both of buffer underflows and buffer overflows bugs at runtime on &man.free.9; and &man.realloc.9;, @@ -334,6 +363,10 @@ A bug which prevents the &man.ichsmb.4; kernel module from unloading has been fixed. + Dual-core processors (such as the Intel + Core Duo) now have both cores available for use by + default in SMP-enabled kernels. &merged; + &man.ipmi.4;, an OpenIPMI compatible driver, has been added. OpenIPMI (Intelligent Platform Management Interface) is an open @@ -463,7 +496,7 @@ architectures such as sparc64. &merged; The &man.em.4; driver has been updated to - version 3.2.18 from Intel, and now supports + version 5.1.5 from Intel. Among other changes, it now supports 82571 and 82572 based adapters. The &man.em.4; driver now includes @@ -552,6 +585,10 @@ and a sysctl variable net.bpf.jitter.enable can be used to disable this feature. + The bridge(4) driver has been removed from the tree. Its + functionality has been completely replaced by + &man.if.bridge.4;. + The &man.gre.4; driver, which is for GRE encapsulation found in RFC 1701 and RFC 1702 now supports IPv6 over GRE. @@ -861,14 +898,14 @@ The &man.bsdiff.1; and &man.bspatch.1; utilities have been added. These are tools for constructing and - applying binary patches. + applying binary patches. &merged; The &man.bsnmpd.1; utility now supports the Host Resources MIB described in RFC 2790. &merged; The &man.cmp.1; utility now supports an flag to compare the symbolic link itself rather than the - file that the link points to. + file that the link points to. &merged; The &man.config.8; utility now supports the nocpu directive, which cancels the effect of a @@ -888,9 +925,21 @@ in C language. Note that it currently supports checkout mode only. + The &man.dhclient.8; program now sends the host's name in + DHCP requests if it is not specified in the configuration + file. + The &man.devd.8; utility now supports a option to specify a configuration file. &merged; + The &man.du.1; program now supports a + flag, which causes it to ignore files and directories with + the nodump flag set. + + The &man.find.1; program now supports + and other related primaries, which can be used to create expressions + based on a file's creation time. + The &man.ftpd.8; utility now creates a PID file /var/run/ftpd.pid even when no option is specified. &merged; @@ -904,6 +953,11 @@ comment listing the file name, owner, and group. &merged; + The &man.getent.1; utility has been imported from NetBSD. + It retrieves and displays information from an administrative + database (such as hosts) using the lookup + order specified in &man.nsswitch.conf.5;. + The &man.gpt.8; utility now supports setting GPT partition labels. The &man.gvinum.8; utility now supports commands @@ -934,6 +988,12 @@ argument still is supported for backward compatibility, but now it is deprecated and its use is discouraged. + The &man.iostat.8; utility now supports + a flag (inspired by Solaris) to print + extended disk statistics. If the new flag is + also specified, no output is made for disks with no + activity. + The &man.jail.8; utility pports a option to write out a JidFile, similar to a PidFile, containing @@ -1033,7 +1093,7 @@ The &man.netstat.1; utility now supports an flag for interface stats mode, - which prints all interface statistics in human readable form. + which prints all interface statistics in human readable form. &merged; The &man.netstat.1; utility now supports printing &man.ipsec.4; protocol statistics if the @@ -1056,7 +1116,7 @@ ping in which &man.icmp.4; payload of packets being sent is increased with given step. This is useful for testing problematic channels, MTU issues - or traffic policing functions in networks. + or traffic policing functions in networks. &merged; The &man.pkill.1; utility now supports a option which allows to @@ -1094,7 +1154,7 @@ allow lookups for a specific version of a given symbol. The &man.sh.1; utility now supports times - built-in command. + built-in command. &merged; The &man.snapinfo.8; utility, which shows snapshot locations on UFS filesystems, has been added. &merged; @@ -1186,7 +1246,7 @@ The netif script now supports ipv4_addrs_ifn, which adds one or more IPv4 address from a ranged list in - CIRD notation. &merged; For example: + CIDR notation. &merged; For example: ipv4_addrs_ed0="192.168.0.1/24 192.168.1.1-5/28" @@ -1404,11 +1464,11 @@ The supported version of the GNOME desktop environment (x11/gnome2) has been - updated from 2.10.2 to 2.12.3. &merged; + updated from 2.10.2 to 2.14.1. &merged; The supported version of the KDE desktop environment - (x11/kde2) has been + (x11/kde3) has been updated from 3.4.2 to 3.5.1. &merged; The supported version of From owner-p4-projects@FreeBSD.ORG Thu May 11 20:15:31 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 03B6B16A6B1; Thu, 11 May 2006 20:14:57 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 399F116A613 for ; Thu, 11 May 2006 20:14:45 +0000 (UTC) (envelope-from soc-andrew@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id F06AB445F4 for ; Thu, 11 May 2006 19:55:04 +0000 (GMT) (envelope-from soc-andrew@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k4BJt4J9088662 for ; Thu, 11 May 2006 19:55:04 GMT (envelope-from soc-andrew@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k4BJt4gW088658 for perforce@freebsd.org; Thu, 11 May 2006 19:55:04 GMT (envelope-from soc-andrew@freebsd.org) Date: Thu, 11 May 2006 19:55:04 GMT Message-Id: <200605111955.k4BJt4gW088658@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to soc-andrew@freebsd.org using -f From: soc-andrew To: Perforce Change Reviews Cc: Subject: PERFORCE change 96969 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 11 May 2006 20:15:49 -0000 http://perforce.freebsd.org/chv.cgi?CH=96969 Change 96969 by soc-andrew@soc-andrew_serv on 2006/05/11 19:54:36 IFC Affected files ... .. //depot/projects/soc2005/bsdinstaller/src/release/doc/en_US.ISO8859-1/hardware/common/artheader.sgml#2 integrate .. //depot/projects/soc2005/bsdinstaller/src/release/doc/en_US.ISO8859-1/installation/common/artheader.sgml#2 integrate .. //depot/projects/soc2005/bsdinstaller/src/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#13 integrate Differences ... ==== //depot/projects/soc2005/bsdinstaller/src/release/doc/en_US.ISO8859-1/hardware/common/artheader.sgml#2 (text+ko) ==== @@ -1,4 +1,4 @@ - + &os;/&arch; &release.current; Hardware Notes @@ -12,6 +12,7 @@ 2003 2004 2005 + 2006 The &os; Documentation Project ==== //depot/projects/soc2005/bsdinstaller/src/release/doc/en_US.ISO8859-1/installation/common/artheader.sgml#2 (text+ko) ==== @@ -1,4 +1,4 @@ - + &os;/&arch; &release.current; Installation Instructions @@ -14,6 +14,7 @@ 2003 2004 2005 + 2006 The &os; Documentation Project ==== //depot/projects/soc2005/bsdinstaller/src/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#13 (text+ko) ==== @@ -3,7 +3,7 @@ The &os; Project - $FreeBSD: src/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml,v 1.918 2006/04/30 05:22:43 hrs Exp $ + $FreeBSD: src/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml,v 1.926 2006/05/11 19:17:17 bmah Exp $ 2000 @@ -151,6 +151,30 @@ For more details see security advisory FreeBSD-SA-06:07.pf. &merged; + A logic bug in the NFS server code, which could cause a crash when + the server received a message with a zero-length payload, has been fixed. + For more details see security advisory FreeBSD-SA-06:10.nfs. &merged; + + A programming error in the &man.fast.ipsec.4; implementation + results in the sequence number associated with a Security + Association not being updated, allowing packets to unconditionally + pass sequence number verification checks, has been fixed. + For more details see security advisory FreeBSD-SA-06:11.ipsec. &merged; + + A logic bug that could cause &man.opiepasswd.1; to allow an unprivileged + user to configure OPIE authentication for the root user under certain + circumstances, has been fixed. + For more details see security advisory FreeBSD-SA-06:12.opie. &merged; + + An asynchronous signal handling vulnerability in &man.sendmail.8;, + which could allow a remote attacker to execute arbitrary code with the + privileges of the user running sendmail, typically root, has been fixed. + For more details see security advisory FreeBSD-SA-06:13.sendmail. &merged; + An information disclosure issue found in the &os; kernel running on 7th- and 8th-generation AMD processors has been fixed. For more details see security advisory + Support for Linux emulation on the Alpha + platform has been removed, due to the lack of a + linux_base port that both supports the + Alpha architecture and is in good working condition. + RedZone, a buffer corruption protection for kernel &man.malloc.9; facility has been implemented. This detects both of buffer underflows and buffer overflows bugs at runtime on &man.free.9; and &man.realloc.9;, @@ -334,6 +363,10 @@ A bug which prevents the &man.ichsmb.4; kernel module from unloading has been fixed. + Dual-core processors (such as the Intel + Core Duo) now have both cores available for use by + default in SMP-enabled kernels. &merged; + &man.ipmi.4;, an OpenIPMI compatible driver, has been added. OpenIPMI (Intelligent Platform Management Interface) is an open @@ -463,7 +496,7 @@ architectures such as sparc64. &merged; The &man.em.4; driver has been updated to - version 3.2.18 from Intel, and now supports + version 5.1.5 from Intel. Among other changes, it now supports 82571 and 82572 based adapters. The &man.em.4; driver now includes @@ -552,6 +585,10 @@ and a sysctl variable net.bpf.jitter.enable can be used to disable this feature. + The bridge(4) driver has been removed from the tree. Its + functionality has been completely replaced by + &man.if.bridge.4;. + The &man.gre.4; driver, which is for GRE encapsulation found in RFC 1701 and RFC 1702 now supports IPv6 over GRE. @@ -861,14 +898,14 @@ The &man.bsdiff.1; and &man.bspatch.1; utilities have been added. These are tools for constructing and - applying binary patches. + applying binary patches. &merged; The &man.bsnmpd.1; utility now supports the Host Resources MIB described in RFC 2790. &merged; The &man.cmp.1; utility now supports an flag to compare the symbolic link itself rather than the - file that the link points to. + file that the link points to. &merged; The &man.config.8; utility now supports the nocpu directive, which cancels the effect of a @@ -888,9 +925,21 @@ in C language. Note that it currently supports checkout mode only. + The &man.dhclient.8; program now sends the host's name in + DHCP requests if it is not specified in the configuration + file. + The &man.devd.8; utility now supports a option to specify a configuration file. &merged; + The &man.du.1; program now supports a + flag, which causes it to ignore files and directories with + the nodump flag set. + + The &man.find.1; program now supports + and other related primaries, which can be used to create expressions + based on a file's creation time. + The &man.ftpd.8; utility now creates a PID file /var/run/ftpd.pid even when no option is specified. &merged; @@ -904,6 +953,11 @@ comment listing the file name, owner, and group. &merged; + The &man.getent.1; utility has been imported from NetBSD. + It retrieves and displays information from an administrative + database (such as hosts) using the lookup + order specified in &man.nsswitch.conf.5;. + The &man.gpt.8; utility now supports setting GPT partition labels. The &man.gvinum.8; utility now supports commands @@ -934,6 +988,12 @@ argument still is supported for backward compatibility, but now it is deprecated and its use is discouraged. + The &man.iostat.8; utility now supports + a flag (inspired by Solaris) to print + extended disk statistics. If the new flag is + also specified, no output is made for disks with no + activity. + The &man.jail.8; utility pports a option to write out a JidFile, similar to a PidFile, containing @@ -1033,7 +1093,7 @@ The &man.netstat.1; utility now supports an flag for interface stats mode, - which prints all interface statistics in human readable form. + which prints all interface statistics in human readable form. &merged; The &man.netstat.1; utility now supports printing &man.ipsec.4; protocol statistics if the @@ -1056,7 +1116,7 @@ ping in which &man.icmp.4; payload of packets being sent is increased with given step. This is useful for testing problematic channels, MTU issues - or traffic policing functions in networks. + or traffic policing functions in networks. &merged; The &man.pkill.1; utility now supports a option which allows to @@ -1094,7 +1154,7 @@ allow lookups for a specific version of a given symbol. The &man.sh.1; utility now supports times - built-in command. + built-in command. &merged; The &man.snapinfo.8; utility, which shows snapshot locations on UFS filesystems, has been added. &merged; @@ -1186,7 +1246,7 @@ The netif script now supports ipv4_addrs_ifn, which adds one or more IPv4 address from a ranged list in - CIRD notation. &merged; For example: + CIDR notation. &merged; For example: ipv4_addrs_ed0="192.168.0.1/24 192.168.1.1-5/28" @@ -1404,11 +1464,11 @@ The supported version of the GNOME desktop environment (x11/gnome2) has been - updated from 2.10.2 to 2.12.3. &merged; + updated from 2.10.2 to 2.14.1. &merged; The supported version of the KDE desktop environment - (x11/kde2) has been + (x11/kde3) has been updated from 3.4.2 to 3.5.1. &merged; The supported version of From owner-p4-projects@FreeBSD.ORG Fri May 12 00:11:37 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id ED84616A404; Fri, 12 May 2006 00:11:36 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 9762716A400 for ; Fri, 12 May 2006 00:11:36 +0000 (UTC) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 3B90543F78 for ; Fri, 12 May 2006 00:11:36 +0000 (GMT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k4C0Ba8v052101 for ; Fri, 12 May 2006 00:11:36 GMT (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k4C0BZ9w052083 for perforce@freebsd.org; Fri, 12 May 2006 00:11:35 GMT (envelope-from marcel@freebsd.org) Date: Fri, 12 May 2006 00:11:35 GMT Message-Id: <200605120011.k4C0BZ9w052083@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Cc: Subject: PERFORCE change 96985 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 12 May 2006 00:11:37 -0000 http://perforce.freebsd.org/chv.cgi?CH=96985 Change 96985 by marcel@marcel_nfs on 2006/05/12 00:11:09 IFC @96983 Affected files ... .. //depot/projects/uart/alpha/Makefile#2 delete .. //depot/projects/uart/alpha/alpha/api_up1000.c#7 delete .. //depot/projects/uart/alpha/alpha/atomic.s#2 delete .. //depot/projects/uart/alpha/alpha/autoconf.c#6 delete .. //depot/projects/uart/alpha/alpha/busdma_machdep.c#10 delete .. //depot/projects/uart/alpha/alpha/busspace.c#3 delete .. //depot/projects/uart/alpha/alpha/clock.c#10 delete .. //depot/projects/uart/alpha/alpha/clock_if.m#3 delete .. //depot/projects/uart/alpha/alpha/cpuconf.c#5 delete .. //depot/projects/uart/alpha/alpha/db_disasm.c#5 delete .. //depot/projects/uart/alpha/alpha/db_instruction.h#4 delete .. //depot/projects/uart/alpha/alpha/db_interface.c#5 delete .. //depot/projects/uart/alpha/alpha/db_trace.c#8 delete .. //depot/projects/uart/alpha/alpha/dec_1000a.c#8 delete .. //depot/projects/uart/alpha/alpha/dec_2100_a50.c#8 delete .. //depot/projects/uart/alpha/alpha/dec_2100_a500.c#8 delete .. //depot/projects/uart/alpha/alpha/dec_3000_300.c#4 delete .. //depot/projects/uart/alpha/alpha/dec_3000_500.c#4 delete .. //depot/projects/uart/alpha/alpha/dec_axppci_33.c#8 delete .. //depot/projects/uart/alpha/alpha/dec_eb164.c#7 delete .. //depot/projects/uart/alpha/alpha/dec_eb64plus.c#8 delete .. //depot/projects/uart/alpha/alpha/dec_kn20aa.c#9 delete .. //depot/projects/uart/alpha/alpha/dec_kn300.c#8 delete .. //depot/projects/uart/alpha/alpha/dec_kn8ae.c#4 delete .. //depot/projects/uart/alpha/alpha/dec_st550.c#8 delete .. //depot/projects/uart/alpha/alpha/dec_st6600.c#7 delete .. //depot/projects/uart/alpha/alpha/divrem.m4#3 delete .. //depot/projects/uart/alpha/alpha/dump_machdep.c#4 delete .. //depot/projects/uart/alpha/alpha/elf_machdep.c#6 delete .. //depot/projects/uart/alpha/alpha/exception.s#3 delete .. //depot/projects/uart/alpha/alpha/fp_emulate.c#5 delete .. //depot/projects/uart/alpha/alpha/gdb_machdep.c#3 delete .. //depot/projects/uart/alpha/alpha/genassym.c#5 delete .. //depot/projects/uart/alpha/alpha/ieee_float.c#4 delete .. //depot/projects/uart/alpha/alpha/ieee_float.h#2 delete .. //depot/projects/uart/alpha/alpha/in_cksum.c#4 delete .. //depot/projects/uart/alpha/alpha/interrupt.c#9 delete .. //depot/projects/uart/alpha/alpha/locore.s#3 delete .. //depot/projects/uart/alpha/alpha/machdep.c#18 delete .. //depot/projects/uart/alpha/alpha/mem.c#4 delete .. //depot/projects/uart/alpha/alpha/mp_machdep.c#15 delete .. //depot/projects/uart/alpha/alpha/pal.s#3 delete .. //depot/projects/uart/alpha/alpha/pmap.c#20 delete .. //depot/projects/uart/alpha/alpha/prom.c#4 delete .. //depot/projects/uart/alpha/alpha/prom_disp.s#3 delete .. //depot/projects/uart/alpha/alpha/promcons.c#7 delete .. //depot/projects/uart/alpha/alpha/sgmap.c#5 delete .. //depot/projects/uart/alpha/alpha/support.s#6 delete .. //depot/projects/uart/alpha/alpha/swtch.s#3 delete .. //depot/projects/uart/alpha/alpha/sys_machdep.c#5 delete .. //depot/projects/uart/alpha/alpha/trap.c#10 delete .. //depot/projects/uart/alpha/alpha/uio_machdep.c#3 delete .. //depot/projects/uart/alpha/alpha/uma_machdep.c#2 delete .. //depot/projects/uart/alpha/alpha/vm_machdep.c#12 delete .. //depot/projects/uart/alpha/compile/.cvsignore#2 delete .. //depot/projects/uart/alpha/conf/.cvsignore#2 delete .. //depot/projects/uart/alpha/conf/DEFAULTS#4 delete .. //depot/projects/uart/alpha/conf/GENERIC#14 delete .. //depot/projects/uart/alpha/conf/GENERIC.hints#4 delete .. //depot/projects/uart/alpha/conf/MAC#2 delete .. //depot/projects/uart/alpha/conf/Makefile#2 delete .. //depot/projects/uart/alpha/conf/NOTES#7 delete .. //depot/projects/uart/alpha/include/_bus.h#2 delete .. //depot/projects/uart/alpha/include/_inttypes.h#2 delete .. //depot/projects/uart/alpha/include/_limits.h#5 delete .. //depot/projects/uart/alpha/include/_stdint.h#3 delete .. //depot/projects/uart/alpha/include/_types.h#5 delete .. //depot/projects/uart/alpha/include/alpha_cpu.h#4 delete .. //depot/projects/uart/alpha/include/asm.h#3 delete .. //depot/projects/uart/alpha/include/atomic.h#6 delete .. //depot/projects/uart/alpha/include/bootinfo.h#3 delete .. //depot/projects/uart/alpha/include/bus.h#10 delete .. //depot/projects/uart/alpha/include/bus_dma.h#2 delete .. //depot/projects/uart/alpha/include/bwx.h#2 delete .. //depot/projects/uart/alpha/include/chipset.h#3 delete .. //depot/projects/uart/alpha/include/clock.h#3 delete .. //depot/projects/uart/alpha/include/clockvar.h#3 delete .. //depot/projects/uart/alpha/include/cpu.h#7 delete .. //depot/projects/uart/alpha/include/cpuconf.h#5 delete .. //depot/projects/uart/alpha/include/cpufunc.h#3 delete .. //depot/projects/uart/alpha/include/db_machdep.h#5 delete .. //depot/projects/uart/alpha/include/elf.h#3 delete .. //depot/projects/uart/alpha/include/endian.h#5 delete .. //depot/projects/uart/alpha/include/exec.h#4 delete .. //depot/projects/uart/alpha/include/float.h#4 delete .. //depot/projects/uart/alpha/include/floatingpoint.h#3 delete .. //depot/projects/uart/alpha/include/fpu.h#3 delete .. //depot/projects/uart/alpha/include/frame.h#3 delete .. //depot/projects/uart/alpha/include/gdb_machdep.h#3 delete .. //depot/projects/uart/alpha/include/ieee.h#4 delete .. //depot/projects/uart/alpha/include/ieeefp.h#3 delete .. //depot/projects/uart/alpha/include/in_cksum.h#4 delete .. //depot/projects/uart/alpha/include/inst.h#2 delete .. //depot/projects/uart/alpha/include/intr.h#3 delete .. //depot/projects/uart/alpha/include/intrcnt.h#3 delete .. //depot/projects/uart/alpha/include/ioctl_bt848.h#4 delete .. //depot/projects/uart/alpha/include/ioctl_meteor.h#4 delete .. //depot/projects/uart/alpha/include/kdb.h#4 delete .. //depot/projects/uart/alpha/include/limits.h#5 delete .. //depot/projects/uart/alpha/include/md_var.h#3 delete .. //depot/projects/uart/alpha/include/memdev.h#2 delete .. //depot/projects/uart/alpha/include/mutex.h#2 delete .. //depot/projects/uart/alpha/include/pal.h#3 delete .. //depot/projects/uart/alpha/include/param.h#8 delete .. //depot/projects/uart/alpha/include/pc/bios.h#3 delete .. //depot/projects/uart/alpha/include/pc/display.h#2 delete .. //depot/projects/uart/alpha/include/pc/vesa.h#2 delete .. //depot/projects/uart/alpha/include/pcb.h#5 delete .. //depot/projects/uart/alpha/include/pcpu.h#4 delete .. //depot/projects/uart/alpha/include/pmap.h#6 delete .. //depot/projects/uart/alpha/include/pmc_mdep.h#3 delete .. //depot/projects/uart/alpha/include/ppireg.h#2 delete .. //depot/projects/uart/alpha/include/proc.h#4 delete .. //depot/projects/uart/alpha/include/profile.h#4 delete .. //depot/projects/uart/alpha/include/prom.h#3 delete .. //depot/projects/uart/alpha/include/pte.h#3 delete .. //depot/projects/uart/alpha/include/ptrace.h#4 delete .. //depot/projects/uart/alpha/include/reg.h#3 delete .. //depot/projects/uart/alpha/include/reloc.h#3 delete .. //depot/projects/uart/alpha/include/resource.h#3 delete .. //depot/projects/uart/alpha/include/rpb.h#3 delete .. //depot/projects/uart/alpha/include/runq.h#3 delete .. //depot/projects/uart/alpha/include/setjmp.h#2 delete .. //depot/projects/uart/alpha/include/sf_buf.h#2 delete .. //depot/projects/uart/alpha/include/sgmap.h#2 delete .. //depot/projects/uart/alpha/include/sigframe.h#2 delete .. //depot/projects/uart/alpha/include/signal.h#4 delete .. //depot/projects/uart/alpha/include/smp.h#5 delete .. //depot/projects/uart/alpha/include/stdarg.h#3 delete .. //depot/projects/uart/alpha/include/swiz.h#2 delete .. //depot/projects/uart/alpha/include/sysarch.h#3 delete .. //depot/projects/uart/alpha/include/timerreg.h#2 delete .. //depot/projects/uart/alpha/include/ucontext.h#3 delete .. //depot/projects/uart/alpha/include/varargs.h#4 delete .. //depot/projects/uart/alpha/include/vmparam.h#5 delete .. //depot/projects/uart/alpha/isa/isa.c#6 delete .. //depot/projects/uart/alpha/isa/isa_dma.c#7 delete .. //depot/projects/uart/alpha/isa/isavar.h#2 delete .. //depot/projects/uart/alpha/isa/mcclock_isa.c#5 delete .. //depot/projects/uart/alpha/linux/Makefile#2 delete .. //depot/projects/uart/alpha/linux/linux.h#3 delete .. //depot/projects/uart/alpha/linux/linux_dummy.c#5 delete .. //depot/projects/uart/alpha/linux/linux_genassym.c#3 delete .. //depot/projects/uart/alpha/linux/linux_ipc64.h#2 delete .. //depot/projects/uart/alpha/linux/linux_locore.s#2 delete .. //depot/projects/uart/alpha/linux/linux_machdep.c#7 delete .. //depot/projects/uart/alpha/linux/linux_proto.h#8 delete .. //depot/projects/uart/alpha/linux/linux_syscall.h#8 delete .. //depot/projects/uart/alpha/linux/linux_sysent.c#8 delete .. //depot/projects/uart/alpha/linux/linux_sysvec.c#10 delete .. //depot/projects/uart/alpha/linux/syscalls.conf#3 delete .. //depot/projects/uart/alpha/linux/syscalls.master#8 delete .. //depot/projects/uart/alpha/mcbus/mcbus.c#4 delete .. //depot/projects/uart/alpha/mcbus/mcbusreg.h#3 delete .. //depot/projects/uart/alpha/mcbus/mcbusvar.h#3 delete .. //depot/projects/uart/alpha/mcbus/mcmem.c#4 delete .. //depot/projects/uart/alpha/mcbus/mcpcia.c#6 delete .. //depot/projects/uart/alpha/mcbus/mcpciareg.h#3 delete .. //depot/projects/uart/alpha/mcbus/mcpciavar.h#3 delete .. //depot/projects/uart/alpha/osf1/Makefile#3 delete .. //depot/projects/uart/alpha/osf1/README.mach-traps#2 delete .. //depot/projects/uart/alpha/osf1/exec_ecoff.h#3 delete .. //depot/projects/uart/alpha/osf1/imgact_osf1.c#6 delete .. //depot/projects/uart/alpha/osf1/osf1.h#3 delete .. //depot/projects/uart/alpha/osf1/osf1_ioctl.c#6 delete .. //depot/projects/uart/alpha/osf1/osf1_misc.c#10 delete .. //depot/projects/uart/alpha/osf1/osf1_mount.c#8 delete .. //depot/projects/uart/alpha/osf1/osf1_proto.h#5 delete .. //depot/projects/uart/alpha/osf1/osf1_signal.c#7 delete .. //depot/projects/uart/alpha/osf1/osf1_signal.h#3 delete .. //depot/projects/uart/alpha/osf1/osf1_syscall.h#5 delete .. //depot/projects/uart/alpha/osf1/osf1_sysent.c#5 delete .. //depot/projects/uart/alpha/osf1/osf1_sysvec.c#5 delete .. //depot/projects/uart/alpha/osf1/osf1_util.h#3 delete .. //depot/projects/uart/alpha/osf1/syscalls.conf#3 delete .. //depot/projects/uart/alpha/osf1/syscalls.master#5 delete .. //depot/projects/uart/alpha/pci/alphapci_if.m#3 delete .. //depot/projects/uart/alpha/pci/apecs.c#6 delete .. //depot/projects/uart/alpha/pci/apecs_pci.c#4 delete .. //depot/projects/uart/alpha/pci/apecsreg.h#3 delete .. //depot/projects/uart/alpha/pci/apecsvar.h#2 delete .. //depot/projects/uart/alpha/pci/bwx.c#3 delete .. //depot/projects/uart/alpha/pci/cia.c#6 delete .. //depot/projects/uart/alpha/pci/cia_pci.c#4 delete .. //depot/projects/uart/alpha/pci/ciareg.h#3 delete .. //depot/projects/uart/alpha/pci/ciavar.h#2 delete .. //depot/projects/uart/alpha/pci/irongate.c#5 delete .. //depot/projects/uart/alpha/pci/irongate_pci.c#3 delete .. //depot/projects/uart/alpha/pci/irongatereg.h#2 delete .. //depot/projects/uart/alpha/pci/irongatevar.h#2 delete .. //depot/projects/uart/alpha/pci/lca.c#5 delete .. //depot/projects/uart/alpha/pci/lca_pci.c#4 delete .. //depot/projects/uart/alpha/pci/lcareg.h#4 delete .. //depot/projects/uart/alpha/pci/lcavar.h#2 delete .. //depot/projects/uart/alpha/pci/pci_eb164_intr.s#3 delete .. //depot/projects/uart/alpha/pci/pci_eb64plus_intr.s#3 delete .. //depot/projects/uart/alpha/pci/pcibus.c#8 delete .. //depot/projects/uart/alpha/pci/pcibus.h#2 delete .. //depot/projects/uart/alpha/pci/swiz.c#3 delete .. //depot/projects/uart/alpha/pci/t2.c#7 delete .. //depot/projects/uart/alpha/pci/t2_pci.c#3 delete .. //depot/projects/uart/alpha/pci/t2reg.h#3 delete .. //depot/projects/uart/alpha/pci/t2var.h#2 delete .. //depot/projects/uart/alpha/pci/tsunami.c#6 delete .. //depot/projects/uart/alpha/pci/tsunami_pci.c#5 delete .. //depot/projects/uart/alpha/pci/tsunamireg.h#2 delete .. //depot/projects/uart/alpha/pci/tsunamivar.h#2 delete .. //depot/projects/uart/alpha/tlsb/dwlpx.c#6 delete .. //depot/projects/uart/alpha/tlsb/dwlpxreg.h#3 delete .. //depot/projects/uart/alpha/tlsb/dwlpxvar.h#3 delete .. //depot/projects/uart/alpha/tlsb/gbus.c#4 delete .. //depot/projects/uart/alpha/tlsb/gbusreg.h#2 delete .. //depot/projects/uart/alpha/tlsb/gbusvar.h#2 delete .. //depot/projects/uart/alpha/tlsb/kftxx.c#4 delete .. //depot/projects/uart/alpha/tlsb/kftxxreg.h#3 delete .. //depot/projects/uart/alpha/tlsb/kftxxvar.h#2 delete .. //depot/projects/uart/alpha/tlsb/mcclock_tlsb.c#4 delete .. //depot/projects/uart/alpha/tlsb/tlsb.c#4 delete .. //depot/projects/uart/alpha/tlsb/tlsbcpu.c#4 delete .. //depot/projects/uart/alpha/tlsb/tlsbmem.c#4 delete .. //depot/projects/uart/alpha/tlsb/tlsbreg.h#3 delete .. //depot/projects/uart/alpha/tlsb/tlsbvar.h#3 delete .. //depot/projects/uart/alpha/tlsb/zs_tlsb.c#6 delete .. //depot/projects/uart/alpha/tlsb/zsreg.h#2 delete .. //depot/projects/uart/alpha/tlsb/zsvar.h#2 delete .. //depot/projects/uart/amd64/amd64/apic_vector.S#7 integrate .. //depot/projects/uart/amd64/amd64/busdma_machdep.c#14 integrate .. //depot/projects/uart/amd64/amd64/machdep.c#19 integrate .. //depot/projects/uart/amd64/amd64/mp_machdep.c#15 integrate .. //depot/projects/uart/amd64/amd64/pmap.c#37 integrate .. //depot/projects/uart/amd64/conf/GENERIC#19 integrate .. //depot/projects/uart/amd64/conf/NOTES#8 integrate .. //depot/projects/uart/amd64/include/apicvar.h#9 integrate .. //depot/projects/uart/amd64/include/cpu.h#6 integrate .. //depot/projects/uart/amd64/include/pmap.h#11 integrate .. //depot/projects/uart/amd64/include/smp.h#9 integrate .. //depot/projects/uart/amd64/include/specialreg.h#5 integrate .. //depot/projects/uart/amd64/linux32/linux32_dummy.c#2 integrate .. //depot/projects/uart/amd64/linux32/linux32_proto.h#6 integrate .. //depot/projects/uart/amd64/linux32/linux32_syscall.h#6 integrate .. //depot/projects/uart/amd64/linux32/linux32_sysent.c#6 integrate .. //depot/projects/uart/amd64/linux32/linux32_sysvec.c#10 integrate .. //depot/projects/uart/amd64/linux32/syscalls.master#6 integrate .. //depot/projects/uart/arm/arm/machdep.c#9 integrate .. //depot/projects/uart/arm/at91/at91_pdcreg.h#1 branch .. //depot/projects/uart/arm/at91/uart_bus_at91usart.c#2 integrate .. //depot/projects/uart/arm/include/cpu.h#5 integrate .. //depot/projects/uart/arm/xscale/i80321/iq80321.c#9 integrate .. //depot/projects/uart/boot/alpha/Makefile#2 delete .. //depot/projects/uart/boot/alpha/Makefile.inc#3 delete .. //depot/projects/uart/boot/alpha/boot1/Makefile#4 delete .. //depot/projects/uart/boot/alpha/boot1/boot1.c#2 delete .. //depot/projects/uart/boot/alpha/cdboot/Makefile#4 delete .. //depot/projects/uart/boot/alpha/cdboot/version#2 delete .. //depot/projects/uart/boot/alpha/common/Makefile.common#5 delete .. //depot/projects/uart/boot/alpha/common/conf.c#3 delete .. //depot/projects/uart/boot/alpha/common/help.alpha#3 delete .. //depot/projects/uart/boot/alpha/common/ldscript#2 delete .. //depot/projects/uart/boot/alpha/common/main.c#4 delete .. //depot/projects/uart/boot/alpha/libalpha/Makefile#3 delete .. //depot/projects/uart/boot/alpha/libalpha/OSFpal.c#3 delete .. //depot/projects/uart/boot/alpha/libalpha/alpha_copy.c#3 delete .. //depot/projects/uart/boot/alpha/libalpha/alpha_module.c#3 delete .. //depot/projects/uart/boot/alpha/libalpha/bbinfo.h#2 delete .. //depot/projects/uart/boot/alpha/libalpha/bootinfo.c#3 delete .. //depot/projects/uart/boot/alpha/libalpha/common.h#2 delete .. //depot/projects/uart/boot/alpha/libalpha/delay.c#4 delete .. //depot/projects/uart/boot/alpha/libalpha/devicename.c#4 delete .. //depot/projects/uart/boot/alpha/libalpha/elf_freebsd.c#3 delete .. //depot/projects/uart/boot/alpha/libalpha/getsecs.c#4 delete .. //depot/projects/uart/boot/alpha/libalpha/libalpha.h#3 delete .. //depot/projects/uart/boot/alpha/libalpha/pal.S#2 delete .. //depot/projects/uart/boot/alpha/libalpha/prom.c#3 delete .. //depot/projects/uart/boot/alpha/libalpha/prom_disp.S#2 delete .. //depot/projects/uart/boot/alpha/libalpha/prom_swpal.S#2 delete .. //depot/projects/uart/boot/alpha/libalpha/reboot.c#3 delete .. //depot/projects/uart/boot/alpha/libalpha/srmdisk.c#4 delete .. //depot/projects/uart/boot/alpha/libalpha/srmnet.c#3 delete .. //depot/projects/uart/boot/alpha/libalpha/start.S#2 delete .. //depot/projects/uart/boot/alpha/libalpha/time.c#3 delete .. //depot/projects/uart/boot/alpha/loader/Makefile#3 delete .. //depot/projects/uart/boot/alpha/loader/version#2 delete .. //depot/projects/uart/boot/alpha/netboot/Makefile#4 delete .. //depot/projects/uart/boot/alpha/netboot/version#2 delete .. //depot/projects/uart/boot/arc/Makefile#2 delete .. //depot/projects/uart/boot/arc/Makefile.inc#2 delete .. //depot/projects/uart/boot/arc/include/arcfuncs.h#4 delete .. //depot/projects/uart/boot/arc/include/arctypes.h#2 delete .. //depot/projects/uart/boot/arc/include/libarc.h#2 delete .. //depot/projects/uart/boot/arc/lib/Makefile#3 delete .. //depot/projects/uart/boot/arc/lib/abort.c#3 delete .. //depot/projects/uart/boot/arc/lib/arcconsole.c#3 delete .. //depot/projects/uart/boot/arc/lib/arcdisk.c#3 delete .. //depot/projects/uart/boot/arc/lib/arch/alpha/copy.c#2 delete .. //depot/projects/uart/boot/arc/lib/arch/alpha/rpb.c#2 delete .. //depot/projects/uart/boot/arc/lib/arch/alpha/setjmp.S#2 delete .. //depot/projects/uart/boot/arc/lib/arch/alpha/start.S#2 delete .. //depot/projects/uart/boot/arc/lib/bootinfo.c#3 delete .. //depot/projects/uart/boot/arc/lib/delay.c#3 delete .. //depot/projects/uart/boot/arc/lib/devicename.c#3 delete .. //depot/projects/uart/boot/arc/lib/elf_freebsd.c#3 delete .. //depot/projects/uart/boot/arc/lib/module.c#3 delete .. //depot/projects/uart/boot/arc/lib/prom.c#3 delete .. //depot/projects/uart/boot/arc/lib/setjmperr.c#3 delete .. //depot/projects/uart/boot/arc/lib/time.c#3 delete .. //depot/projects/uart/boot/arc/loader/Makefile#3 delete .. //depot/projects/uart/boot/arc/loader/conf.c#3 delete .. //depot/projects/uart/boot/arc/loader/help.alpha#2 delete .. //depot/projects/uart/boot/arc/loader/main.c#3 delete .. //depot/projects/uart/boot/arc/loader/version#2 delete .. //depot/projects/uart/boot/i386/boot0/boot0.S#6 integrate .. //depot/projects/uart/boot/pc98/boot2/io.c#6 integrate .. //depot/projects/uart/compat/linprocfs/linprocfs.c#15 integrate .. //depot/projects/uart/compat/linsysfs/linsysfs.c#1 branch .. //depot/projects/uart/compat/linux/linux_file.c#7 integrate .. //depot/projects/uart/compat/linux/linux_ioctl.c#10 integrate .. //depot/projects/uart/compat/linux/linux_ioctl.h#5 integrate .. //depot/projects/uart/compat/linux/linux_misc.c#15 integrate .. //depot/projects/uart/compat/linux/linux_signal.c#7 integrate .. //depot/projects/uart/compat/linux/linux_socket.c#12 integrate .. //depot/projects/uart/compat/linux/linux_stats.c#10 integrate .. //depot/projects/uart/compat/linux/linux_util.c#5 integrate .. //depot/projects/uart/compat/linux/linux_util.h#6 integrate .. //depot/projects/uart/conf/Makefile.alpha#6 delete .. //depot/projects/uart/conf/NOTES#36 integrate .. //depot/projects/uart/conf/files#67 integrate .. //depot/projects/uart/conf/files.alpha#17 delete .. //depot/projects/uart/conf/files.amd64#22 integrate .. //depot/projects/uart/conf/files.i386#27 integrate .. //depot/projects/uart/conf/files.pc98#23 integrate .. //depot/projects/uart/conf/kern.mk#6 integrate .. //depot/projects/uart/conf/ldscript.alpha#3 delete .. //depot/projects/uart/conf/options#34 integrate .. //depot/projects/uart/conf/options.alpha#7 delete .. //depot/projects/uart/conf/options.amd64#9 integrate .. //depot/projects/uart/conf/options.i386#14 integrate .. //depot/projects/uart/conf/options.pc98#13 integrate .. //depot/projects/uart/ddb/db_ps.c#10 integrate .. //depot/projects/uart/dev/acpica/acpi.c#22 integrate .. //depot/projects/uart/dev/acpica/acpi_pci.c#9 integrate .. //depot/projects/uart/dev/acpica/acpi_resource.c#11 integrate .. //depot/projects/uart/dev/advansys/advansys.c#6 integrate .. //depot/projects/uart/dev/amr/amr.c#15 integrate .. //depot/projects/uart/dev/amr/amr_linux.c#4 integrate .. //depot/projects/uart/dev/amr/amrvar.h#11 integrate .. //depot/projects/uart/dev/ata/ata-chipset.c#19 integrate .. //depot/projects/uart/dev/ath/if_ath.c#29 integrate .. //depot/projects/uart/dev/ath/if_ath_pci.c#9 integrate .. //depot/projects/uart/dev/ath/if_athvar.h#19 integrate .. //depot/projects/uart/dev/bce/if_bcereg.h#4 integrate .. //depot/projects/uart/dev/bfe/if_bfe.c#13 integrate .. //depot/projects/uart/dev/bfe/if_bfereg.h#5 integrate .. //depot/projects/uart/dev/dec/mc146818reg.h#3 delete .. //depot/projects/uart/dev/dec/mcclock.c#4 delete .. //depot/projects/uart/dev/dec/mcclock_if.m#3 delete .. //depot/projects/uart/dev/dec/mcclockvar.h#3 delete .. //depot/projects/uart/dev/ed/if_ed_pccard.c#13 integrate .. //depot/projects/uart/dev/hptmv/osbsd.h#5 integrate .. //depot/projects/uart/dev/hwpmc/hwpmc_alpha.c#2 delete .. //depot/projects/uart/dev/mpt/mpt.h#11 integrate .. //depot/projects/uart/dev/mpt/mpt_cam.c#13 integrate .. //depot/projects/uart/dev/mpt/mpt_pci.c#17 integrate .. //depot/projects/uart/dev/pccard/pccarddevs#18 integrate .. //depot/projects/uart/dev/pci/pci.c#23 integrate .. //depot/projects/uart/dev/rr232x/os_bsd.h#2 integrate .. //depot/projects/uart/dev/rr232x/osm_bsd.c#2 integrate .. //depot/projects/uart/dev/sk/if_sk.c#6 integrate .. //depot/projects/uart/dev/sk/if_skreg.h#4 integrate .. //depot/projects/uart/dev/sound/pci/ich.c#21 integrate .. //depot/projects/uart/dev/tga/tga_pci.c#8 delete .. //depot/projects/uart/dev/tga/tga_pci.h#3 delete .. //depot/projects/uart/dev/twa/tw_osl_cam.c#4 integrate .. //depot/projects/uart/dev/uart/uart_cpu_alpha.c#14 delete .. //depot/projects/uart/geom/raid3/g_raid3.c#18 integrate .. //depot/projects/uart/gnu/fs/xfs/FreeBSD/xfs_mountops.c#2 integrate .. //depot/projects/uart/i386/conf/GENERIC#18 integrate .. //depot/projects/uart/i386/conf/NOTES#19 integrate .. //depot/projects/uart/i386/conf/PAE#10 integrate .. //depot/projects/uart/i386/cpufreq/est.c#5 integrate .. //depot/projects/uart/i386/i386/apic_vector.s#5 integrate .. //depot/projects/uart/i386/i386/busdma_machdep.c#17 integrate .. //depot/projects/uart/i386/i386/machdep.c#22 integrate .. //depot/projects/uart/i386/i386/mp_machdep.c#23 integrate .. //depot/projects/uart/i386/i386/pmap.c#38 integrate .. //depot/projects/uart/i386/include/apicvar.h#9 integrate .. //depot/projects/uart/i386/include/cpu.h#6 integrate .. //depot/projects/uart/i386/include/pmap.h#10 integrate .. //depot/projects/uart/i386/include/smp.h#8 integrate .. //depot/projects/uart/i386/include/specialreg.h#5 integrate .. //depot/projects/uart/i386/linux/linux_dummy.c#4 integrate .. //depot/projects/uart/i386/linux/linux_proto.h#8 integrate .. //depot/projects/uart/i386/linux/linux_syscall.h#8 integrate .. //depot/projects/uart/i386/linux/linux_sysent.c#8 integrate .. //depot/projects/uart/i386/linux/linux_sysvec.c#12 integrate .. //depot/projects/uart/i386/linux/syscalls.master#8 integrate .. //depot/projects/uart/ia64/ia64/clock.c#6 integrate .. //depot/projects/uart/ia64/include/cpu.h#11 integrate .. //depot/projects/uart/kern/kern_exec.c#18 integrate .. //depot/projects/uart/kern/kern_sig.c#29 integrate .. //depot/projects/uart/kern/kern_umtx.c#13 integrate .. //depot/projects/uart/kern/subr_clock.c#4 integrate .. //depot/projects/uart/kern/tty_cons.c#8 integrate .. //depot/projects/uart/kern/vfs_aio.c#15 integrate .. //depot/projects/uart/kern/vfs_subr.c#29 integrate .. //depot/projects/uart/libkern/alpha/bswap16.S#3 delete .. //depot/projects/uart/libkern/alpha/bswap32.S#3 delete .. //depot/projects/uart/libkern/alpha/byte_swap_2.S#3 delete .. //depot/projects/uart/libkern/alpha/byte_swap_4.S#3 delete .. //depot/projects/uart/modules/Makefile#34 integrate .. //depot/projects/uart/modules/ath_hal/Makefile#5 integrate .. //depot/projects/uart/modules/linsysfs/Makefile#1 branch .. //depot/projects/uart/modules/linux/Makefile#7 integrate .. //depot/projects/uart/modules/rr232x/Makefile#3 integrate .. //depot/projects/uart/net/bpf.c#12 integrate .. //depot/projects/uart/net/if_gre.c#8 integrate .. //depot/projects/uart/net/route.c#8 integrate .. //depot/projects/uart/netinet/ip_fw2.c#20 integrate .. //depot/projects/uart/netinet/ip_input.c#16 integrate .. //depot/projects/uart/netinet/ip_ipsec.c#2 integrate .. //depot/projects/uart/netinet/tcp_timer.c#12 integrate .. //depot/projects/uart/netinet/udp_usrreq.c#17 integrate .. //depot/projects/uart/netinet6/frag6.c#8 integrate .. //depot/projects/uart/netinet6/ip6_forward.c#9 integrate .. //depot/projects/uart/netinet6/udp6_usrreq.c#12 integrate .. //depot/projects/uart/nfsclient/nfs_socket.c#11 integrate .. //depot/projects/uart/pc98/cbus/cbus.h#2 integrate .. //depot/projects/uart/pc98/cbus/fdc.c#4 integrate .. //depot/projects/uart/pc98/cbus/syscons_cbus.c#2 integrate .. //depot/projects/uart/pc98/conf/GENERIC#13 integrate .. //depot/projects/uart/pc98/conf/NOTES#16 integrate .. //depot/projects/uart/pc98/pc98/machdep.c#8 integrate .. //depot/projects/uart/pc98/pc98/pc98_machdep.c#5 integrate .. //depot/projects/uart/pc98/pc98/pc98_machdep.h#4 integrate .. //depot/projects/uart/powerpc/include/cpu.h#7 integrate .. //depot/projects/uart/powerpc/powerpc/clock.c#7 integrate .. //depot/projects/uart/sparc64/include/cpu.h#5 integrate .. //depot/projects/uart/sys/mount.h#17 integrate .. //depot/projects/uart/ufs/ffs/ffs_rawread.c#10 integrate .. //depot/projects/uart/ufs/ffs/ffs_snapshot.c#15 integrate .. //depot/projects/uart/ufs/ffs/ffs_softdep.c#19 integrate .. //depot/projects/uart/ufs/ffs/ffs_vfsops.c#23 integrate .. //depot/projects/uart/ufs/ffs/ffs_vnops.c#14 integrate .. //depot/projects/uart/ufs/ufs/ufs_inode.c#10 integrate .. //depot/projects/uart/ufs/ufs/ufs_quota.c#11 integrate .. //depot/projects/uart/vm/swap_pager.c#23 integrate Differences ... ==== //depot/projects/uart/amd64/amd64/apic_vector.S#7 (text+ko) ==== @@ -28,7 +28,7 @@ * SUCH DAMAGE. * * from: vector.s, 386BSD 0.1 unknown origin - * $FreeBSD: src/sys/amd64/amd64/apic_vector.S,v 1.108 2006/03/13 23:55:31 peter Exp $ + * $FreeBSD: src/sys/amd64/amd64/apic_vector.S,v 1.109 2006/05/01 21:36:46 jhb Exp $ */ /* @@ -171,6 +171,25 @@ iretq /* + * Invalidate cache. + */ + .text + SUPERALIGN_TEXT +IDTVEC(invlcache) + pushq %rax + + wbinvd + + movq lapic, %rax + movl $0, LA_EOI(%rax) /* End Of Interrupt to APIC */ + + lock + incl smp_tlb_wait + + popq %rax + iretq + +/* * Handler for IPIs sent via the per-cpu IPI bitmap. */ .text ==== //depot/projects/uart/amd64/amd64/busdma_machdep.c#14 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/busdma_machdep.c,v 1.73 2006/01/14 17:22:46 scottl Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/busdma_machdep.c,v 1.74 2006/05/03 04:14:17 scottl Exp $"); #include #include @@ -703,9 +703,10 @@ error = _bus_dmamap_load_buffer(dmat, map, buf, buflen, NULL, flags, &lastaddr, dmat->segments, &nsegs, 1); + CTR5(KTR_BUSDMA, "%s: tag %p tag flags 0x%x error %d nsegs %d", + __func__, dmat, dmat->flags, error, nsegs + 1); + if (error == EINPROGRESS) { - CTR4(KTR_BUSDMA, "%s: tag %p tag flags 0x%x error %d", - __func__, dmat, dmat->flags, error); return (error); } @@ -714,8 +715,13 @@ else (*callback)(callback_arg, dmat->segments, nsegs + 1, 0); - CTR4(KTR_BUSDMA, "%s: tag %p tag flags 0x%x error 0 nsegs %d", - __func__, dmat, dmat->flags, nsegs + 1); + /* + * Return ENOMEM to the caller so that it can pass it up the stack. + * This error only happens when NOWAIT is set, so deferal is disabled. + */ + if (error == ENOMEM) + return (error); + return (0); } ==== //depot/projects/uart/amd64/amd64/machdep.c#19 (text+ko) ==== @@ -39,7 +39,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/machdep.c,v 1.648 2006/03/14 16:13:54 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/machdep.c,v 1.649 2006/05/11 17:29:22 phk Exp $"); #include "opt_atalk.h" #include "opt_atpic.h" @@ -639,13 +639,13 @@ return (error); } -SYSCTL_PROC(_machdep, CPU_ADJKERNTZ, adjkerntz, CTLTYPE_INT|CTLFLAG_RW, +SYSCTL_PROC(_machdep, OID_AUTO, adjkerntz, CTLTYPE_INT|CTLFLAG_RW, &adjkerntz, 0, sysctl_machdep_adjkerntz, "I", ""); -SYSCTL_INT(_machdep, CPU_DISRTCSET, disable_rtc_set, +SYSCTL_INT(_machdep, OID_AUTO, disable_rtc_set, CTLFLAG_RW, &disable_rtc_set, 0, ""); -SYSCTL_INT(_machdep, CPU_WALLCLOCK, wall_cmos_clock, +SYSCTL_INT(_machdep, OID_AUTO, wall_cmos_clock, CTLFLAG_RW, &wall_cmos_clock, 0, ""); /* ==== //depot/projects/uart/amd64/amd64/mp_machdep.c#15 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/mp_machdep.c,v 1.273 2006/04/25 00:06:37 jkim Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/mp_machdep.c,v 1.275 2006/05/01 22:06:59 jhb Exp $"); #include "opt_cpu.h" #include "opt_kstack_pages.h" @@ -514,6 +514,9 @@ while (!aps_ready) ia32_pause(); + /* Initialize the PAT MSR. */ + pmap_init_pat(); + /* set up CPU registers and state */ cpu_setregs(); @@ -875,6 +878,14 @@ } void +smp_cache_flush(void) +{ + + if (smp_started) + smp_tlb_shootdown(IPI_INVLCACHE, 0, 0); +} + +void smp_invltlb(void) { ==== //depot/projects/uart/amd64/amd64/pmap.c#37 (text+ko) ==== @@ -77,7 +77,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.552 2006/04/29 00:59:15 alc Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.554 2006/05/01 22:06:59 jhb Exp $"); /* * Manages physical address maps. @@ -551,6 +551,51 @@ *CMAP1 = 0; invltlb(); + + /* Initialize the PAT MSR. */ + pmap_init_pat(); +} + +/* + * Setup the PAT MSR. + */ +void +pmap_init_pat(void) +{ + uint64_t pat_msr; + + /* Bail if this CPU doesn't implement PAT. */ + if (!(cpu_feature & CPUID_PAT)) + panic("no PAT??"); + +#ifdef PAT_WORKS + /* + * Leave the indices 0-3 at the default of WB, WT, UC, and UC-. + * Program 4 and 5 as WP and WC. + * Leave 6 and 7 as UC and UC-. + */ + pat_msr = rdmsr(MSR_PAT); + pat_msr &= ~(PAT_MASK(4) | PAT_MASK(5)); + pat_msr |= PAT_VALUE(4, PAT_WRITE_PROTECTED) | + PAT_VALUE(5, PAT_WRITE_COMBINING); +#else + /* + * Due to some Intel errata, we can only safely use the lower 4 + * PAT entries. Thus, just replace PAT Index 2 with WC instead + * of UC-. + * + * Intel Pentium III Processor Specification Update + * Errata E.27 (Upper Four PAT Entries Not Usable With Mode B + * or Mode C Paging) + * + * Intel Pentium IV Processor Specification Update + * Errata N46 (PAT Index MSB May Be Calculated Incorrectly) + */ + pat_msr = rdmsr(MSR_PAT); + pat_msr &= ~PAT_MASK(2); + pat_msr |= PAT_VALUE(2, PAT_WRITE_COMBINING); +#endif + wrmsr(MSR_PAT, pat_msr); } /* @@ -732,6 +777,30 @@ else critical_exit(); } + +void +pmap_invalidate_cache(void) +{ + + if (smp_started) { + if (!(read_rflags() & PSL_I)) + panic("%s: interrupts disabled", __func__); + mtx_lock_spin(&smp_ipi_mtx); + } else + critical_enter(); + /* + * We need to disable interrupt preemption but MUST NOT have + * interrupts disabled here. + * XXX we may need to hold schedlock to get a coherent pm_active + * XXX critical sections disable interrupts again + */ + wbinvd(); + smp_cache_flush(); + if (smp_started) + mtx_unlock_spin(&smp_ipi_mtx); + else + critical_exit(); +} #else /* !SMP */ /* * Normal, non-SMP, invalidation functions. @@ -762,6 +831,13 @@ if (pmap == kernel_pmap || pmap->pm_active) invltlb(); } + +PMAP_INLINE void +pmap_invalidate_cache(void) +{ + + wbinvd(); +} #endif /* !SMP */ /* ==== //depot/projects/uart/amd64/conf/GENERIC#19 (text+ko) ==== @@ -16,7 +16,7 @@ # If you are in doubt as to the purpose or necessity of a line, check first # in NOTES. # -# $FreeBSD: src/sys/amd64/conf/GENERIC,v 1.454 2006/04/28 05:23:10 scottl Exp $ +# $FreeBSD: src/sys/amd64/conf/GENERIC,v 1.456 2006/05/09 22:27:00 ambrisko Exp $ cpu HAMMER ident GENERIC @@ -75,6 +75,7 @@ # Linux 32-bit ABI support options COMPAT_LINUX32 # Compatible with i386 linux binaries options LINPROCFS # Cannot be a module yet. +options LINSYSFS # Bus support. device acpi @@ -230,7 +231,13 @@ # Wireless NIC cards device wlan # 802.11 support +device wlan_wep # 802.11 WEP support +device wlan_ccmp # 802.11 CCMP support +device wlan_tkip # 802.11 TKIP support device an # Aironet 4500/4800 802.11 wireless NICs. +device ath # Atheros pci/cardbus NIC's +device ath_hal # Atheros HAL (Hardware Access Layer) +device ath_rate_sample # SampleRate tx rate control for ath device awi # BayStack 660 and others device ral # Ralink Technology RT2500 wireless NICs. device wi # WaveLAN/Intersil/Symbol 802.11 wireless NICs. ==== //depot/projects/uart/amd64/conf/NOTES#8 (text+ko) ==== @@ -4,7 +4,7 @@ # This file contains machine dependent kernel configuration notes. For # machine independent notes, look in /sys/conf/NOTES. # -# $FreeBSD: src/sys/amd64/conf/NOTES,v 1.53 2006/04/28 05:23:10 scottl Exp $ +# $FreeBSD: src/sys/amd64/conf/NOTES,v 1.54 2006/05/09 22:27:00 ambrisko Exp $ # # @@ -507,6 +507,10 @@ # and PSEUDOFS) options LINPROCFS +#Enable the linux-like sys filesystem support (requires COMPAT_LINUX32 +# and PSEUDOFS) +options LINSYSFS + # # SysVR4 ABI emulation # ==== //depot/projects/uart/amd64/include/apicvar.h#9 (text+ko) ==== @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/amd64/include/apicvar.h,v 1.17 2006/02/28 22:24:54 jhb Exp $ + * $FreeBSD: src/sys/amd64/include/apicvar.h,v 1.18 2006/05/01 21:36:47 jhb Exp $ */ #ifndef _MACHINE_APICVAR_H_ @@ -118,8 +118,9 @@ #define IPI_INVLTLB (APIC_IPI_INTS + 1) /* TLB Shootdown IPIs */ #define IPI_INVLPG (APIC_IPI_INTS + 2) #define IPI_INVLRNG (APIC_IPI_INTS + 3) +#define IPI_INVLCACHE (APIC_IPI_INTS + 4) /* Vector to handle bitmap based IPIs */ -#define IPI_BITMAP_VECTOR (APIC_IPI_INTS + 5) +#define IPI_BITMAP_VECTOR (APIC_IPI_INTS + 6) /* IPIs handled by IPI_BITMAPED_VECTOR (XXX ups is there a better place?) */ #define IPI_AST 0 /* Generate software trap. */ @@ -127,7 +128,7 @@ #define IPI_BITMAP_LAST IPI_PREEMPT #define IPI_IS_BITMAPED(x) ((x) <= IPI_BITMAP_LAST) -#define IPI_STOP (APIC_IPI_INTS + 6) /* Stop CPU until restarted. */ +#define IPI_STOP (APIC_IPI_INTS + 7) /* Stop CPU until restarted. */ /* * The spurious interrupt can share the priority class with the IPIs since ==== //depot/projects/uart/amd64/include/cpu.h#6 (text+ko) ==== @@ -30,7 +30,7 @@ * SUCH DAMAGE. * * from: @(#)cpu.h 5.4 (Berkeley) 5/9/91 - * $FreeBSD: src/sys/amd64/include/cpu.h,v 1.75 2005/12/22 22:16:05 jhb Exp $ + * $FreeBSD: src/sys/amd64/include/cpu.h,v 1.76 2006/05/11 17:29:24 phk Exp $ */ #ifndef _MACHINE_CPU_H_ @@ -59,15 +59,6 @@ (ISPL((framep)->tf_cs) == SEL_UPL) #define TRAPF_PC(framep) ((framep)->tf_rip) -/* - * CTL_MACHDEP definitions. - */ -#define CPU_CONSDEV 1 /* dev_t: console terminal device */ -#define CPU_ADJKERNTZ 2 /* int: timezone offset (seconds) */ -#define CPU_DISRTCSET 3 /* int: disable resettodr() call */ -#define CPU_WALLCLOCK 5 /* int: indicates wall CMOS clock */ -#define CPU_MAXID 6 /* number of valid machdep ids */ - #ifdef _KERNEL extern char btext[]; extern char etext[]; ==== //depot/projects/uart/amd64/include/pmap.h#11 (text+ko) ==== @@ -39,7 +39,7 @@ * * from: hp300: @(#)pmap.h 7.2 (Berkeley) 12/16/90 * from: @(#)pmap.h 7.4 (Berkeley) 5/12/91 - * $FreeBSD: src/sys/amd64/include/pmap.h,v 1.130 2006/04/03 21:36:01 peter Exp $ + * $FreeBSD: src/sys/amd64/include/pmap.h,v 1.132 2006/05/01 22:07:00 jhb Exp $ */ #ifndef _MACHINE_PMAP_H_ @@ -58,10 +58,12 @@ #define PG_A 0x020 /* A Accessed */ #define PG_M 0x040 /* D Dirty */ #define PG_PS 0x080 /* PS Page size (0=4k,1=4M) */ +#define PG_PTE_PAT 0x080 /* PAT PAT index */ #define PG_G 0x100 /* G Global */ #define PG_AVAIL1 0x200 /* / Available for system */ #define PG_AVAIL2 0x400 /* < programmers use */ #define PG_AVAIL3 0x800 /* \ */ +#define PG_PDE_PAT 0x1000 /* PAT PAT index */ #define PG_NX (1ul<<63) /* No-execute */ @@ -300,6 +302,7 @@ #define pmap_page_is_mapped(m) (!TAILQ_EMPTY(&(m)->md.pv_list)) void pmap_bootstrap(vm_paddr_t *); +void pmap_init_pat(void); void pmap_kenter(vm_offset_t va, vm_paddr_t pa); void *pmap_kenter_temporary(vm_paddr_t pa, int i); vm_paddr_t pmap_kextract(vm_offset_t); @@ -309,6 +312,7 @@ void pmap_invalidate_page(pmap_t, vm_offset_t); void pmap_invalidate_range(pmap_t, vm_offset_t, vm_offset_t); void pmap_invalidate_all(pmap_t); +void pmap_invalidate_cache(void); #endif /* _KERNEL */ ==== //depot/projects/uart/amd64/include/smp.h#9 (text+ko) ==== @@ -6,7 +6,7 @@ * this stuff is worth it, you can buy me a beer in return. Poul-Henning Kamp * ---------------------------------------------------------------------------- * - * $FreeBSD: src/sys/amd64/include/smp.h,v 1.87 2005/12/22 22:16:05 jhb Exp $ + * $FreeBSD: src/sys/amd64/include/smp.h,v 1.88 2006/05/01 21:36:47 jhb Exp $ * */ @@ -40,6 +40,7 @@ IDTVEC(invltlb), /* TLB shootdowns - global */ IDTVEC(invlpg), /* TLB shootdowns - 1 page */ IDTVEC(invlrng), /* TLB shootdowns - page range */ + IDTVEC(invlcache), /* Write back and invalidate cache */ IDTVEC(ipi_intr_bitmap_handler), /* Bitmap based IPIs */ IDTVEC(cpustop), /* CPU stops & waits to be restarted */ IDTVEC(rendezvous); /* handle CPU rendezvous */ @@ -56,6 +57,7 @@ u_int mp_bootaddress(u_int); int mp_grab_cpu_hlt(void); void mp_topology(void); +void smp_cache_flush(void); void smp_invlpg(vm_offset_t addr); void smp_masked_invlpg(u_int mask, vm_offset_t addr); void smp_invlpg_range(vm_offset_t startva, vm_offset_t endva); ==== //depot/projects/uart/amd64/include/specialreg.h#5 (text+ko) ==== @@ -27,7 +27,7 @@ * SUCH DAMAGE. * * from: @(#)specialreg.h 7.1 (Berkeley) 5/9/91 - * $FreeBSD: src/sys/amd64/include/specialreg.h,v 1.32 2005/10/15 00:44:56 jkim Exp $ + * $FreeBSD: src/sys/amd64/include/specialreg.h,v 1.33 2006/05/01 22:07:00 jhb Exp $ */ #ifndef _MACHINE_SPECIALREG_H_ @@ -230,6 +230,18 @@ #define APICBASE_ADDRESS 0xfffff000 /* + * PAT modes. + */ +#define PAT_UNCACHEABLE 0x00 +#define PAT_WRITE_COMBINING 0x01 +#define PAT_WRITE_THROUGH 0x04 +#define PAT_WRITE_PROTECTED 0x05 +#define PAT_WRITE_BACK 0x06 +#define PAT_UNCACHED 0x07 +#define PAT_VALUE(i, m) ((long)(m) << (8 * (i))) +#define PAT_MASK(i) PAT_VALUE(i, 0xff) + +/* * Constants related to MTRRs */ #define MTRR_N64K 8 /* numbers of fixed-size entries */ ==== //depot/projects/uart/amd64/linux32/linux32_dummy.c#2 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/linux32/linux32_dummy.c,v 1.1 2004/08/16 07:55:06 tjr Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/linux32/linux32_dummy.c,v 1.2 2006/05/10 18:17:28 netchild Exp $"); #include #include @@ -54,7 +54,6 @@ DUMMY(query_module); DUMMY(nfsservctl); DUMMY(prctl); -DUMMY(rt_sigpending); DUMMY(rt_sigtimedwait); DUMMY(rt_sigqueueinfo); DUMMY(capget); ==== //depot/projects/uart/amd64/linux32/linux32_proto.h#6 (text+ko) ==== @@ -2,8 +2,8 @@ * System call prototypes. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/amd64/linux32/linux32_proto.h,v 1.10 2006/03/20 18:54:29 netchild Exp $ - * created from FreeBSD: src/sys/amd64/linux32/syscalls.master,v 1.8 2006/03/20 18:53:26 netchild Exp + * $FreeBSD: src/sys/amd64/linux32/linux32_proto.h,v 1.11 2006/05/10 18:19:51 netchild Exp $ + * created from FreeBSD: src/sys/amd64/linux32/syscalls.master,v 1.9 2006/05/10 18:17:28 netchild Exp */ #ifndef _LINUX_SYSPROTO_H_ @@ -534,7 +534,8 @@ char sigsetsize_l_[PADL_(l_size_t)]; l_size_t sigsetsize; char sigsetsize_r_[PADR_(l_size_t)]; }; struct linux_rt_sigpending_args { - register_t dummy; + char set_l_[PADL_(l_sigset_t *)]; l_sigset_t * set; char set_r_[PADR_(l_sigset_t *)]; + char sigsetsize_l_[PADL_(l_size_t)]; l_size_t sigsetsize; char sigsetsize_r_[PADR_(l_size_t)]; }; struct linux_rt_sigtimedwait_args { register_t dummy; ==== //depot/projects/uart/amd64/linux32/linux32_syscall.h#6 (text+ko) ==== @@ -2,8 +2,8 @@ * System call numbers. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/amd64/linux32/linux32_syscall.h,v 1.10 2006/03/20 18:54:29 netchild Exp $ - * created from FreeBSD: src/sys/amd64/linux32/syscalls.master,v 1.8 2006/03/20 18:53:26 netchild Exp + * $FreeBSD: src/sys/amd64/linux32/linux32_syscall.h,v 1.11 2006/05/10 18:19:51 netchild Exp $ + * created from FreeBSD: src/sys/amd64/linux32/syscalls.master,v 1.9 2006/05/10 18:17:28 netchild Exp */ #define LINUX_SYS_exit 1 ==== //depot/projects/uart/amd64/linux32/linux32_sysent.c#6 (text+ko) ==== @@ -2,8 +2,8 @@ * System call switch table. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/amd64/linux32/linux32_sysent.c,v 1.10 2006/03/20 18:54:29 netchild Exp $ - * created from FreeBSD: src/sys/amd64/linux32/syscalls.master,v 1.8 2006/03/20 18:53:26 netchild Exp + * $FreeBSD: src/sys/amd64/linux32/linux32_sysent.c,v 1.11 2006/05/10 18:19:51 netchild Exp $ + * created from FreeBSD: src/sys/amd64/linux32/syscalls.master,v 1.9 2006/05/10 18:17:28 netchild Exp */ #include @@ -196,7 +196,7 @@ { SYF_MPSAFE | AS(linux_rt_sigreturn_args), (sy_call_t *)linux_rt_sigreturn, AUE_NULL }, /* 173 = linux_rt_sigreturn */ { SYF_MPSAFE | AS(linux_rt_sigaction_args), (sy_call_t *)linux_rt_sigaction, AUE_NULL }, /* 174 = linux_rt_sigaction */ { SYF_MPSAFE | AS(linux_rt_sigprocmask_args), (sy_call_t *)linux_rt_sigprocmask, AUE_NULL }, /* 175 = linux_rt_sigprocmask */ >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Fri May 12 00:16:49 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id CAE3816A405; Fri, 12 May 2006 00:16:49 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 9C79416A402 for ; Fri, 12 May 2006 00:16:49 +0000 (UTC) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 41E6544018 for ; Fri, 12 May 2006 00:16:49 +0000 (GMT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k4C0GnKJ053936 for ; Fri, 12 May 2006 00:16:49 GMT (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k4C0Gmn3053933 for perforce@freebsd.org; Fri, 12 May 2006 00:16:48 GMT (envelope-from marcel@freebsd.org) Date: Fri, 12 May 2006 00:16:48 GMT Message-Id: <200605120016.k4C0Gmn3053933@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Cc: Subject: PERFORCE change 96986 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 12 May 2006 00:16:50 -0000 http://perforce.freebsd.org/chv.cgi?CH=96986 Change 96986 by marcel@marcel_nfs on 2006/05/12 00:16:11 IFC @96983 Affected files ... .. //depot/projects/tty/MAINTAINERS#18 integrate .. //depot/projects/tty/Makefile#16 integrate .. //depot/projects/tty/UPDATING#28 integrate .. //depot/projects/tty/bin/pax/pax.1#5 integrate .. //depot/projects/tty/contrib/traceroute/traceroute.8#3 integrate .. //depot/projects/tty/contrib/traceroute/traceroute.c#5 integrate .. //depot/projects/tty/etc/Makefile#18 integrate .. //depot/projects/tty/etc/defaults/rc.conf#19 integrate .. //depot/projects/tty/etc/mtree/BSD.root.dist#12 integrate .. //depot/projects/tty/etc/nsswitch.conf#1 branch .. //depot/projects/tty/etc/rc.d/jail#11 integrate .. //depot/projects/tty/etc/rc.d/nsswitch#5 integrate .. //depot/projects/tty/games/fortune/datfiles/fortunes#22 integrate .. //depot/projects/tty/lib/libc/gen/syslog.c#7 integrate .. //depot/projects/tty/lib/libc/i386/sys/i386_set_watch.3#3 integrate .. //depot/projects/tty/lib/libc/net/nscachedcli.c#2 integrate .. //depot/projects/tty/lib/libc/stdlib/malloc.c#14 integrate .. //depot/projects/tty/lib/libpthread/arch/i386/i386/thr_getcontext.S#4 integrate .. //depot/projects/tty/lib/libthr/pthread.map#6 integrate .. //depot/projects/tty/release/doc/en_US.ISO8859-1/hardware/common/artheader.sgml#4 integrate .. //depot/projects/tty/release/doc/en_US.ISO8859-1/installation/common/artheader.sgml#4 integrate .. //depot/projects/tty/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#33 integrate .. //depot/projects/tty/sbin/adjkerntz/adjkerntz.c#4 integrate .. //depot/projects/tty/sbin/dhclient/dhclient.c#5 integrate .. //depot/projects/tty/sbin/ipf/ipf/Makefile#5 integrate .. //depot/projects/tty/sbin/mount/mount.c#11 integrate .. //depot/projects/tty/share/man/man4/fdc.4#4 integrate .. //depot/projects/tty/share/man/man5/Makefile#13 integrate .. //depot/projects/tty/share/man/man5/linsysfs.5#1 branch .. //depot/projects/tty/share/man/man5/rc.conf.5#25 integrate .. //depot/projects/tty/share/man/man7/hier.7#11 integrate .. //depot/projects/tty/share/man/man9/make_dev.9#8 integrate .. //depot/projects/tty/share/misc/bsd-family-tree#18 integrate .. //depot/projects/tty/share/zoneinfo/africa#4 integrate .. //depot/projects/tty/share/zoneinfo/antarctica#5 integrate .. //depot/projects/tty/share/zoneinfo/asia#7 integrate .. //depot/projects/tty/share/zoneinfo/australasia#6 integrate .. //depot/projects/tty/share/zoneinfo/backward#6 integrate .. //depot/projects/tty/share/zoneinfo/etcetera#3 integrate .. //depot/projects/tty/share/zoneinfo/europe#7 integrate .. //depot/projects/tty/share/zoneinfo/factory#2 integrate .. //depot/projects/tty/share/zoneinfo/leapseconds#5 integrate .. //depot/projects/tty/share/zoneinfo/northamerica#7 integrate .. //depot/projects/tty/share/zoneinfo/southamerica#7 integrate .. //depot/projects/tty/share/zoneinfo/systemv#3 integrate .. //depot/projects/tty/share/zoneinfo/yearistype.sh#3 integrate .. //depot/projects/tty/share/zoneinfo/zone.tab#7 integrate .. //depot/projects/tty/sys/alpha/Makefile#2 delete .. //depot/projects/tty/sys/alpha/alpha/api_up1000.c#4 delete .. //depot/projects/tty/sys/alpha/alpha/atomic.s#2 delete .. //depot/projects/tty/sys/alpha/alpha/autoconf.c#7 delete .. //depot/projects/tty/sys/alpha/alpha/busdma_machdep.c#14 delete .. //depot/projects/tty/sys/alpha/alpha/busspace.c#3 delete .. //depot/projects/tty/sys/alpha/alpha/clock.c#12 delete .. //depot/projects/tty/sys/alpha/alpha/clock_if.m#3 delete .. //depot/projects/tty/sys/alpha/alpha/cpuconf.c#5 delete .. //depot/projects/tty/sys/alpha/alpha/db_disasm.c#5 delete .. //depot/projects/tty/sys/alpha/alpha/db_instruction.h#4 delete .. //depot/projects/tty/sys/alpha/alpha/db_interface.c#5 delete .. //depot/projects/tty/sys/alpha/alpha/db_trace.c#10 delete .. //depot/projects/tty/sys/alpha/alpha/dec_1000a.c#5 delete .. //depot/projects/tty/sys/alpha/alpha/dec_2100_a50.c#5 delete .. //depot/projects/tty/sys/alpha/alpha/dec_2100_a500.c#6 delete .. //depot/projects/tty/sys/alpha/alpha/dec_3000_300.c#4 delete .. //depot/projects/tty/sys/alpha/alpha/dec_3000_500.c#4 delete .. //depot/projects/tty/sys/alpha/alpha/dec_axppci_33.c#5 delete .. //depot/projects/tty/sys/alpha/alpha/dec_eb164.c#5 delete .. //depot/projects/tty/sys/alpha/alpha/dec_eb64plus.c#5 delete .. //depot/projects/tty/sys/alpha/alpha/dec_kn20aa.c#6 delete .. //depot/projects/tty/sys/alpha/alpha/dec_kn300.c#5 delete .. //depot/projects/tty/sys/alpha/alpha/dec_kn8ae.c#5 delete .. //depot/projects/tty/sys/alpha/alpha/dec_st550.c#5 delete .. //depot/projects/tty/sys/alpha/alpha/dec_st6600.c#4 delete .. //depot/projects/tty/sys/alpha/alpha/divrem.m4#3 delete .. //depot/projects/tty/sys/alpha/alpha/dump_machdep.c#4 delete .. //depot/projects/tty/sys/alpha/alpha/elf_machdep.c#7 delete .. //depot/projects/tty/sys/alpha/alpha/exception.s#4 delete .. //depot/projects/tty/sys/alpha/alpha/fp_emulate.c#5 delete .. //depot/projects/tty/sys/alpha/alpha/gdb_machdep.c#3 delete .. //depot/projects/tty/sys/alpha/alpha/genassym.c#6 delete .. //depot/projects/tty/sys/alpha/alpha/ieee_float.c#4 delete .. //depot/projects/tty/sys/alpha/alpha/ieee_float.h#2 delete .. //depot/projects/tty/sys/alpha/alpha/in_cksum.c#4 delete .. //depot/projects/tty/sys/alpha/alpha/interrupt.c#11 delete .. //depot/projects/tty/sys/alpha/alpha/locore.s#3 delete .. //depot/projects/tty/sys/alpha/alpha/machdep.c#14 delete .. //depot/projects/tty/sys/alpha/alpha/mem.c#8 delete .. //depot/projects/tty/sys/alpha/alpha/mp_machdep.c#10 delete .. //depot/projects/tty/sys/alpha/alpha/pal.s#3 delete .. //depot/projects/tty/sys/alpha/alpha/pmap.c#17 delete .. //depot/projects/tty/sys/alpha/alpha/prom.c#5 delete .. //depot/projects/tty/sys/alpha/alpha/prom_disp.s#3 delete .. //depot/projects/tty/sys/alpha/alpha/promcons.c#10 delete .. //depot/projects/tty/sys/alpha/alpha/sgmap.c#5 delete .. //depot/projects/tty/sys/alpha/alpha/support.s#7 delete .. //depot/projects/tty/sys/alpha/alpha/swtch.s#3 delete .. //depot/projects/tty/sys/alpha/alpha/sys_machdep.c#7 delete .. //depot/projects/tty/sys/alpha/alpha/trap.c#14 delete .. //depot/projects/tty/sys/alpha/alpha/uio_machdep.c#3 delete .. //depot/projects/tty/sys/alpha/alpha/uma_machdep.c#2 delete .. //depot/projects/tty/sys/alpha/alpha/vm_machdep.c#11 delete .. //depot/projects/tty/sys/alpha/compile/.cvsignore#2 delete .. //depot/projects/tty/sys/alpha/conf/.cvsignore#2 delete .. //depot/projects/tty/sys/alpha/conf/DEFAULTS#3 delete .. //depot/projects/tty/sys/alpha/conf/GENERIC#20 delete .. //depot/projects/tty/sys/alpha/conf/GENERIC.hints#6 delete .. //depot/projects/tty/sys/alpha/conf/MAC#2 delete .. //depot/projects/tty/sys/alpha/conf/Makefile#3 delete .. //depot/projects/tty/sys/alpha/conf/NOTES#9 delete .. //depot/projects/tty/sys/alpha/include/_bus.h#2 delete .. //depot/projects/tty/sys/alpha/include/_inttypes.h#2 delete .. //depot/projects/tty/sys/alpha/include/_limits.h#7 delete .. //depot/projects/tty/sys/alpha/include/_stdint.h#3 delete .. //depot/projects/tty/sys/alpha/include/_types.h#7 delete .. //depot/projects/tty/sys/alpha/include/alpha_cpu.h#4 delete .. //depot/projects/tty/sys/alpha/include/asm.h#3 delete .. //depot/projects/tty/sys/alpha/include/atomic.h#7 delete .. //depot/projects/tty/sys/alpha/include/bootinfo.h#3 delete .. //depot/projects/tty/sys/alpha/include/bus.h#11 delete .. //depot/projects/tty/sys/alpha/include/bus_dma.h#2 delete .. //depot/projects/tty/sys/alpha/include/bwx.h#2 delete .. //depot/projects/tty/sys/alpha/include/chipset.h#3 delete .. //depot/projects/tty/sys/alpha/include/clock.h#3 delete .. //depot/projects/tty/sys/alpha/include/clockvar.h#3 delete .. //depot/projects/tty/sys/alpha/include/cpu.h#8 delete .. //depot/projects/tty/sys/alpha/include/cpuconf.h#4 delete .. //depot/projects/tty/sys/alpha/include/cpufunc.h#3 delete .. //depot/projects/tty/sys/alpha/include/db_machdep.h#6 delete .. //depot/projects/tty/sys/alpha/include/elf.h#3 delete .. //depot/projects/tty/sys/alpha/include/endian.h#5 delete .. //depot/projects/tty/sys/alpha/include/exec.h#4 delete .. //depot/projects/tty/sys/alpha/include/float.h#5 delete .. //depot/projects/tty/sys/alpha/include/floatingpoint.h#3 delete .. //depot/projects/tty/sys/alpha/include/fpu.h#3 delete .. //depot/projects/tty/sys/alpha/include/frame.h#3 delete .. //depot/projects/tty/sys/alpha/include/gdb_machdep.h#3 delete .. //depot/projects/tty/sys/alpha/include/ieee.h#4 delete .. //depot/projects/tty/sys/alpha/include/ieeefp.h#3 delete .. //depot/projects/tty/sys/alpha/include/in_cksum.h#4 delete .. //depot/projects/tty/sys/alpha/include/inst.h#2 delete .. //depot/projects/tty/sys/alpha/include/intr.h#3 delete .. //depot/projects/tty/sys/alpha/include/intrcnt.h#3 delete .. //depot/projects/tty/sys/alpha/include/ioctl_bt848.h#4 delete .. //depot/projects/tty/sys/alpha/include/ioctl_meteor.h#4 delete .. //depot/projects/tty/sys/alpha/include/kdb.h#4 delete .. //depot/projects/tty/sys/alpha/include/limits.h#7 delete .. //depot/projects/tty/sys/alpha/include/md_var.h#3 delete .. //depot/projects/tty/sys/alpha/include/memdev.h#2 delete .. //depot/projects/tty/sys/alpha/include/mutex.h#2 delete .. //depot/projects/tty/sys/alpha/include/pal.h#3 delete .. //depot/projects/tty/sys/alpha/include/param.h#9 delete .. //depot/projects/tty/sys/alpha/include/pc/bios.h#3 delete .. //depot/projects/tty/sys/alpha/include/pc/display.h#2 delete .. //depot/projects/tty/sys/alpha/include/pc/vesa.h#2 delete .. //depot/projects/tty/sys/alpha/include/pcb.h#5 delete .. //depot/projects/tty/sys/alpha/include/pcpu.h#4 delete .. //depot/projects/tty/sys/alpha/include/pmap.h#10 delete .. //depot/projects/tty/sys/alpha/include/pmc_mdep.h#3 delete .. //depot/projects/tty/sys/alpha/include/ppireg.h#2 delete .. //depot/projects/tty/sys/alpha/include/proc.h#5 delete .. //depot/projects/tty/sys/alpha/include/profile.h#5 delete .. //depot/projects/tty/sys/alpha/include/prom.h#4 delete .. //depot/projects/tty/sys/alpha/include/pte.h#3 delete .. //depot/projects/tty/sys/alpha/include/ptrace.h#5 delete .. //depot/projects/tty/sys/alpha/include/reg.h#3 delete .. //depot/projects/tty/sys/alpha/include/reloc.h#3 delete .. //depot/projects/tty/sys/alpha/include/resource.h#3 delete .. //depot/projects/tty/sys/alpha/include/rpb.h#3 delete .. //depot/projects/tty/sys/alpha/include/runq.h#3 delete .. //depot/projects/tty/sys/alpha/include/setjmp.h#2 delete .. //depot/projects/tty/sys/alpha/include/sf_buf.h#3 delete .. //depot/projects/tty/sys/alpha/include/sgmap.h#2 delete .. //depot/projects/tty/sys/alpha/include/sigframe.h#2 delete .. //depot/projects/tty/sys/alpha/include/signal.h#4 delete .. //depot/projects/tty/sys/alpha/include/smp.h#4 delete .. //depot/projects/tty/sys/alpha/include/stdarg.h#3 delete .. //depot/projects/tty/sys/alpha/include/swiz.h#2 delete .. //depot/projects/tty/sys/alpha/include/sysarch.h#3 delete .. //depot/projects/tty/sys/alpha/include/timerreg.h#3 delete .. //depot/projects/tty/sys/alpha/include/ucontext.h#3 delete .. //depot/projects/tty/sys/alpha/include/varargs.h#4 delete .. //depot/projects/tty/sys/alpha/include/vmparam.h#5 delete .. //depot/projects/tty/sys/alpha/isa/isa.c#9 delete .. //depot/projects/tty/sys/alpha/isa/isa_dma.c#7 delete .. //depot/projects/tty/sys/alpha/isa/isavar.h#2 delete .. //depot/projects/tty/sys/alpha/isa/mcclock_isa.c#5 delete .. //depot/projects/tty/sys/alpha/linux/Makefile#2 delete .. //depot/projects/tty/sys/alpha/linux/linux.h#5 delete .. //depot/projects/tty/sys/alpha/linux/linux_dummy.c#5 delete .. //depot/projects/tty/sys/alpha/linux/linux_genassym.c#3 delete .. //depot/projects/tty/sys/alpha/linux/linux_ipc64.h#2 delete .. //depot/projects/tty/sys/alpha/linux/linux_locore.s#2 delete .. //depot/projects/tty/sys/alpha/linux/linux_machdep.c#10 delete .. //depot/projects/tty/sys/alpha/linux/linux_proto.h#11 delete .. //depot/projects/tty/sys/alpha/linux/linux_syscall.h#11 delete .. //depot/projects/tty/sys/alpha/linux/linux_sysent.c#11 delete .. //depot/projects/tty/sys/alpha/linux/linux_sysvec.c#12 delete .. //depot/projects/tty/sys/alpha/linux/syscalls.conf#3 delete .. //depot/projects/tty/sys/alpha/linux/syscalls.master#12 delete .. //depot/projects/tty/sys/alpha/mcbus/mcbus.c#4 delete .. //depot/projects/tty/sys/alpha/mcbus/mcbusreg.h#3 delete .. //depot/projects/tty/sys/alpha/mcbus/mcbusvar.h#3 delete .. //depot/projects/tty/sys/alpha/mcbus/mcmem.c#4 delete .. //depot/projects/tty/sys/alpha/mcbus/mcpcia.c#8 delete .. //depot/projects/tty/sys/alpha/mcbus/mcpciareg.h#3 delete .. //depot/projects/tty/sys/alpha/mcbus/mcpciavar.h#3 delete .. //depot/projects/tty/sys/alpha/osf1/Makefile#3 delete .. //depot/projects/tty/sys/alpha/osf1/README.mach-traps#2 delete .. //depot/projects/tty/sys/alpha/osf1/exec_ecoff.h#3 delete .. //depot/projects/tty/sys/alpha/osf1/imgact_osf1.c#7 delete .. //depot/projects/tty/sys/alpha/osf1/osf1.h#3 delete .. //depot/projects/tty/sys/alpha/osf1/osf1_ioctl.c#6 delete .. //depot/projects/tty/sys/alpha/osf1/osf1_misc.c#13 delete .. //depot/projects/tty/sys/alpha/osf1/osf1_mount.c#10 delete .. //depot/projects/tty/sys/alpha/osf1/osf1_proto.h#7 delete .. //depot/projects/tty/sys/alpha/osf1/osf1_signal.c#10 delete .. //depot/projects/tty/sys/alpha/osf1/osf1_signal.h#3 delete .. //depot/projects/tty/sys/alpha/osf1/osf1_syscall.h#7 delete .. //depot/projects/tty/sys/alpha/osf1/osf1_sysent.c#7 delete .. //depot/projects/tty/sys/alpha/osf1/osf1_sysvec.c#5 delete .. //depot/projects/tty/sys/alpha/osf1/osf1_util.h#3 delete .. //depot/projects/tty/sys/alpha/osf1/syscalls.conf#3 delete .. //depot/projects/tty/sys/alpha/osf1/syscalls.master#7 delete .. //depot/projects/tty/sys/alpha/pci/alphapci_if.m#3 delete .. //depot/projects/tty/sys/alpha/pci/apecs.c#8 delete .. //depot/projects/tty/sys/alpha/pci/apecs_pci.c#4 delete .. //depot/projects/tty/sys/alpha/pci/apecsreg.h#3 delete .. //depot/projects/tty/sys/alpha/pci/apecsvar.h#2 delete .. //depot/projects/tty/sys/alpha/pci/bwx.c#3 delete .. //depot/projects/tty/sys/alpha/pci/cia.c#7 delete .. //depot/projects/tty/sys/alpha/pci/cia_pci.c#4 delete .. //depot/projects/tty/sys/alpha/pci/ciareg.h#3 delete .. //depot/projects/tty/sys/alpha/pci/ciavar.h#2 delete .. //depot/projects/tty/sys/alpha/pci/irongate.c#4 delete .. //depot/projects/tty/sys/alpha/pci/irongate_pci.c#3 delete .. //depot/projects/tty/sys/alpha/pci/irongatereg.h#2 delete .. //depot/projects/tty/sys/alpha/pci/irongatevar.h#2 delete .. //depot/projects/tty/sys/alpha/pci/lca.c#5 delete .. //depot/projects/tty/sys/alpha/pci/lca_pci.c#4 delete .. //depot/projects/tty/sys/alpha/pci/lcareg.h#3 delete .. //depot/projects/tty/sys/alpha/pci/lcavar.h#2 delete .. //depot/projects/tty/sys/alpha/pci/pci_eb164_intr.s#3 delete .. //depot/projects/tty/sys/alpha/pci/pci_eb64plus_intr.s#3 delete .. //depot/projects/tty/sys/alpha/pci/pcibus.c#7 delete .. //depot/projects/tty/sys/alpha/pci/pcibus.h#2 delete .. //depot/projects/tty/sys/alpha/pci/swiz.c#3 delete .. //depot/projects/tty/sys/alpha/pci/t2.c#7 delete .. //depot/projects/tty/sys/alpha/pci/t2_pci.c#3 delete .. //depot/projects/tty/sys/alpha/pci/t2reg.h#3 delete .. //depot/projects/tty/sys/alpha/pci/t2var.h#2 delete .. //depot/projects/tty/sys/alpha/pci/tsunami.c#6 delete .. //depot/projects/tty/sys/alpha/pci/tsunami_pci.c#5 delete .. //depot/projects/tty/sys/alpha/pci/tsunamireg.h#2 delete .. //depot/projects/tty/sys/alpha/pci/tsunamivar.h#2 delete .. //depot/projects/tty/sys/alpha/tlsb/dwlpx.c#7 delete .. //depot/projects/tty/sys/alpha/tlsb/dwlpxreg.h#3 delete .. //depot/projects/tty/sys/alpha/tlsb/dwlpxvar.h#3 delete .. //depot/projects/tty/sys/alpha/tlsb/gbus.c#4 delete .. //depot/projects/tty/sys/alpha/tlsb/gbusreg.h#2 delete .. //depot/projects/tty/sys/alpha/tlsb/gbusvar.h#2 delete .. //depot/projects/tty/sys/alpha/tlsb/kftxx.c#4 delete .. //depot/projects/tty/sys/alpha/tlsb/kftxxreg.h#3 delete .. //depot/projects/tty/sys/alpha/tlsb/kftxxvar.h#2 delete .. //depot/projects/tty/sys/alpha/tlsb/mcclock_tlsb.c#4 delete .. //depot/projects/tty/sys/alpha/tlsb/tlsb.c#5 delete .. //depot/projects/tty/sys/alpha/tlsb/tlsbcpu.c#4 delete .. //depot/projects/tty/sys/alpha/tlsb/tlsbmem.c#4 delete .. //depot/projects/tty/sys/alpha/tlsb/tlsbreg.h#3 delete .. //depot/projects/tty/sys/alpha/tlsb/tlsbvar.h#3 delete .. //depot/projects/tty/sys/alpha/tlsb/zs_tlsb.c#10 delete .. //depot/projects/tty/sys/alpha/tlsb/zsreg.h#2 delete .. //depot/projects/tty/sys/alpha/tlsb/zsvar.h#2 delete .. //depot/projects/tty/sys/amd64/amd64/apic_vector.S#10 integrate .. //depot/projects/tty/sys/amd64/amd64/busdma_machdep.c#11 integrate .. //depot/projects/tty/sys/amd64/amd64/machdep.c#18 integrate .. //depot/projects/tty/sys/amd64/amd64/mp_machdep.c#16 integrate .. //depot/projects/tty/sys/amd64/amd64/pmap.c#17 integrate .. //depot/projects/tty/sys/amd64/conf/GENERIC#18 integrate .. //depot/projects/tty/sys/amd64/conf/NOTES#13 integrate .. //depot/projects/tty/sys/amd64/include/apicvar.h#10 integrate .. //depot/projects/tty/sys/amd64/include/cpu.h#7 integrate .. //depot/projects/tty/sys/amd64/include/pmap.h#13 integrate .. //depot/projects/tty/sys/amd64/include/smp.h#9 integrate .. //depot/projects/tty/sys/amd64/include/specialreg.h#8 integrate .. //depot/projects/tty/sys/amd64/linux32/linux32_dummy.c#2 integrate .. //depot/projects/tty/sys/amd64/linux32/linux32_proto.h#7 integrate .. //depot/projects/tty/sys/amd64/linux32/linux32_syscall.h#7 integrate .. //depot/projects/tty/sys/amd64/linux32/linux32_sysent.c#7 integrate .. //depot/projects/tty/sys/amd64/linux32/linux32_sysvec.c#8 integrate .. //depot/projects/tty/sys/amd64/linux32/syscalls.master#7 integrate .. //depot/projects/tty/sys/arm/arm/machdep.c#8 integrate .. //depot/projects/tty/sys/arm/at91/at91_pdcreg.h#1 branch .. //depot/projects/tty/sys/arm/at91/uart_bus_at91usart.c#2 integrate .. //depot/projects/tty/sys/arm/include/cpu.h#6 integrate .. //depot/projects/tty/sys/arm/xscale/i80321/iq80321.c#7 integrate .. //depot/projects/tty/sys/boot/alpha/Makefile#2 delete .. //depot/projects/tty/sys/boot/alpha/Makefile.inc#4 delete .. //depot/projects/tty/sys/boot/alpha/boot1/Makefile#5 delete .. //depot/projects/tty/sys/boot/alpha/boot1/boot1.c#3 delete .. //depot/projects/tty/sys/boot/alpha/cdboot/Makefile#4 delete .. //depot/projects/tty/sys/boot/alpha/cdboot/version#2 delete .. //depot/projects/tty/sys/boot/alpha/common/Makefile.common#7 delete .. //depot/projects/tty/sys/boot/alpha/common/conf.c#3 delete .. //depot/projects/tty/sys/boot/alpha/common/help.alpha#3 delete .. //depot/projects/tty/sys/boot/alpha/common/ldscript#2 delete .. //depot/projects/tty/sys/boot/alpha/common/main.c#4 delete .. //depot/projects/tty/sys/boot/alpha/libalpha/Makefile#4 delete .. //depot/projects/tty/sys/boot/alpha/libalpha/OSFpal.c#3 delete .. //depot/projects/tty/sys/boot/alpha/libalpha/alpha_copy.c#3 delete .. //depot/projects/tty/sys/boot/alpha/libalpha/alpha_module.c#3 delete .. //depot/projects/tty/sys/boot/alpha/libalpha/bbinfo.h#2 delete .. //depot/projects/tty/sys/boot/alpha/libalpha/bootinfo.c#4 delete .. //depot/projects/tty/sys/boot/alpha/libalpha/common.h#2 delete .. //depot/projects/tty/sys/boot/alpha/libalpha/delay.c#4 delete .. //depot/projects/tty/sys/boot/alpha/libalpha/devicename.c#4 delete .. //depot/projects/tty/sys/boot/alpha/libalpha/elf_freebsd.c#4 delete .. //depot/projects/tty/sys/boot/alpha/libalpha/getsecs.c#4 delete .. //depot/projects/tty/sys/boot/alpha/libalpha/libalpha.h#3 delete .. //depot/projects/tty/sys/boot/alpha/libalpha/pal.S#2 delete .. //depot/projects/tty/sys/boot/alpha/libalpha/prom.c#3 delete .. //depot/projects/tty/sys/boot/alpha/libalpha/prom_disp.S#2 delete .. //depot/projects/tty/sys/boot/alpha/libalpha/prom_swpal.S#2 delete .. //depot/projects/tty/sys/boot/alpha/libalpha/reboot.c#3 delete .. //depot/projects/tty/sys/boot/alpha/libalpha/srmdisk.c#5 delete .. //depot/projects/tty/sys/boot/alpha/libalpha/srmnet.c#3 delete .. //depot/projects/tty/sys/boot/alpha/libalpha/start.S#2 delete .. //depot/projects/tty/sys/boot/alpha/libalpha/time.c#3 delete .. //depot/projects/tty/sys/boot/alpha/loader/Makefile#3 delete .. //depot/projects/tty/sys/boot/alpha/loader/version#2 delete .. //depot/projects/tty/sys/boot/alpha/netboot/Makefile#4 delete .. //depot/projects/tty/sys/boot/alpha/netboot/version#2 delete .. //depot/projects/tty/sys/boot/arc/Makefile#2 delete .. //depot/projects/tty/sys/boot/arc/Makefile.inc#2 delete .. //depot/projects/tty/sys/boot/arc/include/arcfuncs.h#4 delete .. //depot/projects/tty/sys/boot/arc/include/arctypes.h#2 delete .. //depot/projects/tty/sys/boot/arc/include/libarc.h#2 delete .. //depot/projects/tty/sys/boot/arc/lib/Makefile#3 delete .. //depot/projects/tty/sys/boot/arc/lib/abort.c#3 delete .. //depot/projects/tty/sys/boot/arc/lib/arcconsole.c#3 delete .. //depot/projects/tty/sys/boot/arc/lib/arcdisk.c#4 delete .. //depot/projects/tty/sys/boot/arc/lib/arch/alpha/copy.c#2 delete .. //depot/projects/tty/sys/boot/arc/lib/arch/alpha/rpb.c#2 delete .. //depot/projects/tty/sys/boot/arc/lib/arch/alpha/setjmp.S#2 delete .. //depot/projects/tty/sys/boot/arc/lib/arch/alpha/start.S#2 delete .. //depot/projects/tty/sys/boot/arc/lib/bootinfo.c#4 delete .. //depot/projects/tty/sys/boot/arc/lib/delay.c#3 delete .. //depot/projects/tty/sys/boot/arc/lib/devicename.c#4 delete .. //depot/projects/tty/sys/boot/arc/lib/elf_freebsd.c#4 delete .. //depot/projects/tty/sys/boot/arc/lib/module.c#3 delete .. //depot/projects/tty/sys/boot/arc/lib/prom.c#3 delete .. //depot/projects/tty/sys/boot/arc/lib/setjmperr.c#3 delete .. //depot/projects/tty/sys/boot/arc/lib/time.c#3 delete .. //depot/projects/tty/sys/boot/arc/loader/Makefile#3 delete .. //depot/projects/tty/sys/boot/arc/loader/conf.c#3 delete .. //depot/projects/tty/sys/boot/arc/loader/help.alpha#2 delete .. //depot/projects/tty/sys/boot/arc/loader/main.c#3 delete .. //depot/projects/tty/sys/boot/arc/loader/version#2 delete .. //depot/projects/tty/sys/boot/i386/boot0/boot0.S#5 integrate .. //depot/projects/tty/sys/boot/pc98/boot2/io.c#7 integrate .. //depot/projects/tty/sys/compat/linprocfs/linprocfs.c#14 integrate .. //depot/projects/tty/sys/compat/linsysfs/linsysfs.c#1 branch .. //depot/projects/tty/sys/compat/linux/linux_file.c#12 integrate .. //depot/projects/tty/sys/compat/linux/linux_ioctl.c#15 integrate .. //depot/projects/tty/sys/compat/linux/linux_ioctl.h#7 integrate .. //depot/projects/tty/sys/compat/linux/linux_misc.c#19 integrate .. //depot/projects/tty/sys/compat/linux/linux_signal.c#10 integrate .. //depot/projects/tty/sys/compat/linux/linux_socket.c#17 integrate .. //depot/projects/tty/sys/compat/linux/linux_stats.c#16 integrate .. //depot/projects/tty/sys/compat/linux/linux_util.c#8 integrate .. //depot/projects/tty/sys/compat/linux/linux_util.h#6 integrate .. //depot/projects/tty/sys/conf/Makefile.alpha#9 delete .. //depot/projects/tty/sys/conf/NOTES#32 integrate .. //depot/projects/tty/sys/conf/files#41 integrate .. //depot/projects/tty/sys/conf/files.alpha#20 delete .. //depot/projects/tty/sys/conf/files.amd64#26 integrate .. //depot/projects/tty/sys/conf/files.i386#31 integrate .. //depot/projects/tty/sys/conf/files.pc98#26 integrate .. //depot/projects/tty/sys/conf/kern.mk#9 integrate .. //depot/projects/tty/sys/conf/ldscript.alpha#4 delete .. //depot/projects/tty/sys/conf/options#29 integrate .. //depot/projects/tty/sys/conf/options.alpha#6 delete .. //depot/projects/tty/sys/conf/options.amd64#14 integrate .. //depot/projects/tty/sys/conf/options.i386#21 integrate .. //depot/projects/tty/sys/conf/options.pc98#20 integrate .. //depot/projects/tty/sys/ddb/db_ps.c#10 integrate .. //depot/projects/tty/sys/dev/acpica/acpi.c#18 integrate .. //depot/projects/tty/sys/dev/acpica/acpi_pci.c#10 integrate .. //depot/projects/tty/sys/dev/acpica/acpi_resource.c#9 integrate .. //depot/projects/tty/sys/dev/amr/amr.c#17 integrate .. //depot/projects/tty/sys/dev/amr/amr_linux.c#3 integrate .. //depot/projects/tty/sys/dev/amr/amrvar.h#13 integrate .. //depot/projects/tty/sys/dev/ata/ata-chipset.c#28 integrate .. //depot/projects/tty/sys/dev/ath/if_ath.c#17 integrate .. //depot/projects/tty/sys/dev/ath/if_ath_pci.c#8 integrate .. //depot/projects/tty/sys/dev/ath/if_athvar.h#13 integrate .. //depot/projects/tty/sys/dev/bce/if_bcereg.h#2 integrate .. //depot/projects/tty/sys/dev/bfe/if_bfe.c#14 integrate .. //depot/projects/tty/sys/dev/bfe/if_bfereg.h#6 integrate .. //depot/projects/tty/sys/dev/dec/mc146818reg.h#3 delete .. //depot/projects/tty/sys/dev/dec/mcclock.c#4 delete .. //depot/projects/tty/sys/dev/dec/mcclock_if.m#3 delete .. //depot/projects/tty/sys/dev/dec/mcclockvar.h#3 delete .. //depot/projects/tty/sys/dev/ed/if_ed_pccard.c#13 integrate .. //depot/projects/tty/sys/dev/hwpmc/hwpmc_alpha.c#2 delete .. //depot/projects/tty/sys/dev/mpt/mpt.h#8 integrate .. //depot/projects/tty/sys/dev/mpt/mpt_cam.c#4 integrate .. //depot/projects/tty/sys/dev/mpt/mpt_pci.c#11 integrate .. //depot/projects/tty/sys/dev/pccard/pccarddevs#14 integrate .. //depot/projects/tty/sys/dev/pci/pci.c#18 integrate .. //depot/projects/tty/sys/dev/rr232x/osm_bsd.c#2 integrate .. //depot/projects/tty/sys/dev/sk/if_skreg.h#2 integrate .. //depot/projects/tty/sys/dev/tga/tga_pci.c#9 delete .. //depot/projects/tty/sys/dev/tga/tga_pci.h#3 delete .. //depot/projects/tty/sys/dev/uart/uart_cpu_alpha.c#8 delete .. //depot/projects/tty/sys/geom/raid3/g_raid3.c#10 integrate .. //depot/projects/tty/sys/gnu/fs/xfs/FreeBSD/xfs_mountops.c#2 integrate .. //depot/projects/tty/sys/i386/conf/GENERIC#23 integrate .. //depot/projects/tty/sys/i386/conf/NOTES#27 integrate .. //depot/projects/tty/sys/i386/conf/PAE#12 integrate .. //depot/projects/tty/sys/i386/cpufreq/est.c#4 integrate .. //depot/projects/tty/sys/i386/i386/apic_vector.s#9 integrate .. //depot/projects/tty/sys/i386/i386/busdma_machdep.c#14 integrate .. //depot/projects/tty/sys/i386/i386/machdep.c#20 integrate .. //depot/projects/tty/sys/i386/i386/mp_machdep.c#24 integrate .. //depot/projects/tty/sys/i386/i386/pmap.c#22 integrate .. //depot/projects/tty/sys/i386/include/apicvar.h#11 integrate .. //depot/projects/tty/sys/i386/include/cpu.h#8 integrate .. //depot/projects/tty/sys/i386/include/pmap.h#12 integrate .. //depot/projects/tty/sys/i386/include/smp.h#12 integrate .. //depot/projects/tty/sys/i386/include/specialreg.h#6 integrate .. //depot/projects/tty/sys/i386/linux/linux_dummy.c#6 integrate .. //depot/projects/tty/sys/i386/linux/linux_proto.h#12 integrate .. //depot/projects/tty/sys/i386/linux/linux_syscall.h#12 integrate .. //depot/projects/tty/sys/i386/linux/linux_sysent.c#13 integrate .. //depot/projects/tty/sys/i386/linux/linux_sysvec.c#16 integrate .. //depot/projects/tty/sys/i386/linux/syscalls.master#12 integrate .. //depot/projects/tty/sys/ia64/ia64/clock.c#8 integrate .. //depot/projects/tty/sys/ia64/include/cpu.h#9 integrate .. //depot/projects/tty/sys/kern/kern_exec.c#23 integrate .. //depot/projects/tty/sys/kern/kern_sig.c#20 integrate .. //depot/projects/tty/sys/kern/kern_umtx.c#10 integrate .. //depot/projects/tty/sys/kern/subr_clock.c#6 integrate .. //depot/projects/tty/sys/kern/tty_cons.c#10 integrate .. //depot/projects/tty/sys/kern/vfs_aio.c#20 integrate .. //depot/projects/tty/sys/libkern/alpha/bswap16.S#3 delete .. //depot/projects/tty/sys/libkern/alpha/bswap32.S#3 delete .. //depot/projects/tty/sys/libkern/alpha/byte_swap_2.S#3 delete .. //depot/projects/tty/sys/libkern/alpha/byte_swap_4.S#3 delete .. //depot/projects/tty/sys/modules/Makefile#27 integrate .. //depot/projects/tty/sys/modules/ath_hal/Makefile#3 integrate .. //depot/projects/tty/sys/modules/linsysfs/Makefile#1 branch .. //depot/projects/tty/sys/modules/linux/Makefile#8 integrate .. //depot/projects/tty/sys/modules/rr232x/Makefile#2 integrate .. //depot/projects/tty/sys/net/bpf.c#18 integrate .. //depot/projects/tty/sys/net/if_gre.c#14 integrate .. //depot/projects/tty/sys/net/route.c#13 integrate .. //depot/projects/tty/sys/netinet/ip_fw2.c#25 integrate .. //depot/projects/tty/sys/netinet/ip_input.c#21 integrate .. //depot/projects/tty/sys/netinet/ip_ipsec.c#2 integrate .. //depot/projects/tty/sys/netinet/tcp_timer.c#13 integrate .. //depot/projects/tty/sys/netinet/udp_usrreq.c#17 integrate .. //depot/projects/tty/sys/netinet6/frag6.c#8 integrate .. //depot/projects/tty/sys/netinet6/ip6_forward.c#10 integrate .. //depot/projects/tty/sys/netinet6/udp6_usrreq.c#12 integrate .. //depot/projects/tty/sys/nfsclient/nfs_socket.c#20 integrate .. //depot/projects/tty/sys/pc98/cbus/cbus.h#4 integrate .. //depot/projects/tty/sys/pc98/cbus/fdc.c#5 integrate .. //depot/projects/tty/sys/pc98/cbus/syscons_cbus.c#3 integrate .. //depot/projects/tty/sys/pc98/conf/GENERIC#16 integrate .. //depot/projects/tty/sys/pc98/conf/NOTES#19 integrate .. //depot/projects/tty/sys/pc98/pc98/machdep.c#8 integrate .. //depot/projects/tty/sys/pc98/pc98/pc98_machdep.c#6 integrate .. //depot/projects/tty/sys/pc98/pc98/pc98_machdep.h#4 integrate .. //depot/projects/tty/sys/powerpc/include/cpu.h#7 integrate .. //depot/projects/tty/sys/powerpc/powerpc/clock.c#9 integrate .. //depot/projects/tty/sys/sparc64/include/cpu.h#6 integrate .. //depot/projects/tty/sys/sys/mount.h#16 integrate .. //depot/projects/tty/sys/ufs/ffs/ffs_rawread.c#12 integrate .. //depot/projects/tty/sys/ufs/ffs/ffs_snapshot.c#15 integrate .. //depot/projects/tty/sys/ufs/ffs/ffs_softdep.c#16 integrate .. //depot/projects/tty/sys/ufs/ffs/ffs_vfsops.c#20 integrate .. //depot/projects/tty/sys/ufs/ffs/ffs_vnops.c#16 integrate .. //depot/projects/tty/sys/ufs/ufs/ufs_inode.c#10 integrate .. //depot/projects/tty/sys/ufs/ufs/ufs_quota.c#13 integrate .. //depot/projects/tty/sys/vm/swap_pager.c#19 integrate .. //depot/projects/tty/tools/tools/find-sb/find-sb.c#2 integrate .. //depot/projects/tty/tools/tools/find-sb/mini_ufs.h#1 branch .. //depot/projects/tty/tools/tools/mfc/mfc.awk#2 integrate .. //depot/projects/tty/tools/tools/ministat/ministat.c#7 integrate .. //depot/projects/tty/tools/tools/recoverdisk/Makefile#2 integrate .. //depot/projects/tty/tools/tools/recoverdisk/README#4 delete .. //depot/projects/tty/tools/tools/recoverdisk/recoverdisk.1#1 branch .. //depot/projects/tty/tools/tools/recoverdisk/recoverdisk.c#3 integrate .. //depot/projects/tty/tools/tools/tinderbox/etc/releng_6.rc#4 integrate .. //depot/projects/tty/usr.bin/Makefile#20 integrate .. //depot/projects/tty/usr.bin/calendar/calendars/calendar.freebsd#18 integrate .. //depot/projects/tty/usr.bin/du/du.1#6 integrate .. //depot/projects/tty/usr.bin/du/du.c#7 integrate .. //depot/projects/tty/usr.bin/getent/Makefile#1 branch .. //depot/projects/tty/usr.bin/getent/getent.1#1 branch .. //depot/projects/tty/usr.bin/getent/getent.c#1 branch .. //depot/projects/tty/usr.bin/make/Makefile#11 integrate .. //depot/projects/tty/usr.bin/top/machine.c#7 integrate .. //depot/projects/tty/usr.bin/w/w.c#5 integrate .. //depot/projects/tty/usr.sbin/cached/agents/services.c#2 integrate .. //depot/projects/tty/usr.sbin/cached/query.c#2 integrate .. //depot/projects/tty/usr.sbin/jail/jail.8#20 integrate .. //depot/projects/tty/usr.sbin/jail/jail.c#9 integrate .. //depot/projects/tty/usr.sbin/mount_nwfs/mount_nwfs.c#2 integrate .. //depot/projects/tty/usr.sbin/mountd/mountd.8#4 integrate .. //depot/projects/tty/usr.sbin/portsnap/phttpget/phttpget.c#6 integrate .. //depot/projects/tty/usr.sbin/portsnap/portsnap/portsnap.sh#5 integrate .. //depot/projects/tty/usr.sbin/sysinstall/installUpgrade.c#5 integrate .. //depot/projects/tty/usr.sbin/sysinstall/sysinstall.h#17 integrate Differences ... ==== //depot/projects/tty/MAINTAINERS#18 (text+ko) ==== @@ -1,4 +1,4 @@ -$FreeBSD: src/MAINTAINERS,v 1.130 2006/04/01 21:19:15 scottl Exp $ +$FreeBSD: src/MAINTAINERS,v 1.131 2006/05/05 20:12:30 rodrigc Exp $ Please note that the content of this file is strictly advisory. No locks listed here are valid. The only strict review requirements @@ -127,7 +127,8 @@ rpc.lockd alfred Will be happy to review code, but not mandatory. truss alfred Will be happy to review code, but not mandatory. rpc alfred Pre-commit review requested. -xfs kan,rodrigc Pre-commit review preferred. +xfs kan@FreeBSD.org,rodrigc@FreeBSD.org,cattelan@xfs.org + Pre-commit review preferred. pkg_install krion Pre-commit review or approval from portmgr@ requested. linux emul emulation Please discuss changes here. bs{diff,patch} cperciva Pre-commit review requested. ==== //depot/projects/tty/Makefile#16 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/Makefile,v 1.328 2006/03/18 14:30:23 ru Exp $ +# $FreeBSD: src/Makefile,v 1.329 2006/05/11 18:54:16 jhb Exp $ # # The user-driven targets are: # @@ -266,7 +266,7 @@ @echo "--------------------------------------------------------------" @echo ">>> make universe started on ${STARTTIME}" @echo "--------------------------------------------------------------" -.for target in i386 i386:pc98 sparc64 alpha ia64 amd64 +.for target in i386 i386:pc98 sparc64 ia64 amd64 .for arch in ${target:C/:.*$//} .for mach in ${target:C/^.*://} KERNCONFS!= cd ${.CURDIR}/sys/${mach}/conf && \ ==== //depot/projects/tty/UPDATING#28 (text+ko) ==== @@ -21,6 +21,21 @@ developers choose to disable these features on build machines to maximize performance. +20060428: + The puc(4) driver has been overhauled. The ebus(4) and sbus(4) + attachments have been removed. Make sure to configure scc(4) + on sparc64. Note also that by default puc(4) will use uart(4) + and not sio(4) for serial ports because interrupt handling has + been optimized for multi-port serial cards and only uart(4) + implements the interface to support it. + +20060330: + The scc(4) driver replaces puc(4) for Serial Communications + Controllers (SCCs) like the Siemens SAB82532 and the Zilog + Z8530. On sparc64, it is advised to add scc(4) to the kernel + configuration to make sure that the serial ports remain + functional. + 20060317: Most world/kernel related NO_* build options changed names. New knobs have common prefixes WITHOUT_*/WITH_* (modelled @@ -543,4 +558,4 @@ Contact Warner Losh if you have any questions about your use of this document. -$FreeBSD: src/UPDATING,v 1.445 2006/04/07 11:36:25 ru Exp $ +$FreeBSD: src/UPDATING,v 1.446 2006/05/04 03:48:06 marcel Exp $ ==== //depot/projects/tty/bin/pax/pax.1#5 (text+ko) ==== @@ -31,7 +31,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)pax.1 8.4 (Berkeley) 4/18/94 -.\" $FreeBSD: src/bin/pax/pax.1,v 1.35 2005/01/16 16:41:58 ru Exp $ +.\" $FreeBSD: src/bin/pax/pax.1,v 1.36 2006/05/10 20:32:57 cokane Exp $ .\" .Dd July 3, 2004 .Dt PAX 1 @@ -394,8 +394,9 @@ bytes per write to the archive file. The .Ar blocksize -must be a multiple of 512 bytes with a maximum of 64512 bytes. -Archives larger than 32256 bytes violate the +must be a multiple of 512 bytes with a maximum of 64512 bytes. A +.Ar blocksize +larger than 32256 bytes violates the .Tn POSIX standard and will not be portable to all systems. A ==== //depot/projects/tty/contrib/traceroute/traceroute.8#3 (text+ko) ==== @@ -14,7 +14,7 @@ .\" WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE. .\" .\" $Id: traceroute.8,v 1.19 2000/09/21 08:44:19 leres Exp $ -.\" $FreeBSD: src/contrib/traceroute/traceroute.8,v 1.11 2005/04/12 15:16:32 thomas Exp $ +.\" $FreeBSD: src/contrib/traceroute/traceroute.8,v 1.12 2006/05/11 06:30:18 cjc Exp $ .\" .TH TRACEROUTE 8 "21 September 2000" .UC 6 @@ -24,7 +24,7 @@ .na .B traceroute [ -.B \-dFISdnrvx +.B \-deFISdnrvx ] [ .B \-f .I first_ttl @@ -98,6 +98,11 @@ .PP Other options are: .TP +.B \-e +Firewall evasion mode. +Use fixed destination ports for UDP and TCP probes. +The destination port does NOT increment with each packet sent. +.TP .B \-f Set the initial time-to-live used in the first outgoing probe packet. .TP ==== //depot/projects/tty/contrib/traceroute/traceroute.c#5 (text+ko) ==== @@ -28,7 +28,7 @@ "@(#)$Id: traceroute.c,v 1.68 2000/12/14 08:04:33 leres Exp $ (LBL)"; #endif static const char rcsid[] = - "$FreeBSD: src/contrib/traceroute/traceroute.c,v 1.28 2006/01/10 16:48:52 pav Exp $"; + "$FreeBSD: src/contrib/traceroute/traceroute.c,v 1.29 2006/05/11 06:30:18 cjc Exp $"; #endif /* @@ -353,6 +353,7 @@ int doipcksum = 1; /* calculate ip checksums by default */ #endif int optlen; /* length of ip options */ +int fixedPort = 0; /* Use fixed destination port for TCP and UDP */ extern int optind; extern int opterr; @@ -521,13 +522,17 @@ prog = argv[0]; opterr = 0; - while ((op = getopt(argc, argv, "dFInrSvxf:g:i:M:m:P:p:q:s:t:w:z:")) != EOF) + while ((op = getopt(argc, argv, "edFInrSvxf:g:i:M:m:P:p:q:s:t:w:z:")) != EOF) switch (op) { case 'd': options |= SO_DEBUG; break; + case 'e': + fixedPort = 1; + break; + case 'f': case 'M': /* FreeBSD compat. */ first_ttl = str2val(optarg, "first ttl", 1, 255); @@ -1289,8 +1294,8 @@ { struct udphdr *const outudp = (struct udphdr *) outp; - outudp->uh_sport = htons(ident); - outudp->uh_dport = htons(port + outdata->seq); + outudp->uh_sport = htons(ident + (fixedPort ? outdata->seq : 0)); + outudp->uh_dport = htons(port + (fixedPort ? 0 : outdata->seq)); outudp->uh_ulen = htons((u_short)protlen); outudp->uh_sum = 0; if (doipcksum) { @@ -1306,8 +1311,8 @@ { struct udphdr *const udp = (struct udphdr *) data; - return (ntohs(udp->uh_sport) == ident - && ntohs(udp->uh_dport) == port + seq); + return (ntohs(udp->uh_sport) == ident + (fixedPort ? seq : 0) && + ntohs(udp->uh_dport) == port + (fixedPort ? 0 : seq)); } void @@ -1316,8 +1321,9 @@ struct tcphdr *const tcp = (struct tcphdr *) outp; tcp->th_sport = htons(ident); - tcp->th_dport = htons(port + outdata->seq); - tcp->th_seq = (tcp->th_sport << 16) | tcp->th_dport; + tcp->th_dport = htons(port + (fixedPort ? 0 : outdata->seq)); + tcp->th_seq = (tcp->th_sport << 16) | (tcp->th_dport + + (fixedPort ? outdata->seq : 0)); tcp->th_ack = 0; tcp->th_off = 5; tcp->th_flags = TH_SYN; @@ -1335,7 +1341,8 @@ struct tcphdr *const tcp = (struct tcphdr *) data; return (ntohs(tcp->th_sport) == ident - && ntohs(tcp->th_dport) == port + seq); + && ntohs(tcp->th_dport) == port + (fixedPort ? 0 : seq)) + && tcp->th_seq == (ident << 16) | (port + seq); } void ==== //depot/projects/tty/etc/Makefile#18 (text+ko) ==== @@ -1,5 +1,5 @@ # from: @(#)Makefile 5.11 (Berkeley) 5/21/91 -# $FreeBSD: src/etc/Makefile,v 1.355 2006/04/28 12:03:33 ume Exp $ +# $FreeBSD: src/etc/Makefile,v 1.356 2006/05/03 15:14:46 ume Exp $ .include @@ -11,8 +11,8 @@ crontab csh.cshrc csh.login csh.logout devd.conf devfs.conf \ dhclient.conf disktab fbtab ftpusers gettytab group \ hosts hosts.allow hosts.equiv hosts.lpd \ - inetd.conf login.access login.conf \ - mac.conf motd netconfig network.subr networks newsyslog.conf \ + inetd.conf login.access login.conf mac.conf motd \ + netconfig network.subr networks newsyslog.conf nsswitch.conf \ portsnap.conf pf.conf pf.os phones profile protocols \ rc rc.bsdextended rc.firewall rc.firewall6 rc.initdiskless \ rc.sendmail rc.shutdown \ ==== //depot/projects/tty/etc/defaults/rc.conf#19 (text+ko) ==== @@ -15,7 +15,7 @@ # For a more detailed explanation of all the rc.conf variables, please # refer to the rc.conf(5) manual page. # -# $FreeBSD: src/etc/defaults/rc.conf,v 1.282 2006/04/28 12:03:33 ume Exp $ +# $FreeBSD: src/etc/defaults/rc.conf,v 1.283 2006/05/11 14:23:43 flz Exp $ ############################################################## ### Important initial Boot-time options #################### @@ -555,11 +555,15 @@ # # To use rc's built-in jail infrastructure create entries for # each jail, specified in jail_list, with the following variables. -# NOTE: replace 'example' with the jail's name. +# NOTES: +# - replace 'example' with the jail's name. +# - except rootdir, hostname and ip, all of the following variables may be made +# global jail variables if you don't specify a jail name (ie. jail_interface). # #jail_example_rootdir="/usr/jail/default" # Jail's root directory #jail_example_hostname="default.domain.com" # Jail's hostname #jail_example_ip="192.168.0.10" # Jail's IP number +#jail_example_interface="" # Interface to create the IP alias on #jail_example_exec_start="/bin/sh /etc/rc" # command to execute in jail for starting #jail_example_exec_stop="/bin/sh /etc/rc.shutdown" # command to execute in jail for stopping #jail_example_devfs_enable="NO" # mount devfs in the jail ==== //depot/projects/tty/etc/mtree/BSD.root.dist#12 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/etc/mtree/BSD.root.dist,v 1.76 2005/12/29 14:40:19 dfr Exp $ +# $FreeBSD: src/etc/mtree/BSD.root.dist,v 1.77 2006/05/10 18:53:15 marcus Exp $ # # Please see the file src/etc/mtree/README before making changes to this file. # @@ -69,6 +69,8 @@ .. libexec .. + media + .. mnt .. proc mode=0555 ==== //depot/projects/tty/etc/rc.d/jail#11 (text+ko) ==== @@ -1,6 +1,6 @@ #!/bin/sh # -# $FreeBSD: src/etc/rc.d/jail,v 1.27 2006/04/08 12:15:35 flz Exp $ +# $FreeBSD: src/etc/rc.d/jail,v 1.32 2006/05/11 14:23:43 flz Exp $ # # PROVIDE: jail @@ -27,65 +27,76 @@ return fi - eval jail_rootdir=\"\$jail_${_j}_rootdir\" - jail_devdir="${jail_rootdir}/dev" - jail_fdescdir="${jail_devdir}/fd" - jail_procdir="${jail_rootdir}/proc" - eval jail_hostname=\"\$jail_${_j}_hostname\" - eval jail_ip=\"\$jail_${_j}_ip\" - eval jail_interface=\"\${jail_${_j}_interface:-${jail_interface}}\" - eval jail_exec=\"\$jail_${_j}_exec\" - eval jail_exec_start=\"\${jail_${_j}_exec_start:-${jail_exec_start}}\" - eval jail_exec_stop=\"\${jail_${_j}_exec_stop:-${jail_exec_stop}}\" - if [ -n "${jail_exec}" ]; then + eval _rootdir=\"\$jail_${_j}_rootdir\" + _devdir="${_rootdir}/dev" + _fdescdir="${_devdir}/fd" + _procdir="${_rootdir}/proc" + eval _hostname=\"\$jail_${_j}_hostname\" + eval _ip=\"\$jail_${_j}_ip\" + eval _interface=\"\${jail_${_j}_interface:-${jail_interface}}\" + eval _exec=\"\$jail_${_j}_exec\" + eval _exec_start=\"\${jail_${_j}_exec_start:-${jail_exec_start}}\" + eval _exec_stop=\"\${jail_${_j}_exec_stop:-${jail_exec_stop}}\" + if [ -n "${_exec}" ]; then # simple/backward-compatible execution - jail_exec_start="${jail_exec}" - jail_exec_stop="" + _exec_start="${_exec}" + _exec_stop="" else # flexible execution - if [ -z "${jail_exec_start}" ]; then - jail_exec_start="/bin/sh /etc/rc" - if [ -z "${jail_exec_stop}" ]; then - jail_exec_stop="/bin/sh /etc/rc.shutdown" + if [ -z "${_exec_start}" ]; then + _exec_start="/bin/sh /etc/rc" + if [ -z "${_exec_stop}" ]; then + _exec_stop="/bin/sh /etc/rc.shutdown" fi fi fi # The default jail ruleset will be used by rc.subr if none is specified. - eval jail_ruleset=\"\${jail_${_j}_devfs_ruleset:-${jail_devfs_ruleset}}\" - eval jail_devfs=\"\${jail_${_j}_devfs_enable:-${jail_devfs_enable}}\" - [ -z "${jail_devfs}" ] && jail_devfs="NO" - eval jail_fdescfs=\"\${jail_${_j}_fdescfs_enable:-${jail_fdescfs_enable}}\" - [ -z "${jail_fdescfs}" ] && jail_fdescfs="NO" - eval jail_procfs=\"\${jail_${_j}_procfs_enable:-${jail_procfs_enable}}\" - [ -z "${jail_procfs}" ] && jail_procfs="NO" + eval _ruleset=\"\${jail_${_j}_devfs_ruleset:-${jail_devfs_ruleset}}\" + eval _devfs=\"\${jail_${_j}_devfs_enable:-${jail_devfs_enable}}\" + [ -z "${_devfs}" ] && _devfs="NO" + eval _fdescfs=\"\${jail_${_j}_fdescfs_enable:-${jail_fdescfs_enable}}\" + [ -z "${_fdescfs}" ] && _fdescfs="NO" + eval _procfs=\"\${jail_${_j}_procfs_enable:-${jail_procfs_enable}}\" + [ -z "${_procfs}" ] && _procfs="NO" - eval jail_mount=\"\${jail_${_j}_mount_enable:-${jail_mount_enable}}\" - [ -z "${jail_mount}" ] && jail_mount="NO" + eval _mount=\"\${jail_${_j}_mount_enable:-${jail_mount_enable}}\" + [ -z "${_mount}" ] && _mount="NO" # "/etc/fstab.${_j}" will be used for {,u}mount(8) if none is specified. - eval jail_fstab=\"\${jail_${_j}_fstab:-${jail_fstab}}\" - [ -z "${jail_fstab}" ] && jail_fstab="/etc/fstab.${_j}" - eval jail_flags=\"\${jail_${_j}_flags:-${jail_flags}}\" - [ -z "${jail_flags}" ] && jail_flags="-l -U root" + eval _fstab=\"\${jail_${_j}_fstab:-${jail_fstab}}\" + [ -z "${_fstab}" ] && _fstab="/etc/fstab.${_j}" + eval _flags=\"\${jail_${_j}_flags:-${jail_flags}}\" + [ -z "${_flags}" ] && _flags="-l -U root" # Debugging aid # - debug "$_j devfs enable: $jail_devfs" - debug "$_j fdescfs enable: $jail_fdescfs" - debug "$_j procfs enable: $jail_procfs" - debug "$_j mount enable: $jail_mount" - debug "$_j hostname: $jail_hostname" - debug "$_j ip: $jail_ip" - debug "$_j interface: $jail_interface" - debug "$_j root: $jail_rootdir" - debug "$_j devdir: $jail_devdir" - debug "$_j fdescdir: $jail_fdescdir" - debug "$_j procdir: $jail_procdir" - debug "$_j ruleset: $jail_ruleset" - debug "$_j fstab: $jail_fstab" - debug "$_j exec start: $jail_exec_start" - debug "$_j exec stop: $jail_exec_stop" - debug "$_j flags: $jail_flags" + debug "$_j devfs enable: $_devfs" + debug "$_j fdescfs enable: $_fdescfs" + debug "$_j procfs enable: $_procfs" + debug "$_j mount enable: $_mount" + debug "$_j hostname: $_hostname" + debug "$_j ip: $_ip" + debug "$_j interface: $_interface" + debug "$_j root: $_rootdir" + debug "$_j devdir: $_devdir" + debug "$_j fdescdir: $_fdescdir" + debug "$_j procdir: $_procdir" + debug "$_j ruleset: $_ruleset" + debug "$_j fstab: $_fstab" + debug "$_j exec start: $_exec_start" + debug "$_j exec stop: $_exec_stop" + debug "$_j flags: $_flags" + + if [ -z "${_hostname}" ]; then + err 3 "$name: No hostname has been defined for ${_j}" + fi + if [ -z "${_rootdir}" ]; then + err 3 "$name: No root directory has been defined for ${_j}" + fi + if [ -z "${_ip}" ]; then + err 3 "$name: No IP address has been defined for ${_j}" + fi + } # set_sysctl rc_knob mib msg @@ -122,24 +133,24 @@ # jail_umount_fs() { - if checkyesno jail_fdescfs; then - if [ -d "${jail_fdescdir}" ] ; then - umount -f ${jail_fdescdir} >/dev/null 2>&1 + if checkyesno _fdescfs; then + if [ -d "${_fdescdir}" ] ; then + umount -f ${_fdescdir} >/dev/null 2>&1 fi fi - if checkyesno jail_devfs; then - if [ -d "${jail_devdir}" ] ; then - umount -f ${jail_devdir} >/dev/null 2>&1 + if checkyesno _devfs; then + if [ -d "${_devdir}" ] ; then + umount -f ${_devdir} >/dev/null 2>&1 fi fi - if checkyesno jail_procfs; then - if [ -d "${jail_procdir}" ] ; then - umount -f ${jail_procdir} >/dev/null 2>&1 + if checkyesno _procfs; then + if [ -d "${_procdir}" ] ; then + umount -f ${_procdir} >/dev/null 2>&1 fi fi - if checkyesno jail_mount; then - [ -f "${jail_fstab}" ] || warn "${jail_fstab} does not exist" - umount -a -F "${jail_fstab}" >/dev/null 2>&1 + if checkyesno _mount; then + [ -f "${_fstab}" ] || warn "${_fstab} does not exist" + umount -a -F "${_fstab}" >/dev/null 2>&1 fi } @@ -161,29 +172,29 @@ do init_variables $_jail if [ -f /var/run/jail_${_jail}.id ]; then - echo -n " [${jail_hostname} already running (/var/run/jail_${_jail}.id exists)]" + echo -n " [${_hostname} already running (/var/run/jail_${_jail}.id exists)]" continue; fi - if [ -n ${jail_interface} ]; then - ifconfig ${jail_interface} alias ${jail_ip} netmask 255.255.255.255 + if [ -n "${_interface}" ]; then + ifconfig ${_interface} alias ${_ip} netmask 255.255.255.255 fi - if checkyesno jail_mount; then - info "Mounting fstab for jail ${_jail} (${jail_fstab})" - if [ ! -f "${jail_fstab}" ]; then - err 3 "$name: ${jail_fstab} does not exist" + if checkyesno _mount; then + info "Mounting fstab for jail ${_jail} (${_fstab})" + if [ ! -f "${_fstab}" ]; then + err 3 "$name: ${_fstab} does not exist" fi - mount -a -F "${jail_fstab}" + mount -a -F "${_fstab}" fi - if checkyesno jail_devfs; then + if checkyesno _devfs; then # If devfs is already mounted here, skip it. - df -t devfs "${jail_devdir}" >/dev/null + df -t devfs "${_devdir}" >/dev/null >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Fri May 12 00:22:07 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 82AFD16A402; Fri, 12 May 2006 00:22:07 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 5992116A401 for ; Fri, 12 May 2006 00:22:07 +0000 (UTC) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id F264543F78 for ; Fri, 12 May 2006 00:22:06 +0000 (GMT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k4C0M6Ll055697 for ; Fri, 12 May 2006 00:22:06 GMT (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k4C0M6dQ055679 for perforce@freebsd.org; Fri, 12 May 2006 00:22:06 GMT (envelope-from marcel@freebsd.org) Date: Fri, 12 May 2006 00:22:06 GMT Message-Id: <200605120022.k4C0M6dQ055679@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Cc: Subject: PERFORCE change 96987 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 12 May 2006 00:22:07 -0000 http://perforce.freebsd.org/chv.cgi?CH=96987 Change 96987 by marcel@marcel_nfs on 2006/05/12 00:21:05 IFC @96983 Affected files ... .. //depot/projects/busdma/alpha/Makefile#2 delete .. //depot/projects/busdma/alpha/alpha/api_up1000.c#2 delete .. //depot/projects/busdma/alpha/alpha/atomic.s#2 delete .. //depot/projects/busdma/alpha/alpha/autoconf.c#2 delete .. //depot/projects/busdma/alpha/alpha/busdma_machdep.c#2 delete .. //depot/projects/busdma/alpha/alpha/busspace.c#2 delete .. //depot/projects/busdma/alpha/alpha/clock.c#2 delete .. //depot/projects/busdma/alpha/alpha/clock_if.m#2 delete .. //depot/projects/busdma/alpha/alpha/cpuconf.c#2 delete .. //depot/projects/busdma/alpha/alpha/db_disasm.c#2 delete .. //depot/projects/busdma/alpha/alpha/db_instruction.h#2 delete .. //depot/projects/busdma/alpha/alpha/db_interface.c#2 delete .. //depot/projects/busdma/alpha/alpha/db_trace.c#2 delete .. //depot/projects/busdma/alpha/alpha/dec_1000a.c#2 delete .. //depot/projects/busdma/alpha/alpha/dec_2100_a50.c#2 delete .. //depot/projects/busdma/alpha/alpha/dec_2100_a500.c#2 delete .. //depot/projects/busdma/alpha/alpha/dec_3000_300.c#2 delete .. //depot/projects/busdma/alpha/alpha/dec_3000_500.c#2 delete .. //depot/projects/busdma/alpha/alpha/dec_axppci_33.c#2 delete .. //depot/projects/busdma/alpha/alpha/dec_eb164.c#2 delete .. //depot/projects/busdma/alpha/alpha/dec_eb64plus.c#2 delete .. //depot/projects/busdma/alpha/alpha/dec_kn20aa.c#2 delete .. //depot/projects/busdma/alpha/alpha/dec_kn300.c#2 delete .. //depot/projects/busdma/alpha/alpha/dec_kn8ae.c#2 delete .. //depot/projects/busdma/alpha/alpha/dec_st550.c#2 delete .. //depot/projects/busdma/alpha/alpha/dec_st6600.c#2 delete .. //depot/projects/busdma/alpha/alpha/divrem.m4#2 delete .. //depot/projects/busdma/alpha/alpha/dump_machdep.c#2 delete .. //depot/projects/busdma/alpha/alpha/elf_machdep.c#2 delete .. //depot/projects/busdma/alpha/alpha/exception.s#2 delete .. //depot/projects/busdma/alpha/alpha/fp_emulate.c#2 delete .. //depot/projects/busdma/alpha/alpha/gdb_machdep.c#2 delete .. //depot/projects/busdma/alpha/alpha/genassym.c#2 delete .. //depot/projects/busdma/alpha/alpha/ieee_float.c#2 delete .. //depot/projects/busdma/alpha/alpha/ieee_float.h#2 delete .. //depot/projects/busdma/alpha/alpha/in_cksum.c#2 delete .. //depot/projects/busdma/alpha/alpha/interrupt.c#2 delete .. //depot/projects/busdma/alpha/alpha/locore.s#2 delete .. //depot/projects/busdma/alpha/alpha/machdep.c#2 delete .. //depot/projects/busdma/alpha/alpha/mem.c#2 delete .. //depot/projects/busdma/alpha/alpha/mp_machdep.c#2 delete .. //depot/projects/busdma/alpha/alpha/pal.s#2 delete .. //depot/projects/busdma/alpha/alpha/pmap.c#2 delete .. //depot/projects/busdma/alpha/alpha/prom.c#2 delete .. //depot/projects/busdma/alpha/alpha/prom_disp.s#2 delete .. //depot/projects/busdma/alpha/alpha/promcons.c#2 delete .. //depot/projects/busdma/alpha/alpha/sgmap.c#2 delete .. //depot/projects/busdma/alpha/alpha/support.s#2 delete .. //depot/projects/busdma/alpha/alpha/swtch.s#2 delete .. //depot/projects/busdma/alpha/alpha/sys_machdep.c#2 delete .. //depot/projects/busdma/alpha/alpha/trap.c#2 delete .. //depot/projects/busdma/alpha/alpha/uio_machdep.c#2 delete .. //depot/projects/busdma/alpha/alpha/uma_machdep.c#2 delete .. //depot/projects/busdma/alpha/alpha/vm_machdep.c#2 delete .. //depot/projects/busdma/alpha/compile/.cvsignore#2 delete .. //depot/projects/busdma/alpha/conf/.cvsignore#2 delete .. //depot/projects/busdma/alpha/conf/DEFAULTS#2 delete .. //depot/projects/busdma/alpha/conf/GENERIC#2 delete .. //depot/projects/busdma/alpha/conf/GENERIC.hints#2 delete .. //depot/projects/busdma/alpha/conf/MAC#2 delete .. //depot/projects/busdma/alpha/conf/Makefile#2 delete .. //depot/projects/busdma/alpha/conf/NOTES#2 delete .. //depot/projects/busdma/alpha/include/_bus.h#2 delete .. //depot/projects/busdma/alpha/include/_inttypes.h#2 delete .. //depot/projects/busdma/alpha/include/_limits.h#2 delete .. //depot/projects/busdma/alpha/include/_stdint.h#2 delete .. //depot/projects/busdma/alpha/include/_types.h#2 delete .. //depot/projects/busdma/alpha/include/alpha_cpu.h#2 delete .. //depot/projects/busdma/alpha/include/asm.h#2 delete .. //depot/projects/busdma/alpha/include/atomic.h#2 delete .. //depot/projects/busdma/alpha/include/bootinfo.h#2 delete .. //depot/projects/busdma/alpha/include/bus.h#2 delete .. //depot/projects/busdma/alpha/include/bus_dma.h#2 delete .. //depot/projects/busdma/alpha/include/bwx.h#2 delete .. //depot/projects/busdma/alpha/include/chipset.h#2 delete .. //depot/projects/busdma/alpha/include/clock.h#2 delete .. //depot/projects/busdma/alpha/include/clockvar.h#2 delete .. //depot/projects/busdma/alpha/include/cpu.h#2 delete .. //depot/projects/busdma/alpha/include/cpuconf.h#2 delete .. //depot/projects/busdma/alpha/include/cpufunc.h#2 delete .. //depot/projects/busdma/alpha/include/db_machdep.h#2 delete .. //depot/projects/busdma/alpha/include/elf.h#2 delete .. //depot/projects/busdma/alpha/include/endian.h#2 delete .. //depot/projects/busdma/alpha/include/exec.h#2 delete .. //depot/projects/busdma/alpha/include/float.h#2 delete .. //depot/projects/busdma/alpha/include/floatingpoint.h#2 delete .. //depot/projects/busdma/alpha/include/fpu.h#2 delete .. //depot/projects/busdma/alpha/include/frame.h#2 delete .. //depot/projects/busdma/alpha/include/gdb_machdep.h#2 delete .. //depot/projects/busdma/alpha/include/ieee.h#2 delete .. //depot/projects/busdma/alpha/include/ieeefp.h#2 delete .. //depot/projects/busdma/alpha/include/in_cksum.h#2 delete .. //depot/projects/busdma/alpha/include/inst.h#2 delete .. //depot/projects/busdma/alpha/include/intr.h#2 delete .. //depot/projects/busdma/alpha/include/intrcnt.h#2 delete .. //depot/projects/busdma/alpha/include/ioctl_bt848.h#2 delete .. //depot/projects/busdma/alpha/include/ioctl_meteor.h#2 delete .. //depot/projects/busdma/alpha/include/kdb.h#2 delete .. //depot/projects/busdma/alpha/include/limits.h#2 delete .. //depot/projects/busdma/alpha/include/md_var.h#2 delete .. //depot/projects/busdma/alpha/include/memdev.h#2 delete .. //depot/projects/busdma/alpha/include/mutex.h#2 delete .. //depot/projects/busdma/alpha/include/pal.h#2 delete .. //depot/projects/busdma/alpha/include/param.h#2 delete .. //depot/projects/busdma/alpha/include/pc/bios.h#2 delete .. //depot/projects/busdma/alpha/include/pc/display.h#2 delete .. //depot/projects/busdma/alpha/include/pc/vesa.h#2 delete .. //depot/projects/busdma/alpha/include/pcb.h#2 delete .. //depot/projects/busdma/alpha/include/pcpu.h#2 delete .. //depot/projects/busdma/alpha/include/pmap.h#2 delete .. //depot/projects/busdma/alpha/include/pmc_mdep.h#2 delete .. //depot/projects/busdma/alpha/include/ppireg.h#2 delete .. //depot/projects/busdma/alpha/include/proc.h#2 delete .. //depot/projects/busdma/alpha/include/profile.h#2 delete .. //depot/projects/busdma/alpha/include/prom.h#2 delete .. //depot/projects/busdma/alpha/include/pte.h#2 delete .. //depot/projects/busdma/alpha/include/ptrace.h#2 delete .. //depot/projects/busdma/alpha/include/reg.h#2 delete .. //depot/projects/busdma/alpha/include/reloc.h#2 delete .. //depot/projects/busdma/alpha/include/resource.h#2 delete .. //depot/projects/busdma/alpha/include/rpb.h#2 delete .. //depot/projects/busdma/alpha/include/runq.h#2 delete .. //depot/projects/busdma/alpha/include/setjmp.h#2 delete .. //depot/projects/busdma/alpha/include/sf_buf.h#2 delete .. //depot/projects/busdma/alpha/include/sgmap.h#2 delete .. //depot/projects/busdma/alpha/include/sigframe.h#2 delete .. //depot/projects/busdma/alpha/include/signal.h#2 delete .. //depot/projects/busdma/alpha/include/smp.h#2 delete .. //depot/projects/busdma/alpha/include/stdarg.h#2 delete .. //depot/projects/busdma/alpha/include/swiz.h#2 delete .. //depot/projects/busdma/alpha/include/sysarch.h#2 delete .. //depot/projects/busdma/alpha/include/timerreg.h#2 delete .. //depot/projects/busdma/alpha/include/ucontext.h#2 delete .. //depot/projects/busdma/alpha/include/varargs.h#2 delete .. //depot/projects/busdma/alpha/include/vmparam.h#2 delete .. //depot/projects/busdma/alpha/isa/isa.c#2 delete .. //depot/projects/busdma/alpha/isa/isa_dma.c#2 delete .. //depot/projects/busdma/alpha/isa/isavar.h#2 delete .. //depot/projects/busdma/alpha/isa/mcclock_isa.c#2 delete .. //depot/projects/busdma/alpha/linux/Makefile#2 delete .. //depot/projects/busdma/alpha/linux/linux.h#2 delete .. //depot/projects/busdma/alpha/linux/linux_dummy.c#2 delete .. //depot/projects/busdma/alpha/linux/linux_genassym.c#2 delete .. //depot/projects/busdma/alpha/linux/linux_ipc64.h#2 delete .. //depot/projects/busdma/alpha/linux/linux_locore.s#2 delete .. //depot/projects/busdma/alpha/linux/linux_machdep.c#2 delete .. //depot/projects/busdma/alpha/linux/linux_proto.h#2 delete .. //depot/projects/busdma/alpha/linux/linux_syscall.h#2 delete .. //depot/projects/busdma/alpha/linux/linux_sysent.c#2 delete .. //depot/projects/busdma/alpha/linux/linux_sysvec.c#2 delete .. //depot/projects/busdma/alpha/linux/syscalls.conf#2 delete .. //depot/projects/busdma/alpha/linux/syscalls.master#2 delete .. //depot/projects/busdma/alpha/mcbus/mcbus.c#2 delete .. //depot/projects/busdma/alpha/mcbus/mcbusreg.h#2 delete .. //depot/projects/busdma/alpha/mcbus/mcbusvar.h#2 delete .. //depot/projects/busdma/alpha/mcbus/mcmem.c#2 delete .. //depot/projects/busdma/alpha/mcbus/mcpcia.c#2 delete .. //depot/projects/busdma/alpha/mcbus/mcpciareg.h#2 delete .. //depot/projects/busdma/alpha/mcbus/mcpciavar.h#2 delete .. //depot/projects/busdma/alpha/osf1/Makefile#2 delete .. //depot/projects/busdma/alpha/osf1/README.mach-traps#2 delete .. //depot/projects/busdma/alpha/osf1/exec_ecoff.h#2 delete .. //depot/projects/busdma/alpha/osf1/imgact_osf1.c#2 delete .. //depot/projects/busdma/alpha/osf1/osf1.h#2 delete .. //depot/projects/busdma/alpha/osf1/osf1_ioctl.c#2 delete .. //depot/projects/busdma/alpha/osf1/osf1_misc.c#2 delete .. //depot/projects/busdma/alpha/osf1/osf1_mount.c#2 delete .. //depot/projects/busdma/alpha/osf1/osf1_proto.h#2 delete .. //depot/projects/busdma/alpha/osf1/osf1_signal.c#2 delete .. //depot/projects/busdma/alpha/osf1/osf1_signal.h#2 delete .. //depot/projects/busdma/alpha/osf1/osf1_syscall.h#2 delete .. //depot/projects/busdma/alpha/osf1/osf1_sysent.c#2 delete .. //depot/projects/busdma/alpha/osf1/osf1_sysvec.c#2 delete .. //depot/projects/busdma/alpha/osf1/osf1_util.h#2 delete .. //depot/projects/busdma/alpha/osf1/syscalls.conf#2 delete .. //depot/projects/busdma/alpha/osf1/syscalls.master#2 delete .. //depot/projects/busdma/alpha/pci/alphapci_if.m#2 delete .. //depot/projects/busdma/alpha/pci/apecs.c#2 delete .. //depot/projects/busdma/alpha/pci/apecs_pci.c#2 delete .. //depot/projects/busdma/alpha/pci/apecsreg.h#2 delete .. //depot/projects/busdma/alpha/pci/apecsvar.h#2 delete .. //depot/projects/busdma/alpha/pci/bwx.c#2 delete .. //depot/projects/busdma/alpha/pci/cia.c#2 delete .. //depot/projects/busdma/alpha/pci/cia_pci.c#2 delete .. //depot/projects/busdma/alpha/pci/ciareg.h#2 delete .. //depot/projects/busdma/alpha/pci/ciavar.h#2 delete .. //depot/projects/busdma/alpha/pci/irongate.c#2 delete .. //depot/projects/busdma/alpha/pci/irongate_pci.c#2 delete .. //depot/projects/busdma/alpha/pci/irongatereg.h#2 delete .. //depot/projects/busdma/alpha/pci/irongatevar.h#2 delete .. //depot/projects/busdma/alpha/pci/lca.c#2 delete .. //depot/projects/busdma/alpha/pci/lca_pci.c#2 delete .. //depot/projects/busdma/alpha/pci/lcareg.h#2 delete .. //depot/projects/busdma/alpha/pci/lcavar.h#2 delete .. //depot/projects/busdma/alpha/pci/pci_eb164_intr.s#2 delete .. //depot/projects/busdma/alpha/pci/pci_eb64plus_intr.s#2 delete .. //depot/projects/busdma/alpha/pci/pcibus.c#2 delete .. //depot/projects/busdma/alpha/pci/pcibus.h#2 delete .. //depot/projects/busdma/alpha/pci/swiz.c#2 delete .. //depot/projects/busdma/alpha/pci/t2.c#2 delete .. //depot/projects/busdma/alpha/pci/t2_pci.c#2 delete .. //depot/projects/busdma/alpha/pci/t2reg.h#2 delete .. //depot/projects/busdma/alpha/pci/t2var.h#2 delete .. //depot/projects/busdma/alpha/pci/tsunami.c#2 delete .. //depot/projects/busdma/alpha/pci/tsunami_pci.c#2 delete .. //depot/projects/busdma/alpha/pci/tsunamireg.h#2 delete .. //depot/projects/busdma/alpha/pci/tsunamivar.h#2 delete .. //depot/projects/busdma/alpha/tlsb/dwlpx.c#2 delete .. //depot/projects/busdma/alpha/tlsb/dwlpxreg.h#2 delete .. //depot/projects/busdma/alpha/tlsb/dwlpxvar.h#2 delete .. //depot/projects/busdma/alpha/tlsb/gbus.c#2 delete .. //depot/projects/busdma/alpha/tlsb/gbusreg.h#2 delete .. //depot/projects/busdma/alpha/tlsb/gbusvar.h#2 delete .. //depot/projects/busdma/alpha/tlsb/kftxx.c#2 delete .. //depot/projects/busdma/alpha/tlsb/kftxxreg.h#2 delete .. //depot/projects/busdma/alpha/tlsb/kftxxvar.h#2 delete .. //depot/projects/busdma/alpha/tlsb/mcclock_tlsb.c#2 delete .. //depot/projects/busdma/alpha/tlsb/tlsb.c#2 delete .. //depot/projects/busdma/alpha/tlsb/tlsbcpu.c#2 delete .. //depot/projects/busdma/alpha/tlsb/tlsbmem.c#2 delete .. //depot/projects/busdma/alpha/tlsb/tlsbreg.h#2 delete .. //depot/projects/busdma/alpha/tlsb/tlsbvar.h#2 delete .. //depot/projects/busdma/alpha/tlsb/zs_tlsb.c#2 delete .. //depot/projects/busdma/alpha/tlsb/zsreg.h#2 delete .. //depot/projects/busdma/alpha/tlsb/zsvar.h#2 delete .. //depot/projects/busdma/amd64/amd64/machdep.c#2 integrate .. //depot/projects/busdma/amd64/conf/GENERIC#2 integrate .. //depot/projects/busdma/amd64/conf/NOTES#2 integrate .. //depot/projects/busdma/amd64/include/cpu.h#2 integrate .. //depot/projects/busdma/amd64/linux32/linux32_dummy.c#2 integrate .. //depot/projects/busdma/amd64/linux32/linux32_proto.h#2 integrate .. //depot/projects/busdma/amd64/linux32/linux32_syscall.h#2 integrate .. //depot/projects/busdma/amd64/linux32/linux32_sysent.c#2 integrate .. //depot/projects/busdma/amd64/linux32/linux32_sysvec.c#2 integrate .. //depot/projects/busdma/amd64/linux32/syscalls.master#2 integrate .. //depot/projects/busdma/arm/arm/machdep.c#2 integrate .. //depot/projects/busdma/arm/at91/at91_pdcreg.h#1 branch .. //depot/projects/busdma/arm/at91/uart_bus_at91usart.c#2 integrate .. //depot/projects/busdma/arm/include/cpu.h#2 integrate .. //depot/projects/busdma/arm/xscale/i80321/iq80321.c#2 integrate .. //depot/projects/busdma/boot/alpha/Makefile#2 delete .. //depot/projects/busdma/boot/alpha/Makefile.inc#2 delete .. //depot/projects/busdma/boot/alpha/boot1/Makefile#2 delete .. //depot/projects/busdma/boot/alpha/boot1/boot1.c#2 delete .. //depot/projects/busdma/boot/alpha/cdboot/Makefile#2 delete .. //depot/projects/busdma/boot/alpha/cdboot/version#2 delete .. //depot/projects/busdma/boot/alpha/common/Makefile.common#2 delete .. //depot/projects/busdma/boot/alpha/common/conf.c#2 delete .. //depot/projects/busdma/boot/alpha/common/help.alpha#2 delete .. //depot/projects/busdma/boot/alpha/common/ldscript#2 delete .. //depot/projects/busdma/boot/alpha/common/main.c#2 delete .. //depot/projects/busdma/boot/alpha/libalpha/Makefile#2 delete .. //depot/projects/busdma/boot/alpha/libalpha/OSFpal.c#2 delete .. //depot/projects/busdma/boot/alpha/libalpha/alpha_copy.c#2 delete .. //depot/projects/busdma/boot/alpha/libalpha/alpha_module.c#2 delete .. //depot/projects/busdma/boot/alpha/libalpha/bbinfo.h#2 delete .. //depot/projects/busdma/boot/alpha/libalpha/bootinfo.c#2 delete .. //depot/projects/busdma/boot/alpha/libalpha/common.h#2 delete .. //depot/projects/busdma/boot/alpha/libalpha/delay.c#2 delete .. //depot/projects/busdma/boot/alpha/libalpha/devicename.c#2 delete .. //depot/projects/busdma/boot/alpha/libalpha/elf_freebsd.c#2 delete .. //depot/projects/busdma/boot/alpha/libalpha/getsecs.c#2 delete .. //depot/projects/busdma/boot/alpha/libalpha/libalpha.h#2 delete .. //depot/projects/busdma/boot/alpha/libalpha/pal.S#2 delete .. //depot/projects/busdma/boot/alpha/libalpha/prom.c#2 delete .. //depot/projects/busdma/boot/alpha/libalpha/prom_disp.S#2 delete .. //depot/projects/busdma/boot/alpha/libalpha/prom_swpal.S#2 delete .. //depot/projects/busdma/boot/alpha/libalpha/reboot.c#2 delete .. //depot/projects/busdma/boot/alpha/libalpha/srmdisk.c#2 delete .. //depot/projects/busdma/boot/alpha/libalpha/srmnet.c#2 delete .. //depot/projects/busdma/boot/alpha/libalpha/start.S#2 delete .. //depot/projects/busdma/boot/alpha/libalpha/time.c#2 delete .. //depot/projects/busdma/boot/alpha/loader/Makefile#2 delete .. //depot/projects/busdma/boot/alpha/loader/version#2 delete .. //depot/projects/busdma/boot/alpha/netboot/Makefile#2 delete .. //depot/projects/busdma/boot/alpha/netboot/version#2 delete .. //depot/projects/busdma/boot/arc/Makefile#2 delete .. //depot/projects/busdma/boot/arc/Makefile.inc#2 delete .. //depot/projects/busdma/boot/arc/include/arcfuncs.h#2 delete .. //depot/projects/busdma/boot/arc/include/arctypes.h#2 delete .. //depot/projects/busdma/boot/arc/include/libarc.h#2 delete .. //depot/projects/busdma/boot/arc/lib/Makefile#2 delete .. //depot/projects/busdma/boot/arc/lib/abort.c#2 delete .. //depot/projects/busdma/boot/arc/lib/arcconsole.c#2 delete .. //depot/projects/busdma/boot/arc/lib/arcdisk.c#2 delete .. //depot/projects/busdma/boot/arc/lib/arch/alpha/copy.c#2 delete .. //depot/projects/busdma/boot/arc/lib/arch/alpha/rpb.c#2 delete .. //depot/projects/busdma/boot/arc/lib/arch/alpha/setjmp.S#2 delete .. //depot/projects/busdma/boot/arc/lib/arch/alpha/start.S#2 delete .. //depot/projects/busdma/boot/arc/lib/bootinfo.c#2 delete .. //depot/projects/busdma/boot/arc/lib/delay.c#2 delete .. //depot/projects/busdma/boot/arc/lib/devicename.c#2 delete .. //depot/projects/busdma/boot/arc/lib/elf_freebsd.c#2 delete .. //depot/projects/busdma/boot/arc/lib/module.c#2 delete .. //depot/projects/busdma/boot/arc/lib/prom.c#2 delete .. //depot/projects/busdma/boot/arc/lib/setjmperr.c#2 delete .. //depot/projects/busdma/boot/arc/lib/time.c#2 delete .. //depot/projects/busdma/boot/arc/loader/Makefile#2 delete .. //depot/projects/busdma/boot/arc/loader/conf.c#2 delete .. //depot/projects/busdma/boot/arc/loader/help.alpha#2 delete .. //depot/projects/busdma/boot/arc/loader/main.c#2 delete .. //depot/projects/busdma/boot/arc/loader/version#2 delete .. //depot/projects/busdma/boot/pc98/boot2/io.c#2 integrate .. //depot/projects/busdma/compat/linprocfs/linprocfs.c#2 integrate .. //depot/projects/busdma/compat/linsysfs/linsysfs.c#1 branch .. //depot/projects/busdma/compat/linux/linux_file.c#2 integrate .. //depot/projects/busdma/compat/linux/linux_ioctl.c#2 integrate .. //depot/projects/busdma/compat/linux/linux_ioctl.h#2 integrate .. //depot/projects/busdma/compat/linux/linux_misc.c#2 integrate .. //depot/projects/busdma/compat/linux/linux_signal.c#2 integrate .. //depot/projects/busdma/compat/linux/linux_socket.c#2 integrate .. //depot/projects/busdma/compat/linux/linux_stats.c#2 integrate .. //depot/projects/busdma/compat/linux/linux_util.c#2 integrate .. //depot/projects/busdma/compat/linux/linux_util.h#2 integrate .. //depot/projects/busdma/conf/Makefile.alpha#2 delete .. //depot/projects/busdma/conf/NOTES#2 integrate .. //depot/projects/busdma/conf/files#2 integrate .. //depot/projects/busdma/conf/files.alpha#2 delete .. //depot/projects/busdma/conf/files.amd64#2 integrate .. //depot/projects/busdma/conf/files.i386#2 integrate .. //depot/projects/busdma/conf/files.pc98#2 integrate .. //depot/projects/busdma/conf/kern.mk#2 integrate .. //depot/projects/busdma/conf/ldscript.alpha#2 delete .. //depot/projects/busdma/conf/options#2 integrate .. //depot/projects/busdma/conf/options.alpha#2 delete .. //depot/projects/busdma/conf/options.amd64#2 integrate .. //depot/projects/busdma/conf/options.i386#2 integrate .. //depot/projects/busdma/conf/options.pc98#2 integrate .. //depot/projects/busdma/ddb/db_ps.c#2 integrate .. //depot/projects/busdma/dev/acpica/acpi.c#2 integrate .. //depot/projects/busdma/dev/acpica/acpi_pci.c#2 integrate .. //depot/projects/busdma/dev/acpica/acpi_resource.c#2 integrate .. //depot/projects/busdma/dev/ata/ata-chipset.c#2 integrate .. //depot/projects/busdma/dev/ath/if_ath.c#2 integrate .. //depot/projects/busdma/dev/ath/if_ath_pci.c#2 integrate .. //depot/projects/busdma/dev/ath/if_athvar.h#2 integrate .. //depot/projects/busdma/dev/bce/if_bcereg.h#2 integrate .. //depot/projects/busdma/dev/bfe/if_bfe.c#2 integrate .. //depot/projects/busdma/dev/bfe/if_bfereg.h#2 integrate .. //depot/projects/busdma/dev/dec/mc146818reg.h#2 delete .. //depot/projects/busdma/dev/dec/mcclock.c#2 delete .. //depot/projects/busdma/dev/dec/mcclock_if.m#2 delete .. //depot/projects/busdma/dev/dec/mcclockvar.h#2 delete .. //depot/projects/busdma/dev/ed/if_ed_pccard.c#2 integrate .. //depot/projects/busdma/dev/hwpmc/hwpmc_alpha.c#2 delete .. //depot/projects/busdma/dev/mpt/mpt.h#2 integrate .. //depot/projects/busdma/dev/mpt/mpt_cam.c#2 integrate .. //depot/projects/busdma/dev/mpt/mpt_pci.c#2 integrate .. //depot/projects/busdma/dev/pccard/pccarddevs#2 integrate .. //depot/projects/busdma/dev/pci/pci.c#2 integrate .. //depot/projects/busdma/dev/rr232x/osm_bsd.c#2 integrate .. //depot/projects/busdma/dev/tga/tga_pci.c#2 delete .. //depot/projects/busdma/dev/tga/tga_pci.h#2 delete .. //depot/projects/busdma/dev/uart/uart_cpu_alpha.c#2 delete .. //depot/projects/busdma/geom/raid3/g_raid3.c#2 integrate .. //depot/projects/busdma/gnu/fs/xfs/FreeBSD/xfs_mountops.c#2 integrate .. //depot/projects/busdma/i386/conf/NOTES#2 integrate .. //depot/projects/busdma/i386/conf/PAE#2 integrate .. //depot/projects/busdma/i386/cpufreq/est.c#2 integrate .. //depot/projects/busdma/i386/i386/machdep.c#2 integrate .. //depot/projects/busdma/i386/include/cpu.h#2 integrate .. //depot/projects/busdma/i386/linux/linux_dummy.c#2 integrate .. //depot/projects/busdma/i386/linux/linux_proto.h#2 integrate .. //depot/projects/busdma/i386/linux/linux_syscall.h#2 integrate .. //depot/projects/busdma/i386/linux/linux_sysent.c#2 integrate .. //depot/projects/busdma/i386/linux/linux_sysvec.c#2 integrate .. //depot/projects/busdma/i386/linux/syscalls.master#2 integrate .. //depot/projects/busdma/ia64/ia64/clock.c#2 integrate .. //depot/projects/busdma/ia64/include/cpu.h#2 integrate .. //depot/projects/busdma/kern/kern_exec.c#2 integrate .. //depot/projects/busdma/kern/kern_sig.c#2 integrate .. //depot/projects/busdma/kern/kern_umtx.c#2 integrate .. //depot/projects/busdma/kern/subr_clock.c#2 integrate .. //depot/projects/busdma/kern/tty_cons.c#2 integrate .. //depot/projects/busdma/kern/vfs_aio.c#2 integrate .. //depot/projects/busdma/libkern/alpha/bswap16.S#2 delete .. //depot/projects/busdma/libkern/alpha/bswap32.S#2 delete .. //depot/projects/busdma/libkern/alpha/byte_swap_2.S#2 delete .. //depot/projects/busdma/libkern/alpha/byte_swap_4.S#2 delete .. //depot/projects/busdma/modules/Makefile#2 integrate .. //depot/projects/busdma/modules/ath_hal/Makefile#2 integrate .. //depot/projects/busdma/modules/linsysfs/Makefile#1 branch .. //depot/projects/busdma/modules/linux/Makefile#2 integrate .. //depot/projects/busdma/modules/rr232x/Makefile#2 integrate .. //depot/projects/busdma/net/bpf.c#2 integrate .. //depot/projects/busdma/net/if_gre.c#2 integrate .. //depot/projects/busdma/net/route.c#2 integrate .. //depot/projects/busdma/netinet/ip_fw2.c#2 integrate .. //depot/projects/busdma/netinet/ip_input.c#2 integrate .. //depot/projects/busdma/netinet/ip_ipsec.c#2 integrate .. //depot/projects/busdma/netinet/tcp_timer.c#2 integrate .. //depot/projects/busdma/netinet/udp_usrreq.c#2 integrate .. //depot/projects/busdma/netinet6/frag6.c#2 integrate .. //depot/projects/busdma/netinet6/ip6_forward.c#2 integrate .. //depot/projects/busdma/nfsclient/nfs_socket.c#2 integrate .. //depot/projects/busdma/pc98/cbus/cbus.h#2 integrate .. //depot/projects/busdma/pc98/cbus/fdc.c#2 integrate .. //depot/projects/busdma/pc98/cbus/syscons_cbus.c#2 integrate .. //depot/projects/busdma/pc98/conf/GENERIC#2 integrate .. //depot/projects/busdma/pc98/conf/NOTES#2 integrate .. //depot/projects/busdma/pc98/pc98/machdep.c#2 integrate .. //depot/projects/busdma/pc98/pc98/pc98_machdep.c#2 integrate .. //depot/projects/busdma/pc98/pc98/pc98_machdep.h#2 integrate .. //depot/projects/busdma/powerpc/include/cpu.h#2 integrate .. //depot/projects/busdma/powerpc/powerpc/clock.c#2 integrate .. //depot/projects/busdma/sparc64/include/cpu.h#2 integrate .. //depot/projects/busdma/sys/mount.h#2 integrate .. //depot/projects/busdma/ufs/ffs/ffs_rawread.c#2 integrate .. //depot/projects/busdma/ufs/ffs/ffs_snapshot.c#2 integrate .. //depot/projects/busdma/ufs/ffs/ffs_softdep.c#2 integrate .. //depot/projects/busdma/ufs/ffs/ffs_vnops.c#2 integrate .. //depot/projects/busdma/ufs/ufs/ufs_inode.c#2 integrate .. //depot/projects/busdma/ufs/ufs/ufs_quota.c#2 integrate .. //depot/projects/busdma/vm/swap_pager.c#2 integrate Differences ... ==== //depot/projects/busdma/amd64/amd64/machdep.c#2 (text+ko) ==== @@ -39,7 +39,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/machdep.c,v 1.648 2006/03/14 16:13:54 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/machdep.c,v 1.649 2006/05/11 17:29:22 phk Exp $"); #include "opt_atalk.h" #include "opt_atpic.h" @@ -639,13 +639,13 @@ return (error); } -SYSCTL_PROC(_machdep, CPU_ADJKERNTZ, adjkerntz, CTLTYPE_INT|CTLFLAG_RW, +SYSCTL_PROC(_machdep, OID_AUTO, adjkerntz, CTLTYPE_INT|CTLFLAG_RW, &adjkerntz, 0, sysctl_machdep_adjkerntz, "I", ""); -SYSCTL_INT(_machdep, CPU_DISRTCSET, disable_rtc_set, +SYSCTL_INT(_machdep, OID_AUTO, disable_rtc_set, CTLFLAG_RW, &disable_rtc_set, 0, ""); -SYSCTL_INT(_machdep, CPU_WALLCLOCK, wall_cmos_clock, +SYSCTL_INT(_machdep, OID_AUTO, wall_cmos_clock, CTLFLAG_RW, &wall_cmos_clock, 0, ""); /* ==== //depot/projects/busdma/amd64/conf/GENERIC#2 (text+ko) ==== @@ -16,7 +16,7 @@ # If you are in doubt as to the purpose or necessity of a line, check first # in NOTES. # -# $FreeBSD: src/sys/amd64/conf/GENERIC,v 1.455 2006/05/03 18:15:36 sam Exp $ +# $FreeBSD: src/sys/amd64/conf/GENERIC,v 1.456 2006/05/09 22:27:00 ambrisko Exp $ cpu HAMMER ident GENERIC @@ -75,6 +75,7 @@ # Linux 32-bit ABI support options COMPAT_LINUX32 # Compatible with i386 linux binaries options LINPROCFS # Cannot be a module yet. +options LINSYSFS # Bus support. device acpi ==== //depot/projects/busdma/amd64/conf/NOTES#2 (text+ko) ==== @@ -4,7 +4,7 @@ # This file contains machine dependent kernel configuration notes. For # machine independent notes, look in /sys/conf/NOTES. # -# $FreeBSD: src/sys/amd64/conf/NOTES,v 1.53 2006/04/28 05:23:10 scottl Exp $ +# $FreeBSD: src/sys/amd64/conf/NOTES,v 1.54 2006/05/09 22:27:00 ambrisko Exp $ # # @@ -507,6 +507,10 @@ # and PSEUDOFS) options LINPROCFS +#Enable the linux-like sys filesystem support (requires COMPAT_LINUX32 +# and PSEUDOFS) +options LINSYSFS + # # SysVR4 ABI emulation # ==== //depot/projects/busdma/amd64/include/cpu.h#2 (text+ko) ==== @@ -30,7 +30,7 @@ * SUCH DAMAGE. * * from: @(#)cpu.h 5.4 (Berkeley) 5/9/91 - * $FreeBSD: src/sys/amd64/include/cpu.h,v 1.75 2005/12/22 22:16:05 jhb Exp $ + * $FreeBSD: src/sys/amd64/include/cpu.h,v 1.76 2006/05/11 17:29:24 phk Exp $ */ #ifndef _MACHINE_CPU_H_ @@ -59,15 +59,6 @@ (ISPL((framep)->tf_cs) == SEL_UPL) #define TRAPF_PC(framep) ((framep)->tf_rip) -/* - * CTL_MACHDEP definitions. - */ -#define CPU_CONSDEV 1 /* dev_t: console terminal device */ -#define CPU_ADJKERNTZ 2 /* int: timezone offset (seconds) */ -#define CPU_DISRTCSET 3 /* int: disable resettodr() call */ -#define CPU_WALLCLOCK 5 /* int: indicates wall CMOS clock */ -#define CPU_MAXID 6 /* number of valid machdep ids */ - #ifdef _KERNEL extern char btext[]; extern char etext[]; ==== //depot/projects/busdma/amd64/linux32/linux32_dummy.c#2 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/linux32/linux32_dummy.c,v 1.1 2004/08/16 07:55:06 tjr Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/linux32/linux32_dummy.c,v 1.2 2006/05/10 18:17:28 netchild Exp $"); #include #include @@ -54,7 +54,6 @@ DUMMY(query_module); DUMMY(nfsservctl); DUMMY(prctl); -DUMMY(rt_sigpending); DUMMY(rt_sigtimedwait); DUMMY(rt_sigqueueinfo); DUMMY(capget); ==== //depot/projects/busdma/amd64/linux32/linux32_proto.h#2 (text+ko) ==== @@ -2,8 +2,8 @@ * System call prototypes. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/amd64/linux32/linux32_proto.h,v 1.10 2006/03/20 18:54:29 netchild Exp $ - * created from FreeBSD: src/sys/amd64/linux32/syscalls.master,v 1.8 2006/03/20 18:53:26 netchild Exp + * $FreeBSD: src/sys/amd64/linux32/linux32_proto.h,v 1.11 2006/05/10 18:19:51 netchild Exp $ + * created from FreeBSD: src/sys/amd64/linux32/syscalls.master,v 1.9 2006/05/10 18:17:28 netchild Exp */ #ifndef _LINUX_SYSPROTO_H_ @@ -534,7 +534,8 @@ char sigsetsize_l_[PADL_(l_size_t)]; l_size_t sigsetsize; char sigsetsize_r_[PADR_(l_size_t)]; }; struct linux_rt_sigpending_args { - register_t dummy; + char set_l_[PADL_(l_sigset_t *)]; l_sigset_t * set; char set_r_[PADR_(l_sigset_t *)]; + char sigsetsize_l_[PADL_(l_size_t)]; l_size_t sigsetsize; char sigsetsize_r_[PADR_(l_size_t)]; }; struct linux_rt_sigtimedwait_args { register_t dummy; ==== //depot/projects/busdma/amd64/linux32/linux32_syscall.h#2 (text+ko) ==== @@ -2,8 +2,8 @@ * System call numbers. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/amd64/linux32/linux32_syscall.h,v 1.10 2006/03/20 18:54:29 netchild Exp $ - * created from FreeBSD: src/sys/amd64/linux32/syscalls.master,v 1.8 2006/03/20 18:53:26 netchild Exp + * $FreeBSD: src/sys/amd64/linux32/linux32_syscall.h,v 1.11 2006/05/10 18:19:51 netchild Exp $ + * created from FreeBSD: src/sys/amd64/linux32/syscalls.master,v 1.9 2006/05/10 18:17:28 netchild Exp */ #define LINUX_SYS_exit 1 ==== //depot/projects/busdma/amd64/linux32/linux32_sysent.c#2 (text+ko) ==== @@ -2,8 +2,8 @@ * System call switch table. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/amd64/linux32/linux32_sysent.c,v 1.10 2006/03/20 18:54:29 netchild Exp $ - * created from FreeBSD: src/sys/amd64/linux32/syscalls.master,v 1.8 2006/03/20 18:53:26 netchild Exp + * $FreeBSD: src/sys/amd64/linux32/linux32_sysent.c,v 1.11 2006/05/10 18:19:51 netchild Exp $ + * created from FreeBSD: src/sys/amd64/linux32/syscalls.master,v 1.9 2006/05/10 18:17:28 netchild Exp */ #include @@ -196,7 +196,7 @@ { SYF_MPSAFE | AS(linux_rt_sigreturn_args), (sy_call_t *)linux_rt_sigreturn, AUE_NULL }, /* 173 = linux_rt_sigreturn */ { SYF_MPSAFE | AS(linux_rt_sigaction_args), (sy_call_t *)linux_rt_sigaction, AUE_NULL }, /* 174 = linux_rt_sigaction */ { SYF_MPSAFE | AS(linux_rt_sigprocmask_args), (sy_call_t *)linux_rt_sigprocmask, AUE_NULL }, /* 175 = linux_rt_sigprocmask */ - { SYF_MPSAFE | 0, (sy_call_t *)linux_rt_sigpending, AUE_NULL }, /* 176 = linux_rt_sigpending */ + { SYF_MPSAFE | AS(linux_rt_sigpending_args), (sy_call_t *)linux_rt_sigpending, AUE_NULL }, /* 176 = linux_rt_sigpending */ { SYF_MPSAFE | 0, (sy_call_t *)linux_rt_sigtimedwait, AUE_NULL }, /* 177 = linux_rt_sigtimedwait */ { SYF_MPSAFE | 0, (sy_call_t *)linux_rt_sigqueueinfo, AUE_NULL }, /* 178 = linux_rt_sigqueueinfo */ { SYF_MPSAFE | AS(linux_rt_sigsuspend_args), (sy_call_t *)linux_rt_sigsuspend, AUE_NULL }, /* 179 = linux_rt_sigsuspend */ ==== //depot/projects/busdma/amd64/linux32/linux32_sysvec.c#2 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/linux32/linux32_sysvec.c,v 1.17 2006/03/19 11:10:32 ru Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/linux32/linux32_sysvec.c,v 1.18 2006/05/06 17:26:45 ambrisko Exp $"); #include "opt_compat.h" #ifndef COMPAT_IA32 @@ -109,6 +109,7 @@ extern struct sysent linux_sysent[LINUX_SYS_MAXSYSCALL]; SET_DECLARE(linux_ioctl_handler_set, struct linux_ioctl_handler); +SET_DECLARE(linux_device_handler_set, struct linux_device_handler); static int elf_linux_fixup(register_t **stack_base, struct image_params *iparams); @@ -1047,6 +1048,7 @@ Elf32_Brandinfo **brandinfo; int error; struct linux_ioctl_handler **lihp; + struct linux_device_handler **ldhp; error = 0; @@ -1059,6 +1061,8 @@ if (error == 0) { SET_FOREACH(lihp, linux_ioctl_handler_set) linux_ioctl_register_handler(*lihp); + SET_FOREACH(ldhp, linux_device_handler_set) + linux_device_register_handler(*ldhp); if (bootverbose) printf("Linux ELF exec handler installed\n"); } else @@ -1078,6 +1082,8 @@ if (error == 0) { SET_FOREACH(lihp, linux_ioctl_handler_set) linux_ioctl_unregister_handler(*lihp); + SET_FOREACH(ldhp, linux_device_handler_set) + linux_device_unregister_handler(*ldhp); if (bootverbose) printf("Linux ELF exec handler removed\n"); } else ==== //depot/projects/busdma/amd64/linux32/syscalls.master#2 (text+ko) ==== @@ -1,4 +1,4 @@ - $FreeBSD: src/sys/amd64/linux32/syscalls.master,v 1.8 2006/03/20 18:53:26 netchild Exp $ + $FreeBSD: src/sys/amd64/linux32/syscalls.master,v 1.9 2006/05/10 18:17:28 netchild Exp $ ; @(#)syscalls.master 8.1 (Berkeley) 7/19/93 ; System call name/number master file (or rather, slave, from LINUX). @@ -308,7 +308,8 @@ 175 AUE_NULL MSTD { int linux_rt_sigprocmask(l_int how, \ l_sigset_t *mask, l_sigset_t *omask, \ l_size_t sigsetsize); } -176 AUE_NULL MSTD { int linux_rt_sigpending(void); } +176 AUE_NULL MSTD { int linux_rt_sigpending(l_sigset_t *set, \ + l_size_t sigsetsize); } 177 AUE_NULL MSTD { int linux_rt_sigtimedwait(void); } 178 AUE_NULL MSTD { int linux_rt_sigqueueinfo(void); } 179 AUE_NULL MSTD { int linux_rt_sigsuspend( \ ==== //depot/projects/busdma/arm/arm/machdep.c#2 (text+ko) ==== @@ -44,7 +44,7 @@ #include "opt_compat.h" #include -__FBSDID("$FreeBSD: src/sys/arm/arm/machdep.c,v 1.21 2006/02/22 18:57:49 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/arm/machdep.c,v 1.22 2006/05/10 13:39:10 cognet Exp $"); #include #include @@ -232,6 +232,7 @@ vm_page_t m; #endif + cpu_setup(""); vm_ksubmap_init(&kmi); bufinit(); vm_pager_bufferinit(); @@ -241,7 +242,6 @@ USPACE_SVC_STACK_TOP; vector_page_setprot(VM_PROT_READ); pmap_set_pcb_pagedir(pmap_kernel(), pcb); - cpu_setup(""); identify_arm_cpu(); thread0.td_frame = (struct trapframe *)pcb->un_32.pcb32_sp - 1; pmap_postinit(); ==== //depot/projects/busdma/arm/at91/uart_bus_at91usart.c#2 (text) ==== @@ -25,7 +25,7 @@ #include "opt_uart.h" #include -__FBSDID("$FreeBSD: src/sys/arm/at91/uart_bus_at91usart.c,v 1.1 2006/02/04 23:32:13 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/at91/uart_bus_at91usart.c,v 1.2 2006/05/11 14:30:28 cognet Exp $"); #include #include @@ -104,7 +104,7 @@ break; } sc->sc_class = &at91_usart_class; - return (uart_bus_probe(dev, 0, 0, 0, device_get_unit(dev), 0)); + return (uart_bus_probe(dev, 0, 0, 0, 0)); } ==== //depot/projects/busdma/arm/include/cpu.h#2 (text+ko) ==== @@ -1,5 +1,5 @@ /* $NetBSD: cpu.h,v 1.2 2001/02/23 21:23:52 reinoud Exp $ */ -/* $FreeBSD: src/sys/arm/include/cpu.h,v 1.5 2005/12/22 22:16:06 jhb Exp $ */ +/* $FreeBSD: src/sys/arm/include/cpu.h,v 1.6 2006/05/11 17:29:24 phk Exp $ */ #ifndef MACHINE_CPU_H #define MACHINE_CPU_H @@ -21,14 +21,6 @@ } #endif -#define CPU_CONSDEV 1 -#define CPU_ADJKERNTZ 2 /* int: timezone offset (seconds) */ -#define CPU_DISRTCSET 3 /* int: disable resettodr() call */ -#define CPU_BOOTINFO 4 /* struct: bootinfo */ -#define CPU_WALLCLOCK 5 /* int: indicates wall CMOS clock */ -#define CPU_MAXID 6 /* number of valid machdep ids */ - - #define TRAPF_USERMODE(frame) ((frame->tf_spsr & PSR_MODE) == PSR_USR32_MODE) #define TRAPF_PC(tfp) ((tfp)->tf_pc) ==== //depot/projects/busdma/arm/xscale/i80321/iq80321.c#2 (text+ko) ==== @@ -42,7 +42,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/arm/xscale/i80321/iq80321.c,v 1.11 2006/04/20 04:12:02 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/xscale/i80321/iq80321.c,v 1.12 2006/05/05 19:14:57 cognet Exp $"); #define _ARM32_BUS_DMA_PRIVATE #include @@ -307,6 +307,7 @@ start, end, count, flags, child); if (rv != NULL) rman_set_rid(rv, *rid); + return (rv); } return (NULL); } ==== //depot/projects/busdma/boot/pc98/boot2/io.c#2 (text+ko) ==== @@ -27,12 +27,12 @@ */ #include -__FBSDID("$FreeBSD: src/sys/boot/pc98/boot2/io.c,v 1.9 2005/09/14 12:39:06 nyan Exp $"); +__FBSDID("$FreeBSD: src/sys/boot/pc98/boot2/io.c,v 1.10 2006/05/09 14:20:17 nyan Exp $"); #include "boot.h" #include #include -#include +#include static int getchar(int in_buf); ==== //depot/projects/busdma/compat/linprocfs/linprocfs.c#2 (text+ko) ==== @@ -40,7 +40,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/compat/linprocfs/linprocfs.c,v 1.91 2005/12/11 21:37:42 mlaier Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/linprocfs/linprocfs.c,v 1.92 2006/05/05 16:10:45 ambrisko Exp $"); #include #include @@ -388,8 +388,13 @@ else if (strcmp(fstype, "procfs") == 0) continue; - sbuf_printf(sb, "%s %s %s %s", mntfrom, mntto, fstype, - mp->mnt_stat.f_flags & MNT_RDONLY ? "ro" : "rw"); + if (strcmp(fstype, "linsysfs") == 0) { + sbuf_printf(sb, "/sys %s sysfs %s", mntto, + mp->mnt_stat.f_flags & MNT_RDONLY ? "ro" : "rw"); + } else { + sbuf_printf(sb, "%s %s %s %s", mntfrom, mntto, fstype, + mp->mnt_stat.f_flags & MNT_RDONLY ? "ro" : "rw"); + } #define ADD_OPTION(opt, name) \ if (mp->mnt_stat.f_flags & (opt)) sbuf_printf(sb, "," name); ADD_OPTION(MNT_SYNCHRONOUS, "sync"); @@ -952,7 +957,24 @@ return (0); } -#if 0 +/* + * Filler function for proc/scsi/device_info + */ +static int +linprocfs_doscsidevinfo(PFS_FILL_ARGS) +{ + return (0); +} + +/* + * Filler function for proc/scsi/scsi + */ +static int +linprocfs_doscsiscsi(PFS_FILL_ARGS) +{ + return (0); +} + extern struct cdevsw *cdevsw[]; /* @@ -961,19 +983,17 @@ static int linprocfs_dodevices(PFS_FILL_ARGS) { - int i; - + char *char_devices; sbuf_printf(sb, "Character devices:\n"); - for (i = 0; i < NUMCDEVSW; i++) - if (cdevsw[i] != NULL) - sbuf_printf(sb, "%3d %s\n", i, cdevsw[i]->d_name); + char_devices = linux_get_char_devices(); + sbuf_printf(sb, "%s", char_devices); + linux_free_get_char_devices(char_devices); sbuf_printf(sb, "\nBlock devices:\n"); return (0); } -#endif /* * Filler function for proc/cmdline @@ -1019,10 +1039,8 @@ NULL, NULL, PFS_RD); pfs_create_file(root, "cpuinfo", &linprocfs_docpuinfo, NULL, NULL, PFS_RD); -#if 0 pfs_create_file(root, "devices", &linprocfs_dodevices, NULL, NULL, PFS_RD); -#endif pfs_create_file(root, "loadavg", &linprocfs_doloadavg, NULL, NULL, PFS_RD); pfs_create_file(root, "meminfo", &linprocfs_domeminfo, @@ -1031,6 +1049,8 @@ pfs_create_file(root, "modules", &linprocfs_domodules, NULL, NULL, PFS_RD); #endif + pfs_create_file(root, "mounts", &linprocfs_domtab, + NULL, NULL, PFS_RD); pfs_create_file(root, "mtab", &linprocfs_domtab, NULL, NULL, PFS_RD); pfs_create_link(root, "self", &procfs_docurproc, @@ -1070,6 +1090,12 @@ pfs_create_file(dir, "status", &linprocfs_doprocstatus, NULL, NULL, PFS_RD); + /* /proc/scsi/... */ + dir = pfs_create_dir(root, "scsi", NULL, NULL, 0); + pfs_create_file(dir, "device_info", &linprocfs_doscsidevinfo, + NULL, NULL, PFS_RD); + pfs_create_file(dir, "scsi", &linprocfs_doscsiscsi, + NULL, NULL, PFS_RD); return (0); } ==== //depot/projects/busdma/compat/linux/linux_file.c#2 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/compat/linux/linux_file.c,v 1.94 2006/03/19 11:10:32 ru Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/linux/linux_file.c,v 1.95 2006/05/10 20:38:15 netchild Exp $"); #include "opt_compat.h" #include "opt_mac.h" @@ -63,7 +63,6 @@ #endif #include -#ifndef __alpha__ int linux_creat(struct thread *td, struct linux_creat_args *args) { @@ -81,7 +80,6 @@ LFREEPATH(path); return (error); } -#endif /*!__alpha__*/ int linux_open(struct thread *td, struct linux_open_args *args) @@ -175,7 +173,6 @@ return error; } -#ifndef __alpha__ int linux_llseek(struct thread *td, struct linux_llseek_args *args) { @@ -203,9 +200,7 @@ td->td_retval[0] = 0; return 0; } -#endif /*!__alpha__*/ -#ifndef __alpha__ int linux_readdir(struct thread *td, struct linux_readdir_args *args) { @@ -216,7 +211,6 @@ lda.count = 1; return linux_getdents(td, &lda); } -#endif /*!__alpha__*/ /* * Note that linux_getdents(2) and linux_getdents64(2) have the same @@ -705,7 +699,6 @@ return (error); } -#ifndef __alpha__ int linux_fdatasync(td, uap) struct thread *td; @@ -716,7 +709,6 @@ bsd.fd = uap->fd; return fsync(td, &bsd); } -#endif /*!__alpha__*/ int linux_pread(td, uap) @@ -951,10 +943,6 @@ } #endif /* __i386__ || (__amd64__ && COMPAT_LINUX32) */ -#if defined(__alpha__) -#define linux_fcntl64_args linux_fcntl_args -#endif - static int fcntl_common(struct thread *td, struct linux_fcntl64_args *args) { ==== //depot/projects/busdma/compat/linux/linux_ioctl.c#2 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/compat/linux/linux_ioctl.c,v 1.135 2006/03/19 11:10:33 ru Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/linux/linux_ioctl.c,v 1.136 2006/05/10 20:38:15 netchild Exp $"); #include #include @@ -276,15 +276,8 @@ unsigned int c_oflag; unsigned int c_cflag; unsigned int c_lflag; -#ifdef __alpha__ - unsigned char c_cc[LINUX_NCCS]; - unsigned char c_line; - unsigned int c_ispeed; - unsigned int c_ospeed; -#else unsigned char c_line; unsigned char c_cc[LINUX_NCCS]; -#endif }; struct linux_winsize { >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Fri May 12 00:23:56 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5500A16A44A; Fri, 12 May 2006 00:23:56 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 3831716A41B for ; Fri, 12 May 2006 00:23:55 +0000 (UTC) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id B279643F7B for ; Fri, 12 May 2006 00:02:23 +0000 (GMT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k4C02NFn043931 for ; Fri, 12 May 2006 00:02:23 GMT (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k4C02MYX043897 for perforce@freebsd.org; Fri, 12 May 2006 00:02:22 GMT (envelope-from marcel@freebsd.org) Date: Fri, 12 May 2006 00:02:22 GMT Message-Id: <200605120002.k4C02MYX043897@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Cc: Subject: PERFORCE change 96984 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 12 May 2006 00:24:00 -0000 http://perforce.freebsd.org/chv.cgi?CH=96984 Change 96984 by marcel@marcel_nfs on 2006/05/12 00:01:21 IFC @96983 Affected files ... .. //depot/projects/ia64/MAINTAINERS#52 integrate .. //depot/projects/ia64/Makefile#48 integrate .. //depot/projects/ia64/UPDATING#86 integrate .. //depot/projects/ia64/bin/pax/pax.1#10 integrate .. //depot/projects/ia64/contrib/traceroute/traceroute.8#5 integrate .. //depot/projects/ia64/contrib/traceroute/traceroute.c#8 integrate .. //depot/projects/ia64/etc/Makefile#55 integrate .. //depot/projects/ia64/etc/defaults/rc.conf#69 integrate .. //depot/projects/ia64/etc/mtree/BSD.root.dist#18 integrate .. //depot/projects/ia64/etc/nsswitch.conf#1 branch .. //depot/projects/ia64/etc/rc.d/jail#19 integrate .. //depot/projects/ia64/etc/rc.d/nsswitch#7 integrate .. //depot/projects/ia64/games/fortune/datfiles/fortunes#56 integrate .. //depot/projects/ia64/lib/libc/gen/syslog.c#14 integrate .. //depot/projects/ia64/lib/libc/i386/sys/i386_set_watch.3#6 integrate .. //depot/projects/ia64/lib/libc/net/nscachedcli.c#2 integrate .. //depot/projects/ia64/lib/libc/stdlib/malloc.c#31 integrate .. //depot/projects/ia64/lib/libpthread/arch/i386/i386/thr_getcontext.S#5 integrate .. //depot/projects/ia64/lib/libthr/pthread.map#6 integrate .. //depot/projects/ia64/release/doc/en_US.ISO8859-1/hardware/common/artheader.sgml#7 integrate .. //depot/projects/ia64/release/doc/en_US.ISO8859-1/installation/common/artheader.sgml#7 integrate .. //depot/projects/ia64/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#157 integrate .. //depot/projects/ia64/sbin/adjkerntz/adjkerntz.c#5 integrate .. //depot/projects/ia64/sbin/dhclient/dhclient.c#3 integrate .. //depot/projects/ia64/sbin/ipf/ipf/Makefile#3 integrate .. //depot/projects/ia64/sbin/mount/mount.c#25 integrate .. //depot/projects/ia64/share/man/man4/fdc.4#5 integrate .. //depot/projects/ia64/share/man/man5/Makefile#25 integrate .. //depot/projects/ia64/share/man/man5/linsysfs.5#1 branch .. //depot/projects/ia64/share/man/man5/rc.conf.5#71 integrate .. //depot/projects/ia64/share/man/man7/hier.7#31 integrate .. //depot/projects/ia64/share/man/man9/make_dev.9#9 integrate .. //depot/projects/ia64/share/misc/bsd-family-tree#30 integrate .. //depot/projects/ia64/share/zoneinfo/africa#6 integrate .. //depot/projects/ia64/share/zoneinfo/antarctica#6 integrate .. //depot/projects/ia64/share/zoneinfo/asia#11 integrate .. //depot/projects/ia64/share/zoneinfo/australasia#10 integrate .. //depot/projects/ia64/share/zoneinfo/backward#8 integrate .. //depot/projects/ia64/share/zoneinfo/etcetera#3 integrate .. //depot/projects/ia64/share/zoneinfo/europe#11 integrate .. //depot/projects/ia64/share/zoneinfo/factory#2 integrate .. //depot/projects/ia64/share/zoneinfo/leapseconds#9 integrate .. //depot/projects/ia64/share/zoneinfo/northamerica#11 integrate .. //depot/projects/ia64/share/zoneinfo/southamerica#12 integrate .. //depot/projects/ia64/share/zoneinfo/systemv#3 integrate .. //depot/projects/ia64/share/zoneinfo/yearistype.sh#3 integrate .. //depot/projects/ia64/share/zoneinfo/zone.tab#12 integrate .. //depot/projects/ia64/sys/alpha/Makefile#2 delete .. //depot/projects/ia64/sys/alpha/alpha/api_up1000.c#11 delete .. //depot/projects/ia64/sys/alpha/alpha/atomic.s#3 delete .. //depot/projects/ia64/sys/alpha/alpha/autoconf.c#12 delete .. //depot/projects/ia64/sys/alpha/alpha/busdma_machdep.c#28 delete .. //depot/projects/ia64/sys/alpha/alpha/busspace.c#4 delete .. //depot/projects/ia64/sys/alpha/alpha/clock.c#18 delete .. //depot/projects/ia64/sys/alpha/alpha/clock_if.m#3 delete .. //depot/projects/ia64/sys/alpha/alpha/cpuconf.c#9 delete .. //depot/projects/ia64/sys/alpha/alpha/db_disasm.c#8 delete .. //depot/projects/ia64/sys/alpha/alpha/db_instruction.h#5 delete .. //depot/projects/ia64/sys/alpha/alpha/db_interface.c#10 delete .. //depot/projects/ia64/sys/alpha/alpha/db_trace.c#14 delete .. //depot/projects/ia64/sys/alpha/alpha/dec_1000a.c#12 delete .. //depot/projects/ia64/sys/alpha/alpha/dec_2100_a50.c#13 delete .. //depot/projects/ia64/sys/alpha/alpha/dec_2100_a500.c#13 delete .. //depot/projects/ia64/sys/alpha/alpha/dec_3000_300.c#5 delete .. //depot/projects/ia64/sys/alpha/alpha/dec_3000_500.c#5 delete .. //depot/projects/ia64/sys/alpha/alpha/dec_axppci_33.c#14 delete .. //depot/projects/ia64/sys/alpha/alpha/dec_eb164.c#11 delete .. //depot/projects/ia64/sys/alpha/alpha/dec_eb64plus.c#13 delete .. //depot/projects/ia64/sys/alpha/alpha/dec_kn20aa.c#13 delete .. //depot/projects/ia64/sys/alpha/alpha/dec_kn300.c#13 delete .. //depot/projects/ia64/sys/alpha/alpha/dec_kn8ae.c#6 delete .. //depot/projects/ia64/sys/alpha/alpha/dec_st550.c#12 delete .. //depot/projects/ia64/sys/alpha/alpha/dec_st6600.c#11 delete .. //depot/projects/ia64/sys/alpha/alpha/divrem.m4#4 delete .. //depot/projects/ia64/sys/alpha/alpha/dump_machdep.c#7 delete .. //depot/projects/ia64/sys/alpha/alpha/elf_machdep.c#15 delete .. //depot/projects/ia64/sys/alpha/alpha/exception.s#7 delete .. //depot/projects/ia64/sys/alpha/alpha/fp_emulate.c#6 delete .. //depot/projects/ia64/sys/alpha/alpha/gdb_machdep.c#4 delete .. //depot/projects/ia64/sys/alpha/alpha/genassym.c#12 delete .. //depot/projects/ia64/sys/alpha/alpha/ieee_float.c#5 delete .. //depot/projects/ia64/sys/alpha/alpha/ieee_float.h#2 delete .. //depot/projects/ia64/sys/alpha/alpha/in_cksum.c#5 delete .. //depot/projects/ia64/sys/alpha/alpha/interrupt.c#23 delete .. //depot/projects/ia64/sys/alpha/alpha/locore.s#6 delete .. //depot/projects/ia64/sys/alpha/alpha/machdep.c#53 delete .. //depot/projects/ia64/sys/alpha/alpha/mem.c#14 delete .. //depot/projects/ia64/sys/alpha/alpha/mp_machdep.c#24 delete .. //depot/projects/ia64/sys/alpha/alpha/pal.s#4 delete .. //depot/projects/ia64/sys/alpha/alpha/pmap.c#61 delete .. //depot/projects/ia64/sys/alpha/alpha/prom.c#12 delete .. //depot/projects/ia64/sys/alpha/alpha/prom_disp.s#4 delete .. //depot/projects/ia64/sys/alpha/alpha/promcons.c#17 delete .. //depot/projects/ia64/sys/alpha/alpha/sgmap.c#6 delete .. //depot/projects/ia64/sys/alpha/alpha/support.s#12 delete .. //depot/projects/ia64/sys/alpha/alpha/swtch.s#5 delete .. //depot/projects/ia64/sys/alpha/alpha/sys_machdep.c#13 delete .. //depot/projects/ia64/sys/alpha/alpha/trap.c#39 delete .. //depot/projects/ia64/sys/alpha/alpha/uio_machdep.c#5 delete .. //depot/projects/ia64/sys/alpha/alpha/uma_machdep.c#2 delete .. //depot/projects/ia64/sys/alpha/alpha/vm_machdep.c#38 delete .. //depot/projects/ia64/sys/alpha/compile/.cvsignore#2 delete .. //depot/projects/ia64/sys/alpha/conf/.cvsignore#2 delete .. //depot/projects/ia64/sys/alpha/conf/DEFAULTS#3 delete .. //depot/projects/ia64/sys/alpha/conf/GENERIC#42 delete .. //depot/projects/ia64/sys/alpha/conf/GENERIC.hints#7 delete .. //depot/projects/ia64/sys/alpha/conf/MAC#2 delete .. //depot/projects/ia64/sys/alpha/conf/Makefile#3 delete .. //depot/projects/ia64/sys/alpha/conf/NOTES#11 delete .. //depot/projects/ia64/sys/alpha/include/_bus.h#2 delete .. //depot/projects/ia64/sys/alpha/include/_inttypes.h#3 delete .. //depot/projects/ia64/sys/alpha/include/_limits.h#9 delete .. //depot/projects/ia64/sys/alpha/include/_stdint.h#3 delete .. //depot/projects/ia64/sys/alpha/include/_types.h#7 delete .. //depot/projects/ia64/sys/alpha/include/alpha_cpu.h#5 delete .. //depot/projects/ia64/sys/alpha/include/asm.h#7 delete .. //depot/projects/ia64/sys/alpha/include/atomic.h#13 delete .. //depot/projects/ia64/sys/alpha/include/bootinfo.h#4 delete .. //depot/projects/ia64/sys/alpha/include/bus.h#20 delete .. //depot/projects/ia64/sys/alpha/include/bus_dma.h#2 delete .. //depot/projects/ia64/sys/alpha/include/bwx.h#2 delete .. //depot/projects/ia64/sys/alpha/include/chipset.h#3 delete .. //depot/projects/ia64/sys/alpha/include/clock.h#4 delete .. //depot/projects/ia64/sys/alpha/include/clockvar.h#3 delete .. //depot/projects/ia64/sys/alpha/include/cpu.h#12 delete .. //depot/projects/ia64/sys/alpha/include/cpuconf.h#6 delete .. //depot/projects/ia64/sys/alpha/include/cpufunc.h#6 delete .. //depot/projects/ia64/sys/alpha/include/db_machdep.h#8 delete .. //depot/projects/ia64/sys/alpha/include/elf.h#6 delete .. //depot/projects/ia64/sys/alpha/include/endian.h#11 delete .. //depot/projects/ia64/sys/alpha/include/exec.h#4 delete .. //depot/projects/ia64/sys/alpha/include/float.h#6 delete .. //depot/projects/ia64/sys/alpha/include/floatingpoint.h#3 delete .. //depot/projects/ia64/sys/alpha/include/fpu.h#4 delete .. //depot/projects/ia64/sys/alpha/include/frame.h#3 delete .. //depot/projects/ia64/sys/alpha/include/gdb_machdep.h#4 delete .. //depot/projects/ia64/sys/alpha/include/ieee.h#4 delete .. //depot/projects/ia64/sys/alpha/include/ieeefp.h#3 delete .. //depot/projects/ia64/sys/alpha/include/in_cksum.h#4 delete .. //depot/projects/ia64/sys/alpha/include/inst.h#2 delete .. //depot/projects/ia64/sys/alpha/include/intr.h#4 delete .. //depot/projects/ia64/sys/alpha/include/intrcnt.h#3 delete .. //depot/projects/ia64/sys/alpha/include/ioctl_bt848.h#4 delete .. //depot/projects/ia64/sys/alpha/include/ioctl_meteor.h#7 delete .. //depot/projects/ia64/sys/alpha/include/kdb.h#4 delete .. //depot/projects/ia64/sys/alpha/include/limits.h#10 delete .. //depot/projects/ia64/sys/alpha/include/md_var.h#6 delete .. //depot/projects/ia64/sys/alpha/include/memdev.h#2 delete .. //depot/projects/ia64/sys/alpha/include/mutex.h#4 delete .. //depot/projects/ia64/sys/alpha/include/pal.h#3 delete .. //depot/projects/ia64/sys/alpha/include/param.h#14 delete .. //depot/projects/ia64/sys/alpha/include/pc/bios.h#3 delete .. //depot/projects/ia64/sys/alpha/include/pc/display.h#2 delete .. //depot/projects/ia64/sys/alpha/include/pc/vesa.h#3 delete .. //depot/projects/ia64/sys/alpha/include/pcb.h#7 delete .. //depot/projects/ia64/sys/alpha/include/pcpu.h#5 delete .. //depot/projects/ia64/sys/alpha/include/pmap.h#17 delete .. //depot/projects/ia64/sys/alpha/include/pmc_mdep.h#3 delete .. //depot/projects/ia64/sys/alpha/include/ppireg.h#2 delete .. //depot/projects/ia64/sys/alpha/include/proc.h#8 delete .. //depot/projects/ia64/sys/alpha/include/profile.h#6 delete .. //depot/projects/ia64/sys/alpha/include/prom.h#5 delete .. //depot/projects/ia64/sys/alpha/include/pte.h#3 delete .. //depot/projects/ia64/sys/alpha/include/ptrace.h#6 delete .. //depot/projects/ia64/sys/alpha/include/reg.h#5 delete .. //depot/projects/ia64/sys/alpha/include/reloc.h#3 delete .. //depot/projects/ia64/sys/alpha/include/resource.h#3 delete .. //depot/projects/ia64/sys/alpha/include/rpb.h#4 delete .. //depot/projects/ia64/sys/alpha/include/runq.h#4 delete .. //depot/projects/ia64/sys/alpha/include/setjmp.h#3 delete .. //depot/projects/ia64/sys/alpha/include/sf_buf.h#3 delete .. //depot/projects/ia64/sys/alpha/include/sgmap.h#2 delete .. //depot/projects/ia64/sys/alpha/include/sigframe.h#4 delete .. //depot/projects/ia64/sys/alpha/include/signal.h#7 delete .. //depot/projects/ia64/sys/alpha/include/smp.h#5 delete .. //depot/projects/ia64/sys/alpha/include/stdarg.h#7 delete .. //depot/projects/ia64/sys/alpha/include/swiz.h#2 delete .. //depot/projects/ia64/sys/alpha/include/sysarch.h#5 delete .. //depot/projects/ia64/sys/alpha/include/timerreg.h#3 delete .. //depot/projects/ia64/sys/alpha/include/ucontext.h#6 delete .. //depot/projects/ia64/sys/alpha/include/varargs.h#7 delete .. //depot/projects/ia64/sys/alpha/include/vmparam.h#6 delete .. //depot/projects/ia64/sys/alpha/isa/isa.c#11 delete .. //depot/projects/ia64/sys/alpha/isa/isa_dma.c#10 delete .. //depot/projects/ia64/sys/alpha/isa/isavar.h#2 delete .. //depot/projects/ia64/sys/alpha/isa/mcclock_isa.c#6 delete .. //depot/projects/ia64/sys/alpha/linux/Makefile#2 delete .. //depot/projects/ia64/sys/alpha/linux/linux.h#5 delete .. //depot/projects/ia64/sys/alpha/linux/linux_dummy.c#7 delete .. //depot/projects/ia64/sys/alpha/linux/linux_genassym.c#5 delete .. //depot/projects/ia64/sys/alpha/linux/linux_ipc64.h#2 delete .. //depot/projects/ia64/sys/alpha/linux/linux_locore.s#2 delete .. //depot/projects/ia64/sys/alpha/linux/linux_machdep.c#17 delete .. //depot/projects/ia64/sys/alpha/linux/linux_proto.h#16 delete .. //depot/projects/ia64/sys/alpha/linux/linux_syscall.h#15 delete .. //depot/projects/ia64/sys/alpha/linux/linux_sysent.c#15 delete .. //depot/projects/ia64/sys/alpha/linux/linux_sysvec.c#21 delete .. //depot/projects/ia64/sys/alpha/linux/syscalls.conf#3 delete .. //depot/projects/ia64/sys/alpha/linux/syscalls.master#15 delete .. //depot/projects/ia64/sys/alpha/mcbus/mcbus.c#6 delete .. //depot/projects/ia64/sys/alpha/mcbus/mcbusreg.h#3 delete .. //depot/projects/ia64/sys/alpha/mcbus/mcbusvar.h#4 delete .. //depot/projects/ia64/sys/alpha/mcbus/mcmem.c#5 delete .. //depot/projects/ia64/sys/alpha/mcbus/mcpcia.c#13 delete .. //depot/projects/ia64/sys/alpha/mcbus/mcpciareg.h#3 delete .. //depot/projects/ia64/sys/alpha/mcbus/mcpciavar.h#4 delete .. //depot/projects/ia64/sys/alpha/osf1/Makefile#3 delete .. //depot/projects/ia64/sys/alpha/osf1/README.mach-traps#2 delete .. //depot/projects/ia64/sys/alpha/osf1/exec_ecoff.h#3 delete .. //depot/projects/ia64/sys/alpha/osf1/imgact_osf1.c#16 delete .. //depot/projects/ia64/sys/alpha/osf1/osf1.h#4 delete .. //depot/projects/ia64/sys/alpha/osf1/osf1_ioctl.c#8 delete .. //depot/projects/ia64/sys/alpha/osf1/osf1_misc.c#31 delete .. //depot/projects/ia64/sys/alpha/osf1/osf1_mount.c#16 delete .. //depot/projects/ia64/sys/alpha/osf1/osf1_proto.h#10 delete .. //depot/projects/ia64/sys/alpha/osf1/osf1_signal.c#23 delete .. //depot/projects/ia64/sys/alpha/osf1/osf1_signal.h#4 delete .. //depot/projects/ia64/sys/alpha/osf1/osf1_syscall.h#9 delete .. //depot/projects/ia64/sys/alpha/osf1/osf1_sysent.c#9 delete .. //depot/projects/ia64/sys/alpha/osf1/osf1_sysvec.c#9 delete .. //depot/projects/ia64/sys/alpha/osf1/osf1_util.h#6 delete .. //depot/projects/ia64/sys/alpha/osf1/syscalls.conf#3 delete .. //depot/projects/ia64/sys/alpha/osf1/syscalls.master#9 delete .. //depot/projects/ia64/sys/alpha/pci/alphapci_if.m#3 delete .. //depot/projects/ia64/sys/alpha/pci/apecs.c#10 delete .. //depot/projects/ia64/sys/alpha/pci/apecs_pci.c#6 delete .. //depot/projects/ia64/sys/alpha/pci/apecsreg.h#3 delete .. //depot/projects/ia64/sys/alpha/pci/apecsvar.h#2 delete .. //depot/projects/ia64/sys/alpha/pci/bwx.c#4 delete .. //depot/projects/ia64/sys/alpha/pci/cia.c#10 delete .. //depot/projects/ia64/sys/alpha/pci/cia_pci.c#6 delete .. //depot/projects/ia64/sys/alpha/pci/ciareg.h#3 delete .. //depot/projects/ia64/sys/alpha/pci/ciavar.h#2 delete .. //depot/projects/ia64/sys/alpha/pci/irongate.c#6 delete .. //depot/projects/ia64/sys/alpha/pci/irongate_pci.c#6 delete .. //depot/projects/ia64/sys/alpha/pci/irongatereg.h#2 delete .. //depot/projects/ia64/sys/alpha/pci/irongatevar.h#2 delete .. //depot/projects/ia64/sys/alpha/pci/lca.c#7 delete .. //depot/projects/ia64/sys/alpha/pci/lca_pci.c#8 delete .. //depot/projects/ia64/sys/alpha/pci/lcareg.h#4 delete .. //depot/projects/ia64/sys/alpha/pci/lcavar.h#2 delete .. //depot/projects/ia64/sys/alpha/pci/pci_eb164_intr.s#3 delete .. //depot/projects/ia64/sys/alpha/pci/pci_eb64plus_intr.s#3 delete .. //depot/projects/ia64/sys/alpha/pci/pcibus.c#10 delete .. //depot/projects/ia64/sys/alpha/pci/pcibus.h#3 delete .. //depot/projects/ia64/sys/alpha/pci/swiz.c#4 delete .. //depot/projects/ia64/sys/alpha/pci/t2.c#11 delete .. //depot/projects/ia64/sys/alpha/pci/t2_pci.c#6 delete .. //depot/projects/ia64/sys/alpha/pci/t2reg.h#3 delete .. //depot/projects/ia64/sys/alpha/pci/t2var.h#2 delete .. //depot/projects/ia64/sys/alpha/pci/tsunami.c#10 delete .. //depot/projects/ia64/sys/alpha/pci/tsunami_pci.c#8 delete .. //depot/projects/ia64/sys/alpha/pci/tsunamireg.h#3 delete .. //depot/projects/ia64/sys/alpha/pci/tsunamivar.h#2 delete .. //depot/projects/ia64/sys/alpha/tlsb/dwlpx.c#10 delete .. //depot/projects/ia64/sys/alpha/tlsb/dwlpxreg.h#3 delete .. //depot/projects/ia64/sys/alpha/tlsb/dwlpxvar.h#3 delete .. //depot/projects/ia64/sys/alpha/tlsb/gbus.c#5 delete .. //depot/projects/ia64/sys/alpha/tlsb/gbusreg.h#2 delete .. //depot/projects/ia64/sys/alpha/tlsb/gbusvar.h#2 delete .. //depot/projects/ia64/sys/alpha/tlsb/kftxx.c#5 delete .. //depot/projects/ia64/sys/alpha/tlsb/kftxxreg.h#3 delete .. //depot/projects/ia64/sys/alpha/tlsb/kftxxvar.h#2 delete .. //depot/projects/ia64/sys/alpha/tlsb/mcclock_tlsb.c#5 delete .. //depot/projects/ia64/sys/alpha/tlsb/tlsb.c#6 delete .. //depot/projects/ia64/sys/alpha/tlsb/tlsbcpu.c#5 delete .. //depot/projects/ia64/sys/alpha/tlsb/tlsbmem.c#5 delete .. //depot/projects/ia64/sys/alpha/tlsb/tlsbreg.h#3 delete .. //depot/projects/ia64/sys/alpha/tlsb/tlsbvar.h#3 delete .. //depot/projects/ia64/sys/alpha/tlsb/zs_tlsb.c#16 delete .. //depot/projects/ia64/sys/alpha/tlsb/zsreg.h#2 delete .. //depot/projects/ia64/sys/alpha/tlsb/zsvar.h#2 delete .. //depot/projects/ia64/sys/amd64/amd64/apic_vector.S#12 integrate .. //depot/projects/ia64/sys/amd64/amd64/busdma_machdep.c#18 integrate .. //depot/projects/ia64/sys/amd64/amd64/machdep.c#37 integrate .. //depot/projects/ia64/sys/amd64/amd64/mp_machdep.c#22 integrate .. //depot/projects/ia64/sys/amd64/amd64/pmap.c#52 integrate .. //depot/projects/ia64/sys/amd64/conf/GENERIC#34 integrate .. //depot/projects/ia64/sys/amd64/conf/NOTES#18 integrate .. //depot/projects/ia64/sys/amd64/include/apicvar.h#11 integrate .. //depot/projects/ia64/sys/amd64/include/cpu.h#7 integrate .. //depot/projects/ia64/sys/amd64/include/pmap.h#20 integrate .. //depot/projects/ia64/sys/amd64/include/smp.h#11 integrate .. //depot/projects/ia64/sys/amd64/include/specialreg.h#9 integrate .. //depot/projects/ia64/sys/amd64/linux32/linux32_dummy.c#2 integrate .. //depot/projects/ia64/sys/amd64/linux32/linux32_proto.h#6 integrate .. //depot/projects/ia64/sys/amd64/linux32/linux32_syscall.h#6 integrate .. //depot/projects/ia64/sys/amd64/linux32/linux32_sysent.c#6 integrate .. //depot/projects/ia64/sys/amd64/linux32/linux32_sysvec.c#10 integrate .. //depot/projects/ia64/sys/amd64/linux32/syscalls.master#6 integrate .. //depot/projects/ia64/sys/arm/arm/machdep.c#12 integrate .. //depot/projects/ia64/sys/arm/at91/at91_pdcreg.h#1 branch .. //depot/projects/ia64/sys/arm/at91/uart_bus_at91usart.c#2 integrate .. //depot/projects/ia64/sys/arm/include/cpu.h#6 integrate .. //depot/projects/ia64/sys/arm/xscale/i80321/iq80321.c#9 integrate .. //depot/projects/ia64/sys/boot/alpha/Makefile#2 delete .. //depot/projects/ia64/sys/boot/alpha/Makefile.inc#4 delete .. //depot/projects/ia64/sys/boot/alpha/boot1/Makefile#9 delete .. //depot/projects/ia64/sys/boot/alpha/boot1/boot1.c#5 delete .. //depot/projects/ia64/sys/boot/alpha/cdboot/Makefile#5 delete .. //depot/projects/ia64/sys/boot/alpha/cdboot/version#4 delete .. //depot/projects/ia64/sys/boot/alpha/common/Makefile.common#7 delete .. //depot/projects/ia64/sys/boot/alpha/common/conf.c#5 delete .. //depot/projects/ia64/sys/boot/alpha/common/help.alpha#3 delete .. //depot/projects/ia64/sys/boot/alpha/common/ldscript#2 delete .. //depot/projects/ia64/sys/boot/alpha/common/main.c#4 delete .. //depot/projects/ia64/sys/boot/alpha/libalpha/Makefile#6 delete .. //depot/projects/ia64/sys/boot/alpha/libalpha/OSFpal.c#3 delete .. //depot/projects/ia64/sys/boot/alpha/libalpha/alpha_copy.c#3 delete .. //depot/projects/ia64/sys/boot/alpha/libalpha/alpha_module.c#3 delete .. //depot/projects/ia64/sys/boot/alpha/libalpha/bbinfo.h#2 delete .. //depot/projects/ia64/sys/boot/alpha/libalpha/bootinfo.c#4 delete .. //depot/projects/ia64/sys/boot/alpha/libalpha/common.h#3 delete .. //depot/projects/ia64/sys/boot/alpha/libalpha/delay.c#4 delete .. //depot/projects/ia64/sys/boot/alpha/libalpha/devicename.c#4 delete .. //depot/projects/ia64/sys/boot/alpha/libalpha/elf_freebsd.c#5 delete .. //depot/projects/ia64/sys/boot/alpha/libalpha/getsecs.c#4 delete .. //depot/projects/ia64/sys/boot/alpha/libalpha/libalpha.h#3 delete .. //depot/projects/ia64/sys/boot/alpha/libalpha/pal.S#2 delete .. //depot/projects/ia64/sys/boot/alpha/libalpha/prom.c#3 delete .. //depot/projects/ia64/sys/boot/alpha/libalpha/prom_disp.S#2 delete .. //depot/projects/ia64/sys/boot/alpha/libalpha/prom_swpal.S#2 delete .. //depot/projects/ia64/sys/boot/alpha/libalpha/reboot.c#3 delete .. //depot/projects/ia64/sys/boot/alpha/libalpha/srmdisk.c#5 delete .. //depot/projects/ia64/sys/boot/alpha/libalpha/srmnet.c#3 delete .. //depot/projects/ia64/sys/boot/alpha/libalpha/start.S#2 delete .. //depot/projects/ia64/sys/boot/alpha/libalpha/time.c#3 delete .. //depot/projects/ia64/sys/boot/alpha/loader/Makefile#4 delete .. //depot/projects/ia64/sys/boot/alpha/loader/version#3 delete .. //depot/projects/ia64/sys/boot/alpha/netboot/Makefile#5 delete .. //depot/projects/ia64/sys/boot/alpha/netboot/version#3 delete .. //depot/projects/ia64/sys/boot/arc/Makefile#2 delete .. //depot/projects/ia64/sys/boot/arc/Makefile.inc#2 delete .. //depot/projects/ia64/sys/boot/arc/include/arcfuncs.h#4 delete .. //depot/projects/ia64/sys/boot/arc/include/arctypes.h#2 delete .. //depot/projects/ia64/sys/boot/arc/include/libarc.h#2 delete .. //depot/projects/ia64/sys/boot/arc/lib/Makefile#5 delete .. //depot/projects/ia64/sys/boot/arc/lib/abort.c#3 delete .. //depot/projects/ia64/sys/boot/arc/lib/arcconsole.c#3 delete .. //depot/projects/ia64/sys/boot/arc/lib/arcdisk.c#5 delete .. //depot/projects/ia64/sys/boot/arc/lib/arch/alpha/copy.c#2 delete .. //depot/projects/ia64/sys/boot/arc/lib/arch/alpha/rpb.c#2 delete .. //depot/projects/ia64/sys/boot/arc/lib/arch/alpha/setjmp.S#2 delete .. //depot/projects/ia64/sys/boot/arc/lib/arch/alpha/start.S#2 delete .. //depot/projects/ia64/sys/boot/arc/lib/bootinfo.c#4 delete .. //depot/projects/ia64/sys/boot/arc/lib/delay.c#3 delete .. //depot/projects/ia64/sys/boot/arc/lib/devicename.c#4 delete .. //depot/projects/ia64/sys/boot/arc/lib/elf_freebsd.c#5 delete .. //depot/projects/ia64/sys/boot/arc/lib/module.c#3 delete .. //depot/projects/ia64/sys/boot/arc/lib/prom.c#3 delete .. //depot/projects/ia64/sys/boot/arc/lib/setjmperr.c#3 delete .. //depot/projects/ia64/sys/boot/arc/lib/time.c#3 delete .. //depot/projects/ia64/sys/boot/arc/loader/Makefile#4 delete .. //depot/projects/ia64/sys/boot/arc/loader/conf.c#4 delete .. //depot/projects/ia64/sys/boot/arc/loader/help.alpha#2 delete .. //depot/projects/ia64/sys/boot/arc/loader/main.c#3 delete .. //depot/projects/ia64/sys/boot/arc/loader/version#2 delete .. //depot/projects/ia64/sys/boot/i386/boot0/boot0.S#7 integrate .. //depot/projects/ia64/sys/boot/pc98/boot2/io.c#7 integrate .. //depot/projects/ia64/sys/compat/linprocfs/linprocfs.c#39 integrate .. //depot/projects/ia64/sys/compat/linsysfs/linsysfs.c#1 branch .. //depot/projects/ia64/sys/compat/linux/linux_file.c#25 integrate .. //depot/projects/ia64/sys/compat/linux/linux_ioctl.c#37 integrate .. //depot/projects/ia64/sys/compat/linux/linux_ioctl.h#12 integrate .. //depot/projects/ia64/sys/compat/linux/linux_misc.c#43 integrate .. //depot/projects/ia64/sys/compat/linux/linux_signal.c#18 integrate .. //depot/projects/ia64/sys/compat/linux/linux_socket.c#23 integrate .. //depot/projects/ia64/sys/compat/linux/linux_stats.c#26 integrate .. //depot/projects/ia64/sys/compat/linux/linux_util.c#12 integrate .. //depot/projects/ia64/sys/compat/linux/linux_util.h#12 integrate .. //depot/projects/ia64/sys/conf/Makefile.alpha#19 delete .. //depot/projects/ia64/sys/conf/NOTES#100 integrate .. //depot/projects/ia64/sys/conf/files#140 integrate .. //depot/projects/ia64/sys/conf/files.alpha#36 delete .. //depot/projects/ia64/sys/conf/files.amd64#36 integrate .. //depot/projects/ia64/sys/conf/files.i386#75 integrate .. //depot/projects/ia64/sys/conf/files.pc98#63 integrate .. //depot/projects/ia64/sys/conf/kern.mk#16 integrate .. //depot/projects/ia64/sys/conf/ldscript.alpha#5 delete .. //depot/projects/ia64/sys/conf/options#93 integrate .. //depot/projects/ia64/sys/conf/options.alpha#13 delete .. //depot/projects/ia64/sys/conf/options.amd64#17 integrate .. //depot/projects/ia64/sys/conf/options.i386#40 integrate .. //depot/projects/ia64/sys/conf/options.pc98#40 integrate .. //depot/projects/ia64/sys/ddb/db_ps.c#29 integrate .. //depot/projects/ia64/sys/dev/acpica/acpi.c#67 integrate .. //depot/projects/ia64/sys/dev/acpica/acpi_pci.c#16 integrate .. //depot/projects/ia64/sys/dev/acpica/acpi_resource.c#22 integrate .. //depot/projects/ia64/sys/dev/amr/amr.c#36 integrate .. //depot/projects/ia64/sys/dev/amr/amr_linux.c#4 integrate .. //depot/projects/ia64/sys/dev/amr/amrvar.h#22 integrate .. //depot/projects/ia64/sys/dev/ata/ata-chipset.c#51 integrate .. //depot/projects/ia64/sys/dev/ath/if_ath.c#31 integrate .. //depot/projects/ia64/sys/dev/ath/if_ath_pci.c#13 integrate .. //depot/projects/ia64/sys/dev/ath/if_athvar.h#18 integrate .. //depot/projects/ia64/sys/dev/bce/if_bcereg.h#2 integrate .. //depot/projects/ia64/sys/dev/bfe/if_bfe.c#16 integrate .. //depot/projects/ia64/sys/dev/bfe/if_bfereg.h#8 integrate .. //depot/projects/ia64/sys/dev/dec/mc146818reg.h#3 delete .. //depot/projects/ia64/sys/dev/dec/mcclock.c#5 delete .. //depot/projects/ia64/sys/dev/dec/mcclock_if.m#3 delete .. //depot/projects/ia64/sys/dev/dec/mcclockvar.h#3 delete .. //depot/projects/ia64/sys/dev/ed/if_ed_pccard.c#29 integrate .. //depot/projects/ia64/sys/dev/hwpmc/hwpmc_alpha.c#2 delete .. //depot/projects/ia64/sys/dev/mpt/mpt.h#11 integrate .. //depot/projects/ia64/sys/dev/mpt/mpt_cam.c#5 integrate .. //depot/projects/ia64/sys/dev/mpt/mpt_pci.c#21 integrate .. //depot/projects/ia64/sys/dev/pccard/pccarddevs#50 integrate .. //depot/projects/ia64/sys/dev/pci/pci.c#56 integrate .. //depot/projects/ia64/sys/dev/rr232x/osm_bsd.c#2 integrate .. //depot/projects/ia64/sys/dev/sk/if_skreg.h#2 integrate .. //depot/projects/ia64/sys/dev/tga/tga_pci.c#13 delete .. //depot/projects/ia64/sys/dev/tga/tga_pci.h#3 delete .. //depot/projects/ia64/sys/dev/uart/uart_cpu_alpha.c#11 delete .. //depot/projects/ia64/sys/geom/raid3/g_raid3.c#18 integrate .. //depot/projects/ia64/sys/gnu/fs/xfs/FreeBSD/xfs_mountops.c#2 integrate .. //depot/projects/ia64/sys/i386/conf/GENERIC#64 integrate .. //depot/projects/ia64/sys/i386/conf/NOTES#73 integrate .. //depot/projects/ia64/sys/i386/conf/PAE#17 integrate .. //depot/projects/ia64/sys/i386/cpufreq/est.c#5 integrate .. //depot/projects/ia64/sys/i386/i386/apic_vector.s#11 integrate .. //depot/projects/ia64/sys/i386/i386/busdma_machdep.c#37 integrate .. //depot/projects/ia64/sys/i386/i386/machdep.c#70 integrate .. //depot/projects/ia64/sys/i386/i386/mp_machdep.c#52 integrate .. //depot/projects/ia64/sys/i386/i386/pmap.c#92 integrate .. //depot/projects/ia64/sys/i386/include/apicvar.h#12 integrate .. //depot/projects/ia64/sys/i386/include/cpu.h#11 integrate .. //depot/projects/ia64/sys/i386/include/pmap.h#28 integrate .. //depot/projects/ia64/sys/i386/include/smp.h#18 integrate .. //depot/projects/ia64/sys/i386/include/specialreg.h#10 integrate .. //depot/projects/ia64/sys/i386/linux/linux_dummy.c#9 integrate .. //depot/projects/ia64/sys/i386/linux/linux_proto.h#16 integrate .. //depot/projects/ia64/sys/i386/linux/linux_syscall.h#16 integrate .. //depot/projects/ia64/sys/i386/linux/linux_sysent.c#17 integrate .. //depot/projects/ia64/sys/i386/linux/linux_sysvec.c#39 integrate .. //depot/projects/ia64/sys/i386/linux/syscalls.master#15 integrate .. //depot/projects/ia64/sys/ia64/ia64/clock.c#21 integrate .. //depot/projects/ia64/sys/ia64/include/cpu.h#29 integrate .. //depot/projects/ia64/sys/kern/kern_exec.c#81 integrate .. //depot/projects/ia64/sys/kern/kern_sig.c#90 integrate .. //depot/projects/ia64/sys/kern/kern_umtx.c#19 integrate .. //depot/projects/ia64/sys/kern/subr_clock.c#7 integrate .. //depot/projects/ia64/sys/kern/tty_cons.c#25 integrate .. //depot/projects/ia64/sys/kern/vfs_aio.c#54 integrate .. //depot/projects/ia64/sys/libkern/alpha/bswap16.S#3 delete .. //depot/projects/ia64/sys/libkern/alpha/bswap32.S#3 delete .. //depot/projects/ia64/sys/libkern/alpha/byte_swap_2.S#4 delete .. //depot/projects/ia64/sys/libkern/alpha/byte_swap_4.S#4 delete .. //depot/projects/ia64/sys/modules/Makefile#95 integrate .. //depot/projects/ia64/sys/modules/ath_hal/Makefile#5 integrate .. //depot/projects/ia64/sys/modules/linsysfs/Makefile#1 branch .. //depot/projects/ia64/sys/modules/linux/Makefile#13 integrate .. //depot/projects/ia64/sys/modules/rr232x/Makefile#2 integrate .. //depot/projects/ia64/sys/net/bpf.c#42 integrate .. //depot/projects/ia64/sys/net/if_gre.c#22 integrate .. //depot/projects/ia64/sys/net/route.c#25 integrate .. //depot/projects/ia64/sys/netinet/ip_fw2.c#54 integrate .. //depot/projects/ia64/sys/netinet/ip_input.c#61 integrate .. //depot/projects/ia64/sys/netinet/ip_ipsec.c#2 integrate .. //depot/projects/ia64/sys/netinet/tcp_timer.c#26 integrate .. //depot/projects/ia64/sys/netinet/udp_usrreq.c#45 integrate .. //depot/projects/ia64/sys/netinet6/frag6.c#11 integrate .. //depot/projects/ia64/sys/netinet6/ip6_forward.c#17 integrate .. //depot/projects/ia64/sys/netinet6/udp6_usrreq.c#27 integrate .. //depot/projects/ia64/sys/nfsclient/nfs_socket.c#34 integrate .. //depot/projects/ia64/sys/pc98/cbus/cbus.h#2 integrate .. //depot/projects/ia64/sys/pc98/cbus/fdc.c#5 integrate .. //depot/projects/ia64/sys/pc98/cbus/syscons_cbus.c#2 integrate .. //depot/projects/ia64/sys/pc98/conf/GENERIC#54 integrate .. //depot/projects/ia64/sys/pc98/conf/NOTES#35 integrate .. //depot/projects/ia64/sys/pc98/pc98/machdep.c#8 integrate .. //depot/projects/ia64/sys/pc98/pc98/pc98_machdep.c#6 integrate .. //depot/projects/ia64/sys/pc98/pc98/pc98_machdep.h#5 integrate .. //depot/projects/ia64/sys/powerpc/include/cpu.h#15 integrate .. //depot/projects/ia64/sys/powerpc/powerpc/clock.c#15 integrate .. //depot/projects/ia64/sys/sparc64/include/cpu.h#8 integrate .. //depot/projects/ia64/sys/sys/mount.h#38 integrate .. //depot/projects/ia64/sys/ufs/ffs/ffs_rawread.c#17 integrate .. //depot/projects/ia64/sys/ufs/ffs/ffs_snapshot.c#47 integrate .. //depot/projects/ia64/sys/ufs/ffs/ffs_softdep.c#49 integrate .. //depot/projects/ia64/sys/ufs/ffs/ffs_vfsops.c#61 integrate .. //depot/projects/ia64/sys/ufs/ffs/ffs_vnops.c#49 integrate .. //depot/projects/ia64/sys/ufs/ufs/ufs_inode.c#21 integrate .. //depot/projects/ia64/sys/ufs/ufs/ufs_quota.c#25 integrate .. //depot/projects/ia64/sys/vm/swap_pager.c#59 integrate .. //depot/projects/ia64/tools/tools/find-sb/find-sb.c#2 integrate .. //depot/projects/ia64/tools/tools/find-sb/mini_ufs.h#1 branch .. //depot/projects/ia64/tools/tools/mfc/mfc.awk#2 integrate .. //depot/projects/ia64/tools/tools/ministat/ministat.c#8 integrate .. //depot/projects/ia64/tools/tools/recoverdisk/Makefile#4 integrate .. //depot/projects/ia64/tools/tools/recoverdisk/README#4 delete .. //depot/projects/ia64/tools/tools/recoverdisk/recoverdisk.1#1 branch .. //depot/projects/ia64/tools/tools/recoverdisk/recoverdisk.c#4 integrate .. //depot/projects/ia64/tools/tools/tinderbox/etc/releng_6.rc#4 integrate .. //depot/projects/ia64/usr.bin/Makefile#75 integrate .. //depot/projects/ia64/usr.bin/calendar/calendars/calendar.freebsd#60 integrate .. //depot/projects/ia64/usr.bin/du/du.1#9 integrate .. //depot/projects/ia64/usr.bin/du/du.c#15 integrate .. //depot/projects/ia64/usr.bin/getent/Makefile#1 branch .. //depot/projects/ia64/usr.bin/getent/getent.1#1 branch .. //depot/projects/ia64/usr.bin/getent/getent.c#1 branch .. //depot/projects/ia64/usr.bin/make/Makefile#21 integrate .. //depot/projects/ia64/usr.bin/top/machine.c#11 integrate .. //depot/projects/ia64/usr.bin/w/w.c#11 integrate .. //depot/projects/ia64/usr.sbin/cached/agents/services.c#2 integrate .. //depot/projects/ia64/usr.sbin/cached/query.c#2 integrate .. //depot/projects/ia64/usr.sbin/jail/jail.8#25 integrate .. //depot/projects/ia64/usr.sbin/jail/jail.c#14 integrate .. //depot/projects/ia64/usr.sbin/mount_nwfs/mount_nwfs.c#3 integrate .. //depot/projects/ia64/usr.sbin/mountd/mountd.8#7 integrate .. //depot/projects/ia64/usr.sbin/portsnap/phttpget/phttpget.c#6 integrate .. //depot/projects/ia64/usr.sbin/portsnap/portsnap/portsnap.sh#5 integrate .. //depot/projects/ia64/usr.sbin/sysinstall/installUpgrade.c#10 integrate .. //depot/projects/ia64/usr.sbin/sysinstall/sysinstall.h#37 integrate Differences ... ==== //depot/projects/ia64/MAINTAINERS#52 (text+ko) ==== @@ -1,4 +1,4 @@ -$FreeBSD: src/MAINTAINERS,v 1.130 2006/04/01 21:19:15 scottl Exp $ +$FreeBSD: src/MAINTAINERS,v 1.131 2006/05/05 20:12:30 rodrigc Exp $ Please note that the content of this file is strictly advisory. No locks listed here are valid. The only strict review requirements @@ -127,7 +127,8 @@ rpc.lockd alfred Will be happy to review code, but not mandatory. truss alfred Will be happy to review code, but not mandatory. rpc alfred Pre-commit review requested. -xfs kan,rodrigc Pre-commit review preferred. +xfs kan@FreeBSD.org,rodrigc@FreeBSD.org,cattelan@xfs.org + Pre-commit review preferred. pkg_install krion Pre-commit review or approval from portmgr@ requested. linux emul emulation Please discuss changes here. bs{diff,patch} cperciva Pre-commit review requested. ==== //depot/projects/ia64/Makefile#48 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/Makefile,v 1.328 2006/03/18 14:30:23 ru Exp $ +# $FreeBSD: src/Makefile,v 1.329 2006/05/11 18:54:16 jhb Exp $ # # The user-driven targets are: # @@ -266,7 +266,7 @@ @echo "--------------------------------------------------------------" @echo ">>> make universe started on ${STARTTIME}" @echo "--------------------------------------------------------------" -.for target in i386 i386:pc98 sparc64 alpha ia64 amd64 +.for target in i386 i386:pc98 sparc64 ia64 amd64 .for arch in ${target:C/:.*$//} .for mach in ${target:C/^.*://} KERNCONFS!= cd ${.CURDIR}/sys/${mach}/conf && \ ==== //depot/projects/ia64/UPDATING#86 (text+ko) ==== @@ -21,6 +21,21 @@ developers choose to disable these features on build machines to maximize performance. +20060428: + The puc(4) driver has been overhauled. The ebus(4) and sbus(4) + attachments have been removed. Make sure to configure scc(4) + on sparc64. Note also that by default puc(4) will use uart(4) + and not sio(4) for serial ports because interrupt handling has + been optimized for multi-port serial cards and only uart(4) + implements the interface to support it. + +20060330: + The scc(4) driver replaces puc(4) for Serial Communications + Controllers (SCCs) like the Siemens SAB82532 and the Zilog + Z8530. On sparc64, it is advised to add scc(4) to the kernel + configuration to make sure that the serial ports remain + functional. + 20060317: Most world/kernel related NO_* build options changed names. New knobs have common prefixes WITHOUT_*/WITH_* (modelled @@ -543,4 +558,4 @@ Contact Warner Losh if you have any questions about your use of this document. -$FreeBSD: src/UPDATING,v 1.445 2006/04/07 11:36:25 ru Exp $ +$FreeBSD: src/UPDATING,v 1.446 2006/05/04 03:48:06 marcel Exp $ ==== //depot/projects/ia64/bin/pax/pax.1#10 (text+ko) ==== @@ -31,7 +31,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)pax.1 8.4 (Berkeley) 4/18/94 -.\" $FreeBSD: src/bin/pax/pax.1,v 1.35 2005/01/16 16:41:58 ru Exp $ +.\" $FreeBSD: src/bin/pax/pax.1,v 1.36 2006/05/10 20:32:57 cokane Exp $ .\" .Dd July 3, 2004 .Dt PAX 1 @@ -394,8 +394,9 @@ bytes per write to the archive file. The .Ar blocksize -must be a multiple of 512 bytes with a maximum of 64512 bytes. -Archives larger than 32256 bytes violate the +must be a multiple of 512 bytes with a maximum of 64512 bytes. A +.Ar blocksize +larger than 32256 bytes violates the .Tn POSIX standard and will not be portable to all systems. A ==== //depot/projects/ia64/contrib/traceroute/traceroute.8#5 (text+ko) ==== @@ -14,7 +14,7 @@ .\" WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE. .\" .\" $Id: traceroute.8,v 1.19 2000/09/21 08:44:19 leres Exp $ -.\" $FreeBSD: src/contrib/traceroute/traceroute.8,v 1.11 2005/04/12 15:16:32 thomas Exp $ +.\" $FreeBSD: src/contrib/traceroute/traceroute.8,v 1.12 2006/05/11 06:30:18 cjc Exp $ .\" .TH TRACEROUTE 8 "21 September 2000" .UC 6 @@ -24,7 +24,7 @@ .na .B traceroute [ -.B \-dFISdnrvx +.B \-deFISdnrvx ] [ .B \-f .I first_ttl @@ -98,6 +98,11 @@ .PP Other options are: .TP +.B \-e +Firewall evasion mode. +Use fixed destination ports for UDP and TCP probes. +The destination port does NOT increment with each packet sent. +.TP .B \-f Set the initial time-to-live used in the first outgoing probe packet. .TP ==== //depot/projects/ia64/contrib/traceroute/traceroute.c#8 (text+ko) ==== @@ -28,7 +28,7 @@ "@(#)$Id: traceroute.c,v 1.68 2000/12/14 08:04:33 leres Exp $ (LBL)"; #endif static const char rcsid[] = - "$FreeBSD: src/contrib/traceroute/traceroute.c,v 1.28 2006/01/10 16:48:52 pav Exp $"; + "$FreeBSD: src/contrib/traceroute/traceroute.c,v 1.29 2006/05/11 06:30:18 cjc Exp $"; #endif /* @@ -353,6 +353,7 @@ int doipcksum = 1; /* calculate ip checksums by default */ #endif int optlen; /* length of ip options */ +int fixedPort = 0; /* Use fixed destination port for TCP and UDP */ extern int optind; extern int opterr; @@ -521,13 +522,17 @@ prog = argv[0]; opterr = 0; - while ((op = getopt(argc, argv, "dFInrSvxf:g:i:M:m:P:p:q:s:t:w:z:")) != EOF) + while ((op = getopt(argc, argv, "edFInrSvxf:g:i:M:m:P:p:q:s:t:w:z:")) != EOF) switch (op) { case 'd': options |= SO_DEBUG; break; + case 'e': + fixedPort = 1; + break; + case 'f': case 'M': /* FreeBSD compat. */ first_ttl = str2val(optarg, "first ttl", 1, 255); @@ -1289,8 +1294,8 @@ { struct udphdr *const outudp = (struct udphdr *) outp; - outudp->uh_sport = htons(ident); - outudp->uh_dport = htons(port + outdata->seq); + outudp->uh_sport = htons(ident + (fixedPort ? outdata->seq : 0)); + outudp->uh_dport = htons(port + (fixedPort ? 0 : outdata->seq)); outudp->uh_ulen = htons((u_short)protlen); outudp->uh_sum = 0; if (doipcksum) { @@ -1306,8 +1311,8 @@ { struct udphdr *const udp = (struct udphdr *) data; - return (ntohs(udp->uh_sport) == ident - && ntohs(udp->uh_dport) == port + seq); + return (ntohs(udp->uh_sport) == ident + (fixedPort ? seq : 0) && + ntohs(udp->uh_dport) == port + (fixedPort ? 0 : seq)); } void @@ -1316,8 +1321,9 @@ struct tcphdr *const tcp = (struct tcphdr *) outp; tcp->th_sport = htons(ident); - tcp->th_dport = htons(port + outdata->seq); - tcp->th_seq = (tcp->th_sport << 16) | tcp->th_dport; + tcp->th_dport = htons(port + (fixedPort ? 0 : outdata->seq)); + tcp->th_seq = (tcp->th_sport << 16) | (tcp->th_dport + + (fixedPort ? outdata->seq : 0)); tcp->th_ack = 0; tcp->th_off = 5; tcp->th_flags = TH_SYN; @@ -1335,7 +1341,8 @@ struct tcphdr *const tcp = (struct tcphdr *) data; return (ntohs(tcp->th_sport) == ident - && ntohs(tcp->th_dport) == port + seq); + && ntohs(tcp->th_dport) == port + (fixedPort ? 0 : seq)) + && tcp->th_seq == (ident << 16) | (port + seq); } void ==== //depot/projects/ia64/etc/Makefile#55 (text+ko) ==== @@ -1,5 +1,5 @@ # from: @(#)Makefile 5.11 (Berkeley) 5/21/91 -# $FreeBSD: src/etc/Makefile,v 1.355 2006/04/28 12:03:33 ume Exp $ +# $FreeBSD: src/etc/Makefile,v 1.356 2006/05/03 15:14:46 ume Exp $ .include @@ -11,8 +11,8 @@ crontab csh.cshrc csh.login csh.logout devd.conf devfs.conf \ dhclient.conf disktab fbtab ftpusers gettytab group \ hosts hosts.allow hosts.equiv hosts.lpd \ - inetd.conf login.access login.conf \ - mac.conf motd netconfig network.subr networks newsyslog.conf \ + inetd.conf login.access login.conf mac.conf motd \ + netconfig network.subr networks newsyslog.conf nsswitch.conf \ portsnap.conf pf.conf pf.os phones profile protocols \ rc rc.bsdextended rc.firewall rc.firewall6 rc.initdiskless \ rc.sendmail rc.shutdown \ ==== //depot/projects/ia64/etc/defaults/rc.conf#69 (text+ko) ==== @@ -15,7 +15,7 @@ # For a more detailed explanation of all the rc.conf variables, please # refer to the rc.conf(5) manual page. # -# $FreeBSD: src/etc/defaults/rc.conf,v 1.282 2006/04/28 12:03:33 ume Exp $ +# $FreeBSD: src/etc/defaults/rc.conf,v 1.283 2006/05/11 14:23:43 flz Exp $ ############################################################## ### Important initial Boot-time options #################### @@ -555,11 +555,15 @@ # # To use rc's built-in jail infrastructure create entries for # each jail, specified in jail_list, with the following variables. -# NOTE: replace 'example' with the jail's name. +# NOTES: +# - replace 'example' with the jail's name. +# - except rootdir, hostname and ip, all of the following variables may be made +# global jail variables if you don't specify a jail name (ie. jail_interface). # #jail_example_rootdir="/usr/jail/default" # Jail's root directory #jail_example_hostname="default.domain.com" # Jail's hostname #jail_example_ip="192.168.0.10" # Jail's IP number +#jail_example_interface="" # Interface to create the IP alias on #jail_example_exec_start="/bin/sh /etc/rc" # command to execute in jail for starting #jail_example_exec_stop="/bin/sh /etc/rc.shutdown" # command to execute in jail for stopping #jail_example_devfs_enable="NO" # mount devfs in the jail ==== //depot/projects/ia64/etc/mtree/BSD.root.dist#18 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/etc/mtree/BSD.root.dist,v 1.76 2005/12/29 14:40:19 dfr Exp $ +# $FreeBSD: src/etc/mtree/BSD.root.dist,v 1.77 2006/05/10 18:53:15 marcus Exp $ # # Please see the file src/etc/mtree/README before making changes to this file. # @@ -69,6 +69,8 @@ .. libexec .. + media + .. mnt .. proc mode=0555 ==== //depot/projects/ia64/etc/rc.d/jail#19 (text+ko) ==== @@ -1,6 +1,6 @@ #!/bin/sh # -# $FreeBSD: src/etc/rc.d/jail,v 1.27 2006/04/08 12:15:35 flz Exp $ +# $FreeBSD: src/etc/rc.d/jail,v 1.32 2006/05/11 14:23:43 flz Exp $ # # PROVIDE: jail @@ -27,65 +27,76 @@ return fi - eval jail_rootdir=\"\$jail_${_j}_rootdir\" - jail_devdir="${jail_rootdir}/dev" - jail_fdescdir="${jail_devdir}/fd" - jail_procdir="${jail_rootdir}/proc" - eval jail_hostname=\"\$jail_${_j}_hostname\" - eval jail_ip=\"\$jail_${_j}_ip\" - eval jail_interface=\"\${jail_${_j}_interface:-${jail_interface}}\" - eval jail_exec=\"\$jail_${_j}_exec\" - eval jail_exec_start=\"\${jail_${_j}_exec_start:-${jail_exec_start}}\" - eval jail_exec_stop=\"\${jail_${_j}_exec_stop:-${jail_exec_stop}}\" - if [ -n "${jail_exec}" ]; then + eval _rootdir=\"\$jail_${_j}_rootdir\" + _devdir="${_rootdir}/dev" + _fdescdir="${_devdir}/fd" + _procdir="${_rootdir}/proc" + eval _hostname=\"\$jail_${_j}_hostname\" + eval _ip=\"\$jail_${_j}_ip\" + eval _interface=\"\${jail_${_j}_interface:-${jail_interface}}\" + eval _exec=\"\$jail_${_j}_exec\" + eval _exec_start=\"\${jail_${_j}_exec_start:-${jail_exec_start}}\" + eval _exec_stop=\"\${jail_${_j}_exec_stop:-${jail_exec_stop}}\" + if [ -n "${_exec}" ]; then # simple/backward-compatible execution - jail_exec_start="${jail_exec}" - jail_exec_stop="" + _exec_start="${_exec}" + _exec_stop="" else # flexible execution - if [ -z "${jail_exec_start}" ]; then - jail_exec_start="/bin/sh /etc/rc" - if [ -z "${jail_exec_stop}" ]; then - jail_exec_stop="/bin/sh /etc/rc.shutdown" + if [ -z "${_exec_start}" ]; then + _exec_start="/bin/sh /etc/rc" + if [ -z "${_exec_stop}" ]; then + _exec_stop="/bin/sh /etc/rc.shutdown" fi fi fi # The default jail ruleset will be used by rc.subr if none is specified. - eval jail_ruleset=\"\${jail_${_j}_devfs_ruleset:-${jail_devfs_ruleset}}\" - eval jail_devfs=\"\${jail_${_j}_devfs_enable:-${jail_devfs_enable}}\" - [ -z "${jail_devfs}" ] && jail_devfs="NO" - eval jail_fdescfs=\"\${jail_${_j}_fdescfs_enable:-${jail_fdescfs_enable}}\" - [ -z "${jail_fdescfs}" ] && jail_fdescfs="NO" - eval jail_procfs=\"\${jail_${_j}_procfs_enable:-${jail_procfs_enable}}\" - [ -z "${jail_procfs}" ] && jail_procfs="NO" + eval _ruleset=\"\${jail_${_j}_devfs_ruleset:-${jail_devfs_ruleset}}\" + eval _devfs=\"\${jail_${_j}_devfs_enable:-${jail_devfs_enable}}\" + [ -z "${_devfs}" ] && _devfs="NO" + eval _fdescfs=\"\${jail_${_j}_fdescfs_enable:-${jail_fdescfs_enable}}\" + [ -z "${_fdescfs}" ] && _fdescfs="NO" + eval _procfs=\"\${jail_${_j}_procfs_enable:-${jail_procfs_enable}}\" + [ -z "${_procfs}" ] && _procfs="NO" - eval jail_mount=\"\${jail_${_j}_mount_enable:-${jail_mount_enable}}\" - [ -z "${jail_mount}" ] && jail_mount="NO" + eval _mount=\"\${jail_${_j}_mount_enable:-${jail_mount_enable}}\" + [ -z "${_mount}" ] && _mount="NO" # "/etc/fstab.${_j}" will be used for {,u}mount(8) if none is specified. - eval jail_fstab=\"\${jail_${_j}_fstab:-${jail_fstab}}\" - [ -z "${jail_fstab}" ] && jail_fstab="/etc/fstab.${_j}" - eval jail_flags=\"\${jail_${_j}_flags:-${jail_flags}}\" - [ -z "${jail_flags}" ] && jail_flags="-l -U root" + eval _fstab=\"\${jail_${_j}_fstab:-${jail_fstab}}\" + [ -z "${_fstab}" ] && _fstab="/etc/fstab.${_j}" + eval _flags=\"\${jail_${_j}_flags:-${jail_flags}}\" + [ -z "${_flags}" ] && _flags="-l -U root" # Debugging aid # - debug "$_j devfs enable: $jail_devfs" - debug "$_j fdescfs enable: $jail_fdescfs" - debug "$_j procfs enable: $jail_procfs" - debug "$_j mount enable: $jail_mount" - debug "$_j hostname: $jail_hostname" - debug "$_j ip: $jail_ip" - debug "$_j interface: $jail_interface" - debug "$_j root: $jail_rootdir" - debug "$_j devdir: $jail_devdir" - debug "$_j fdescdir: $jail_fdescdir" - debug "$_j procdir: $jail_procdir" - debug "$_j ruleset: $jail_ruleset" - debug "$_j fstab: $jail_fstab" - debug "$_j exec start: $jail_exec_start" - debug "$_j exec stop: $jail_exec_stop" - debug "$_j flags: $jail_flags" + debug "$_j devfs enable: $_devfs" + debug "$_j fdescfs enable: $_fdescfs" + debug "$_j procfs enable: $_procfs" + debug "$_j mount enable: $_mount" + debug "$_j hostname: $_hostname" + debug "$_j ip: $_ip" + debug "$_j interface: $_interface" + debug "$_j root: $_rootdir" + debug "$_j devdir: $_devdir" + debug "$_j fdescdir: $_fdescdir" + debug "$_j procdir: $_procdir" + debug "$_j ruleset: $_ruleset" + debug "$_j fstab: $_fstab" + debug "$_j exec start: $_exec_start" + debug "$_j exec stop: $_exec_stop" + debug "$_j flags: $_flags" + + if [ -z "${_hostname}" ]; then + err 3 "$name: No hostname has been defined for ${_j}" + fi + if [ -z "${_rootdir}" ]; then + err 3 "$name: No root directory has been defined for ${_j}" + fi + if [ -z "${_ip}" ]; then + err 3 "$name: No IP address has been defined for ${_j}" + fi + } # set_sysctl rc_knob mib msg @@ -122,24 +133,24 @@ # jail_umount_fs() { - if checkyesno jail_fdescfs; then - if [ -d "${jail_fdescdir}" ] ; then - umount -f ${jail_fdescdir} >/dev/null 2>&1 + if checkyesno _fdescfs; then + if [ -d "${_fdescdir}" ] ; then + umount -f ${_fdescdir} >/dev/null 2>&1 fi fi - if checkyesno jail_devfs; then - if [ -d "${jail_devdir}" ] ; then - umount -f ${jail_devdir} >/dev/null 2>&1 + if checkyesno _devfs; then + if [ -d "${_devdir}" ] ; then + umount -f ${_devdir} >/dev/null 2>&1 fi fi - if checkyesno jail_procfs; then - if [ -d "${jail_procdir}" ] ; then - umount -f ${jail_procdir} >/dev/null 2>&1 + if checkyesno _procfs; then + if [ -d "${_procdir}" ] ; then + umount -f ${_procdir} >/dev/null 2>&1 fi fi - if checkyesno jail_mount; then - [ -f "${jail_fstab}" ] || warn "${jail_fstab} does not exist" - umount -a -F "${jail_fstab}" >/dev/null 2>&1 + if checkyesno _mount; then + [ -f "${_fstab}" ] || warn "${_fstab} does not exist" + umount -a -F "${_fstab}" >/dev/null 2>&1 fi } @@ -161,29 +172,29 @@ do init_variables $_jail if [ -f /var/run/jail_${_jail}.id ]; then - echo -n " [${jail_hostname} already running (/var/run/jail_${_jail}.id exists)]" + echo -n " [${_hostname} already running (/var/run/jail_${_jail}.id exists)]" continue; fi - if [ -n ${jail_interface} ]; then - ifconfig ${jail_interface} alias ${jail_ip} netmask 255.255.255.255 + if [ -n "${_interface}" ]; then + ifconfig ${_interface} alias ${_ip} netmask 255.255.255.255 fi - if checkyesno jail_mount; then - info "Mounting fstab for jail ${_jail} (${jail_fstab})" - if [ ! -f "${jail_fstab}" ]; then - err 3 "$name: ${jail_fstab} does not exist" + if checkyesno _mount; then + info "Mounting fstab for jail ${_jail} (${_fstab})" + if [ ! -f "${_fstab}" ]; then + err 3 "$name: ${_fstab} does not exist" fi - mount -a -F "${jail_fstab}" + mount -a -F "${_fstab}" fi - if checkyesno jail_devfs; then + if checkyesno _devfs; then # If devfs is already mounted here, skip it. - df -t devfs "${jail_devdir}" >/dev/null + df -t devfs "${_devdir}" >/dev/null >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Fri May 12 01:41:50 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6F18916A44F; Fri, 12 May 2006 01:41:50 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 2FBC116A43E for ; Fri, 12 May 2006 01:41:50 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 2E9D143D58 for ; Fri, 12 May 2006 01:41:49 +0000 (GMT) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k4C1fnOo009428 for ; Fri, 12 May 2006 01:41:49 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k4C1fmdw009420 for perforce@freebsd.org; Fri, 12 May 2006 01:41:48 GMT (envelope-from jb@freebsd.org) Date: Fri, 12 May 2006 01:41:48 GMT Message-Id: <200605120141.k4C1fmdw009420@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 96993 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 12 May 2006 01:41:50 -0000 http://perforce.freebsd.org/chv.cgi?CH=96993 Change 96993 by jb@jb_freebsd2 on 2006/05/12 01:41:09 This makefile runs Sun's DTrace tests on FreeBSD. The test files themselves haven't been released yet, so they aren't publicly available and can't be added to FreeBSD's repository. At this stage the indication from Sun is that the release of those files is subject to their review process. Stay tuned. As of today, 629 of the 1039 tests pass on FreeBSD. Of the ones that fail, some failures are due to builtin variables which haven't been ported (and are straight-forward to port). Then there are tests that fail because the required provider hasn't been ported. And finally there are those things that are more difficult to get working on FreeBSD. At this stage it is fair to say that the easy things have been done. The percentage pass/fail test results are just an indication that there is light at the end of the tunnel. 8-) Affected files ... .. //depot/projects/dtrace/src/cddl/test/dtrace/Makefile#1 add Differences ... From owner-p4-projects@FreeBSD.ORG Fri May 12 23:26:09 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3F7B816A4DF; Fri, 12 May 2006 23:26:09 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id DAFF616A47C for ; Fri, 12 May 2006 23:26:08 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id AA44643D46 for ; Fri, 12 May 2006 23:26:08 +0000 (GMT) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k4CNQ84e004061 for ; Fri, 12 May 2006 23:26:08 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k4CNQ82D004058 for perforce@freebsd.org; Fri, 12 May 2006 23:26:08 GMT (envelope-from jb@freebsd.org) Date: Fri, 12 May 2006 23:26:08 GMT Message-Id: <200605122326.k4CNQ82D004058@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 97034 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 12 May 2006 23:26:09 -0000 http://perforce.freebsd.org/chv.cgi?CH=97034 Change 97034 by jb@jb_freebsd2 on 2006/05/12 23:25:25 Zero the size of the structure, not just the size of the pointer. Oops. On FreeBSD, only process CPUs if they are present. Affected files ... .. //depot/projects/dtrace/src/sys/cddl/dev/dtrace/dtrace_ioctl.c#12 edit Differences ... ==== //depot/projects/dtrace/src/sys/cddl/dev/dtrace/dtrace_ioctl.c#12 (text+ko) ==== @@ -658,7 +658,7 @@ dtrace_membar_producer(); state->dts_laststatus = dtrace_gethrtime(); - bzero(stat, sizeof (stat)); + bzero(stat, sizeof (*stat)); mutex_enter(&dtrace_lock); @@ -674,6 +674,10 @@ dstate = &state->dts_vstate.dtvs_dynvars; for (i = 0; i < NCPU; i++) { +#if !defined(sun) + if (pcpu_find(i) == NULL) + continue; +#endif dtrace_dstate_percpu_t *dcpu = &dstate->dtds_percpu[i]; stat->dtst_dyndrops += dcpu->dtdsc_drops; From owner-p4-projects@FreeBSD.ORG Fri May 12 23:30:17 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1B91116A66F; Fri, 12 May 2006 23:30:17 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 4E14116A66A for ; Fri, 12 May 2006 23:30:15 +0000 (UTC) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 00EBA43D48 for ; Fri, 12 May 2006 23:30:15 +0000 (GMT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k4CNUEUP004214 for ; Fri, 12 May 2006 23:30:14 GMT (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k4CNUE5B004211 for perforce@freebsd.org; Fri, 12 May 2006 23:30:14 GMT (envelope-from marcel@freebsd.org) Date: Fri, 12 May 2006 23:30:14 GMT Message-Id: <200605122330.k4CNUE5B004211@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Cc: Subject: PERFORCE change 97037 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 12 May 2006 23:30:21 -0000 http://perforce.freebsd.org/chv.cgi?CH=97037 Change 97037 by marcel@marcel_nfs on 2006/05/12 23:29:24 Allow setting the line speed on the command line and bail out if tcsetattr() fails. Affected files ... .. //depot/projects/uart/dev/uart/uarttest.c#6 edit Differences ... ==== //depot/projects/uart/dev/uart/uarttest.c#6 (text+ko) ==== @@ -155,9 +155,11 @@ { char buf[PATH_MAX]; struct termios t0, t1; + speed_t sp; int ch; - while ((ch = getopt(argc, argv, "clt")) != -1) { + sp = 9600; /* Any speed that we expect to work for all UARTs */ + while ((ch = getopt(argc, argv, "cls:t")) != -1) { switch (ch) { case 'c': /* DCE mode */ sethow(AS_DCE); @@ -165,6 +167,9 @@ case 'l': /* Loopback mode */ sethow(AS_LOOP); break; + case 's': /* Line speed */ + sp = atoi(optarg); + break; case 't': /* DTE mode */ sethow(AS_DTE); break; @@ -198,7 +203,7 @@ tcgetattr(fd, &t0); t1 = t0; cfmakeraw(&t1); - cfsetspeed(&t1, B115200); + cfsetspeed(&t1, sp); switch (how) { case AS_DCE: t1.c_cflag |= CRTS_IFLOW; @@ -210,7 +215,10 @@ t1.c_cflag |= CCTS_OFLOW | CRTS_IFLOW; break; } - tcsetattr(fd, TCSAFLUSH|TCSANOW, &t1); + if (tcsetattr(fd, TCSAFLUSH|TCSANOW, &t1) == -1) + err(EX_IOERR, "cannot set line attributes"); + + printf("Line speed is %u baud\n", sp); switch (how) { case AS_DCE: From owner-p4-projects@FreeBSD.ORG Fri May 12 23:30:22 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D859E16A715; Fri, 12 May 2006 23:30:17 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 94D2E16A63F for ; Fri, 12 May 2006 23:30:15 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id A1E0643D46 for ; Fri, 12 May 2006 23:30:14 +0000 (GMT) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k4CNUEbs004208 for ; Fri, 12 May 2006 23:30:14 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k4CNUEuM004205 for perforce@freebsd.org; Fri, 12 May 2006 23:30:14 GMT (envelope-from jb@freebsd.org) Date: Fri, 12 May 2006 23:30:14 GMT Message-Id: <200605122330.k4CNUEuM004205@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 97036 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 12 May 2006 23:30:26 -0000 http://perforce.freebsd.org/chv.cgi?CH=97036 Change 97036 by jb@jb_freebsd2 on 2006/05/12 23:29:15 Port the code for some of the special types now that I can see the tests accessing these. This includes 'execname', 'pid', 'tid' which are pretty fundamental to the operation of DTrace. There are still things here that are Solaris-specific, so they remain commented out. These pieces of code aren't being processed because the tests tend to access Solaris-specific structures which fail to resolve in dtrace(1), so the probes never get created and consequently they commented out bits of code don't get accessed. Affected files ... .. //depot/projects/dtrace/src/sys/cddl/dev/dtrace/dtrace_dif.c#6 edit Differences ... ==== //depot/projects/dtrace/src/sys/cddl/dev/dtrace/dtrace_dif.c#6 (text+ko) ==== @@ -51,7 +51,7 @@ return (mstate->dtms_arg[ndx]); case DIF_VAR_UREGS: { -printf("%s:%s(%d): DOODAD\n",__FUNCTION__,__FILE__,__LINE__); +printf("%s:%s(%d): DIF_VAR_UREGS\n",__FUNCTION__,__FILE__,__LINE__); #ifdef DOODAD klwp_t *lwp; @@ -122,7 +122,7 @@ return (mstate->dtms_stackdepth); case DIF_VAR_USTACKDEPTH: -printf("%s:%s(%d): DOODAD\n",__FUNCTION__,__FILE__,__LINE__); +printf("%s:%s(%d): DIF_VAR_USTACKDEPTH\n",__FUNCTION__,__FILE__,__LINE__); #ifdef DOODAD if (!dtrace_priv_proc(state)) return (0); @@ -223,6 +223,7 @@ mstate->dtms_probe->dtpr_name); case DIF_VAR_PID: +#if defined(sun) if (!dtrace_priv_proc(state)) return (0); @@ -231,11 +232,8 @@ * always due to a high-level interrupt. (And we're assuming * that there is only a single high level interrupt.) */ -printf("%s:%s(%d): DOODAD\n",__FUNCTION__,__FILE__,__LINE__); -#ifdef DOODAD if (DTRACE_ANCHORED(mstate->dtms_probe) && CPU_ON_INTR(CPU)) return (pid0.pid_id); -#endif /* * It is always safe to dereference one's own t_procp pointer: @@ -245,16 +243,13 @@ * threads and processes don't clean up their own state -- * they leave that task to whomever reaps them.) */ -printf("%s:%s(%d): DOODAD\n",__FUNCTION__,__FILE__,__LINE__); -#ifdef DOODAD return ((uint64_t)curthread->t_procp->p_pidp->pid_id); #else -return 0; + return ((uint64_t)curproc->p_pid); #endif case DIF_VAR_TID: -printf("%s:%s(%d): DOODAD\n",__FUNCTION__,__FILE__,__LINE__); -#ifdef DOODAD +#if defined(sun) /* * See comment in DIF_VAR_PID. */ @@ -263,12 +258,11 @@ return ((uint64_t)curthread->t_tid); #else -return 0; + return ((uint64_t)curthread->td_tid); #endif case DIF_VAR_EXECNAME: -printf("%s:%s(%d): DOODAD\n",__FUNCTION__,__FILE__,__LINE__); -#ifdef DOODAD +#if defined(sun) if (!dtrace_priv_proc(state)) return (0); @@ -287,12 +281,11 @@ return ((uint64_t)(uintptr_t) curthread->t_procp->p_user.u_comm); #else -return 0; + return ((uint64_t)(uintptr_t) curproc->p_comm); #endif case DIF_VAR_ZONENAME: -printf("%s:%s(%d): DOODAD\n",__FUNCTION__,__FILE__,__LINE__); -#ifdef DOODAD +#if defined(sun) if (!dtrace_priv_proc(state)) return (0); @@ -311,7 +304,7 @@ return ((uint64_t)(uintptr_t) curthread->t_procp->p_zone->zone_name); #else -return 0; + return 0; #endif default: @@ -353,7 +346,7 @@ break; case DIF_SUBR_MUTEX_OWNED: -printf("%s:%s(%d): DOODAD\n",__FUNCTION__,__FILE__,__LINE__); +printf("%s:%s(%d): DIF_SUBR_MUTEX_OWNED\n",__FUNCTION__,__FILE__,__LINE__); #ifdef DOODAD m.mx = dtrace_load64(tupregs[0].dttk_value); if (MUTEX_TYPE_ADAPTIVE(&m.mi)) @@ -364,7 +357,7 @@ break; case DIF_SUBR_MUTEX_OWNER: -printf("%s:%s(%d): DOODAD\n",__FUNCTION__,__FILE__,__LINE__); +printf("%s:%s(%d): DIF_SUBR_MUTEX_OWNER\n",__FUNCTION__,__FILE__,__LINE__); #ifdef DOODAD m.mx = dtrace_load64(tupregs[0].dttk_value); if (MUTEX_TYPE_ADAPTIVE(&m.mi) && @@ -376,7 +369,7 @@ break; case DIF_SUBR_MUTEX_TYPE_ADAPTIVE: -printf("%s:%s(%d): DOODAD\n",__FUNCTION__,__FILE__,__LINE__); +printf("%s:%s(%d): DIF_SUBR_MUTEX_TYPE_ADAPTIVE\n",__FUNCTION__,__FILE__,__LINE__); #ifdef DOODAD m.mx = dtrace_load64(tupregs[0].dttk_value); regs[rd] = MUTEX_TYPE_ADAPTIVE(&m.mi); @@ -384,7 +377,7 @@ break; case DIF_SUBR_MUTEX_TYPE_SPIN: -printf("%s:%s(%d): DOODAD\n",__FUNCTION__,__FILE__,__LINE__); +printf("%s:%s(%d): DIF_SUBR_MUTEX_TYPE_SPIN\n",__FUNCTION__,__FILE__,__LINE__); #ifdef DOODAD m.mx = dtrace_load64(tupregs[0].dttk_value); regs[rd] = MUTEX_TYPE_SPIN(&m.mi); @@ -392,7 +385,7 @@ break; case DIF_SUBR_RW_READ_HELD: { -printf("%s:%s(%d): DOODAD\n",__FUNCTION__,__FILE__,__LINE__); +printf("%s:%s(%d): DIF_SUBR_RW_READ_HELD\n",__FUNCTION__,__FILE__,__LINE__); #ifdef DOODAD uintptr_t tmp; @@ -403,7 +396,7 @@ } case DIF_SUBR_RW_WRITE_HELD: -printf("%s:%s(%d): DOODAD\n",__FUNCTION__,__FILE__,__LINE__); +printf("%s:%s(%d): DIF_SUBR_RW_WRITE_HELD\n",__FUNCTION__,__FILE__,__LINE__); #ifdef DOODAD r.rw = dtrace_loadptr(tupregs[0].dttk_value); regs[rd] = _RW_WRITE_HELD(&r.ri); @@ -411,7 +404,7 @@ break; case DIF_SUBR_RW_ISWRITER: -printf("%s:%s(%d): DOODAD\n",__FUNCTION__,__FILE__,__LINE__); +printf("%s:%s(%d): DIF_SUBR_RW_ISWRITER\n",__FUNCTION__,__FILE__,__LINE__); #ifdef DOODAD r.rw = dtrace_loadptr(tupregs[0].dttk_value); regs[rd] = _RW_ISWRITER(&r.ri); @@ -519,7 +512,7 @@ case DIF_SUBR_MSGSIZE: case DIF_SUBR_MSGDSIZE: { -printf("%s:%s(%d): DOODAD\n",__FUNCTION__,__FILE__,__LINE__); +printf("%s:%s(%d): DIF_SUBR_MSGSIZE or DIF_SUBR_MSGDSIZE\n",__FUNCTION__,__FILE__,__LINE__); #ifdef DOODAD uintptr_t baddr = tupregs[0].dttk_value, daddr; uintptr_t wptr, rptr; @@ -572,25 +565,31 @@ } case DIF_SUBR_PROGENYOF: { -printf("%s:%s(%d): DOODAD\n",__FUNCTION__,__FILE__,__LINE__); -#ifdef DOODAD pid_t pid = tupregs[0].dttk_value; proc_t *p; int rval = 0; DTRACE_CPUFLAG_SET(CPU_DTRACE_NOFAULT); +#if defined(sun) for (p = curthread->t_procp; p != NULL; p = p->p_parent) { if (p->p_pidp->pid_id == pid) { rval = 1; break; } } +#else + for (p = curproc; p != NULL; p = p->p_pptr) { + if (p->p_pid == pid) { + rval = 1; + break; + } + } +#endif DTRACE_CPUFLAG_CLEAR(CPU_DTRACE_NOFAULT); regs[rd] = rval; -#endif break; } @@ -665,8 +664,6 @@ case DIF_SUBR_STRSTR: case DIF_SUBR_INDEX: case DIF_SUBR_RINDEX: { -printf("%s:%s(%d): DOODAD\n",__FUNCTION__,__FILE__,__LINE__); -#ifdef DOODAD /* * We're going to iterate over the string looking for the * specified string. We will iterate until we have reached @@ -800,29 +797,27 @@ } } -#endif break; } case DIF_SUBR_STRTOK: { -printf("%s:%s(%d): DOODAD\n",__FUNCTION__,__FILE__,__LINE__); -#ifdef DOODAD uintptr_t addr = tupregs[0].dttk_value; uintptr_t tokaddr = tupregs[1].dttk_value; uint64_t size = state->dts_options[DTRACEOPT_STRSIZE]; uintptr_t limit, toklimit = tokaddr + size; - uint8_t c, tokmap[32]; /* 256 / 8 */ + uint8_t c = 0; + uint8_t tokmap[32]; /* 256 / 8 */ char *dest = (char *)mstate->dtms_scratch_ptr; int i; if (mstate->dtms_scratch_ptr + size > mstate->dtms_scratch_base + mstate->dtms_scratch_size) { DTRACE_CPUFLAG_SET(CPU_DTRACE_NOSCRATCH); - regs[rd] = NULL; + regs[rd] = 0; break; } - if (addr == NULL) { + if (addr == 0) { /* * If the address specified is NULL, we use our saved * strtok pointer from the mstate. Note that this @@ -868,8 +863,8 @@ * We return NULL in this case, and we set the saved * address to NULL as well. */ - regs[rd] = NULL; - mstate->dtms_strtok = NULL; + regs[rd] = 0; + mstate->dtms_strtok = 0; break; } @@ -892,13 +887,10 @@ regs[rd] = (uintptr_t)dest; mstate->dtms_scratch_ptr += size; mstate->dtms_strtok = addr; -#endif break; } case DIF_SUBR_SUBSTR: { -printf("%s:%s(%d): DOODAD\n",__FUNCTION__,__FILE__,__LINE__); -#ifdef DOODAD uintptr_t s = tupregs[0].dttk_value; uint64_t size = state->dts_options[DTRACEOPT_STRSIZE]; char *d = (char *)mstate->dtms_scratch_ptr; @@ -913,7 +905,7 @@ if (mstate->dtms_scratch_ptr + size > mstate->dtms_scratch_base + mstate->dtms_scratch_size) { DTRACE_CPUFLAG_SET(CPU_DTRACE_NOSCRATCH); - regs[rd] = NULL; + regs[rd] = 0; break; } @@ -941,12 +933,11 @@ mstate->dtms_scratch_ptr += size; regs[rd] = (uintptr_t)d; -#endif break; } case DIF_SUBR_GETMAJOR: -printf("%s:%s(%d): DOODAD\n",__FUNCTION__,__FILE__,__LINE__); +printf("%s:%s(%d): DIF_SUBR_GETMAJOR\n",__FUNCTION__,__FILE__,__LINE__); #ifdef DOODAD #ifdef _LP64 regs[rd] = (tupregs[0].dttk_value >> NBITSMINOR64) & MAXMAJ64; @@ -957,7 +948,7 @@ break; case DIF_SUBR_GETMINOR: -printf("%s:%s(%d): DOODAD\n",__FUNCTION__,__FILE__,__LINE__); +printf("%s:%s(%d): DIF_SUBR_GETMINOR\n",__FUNCTION__,__FILE__,__LINE__); #ifdef DOODAD #ifdef _LP64 regs[rd] = tupregs[0].dttk_value & MAXMIN64; @@ -968,7 +959,7 @@ break; case DIF_SUBR_DDI_PATHNAME: { -printf("%s:%s(%d): DOODAD\n",__FUNCTION__,__FILE__,__LINE__); +printf("%s:%s(%d): DIF_SUBR_DDI_PATHNAME\n",__FUNCTION__,__FILE__,__LINE__); #ifdef DOODAD /* * This one is a galactic mess. We are going to roughly @@ -1200,8 +1191,6 @@ } case DIF_SUBR_LLTOSTR: { -printf("%s:%s(%d): DOODAD\n",__FUNCTION__,__FILE__,__LINE__); -#ifdef DOODAD int64_t i = (int64_t)tupregs[0].dttk_value; int64_t val = i < 0 ? i * -1 : i; uint64_t size = 22; /* enough room for 2^64 in decimal */ @@ -1210,7 +1199,7 @@ if (mstate->dtms_scratch_ptr + size > mstate->dtms_scratch_base + mstate->dtms_scratch_size) { DTRACE_CPUFLAG_SET(CPU_DTRACE_NOSCRATCH); - regs[rd] = NULL; + regs[rd] = 0; break; } @@ -1225,14 +1214,11 @@ regs[rd] = (uintptr_t)end + 1; mstate->dtms_scratch_ptr += size; -#endif break; } case DIF_SUBR_DIRNAME: case DIF_SUBR_BASENAME: { -printf("%s:%s(%d): DOODAD\n",__FUNCTION__,__FILE__,__LINE__); -#ifdef DOODAD char *dest = (char *)mstate->dtms_scratch_ptr; uint64_t size = state->dts_options[DTRACEOPT_STRSIZE]; uintptr_t src = tupregs[0].dttk_value; @@ -1243,7 +1229,7 @@ if (mstate->dtms_scratch_ptr + size > mstate->dtms_scratch_base + mstate->dtms_scratch_size) { DTRACE_CPUFLAG_SET(CPU_DTRACE_NOSCRATCH); - regs[rd] = NULL; + regs[rd] = 0; break; } @@ -1355,7 +1341,6 @@ dest[j] = '\0'; regs[rd] = (uintptr_t)dest; mstate->dtms_scratch_ptr += size; -#endif break; } From owner-p4-projects@FreeBSD.ORG Fri May 12 23:35:26 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C68D116A6CF; Fri, 12 May 2006 23:35:25 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 8706916A6C7 for ; Fri, 12 May 2006 23:35:25 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id C98A543D45 for ; Fri, 12 May 2006 23:35:21 +0000 (GMT) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k4CNZLEu004593 for ; Fri, 12 May 2006 23:35:21 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k4CNZLuN004590 for perforce@freebsd.org; Fri, 12 May 2006 23:35:21 GMT (envelope-from jb@freebsd.org) Date: Fri, 12 May 2006 23:35:21 GMT Message-Id: <200605122335.k4CNZLuN004590@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 97038 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 12 May 2006 23:35:28 -0000 http://perforce.freebsd.org/chv.cgi?CH=97038 Change 97038 by jb@jb_freebsd2 on 2006/05/12 23:35:05 We're up to a test pass count of 642 now. This commit reflects that, however it mostly groups the tests that fail into groups according to the work needed to many them work. The majority of these are builtin variables that need to be ported to FreeBSD. Things like 'curpsinfo', for instance, are implemented in D library scripts that I haven't ported yet. I guess that's next. 8-) Some of the test failures are due to shell scripts which contain code which FreeBSD's 'sh' handles differently to Solaris' 'ksh'. Affected files ... .. //depot/projects/dtrace/src/cddl/test/dtrace/Makefile#2 edit Differences ... ==== //depot/projects/dtrace/src/cddl/test/dtrace/Makefile#2 (text+ko) ==== @@ -81,6 +81,7 @@ ${.CURDIR}/tst/common/aggs/tst.lquantzero.d \ ${.CURDIR}/tst/common/aggs/tst.max.d \ ${.CURDIR}/tst/common/aggs/tst.min.d \ + ${.CURDIR}/tst/common/aggs/tst.multiaggs1.d \ ${.CURDIR}/tst/common/aggs/tst.multiaggs2.d \ ${.CURDIR}/tst/common/aggs/tst.multiaggs3.d \ ${.CURDIR}/tst/common/aggs/tst.multinormalize.d \ @@ -157,12 +158,17 @@ TESTBUILTINVAR= \ ${.CURDIR}/tst/common/builtinvar/tst.arg0.d \ + ${.CURDIR}/tst/common/builtinvar/tst.arg0clause.d \ ${.CURDIR}/tst/common/builtinvar/tst.arg1.d \ ${.CURDIR}/tst/common/builtinvar/tst.arg1to8.d \ + ${.CURDIR}/tst/common/builtinvar/tst.arg1to8clause.d \ ${.CURDIR}/tst/common/builtinvar/tst.epid.d \ ${.CURDIR}/tst/common/builtinvar/tst.epid1.d \ + ${.CURDIR}/tst/common/builtinvar/tst.execname.d \ ${.CURDIR}/tst/common/builtinvar/tst.id.d \ ${.CURDIR}/tst/common/builtinvar/tst.id1.d \ + ${.CURDIR}/tst/common/builtinvar/tst.pid.d \ + ${.CURDIR}/tst/common/builtinvar/tst.pid1.d \ ${.CURDIR}/tst/common/builtinvar/tst.tid.d \ ${.CURDIR}/tst/common/builtinvar/tst.tid1.d \ ${.CURDIR}/tst/common/builtinvar/tst.timestamp.d \ @@ -262,11 +268,19 @@ ${.CURDIR}/tst/common/funcs/err.copyoutbadaddr.ksh \ ${.CURDIR}/tst/common/funcs/err.copyoutstrbadaddr.ksh \ ${.CURDIR}/tst/common/funcs/tst.badfreopen.ksh \ + ${.CURDIR}/tst/common/funcs/tst.basename.d \ + ${.CURDIR}/tst/common/funcs/tst.cleanpath.d \ ${.CURDIR}/tst/common/funcs/tst.default.d \ ${.CURDIR}/tst/common/funcs/tst.ftruncate.ksh \ + ${.CURDIR}/tst/common/funcs/tst.index.d \ + ${.CURDIR}/tst/common/funcs/tst.lltostr.d \ + ${.CURDIR}/tst/common/funcs/tst.progenyof.d \ ${.CURDIR}/tst/common/funcs/tst.rand.d \ ${.CURDIR}/tst/common/funcs/tst.strchr.d \ - ${.CURDIR}/tst/common/funcs/tst.strjoin.d + ${.CURDIR}/tst/common/funcs/tst.strjoin.d \ + ${.CURDIR}/tst/common/funcs/tst.strstr.d \ + ${.CURDIR}/tst/common/funcs/tst.strtok.d \ + ${.CURDIR}/tst/common/funcs/tst.substr.d TESTGRAMMAR= \ ${.CURDIR}/tst/common/grammar/err.D_ADDROF_LVAL.d \ @@ -839,6 +853,24 @@ ${.CURDIR}/tst/common/dtraceUtil/tst.ZeroProbesWithoutZ.d.ksh \ ${.CURDIR}/tst/common/dtraceUtil/tst.ZeroProviderProbes.d.ksh +TESTFASTTRAP= \ + ${.CURDIR}/tst/common/fasttrap/tst.fasttrap.d \ + ${.CURDIR}/tst/common/fasttrap/tst.fasttrap.exe \ + ${.CURDIR}/tst/common/fasttrap/tst.stack.d \ + ${.CURDIR}/tst/common/fasttrap/tst.stack.exe + +TESTFBTPROVIDER= \ + ${.CURDIR}/tst/common/fbtprovider/err.D_PDESC_ZERO.notreturn.d \ + ${.CURDIR}/tst/common/fbtprovider/tst.basic.d \ + ${.CURDIR}/tst/common/fbtprovider/tst.functionentry.d \ + ${.CURDIR}/tst/common/fbtprovider/tst.functionreturnvalue.d \ + ${.CURDIR}/tst/common/fbtprovider/tst.ioctlargs.d \ + ${.CURDIR}/tst/common/fbtprovider/tst.offset.d \ + ${.CURDIR}/tst/common/fbtprovider/tst.offsetzero.d \ + ${.CURDIR}/tst/common/fbtprovider/tst.return.d \ + ${.CURDIR}/tst/common/fbtprovider/tst.return0.d \ + ${.CURDIR}/tst/common/fbtprovider/tst.tailcall.d + TESTIO= \ ${.CURDIR}/tst/common/io/tst.fds.d \ ${.CURDIR}/tst/common/io/tst.fds.exe @@ -1201,85 +1233,18 @@ # Tests that currently fail (but don't make the system go kaboom): NOTWORK= \ - ${TESTSAFETY} \ - ${.CURDIR}/tst/common/aggs/err.D_KEY_TYPE.badkey4.d \ ${.CURDIR}/tst/common/aggs/tst.neglquant.d \ ${.CURDIR}/tst/common/aggs/tst.negquant.d \ ${.CURDIR}/tst/common/aggs/tst.subr.d \ ${.CURDIR}/tst/common/arrays/tst.uregsarray.d \ - ${.CURDIR}/tst/common/assocs/err.D_OP_INCOMPAT.dupgtype.d \ - ${.CURDIR}/tst/common/assocs/err.D_OP_INCOMPAT.dupttype.d \ - ${.CURDIR}/tst/common/assocs/tst.orthogonality.d \ - ${.CURDIR}/tst/common/builtinvar/err.D_XLATE_NOCONV.cpuusage.d \ - ${.CURDIR}/tst/common/builtinvar/err.D_XLATE_NOCONV.nice.d \ - ${.CURDIR}/tst/common/builtinvar/err.D_XLATE_NOCONV.priority.d \ - ${.CURDIR}/tst/common/builtinvar/err.D_XLATE_NOCONV.prsize.d \ - ${.CURDIR}/tst/common/builtinvar/err.D_XLATE_NOCONV.rssize.d \ - ${.CURDIR}/tst/common/builtinvar/tst.errno.d \ - ${.CURDIR}/tst/common/builtinvar/tst.errno1.d \ - ${.CURDIR}/tst/common/builtinvar/tst.execname.d \ - ${.CURDIR}/tst/common/builtinvar/tst.hpriority.d \ - ${.CURDIR}/tst/common/builtinvar/tst.lwpsinfo.d \ - ${.CURDIR}/tst/common/builtinvar/tst.lwpsinfo1.d \ - ${.CURDIR}/tst/common/builtinvar/tst.psinfo.d \ - ${.CURDIR}/tst/common/builtinvar/tst.psinfo1.d \ ${.CURDIR}/tst/common/decls/tst.basics.d \ ${.CURDIR}/tst/common/drops/drp.DTRACEDROP_STKSTROVERFLOW.d \ ${.CURDIR}/tst/common/error/tst.DTRACEFLT_BADADDR.d \ ${.CURDIR}/tst/common/error/tst.DTRACEFLT_UNKNOWN.d \ - ${.CURDIR}/tst/common/fasttrap/tst.fasttrap.d \ - ${.CURDIR}/tst/common/fasttrap/tst.fasttrap.exe \ - ${.CURDIR}/tst/common/fasttrap/tst.stack.d \ - ${.CURDIR}/tst/common/fasttrap/tst.stack.exe \ - ${.CURDIR}/tst/common/fbtprovider/err.D_PDESC_ZERO.notreturn.d \ - ${.CURDIR}/tst/common/fbtprovider/tst.basic.d \ - ${.CURDIR}/tst/common/fbtprovider/tst.functionentry.d \ - ${.CURDIR}/tst/common/fbtprovider/tst.functionreturnvalue.d \ - ${.CURDIR}/tst/common/fbtprovider/tst.ioctlargs.d \ - ${.CURDIR}/tst/common/fbtprovider/tst.offset.d \ - ${.CURDIR}/tst/common/fbtprovider/tst.offsetzero.d \ - ${.CURDIR}/tst/common/fbtprovider/tst.return.d \ - ${.CURDIR}/tst/common/fbtprovider/tst.return0.d \ - ${.CURDIR}/tst/common/fbtprovider/tst.tailcall.d \ - ${.CURDIR}/tst/common/funcs/err.D_PROTO_ARG.mobadarg.d \ - ${.CURDIR}/tst/common/funcs/err.D_PROTO_LEN.motoofew.d \ - ${.CURDIR}/tst/common/funcs/err.D_PROTO_LEN.motoomany.d \ - ${.CURDIR}/tst/common/funcs/err.D_PROTO_LEN.mtatoofew.d \ - ${.CURDIR}/tst/common/funcs/err.D_PROTO_LEN.mtatoomany.d \ - ${.CURDIR}/tst/common/funcs/tst.bcopy.d \ - ${.CURDIR}/tst/common/funcs/tst.cleanpath.d \ - ${.CURDIR}/tst/common/funcs/tst.copyin.d \ - ${.CURDIR}/tst/common/funcs/tst.copyinto.d \ - ${.CURDIR}/tst/common/funcs/tst.ddi_pathname.d \ - ${.CURDIR}/tst/common/funcs/tst.freopen.ksh \ - ${.CURDIR}/tst/common/funcs/tst.index.d \ - ${.CURDIR}/tst/common/funcs/tst.mutex_owned.d \ - ${.CURDIR}/tst/common/funcs/tst.mutex_owner.d \ - ${.CURDIR}/tst/common/funcs/tst.mutex_type_adaptive.d \ - ${.CURDIR}/tst/common/funcs/tst.progenyof.d \ - ${.CURDIR}/tst/common/funcs/tst.strstr.d \ - ${.CURDIR}/tst/common/funcs/tst.strtok.d \ - ${.CURDIR}/tst/common/funcs/tst.substr.d \ - ${.CURDIR}/tst/common/inline/err.D_OP_INCOMPAT.badxlate.d \ - ${.CURDIR}/tst/common/inline/tst.InlineDataAssign.d \ - ${.CURDIR}/tst/common/inline/tst.InlineExpression.d \ - ${.CURDIR}/tst/common/inline/tst.InlineTypedef.d \ - ${.CURDIR}/tst/common/offsetof/err.D_OFFSETOF_BITFIELD.bitfield.d \ - ${.CURDIR}/tst/common/offsetof/err.D_UNKNOWN.badmemb.d \ - ${.CURDIR}/tst/common/pointers/err.D_OP_LVAL.AddressChange.d \ - ${.CURDIR}/tst/common/pointers/tst.GlobalVar.d \ - ${.CURDIR}/tst/common/pointers/tst.basic1.d \ - ${.CURDIR}/tst/common/pointers/tst.basic2.d \ - ${.CURDIR}/tst/common/predicates/tst.argsnotcached.d \ - ${.CURDIR}/tst/common/preprocessor/err.D_PRAGCTL_INVAL.tabdefine.d \ - ${.CURDIR}/tst/common/printa/tst.many.d \ ${.CURDIR}/tst/common/printa/tst.walltimestamp.d \ ${.CURDIR}/tst/common/printf/tst.basics.d \ ${.CURDIR}/tst/common/printf/tst.printT.d \ ${.CURDIR}/tst/common/printf/tst.printY.d \ - ${.CURDIR}/tst/common/printf/tst.str.d \ - ${.CURDIR}/tst/common/printf/tst.sym.d \ - ${.CURDIR}/tst/common/probes/tst.probestar.d \ ${.CURDIR}/tst/common/profile-n/tst.argtest.d \ ${.CURDIR}/tst/common/profile-n/tst.func.ksh \ ${.CURDIR}/tst/common/profile-n/tst.mod.ksh \ @@ -1287,14 +1252,6 @@ ${.CURDIR}/tst/common/profile-n/tst.ufunc.ksh \ ${.CURDIR}/tst/common/profile-n/tst.umod.ksh \ ${.CURDIR}/tst/common/profile-n/tst.usym.ksh \ - ${.CURDIR}/tst/common/providers/tst.beginprof.d \ - ${.CURDIR}/tst/common/providers/tst.probattrs.d \ - ${.CURDIR}/tst/common/providers/tst.probefunc.d \ - ${.CURDIR}/tst/common/scalars/err.D_OP_INCOMPAT.dupgtype.d \ - ${.CURDIR}/tst/common/scalars/err.D_OP_INCOMPAT.dupltype.d \ - ${.CURDIR}/tst/common/scalars/err.D_OP_INCOMPAT.dupttype.d \ - ${.CURDIR}/tst/common/scalars/tst.misc.d \ - ${.CURDIR}/tst/common/scalars/tst.selfarray2.d \ ${.CURDIR}/tst/common/speculation/err.D_ACT_SPEC.SpeculateWithBreakPoint.d \ ${.CURDIR}/tst/common/speculation/err.D_ACT_SPEC.SpeculateWithChill.d \ ${.CURDIR}/tst/common/speculation/err.D_ACT_SPEC.SpeculateWithCopyOut.d \ @@ -1302,54 +1259,135 @@ ${.CURDIR}/tst/common/speculation/err.D_ACT_SPEC.SpeculateWithPanic.d \ ${.CURDIR}/tst/common/speculation/err.D_ACT_SPEC.SpeculateWithRaise.d \ ${.CURDIR}/tst/common/speculation/err.D_ACT_SPEC.SpeculateWithStop.d \ - ${.CURDIR}/tst/common/trace/err.D_TRACE_VOID.bad.d \ ${.CURDIR}/tst/common/trace/tst.misc.d \ ${.CURDIR}/tst/common/tracemem/err.D_TRACEMEM_ADDR.badaddr.d \ ${.CURDIR}/tst/common/translators/tst.ProcModelTrans.d \ - ${.CURDIR}/tst/common/types/err.D_CAST_INVAL.badcast.d \ ${.CURDIR}/tst/common/types/err.D_CG_DYN.ResultDynType.d \ ${.CURDIR}/tst/common/types/err.D_XLATE_REDECL.ResultDynType.d \ - ${.CURDIR}/tst/common/types/tst.complex.d \ - ${.CURDIR}/tst/common/types/tst.ptrincop.d \ - ${.CURDIR}/tst/common/types/tst.ptrops.d \ + +notwork : ${.CURDIR}/bin/dtest ${NOTWORK} + @${.CURDIR}/bin/dtest ${NOTWORK} + +REQUIRES_CURPSINFO= \ + ${.CURDIR}/tst/common/aggs/err.D_KEY_TYPE.badkey4.d \ + ${.CURDIR}/tst/common/builtinvar/err.D_XLATE_NOCONV.prsize.d \ + ${.CURDIR}/tst/common/builtinvar/err.D_XLATE_NOCONV.rssize.d \ + ${.CURDIR}/tst/common/builtinvar/tst.psinfo.d \ + ${.CURDIR}/tst/common/builtinvar/tst.psinfo1.d \ + ${.CURDIR}/tst/common/funcs/tst.copyin.d \ + ${.CURDIR}/tst/common/funcs/tst.copyinto.d \ ${.CURDIR}/tst/common/types/tst.struct.d \ ${.CURDIR}/tst/common/types/tst.typedef.d \ ${.CURDIR}/tst/common/vars/tst.gid.d \ ${.CURDIR}/tst/common/vars/tst.ppid.d \ - ${.CURDIR}/tst/common/vars/tst.ucaller.ksh \ ${.CURDIR}/tst/common/vars/tst.uid.d -notwork : ${.CURDIR}/bin/dtest ${NOTWORK} - @${.CURDIR}/bin/dtest ${NOTWORK} +REQUIRES_CURLWPSINFO= \ + ${.CURDIR}/tst/common/builtinvar/err.D_XLATE_NOCONV.priority.d \ + ${.CURDIR}/tst/common/builtinvar/err.D_XLATE_NOCONV.cpuusage.d \ + ${.CURDIR}/tst/common/builtinvar/err.D_XLATE_NOCONV.nice.d \ + ${.CURDIR}/tst/common/builtinvar/tst.hpriority.d \ + ${.CURDIR}/tst/common/builtinvar/tst.lwpsinfo.d \ + ${.CURDIR}/tst/common/builtinvar/tst.lwpsinfo1.d + +REQUIRES_CURTHREAD= \ + ${.CURDIR}/tst/common/assocs/tst.orthogonality.d \ + ${.CURDIR}/tst/common/scalars/tst.selfarray2.d \ + ${.CURDIR}/tst/common/types/tst.complex.d + +REQUIRES_ERRNO= \ + ${.CURDIR}/tst/common/builtinvar/tst.errno.d \ + ${.CURDIR}/tst/common/builtinvar/tst.errno1. + +REQUIRES_FBT= \ + ${.CURDIR}/tst/common/predicates/tst.argsnotcached.d + +REQUIRES_KMEM_FLAGS= \ + ${.CURDIR}/tst/common/assocs/err.D_OP_INCOMPAT.dupgtype.d \ + ${.CURDIR}/tst/common/assocs/err.D_OP_INCOMPAT.dupttype.d \ + ${.CURDIR}/tst/common/funcs/tst.bcopy.d \ + ${.CURDIR}/tst/common/inline/tst.InlineDataAssign.d \ + ${.CURDIR}/tst/common/inline/tst.InlineExpression.d \ + ${.CURDIR}/tst/common/inline/tst.InlineTypedef.d \ + ${.CURDIR}/tst/common/pointers/err.D_OP_LVAL.AddressChange.d \ + ${.CURDIR}/tst/common/pointers/tst.GlobalVar.d \ + ${.CURDIR}/tst/common/pointers/tst.basic1.d \ + ${.CURDIR}/tst/common/pointers/tst.basic2.d \ + ${.CURDIR}/tst/common/scalars/err.D_OP_INCOMPAT.dupgtype.d \ + ${.CURDIR}/tst/common/scalars/err.D_OP_INCOMPAT.dupltype.d \ + ${.CURDIR}/tst/common/scalars/err.D_OP_INCOMPAT.dupttype.d \ + ${.CURDIR}/tst/common/scalars/tst.misc.d \ + ${.CURDIR}/tst/common/trace/err.D_TRACE_VOID.bad.d \ + ${.CURDIR}/tst/common/types/err.D_CAST_INVAL.badcast.d \ + ${.CURDIR}/tst/common/types/tst.ptrincop.d \ + ${.CURDIR}/tst/common/types/tst.ptrops.d + +REQUIRES_LIBPROC= \ + ${.CURDIR}/tst/common/vars/tst.ucaller.ksh + +REQUIRES_ROOTFS= \ + ${.CURDIR}/tst/common/printf/tst.str.d + +REQUIRES_TCP_T= \ + ${.CURDIR}/tst/common/offsetof/err.D_OFFSETOF_BITFIELD.bitfield.d + +REQUIRES_VFS_T= \ + ${.CURDIR}/tst/common/inline/err.D_OP_INCOMPAT.badxlate.d + +REQUIRES_VNODE_T= \ + ${.CURDIR}/tst/common/offsetof/err.D_UNKNOWN.badmemb.d + +# -------------------------------------------------------------------------------- +# These need to be ported or a decision made as to why they don't apply to FreeBSD: + +SOLARIS_SPECIFIC= \ + ${.CURDIR}/tst/common/funcs/err.D_PROTO_ARG.mobadarg.d \ + ${.CURDIR}/tst/common/funcs/err.D_PROTO_LEN.motoofew.d \ + ${.CURDIR}/tst/common/funcs/err.D_PROTO_LEN.motoomany.d \ + ${.CURDIR}/tst/common/funcs/err.D_PROTO_LEN.mtatoofew.d \ + ${.CURDIR}/tst/common/funcs/err.D_PROTO_LEN.mtatoomany.d \ + ${.CURDIR}/tst/common/funcs/tst.ddi_pathname.d \ + ${.CURDIR}/tst/common/funcs/tst.freopen.ksh \ + ${.CURDIR}/tst/common/funcs/tst.mutex_owned.d \ + ${.CURDIR}/tst/common/funcs/tst.mutex_owner.d \ + ${.CURDIR}/tst/common/funcs/tst.mutex_type_adaptive.d \ + ${.CURDIR}/tst/common/preprocessor/err.D_PRAGCTL_INVAL.tabdefine.d \ + ${.CURDIR}/tst/common/printf/tst.sym.d \ + ${.CURDIR}/tst/common/probes/tst.probestar.d \ # -------------------------------------------------------------------------------- # Tests that currently hang. TESTHANG= \ - ${.CURDIR}/tst/common/aggs/tst.multiaggs1.d \ ${.CURDIR}/tst/common/aggs/tst.signature.d \ - ${.CURDIR}/tst/common/builtinvar/tst.arg0clause.d \ - ${.CURDIR}/tst/common/builtinvar/tst.arg1to8clause.d \ ${.CURDIR}/tst/common/builtinvar/tst.caller.d \ ${.CURDIR}/tst/common/builtinvar/tst.caller1.d \ ${.CURDIR}/tst/common/builtinvar/tst.ipl.d \ ${.CURDIR}/tst/common/builtinvar/tst.ipl1.d \ - ${.CURDIR}/tst/common/builtinvar/tst.pid.d \ - ${.CURDIR}/tst/common/builtinvar/tst.pid1.d \ - ${.CURDIR}/tst/common/funcs/tst.basename.d \ ${.CURDIR}/tst/common/funcs/tst.chill.ksh \ - ${.CURDIR}/tst/common/funcs/tst.lltostr.d \ ${.CURDIR}/tst/common/funcs/tst.system.d \ ${.CURDIR}/tst/common/inline/tst.InlineKinds.d \ ${.CURDIR}/tst/common/multiaggs/tst.many.d \ ${.CURDIR}/tst/common/multiaggs/tst.sortpos.d \ ${.CURDIR}/tst/common/multiaggs/tst.tuplecompat.d \ ${.CURDIR}/tst/common/predicates/tst.predcache.ksh \ + ${.CURDIR}/tst/common/printa/tst.many.d \ ${.CURDIR}/tst/common/printa/tst.stack.d \ + ${.CURDIR}/tst/common/providers/tst.beginprof.d \ + ${.CURDIR}/tst/common/providers/tst.probattrs.d \ + ${.CURDIR}/tst/common/providers/tst.probefunc.d \ ${.CURDIR}/tst/common/speculation/tst.NoSpecBuffer.d \ ${.CURDIR}/tst/common/tracemem/tst.rootvp.d testhang : ${.CURDIR}/bin/dtest ${TESTHANG} @${.CURDIR}/bin/dtest ${TESTHANG} +# -------------------------------------------------------------------------------- +# Tests currently trying to fix... + +TESTTRY= \ + +testtry : ${.CURDIR}/bin/dtest ${TESTTRY} + @${.CURDIR}/bin/dtest ${TESTTRY} + .include From owner-p4-projects@FreeBSD.ORG Sat May 13 00:07:03 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 69A9E16A70B; Sat, 13 May 2006 00:07:03 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 2913816A705 for ; Sat, 13 May 2006 00:07:03 +0000 (UTC) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id C554943D46 for ; Sat, 13 May 2006 00:07:02 +0000 (GMT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k4D072pc007268 for ; Sat, 13 May 2006 00:07:02 GMT (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k4D0713g007263 for perforce@freebsd.org; Sat, 13 May 2006 00:07:01 GMT (envelope-from marcel@freebsd.org) Date: Sat, 13 May 2006 00:07:01 GMT Message-Id: <200605130007.k4D0713g007263@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Cc: Subject: PERFORCE change 97040 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 13 May 2006 00:07:04 -0000 http://perforce.freebsd.org/chv.cgi?CH=97040 Change 97040 by marcel@marcel_nfs on 2006/05/13 00:06:52 IFC @97039 Affected files ... .. //depot/projects/tty/etc/defaults/periodic.conf#8 integrate .. //depot/projects/tty/etc/periodic/security/600.ip6fwdenied#3 delete .. //depot/projects/tty/etc/periodic/security/650.ip6fwlimit#3 delete .. //depot/projects/tty/etc/periodic/security/Makefile#3 integrate .. //depot/projects/tty/etc/rc.d/ip6fw#5 integrate .. //depot/projects/tty/etc/rc.firewall6#7 integrate .. //depot/projects/tty/include/netdb.h#12 integrate .. //depot/projects/tty/lib/libc/net/gethostbydns.c#9 integrate .. //depot/projects/tty/lib/libc/net/gethostbyht.c#6 integrate .. //depot/projects/tty/lib/libc/net/gethostbyname.3#8 integrate .. //depot/projects/tty/lib/libc/net/gethostbynis.c#7 integrate .. //depot/projects/tty/lib/libc/net/gethostnamadr.c#7 integrate .. //depot/projects/tty/lib/libc/net/netdb_private.h#6 integrate .. //depot/projects/tty/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#34 integrate .. //depot/projects/tty/sbin/Makefile#20 integrate .. //depot/projects/tty/sbin/ip6fw/Makefile#3 delete .. //depot/projects/tty/sbin/ip6fw/ip6fw.8#8 delete .. //depot/projects/tty/sbin/ip6fw/ip6fw.c#8 delete .. //depot/projects/tty/sbin/ip6fw/sample.sh#2 delete .. //depot/projects/tty/sbin/ipfw/ipfw.8#23 integrate .. //depot/projects/tty/share/man/man4/ath.4#12 integrate .. //depot/projects/tty/share/man/man5/periodic.conf.5#11 integrate .. //depot/projects/tty/share/man/man5/rc.conf.5#26 integrate .. //depot/projects/tty/share/man/man7/security.7#8 integrate .. //depot/projects/tty/sys/boot/Makefile#9 integrate .. //depot/projects/tty/sys/boot/common/Makefile.inc#7 integrate .. //depot/projects/tty/sys/boot/common/load_elf.c#8 integrate .. //depot/projects/tty/sys/boot/common/loader.8#17 integrate .. //depot/projects/tty/sys/boot/efi/libefi/bootinfo.c#6 integrate .. //depot/projects/tty/sys/boot/ficl/Makefile#8 integrate .. //depot/projects/tty/sys/boot/ficl/alpha/sysdep.c#2 delete .. //depot/projects/tty/sys/boot/ficl/alpha/sysdep.h#2 delete .. //depot/projects/tty/sys/boot/ficl/loader.c#5 integrate .. //depot/projects/tty/sys/boot/forth/loader.4th#2 integrate .. //depot/projects/tty/sys/boot/ia64/ski/bootinfo.c#3 integrate .. //depot/projects/tty/sys/boot/ia64/ski/conf.c#2 integrate .. //depot/projects/tty/sys/boot/powerpc/loader/conf.c#3 integrate .. //depot/projects/tty/sys/compat/linprocfs/linprocfs.c#15 integrate .. //depot/projects/tty/sys/conf/NOTES#33 integrate .. //depot/projects/tty/sys/conf/files#42 integrate .. //depot/projects/tty/sys/conf/kern.post.mk#21 integrate .. //depot/projects/tty/sys/conf/options#30 integrate .. //depot/projects/tty/sys/contrib/pf/net/pf_ioctl.c#10 integrate .. //depot/projects/tty/sys/dev/asr/asr.c#13 integrate .. //depot/projects/tty/sys/dev/ata/ata-all.c#26 integrate .. //depot/projects/tty/sys/dev/ata/ata-pci.c#20 integrate .. //depot/projects/tty/sys/dev/atkbdc/atkbd.c#3 integrate .. //depot/projects/tty/sys/dev/atkbdc/atkbdc.c#4 integrate .. //depot/projects/tty/sys/dev/dc/if_dc.c#5 integrate .. //depot/projects/tty/sys/dev/de/if_de.c#2 integrate .. //depot/projects/tty/sys/dev/fb/tga.c#7 delete .. //depot/projects/tty/sys/dev/fb/tga.h#3 delete .. //depot/projects/tty/sys/dev/lge/if_lgereg.h#6 integrate .. //depot/projects/tty/sys/dev/nge/if_ngereg.h#6 integrate .. //depot/projects/tty/sys/dev/pdq/pdq_freebsd.h#9 integrate .. //depot/projects/tty/sys/dev/pdq/pdqvar.h#6 integrate .. //depot/projects/tty/sys/dev/ppc/ppc.c#6 integrate .. //depot/projects/tty/sys/dev/sound/isa/es1888.c#5 delete .. //depot/projects/tty/sys/dev/sound/isa/gusc.c#5 integrate .. //depot/projects/tty/sys/dev/sym/sym_hipd.c#11 integrate .. //depot/projects/tty/sys/dev/syscons/scterm-sc.c#5 integrate .. //depot/projects/tty/sys/dev/syscons/scvgarndr.c#9 integrate .. //depot/projects/tty/sys/dev/syscons/syscons.h#9 integrate .. //depot/projects/tty/sys/dev/uart/uart_dev_z8530.c#8 integrate .. //depot/projects/tty/sys/isa/isa_common.c#8 integrate .. //depot/projects/tty/sys/isa/isa_common.h#3 integrate .. //depot/projects/tty/sys/kern/init_main.c#17 integrate .. //depot/projects/tty/sys/kern/kern_mutex.c#16 integrate .. //depot/projects/tty/sys/kern/kern_sig.c#21 integrate .. //depot/projects/tty/sys/kern/vfs_subr.c#26 integrate .. //depot/projects/tty/sys/modules/ip6fw/Makefile#2 delete .. //depot/projects/tty/sys/modules/sound/driver/ess/Makefile#2 integrate .. //depot/projects/tty/sys/net/if.h#12 integrate .. //depot/projects/tty/sys/net/if_loop.c#16 integrate .. //depot/projects/tty/sys/netinet/ip_fw.h#15 integrate .. //depot/projects/tty/sys/netinet/ip_fw2.c#26 integrate .. //depot/projects/tty/sys/netinet/ip_fw_pfil.c#5 integrate .. //depot/projects/tty/sys/netinet/ip_input.c#22 integrate .. //depot/projects/tty/sys/netinet6/ip6_fw.c#12 delete .. //depot/projects/tty/sys/netinet6/ip6_fw.h#5 delete .. //depot/projects/tty/sys/pci/agp.c#13 integrate .. //depot/projects/tty/sys/pci/if_pcnreg.h#6 integrate .. //depot/projects/tty/sys/pci/if_sfreg.h#6 integrate .. //depot/projects/tty/sys/pci/if_stereg.h#7 integrate .. //depot/projects/tty/sys/pci/if_tl.c#15 integrate .. //depot/projects/tty/sys/pci/if_tlreg.h#6 integrate .. //depot/projects/tty/sys/pci/if_vrreg.h#9 integrate .. //depot/projects/tty/sys/pci/if_wbreg.h#7 integrate .. //depot/projects/tty/sys/pci/ncr.c#10 integrate .. //depot/projects/tty/sys/sys/_timeval.h#3 integrate .. //depot/projects/tty/sys/sys/conf.h#15 integrate .. //depot/projects/tty/sys/sys/disklabel.h#8 integrate .. //depot/projects/tty/sys/sys/elf64.h#3 integrate .. //depot/projects/tty/sys/sys/param.h#26 integrate .. //depot/projects/tty/sys/sys/signal.h#9 integrate .. //depot/projects/tty/sys/sys/ucontext.h#4 integrate .. //depot/projects/tty/sys/sys/user.h#10 integrate .. //depot/projects/tty/tools/tools/tinderbox/etc/update_releng_6.rc#3 integrate .. //depot/projects/tty/usr.sbin/jail/jail.c#10 integrate .. //depot/projects/tty/usr.sbin/portsnap/portsnap/portsnap.sh#6 integrate Differences ... ==== //depot/projects/tty/etc/defaults/periodic.conf#8 (text+ko) ==== @@ -13,7 +13,7 @@ # For a more detailed explanation of all the periodic.conf variables, please # refer to the periodic.conf(5) manual page. # -# $FreeBSD: src/etc/defaults/periodic.conf,v 1.37 2006/03/02 14:46:00 brueffer Exp $ +# $FreeBSD: src/etc/defaults/periodic.conf,v 1.38 2006/05/12 19:17:33 mlaier Exp $ # # What files override these defaults ? @@ -171,15 +171,9 @@ # 550.ipfwlimit daily_status_security_ipfwlimit_enable="YES" -# 600.ip6fwdenied -daily_status_security_ip6fwdenied_enable="YES" - # 610.ipf6denied daily_status_security_ipf6denied_enable="YES" -# 650.ip6fwlimit -daily_status_security_ip6fwlimit_enable="YES" - # 700.kernelmsg daily_status_security_kernelmsg_enable="YES" ==== //depot/projects/tty/etc/periodic/security/Makefile#3 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/etc/periodic/security/Makefile,v 1.4 2004/11/24 18:41:53 mlaier Exp $ +# $FreeBSD: src/etc/periodic/security/Makefile,v 1.5 2006/05/12 19:17:34 mlaier Exp $ FILES= 100.chksetuid \ 200.chkmounts \ @@ -8,8 +8,6 @@ 510.ipfdenied \ 520.pfdenied \ 550.ipfwlimit \ - 600.ip6fwdenied \ - 650.ip6fwlimit \ 700.kernelmsg \ 800.loginfail \ 900.tcpwrap \ ==== //depot/projects/tty/etc/rc.d/ip6fw#5 (text+ko) ==== @@ -1,6 +1,6 @@ #!/bin/sh # -# $FreeBSD: src/etc/rc.d/ip6fw,v 1.6 2004/10/07 13:55:26 mtm Exp $ +# $FreeBSD: src/etc/rc.d/ip6fw,v 1.7 2006/05/12 19:17:34 mlaier Exp $ # # PROVIDE: ip6fw @@ -20,7 +20,7 @@ { # Load IPv6 firewall module, if not already loaded if ! ${SYSCTL} net.inet6.ip6.fw.enable > /dev/null 2>&1; then - kldload ip6fw && { + kldload ipfw && { debug 'Kernel IPv6 firewall module loaded.' return 0 } @@ -41,7 +41,7 @@ if [ -r "${ipv6_firewall_script}" ]; then . "${ipv6_firewall_script}" echo 'IPv6 Firewall rules loaded.' - elif [ "`ip6fw l 65535`" = "65535 deny ipv6 from any to any" ]; then + elif [ "`ipfw show 65535`" = "65535 deny ip from any to any" ]; then warn 'IPv6 firewall rules have not been loaded. Default' \ ' to DENY all access.' fi @@ -50,7 +50,7 @@ # if checkyesno ipv6_firewall_logging; then echo 'IPv6 Firewall logging=YES' - sysctl net.inet6.ip6.fw.verbose=1 >/dev/null + sysctl net.inet.ip.fw.verbose=1 >/dev/null fi # Enable the firewall ==== //depot/projects/tty/etc/rc.firewall6#7 (text+ko) ==== @@ -1,7 +1,7 @@ #!/bin/sh - ############ # Setup system for IPv6 firewall service. -# $FreeBSD: src/etc/rc.firewall6,v 1.16 2005/10/05 07:00:42 ume Exp $ +# $FreeBSD: src/etc/rc.firewall6,v 1.17 2006/05/12 19:17:33 mlaier Exp $ # Suck in the configuration variables. if [ -z "${source_rc_confs_defined}" ]; then @@ -54,17 +54,17 @@ ############ # Only in rare cases do you want to change these rules # - ${fw6cmd} add 100 pass all from any to any via lo0 - ${fw6cmd} add 200 deny all from any to ::1 - ${fw6cmd} add 300 deny all from ::1 to any + ${fw6cmd} add 100 pass ip6 from any to any via lo0 + ${fw6cmd} add 200 deny ip6 from any to ::1 + ${fw6cmd} add 300 deny ip6 from ::1 to any # # ND # # DAD - ${fw6cmd} add pass ipv6-icmp from :: to ff02::/16 + ${fw6cmd} add pass ip6 from :: to ff02::/16 proto ipv6-icmp # RS, RA, NS, NA, redirect... - ${fw6cmd} add pass ipv6-icmp from fe80::/10 to fe80::/10 - ${fw6cmd} add pass ipv6-icmp from fe80::/10 to ff02::/16 + ${fw6cmd} add pass ip6 from fe80::/10 to fe80::/10 proto ipv6-icmp + ${fw6cmd} add pass ip6 from fe80::/10 to ff02::/16 proto ipv6-icmp } if [ -n "${1}" ]; then @@ -76,10 +76,10 @@ # case ${ipv6_firewall_quiet} in [Yy][Ee][Ss]) - fw6cmd="/sbin/ip6fw -q" + fw6cmd="/sbin/ipfw -q" ;; *) - fw6cmd="/sbin/ip6fw" + fw6cmd="/sbin/ipfw" ;; esac @@ -102,7 +102,7 @@ case ${ipv6_firewall_type} in [Oo][Pp][Ee][Nn]) setup_local - ${fw6cmd} add 65000 pass all from any to any + ${fw6cmd} add 65000 pass ip6 from any to any ;; [Cc][Ll][Ii][Ee][Nn][Tt]) @@ -122,41 +122,42 @@ setup_local # Allow any traffic to or from my own net. - ${fw6cmd} add pass all from ${ip} to ${net}/${prefixlen} - ${fw6cmd} add pass all from ${net}/${prefixlen} to ${ip} + ${fw6cmd} add pass ip6 from ${ip} to ${net}/${prefixlen} + ${fw6cmd} add pass ip6 from ${net}/${prefixlen} to ${ip} # Allow any link-local multicast traffic - ${fw6cmd} add pass all from fe80::/10 to ff02::/16 - ${fw6cmd} add pass all from ${net}/${prefixlen} to ff02::/16 + ${fw6cmd} add pass ip6 from fe80::/10 to ff02::/16 + ${fw6cmd} add pass ip6 from ${net}/${prefixlen} to ff02::/16 # Allow TCP through if setup succeeded - ${fw6cmd} add pass tcp from any to any established + ${fw6cmd} add pass ip6 from any to any established proto tcp # Allow IP fragments to pass through - ${fw6cmd} add pass all from any to any frag + ${fw6cmd} add pass ip6 from any to any frag # Allow setup of incoming email - ${fw6cmd} add pass tcp from any to ${ip} 25 setup + ${fw6cmd} add pass ip6 from any to ${ip} 25 setup proto tcp # Allow setup of outgoing TCP connections only - ${fw6cmd} add pass tcp from ${ip} to any setup + ${fw6cmd} add pass ip6 from ${ip} to any setup proto tcp # Disallow setup of all other TCP connections - ${fw6cmd} add deny tcp from any to any setup + ${fw6cmd} add deny ip6 from any to any setup proto tcp # Allow DNS queries out in the world - ${fw6cmd} add pass udp from any 53 to ${ip} - ${fw6cmd} add pass udp from ${ip} to any 53 + ${fw6cmd} add pass ip6 from any 53 to ${ip} proto udp + ${fw6cmd} add pass ip6 from ${ip} to any 53 proto udp # Allow NTP queries out in the world - ${fw6cmd} add pass udp from any 123 to ${ip} - ${fw6cmd} add pass udp from ${ip} to any 123 + ${fw6cmd} add pass ip6 from any 123 to ${ip} proto udp + ${fw6cmd} add pass ip6 from ${ip} to any 123 proto udp # Allow ICMPv6 destination unreach - ${fw6cmd} add pass ipv6-icmp from any to any icmptypes 1 + ${fw6cmd} add pass ip6 from any to any icmp6types 1 proto ipv6-icmp # Allow NS/NA/toobig (don't filter it out) - ${fw6cmd} add pass ipv6-icmp from any to any icmptypes 2,135,136 + ${fw6cmd} add pass ip6 from any to any icmp6types 2,135,136 \ + proto ipv6-icmp # Everything else is denied by default, unless the # IPV6FIREWALL_DEFAULT_TO_ACCEPT option is set in your kernel @@ -185,94 +186,96 @@ setup_local # Stop spoofing - ${fw6cmd} add deny all from ${inet}/${iprefixlen} to any in via ${oif} - ${fw6cmd} add deny all from ${onet}/${oprefixlen} to any in via ${iif} + ${fw6cmd} add deny ip6 from ${inet}/${iprefixlen} to any in via ${oif} + ${fw6cmd} add deny ip6 from ${onet}/${oprefixlen} to any in via ${iif} # Stop unique local unicast address on the outside interface - ${fw6cmd} add deny all from fc00::/7 to any via ${oif} - ${fw6cmd} add deny all from any to fc00::/7 via ${oif} + ${fw6cmd} add deny ip6 from fc00::/7 to any via ${oif} + ${fw6cmd} add deny ip6 from any to fc00::/7 via ${oif} # Stop site-local on the outside interface - ${fw6cmd} add deny all from fec0::/10 to any via ${oif} - ${fw6cmd} add deny all from any to fec0::/10 via ${oif} + ${fw6cmd} add deny ip6 from fec0::/10 to any via ${oif} + ${fw6cmd} add deny ip6 from any to fec0::/10 via ${oif} # Disallow "internal" addresses to appear on the wire. - ${fw6cmd} add deny all from ::ffff:0.0.0.0/96 to any via ${oif} - ${fw6cmd} add deny all from any to ::ffff:0.0.0.0/96 via ${oif} + ${fw6cmd} add deny ip6 from ::ffff:0.0.0.0/96 to any via ${oif} + ${fw6cmd} add deny ip6 from any to ::ffff:0.0.0.0/96 via ${oif} # Disallow packets to malicious IPv4 compatible prefix. - ${fw6cmd} add deny all from ::224.0.0.0/100 to any via ${oif} - ${fw6cmd} add deny all from any to ::224.0.0.0/100 via ${oif} - ${fw6cmd} add deny all from ::127.0.0.0/104 to any via ${oif} - ${fw6cmd} add deny all from any to ::127.0.0.0/104 via ${oif} - ${fw6cmd} add deny all from ::0.0.0.0/104 to any via ${oif} - ${fw6cmd} add deny all from any to ::0.0.0.0/104 via ${oif} - ${fw6cmd} add deny all from ::255.0.0.0/104 to any via ${oif} - ${fw6cmd} add deny all from any to ::255.0.0.0/104 via ${oif} + ${fw6cmd} add deny ip6 from ::224.0.0.0/100 to any via ${oif} + ${fw6cmd} add deny ip6 from any to ::224.0.0.0/100 via ${oif} + ${fw6cmd} add deny ip6 from ::127.0.0.0/104 to any via ${oif} + ${fw6cmd} add deny ip6 from any to ::127.0.0.0/104 via ${oif} + ${fw6cmd} add deny ip6 from ::0.0.0.0/104 to any via ${oif} + ${fw6cmd} add deny ip6 from any to ::0.0.0.0/104 via ${oif} + ${fw6cmd} add deny ip6 from ::255.0.0.0/104 to any via ${oif} + ${fw6cmd} add deny ip6 from any to ::255.0.0.0/104 via ${oif} - ${fw6cmd} add deny all from ::0.0.0.0/96 to any via ${oif} - ${fw6cmd} add deny all from any to ::0.0.0.0/96 via ${oif} + ${fw6cmd} add deny ip6 from ::0.0.0.0/96 to any via ${oif} + ${fw6cmd} add deny ip6 from any to ::0.0.0.0/96 via ${oif} # Disallow packets to malicious 6to4 prefix. - ${fw6cmd} add deny all from 2002:e000::/20 to any via ${oif} - ${fw6cmd} add deny all from any to 2002:e000::/20 via ${oif} - ${fw6cmd} add deny all from 2002:7f00::/24 to any via ${oif} - ${fw6cmd} add deny all from any to 2002:7f00::/24 via ${oif} - ${fw6cmd} add deny all from 2002:0000::/24 to any via ${oif} - ${fw6cmd} add deny all from any to 2002:0000::/24 via ${oif} - ${fw6cmd} add deny all from 2002:ff00::/24 to any via ${oif} - ${fw6cmd} add deny all from any to 2002:ff00::/24 via ${oif} + ${fw6cmd} add deny ip6 from 2002:e000::/20 to any via ${oif} + ${fw6cmd} add deny ip6 from any to 2002:e000::/20 via ${oif} + ${fw6cmd} add deny ip6 from 2002:7f00::/24 to any via ${oif} + ${fw6cmd} add deny ip6 from any to 2002:7f00::/24 via ${oif} + ${fw6cmd} add deny ip6 from 2002:0000::/24 to any via ${oif} + ${fw6cmd} add deny ip6 from any to 2002:0000::/24 via ${oif} + ${fw6cmd} add deny ip6 from 2002:ff00::/24 to any via ${oif} + ${fw6cmd} add deny ip6 from any to 2002:ff00::/24 via ${oif} - ${fw6cmd} add deny all from 2002:0a00::/24 to any via ${oif} - ${fw6cmd} add deny all from any to 2002:0a00::/24 via ${oif} - ${fw6cmd} add deny all from 2002:ac10::/28 to any via ${oif} - ${fw6cmd} add deny all from any to 2002:ac10::/28 via ${oif} - ${fw6cmd} add deny all from 2002:c0a8::/32 to any via ${oif} - ${fw6cmd} add deny all from any to 2002:c0a8::/32 via ${oif} + ${fw6cmd} add deny ip6 from 2002:0a00::/24 to any via ${oif} + ${fw6cmd} add deny ip6 from any to 2002:0a00::/24 via ${oif} + ${fw6cmd} add deny ip6 from 2002:ac10::/28 to any via ${oif} + ${fw6cmd} add deny ip6 from any to 2002:ac10::/28 via ${oif} + ${fw6cmd} add deny ip6 from 2002:c0a8::/32 to any via ${oif} + ${fw6cmd} add deny ip6 from any to 2002:c0a8::/32 via ${oif} - ${fw6cmd} add deny all from ff05::/16 to any via ${oif} - ${fw6cmd} add deny all from any to ff05::/16 via ${oif} + ${fw6cmd} add deny ip6 from ff05::/16 to any via ${oif} + ${fw6cmd} add deny ip6 from any to ff05::/16 via ${oif} # Allow TCP through if setup succeeded ${fw6cmd} add pass tcp from any to any established # Allow IP fragments to pass through - ${fw6cmd} add pass all from any to any frag + ${fw6cmd} add pass ip6 from any to any frag # Allow setup of incoming email - ${fw6cmd} add pass tcp from any to ${oip} 25 setup + ${fw6cmd} add pass ip6 from any to ${oip} 25 setup proto tcp # Allow access to our DNS - ${fw6cmd} add pass tcp from any to ${oip} 53 setup - ${fw6cmd} add pass udp from any to ${oip} 53 - ${fw6cmd} add pass udp from ${oip} 53 to any + ${fw6cmd} add pass ip6 from any to ${oip} 53 setup proto tcp + ${fw6cmd} add pass ip6 from any to ${oip} 53 proto udp + ${fw6cmd} add pass ip6 from ${oip} 53 to any proto udp # Allow access to our WWW - ${fw6cmd} add pass tcp from any to ${oip} 80 setup + ${fw6cmd} add pass ip6 from any to ${oip} 80 setup proto tcp # Reject&Log all setup of incoming connections from the outside - ${fw6cmd} add deny log tcp from any to any in via ${oif} setup + ${fw6cmd} add deny log ip6 from any to any in via ${oif} setup \ + proto tcp # Allow setup of any other TCP connection - ${fw6cmd} add pass tcp from any to any setup + ${fw6cmd} add pass ip6 from any to any setup proto tcp # Allow DNS queries out in the world - ${fw6cmd} add pass udp from any 53 to ${oip} - ${fw6cmd} add pass udp from ${oip} to any 53 + ${fw6cmd} add pass ip6 from any 53 to ${oip} proto udp + ${fw6cmd} add pass ip6 from ${oip} to any 53 proto udp # Allow NTP queries out in the world - ${fw6cmd} add pass udp from any 123 to ${oip} - ${fw6cmd} add pass udp from ${oip} to any 123 + ${fw6cmd} add pass ip6 from any 123 to ${oip} proto udp + ${fw6cmd} add pass ip6 from ${oip} to any 123 proto udp # Allow RIPng - #${fw6cmd} add pass udp from fe80::/10 521 to ff02::9 521 - #${fw6cmd} add pass udp from fe80::/10 521 to fe80::/10 521 + #${fw6cmd} add pass ip6 from fe80::/10 521 to ff02::9 521 proto udp + #${fw6cmd} add pass ip6 from fe80::/10 521 to fe80::/10 521 proto udp # Allow ICMPv6 destination unreach - ${fw6cmd} add pass ipv6-icmp from any to any icmptypes 1 + ${fw6cmd} add pass ip6 from any to any icmp6types 1 proto ipv6-icmp # Allow NS/NA/toobig (don't filter it out) - ${fw6cmd} add pass ipv6-icmp from any to any icmptypes 2,135,136 + ${fw6cmd} add pass ip6 from any to any icmp6types 2,135,136 \ + proto ipv6-icmp # Everything else is denied by default, unless the # IPV6FIREWALL_DEFAULT_TO_ACCEPT option is set in your kernel @@ -281,7 +284,7 @@ [Cc][Ll][Oo][Ss][Ee][Dd]) # Only enable the loopback interface - ${fw6cmd} add 100 pass all from any to any via lo0 + ${fw6cmd} add 100 pass ip6 from any to any via lo0 ;; [Uu][Nn][Kk][Nn][Oo][Ww][Nn]) ;; ==== //depot/projects/tty/include/netdb.h#12 (text+ko) ==== @@ -55,7 +55,7 @@ /* * @(#)netdb.h 8.1 (Berkeley) 6/2/93 * From: Id: netdb.h,v 8.9 1996/11/19 08:39:29 vixie Exp $ - * $FreeBSD: src/include/netdb.h,v 1.41 2006/04/15 16:20:26 ume Exp $ + * $FreeBSD: src/include/netdb.h,v 1.42 2006/05/12 15:37:22 ume Exp $ */ #ifndef _NETDB_H_ @@ -63,6 +63,7 @@ #include #include +#include #ifndef _SIZE_T_DECLARED typedef __size_t size_t; @@ -220,9 +221,15 @@ void endprotoent(void); void endservent(void); void freehostent(struct hostent *); -struct hostent *gethostbyaddr(const char *, int, int); -int gethostbyaddr_r(const char *, int, int, struct hostent *, +#if __LONG_BIT == 64 +struct hostent *gethostbyaddr(const void *, int, int); +int gethostbyaddr_r(const void *, int, int, struct hostent *, + char *, size_t, struct hostent **, int *); +#else +struct hostent *gethostbyaddr(const void *, socklen_t, int); +int gethostbyaddr_r(const void *, socklen_t, int, struct hostent *, char *, size_t, struct hostent **, int *); +#endif struct hostent *gethostbyname(const char *); int gethostbyname_r(const char *, struct hostent *, char *, size_t, struct hostent **, int *); ==== //depot/projects/tty/lib/libc/net/gethostbydns.c#9 (text+ko) ==== @@ -58,7 +58,7 @@ static char fromrcsid[] = "From: Id: gethnamaddr.c,v 8.23 1998/04/07 04:59:46 vixie Exp $"; #endif /* LIBC_SCCS and not lint */ #include -__FBSDID("$FreeBSD: src/lib/libc/net/gethostbydns.c,v 1.56 2006/04/15 16:20:27 ume Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/net/gethostbydns.c,v 1.57 2006/05/12 15:37:23 ume Exp $"); #include #include @@ -550,11 +550,13 @@ int _dns_gethostbyaddr(void *rval, void *cb_data, va_list ap) { - const u_char *uaddr; - int len, af; + const void *addr; + socklen_t len; + int af; char *buffer; size_t buflen; int *errnop, *h_errnop; + const u_char *uaddr; struct hostent *hptr, he; struct hostent_data *hed; int n; @@ -570,14 +572,15 @@ int ret_h_error; #endif /*SUNSECURITY*/ - uaddr = va_arg(ap, const u_char *); - len = va_arg(ap, int); + addr = va_arg(ap, const void *); + len = va_arg(ap, socklen_t); af = va_arg(ap, int); hptr = va_arg(ap, struct hostent *); buffer = va_arg(ap, char *); buflen = va_arg(ap, size_t); errnop = va_arg(ap, int *); h_errnop = va_arg(ap, int *); + uaddr = (const u_char *)addr; *((struct hostent **)rval) = NULL; ==== //depot/projects/tty/lib/libc/net/gethostbyht.c#6 (text+ko) ==== @@ -55,7 +55,7 @@ static char sccsid[] = "@(#)gethostnamadr.c 8.1 (Berkeley) 6/4/93"; #endif /* LIBC_SCCS and not lint */ #include -__FBSDID("$FreeBSD: src/lib/libc/net/gethostbyht.c,v 1.25 2006/04/15 16:20:27 ume Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/net/gethostbyht.c,v 1.26 2006/05/12 15:37:23 ume Exp $"); #include #include @@ -282,8 +282,9 @@ int _ht_gethostbyaddr(void *rval, void *cb_data, va_list ap) { - const char *addr; - int len, af; + const void *addr; + socklen_t len; + int af; char *buffer; size_t buflen; int *errnop, *h_errnop; @@ -292,8 +293,8 @@ res_state statp; int error; - addr = va_arg(ap, const char *); - len = va_arg(ap, int); + addr = va_arg(ap, const void *); + len = va_arg(ap, socklen_t); af = va_arg(ap, int); hptr = va_arg(ap, struct hostent *); buffer = va_arg(ap, char *); ==== //depot/projects/tty/lib/libc/net/gethostbyname.3#8 (text+ko) ==== @@ -30,7 +30,7 @@ .\" SUCH DAMAGE. .\" .\" From: @(#)gethostbyname.3 8.4 (Berkeley) 5/25/95 -.\" $FreeBSD: src/lib/libc/net/gethostbyname.3,v 1.34 2005/04/28 18:03:43 ume Exp $ +.\" $FreeBSD: src/lib/libc/net/gethostbyname.3,v 1.35 2006/05/12 15:37:23 ume Exp $ .\" .Dd May 25, 1995 .Dt GETHOSTBYNAME 3 @@ -55,7 +55,7 @@ .Ft struct hostent * .Fn gethostbyname2 "const char *name" "int af" .Ft struct hostent * -.Fn gethostbyaddr "const char *addr" "int len" "int type" +.Fn gethostbyaddr "const void *addr" "socklen_t len" "int type" .Ft struct hostent * .Fn gethostent void .Ft void @@ -246,7 +246,7 @@ if (!inet_aton(ipstr, &ip)) errx(1, "can't parse IP address %s", ipstr); -if ((hp = gethostbyaddr((const char *)&ip, +if ((hp = gethostbyaddr((const void *)&ip, sizeof ip, AF_INET)) == NULL) errx(1, "no name associated with %s", ipstr); ==== //depot/projects/tty/lib/libc/net/gethostbynis.c#7 (text+ko) ==== @@ -24,7 +24,7 @@ */ #include -__FBSDID("$FreeBSD: src/lib/libc/net/gethostbynis.c,v 1.27 2006/04/15 16:20:27 ume Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/net/gethostbynis.c,v 1.28 2006/05/12 15:37:23 ume Exp $"); #include #include @@ -178,8 +178,8 @@ } static int -_gethostbynisaddr_r(const char *addr, int len, int af, struct hostent *he, - struct hostent_data *hed) +_gethostbynisaddr_r(const void *addr, socklen_t len, int af, + struct hostent *he, struct hostent_data *hed) { char *map; char numaddr[46]; @@ -227,7 +227,7 @@ } struct hostent * -_gethostbynisaddr(const char *addr, int len, int af) +_gethostbynisaddr(const void *addr, socklen_t len, int af) { #ifdef YP struct hostent *he; @@ -303,8 +303,8 @@ _nis_gethostbyaddr(void *rval, void *cb_data, va_list ap) { #ifdef YP - const char *addr; - int len; + const void *addr; + socklen_t len; int af; char *buffer; size_t buflen; @@ -313,8 +313,8 @@ struct hostent_data *hed; res_state statp; - addr = va_arg(ap, const char *); - len = va_arg(ap, int); + addr = va_arg(ap, const void *); + len = va_arg(ap, socklen_t); af = va_arg(ap, int); hptr = va_arg(ap, struct hostent *); buffer = va_arg(ap, char *); ==== //depot/projects/tty/lib/libc/net/gethostnamadr.c#7 (text+ko) ==== @@ -24,7 +24,7 @@ */ #include -__FBSDID("$FreeBSD: src/lib/libc/net/gethostnamadr.c,v 1.31 2006/04/28 12:03:35 ume Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/net/gethostnamadr.c,v 1.32 2006/05/12 15:37:23 ume Exp $"); #include "namespace.h" #include "reentrant.h" @@ -573,8 +573,14 @@ } int -gethostbyaddr_r(const char *addr, int len, int af, struct hostent *hp, - char *buf, size_t buflen, struct hostent **result, int *h_errnop) +gethostbyaddr_r(const void *addr, +#if __LONG_BIT == 64 + int len, +#else + socklen_t len, +#endif + int af, struct hostent *hp, char *buf, size_t buflen, + struct hostent **result, int *h_errnop) { const u_char *uaddr = (const u_char *)addr; const struct in6_addr *addr6; @@ -606,7 +612,7 @@ } if (af == AF_INET6 && len == NS_IN6ADDRSZ) { - addr6 = (const struct in6_addr *)(const void *)uaddr; + addr6 = (const struct in6_addr *)addr; if (IN6_IS_ADDR_LINKLOCAL(addr6)) { RES_SET_H_ERRNO(statp, HOST_NOT_FOUND); *h_errnop = statp->res_h_errno; @@ -678,7 +684,11 @@ } struct hostent * -gethostbyaddr(const char *addr, int len, int af) +#if __LONG_BIT == 64 +gethostbyaddr(const void *addr, int len, int af) +#else +gethostbyaddr(const void *addr, socklen_t len, int af) +#endif { struct hostdata *hd; struct hostent *rval; ==== //depot/projects/tty/lib/libc/net/netdb_private.h#6 (text+ko) ==== @@ -22,7 +22,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/lib/libc/net/netdb_private.h,v 1.12 2006/04/28 12:03:35 ume Exp $ + * $FreeBSD: src/lib/libc/net/netdb_private.h,v 1.13 2006/05/12 15:37:23 ume Exp $ */ #ifndef _NETDB_PRIVATE_H_ @@ -133,7 +133,7 @@ void _endhosthtent(struct hostent_data *); void _endnetdnsent(void); void _endnethtent(struct netent_data *); -struct hostent *_gethostbynisaddr(const char *, int, int); +struct hostent *_gethostbynisaddr(const void *, socklen_t, int); struct hostent *_gethostbynisname(const char *, int); void _map_v4v6_address(const char *, char *); void _map_v4v6_hostent(struct hostent *, char **, char *); ==== //depot/projects/tty/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#34 (text+ko) ==== @@ -3,7 +3,7 @@ The &os; Project - $FreeBSD: src/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml,v 1.927 2006/05/11 22:55:18 bmah Exp $ + $FreeBSD: src/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml,v 1.929 2006/05/12 19:31:29 bmah Exp $ 2000 @@ -349,6 +349,12 @@ The &man.acpi.thermal.4; driver now supports passive cooling. &merged; + + Support for the alpha architecture has been removed. Alpha + support will remain on the RELENG_5 and RELENG_6 codelines. + The &man.cardbus.4; driver now supports /dev/cardbus%d.cis. @@ -994,12 +1000,15 @@ also specified, no output is made for disks with no activity. - The &man.jail.8; utility pports a WPA Supplicant has been updated from version 0.3.9 to version 0.4.8. ==== //depot/projects/tty/sbin/Makefile#20 (text+ko) ==== @@ -1,5 +1,5 @@ # @(#)Makefile 8.5 (Berkeley) 3/31/94 -# $FreeBSD: src/sbin/Makefile,v 1.159 2006/03/17 18:54:30 ru Exp $ +# $FreeBSD: src/sbin/Makefile,v 1.160 2006/05/12 20:39:21 mlaier Exp $ .include @@ -38,7 +38,6 @@ gvinum \ ifconfig \ init \ - ${_ip6fw} \ ${_ipf} \ ipfw \ kldconfig \ @@ -112,7 +111,6 @@ .endif .if ${MK_INET6} != "no" -_ip6fw= ip6fw _ping6= ping6 .endif ==== //depot/projects/tty/sbin/ipfw/ipfw.8#23 (text+ko) ==== @@ -1,7 +1,7 @@ .\" -.\" $FreeBSD: src/sbin/ipfw/ipfw.8,v 1.186 2006/03/05 15:55:46 ume Exp $ +.\" $FreeBSD: src/sbin/ipfw/ipfw.8,v 1.187 2006/05/12 18:09:33 mlaier Exp $ .\" -.Dd January 16, 2006 +.Dd May 12, 2006 .Dt IPFW 8 .Os .Sh NAME @@ -327,7 +327,7 @@ | | +----------->-----------+ ^ V - [ip(6)_input] [ip(6)_output] net.inet.ip.fw.enable=1 + [ip(6)_input] [ip(6)_output] net.inet(6).ip(6).fw.enable=1 | | ^ V [ether_demux] [ether_output_frame] net.link.ether.ipfw=1 @@ -2051,6 +2051,8 @@ Enables the firewall. Setting this variable to 0 lets you run your machine without firewall even if compiled in. +.It Em net.inet6.ip6.fw.enable : No 1 +provides the same functionality as above for the IPv6 case. .It Em net.inet.ip.fw.one_pass : No 1 When set, the packet exiting from the .Xr dummynet 4 ==== //depot/projects/tty/share/man/man4/ath.4#12 (text+ko) ==== @@ -29,7 +29,7 @@ .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF .\" THE POSSIBILITY OF SUCH DAMAGES. .\" -.\" $FreeBSD: src/share/man/man4/ath.4,v 1.38 2006/04/28 21:45:08 maxim Exp $ +.\" $FreeBSD: src/share/man/man4/ath.4,v 1.40 2006/05/12 17:58:11 keramida Exp $ .\"/ .Dd September 5, 2005 .Dt ATH 4 @@ -125,54 +125,12 @@ driver come in either Cardbus or mini-PCI packages. Wireless cards in Cardbus slots may be inserted and ejected on the fly. .Sh HARDWARE -The following cards are among those supported by the +The .Nm -driver: +driver supports all Atheros Cardbus or PCI cards, +except those that are based on the AR5005VL chipset. .Pp -.Bl -column -compact "Samsung SWL-5200N" "AR5212" "Cardbus" "a/b/g" -.It Em "Card Chip Bus Standard" -.It "Aztech WL830PC AR5212 CardBus b/g" -.It "Cisco AIR-CB21AG AR5115 Cardbus a/b/g" -.It "Cisco AIR-PI21AG AR5115 PCI a/b/g" -.It "D-Link DWL-A650 AR5210 CardBus a" -.It "D-Link DWL-AB650 AR5211 CardBus a/b" -.It "D-Link DWL-A520 AR5210 PCI a" -.It "D-Link DWL-AG520 AR5212 PCI a/b/g" -.It "D-Link DWL-AG650 AR5212 CardBus a/b/g" -.It "D-Link DWL-G520B AR5212 PCI b/g" -.It "D-Link DWL-G650B AR5212 CardBus b/g" -.It "Elecom LD-WL54AG AR5212 Cardbus a/b/g" -.It "Elecom LD-WL54 AR5211 Cardbus a" -.It "Fujitsu E5454 AR5212 Cardbus a/b/g" -.It "Fujitsu FMV-JW481 AR5212 Cardbus a/b/g" -.It "Fujitsu E5454 AR5212 Cardbus a/b/g" -.It "HP NC4000 AR5212 PCI a/b/g" -.It "I/O Data WN-AB AR5212 CardBus a/b" -.It "I/O Data WN-AG AR5212 CardBus a/b/g" -.It "I/O Data WN-A54 AR5212 CardBus a" -.It "Linksys WMP55AG AR5212 PCI a/b/g" -.It "Linksys WPC51AB AR5211 CardBus a/b" -.It "Linksys WPC55AG AR5212 CardBus a/b/g" -.It "NEC PA-WL/54AG AR5212 CardBus a/b/g" -.It "Netgear WAG311 AR5212 PCI a/b/g" -.It "Netgear WAB501 AR5211 CardBus a/b" -.It "Netgear WAG511 AR5212 CardBus a/b/g" -.It "Netgear WG311T AR5212 PCI b/g" -.It "Netgear WG511T AR5212 CardBus b/g" -.It "Orinoco 8480 AR5212 CardBus a/b/g" -.It "Orinoco 8470WD AR5212 CardBus a/b/g" -.It "Proxim Skyline 4030 AR5210 CardBus a" -.It "Proxim Skyline 4032 AR5210 PCI a" -.It "Samsung SWL-5200N AR5212 CardBus a/b/g" -.It "SMC SMC2536W-AG AR5212 CardBus a/b/g" -.It "SMC SMC2735W AR5210 CardBus a" -.It "Sony PCWA-C700 AR5212 Cardbus a/b" -.It "Sony PCWA-C300S AR5212 Cardbus b/g" -.It "Sony PCWA-C500 AR5210 Cardbus a" -.It "3Com 3CRPAG175 AR5212 CardBus a/b/g" -.El -.Pp -An up to date list can be found at +A list of cards that are supported can be found at .Pa http://customerproducts.atheros.com/customerproducts . .Sh EXAMPLES Join an existing BSS network (ie: connect to an access point): ==== //depot/projects/tty/share/man/man5/periodic.conf.5#11 (text+ko) ==== @@ -23,7 +23,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man5/periodic.conf.5,v 1.59 2006/03/02 14:55:07 brueffer Exp $ +.\" $FreeBSD: src/share/man/man5/periodic.conf.5,v 1.60 2006/05/12 19:17:34 mlaier Exp $ .\" .Dd March 2, 2006 .Dt PERIODIC.CONF 5 @@ -536,20 +536,6 @@ to display .Xr ipfw 8 rules that have reached their verbosity limit. -.It Va daily_status_security_ip6fwdenied_enable -.Pq Vt bool -Set to -.Dq YES -to show log entries for packets denied by -.Xr ip6fw 8 -since yesterday's check. -.It Va daily_status_security_ip6fwlimit_enable -.Pq Vt bool -Set to -.Dq YES -to display -.Xr ip6fw 8 -rules that have reached their verbosity limit. .It Va daily_status_security_kernelmsg_enable .Pq Vt bool Set to ==== //depot/projects/tty/share/man/man5/rc.conf.5#26 (text+ko) ==== @@ -22,7 +22,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man5/rc.conf.5,v 1.294 2006/05/11 14:23:43 flz Exp $ +.\" $FreeBSD: src/share/man/man5/rc.conf.5,v 1.295 2006/05/12 19:17:34 mlaier Exp $ .\" .Dd May 11, 2006 .Dt RC.CONF 5 @@ -402,7 +402,7 @@ If the kernel was not built with .Cd "options IPV6FIREWALL" , the -.Pa ip6fw.ko +.Pa ipfw.ko kernel module will be loaded. .It Va firewall_script .Pq Vt str ==== //depot/projects/tty/share/man/man7/security.7#8 (text+ko) ==== @@ -21,15 +21,14 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man7/security.7,v 1.45 2006/01/19 20:01:43 ceri Exp $ +.\" $FreeBSD: src/share/man/man7/security.7,v 1.46 2006/05/12 17:42:48 keramida Exp $ .\" .Dd November 29, 2004 .Dt SECURITY 7 .Os .Sh NAME .Nm security -.Nd introduction to security under >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sat May 13 00:12:18 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 596BE16A75B; Sat, 13 May 2006 00:12:18 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id AEDBB16A756 for ; Sat, 13 May 2006 00:12:16 +0000 (UTC) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id AC08D43D45 for ; Sat, 13 May 2006 00:12:11 +0000 (GMT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k4D0CAqV007467 for ; Sat, 13 May 2006 00:12:10 GMT (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k4D0C960007464 for perforce@freebsd.org; Sat, 13 May 2006 00:12:09 GMT (envelope-from marcel@freebsd.org) Date: Sat, 13 May 2006 00:12:09 GMT Message-Id: <200605130012.k4D0C960007464@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Cc: Subject: PERFORCE change 97041 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 13 May 2006 00:12:19 -0000 http://perforce.freebsd.org/chv.cgi?CH=97041 Change 97041 by marcel@marcel_nfs on 2006/05/13 00:11:37 IFC @97039 Affected files ... .. //depot/projects/uart/boot/Makefile#7 integrate .. //depot/projects/uart/boot/common/Makefile.inc#3 integrate .. //depot/projects/uart/boot/common/load_elf.c#5 integrate .. //depot/projects/uart/boot/common/loader.8#9 integrate .. //depot/projects/uart/boot/efi/libefi/bootinfo.c#5 integrate .. //depot/projects/uart/boot/ficl/Makefile#6 integrate .. //depot/projects/uart/boot/ficl/alpha/sysdep.c#2 delete .. //depot/projects/uart/boot/ficl/alpha/sysdep.h#2 delete .. //depot/projects/uart/boot/ficl/loader.c#4 integrate .. //depot/projects/uart/boot/forth/loader.4th#2 integrate .. //depot/projects/uart/boot/ia64/ski/bootinfo.c#4 integrate .. //depot/projects/uart/boot/ia64/ski/conf.c#3 integrate .. //depot/projects/uart/boot/powerpc/loader/conf.c#3 integrate .. //depot/projects/uart/compat/linprocfs/linprocfs.c#16 integrate .. //depot/projects/uart/conf/NOTES#37 integrate .. //depot/projects/uart/conf/files#68 integrate .. //depot/projects/uart/conf/kern.post.mk#13 integrate .. //depot/projects/uart/conf/options#35 integrate .. //depot/projects/uart/contrib/pf/net/pf_ioctl.c#8 integrate .. //depot/projects/uart/dev/asr/asr.c#12 integrate .. //depot/projects/uart/dev/ata/ata-all.c#22 integrate .. //depot/projects/uart/dev/ata/ata-pci.c#14 integrate .. //depot/projects/uart/dev/atkbdc/atkbd.c#3 integrate .. //depot/projects/uart/dev/atkbdc/atkbdc.c#4 integrate .. //depot/projects/uart/dev/dc/if_dc.c#5 integrate .. //depot/projects/uart/dev/de/if_de.c#2 integrate .. //depot/projects/uart/dev/fb/tga.c#7 delete .. //depot/projects/uart/dev/fb/tga.h#3 delete .. //depot/projects/uart/dev/lge/if_lgereg.h#5 integrate .. //depot/projects/uart/dev/nge/if_ngereg.h#6 integrate .. //depot/projects/uart/dev/pdq/pdq_freebsd.h#6 integrate .. //depot/projects/uart/dev/pdq/pdqvar.h#4 integrate .. //depot/projects/uart/dev/ppc/ppc.c#11 integrate .. //depot/projects/uart/dev/sound/isa/es1888.c#4 delete .. //depot/projects/uart/dev/sound/isa/gusc.c#4 integrate .. //depot/projects/uart/dev/sym/sym_hipd.c#11 integrate .. //depot/projects/uart/dev/syscons/scterm-sc.c#6 integrate .. //depot/projects/uart/dev/syscons/scvgarndr.c#7 integrate .. //depot/projects/uart/dev/syscons/syscons.h#7 integrate .. //depot/projects/uart/dev/uart/uart_dev_z8530.c#31 integrate .. //depot/projects/uart/isa/isa_common.c#8 integrate .. //depot/projects/uart/isa/isa_common.h#3 integrate .. //depot/projects/uart/kern/init_main.c#14 integrate .. //depot/projects/uart/kern/kern_mutex.c#12 integrate .. //depot/projects/uart/kern/kern_sig.c#30 integrate .. //depot/projects/uart/kern/vfs_subr.c#30 integrate .. //depot/projects/uart/modules/ip6fw/Makefile#2 delete .. //depot/projects/uart/modules/sound/driver/ess/Makefile#2 integrate .. //depot/projects/uart/net/if.h#11 integrate .. //depot/projects/uart/net/if_loop.c#8 integrate .. //depot/projects/uart/netinet/ip_fw.h#12 integrate .. //depot/projects/uart/netinet/ip_fw2.c#21 integrate .. //depot/projects/uart/netinet/ip_fw_pfil.c#7 integrate .. //depot/projects/uart/netinet/ip_input.c#17 integrate .. //depot/projects/uart/netinet6/ip6_fw.c#8 delete .. //depot/projects/uart/netinet6/ip6_fw.h#5 delete .. //depot/projects/uart/pci/agp.c#5 integrate .. //depot/projects/uart/pci/if_pcnreg.h#5 integrate .. //depot/projects/uart/pci/if_sfreg.h#7 integrate .. //depot/projects/uart/pci/if_stereg.h#5 integrate .. //depot/projects/uart/pci/if_tl.c#9 integrate .. //depot/projects/uart/pci/if_tlreg.h#6 integrate .. //depot/projects/uart/pci/if_vrreg.h#6 integrate .. //depot/projects/uart/pci/if_wbreg.h#6 integrate .. //depot/projects/uart/pci/ncr.c#8 integrate .. //depot/projects/uart/sys/_timeval.h#3 integrate .. //depot/projects/uart/sys/conf.h#13 integrate .. //depot/projects/uart/sys/disklabel.h#5 integrate .. //depot/projects/uart/sys/elf64.h#3 integrate .. //depot/projects/uart/sys/param.h#25 integrate .. //depot/projects/uart/sys/signal.h#5 integrate .. //depot/projects/uart/sys/ucontext.h#3 integrate .. //depot/projects/uart/sys/user.h#8 integrate Differences ... ==== //depot/projects/uart/boot/Makefile#7 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/boot/Makefile,v 1.27 2006/03/17 18:54:34 ru Exp $ +# $FreeBSD: src/sys/boot/Makefile,v 1.28 2006/05/12 04:09:52 jhb Exp $ .include @@ -20,10 +20,4 @@ # Pick the machine-dependent subdir based on the target architecture. SUBDIR+= ${MACHINE:S/amd64/i386/} -# Build ARC / AlphaBIOS executable on the Alpha -# (this is a WIP (work in progress)). -#.if ${MACHINE_ARCH} == "alpha" -#SUBDIR+= arc -#.endif - .include ==== //depot/projects/uart/boot/common/Makefile.inc#3 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/boot/common/Makefile.inc,v 1.21 2004/10/24 12:32:41 ru Exp $ +# $FreeBSD: src/sys/boot/common/Makefile.inc,v 1.22 2006/05/12 04:09:52 jhb Exp $ SRCS+= bcache.c boot.c commands.c console.c devopen.c interp.c SRCS+= interp_backslash.c interp_parse.c ls.c misc.c @@ -11,8 +11,7 @@ SRCS+= load_elf32.c load_elf32_obj.c reloc_elf32.c .elif ${MACHINE_ARCH} == "powerpc" SRCS+= load_elf32.c reloc_elf32.c -.elif ${MACHINE_ARCH} == "sparc64" || ${MACHINE_ARCH} == "ia64" || \ - ${MACHINE_ARCH} == "alpha" +.elif ${MACHINE_ARCH} == "sparc64" || ${MACHINE_ARCH} == "ia64" SRCS+= load_elf64.c reloc_elf64.c .endif ==== //depot/projects/uart/boot/common/load_elf.c#5 (text+ko) ==== @@ -26,7 +26,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/boot/common/load_elf.c,v 1.33 2005/12/18 04:52:35 marcel Exp $"); +__FBSDID("$FreeBSD: src/sys/boot/common/load_elf.c,v 1.34 2006/05/12 04:09:52 jhb Exp $"); #include #include @@ -266,7 +266,7 @@ off = - (off & 0xff000000u); /* i386 relocates after locore */ #endif #else - off = 0; /* alpha is direct mapped for kernels */ + off = 0; /* other archs use direct mapped kernels */ #endif } ef->off = off; ==== //depot/projects/uart/boot/common/loader.8#9 (text+ko) ==== @@ -22,7 +22,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/sys/boot/common/loader.8,v 1.84 2005/09/22 15:06:57 ru Exp $ +.\" $FreeBSD: src/sys/boot/common/loader.8,v 1.85 2006/05/12 04:09:52 jhb Exp $ .\" .Dd September 22, 2005 .Dt LOADER 8 @@ -800,9 +800,6 @@ .It arch-i386 .Ic TRUE if the architecture is IA32. -.It arch-alpha -.Ic TRUE -if the architecture is AXP. .It FreeBSD_version .Fx version at compile time. ==== //depot/projects/uart/boot/efi/libefi/bootinfo.c#5 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/boot/efi/libefi/bootinfo.c,v 1.12 2005/09/22 15:06:57 ru Exp $"); +__FBSDID("$FreeBSD: src/sys/boot/efi/libefi/bootinfo.c,v 1.13 2006/05/12 04:09:53 jhb Exp $"); #include #include @@ -243,7 +243,7 @@ } /* - * Load the information expected by an alpha kernel. + * Load the information expected by the kernel. * * - The kernel environment is copied into kernel space. * - Module metadata are formatted and placed in kernel space. ==== //depot/projects/uart/boot/ficl/Makefile#6 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/boot/ficl/Makefile,v 1.42 2005/07/15 12:22:14 ache Exp $ +# $FreeBSD: src/sys/boot/ficl/Makefile,v 1.43 2006/05/12 04:07:42 jhb Exp $ # .PATH: ${.CURDIR}/${MACHINE_ARCH:S/amd64/i386/} BASE_SRCS= dict.c ficl.c fileaccess.c float.c loader.c math64.c \ @@ -7,9 +7,6 @@ SRCS= ${BASE_SRCS} sysdep.c softcore.c CLEANFILES= softcore.c testmain testmain.o CFLAGS+= -ffreestanding -.if ${MACHINE_ARCH} == "alpha" -CFLAGS+= -mno-fp-regs -Os -.endif .if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "amd64" CFLAGS+= -mpreferred-stack-boundary=2 CFLAGS+= -mno-mmx -mno-3dnow -mno-sse -mno-sse2 ==== //depot/projects/uart/boot/ficl/loader.c#4 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/boot/ficl/loader.c,v 1.11 2004/11/30 11:35:30 scottl Exp $ + * $FreeBSD: src/sys/boot/ficl/loader.c,v 1.12 2006/05/12 04:07:42 jhb Exp $ */ /******************************************************************* @@ -691,22 +691,14 @@ ficlSetEnv(pSys, "arch-pc98", FICL_TRUE); #elif defined(__i386__) ficlSetEnv(pSys, "arch-i386", FICL_TRUE); - ficlSetEnv(pSys, "arch-alpha", FICL_FALSE); - ficlSetEnv(pSys, "arch-ia64", FICL_FALSE); - ficlSetEnv(pSys, "arch-powerpc", FICL_FALSE); -#elif defined(__alpha__) - ficlSetEnv(pSys, "arch-i386", FICL_FALSE); - ficlSetEnv(pSys, "arch-alpha", FICL_TRUE); ficlSetEnv(pSys, "arch-ia64", FICL_FALSE); ficlSetEnv(pSys, "arch-powerpc", FICL_FALSE); #elif defined(__ia64__) ficlSetEnv(pSys, "arch-i386", FICL_FALSE); - ficlSetEnv(pSys, "arch-alpha", FICL_FALSE); ficlSetEnv(pSys, "arch-ia64", FICL_TRUE); ficlSetEnv(pSys, "arch-powerpc", FICL_FALSE); #elif defined(__powerpc__) ficlSetEnv(pSys, "arch-i386", FICL_FALSE); - ficlSetEnv(pSys, "arch-alpha", FICL_FALSE); ficlSetEnv(pSys, "arch-ia64", FICL_FALSE); ficlSetEnv(pSys, "arch-powerpc", FICL_TRUE); #endif ==== //depot/projects/uart/boot/forth/loader.4th#2 (text+ko) ==== @@ -22,19 +22,7 @@ \ OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF \ SUCH DAMAGE. \ -\ $FreeBSD: src/sys/boot/forth/loader.4th,v 1.24 2002/05/24 02:28:58 gordon Exp $ - -s" arch-alpha" environment? [if] [if] - s" loader_version" environment? [if] - 12 < [if] - .( Loader version 1.2+ required) cr - abort - [then] - [else] - .( Could not get loader version!) cr - abort - [then] -[then] [then] +\ $FreeBSD: src/sys/boot/forth/loader.4th,v 1.25 2006/05/12 04:09:53 jhb Exp $ s" arch-i386" environment? [if] [if] s" loader_version" environment? [if] ==== //depot/projects/uart/boot/ia64/ski/bootinfo.c#4 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/boot/ia64/ski/bootinfo.c,v 1.13 2005/09/22 15:06:58 ru Exp $"); +__FBSDID("$FreeBSD: src/sys/boot/ia64/ski/bootinfo.c,v 1.14 2006/05/12 04:09:53 jhb Exp $"); #include #include @@ -239,7 +239,7 @@ } /* - * Load the information expected by an alpha kernel. + * Load the information expected by the kernel. * * - The kernel environment is copied into kernel space. * - Module metadata are formatted and placed in kernel space. ==== //depot/projects/uart/boot/ia64/ski/conf.c#3 (text+ko) ==== @@ -32,7 +32,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/boot/ia64/ski/conf.c,v 1.6 2005/01/05 22:16:58 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/boot/ia64/ski/conf.c,v 1.7 2006/05/12 04:09:53 jhb Exp $"); #include @@ -75,7 +75,7 @@ /* * Consoles * - * We don't prototype these in libalpha.h because they require + * We don't prototype these in libski.h because they require * data structures from bootstrap.h as well. */ extern struct console ski_console; ==== //depot/projects/uart/boot/powerpc/loader/conf.c#3 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/boot/powerpc/loader/conf.c,v 1.10 2004/01/04 23:21:18 obrien Exp $"); +__FBSDID("$FreeBSD: src/sys/boot/powerpc/loader/conf.c,v 1.11 2006/05/12 04:09:53 jhb Exp $"); #include #include "bootstrap.h" @@ -102,7 +102,7 @@ /* * Consoles * - * We don't prototype these in libalpha.h because they require + * We don't prototype these in libofw.h because they require * data structures from bootstrap.h as well. */ extern struct console ofwconsole; ==== //depot/projects/uart/compat/linprocfs/linprocfs.c#16 (text+ko) ==== @@ -40,7 +40,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/compat/linprocfs/linprocfs.c,v 1.92 2006/05/05 16:10:45 ambrisko Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/linprocfs/linprocfs.c,v 1.93 2006/05/12 05:04:40 jhb Exp $"); #include #include @@ -79,13 +79,6 @@ #include -#ifdef __alpha__ -#include -#include -#include -extern int ncpus; -#endif /* __alpha__ */ - #if defined(__i386__) || defined(__amd64__) #include #include @@ -185,77 +178,6 @@ return (0); } -#ifdef __alpha__ -extern struct rpb *hwrpb; -/* - * Filler function for proc/cpuinfo (Alpha version) - */ -static int -linprocfs_docpuinfo(PFS_FILL_ARGS) -{ - u_int64_t type, major; - struct pcs *pcsp; - const char *model, *sysname; - - static const char *cpuname[] = { - "EV3", "EV4", "Simulate", "LCA4", "EV5", "EV45", "EV56", - "EV6", "PCA56", "PCA57", "EV67", "EV68CB", "EV68AL" - }; - - pcsp = LOCATE_PCS(hwrpb, hwrpb->rpb_primary_cpu_id); - type = pcsp->pcs_proc_type; - major = (type & PCS_PROC_MAJOR) >> PCS_PROC_MAJORSHIFT; - if (major < sizeof(cpuname)/sizeof(char *)) { - model = cpuname[major - 1]; - } else { - model = "unknown"; - } - - sysname = alpha_dsr_sysname(); - - sbuf_printf(sb, - "cpu\t\t\t: Alpha\n" - "cpu model\t\t: %s\n" - "cpu variation\t\t: %ld\n" - "cpu revision\t\t: %d\n" - "cpu serial number\t: %s\n" - "system type\t\t: %s\n" - "system variation\t: %s\n" - "system revision\t\t: %d\n" - "system serial number\t: %s\n" - "cycle frequency [Hz]\t: %lu\n" - "timer frequency [Hz]\t: %u\n" - "page size [bytes]\t: %ld\n" - "phys. address bits\t: %ld\n" - "max. addr. space #\t: %ld\n" - "BogoMIPS\t\t: %u.%02u\n" - "kernel unaligned acc\t: %d (pc=%x,va=%x)\n" - "user unaligned acc\t: %d (pc=%x,va=%x)\n" - "platform string\t\t: %s\n" - "cpus detected\t\t: %d\n" - , - model, - pcsp->pcs_proc_var, - *(int *)hwrpb->rpb_revision, - " ", - " ", - "0", - 0, - " ", - hwrpb->rpb_cc_freq, - hz, - hwrpb->rpb_page_size, - hwrpb->rpb_phys_addr_size, - hwrpb->rpb_max_asn, - 0, 0, - 0, 0, 0, - 0, 0, 0, - sysname, - ncpus); - return (0); -} -#endif /* __alpha__ */ - #if defined(__i386__) || defined(__amd64__) /* * Filler function for proc/cpuinfo (i386 & amd64 version) ==== //depot/projects/uart/conf/NOTES#37 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/NOTES,v 1.1361 2006/05/11 22:25:26 jhb Exp $ +# $FreeBSD: src/sys/conf/NOTES,v 1.1362 2006/05/12 10:25:54 benno Exp $ # # NOTES -- Lines that can be cut/pasted into kernel and hints configs. # @@ -2486,6 +2486,14 @@ options DEBUG_VFS_LOCKS # enable vfs lock debugging options SOCKBUF_DEBUG # enable sockbuf last record/mb tail checking +# +# Verbose SYSINIT +# +# Make the SYSINIT process performed by mi_startup() verbose. This is very +# useful when porting to a new architecture. If DDB is also enabled, this +# will print function names instead of addresses. +options VERBOSE_SYSINIT + ##################################################################### # SYSV IPC KERNEL PARAMETERS # ==== //depot/projects/uart/conf/files#68 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/files,v 1.1114 2006/05/07 18:12:17 netchild Exp $ +# $FreeBSD: src/sys/conf/files,v 1.1115 2006/05/12 04:11:25 jhb Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -864,7 +864,6 @@ dev/sn/if_sn_pccard.c optional sn pccard dev/snp/snp.c optional snp dev/sound/isa/ad1816.c optional snd_ad1816 isa -dev/sound/isa/es1888.c optional snd_ess isa dev/sound/isa/ess.c optional snd_ess isa dev/sound/isa/gusc.c optional snd_gusc isa dev/sound/isa/mss.c optional snd_mss isa ==== //depot/projects/uart/conf/kern.post.mk#13 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/kern.post.mk,v 1.92 2006/02/07 13:37:26 ru Exp $ +# $FreeBSD: src/sys/conf/kern.post.mk,v 1.93 2006/05/12 02:45:12 jmg Exp $ # Part of a unified Makefile for building kernels. This part includes all # the definitions that need to be after all the % directives except %RULES @@ -68,6 +68,15 @@ ${FULLKERNEL} ${.TARGET} ${KERNEL_KO}.symbols: ${FULLKERNEL} ${OBJCOPY} --only-keep-debug ${FULLKERNEL} ${.TARGET} +.if defined(MFS_IMAGE) + @dd if="${MFS_IMAGE}" ibs=8192 of="${KERNEL_KO}" \ + obs=`strings -at d "${KERNEL_KO}" | \ + grep "MFS Filesystem goes here" | awk '{print $$1}'` \ + oseek=1 conv=notrunc 2>/dev/null && \ + strings ${KERNEL_KO} | \ + grep 'MFS Filesystem had better STOP here' > /dev/null || \ + (rm ${KERNEL_KO} && echo 'MFS image too large' && false) +.endif install.debug reinstall.debug: gdbinit cd ${.CURDIR}; ${MAKE} ${.TARGET:R} ==== //depot/projects/uart/conf/options#35 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/options,v 1.540 2006/05/07 18:12:17 netchild Exp $ +# $FreeBSD: src/sys/conf/options,v 1.541 2006/05/12 02:01:38 benno Exp $ # # On the handling of kernel options # @@ -158,6 +158,7 @@ TURNSTILE_PROFILING TTYHOG opt_tty.h VFS_AIO +VERBOSE_SYSINIT opt_global.h WLCACHE opt_wavelan.h WLDEBUG opt_wavelan.h ==== //depot/projects/uart/contrib/pf/net/pf_ioctl.c#8 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/contrib/pf/net/pf_ioctl.c,v 1.23 2006/02/05 17:17:32 mlaier Exp $ */ +/* $FreeBSD: src/sys/contrib/pf/net/pf_ioctl.c,v 1.24 2006/05/12 16:15:34 mlaier Exp $ */ /* $OpenBSD: pf_ioctl.c,v 1.139 2005/03/03 07:13:39 dhartmei Exp $ */ /* @@ -1479,14 +1479,20 @@ break; } if (pr->ticket != ruleset->rules[rs_num].inactive.ticket) { - printf("ticket: %d != [%d]%d\n", pr->ticket, - rs_num, ruleset->rules[rs_num].inactive.ticket); +#ifdef __FreeBSD__ + DPFPRINTF(PF_DEBUG_MISC, + ("ticket: %d != [%d]%d\n", pr->ticket, rs_num, + ruleset->rules[rs_num].inactive.ticket)); +#endif error = EBUSY; break; } if (pr->pool_ticket != ticket_pabuf) { - printf("pool_ticket: %d != %d\n", pr->pool_ticket, - ticket_pabuf); +#ifdef __FreeBSD__ + DPFPRINTF(PF_DEBUG_MISC, + ("pool_ticket: %d != %d\n", pr->pool_ticket, + ticket_pabuf)); +#endif error = EBUSY; break; } ==== //depot/projects/uart/dev/asr/asr.c#12 (text+ko) ==== @@ -146,9 +146,6 @@ #define ASR_IOCTL_COMPAT #endif /* ASR_COMPAT */ #endif /* !BURN_BRIDGES */ - -#elif defined(__alpha__) -#include #endif #include @@ -165,7 +162,7 @@ #include -__FBSDID("$FreeBSD: src/sys/dev/asr/asr.c,v 1.77 2006/02/12 06:57:41 scottl Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/asr/asr.c,v 1.78 2006/05/12 05:04:40 jhb Exp $"); #define ASR_VERSION 1 #define ASR_REVISION '1' @@ -3715,8 +3712,6 @@ case CPU_686: Info.processorType = PROC_SEXIUM; break; } -#elif defined(__alpha__) - Info.processorType = PROC_ALPHA; #endif Info.osType = OS_BSDI_UNIX; ==== //depot/projects/uart/dev/ata/ata-all.c#22 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ata/ata-all.c,v 1.272 2006/04/14 16:25:42 sos Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ata/ata-all.c,v 1.273 2006/05/12 05:04:40 jhb Exp $"); #include "opt_ata.h" #include @@ -47,9 +47,6 @@ #include #include #include -#ifdef __alpha__ -#include -#endif #include #include ==== //depot/projects/uart/dev/ata/ata-pci.c#14 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ata/ata-pci.c,v 1.116 2006/02/16 17:09:24 sos Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ata/ata-pci.c,v 1.117 2006/05/12 05:04:40 jhb Exp $"); #include "opt_ata.h" #include @@ -42,9 +42,6 @@ #include #include #include -#ifdef __alpha__ -#include -#endif #include #include #include @@ -288,14 +285,10 @@ } if (type == SYS_RES_IRQ && *rid == ATA_IRQ_RID) { if (ata_legacy(dev)) { -#ifdef __alpha__ - res = alpha_platform_alloc_ide_intr(unit); -#else int irq = (unit == 0 ? 14 : 15); res = BUS_ALLOC_RESOURCE(device_get_parent(dev), child, SYS_RES_IRQ, rid, irq, irq, 1, flags); -#endif } else res = controller->r_irq; @@ -331,12 +324,8 @@ return ENOENT; if (ata_legacy(dev)) { -#ifdef __alpha__ - return alpha_platform_release_ide_intr(unit, r); -#else return BUS_RELEASE_RESOURCE(device_get_parent(dev), child, SYS_RES_IRQ, rid, r); -#endif } else return 0; @@ -350,13 +339,8 @@ void **cookiep) { if (ata_legacy(dev)) { -#ifdef __alpha__ - return alpha_platform_setup_ide_intr(child, irq, function, argument, - cookiep); -#else return BUS_SETUP_INTR(device_get_parent(dev), child, irq, flags, function, argument, cookiep); -#endif } else { struct ata_pci_controller *controller = device_get_softc(dev); @@ -374,11 +358,7 @@ void *cookie) { if (ata_legacy(dev)) { -#ifdef __alpha__ - return alpha_platform_teardown_ide_intr(child, irq, cookie); -#else return BUS_TEARDOWN_INTR(device_get_parent(dev), child, irq, cookie); -#endif } else { struct ata_pci_controller *controller = device_get_softc(dev); ==== //depot/projects/uart/dev/atkbdc/atkbd.c#3 (text+ko) ==== @@ -26,7 +26,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/atkbdc/atkbd.c,v 1.48 2006/04/26 06:05:16 sobomax Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/atkbdc/atkbd.c,v 1.49 2006/05/12 05:04:41 jhb Exp $"); #include "opt_kbd.h" #include "opt_atkbd.h" @@ -1330,7 +1330,7 @@ } } -#if defined(__alpha__) || defined(__sparc64__) +#if defined(__sparc64__) if (send_kbd_command_and_data( kbdc, KBDC_SET_SCANCODE_SET, 2) != KBD_ACK) { printf("atkbd: can't set translation.\n"); ==== //depot/projects/uart/dev/atkbdc/atkbdc.c#4 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/atkbdc/atkbdc.c,v 1.23 2006/04/26 06:05:16 sobomax Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/atkbdc/atkbdc.c,v 1.24 2006/05/12 05:04:41 jhb Exp $"); #include "opt_kbd.h" @@ -174,8 +174,6 @@ tag = I386_BUS_SPACE_IO; #elif defined(__amd64__) tag = AMD64_BUS_SPACE_IO; -#elif defined(__alpha__) - tag = busspace_isa_io; #elif defined(__ia64__) tag = IA64_BUS_SPACE_IO; #elif defined(__sparc64__) ==== //depot/projects/uart/dev/dc/if_dc.c#5 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/dc/if_dc.c,v 1.180 2006/03/16 20:00:39 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/dc/if_dc.c,v 1.181 2006/05/12 05:04:41 jhb Exp $"); /* * DEC "tulip" clone ethernet driver. Supports the DEC/Intel 21143 @@ -128,9 +128,6 @@ #include #define DC_USEIOSPACE -#ifdef __alpha__ -#define SRM_MEDIA -#endif #include @@ -2281,32 +2278,6 @@ callout_init_mtx(&sc->dc_stat_ch, &sc->dc_mtx, 0); -#ifdef SRM_MEDIA - sc->dc_srm_media = 0; - - /* Remember the SRM console media setting */ - if (DC_IS_INTEL(sc)) { - command = pci_read_config(dev, DC_PCI_CFDD, 4); - command &= ~(DC_CFDD_SNOOZE_MODE | DC_CFDD_SLEEP_MODE); - switch ((command >> 8) & 0xff) { - case 3: - sc->dc_srm_media = IFM_10_T; - break; - case 4: - sc->dc_srm_media = IFM_10_T | IFM_FDX; - break; - case 5: - sc->dc_srm_media = IFM_100_TX; - break; - case 6: - sc->dc_srm_media = IFM_100_TX | IFM_FDX; - break; - } - if (sc->dc_srm_media) - sc->dc_srm_media |= IFM_ACTIVE | IFM_ETHER; - } -#endif - /* * Call MI attach routine. */ @@ -3400,19 +3371,7 @@ DC_LOCK(sc); dc_init_locked(sc); -#ifdef SRM_MEDIA - if(sc->dc_srm_media) { - struct ifreq ifr; - struct mii_data *mii; - - ifr.ifr_media = sc->dc_srm_media; - sc->dc_srm_media = 0; - DC_UNLOCK(sc); - mii = device_get_softc(sc->dc_miibus); - ifmedia_ioctl(sc->dc_ifp, &ifr, &mii->mii_media, SIOCSIFMEDIA); - } else -#endif - DC_UNLOCK(sc); + DC_UNLOCK(sc); } static void @@ -3684,12 +3643,6 @@ case SIOCSIFMEDIA: mii = device_get_softc(sc->dc_miibus); error = ifmedia_ioctl(ifp, ifr, &mii->mii_media, command); -#ifdef SRM_MEDIA - DC_LOCK(sc); - if (sc->dc_srm_media) - sc->dc_srm_media = 0; - DC_UNLOCK(sc); -#endif break; case SIOCSIFCAP: #ifdef DEVICE_POLLING ==== //depot/projects/uart/dev/de/if_de.c#2 (text) ==== @@ -36,7 +36,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/de/if_de.c,v 1.179 2006/02/26 17:52:04 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/de/if_de.c,v 1.180 2006/05/12 05:04:41 jhb Exp $"); #define TULIP_HDR_DATA @@ -4436,15 +4436,6 @@ == TULIP_HAVE_ISVSROM ? " (invalid EESPROM checksum)" : ""); TULIP_LOCK(sc); -#if defined(__alpha__) - /* - * In case the SRM console told us about a bogus media, - * we need to check to be safe. - */ - if (sc->tulip_mediums[sc->tulip_media] == NULL) - sc->tulip_media = TULIP_MEDIA_UNKNOWN; -#endif - (*sc->tulip_boardsw->bd_media_probe)(sc); ifmedia_init(&sc->tulip_ifmedia, 0, tulip_ifmedia_change, @@ -4749,9 +4740,6 @@ tulip_pci_attach(device_t dev) { tulip_softc_t *sc; -#if defined(__alpha__) - tulip_media_t media = TULIP_MEDIA_UNKNOWN; -#endif int retval, idx; u_int32_t revinfo, cfdainfo; unsigned csroffset = TULIP_PCI_CSROFFSET; @@ -4829,23 +4817,6 @@ pci_write_config(dev, PCI_CFDA, cfdainfo, 4); DELAY(11*1000); } -#if defined(__alpha__) - /* - * The Alpha SRM console encodes a console set media in the driver - * part of the CFDA register. Note that the Multia presents a - * problem in that its BNC mode is really EXTSIA. So in that case - * force a probe. - */ - switch ((cfdainfo >> 8) & 0xff) { - case 1: media = chipid > TULIP_21040 ? TULIP_MEDIA_AUI : TULIP_MEDIA_AUIBNC; break; - case 2: media = chipid > TULIP_21040 ? TULIP_MEDIA_BNC : TULIP_MEDIA_UNKNOWN; break; - case 3: media = TULIP_MEDIA_10BASET; break; - case 4: media = TULIP_MEDIA_10BASET_FD; break; - case 5: media = TULIP_MEDIA_100BASETX; break; - case 6: media = TULIP_MEDIA_100BASETX_FD; break; - default: media = TULIP_MEDIA_UNKNOWN; break; - } -#endif sc->tulip_unit = unit; sc->tulip_revinfo = revinfo; @@ -4911,9 +4882,6 @@ if (sc->tulip_features & TULIP_HAVE_SHAREDINTR) intr_rtn = tulip_intr_shared; -#if defined(__alpha__) - sc->tulip_media = media; -#endif tulip_attach(sc); /* Setup interrupt last. */ @@ -4933,13 +4901,6 @@ return ENXIO; } } - -#if defined(__alpha__) - TULIP_LOCK(sc); - if (sc->tulip_media != TULIP_MEDIA_UNKNOWN) - tulip_linkup(sc, media); - TULIP_UNLOCK(sc); -#endif } return 0; } ==== //depot/projects/uart/dev/lge/if_lgereg.h#5 (text+ko) ==== @@ -30,7 +30,7 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF * THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/lge/if_lgereg.h,v 1.7 2005/11/23 18:51:34 jhb Exp $ + * $FreeBSD: src/sys/dev/lge/if_lgereg.h,v 1.8 2006/05/12 05:04:42 jhb Exp $ */ @@ -607,8 +607,3 @@ #define LGE_PSTATE_D3 0x0003 #define LGE_PME_EN 0x0010 #define LGE_PME_STATUS 0x8000 - -#ifdef __alpha__ -#undef vtophys -#define vtophys(va) alpha_XXX_dmamap((vm_offset_t)va) -#endif ==== //depot/projects/uart/dev/nge/if_ngereg.h#6 (text+ko) ==== @@ -30,7 +30,7 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF * THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/nge/if_ngereg.h,v 1.14 2005/10/13 20:22:07 jhb Exp $ + * $FreeBSD: src/sys/dev/nge/if_ngereg.h,v 1.15 2006/05/12 05:04:42 jhb Exp $ */ #define NGE_CSR 0x00 @@ -731,8 +731,3 @@ #define NGE_PSTATE_D3 0x0003 #define NGE_PME_EN 0x0010 #define NGE_PME_STATUS 0x8000 - -#ifdef __alpha__ -#undef vtophys -#define vtophys(va) alpha_XXX_dmamap((vm_offset_t)va) -#endif ==== //depot/projects/uart/dev/pdq/pdq_freebsd.h#6 (text+ko) ==== @@ -24,7 +24,7 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * * Id: pdqvar.h,v 1.21 1997/03/21 21:16:04 thomas Exp - * $FreeBSD: src/sys/dev/pdq/pdq_freebsd.h,v 1.11 2005/11/11 07:36:13 ru Exp $ + * $FreeBSD: src/sys/dev/pdq/pdq_freebsd.h,v 1.12 2006/05/12 05:04:42 jhb Exp $ * */ @@ -164,11 +164,7 @@ #define PDQ_OS_CSR_FMT "0x%x" #define PDQ_OS_USEC_DELAY(n) DELAY(n) -#ifdef __alpha__ -#define PDQ_OS_VA_TO_BUSPA(pdq, p) alpha_XXX_dmamap((vm_offset_t)p) -#else #define PDQ_OS_VA_TO_BUSPA(pdq, p) vtophys(p) -#endif #define PDQ_OS_MEMALLOC(n) malloc(n, M_DEVBUF, M_NOWAIT) #define PDQ_OS_MEMFREE(p, n) free((void *) p, M_DEVBUF) ==== //depot/projects/uart/dev/pdq/pdqvar.h#4 (text+ko) ==== @@ -24,7 +24,7 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * * Id: pdqvar.h,v 1.21 1997/03/21 21:16:04 thomas Exp - * $FreeBSD: src/sys/dev/pdq/pdqvar.h,v 1.12 2005/06/10 16:49:13 brooks Exp $ + * $FreeBSD: src/sys/dev/pdq/pdqvar.h,v 1.13 2006/05/12 05:04:42 jhb Exp $ * */ @@ -165,7 +165,7 @@ struct ifmedia sc_ifmedia; #endif pdq_t *sc_pdq; -#if defined(__alpha__) || defined(__i386__) +#if defined(__i386__) pdq_bus_ioport_t sc_iobase; #endif #if defined(PDQ_IOMAPPED) ==== //depot/projects/uart/dev/ppc/ppc.c#11 (text+ko) ==== @@ -26,7 +26,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ppc/ppc.c,v 1.51 2006/04/24 23:31:51 marcel Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ppc/ppc.c,v 1.52 2006/05/12 05:04:42 jhb Exp $"); #include "opt_ppc.h" @@ -1681,15 +1681,6 @@ IO_LPTSIZE_EXTENDED); } #endif -#ifdef __alpha__ - /* - * There isn't a bios list on alpha. Put it in the usual place. - */ - if (error) { >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sat May 13 00:17:20 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 300A316A5A8; Sat, 13 May 2006 00:17:20 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id CE1E716A545 for ; Sat, 13 May 2006 00:17:19 +0000 (UTC) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 5151043D49 for ; Sat, 13 May 2006 00:17:19 +0000 (GMT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k4D0HI43007695 for ; Sat, 13 May 2006 00:17:18 GMT (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k4D0HHNu007692 for perforce@freebsd.org; Sat, 13 May 2006 00:17:17 GMT (envelope-from marcel@freebsd.org) Date: Sat, 13 May 2006 00:17:17 GMT Message-Id: <200605130017.k4D0HHNu007692@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Cc: Subject: PERFORCE change 97042 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 13 May 2006 00:17:20 -0000 http://perforce.freebsd.org/chv.cgi?CH=97042 Change 97042 by marcel@marcel_nfs on 2006/05/13 00:16:50 IFC @97039 Affected files ... .. //depot/projects/ia64/etc/defaults/periodic.conf#19 integrate .. //depot/projects/ia64/etc/periodic/security/600.ip6fwdenied#6 delete .. //depot/projects/ia64/etc/periodic/security/650.ip6fwlimit#7 delete .. //depot/projects/ia64/etc/periodic/security/Makefile#5 integrate .. //depot/projects/ia64/etc/rc.d/ip6fw#7 integrate .. //depot/projects/ia64/etc/rc.firewall6#8 integrate .. //depot/projects/ia64/include/netdb.h#14 integrate .. //depot/projects/ia64/lib/libc/net/gethostbydns.c#16 integrate .. //depot/projects/ia64/lib/libc/net/gethostbyht.c#7 integrate .. //depot/projects/ia64/lib/libc/net/gethostbyname.3#10 integrate .. //depot/projects/ia64/lib/libc/net/gethostbynis.c#8 integrate .. //depot/projects/ia64/lib/libc/net/gethostnamadr.c#8 integrate .. //depot/projects/ia64/lib/libc/net/netdb_private.h#6 integrate .. //depot/projects/ia64/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#158 integrate .. //depot/projects/ia64/sbin/Makefile#48 integrate .. //depot/projects/ia64/sbin/ip6fw/Makefile#5 delete .. //depot/projects/ia64/sbin/ip6fw/ip6fw.8#14 delete .. //depot/projects/ia64/sbin/ip6fw/ip6fw.c#12 delete .. //depot/projects/ia64/sbin/ip6fw/sample.sh#2 delete .. //depot/projects/ia64/sbin/ipfw/ipfw.8#51 integrate .. //depot/projects/ia64/share/man/man4/ath.4#28 integrate .. //depot/projects/ia64/share/man/man5/periodic.conf.5#21 integrate .. //depot/projects/ia64/share/man/man5/rc.conf.5#72 integrate .. //depot/projects/ia64/share/man/man7/security.7#15 integrate .. //depot/projects/ia64/sys/boot/Makefile#16 integrate .. //depot/projects/ia64/sys/boot/common/Makefile.inc#9 integrate .. //depot/projects/ia64/sys/boot/common/load_elf.c#17 integrate .. //depot/projects/ia64/sys/boot/common/loader.8#31 integrate .. //depot/projects/ia64/sys/boot/efi/libefi/bootinfo.c#15 integrate .. //depot/projects/ia64/sys/boot/ficl/Makefile#14 integrate .. //depot/projects/ia64/sys/boot/ficl/alpha/sysdep.c#2 delete .. //depot/projects/ia64/sys/boot/ficl/alpha/sysdep.h#4 delete .. //depot/projects/ia64/sys/boot/ficl/loader.c#8 integrate .. //depot/projects/ia64/sys/boot/forth/loader.4th#4 integrate .. //depot/projects/ia64/sys/boot/ia64/ski/bootinfo.c#6 integrate .. //depot/projects/ia64/sys/boot/ia64/ski/conf.c#3 integrate .. //depot/projects/ia64/sys/boot/powerpc/loader/conf.c#5 integrate .. //depot/projects/ia64/sys/compat/linprocfs/linprocfs.c#40 integrate .. //depot/projects/ia64/sys/conf/NOTES#101 integrate .. //depot/projects/ia64/sys/conf/files#141 integrate .. //depot/projects/ia64/sys/conf/kern.post.mk#59 integrate .. //depot/projects/ia64/sys/conf/options#94 integrate .. //depot/projects/ia64/sys/contrib/pf/net/pf_ioctl.c#16 integrate .. //depot/projects/ia64/sys/dev/asr/asr.c#31 integrate .. //depot/projects/ia64/sys/dev/ata/ata-all.c#69 integrate .. //depot/projects/ia64/sys/dev/ata/ata-pci.c#51 integrate .. //depot/projects/ia64/sys/dev/atkbdc/atkbd.c#3 integrate .. //depot/projects/ia64/sys/dev/atkbdc/atkbdc.c#4 integrate .. //depot/projects/ia64/sys/dev/dc/if_dc.c#5 integrate .. //depot/projects/ia64/sys/dev/de/if_de.c#2 integrate .. //depot/projects/ia64/sys/dev/fb/tga.c#9 delete .. //depot/projects/ia64/sys/dev/fb/tga.h#3 delete .. //depot/projects/ia64/sys/dev/lge/if_lgereg.h#7 integrate .. //depot/projects/ia64/sys/dev/nge/if_ngereg.h#10 integrate .. //depot/projects/ia64/sys/dev/pdq/pdq_freebsd.h#12 integrate .. //depot/projects/ia64/sys/dev/pdq/pdqvar.h#9 integrate .. //depot/projects/ia64/sys/dev/ppc/ppc.c#9 integrate .. //depot/projects/ia64/sys/dev/sound/isa/es1888.c#7 delete .. //depot/projects/ia64/sys/dev/sound/isa/gusc.c#6 integrate .. //depot/projects/ia64/sys/dev/sym/sym_hipd.c#25 integrate .. //depot/projects/ia64/sys/dev/syscons/scterm-sc.c#7 integrate .. //depot/projects/ia64/sys/dev/syscons/scvgarndr.c#11 integrate .. //depot/projects/ia64/sys/dev/syscons/syscons.h#10 integrate .. //depot/projects/ia64/sys/dev/uart/uart_dev_z8530.c#13 integrate .. //depot/projects/ia64/sys/isa/isa_common.c#15 integrate .. //depot/projects/ia64/sys/isa/isa_common.h#5 integrate .. //depot/projects/ia64/sys/kern/init_main.c#54 integrate .. //depot/projects/ia64/sys/kern/kern_mutex.c#43 integrate .. //depot/projects/ia64/sys/kern/kern_sig.c#91 integrate .. //depot/projects/ia64/sys/kern/vfs_subr.c#87 integrate .. //depot/projects/ia64/sys/modules/ip6fw/Makefile#3 delete .. //depot/projects/ia64/sys/modules/sound/driver/ess/Makefile#3 integrate .. //depot/projects/ia64/sys/net/if.h#25 integrate .. //depot/projects/ia64/sys/net/if_loop.c#30 integrate .. //depot/projects/ia64/sys/netinet/ip_fw.h#31 integrate .. //depot/projects/ia64/sys/netinet/ip_fw2.c#55 integrate .. //depot/projects/ia64/sys/netinet/ip_fw_pfil.c#12 integrate .. //depot/projects/ia64/sys/netinet/ip_input.c#62 integrate .. //depot/projects/ia64/sys/netinet6/ip6_fw.c#21 delete .. //depot/projects/ia64/sys/netinet6/ip6_fw.h#6 delete .. //depot/projects/ia64/sys/pci/agp.c#28 integrate .. //depot/projects/ia64/sys/pci/if_pcnreg.h#6 integrate .. //depot/projects/ia64/sys/pci/if_sfreg.h#6 integrate .. //depot/projects/ia64/sys/pci/if_stereg.h#9 integrate .. //depot/projects/ia64/sys/pci/if_tl.c#25 integrate .. //depot/projects/ia64/sys/pci/if_tlreg.h#7 integrate .. //depot/projects/ia64/sys/pci/if_vrreg.h#13 integrate .. //depot/projects/ia64/sys/pci/if_wbreg.h#6 integrate .. //depot/projects/ia64/sys/pci/ncr.c#21 integrate .. //depot/projects/ia64/sys/sys/_timeval.h#3 integrate .. //depot/projects/ia64/sys/sys/conf.h#43 integrate .. //depot/projects/ia64/sys/sys/disklabel.h#30 integrate .. //depot/projects/ia64/sys/sys/elf64.h#5 integrate .. //depot/projects/ia64/sys/sys/param.h#74 integrate .. //depot/projects/ia64/sys/sys/signal.h#18 integrate .. //depot/projects/ia64/sys/sys/ucontext.h#9 integrate .. //depot/projects/ia64/sys/sys/user.h#21 integrate .. //depot/projects/ia64/tools/tools/tinderbox/etc/update_releng_6.rc#3 integrate .. //depot/projects/ia64/usr.sbin/jail/jail.c#15 integrate .. //depot/projects/ia64/usr.sbin/portsnap/portsnap/portsnap.sh#6 integrate Differences ... ==== //depot/projects/ia64/etc/defaults/periodic.conf#19 (text+ko) ==== @@ -13,7 +13,7 @@ # For a more detailed explanation of all the periodic.conf variables, please # refer to the periodic.conf(5) manual page. # -# $FreeBSD: src/etc/defaults/periodic.conf,v 1.37 2006/03/02 14:46:00 brueffer Exp $ +# $FreeBSD: src/etc/defaults/periodic.conf,v 1.38 2006/05/12 19:17:33 mlaier Exp $ # # What files override these defaults ? @@ -171,15 +171,9 @@ # 550.ipfwlimit daily_status_security_ipfwlimit_enable="YES" -# 600.ip6fwdenied -daily_status_security_ip6fwdenied_enable="YES" - # 610.ipf6denied daily_status_security_ipf6denied_enable="YES" -# 650.ip6fwlimit -daily_status_security_ip6fwlimit_enable="YES" - # 700.kernelmsg daily_status_security_kernelmsg_enable="YES" ==== //depot/projects/ia64/etc/periodic/security/Makefile#5 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/etc/periodic/security/Makefile,v 1.4 2004/11/24 18:41:53 mlaier Exp $ +# $FreeBSD: src/etc/periodic/security/Makefile,v 1.5 2006/05/12 19:17:34 mlaier Exp $ FILES= 100.chksetuid \ 200.chkmounts \ @@ -8,8 +8,6 @@ 510.ipfdenied \ 520.pfdenied \ 550.ipfwlimit \ - 600.ip6fwdenied \ - 650.ip6fwlimit \ 700.kernelmsg \ 800.loginfail \ 900.tcpwrap \ ==== //depot/projects/ia64/etc/rc.d/ip6fw#7 (text+ko) ==== @@ -1,6 +1,6 @@ #!/bin/sh # -# $FreeBSD: src/etc/rc.d/ip6fw,v 1.6 2004/10/07 13:55:26 mtm Exp $ +# $FreeBSD: src/etc/rc.d/ip6fw,v 1.7 2006/05/12 19:17:34 mlaier Exp $ # # PROVIDE: ip6fw @@ -20,7 +20,7 @@ { # Load IPv6 firewall module, if not already loaded if ! ${SYSCTL} net.inet6.ip6.fw.enable > /dev/null 2>&1; then - kldload ip6fw && { + kldload ipfw && { debug 'Kernel IPv6 firewall module loaded.' return 0 } @@ -41,7 +41,7 @@ if [ -r "${ipv6_firewall_script}" ]; then . "${ipv6_firewall_script}" echo 'IPv6 Firewall rules loaded.' - elif [ "`ip6fw l 65535`" = "65535 deny ipv6 from any to any" ]; then + elif [ "`ipfw show 65535`" = "65535 deny ip from any to any" ]; then warn 'IPv6 firewall rules have not been loaded. Default' \ ' to DENY all access.' fi @@ -50,7 +50,7 @@ # if checkyesno ipv6_firewall_logging; then echo 'IPv6 Firewall logging=YES' - sysctl net.inet6.ip6.fw.verbose=1 >/dev/null + sysctl net.inet.ip.fw.verbose=1 >/dev/null fi # Enable the firewall ==== //depot/projects/ia64/etc/rc.firewall6#8 (text+ko) ==== @@ -1,7 +1,7 @@ #!/bin/sh - ############ # Setup system for IPv6 firewall service. -# $FreeBSD: src/etc/rc.firewall6,v 1.16 2005/10/05 07:00:42 ume Exp $ +# $FreeBSD: src/etc/rc.firewall6,v 1.17 2006/05/12 19:17:33 mlaier Exp $ # Suck in the configuration variables. if [ -z "${source_rc_confs_defined}" ]; then @@ -54,17 +54,17 @@ ############ # Only in rare cases do you want to change these rules # - ${fw6cmd} add 100 pass all from any to any via lo0 - ${fw6cmd} add 200 deny all from any to ::1 - ${fw6cmd} add 300 deny all from ::1 to any + ${fw6cmd} add 100 pass ip6 from any to any via lo0 + ${fw6cmd} add 200 deny ip6 from any to ::1 + ${fw6cmd} add 300 deny ip6 from ::1 to any # # ND # # DAD - ${fw6cmd} add pass ipv6-icmp from :: to ff02::/16 + ${fw6cmd} add pass ip6 from :: to ff02::/16 proto ipv6-icmp # RS, RA, NS, NA, redirect... - ${fw6cmd} add pass ipv6-icmp from fe80::/10 to fe80::/10 - ${fw6cmd} add pass ipv6-icmp from fe80::/10 to ff02::/16 + ${fw6cmd} add pass ip6 from fe80::/10 to fe80::/10 proto ipv6-icmp + ${fw6cmd} add pass ip6 from fe80::/10 to ff02::/16 proto ipv6-icmp } if [ -n "${1}" ]; then @@ -76,10 +76,10 @@ # case ${ipv6_firewall_quiet} in [Yy][Ee][Ss]) - fw6cmd="/sbin/ip6fw -q" + fw6cmd="/sbin/ipfw -q" ;; *) - fw6cmd="/sbin/ip6fw" + fw6cmd="/sbin/ipfw" ;; esac @@ -102,7 +102,7 @@ case ${ipv6_firewall_type} in [Oo][Pp][Ee][Nn]) setup_local - ${fw6cmd} add 65000 pass all from any to any + ${fw6cmd} add 65000 pass ip6 from any to any ;; [Cc][Ll][Ii][Ee][Nn][Tt]) @@ -122,41 +122,42 @@ setup_local # Allow any traffic to or from my own net. - ${fw6cmd} add pass all from ${ip} to ${net}/${prefixlen} - ${fw6cmd} add pass all from ${net}/${prefixlen} to ${ip} + ${fw6cmd} add pass ip6 from ${ip} to ${net}/${prefixlen} + ${fw6cmd} add pass ip6 from ${net}/${prefixlen} to ${ip} # Allow any link-local multicast traffic - ${fw6cmd} add pass all from fe80::/10 to ff02::/16 - ${fw6cmd} add pass all from ${net}/${prefixlen} to ff02::/16 + ${fw6cmd} add pass ip6 from fe80::/10 to ff02::/16 + ${fw6cmd} add pass ip6 from ${net}/${prefixlen} to ff02::/16 # Allow TCP through if setup succeeded - ${fw6cmd} add pass tcp from any to any established + ${fw6cmd} add pass ip6 from any to any established proto tcp # Allow IP fragments to pass through - ${fw6cmd} add pass all from any to any frag + ${fw6cmd} add pass ip6 from any to any frag # Allow setup of incoming email - ${fw6cmd} add pass tcp from any to ${ip} 25 setup + ${fw6cmd} add pass ip6 from any to ${ip} 25 setup proto tcp # Allow setup of outgoing TCP connections only - ${fw6cmd} add pass tcp from ${ip} to any setup + ${fw6cmd} add pass ip6 from ${ip} to any setup proto tcp # Disallow setup of all other TCP connections - ${fw6cmd} add deny tcp from any to any setup + ${fw6cmd} add deny ip6 from any to any setup proto tcp # Allow DNS queries out in the world - ${fw6cmd} add pass udp from any 53 to ${ip} - ${fw6cmd} add pass udp from ${ip} to any 53 + ${fw6cmd} add pass ip6 from any 53 to ${ip} proto udp + ${fw6cmd} add pass ip6 from ${ip} to any 53 proto udp # Allow NTP queries out in the world - ${fw6cmd} add pass udp from any 123 to ${ip} - ${fw6cmd} add pass udp from ${ip} to any 123 + ${fw6cmd} add pass ip6 from any 123 to ${ip} proto udp + ${fw6cmd} add pass ip6 from ${ip} to any 123 proto udp # Allow ICMPv6 destination unreach - ${fw6cmd} add pass ipv6-icmp from any to any icmptypes 1 + ${fw6cmd} add pass ip6 from any to any icmp6types 1 proto ipv6-icmp # Allow NS/NA/toobig (don't filter it out) - ${fw6cmd} add pass ipv6-icmp from any to any icmptypes 2,135,136 + ${fw6cmd} add pass ip6 from any to any icmp6types 2,135,136 \ + proto ipv6-icmp # Everything else is denied by default, unless the # IPV6FIREWALL_DEFAULT_TO_ACCEPT option is set in your kernel @@ -185,94 +186,96 @@ setup_local # Stop spoofing - ${fw6cmd} add deny all from ${inet}/${iprefixlen} to any in via ${oif} - ${fw6cmd} add deny all from ${onet}/${oprefixlen} to any in via ${iif} + ${fw6cmd} add deny ip6 from ${inet}/${iprefixlen} to any in via ${oif} + ${fw6cmd} add deny ip6 from ${onet}/${oprefixlen} to any in via ${iif} # Stop unique local unicast address on the outside interface - ${fw6cmd} add deny all from fc00::/7 to any via ${oif} - ${fw6cmd} add deny all from any to fc00::/7 via ${oif} + ${fw6cmd} add deny ip6 from fc00::/7 to any via ${oif} + ${fw6cmd} add deny ip6 from any to fc00::/7 via ${oif} # Stop site-local on the outside interface - ${fw6cmd} add deny all from fec0::/10 to any via ${oif} - ${fw6cmd} add deny all from any to fec0::/10 via ${oif} + ${fw6cmd} add deny ip6 from fec0::/10 to any via ${oif} + ${fw6cmd} add deny ip6 from any to fec0::/10 via ${oif} # Disallow "internal" addresses to appear on the wire. - ${fw6cmd} add deny all from ::ffff:0.0.0.0/96 to any via ${oif} - ${fw6cmd} add deny all from any to ::ffff:0.0.0.0/96 via ${oif} + ${fw6cmd} add deny ip6 from ::ffff:0.0.0.0/96 to any via ${oif} + ${fw6cmd} add deny ip6 from any to ::ffff:0.0.0.0/96 via ${oif} # Disallow packets to malicious IPv4 compatible prefix. - ${fw6cmd} add deny all from ::224.0.0.0/100 to any via ${oif} - ${fw6cmd} add deny all from any to ::224.0.0.0/100 via ${oif} - ${fw6cmd} add deny all from ::127.0.0.0/104 to any via ${oif} - ${fw6cmd} add deny all from any to ::127.0.0.0/104 via ${oif} - ${fw6cmd} add deny all from ::0.0.0.0/104 to any via ${oif} - ${fw6cmd} add deny all from any to ::0.0.0.0/104 via ${oif} - ${fw6cmd} add deny all from ::255.0.0.0/104 to any via ${oif} - ${fw6cmd} add deny all from any to ::255.0.0.0/104 via ${oif} + ${fw6cmd} add deny ip6 from ::224.0.0.0/100 to any via ${oif} + ${fw6cmd} add deny ip6 from any to ::224.0.0.0/100 via ${oif} + ${fw6cmd} add deny ip6 from ::127.0.0.0/104 to any via ${oif} + ${fw6cmd} add deny ip6 from any to ::127.0.0.0/104 via ${oif} + ${fw6cmd} add deny ip6 from ::0.0.0.0/104 to any via ${oif} + ${fw6cmd} add deny ip6 from any to ::0.0.0.0/104 via ${oif} + ${fw6cmd} add deny ip6 from ::255.0.0.0/104 to any via ${oif} + ${fw6cmd} add deny ip6 from any to ::255.0.0.0/104 via ${oif} - ${fw6cmd} add deny all from ::0.0.0.0/96 to any via ${oif} - ${fw6cmd} add deny all from any to ::0.0.0.0/96 via ${oif} + ${fw6cmd} add deny ip6 from ::0.0.0.0/96 to any via ${oif} + ${fw6cmd} add deny ip6 from any to ::0.0.0.0/96 via ${oif} # Disallow packets to malicious 6to4 prefix. - ${fw6cmd} add deny all from 2002:e000::/20 to any via ${oif} - ${fw6cmd} add deny all from any to 2002:e000::/20 via ${oif} - ${fw6cmd} add deny all from 2002:7f00::/24 to any via ${oif} - ${fw6cmd} add deny all from any to 2002:7f00::/24 via ${oif} - ${fw6cmd} add deny all from 2002:0000::/24 to any via ${oif} - ${fw6cmd} add deny all from any to 2002:0000::/24 via ${oif} - ${fw6cmd} add deny all from 2002:ff00::/24 to any via ${oif} - ${fw6cmd} add deny all from any to 2002:ff00::/24 via ${oif} + ${fw6cmd} add deny ip6 from 2002:e000::/20 to any via ${oif} + ${fw6cmd} add deny ip6 from any to 2002:e000::/20 via ${oif} + ${fw6cmd} add deny ip6 from 2002:7f00::/24 to any via ${oif} + ${fw6cmd} add deny ip6 from any to 2002:7f00::/24 via ${oif} + ${fw6cmd} add deny ip6 from 2002:0000::/24 to any via ${oif} + ${fw6cmd} add deny ip6 from any to 2002:0000::/24 via ${oif} + ${fw6cmd} add deny ip6 from 2002:ff00::/24 to any via ${oif} + ${fw6cmd} add deny ip6 from any to 2002:ff00::/24 via ${oif} - ${fw6cmd} add deny all from 2002:0a00::/24 to any via ${oif} - ${fw6cmd} add deny all from any to 2002:0a00::/24 via ${oif} - ${fw6cmd} add deny all from 2002:ac10::/28 to any via ${oif} - ${fw6cmd} add deny all from any to 2002:ac10::/28 via ${oif} - ${fw6cmd} add deny all from 2002:c0a8::/32 to any via ${oif} - ${fw6cmd} add deny all from any to 2002:c0a8::/32 via ${oif} + ${fw6cmd} add deny ip6 from 2002:0a00::/24 to any via ${oif} + ${fw6cmd} add deny ip6 from any to 2002:0a00::/24 via ${oif} + ${fw6cmd} add deny ip6 from 2002:ac10::/28 to any via ${oif} + ${fw6cmd} add deny ip6 from any to 2002:ac10::/28 via ${oif} + ${fw6cmd} add deny ip6 from 2002:c0a8::/32 to any via ${oif} + ${fw6cmd} add deny ip6 from any to 2002:c0a8::/32 via ${oif} - ${fw6cmd} add deny all from ff05::/16 to any via ${oif} - ${fw6cmd} add deny all from any to ff05::/16 via ${oif} + ${fw6cmd} add deny ip6 from ff05::/16 to any via ${oif} + ${fw6cmd} add deny ip6 from any to ff05::/16 via ${oif} # Allow TCP through if setup succeeded ${fw6cmd} add pass tcp from any to any established # Allow IP fragments to pass through - ${fw6cmd} add pass all from any to any frag + ${fw6cmd} add pass ip6 from any to any frag # Allow setup of incoming email - ${fw6cmd} add pass tcp from any to ${oip} 25 setup + ${fw6cmd} add pass ip6 from any to ${oip} 25 setup proto tcp # Allow access to our DNS - ${fw6cmd} add pass tcp from any to ${oip} 53 setup - ${fw6cmd} add pass udp from any to ${oip} 53 - ${fw6cmd} add pass udp from ${oip} 53 to any + ${fw6cmd} add pass ip6 from any to ${oip} 53 setup proto tcp + ${fw6cmd} add pass ip6 from any to ${oip} 53 proto udp + ${fw6cmd} add pass ip6 from ${oip} 53 to any proto udp # Allow access to our WWW - ${fw6cmd} add pass tcp from any to ${oip} 80 setup + ${fw6cmd} add pass ip6 from any to ${oip} 80 setup proto tcp # Reject&Log all setup of incoming connections from the outside - ${fw6cmd} add deny log tcp from any to any in via ${oif} setup + ${fw6cmd} add deny log ip6 from any to any in via ${oif} setup \ + proto tcp # Allow setup of any other TCP connection - ${fw6cmd} add pass tcp from any to any setup + ${fw6cmd} add pass ip6 from any to any setup proto tcp # Allow DNS queries out in the world - ${fw6cmd} add pass udp from any 53 to ${oip} - ${fw6cmd} add pass udp from ${oip} to any 53 + ${fw6cmd} add pass ip6 from any 53 to ${oip} proto udp + ${fw6cmd} add pass ip6 from ${oip} to any 53 proto udp # Allow NTP queries out in the world - ${fw6cmd} add pass udp from any 123 to ${oip} - ${fw6cmd} add pass udp from ${oip} to any 123 + ${fw6cmd} add pass ip6 from any 123 to ${oip} proto udp + ${fw6cmd} add pass ip6 from ${oip} to any 123 proto udp # Allow RIPng - #${fw6cmd} add pass udp from fe80::/10 521 to ff02::9 521 - #${fw6cmd} add pass udp from fe80::/10 521 to fe80::/10 521 + #${fw6cmd} add pass ip6 from fe80::/10 521 to ff02::9 521 proto udp + #${fw6cmd} add pass ip6 from fe80::/10 521 to fe80::/10 521 proto udp # Allow ICMPv6 destination unreach - ${fw6cmd} add pass ipv6-icmp from any to any icmptypes 1 + ${fw6cmd} add pass ip6 from any to any icmp6types 1 proto ipv6-icmp # Allow NS/NA/toobig (don't filter it out) - ${fw6cmd} add pass ipv6-icmp from any to any icmptypes 2,135,136 + ${fw6cmd} add pass ip6 from any to any icmp6types 2,135,136 \ + proto ipv6-icmp # Everything else is denied by default, unless the # IPV6FIREWALL_DEFAULT_TO_ACCEPT option is set in your kernel @@ -281,7 +284,7 @@ [Cc][Ll][Oo][Ss][Ee][Dd]) # Only enable the loopback interface - ${fw6cmd} add 100 pass all from any to any via lo0 + ${fw6cmd} add 100 pass ip6 from any to any via lo0 ;; [Uu][Nn][Kk][Nn][Oo][Ww][Nn]) ;; ==== //depot/projects/ia64/include/netdb.h#14 (text+ko) ==== @@ -55,7 +55,7 @@ /* * @(#)netdb.h 8.1 (Berkeley) 6/2/93 * From: Id: netdb.h,v 8.9 1996/11/19 08:39:29 vixie Exp $ - * $FreeBSD: src/include/netdb.h,v 1.41 2006/04/15 16:20:26 ume Exp $ + * $FreeBSD: src/include/netdb.h,v 1.42 2006/05/12 15:37:22 ume Exp $ */ #ifndef _NETDB_H_ @@ -63,6 +63,7 @@ #include #include +#include #ifndef _SIZE_T_DECLARED typedef __size_t size_t; @@ -220,9 +221,15 @@ void endprotoent(void); void endservent(void); void freehostent(struct hostent *); -struct hostent *gethostbyaddr(const char *, int, int); -int gethostbyaddr_r(const char *, int, int, struct hostent *, +#if __LONG_BIT == 64 +struct hostent *gethostbyaddr(const void *, int, int); +int gethostbyaddr_r(const void *, int, int, struct hostent *, + char *, size_t, struct hostent **, int *); +#else +struct hostent *gethostbyaddr(const void *, socklen_t, int); +int gethostbyaddr_r(const void *, socklen_t, int, struct hostent *, char *, size_t, struct hostent **, int *); +#endif struct hostent *gethostbyname(const char *); int gethostbyname_r(const char *, struct hostent *, char *, size_t, struct hostent **, int *); ==== //depot/projects/ia64/lib/libc/net/gethostbydns.c#16 (text+ko) ==== @@ -58,7 +58,7 @@ static char fromrcsid[] = "From: Id: gethnamaddr.c,v 8.23 1998/04/07 04:59:46 vixie Exp $"; #endif /* LIBC_SCCS and not lint */ #include -__FBSDID("$FreeBSD: src/lib/libc/net/gethostbydns.c,v 1.56 2006/04/15 16:20:27 ume Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/net/gethostbydns.c,v 1.57 2006/05/12 15:37:23 ume Exp $"); #include #include @@ -550,11 +550,13 @@ int _dns_gethostbyaddr(void *rval, void *cb_data, va_list ap) { - const u_char *uaddr; - int len, af; + const void *addr; + socklen_t len; + int af; char *buffer; size_t buflen; int *errnop, *h_errnop; + const u_char *uaddr; struct hostent *hptr, he; struct hostent_data *hed; int n; @@ -570,14 +572,15 @@ int ret_h_error; #endif /*SUNSECURITY*/ - uaddr = va_arg(ap, const u_char *); - len = va_arg(ap, int); + addr = va_arg(ap, const void *); + len = va_arg(ap, socklen_t); af = va_arg(ap, int); hptr = va_arg(ap, struct hostent *); buffer = va_arg(ap, char *); buflen = va_arg(ap, size_t); errnop = va_arg(ap, int *); h_errnop = va_arg(ap, int *); + uaddr = (const u_char *)addr; *((struct hostent **)rval) = NULL; ==== //depot/projects/ia64/lib/libc/net/gethostbyht.c#7 (text+ko) ==== @@ -55,7 +55,7 @@ static char sccsid[] = "@(#)gethostnamadr.c 8.1 (Berkeley) 6/4/93"; #endif /* LIBC_SCCS and not lint */ #include -__FBSDID("$FreeBSD: src/lib/libc/net/gethostbyht.c,v 1.25 2006/04/15 16:20:27 ume Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/net/gethostbyht.c,v 1.26 2006/05/12 15:37:23 ume Exp $"); #include #include @@ -282,8 +282,9 @@ int _ht_gethostbyaddr(void *rval, void *cb_data, va_list ap) { - const char *addr; - int len, af; + const void *addr; + socklen_t len; + int af; char *buffer; size_t buflen; int *errnop, *h_errnop; @@ -292,8 +293,8 @@ res_state statp; int error; - addr = va_arg(ap, const char *); - len = va_arg(ap, int); + addr = va_arg(ap, const void *); + len = va_arg(ap, socklen_t); af = va_arg(ap, int); hptr = va_arg(ap, struct hostent *); buffer = va_arg(ap, char *); ==== //depot/projects/ia64/lib/libc/net/gethostbyname.3#10 (text+ko) ==== @@ -30,7 +30,7 @@ .\" SUCH DAMAGE. .\" .\" From: @(#)gethostbyname.3 8.4 (Berkeley) 5/25/95 -.\" $FreeBSD: src/lib/libc/net/gethostbyname.3,v 1.34 2005/04/28 18:03:43 ume Exp $ +.\" $FreeBSD: src/lib/libc/net/gethostbyname.3,v 1.35 2006/05/12 15:37:23 ume Exp $ .\" .Dd May 25, 1995 .Dt GETHOSTBYNAME 3 @@ -55,7 +55,7 @@ .Ft struct hostent * .Fn gethostbyname2 "const char *name" "int af" .Ft struct hostent * -.Fn gethostbyaddr "const char *addr" "int len" "int type" +.Fn gethostbyaddr "const void *addr" "socklen_t len" "int type" .Ft struct hostent * .Fn gethostent void .Ft void @@ -246,7 +246,7 @@ if (!inet_aton(ipstr, &ip)) errx(1, "can't parse IP address %s", ipstr); -if ((hp = gethostbyaddr((const char *)&ip, +if ((hp = gethostbyaddr((const void *)&ip, sizeof ip, AF_INET)) == NULL) errx(1, "no name associated with %s", ipstr); ==== //depot/projects/ia64/lib/libc/net/gethostbynis.c#8 (text+ko) ==== @@ -24,7 +24,7 @@ */ #include -__FBSDID("$FreeBSD: src/lib/libc/net/gethostbynis.c,v 1.27 2006/04/15 16:20:27 ume Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/net/gethostbynis.c,v 1.28 2006/05/12 15:37:23 ume Exp $"); #include #include @@ -178,8 +178,8 @@ } static int -_gethostbynisaddr_r(const char *addr, int len, int af, struct hostent *he, - struct hostent_data *hed) +_gethostbynisaddr_r(const void *addr, socklen_t len, int af, + struct hostent *he, struct hostent_data *hed) { char *map; char numaddr[46]; @@ -227,7 +227,7 @@ } struct hostent * -_gethostbynisaddr(const char *addr, int len, int af) +_gethostbynisaddr(const void *addr, socklen_t len, int af) { #ifdef YP struct hostent *he; @@ -303,8 +303,8 @@ _nis_gethostbyaddr(void *rval, void *cb_data, va_list ap) { #ifdef YP - const char *addr; - int len; + const void *addr; + socklen_t len; int af; char *buffer; size_t buflen; @@ -313,8 +313,8 @@ struct hostent_data *hed; res_state statp; - addr = va_arg(ap, const char *); - len = va_arg(ap, int); + addr = va_arg(ap, const void *); + len = va_arg(ap, socklen_t); af = va_arg(ap, int); hptr = va_arg(ap, struct hostent *); buffer = va_arg(ap, char *); ==== //depot/projects/ia64/lib/libc/net/gethostnamadr.c#8 (text+ko) ==== @@ -24,7 +24,7 @@ */ #include -__FBSDID("$FreeBSD: src/lib/libc/net/gethostnamadr.c,v 1.31 2006/04/28 12:03:35 ume Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/net/gethostnamadr.c,v 1.32 2006/05/12 15:37:23 ume Exp $"); #include "namespace.h" #include "reentrant.h" @@ -573,8 +573,14 @@ } int -gethostbyaddr_r(const char *addr, int len, int af, struct hostent *hp, - char *buf, size_t buflen, struct hostent **result, int *h_errnop) +gethostbyaddr_r(const void *addr, +#if __LONG_BIT == 64 + int len, +#else + socklen_t len, +#endif + int af, struct hostent *hp, char *buf, size_t buflen, + struct hostent **result, int *h_errnop) { const u_char *uaddr = (const u_char *)addr; const struct in6_addr *addr6; @@ -606,7 +612,7 @@ } if (af == AF_INET6 && len == NS_IN6ADDRSZ) { - addr6 = (const struct in6_addr *)(const void *)uaddr; + addr6 = (const struct in6_addr *)addr; if (IN6_IS_ADDR_LINKLOCAL(addr6)) { RES_SET_H_ERRNO(statp, HOST_NOT_FOUND); *h_errnop = statp->res_h_errno; @@ -678,7 +684,11 @@ } struct hostent * -gethostbyaddr(const char *addr, int len, int af) +#if __LONG_BIT == 64 +gethostbyaddr(const void *addr, int len, int af) +#else +gethostbyaddr(const void *addr, socklen_t len, int af) +#endif { struct hostdata *hd; struct hostent *rval; ==== //depot/projects/ia64/lib/libc/net/netdb_private.h#6 (text+ko) ==== @@ -22,7 +22,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/lib/libc/net/netdb_private.h,v 1.12 2006/04/28 12:03:35 ume Exp $ + * $FreeBSD: src/lib/libc/net/netdb_private.h,v 1.13 2006/05/12 15:37:23 ume Exp $ */ #ifndef _NETDB_PRIVATE_H_ @@ -133,7 +133,7 @@ void _endhosthtent(struct hostent_data *); void _endnetdnsent(void); void _endnethtent(struct netent_data *); -struct hostent *_gethostbynisaddr(const char *, int, int); +struct hostent *_gethostbynisaddr(const void *, socklen_t, int); struct hostent *_gethostbynisname(const char *, int); void _map_v4v6_address(const char *, char *); void _map_v4v6_hostent(struct hostent *, char **, char *); ==== //depot/projects/ia64/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#158 (text+ko) ==== @@ -3,7 +3,7 @@ The &os; Project - $FreeBSD: src/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml,v 1.927 2006/05/11 22:55:18 bmah Exp $ + $FreeBSD: src/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml,v 1.929 2006/05/12 19:31:29 bmah Exp $ 2000 @@ -349,6 +349,12 @@ The &man.acpi.thermal.4; driver now supports passive cooling. &merged; + + Support for the alpha architecture has been removed. Alpha + support will remain on the RELENG_5 and RELENG_6 codelines. + The &man.cardbus.4; driver now supports /dev/cardbus%d.cis. @@ -994,12 +1000,15 @@ also specified, no output is made for disks with no activity. - The &man.jail.8; utility pports a WPA Supplicant has been updated from version 0.3.9 to version 0.4.8. ==== //depot/projects/ia64/sbin/Makefile#48 (text+ko) ==== @@ -1,5 +1,5 @@ # @(#)Makefile 8.5 (Berkeley) 3/31/94 -# $FreeBSD: src/sbin/Makefile,v 1.159 2006/03/17 18:54:30 ru Exp $ +# $FreeBSD: src/sbin/Makefile,v 1.160 2006/05/12 20:39:21 mlaier Exp $ .include @@ -38,7 +38,6 @@ gvinum \ ifconfig \ init \ - ${_ip6fw} \ ${_ipf} \ ipfw \ kldconfig \ @@ -112,7 +111,6 @@ .endif .if ${MK_INET6} != "no" -_ip6fw= ip6fw _ping6= ping6 .endif ==== //depot/projects/ia64/sbin/ipfw/ipfw.8#51 (text+ko) ==== @@ -1,7 +1,7 @@ .\" -.\" $FreeBSD: src/sbin/ipfw/ipfw.8,v 1.186 2006/03/05 15:55:46 ume Exp $ +.\" $FreeBSD: src/sbin/ipfw/ipfw.8,v 1.187 2006/05/12 18:09:33 mlaier Exp $ .\" -.Dd January 16, 2006 +.Dd May 12, 2006 .Dt IPFW 8 .Os .Sh NAME @@ -327,7 +327,7 @@ | | +----------->-----------+ ^ V - [ip(6)_input] [ip(6)_output] net.inet.ip.fw.enable=1 + [ip(6)_input] [ip(6)_output] net.inet(6).ip(6).fw.enable=1 | | ^ V [ether_demux] [ether_output_frame] net.link.ether.ipfw=1 @@ -2051,6 +2051,8 @@ Enables the firewall. Setting this variable to 0 lets you run your machine without firewall even if compiled in. +.It Em net.inet6.ip6.fw.enable : No 1 +provides the same functionality as above for the IPv6 case. .It Em net.inet.ip.fw.one_pass : No 1 When set, the packet exiting from the .Xr dummynet 4 ==== //depot/projects/ia64/share/man/man4/ath.4#28 (text+ko) ==== @@ -29,7 +29,7 @@ .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF .\" THE POSSIBILITY OF SUCH DAMAGES. .\" -.\" $FreeBSD: src/share/man/man4/ath.4,v 1.38 2006/04/28 21:45:08 maxim Exp $ +.\" $FreeBSD: src/share/man/man4/ath.4,v 1.40 2006/05/12 17:58:11 keramida Exp $ .\"/ .Dd September 5, 2005 .Dt ATH 4 @@ -125,54 +125,12 @@ driver come in either Cardbus or mini-PCI packages. Wireless cards in Cardbus slots may be inserted and ejected on the fly. .Sh HARDWARE -The following cards are among those supported by the +The .Nm -driver: +driver supports all Atheros Cardbus or PCI cards, +except those that are based on the AR5005VL chipset. .Pp -.Bl -column -compact "Samsung SWL-5200N" "AR5212" "Cardbus" "a/b/g" -.It Em "Card Chip Bus Standard" -.It "Aztech WL830PC AR5212 CardBus b/g" -.It "Cisco AIR-CB21AG AR5115 Cardbus a/b/g" -.It "Cisco AIR-PI21AG AR5115 PCI a/b/g" -.It "D-Link DWL-A650 AR5210 CardBus a" -.It "D-Link DWL-AB650 AR5211 CardBus a/b" -.It "D-Link DWL-A520 AR5210 PCI a" -.It "D-Link DWL-AG520 AR5212 PCI a/b/g" -.It "D-Link DWL-AG650 AR5212 CardBus a/b/g" -.It "D-Link DWL-G520B AR5212 PCI b/g" -.It "D-Link DWL-G650B AR5212 CardBus b/g" -.It "Elecom LD-WL54AG AR5212 Cardbus a/b/g" -.It "Elecom LD-WL54 AR5211 Cardbus a" -.It "Fujitsu E5454 AR5212 Cardbus a/b/g" -.It "Fujitsu FMV-JW481 AR5212 Cardbus a/b/g" -.It "Fujitsu E5454 AR5212 Cardbus a/b/g" -.It "HP NC4000 AR5212 PCI a/b/g" -.It "I/O Data WN-AB AR5212 CardBus a/b" -.It "I/O Data WN-AG AR5212 CardBus a/b/g" -.It "I/O Data WN-A54 AR5212 CardBus a" -.It "Linksys WMP55AG AR5212 PCI a/b/g" -.It "Linksys WPC51AB AR5211 CardBus a/b" -.It "Linksys WPC55AG AR5212 CardBus a/b/g" -.It "NEC PA-WL/54AG AR5212 CardBus a/b/g" -.It "Netgear WAG311 AR5212 PCI a/b/g" -.It "Netgear WAB501 AR5211 CardBus a/b" -.It "Netgear WAG511 AR5212 CardBus a/b/g" -.It "Netgear WG311T AR5212 PCI b/g" -.It "Netgear WG511T AR5212 CardBus b/g" -.It "Orinoco 8480 AR5212 CardBus a/b/g" -.It "Orinoco 8470WD AR5212 CardBus a/b/g" -.It "Proxim Skyline 4030 AR5210 CardBus a" -.It "Proxim Skyline 4032 AR5210 PCI a" -.It "Samsung SWL-5200N AR5212 CardBus a/b/g" -.It "SMC SMC2536W-AG AR5212 CardBus a/b/g" -.It "SMC SMC2735W AR5210 CardBus a" -.It "Sony PCWA-C700 AR5212 Cardbus a/b" -.It "Sony PCWA-C300S AR5212 Cardbus b/g" -.It "Sony PCWA-C500 AR5210 Cardbus a" -.It "3Com 3CRPAG175 AR5212 CardBus a/b/g" -.El -.Pp -An up to date list can be found at +A list of cards that are supported can be found at .Pa http://customerproducts.atheros.com/customerproducts . .Sh EXAMPLES Join an existing BSS network (ie: connect to an access point): ==== //depot/projects/ia64/share/man/man5/periodic.conf.5#21 (text+ko) ==== @@ -23,7 +23,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man5/periodic.conf.5,v 1.59 2006/03/02 14:55:07 brueffer Exp $ +.\" $FreeBSD: src/share/man/man5/periodic.conf.5,v 1.60 2006/05/12 19:17:34 mlaier Exp $ .\" .Dd March 2, 2006 .Dt PERIODIC.CONF 5 @@ -536,20 +536,6 @@ to display .Xr ipfw 8 rules that have reached their verbosity limit. -.It Va daily_status_security_ip6fwdenied_enable -.Pq Vt bool -Set to -.Dq YES -to show log entries for packets denied by -.Xr ip6fw 8 -since yesterday's check. -.It Va daily_status_security_ip6fwlimit_enable -.Pq Vt bool -Set to -.Dq YES -to display -.Xr ip6fw 8 -rules that have reached their verbosity limit. .It Va daily_status_security_kernelmsg_enable .Pq Vt bool Set to ==== //depot/projects/ia64/share/man/man5/rc.conf.5#72 (text+ko) ==== @@ -22,7 +22,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man5/rc.conf.5,v 1.294 2006/05/11 14:23:43 flz Exp $ +.\" $FreeBSD: src/share/man/man5/rc.conf.5,v 1.295 2006/05/12 19:17:34 mlaier Exp $ .\" .Dd May 11, 2006 .Dt RC.CONF 5 @@ -402,7 +402,7 @@ If the kernel was not built with .Cd "options IPV6FIREWALL" , the -.Pa ip6fw.ko +.Pa ipfw.ko kernel module will be loaded. .It Va firewall_script .Pq Vt str ==== //depot/projects/ia64/share/man/man7/security.7#15 (text+ko) ==== @@ -21,15 +21,14 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man7/security.7,v 1.45 2006/01/19 20:01:43 ceri Exp $ +.\" $FreeBSD: src/share/man/man7/security.7,v 1.46 2006/05/12 17:42:48 keramida Exp $ .\" .Dd November 29, 2004 .Dt SECURITY 7 .Os .Sh NAME .Nm security -.Nd introduction to security under >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sat May 13 01:07:22 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3E72516A42F; Sat, 13 May 2006 01:07:22 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 01FB916A407 for ; Sat, 13 May 2006 01:07:22 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 8D9D443D48 for ; Sat, 13 May 2006 01:07:21 +0000 (GMT) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k4D17KFR021803 for ; Sat, 13 May 2006 01:07:20 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k4D17KY6021798 for perforce@freebsd.org; Sat, 13 May 2006 01:07:20 GMT (envelope-from jb@freebsd.org) Date: Sat, 13 May 2006 01:07:20 GMT Message-Id: <200605130107.k4D17KY6021798@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 97045 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 13 May 2006 01:07:22 -0000 http://perforce.freebsd.org/chv.cgi?CH=97045 Change 97045 by jb@jb_freebsd2 on 2006/05/13 01:06:55 I must be making progress because Sun's DTrace tests are now finding my hacks. Blush. It's time to handle the memory allocation for the buffers properly. Respect the request to allocate buffers for all CPUs or just one. If allocating buffers for all CPUs, then respect the fact that the CPU address space is sparse. This allows us to pass all but two of Sun's DTrace buffer tests. One that fails requires the builtin variable 'curthread', so that's not a buffer-specific problem. The second one causes a deadlock in the kernel witout a panic, so that's a little bit of a, umm, err, problem. Sigh. Affected files ... .. //depot/projects/dtrace/src/cddl/test/dtrace/Makefile#3 edit .. //depot/projects/dtrace/src/sys/cddl/dev/dtrace/dtrace_buffer.c#6 edit .. //depot/projects/dtrace/src/sys/cddl/dev/dtrace/dtrace_dynvar.c#4 edit .. //depot/projects/dtrace/src/sys/cddl/dev/dtrace/dtrace_state.c#8 edit Differences ... ==== //depot/projects/dtrace/src/cddl/test/dtrace/Makefile#3 (text+ko) ==== @@ -156,6 +156,22 @@ ${.CURDIR}/tst/common/bitfields/tst.BitFieldPromotion.d \ ${.CURDIR}/tst/common/bitfields/tst.SizeofBitField.d +TESTBUFFERING= \ + ${.CURDIR}/tst/common/buffering/err.end.d \ + ${.CURDIR}/tst/common/buffering/err.resize1.d \ + ${.CURDIR}/tst/common/buffering/err.resize2.d \ + ${.CURDIR}/tst/common/buffering/err.resize3.d \ + ${.CURDIR}/tst/common/buffering/err.zerobuf.d \ + ${.CURDIR}/tst/common/buffering/tst.dynvarsize.d \ + ${.CURDIR}/tst/common/buffering/tst.fill1.d \ + ${.CURDIR}/tst/common/buffering/tst.resize1.d \ + ${.CURDIR}/tst/common/buffering/tst.resize2.d \ + ${.CURDIR}/tst/common/buffering/tst.resize3.d \ + ${.CURDIR}/tst/common/buffering/tst.ring1.d \ + ${.CURDIR}/tst/common/buffering/tst.ring2.d \ + ${.CURDIR}/tst/common/buffering/tst.smallring.d \ + ${.CURDIR}/tst/common/buffering/tst.switch1.d + TESTBUILTINVAR= \ ${.CURDIR}/tst/common/builtinvar/tst.arg0.d \ ${.CURDIR}/tst/common/builtinvar/tst.arg0clause.d \ @@ -1047,24 +1063,9 @@ # -------------------------------------------------------------------------------- # Tests that either cause a system lock or a panic: -TESTBUFFERING= \ - ${.CURDIR}/tst/common/buffering/err.end.d \ - ${.CURDIR}/tst/common/buffering/err.resize1.d \ - ${.CURDIR}/tst/common/buffering/err.resize2.d \ - ${.CURDIR}/tst/common/buffering/err.resize3.d \ - ${.CURDIR}/tst/common/buffering/err.zerobuf.d \ +KABOOM= \ ${.CURDIR}/tst/common/buffering/tst.alignring.d \ ${.CURDIR}/tst/common/buffering/tst.cputime.ksh \ - ${.CURDIR}/tst/common/buffering/tst.dynvarsize.d \ - ${.CURDIR}/tst/common/buffering/tst.fill1.d \ - ${.CURDIR}/tst/common/buffering/tst.resize1.d \ - ${.CURDIR}/tst/common/buffering/tst.resize2.d \ - ${.CURDIR}/tst/common/buffering/tst.resize3.d \ - ${.CURDIR}/tst/common/buffering/tst.ring1.d \ - ${.CURDIR}/tst/common/buffering/tst.ring2.d \ - ${.CURDIR}/tst/common/buffering/tst.ring3.d \ - ${.CURDIR}/tst/common/buffering/tst.smallring.d \ - ${.CURDIR}/tst/common/buffering/tst.switch1.d # -------------------------------------------------------------------------------- # The normal test targets: @@ -1076,6 +1077,7 @@ ${TESTASSOCS} \ ${TESTBEGIN} \ ${TESTBITFIELDS} \ + ${TESTBUFFERING} \ ${TESTBUILTINVAR} \ ${TESTCLAUSES} \ ${TESTDECLS} \ @@ -1292,6 +1294,7 @@ REQUIRES_CURTHREAD= \ ${.CURDIR}/tst/common/assocs/tst.orthogonality.d \ + ${.CURDIR}/tst/common/buffering/tst.ring3.d \ ${.CURDIR}/tst/common/scalars/tst.selfarray2.d \ ${.CURDIR}/tst/common/types/tst.complex.d @@ -1328,6 +1331,9 @@ REQUIRES_ROOTFS= \ ${.CURDIR}/tst/common/printf/tst.str.d +REQUIRES_SCHED= \ + ${.CURDIR}/tst/common/buffering/tst.cputime.ksh + REQUIRES_TCP_T= \ ${.CURDIR}/tst/common/offsetof/err.D_OFFSETOF_BITFIELD.bitfield.d ==== //depot/projects/dtrace/src/sys/cddl/dev/dtrace/dtrace_buffer.c#6 (text+ko) ==== @@ -69,9 +69,9 @@ dtrace_buffer_alloc(dtrace_buffer_t *bufs, size_t size, int flags, processorid_t cpu) { -#if defined(sun) cpu_t *cp; dtrace_buffer_t *buf; +#if defined(sun) ASSERT(MUTEX_HELD(&cpu_lock)); ASSERT(MUTEX_HELD(&dtrace_lock)); @@ -144,16 +144,18 @@ return (ENOMEM); #else - dtrace_buffer_t *buf; int i; ASSERT(MUTEX_HELD(&dtrace_lock)); for (i = 0; i <= mp_maxid; i++) { - buf = &bufs[i]; + if ((cp = pcpu_find(i)) == NULL) + continue; - if (CPU_ABSENT(i)) + if (cpu != DTRACE_CPUALL && cpu != i) continue; + buf = &bufs[i]; + /* * If there is already a buffer allocated for this CPU, it * is only possible that this is a DR event. In this case, @@ -166,27 +168,55 @@ ASSERT(buf->dtb_xamot == NULL); - /* - * XXX Hack. - * This should be KM_NOSLEEP with error handling if low on - * memory. - */ - buf->dtb_tomax = kmem_zalloc(size, KM_SLEEP); + if ((buf->dtb_tomax = kmem_zalloc(size, KM_NOSLEEP)) == NULL) + goto err; buf->dtb_size = size; buf->dtb_flags = flags; buf->dtb_offset = 0; buf->dtb_drops = 0; - /* - * XXX Hack. - * This should be KM_NOSLEEP with error handling if low on - * memory. - */ - buf->dtb_xamot = kmem_zalloc(size, KM_SLEEP); + if (flags & DTRACEBUF_NOSWITCH) + continue; + + if ((buf->dtb_xamot = kmem_zalloc(size, KM_NOSLEEP)) == NULL) + goto err; } return (0); + +err: + /* + * Error allocating memory, so free the buffers that were + * allocated before the failed allocation. + */ + for (i = 0; i <= mp_maxid; i++) { + if ((cp = pcpu_find(i)) == NULL) + continue; + + if (cpu != DTRACE_CPUALL && cpu != i) + continue; + + buf = &bufs[i]; + + if (buf->dtb_xamot != NULL) { + ASSERT(buf->dtb_tomax != NULL); + ASSERT(buf->dtb_size == size); + kmem_free(buf->dtb_xamot, size); + } + + if (buf->dtb_tomax != NULL) { + ASSERT(buf->dtb_size == size); + kmem_free(buf->dtb_tomax, size); + } + + buf->dtb_tomax = NULL; + buf->dtb_xamot = NULL; + buf->dtb_size = 0; + + } + + return (ENOMEM); #endif } @@ -494,6 +524,11 @@ int i; for (i = 0; i < NCPU; i++) { +#if !defined(sun) + if (pcpu_find(i) == NULL) + continue; +#endif + dtrace_buffer_t *buf = &bufs[i]; if (buf->dtb_tomax == NULL) { ==== //depot/projects/dtrace/src/sys/cddl/dev/dtrace/dtrace_dynvar.c#4 (text+ko) ==== @@ -13,6 +13,10 @@ int i, work = 0; for (i = 0; i < NCPU; i++) { +#if !defined(sun) + if (CPU_ABSENT(i)) + continue; +#endif dcpu = &dstate->dtds_percpu[i]; ASSERT(dcpu->dtdsc_rinsing == NULL); @@ -63,6 +67,10 @@ dtrace_sync(); for (i = 0; i < NCPU; i++) { +#if !defined(sun) + if (CPU_ABSENT(i)) + continue; +#endif dcpu = &dstate->dtds_percpu[i]; if (dcpu->dtdsc_rinsing == NULL) ==== //depot/projects/dtrace/src/sys/cddl/dev/dtrace/dtrace_state.c#8 (text+ko) ==== @@ -63,6 +63,10 @@ maxper = (maxper / dstate->dtds_chunksize) * dstate->dtds_chunksize; for (i = 0; i < NCPU; i++) { +#if !defined(sun) + if (CPU_ABSENT(i)) + continue; +#endif dstate->dtds_percpu[i].dtdsc_free = dvar = start; /* @@ -408,7 +412,7 @@ dtrace_state_buffer(dtrace_state_t *state, dtrace_buffer_t *buf, int which) { dtrace_optval_t *opt = state->dts_options, size; - processorid_t cpu; + processorid_t cpu = 0; int flags = 0, rval; ASSERT(MUTEX_HELD(&dtrace_lock)); From owner-p4-projects@FreeBSD.ORG Sat May 13 02:23:14 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 072B616A404; Sat, 13 May 2006 02:23:14 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 9012A16A401 for ; Sat, 13 May 2006 02:23:13 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 5477943D46 for ; Sat, 13 May 2006 02:23:13 +0000 (GMT) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k4D2NCVD025838 for ; Sat, 13 May 2006 02:23:12 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k4D2NC1G025835 for perforce@freebsd.org; Sat, 13 May 2006 02:23:12 GMT (envelope-from jb@freebsd.org) Date: Sat, 13 May 2006 02:23:12 GMT Message-Id: <200605130223.k4D2NC1G025835@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 97049 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 13 May 2006 02:23:14 -0000 http://perforce.freebsd.org/chv.cgi?CH=97049 Change 97049 by jb@jb_freebsd2 on 2006/05/13 02:22:11 This update seems to have fallen on lost (p4) ears. Huh? Affected files ... .. //depot/projects/dtrace/src/cddl/test/dtrace/Makefile#4 edit Differences ... ==== //depot/projects/dtrace/src/cddl/test/dtrace/Makefile#4 (text+ko) ==== @@ -519,33 +519,8 @@ ${.CURDIR}/tst/common/providers/tst.twoprof.d TESTSAFETY= \ - ${.CURDIR}/tst/common/safety/tst.basename.d \ - ${.CURDIR}/tst/common/safety/tst.caller.d \ - ${.CURDIR}/tst/common/safety/tst.cleanpath.d \ ${.CURDIR}/tst/common/safety/tst.copyin.d \ - ${.CURDIR}/tst/common/safety/tst.ddi_pathname.d \ - ${.CURDIR}/tst/common/safety/tst.dirname.d \ - ${.CURDIR}/tst/common/safety/tst.index.d \ - ${.CURDIR}/tst/common/safety/tst.msgdsize.d \ - ${.CURDIR}/tst/common/safety/tst.msgsize.d \ - ${.CURDIR}/tst/common/safety/tst.null.d \ - ${.CURDIR}/tst/common/safety/tst.progenyof.d \ - ${.CURDIR}/tst/common/safety/tst.random.d \ - ${.CURDIR}/tst/common/safety/tst.rw.d \ - ${.CURDIR}/tst/common/safety/tst.shortstr.d \ - ${.CURDIR}/tst/common/safety/tst.stack.d \ - ${.CURDIR}/tst/common/safety/tst.stackdepth.d \ - ${.CURDIR}/tst/common/safety/tst.strchr.d \ - ${.CURDIR}/tst/common/safety/tst.strjoin.d \ - ${.CURDIR}/tst/common/safety/tst.strstr.d \ - ${.CURDIR}/tst/common/safety/tst.strtok.d \ - ${.CURDIR}/tst/common/safety/tst.substr.d \ - ${.CURDIR}/tst/common/safety/tst.unalign.d \ - ${.CURDIR}/tst/common/safety/tst.uregs.d \ - ${.CURDIR}/tst/common/safety/tst.ustack.d \ - ${.CURDIR}/tst/common/safety/tst.ustackdepth.d \ - ${.CURDIR}/tst/common/safety/tst.vahole.d \ - ${.CURDIR}/tst/common/safety/tst.violentdeath.ksh + ${.CURDIR}/tst/common/safety/tst.shortstr.d TESTSCALARS= \ ${.CURDIR}/tst/common/scalars/err.D_ARR_LOCAL.thisarray.d \ @@ -1102,6 +1077,7 @@ ${TESTPROBES} \ ${TESTPROFILE} \ ${TESTPROVIDERS} \ + ${TESTSAFETY} \ ${TESTSCALARS} \ ${TESTSIZEOF} \ ${TESTSPECULATION} \ @@ -1303,7 +1279,32 @@ ${.CURDIR}/tst/common/builtinvar/tst.errno1. REQUIRES_FBT= \ - ${.CURDIR}/tst/common/predicates/tst.argsnotcached.d + ${.CURDIR}/tst/common/predicates/tst.argsnotcached.d \ + ${.CURDIR}/tst/common/safety/tst.basename.d \ + ${.CURDIR}/tst/common/safety/tst.caller.d \ + ${.CURDIR}/tst/common/safety/tst.cleanpath.d \ + ${.CURDIR}/tst/common/safety/tst.ddi_pathname.d \ + ${.CURDIR}/tst/common/safety/tst.dirname.d \ + ${.CURDIR}/tst/common/safety/tst.index.d \ + ${.CURDIR}/tst/common/safety/tst.msgdsize.d \ + ${.CURDIR}/tst/common/safety/tst.msgsize.d \ + ${.CURDIR}/tst/common/safety/tst.null.d \ + ${.CURDIR}/tst/common/safety/tst.progenyof.d \ + ${.CURDIR}/tst/common/safety/tst.random.d \ + ${.CURDIR}/tst/common/safety/tst.rw.d \ + ${.CURDIR}/tst/common/safety/tst.stack.d \ + ${.CURDIR}/tst/common/safety/tst.stackdepth.d \ + ${.CURDIR}/tst/common/safety/tst.strchr.d \ + ${.CURDIR}/tst/common/safety/tst.strjoin.d \ + ${.CURDIR}/tst/common/safety/tst.strstr.d \ + ${.CURDIR}/tst/common/safety/tst.strtok.d \ + ${.CURDIR}/tst/common/safety/tst.substr.d \ + ${.CURDIR}/tst/common/safety/tst.unalign.d \ + ${.CURDIR}/tst/common/safety/tst.uregs.d \ + ${.CURDIR}/tst/common/safety/tst.ustack.d \ + ${.CURDIR}/tst/common/safety/tst.ustackdepth.d \ + ${.CURDIR}/tst/common/safety/tst.vahole.d \ + ${.CURDIR}/tst/common/safety/tst.violentdeath.ksh REQUIRES_KMEM_FLAGS= \ ${.CURDIR}/tst/common/assocs/err.D_OP_INCOMPAT.dupgtype.d \ From owner-p4-projects@FreeBSD.ORG Sat May 13 03:31:47 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D27CF16A404; Sat, 13 May 2006 03:31:47 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 06D1F16A40F for ; Sat, 13 May 2006 03:31:47 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id C5DCD43D48 for ; Sat, 13 May 2006 03:31:46 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k4D3Vjdl033327 for ; Sat, 13 May 2006 03:31:45 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k4D3VjXL033324 for perforce@freebsd.org; Sat, 13 May 2006 03:31:45 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sat, 13 May 2006 03:31:45 GMT Message-Id: <200605130331.k4D3VjXL033324@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 97056 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 13 May 2006 03:31:50 -0000 http://perforce.freebsd.org/chv.cgi?CH=97056 Change 97056 by rwatson@rwatson_sesame on 2006/05/13 03:30:56 White space. Or maybe whitespace. Affected files ... .. //depot/projects/trustedbsd/audit3/sys/security/audit/audit_pipe.c#21 edit Differences ... ==== //depot/projects/trustedbsd/audit3/sys/security/audit/audit_pipe.c#21 (text+ko) ==== @@ -119,7 +119,6 @@ u_int64_t ap_drops; /* Records dropped. */ u_int64_t ap_truncates; /* Records too long. */ - /* * Fields relating to pipe interest: global masks for unmatched * processes (attributable, non-attributable), and a list of specific From owner-p4-projects@FreeBSD.ORG Sat May 13 03:55:19 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C460216A404; Sat, 13 May 2006 03:55:19 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 870BF16A401 for ; Sat, 13 May 2006 03:55:19 +0000 (UTC) (envelope-from soc-andrew@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 37D0B43D45 for ; Sat, 13 May 2006 03:55:19 +0000 (GMT) (envelope-from soc-andrew@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k4D3tINw034253 for ; Sat, 13 May 2006 03:55:18 GMT (envelope-from soc-andrew@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k4D3tHlP034250 for perforce@freebsd.org; Sat, 13 May 2006 03:55:17 GMT (envelope-from soc-andrew@freebsd.org) Date: Sat, 13 May 2006 03:55:17 GMT Message-Id: <200605130355.k4D3tHlP034250@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to soc-andrew@freebsd.org using -f From: soc-andrew To: Perforce Change Reviews Cc: Subject: PERFORCE change 97060 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 13 May 2006 03:55:19 -0000 http://perforce.freebsd.org/chv.cgi?CH=97060 Change 97060 by soc-andrew@soc-andrew_serv on 2006/05/13 03:54:48 Remove the compat dists as they are not on the CD's Affected files ... .. //depot/projects/soc2005/bsdinstaller/src/libexec/bsdinstaller/conf/FreeBSD.lua#5 edit Differences ... ==== //depot/projects/soc2005/bsdinstaller/src/libexec/bsdinstaller/conf/FreeBSD.lua#5 (text+ko) ==== @@ -21,12 +21,6 @@ { src = "proflibs", dest = "/", install = "Y" }, { src = "dict", dest = "/", install = "Y" }, { src = "info", dest = "/", install = "Y" }, - { src = "compat1x", dest = "/", install = "Y" }, - { src = "compat20", dest = "/", install = "Y" }, - { src = "compat21", dest = "/", install = "Y" }, - { src = "compat22", dest = "/", install = "Y" }, - { src = "compat3x", dest = "/", install = "Y" }, - { src = "compat4x", dest = "/", install = "Y" }, { src = "source", dest = "/usr/src", install = "Y" } } From owner-p4-projects@FreeBSD.ORG Sat May 13 04:28:56 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4CB9316A41B; Sat, 13 May 2006 04:28:56 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 29F4116A419 for ; Sat, 13 May 2006 04:28:56 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id E521E43D45 for ; Sat, 13 May 2006 04:28:55 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k4D4SsLC044269 for ; Sat, 13 May 2006 04:28:54 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k4D4SsOY044266 for perforce@freebsd.org; Sat, 13 May 2006 04:28:54 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sat, 13 May 2006 04:28:54 GMT Message-Id: <200605130428.k4D4SsOY044266@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 97068 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 13 May 2006 04:28:56 -0000 http://perforce.freebsd.org/chv.cgi?CH=97068 Change 97068 by rwatson@rwatson_fledge on 2006/05/13 04:27:53 Remove use of Giant around vn_open() in audit code. Submitted by: jhb Affected files ... .. //depot/projects/trustedbsd/audit3/sys/security/audit/audit_syscalls.c#14 edit Differences ... ==== //depot/projects/trustedbsd/audit3/sys/security/audit/audit_syscalls.c#14 (text+ko) ==== @@ -525,7 +525,7 @@ struct ucred *cred; struct vnode *vp; int error = 0; - int flags; + int flags, vfslocked; error = suser(td); if (error) @@ -544,25 +544,21 @@ if (uap->path == NULL) return (EINVAL); - /* - * XXXAUDIT: Giant may no longer be required here. - */ - mtx_lock(&Giant); - NDINIT(&nd, LOOKUP, FOLLOW | LOCKLEAF, UIO_USERSPACE, uap->path, td); + NDINIT(&nd, LOOKUP, FOLLOW | LOCKLEAF | MPSAFE, UIO_USERSPACE, + uap->path, td); flags = AUDIT_OPEN_FLAGS; error = vn_open(&nd, &flags, 0, -1); - if (error) { - mtx_unlock(&Giant); - goto err_out; - } + if (error) + return (error); + vfslocked = NDHASGIANT(&nd); VOP_UNLOCK(nd.ni_vp, 0, td); vp = nd.ni_vp; if (vp->v_type != VREG) { vn_close(vp, AUDIT_CLOSE_FLAGS, td->td_ucred, td); - mtx_unlock(&Giant); - error = EINVAL; - goto err_out; + VFS_UNLOCK_GIANT(vfslocked); + return (EINVAL); } + VFS_UNLOCK_GIANT(vfslocked); cred = td->td_ucred; crhold(cred); @@ -572,10 +568,8 @@ */ audit_suspended = 0; - mtx_unlock(&Giant); audit_rotate_vnode(cred, vp); -err_out: return (error); } From owner-p4-projects@FreeBSD.ORG Sat May 13 21:00:11 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 47B8716A40D; Sat, 13 May 2006 21:00:11 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 0749916A400 for ; Sat, 13 May 2006 21:00:10 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 8525D43D45 for ; Sat, 13 May 2006 21:00:10 +0000 (GMT) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k4DL06W7055675 for ; Sat, 13 May 2006 21:00:06 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k4DL060e055672 for perforce@freebsd.org; Sat, 13 May 2006 21:00:06 GMT (envelope-from jb@freebsd.org) Date: Sat, 13 May 2006 21:00:06 GMT Message-Id: <200605132100.k4DL060e055672@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 97104 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 13 May 2006 21:00:11 -0000 http://perforce.freebsd.org/chv.cgi?CH=97104 Change 97104 by jb@jb_freebsd2 on 2006/05/13 20:59:53 Restore a case that got lost by mistake. Affected files ... .. //depot/projects/dtrace/src/sys/cddl/dev/dtrace/dtrace_dif.c#7 edit Differences ... ==== //depot/projects/dtrace/src/sys/cddl/dev/dtrace/dtrace_dif.c#7 (text+ko) ==== @@ -213,6 +213,7 @@ return ((uint64_t)(uintptr_t) mstate->dtms_probe->dtpr_mod); + case DIF_VAR_PROBEFUNC: ASSERT(mstate->dtms_present & DTRACE_MSTATE_PROBE); return ((uint64_t)(uintptr_t) mstate->dtms_probe->dtpr_func);