Date: Wed, 7 Dec 2005 22:12:47 GMT From: John Baldwin <jhb@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 87864 for review Message-ID: <200512072212.jB7MClxI088965@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=87864 Change 87864 by jhb@jhb_slimer on 2005/12/07 22:12:14 IFC @87863. Affected files ... .. //depot/projects/smpng/sys/alpha/alpha/pmap.c#76 integrate .. //depot/projects/smpng/sys/alpha/alpha/trap.c#62 integrate .. //depot/projects/smpng/sys/alpha/conf/DEFAULTS#2 integrate .. //depot/projects/smpng/sys/alpha/conf/GENERIC#53 integrate .. //depot/projects/smpng/sys/alpha/conf/NOTES#11 integrate .. //depot/projects/smpng/sys/alpha/include/param.h#15 integrate .. //depot/projects/smpng/sys/alpha/include/pmap.h#24 integrate .. //depot/projects/smpng/sys/amd64/amd64/bpf_jit_machdep.c#1 branch .. //depot/projects/smpng/sys/amd64/amd64/bpf_jit_machdep.h#1 branch .. //depot/projects/smpng/sys/amd64/amd64/busdma_machdep.c#19 integrate .. //depot/projects/smpng/sys/amd64/amd64/intr_machdep.c#14 integrate .. //depot/projects/smpng/sys/amd64/amd64/machdep.c#48 integrate .. //depot/projects/smpng/sys/amd64/conf/DEFAULTS#3 integrate .. //depot/projects/smpng/sys/amd64/conf/GENERIC#40 integrate .. //depot/projects/smpng/sys/amd64/conf/NOTES#27 integrate .. //depot/projects/smpng/sys/amd64/ia32/ia32_signal.c#14 integrate .. //depot/projects/smpng/sys/amd64/include/param.h#16 integrate .. //depot/projects/smpng/sys/amd64/include/pmap.h#19 integrate .. //depot/projects/smpng/sys/amd64/isa/atpic.c#11 integrate .. //depot/projects/smpng/sys/arm/arm/cpufunc_asm_arm9.S#4 integrate .. //depot/projects/smpng/sys/arm/arm/elf_trampoline.c#2 integrate .. //depot/projects/smpng/sys/arm/arm/inckern.S#2 integrate .. //depot/projects/smpng/sys/arm/arm/machdep.c#16 integrate .. //depot/projects/smpng/sys/arm/arm/vm_machdep.c#17 integrate .. //depot/projects/smpng/sys/arm/include/elf.h#5 integrate .. //depot/projects/smpng/sys/arm/include/param.h#8 integrate .. //depot/projects/smpng/sys/arm/xscale/i80321/iq31244_machdep.c#15 integrate .. //depot/projects/smpng/sys/boot/forth/loader.conf#40 integrate .. //depot/projects/smpng/sys/coda/coda_psdev.c#17 integrate .. //depot/projects/smpng/sys/compat/ia32/ia32_signal.h#9 integrate .. //depot/projects/smpng/sys/compat/linprocfs/linprocfs.c#45 integrate .. //depot/projects/smpng/sys/compat/linux/linux_getcwd.c#19 integrate .. //depot/projects/smpng/sys/compat/linux/linux_signal.c#18 integrate .. //depot/projects/smpng/sys/compat/ndis/subr_ntoskrnl.c#39 integrate .. //depot/projects/smpng/sys/conf/Makefile.alpha#27 integrate .. //depot/projects/smpng/sys/conf/Makefile.amd64#14 integrate .. //depot/projects/smpng/sys/conf/Makefile.arm#16 integrate .. //depot/projects/smpng/sys/conf/Makefile.i386#25 integrate .. //depot/projects/smpng/sys/conf/Makefile.ia64#32 integrate .. //depot/projects/smpng/sys/conf/Makefile.pc98#24 integrate .. //depot/projects/smpng/sys/conf/Makefile.powerpc#33 integrate .. //depot/projects/smpng/sys/conf/Makefile.sparc64#28 integrate .. //depot/projects/smpng/sys/conf/NOTES#108 integrate .. //depot/projects/smpng/sys/conf/files#159 integrate .. //depot/projects/smpng/sys/conf/files.alpha#36 integrate .. //depot/projects/smpng/sys/conf/files.amd64#37 integrate .. //depot/projects/smpng/sys/conf/files.i386#91 integrate .. //depot/projects/smpng/sys/conf/files.ia64#52 integrate .. //depot/projects/smpng/sys/conf/files.pc98#78 integrate .. //depot/projects/smpng/sys/conf/files.powerpc#25 integrate .. //depot/projects/smpng/sys/conf/files.sparc64#53 integrate .. //depot/projects/smpng/sys/conf/kern.post.mk#50 integrate .. //depot/projects/smpng/sys/conf/kmod.mk#53 integrate .. //depot/projects/smpng/sys/conf/ldscript.arm#3 integrate .. //depot/projects/smpng/sys/conf/options#109 integrate .. //depot/projects/smpng/sys/conf/options.amd64#16 integrate .. //depot/projects/smpng/sys/conf/options.i386#53 integrate .. //depot/projects/smpng/sys/conf/options.pc98#52 integrate .. //depot/projects/smpng/sys/conf/systags.sh#4 integrate .. //depot/projects/smpng/sys/contrib/dev/nve/adapter.h#2 integrate .. //depot/projects/smpng/sys/contrib/dev/nve/amd64/nvenetlib.o.bz2.uu#2 integrate .. //depot/projects/smpng/sys/contrib/dev/nve/i386/nvenetlib.o.bz2.uu#2 integrate .. //depot/projects/smpng/sys/contrib/dev/nve/nvenet_version.h#1 branch .. //depot/projects/smpng/sys/contrib/ipfilter/netinet/fil.c#19 integrate .. //depot/projects/smpng/sys/contrib/ipfilter/netinet/ip_auth.c#14 integrate .. //depot/projects/smpng/sys/contrib/ipfilter/netinet/ip_compat.h#12 integrate .. //depot/projects/smpng/sys/contrib/ipfilter/netinet/ip_fil.h#12 integrate .. //depot/projects/smpng/sys/contrib/ipfilter/netinet/ip_log.c#12 integrate .. //depot/projects/smpng/sys/contrib/pf/net/if_pflog.c#13 integrate .. //depot/projects/smpng/sys/contrib/pf/net/if_pfsync.c#19 integrate .. //depot/projects/smpng/sys/contrib/pf/net/pf.c#20 integrate .. //depot/projects/smpng/sys/contrib/pf/net/pf_ioctl.c#16 integrate .. //depot/projects/smpng/sys/contrib/pf/net/pf_norm.c#10 integrate .. //depot/projects/smpng/sys/ddb/db_access.c#6 integrate .. //depot/projects/smpng/sys/dev/acpica/acpi_battery.c#17 integrate .. //depot/projects/smpng/sys/dev/acpica/acpi_cmbat.c#28 integrate .. //depot/projects/smpng/sys/dev/acpica/acpi_ec.c#40 integrate .. //depot/projects/smpng/sys/dev/acpica/acpi_pci_link.c#33 integrate .. //depot/projects/smpng/sys/dev/acpica/acpi_pcib.c#34 integrate .. //depot/projects/smpng/sys/dev/acpica/acpi_smbat.c#2 integrate .. //depot/projects/smpng/sys/dev/acpica/acpivar.h#61 integrate .. //depot/projects/smpng/sys/dev/advansys/adv_pci.c#12 integrate .. //depot/projects/smpng/sys/dev/advansys/advlib.c#6 integrate .. //depot/projects/smpng/sys/dev/advansys/adw_pci.c#11 integrate .. //depot/projects/smpng/sys/dev/advansys/adwcam.c#12 integrate .. //depot/projects/smpng/sys/dev/aic7xxx/aic79xx.c#26 integrate .. //depot/projects/smpng/sys/dev/aic7xxx/aic79xx_osm.c#20 integrate .. //depot/projects/smpng/sys/dev/aic7xxx/aic79xx_osm.h#15 integrate .. //depot/projects/smpng/sys/dev/aic7xxx/aic79xx_pci.c#22 integrate .. //depot/projects/smpng/sys/dev/aic7xxx/aic7xxx_osm.c#18 integrate .. //depot/projects/smpng/sys/dev/aic7xxx/aic7xxx_osm.h#17 integrate .. //depot/projects/smpng/sys/dev/amr/amr.c#35 integrate .. //depot/projects/smpng/sys/dev/arcmsr/arcmsr.c#4 integrate .. //depot/projects/smpng/sys/dev/asr/dptsig.h#6 integrate .. //depot/projects/smpng/sys/dev/ata/ata-all.c#76 integrate .. //depot/projects/smpng/sys/dev/ata/ata-all.h#40 integrate .. //depot/projects/smpng/sys/dev/ata/ata-chipset.c#58 integrate .. //depot/projects/smpng/sys/dev/ata/ata-dma.c#47 integrate .. //depot/projects/smpng/sys/dev/ata/ata-lowlevel.c#32 integrate .. //depot/projects/smpng/sys/dev/ata/ata-pci.h#36 integrate .. //depot/projects/smpng/sys/dev/ata/ata-raid.c#40 integrate .. //depot/projects/smpng/sys/dev/ata/ata-raid.h#22 integrate .. //depot/projects/smpng/sys/dev/atkbdc/atkbdc.c#2 integrate .. //depot/projects/smpng/sys/dev/atkbdc/psm.c#2 integrate .. //depot/projects/smpng/sys/dev/bge/if_bge.c#63 integrate .. //depot/projects/smpng/sys/dev/bktr/bktr_card.c#15 integrate .. //depot/projects/smpng/sys/dev/bktr/bktr_core.c#18 integrate .. //depot/projects/smpng/sys/dev/dc/if_dc.c#4 integrate .. //depot/projects/smpng/sys/dev/dc/if_dcreg.h#2 integrate .. //depot/projects/smpng/sys/dev/dcons/dcons_os.c#6 integrate .. //depot/projects/smpng/sys/dev/drm/ati_pcigart.c#3 integrate .. //depot/projects/smpng/sys/dev/drm/drm-preprocess.sh#1 branch .. //depot/projects/smpng/sys/dev/drm/drm-subprocess.pl#1 branch .. //depot/projects/smpng/sys/dev/drm/drm.h#9 integrate .. //depot/projects/smpng/sys/dev/drm/drmP.h#13 integrate .. //depot/projects/smpng/sys/dev/drm/drm_agpsupport.c#3 integrate .. //depot/projects/smpng/sys/dev/drm/drm_atomic.h#2 integrate .. //depot/projects/smpng/sys/dev/drm/drm_auth.c#2 integrate .. //depot/projects/smpng/sys/dev/drm/drm_bufs.c#2 integrate .. //depot/projects/smpng/sys/dev/drm/drm_context.c#2 integrate .. //depot/projects/smpng/sys/dev/drm/drm_dma.c#2 integrate .. //depot/projects/smpng/sys/dev/drm/drm_drawable.c#2 integrate .. //depot/projects/smpng/sys/dev/drm/drm_drv.c#2 integrate .. //depot/projects/smpng/sys/dev/drm/drm_fops.c#2 integrate .. //depot/projects/smpng/sys/dev/drm/drm_ioctl.c#2 integrate .. //depot/projects/smpng/sys/dev/drm/drm_irq.c#2 integrate .. //depot/projects/smpng/sys/dev/drm/drm_linux_list.h#4 integrate .. //depot/projects/smpng/sys/dev/drm/drm_lock.c#2 integrate .. //depot/projects/smpng/sys/dev/drm/drm_memory.c#2 integrate .. //depot/projects/smpng/sys/dev/drm/drm_pci.c#2 integrate .. //depot/projects/smpng/sys/dev/drm/drm_pciids.h#4 integrate .. //depot/projects/smpng/sys/dev/drm/drm_sarea.h#6 integrate .. //depot/projects/smpng/sys/dev/drm/drm_scatter.c#2 integrate .. //depot/projects/smpng/sys/dev/drm/drm_sysctl.c#2 integrate .. //depot/projects/smpng/sys/dev/drm/drm_vm.c#2 integrate .. //depot/projects/smpng/sys/dev/drm/i915_dma.c#2 integrate .. //depot/projects/smpng/sys/dev/drm/i915_drm.h#2 integrate .. //depot/projects/smpng/sys/dev/drm/i915_drv.c#2 integrate .. //depot/projects/smpng/sys/dev/drm/i915_drv.h#2 integrate .. //depot/projects/smpng/sys/dev/drm/i915_irq.c#2 integrate .. //depot/projects/smpng/sys/dev/drm/i915_mem.c#2 integrate .. //depot/projects/smpng/sys/dev/drm/mach64_dma.c#2 integrate .. //depot/projects/smpng/sys/dev/drm/mach64_drm.h#2 integrate .. //depot/projects/smpng/sys/dev/drm/mach64_drv.c#2 integrate .. //depot/projects/smpng/sys/dev/drm/mach64_drv.h#2 integrate .. //depot/projects/smpng/sys/dev/drm/mach64_irq.c#2 integrate .. //depot/projects/smpng/sys/dev/drm/mach64_state.c#2 integrate .. //depot/projects/smpng/sys/dev/drm/mga_dma.c#11 integrate .. //depot/projects/smpng/sys/dev/drm/mga_drm.h#6 integrate .. //depot/projects/smpng/sys/dev/drm/mga_drv.c#8 integrate .. //depot/projects/smpng/sys/dev/drm/mga_drv.h#9 integrate .. //depot/projects/smpng/sys/dev/drm/mga_irq.c#6 integrate .. //depot/projects/smpng/sys/dev/drm/mga_state.c#8 integrate .. //depot/projects/smpng/sys/dev/drm/mga_ucode.h#4 integrate .. //depot/projects/smpng/sys/dev/drm/mga_warp.c#6 integrate .. //depot/projects/smpng/sys/dev/drm/r128_cce.c#12 integrate .. //depot/projects/smpng/sys/dev/drm/r128_drm.h#7 integrate .. //depot/projects/smpng/sys/dev/drm/r128_drv.c#8 integrate .. //depot/projects/smpng/sys/dev/drm/r128_drv.h#10 integrate .. //depot/projects/smpng/sys/dev/drm/r128_irq.c#6 integrate .. //depot/projects/smpng/sys/dev/drm/r128_state.c#11 integrate .. //depot/projects/smpng/sys/dev/drm/r300_cmdbuf.c#3 integrate .. //depot/projects/smpng/sys/dev/drm/r300_reg.h#2 integrate .. //depot/projects/smpng/sys/dev/drm/radeon_cp.c#14 integrate .. //depot/projects/smpng/sys/dev/drm/radeon_drm.h#11 integrate .. //depot/projects/smpng/sys/dev/drm/radeon_drv.c#10 integrate .. //depot/projects/smpng/sys/dev/drm/radeon_drv.h#13 integrate .. //depot/projects/smpng/sys/dev/drm/radeon_irq.c#7 integrate .. //depot/projects/smpng/sys/dev/drm/radeon_mem.c#8 integrate .. //depot/projects/smpng/sys/dev/drm/radeon_state.c#14 integrate .. //depot/projects/smpng/sys/dev/drm/savage_bci.c#2 integrate .. //depot/projects/smpng/sys/dev/drm/savage_drm.h#2 integrate .. //depot/projects/smpng/sys/dev/drm/savage_drv.c#2 integrate .. //depot/projects/smpng/sys/dev/drm/savage_drv.h#2 integrate .. //depot/projects/smpng/sys/dev/drm/savage_state.c#2 integrate .. //depot/projects/smpng/sys/dev/drm/sis_drm.h#5 integrate .. //depot/projects/smpng/sys/dev/drm/sis_drv.c#6 integrate .. //depot/projects/smpng/sys/dev/drm/sis_drv.h#4 integrate .. //depot/projects/smpng/sys/dev/drm/sis_ds.c#4 integrate .. //depot/projects/smpng/sys/dev/drm/sis_ds.h#5 integrate .. //depot/projects/smpng/sys/dev/drm/sis_mm.c#8 integrate .. //depot/projects/smpng/sys/dev/drm/tdfx_drv.c#8 integrate .. //depot/projects/smpng/sys/dev/drm/tdfx_drv.h#2 integrate .. //depot/projects/smpng/sys/dev/em/if_em.c#58 integrate .. //depot/projects/smpng/sys/dev/em/if_em_hw.c#16 integrate .. //depot/projects/smpng/sys/dev/em/if_em_hw.h#17 integrate .. //depot/projects/smpng/sys/dev/em/if_em_osdep.h#16 integrate .. //depot/projects/smpng/sys/dev/esp/ncr53c9x.c#6 integrate .. //depot/projects/smpng/sys/dev/esp/ncr53c9xvar.h#5 integrate .. //depot/projects/smpng/sys/dev/fb/fb.c#12 integrate .. //depot/projects/smpng/sys/dev/fb/fbreg.h#14 integrate .. //depot/projects/smpng/sys/dev/fb/vga.c#22 integrate .. //depot/projects/smpng/sys/dev/firewire/firewire.c#38 integrate .. //depot/projects/smpng/sys/dev/gem/if_gem.c#27 integrate .. //depot/projects/smpng/sys/dev/hptmv/hptproc.c#6 integrate .. //depot/projects/smpng/sys/dev/hptmv/mvOs.h#4 integrate .. //depot/projects/smpng/sys/dev/hwpmc/hwpmc_amd.c#7 integrate .. //depot/projects/smpng/sys/dev/hwpmc/hwpmc_logging.c#4 integrate .. //depot/projects/smpng/sys/dev/hwpmc/hwpmc_mod.c#10 integrate .. //depot/projects/smpng/sys/dev/hwpmc/hwpmc_piv.c#5 integrate .. //depot/projects/smpng/sys/dev/ic/via6522reg.h#1 branch .. //depot/projects/smpng/sys/dev/ie/if_ie_isa.c#4 integrate .. //depot/projects/smpng/sys/dev/ips/ips.c#14 integrate .. //depot/projects/smpng/sys/dev/ips/ips.h#13 integrate .. //depot/projects/smpng/sys/dev/ips/ips_commands.c#12 integrate .. //depot/projects/smpng/sys/dev/ips/ips_disk.c#9 integrate .. //depot/projects/smpng/sys/dev/ips/ips_ioctl.c#8 integrate .. //depot/projects/smpng/sys/dev/ips/ips_pci.c#11 integrate .. //depot/projects/smpng/sys/dev/ips/ipsreg.h#1 branch .. //depot/projects/smpng/sys/dev/isp/isp_freebsd.h#26 integrate .. //depot/projects/smpng/sys/dev/ispfw/ispfw.c#11 integrate .. //depot/projects/smpng/sys/dev/lge/if_lge.c#33 integrate .. //depot/projects/smpng/sys/dev/lge/if_lgereg.h#6 integrate .. //depot/projects/smpng/sys/dev/lmc/if_lmc.c#11 integrate .. //depot/projects/smpng/sys/dev/lmc/if_lmc.h#2 integrate .. //depot/projects/smpng/sys/dev/mpt/mpt.h#8 integrate .. //depot/projects/smpng/sys/dev/mpt/mpt_cam.c#3 integrate .. //depot/projects/smpng/sys/dev/mpt/mpt_raid.c#4 integrate .. //depot/projects/smpng/sys/dev/my/if_my.c#22 integrate .. //depot/projects/smpng/sys/dev/nve/if_nve.c#10 integrate .. //depot/projects/smpng/sys/dev/nve/if_nvereg.h#4 integrate .. //depot/projects/smpng/sys/dev/ofw/ofw_bus_if.m#3 integrate .. //depot/projects/smpng/sys/dev/ofw/ofw_bus_subr.c#1 branch .. //depot/projects/smpng/sys/dev/ofw/ofw_bus_subr.h#1 branch .. //depot/projects/smpng/sys/dev/ofw/openfirm.c#10 integrate .. //depot/projects/smpng/sys/dev/ppc/ppc.c#6 integrate .. //depot/projects/smpng/sys/dev/puc/pucdata.c#33 integrate .. //depot/projects/smpng/sys/dev/ral/if_ral.c#12 integrate .. //depot/projects/smpng/sys/dev/ral/if_ralreg.h#2 integrate .. //depot/projects/smpng/sys/dev/re/if_re.c#34 integrate .. //depot/projects/smpng/sys/dev/rp/rp.c#22 integrate .. //depot/projects/smpng/sys/dev/rp/rp_isa.c#6 integrate .. //depot/projects/smpng/sys/dev/rp/rp_pci.c#8 integrate .. //depot/projects/smpng/sys/dev/rp/rpvar.h#6 integrate .. //depot/projects/smpng/sys/dev/sio/sio.c#58 integrate .. //depot/projects/smpng/sys/dev/snc/dp83932.c#16 integrate .. //depot/projects/smpng/sys/dev/snc/dp83932var.h#6 integrate .. //depot/projects/smpng/sys/dev/sound/driver.c#5 integrate .. //depot/projects/smpng/sys/dev/sound/pci/atiixp.c#1 branch .. //depot/projects/smpng/sys/dev/sound/pci/atiixp.h#1 branch .. //depot/projects/smpng/sys/dev/sound/pci/csa.c#15 integrate .. //depot/projects/smpng/sys/dev/sound/pcm/ac97.c#30 integrate .. //depot/projects/smpng/sys/dev/sound/pcm/feeder_fmt.c#14 integrate .. //depot/projects/smpng/sys/dev/sym/sym_hipd.c#24 integrate .. //depot/projects/smpng/sys/dev/syscons/schistory.c#7 integrate .. //depot/projects/smpng/sys/dev/syscons/scterm-dumb.c#4 integrate .. //depot/projects/smpng/sys/dev/syscons/scterm-sc.c#7 integrate .. //depot/projects/smpng/sys/dev/syscons/syscons.c#52 integrate .. //depot/projects/smpng/sys/dev/syscons/sysmouse.c#13 integrate .. //depot/projects/smpng/sys/dev/usb/if_udav.c#13 integrate .. //depot/projects/smpng/sys/dev/usb/if_udavreg.h#6 integrate .. //depot/projects/smpng/sys/dev/usb/if_ural.c#11 integrate .. //depot/projects/smpng/sys/dev/usb/if_uralreg.h#2 integrate .. //depot/projects/smpng/sys/dev/usb/if_uralvar.h#5 integrate .. //depot/projects/smpng/sys/dev/usb/ohci.c#38 integrate .. //depot/projects/smpng/sys/dev/usb/ohcivar.h#14 integrate .. //depot/projects/smpng/sys/dev/usb/sl811hs.c#2 integrate .. //depot/projects/smpng/sys/dev/usb/umass.c#49 integrate .. //depot/projects/smpng/sys/dev/usb/uplcom.c#21 integrate .. //depot/projects/smpng/sys/dev/usb/usb_quirks.c#13 integrate .. //depot/projects/smpng/sys/dev/usb/usb_quirks.h#3 integrate .. //depot/projects/smpng/sys/dev/usb/usb_subr.c#31 integrate .. //depot/projects/smpng/sys/dev/usb/usbdevs#80 integrate .. //depot/projects/smpng/sys/dev/usb/uvisor.c#16 integrate .. //depot/projects/smpng/sys/dev/usb/uvscom.c#18 integrate .. //depot/projects/smpng/sys/fs/hpfs/hpfs_vnops.c#30 integrate .. //depot/projects/smpng/sys/fs/ntfs/ntfs_subr.c#22 integrate .. //depot/projects/smpng/sys/fs/ntfs/ntfs_vnops.c#24 integrate .. //depot/projects/smpng/sys/fs/nwfs/nwfs_io.c#19 integrate .. //depot/projects/smpng/sys/fs/smbfs/smbfs_io.c#22 integrate .. //depot/projects/smpng/sys/fs/smbfs/smbfs_smb.c#14 integrate .. //depot/projects/smpng/sys/fs/smbfs/smbfs_vfsops.c#33 integrate .. //depot/projects/smpng/sys/geom/bde/g_bde_lock.c#14 integrate .. //depot/projects/smpng/sys/geom/eli/g_eli.c#5 integrate .. //depot/projects/smpng/sys/geom/geom_aes.c#17 integrate .. //depot/projects/smpng/sys/geom/geom_apple.c#11 integrate .. //depot/projects/smpng/sys/geom/geom_bsd.c#39 integrate .. //depot/projects/smpng/sys/geom/geom_fox.c#8 integrate .. //depot/projects/smpng/sys/geom/geom_gpt.c#22 integrate .. //depot/projects/smpng/sys/geom/geom_kern.c#22 integrate .. //depot/projects/smpng/sys/geom/geom_mbr.c#32 integrate .. //depot/projects/smpng/sys/geom/geom_pc98.c#29 integrate .. //depot/projects/smpng/sys/geom/geom_sunlabel.c#27 integrate .. //depot/projects/smpng/sys/geom/geom_vol_ffs.c#10 integrate .. //depot/projects/smpng/sys/geom/label/g_label_iso9660.c#3 integrate .. //depot/projects/smpng/sys/geom/label/g_label_msdosfs.c#2 integrate .. //depot/projects/smpng/sys/geom/label/g_label_ntfs.c#4 integrate .. //depot/projects/smpng/sys/geom/label/g_label_ufs.c#4 integrate .. //depot/projects/smpng/sys/geom/mirror/g_mirror.c#22 integrate .. //depot/projects/smpng/sys/geom/raid3/g_raid3.c#19 integrate .. //depot/projects/smpng/sys/geom/uzip/g_uzip.c#7 integrate .. //depot/projects/smpng/sys/geom/vinum/geom_vinum.c#14 integrate .. //depot/projects/smpng/sys/geom/vinum/geom_vinum_drive.c#15 integrate .. //depot/projects/smpng/sys/gnu/fs/ext2fs/ext2_alloc.c#4 integrate .. //depot/projects/smpng/sys/gnu/fs/ext2fs/ext2_balloc.c#2 integrate .. //depot/projects/smpng/sys/gnu/fs/ext2fs/ext2_inode.c#2 integrate .. //depot/projects/smpng/sys/gnu/fs/ext2fs/ext2_linux_ialloc.c#3 integrate .. //depot/projects/smpng/sys/gnu/fs/ext2fs/ext2_lookup.c#3 integrate .. //depot/projects/smpng/sys/gnu/fs/reiserfs/reiserfs_fs.h#2 integrate .. //depot/projects/smpng/sys/i386/conf/DEFAULTS#3 integrate .. //depot/projects/smpng/sys/i386/conf/GENERIC#69 integrate .. //depot/projects/smpng/sys/i386/conf/NOTES#112 integrate .. //depot/projects/smpng/sys/i386/conf/XBOX#2 integrate .. //depot/projects/smpng/sys/i386/i386/apic_vector.s#20 integrate .. //depot/projects/smpng/sys/i386/i386/bpf_jit_machdep.c#1 branch .. //depot/projects/smpng/sys/i386/i386/bpf_jit_machdep.h#1 branch .. //depot/projects/smpng/sys/i386/i386/busdma_machdep.c#37 integrate .. //depot/projects/smpng/sys/i386/i386/db_trace.c#27 integrate .. //depot/projects/smpng/sys/i386/i386/exception.s#25 integrate .. //depot/projects/smpng/sys/i386/i386/identcpu.c#40 integrate .. //depot/projects/smpng/sys/i386/i386/intr_machdep.c#16 integrate .. //depot/projects/smpng/sys/i386/i386/local_apic.c#37 integrate .. //depot/projects/smpng/sys/i386/i386/machdep.c#100 integrate .. //depot/projects/smpng/sys/i386/i386/mp_machdep.c#95 integrate .. //depot/projects/smpng/sys/i386/i386/pmap.c#91 integrate .. //depot/projects/smpng/sys/i386/include/apicvar.h#17 integrate .. //depot/projects/smpng/sys/i386/include/asmacros.h#6 integrate .. //depot/projects/smpng/sys/i386/include/bus.h#9 integrate .. //depot/projects/smpng/sys/i386/include/frame.h#6 integrate .. //depot/projects/smpng/sys/i386/include/intr_machdep.h#9 integrate .. //depot/projects/smpng/sys/i386/include/param.h#16 integrate .. //depot/projects/smpng/sys/i386/include/pmap.h#28 integrate .. //depot/projects/smpng/sys/i386/include/smp.h#19 integrate .. //depot/projects/smpng/sys/i386/include/smptests.h#11 delete .. //depot/projects/smpng/sys/i386/isa/atpic.c#14 integrate .. //depot/projects/smpng/sys/i386/isa/atpic_vector.s#12 integrate .. //depot/projects/smpng/sys/i386/isa/icu.h#12 integrate .. //depot/projects/smpng/sys/i386/isa/npx.c#49 integrate .. //depot/projects/smpng/sys/i386/isa/pcvt/pcvt_hdr.h#10 integrate .. //depot/projects/smpng/sys/i386/isa/vesa.c#18 integrate .. //depot/projects/smpng/sys/i4b/layer1/itjc/i4b_itjc_pci.c#15 integrate .. //depot/projects/smpng/sys/i4b/layer2/i4b_l2timer.c#6 integrate .. //depot/projects/smpng/sys/i4b/layer4/i4b_i4bdrv.c#21 integrate .. //depot/projects/smpng/sys/i4b/layer4/i4b_l4.c#10 integrate .. //depot/projects/smpng/sys/ia64/conf/DEFAULTS#2 integrate .. //depot/projects/smpng/sys/ia64/conf/GENERIC#47 integrate .. //depot/projects/smpng/sys/ia64/conf/NOTES#7 integrate .. //depot/projects/smpng/sys/ia64/conf/SKI#20 integrate .. //depot/projects/smpng/sys/ia64/ia64/machdep.c#98 integrate .. //depot/projects/smpng/sys/ia64/include/param.h#18 integrate .. //depot/projects/smpng/sys/ia64/include/pmap.h#23 integrate .. //depot/projects/smpng/sys/isa/vga_isa.c#14 integrate .. //depot/projects/smpng/sys/kern/init_sysent.c#63 integrate .. //depot/projects/smpng/sys/kern/kern_descrip.c#87 integrate .. //depot/projects/smpng/sys/kern/kern_exec.c#92 integrate .. //depot/projects/smpng/sys/kern/kern_pmc.c#4 integrate .. //depot/projects/smpng/sys/kern/kern_sig.c#114 integrate .. //depot/projects/smpng/sys/kern/kern_synch.c#92 integrate .. //depot/projects/smpng/sys/kern/kern_thread.c#83 integrate .. //depot/projects/smpng/sys/kern/kern_time.c#40 integrate .. //depot/projects/smpng/sys/kern/subr_witness.c#143 integrate .. //depot/projects/smpng/sys/kern/syscalls.c#63 integrate .. //depot/projects/smpng/sys/kern/syscalls.master#65 integrate .. //depot/projects/smpng/sys/kern/uipc_mqueue.c#1 branch .. //depot/projects/smpng/sys/kern/uipc_socket.c#78 integrate .. //depot/projects/smpng/sys/kern/uipc_socket2.c#48 integrate .. //depot/projects/smpng/sys/kern/vfs_bio.c#86 integrate .. //depot/projects/smpng/sys/kern/vfs_cluster.c#43 integrate .. //depot/projects/smpng/sys/kern/vfs_mount.c#53 integrate .. //depot/projects/smpng/sys/modules/Makefile#111 integrate .. //depot/projects/smpng/sys/modules/drm/Makefile#5 integrate .. //depot/projects/smpng/sys/modules/drm/i915/Makefile#1 branch .. //depot/projects/smpng/sys/modules/drm/savage/Makefile#1 branch .. //depot/projects/smpng/sys/modules/geom/geom_vinum/Makefile#4 integrate .. //depot/projects/smpng/sys/modules/i2c/controllers/pcf/Makefile#4 integrate .. //depot/projects/smpng/sys/modules/if_gif/Makefile#8 integrate .. //depot/projects/smpng/sys/modules/ipfw/Makefile#8 integrate .. //depot/projects/smpng/sys/modules/mqueue/Makefile#1 branch .. //depot/projects/smpng/sys/modules/netgraph/bpf/Makefile#3 integrate .. //depot/projects/smpng/sys/modules/sound/driver/Makefile#7 integrate .. //depot/projects/smpng/sys/modules/sound/driver/atiixp/Makefile#1 branch .. //depot/projects/smpng/sys/net/bpf.c#58 integrate .. //depot/projects/smpng/sys/net/bpf_jitter.c#1 branch .. //depot/projects/smpng/sys/net/bpf_jitter.h#1 branch .. //depot/projects/smpng/sys/net/bpfdesc.h#15 integrate .. //depot/projects/smpng/sys/net/if_bridge.c#16 integrate .. //depot/projects/smpng/sys/net/if_clone.c#8 integrate .. //depot/projects/smpng/sys/net/if_ppp.c#38 integrate .. //depot/projects/smpng/sys/net/if_spppsubr.c#29 integrate .. //depot/projects/smpng/sys/net/if_vlan.c#43 integrate .. //depot/projects/smpng/sys/net80211/ieee80211_input.c#24 integrate .. //depot/projects/smpng/sys/net80211/ieee80211_node.c#21 integrate .. //depot/projects/smpng/sys/net80211/ieee80211_node.h#16 integrate .. //depot/projects/smpng/sys/net80211/ieee80211_output.c#20 integrate .. //depot/projects/smpng/sys/netgraph/bluetooth/drivers/ubt/ng_ubt.c#18 integrate .. //depot/projects/smpng/sys/netgraph/netflow/netflow.c#10 integrate .. //depot/projects/smpng/sys/netgraph/ng_bpf.c#6 integrate .. //depot/projects/smpng/sys/netgraph/ng_vjc.c#7 integrate .. //depot/projects/smpng/sys/netinet/ip_dummynet.c#42 integrate .. //depot/projects/smpng/sys/netinet/ip_dummynet.h#20 integrate .. //depot/projects/smpng/sys/netinet/ip_fw.h#31 integrate .. //depot/projects/smpng/sys/netinet/ip_fw2.c#63 integrate .. //depot/projects/smpng/sys/netinet/ip_fw_pfil.c#14 integrate .. //depot/projects/smpng/sys/netinet/ip_input.c#72 integrate .. //depot/projects/smpng/sys/netinet/ip_output.c#80 integrate .. //depot/projects/smpng/sys/netinet/libalias/libalias.3#2 integrate .. //depot/projects/smpng/sys/netipsec/key_debug.c#4 integrate .. //depot/projects/smpng/sys/netkey/key_debug.c#10 integrate .. //depot/projects/smpng/sys/netsmb/smb_dev.c#20 integrate .. //depot/projects/smpng/sys/nfsclient/nfs_diskless.c#12 integrate .. //depot/projects/smpng/sys/pc98/cbus/fdc.c#3 integrate .. //depot/projects/smpng/sys/pc98/cbus/gdc.c#3 integrate .. //depot/projects/smpng/sys/pc98/cbus/ppc.c#2 integrate .. //depot/projects/smpng/sys/pc98/cbus/scterm-sck.c#2 integrate .. //depot/projects/smpng/sys/pc98/conf/DEFAULTS#3 integrate .. //depot/projects/smpng/sys/pc98/conf/GENERIC#59 integrate .. //depot/projects/smpng/sys/pc98/conf/NOTES#48 integrate .. //depot/projects/smpng/sys/pc98/include/bus.h#5 integrate .. //depot/projects/smpng/sys/pc98/include/smptests.h#2 delete .. //depot/projects/smpng/sys/pc98/pc98/machdep.c#7 integrate .. //depot/projects/smpng/sys/pci/agp_i810.c#19 integrate .. //depot/projects/smpng/sys/pci/agp_intel.c#20 integrate .. //depot/projects/smpng/sys/pci/agpreg.h#14 integrate .. //depot/projects/smpng/sys/pci/if_de.c#31 integrate .. //depot/projects/smpng/sys/pci/if_devar.h#13 integrate .. //depot/projects/smpng/sys/pci/viapm.c#11 integrate .. //depot/projects/smpng/sys/posix4/mqueue.h#4 delete .. //depot/projects/smpng/sys/powerpc/conf/DEFAULTS#2 integrate .. //depot/projects/smpng/sys/powerpc/conf/GENERIC#31 integrate .. //depot/projects/smpng/sys/powerpc/include/param.h#13 integrate .. //depot/projects/smpng/sys/powerpc/include/pmap.h#17 integrate .. //depot/projects/smpng/sys/powerpc/powermac/macio.c#11 integrate .. //depot/projects/smpng/sys/powerpc/powermac/maciovar.h#7 integrate .. //depot/projects/smpng/sys/rpc/rpcclnt.c#11 integrate .. //depot/projects/smpng/sys/sparc64/central/central.c#6 integrate .. //depot/projects/smpng/sys/sparc64/conf/DEFAULTS#2 integrate .. //depot/projects/smpng/sys/sparc64/conf/GENERIC#61 integrate .. //depot/projects/smpng/sys/sparc64/conf/NOTES#19 integrate .. //depot/projects/smpng/sys/sparc64/ebus/ebus.c#21 integrate .. //depot/projects/smpng/sys/sparc64/fhc/clkbrd.c#2 integrate .. //depot/projects/smpng/sys/sparc64/fhc/fhc.c#7 integrate .. //depot/projects/smpng/sys/sparc64/fhc/fhc_central.c#6 integrate .. //depot/projects/smpng/sys/sparc64/fhc/fhc_nexus.c#6 integrate .. //depot/projects/smpng/sys/sparc64/fhc/fhcvar.h#4 integrate .. //depot/projects/smpng/sys/sparc64/include/elf.h#11 integrate .. //depot/projects/smpng/sys/sparc64/include/ktr.h#6 integrate .. //depot/projects/smpng/sys/sparc64/include/ofw_upa.h#4 integrate .. //depot/projects/smpng/sys/sparc64/include/param.h#17 integrate .. //depot/projects/smpng/sys/sparc64/include/pmap.h#30 integrate .. //depot/projects/smpng/sys/sparc64/isa/ofw_isa.c#9 integrate .. //depot/projects/smpng/sys/sparc64/pci/apb.c#11 integrate .. //depot/projects/smpng/sys/sparc64/pci/ofw_pci.c#15 integrate .. //depot/projects/smpng/sys/sparc64/pci/ofw_pci.h#10 integrate .. //depot/projects/smpng/sys/sparc64/pci/ofw_pcib.c#5 integrate .. //depot/projects/smpng/sys/sparc64/pci/ofw_pcib_subr.c#5 integrate .. //depot/projects/smpng/sys/sparc64/pci/ofw_pcibus.c#6 integrate .. //depot/projects/smpng/sys/sparc64/pci/psycho.c#36 integrate .. //depot/projects/smpng/sys/sparc64/pci/psychoreg.h#10 integrate .. //depot/projects/smpng/sys/sparc64/pci/psychovar.h#13 integrate .. //depot/projects/smpng/sys/sparc64/sbus/dma_sbus.c#2 integrate .. //depot/projects/smpng/sys/sparc64/sbus/sbus.c#22 integrate .. //depot/projects/smpng/sys/sparc64/sparc64/eeprom.c#8 integrate .. //depot/projects/smpng/sys/sparc64/sparc64/genassym.c#36 integrate .. //depot/projects/smpng/sys/sparc64/sparc64/locore.S#5 integrate .. //depot/projects/smpng/sys/sparc64/sparc64/mem.c#14 integrate .. //depot/projects/smpng/sys/sparc64/sparc64/rtc.c#5 integrate .. //depot/projects/smpng/sys/sys/_lock.h#12 integrate .. //depot/projects/smpng/sys/sys/_types.h#13 integrate .. //depot/projects/smpng/sys/sys/bio.h#26 integrate .. //depot/projects/smpng/sys/sys/buf.h#42 integrate .. //depot/projects/smpng/sys/sys/event.h#20 integrate .. //depot/projects/smpng/sys/sys/file.h#24 integrate .. //depot/projects/smpng/sys/sys/kbio.h#3 integrate .. //depot/projects/smpng/sys/sys/ktr.h#23 integrate .. //depot/projects/smpng/sys/sys/limits.h#9 integrate .. //depot/projects/smpng/sys/sys/lock.h#32 integrate .. //depot/projects/smpng/sys/sys/mount.h#45 integrate .. //depot/projects/smpng/sys/sys/mouse.h#6 integrate .. //depot/projects/smpng/sys/sys/mqueue.h#1 branch .. //depot/projects/smpng/sys/sys/param.h#91 integrate .. //depot/projects/smpng/sys/sys/pmc.h#5 integrate .. //depot/projects/smpng/sys/sys/proc.h#157 integrate .. //depot/projects/smpng/sys/sys/queue.h#15 integrate .. //depot/projects/smpng/sys/sys/signal.h#23 integrate .. //depot/projects/smpng/sys/sys/signalvar.h#28 integrate .. //depot/projects/smpng/sys/sys/syscall.h#62 integrate .. //depot/projects/smpng/sys/sys/syscall.mk#62 integrate .. //depot/projects/smpng/sys/sys/sysproto.h#64 integrate .. //depot/projects/smpng/sys/sys/time.h#20 integrate .. //depot/projects/smpng/sys/sys/types.h#31 integrate .. //depot/projects/smpng/sys/sys/unistd.h#15 integrate .. //depot/projects/smpng/sys/ufs/ffs/ffs_vfsops.c#79 integrate .. //depot/projects/smpng/sys/vm/vm_map.c#76 integrate .. //depot/projects/smpng/sys/vm/vm_map.h#34 integrate .. //depot/projects/smpng/sys/vm/vm_object.c#73 integrate .. //depot/user/jhb/acpipci/amd64/ia32/ia32_signal.c#13 integrate .. //depot/user/jhb/acpipci/compat/ia32/ia32_signal.h#8 integrate .. //depot/user/jhb/acpipci/conf/files#94 integrate .. //depot/user/jhb/acpipci/conf/files.amd64#34 integrate .. //depot/user/jhb/acpipci/conf/files.i386#75 integrate .. //depot/user/jhb/acpipci/conf/files.pc98#42 integrate .. //depot/user/jhb/acpipci/contrib/dev/nve/adapter.h#2 integrate .. //depot/user/jhb/acpipci/contrib/dev/nve/amd64/nvenetlib.o.bz2.uu#2 integrate .. //depot/user/jhb/acpipci/contrib/dev/nve/i386/nvenetlib.o.bz2.uu#2 integrate .. //depot/user/jhb/acpipci/contrib/dev/nve/nvenet_version.h#1 branch .. //depot/user/jhb/acpipci/dev/nve/if_nve.c#26 integrate .. //depot/user/jhb/acpipci/dev/nve/if_nvereg.h#8 integrate .. //depot/user/jhb/acpipci/dev/sio/sio.c#39 integrate .. //depot/user/jhb/acpipci/kern/vfs_bio.c#49 integrate .. //depot/user/jhb/acpipci/kern/vfs_cluster.c#26 integrate .. //depot/user/jhb/acpipci/modules/netgraph/bpf/Makefile#2 integrate .. //depot/user/jhb/acpipci/net/bpf.c#36 integrate .. //depot/user/jhb/acpipci/net/bpf_jitter.c#2 integrate .. //depot/user/jhb/acpipci/net/bpf_jitter.h#2 integrate .. //depot/user/jhb/acpipci/netgraph/ng_bpf.c#5 integrate .. //depot/user/jhb/acpipci/sparc64/include/elf.h#5 integrate .. //depot/user/jhb/acpipci/sys/buf.h#27 integrate .. //depot/user/jhb/agp/amd64/ia32/ia32_signal.c#4 integrate .. //depot/user/jhb/agp/compat/ia32/ia32_signal.h#3 integrate .. //depot/user/jhb/agp/conf/files#12 integrate .. //depot/user/jhb/agp/conf/files.amd64#8 integrate .. //depot/user/jhb/agp/conf/files.i386#9 integrate .. //depot/user/jhb/agp/conf/files.pc98#8 integrate .. //depot/user/jhb/agp/contrib/dev/nve/adapter.h#2 integrate .. //depot/user/jhb/agp/contrib/dev/nve/amd64/nvenetlib.o.bz2.uu#2 integrate .. //depot/user/jhb/agp/contrib/dev/nve/i386/nvenetlib.o.bz2.uu#2 integrate .. //depot/user/jhb/agp/contrib/dev/nve/nvenet_version.h#1 branch .. //depot/user/jhb/agp/dev/nve/if_nve.c#5 integrate .. //depot/user/jhb/agp/dev/nve/if_nvereg.h#4 integrate .. //depot/user/jhb/agp/dev/sio/sio.c#5 integrate .. //depot/user/jhb/agp/kern/vfs_bio.c#6 integrate .. //depot/user/jhb/agp/kern/vfs_cluster.c#6 integrate .. //depot/user/jhb/agp/modules/netgraph/bpf/Makefile#2 integrate .. //depot/user/jhb/agp/net/bpf.c#7 integrate .. //depot/user/jhb/agp/net/bpf_jitter.c#2 integrate .. //depot/user/jhb/agp/net/bpf_jitter.h#2 integrate .. //depot/user/jhb/agp/netgraph/ng_bpf.c#4 integrate .. //depot/user/jhb/agp/sparc64/include/elf.h#2 integrate .. //depot/user/jhb/agp/sys/buf.h#6 integrate .. //depot/user/jhb/pat/amd64/ia32/ia32_signal.c#4 integrate .. //depot/user/jhb/pat/compat/ia32/ia32_signal.h#3 integrate .. //depot/user/jhb/pat/conf/files#9 integrate .. //depot/user/jhb/pat/conf/files.amd64#5 integrate .. //depot/user/jhb/pat/conf/files.i386#7 integrate .. //depot/user/jhb/pat/conf/files.pc98#5 integrate .. //depot/user/jhb/pat/contrib/dev/nve/adapter.h#2 integrate .. //depot/user/jhb/pat/contrib/dev/nve/amd64/nvenetlib.o.bz2.uu#2 integrate .. //depot/user/jhb/pat/contrib/dev/nve/i386/nvenetlib.o.bz2.uu#2 integrate .. //depot/user/jhb/pat/contrib/dev/nve/nvenet_version.h#1 branch .. //depot/user/jhb/pat/dev/nve/if_nve.c#7 integrate .. //depot/user/jhb/pat/dev/nve/if_nvereg.h#4 integrate .. //depot/user/jhb/pat/dev/sio/sio.c#4 integrate .. //depot/user/jhb/pat/kern/vfs_bio.c#4 integrate .. //depot/user/jhb/pat/kern/vfs_cluster.c#4 integrate .. //depot/user/jhb/pat/modules/netgraph/bpf/Makefile#2 integrate .. //depot/user/jhb/pat/net/bpf.c#4 integrate .. //depot/user/jhb/pat/net/bpf_jitter.c#2 integrate .. //depot/user/jhb/pat/net/bpf_jitter.h#2 integrate .. //depot/user/jhb/pat/netgraph/ng_bpf.c#2 integrate .. //depot/user/jhb/pat/sparc64/include/elf.h#2 integrate .. //depot/user/jhb/pat/sys/buf.h#3 integrate Differences ... ==== //depot/projects/smpng/sys/alpha/alpha/pmap.c#76 (text+ko) ==== @@ -148,7 +148,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/alpha/alpha/pmap.c,v 1.186 2005/11/20 06:09:47 alc Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/alpha/pmap.c,v 1.187 2005/12/02 18:02:54 alc Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -1941,11 +1941,12 @@ pmap->pm_stats.resident_count++; /* - * Now validate mapping with RO protection + * Validate the mapping with limited access, read and/or execute but + * not write. */ - *pte = pmap_phys_to_pte(VM_PAGE_TO_PHYS(m)) | PG_V | PG_KRE | PG_URE | managed; + *pte = pmap_phys_to_pte(VM_PAGE_TO_PHYS(m)) | PG_V | pte_prot(pmap, + prot & (VM_PROT_READ | VM_PROT_EXECUTE)) | managed; out: - alpha_pal_imb(); /* XXX overkill? */ PMAP_UNLOCK(pmap); return mpte; } ==== //depot/projects/smpng/sys/alpha/alpha/trap.c#62 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/alpha/alpha/trap.c,v 1.126 2005/10/14 12:43:42 davidxu Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/alpha/trap.c,v 1.127 2005/12/06 11:19:36 ru Exp $"); /* #include "opt_fix_unaligned_vax_fp.h" */ #include "opt_ddb.h" @@ -656,7 +656,7 @@ framep->tf_regs[FRAME_TRAPARG_A0] = 0; framep->tf_regs[FRAME_TRAPARG_A1] = 0; framep->tf_regs[FRAME_TRAPARG_A2] = 0; -#if notdef /* can't happen, ever. */ +#ifdef notdef /* can't happen, ever. */ if ((framep->tf_regs[FRAME_PS] & ALPHA_PSL_USERMODE) == 0) panic("syscall"); #endif ==== //depot/projects/smpng/sys/alpha/conf/DEFAULTS#2 (text+ko) ==== @@ -1,10 +1,9 @@ # # DEFAULTS -- Default kernel configuration file for FreeBSD/alpha # -# $FreeBSD: src/sys/alpha/conf/DEFAULTS,v 1.2 2005/11/21 20:22:34 jhb Exp $ +# $FreeBSD: src/sys/alpha/conf/DEFAULTS,v 1.3 2005/11/27 23:16:58 ru Exp $ -# Not yet, this would break all existing configs -#machine alpha +machine alpha # Pseudo devices. device mem # Memory and kernel memory devices ==== //depot/projects/smpng/sys/alpha/conf/GENERIC#53 (text+ko) ==== @@ -18,9 +18,8 @@ # # For hardware specific information check HARDWARE.TXT # -# $FreeBSD: src/sys/alpha/conf/GENERIC,v 1.190 2005/11/21 20:17:45 jhb Exp $ +# $FreeBSD: src/sys/alpha/conf/GENERIC,v 1.191 2005/11/27 23:16:58 ru Exp $ -machine alpha cpu EV4 cpu EV5 ident GENERIC ==== //depot/projects/smpng/sys/alpha/conf/NOTES#11 (text+ko) ==== @@ -1,14 +1,8 @@ -# $FreeBSD: src/sys/alpha/conf/NOTES,v 1.156 2004/11/09 22:24:47 wilko Exp $ +# $FreeBSD: src/sys/alpha/conf/NOTES,v 1.157 2005/11/27 23:16:58 ru Exp $ # # This file contains machine dependent kernel configuration notes. For # machine independent notes, look in /sys/conf/NOTES. -# This directive is mandatory. It defines the architecture to be -# configured for. In this case, this kernel is for a machine using -# Alpha processors. -# -machine alpha - ##################################################################### # CPU OPTIONS ==== //depot/projects/smpng/sys/alpha/include/param.h#15 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/alpha/include/param.h,v 1.39 2005/09/11 20:51:14 alc Exp $ */ +/* $FreeBSD: src/sys/alpha/include/param.h,v 1.40 2005/12/06 13:27:20 ru Exp $ */ /* From: NetBSD: param.h,v 1.20 1997/09/19 13:52:53 leo Exp */ /*- @@ -64,13 +64,6 @@ #define _ALIGNED_POINTER(p,t) ((((u_long)(p)) & (sizeof(t)-1)) == 0) #endif -#ifndef _MACHINE -#define _MACHINE alpha -#endif -#ifndef _MACHINE_ARCH -#define _MACHINE_ARCH alpha -#endif - #ifndef _NO_NAMESPACE_POLLUTION #ifndef _MACHINE_PARAM_H_ ==== //depot/projects/smpng/sys/alpha/include/pmap.h#24 (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 * from: i386 pmap.h,v 1.54 1997/11/20 19:30:35 bde Exp - * $FreeBSD: src/sys/alpha/include/pmap.h,v 1.36 2005/09/19 23:33:00 ticso Exp $ + * $FreeBSD: src/sys/alpha/include/pmap.h,v 1.37 2005/12/06 21:09:00 jhb Exp $ */ #ifndef _MACHINE_PMAP_H_ @@ -126,6 +126,7 @@ */ #define vtopte(va) (PTmap + (alpha_btop(va) \ & ((1 << 3*ALPHA_PTSHIFT)-1))) +#define vtophys(va) pmap_kextract((vm_offset_t)(va)) /* * Routine: pmap_kextract @@ -145,8 +146,6 @@ return pa; } -#define vtophys(va) pmap_kextract(((vm_offset_t) (va))) - static __inline vm_offset_t alpha_XXX_dmamap(vm_offset_t va) { ==== //depot/projects/smpng/sys/amd64/amd64/busdma_machdep.c#19 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/amd64/amd64/busdma_machdep.c,v 1.70 2005/03/12 07:05:59 scottl Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/busdma_machdep.c,v 1.71 2005/11/24 15:28:32 le Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -978,7 +978,7 @@ SYSCTL_ADD_INT(busdma_sysctl_tree(bz), SYSCTL_CHILDREN(busdma_sysctl_tree_top(bz)), OID_AUTO, "total_bpages", CTLFLAG_RD, &bz->total_bpages, 0, - "Totoal bounce pages"); + "Total bounce pages"); SYSCTL_ADD_INT(busdma_sysctl_tree(bz), SYSCTL_CHILDREN(busdma_sysctl_tree_top(bz)), OID_AUTO, "free_bpages", CTLFLAG_RD, &bz->free_bpages, 0, ==== //depot/projects/smpng/sys/amd64/amd64/intr_machdep.c#14 (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/amd64/intr_machdep.c,v 1.16 2005/10/25 19:48:45 jhb Exp $ + * $FreeBSD: src/sys/amd64/amd64/intr_machdep.c,v 1.17 2005/11/28 20:18:43 jhb Exp $ */ /* @@ -190,6 +190,7 @@ log(LOG_CRIT, "too many stray irq %d's: not logging anymore\n", vector); + return; } /* ==== //depot/projects/smpng/sys/amd64/amd64/machdep.c#48 (text+ko) ==== @@ -39,7 +39,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/amd64/amd64/machdep.c,v 1.644 2005/11/21 18:39:17 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/machdep.c,v 1.645 2005/11/24 08:16:17 ru Exp $"); #include "opt_atalk.h" #include "opt_atpic.h" @@ -343,7 +343,7 @@ sigreturn(td, uap) struct thread *td; struct sigreturn_args /* { - const __ucontext *sigcntxp; + const struct __ucontext *sigcntxp; } */ *uap; { ucontext_t uc; ==== //depot/projects/smpng/sys/amd64/conf/DEFAULTS#3 (text+ko) ==== @@ -1,10 +1,9 @@ # # DEFAULTS -- Default kernel configuration file for FreeBSD/amd64 # -# $FreeBSD: src/sys/amd64/conf/DEFAULTS,v 1.3 2005/11/21 20:22:34 jhb Exp $ +# $FreeBSD: src/sys/amd64/conf/DEFAULTS,v 1.4 2005/11/27 23:16:58 ru Exp $ -# Not yet, this would break all existing configs -#machine amd64 +machine amd64 # Bus support. device isa ==== //depot/projects/smpng/sys/amd64/conf/GENERIC#40 (text+ko) ==== @@ -16,9 +16,8 @@ # 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.446 2005/11/05 19:48:53 marcel Exp $ +# $FreeBSD: src/sys/amd64/conf/GENERIC,v 1.447 2005/11/27 23:16:58 ru Exp $ -machine amd64 cpu HAMMER ident GENERIC ==== //depot/projects/smpng/sys/amd64/conf/NOTES#27 (text+ko) ==== @@ -4,14 +4,8 @@ # 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.48 2005/11/11 09:57:29 ru Exp $ -# - -# -# This directive is mandatory; it defines the architecture to be -# configured for; in this case, the AMD64 family based machines. +# $FreeBSD: src/sys/amd64/conf/NOTES,v 1.51 2005/12/03 01:23:49 anholt Exp $ # -machine amd64 # # We want LINT to cover profiling as well. @@ -210,10 +204,12 @@ # Direct Rendering modules for 3D acceleration. device drm # DRM core module required by DRM drivers +device i915drm # Intel i830 through i915 device mach64drm # ATI Rage Pro, Rage Mobility P/M, Rage XL device mgadrm # AGP Matrox G200, G400, G450, G550 device r128drm # ATI Rage 128 device radeondrm # ATI Radeon +device savagedrm # S3 Savage3D, Savage4 device sisdrm # SiS 300/305, 540, 630 device tdfxdrm # 3dfx Voodoo 3/4/5 and Banshee options DRM_DEBUG # Include debug printfs (slow) ==== //depot/projects/smpng/sys/amd64/ia32/ia32_signal.c#14 (text+ko) ==== @@ -32,7 +32,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/amd64/ia32/ia32_signal.c,v 1.13 2005/11/04 20:32:26 ru Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/ia32/ia32_signal.c,v 1.14 2005/12/06 23:06:29 peter Exp $"); #include "opt_compat.h" @@ -754,5 +754,7 @@ dst->si_addr = dst->si_addr; dst->si_value.sigval_int = src->si_value.sival_int; dst->si_band = src->si_band; - dst->__spare__[0] = src->si_trapno; + dst->si_trapno = src->si_trapno; + dst->si_timerid = src->si_timerid; + dst->si_overrun = src->si_overrun; } ==== //depot/projects/smpng/sys/amd64/include/param.h#16 (text+ko) ==== @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * @(#)param.h 8.1 (Berkeley) 6/10/93 - * $FreeBSD: src/sys/amd64/include/param.h,v 1.18 2005/06/29 15:13:25 jhb Exp $ + * $FreeBSD: src/sys/amd64/include/param.h,v 1.19 2005/12/06 13:27:20 ru Exp $ */ /* @@ -64,13 +64,6 @@ #define _ALIGNED_POINTER(p,t) ((((u_long)(p)) & (sizeof(t)-1)) == 0) #endif -#ifndef _MACHINE -#define _MACHINE amd64 -#endif -#ifndef _MACHINE_ARCH -#define _MACHINE_ARCH amd64 -#endif - #ifndef _NO_NAMESPACE_POLLUTION #ifndef _MACHINE_PARAM_H_ ==== //depot/projects/smpng/sys/amd64/include/pmap.h#19 (text+ko) ==== @@ -39,14 +39,14 @@ * * 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.127 2005/06/29 22:28:45 peter Exp $ + * $FreeBSD: src/sys/amd64/include/pmap.h,v 1.128 2005/12/06 21:09:01 jhb Exp $ */ #ifndef _MACHINE_PMAP_H_ #define _MACHINE_PMAP_H_ /* - * Page-directory and page-table entires follow this format, with a few + * Page-directory and page-table entries follow this format, with a few * of the fields not present here and there, depending on a lot of things. */ /* ---- Intel Nomenclature ---- */ @@ -171,15 +171,13 @@ #ifdef _KERNEL /* * virtual address to page table entry and - * to physical address. Likewise for alternate address space. + * to physical address. * Note: these work recursively, thus vtopte of a pte will give * the corresponding pde that in turn maps it. */ pt_entry_t *vtopte(vm_offset_t); -vm_paddr_t pmap_kextract(vm_offset_t); +#define vtophys(va) pmap_kextract((vm_offset_t)(va)) -#define vtophys(va) pmap_kextract(((vm_offset_t) (va))) - static __inline pt_entry_t pte_load(pt_entry_t *ptep) { @@ -291,6 +289,7 @@ void pmap_bootstrap(vm_paddr_t *); 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); void pmap_kremove(vm_offset_t); void *pmap_mapdev(vm_paddr_t, vm_size_t); void pmap_unmapdev(vm_offset_t, vm_size_t); ==== //depot/projects/smpng/sys/amd64/isa/atpic.c#11 (text+ko) ==== @@ -32,7 +32,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/amd64/isa/atpic.c,v 1.16 2005/10/25 19:48:46 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/isa/atpic.c,v 1.17 2005/12/05 22:09:30 jhb Exp $"); #include "opt_auto_eoi.h" #include "opt_isa.h" @@ -453,6 +453,21 @@ struct atpic_intsrc *ai; int i; + /* + * If any of the ISA IRQs have an interrupt source already, then + * assume that the APICs are being used and don't register any + * of our interrupt sources. This makes sure we don't accidentally + * use mixed mode. The "accidental" use could otherwise occur on + * machines that route the ACPI SCI interrupt to a different ISA + * IRQ (at least one machines routes it to IRQ 13) thus disabling + * that APIC ISA routing and allowing the ATPIC source for that IRQ + * to leak through. We used to depend on this feature for routing + * IRQ0 via mixed mode, but now we don't use mixed mode at all. + */ + for (i = 0; i < NUM_ISA_IRQS; i++) + if (intr_lookup_source(i) != NULL) + return; + /* Loop through all interrupt sources and add them. */ for (i = 0, ai = atintrs; i < NUM_ISA_IRQS; i++, ai++) { if (i == ICU_SLAVEID) ==== //depot/projects/smpng/sys/arm/arm/cpufunc_asm_arm9.S#4 (text+ko) ==== @@ -1,7 +1,7 @@ -/* $NetBSD: cpufunc_asm_arm9.S,v 1.2 2002/01/29 15:27:29 rearnsha Exp $ */ +/* $NetBSD: cpufunc_asm_arm9.S,v 1.3 2004/01/26 15:54:16 rearnsha Exp $ */ -/*- - * Copyright (c) 2001 ARM Limited +/* + * Copyright (c) 2001, 2004 ARM Limited * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -29,11 +29,10 @@ * SUCH DAMAGE. * * ARM9 assembly functions for CPU / MMU / TLB specific operations - * */ #include <machine/asm.h> -__FBSDID("$FreeBSD: src/sys/arm/arm/cpufunc_asm_arm9.S,v 1.3 2005/01/05 21:58:47 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/arm/cpufunc_asm_arm9.S,v 1.4 2005/11/23 18:02:40 cognet Exp $"); /* * Functions to set the MMU Translation Table Base register @@ -42,17 +41,14 @@ * addresses that are about to change. */ ENTRY(arm9_setttb) - /* - * Since we use the caches in write-through mode, we only have to - * drain the write buffers and flush the caches. - */ - mcr p15, 0, r0, c7, c7, 0 /* flush I+D caches */ - mcr p15, 0, r0, c7, c10, 4 /* drain write buffer */ + stmfd sp!, {r0, lr} + bl _C_LABEL(arm9_idcache_wbinv_all) + ldmfd sp!, {r0, lr} >>> TRUNCATED FOR MAIL (1000 lines) <<<
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200512072212.jB7MClxI088965>