Date: Mon, 11 Dec 2006 22:22:26 GMT From: John Baldwin <jhb@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 111504 for review Message-ID: <200612112222.kBBMMQgf006917@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=111504 Change 111504 by jhb@jhb_mutex on 2006/12/11 22:22:17 IFC @111476. Affected files ... .. //depot/projects/smpng/sys/Makefile#15 integrate .. //depot/projects/smpng/sys/amd64/amd64/db_trace.c#24 integrate .. //depot/projects/smpng/sys/amd64/amd64/genassym.c#17 integrate .. //depot/projects/smpng/sys/amd64/amd64/machdep.c#62 integrate .. //depot/projects/smpng/sys/amd64/amd64/minidump_machdep.c#2 integrate .. //depot/projects/smpng/sys/amd64/amd64/pmap.c#70 integrate .. //depot/projects/smpng/sys/amd64/amd64/trap.c#56 integrate .. //depot/projects/smpng/sys/amd64/conf/GENERIC#53 integrate .. //depot/projects/smpng/sys/amd64/include/pmap.h#26 integrate .. //depot/projects/smpng/sys/amd64/include/reg.h#8 integrate .. //depot/projects/smpng/sys/amd64/isa/clock.c#19 integrate .. //depot/projects/smpng/sys/amd64/linux32/linux32_sysvec.c#22 integrate .. //depot/projects/smpng/sys/arm/arm/cpufunc.c#13 integrate .. //depot/projects/smpng/sys/arm/arm/genassym.c#8 integrate .. //depot/projects/smpng/sys/arm/arm/identcpu.c#10 integrate .. //depot/projects/smpng/sys/arm/arm/nexus_io.c#6 integrate .. //depot/projects/smpng/sys/arm/arm/pmap.c#37 integrate .. //depot/projects/smpng/sys/arm/at91/at91.c#7 integrate .. //depot/projects/smpng/sys/arm/at91/at91_pio.c#4 integrate .. //depot/projects/smpng/sys/arm/at91/at91_spi.c#4 integrate .. //depot/projects/smpng/sys/arm/at91/at91_twi.c#6 integrate .. //depot/projects/smpng/sys/arm/at91/kb920x_machdep.c#13 integrate .. //depot/projects/smpng/sys/arm/at91/uart_dev_at91usart.c#9 integrate .. //depot/projects/smpng/sys/arm/conf/AVILA#1 branch .. //depot/projects/smpng/sys/arm/include/bus.h#8 integrate .. //depot/projects/smpng/sys/arm/include/cpuconf.h#8 integrate .. //depot/projects/smpng/sys/arm/sa11x0/assabet_machdep.c#14 integrate .. //depot/projects/smpng/sys/arm/sa11x0/sa11x0_io.c#8 integrate .. //depot/projects/smpng/sys/arm/xscale/i80321/ep80219_machdep.c#4 integrate .. //depot/projects/smpng/sys/arm/xscale/i80321/i80321_space.c#6 integrate .. //depot/projects/smpng/sys/arm/xscale/i80321/iq31244_machdep.c#23 integrate .. //depot/projects/smpng/sys/arm/xscale/i80321/obio_space.c#4 integrate .. //depot/projects/smpng/sys/arm/xscale/ixp425/avila_ata.c#1 branch .. //depot/projects/smpng/sys/arm/xscale/ixp425/avila_led.c#1 branch .. //depot/projects/smpng/sys/arm/xscale/ixp425/avila_machdep.c#1 branch .. //depot/projects/smpng/sys/arm/xscale/ixp425/files.avila#1 branch .. //depot/projects/smpng/sys/arm/xscale/ixp425/files.ixp425#1 branch .. //depot/projects/smpng/sys/arm/xscale/ixp425/if_npe.c#1 branch .. //depot/projects/smpng/sys/arm/xscale/ixp425/if_npereg.h#1 branch .. //depot/projects/smpng/sys/arm/xscale/ixp425/ixdp425_pci.c#1 branch .. //depot/projects/smpng/sys/arm/xscale/ixp425/ixdp425reg.h#1 branch .. //depot/projects/smpng/sys/arm/xscale/ixp425/ixp425.c#1 branch .. //depot/projects/smpng/sys/arm/xscale/ixp425/ixp425_a4x_io.S#1 branch .. //depot/projects/smpng/sys/arm/xscale/ixp425/ixp425_a4x_space.c#1 branch .. //depot/projects/smpng/sys/arm/xscale/ixp425/ixp425_iic.c#1 branch .. //depot/projects/smpng/sys/arm/xscale/ixp425/ixp425_intr.h#1 branch .. //depot/projects/smpng/sys/arm/xscale/ixp425/ixp425_mem.c#1 branch .. //depot/projects/smpng/sys/arm/xscale/ixp425/ixp425_npe.c#1 branch .. //depot/projects/smpng/sys/arm/xscale/ixp425/ixp425_npereg.h#1 branch .. //depot/projects/smpng/sys/arm/xscale/ixp425/ixp425_npevar.h#1 branch .. //depot/projects/smpng/sys/arm/xscale/ixp425/ixp425_pci.c#1 branch .. //depot/projects/smpng/sys/arm/xscale/ixp425/ixp425_pci_asm.S#1 branch .. //depot/projects/smpng/sys/arm/xscale/ixp425/ixp425_pci_space.c#1 branch .. //depot/projects/smpng/sys/arm/xscale/ixp425/ixp425_qmgr.c#1 branch .. //depot/projects/smpng/sys/arm/xscale/ixp425/ixp425_qmgr.h#1 branch .. //depot/projects/smpng/sys/arm/xscale/ixp425/ixp425_space.c#1 branch .. //depot/projects/smpng/sys/arm/xscale/ixp425/ixp425_timer.c#1 branch .. //depot/projects/smpng/sys/arm/xscale/ixp425/ixp425_wdog.c#1 branch .. //depot/projects/smpng/sys/arm/xscale/ixp425/ixp425reg.h#1 branch .. //depot/projects/smpng/sys/arm/xscale/ixp425/ixp425var.h#1 branch .. //depot/projects/smpng/sys/arm/xscale/ixp425/std.avila#1 branch .. //depot/projects/smpng/sys/arm/xscale/ixp425/std.ixp425#1 branch .. //depot/projects/smpng/sys/arm/xscale/ixp425/uart_bus_ixp425.c#1 branch .. //depot/projects/smpng/sys/arm/xscale/ixp425/uart_cpu_ixp425.c#1 branch .. //depot/projects/smpng/sys/boot/common/loader.8#42 integrate .. //depot/projects/smpng/sys/boot/i386/btx/btx/btx.S#6 integrate .. //depot/projects/smpng/sys/boot/ia64/common/copy.c#2 integrate .. //depot/projects/smpng/sys/boot/ia64/common/libia64.h#2 integrate .. //depot/projects/smpng/sys/boot/sparc64/loader/hcall.S#2 delete .. //depot/projects/smpng/sys/cam/cam_ccb.h#10 integrate .. //depot/projects/smpng/sys/cam/cam_periph.c#23 integrate .. //depot/projects/smpng/sys/cam/cam_xpt.c#39 integrate .. //depot/projects/smpng/sys/cam/cam_xpt.h#3 integrate .. //depot/projects/smpng/sys/cam/scsi/scsi_all.h#12 integrate .. //depot/projects/smpng/sys/cam/scsi/scsi_cd.c#30 integrate .. //depot/projects/smpng/sys/cam/scsi/scsi_ch.c#14 integrate .. //depot/projects/smpng/sys/cam/scsi/scsi_da.c#72 integrate .. //depot/projects/smpng/sys/cam/scsi/scsi_pass.c#16 integrate .. //depot/projects/smpng/sys/cam/scsi/scsi_pt.c#13 integrate .. //depot/projects/smpng/sys/cam/scsi/scsi_sa.c#26 integrate .. //depot/projects/smpng/sys/cam/scsi/scsi_ses.c#14 integrate .. //depot/projects/smpng/sys/cam/scsi/scsi_targ_bh.c#10 integrate .. //depot/projects/smpng/sys/cam/scsi/scsi_target.c#22 integrate .. //depot/projects/smpng/sys/compat/linprocfs/linprocfs.c#52 integrate .. //depot/projects/smpng/sys/compat/linsysfs/linsysfs.c#2 integrate .. //depot/projects/smpng/sys/compat/linux/linux_getcwd.c#23 integrate .. //depot/projects/smpng/sys/compat/linux/linux_misc.c#76 integrate .. //depot/projects/smpng/sys/compat/linux/linux_stats.c#35 integrate .. //depot/projects/smpng/sys/conf/NOTES#132 integrate .. //depot/projects/smpng/sys/conf/files#192 integrate .. //depot/projects/smpng/sys/conf/files.arm#11 integrate .. //depot/projects/smpng/sys/conf/files.sun4v#3 integrate .. //depot/projects/smpng/sys/conf/kern.mk#18 integrate .. //depot/projects/smpng/sys/conf/options#130 integrate .. //depot/projects/smpng/sys/conf/options.arm#12 integrate .. //depot/projects/smpng/sys/ddb/db_ps.c#38 integrate .. //depot/projects/smpng/sys/dev/aac/aac_pci.c#44 integrate .. //depot/projects/smpng/sys/dev/advansys/adv_eisa.c#10 integrate .. //depot/projects/smpng/sys/dev/advansys/adv_isa.c#11 integrate .. //depot/projects/smpng/sys/dev/advansys/adv_pci.c#14 integrate .. //depot/projects/smpng/sys/dev/advansys/advansys.c#14 integrate .. //depot/projects/smpng/sys/dev/advansys/adw_pci.c#12 integrate .. //depot/projects/smpng/sys/dev/advansys/adwcam.c#15 integrate .. //depot/projects/smpng/sys/dev/aha/aha.c#19 integrate .. //depot/projects/smpng/sys/dev/aha/aha_isa.c#16 integrate .. //depot/projects/smpng/sys/dev/aha/aha_mca.c#11 integrate .. //depot/projects/smpng/sys/dev/ahb/ahb.c#16 integrate .. //depot/projects/smpng/sys/dev/amd/amd.c#18 integrate .. //depot/projects/smpng/sys/dev/amr/amr_pci.c#27 integrate .. //depot/projects/smpng/sys/dev/arcmsr/arcmsr.c#9 integrate .. //depot/projects/smpng/sys/dev/asr/asr.c#35 integrate .. //depot/projects/smpng/sys/dev/ath/if_ath.c#45 integrate .. //depot/projects/smpng/sys/dev/ath/if_ath_pci.c#14 integrate .. //depot/projects/smpng/sys/dev/bce/if_bce.c#10 integrate .. //depot/projects/smpng/sys/dev/bfe/if_bfe.c#25 integrate .. //depot/projects/smpng/sys/dev/bge/if_bge.c#81 integrate .. //depot/projects/smpng/sys/dev/bge/if_bgereg.h#46 integrate .. //depot/projects/smpng/sys/dev/buslogic/bt.c#16 integrate .. //depot/projects/smpng/sys/dev/buslogic/bt_eisa.c#10 integrate .. //depot/projects/smpng/sys/dev/buslogic/bt_isa.c#9 integrate .. //depot/projects/smpng/sys/dev/buslogic/bt_mca.c#8 integrate .. //depot/projects/smpng/sys/dev/buslogic/bt_pci.c#10 integrate .. //depot/projects/smpng/sys/dev/ciss/ciss.c#49 integrate .. //depot/projects/smpng/sys/dev/dc/if_dc.c#12 integrate .. //depot/projects/smpng/sys/dev/dc/if_dcreg.h#6 integrate .. //depot/projects/smpng/sys/dev/dpt/dpt_eisa.c#8 integrate .. //depot/projects/smpng/sys/dev/dpt/dpt_isa.c#8 integrate .. //depot/projects/smpng/sys/dev/dpt/dpt_pci.c#12 integrate .. //depot/projects/smpng/sys/dev/em/if_em.c#78 integrate .. //depot/projects/smpng/sys/dev/em/if_em.h#39 integrate .. //depot/projects/smpng/sys/dev/ep/if_ep.c#28 integrate .. //depot/projects/smpng/sys/dev/esp/esp_sbus.c#8 integrate .. //depot/projects/smpng/sys/dev/firewire/fwdev.c#22 integrate .. //depot/projects/smpng/sys/dev/flash/at45d.c#1 branch .. //depot/projects/smpng/sys/dev/fxp/if_fxp.c#78 integrate .. //depot/projects/smpng/sys/dev/fxp/if_fxpvar.h#19 integrate .. //depot/projects/smpng/sys/dev/gem/if_gem.c#30 integrate .. //depot/projects/smpng/sys/dev/gem/if_gemvar.h#12 integrate .. //depot/projects/smpng/sys/dev/hme/if_hme.c#33 integrate .. //depot/projects/smpng/sys/dev/hme/if_hmevar.h#10 integrate .. //depot/projects/smpng/sys/dev/iicbus/ad7418.c#1 branch .. //depot/projects/smpng/sys/dev/iicbus/ds1672.c#1 branch .. //depot/projects/smpng/sys/dev/iicbus/iic.c#13 integrate .. //depot/projects/smpng/sys/dev/iicbus/iic.h#3 integrate .. //depot/projects/smpng/sys/dev/iicbus/iicbb.c#7 integrate .. //depot/projects/smpng/sys/dev/iicbus/iicbus.c#9 integrate .. //depot/projects/smpng/sys/dev/iicbus/iicbus_if.m#4 integrate .. //depot/projects/smpng/sys/dev/iicbus/iiconf.c#5 integrate .. //depot/projects/smpng/sys/dev/iicbus/iiconf.h#5 integrate .. //depot/projects/smpng/sys/dev/iir/iir_pci.c#16 integrate .. //depot/projects/smpng/sys/dev/ipmi/ipmi.c#5 integrate .. //depot/projects/smpng/sys/dev/isp/isp.c#48 integrate .. //depot/projects/smpng/sys/dev/isp/isp_freebsd.c#49 integrate .. //depot/projects/smpng/sys/dev/isp/isp_library.c#8 integrate .. //depot/projects/smpng/sys/dev/isp/isp_library.h#4 integrate .. //depot/projects/smpng/sys/dev/isp/isp_pci.c#44 integrate .. //depot/projects/smpng/sys/dev/isp/isp_sbus.c#18 integrate .. //depot/projects/smpng/sys/dev/isp/isp_stds.h#3 integrate .. //depot/projects/smpng/sys/dev/isp/isp_target.c#22 integrate .. //depot/projects/smpng/sys/dev/isp/ispmbox.h#24 integrate .. //depot/projects/smpng/sys/dev/isp/ispvar.h#34 integrate .. //depot/projects/smpng/sys/dev/ispfw/ispfw.c#15 integrate .. //depot/projects/smpng/sys/dev/iwi/if_iwi.c#22 integrate .. //depot/projects/smpng/sys/dev/le/am7990.c#4 integrate .. //depot/projects/smpng/sys/dev/le/am79900.c#4 integrate .. //depot/projects/smpng/sys/dev/le/lance.c#3 integrate .. //depot/projects/smpng/sys/dev/le/lancevar.h#3 integrate .. //depot/projects/smpng/sys/dev/mfi/mfi.c#13 integrate .. //depot/projects/smpng/sys/dev/mii/acphy.c#15 integrate .. //depot/projects/smpng/sys/dev/mii/amphy.c#14 integrate .. //depot/projects/smpng/sys/dev/mii/bmtphy.c#10 integrate .. //depot/projects/smpng/sys/dev/mii/brgphy.c#34 integrate .. //depot/projects/smpng/sys/dev/mii/ciphy.c#6 integrate .. //depot/projects/smpng/sys/dev/mii/e1000phy.c#14 integrate .. //depot/projects/smpng/sys/dev/mii/e1000phyreg.h#4 integrate .. //depot/projects/smpng/sys/dev/mii/gentbi.c#2 integrate .. //depot/projects/smpng/sys/dev/mii/inphy.c#9 integrate .. //depot/projects/smpng/sys/dev/mii/ip1000phy.c#2 integrate .. //depot/projects/smpng/sys/dev/mii/lxtphy.c#15 integrate .. //depot/projects/smpng/sys/dev/mii/mii_physubr.c#15 integrate .. //depot/projects/smpng/sys/dev/mii/miidevs#20 integrate .. //depot/projects/smpng/sys/dev/mii/miivar.h#8 integrate .. //depot/projects/smpng/sys/dev/mii/mlphy.c#12 integrate .. //depot/projects/smpng/sys/dev/mii/nsgphy.c#17 integrate .. //depot/projects/smpng/sys/dev/mii/nsphy.c#14 integrate .. //depot/projects/smpng/sys/dev/mii/pnaphy.c#15 integrate .. //depot/projects/smpng/sys/dev/mii/qsphy.c#15 integrate .. //depot/projects/smpng/sys/dev/mii/rgephy.c#10 integrate .. //depot/projects/smpng/sys/dev/mii/rlphy.c#18 integrate .. //depot/projects/smpng/sys/dev/mii/tdkphy.c#17 integrate .. //depot/projects/smpng/sys/dev/mii/tlphy.c#16 integrate .. //depot/projects/smpng/sys/dev/mii/xmphy.c#16 integrate .. //depot/projects/smpng/sys/dev/mly/mly.c#29 integrate .. //depot/projects/smpng/sys/dev/mpt/mpt.c#21 integrate .. //depot/projects/smpng/sys/dev/mpt/mpt.h#18 integrate .. //depot/projects/smpng/sys/dev/mpt/mpt_cam.c#17 integrate .. //depot/projects/smpng/sys/dev/mpt/mpt_debug.c#15 integrate .. //depot/projects/smpng/sys/dev/mpt/mpt_pci.c#27 integrate .. //depot/projects/smpng/sys/dev/mpt/mpt_raid.c#10 integrate .. //depot/projects/smpng/sys/dev/mxge/if_mxge.c#8 integrate .. //depot/projects/smpng/sys/dev/mxge/if_mxge_var.h#4 integrate .. //depot/projects/smpng/sys/dev/nfe/if_nfe.c#6 integrate .. //depot/projects/smpng/sys/dev/nfe/if_nfereg.h#4 integrate .. //depot/projects/smpng/sys/dev/nfe/if_nfevar.h#2 integrate .. //depot/projects/smpng/sys/dev/nve/if_nvereg.h#5 integrate .. //depot/projects/smpng/sys/dev/pci/pci.c#78 integrate .. //depot/projects/smpng/sys/dev/ppbus/vpo.c#10 integrate .. //depot/projects/smpng/sys/dev/ral/rt2560.c#6 integrate .. //depot/projects/smpng/sys/dev/ral/rt2661.c#4 integrate .. //depot/projects/smpng/sys/dev/re/if_re.c#46 integrate .. //depot/projects/smpng/sys/dev/rp/rp.c#23 integrate .. //depot/projects/smpng/sys/dev/rp/rpreg.h#4 integrate .. //depot/projects/smpng/sys/dev/rp/rpvar.h#7 integrate .. //depot/projects/smpng/sys/dev/sound/pci/atiixp.c#8 integrate .. //depot/projects/smpng/sys/dev/sound/pci/cmi.c#31 integrate .. //depot/projects/smpng/sys/dev/sound/pci/es137x.c#22 integrate .. //depot/projects/smpng/sys/dev/sound/pci/hda/hda_reg.h#2 integrate .. //depot/projects/smpng/sys/dev/sound/pci/hda/hdac.c#3 integrate .. //depot/projects/smpng/sys/dev/sound/pci/hda/hdac_private.h#2 integrate .. //depot/projects/smpng/sys/dev/sound/pci/ich.c#46 integrate .. //depot/projects/smpng/sys/dev/sound/pci/via8233.c#22 integrate .. //depot/projects/smpng/sys/dev/sound/pcm/ac97.c#34 integrate .. //depot/projects/smpng/sys/dev/sound/pcm/ac97.h#11 integrate .. //depot/projects/smpng/sys/dev/sound/pcm/buffer.c#17 integrate .. //depot/projects/smpng/sys/dev/sound/pcm/buffer.h#10 integrate .. //depot/projects/smpng/sys/dev/sound/pcm/channel.c#38 integrate .. //depot/projects/smpng/sys/dev/sound/pcm/channel.h#14 integrate .. //depot/projects/smpng/sys/dev/sound/pcm/dsp.c#40 integrate .. //depot/projects/smpng/sys/dev/sound/pcm/fake.c#8 integrate .. //depot/projects/smpng/sys/dev/sound/pcm/feeder.c#16 integrate .. //depot/projects/smpng/sys/dev/sound/pcm/feeder.h#8 integrate .. //depot/projects/smpng/sys/dev/sound/pcm/feeder_fmt.c#16 integrate .. //depot/projects/smpng/sys/dev/sound/pcm/feeder_rate.c#13 integrate .. //depot/projects/smpng/sys/dev/sound/pcm/feeder_volume.c#3 integrate .. //depot/projects/smpng/sys/dev/sound/pcm/mixer.c#26 integrate .. //depot/projects/smpng/sys/dev/sound/pcm/sndstat.c#19 integrate .. //depot/projects/smpng/sys/dev/sound/pcm/sound.c#35 integrate .. //depot/projects/smpng/sys/dev/sound/pcm/sound.h#28 integrate .. //depot/projects/smpng/sys/dev/sound/pcm/vchan.c#18 integrate .. //depot/projects/smpng/sys/dev/sound/usb/uaudio.c#14 integrate .. //depot/projects/smpng/sys/dev/trm/trm.c#25 integrate .. //depot/projects/smpng/sys/dev/usb/FILES#6 integrate .. //depot/projects/smpng/sys/dev/usb/if_aue.c#44 integrate .. //depot/projects/smpng/sys/dev/usb/if_auereg.h#11 integrate .. //depot/projects/smpng/sys/dev/usb/if_ural.c#21 integrate .. //depot/projects/smpng/sys/dev/usb/ukbd.c#23 integrate .. //depot/projects/smpng/sys/dev/usb/usb_ethersubr.c#14 integrate .. //depot/projects/smpng/sys/dev/usb/usb_ethersubr.h#6 integrate .. //depot/projects/smpng/sys/dev/usb/usb_quirks.c#22 integrate .. //depot/projects/smpng/sys/dev/usb/usb_quirks.h#8 integrate .. //depot/projects/smpng/sys/dev/usb/usbdevs#98 integrate .. //depot/projects/smpng/sys/dev/usb/usbdi.c#24 integrate .. //depot/projects/smpng/sys/dev/vge/if_vge.c#17 integrate .. //depot/projects/smpng/sys/dev/wds/wd7000.c#8 integrate .. //depot/projects/smpng/sys/dev/wi/if_wi.c#83 integrate .. //depot/projects/smpng/sys/dev/wi/if_wivar.h#24 integrate .. //depot/projects/smpng/sys/fs/msdosfs/msdosfs_conv.c#17 integrate .. //depot/projects/smpng/sys/fs/msdosfs/msdosfs_vfsops.c#50 integrate .. //depot/projects/smpng/sys/fs/msdosfs/msdosfs_vnops.c#37 integrate .. //depot/projects/smpng/sys/fs/ntfs/ntfs_subr.c#24 integrate .. //depot/projects/smpng/sys/fs/ntfs/ntfs_subr.h#5 integrate .. //depot/projects/smpng/sys/fs/ntfs/ntfs_vnops.c#27 integrate .. //depot/projects/smpng/sys/fs/procfs/procfs_status.c#26 integrate .. //depot/projects/smpng/sys/fs/unionfs/union.h#13 integrate .. //depot/projects/smpng/sys/fs/unionfs/union_subr.c#26 integrate .. //depot/projects/smpng/sys/fs/unionfs/union_vfsops.c#30 integrate .. //depot/projects/smpng/sys/fs/unionfs/union_vnops.c#32 integrate .. //depot/projects/smpng/sys/geom/journal/g_journal.c#3 integrate .. //depot/projects/smpng/sys/gnu/fs/ext2fs/ext2_vfsops.c#9 integrate .. //depot/projects/smpng/sys/i386/i386/genassym.c#34 integrate .. //depot/projects/smpng/sys/i386/i386/locore.s#27 integrate .. //depot/projects/smpng/sys/i386/i386/machdep.c#121 integrate .. //depot/projects/smpng/sys/i386/i386/pmap.c#111 integrate .. //depot/projects/smpng/sys/i386/include/pmap.h#33 integrate .. //depot/projects/smpng/sys/i386/isa/clock.c#50 integrate .. //depot/projects/smpng/sys/ia64/ia64/genassym.c#29 integrate .. //depot/projects/smpng/sys/ia64/ia64/interrupt.c#36 integrate .. //depot/projects/smpng/sys/ia64/ia64/machdep.c#107 integrate .. //depot/projects/smpng/sys/ia64/ia64/mp_machdep.c#34 integrate .. //depot/projects/smpng/sys/ia64/include/kdb.h#4 integrate .. //depot/projects/smpng/sys/ia64/include/pcpu.h#6 integrate .. //depot/projects/smpng/sys/isofs/cd9660/cd9660_node.h#9 integrate .. //depot/projects/smpng/sys/kern/imgact_elf.c#53 integrate .. //depot/projects/smpng/sys/kern/init_main.c#64 integrate .. //depot/projects/smpng/sys/kern/kern_clock.c#53 integrate .. //depot/projects/smpng/sys/kern/kern_event.c#49 integrate .. //depot/projects/smpng/sys/kern/kern_fork.c#104 integrate .. //depot/projects/smpng/sys/kern/kern_idle.c#28 integrate .. //depot/projects/smpng/sys/kern/kern_intr.c#80 integrate .. //depot/projects/smpng/sys/kern/kern_kse.c#33 integrate .. //depot/projects/smpng/sys/kern/kern_poll.c#23 integrate .. //depot/projects/smpng/sys/kern/kern_proc.c#88 integrate .. //depot/projects/smpng/sys/kern/kern_resource.c#66 integrate .. //depot/projects/smpng/sys/kern/kern_subr.c#43 integrate .. //depot/projects/smpng/sys/kern/kern_switch.c#66 integrate .. //depot/projects/smpng/sys/kern/kern_synch.c#108 integrate .. //depot/projects/smpng/sys/kern/kern_thr.c#40 integrate .. //depot/projects/smpng/sys/kern/kern_thread.c#96 integrate .. //depot/projects/smpng/sys/kern/kern_time.c#49 integrate .. //depot/projects/smpng/sys/kern/kern_umtx.c#29 integrate .. //depot/projects/smpng/sys/kern/ksched.c#2 integrate .. //depot/projects/smpng/sys/kern/link_elf_obj.c#16 integrate .. //depot/projects/smpng/sys/kern/sched_4bsd.c#64 integrate .. //depot/projects/smpng/sys/kern/sched_ule.c#71 integrate .. //depot/projects/smpng/sys/kern/subr_lock.c#5 integrate .. //depot/projects/smpng/sys/kern/subr_prf.c#50 integrate .. //depot/projects/smpng/sys/kern/subr_rman.c#31 integrate .. //depot/projects/smpng/sys/kern/subr_trap.c#82 integrate .. //depot/projects/smpng/sys/kern/sysv_msg.c#33 integrate .. //depot/projects/smpng/sys/kern/tty.c#68 integrate .. //depot/projects/smpng/sys/kern/uipc_socket.c#96 integrate .. //depot/projects/smpng/sys/kern/vfs_export.c#23 integrate .. //depot/projects/smpng/sys/modules/Makefile#131 integrate .. //depot/projects/smpng/sys/modules/isp/Makefile#3 integrate .. //depot/projects/smpng/sys/modules/wlan_amrr/Makefile#1 branch .. //depot/projects/smpng/sys/net/bridgestp.c#16 integrate .. //depot/projects/smpng/sys/net/bridgestp.h#6 integrate .. //depot/projects/smpng/sys/net/ethernet.h#10 integrate .. //depot/projects/smpng/sys/net/if.c#89 integrate .. //depot/projects/smpng/sys/net/if_atmsubr.c#23 integrate .. //depot/projects/smpng/sys/net/if_bridge.c#41 integrate .. //depot/projects/smpng/sys/net/if_bridgevar.h#15 integrate .. //depot/projects/smpng/sys/net/if_ethersubr.c#77 integrate .. //depot/projects/smpng/sys/net/if_llc.h#7 integrate .. //depot/projects/smpng/sys/net/if_ppp.c#45 integrate .. //depot/projects/smpng/sys/net/if_pppvar.h#12 integrate .. //depot/projects/smpng/sys/net/netisr.c#11 integrate .. //depot/projects/smpng/sys/net/ppp_tty.c#23 integrate .. //depot/projects/smpng/sys/net/route.c#31 integrate .. //depot/projects/smpng/sys/net80211/ieee80211.c#23 integrate .. //depot/projects/smpng/sys/net80211/ieee80211.h#10 integrate .. //depot/projects/smpng/sys/net80211/ieee80211_amrr.c#1 branch .. //depot/projects/smpng/sys/net80211/ieee80211_amrr.h#1 branch .. //depot/projects/smpng/sys/net80211/ieee80211_input.c#33 integrate .. //depot/projects/smpng/sys/net80211/ieee80211_output.c#28 integrate .. //depot/projects/smpng/sys/net80211/ieee80211_var.h#22 integrate .. //depot/projects/smpng/sys/netgraph/ng_nat.c#4 integrate .. //depot/projects/smpng/sys/netinet/igmp.c#19 integrate .. //depot/projects/smpng/sys/netinet/in_pcb.c#70 integrate .. //depot/projects/smpng/sys/netinet/ip_carp.h#3 integrate .. //depot/projects/smpng/sys/netinet/ip_output.c#89 integrate .. //depot/projects/smpng/sys/netinet/libalias/alias.c#4 integrate .. //depot/projects/smpng/sys/netinet/libalias/alias.h#3 integrate .. //depot/projects/smpng/sys/netinet/tcp_usrreq.c#54 integrate .. //depot/projects/smpng/sys/netinet6/nd6.c#37 integrate .. //depot/projects/smpng/sys/nfs/nfsproto.h#6 integrate .. //depot/projects/smpng/sys/nfs4client/nfs4_subs.c#5 integrate .. //depot/projects/smpng/sys/nfs4client/nfs4_vn_subs.c#5 integrate .. //depot/projects/smpng/sys/nfsclient/bootp_subr.c#33 integrate .. //depot/projects/smpng/sys/nfsclient/nfs.h#28 integrate .. //depot/projects/smpng/sys/nfsclient/nfs_diskless.c#15 integrate .. //depot/projects/smpng/sys/nfsclient/nfs_node.c#26 integrate .. //depot/projects/smpng/sys/nfsclient/nfs_socket.c#48 integrate .. //depot/projects/smpng/sys/nfsclient/nfs_vfsops.c#57 integrate .. //depot/projects/smpng/sys/nfsclient/nfsdiskless.h#8 integrate .. //depot/projects/smpng/sys/nfsserver/nfs.h#19 integrate .. //depot/projects/smpng/sys/nfsserver/nfs_serv.c#49 integrate .. //depot/projects/smpng/sys/nfsserver/nfs_srvsubs.c#35 integrate .. //depot/projects/smpng/sys/pc98/pc98/machdep.c#19 integrate .. //depot/projects/smpng/sys/pci/if_pcn.c#42 integrate .. //depot/projects/smpng/sys/pci/if_pcnreg.h#9 integrate .. //depot/projects/smpng/sys/pci/if_rl.c#66 integrate .. //depot/projects/smpng/sys/pci/if_rlreg.h#34 integrate .. //depot/projects/smpng/sys/pci/if_xl.c#70 integrate .. //depot/projects/smpng/sys/pci/if_xlreg.h#20 integrate .. //depot/projects/smpng/sys/powerpc/include/pmap.h#18 integrate .. //depot/projects/smpng/sys/powerpc/powerpc/genassym.c#27 integrate .. //depot/projects/smpng/sys/powerpc/powerpc/intr_machdep.c#9 integrate .. //depot/projects/smpng/sys/powerpc/powerpc/machdep.c#71 integrate .. //depot/projects/smpng/sys/powerpc/powerpc/mmu_if.m#7 integrate .. //depot/projects/smpng/sys/powerpc/powerpc/mmu_oea.c#9 integrate .. //depot/projects/smpng/sys/powerpc/powerpc/pmap_dispatch.c#8 integrate .. //depot/projects/smpng/sys/powerpc/powerpc/uio_machdep.c#5 integrate .. //depot/projects/smpng/sys/sparc64/sparc64/autoconf.c#11 integrate .. //depot/projects/smpng/sys/sparc64/sparc64/elf_machdep.c#19 integrate .. //depot/projects/smpng/sys/sparc64/sparc64/genassym.c#40 integrate .. //depot/projects/smpng/sys/sparc64/sparc64/identcpu.c#16 integrate .. //depot/projects/smpng/sys/sparc64/sparc64/machdep.c#83 integrate .. //depot/projects/smpng/sys/sparc64/sparc64/mem.c#15 integrate .. //depot/projects/smpng/sys/sun4v/cddl/mdesc/mdesc_diff.c#1 branch .. //depot/projects/smpng/sys/sun4v/cddl/mdesc/mdesc_findname.c#1 branch .. //depot/projects/smpng/sys/sun4v/cddl/mdesc/mdesc_findnodeprop.c#1 branch .. //depot/projects/smpng/sys/sun4v/cddl/mdesc/mdesc_fini.c#1 branch .. //depot/projects/smpng/sys/sun4v/cddl/mdesc/mdesc_getbinsize.c#1 branch .. //depot/projects/smpng/sys/sun4v/cddl/mdesc/mdesc_getgen.c#1 branch .. //depot/projects/smpng/sys/sun4v/cddl/mdesc/mdesc_getpropdata.c#1 branch .. //depot/projects/smpng/sys/sun4v/cddl/mdesc/mdesc_getpropstr.c#1 branch .. //depot/projects/smpng/sys/sun4v/cddl/mdesc/mdesc_getpropval.c#1 branch .. //depot/projects/smpng/sys/sun4v/cddl/mdesc/mdesc_init_intern.c#1 branch .. //depot/projects/smpng/sys/sun4v/cddl/mdesc/mdesc_nodecount.c#1 branch .. //depot/projects/smpng/sys/sun4v/cddl/mdesc/mdesc_rootnode.c#1 branch .. //depot/projects/smpng/sys/sun4v/cddl/mdesc/mdesc_scandag.c#1 branch .. //depot/projects/smpng/sys/sun4v/cddl/t1_copy.S#1 branch .. //depot/projects/smpng/sys/sun4v/conf/DEFAULTS#4 integrate .. //depot/projects/smpng/sys/sun4v/conf/GENERIC#3 integrate .. //depot/projects/smpng/sys/sun4v/conf/NOTES#3 integrate .. //depot/projects/smpng/sys/sun4v/include/asm.h#2 integrate .. //depot/projects/smpng/sys/sun4v/include/cache.h#2 integrate .. //depot/projects/smpng/sys/sun4v/include/hv_api.h#1 branch .. //depot/projects/smpng/sys/sun4v/include/hypervisor_api.h#3 delete .. //depot/projects/smpng/sys/sun4v/include/hypervisorvar.h#4 integrate .. //depot/projects/smpng/sys/sun4v/include/pcb.h#2 integrate .. //depot/projects/smpng/sys/sun4v/include/pcpu.h#2 integrate .. //depot/projects/smpng/sys/sun4v/include/pmap.h#3 integrate .. //depot/projects/smpng/sys/sun4v/include/smp.h#2 integrate .. //depot/projects/smpng/sys/sun4v/include/sun4v_cpufunc.h#2 integrate .. //depot/projects/smpng/sys/sun4v/include/tsb.h#2 integrate .. //depot/projects/smpng/sys/sun4v/include/tte_hash.h#4 integrate .. //depot/projects/smpng/sys/sun4v/mdesc/mdesc_diff.c#2 delete .. //depot/projects/smpng/sys/sun4v/mdesc/mdesc_findname.c#2 delete .. //depot/projects/smpng/sys/sun4v/mdesc/mdesc_findnodeprop.c#2 delete .. //depot/projects/smpng/sys/sun4v/mdesc/mdesc_fini.c#2 delete .. //depot/projects/smpng/sys/sun4v/mdesc/mdesc_getbinsize.c#2 delete .. //depot/projects/smpng/sys/sun4v/mdesc/mdesc_getgen.c#2 delete .. //depot/projects/smpng/sys/sun4v/mdesc/mdesc_getpropdata.c#2 delete .. //depot/projects/smpng/sys/sun4v/mdesc/mdesc_getpropstr.c#2 delete .. //depot/projects/smpng/sys/sun4v/mdesc/mdesc_getpropval.c#2 delete .. //depot/projects/smpng/sys/sun4v/mdesc/mdesc_init.c#2 integrate .. //depot/projects/smpng/sys/sun4v/mdesc/mdesc_init_intern.c#2 delete .. //depot/projects/smpng/sys/sun4v/mdesc/mdesc_nodecount.c#2 delete .. //depot/projects/smpng/sys/sun4v/mdesc/mdesc_rootnode.c#2 delete .. //depot/projects/smpng/sys/sun4v/mdesc/mdesc_scandag.c#2 delete .. //depot/projects/smpng/sys/sun4v/mdesc/mdesc_vdevfindval.c#2 integrate .. //depot/projects/smpng/sys/sun4v/sun4v/autoconf.c#2 delete .. //depot/projects/smpng/sys/sun4v/sun4v/clock.c#2 delete .. //depot/projects/smpng/sys/sun4v/sun4v/counter.c#2 delete .. //depot/projects/smpng/sys/sun4v/sun4v/db_disasm.c#2 delete .. //depot/projects/smpng/sys/sun4v/sun4v/eeprom.c#2 delete .. //depot/projects/smpng/sys/sun4v/sun4v/elf_machdep.c#2 delete .. //depot/projects/smpng/sys/sun4v/sun4v/exception.S#4 integrate .. //depot/projects/smpng/sys/sun4v/sun4v/gdb_machdep.c#2 delete .. //depot/projects/smpng/sys/sun4v/sun4v/hv_pci.c#2 integrate .. //depot/projects/smpng/sys/sun4v/sun4v/hvcons.c#4 integrate .. //depot/projects/smpng/sys/sun4v/sun4v/hviommu.c#2 integrate .. //depot/projects/smpng/sys/sun4v/sun4v/identcpu.c#2 delete .. //depot/projects/smpng/sys/sun4v/sun4v/in_cksum.c#2 delete .. //depot/projects/smpng/sys/sun4v/sun4v/interrupt.S#4 integrate .. //depot/projects/smpng/sys/sun4v/sun4v/intr_machdep.c#3 integrate .. //depot/projects/smpng/sys/sun4v/sun4v/iommu.c#2 delete .. //depot/projects/smpng/sys/sun4v/sun4v/machdep.c#4 integrate .. //depot/projects/smpng/sys/sun4v/sun4v/mem.c#2 delete .. //depot/projects/smpng/sys/sun4v/sun4v/mp_locore.S#2 integrate .. //depot/projects/smpng/sys/sun4v/sun4v/mp_machdep.c#2 integrate .. //depot/projects/smpng/sys/sun4v/sun4v/nexus.c#2 integrate .. //depot/projects/smpng/sys/sun4v/sun4v/ofw_bus.c#2 delete .. //depot/projects/smpng/sys/sun4v/sun4v/ofw_machdep.c#2 delete .. //depot/projects/smpng/sys/sun4v/sun4v/pmap.c#6 integrate .. //depot/projects/smpng/sys/sun4v/sun4v/prof_machdep.c#2 delete .. //depot/projects/smpng/sys/sun4v/sun4v/rtc.c#3 integrate .. //depot/projects/smpng/sys/sun4v/sun4v/rwindow.c#2 delete .. //depot/projects/smpng/sys/sun4v/sun4v/simdisk.c#2 integrate .. //depot/projects/smpng/sys/sun4v/sun4v/support.S#4 integrate .. //depot/projects/smpng/sys/sun4v/sun4v/sys_machdep.c#2 delete .. //depot/projects/smpng/sys/sun4v/sun4v/t1_copy.S#2 delete .. //depot/projects/smpng/sys/sun4v/sun4v/tlb.c#2 delete .. //depot/projects/smpng/sys/sun4v/sun4v/trap.c#5 integrate .. //depot/projects/smpng/sys/sun4v/sun4v/tsb.c#2 integrate .. //depot/projects/smpng/sys/sun4v/sun4v/tte.c#2 integrate .. //depot/projects/smpng/sys/sun4v/sun4v/tte_hash.c#4 integrate .. //depot/projects/smpng/sys/sun4v/sun4v/uio_machdep.c#2 integrate .. //depot/projects/smpng/sys/sun4v/sun4v/vm_machdep.c#2 integrate .. //depot/projects/smpng/sys/sun4v/sun4v/vnex.c#2 integrate .. //depot/projects/smpng/sys/sys/param.h#107 integrate .. //depot/projects/smpng/sys/sys/pcpu.h#17 integrate .. //depot/projects/smpng/sys/sys/proc.h#174 integrate .. //depot/projects/smpng/sys/sys/rtprio.h#7 integrate .. //depot/projects/smpng/sys/sys/runq.h#7 integrate .. //depot/projects/smpng/sys/sys/sched.h#25 integrate .. //depot/projects/smpng/sys/sys/soundcard.h#13 integrate .. //depot/projects/smpng/sys/sys/uio.h#23 integrate .. //depot/projects/smpng/sys/sys/umtx.h#19 integrate .. //depot/projects/smpng/sys/sys/vmmeter.h#6 integrate .. //depot/projects/smpng/sys/vm/vm_glue.c#59 integrate .. //depot/projects/smpng/sys/vm/vm_kern.h#7 integrate .. //depot/projects/smpng/sys/vm/vm_meter.c#31 integrate .. //depot/projects/smpng/sys/vm/vm_page.c#87 integrate .. //depot/projects/smpng/sys/vm/vm_zeroidle.c#32 integrate Differences ... ==== //depot/projects/smpng/sys/Makefile#15 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/Makefile,v 1.39 2006/11/11 16:26:55 trhodes Exp $ +# $FreeBSD: src/sys/Makefile,v 1.40 2006/11/26 18:27:16 maxim Exp $ .include <bsd.own.mk> @@ -8,8 +8,8 @@ .endif # Directories to include in cscope name file and TAGS. -CSCOPEDIRS= coda compat conf contrib crypto ddb dev fs geom gnu i4b isa \ - isofs kern libkern modules net net80211 netatalk netatm \ +CSCOPEDIRS= cam coda compat conf contrib crypto ddb dev fs geom gnu i4b \ + isa isofs kern libkern modules net net80211 netatalk netatm \ netgraph netinet netinet6 netipx netkey netnatm netncp \ netsmb nfs nfsclient nfs4client rpc pccard pci sys \ ufs vm ${ARCHDIR} ==== //depot/projects/smpng/sys/amd64/amd64/db_trace.c#24 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/amd64/amd64/db_trace.c,v 1.79 2006/11/17 19:20:31 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/db_trace.c,v 1.80 2006/11/17 20:27:00 jhb Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -562,7 +562,7 @@ } /* - * we can watch a 1, 2, or 4 byte sized location + * we can watch a 1, 2, 4, or 8 byte sized location */ switch (size) { case 1: @@ -574,6 +574,9 @@ case 4: len = DBREG_DR7_LEN_4; break; + case 8: + len = DBREG_DR7_LEN_8; + break; default: return (-1); } @@ -624,12 +627,14 @@ avail++; } - if (avail * 4 < size) + if (avail * 8 < size) return (-1); for (i = 0; i < 4 && (size > 0); i++) { if (!DBREG_DR7_ENABLED(d.dr[7], i)) { - if (size > 2) + if (size >= 8 || (avail == 1 && size > 4)) + wsize = 8; + else if (size > 2) wsize = 4; else wsize = size; @@ -637,6 +642,7 @@ DBREG_DR7_WRONLY, &d); addr += wsize; size -= wsize; + avail--; } } @@ -699,8 +705,12 @@ if (DBREG_DR7_ENABLED(d.dr[7], i)) { type = DBREG_DR7_ACCESS(d.dr[7], i); len = DBREG_DR7_LEN(d.dr[7], i); + if (len == DBREG_DR7_LEN_8) + len = 8; + else + len++; db_printf(" %-5d %-8s %10s %3d ", - i, "enabled", watchtype_str(type), len + 1); + i, "enabled", watchtype_str(type), len); db_printsym((db_addr_t)DBREG_DRX((&d), i), DB_STGY_ANY); db_printf("\n"); } else { ==== //depot/projects/smpng/sys/amd64/amd64/genassym.c#17 (text+ko) ==== @@ -33,7 +33,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/amd64/amd64/genassym.c,v 1.158 2006/11/01 04:54:49 jb Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/genassym.c,v 1.159 2006/11/30 04:17:04 jb Exp $"); #include "opt_compat.h" #include "opt_kstack_pages.h" @@ -185,7 +185,6 @@ ASSYM(PC_FPCURTHREAD, offsetof(struct pcpu, pc_fpcurthread)); ASSYM(PC_IDLETHREAD, offsetof(struct pcpu, pc_idlethread)); ASSYM(PC_CURPCB, offsetof(struct pcpu, pc_curpcb)); -ASSYM(PC_CONS_BUFR, offsetof(struct pcpu, pc_cons_bufr)); ASSYM(PC_CPUID, offsetof(struct pcpu, pc_cpuid)); ASSYM(PC_SCRATCH_RSP, offsetof(struct pcpu, pc_scratch_rsp)); ASSYM(PC_CURPMAP, offsetof(struct pcpu, pc_curpmap)); ==== //depot/projects/smpng/sys/amd64/amd64/machdep.c#62 (text+ko) ==== @@ -39,7 +39,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/amd64/amd64/machdep.c,v 1.662 2006/11/17 19:20:31 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/machdep.c,v 1.666 2006/12/06 18:27:17 sobomax Exp $"); #include "opt_atalk.h" #include "opt_atpic.h" @@ -514,6 +514,7 @@ * help lock contention somewhat, and this is critical for HTT. -Peter */ static int cpu_idle_hlt = 1; +TUNABLE_INT("machdep.cpu_idle_hlt", &cpu_idle_hlt); SYSCTL_INT(_machdep, OID_AUTO, cpu_idle_hlt, CTLFLAG_RW, &cpu_idle_hlt, 0, "Idle loop HLT enable"); @@ -833,7 +834,7 @@ static void getmemsize(caddr_t kmdp, u_int64_t first) { - int i, physmap_idx, pa_indx, da_indx; + int i, off, physmap_idx, pa_indx, da_indx; vm_paddr_t pa, physmap[PHYSMAP_SIZE]; u_long physmem_tunable; pt_entry_t *pte; @@ -1096,14 +1097,17 @@ /* Trim off space for the message buffer. */ phys_avail[pa_indx] -= round_page(MSGBUF_SIZE); - avail_end = phys_avail[pa_indx]; + /* Map the message buffer. */ + for (off = 0; off < round_page(MSGBUF_SIZE); off += PAGE_SIZE) + pmap_kenter((vm_offset_t)msgbufp + off, phys_avail[pa_indx] + + off); } u_int64_t hammer_time(u_int64_t modulep, u_int64_t physfree) { caddr_t kmdp; - int gsel_tss, off, x; + int gsel_tss, x; struct pcpu *pc; u_int64_t msr; char *env; @@ -1118,11 +1122,7 @@ * This may be done better later if it gets more high level * components in it. If so just link td->td_proc here. */ -#ifdef KSE - proc_linkup(&proc0, &ksegrp0, &thread0); -#else proc_linkup(&proc0, &thread0); -#endif preload_metadata = (caddr_t)(uintptr_t)(modulep + KERNBASE); preload_bootstrap_relocate(KERNBASE); @@ -1270,10 +1270,6 @@ /* now running on new page tables, configured,and u/iom is accessible */ - /* Map the message buffer. */ - for (off = 0; off < round_page(MSGBUF_SIZE); off += PAGE_SIZE) - pmap_kenter((vm_offset_t)msgbufp + off, avail_end + off); - msgbufinit(msgbufp, MSGBUF_SIZE); fpuinit(); @@ -1711,7 +1707,8 @@ for (i = 0; i < 4; i++) { if (DBREG_DR7_ACCESS(dbregs->dr[7], i) == 0x02) return (EINVAL); - if (DBREG_DR7_LEN(dbregs->dr[7], i) == 0x02) + if (td->td_frame->tf_cs == _ucode32sel && + DBREG_DR7_LEN(dbregs->dr[7], i) == DBREG_DR7_LEN_8) return (EINVAL); } if ((dbregs->dr[6] & 0xffffffff00000000ul) != 0 || ==== //depot/projects/smpng/sys/amd64/amd64/minidump_machdep.c#2 (text) ==== @@ -25,7 +25,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/amd64/amd64/minidump_machdep.c,v 1.1 2006/04/21 04:24:50 peter Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/minidump_machdep.c,v 1.2 2006/12/05 11:31:33 ru Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -215,7 +215,7 @@ j = ((va >> PDRSHIFT) & ((1ul << NPDEPGSHIFT) - 1)); if ((pd[j] & (PG_PS | PG_V)) == (PG_PS | PG_V)) { /* This is an entire 2M page. */ - pa = pd[j] & PG_FRAME & ~PDRMASK; + pa = pd[j] & PG_PS_FRAME; for (k = 0; k < NPTEPG; k++) { if (is_dumpable(pa)) dump_add_page(pa); @@ -326,7 +326,7 @@ j = ((va >> PDRSHIFT) & ((1ul << NPDEPGSHIFT) - 1)); if ((pd[j] & (PG_PS | PG_V)) == (PG_PS | PG_V)) { /* This is a single 2M block. Generate a fake PTP */ - pa = pd[j] & PG_FRAME & ~PDRMASK; + pa = pd[j] & PG_PS_FRAME; for (k = 0; k < NPTEPG; k++) { fakept[k] = (pa + (k * PAGE_SIZE)) | PG_V | PG_RW | PG_A | PG_M; } ==== //depot/projects/smpng/sys/amd64/amd64/pmap.c#70 (text+ko) ==== @@ -77,7 +77,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.573 2006/11/12 21:48:32 alc Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.577 2006/12/05 11:31:33 ru Exp $"); /* * Manages physical address maps. @@ -168,8 +168,7 @@ struct pmap kernel_pmap_store; -vm_paddr_t avail_start; /* PA of first available physical page */ -vm_paddr_t avail_end; /* PA of last available physical page */ +static vm_paddr_t avail_start; /* PA of first available physical page */ vm_offset_t virtual_avail; /* VA of first avail page (after kernel bss) */ vm_offset_t virtual_end; /* VA of last avail page (end of kernel AS) */ @@ -948,9 +947,7 @@ pde = *pdep; if (pde) { if ((pde & PG_PS) != 0) { - KASSERT((pde & PG_FRAME & PDRMASK) == 0, - ("pmap_extract: bad pde")); - rtval = (pde & PG_FRAME) | (va & PDRMASK); + rtval = (pde & PG_PS_FRAME) | (va & PDRMASK); PMAP_UNLOCK(pmap); return rtval; } @@ -983,9 +980,7 @@ if (pdep != NULL && (pde = *pdep)) { if (pde & PG_PS) { if ((pde & PG_RW) || (prot & VM_PROT_WRITE) == 0) { - KASSERT((pde & PG_FRAME & PDRMASK) == 0, - ("pmap_extract_and_hold: bad pde")); - m = PHYS_TO_VM_PAGE((pde & PG_FRAME) | + m = PHYS_TO_VM_PAGE((pde & PG_PS_FRAME) | (va & PDRMASK)); vm_page_hold(m); } @@ -1014,7 +1009,7 @@ } else { pde = vtopde(va); if (*pde & PG_PS) { - pa = (*pde & ~(NBPDR - 1)) | (va & (NBPDR - 1)); + pa = (*pde & PG_PS_FRAME) | (va & PDRMASK); } else { pa = *vtopte(va); pa = (pa & PG_FRAME) | (va & PAGE_MASK); @@ -1613,7 +1608,7 @@ #define PC_FREE1 0xfffffffffffffffful #define PC_FREE2 0x000000fffffffffful -static uint64_t pc_freemask[3] = { PC_FREE0, PC_FREE1, PC_FREE2 }; +static uint64_t pc_freemask[_NPCM] = { PC_FREE0, PC_FREE1, PC_FREE2 }; SYSCTL_INT(_vm_pmap, OID_AUTO, pv_entry_count, CTLFLAG_RD, &pv_entry_count, 0, "Current number of pv entries"); @@ -2127,7 +2122,8 @@ return; } - if (prot & VM_PROT_WRITE) + if ((prot & (VM_PROT_WRITE|VM_PROT_EXECUTE)) == + (VM_PROT_WRITE|VM_PROT_EXECUTE)) return; anychanged = 0; @@ -2163,7 +2159,10 @@ * Check for large page. */ if ((ptpaddr & PG_PS) != 0) { - *pde &= ~(PG_M|PG_RW); + if ((prot & VM_PROT_WRITE) == 0) + *pde &= ~(PG_M|PG_RW); + if ((prot & VM_PROT_EXECUTE) == 0) + *pde |= pg_nx; anychanged = 1; continue; } @@ -2178,6 +2177,8 @@ retry: obits = pbits = *pte; + if ((pbits & PG_V) == 0) + continue; if (pbits & PG_MANAGED) { m = NULL; if (pbits & PG_A) { @@ -2193,7 +2194,10 @@ } } - pbits &= ~(PG_RW | PG_M); + if ((prot & VM_PROT_WRITE) == 0) + pbits &= ~(PG_RW | PG_M); + if ((prot & VM_PROT_EXECUTE) == 0) + pbits |= pg_nx; if (pbits != obits) { if (!atomic_cmpset_long(pte, obits, pbits)) ==== //depot/projects/smpng/sys/amd64/amd64/trap.c#56 (text+ko) ==== @@ -38,7 +38,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/amd64/amd64/trap.c,v 1.311 2006/10/26 21:42:16 jb Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/trap.c,v 1.312 2006/11/28 20:04:00 ru Exp $"); /* * AMD64 Trap and System call handling @@ -646,9 +646,10 @@ #endif if (type == T_PAGEFLT) { printf("fault virtual address = 0x%lx\n", eva); - printf("fault code = %s %s, %s\n", + printf("fault code = %s %s %s, %s\n", code & PGEX_U ? "user" : "supervisor", code & PGEX_W ? "write" : "read", + code & PGEX_I ? "instruction" : "data", code & PGEX_P ? "protection violation" : "page not present"); } printf("instruction pointer = 0x%lx:0x%lx\n", ==== //depot/projects/smpng/sys/amd64/conf/GENERIC#53 (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.468 2006/10/26 22:11:34 jb Exp $ +# $FreeBSD: src/sys/amd64/conf/GENERIC,v 1.470 2006/12/03 21:02:09 netchild Exp $ cpu HAMMER ident GENERIC @@ -71,11 +71,6 @@ # Make an SMP-capable kernel by default options SMP # Symmetric MultiProcessor Kernel -# Linux 32-bit ABI support -options COMPAT_LINUX32 # Compatible with i386 linux binaries -options LINPROCFS # Cannot be a module yet. -options LINSYSFS - # Bus support. device acpi device pci ==== //depot/projects/smpng/sys/amd64/include/pmap.h#26 (text+ko) ==== @@ -39,7 +39,7 @@ * * from: hp300: @(#)pmap.h 7.2 (Berkeley) 12/16/90 * from: @(#)pmap.h 7.4 (Berkeley) 5/12/91 - * $FreeBSD: src/sys/amd64/include/pmap.h,v 1.136 2006/11/13 20:33:54 ru Exp $ + * $FreeBSD: src/sys/amd64/include/pmap.h,v 1.138 2006/12/05 11:31:33 ru Exp $ */ #ifndef _MACHINE_PMAP_H_ @@ -71,6 +71,7 @@ #define PG_W PG_AVAIL1 /* "Wired" pseudoflag */ #define PG_MANAGED PG_AVAIL2 #define PG_FRAME (0x000ffffffffff000ul) +#define PG_PS_FRAME (0x000fffffffe00000ul) #define PG_PROT (PG_RW|PG_U) /* all protection bits . */ #define PG_N (PG_NC_PWT|PG_NC_PCD) /* Non-cacheable */ @@ -296,7 +297,6 @@ extern caddr_t CADDR1; extern pt_entry_t *CMAP1; -extern vm_paddr_t avail_end; extern vm_paddr_t phys_avail[]; extern vm_paddr_t dump_avail[]; extern vm_offset_t virtual_avail; ==== //depot/projects/smpng/sys/amd64/include/reg.h#8 (text+ko) ==== @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * from: @(#)reg.h 5.5 (Berkeley) 1/18/91 - * $FreeBSD: src/sys/amd64/include/reg.h,v 1.37 2006/11/17 19:20:31 jhb Exp $ + * $FreeBSD: src/sys/amd64/include/reg.h,v 1.38 2006/11/17 20:27:01 jhb Exp $ */ #ifndef _MACHINE_REG_H_ @@ -97,6 +97,7 @@ #define DBREG_DR7_LEN_1 0x00 /* 1 byte length */ #define DBREG_DR7_LEN_2 0x01 #define DBREG_DR7_LEN_4 0x03 +#define DBREG_DR7_LEN_8 0x02 #define DBREG_DR7_EXEC 0x00 /* break on execute */ #define DBREG_DR7_WRONLY 0x01 /* break on write */ #define DBREG_DR7_RDWR 0x03 /* break on read or write */ ==== //depot/projects/smpng/sys/amd64/isa/clock.c#19 (text+ko) ==== @@ -33,7 +33,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/amd64/isa/clock.c,v 1.227 2006/10/02 18:23:36 phk Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/isa/clock.c,v 1.228 2006/12/03 03:49:28 bde Exp $"); /* * Routines to handle clock hardware. @@ -115,6 +115,7 @@ static int (*i8254_pending)(struct intsrc *); static int i8254_ticked; static int using_lapic_timer; +static int rtc_reg = -1; static u_char rtc_statusa = RTCSA_DIVIDER | RTCSA_NOPROF; static u_char rtc_statusb = RTCSB_24HR; @@ -421,24 +422,30 @@ u_char val; RTC_LOCK; - outb(IO_RTC, reg); - inb(0x84); + if (rtc_reg != reg) { + inb(0x84); + outb(IO_RTC, reg); + rtc_reg = reg; + inb(0x84); + } val = inb(IO_RTC + 1); - inb(0x84); RTC_UNLOCK; return (val); } -static __inline void -writertc(u_char reg, u_char val) +static void +writertc(int reg, u_char val) { RTC_LOCK; - inb(0x84); - outb(IO_RTC, reg); + if (rtc_reg != reg) { + inb(0x84); + outb(IO_RTC, reg); + rtc_reg = reg; + inb(0x84); + } + outb(IO_RTC + 1, val); inb(0x84); - outb(IO_RTC + 1, val); - inb(0x84); /* XXX work around wrong order in rtcin() */ RTC_UNLOCK; } ==== //depot/projects/smpng/sys/amd64/linux32/linux32_sysvec.c#22 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/amd64/linux32/linux32_sysvec.c,v 1.25 2006/10/31 17:53:02 kib Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/linux32/linux32_sysvec.c,v 1.26 2006/12/03 21:06:07 netchild Exp $"); #include "opt_compat.h" #ifndef COMPAT_IA32 @@ -1118,7 +1118,7 @@ printf("Could not deinstall ELF interpreter entry\n"); break; default: - break; + return EOPNOTSUPP; } return error; } ==== //depot/projects/smpng/sys/arm/arm/cpufunc.c#13 (text+ko) ==== @@ -45,7 +45,7 @@ * Created : 30/01/97 */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/arm/arm/cpufunc.c,v 1.13 2006/11/07 22:36:56 cognet Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/arm/cpufunc.c,v 1.15 2006/11/30 23:34:07 cognet Exp $"); #include <sys/param.h> >>> TRUNCATED FOR MAIL (1000 lines) <<<
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200612112222.kBBMMQgf006917>