Date: Mon, 29 Apr 2002 13:00:36 -0700 (PDT) From: John Baldwin <jhb@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 10472 for review Message-ID: <200204292000.g3TK0ab86224@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://people.freebsd.org/~peter/p4db/chv.cgi?CH=10472 Change 10472 by jhb@jhb_laptop on 2002/04/29 13:00:17 IFC. Affected files ... ... //depot/projects/smpng/sys/Makefile#2 integrate ... //depot/projects/smpng/sys/alpha/alpha/dec_axppci_33.c#3 integrate ... //depot/projects/smpng/sys/alpha/alpha/elf_machdep.c#3 integrate ... //depot/projects/smpng/sys/alpha/alpha/machdep.c#43 integrate ... //depot/projects/smpng/sys/alpha/alpha/pmap.c#30 integrate ... //depot/projects/smpng/sys/alpha/alpha/trap.c#31 integrate ... //depot/projects/smpng/sys/alpha/conf/GENERIC#17 integrate ... //depot/projects/smpng/sys/alpha/include/pmap.h#9 integrate ... //depot/projects/smpng/sys/alpha/isa/isa_dma.c#2 integrate ... //depot/projects/smpng/sys/alpha/pci/lca.c#4 integrate ... //depot/projects/smpng/sys/alpha/pci/lca_pci.c#4 integrate ... //depot/projects/smpng/sys/alpha/pci/tsunami_pci.c#3 integrate ... //depot/projects/smpng/sys/boot/efi/libefi/arch/ia64/start.S#4 integrate ... //depot/projects/smpng/sys/boot/efi/libefi/elf_freebsd.c#6 integrate ... //depot/projects/smpng/sys/boot/forth/loader.conf#8 integrate ... //depot/projects/smpng/sys/boot/i386/kgzldr/Makefile#4 integrate ... //depot/projects/smpng/sys/boot/i386/loader/Makefile#6 integrate ... //depot/projects/smpng/sys/boot/pc98/kgzldr/Makefile#3 integrate ... //depot/projects/smpng/sys/boot/pc98/loader/Makefile#5 integrate ... //depot/projects/smpng/sys/boot/sparc64/boot1/Makefile#3 integrate ... //depot/projects/smpng/sys/boot/sparc64/boot1/boot1.c#2 integrate ... //depot/projects/smpng/sys/cam/cam_xpt.c#8 integrate ... //depot/projects/smpng/sys/cam/scsi/scsi_all.c#8 integrate ... //depot/projects/smpng/sys/coda/coda_subr.c#4 integrate ... //depot/projects/smpng/sys/compat/linux/linux_misc.c#21 integrate ... //depot/projects/smpng/sys/conf/NOTES#7 integrate ... //depot/projects/smpng/sys/conf/files#36 integrate ... //depot/projects/smpng/sys/conf/files.ia64#14 integrate ... //depot/projects/smpng/sys/conf/kern.post.mk#8 integrate ... //depot/projects/smpng/sys/conf/kmod.mk#8 integrate ... //depot/projects/smpng/sys/conf/kmod_syms.awk#3 integrate ... //depot/projects/smpng/sys/conf/options#21 integrate ... //depot/projects/smpng/sys/contrib/ipfilter/netinet/IPFILTER.LICENCE#2 integrate ... //depot/projects/smpng/sys/contrib/ipfilter/netinet/QNX_OCL.txt#1 branch ... //depot/projects/smpng/sys/contrib/ipfilter/netinet/fil.c#6 integrate ... //depot/projects/smpng/sys/contrib/ipfilter/netinet/ip_auth.c#6 integrate ... //depot/projects/smpng/sys/contrib/ipfilter/netinet/ip_compat.h#4 integrate ... //depot/projects/smpng/sys/contrib/ipfilter/netinet/ip_fil.c#7 integrate ... //depot/projects/smpng/sys/contrib/ipfilter/netinet/ip_fil.h#5 integrate ... //depot/projects/smpng/sys/contrib/ipfilter/netinet/ip_frag.c#5 integrate ... //depot/projects/smpng/sys/contrib/ipfilter/netinet/ip_ftp_pxy.c#4 integrate ... //depot/projects/smpng/sys/contrib/ipfilter/netinet/ip_log.c#5 integrate ... //depot/projects/smpng/sys/contrib/ipfilter/netinet/ip_nat.c#7 integrate ... //depot/projects/smpng/sys/contrib/ipfilter/netinet/ip_nat.h#4 integrate ... //depot/projects/smpng/sys/contrib/ipfilter/netinet/ip_proxy.c#6 integrate ... //depot/projects/smpng/sys/contrib/ipfilter/netinet/ip_state.c#5 integrate ... //depot/projects/smpng/sys/contrib/ipfilter/netinet/ip_state.h#4 integrate ... //depot/projects/smpng/sys/contrib/ipfilter/netinet/ipl.h#4 integrate ... //depot/projects/smpng/sys/crypto/des/podd.h#2 integrate ... //depot/projects/smpng/sys/crypto/des/sk.h#2 integrate ... //depot/projects/smpng/sys/crypto/rijndael/rijndael-api-fst.h#2 integrate ... //depot/projects/smpng/sys/dev/aac/aac.c#13 integrate ... //depot/projects/smpng/sys/dev/aac/aac_cam.c#1 branch ... //depot/projects/smpng/sys/dev/aac/aac_cam.h#1 branch ... //depot/projects/smpng/sys/dev/aac/aac_disk.c#10 integrate ... //depot/projects/smpng/sys/dev/aac/aac_pci.c#13 integrate ... //depot/projects/smpng/sys/dev/aac/aacreg.h#7 integrate ... //depot/projects/smpng/sys/dev/aac/aacvar.h#11 integrate ... //depot/projects/smpng/sys/dev/acpica/acpi.c#25 integrate ... //depot/projects/smpng/sys/dev/acpica/acpi_timer.c#7 integrate ... //depot/projects/smpng/sys/dev/aic7xxx/ahc_eisa.c#2 integrate ... //depot/projects/smpng/sys/dev/aic7xxx/ahc_pci.c#3 integrate ... //depot/projects/smpng/sys/dev/aic7xxx/aic7770.c#3 integrate ... //depot/projects/smpng/sys/dev/aic7xxx/aic7xxx.c#7 integrate ... //depot/projects/smpng/sys/dev/aic7xxx/aic7xxx.h#3 integrate ... //depot/projects/smpng/sys/dev/aic7xxx/aic7xxx.reg#3 integrate ... //depot/projects/smpng/sys/dev/aic7xxx/aic7xxx.seq#4 integrate ... //depot/projects/smpng/sys/dev/aic7xxx/aic7xxx_93cx6.c#3 integrate ... //depot/projects/smpng/sys/dev/aic7xxx/aic7xxx_93cx6.h#2 integrate ... //depot/projects/smpng/sys/dev/aic7xxx/aic7xxx_freebsd.c#3 delete ... //depot/projects/smpng/sys/dev/aic7xxx/aic7xxx_freebsd.h#3 delete ... //depot/projects/smpng/sys/dev/aic7xxx/aic7xxx_inline.h#3 integrate ... //depot/projects/smpng/sys/dev/aic7xxx/aic7xxx_osm.c#2 integrate ... //depot/projects/smpng/sys/dev/aic7xxx/aic7xxx_osm.h#2 integrate ... //depot/projects/smpng/sys/dev/aic7xxx/aic7xxx_pci.c#4 integrate ... //depot/projects/smpng/sys/dev/aic7xxx/aicasm/Makefile#3 integrate ... //depot/projects/smpng/sys/dev/aic7xxx/aicasm/aicasm.c#3 integrate ... //depot/projects/smpng/sys/dev/aic7xxx/aicasm/aicasm.h#3 integrate ... //depot/projects/smpng/sys/dev/aic7xxx/aicasm/aicasm_gram.y#3 integrate ... //depot/projects/smpng/sys/dev/aic7xxx/aicasm/aicasm_insformat.h#2 integrate ... //depot/projects/smpng/sys/dev/aic7xxx/aicasm/aicasm_macro_gram.y#1 branch ... //depot/projects/smpng/sys/dev/aic7xxx/aicasm/aicasm_macro_scan.l#1 branch ... //depot/projects/smpng/sys/dev/aic7xxx/aicasm/aicasm_scan.l#4 integrate ... //depot/projects/smpng/sys/dev/aic7xxx/aicasm/aicasm_symbol.c#3 integrate ... //depot/projects/smpng/sys/dev/aic7xxx/aicasm/aicasm_symbol.h#3 integrate ... //depot/projects/smpng/sys/dev/ata/ata-all.h#9 integrate ... //depot/projects/smpng/sys/dev/ata/ata-disk.c#18 integrate ... //depot/projects/smpng/sys/dev/ata/ata-dma.c#21 integrate ... //depot/projects/smpng/sys/dev/ata/ata-isa.c#5 integrate ... //depot/projects/smpng/sys/dev/ata/atapi-all.c#12 integrate ... //depot/projects/smpng/sys/dev/awi/awi.c#7 integrate ... //depot/projects/smpng/sys/dev/awi/awi_wep.c#7 integrate ... //depot/projects/smpng/sys/dev/awi/awi_wicfg.c#7 integrate ... //depot/projects/smpng/sys/dev/bge/if_bge.c#11 integrate ... //depot/projects/smpng/sys/dev/digi/digi.c#14 integrate ... //depot/projects/smpng/sys/dev/digi/digi_isa.c#5 integrate ... //depot/projects/smpng/sys/dev/drm/drm.h#1 branch ... //depot/projects/smpng/sys/dev/drm/drmP.h#1 branch ... //depot/projects/smpng/sys/dev/drm/drm_agpsupport.h#1 branch ... //depot/projects/smpng/sys/dev/drm/drm_auth.h#1 branch ... //depot/projects/smpng/sys/dev/drm/drm_bufs.h#1 branch ... //depot/projects/smpng/sys/dev/drm/drm_context.h#1 branch ... //depot/projects/smpng/sys/dev/drm/drm_dma.h#1 branch ... //depot/projects/smpng/sys/dev/drm/drm_drawable.h#1 branch ... //depot/projects/smpng/sys/dev/drm/drm_drv.h#1 branch ... //depot/projects/smpng/sys/dev/drm/drm_fops.h#1 branch ... //depot/projects/smpng/sys/dev/drm/drm_init.h#1 branch ... //depot/projects/smpng/sys/dev/drm/drm_ioctl.h#1 branch ... //depot/projects/smpng/sys/dev/drm/drm_linux.h#1 branch ... //depot/projects/smpng/sys/dev/drm/drm_lists.h#1 branch ... //depot/projects/smpng/sys/dev/drm/drm_lock.h#1 branch ... //depot/projects/smpng/sys/dev/drm/drm_memory.h#1 branch ... //depot/projects/smpng/sys/dev/drm/drm_os_freebsd.h#1 branch ... //depot/projects/smpng/sys/dev/drm/drm_scatter.h#1 branch ... //depot/projects/smpng/sys/dev/drm/drm_sysctl.h#1 branch ... //depot/projects/smpng/sys/dev/drm/drm_vm.h#1 branch ... //depot/projects/smpng/sys/dev/drm/gamma.h#1 branch ... //depot/projects/smpng/sys/dev/drm/gamma_dma.c#1 branch ... //depot/projects/smpng/sys/dev/drm/gamma_drv.c#1 branch ... //depot/projects/smpng/sys/dev/drm/gamma_drv.h#1 branch ... //depot/projects/smpng/sys/dev/drm/i810_drm.h#1 branch ... //depot/projects/smpng/sys/dev/drm/mga.h#1 branch ... //depot/projects/smpng/sys/dev/drm/mga_dma.c#1 branch ... //depot/projects/smpng/sys/dev/drm/mga_drm.h#1 branch ... //depot/projects/smpng/sys/dev/drm/mga_drv.c#1 branch ... //depot/projects/smpng/sys/dev/drm/mga_drv.h#1 branch ... //depot/projects/smpng/sys/dev/drm/mga_state.c#1 branch ... //depot/projects/smpng/sys/dev/drm/mga_ucode.h#1 branch ... //depot/projects/smpng/sys/dev/drm/mga_warp.c#1 branch ... //depot/projects/smpng/sys/dev/drm/r128.h#1 branch ... //depot/projects/smpng/sys/dev/drm/r128_cce.c#1 branch ... //depot/projects/smpng/sys/dev/drm/r128_drm.h#1 branch ... //depot/projects/smpng/sys/dev/drm/r128_drv.c#1 branch ... //depot/projects/smpng/sys/dev/drm/r128_drv.h#1 branch ... //depot/projects/smpng/sys/dev/drm/r128_state.c#1 branch ... //depot/projects/smpng/sys/dev/drm/radeon.h#1 branch ... //depot/projects/smpng/sys/dev/drm/radeon_cp.c#1 branch ... //depot/projects/smpng/sys/dev/drm/radeon_drm.h#1 branch ... //depot/projects/smpng/sys/dev/drm/radeon_drv.c#1 branch ... //depot/projects/smpng/sys/dev/drm/radeon_drv.h#1 branch ... //depot/projects/smpng/sys/dev/drm/radeon_state.c#1 branch ... //depot/projects/smpng/sys/dev/drm/sis_drm.h#1 branch ... //depot/projects/smpng/sys/dev/drm/tdfx.h#1 branch ... //depot/projects/smpng/sys/dev/drm/tdfx_drv.c#1 branch ... //depot/projects/smpng/sys/dev/em/if_em.c#6 integrate ... //depot/projects/smpng/sys/dev/gem/if_gem.c#4 integrate ... //depot/projects/smpng/sys/dev/gx/if_gx.c#6 integrate ... //depot/projects/smpng/sys/dev/hea/eni.c#3 integrate ... //depot/projects/smpng/sys/dev/hea/eni_buffer.c#4 integrate ... //depot/projects/smpng/sys/dev/hea/eni_transmit.c#2 integrate ... //depot/projects/smpng/sys/dev/hea/eni_vcm.c#3 integrate ... //depot/projects/smpng/sys/dev/hfa/fore_command.c#2 integrate ... //depot/projects/smpng/sys/dev/hfa/fore_output.c#3 integrate ... //depot/projects/smpng/sys/dev/hfa/hfa_eisa.c#1 branch ... //depot/projects/smpng/sys/dev/hfa/hfa_freebsd.c#1 branch ... //depot/projects/smpng/sys/dev/hfa/hfa_freebsd.h#1 branch ... //depot/projects/smpng/sys/dev/hfa/hfa_pci.c#1 branch ... //depot/projects/smpng/sys/dev/hfa/hfa_sbus.c#1 branch ... //depot/projects/smpng/sys/dev/hme/if_hme.c#4 integrate ... //depot/projects/smpng/sys/dev/iir/iir.c#2 integrate ... //depot/projects/smpng/sys/dev/iir/iir_ctrl.c#2 integrate ... //depot/projects/smpng/sys/dev/iir/iir_pci.c#3 integrate ... //depot/projects/smpng/sys/dev/isp/isp.c#18 integrate ... //depot/projects/smpng/sys/dev/isp/isp_freebsd.h#11 integrate ... //depot/projects/smpng/sys/dev/isp/isp_inline.h#6 integrate ... //depot/projects/smpng/sys/dev/isp/ispmbox.h#10 integrate ... //depot/projects/smpng/sys/dev/lge/if_lge.c#5 integrate ... //depot/projects/smpng/sys/dev/mii/acphy.c#4 integrate ... //depot/projects/smpng/sys/dev/mii/amphy.c#4 integrate ... //depot/projects/smpng/sys/dev/mii/brgphy.c#7 integrate ... //depot/projects/smpng/sys/dev/mii/dcphy.c#4 integrate ... //depot/projects/smpng/sys/dev/mii/e1000phy.c#3 integrate ... //depot/projects/smpng/sys/dev/mii/exphy.c#4 integrate ... //depot/projects/smpng/sys/dev/mii/inphy.c#3 integrate ... //depot/projects/smpng/sys/dev/mii/lxtphy.c#4 integrate ... //depot/projects/smpng/sys/dev/mii/mii.c#4 integrate ... //depot/projects/smpng/sys/dev/mii/mii.h#2 integrate ... //depot/projects/smpng/sys/dev/mii/mii_physubr.c#4 integrate ... //depot/projects/smpng/sys/dev/mii/miivar.h#4 integrate ... //depot/projects/smpng/sys/dev/mii/mlphy.c#4 integrate ... //depot/projects/smpng/sys/dev/mii/nsgphy.c#4 integrate ... //depot/projects/smpng/sys/dev/mii/nsgphyreg.h#2 integrate ... //depot/projects/smpng/sys/dev/mii/nsphy.c#4 integrate ... //depot/projects/smpng/sys/dev/mii/pnaphy.c#4 integrate ... //depot/projects/smpng/sys/dev/mii/pnphy.c#4 integrate ... //depot/projects/smpng/sys/dev/mii/qsphy.c#4 integrate ... //depot/projects/smpng/sys/dev/mii/rlphy.c#6 integrate ... //depot/projects/smpng/sys/dev/mii/tdkphy.c#5 integrate ... //depot/projects/smpng/sys/dev/mii/tlphy.c#5 integrate ... //depot/projects/smpng/sys/dev/mii/ukphy.c#4 integrate ... //depot/projects/smpng/sys/dev/mii/ukphy_subr.c#2 integrate ... //depot/projects/smpng/sys/dev/mii/xmphy.c#4 integrate ... //depot/projects/smpng/sys/dev/mly/mly.c#8 integrate ... //depot/projects/smpng/sys/dev/my/if_my.c#2 integrate ... //depot/projects/smpng/sys/dev/nge/if_nge.c#12 integrate ... //depot/projects/smpng/sys/dev/pccbb/pccbb.c#13 integrate ... //depot/projects/smpng/sys/dev/pci/pci.c#11 integrate ... //depot/projects/smpng/sys/dev/ppbus/pps.c#6 integrate ... //depot/projects/smpng/sys/dev/puc/puc.c#4 integrate ... //depot/projects/smpng/sys/dev/puc/pucdata.c#4 integrate ... //depot/projects/smpng/sys/dev/random/harvest.c#4 integrate ... //depot/projects/smpng/sys/dev/sio/sio.c#18 integrate ... //depot/projects/smpng/sys/dev/sound/pci/es137x.c#5 integrate ... //depot/projects/smpng/sys/dev/sound/pcm/ac97.c#8 integrate ... //depot/projects/smpng/sys/dev/sound/pcm/ac97.h#3 integrate ... //depot/projects/smpng/sys/dev/sound/pcm/sound.c#10 integrate ... //depot/projects/smpng/sys/dev/sym/sym_hipd.c#7 integrate ... //depot/projects/smpng/sys/dev/tdfx/tdfx_pci.c#4 integrate ... //depot/projects/smpng/sys/dev/tx/if_tx.c#1 branch ... //depot/projects/smpng/sys/dev/tx/if_txreg.h#1 branch ... //depot/projects/smpng/sys/dev/tx/if_txvar.h#1 branch ... //depot/projects/smpng/sys/dev/usb/if_aue.c#13 integrate ... //depot/projects/smpng/sys/dev/usb/ohci.c#15 integrate ... //depot/projects/smpng/sys/dev/usb/uhci.c#17 integrate ... //depot/projects/smpng/sys/dev/usb/usb_subr.c#10 integrate ... //depot/projects/smpng/sys/dev/usb/usbdevs#18 integrate ... //depot/projects/smpng/sys/dev/usb/usbdevs.h#19 integrate ... //depot/projects/smpng/sys/dev/usb/usbdevs_data.h#19 integrate ... //depot/projects/smpng/sys/dev/vinum/vinumio.c#6 integrate ... //depot/projects/smpng/sys/dev/wi/if_wi.c#34 integrate ... //depot/projects/smpng/sys/dev/wi/if_wi_pccard.c#6 integrate ... //depot/projects/smpng/sys/dev/wi/if_wi_pci.c#6 integrate ... //depot/projects/smpng/sys/dev/wi/if_wivar.h#7 integrate ... //depot/projects/smpng/sys/dev/wi/wi_hostap.c#4 integrate ... //depot/projects/smpng/sys/dev/wi/wi_hostap.h#3 integrate ... //depot/projects/smpng/sys/fs/devfs/devfs.h#3 integrate ... //depot/projects/smpng/sys/fs/fifofs/fifo_vnops.c#10 integrate ... //depot/projects/smpng/sys/fs/procfs/procfs.h#8 integrate ... //depot/projects/smpng/sys/fs/procfs/procfs_mem.c#7 integrate ... //depot/projects/smpng/sys/fs/smbfs/smbfs_io.c#6 integrate ... //depot/projects/smpng/sys/fs/smbfs/smbfs_vfsops.c#9 integrate ... //depot/projects/smpng/sys/geom/geom.h#6 integrate ... //depot/projects/smpng/sys/geom/geom_bsd.c#7 integrate ... //depot/projects/smpng/sys/geom/geom_dev.c#6 integrate ... //depot/projects/smpng/sys/geom/geom_disk.c#7 integrate ... //depot/projects/smpng/sys/geom/geom_dump.c#4 integrate ... //depot/projects/smpng/sys/geom/geom_enc.c#3 integrate ... //depot/projects/smpng/sys/geom/geom_slice.c#5 integrate ... //depot/projects/smpng/sys/geom/geom_slice.h#5 integrate ... //depot/projects/smpng/sys/geom/geom_subr.c#5 integrate ... //depot/projects/smpng/sys/i386/conf/GENERIC#19 integrate ... //depot/projects/smpng/sys/i386/i386/autoconf.c#11 integrate ... //depot/projects/smpng/sys/i386/i386/bios.c#9 integrate ... //depot/projects/smpng/sys/i386/i386/busdma_machdep.c#5 integrate ... //depot/projects/smpng/sys/i386/i386/elf_machdep.c#2 integrate ... //depot/projects/smpng/sys/i386/i386/identcpu.c#8 integrate ... //depot/projects/smpng/sys/i386/i386/machdep.c#37 integrate ... //depot/projects/smpng/sys/i386/i386/mp_clock.c#2 integrate ... //depot/projects/smpng/sys/i386/i386/mp_machdep.c#23 integrate ... //depot/projects/smpng/sys/i386/i386/pmap.c#21 integrate ... //depot/projects/smpng/sys/i386/i386/trap.c#37 integrate ... //depot/projects/smpng/sys/i386/include/pmap.h#7 integrate ... //depot/projects/smpng/sys/i386/include/profile.h#5 integrate ... //depot/projects/smpng/sys/i386/isa/bs/bsif.c#3 integrate ... //depot/projects/smpng/sys/i386/isa/clock.c#15 integrate ... //depot/projects/smpng/sys/i386/isa/isa_dma.c#4 integrate ... //depot/projects/smpng/sys/i386/pci/pci_bus.c#5 integrate ... //depot/projects/smpng/sys/i386/pci/pci_cfgreg.c#8 integrate ... //depot/projects/smpng/sys/i4b/layer1/ifpi2/i4b_ifpi2_pci.c#4 integrate ... //depot/projects/smpng/sys/ia64/conf/GENERIC#15 integrate ... //depot/projects/smpng/sys/ia64/ia64/elf_machdep.c#3 integrate ... //depot/projects/smpng/sys/ia64/ia64/locore.s#12 integrate ... //depot/projects/smpng/sys/ia64/ia64/machdep.c#37 integrate ... //depot/projects/smpng/sys/ia64/ia64/mca.c#1 branch ... //depot/projects/smpng/sys/ia64/ia64/pmap.c#28 integrate ... //depot/projects/smpng/sys/ia64/ia64/sal.c#6 integrate ... //depot/projects/smpng/sys/ia64/ia64/swtch.s#9 integrate ... //depot/projects/smpng/sys/ia64/ia64/trap.c#30 integrate ... //depot/projects/smpng/sys/ia64/ia64/vm_machdep.c#12 integrate ... //depot/projects/smpng/sys/ia64/include/mca.h#1 branch ... //depot/projects/smpng/sys/ia64/include/pmap.h#7 integrate ... //depot/projects/smpng/sys/ia64/include/sal.h#4 integrate ... //depot/projects/smpng/sys/ia64/isa/isa_dma.c#3 integrate ... //depot/projects/smpng/sys/kern/bus_if.m#3 integrate ... //depot/projects/smpng/sys/kern/init_main.c#17 integrate ... //depot/projects/smpng/sys/kern/init_sysent.c#13 integrate ... //depot/projects/smpng/sys/kern/kern_clock.c#17 integrate ... //depot/projects/smpng/sys/kern/kern_condvar.c#12 integrate ... //depot/projects/smpng/sys/kern/kern_conf.c#11 integrate ... //depot/projects/smpng/sys/kern/kern_descrip.c#25 integrate ... //depot/projects/smpng/sys/kern/kern_environment.c#6 integrate ... //depot/projects/smpng/sys/kern/kern_exec.c#35 integrate ... //depot/projects/smpng/sys/kern/kern_exit.c#37 integrate ... //depot/projects/smpng/sys/kern/kern_linker.c#20 integrate ... //depot/projects/smpng/sys/kern/kern_malloc.c#10 integrate ... //depot/projects/smpng/sys/kern/kern_ntptime.c#9 integrate ... //depot/projects/smpng/sys/kern/kern_proc.c#28 integrate ... //depot/projects/smpng/sys/kern/kern_prot.c#61 integrate ... //depot/projects/smpng/sys/kern/kern_sig.c#34 integrate ... //depot/projects/smpng/sys/kern/kern_tc.c#9 integrate ... //depot/projects/smpng/sys/kern/kern_time.c#15 integrate ... //depot/projects/smpng/sys/kern/link_elf.c#12 integrate ... //depot/projects/smpng/sys/kern/makesyscalls.sh#10 integrate ... //depot/projects/smpng/sys/kern/subr_bus.c#9 integrate ... //depot/projects/smpng/sys/kern/subr_disklabel.c#9 integrate ... //depot/projects/smpng/sys/kern/subr_hints.c#3 integrate ... //depot/projects/smpng/sys/kern/subr_mchain.c#4 integrate ... //depot/projects/smpng/sys/kern/subr_prf.c#14 integrate ... //depot/projects/smpng/sys/kern/subr_witness.c#45 edit ... //depot/projects/smpng/sys/kern/sys_process.c#16 integrate ... //depot/projects/smpng/sys/kern/syscalls.c#13 integrate ... //depot/projects/smpng/sys/kern/syscalls.master#12 integrate ... //depot/projects/smpng/sys/kern/uipc_mbuf2.c#3 integrate ... //depot/projects/smpng/sys/kern/uipc_socket.c#19 integrate ... //depot/projects/smpng/sys/kern/uipc_socket2.c#12 integrate ... //depot/projects/smpng/sys/kern/uipc_syscalls.c#17 integrate ... //depot/projects/smpng/sys/kern/vfs_aio.c#22 integrate ... //depot/projects/smpng/sys/kern/vfs_conf.c#6 integrate ... //depot/projects/smpng/sys/kern/vfs_default.c#6 integrate ... //depot/projects/smpng/sys/kern/vfs_syscalls.c#36 integrate ... //depot/projects/smpng/sys/modules/Makefile#26 integrate ... //depot/projects/smpng/sys/modules/aac/Makefile#2 integrate ... //depot/projects/smpng/sys/modules/drm/Makefile#1 branch ... //depot/projects/smpng/sys/modules/drm/gamma/Makefile#1 branch ... //depot/projects/smpng/sys/modules/drm/mga/Makefile#1 branch ... //depot/projects/smpng/sys/modules/drm/r128/Makefile#1 branch ... //depot/projects/smpng/sys/modules/drm/radeon/Makefile#1 branch ... //depot/projects/smpng/sys/modules/drm/tdfx/Makefile#1 branch ... //depot/projects/smpng/sys/modules/hfa/Makefile#1 branch ... //depot/projects/smpng/sys/modules/hfa/eisa/Makefile#1 branch ... //depot/projects/smpng/sys/modules/hfa/hfa/Makefile#1 branch ... //depot/projects/smpng/sys/modules/hfa/pci/Makefile#1 branch ... //depot/projects/smpng/sys/modules/hfa/sbus/Makefile#1 branch ... //depot/projects/smpng/sys/modules/my/Makefile#1 branch ... //depot/projects/smpng/sys/modules/tx/Makefile#4 integrate ... //depot/projects/smpng/sys/modules/udf/Makefile#2 integrate ... //depot/projects/smpng/sys/net/if.c#23 integrate ... //depot/projects/smpng/sys/net/if_faith.c#9 integrate ... //depot/projects/smpng/sys/net/if_gif.c#8 integrate ... //depot/projects/smpng/sys/net/if_media.h#4 integrate ... //depot/projects/smpng/sys/net/if_stf.c#12 integrate ... //depot/projects/smpng/sys/net/if_stf.h#4 integrate ... //depot/projects/smpng/sys/net/net_osdep.c#3 integrate ... //depot/projects/smpng/sys/net/net_osdep.h#6 integrate ... //depot/projects/smpng/sys/net/radix.c#4 integrate ... //depot/projects/smpng/sys/net/rtsock.c#16 integrate ... //depot/projects/smpng/sys/netatm/atm.h#2 integrate ... //depot/projects/smpng/sys/netatm/atm_aal5.c#4 integrate ... //depot/projects/smpng/sys/netatm/atm_cm.c#3 integrate ... //depot/projects/smpng/sys/netatm/atm_device.c#3 integrate ... //depot/projects/smpng/sys/netatm/atm_if.c#4 integrate ... //depot/projects/smpng/sys/netatm/atm_if.h#3 integrate ... //depot/projects/smpng/sys/netatm/atm_ioctl.h#2 integrate ... //depot/projects/smpng/sys/netatm/atm_proto.c#3 integrate ... //depot/projects/smpng/sys/netatm/atm_signal.c#3 integrate ... //depot/projects/smpng/sys/netatm/atm_socket.c#3 integrate ... //depot/projects/smpng/sys/netatm/atm_subr.c#7 integrate ... //depot/projects/smpng/sys/netatm/atm_sys.h#3 integrate ... //depot/projects/smpng/sys/netatm/atm_usrreq.c#7 integrate ... //depot/projects/smpng/sys/netatm/atm_var.h#5 integrate ... //depot/projects/smpng/sys/netatm/ipatm/ipatm_if.c#3 integrate ... //depot/projects/smpng/sys/netatm/ipatm/ipatm_input.c#2 integrate ... //depot/projects/smpng/sys/netatm/ipatm/ipatm_output.c#2 integrate ... //depot/projects/smpng/sys/netatm/ipatm/ipatm_usrreq.c#2 integrate ... //depot/projects/smpng/sys/netatm/ipatm/ipatm_vcm.c#2 integrate ... //depot/projects/smpng/sys/netatm/port.h#3 integrate ... //depot/projects/smpng/sys/netatm/sigpvc/sigpvc_if.c#3 integrate ... //depot/projects/smpng/sys/netatm/spans/spans_arp.c#3 integrate ... //depot/projects/smpng/sys/netatm/spans/spans_cls.c#3 integrate ... //depot/projects/smpng/sys/netatm/spans/spans_if.c#3 integrate ... //depot/projects/smpng/sys/netatm/spans/spans_kxdr.c#3 integrate ... //depot/projects/smpng/sys/netatm/spans/spans_msg.c#3 integrate ... //depot/projects/smpng/sys/netatm/spans/spans_proto.c#3 integrate ... //depot/projects/smpng/sys/netatm/spans/spans_util.c#2 integrate ... //depot/projects/smpng/sys/netatm/spans/spans_var.h#3 integrate ... //depot/projects/smpng/sys/netatm/uni/sscop_pdu.c#3 integrate ... //depot/projects/smpng/sys/netatm/uni/sscop_subr.c#3 integrate ... //depot/projects/smpng/sys/netatm/uni/sscop_upper.c#3 integrate ... //depot/projects/smpng/sys/netatm/uni/uniarp.c#3 integrate ... //depot/projects/smpng/sys/netatm/uni/uniarp_cache.c#2 integrate ... //depot/projects/smpng/sys/netatm/uni/uniarp_output.c#2 integrate ... //depot/projects/smpng/sys/netatm/uni/uniip.c#3 integrate ... //depot/projects/smpng/sys/netatm/uni/unisig_decode.c#3 integrate ... //depot/projects/smpng/sys/netatm/uni/unisig_if.c#3 integrate ... //depot/projects/smpng/sys/netatm/uni/unisig_sigmgr_state.c#3 integrate ... //depot/projects/smpng/sys/netatm/uni/unisig_subr.c#2 integrate ... //depot/projects/smpng/sys/netatm/uni/unisig_util.c#2 integrate ... //depot/projects/smpng/sys/netatm/uni/unisig_vc_state.c#3 integrate ... //depot/projects/smpng/sys/netinet/accf_data.c#2 integrate ... //depot/projects/smpng/sys/netinet/accf_http.c#2 integrate ... //depot/projects/smpng/sys/netinet/icmp6.h#3 integrate ... //depot/projects/smpng/sys/netinet/in.h#12 integrate ... //depot/projects/smpng/sys/netinet/in_gif.c#5 integrate ... //depot/projects/smpng/sys/netinet/ip_encap.c#6 integrate ... //depot/projects/smpng/sys/netinet/tcp_input.c#16 integrate ... //depot/projects/smpng/sys/netinet6/ah.h#3 integrate ... //depot/projects/smpng/sys/netinet6/ah_core.c#2 integrate ... //depot/projects/smpng/sys/netinet6/ah_input.c#6 integrate ... //depot/projects/smpng/sys/netinet6/ah_output.c#2 integrate ... //depot/projects/smpng/sys/netinet6/dest6.c#2 integrate ... //depot/projects/smpng/sys/netinet6/esp.h#3 integrate ... //depot/projects/smpng/sys/netinet6/esp_input.c#6 integrate ... //depot/projects/smpng/sys/netinet6/esp_output.c#2 integrate ... //depot/projects/smpng/sys/netinet6/frag6.c#2 integrate ... //depot/projects/smpng/sys/netinet6/icmp6.c#4 integrate ... //depot/projects/smpng/sys/netinet6/in6.c#10 integrate ... //depot/projects/smpng/sys/netinet6/in6.h#5 integrate ... //depot/projects/smpng/sys/netinet6/in6_ifattach.c#3 integrate ... //depot/projects/smpng/sys/netinet6/in6_pcb.c#13 integrate ... //depot/projects/smpng/sys/netinet6/in6_proto.c#2 integrate ... //depot/projects/smpng/sys/netinet6/in6_rmx.c#2 integrate ... //depot/projects/smpng/sys/netinet6/in6_var.h#3 integrate ... //depot/projects/smpng/sys/netinet6/ip6_forward.c#5 integrate ... //depot/projects/smpng/sys/netinet6/ip6_fw.c#6 integrate ... //depot/projects/smpng/sys/netinet6/ip6_fw.h#2 integrate ... //depot/projects/smpng/sys/netinet6/ip6_input.c#14 integrate ... //depot/projects/smpng/sys/netinet6/ip6_mroute.c#5 integrate ... //depot/projects/smpng/sys/netinet6/ip6_mroute.h#2 integrate ... //depot/projects/smpng/sys/netinet6/ip6_output.c#10 integrate ... //depot/projects/smpng/sys/netinet6/ip6protosw.h#4 integrate ... //depot/projects/smpng/sys/netinet6/ipcomp.h#3 integrate ... //depot/projects/smpng/sys/netinet6/ipcomp_core.c#2 integrate ... //depot/projects/smpng/sys/netinet6/ipcomp_input.c#4 integrate ... //depot/projects/smpng/sys/netinet6/ipcomp_output.c#2 integrate ... //depot/projects/smpng/sys/netinet6/ipsec.c#4 integrate ... //depot/projects/smpng/sys/netinet6/ipsec.h#2 integrate ... //depot/projects/smpng/sys/netinet6/nd6.c#7 integrate ... //depot/projects/smpng/sys/netinet6/nd6.h#4 integrate ... //depot/projects/smpng/sys/netinet6/nd6_nbr.c#3 integrate ... //depot/projects/smpng/sys/netinet6/nd6_rtr.c#4 integrate ... //depot/projects/smpng/sys/netinet6/route6.c#2 integrate ... //depot/projects/smpng/sys/netinet6/udp6_output.c#8 integrate ... //depot/projects/smpng/sys/netinet6/udp6_usrreq.c#11 integrate ... //depot/projects/smpng/sys/netkey/key.h#3 integrate ... //depot/projects/smpng/sys/netkey/key_debug.c#5 integrate ... //depot/projects/smpng/sys/netkey/keysock.c#6 integrate ... //depot/projects/smpng/sys/netncp/ncp_nls.h#2 integrate ... //depot/projects/smpng/sys/netsmb/netbios.h#3 integrate ... //depot/projects/smpng/sys/netsmb/smb.h#5 integrate ... //depot/projects/smpng/sys/netsmb/smb_iod.c#5 integrate ... //depot/projects/smpng/sys/netsmb/smb_rq.c#6 integrate ... //depot/projects/smpng/sys/netsmb/smb_subr.c#6 integrate ... //depot/projects/smpng/sys/netsmb/smb_trantcp.c#7 integrate ... //depot/projects/smpng/sys/nfsclient/bootp_subr.c#9 integrate ... //depot/projects/smpng/sys/nfsclient/nfs_node.c#6 integrate ... //depot/projects/smpng/sys/nfsclient/nfs_socket.c#8 integrate ... //depot/projects/smpng/sys/nfsclient/nfs_vfsops.c#12 integrate ... //depot/projects/smpng/sys/nfsclient/nfsnode.h#4 integrate ... //depot/projects/smpng/sys/nfsserver/nfs_serv.c#16 integrate ... //depot/projects/smpng/sys/pc98/conf/GENERIC#19 integrate ... //depot/projects/smpng/sys/pc98/i386/machdep.c#33 integrate ... //depot/projects/smpng/sys/pc98/pc98/clock.c#8 integrate ... //depot/projects/smpng/sys/pc98/pc98/isa_dma.c#4 integrate ... //depot/projects/smpng/sys/pc98/pc98/sio.c#19 integrate ... //depot/projects/smpng/sys/pc98/pc98/syscons.c#15 integrate ... //depot/projects/smpng/sys/pci/if_dc.c#15 integrate ... //depot/projects/smpng/sys/pci/if_de.c#2 integrate ... //depot/projects/smpng/sys/pci/if_rl.c#11 integrate ... //depot/projects/smpng/sys/pci/if_rlreg.h#5 integrate ... //depot/projects/smpng/sys/pci/if_sk.c#7 integrate ... //depot/projects/smpng/sys/pci/if_ti.c#11 integrate ... //depot/projects/smpng/sys/pci/if_tx.c#6 delete ... //depot/projects/smpng/sys/pci/if_txvar.h#3 delete ... //depot/projects/smpng/sys/pci/xrpu.c#3 integrate ... //depot/projects/smpng/sys/powerpc/include/frame.h#4 integrate ... //depot/projects/smpng/sys/powerpc/include/pcpu.h#3 integrate ... //depot/projects/smpng/sys/powerpc/include/pmap.h#6 integrate ... //depot/projects/smpng/sys/powerpc/include/spr.h#1 branch ... //depot/projects/smpng/sys/powerpc/powerpc/clock.c#5 integrate ... //depot/projects/smpng/sys/powerpc/powerpc/copyinout.c#2 integrate ... //depot/projects/smpng/sys/powerpc/powerpc/elf_machdep.c#2 integrate ... //depot/projects/smpng/sys/powerpc/powerpc/genassym.c#13 integrate ... //depot/projects/smpng/sys/powerpc/powerpc/locore.s#7 integrate ... //depot/projects/smpng/sys/powerpc/powerpc/pmap.c#16 integrate ... //depot/projects/smpng/sys/powerpc/powerpc/sigcode.S#1 branch ... //depot/projects/smpng/sys/powerpc/powerpc/swtch.s#10 integrate ... //depot/projects/smpng/sys/powerpc/powerpc/trap.c#17 integrate ... //depot/projects/smpng/sys/powerpc/powerpc/trap_subr.S#1 branch ... //depot/projects/smpng/sys/sparc64/conf/GENERIC#12 integrate ... //depot/projects/smpng/sys/sparc64/include/pmap.h#11 integrate ... //depot/projects/smpng/sys/sparc64/include/proc.h#8 integrate ... //depot/projects/smpng/sys/sparc64/include/sysarch.h#2 integrate ... //depot/projects/smpng/sys/sparc64/sparc64/elf_machdep.c#4 integrate ... //depot/projects/smpng/sys/sparc64/sparc64/machdep.c#27 integrate ... //depot/projects/smpng/sys/sparc64/sparc64/mp_machdep.c#7 integrate ... //depot/projects/smpng/sys/sparc64/sparc64/pmap.c#22 integrate ... //depot/projects/smpng/sys/sparc64/sparc64/rwindow.c#6 integrate ... //depot/projects/smpng/sys/sparc64/sparc64/sys_machdep.c#7 integrate ... //depot/projects/smpng/sys/sparc64/sparc64/trap.c#32 integrate ... //depot/projects/smpng/sys/sparc64/sparc64/vm_machdep.c#19 integrate ... //depot/projects/smpng/sys/sys/_types.h#2 integrate ... //depot/projects/smpng/sys/sys/conf.h#14 integrate ... //depot/projects/smpng/sys/sys/disklabel.h#15 integrate ... //depot/projects/smpng/sys/sys/endian.h#1 branch ... //depot/projects/smpng/sys/sys/eventhandler.h#5 integrate ... //depot/projects/smpng/sys/sys/filedesc.h#10 integrate ... //depot/projects/smpng/sys/sys/kenv.h#1 branch ... //depot/projects/smpng/sys/sys/kernel.h#14 integrate ... //depot/projects/smpng/sys/sys/linker.h#6 integrate ... //depot/projects/smpng/sys/sys/linker_set.h#2 integrate ... //depot/projects/smpng/sys/sys/lock.h#15 integrate ... //depot/projects/smpng/sys/sys/malloc.h#8 integrate ... //depot/projects/smpng/sys/sys/mount.h#10 integrate ... //depot/projects/smpng/sys/sys/param.h#21 integrate ... //depot/projects/smpng/sys/sys/poll.h#4 integrate ... //depot/projects/smpng/sys/sys/proc.h#46 integrate ... //depot/projects/smpng/sys/sys/queue.h#5 integrate ... //depot/projects/smpng/sys/sys/socket.h#5 integrate ... //depot/projects/smpng/sys/sys/socketvar.h#17 integrate ... //depot/projects/smpng/sys/sys/syscall.h#13 integrate ... //depot/projects/smpng/sys/sys/syscall.mk#13 integrate ... //depot/projects/smpng/sys/sys/sysproto.h#15 integrate ... //depot/projects/smpng/sys/sys/systm.h#29 integrate ... //depot/projects/smpng/sys/sys/time.h#6 integrate ... //depot/projects/smpng/sys/sys/timepps.h#3 integrate ... //depot/projects/smpng/sys/sys/timetc.h#6 integrate ... //depot/projects/smpng/sys/sys/timex.h#3 integrate ... //depot/projects/smpng/sys/sys/un.h#6 integrate ... //depot/projects/smpng/sys/sys/vnode.h#16 integrate ... //depot/projects/smpng/sys/ufs/ifs/ifs_vnops.c#5 integrate ... //depot/projects/smpng/sys/vm/pmap.h#7 integrate ... //depot/projects/smpng/sys/vm/uma_core.c#11 integrate ... //depot/projects/smpng/sys/vm/vm_fault.c#8 integrate ... //depot/projects/smpng/sys/vm/vm_glue.c#12 integrate ... //depot/projects/smpng/sys/vm/vm_kern.c#5 integrate ... //depot/projects/smpng/sys/vm/vm_map.c#11 integrate ... //depot/projects/smpng/sys/vm/vm_map.h#6 integrate ... //depot/projects/smpng/sys/vm/vm_meter.c#7 integrate ... //depot/projects/smpng/sys/vm/vm_object.c#10 integrate ... //depot/projects/smpng/sys/vm/vm_object.h#4 integrate ... //depot/projects/smpng/sys/vm/vm_page.c#15 integrate ... //depot/projects/smpng/sys/vm/vm_page.h#7 integrate ... //depot/projects/smpng/sys/vm/vm_pageout.c#11 integrate ... //depot/projects/smpng/sys/vm/vnode_pager.c#13 integrate Differences ... ==== //depot/projects/smpng/sys/Makefile#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/Makefile,v 1.25 2000/08/24 18:53:09 peter Exp $ +# $FreeBSD: src/sys/Makefile,v 1.26 2002/04/26 17:55:21 ru Exp $ # The boot loader SUBDIR= boot @@ -8,11 +8,6 @@ SUBDIR+=modules .endif -afterdistribute: - ${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m 444 \ - ${.CURDIR}/${MACHINE}/conf/GENERIC.hints \ - ${DESTDIR}/boot/device.hints - HTAGSFLAGS+= -at `awk -F= '/^RELEASE *=/{release=$2}; END {print "FreeBSD", release, "kernel"}' < conf/newvers.sh` .include <bsd.subdir.mk> ==== //depot/projects/smpng/sys/alpha/alpha/dec_axppci_33.c#3 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/alpha/alpha/dec_axppci_33.c,v 1.13 2002/03/20 18:58:44 obrien Exp $ */ +/* $FreeBSD: src/sys/alpha/alpha/dec_axppci_33.c,v 1.15 2002/04/17 15:32:11 ticso Exp $ */ /* $NetBSD: dec_axppci_33.c,v 1.38 1998/07/07 08:49:12 ross Exp $ */ /* @@ -55,7 +55,7 @@ void dec_axppci_33_init(void); static void dec_axppci_33_cons_init(void); -static void dec_axppci_33_intr_map(void *); +static int dec_axppci_33_intr_route (device_t, device_t, int); extern int siocnattach(int, int); extern int siogdbattach(int, int); @@ -93,7 +93,8 @@ platform.iobus = "lca"; platform.cons_init = dec_axppci_33_cons_init; - platform.pci_intr_map = dec_axppci_33_intr_map; + platform.pci_intr_route = dec_axppci_33_intr_route; + platform.pci_intr_map = NULL; lca_init(); @@ -167,16 +168,13 @@ #define SIO_PCIREG_PIRQ_RTCTRL 0x60 /* PIRQ0 Route Control */ -void -dec_axppci_33_intr_map(void *arg) +static int +dec_axppci_33_intr_route(device_t pcib, device_t dev, int pin) { - pcicfgregs *cfg; int pirq; u_int32_t pirqreg; u_int8_t pirqline; - cfg = (pcicfgregs *)arg; - #ifndef DIAGNOSTIC pirq = 0; /* XXX gcc -Wuninitialized */ #endif @@ -185,23 +183,22 @@ * Slot->interrupt translation. Taken from NetBSD. */ - if (cfg->intpin == 0) { + if (pin == 0) { /* No IRQ used. */ - return; + return -1; } - if (cfg->intpin > 4) { - printf("dec_axppci_33_intr_map: bad interrupt pin %d\n", - cfg->intpin); - return; + if (pin > 4) { + printf("dec_axppci_33_intr_route: bad interrupt pin %d\n", pin); + return -1; } - switch (cfg->slot) { + switch (pci_get_slot(dev)) { case 6: /* NCR SCSI */ pirq = 3; break; case 11: /* slot 1 */ - switch (cfg->intpin) { + switch (pin) { case 1: case 4: pirq = 0; @@ -214,14 +211,14 @@ break; #ifdef DIAGNOSTIC default: /* XXX gcc -Wuninitialized */ - panic("dec_axppci_33_intr_map: bogus PCI pin %d\n", - cfg->intpin); + panic("dec_axppci_33_intr_route: bogus PCI pin %d\n", + pin); #endif }; break; case 12: /* slot 2 */ - switch (cfg->intpin) { + switch (pin) { case 1: case 4: pirq = 1; @@ -234,14 +231,14 @@ break; #ifdef DIAGNOSTIC default: /* XXX gcc -Wuninitialized */ - panic("dec_axppci_33_intr_map: bogus PCI pin %d\n", - cfg->intpin); + panic("dec_axppci_33_intr_route: bogus PCI pin %d\n", + pin); #endif }; break; case 8: /* slot 3 */ - switch (cfg->intpin) { + switch (pin) { case 1: case 4: pirq = 2; @@ -254,33 +251,24 @@ break; #ifdef DIAGNOSTIC default: /* XXX gcc -Wuninitialized */ - panic("dec_axppci_33_intr_map bogus: PCI pin %d\n", - cfg->intpin); + panic("dec_axppci_33_intr_route bogus: PCI pin %d\n", + pin); #endif }; break; default: - printf("dec_axppci_33_intr_map: weird device number %d\n", - cfg->slot); - return; + printf("dec_axppci_33_intr_route: weird device number %d\n", + pci_get_slot(dev)); + return -1; } pirqreg = lca_pcib_read_config(0, 0, 7, 0, SIO_PCIREG_PIRQ_RTCTRL, 4); -#if 0 - printf("dec_axppci_33_intr_map: device %d pin %c: pirq %d, reg = %x\n", - device, '@' + cfg->intpin, pirq, pirqreg); -#endif pirqline = (pirqreg >> (pirq * 8)) & 0xff; if ((pirqline & 0x80) != 0) panic("bad pirqline %d",pirqline); pirqline &= 0xf; -#if 0 - printf("dec_axppci_33_intr_map: device %d pin %c: mapped to line %d\n", - device, '@' + cfg->intpin, pirqline); -#endif - - cfg->intline = pirqline; + return(pirqline); } ==== //depot/projects/smpng/sys/alpha/alpha/elf_machdep.c#3 (text+ko) ==== @@ -22,7 +22,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/alpha/alpha/elf_machdep.c,v 1.8 2002/02/21 23:34:09 gallatin Exp $ + * $FreeBSD: src/sys/alpha/alpha/elf_machdep.c,v 1.9 2002/04/25 01:22:15 marcel Exp $ */ #include <sys/param.h> @@ -38,13 +38,13 @@ /* Process one elf relocation with addend. */ int -elf_reloc(linker_file_t lf, const void *data, int type, const char *sym) +elf_reloc(linker_file_t lf, const void *data, int type) { Elf_Addr relocbase = (Elf_Addr) lf->address; Elf_Addr *where; Elf_Addr addr; Elf_Addr addend; - Elf_Word rtype; + Elf_Word rtype, symidx; const Elf_Rel *rel; const Elf_Rela *rela; @@ -54,12 +54,14 @@ where = (Elf_Addr *) (relocbase + rel->r_offset); addend = *where; rtype = ELF_R_TYPE(rel->r_info); + symidx = ELF_R_SYM(rel->r_info); break; case ELF_RELOC_RELA: rela = (const Elf_Rela *)data; where = (Elf_Addr *) (relocbase + rela->r_offset); addend = rela->r_addend; rtype = ELF_R_TYPE(rela->r_info); + symidx = ELF_R_SYM(rela->r_info); break; default: panic("elf_reloc: unknown relocation mode %d\n", type); @@ -71,9 +73,8 @@ break; case R_ALPHA_REFQUAD: - addr = (Elf_Addr) - linker_file_lookup_symbol(lf, sym, 1); - if (addr == NULL) + addr = elf_lookup(lf, symidx, 1); + if (addr == 0) return -1; addr += addend; if (*where != addr) @@ -81,9 +82,8 @@ break; case R_ALPHA_GLOB_DAT: - addr = (Elf_Addr) - linker_file_lookup_symbol(lf, sym, 1); - if (addr == NULL) + addr = elf_lookup(lf, symidx, 1); + if (addr == 0) return -1; addr += addend; if (*where != addr) @@ -92,9 +92,8 @@ case R_ALPHA_JMP_SLOT: /* No point in lazy binding for kernel modules. */ - addr = (Elf_Addr) - linker_file_lookup_symbol(lf, sym, 1); - if (addr == NULL) + addr = elf_lookup(lf, symidx, 1); + if (addr == 0) return -1; if (*where != addr) *where = addr; ==== //depot/projects/smpng/sys/alpha/alpha/machdep.c#43 (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/alpha/alpha/machdep.c,v 1.178 2002/04/13 23:37:10 alc Exp $ + * $FreeBSD: src/sys/alpha/alpha/machdep.c,v 1.179 2002/04/17 13:06:32 mux Exp $ */ /*- * Copyright (c) 1998 The NetBSD Foundation, Inc. @@ -834,6 +834,7 @@ printf("Ignoring invalid memory size of '%s'\n", p); else Maxmem = alpha_btop(AllowMem); + freeenv(p); } while (physmem > Maxmem) { @@ -1015,6 +1016,7 @@ boothowto |= RB_VERBOSE; bootverbose = 1; } + freeenv(p); } /* @@ -1025,6 +1027,7 @@ min(sizeof(kernelname), sizeof bootinfo.booted_kernel) - 1); } else if ((p = getenv("kernelname")) != NULL) { strncpy(kernelname, p, sizeof(kernelname) - 1); + freeenv(p); } /* ==== //depot/projects/smpng/sys/alpha/alpha/pmap.c#30 (text+ko) ==== @@ -43,7 +43,7 @@ * from: @(#)pmap.c 7.7 (Berkeley) 5/12/91 * from: i386 Id: pmap.c,v 1.193 1998/04/19 15:22:48 bde Exp * with some ideas from NetBSD's alpha pmap - * $FreeBSD: src/sys/alpha/alpha/pmap.c,v 1.91 2002/04/15 16:07:52 peter Exp $ + * $FreeBSD: src/sys/alpha/alpha/pmap.c,v 1.92 2002/04/29 07:43:08 peter Exp $ */ /* @@ -222,7 +222,7 @@ * Given a map and a machine independent protection code, * convert to an alpha protection code. */ -#define pte_prot(m, p) (protection_codes[m == pmap_kernel() ? 0 : 1][p]) +#define pte_prot(m, p) (protection_codes[m == kernel_pmap ? 0 : 1][p]) int protection_codes[2][8]; /* @@ -296,8 +296,7 @@ /* * Statically allocated kernel pmap */ -static struct pmap kernel_pmap_store; -pmap_t kernel_pmap; +struct pmap kernel_pmap_store; vm_offset_t avail_start; /* PA of first available physical page */ vm_offset_t avail_end; /* PA of last available physical page */ @@ -531,13 +530,9 @@ alpha_protection_init(); /* - * The kernel's pmap is statically allocated so we don't have to use - * pmap_create, which is unlikely to work correctly at this part of - * the boot sequence (XXX and which no longer exists). + * Initialize the kernel pmap (which is statically allocated). */ - kernel_pmap = &kernel_pmap_store; kernel_pmap->pm_lev1 = Lev1map; - kernel_pmap->pm_count = 1; kernel_pmap->pm_active = ~0; kernel_pmap->pm_asn[alpha_pal_whami()].asn = 0; kernel_pmap->pm_asn[alpha_pal_whami()].gen = 1; @@ -1356,7 +1351,6 @@ int i; pmap->pm_lev1 = Lev1map; - pmap->pm_count = 1; pmap->pm_ptphint = NULL; pmap->pm_active = 0; for (i = 0; i < MAXCPU; i++) { @@ -1407,7 +1401,6 @@ pmap->pm_lev1[PTLEV1I] = pmap_phys_to_pte(VM_PAGE_TO_PHYS(lev1pg)) | PG_V | PG_KRE | PG_KWE; - pmap->pm_count = 1; pmap->pm_ptphint = NULL; pmap->pm_active = 0; for (i = 0; i < MAXCPU; i++) { @@ -1775,39 +1768,9 @@ critical_exit(); } -/* - * Retire the given physical map from service. - * Should only be called if the map contains - * no valid mappings. - */ -void -pmap_destroy(pmap_t pmap) -{ - int count; - if (pmap == NULL) - return; - - count = --pmap->pm_count; - if (count == 0) { - pmap_release(pmap); - panic("destroying a pmap is not yet implemented"); - } -} - -/* - * Add a reference to the specified pmap. - */ -void -pmap_reference(pmap_t pmap) -{ - if (pmap != NULL) { - pmap->pm_count++; - } -} - /*************************************************** -* page management routines. + * page management routines. ***************************************************/ /* @@ -2691,16 +2654,6 @@ { } -/* - * Routine: pmap_kernel - * Function: - * Returns the physical map handle for the kernel. - */ -pmap_t -pmap_kernel() -{ - return (kernel_pmap); -} /* * pmap_zero_page zeros the specified hardware page by ==== //depot/projects/smpng/sys/alpha/alpha/trap.c#31 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/alpha/alpha/trap.c,v 1.91 2002/04/16 05:56:01 alc Exp $ */ +/* $FreeBSD: src/sys/alpha/alpha/trap.c,v 1.92 2002/04/27 09:34:15 alc Exp $ */ /* $NetBSD: trap.c,v 1.31 1998/03/26 02:21:46 thorpej Exp $ */ /* @@ -472,7 +472,6 @@ goto out; } - mtx_lock(&Giant); /* * It is only a kernel address space fault iff: * 1. !user and @@ -515,7 +514,6 @@ break; #ifdef DIAGNOSTIC default: /* XXX gcc -Wuninitialized */ - mtx_unlock(&Giant); goto dopanic; #endif } @@ -531,20 +529,8 @@ ++p->p_lock; PROC_UNLOCK(p); - /* - * Grow the stack if necessary - */ - /* vm_map_growstack fails only if va falls into - * a growable stack region and the stack growth - * fails. It succeeds if va was not within - * a growable stack region, or if the stack - * growth succeeded. - */ - if (vm_map_growstack(p, va) != KERN_SUCCESS) - rv = KERN_FAILURE; - else - /* Fault in the user page: */ - rv = vm_fault(map, va, ftype, + /* Fault in the user page: */ + rv = vm_fault(map, va, ftype, (ftype & VM_PROT_WRITE) ? VM_FAULT_DIRTY : VM_FAULT_NORMAL); @@ -559,7 +545,6 @@ */ rv = vm_fault(map, va, ftype, VM_FAULT_NORMAL); } - mtx_unlock(&Giant); if (rv == KERN_SUCCESS) goto out; ==== //depot/projects/smpng/sys/alpha/conf/GENERIC#17 (text+ko) ==== >>> TRUNCATED FOR MAIL (1000 lines) <<< To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200204292000.g3TK0ab86224>