PERFORCE change 110761 for review
Matt Jacob
mjacob at FreeBSD.org
Thu Nov 30 14:40:32 PST 2006
http://perforce.freebsd.org/chv.cgi?CH=110761
Change 110761 by mjacob at newisp on 2006/11/30 22:39:27
IFC
Affected files ...
.. //depot/projects/newisp/Makefile#3 integrate
.. //depot/projects/newisp/amd64/amd64/db_trace.c#4 integrate
.. //depot/projects/newisp/amd64/amd64/genassym.c#3 integrate
.. //depot/projects/newisp/amd64/amd64/intr_machdep.c#4 integrate
.. //depot/projects/newisp/amd64/amd64/io_apic.c#3 integrate
.. //depot/projects/newisp/amd64/amd64/machdep.c#8 integrate
.. //depot/projects/newisp/amd64/amd64/pmap.c#4 integrate
.. //depot/projects/newisp/amd64/amd64/trap.c#3 integrate
.. //depot/projects/newisp/amd64/conf/GENERIC#5 integrate
.. //depot/projects/newisp/amd64/include/pmap.h#3 integrate
.. //depot/projects/newisp/amd64/include/reg.h#3 integrate
.. //depot/projects/newisp/arm/arm/cpufunc.c#4 integrate
.. //depot/projects/newisp/arm/arm/genassym.c#3 integrate
.. //depot/projects/newisp/arm/arm/identcpu.c#3 integrate
.. //depot/projects/newisp/arm/arm/nexus.c#3 integrate
.. //depot/projects/newisp/arm/arm/nexus_io.c#3 integrate
.. //depot/projects/newisp/arm/at91/at91.c#3 integrate
.. //depot/projects/newisp/arm/at91/at91_pio.c#2 integrate
.. //depot/projects/newisp/arm/at91/at91_spi.c#3 integrate
.. //depot/projects/newisp/arm/at91/at91_twi.c#4 integrate
.. //depot/projects/newisp/arm/conf/AVILA#1 branch
.. //depot/projects/newisp/arm/include/bus.h#2 integrate
.. //depot/projects/newisp/arm/sa11x0/sa11x0_io.c#3 integrate
.. //depot/projects/newisp/arm/xscale/i80321/ep80219_machdep.c#4 integrate
.. //depot/projects/newisp/arm/xscale/i80321/i80321_space.c#2 integrate
.. //depot/projects/newisp/arm/xscale/i80321/iq31244_machdep.c#3 integrate
.. //depot/projects/newisp/arm/xscale/i80321/obio_space.c#2 integrate
.. //depot/projects/newisp/arm/xscale/ixp425/avila_ata.c#1 branch
.. //depot/projects/newisp/arm/xscale/ixp425/avila_led.c#1 branch
.. //depot/projects/newisp/arm/xscale/ixp425/avila_machdep.c#1 branch
.. //depot/projects/newisp/arm/xscale/ixp425/files.avila#1 branch
.. //depot/projects/newisp/arm/xscale/ixp425/files.ixp425#1 branch
.. //depot/projects/newisp/arm/xscale/ixp425/if_npe.c#1 branch
.. //depot/projects/newisp/arm/xscale/ixp425/if_npereg.h#1 branch
.. //depot/projects/newisp/arm/xscale/ixp425/ixdp425_pci.c#1 branch
.. //depot/projects/newisp/arm/xscale/ixp425/ixdp425reg.h#1 branch
.. //depot/projects/newisp/arm/xscale/ixp425/ixp425.c#1 branch
.. //depot/projects/newisp/arm/xscale/ixp425/ixp425_a4x_io.S#1 branch
.. //depot/projects/newisp/arm/xscale/ixp425/ixp425_a4x_space.c#1 branch
.. //depot/projects/newisp/arm/xscale/ixp425/ixp425_iic.c#1 branch
.. //depot/projects/newisp/arm/xscale/ixp425/ixp425_intr.h#1 branch
.. //depot/projects/newisp/arm/xscale/ixp425/ixp425_mem.c#1 branch
.. //depot/projects/newisp/arm/xscale/ixp425/ixp425_npe.c#1 branch
.. //depot/projects/newisp/arm/xscale/ixp425/ixp425_npereg.h#1 branch
.. //depot/projects/newisp/arm/xscale/ixp425/ixp425_npevar.h#1 branch
.. //depot/projects/newisp/arm/xscale/ixp425/ixp425_pci.c#1 branch
.. //depot/projects/newisp/arm/xscale/ixp425/ixp425_pci_asm.S#1 branch
.. //depot/projects/newisp/arm/xscale/ixp425/ixp425_pci_space.c#1 branch
.. //depot/projects/newisp/arm/xscale/ixp425/ixp425_qmgr.c#1 branch
.. //depot/projects/newisp/arm/xscale/ixp425/ixp425_qmgr.h#1 branch
.. //depot/projects/newisp/arm/xscale/ixp425/ixp425_space.c#1 branch
.. //depot/projects/newisp/arm/xscale/ixp425/ixp425_timer.c#1 branch
.. //depot/projects/newisp/arm/xscale/ixp425/ixp425_wdog.c#1 branch
.. //depot/projects/newisp/arm/xscale/ixp425/ixp425reg.h#1 branch
.. //depot/projects/newisp/arm/xscale/ixp425/ixp425var.h#1 branch
.. //depot/projects/newisp/arm/xscale/ixp425/std.avila#1 branch
.. //depot/projects/newisp/arm/xscale/ixp425/std.ixp425#1 branch
.. //depot/projects/newisp/arm/xscale/ixp425/uart_bus_ixp425.c#1 branch
.. //depot/projects/newisp/arm/xscale/ixp425/uart_cpu_ixp425.c#1 branch
.. //depot/projects/newisp/boot/arm/at91/boot0/Makefile#2 integrate
.. //depot/projects/newisp/boot/arm/at91/boot0/arm_init.s#2 delete
.. //depot/projects/newisp/boot/arm/at91/boot0iic/Makefile#2 integrate
.. //depot/projects/newisp/boot/arm/at91/boot0iic/main.c#3 integrate
.. //depot/projects/newisp/boot/arm/at91/boot0spi/Makefile#2 integrate
.. //depot/projects/newisp/boot/arm/at91/boot0spi/main.c#3 integrate
.. //depot/projects/newisp/boot/arm/at91/boot2/Makefile#3 integrate
.. //depot/projects/newisp/boot/arm/at91/boot2/boot2.c#3 integrate
.. //depot/projects/newisp/boot/arm/at91/bootiic/Makefile#3 integrate
.. //depot/projects/newisp/boot/arm/at91/bootiic/arm_init.S#2 delete
.. //depot/projects/newisp/boot/arm/at91/bootspi/Makefile#4 integrate
.. //depot/projects/newisp/boot/arm/at91/bootspi/arm_init.S#3 delete
.. //depot/projects/newisp/boot/arm/at91/libat91/arm_init.S#1 branch
.. //depot/projects/newisp/boot/arm/at91/libat91/mci_device.c#3 delete
.. //depot/projects/newisp/boot/common/loader.8#3 integrate
.. //depot/projects/newisp/boot/i386/loader/main.c#3 integrate
.. //depot/projects/newisp/boot/ia64/common/copy.c#2 integrate
.. //depot/projects/newisp/boot/ia64/common/libia64.h#2 integrate
.. //depot/projects/newisp/boot/sparc64/loader/hcall.S#2 delete
.. //depot/projects/newisp/cam/scsi/scsi_da.c#7 integrate
.. //depot/projects/newisp/compat/linprocfs/linprocfs.c#4 integrate
.. //depot/projects/newisp/compat/linux/linux_getcwd.c#3 integrate
.. //depot/projects/newisp/compat/linux/linux_misc.c#9 integrate
.. //depot/projects/newisp/conf/files#14 integrate
.. //depot/projects/newisp/conf/files.arm#3 integrate
.. //depot/projects/newisp/conf/files.sun4v#3 integrate
.. //depot/projects/newisp/conf/kern.mk#2 integrate
.. //depot/projects/newisp/conf/options#8 integrate
.. //depot/projects/newisp/conf/options.arm#2 integrate
.. //depot/projects/newisp/ddb/db_watch.c#2 integrate
.. //depot/projects/newisp/dev/ata/ata-all.c#3 integrate
.. //depot/projects/newisp/dev/ath/if_ath.c#3 integrate
.. //depot/projects/newisp/dev/bce/if_bce.c#9 integrate
.. //depot/projects/newisp/dev/bce/if_bcereg.h#5 integrate
.. //depot/projects/newisp/dev/bfe/if_bfe.c#2 integrate
.. //depot/projects/newisp/dev/bge/if_bge.c#11 integrate
.. //depot/projects/newisp/dev/bge/if_bgereg.h#5 integrate
.. //depot/projects/newisp/dev/ciss/ciss.c#4 integrate
.. //depot/projects/newisp/dev/em/if_em.c#14 integrate
.. //depot/projects/newisp/dev/em/if_em.h#8 integrate
.. //depot/projects/newisp/dev/flash/at45d.c#1 branch
.. //depot/projects/newisp/dev/fxp/if_fxp.c#5 integrate
.. //depot/projects/newisp/dev/fxp/if_fxpvar.h#2 integrate
.. //depot/projects/newisp/dev/iicbus/ad7418.c#1 branch
.. //depot/projects/newisp/dev/iicbus/ds1672.c#1 branch
.. //depot/projects/newisp/dev/iicbus/iic.c#3 integrate
.. //depot/projects/newisp/dev/iicbus/iic.h#2 integrate
.. //depot/projects/newisp/dev/iicbus/iicbb.c#2 integrate
.. //depot/projects/newisp/dev/iicbus/iicbus.c#2 integrate
.. //depot/projects/newisp/dev/iicbus/iiconf.h#2 integrate
.. //depot/projects/newisp/dev/isp/isp.c#39 integrate
.. //depot/projects/newisp/dev/isp/isp_library.c#22 integrate
.. //depot/projects/newisp/dev/isp/isp_library.h#14 integrate
.. //depot/projects/newisp/dev/isp/isp_pci.c#20 integrate
.. //depot/projects/newisp/dev/isp/ispmbox.h#15 integrate
.. //depot/projects/newisp/dev/isp/ispvar.h#18 integrate
.. //depot/projects/newisp/dev/mfi/mfi.c#9 integrate
.. //depot/projects/newisp/dev/mii/bmtphy.c#2 integrate
.. //depot/projects/newisp/dev/mii/ciphy.c#2 integrate
.. //depot/projects/newisp/dev/mii/gentbi.c#2 integrate
.. //depot/projects/newisp/dev/mii/lxtphy.c#2 integrate
.. //depot/projects/newisp/dev/mii/mii_physubr.c#2 integrate
.. //depot/projects/newisp/dev/mii/miivar.h#2 integrate
.. //depot/projects/newisp/dev/mii/nsgphy.c#2 integrate
.. //depot/projects/newisp/dev/mii/nsphy.c#2 integrate
.. //depot/projects/newisp/dev/mii/qsphy.c#2 integrate
.. //depot/projects/newisp/dev/mii/rlphy.c#2 integrate
.. //depot/projects/newisp/dev/mpt/mpt.h#5 integrate
.. //depot/projects/newisp/dev/mpt/mpt_cam.c#14 integrate
.. //depot/projects/newisp/dev/mpt/mpt_pci.c#6 integrate
.. //depot/projects/newisp/dev/mxge/if_mxge.c#4 integrate
.. //depot/projects/newisp/dev/mxge/if_mxge_var.h#3 integrate
.. //depot/projects/newisp/dev/nfe/if_nfe.c#5 integrate
.. //depot/projects/newisp/dev/nfe/if_nfereg.h#4 integrate
.. //depot/projects/newisp/dev/nfe/if_nfevar.h#2 integrate
.. //depot/projects/newisp/dev/pci/pci.c#8 integrate
.. //depot/projects/newisp/dev/re/if_re.c#5 integrate
.. //depot/projects/newisp/dev/rp/rp.c#2 integrate
.. //depot/projects/newisp/dev/rp/rpreg.h#2 integrate
.. //depot/projects/newisp/dev/rp/rpvar.h#2 integrate
.. //depot/projects/newisp/dev/sound/pci/atiixp.c#3 integrate
.. //depot/projects/newisp/dev/sound/pci/cmi.c#2 integrate
.. //depot/projects/newisp/dev/sound/pci/es137x.c#2 integrate
.. //depot/projects/newisp/dev/sound/pci/hda/hda_reg.h#2 integrate
.. //depot/projects/newisp/dev/sound/pci/hda/hdac.c#4 integrate
.. //depot/projects/newisp/dev/sound/pci/hda/hdac_private.h#3 integrate
.. //depot/projects/newisp/dev/sound/pci/ich.c#2 integrate
.. //depot/projects/newisp/dev/sound/pci/via8233.c#2 integrate
.. //depot/projects/newisp/dev/sound/pcm/ac97.c#3 integrate
.. //depot/projects/newisp/dev/sound/pcm/ac97.h#2 integrate
.. //depot/projects/newisp/dev/sound/pcm/buffer.c#3 integrate
.. //depot/projects/newisp/dev/sound/pcm/buffer.h#3 integrate
.. //depot/projects/newisp/dev/sound/pcm/channel.c#4 integrate
.. //depot/projects/newisp/dev/sound/pcm/channel.h#3 integrate
.. //depot/projects/newisp/dev/sound/pcm/dsp.c#6 integrate
.. //depot/projects/newisp/dev/sound/pcm/fake.c#2 integrate
.. //depot/projects/newisp/dev/sound/pcm/feeder.c#2 integrate
.. //depot/projects/newisp/dev/sound/pcm/feeder.h#2 integrate
.. //depot/projects/newisp/dev/sound/pcm/feeder_fmt.c#2 integrate
.. //depot/projects/newisp/dev/sound/pcm/feeder_rate.c#2 integrate
.. //depot/projects/newisp/dev/sound/pcm/feeder_volume.c#2 integrate
.. //depot/projects/newisp/dev/sound/pcm/mixer.c#4 integrate
.. //depot/projects/newisp/dev/sound/pcm/sndstat.c#2 integrate
.. //depot/projects/newisp/dev/sound/pcm/sound.c#3 integrate
.. //depot/projects/newisp/dev/sound/pcm/sound.h#4 integrate
.. //depot/projects/newisp/dev/sound/pcm/vchan.c#2 integrate
.. //depot/projects/newisp/dev/sound/usb/uaudio.c#4 integrate
.. //depot/projects/newisp/dev/syscons/syscons.c#5 integrate
.. //depot/projects/newisp/dev/usb/FILES#2 integrate
.. //depot/projects/newisp/dev/usb/if_aue.c#4 integrate
.. //depot/projects/newisp/dev/usb/if_auereg.h#2 integrate
.. //depot/projects/newisp/dev/usb/if_ural.c#5 integrate
.. //depot/projects/newisp/dev/usb/ukbd.c#5 integrate
.. //depot/projects/newisp/dev/usb/usb_quirks.c#5 integrate
.. //depot/projects/newisp/dev/usb/usb_quirks.h#2 integrate
.. //depot/projects/newisp/dev/usb/usbdevs#6 integrate
.. //depot/projects/newisp/dev/usb/usbdi.c#4 integrate
.. //depot/projects/newisp/dev/vge/if_vge.c#4 integrate
.. //depot/projects/newisp/fs/msdosfs/msdosfs_conv.c#4 integrate
.. //depot/projects/newisp/fs/ntfs/ntfs_subr.c#2 integrate
.. //depot/projects/newisp/fs/ntfs/ntfs_subr.h#2 integrate
.. //depot/projects/newisp/fs/ntfs/ntfs_vnops.c#3 integrate
.. //depot/projects/newisp/fs/procfs/procfs_ioctl.c#4 integrate
.. //depot/projects/newisp/gnu/fs/ext2fs/ext2_vfsops.c#4 integrate
.. //depot/projects/newisp/i386/i386/db_trace.c#4 integrate
.. //depot/projects/newisp/i386/i386/genassym.c#3 integrate
.. //depot/projects/newisp/i386/i386/intr_machdep.c#3 integrate
.. //depot/projects/newisp/i386/i386/io_apic.c#3 integrate
.. //depot/projects/newisp/i386/i386/locore.s#2 integrate
.. //depot/projects/newisp/i386/i386/machdep.c#7 integrate
.. //depot/projects/newisp/i386/i386/pmap.c#4 integrate
.. //depot/projects/newisp/i386/include/pmap.h#3 integrate
.. //depot/projects/newisp/i386/include/reg.h#3 integrate
.. //depot/projects/newisp/ia64/ia64/genassym.c#3 integrate
.. //depot/projects/newisp/ia64/ia64/interrupt.c#2 integrate
.. //depot/projects/newisp/ia64/ia64/machdep.c#4 integrate
.. //depot/projects/newisp/ia64/ia64/mp_machdep.c#2 integrate
.. //depot/projects/newisp/ia64/include/kdb.h#2 integrate
.. //depot/projects/newisp/ia64/include/pcpu.h#2 integrate
.. //depot/projects/newisp/kern/imgact_elf.c#2 integrate
.. //depot/projects/newisp/kern/kern_condvar.c#2 integrate
.. //depot/projects/newisp/kern/kern_event.c#3 integrate
.. //depot/projects/newisp/kern/kern_resource.c#5 integrate
.. //depot/projects/newisp/kern/kern_synch.c#4 integrate
.. //depot/projects/newisp/kern/kern_time.c#6 integrate
.. //depot/projects/newisp/kern/link_elf_obj.c#3 integrate
.. //depot/projects/newisp/kern/sched_4bsd.c#5 integrate
.. //depot/projects/newisp/kern/subr_prf.c#5 integrate
.. //depot/projects/newisp/kern/subr_sleepqueue.c#2 integrate
.. //depot/projects/newisp/kern/sysv_msg.c#5 integrate
.. //depot/projects/newisp/kern/uipc_socket.c#7 integrate
.. //depot/projects/newisp/modules/Makefile#6 integrate
.. //depot/projects/newisp/modules/wlan_amrr/Makefile#1 branch
.. //depot/projects/newisp/net/bridgestp.c#6 integrate
.. //depot/projects/newisp/net/bridgestp.h#4 integrate
.. //depot/projects/newisp/net/ethernet.h#2 integrate
.. //depot/projects/newisp/net/if.c#5 integrate
.. //depot/projects/newisp/net/if_bridge.c#8 integrate
.. //depot/projects/newisp/net/if_bridgevar.h#4 integrate
.. //depot/projects/newisp/net/if_ethersubr.c#3 integrate
.. //depot/projects/newisp/net/netisr.c#2 integrate
.. //depot/projects/newisp/net/route.c#2 integrate
.. //depot/projects/newisp/net80211/ieee80211.c#2 integrate
.. //depot/projects/newisp/net80211/ieee80211_amrr.c#1 branch
.. //depot/projects/newisp/net80211/ieee80211_amrr.h#1 branch
.. //depot/projects/newisp/net80211/ieee80211_var.h#2 integrate
.. //depot/projects/newisp/netinet/in_pcb.c#5 integrate
.. //depot/projects/newisp/netinet/tcp_usrreq.c#3 integrate
.. //depot/projects/newisp/netinet6/nd6.c#5 integrate
.. //depot/projects/newisp/nfs/nfsproto.h#2 integrate
.. //depot/projects/newisp/nfs4client/nfs4_subs.c#2 integrate
.. //depot/projects/newisp/nfs4client/nfs4_vn_subs.c#2 integrate
.. //depot/projects/newisp/nfsclient/nfs.h#3 integrate
.. //depot/projects/newisp/nfsclient/nfs_node.c#3 integrate
.. //depot/projects/newisp/nfsclient/nfs_socket.c#4 integrate
.. //depot/projects/newisp/nfsclient/nfs_vnops.c#5 integrate
.. //depot/projects/newisp/nfsserver/nfs.h#2 integrate
.. //depot/projects/newisp/nfsserver/nfs_serv.c#3 integrate
.. //depot/projects/newisp/nfsserver/nfs_srvsubs.c#2 integrate
.. //depot/projects/newisp/pc98/pc98/machdep.c#5 integrate
.. //depot/projects/newisp/pci/if_pcn.c#3 integrate
.. //depot/projects/newisp/pci/if_pcnreg.h#3 integrate
.. //depot/projects/newisp/pci/if_rlreg.h#2 integrate
.. //depot/projects/newisp/powerpc/powerpc/genassym.c#3 integrate
.. //depot/projects/newisp/powerpc/powerpc/mmu_oea.c#3 integrate
.. //depot/projects/newisp/sparc64/sparc64/autoconf.c#2 integrate
.. //depot/projects/newisp/sparc64/sparc64/genassym.c#5 integrate
.. //depot/projects/newisp/sparc64/sparc64/identcpu.c#2 integrate
.. //depot/projects/newisp/sparc64/sparc64/mem.c#2 integrate
.. //depot/projects/newisp/sun4v/cddl/mdesc/mdesc_diff.c#1 branch
.. //depot/projects/newisp/sun4v/cddl/mdesc/mdesc_findname.c#1 branch
.. //depot/projects/newisp/sun4v/cddl/mdesc/mdesc_findnodeprop.c#1 branch
.. //depot/projects/newisp/sun4v/cddl/mdesc/mdesc_fini.c#1 branch
.. //depot/projects/newisp/sun4v/cddl/mdesc/mdesc_getbinsize.c#1 branch
.. //depot/projects/newisp/sun4v/cddl/mdesc/mdesc_getgen.c#1 branch
.. //depot/projects/newisp/sun4v/cddl/mdesc/mdesc_getpropdata.c#1 branch
.. //depot/projects/newisp/sun4v/cddl/mdesc/mdesc_getpropstr.c#1 branch
.. //depot/projects/newisp/sun4v/cddl/mdesc/mdesc_getpropval.c#1 branch
.. //depot/projects/newisp/sun4v/cddl/mdesc/mdesc_init_intern.c#1 branch
.. //depot/projects/newisp/sun4v/cddl/mdesc/mdesc_nodecount.c#1 branch
.. //depot/projects/newisp/sun4v/cddl/mdesc/mdesc_rootnode.c#1 branch
.. //depot/projects/newisp/sun4v/cddl/mdesc/mdesc_scandag.c#1 branch
.. //depot/projects/newisp/sun4v/cddl/t1_copy.S#1 branch
.. //depot/projects/newisp/sun4v/conf/DEFAULTS#4 integrate
.. //depot/projects/newisp/sun4v/conf/GENERIC#3 integrate
.. //depot/projects/newisp/sun4v/conf/NOTES#4 integrate
.. //depot/projects/newisp/sun4v/include/asm.h#2 integrate
.. //depot/projects/newisp/sun4v/include/cache.h#2 integrate
.. //depot/projects/newisp/sun4v/include/hv_api.h#1 branch
.. //depot/projects/newisp/sun4v/include/hypervisor_api.h#3 delete
.. //depot/projects/newisp/sun4v/include/hypervisorvar.h#3 integrate
.. //depot/projects/newisp/sun4v/include/pcb.h#2 integrate
.. //depot/projects/newisp/sun4v/include/pcpu.h#2 integrate
.. //depot/projects/newisp/sun4v/include/pmap.h#3 integrate
.. //depot/projects/newisp/sun4v/include/smp.h#2 integrate
.. //depot/projects/newisp/sun4v/include/sun4v_cpufunc.h#2 integrate
.. //depot/projects/newisp/sun4v/include/tsb.h#2 integrate
.. //depot/projects/newisp/sun4v/include/tte_hash.h#3 integrate
.. //depot/projects/newisp/sun4v/mdesc/mdesc_diff.c#2 delete
.. //depot/projects/newisp/sun4v/mdesc/mdesc_findname.c#2 delete
.. //depot/projects/newisp/sun4v/mdesc/mdesc_findnodeprop.c#2 delete
.. //depot/projects/newisp/sun4v/mdesc/mdesc_fini.c#2 delete
.. //depot/projects/newisp/sun4v/mdesc/mdesc_getbinsize.c#2 delete
.. //depot/projects/newisp/sun4v/mdesc/mdesc_getgen.c#2 delete
.. //depot/projects/newisp/sun4v/mdesc/mdesc_getpropdata.c#2 delete
.. //depot/projects/newisp/sun4v/mdesc/mdesc_getpropstr.c#2 delete
.. //depot/projects/newisp/sun4v/mdesc/mdesc_getpropval.c#2 delete
.. //depot/projects/newisp/sun4v/mdesc/mdesc_init.c#2 integrate
.. //depot/projects/newisp/sun4v/mdesc/mdesc_init_intern.c#2 delete
.. //depot/projects/newisp/sun4v/mdesc/mdesc_nodecount.c#2 delete
.. //depot/projects/newisp/sun4v/mdesc/mdesc_rootnode.c#2 delete
.. //depot/projects/newisp/sun4v/mdesc/mdesc_scandag.c#2 delete
.. //depot/projects/newisp/sun4v/sun4v/autoconf.c#2 delete
.. //depot/projects/newisp/sun4v/sun4v/clock.c#2 delete
.. //depot/projects/newisp/sun4v/sun4v/counter.c#2 delete
.. //depot/projects/newisp/sun4v/sun4v/db_disasm.c#2 delete
.. //depot/projects/newisp/sun4v/sun4v/eeprom.c#2 delete
.. //depot/projects/newisp/sun4v/sun4v/elf_machdep.c#2 delete
.. //depot/projects/newisp/sun4v/sun4v/exception.S#4 integrate
.. //depot/projects/newisp/sun4v/sun4v/gdb_machdep.c#2 delete
.. //depot/projects/newisp/sun4v/sun4v/hv_pci.c#2 integrate
.. //depot/projects/newisp/sun4v/sun4v/hvcons.c#4 integrate
.. //depot/projects/newisp/sun4v/sun4v/hviommu.c#2 integrate
.. //depot/projects/newisp/sun4v/sun4v/identcpu.c#2 delete
.. //depot/projects/newisp/sun4v/sun4v/in_cksum.c#2 delete
.. //depot/projects/newisp/sun4v/sun4v/interrupt.S#4 integrate
.. //depot/projects/newisp/sun4v/sun4v/intr_machdep.c#3 integrate
.. //depot/projects/newisp/sun4v/sun4v/iommu.c#2 delete
.. //depot/projects/newisp/sun4v/sun4v/machdep.c#4 integrate
.. //depot/projects/newisp/sun4v/sun4v/mem.c#2 delete
.. //depot/projects/newisp/sun4v/sun4v/mp_locore.S#2 integrate
.. //depot/projects/newisp/sun4v/sun4v/mp_machdep.c#2 integrate
.. //depot/projects/newisp/sun4v/sun4v/nexus.c#2 integrate
.. //depot/projects/newisp/sun4v/sun4v/ofw_bus.c#2 delete
.. //depot/projects/newisp/sun4v/sun4v/ofw_machdep.c#2 delete
.. //depot/projects/newisp/sun4v/sun4v/pmap.c#5 integrate
.. //depot/projects/newisp/sun4v/sun4v/prof_machdep.c#2 delete
.. //depot/projects/newisp/sun4v/sun4v/rtc.c#3 integrate
.. //depot/projects/newisp/sun4v/sun4v/rwindow.c#2 delete
.. //depot/projects/newisp/sun4v/sun4v/simdisk.c#2 integrate
.. //depot/projects/newisp/sun4v/sun4v/support.S#4 integrate
.. //depot/projects/newisp/sun4v/sun4v/sys_machdep.c#2 delete
.. //depot/projects/newisp/sun4v/sun4v/t1_copy.S#2 delete
.. //depot/projects/newisp/sun4v/sun4v/tlb.c#2 delete
.. //depot/projects/newisp/sun4v/sun4v/trap.c#5 integrate
.. //depot/projects/newisp/sun4v/sun4v/tsb.c#2 integrate
.. //depot/projects/newisp/sun4v/sun4v/tte.c#2 integrate
.. //depot/projects/newisp/sun4v/sun4v/tte_hash.c#3 integrate
.. //depot/projects/newisp/sun4v/sun4v/vm_machdep.c#2 integrate
.. //depot/projects/newisp/sun4v/sun4v/vnex.c#2 integrate
.. //depot/projects/newisp/sys/param.h#9 integrate
.. //depot/projects/newisp/sys/pcpu.h#3 integrate
.. //depot/projects/newisp/sys/sleepqueue.h#2 integrate
.. //depot/projects/newisp/sys/soundcard.h#4 integrate
.. //depot/projects/newisp/sys/uio.h#2 integrate
.. //depot/projects/newisp/sys/vmmeter.h#2 integrate
.. //depot/projects/newisp/vm/vm_kern.h#2 integrate
.. //depot/projects/newisp/vm/vm_meter.c#2 integrate
Differences ...
==== //depot/projects/newisp/Makefile#3 (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/newisp/amd64/amd64/db_trace.c#4 (text+ko) ====
@@ -25,7 +25,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/amd64/amd64/db_trace.c,v 1.77 2006/11/15 19:53:47 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>
@@ -200,7 +200,7 @@
static void db_print_stack_entry(const char *, int, char **, long *, db_addr_t);
static void decode_syscall(int, struct thread *);
-static char * watchtype_str(int type);
+static const char * watchtype_str(int type);
int amd64_set_watch(int watchnum, unsigned long watchaddr, int size,
int access, struct dbreg *d);
int amd64_clr_watch(int watchnum, struct dbreg *d);
@@ -538,12 +538,11 @@
int access;
struct dbreg *d;
{
- int i;
- unsigned int mask;
+ int i, len;
if (watchnum == -1) {
- for (i = 0, mask = 0x3; i < 4; i++, mask <<= 2)
- if ((d->dr[7] & mask) == 0)
+ for (i = 0; i < 4; i++)
+ if (!DBREG_DR7_ENABLED(d->dr[7], i))
break;
if (i < 4)
watchnum = i;
@@ -563,25 +562,34 @@
}
/*
- * 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 : mask = 0x00; break;
- case 2 : mask = 0x01 << 2; break;
- case 4 : mask = 0x03 << 2; break;
- default : return (-1);
+ case 1:
+ len = DBREG_DR7_LEN_1;
+ break;
+ case 2:
+ len = DBREG_DR7_LEN_2;
+ break;
+ case 4:
+ len = DBREG_DR7_LEN_4;
+ break;
+ case 8:
+ len = DBREG_DR7_LEN_8;
+ break;
+ default:
+ return (-1);
}
- mask |= access;
-
/* clear the bits we are about to affect */
- d->dr[7] &= ~((0x3 << (watchnum*2)) | (0x0f << (watchnum*4+16)));
+ d->dr[7] &= ~DBREG_DR7_MASK(watchnum);
/* set drN register to the address, N=watchnum */
DBREG_DRX(d, watchnum) = watchaddr;
/* enable the watchpoint */
- d->dr[7] |= (0x2 << (watchnum*2)) | (mask << (watchnum*4+16));
+ d->dr[7] |= DBREG_DR7_SET(watchnum, len, access,
+ DBREG_DR7_GLOBAL_ENABLE);
return (watchnum);
}
@@ -596,7 +604,7 @@
if (watchnum < 0 || watchnum >= 4)
return (-1);
- d->dr[7] = d->dr[7] & ~((0x3 << (watchnum*2)) | (0x0f << (watchnum*4+16)));
+ d->dr[7] &= ~DBREG_DR7_MASK(watchnum);
DBREG_DRX(d, watchnum) = 0;
return (0);
@@ -615,25 +623,26 @@
avail = 0;
for(i = 0; i < 4; i++) {
- if ((d.dr[7] & (3 << (i*2))) == 0)
+ if (!DBREG_DR7_ENABLED(d.dr[7], i))
avail++;
}
- if (avail * 4 < size)
+ if (avail * 8 < size)
return (-1);
- for (i = 0; i < 4 && (size != 0); i++) {
- if ((d.dr[7] & (3<<(i*2))) == 0) {
- if (size > 4)
+ for (i = 0; i < 4 && (size > 0); i++) {
+ if (!DBREG_DR7_ENABLED(d.dr[7], i)) {
+ if (size >= 8 || (avail == 1 && size > 4))
+ wsize = 8;
+ else if (size > 2)
wsize = 4;
else
wsize = size;
- if (wsize == 3)
- wsize++;
amd64_set_watch(i, addr, wsize,
DBREG_DR7_WRONLY, &d);
addr += wsize;
size -= wsize;
+ avail--;
}
}
@@ -648,13 +657,13 @@
db_expr_t addr;
db_expr_t size;
{
+ struct dbreg d;
int i;
- struct dbreg d;
fill_dbregs(NULL, &d);
for(i = 0; i < 4; i++) {
- if (d.dr[7] & (3 << (i*2))) {
+ if (DBREG_DR7_ENABLED(d.dr[7], i)) {
if ((DBREG_DRX((&d), i) >= addr) &&
(DBREG_DRX((&d), i) < addr+size))
amd64_clr_watch(i, &d);
@@ -668,8 +677,7 @@
}
-static
-char *
+static const char *
watchtype_str(type)
int type;
{
@@ -691,17 +699,21 @@
fill_dbregs(NULL, &d);
db_printf("\nhardware watchpoints:\n");
- db_printf(" watch status type len address\n");
- db_printf(" ----- -------- ---------- --- ----------\n");
+ db_printf(" watch status type len address\n");
+ db_printf(" ----- -------- ---------- --- ------------------\n");
for (i = 0; i < 4; i++) {
- if (d.dr[7] & (0x03 << (i*2))) {
- type = (d.dr[7] >> (16+(i*4))) & 3;
- len = (d.dr[7] >> (16+(i*4)+2)) & 3;
- db_printf(" %-5d %-8s %10s %3d 0x%016lx\n",
- i, "enabled", watchtype_str(type),
- len + 1, DBREG_DRX((&d), i));
- }
- else {
+ 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);
+ db_printsym((db_addr_t)DBREG_DRX((&d), i), DB_STGY_ANY);
+ db_printf("\n");
+ } else {
db_printf(" %-5d disabled\n", i);
}
}
==== //depot/projects/newisp/amd64/amd64/genassym.c#3 (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/newisp/amd64/amd64/intr_machdep.c#4 (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.25 2006/10/16 21:40:46 jhb Exp $
+ * $FreeBSD: src/sys/amd64/amd64/intr_machdep.c,v 1.26 2006/11/17 16:41:03 jhb Exp $
*/
/*
@@ -446,10 +446,6 @@
current_cpu++;
if (current_cpu >= num_cpus)
current_cpu = 0;
- if (bootverbose) {
- printf("INTR: Assigning IRQ %d", pic->pic_vector(isrc));
- printf(" to local APIC %u\n", apic_id);
- }
pic->pic_assign_cpu(isrc, apic_id);
}
@@ -483,7 +479,7 @@
if (num_cpus <= 1)
return;
- /* Round-robin assign each enabled source a CPU. */
+ /* Round-robin assign a CPU to each enabled source. */
mtx_lock_spin(&intr_table_lock);
assign_cpu = 1;
for (i = 0; i < NUM_IO_INTS; i++) {
==== //depot/projects/newisp/amd64/amd64/io_apic.c#3 (text+ko) ====
@@ -28,7 +28,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/amd64/amd64/io_apic.c,v 1.25 2006/10/10 23:23:11 jhb Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/io_apic.c,v 1.26 2006/11/17 16:41:03 jhb Exp $");
#include "opt_isa.h"
@@ -512,13 +512,6 @@
* be routed to other CPUs later after they are enabled.
*/
intpin->io_cpu = PCPU_GET(apic_id);
- if (bootverbose && intpin->io_irq != IRQ_DISABLED) {
- printf("ioapic%u: intpin %d -> ", io->io_id, i);
- ioapic_print_irq(intpin);
- printf(" (%s, %s)\n", intpin->io_edgetrigger ?
- "edge" : "level", intpin->io_activehi ? "high" :
- "low");
- }
value = ioapic_read(apic, IOAPIC_REDTBL_LO(i));
ioapic_write(apic, IOAPIC_REDTBL_LO(i), value | IOART_INTMSET);
}
@@ -583,6 +576,8 @@
return (EINVAL);
if (io->io_pins[pin].io_irq >= NUM_IO_INTS)
return (EINVAL);
+ if (io->io_pins[pin].io_bus == bus_type)
+ return (0);
io->io_pins[pin].io_bus = bus_type;
if (bootverbose)
printf("ioapic%u: intpin %d bus %s\n", io->io_id, pin,
@@ -666,13 +661,17 @@
ioapic_set_polarity(void *cookie, u_int pin, enum intr_polarity pol)
{
struct ioapic *io;
+ int activehi;
io = (struct ioapic *)cookie;
if (pin >= io->io_numintr || pol == INTR_POLARITY_CONFORM)
return (EINVAL);
if (io->io_pins[pin].io_irq >= NUM_IO_INTS)
return (EINVAL);
- io->io_pins[pin].io_activehi = (pol == INTR_POLARITY_HIGH);
+ activehi = (pol == INTR_POLARITY_HIGH);
+ if (io->io_pins[pin].io_activehi == activehi)
+ return (0);
+ io->io_pins[pin].io_activehi = activehi;
if (bootverbose)
printf("ioapic%u: intpin %d polarity: %s\n", io->io_id, pin,
pol == INTR_POLARITY_HIGH ? "high" : "low");
@@ -683,13 +682,17 @@
ioapic_set_triggermode(void *cookie, u_int pin, enum intr_trigger trigger)
{
struct ioapic *io;
+ int edgetrigger;
io = (struct ioapic *)cookie;
if (pin >= io->io_numintr || trigger == INTR_TRIGGER_CONFORM)
return (EINVAL);
if (io->io_pins[pin].io_irq >= NUM_IO_INTS)
- return (EINVAL);
- io->io_pins[pin].io_edgetrigger = (trigger == INTR_TRIGGER_EDGE);
+ return (EINVAL);
+ edgetrigger = (trigger == INTR_TRIGGER_EDGE);
+ if (io->io_pins[pin].io_edgetrigger == edgetrigger)
+ return (0);
+ io->io_pins[pin].io_edgetrigger = edgetrigger;
if (bootverbose)
printf("ioapic%u: intpin %d trigger: %s\n", io->io_id, pin,
trigger == INTR_TRIGGER_EDGE ? "edge" : "level");
==== //depot/projects/newisp/amd64/amd64/machdep.c#8 (text+ko) ====
@@ -39,7 +39,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/amd64/amd64/machdep.c,v 1.661 2006/11/15 19:53:47 jhb Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/machdep.c,v 1.664 2006/11/19 20:54:57 alc Exp $");
#include "opt_atalk.h"
#include "opt_atpic.h"
@@ -833,7 +833,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 +1096,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;
@@ -1270,10 +1273,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();
@@ -1692,7 +1691,6 @@
{
struct pcb *pcb;
int i;
- u_int64_t mask1, mask2;
if (td == NULL) {
load_dr0(dbregs->dr[0]);
@@ -1709,10 +1707,13 @@
* TRCTRAP or a general protection fault right here.
* Upper bits of dr6 and dr7 must not be set
*/
- for (i = 0, mask1 = 0x3<<16, mask2 = 0x2<<16; i < 8;
- i++, mask1 <<= 2, mask2 <<= 2)
- if ((dbregs->dr[7] & mask1) == mask2)
+ for (i = 0; i < 4; i++) {
+ if (DBREG_DR7_ACCESS(dbregs->dr[7], i) == 0x02)
+ return (EINVAL);
+ 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 ||
(dbregs->dr[7] & 0xffffffff00000000ul) != 0)
return (EINVAL);
@@ -1733,22 +1734,22 @@
* from within kernel mode?
*/
- if (dbregs->dr[7] & 0x3) {
+ if (DBREG_DR7_ENABLED(dbregs->dr[7], 0)) {
/* dr0 is enabled */
if (dbregs->dr[0] >= VM_MAXUSER_ADDRESS)
return (EINVAL);
}
- if (dbregs->dr[7] & 0x3<<2) {
+ if (DBREG_DR7_ENABLED(dbregs->dr[7], 1)) {
/* dr1 is enabled */
if (dbregs->dr[1] >= VM_MAXUSER_ADDRESS)
return (EINVAL);
}
- if (dbregs->dr[7] & 0x3<<4) {
+ if (DBREG_DR7_ENABLED(dbregs->dr[7], 2)) {
/* dr2 is enabled */
if (dbregs->dr[2] >= VM_MAXUSER_ADDRESS)
return (EINVAL);
}
- if (dbregs->dr[7] & 0x3<<6) {
+ if (DBREG_DR7_ENABLED(dbregs->dr[7], 3)) {
/* dr3 is enabled */
if (dbregs->dr[3] >= VM_MAXUSER_ADDRESS)
return (EINVAL);
==== //depot/projects/newisp/amd64/amd64/pmap.c#4 (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.576 2006/11/23 21:37:04 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) */
@@ -1613,7 +1612,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 +2126,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 +2163,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 +2181,8 @@
retry:
obits = pbits = *pte;
+ if ((pbits & PG_V) == 0)
+ continue;
if (pbits & PG_MANAGED) {
m = NULL;
if (pbits & PG_A) {
@@ -2193,7 +2198,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/newisp/amd64/amd64/trap.c#3 (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/newisp/amd64/conf/GENERIC#5 (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.469 2006/11/22 10:34:12 ru Exp $
cpu HAMMER
ident GENERIC
@@ -73,7 +73,7 @@
# Linux 32-bit ABI support
options COMPAT_LINUX32 # Compatible with i386 linux binaries
-options LINPROCFS # Cannot be a module yet.
+options LINPROCFS
options LINSYSFS
# Bus support.
==== //depot/projects/newisp/amd64/include/pmap.h#3 (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.137 2006/11/19 20:54:57 alc Exp $
*/
#ifndef _MACHINE_PMAP_H_
@@ -296,7 +296,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/newisp/amd64/include/reg.h#3 (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.36 2006/11/15 19:53:48 jhb Exp $
+ * $FreeBSD: src/sys/amd64/include/reg.h,v 1.38 2006/11/17 20:27:01 jhb Exp $
*/
#ifndef _MACHINE_REG_H_
@@ -92,9 +92,22 @@
/* Index 8-15: reserved */
};
+#define DBREG_DR7_LOCAL_ENABLE 0x01
+#define DBREG_DR7_GLOBAL_ENABLE 0x02
+#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 */
+#define DBREG_DR7_MASK(i) ((u_long)0xf << ((i) * 4 + 16) | 0x3 << (i) * 2)
+#define DBREG_DR7_SET(i, len, access, enable) \
+ ((u_long)((len) << 2 | (access)) << ((i) * 4 + 16) | (enable) << (i) * 2)
+#define DBREG_DR7_GD 0x2000
+#define DBREG_DR7_ENABLED(d, i) (((d) & 0x3 << (i) * 2) != 0)
+#define DBREG_DR7_ACCESS(d, i) ((d) >> ((i) * 4 + 16) & 0x3)
+#define DBREG_DR7_LEN(d, i) ((d) >> ((i) * 4 + 18) & 0x3)
#define DBREG_DRX(d,x) ((d)->dr[(x)]) /* reference dr0 - dr15 by
register number */
==== //depot/projects/newisp/arm/arm/cpufunc.c#4 (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.14 2006/11/19 23:55:23 sam Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -1015,7 +1015,6 @@
#ifdef CPU_XSCALE_IXP425
if (cputype == CPU_ID_IXP425_533 || cputype == CPU_ID_IXP425_400 ||
cputype == CPU_ID_IXP425_266) {
- ixp425_icu_init();
cpufuncs = xscale_cpufuncs;
#if defined(PERFCTRS)
==== //depot/projects/newisp/arm/arm/genassym.c#3 (text+ko) ====
@@ -26,7 +26,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/arm/arm/genassym.c,v 1.7 2006/11/01 04:54:50 jb Exp $");
+__FBSDID("$FreeBSD: src/sys/arm/arm/genassym.c,v 1.8 2006/11/30 04:17:04 jb Exp $");
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/assym.h>
@@ -69,7 +69,6 @@
ASSYM(PCB_PC, offsetof(struct pcb, un_32.pcb32_pc));
ASSYM(PCB_SP, offsetof(struct pcb, un_32.pcb32_sp));
-ASSYM(PC_CONS_BUFR, offsetof(struct pcpu, pc_cons_bufr));
ASSYM(PC_CURPCB, offsetof(struct pcpu, pc_curpcb));
ASSYM(PC_CURTHREAD, offsetof(struct pcpu, pc_curthread));
ASSYM(M_LEN, offsetof(struct mbuf, m_len));
==== //depot/projects/newisp/arm/arm/identcpu.c#3 (text+ko) ====
@@ -42,7 +42,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/arm/arm/identcpu.c,v 1.9 2006/11/07 22:36:57 cognet Exp $");
+__FBSDID("$FreeBSD: src/sys/arm/arm/identcpu.c,v 1.10 2006/11/19 23:45:33 sam Exp $");
>>> TRUNCATED FOR MAIL (1000 lines) <<<
More information about the p4-projects
mailing list