Date: Thu, 25 Sep 2003 22:25:59 -0700 (PDT) From: Marcel Moolenaar <marcel@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 38622 for review Message-ID: <200309260525.h8Q5Pxxa073822@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=38622 Change 38622 by marcel@marcel_nfs on 2003/09/25 22:25:43 IFC @38620 Affected files ... .. //depot/projects/uart/amd64/amd64/pmap.c#17 integrate .. //depot/projects/uart/cam/scsi/scsi_targ_bh.c#2 integrate .. //depot/projects/uart/conf/NOTES#15 integrate .. //depot/projects/uart/dev/acpica/acpi.c#12 integrate .. //depot/projects/uart/dev/aic7xxx/aic79xx_pci.c#3 integrate .. //depot/projects/uart/dev/aic7xxx/aic7xxx_pci.c#4 integrate .. //depot/projects/uart/dev/firewire/fwphyreg.h#1 branch .. //depot/projects/uart/dev/puc/puc.c#11 integrate .. //depot/projects/uart/dev/puc/pucvar.h#9 integrate .. //depot/projects/uart/dev/uart/uart.h#8 integrate .. //depot/projects/uart/dev/uart/uart_bus.h#31 integrate .. //depot/projects/uart/dev/uart/uart_bus_acpi.c#5 integrate .. //depot/projects/uart/dev/uart/uart_bus_ebus.c#7 integrate .. //depot/projects/uart/dev/uart/uart_bus_isa.c#5 integrate .. //depot/projects/uart/dev/uart/uart_bus_pccard.c#4 integrate .. //depot/projects/uart/dev/uart/uart_bus_pci.c#7 integrate .. //depot/projects/uart/dev/uart/uart_bus_puc.c#10 integrate .. //depot/projects/uart/dev/uart/uart_core.c#34 integrate .. //depot/projects/uart/dev/uart/uart_cpu_alpha.c#8 integrate .. //depot/projects/uart/dev/uart/uart_cpu_amd64.c#6 integrate .. //depot/projects/uart/dev/uart/uart_cpu_i386.c#7 integrate .. //depot/projects/uart/dev/uart/uart_cpu_ia64.c#8 integrate .. //depot/projects/uart/dev/uart/uart_cpu_pc98.c#7 integrate .. //depot/projects/uart/dev/uart/uart_cpu_sparc64.c#17 integrate .. //depot/projects/uart/dev/uart/uart_dev_sab82532.c#31 integrate .. //depot/projects/uart/dev/uart/uart_dev_z8530.c#17 integrate .. //depot/projects/uart/netinet/icmp6.h#2 integrate .. //depot/projects/uart/netinet/ip6.h#2 integrate .. //depot/projects/uart/netkey/key.c#2 integrate .. //depot/projects/uart/netkey/key_debug.c#2 integrate .. //depot/projects/uart/netkey/key_debug.h#2 integrate .. //depot/projects/uart/netkey/keysock.c#2 integrate Differences ... ==== //depot/projects/uart/amd64/amd64/pmap.c#17 (text+ko) ==== @@ -73,7 +73,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.437 2003/09/13 21:57:38 alc Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.439 2003/09/26 04:12:41 alc Exp $"); /* * Manages physical address maps. @@ -1012,6 +1012,7 @@ register struct pmap *pmap; { vm_page_t pml4pg; + static vm_pindex_t color; /* * allocate object for the ptes @@ -1022,14 +1023,13 @@ /* * allocate the page directory page */ - VM_OBJECT_LOCK(pmap->pm_pteobj); - pml4pg = vm_page_grab(pmap->pm_pteobj, NUPDE + NUPDPE + NUPML4E, - VM_ALLOC_NORMAL | VM_ALLOC_RETRY | VM_ALLOC_WIRED | VM_ALLOC_ZERO); + while ((pml4pg = vm_page_alloc(NULL, color++, VM_ALLOC_NOOBJ | + VM_ALLOC_NORMAL | VM_ALLOC_WIRED | VM_ALLOC_ZERO)) == NULL) + VM_WAIT; vm_page_lock_queues(); vm_page_flag_clear(pml4pg, PG_BUSY); pml4pg->valid = VM_PAGE_BITS_ALL; vm_page_unlock_queues(); - VM_OBJECT_UNLOCK(pmap->pm_pteobj); pmap->pm_pml4 = (pml4_entry_t *)PHYS_TO_DMAP(VM_PAGE_TO_PHYS(pml4pg)); @@ -1241,14 +1241,8 @@ void pmap_release(pmap_t pmap) { - vm_object_t object; vm_page_t m; - object = pmap->pm_pteobj; - - KASSERT(object->ref_count == 1, - ("pmap_release: pteobj reference count %d != 1", - object->ref_count)); KASSERT(pmap->pm_stats.resident_count == 0, ("pmap_release: pmap resident count %ld != 0", pmap->pm_stats.resident_count)); @@ -1258,15 +1252,14 @@ mtx_unlock_spin(&allpmaps_lock); vm_page_lock_queues(); - while ((m = TAILQ_FIRST(&object->memq)) != NULL) { - m->wire_count--; - atomic_subtract_int(&cnt.v_wire_count, 1); - vm_page_busy(m); - vm_page_free(m); - } - KASSERT(TAILQ_EMPTY(&object->memq), + m = PHYS_TO_VM_PAGE(pmap->pm_pml4[PML4PML4I]); + m->wire_count--; + atomic_subtract_int(&cnt.v_wire_count, 1); + vm_page_busy(m); + vm_page_free(m); + vm_page_unlock_queues(); + KASSERT(TAILQ_EMPTY(&pmap->pm_pteobj->memq), ("pmap_release: leaking page table pages")); - vm_page_unlock_queues(); } static int ==== //depot/projects/uart/cam/scsi/scsi_targ_bh.c#2 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_targ_bh.c,v 1.18 2003/06/10 18:14:05 obrien Exp $"); +__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_targ_bh.c,v 1.19 2003/09/25 05:02:19 simokawa Exp $"); #include <sys/param.h> #include <sys/queue.h> @@ -167,7 +167,7 @@ xpt_setup_ccb(&csa.ccb_h, path, /*priority*/5); csa.ccb_h.func_code = XPT_SASYNC_CB; - csa.event_enable = AC_PATH_REGISTERED; + csa.event_enable = AC_PATH_REGISTERED | AC_PATH_DEREGISTERED; csa.callback = targbhasync; csa.callback_arg = NULL; xpt_action((union ccb *)&csa); @@ -185,15 +185,26 @@ targbhasync(void *callback_arg, u_int32_t code, struct cam_path *path, void *arg) { - struct cam_periph *periph; + struct cam_path *new_path; + cam_status status; + + /* + * Allocate a peripheral instance for + * this target instance. + */ + status = xpt_create_path(&new_path, NULL, + xpt_path_path_id(path), + CAM_TARGET_WILDCARD, CAM_LUN_WILDCARD); + if (status != CAM_REQ_CMP) { + printf("targbhasync: Unable to create path " + "due to status 0x%x\n", status); + return; + } - periph = (struct cam_periph *)callback_arg; switch (code) { case AC_PATH_REGISTERED: { struct ccb_pathinq *cpi; - struct cam_path *new_path; - cam_status status; cpi = (struct ccb_pathinq *)arg; @@ -201,35 +212,23 @@ if ((cpi->target_sprt & PIT_PROCESSOR) == 0) break; - /* - * Allocate a peripheral instance for - * this target instance. - */ - status = xpt_create_path(&new_path, NULL, - xpt_path_path_id(path), - CAM_TARGET_WILDCARD, CAM_LUN_WILDCARD); - if (status != CAM_REQ_CMP) { - printf("targbhasync: Unable to create path " - "due to status 0x%x\n", status); - break; - } status = cam_periph_alloc(targbhctor, NULL, targbhdtor, targbhstart, "targbh", CAM_PERIPH_BIO, new_path, targbhasync, AC_PATH_REGISTERED, cpi); - xpt_free_path(new_path); break; } case AC_PATH_DEREGISTERED: { - targbhdislun(periph); + cam_periph_invalidate(cam_periph_find(new_path, "targbh")); break; } default: break; } + xpt_free_path(new_path); } /* Attempt to enable our lun */ @@ -439,6 +438,8 @@ case 1: /* FALLTHROUGH */ default: + /* XXX Wait for callback of targbhdislun() */ + tsleep(softc, PRIBIO, "targbh", hz/2); free(softc, M_DEVBUF); break; } ==== //depot/projects/uart/conf/NOTES#15 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/NOTES,v 1.1176 2003/09/19 19:04:30 jhb Exp $ +# $FreeBSD: src/sys/conf/NOTES,v 1.1177 2003/09/25 16:06:17 sam Exp $ # # NOTES -- Lines that can be cut/pasted into kernel and hints configs. # @@ -569,7 +569,7 @@ # # PFIL_HOOKS enables an abtraction layer which is meant to be used in # network code where filtering is required. See the pfil(9) man page. -# This option is a subset of the IPFILTER option. +# This option is required by the IPFILTER option. # # TCPDEBUG enables code which keeps traces of the TCP state machine # for sockets with the SO_DEBUG option set, which can then be examined @@ -591,7 +591,7 @@ options IPFILTER_LOG #ipfilter logging options IPFILTER_DEFAULT_BLOCK #block all packets by default options IPSTEALTH #support for stealth forwarding -options PFIL_HOOKS +options PFIL_HOOKS #required by IPFILTER options TCPDEBUG # The MBUF_STRESS_TEST option enables options which create ==== //depot/projects/uart/dev/acpica/acpi.c#12 (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/dev/acpica/acpi.c,v 1.102 2003/09/18 05:12:45 njl Exp $ + * $FreeBSD: src/sys/dev/acpica/acpi.c,v 1.103 2003/09/26 04:32:40 njl Exp $ */ #include "opt_acpi.h" @@ -2081,6 +2081,7 @@ {"ACPI_CA_DEBUGGER", ACPI_CA_DEBUGGER}, {"ACPI_OS_SERVICES", ACPI_OS_SERVICES}, {"ACPI_CA_DISASSEMBLER", ACPI_CA_DISASSEMBLER}, + {"ACPI_ALL_COMPONENTS", ACPI_ALL_COMPONENTS}, {"ACPI_BUS", ACPI_BUS}, {"ACPI_SYSTEM", ACPI_SYSTEM}, @@ -2092,9 +2093,7 @@ {"ACPI_PROCESSOR", ACPI_PROCESSOR}, {"ACPI_THERMAL", ACPI_THERMAL}, {"ACPI_FAN", ACPI_FAN}, - {"ACPI_ALL_DRIVERS", ACPI_ALL_DRIVERS}, - {"ACPI_ALL_COMPONENTS", ACPI_ALL_COMPONENTS}, {NULL, 0} }; @@ -2107,6 +2106,7 @@ {"ACPI_LV_ALL_EXCEPTIONS", ACPI_LV_ALL_EXCEPTIONS}, /* Trace verbosity level 1 [Standard Trace Level] */ + {"ACPI_LV_INIT_NAMES", ACPI_LV_INIT_NAMES}, {"ACPI_LV_PARSE", ACPI_LV_PARSE}, {"ACPI_LV_LOAD", ACPI_LV_LOAD}, {"ACPI_LV_DISPATCH", ACPI_LV_DISPATCH}, @@ -2120,7 +2120,6 @@ {"ACPI_LV_RESOURCES", ACPI_LV_RESOURCES}, {"ACPI_LV_USER_REQUESTS", ACPI_LV_USER_REQUESTS}, {"ACPI_LV_PACKAGE", ACPI_LV_PACKAGE}, - {"ACPI_LV_INIT_NAMES", ACPI_LV_INIT_NAMES}, {"ACPI_LV_VERBOSITY1", ACPI_LV_VERBOSITY1}, /* Trace verbosity level 2 [Function tracing and memory allocation] */ ==== //depot/projects/uart/dev/aic7xxx/aic79xx_pci.c#3 (text+ko) ==== @@ -38,11 +38,11 @@ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGES. * - * $Id: //depot/aic7xxx/aic7xxx/aic79xx_pci.c#76 $ + * $Id: //depot/aic7xxx/aic7xxx/aic79xx_pci.c#80 $ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/dev/aic7xxx/aic79xx_pci.c,v 1.15 2003/08/24 17:48:03 obrien Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/aic7xxx/aic79xx_pci.c,v 1.16 2003/09/25 23:36:41 scottl Exp $"); #ifdef __linux__ #include "aic79xx_osm.h" @@ -453,8 +453,10 @@ * or read prefetching could be initiated by the * CPU or host bridge. Our device does not support * either, so look for data corruption and/or flaged - * PCI errors. + * PCI errors. First pause without causing another + * chip reset. */ + hcntrl &= ~CHIPRST; ahd_outb(ahd, HCNTRL, hcntrl|PAUSE); while (ahd_is_paused(ahd) == 0) ; ==== //depot/projects/uart/dev/aic7xxx/aic7xxx_pci.c#4 (text+ko) ==== @@ -39,11 +39,11 @@ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGES. * - * $Id: //depot/aic7xxx/aic7xxx/aic7xxx_pci.c#69 $ + * $Id: //depot/aic7xxx/aic7xxx/aic7xxx_pci.c#72 $ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/dev/aic7xxx/aic7xxx_pci.c,v 1.30 2003/09/02 17:30:34 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/aic7xxx/aic7xxx_pci.c,v 1.31 2003/09/25 23:36:41 scottl Exp $"); #ifdef __linux__ #include "aic7xxx_osm.h" @@ -1285,8 +1285,10 @@ * or read prefetching could be initiated by the * CPU or host bridge. Our device does not support * either, so look for data corruption and/or flagged - * PCI errors. + * PCI errors. First pause without causing another + * chip reset. */ + hcntrl &= ~CHIPRST; ahc_outb(ahc, HCNTRL, hcntrl|PAUSE); while (ahc_is_paused(ahc) == 0) ; ==== //depot/projects/uart/dev/puc/puc.c#11 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/dev/puc/puc.c,v 1.26 2003/09/06 21:48:49 marcel Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/puc/puc.c,v 1.27 2003/09/26 04:44:55 marcel Exp $"); /* * Copyright (c) 1996, 1998, 1999 @@ -61,7 +61,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/dev/puc/puc.c,v 1.26 2003/09/06 21:48:49 marcel Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/puc/puc.c,v 1.27 2003/09/26 04:44:55 marcel Exp $"); /* * PCI "universal" communication card device driver, glues com, lpt, ==== //depot/projects/uart/dev/puc/pucvar.h#9 (text+ko) ==== @@ -1,5 +1,5 @@ /* $NetBSD: pucvar.h,v 1.2 1999/02/06 06:29:54 cgd Exp $ */ -/* $FreeBSD: src/sys/dev/puc/pucvar.h,v 1.11 2003/09/06 21:48:50 marcel Exp $ */ +/* $FreeBSD: src/sys/dev/puc/pucvar.h,v 1.12 2003/09/26 04:44:55 marcel Exp $ */ /*- * Copyright (c) 2002 JF Hay. All rights reserved. @@ -115,9 +115,9 @@ enum puc_device_ivars { PUC_IVAR_FREQ, - PUC_IVAR_PORT, + PUC_IVAR_SUBTYPE, PUC_IVAR_REGSHFT, - PUC_IVAR_SUBTYPE + PUC_IVAR_PORT }; #ifdef PUC_ENTRAILS ==== //depot/projects/uart/dev/uart/uart.h#8 (text+ko) ==== @@ -23,7 +23,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/uart/uart.h,v 1.2 2003/09/23 09:25:38 nyan Exp $ + * $FreeBSD: src/sys/dev/uart/uart.h,v 1.3 2003/09/26 05:14:56 marcel Exp $ */ #ifndef _DEV_UART_H_ ==== //depot/projects/uart/dev/uart/uart_bus.h#31 (text+ko) ==== @@ -23,7 +23,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/uart/uart_bus.h,v 1.3 2003/09/17 01:41:21 marcel Exp $ + * $FreeBSD: src/sys/dev/uart/uart_bus.h,v 1.4 2003/09/26 05:14:56 marcel Exp $ */ #ifndef _DEV_UART_BUS_H_ ==== //depot/projects/uart/dev/uart/uart_bus_acpi.c#5 (text+ko) ==== @@ -23,7 +23,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/dev/uart/uart_bus_acpi.c,v 1.1 2003/09/06 23:13:47 marcel Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/uart/uart_bus_acpi.c,v 1.2 2003/09/26 05:14:56 marcel Exp $"); #include <sys/param.h> #include <sys/systm.h> ==== //depot/projects/uart/dev/uart/uart_bus_ebus.c#7 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/dev/uart/uart_bus_ebus.c,v 1.1 2003/09/06 23:13:47 marcel Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/uart/uart_bus_ebus.c,v 1.2 2003/09/26 05:14:56 marcel Exp $"); #include <sys/param.h> #include <sys/systm.h> ==== //depot/projects/uart/dev/uart/uart_bus_isa.c#5 (text+ko) ==== @@ -23,7 +23,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/dev/uart/uart_bus_isa.c,v 1.1 2003/09/06 23:13:47 marcel Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/uart/uart_bus_isa.c,v 1.2 2003/09/26 05:14:56 marcel Exp $"); #include <sys/param.h> #include <sys/systm.h> ==== //depot/projects/uart/dev/uart/uart_bus_pccard.c#4 (text+ko) ==== @@ -24,7 +24,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/dev/uart/uart_bus_pccard.c,v 1.4 2003/09/23 09:20:03 nyan Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/uart/uart_bus_pccard.c,v 1.5 2003/09/26 05:14:56 marcel Exp $"); #include <sys/param.h> #include <sys/systm.h> ==== //depot/projects/uart/dev/uart/uart_bus_pci.c#7 (text+ko) ==== @@ -23,7 +23,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/dev/uart/uart_bus_pci.c,v 1.1 2003/09/06 23:13:47 marcel Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/uart/uart_bus_pci.c,v 1.2 2003/09/26 05:14:56 marcel Exp $"); #include <sys/param.h> #include <sys/systm.h> ==== //depot/projects/uart/dev/uart/uart_bus_puc.c#10 (text+ko) ==== @@ -24,7 +24,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/dev/uart/uart_bus_puc.c,v 1.1 2003/09/06 23:13:47 marcel Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/uart/uart_bus_puc.c,v 1.2 2003/09/26 05:14:56 marcel Exp $"); #include <sys/param.h> #include <sys/systm.h> ==== //depot/projects/uart/dev/uart/uart_core.c#34 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/dev/uart/uart_core.c,v 1.6 2003/09/23 09:55:21 nyan Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/uart/uart_core.c,v 1.7 2003/09/26 05:14:56 marcel Exp $"); #ifndef KLD_MODULE #include "opt_comconsole.h" ==== //depot/projects/uart/dev/uart/uart_cpu_alpha.c#8 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/dev/uart/uart_cpu_alpha.c,v 1.5 2003/09/23 13:03:22 nyan Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/uart/uart_cpu_alpha.c,v 1.6 2003/09/26 05:14:56 marcel Exp $"); #include <sys/param.h> #include <sys/systm.h> ==== //depot/projects/uart/dev/uart/uart_cpu_amd64.c#6 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/dev/uart/uart_cpu_amd64.c,v 1.5 2003/09/23 13:03:22 nyan Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/uart/uart_cpu_amd64.c,v 1.6 2003/09/26 05:14:56 marcel Exp $"); #include <sys/param.h> #include <sys/systm.h> ==== //depot/projects/uart/dev/uart/uart_cpu_i386.c#7 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/dev/uart/uart_cpu_i386.c,v 1.5 2003/09/23 13:03:22 nyan Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/uart/uart_cpu_i386.c,v 1.6 2003/09/26 05:14:56 marcel Exp $"); #include <sys/param.h> #include <sys/systm.h> ==== //depot/projects/uart/dev/uart/uart_cpu_ia64.c#8 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/dev/uart/uart_cpu_ia64.c,v 1.5 2003/09/23 13:03:22 nyan Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/uart/uart_cpu_ia64.c,v 1.6 2003/09/26 05:14:56 marcel Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -76,7 +76,7 @@ continue; addr = ent->address.addr_high; - addr = (addr << 32) + ent->address.addr_low + addr = (addr << 32) + ent->address.addr_low; di->ops = uart_ns8250_ops; di->bas.chan = 0; di->bas.bst = (ent->address.addr_space == 0) ==== //depot/projects/uart/dev/uart/uart_cpu_pc98.c#7 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/dev/uart/uart_cpu_pc98.c,v 1.8 2003/09/23 13:03:22 nyan Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/uart/uart_cpu_pc98.c,v 1.9 2003/09/26 05:14:56 marcel Exp $"); #include <sys/param.h> #include <sys/systm.h> ==== //depot/projects/uart/dev/uart/uart_cpu_sparc64.c#17 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/dev/uart/uart_cpu_sparc64.c,v 1.4 2003/09/23 09:25:38 nyan Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/uart/uart_cpu_sparc64.c,v 1.5 2003/09/26 05:14:56 marcel Exp $"); #include <sys/param.h> #include <sys/systm.h> ==== //depot/projects/uart/dev/uart/uart_dev_sab82532.c#31 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/dev/uart/uart_dev_sab82532.c,v 1.4 2003/09/23 09:25:38 nyan Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/uart/uart_dev_sab82532.c,v 1.5 2003/09/26 05:14:56 marcel Exp $"); #include <sys/param.h> #include <sys/systm.h> ==== //depot/projects/uart/dev/uart/uart_dev_z8530.c#17 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/dev/uart/uart_dev_z8530.c,v 1.5 2003/09/23 09:25:38 nyan Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/uart/uart_dev_z8530.c,v 1.6 2003/09/26 05:14:56 marcel Exp $"); #include <sys/param.h> #include <sys/systm.h> ==== //depot/projects/uart/netinet/icmp6.h#2 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/netinet/icmp6.h,v 1.9 2002/09/23 06:25:08 alfred Exp $ */ +/* $FreeBSD: src/sys/netinet/icmp6.h,v 1.10 2003/09/25 13:40:06 ume Exp $ */ /* $KAME: icmp6.h,v 1.46 2001/04/27 15:09:48 itojun Exp $ */ /* @@ -515,7 +515,7 @@ p = (u_char *)filterp; \ for (i = 0; i < sizeof(struct icmp6_filter); i++) \ p[i] = 0xff; \ -} while (0) +} while (/*CONSTCOND*/ 0) #define ICMP6_FILTER_SETBLOCKALL(filterp) \ bzero(filterp, sizeof(struct icmp6_filter)) #else /* _KERNEL */ @@ -678,7 +678,7 @@ && icmp6_ifstat && icmp6_ifstat[(ifp)->if_index]) { \ icmp6_ifstat[(ifp)->if_index]->tag++; \ } \ -} while (0) +} while (/*CONSTCOND*/ 0) #define icmp6_ifoutstat_inc(ifp, type, code) \ do { \ @@ -731,7 +731,7 @@ icmp6_ifstat_inc(ifp, ifs6_out_redirect); \ break; \ } \ -} while (0) +} while (/*CONSTCOND*/ 0) extern int icmp6_rediraccept; /* accept/process redirects */ extern int icmp6_redirtimeout; /* cache time for redirect routes */ ==== //depot/projects/uart/netinet/ip6.h#2 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/netinet/ip6.h,v 1.6 2002/09/23 06:25:08 alfred Exp $ */ +/* $FreeBSD: src/sys/netinet/ip6.h,v 1.7 2003/09/25 13:40:06 ume Exp $ */ /* $KAME: ip6.h,v 1.18 2001/03/29 05:34:30 itojun Exp $ */ /* @@ -255,7 +255,7 @@ return ret; \ } \ } \ -} while (0) +} while (/*CONSTCOND*/ 0) /* * IP6_EXTHDR_GET ensures that intermediate protocol header (from "off" to @@ -284,7 +284,7 @@ (m) = NULL; \ } \ } \ -} while (0) +} while (/*CONSTCOND*/ 0) #define IP6_EXTHDR_GET0(val, typ, m, off, len) \ do { \ @@ -302,7 +302,7 @@ (m) = NULL; \ } \ } \ -} while (0) +} while (/*CONSTCOND*/ 0) #endif /*_KERNEL*/ #endif /* not _NETINET_IP6_H_ */ ==== //depot/projects/uart/netkey/key.c#2 (text+ko) ==== @@ -30,7 +30,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/netkey/key.c,v 1.48 2003/06/11 05:26:11 obrien Exp $"); +__FBSDID("$FreeBSD: src/sys/netkey/key.c,v 1.50 2003/09/25 13:40:06 ume Exp $"); /* * This code is referd to RFC 2367 @@ -284,7 +284,7 @@ curelm = LIST_NEXT(curelm, field);\ LIST_INSERT_AFTER(curelm, elm, field);\ }\ -} while (0) +} while (/*CONSTCOND*/ 0) #define KEY_CHKSASTATE(head, sav, name) \ do { \ @@ -293,7 +293,7 @@ (name), (head), (sav))); \ continue; \ } \ -} while (0) +} while (/*CONSTCOND*/ 0) #define KEY_CHKSPDIR(head, sp, name) \ do { \ @@ -302,7 +302,7 @@ "anyway continue.\n", \ (name), (head), (sp))); \ } \ -} while (0) +} while (/*CONSTCOND*/ 0) #if 1 #define KMALLOC(p, t, n) \ @@ -315,13 +315,13 @@ ((p) = (t)malloc((unsigned long)(n), M_SECA, M_NOWAIT)); \ printf("%s %d: %p <- KMALLOC(%s, %d)\n", \ __FILE__, __LINE__, (p), #t, n); \ -} while (0) +} while (/*CONSTCOND*/ 0) #define KFREE(p) \ do { \ printf("%s %d: %p -> KFREE()\n", __FILE__, __LINE__, (p)); \ free((caddr_t)(p), M_SECA); \ - } while (0) + } while (/*CONSTCOND*/ 0) #endif /* @@ -337,7 +337,7 @@ (idx)->ul_proto = (ulp); \ bcopy((s), &(idx)->src, ((const struct sockaddr *)(s))->sa_len); \ bcopy((d), &(idx)->dst, ((const struct sockaddr *)(d))->sa_len); \ -} while (0) +} while (/*CONSTCOND*/ 0) /* * set parameters into secasindex buffer. @@ -351,7 +351,7 @@ (idx)->reqid = (r); \ bcopy((s), &(idx)->src, ((const struct sockaddr *)(s))->sa_len); \ bcopy((d), &(idx)->dst, ((const struct sockaddr *)(d))->sa_len); \ -} while (0) +} while (/*CONSTCOND*/ 0) /* key statistics */ struct _keystat { @@ -514,7 +514,7 @@ /* sanity check */ if (spidx == NULL) - panic("key_allocsp: NULL pointer is passed.\n"); + panic("key_allocsp: NULL pointer is passed."); /* check direction */ switch (dir) { @@ -522,7 +522,7 @@ case IPSEC_DIR_OUTBOUND: break; default: - panic("key_allocsp: Invalid direction is passed.\n"); + panic("key_allocsp: Invalid direction is passed."); } /* get a SP entry */ @@ -650,7 +650,7 @@ /* sanity check */ if (isr == NULL || saidx == NULL) - panic("key_checkrequest: NULL pointer is passed.\n"); + panic("key_checkrequest: NULL pointer is passed."); /* check mode */ switch (saidx->mode) { @@ -659,7 +659,7 @@ break; case IPSEC_MODE_ANY: default: - panic("key_checkrequest: Invalid policy defined.\n"); + panic("key_checkrequest: Invalid policy defined."); } /* get current level */ @@ -672,7 +672,7 @@ */ if (isr->sav != NULL) { if (isr->sav->sah == NULL) - panic("key_checkrequest: sah is null.\n"); + panic("key_checkrequest: sah is null."); if (isr->sav == (struct secasvar *)LIST_FIRST( &isr->sav->sah->savtree[SADB_SASTATE_DEAD])) { KEYDEBUG(KEYDEBUG_IPSEC_STAMP, @@ -811,7 +811,7 @@ /* sanity check 2 */ if (candidate->lft_c == NULL || sav->lft_c == NULL) panic("key_do_allocsa_policy: " - "lifetime_current is NULL.\n"); + "lifetime_current is NULL."); /* What the best method is to compare ? */ if (key_preferred_oldsa) { @@ -934,7 +934,7 @@ /* sanity check */ if (src == NULL || dst == NULL) - panic("key_allocsa: NULL pointer is passed.\n"); + panic("key_allocsa: NULL pointer is passed."); /* * when both systems employ similar strategy to use a SA. @@ -1075,7 +1075,7 @@ { /* sanity check */ if (sp == NULL) - panic("key_freesp: NULL pointer is passed.\n"); + panic("key_freesp: NULL pointer is passed."); sp->refcnt--; KEYDEBUG(KEYDEBUG_IPSEC_STAMP, @@ -1098,7 +1098,7 @@ { /* sanity check */ if (so == NULL) - panic("key_freeso: NULL pointer is passed.\n"); + panic("key_freeso: NULL pointer is passed."); switch (so->so_proto->pr_domain->dom_family) { #ifdef INET @@ -1152,7 +1152,7 @@ { /* sanity check */ if (sp == NULL || *sp == NULL) - panic("key_freesp_so: sp == NULL\n"); + panic("key_freesp_so: sp == NULL"); switch ((*sp)->policy) { case IPSEC_POLICY_IPSEC: @@ -1182,7 +1182,7 @@ { /* sanity check */ if (sav == NULL) - panic("key_freesav: NULL pointer is passed.\n"); + panic("key_freesav: NULL pointer is passed."); sav->refcnt--; KEYDEBUG(KEYDEBUG_IPSEC_STAMP, @@ -1207,7 +1207,7 @@ /* sanity check */ if (sp == NULL) - panic("key_delsp: NULL pointer is passed.\n"); + panic("key_delsp: NULL pointer is passed."); sp->state = IPSEC_SPSTATE_DEAD; @@ -1257,7 +1257,7 @@ /* sanity check */ if (spidx == NULL) - panic("key_getsp: NULL pointer is passed.\n"); + panic("key_getsp: NULL pointer is passed."); LIST_FOREACH(sp, &sptree[spidx->dir], chain) { if (sp->state == IPSEC_SPSTATE_DEAD) @@ -1333,9 +1333,9 @@ /* sanity check */ if (xpl0 == NULL) - panic("key_msg2sp: NULL pointer was passed.\n"); + panic("key_msg2sp: NULL pointer was passed."); if (len < sizeof(*xpl0)) - panic("key_msg2sp: invalid length.\n"); + panic("key_msg2sp: invalid length."); if (len != PFKEY_EXTLEN(xpl0)) { ipseclog((LOG_DEBUG, "key_msg2sp: Invalid msg length.\n")); *error = EINVAL; @@ -1570,7 +1570,7 @@ /* sanity check. */ if (sp == NULL) - panic("key_sp2msg: NULL pointer was passed.\n"); + panic("key_sp2msg: NULL pointer was passed."); tlen = key_getspreqmsglen(sp); @@ -1740,7 +1740,7 @@ /* sanity check */ if (so == NULL || m == NULL || mhp == NULL || mhp->msg == NULL) - panic("key_spdadd: NULL pointer is passed.\n"); + panic("key_spdadd: NULL pointer is passed."); if (mhp->ext[SADB_EXT_ADDRESS_SRC] == NULL || mhp->ext[SADB_EXT_ADDRESS_DST] == NULL || @@ -1996,7 +1996,7 @@ /* sanity check */ if (so == NULL || m == NULL || mhp == NULL || mhp->msg == NULL) - panic("key_spddelete: NULL pointer is passed.\n"); + panic("key_spddelete: NULL pointer is passed."); if (mhp->ext[SADB_EXT_ADDRESS_SRC] == NULL || mhp->ext[SADB_EXT_ADDRESS_DST] == NULL || @@ -2089,7 +2089,7 @@ /* sanity check */ if (so == NULL || m == NULL || mhp == NULL || mhp->msg == NULL) - panic("key_spddelete2: NULL pointer is passed.\n"); + panic("key_spddelete2: NULL pointer is passed."); if (mhp->ext[SADB_X_EXT_POLICY] == NULL || mhp->extlen[SADB_X_EXT_POLICY] < sizeof(struct sadb_x_policy)) { @@ -2186,7 +2186,7 @@ /* sanity check */ if (so == NULL || m == NULL || mhp == NULL || mhp->msg == NULL) - panic("key_spdget: NULL pointer is passed.\n"); + panic("key_spdget: NULL pointer is passed."); if (mhp->ext[SADB_X_EXT_POLICY] == NULL || mhp->extlen[SADB_X_EXT_POLICY] < sizeof(struct sadb_x_policy)) { @@ -2235,11 +2235,11 @@ /* sanity check */ if (sp == NULL) - panic("key_spdacquire: NULL pointer is passed.\n"); + panic("key_spdacquire: NULL pointer is passed."); if (sp->req != NULL) - panic("key_spdacquire: called but there is request.\n"); + panic("key_spdacquire: called but there is request."); if (sp->policy != IPSEC_POLICY_IPSEC) - panic("key_spdacquire: policy mismathed. IPsec is expected.\n"); + panic("key_spdacquire: policy mismathed. IPsec is expected."); /* Get an entry to check whether sent message or not. */ if ((newspacq = key_getspacq(&sp->spidx)) != NULL) { @@ -2307,7 +2307,7 @@ /* sanity check */ if (so == NULL || m == NULL || mhp == NULL || mhp->msg == NULL) - panic("key_spdflush: NULL pointer is passed.\n"); + panic("key_spdflush: NULL pointer is passed."); if (m->m_len != PFKEY_ALIGN8(sizeof(struct sadb_msg))) return key_senderror(so, m, EINVAL); @@ -2358,7 +2358,7 @@ /* sanity check */ if (so == NULL || m == NULL || mhp == NULL || mhp->msg == NULL) - panic("key_spddump: NULL pointer is passed.\n"); + panic("key_spddump: NULL pointer is passed."); /* search SPD entry and get buffer size. */ cnt = 0; @@ -2497,7 +2497,7 @@ /* sanity check */ if (sp == NULL) - panic("key_spdexpire: NULL pointer is passed.\n"); + panic("key_spdexpire: NULL pointer is passed."); /* set msg header */ m = key_setsadbmsg(SADB_X_SPDEXPIRE, 0, 0, 0, 0, 0); @@ -2604,7 +2604,7 @@ /* sanity check */ if (saidx == NULL) - panic("key_newsaidx: NULL pointer is passed.\n"); + panic("key_newsaidx: NULL pointer is passed."); newsah = keydb_newsecashead(); if (newsah == NULL) @@ -2633,7 +2633,7 @@ /* sanity check */ if (sah == NULL) - panic("key_delsah: NULL pointer is passed.\n"); + panic("key_delsah: NULL pointer is passed."); s = splnet(); /*called from softclock()*/ @@ -2711,7 +2711,7 @@ /* sanity check */ if (m == NULL || mhp == NULL || mhp->msg == NULL || sah == NULL) - panic("key_newsa: NULL pointer is passed.\n"); + panic("key_newsa: NULL pointer is passed."); KMALLOC(newsav, struct secasvar *, sizeof(struct secasvar)); if (newsav == NULL) { @@ -2790,7 +2790,7 @@ { /* sanity check */ if (sav == NULL) - panic("key_delsav: NULL pointer is passed.\n"); + panic("key_delsav: NULL pointer is passed."); if (sav->refcnt > 0) return; /* can't free */ @@ -2955,7 +2955,7 @@ >>> TRUNCATED FOR MAIL (1000 lines) <<<
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200309260525.h8Q5Pxxa073822>