Date: Mon, 21 Jan 2008 18:58:47 GMT From: John Baldwin <jhb@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 133805 for review Message-ID: <200801211858.m0LIwlY2082525@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=133805 Change 133805 by jhb@jhb_zion on 2008/01/21 18:58:30 IFC @133798 Affected files ... .. //depot/projects/smpng/sys/amd64/amd64/machdep.c#68 integrate .. //depot/projects/smpng/sys/amd64/amd64/mp_watchdog.c#4 integrate .. //depot/projects/smpng/sys/amd64/amd64/pmap.c#77 integrate .. //depot/projects/smpng/sys/amd64/conf/GENERIC#60 integrate .. //depot/projects/smpng/sys/amd64/conf/NOTES#40 integrate .. //depot/projects/smpng/sys/amd64/include/_types.h#8 integrate .. //depot/projects/smpng/sys/amd64/include/float.h#7 integrate .. //depot/projects/smpng/sys/amd64/include/ieeefp.h#8 integrate .. //depot/projects/smpng/sys/amd64/include/pmap.h#27 integrate .. //depot/projects/smpng/sys/amd64/include/vmparam.h#11 integrate .. //depot/projects/smpng/sys/amd64/isa/clock.c#24 integrate .. //depot/projects/smpng/sys/arm/arm/pmap.c#41 integrate .. //depot/projects/smpng/sys/arm/arm/support.S#13 integrate .. //depot/projects/smpng/sys/arm/at91/if_ate.c#15 integrate .. //depot/projects/smpng/sys/arm/at91/kb920x_machdep.c#16 integrate .. //depot/projects/smpng/sys/arm/at91/uart_dev_at91usart.c#12 integrate .. //depot/projects/smpng/sys/arm/include/vmparam.h#10 integrate .. //depot/projects/smpng/sys/arm/xscale/ixp425/if_npe.c#6 integrate .. //depot/projects/smpng/sys/boot/arm/at91/boot2/bwct_board.c#2 integrate .. //depot/projects/smpng/sys/boot/arm/at91/libat91/spi_flash.c#5 integrate .. //depot/projects/smpng/sys/boot/forth/loader.conf.5#12 integrate .. //depot/projects/smpng/sys/boot/powerpc/ofw/Makefile#2 integrate .. //depot/projects/smpng/sys/cam/cam_xpt.c#48 integrate .. //depot/projects/smpng/sys/cam/scsi/scsi_da.c#80 integrate .. //depot/projects/smpng/sys/cam/scsi/scsi_low.h#6 integrate .. //depot/projects/smpng/sys/compat/freebsd32/freebsd32_proto.h#39 integrate .. //depot/projects/smpng/sys/compat/freebsd32/freebsd32_syscall.h#39 integrate .. //depot/projects/smpng/sys/compat/freebsd32/freebsd32_syscalls.c#39 integrate .. //depot/projects/smpng/sys/compat/freebsd32/freebsd32_sysent.c#39 integrate .. //depot/projects/smpng/sys/compat/freebsd32/syscalls.master#43 integrate .. //depot/projects/smpng/sys/compat/linprocfs/linprocfs.c#62 integrate .. //depot/projects/smpng/sys/compat/linux/linux_file.c#38 integrate .. //depot/projects/smpng/sys/compat/linux/linux_getcwd.c#25 integrate .. //depot/projects/smpng/sys/compat/linux/linux_misc.c#84 integrate .. //depot/projects/smpng/sys/compat/linux/linux_stats.c#38 integrate .. //depot/projects/smpng/sys/compat/ndis/subr_ndis.c#43 integrate .. //depot/projects/smpng/sys/compat/ndis/subr_ntoskrnl.c#44 integrate .. //depot/projects/smpng/sys/compat/opensolaris/kern/opensolaris_kobj.c#4 integrate .. //depot/projects/smpng/sys/compat/opensolaris/kern/opensolaris_vfs.c#5 integrate .. //depot/projects/smpng/sys/compat/opensolaris/sys/vnode.h#4 integrate .. //depot/projects/smpng/sys/compat/pecoff/imgact_pecoff.c#28 integrate .. //depot/projects/smpng/sys/compat/svr4/imgact_svr4.c#15 integrate .. //depot/projects/smpng/sys/compat/svr4/svr4_fcntl.c#25 integrate .. //depot/projects/smpng/sys/compat/svr4/svr4_misc.c#62 integrate .. //depot/projects/smpng/sys/compat/svr4/svr4_stream.c#43 integrate .. //depot/projects/smpng/sys/conf/NOTES#146 integrate .. //depot/projects/smpng/sys/conf/files#210 integrate .. //depot/projects/smpng/sys/conf/files.i386#108 integrate .. //depot/projects/smpng/sys/conf/options#145 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/evgpe.c#13 integrate .. //depot/projects/smpng/sys/contrib/opensolaris/uts/common/fs/gfs.c#4 integrate .. //depot/projects/smpng/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_ctldir.c#5 integrate .. //depot/projects/smpng/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_replay.c#3 integrate .. //depot/projects/smpng/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c#5 integrate .. //depot/projects/smpng/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c#6 integrate .. //depot/projects/smpng/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_znode.c#6 integrate .. //depot/projects/smpng/sys/crypto/rijndael/rijndael-api.c#2 integrate .. //depot/projects/smpng/sys/crypto/rijndael/test00.c#2 integrate .. //depot/projects/smpng/sys/ddb/db_capture.c#1 branch .. //depot/projects/smpng/sys/ddb/db_command.c#38 integrate .. //depot/projects/smpng/sys/ddb/db_command.h#4 integrate .. //depot/projects/smpng/sys/ddb/db_input.c#9 integrate .. //depot/projects/smpng/sys/ddb/db_lex.c#6 integrate .. //depot/projects/smpng/sys/ddb/db_lex.h#4 integrate .. //depot/projects/smpng/sys/ddb/db_main.c#5 integrate .. //depot/projects/smpng/sys/ddb/db_output.c#21 integrate .. //depot/projects/smpng/sys/ddb/db_script.c#1 branch .. //depot/projects/smpng/sys/ddb/db_textdump.c#1 branch .. //depot/projects/smpng/sys/ddb/ddb.h#24 integrate .. //depot/projects/smpng/sys/dev/acpica/Osd/OsdDebug.c#13 integrate .. //depot/projects/smpng/sys/dev/acpica/Osd/OsdSchedule.c#32 integrate .. //depot/projects/smpng/sys/dev/acpica/acpi_hpet.c#9 integrate .. //depot/projects/smpng/sys/dev/acpica/acpi_hpet.h#1 branch .. //depot/projects/smpng/sys/dev/acpica/acpi_thermal.c#41 integrate .. //depot/projects/smpng/sys/dev/an/if_an.c#55 integrate .. //depot/projects/smpng/sys/dev/an/if_an_pci.c#19 integrate .. //depot/projects/smpng/sys/dev/an/if_anreg.h#15 integrate .. //depot/projects/smpng/sys/dev/ata/ata-all.h#54 integrate .. //depot/projects/smpng/sys/dev/ata/ata-disk.c#66 integrate .. //depot/projects/smpng/sys/dev/ath/if_ath.c#54 integrate .. //depot/projects/smpng/sys/dev/atkbdc/atkbd.c#6 integrate .. //depot/projects/smpng/sys/dev/atkbdc/atkbd_atkbdc.c#3 integrate .. //depot/projects/smpng/sys/dev/bge/if_bge.c#95 integrate .. //depot/projects/smpng/sys/dev/bge/if_bgereg.h#56 integrate .. //depot/projects/smpng/sys/dev/coretemp/coretemp.c#2 integrate .. //depot/projects/smpng/sys/dev/cxgb/common/cxgb_t3_cpl.h#3 integrate .. //depot/projects/smpng/sys/dev/cxgb/cxgb_adapter.h#5 integrate .. //depot/projects/smpng/sys/dev/cxgb/cxgb_l2t.c#2 integrate .. //depot/projects/smpng/sys/dev/cxgb/cxgb_main.c#5 integrate .. //depot/projects/smpng/sys/dev/cxgb/cxgb_multiq.c#1 branch .. //depot/projects/smpng/sys/dev/cxgb/cxgb_osdep.h#4 integrate .. //depot/projects/smpng/sys/dev/cxgb/cxgb_sge.c#6 integrate .. //depot/projects/smpng/sys/dev/cxgb/sys/cxgb_support.c#2 integrate .. //depot/projects/smpng/sys/dev/cxgb/sys/mvec.h#4 integrate .. //depot/projects/smpng/sys/dev/cxgb/sys/uipc_mvec.c#4 integrate .. //depot/projects/smpng/sys/dev/dcons/dcons_os.c#11 integrate .. //depot/projects/smpng/sys/dev/drm/drm_drv.c#5 integrate .. //depot/projects/smpng/sys/dev/ed/if_ed_pci.c#15 integrate .. //depot/projects/smpng/sys/dev/ed/if_ed_rtl80x9.c#3 integrate .. //depot/projects/smpng/sys/dev/fb/creator.c#14 integrate .. //depot/projects/smpng/sys/dev/fb/fb.c#13 integrate .. //depot/projects/smpng/sys/dev/fb/fbreg.h#16 integrate .. //depot/projects/smpng/sys/dev/fb/machfb.c#6 integrate .. //depot/projects/smpng/sys/dev/fb/splash_bmp.c#3 integrate .. //depot/projects/smpng/sys/dev/fb/splash_pcx.c#2 integrate .. //depot/projects/smpng/sys/dev/fb/vga.c#23 integrate .. //depot/projects/smpng/sys/dev/fdc/fdc.c#31 integrate .. //depot/projects/smpng/sys/dev/gem/if_gem.c#33 integrate .. //depot/projects/smpng/sys/dev/gem/if_gem_pci.c#23 integrate .. //depot/projects/smpng/sys/dev/gem/if_gemreg.h#5 integrate .. //depot/projects/smpng/sys/dev/gem/if_gemvar.h#15 integrate .. //depot/projects/smpng/sys/dev/hptrr/hptrr_osm_bsd.c#2 integrate .. //depot/projects/smpng/sys/dev/hwpmc/hwpmc_mod.c#23 integrate .. //depot/projects/smpng/sys/dev/ichwd/ichwd.c#9 integrate .. //depot/projects/smpng/sys/dev/ichwd/ichwd.h#5 integrate .. //depot/projects/smpng/sys/dev/if_ndis/if_ndis.c#45 integrate .. //depot/projects/smpng/sys/dev/iir/iir.c#20 integrate .. //depot/projects/smpng/sys/dev/kbd/kbd.c#19 integrate .. //depot/projects/smpng/sys/dev/kbd/kbdreg.h#6 integrate .. //depot/projects/smpng/sys/dev/kbdmux/kbdmux.c#7 integrate .. //depot/projects/smpng/sys/dev/le/am7990.c#5 integrate .. //depot/projects/smpng/sys/dev/le/am79900.c#5 integrate .. //depot/projects/smpng/sys/dev/md/md.c#82 integrate .. //depot/projects/smpng/sys/dev/mii/brgphy.c#44 integrate .. //depot/projects/smpng/sys/dev/msk/if_msk.c#9 integrate .. //depot/projects/smpng/sys/dev/mxge/eth_z8e.h#2 integrate .. //depot/projects/smpng/sys/dev/mxge/ethp_z8e.h#2 integrate .. //depot/projects/smpng/sys/dev/mxge/if_mxge.c#19 integrate .. //depot/projects/smpng/sys/dev/mxge/if_mxge_var.h#8 integrate .. //depot/projects/smpng/sys/dev/mxge/mxge_lro.c#2 integrate .. //depot/projects/smpng/sys/dev/mxge/mxge_mcp.h#6 integrate .. //depot/projects/smpng/sys/dev/mxge/mxge_rss_eth_z8e.c#1 branch .. //depot/projects/smpng/sys/dev/mxge/mxge_rss_ethp_z8e.c#1 branch .. //depot/projects/smpng/sys/dev/mxge/rss_eth_z8e.h#1 branch .. //depot/projects/smpng/sys/dev/mxge/rss_ethp_z8e.h#1 branch .. //depot/projects/smpng/sys/dev/nfe/if_nfe.c#10 integrate .. //depot/projects/smpng/sys/dev/ofw/ofw_console.c#26 integrate .. //depot/projects/smpng/sys/dev/pci/pci_user.c#19 integrate .. //depot/projects/smpng/sys/dev/ppbus/ppbconf.c#6 integrate .. //depot/projects/smpng/sys/dev/ppbus/ppbconf.h#3 integrate .. //depot/projects/smpng/sys/dev/puc/pucdata.c#40 integrate .. //depot/projects/smpng/sys/dev/re/if_re.c#57 integrate .. //depot/projects/smpng/sys/dev/sf/if_sf.c#1 branch .. //depot/projects/smpng/sys/dev/sf/if_sfreg.h#1 branch .. //depot/projects/smpng/sys/dev/sf/starfire_rx.h#1 branch .. //depot/projects/smpng/sys/dev/sf/starfire_tx.h#1 branch .. //depot/projects/smpng/sys/dev/sio/sio.c#65 integrate .. //depot/projects/smpng/sys/dev/snp/snp.c#28 integrate .. //depot/projects/smpng/sys/dev/stge/if_stge.c#9 integrate .. //depot/projects/smpng/sys/dev/stge/if_stgereg.h#3 integrate .. //depot/projects/smpng/sys/dev/streams/streams.c#35 integrate .. //depot/projects/smpng/sys/dev/syscons/blank/blank_saver.c#2 integrate .. //depot/projects/smpng/sys/dev/syscons/daemon/daemon_saver.c#4 integrate .. //depot/projects/smpng/sys/dev/syscons/dragon/dragon_saver.c#3 integrate .. //depot/projects/smpng/sys/dev/syscons/fade/fade_saver.c#3 integrate .. //depot/projects/smpng/sys/dev/syscons/fire/fire_saver.c#5 integrate .. //depot/projects/smpng/sys/dev/syscons/green/green_saver.c#2 integrate .. //depot/projects/smpng/sys/dev/syscons/logo/logo_saver.c#6 integrate .. //depot/projects/smpng/sys/dev/syscons/rain/rain_saver.c#6 integrate .. //depot/projects/smpng/sys/dev/syscons/scgfbrndr.c#10 integrate .. //depot/projects/smpng/sys/dev/syscons/scvgarndr.c#10 integrate .. //depot/projects/smpng/sys/dev/syscons/scvidctl.c#12 integrate .. //depot/projects/smpng/sys/dev/syscons/snake/snake_saver.c#4 integrate .. //depot/projects/smpng/sys/dev/syscons/star/star_saver.c#3 integrate .. //depot/projects/smpng/sys/dev/syscons/syscons.c#60 integrate .. //depot/projects/smpng/sys/dev/syscons/syscons.h#18 integrate .. //depot/projects/smpng/sys/dev/syscons/warp/warp_saver.c#6 integrate .. //depot/projects/smpng/sys/dev/uart/uart_core.c#17 integrate .. //depot/projects/smpng/sys/dev/usb/ehci.c#29 integrate .. //depot/projects/smpng/sys/dev/usb/if_rum.c#3 integrate .. //depot/projects/smpng/sys/dev/usb/if_udav.c#19 integrate .. //depot/projects/smpng/sys/dev/usb/if_zyd.c#2 integrate .. //depot/projects/smpng/sys/dev/usb/ukbd.c#26 integrate .. //depot/projects/smpng/sys/dev/usb/ums.c#28 integrate .. //depot/projects/smpng/sys/dev/usb/usbdevs#107 integrate .. //depot/projects/smpng/sys/dev/vkbd/vkbd.c#11 integrate .. //depot/projects/smpng/sys/dev/wpi/if_wpi.c#2 integrate .. //depot/projects/smpng/sys/fs/cd9660/cd9660_lookup.c#2 integrate .. //depot/projects/smpng/sys/fs/cd9660/cd9660_vfsops.c#4 integrate .. //depot/projects/smpng/sys/fs/coda/cnode.h#2 integrate .. //depot/projects/smpng/sys/fs/coda/coda_namecache.h#2 integrate .. //depot/projects/smpng/sys/fs/coda/coda_psdev.c#2 integrate .. //depot/projects/smpng/sys/fs/coda/coda_vfsops.c#2 integrate .. //depot/projects/smpng/sys/fs/coda/coda_vnops.c#2 integrate .. //depot/projects/smpng/sys/fs/devfs/devfs_devs.c#27 integrate .. //depot/projects/smpng/sys/fs/devfs/devfs_vfsops.c#30 integrate .. //depot/projects/smpng/sys/fs/devfs/devfs_vnops.c#66 integrate .. //depot/projects/smpng/sys/fs/fdescfs/fdesc_vfsops.c#24 integrate .. //depot/projects/smpng/sys/fs/fdescfs/fdesc_vnops.c#27 integrate .. //depot/projects/smpng/sys/fs/fifofs/fifo_vnops.c#44 integrate .. //depot/projects/smpng/sys/fs/hpfs/hpfs_subr.h#4 integrate .. //depot/projects/smpng/sys/fs/hpfs/hpfs_vfsops.c#35 integrate .. //depot/projects/smpng/sys/fs/hpfs/hpfs_vnops.c#34 integrate .. //depot/projects/smpng/sys/fs/msdosfs/msdosfs_lookup.c#14 integrate .. //depot/projects/smpng/sys/fs/msdosfs/msdosfs_vfsops.c#55 integrate .. //depot/projects/smpng/sys/fs/msdosfs/msdosfs_vnops.c#41 integrate .. //depot/projects/smpng/sys/fs/ntfs/ntfs_subr.c#25 integrate .. //depot/projects/smpng/sys/fs/ntfs/ntfs_vfsops.c#37 integrate .. //depot/projects/smpng/sys/fs/ntfs/ntfs_vnops.c#29 integrate .. //depot/projects/smpng/sys/fs/nullfs/null_subr.c#18 integrate .. //depot/projects/smpng/sys/fs/nullfs/null_vfsops.c#28 integrate .. //depot/projects/smpng/sys/fs/nullfs/null_vnops.c#32 integrate .. //depot/projects/smpng/sys/fs/nwfs/nwfs_node.c#20 integrate .. //depot/projects/smpng/sys/fs/nwfs/nwfs_vfsops.c#26 integrate .. //depot/projects/smpng/sys/fs/nwfs/nwfs_vnops.c#17 integrate .. //depot/projects/smpng/sys/fs/portalfs/portal_vfsops.c#23 integrate .. //depot/projects/smpng/sys/fs/portalfs/portal_vnops.c#28 integrate .. //depot/projects/smpng/sys/fs/procfs/procfs.c#15 integrate .. //depot/projects/smpng/sys/fs/procfs/procfs_map.c#11 integrate .. //depot/projects/smpng/sys/fs/pseudofs/pseudofs_vncache.c#27 integrate .. //depot/projects/smpng/sys/fs/pseudofs/pseudofs_vnops.c#49 integrate .. //depot/projects/smpng/sys/fs/smbfs/smbfs_io.c#27 integrate .. //depot/projects/smpng/sys/fs/smbfs/smbfs_node.c#27 integrate .. //depot/projects/smpng/sys/fs/smbfs/smbfs_vfsops.c#38 integrate .. //depot/projects/smpng/sys/fs/smbfs/smbfs_vnops.c#38 integrate .. //depot/projects/smpng/sys/fs/tmpfs/tmpfs_subr.c#2 integrate .. //depot/projects/smpng/sys/fs/tmpfs/tmpfs_vfsops.c#2 integrate .. //depot/projects/smpng/sys/fs/tmpfs/tmpfs_vnops.c#2 integrate .. //depot/projects/smpng/sys/fs/udf/udf_vfsops.c#36 integrate .. //depot/projects/smpng/sys/fs/udf/udf_vnops.c#40 integrate .. //depot/projects/smpng/sys/fs/unionfs/union_subr.c#31 integrate .. //depot/projects/smpng/sys/fs/unionfs/union_vfsops.c#33 integrate .. //depot/projects/smpng/sys/fs/unionfs/union_vnops.c#37 integrate .. //depot/projects/smpng/sys/geom/part/g_part_bsd.c#2 integrate .. //depot/projects/smpng/sys/gnu/fs/ext2fs/ext2_lookup.c#4 integrate .. //depot/projects/smpng/sys/gnu/fs/ext2fs/ext2_vfsops.c#13 integrate .. //depot/projects/smpng/sys/gnu/fs/ext2fs/ext2_vnops.c#9 integrate .. //depot/projects/smpng/sys/gnu/fs/ext2fs/fs.h#3 integrate .. //depot/projects/smpng/sys/gnu/fs/reiserfs/reiserfs_inode.c#4 integrate .. //depot/projects/smpng/sys/gnu/fs/reiserfs/reiserfs_namei.c#5 integrate .. //depot/projects/smpng/sys/gnu/fs/reiserfs/reiserfs_vfsops.c#9 integrate .. //depot/projects/smpng/sys/gnu/fs/xfs/FreeBSD/xfs_buf.c#3 integrate .. //depot/projects/smpng/sys/gnu/fs/xfs/FreeBSD/xfs_buf.h#3 integrate .. //depot/projects/smpng/sys/gnu/fs/xfs/FreeBSD/xfs_freebsd_iget.c#3 integrate .. //depot/projects/smpng/sys/gnu/fs/xfs/FreeBSD/xfs_mountops.c#6 integrate .. //depot/projects/smpng/sys/gnu/fs/xfs/FreeBSD/xfs_super.c#4 integrate .. //depot/projects/smpng/sys/gnu/fs/xfs/FreeBSD/xfs_vnode.c#3 integrate .. //depot/projects/smpng/sys/gnu/fs/xfs/FreeBSD/xfs_vnops.c#4 integrate .. //depot/projects/smpng/sys/i386/conf/GENERIC#91 integrate .. //depot/projects/smpng/sys/i386/conf/GENERIC.hints#10 integrate .. //depot/projects/smpng/sys/i386/conf/NOTES#129 integrate .. //depot/projects/smpng/sys/i386/i386/machdep.c#129 integrate .. //depot/projects/smpng/sys/i386/i386/mp_watchdog.c#4 integrate .. //depot/projects/smpng/sys/i386/i386/pmap.c#121 integrate .. //depot/projects/smpng/sys/i386/ibcs2/ibcs2_misc.c#34 integrate .. //depot/projects/smpng/sys/i386/ibcs2/imgact_coff.c#24 integrate .. //depot/projects/smpng/sys/i386/include/ieeefp.h#5 integrate .. //depot/projects/smpng/sys/i386/include/pmap.h#38 integrate .. //depot/projects/smpng/sys/i386/include/vmparam.h#12 integrate .. //depot/projects/smpng/sys/i386/isa/clock.c#56 integrate .. //depot/projects/smpng/sys/i386/linux/imgact_linux.c#20 integrate .. //depot/projects/smpng/sys/i386/pci/pci_pir.c#12 integrate .. //depot/projects/smpng/sys/i386/xbox/xboxfb.c#6 integrate .. //depot/projects/smpng/sys/ia64/conf/GENERIC#58 integrate .. //depot/projects/smpng/sys/ia64/ia64/machdep.c#112 integrate .. //depot/projects/smpng/sys/ia64/ia64/pmap.c#87 integrate .. //depot/projects/smpng/sys/ia64/include/vmparam.h#15 integrate .. //depot/projects/smpng/sys/isa/vga_isa.c#15 integrate .. //depot/projects/smpng/sys/kern/genassym.sh#4 integrate .. //depot/projects/smpng/sys/kern/imgact_aout.c#31 integrate .. //depot/projects/smpng/sys/kern/imgact_elf.c#58 integrate .. //depot/projects/smpng/sys/kern/imgact_gzip.c#15 integrate .. //depot/projects/smpng/sys/kern/init_main.c#70 integrate .. //depot/projects/smpng/sys/kern/init_sysent.c#81 integrate .. //depot/projects/smpng/sys/kern/kern_acct.c#52 integrate .. //depot/projects/smpng/sys/kern/kern_alq.c#16 integrate .. //depot/projects/smpng/sys/kern/kern_clock.c#57 integrate .. //depot/projects/smpng/sys/kern/kern_cpu.c#11 integrate .. //depot/projects/smpng/sys/kern/kern_descrip.c#109 integrate .. //depot/projects/smpng/sys/kern/kern_event.c#53 integrate .. //depot/projects/smpng/sys/kern/kern_exec.c#108 integrate .. //depot/projects/smpng/sys/kern/kern_exit.c#126 integrate .. //depot/projects/smpng/sys/kern/kern_jail.c#51 integrate .. //depot/projects/smpng/sys/kern/kern_ktrace.c#64 integrate .. //depot/projects/smpng/sys/kern/kern_linker.c#90 integrate .. //depot/projects/smpng/sys/kern/kern_lock.c#65 integrate .. //depot/projects/smpng/sys/kern/kern_mib.c#34 integrate .. //depot/projects/smpng/sys/kern/kern_proc.c#91 integrate .. //depot/projects/smpng/sys/kern/kern_resource.c#74 integrate .. //depot/projects/smpng/sys/kern/kern_rwlock.c#19 integrate .. //depot/projects/smpng/sys/kern/kern_shutdown.c#68 integrate .. //depot/projects/smpng/sys/kern/kern_sig.c#135 integrate .. //depot/projects/smpng/sys/kern/kern_synch.c#119 integrate .. //depot/projects/smpng/sys/kern/kern_tc.c#44 integrate .. //depot/projects/smpng/sys/kern/kern_thread.c#103 integrate .. //depot/projects/smpng/sys/kern/kern_time.c#53 integrate .. //depot/projects/smpng/sys/kern/link_elf.c#44 integrate .. //depot/projects/smpng/sys/kern/link_elf_obj.c#18 integrate .. //depot/projects/smpng/sys/kern/sched_ule.c#79 integrate .. //depot/projects/smpng/sys/kern/subr_kdb.c#20 integrate .. //depot/projects/smpng/sys/kern/subr_lock.c#10 integrate .. //depot/projects/smpng/sys/kern/subr_smp.c#47 integrate .. //depot/projects/smpng/sys/kern/subr_witness.c#165 integrate .. //depot/projects/smpng/sys/kern/sys_generic.c#52 integrate .. //depot/projects/smpng/sys/kern/sys_pipe.c#60 integrate .. //depot/projects/smpng/sys/kern/sys_socket.c#28 integrate .. //depot/projects/smpng/sys/kern/syscalls.c#81 integrate .. //depot/projects/smpng/sys/kern/syscalls.master#87 integrate .. //depot/projects/smpng/sys/kern/systrace_args.c#8 integrate .. //depot/projects/smpng/sys/kern/tty.c#71 integrate .. //depot/projects/smpng/sys/kern/tty_cons.c#38 integrate .. //depot/projects/smpng/sys/kern/tty_pty.c#50 integrate .. //depot/projects/smpng/sys/kern/uipc_debug.c#3 integrate .. //depot/projects/smpng/sys/kern/uipc_mbuf.c#56 integrate .. //depot/projects/smpng/sys/kern/uipc_mqueue.c#15 integrate .. //depot/projects/smpng/sys/kern/uipc_sem.c#25 integrate .. //depot/projects/smpng/sys/kern/uipc_shm.c#1 branch .. //depot/projects/smpng/sys/kern/uipc_syscalls.c#108 integrate .. //depot/projects/smpng/sys/kern/uipc_usrreq.c#80 integrate .. //depot/projects/smpng/sys/kern/vfs_acl.c#3 integrate .. //depot/projects/smpng/sys/kern/vfs_aio.c#79 integrate .. //depot/projects/smpng/sys/kern/vfs_bio.c#106 integrate .. //depot/projects/smpng/sys/kern/vfs_cache.c#36 integrate .. //depot/projects/smpng/sys/kern/vfs_default.c#51 integrate .. //depot/projects/smpng/sys/kern/vfs_extattr.c#3 integrate .. //depot/projects/smpng/sys/kern/vfs_lookup.c#45 integrate .. //depot/projects/smpng/sys/kern/vfs_mount.c#75 integrate .. //depot/projects/smpng/sys/kern/vfs_subr.c#144 integrate .. //depot/projects/smpng/sys/kern/vfs_syscalls.c#131 integrate .. //depot/projects/smpng/sys/kern/vfs_vnops.c#81 integrate .. //depot/projects/smpng/sys/kern/vnode_if.src#33 integrate .. //depot/projects/smpng/sys/modules/cxgb/cxgb/Makefile#2 integrate .. //depot/projects/smpng/sys/modules/mxge/Makefile#2 integrate .. //depot/projects/smpng/sys/modules/mxge/mxge_rss_eth_z8e/Makefile#1 branch .. //depot/projects/smpng/sys/modules/mxge/mxge_rss_ethp_z8e/Makefile#1 branch .. //depot/projects/smpng/sys/modules/sf/Makefile#3 integrate .. //depot/projects/smpng/sys/net/bpf.c#71 integrate .. //depot/projects/smpng/sys/net/bpf.h#22 integrate .. //depot/projects/smpng/sys/net/bpf_filter.c#12 integrate .. //depot/projects/smpng/sys/net/ieee8023ad_lacp.c#10 integrate .. //depot/projects/smpng/sys/net/ieee8023ad_lacp.h#7 integrate .. //depot/projects/smpng/sys/net/if_bridge.c#47 integrate .. //depot/projects/smpng/sys/net/if_enc.c#8 integrate .. //depot/projects/smpng/sys/net/if_lagg.c#9 integrate .. //depot/projects/smpng/sys/net/netisr.h#10 integrate .. //depot/projects/smpng/sys/net/route.c#33 integrate .. //depot/projects/smpng/sys/net/route.h#25 integrate .. //depot/projects/smpng/sys/netgraph/ng_base.c#51 integrate .. //depot/projects/smpng/sys/netgraph/ng_pppoe.c#32 integrate .. //depot/projects/smpng/sys/netgraph/ng_pppoe.h#14 integrate .. //depot/projects/smpng/sys/netgraph/ng_socket.c#45 integrate .. //depot/projects/smpng/sys/netinet/if_ether.c#57 integrate .. //depot/projects/smpng/sys/netinet/if_ether.h#10 integrate .. //depot/projects/smpng/sys/netinet/in_pcb.c#77 integrate .. //depot/projects/smpng/sys/netinet/ip_dummynet.c#48 integrate .. //depot/projects/smpng/sys/netinet/tcp_usrreq.c#65 integrate .. //depot/projects/smpng/sys/netinet6/frag6.c#15 integrate .. //depot/projects/smpng/sys/netinet6/icmp6.c#41 integrate .. //depot/projects/smpng/sys/netinet6/in6.c#41 integrate .. //depot/projects/smpng/sys/netinet6/in6_ifattach.c#22 integrate .. //depot/projects/smpng/sys/netinet6/in6_pcb.c#51 integrate .. //depot/projects/smpng/sys/netinet6/in6_proto.c#22 integrate .. //depot/projects/smpng/sys/netinet6/in6_rmx.c#12 integrate .. //depot/projects/smpng/sys/netinet6/in6_src.c#32 integrate .. //depot/projects/smpng/sys/netinet6/ip6_input.c#50 integrate .. //depot/projects/smpng/sys/netinet6/ip6_mroute.c#32 integrate .. //depot/projects/smpng/sys/netinet6/ip6_output.c#49 integrate .. //depot/projects/smpng/sys/netinet6/mld6.c#22 integrate .. //depot/projects/smpng/sys/netinet6/nd6.c#43 integrate .. //depot/projects/smpng/sys/netinet6/nd6_nbr.c#27 integrate .. //depot/projects/smpng/sys/netinet6/nd6_rtr.c#20 integrate .. //depot/projects/smpng/sys/netinet6/raw_ip6.c#46 integrate .. //depot/projects/smpng/sys/netinet6/udp6_usrreq.c#45 integrate .. //depot/projects/smpng/sys/nfs4client/nfs4_vfsops.c#20 integrate .. //depot/projects/smpng/sys/nfs4client/nfs4_vnops.c#24 integrate .. //depot/projects/smpng/sys/nfsclient/nfs_socket.c#53 integrate .. //depot/projects/smpng/sys/nfsclient/nfs_subs.c#32 integrate .. //depot/projects/smpng/sys/nfsclient/nfs_vfsops.c#61 integrate .. //depot/projects/smpng/sys/nfsclient/nfs_vnops.c#68 integrate .. //depot/projects/smpng/sys/nfsserver/nfs_serv.c#54 integrate .. //depot/projects/smpng/sys/nfsserver/nfs_srvsubs.c#41 integrate .. //depot/projects/smpng/sys/opencrypto/cryptodev.c#25 integrate .. //depot/projects/smpng/sys/pc98/cbus/gdc.c#4 integrate .. //depot/projects/smpng/sys/pc98/cbus/pckbd.c#5 integrate .. //depot/projects/smpng/sys/pc98/cbus/scgdcrndr.c#3 integrate .. //depot/projects/smpng/sys/pc98/cbus/sio.c#11 integrate .. //depot/projects/smpng/sys/pc98/conf/GENERIC#72 integrate .. //depot/projects/smpng/sys/pc98/pc98/machdep.c#25 integrate .. //depot/projects/smpng/sys/pci/amdsmb.c#5 integrate .. //depot/projects/smpng/sys/pci/if_rlreg.h#38 integrate .. //depot/projects/smpng/sys/pci/if_sf.c#47 delete .. //depot/projects/smpng/sys/pci/if_sfreg.h#12 delete .. //depot/projects/smpng/sys/pci/nfsmb.c#7 integrate .. //depot/projects/smpng/sys/powerpc/aim/machdep.c#2 integrate .. //depot/projects/smpng/sys/powerpc/conf/GENERIC#45 integrate .. //depot/projects/smpng/sys/powerpc/include/vmparam.h#8 integrate .. //depot/projects/smpng/sys/powerpc/powermac/grackle.c#10 integrate .. //depot/projects/smpng/sys/powerpc/powermac/macio.c#14 integrate .. //depot/projects/smpng/sys/powerpc/powermac/pswitch.c#6 integrate .. //depot/projects/smpng/sys/powerpc/powermac/uninorth.c#14 integrate .. //depot/projects/smpng/sys/powerpc/powerpc/pmap_dispatch.c#10 integrate .. //depot/projects/smpng/sys/powerpc/psim/iobus.c#10 integrate .. //depot/projects/smpng/sys/security/audit/audit_arg.c#11 integrate .. //depot/projects/smpng/sys/security/audit/audit_bsm.c#8 integrate .. //depot/projects/smpng/sys/security/audit/audit_bsm_klib.c#7 integrate .. //depot/projects/smpng/sys/security/audit/audit_pipe.c#8 integrate .. //depot/projects/smpng/sys/security/audit/audit_syscalls.c#12 integrate .. //depot/projects/smpng/sys/security/audit/audit_worker.c#6 integrate .. //depot/projects/smpng/sys/security/mac/mac_framework.h#9 integrate .. //depot/projects/smpng/sys/security/mac/mac_policy.h#6 integrate .. //depot/projects/smpng/sys/security/mac/mac_posix_shm.c#1 branch .. //depot/projects/smpng/sys/security/mac/mac_process.c#15 integrate .. //depot/projects/smpng/sys/security/mac/mac_syscalls.c#4 integrate .. //depot/projects/smpng/sys/security/mac_stub/mac_stub.c#24 integrate .. //depot/projects/smpng/sys/security/mac_test/mac_test.c#40 integrate .. //depot/projects/smpng/sys/sparc64/conf/GENERIC#79 integrate .. //depot/projects/smpng/sys/sparc64/include/vmparam.h#16 integrate .. //depot/projects/smpng/sys/sparc64/pci/psycho.c#44 integrate .. //depot/projects/smpng/sys/sparc64/sparc64/machdep.c#88 integrate .. //depot/projects/smpng/sys/sparc64/sparc64/pmap.c#72 integrate .. //depot/projects/smpng/sys/sparc64/sparc64/trap.c#78 integrate .. //depot/projects/smpng/sys/sparc64/sparc64/tsb.c#26 integrate .. //depot/projects/smpng/sys/sun4v/include/vmparam.h#5 integrate .. //depot/projects/smpng/sys/sun4v/sun4v/hvcons.c#6 integrate .. //depot/projects/smpng/sys/sun4v/sun4v/machdep.c#7 integrate .. //depot/projects/smpng/sys/sun4v/sun4v/pmap.c#13 integrate .. //depot/projects/smpng/sys/sun4v/sun4v/trap.c#9 integrate .. //depot/projects/smpng/sys/sys/buf.h#47 integrate .. //depot/projects/smpng/sys/sys/copyright.h#11 integrate .. //depot/projects/smpng/sys/sys/fcntl.h#7 integrate .. //depot/projects/smpng/sys/sys/file.h#27 integrate .. //depot/projects/smpng/sys/sys/kdb.h#5 integrate .. //depot/projects/smpng/sys/sys/kernel.h#38 integrate .. //depot/projects/smpng/sys/sys/kerneldump.h#9 integrate .. //depot/projects/smpng/sys/sys/lockmgr.h#22 integrate .. //depot/projects/smpng/sys/sys/mbuf.h#73 integrate .. //depot/projects/smpng/sys/sys/mman.h#11 integrate .. //depot/projects/smpng/sys/sys/param.h#120 integrate .. //depot/projects/smpng/sys/sys/pmc.h#9 integrate .. //depot/projects/smpng/sys/sys/priv.h#8 integrate .. //depot/projects/smpng/sys/sys/proc.h#182 integrate .. //depot/projects/smpng/sys/sys/signal.h#27 integrate .. //depot/projects/smpng/sys/sys/syscall.h#80 integrate .. //depot/projects/smpng/sys/sys/syscall.mk#80 integrate .. //depot/projects/smpng/sys/sys/syscallsubr.h#52 integrate .. //depot/projects/smpng/sys/sys/sysctl.h#46 integrate .. //depot/projects/smpng/sys/sys/sysproto.h#84 integrate .. //depot/projects/smpng/sys/sys/time.h#24 integrate .. //depot/projects/smpng/sys/sys/tree.h#9 integrate .. //depot/projects/smpng/sys/sys/unpcb.h#13 integrate .. //depot/projects/smpng/sys/sys/user.h#29 integrate .. //depot/projects/smpng/sys/sys/vnode.h#82 integrate .. //depot/projects/smpng/sys/ufs/ffs/ffs_balloc.c#19 integrate .. //depot/projects/smpng/sys/ufs/ffs/ffs_rawread.c#20 integrate .. //depot/projects/smpng/sys/ufs/ffs/ffs_snapshot.c#64 integrate .. //depot/projects/smpng/sys/ufs/ffs/ffs_softdep.c#66 integrate .. //depot/projects/smpng/sys/ufs/ffs/ffs_vfsops.c#96 integrate .. //depot/projects/smpng/sys/ufs/ffs/ffs_vnops.c#55 integrate .. //depot/projects/smpng/sys/ufs/ufs/ufs_extattr.c#41 integrate .. //depot/projects/smpng/sys/ufs/ufs/ufs_lookup.c#29 integrate .. //depot/projects/smpng/sys/ufs/ufs/ufs_quota.c#40 integrate .. //depot/projects/smpng/sys/ufs/ufs/ufs_vnops.c#65 integrate .. //depot/projects/smpng/sys/vm/pmap.h#35 integrate .. //depot/projects/smpng/sys/vm/swap_pager.c#73 integrate .. //depot/projects/smpng/sys/vm/vm.h#11 integrate .. //depot/projects/smpng/sys/vm/vm_contig.c#45 integrate .. //depot/projects/smpng/sys/vm/vm_fault.c#69 integrate .. //depot/projects/smpng/sys/vm/vm_kern.c#39 integrate .. //depot/projects/smpng/sys/vm/vm_map.c#88 integrate .. //depot/projects/smpng/sys/vm/vm_mmap.c#64 integrate .. //depot/projects/smpng/sys/vm/vm_object.c#96 integrate .. //depot/projects/smpng/sys/vm/vm_object.h#34 integrate .. //depot/projects/smpng/sys/vm/vm_page.c#95 integrate .. //depot/projects/smpng/sys/vm/vm_phys.c#3 integrate .. //depot/projects/smpng/sys/vm/vm_reserv.c#1 branch .. //depot/projects/smpng/sys/vm/vm_reserv.h#1 branch .. //depot/projects/smpng/sys/vm/vnode_pager.c#64 integrate Differences ... ==== //depot/projects/smpng/sys/amd64/amd64/machdep.c#68 (text+ko) ==== @@ -39,7 +39,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/amd64/amd64/machdep.c,v 1.679 2007/12/12 20:24:06 rpaulo Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/machdep.c,v 1.680 2007/12/25 17:51:55 rwatson Exp $"); #include "opt_atalk.h" #include "opt_atpic.h" @@ -1277,7 +1277,8 @@ #ifdef KDB if (boothowto & RB_KDB) - kdb_enter("Boot flags requested debugger"); + kdb_enter(KDB_WHY_BOOTFLAGS, + "Boot flags requested debugger"); #endif identify_cpu(); /* Final stage of CPU initialization */ ==== //depot/projects/smpng/sys/amd64/amd64/mp_watchdog.c#4 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/amd64/amd64/mp_watchdog.c,v 1.5 2007/06/04 23:56:33 jeff Exp $ + * $FreeBSD: src/sys/amd64/amd64/mp_watchdog.c,v 1.6 2007/12/25 17:51:55 rwatson Exp $ */ #include "opt_mp_watchdog.h" @@ -203,7 +203,7 @@ if (watchdog_nmi) watchdog_ipi_nmi(); else - kdb_enter("mp_watchdog"); + kdb_enter(KDB_WHY_WATCHDOG, "mp_watchdog"); } } bcopy(old_pcomm, p->p_comm, MAXCOMLEN + 1); ==== //depot/projects/smpng/sys/amd64/amd64/pmap.c#77 (text+ko) ==== @@ -77,7 +77,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.599 2007/12/09 21:00:35 alc Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.605 2008/01/17 18:25:51 alc Exp $"); /* * Manages physical address maps. @@ -149,11 +149,7 @@ #define PMAP_SHPGPERPROC 200 #endif -#if defined(DIAGNOSTIC) -#define PMAP_DIAGNOSTIC -#endif - -#if !defined(PMAP_DIAGNOSTIC) +#if !defined(DIAGNOSTIC) #define PMAP_INLINE __gnu89_inline #else #define PMAP_INLINE @@ -614,7 +610,6 @@ { TAILQ_INIT(&m->md.pv_list); - m->md.pv_list_count = 0; } /* @@ -1554,7 +1549,7 @@ /* We need a new PDP entry */ nkpg = vm_page_alloc(NULL, nkpt, VM_ALLOC_NOOBJ | VM_ALLOC_SYSTEM | VM_ALLOC_WIRED); - if (!nkpg) + if (nkpg == NULL) panic("pmap_growkernel: no memory to grow kernel"); pmap_zero_page(nkpg); paddr = VM_PAGE_TO_PHYS(nkpg); @@ -1572,12 +1567,9 @@ continue; } - /* - * This index is bogus, but out of the way - */ - nkpg = vm_page_alloc(NULL, nkpt, + nkpg = vm_page_alloc(NULL, pmap_pde_pindex(kernel_vm_end), VM_ALLOC_NOOBJ | VM_ALLOC_SYSTEM | VM_ALLOC_WIRED); - if (!nkpg) + if (nkpg == NULL) panic("pmap_growkernel: no memory to grow kernel"); nkpt++; @@ -1702,7 +1694,6 @@ TAILQ_REMOVE(&m->md.pv_list, pv, pv_list); if (TAILQ_EMPTY(&m->md.pv_list)) vm_page_flag_clear(m, PG_WRITEABLE); - m->md.pv_list_count--; free_pv_entry(pmap, pv); if (pmap != locked_pmap) PMAP_UNLOCK(pmap); @@ -1850,7 +1841,6 @@ } KASSERT(pv != NULL, ("pmap_remove_entry: pv not found")); TAILQ_REMOVE(&m->md.pv_list, pv, pv_list); - m->md.pv_list_count--; if (TAILQ_EMPTY(&m->md.pv_list)) vm_page_flag_clear(m, PG_WRITEABLE); free_pv_entry(pmap, pv); @@ -1870,7 +1860,6 @@ pv = get_pv_entry(pmap, FALSE); pv->pv_va = va; TAILQ_INSERT_TAIL(&m->md.pv_list, pv, pv_list); - m->md.pv_list_count++; } /* @@ -1887,7 +1876,6 @@ (pv = get_pv_entry(pmap, TRUE)) != NULL) { pv->pv_va = va; TAILQ_INSERT_TAIL(&m->md.pv_list, pv, pv_list); - m->md.pv_list_count++; return (TRUE); } else return (FALSE); @@ -2083,15 +2071,8 @@ pd_entry_t ptepde; vm_page_t free; -#if defined(PMAP_DIAGNOSTIC) - /* - * XXX This makes pmap_remove_all() illegal for non-managed pages! - */ - if (m->flags & PG_FICTITIOUS) { - panic("pmap_remove_all: illegal for unmanaged page, va: 0x%lx", - VM_PAGE_TO_PHYS(m)); - } -#endif + KASSERT((m->flags & PG_FICTITIOUS) == 0, + ("pmap_remove_all: page %p is fictitious", m)); mtx_assert(&vm_page_queue_mtx, MA_OWNED); while ((pv = TAILQ_FIRST(&m->md.pv_list)) != NULL) { pmap = PV_PMAP(pv); @@ -2121,7 +2102,6 @@ pmap_invalidate_page(pmap, pv->pv_va); pmap_free_zero_pages(free); TAILQ_REMOVE(&m->md.pv_list, pv, pv_list); - m->md.pv_list_count--; free_pv_entry(pmap, pv); PMAP_UNLOCK(pmap); } @@ -2253,8 +2233,8 @@ * insert this page into the given map NOW. */ void -pmap_enter(pmap_t pmap, vm_offset_t va, vm_page_t m, vm_prot_t prot, - boolean_t wired) +pmap_enter(pmap_t pmap, vm_offset_t va, vm_prot_t access, vm_page_t m, + vm_prot_t prot, boolean_t wired) { vm_paddr_t pa; pd_entry_t *pde; @@ -2265,12 +2245,9 @@ boolean_t invlva; va = trunc_page(va); -#ifdef PMAP_DIAGNOSTIC - if (va > VM_MAX_KERNEL_ADDRESS) - panic("pmap_enter: toobig"); - if ((va >= UPT_MIN_ADDRESS) && (va < UPT_MAX_ADDRESS)) - panic("pmap_enter: invalid to pmap_enter page table pages (va: 0x%lx)", va); -#endif + KASSERT(va <= VM_MAX_KERNEL_ADDRESS, ("pmap_enter: toobig")); + KASSERT(va < UPT_MIN_ADDRESS || va >= UPT_MAX_ADDRESS, + ("pmap_enter: invalid to pmap_enter page table pages (va: 0x%lx)", va)); mpte = NULL; @@ -2284,19 +2261,9 @@ if (va < VM_MAXUSER_ADDRESS) { mpte = pmap_allocpte(pmap, va, M_WAITOK); } -#if 0 && defined(PMAP_DIAGNOSTIC) - else { - pd_entry_t *pdeaddr = pmap_pde(pmap, va); - origpte = *pdeaddr; - if ((origpte & PG_V) == 0) { - panic("pmap_enter: invalid kernel page table page, pde=%p, va=%p\n", - origpte, va); - } - } -#endif pde = pmap_pde(pmap, va); - if (pde != NULL) { + if (pde != NULL && (*pde & PG_V) != 0) { if ((*pde & PG_PS) != 0) panic("pmap_enter: attempted pmap_enter on 2MB page"); pte = pmap_pde_to_pte(pde, va); @@ -2307,7 +2274,7 @@ * Page Directory table entry not valid, we need a new PT page */ if (pte == NULL) - panic("pmap_enter: invalid page directory va=%#lx\n", va); + panic("pmap_enter: invalid page directory va=%#lx", va); pa = VM_PAGE_TO_PHYS(m); om = NULL; @@ -2761,8 +2728,8 @@ pdp_entry_t *pdpe; pd_entry_t srcptepaddr, *pde; - if (addr >= UPT_MIN_ADDRESS) - panic("pmap_copy: invalid to pmap_copy page tables"); + KASSERT(addr < UPT_MIN_ADDRESS, + ("pmap_copy: invalid to pmap_copy page tables")); pml4e = pmap_pml4e(src_pmap, addr); if ((*pml4e & PG_V) == 0) { @@ -2800,8 +2767,8 @@ } srcmpte = PHYS_TO_VM_PAGE(srcptepaddr & PG_FRAME); - if (srcmpte->wire_count == 0) - panic("pmap_copy: source page table page is unused"); + KASSERT(srcmpte->wire_count > 0, + ("pmap_copy: source page table page is unused")); if (va_next > end_addr) va_next = end_addr; @@ -3048,7 +3015,6 @@ PV_STAT(pv_entry_spare++); pv_entry_count--; pc->pc_map[field] |= bitmask; - m->md.pv_list_count--; TAILQ_REMOVE(&m->md.pv_list, pv, pv_list); if (TAILQ_EMPTY(&m->md.pv_list)) vm_page_flag_clear(m, PG_WRITEABLE); @@ -3121,7 +3087,7 @@ PMAP_LOCK(pmap); pde = pmap_pde(pmap, addr); if (pde != NULL && (*pde & PG_V)) { - pte = vtopte(addr); + pte = pmap_pde_to_pte(pde, addr); rv = (*pte & PG_V) == 0; } PMAP_UNLOCK(pmap); ==== //depot/projects/smpng/sys/amd64/conf/GENERIC#60 (text+ko) ==== @@ -16,7 +16,7 @@ # If you are in doubt as to the purpose or necessity of a line, check first # in NOTES. # -# $FreeBSD: src/sys/amd64/conf/GENERIC,v 1.490 2007/12/15 00:56:16 scottl Exp $ +# $FreeBSD: src/sys/amd64/conf/GENERIC,v 1.491 2008/01/07 21:40:09 jhb Exp $ cpu HAMMER ident GENERIC @@ -52,6 +52,7 @@ options COMPAT_FREEBSD4 # Compatible with FreeBSD4 options COMPAT_FREEBSD5 # Compatible with FreeBSD5 options COMPAT_FREEBSD6 # Compatible with FreeBSD6 +options COMPAT_FREEBSD7 # Compatible with FreeBSD7 options SCSI_DELAY=5000 # Delay (in ms) before probing SCSI options KTRACE # ktrace(1) support options STACK # stack(9) support ==== //depot/projects/smpng/sys/amd64/conf/NOTES#40 (text+ko) ==== @@ -4,7 +4,7 @@ # This file contains machine dependent kernel configuration notes. For # machine independent notes, look in /sys/conf/NOTES. # -# $FreeBSD: src/sys/amd64/conf/NOTES,v 1.73 2007/12/15 00:56:16 scottl Exp $ +# $FreeBSD: src/sys/amd64/conf/NOTES,v 1.74 2007/12/28 22:50:04 rpaulo Exp $ # # @@ -411,6 +411,7 @@ # vpd: Vital Product Data kernel interface # cy: Cyclades serial driver # digi: Digiboard driver +# asmc: Apple System Management Controller # Notes on the Specialix SI/XIO driver: # The host card is memory, not IO mapped. @@ -436,7 +437,7 @@ hint.pbio.0.port="0x360" device smbios device vpd - +device asmc # # Laptop/Notebook options: # ==== //depot/projects/smpng/sys/amd64/include/_types.h#8 (text+ko) ==== @@ -33,7 +33,7 @@ * * From: @(#)ansi.h 8.2 (Berkeley) 1/4/94 * From: @(#)types.h 8.3 (Berkeley) 1/5/94 - * $FreeBSD: src/sys/amd64/include/_types.h,v 1.11 2006/01/09 06:05:56 imp Exp $ + * $FreeBSD: src/sys/amd64/include/_types.h,v 1.12 2008/01/17 13:12:46 bde Exp $ */ #ifndef _MACHINE__TYPES_H_ @@ -64,7 +64,7 @@ typedef unsigned int __cpumask_t; typedef __int64_t __critical_t; typedef double __double_t; -typedef double __float_t; +typedef float __float_t; typedef __int64_t __intfptr_t; typedef __int64_t __intmax_t; typedef __int64_t __intptr_t; ==== //depot/projects/smpng/sys/amd64/include/float.h#7 (text+ko) ==== @@ -27,7 +27,7 @@ * SUCH DAMAGE. * * from: @(#)float.h 7.1 (Berkeley) 5/8/90 - * $FreeBSD: src/sys/amd64/include/float.h,v 1.15 2005/01/05 20:17:20 imp Exp $ + * $FreeBSD: src/sys/amd64/include/float.h,v 1.16 2008/01/17 13:12:46 bde Exp $ */ #ifndef _MACHINE_FLOAT_H_ @@ -42,7 +42,7 @@ #define FLT_RADIX 2 /* b */ #define FLT_ROUNDS __flt_rounds() #if __ISO_C_VISIBLE >= 1999 -#define FLT_EVAL_METHOD (-1) /* i387 semantics are...interesting */ +#define FLT_EVAL_METHOD 0 /* no promotions */ #define DECIMAL_DIG 21 /* max precision in decimal digits */ #endif ==== //depot/projects/smpng/sys/amd64/include/ieeefp.h#8 (text+ko) ==== @@ -32,32 +32,33 @@ * SUCH DAMAGE. * * from: @(#) ieeefp.h 1.0 (Berkeley) 9/23/93 - * $FreeBSD: src/sys/amd64/include/ieeefp.h,v 1.14 2005/04/12 23:12:00 jhb Exp $ + * $FreeBSD: src/sys/amd64/include/ieeefp.h,v 1.19 2008/01/11 17:11:32 bde Exp $ */ +#ifndef _MACHINE_IEEEFP_H_ +#define _MACHINE_IEEEFP_H_ + /* - * IEEE floating point type and constant definitions. + * IEEE floating point type, constant and function definitions. + * XXX: {FP,SSE}*FLD and {FP,SSE}*OFF are undocumented pollution. */ -#ifndef _MACHINE_IEEEFP_H_ -#define _MACHINE_IEEEFP_H_ - #ifndef _SYS_CDEFS_H_ #error this file needs sys/cdefs.h as a prerequisite #endif /* - * FP rounding modes + * Rounding modes. */ typedef enum { FP_RN=0, /* round to nearest */ - FP_RM, /* round down to minus infinity */ - FP_RP, /* round up to plus infinity */ + FP_RM, /* round down towards minus infinity */ + FP_RP, /* round up towards plus infinity */ FP_RZ /* truncate */ } fp_rnd_t; /* - * FP precision modes + * Precision (i.e., rounding precision) modes. */ typedef enum { FP_PS=0, /* 24 bit (single-precision) */ @@ -69,7 +70,7 @@ #define fp_except_t int /* - * FP exception masks + * Exception bit masks. */ #define FP_X_INV 0x01 /* invalid operation */ #define FP_X_DNML 0x02 /* denormal */ @@ -80,23 +81,19 @@ #define FP_X_STK 0x40 /* stack fault */ /* - * FP registers + * FPU control word bit-field masks. */ -#define FP_MSKS_REG 0 /* exception masks */ -#define FP_PRC_REG 0 /* precision */ -#define FP_RND_REG 0 /* direction */ -#define FP_STKY_REG 1 /* sticky flags */ +#define FP_MSKS_FLD 0x3f /* exception masks field */ +#define FP_PRC_FLD 0x300 /* precision control field */ +#define FP_RND_FLD 0xc00 /* rounding control field */ /* - * FP register bit field masks + * FPU status word bit-field masks. */ -#define FP_MSKS_FLD 0x3f /* exception masks field */ -#define FP_PRC_FLD 0x300 /* precision control field */ -#define FP_RND_FLD 0xc00 /* round control field */ #define FP_STKY_FLD 0x3f /* sticky flags field */ /* - * SSE mxcsr register bit field masks + * SSE mxcsr register bit-field masks. */ #define SSE_STKY_FLD 0x3f /* exception flags */ #define SSE_DAZ_FLD 0x40 /* Denormals are zero */ @@ -105,15 +102,19 @@ #define SSE_FZ_FLD 0x8000 /* flush to zero on underflow */ /* - * FP register bit field offsets + * FPU control word bit-field offsets (shift counts). */ #define FP_MSKS_OFF 0 /* exception masks offset */ #define FP_PRC_OFF 8 /* precision control offset */ -#define FP_RND_OFF 10 /* round control offset */ +#define FP_RND_OFF 10 /* rounding control offset */ + +/* + * FPU status word bit-field offsets (shift counts). + */ #define FP_STKY_OFF 0 /* sticky flags offset */ /* - * SSE mxcsr register bit field offsets + * SSE mxcsr register bit-field offsets (shift counts). */ #define SSE_STKY_OFF 0 /* exception flags offset */ #define SSE_DAZ_OFF 6 /* DAZ exception mask offset */ @@ -121,18 +122,45 @@ #define SSE_RND_OFF 13 /* rounding control offset */ #define SSE_FZ_OFF 15 /* flush to zero offset */ -#if defined(__GNUCLIKE_ASM) && defined(__CC_SUPPORTS___INLINE__) \ - && !defined(__cplusplus) +#ifdef __GNUCLIKE_ASM +#define __fldcw(addr) __asm __volatile("fldcw %0" : : "m" (*(addr))) #define __fldenv(addr) __asm __volatile("fldenv %0" : : "m" (*(addr))) +#define __fnstcw(addr) __asm __volatile("fnstcw %0" : "=m" (*(addr))) #define __fnstenv(addr) __asm __volatile("fnstenv %0" : "=m" (*(addr))) -#define __fldcw(addr) __asm __volatile("fldcw %0" : : "m" (*(addr))) -#define __fnstcw(addr) __asm __volatile("fnstcw %0" : "=m" (*(addr))) #define __fnstsw(addr) __asm __volatile("fnstsw %0" : "=m" (*(addr))) #define __ldmxcsr(addr) __asm __volatile("ldmxcsr %0" : : "m" (*(addr))) #define __stmxcsr(addr) __asm __volatile("stmxcsr %0" : "=m" (*(addr))) /* + * Load the control word. Be careful not to trap if there is a currently + * unmasked exception (ones that will become freshly unmasked are not a + * problem). This case must be handled by a save/restore of the + * environment or even of the full x87 state. Accessing the environment + * is very inefficient, so only do it when necessary. + */ +static __inline void +__fnldcw(unsigned short _cw, unsigned short _newcw) +{ + struct { + unsigned _cw; + unsigned _other[6]; + } _env; + unsigned short _sw; + + if ((_cw & FP_MSKS_FLD) != FP_MSKS_FLD) { + __fnstsw(&_sw); + if (((_sw & ~_cw) & FP_STKY_FLD) != 0) { + __fnstenv(&_env); + _env._cw = _newcw; + __fldenv(&_env); + return; + } + } + __fldcw(&_newcw); +} + +/* * General notes about conflicting SSE vs FP status bits. * This code assumes that software will not fiddle with the control * bits of the SSE and x87 in such a way to get them out of sync and @@ -143,28 +171,27 @@ * merge the two together. I think. */ -/* Set rounding control */ -static __inline__ fp_rnd_t +static __inline fp_rnd_t __fpgetround(void) { unsigned short _cw; __fnstcw(&_cw); - return ((_cw & FP_RND_FLD) >> FP_RND_OFF); + return ((fp_rnd_t)((_cw & FP_RND_FLD) >> FP_RND_OFF)); } -static __inline__ fp_rnd_t +static __inline fp_rnd_t __fpsetround(fp_rnd_t _m) { - unsigned short _cw; - unsigned int _mxcsr; >>> TRUNCATED FOR MAIL (1000 lines) <<<
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200801211858.m0LIwlY2082525>