Date: Thu, 15 Sep 2005 18:48:29 GMT From: John Baldwin <jhb@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 83680 for review Message-ID: <200509151848.j8FImTQQ007144@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=83680 Change 83680 by jhb@jhb_slimer on 2005/09/15 18:47:58 IFC @83679. Affected files ... .. //depot/projects/smpng/sys/alpha/alpha/busdma_machdep.c#28 integrate .. //depot/projects/smpng/sys/alpha/alpha/db_trace.c#18 integrate .. //depot/projects/smpng/sys/alpha/alpha/pmap.c#70 integrate .. //depot/projects/smpng/sys/alpha/include/param.h#14 integrate .. //depot/projects/smpng/sys/alpha/include/vmparam.h#6 integrate .. //depot/projects/smpng/sys/amd64/acpica/OsdEnvironment.c#6 integrate .. //depot/projects/smpng/sys/amd64/acpica/acpi_machdep.c#9 integrate .. //depot/projects/smpng/sys/amd64/acpica/acpi_wakeup.c#4 integrate .. //depot/projects/smpng/sys/amd64/acpica/madt.c#7 integrate .. //depot/projects/smpng/sys/amd64/amd64/db_trace.c#14 integrate .. //depot/projects/smpng/sys/amd64/amd64/exception.S#16 integrate .. //depot/projects/smpng/sys/amd64/amd64/genassym.c#14 integrate .. //depot/projects/smpng/sys/amd64/amd64/pmap.c#45 integrate .. //depot/projects/smpng/sys/amd64/amd64/trap.c#30 integrate .. //depot/projects/smpng/sys/amd64/conf/GENERIC#36 integrate .. //depot/projects/smpng/sys/amd64/conf/NOTES#20 integrate .. //depot/projects/smpng/sys/arm/arm/db_trace.c#13 integrate .. //depot/projects/smpng/sys/arm/arm/pmap.c#19 integrate .. //depot/projects/smpng/sys/boot/forth/loader.conf#37 integrate .. //depot/projects/smpng/sys/boot/pc98/Makefile.inc#4 integrate .. //depot/projects/smpng/sys/boot/pc98/boot2/io.c#7 integrate .. //depot/projects/smpng/sys/boot/pc98/libpc98/comconsole.c#4 integrate .. //depot/projects/smpng/sys/compat/linux/linux_ioctl.c#41 integrate .. //depot/projects/smpng/sys/compat/ndis/kern_ndis.c#29 integrate .. //depot/projects/smpng/sys/conf/Makefile.amd64#11 integrate .. //depot/projects/smpng/sys/conf/Makefile.powerpc#30 integrate .. //depot/projects/smpng/sys/conf/NOTES#102 integrate .. //depot/projects/smpng/sys/conf/files#148 integrate .. //depot/projects/smpng/sys/conf/files.amd64#35 integrate .. //depot/projects/smpng/sys/conf/files.ia64#51 integrate .. //depot/projects/smpng/sys/conf/kern.post.mk#47 integrate .. //depot/projects/smpng/sys/conf/kern.pre.mk#47 integrate .. //depot/projects/smpng/sys/conf/kmod.mk#48 integrate .. //depot/projects/smpng/sys/contrib/dev/nve/amd64/nvenetlib.README#1 branch .. //depot/projects/smpng/sys/contrib/dev/nve/i386/nvenetlib.README#1 branch .. //depot/projects/smpng/sys/contrib/pf/net/if_pfsync.c#16 integrate .. //depot/projects/smpng/sys/contrib/pf/net/pf.c#19 integrate .. //depot/projects/smpng/sys/contrib/pf/net/pf_ioctl.c#15 integrate .. //depot/projects/smpng/sys/ddb/db_watch.c#6 integrate .. //depot/projects/smpng/sys/ddb/ddb.h#16 integrate .. //depot/projects/smpng/sys/dev/aac/aac.c#50 integrate .. //depot/projects/smpng/sys/dev/aac/aac_cam.c#16 integrate .. //depot/projects/smpng/sys/dev/acpi_support/acpi_asus.c#6 integrate .. //depot/projects/smpng/sys/dev/acpi_support/acpi_fujitsu.c#3 integrate .. //depot/projects/smpng/sys/dev/acpi_support/acpi_ibm.c#6 integrate .. //depot/projects/smpng/sys/dev/acpi_support/acpi_panasonic.c#4 integrate .. //depot/projects/smpng/sys/dev/acpi_support/acpi_sony.c#4 integrate .. //depot/projects/smpng/sys/dev/acpi_support/acpi_toshiba.c#4 integrate .. //depot/projects/smpng/sys/dev/acpica/Osd/OsdDebug.c#10 integrate .. //depot/projects/smpng/sys/dev/acpica/Osd/OsdHardware.c#17 integrate .. //depot/projects/smpng/sys/dev/acpica/Osd/OsdInterrupt.c#15 integrate .. //depot/projects/smpng/sys/dev/acpica/Osd/OsdMemory.c#9 integrate .. //depot/projects/smpng/sys/dev/acpica/Osd/OsdSchedule.c#26 integrate .. //depot/projects/smpng/sys/dev/acpica/Osd/OsdStream.c#6 integrate .. //depot/projects/smpng/sys/dev/acpica/Osd/OsdSynch.c#17 integrate .. //depot/projects/smpng/sys/dev/acpica/Osd/OsdTable.c#10 integrate .. //depot/projects/smpng/sys/dev/acpica/acpi.c#86 integrate .. //depot/projects/smpng/sys/dev/acpica/acpi_acad.c#24 integrate .. //depot/projects/smpng/sys/dev/acpica/acpi_battery.c#15 integrate .. //depot/projects/smpng/sys/dev/acpica/acpi_button.c#18 integrate .. //depot/projects/smpng/sys/dev/acpica/acpi_cmbat.c#27 integrate .. //depot/projects/smpng/sys/dev/acpica/acpi_cpu.c#34 integrate .. //depot/projects/smpng/sys/dev/acpica/acpi_ec.c#39 integrate .. //depot/projects/smpng/sys/dev/acpica/acpi_if.m#8 integrate .. //depot/projects/smpng/sys/dev/acpica/acpi_isab.c#8 integrate .. //depot/projects/smpng/sys/dev/acpica/acpi_lid.c#16 integrate .. //depot/projects/smpng/sys/dev/acpica/acpi_package.c#7 integrate .. //depot/projects/smpng/sys/dev/acpica/acpi_pci.c#18 integrate .. //depot/projects/smpng/sys/dev/acpica/acpi_pci_link.c#29 integrate .. //depot/projects/smpng/sys/dev/acpica/acpi_pcib.c#32 integrate .. //depot/projects/smpng/sys/dev/acpica/acpi_pcib_acpi.c#19 integrate .. //depot/projects/smpng/sys/dev/acpica/acpi_pcib_pci.c#10 integrate .. //depot/projects/smpng/sys/dev/acpica/acpi_perf.c#7 integrate .. //depot/projects/smpng/sys/dev/acpica/acpi_powerres.c#21 integrate .. //depot/projects/smpng/sys/dev/acpica/acpi_quirk.c#3 integrate .. //depot/projects/smpng/sys/dev/acpica/acpi_resource.c#27 integrate .. //depot/projects/smpng/sys/dev/acpica/acpi_thermal.c#35 integrate .. //depot/projects/smpng/sys/dev/acpica/acpi_throttle.c#5 integrate .. //depot/projects/smpng/sys/dev/acpica/acpi_timer.c#22 integrate .. //depot/projects/smpng/sys/dev/acpica/acpi_video.c#9 integrate .. //depot/projects/smpng/sys/dev/ata/ata-all.c#73 integrate .. //depot/projects/smpng/sys/dev/ata/ata-chipset.c#56 integrate .. //depot/projects/smpng/sys/dev/ata/ata-lowlevel.c#30 integrate .. //depot/projects/smpng/sys/dev/ata/ata-pci.h#34 integrate .. //depot/projects/smpng/sys/dev/ata/ata-queue.c#28 integrate .. //depot/projects/smpng/sys/dev/ata/ata-raid.c#37 integrate .. //depot/projects/smpng/sys/dev/ata/ata-raid.h#21 integrate .. //depot/projects/smpng/sys/dev/bge/if_bge.c#58 integrate .. //depot/projects/smpng/sys/dev/cp/if_cp.c#14 integrate .. //depot/projects/smpng/sys/dev/ctau/if_ct.c#16 integrate .. //depot/projects/smpng/sys/dev/cx/if_cx.c#20 integrate .. //depot/projects/smpng/sys/dev/digi/digi.c#29 integrate .. //depot/projects/smpng/sys/dev/ed/if_ed.c#33 integrate .. //depot/projects/smpng/sys/dev/ed/if_ed_3c503.c#3 integrate .. //depot/projects/smpng/sys/dev/ed/if_ed_cbus.c#14 integrate .. //depot/projects/smpng/sys/dev/ed/if_ed_hpp.c#3 integrate .. //depot/projects/smpng/sys/dev/ed/if_ed_isa.c#11 integrate .. //depot/projects/smpng/sys/dev/ed/if_ed_novell.c#3 integrate .. //depot/projects/smpng/sys/dev/ed/if_ed_pccard.c#32 integrate .. //depot/projects/smpng/sys/dev/ed/if_ed_pci.c#12 integrate .. //depot/projects/smpng/sys/dev/ed/if_ed_sic.c#3 integrate .. //depot/projects/smpng/sys/dev/ed/if_ed_wd80x3.c#3 integrate .. //depot/projects/smpng/sys/dev/ed/if_edreg.h#6 integrate .. //depot/projects/smpng/sys/dev/ed/if_edvar.h#11 integrate .. //depot/projects/smpng/sys/dev/em/if_em.c#50 integrate .. //depot/projects/smpng/sys/dev/ep/if_ep_eisa.c#12 integrate .. //depot/projects/smpng/sys/dev/ep/if_ep_pccard.c#21 integrate .. //depot/projects/smpng/sys/dev/ex/if_ex_pccard.c#12 integrate .. //depot/projects/smpng/sys/dev/fdc/fdc.c#19 integrate .. //depot/projects/smpng/sys/dev/fdc/fdc_acpi.c#7 integrate .. //depot/projects/smpng/sys/dev/gem/if_gem.c#24 integrate .. //depot/projects/smpng/sys/dev/hme/if_hme.c#26 integrate .. //depot/projects/smpng/sys/dev/hptmv/access601.h#3 integrate .. //depot/projects/smpng/sys/dev/hptmv/amd64-elf.raid.o.uu#1 branch .. //depot/projects/smpng/sys/dev/hptmv/array.h#3 integrate .. //depot/projects/smpng/sys/dev/hptmv/atapi.h#3 integrate .. //depot/projects/smpng/sys/dev/hptmv/command.h#3 integrate .. //depot/projects/smpng/sys/dev/hptmv/entry.c#7 integrate .. //depot/projects/smpng/sys/dev/hptmv/global.h#4 integrate .. //depot/projects/smpng/sys/dev/hptmv/gui_lib.c#4 integrate .. //depot/projects/smpng/sys/dev/hptmv/hptintf.h#3 integrate .. //depot/projects/smpng/sys/dev/hptmv/hptproc.c#5 integrate .. //depot/projects/smpng/sys/dev/hptmv/i386-elf.raid.o.uu#3 integrate .. //depot/projects/smpng/sys/dev/hptmv/ioctl.c#4 integrate .. //depot/projects/smpng/sys/dev/hptmv/mv.c#3 integrate .. //depot/projects/smpng/sys/dev/hptmv/mvOs.h#3 integrate .. //depot/projects/smpng/sys/dev/hptmv/mvSata.h#3 integrate .. //depot/projects/smpng/sys/dev/hptmv/mvStorageDev.h#4 integrate .. //depot/projects/smpng/sys/dev/hptmv/osbsd.h#4 integrate .. //depot/projects/smpng/sys/dev/hptmv/raid5n.h#3 integrate .. //depot/projects/smpng/sys/dev/hptmv/readme.txt#3 integrate .. //depot/projects/smpng/sys/dev/hptmv/vdevice.h#3 integrate .. //depot/projects/smpng/sys/dev/hwpmc/hwpmc_amd.c#6 integrate .. //depot/projects/smpng/sys/dev/ieee488/tnt4882.c#1 branch .. //depot/projects/smpng/sys/dev/ieee488/upd7210.c#5 integrate .. //depot/projects/smpng/sys/dev/ieee488/upd7210.h#4 integrate .. //depot/projects/smpng/sys/dev/md/md.c#67 integrate .. //depot/projects/smpng/sys/dev/mpt/mpt_pci.c#15 integrate .. //depot/projects/smpng/sys/dev/pccard/card_if.m#15 integrate .. //depot/projects/smpng/sys/dev/pccard/pccard.c#38 integrate .. //depot/projects/smpng/sys/dev/pccard/pccard_cis.c#22 integrate .. //depot/projects/smpng/sys/dev/pccard/pccarddevs#50 integrate .. //depot/projects/smpng/sys/dev/pccard/pccardvar.h#24 integrate .. //depot/projects/smpng/sys/dev/pccbb/pccbb.c#50 integrate .. //depot/projects/smpng/sys/dev/pci/pci.c#59 integrate .. //depot/projects/smpng/sys/dev/pci/pci_pci.c#26 integrate .. //depot/projects/smpng/sys/dev/pci/pcivar.h#15 integrate .. //depot/projects/smpng/sys/dev/sn/if_sn_pccard.c#19 integrate .. //depot/projects/smpng/sys/dev/sound/isa/mss.c#25 integrate .. //depot/projects/smpng/sys/dev/sound/isa/sb16.c#20 integrate .. //depot/projects/smpng/sys/dev/sound/pci/csapcm.c#14 integrate .. //depot/projects/smpng/sys/dev/sound/pci/maestro3.c#22 integrate .. //depot/projects/smpng/sys/dev/sound/pci/neomagic.c#10 integrate .. //depot/projects/smpng/sys/dev/sound/pcm/ac97.c#27 integrate .. //depot/projects/smpng/sys/dev/sound/pcm/ac97.h#9 integrate .. //depot/projects/smpng/sys/dev/sound/pcm/channel.c#31 integrate .. //depot/projects/smpng/sys/dev/sound/pcm/channel.h#12 integrate .. //depot/projects/smpng/sys/dev/sound/pcm/dsp.c#27 integrate .. //depot/projects/smpng/sys/dev/sound/pcm/fake.c#7 integrate .. //depot/projects/smpng/sys/dev/sound/pcm/feeder.c#12 integrate .. //depot/projects/smpng/sys/dev/sound/pcm/feeder_fmt.c#12 integrate .. //depot/projects/smpng/sys/dev/sound/pcm/sndstat.c#17 integrate .. //depot/projects/smpng/sys/dev/sound/pcm/sound.c#27 integrate .. //depot/projects/smpng/sys/dev/sound/pcm/sound.h#22 integrate .. //depot/projects/smpng/sys/dev/sound/pcm/vchan.c#11 integrate .. //depot/projects/smpng/sys/dev/sound/usb/uaudio.c#7 integrate .. //depot/projects/smpng/sys/dev/syscons/scmouse.c#12 integrate .. //depot/projects/smpng/sys/dev/syscons/scvesactl.c#6 integrate .. //depot/projects/smpng/sys/dev/syscons/scvidctl.c#9 integrate .. //depot/projects/smpng/sys/dev/syscons/syscons.c#50 integrate .. //depot/projects/smpng/sys/dev/syscons/syscons.h#13 integrate .. //depot/projects/smpng/sys/dev/twa/tw_osl_cam.c#4 integrate .. //depot/projects/smpng/sys/dev/twa/tw_osl_freebsd.c#2 integrate .. //depot/projects/smpng/sys/dev/twa/tw_osl_includes.h#2 integrate .. //depot/projects/smpng/sys/dev/twa/tw_osl_ioctl.h#2 integrate .. //depot/projects/smpng/sys/dev/twa/tw_osl_share.h#3 integrate .. //depot/projects/smpng/sys/dev/txp/if_txp.c#27 integrate .. //depot/projects/smpng/sys/dev/usb/usbdevs#78 integrate .. //depot/projects/smpng/sys/dev/wi/if_wi.c#75 integrate .. //depot/projects/smpng/sys/dev/xe/if_xe_pccard.c#22 integrate .. //depot/projects/smpng/sys/fs/devfs/devfs.h#15 integrate .. //depot/projects/smpng/sys/fs/devfs/devfs_devs.c#19 integrate .. //depot/projects/smpng/sys/fs/devfs/devfs_rule.c#12 integrate .. //depot/projects/smpng/sys/fs/devfs/devfs_vnops.c#50 integrate .. //depot/projects/smpng/sys/fs/fifofs/fifo_vnops.c#35 integrate .. //depot/projects/smpng/sys/fs/hpfs/hpfs_vfsops.c#29 integrate .. //depot/projects/smpng/sys/fs/msdosfs/msdosfs_denode.c#24 integrate .. //depot/projects/smpng/sys/fs/msdosfs/msdosfs_vfsops.c#42 integrate .. //depot/projects/smpng/sys/fs/ntfs/ntfs.h#9 integrate .. //depot/projects/smpng/sys/fs/ntfs/ntfs_vfsops.c#30 integrate .. //depot/projects/smpng/sys/fs/nullfs/null_vnops.c#24 integrate .. //depot/projects/smpng/sys/fs/udf/udf_vfsops.c#22 integrate .. //depot/projects/smpng/sys/geom/eli/g_eli.c#4 integrate .. //depot/projects/smpng/sys/geom/geom.h#44 integrate .. //depot/projects/smpng/sys/geom/geom_event.c#32 integrate .. //depot/projects/smpng/sys/geom/geom_io.c#38 integrate .. //depot/projects/smpng/sys/geom/geom_slice.c#32 integrate .. //depot/projects/smpng/sys/geom/label/g_label_ntfs.c#2 integrate .. //depot/projects/smpng/sys/geom/vinum/geom_vinum_init.c#10 integrate .. //depot/projects/smpng/sys/geom/vinum/geom_vinum_rm.c#7 integrate .. //depot/projects/smpng/sys/gnu/fs/ext2fs/ext2_vfsops.c#3 integrate .. //depot/projects/smpng/sys/gnu/fs/ext2fs/fs.h#2 integrate .. //depot/projects/smpng/sys/gnu/fs/reiserfs/reiserfs_vfsops.c#2 integrate .. //depot/projects/smpng/sys/i386/acpica/OsdEnvironment.c#9 integrate .. //depot/projects/smpng/sys/i386/acpica/acpi_machdep.c#22 integrate .. //depot/projects/smpng/sys/i386/acpica/acpi_wakeup.c#32 integrate .. //depot/projects/smpng/sys/i386/acpica/madt.c#13 integrate .. //depot/projects/smpng/sys/i386/conf/PAE#15 integrate .. //depot/projects/smpng/sys/i386/i386/db_trace.c#26 integrate .. //depot/projects/smpng/sys/i386/i386/pmap.c#85 integrate .. //depot/projects/smpng/sys/i386/i386/sys_machdep.c#44 integrate .. //depot/projects/smpng/sys/i386/i386/vm_machdep.c#71 integrate .. //depot/projects/smpng/sys/i386/include/pcb_ext.h#5 integrate .. //depot/projects/smpng/sys/i386/include/ucontext.h#8 integrate .. //depot/projects/smpng/sys/i386/pci/pci_pir.c#10 integrate .. //depot/projects/smpng/sys/ia64/acpica/OsdEnvironment.c#9 integrate .. //depot/projects/smpng/sys/ia64/acpica/acpi_machdep.c#6 integrate .. //depot/projects/smpng/sys/ia64/acpica/acpi_wakeup.c#3 integrate .. //depot/projects/smpng/sys/ia64/acpica/madt.c#13 integrate .. //depot/projects/smpng/sys/ia64/conf/GENERIC#45 integrate .. //depot/projects/smpng/sys/ia64/ia32/ia32_reg.c#2 integrate .. //depot/projects/smpng/sys/ia64/ia32/ia32_signal.c#2 integrate .. //depot/projects/smpng/sys/ia64/ia32/ia32_sigtramp.c#2 delete .. //depot/projects/smpng/sys/ia64/ia64/db_interface.c#21 delete .. //depot/projects/smpng/sys/ia64/ia64/db_machdep.c#1 branch .. //depot/projects/smpng/sys/ia64/ia64/db_trace.c#22 delete .. //depot/projects/smpng/sys/ia64/ia64/interrupt.c#31 integrate .. //depot/projects/smpng/sys/ia64/ia64/machdep.c#96 integrate .. //depot/projects/smpng/sys/ia64/ia64/mp_machdep.c#31 integrate .. //depot/projects/smpng/sys/ia64/ia64/pmap.c#72 integrate .. //depot/projects/smpng/sys/ia64/ia64/trap.c#76 integrate .. //depot/projects/smpng/sys/ia64/ia64/vm_machdep.c#50 integrate .. //depot/projects/smpng/sys/ia64/include/param.h#17 integrate .. //depot/projects/smpng/sys/ia64/include/pmap.h#22 integrate .. //depot/projects/smpng/sys/ia64/include/vmparam.h#10 integrate .. //depot/projects/smpng/sys/kern/imgact_elf.c#45 integrate .. //depot/projects/smpng/sys/kern/init_main.c#56 integrate .. //depot/projects/smpng/sys/kern/kern_acl.c#24 integrate .. //depot/projects/smpng/sys/kern/kern_conf.c#41 integrate .. //depot/projects/smpng/sys/kern/kern_cpu.c#6 integrate .. //depot/projects/smpng/sys/kern/kern_exit.c#99 integrate .. //depot/projects/smpng/sys/kern/kern_kse.c#24 integrate .. //depot/projects/smpng/sys/kern/kern_lock.c#43 integrate .. //depot/projects/smpng/sys/kern/kern_mutex.c#104 integrate .. //depot/projects/smpng/sys/kern/kern_poll.c#17 integrate .. //depot/projects/smpng/sys/kern/kern_shutdown.c#60 integrate .. //depot/projects/smpng/sys/kern/kern_tc.c#32 integrate .. //depot/projects/smpng/sys/kern/kern_timeout.c#25 integrate .. //depot/projects/smpng/sys/kern/link_elf.c#27 integrate .. //depot/projects/smpng/sys/kern/link_elf_obj.c#6 integrate .. //depot/projects/smpng/sys/kern/subr_prf.c#40 integrate .. //depot/projects/smpng/sys/kern/subr_stack.c#2 integrate .. //depot/projects/smpng/sys/kern/subr_witness.c#137 integrate .. //depot/projects/smpng/sys/kern/uipc_mbuf.c#38 integrate .. //depot/projects/smpng/sys/kern/uipc_socket.c#73 integrate .. //depot/projects/smpng/sys/kern/vfs_hash.c#3 integrate .. //depot/projects/smpng/sys/kern/vfs_lookup.c#30 integrate .. //depot/projects/smpng/sys/kern/vfs_mount.c#50 integrate .. //depot/projects/smpng/sys/kern/vfs_subr.c#109 integrate .. //depot/projects/smpng/sys/kern/vfs_syscalls.c#92 integrate .. //depot/projects/smpng/sys/modules/Makefile#104 integrate .. //depot/projects/smpng/sys/modules/de/Makefile#4 integrate .. //depot/projects/smpng/sys/modules/hptmv/Makefile#3 integrate .. //depot/projects/smpng/sys/net/bpf.c#56 integrate .. //depot/projects/smpng/sys/net/bpfdesc.h#14 integrate .. //depot/projects/smpng/sys/net/if.c#73 integrate .. //depot/projects/smpng/sys/net/if_bridge.c#9 integrate .. //depot/projects/smpng/sys/net/if_ethersubr.c#63 integrate .. //depot/projects/smpng/sys/net/if_vlan.c#38 integrate .. //depot/projects/smpng/sys/net/if_vlan_var.h#14 integrate .. //depot/projects/smpng/sys/net/route.h#22 integrate .. //depot/projects/smpng/sys/net/rtsock.c#49 integrate .. //depot/projects/smpng/sys/net/zlib.c#10 integrate .. //depot/projects/smpng/sys/net80211/ieee80211_ioctl.c#20 integrate .. //depot/projects/smpng/sys/netatalk/at_proto.c#3 integrate .. //depot/projects/smpng/sys/netatalk/ddp_output.c#11 integrate .. //depot/projects/smpng/sys/netgraph/bluetooth/include/ng_l2cap.h#4 integrate .. //depot/projects/smpng/sys/netgraph/bluetooth/l2cap/ng_l2cap_cmds.c#6 integrate .. //depot/projects/smpng/sys/netgraph/bluetooth/l2cap/ng_l2cap_misc.c#11 integrate .. //depot/projects/smpng/sys/netgraph/netgraph.h#22 integrate .. //depot/projects/smpng/sys/netgraph/ng_base.c#39 integrate .. //depot/projects/smpng/sys/netgraph/ng_ksocket.c#28 integrate .. //depot/projects/smpng/sys/netgraph/ng_pptpgre.c#17 integrate .. //depot/projects/smpng/sys/netgraph/ng_socket.c#33 integrate .. //depot/projects/smpng/sys/netgraph/ng_split.c#7 integrate .. //depot/projects/smpng/sys/netinet/if_ether.c#38 integrate .. //depot/projects/smpng/sys/netinet/ip_carp.c#11 integrate .. //depot/projects/smpng/sys/netinet/ip_fw2.c#58 integrate .. //depot/projects/smpng/sys/netinet/ip_input.c#70 integrate .. //depot/projects/smpng/sys/netinet/ip_output.c#76 integrate .. //depot/projects/smpng/sys/netinet/tcp_subr.c#72 integrate .. //depot/projects/smpng/sys/netinet/tcp_syncache.c#41 integrate .. //depot/projects/smpng/sys/netinet6/in6.c#28 integrate .. //depot/projects/smpng/sys/netinet6/in6_ifattach.c#15 integrate .. //depot/projects/smpng/sys/netinet6/in6_pcb.c#38 integrate .. //depot/projects/smpng/sys/netinet6/in6_var.h#14 integrate .. //depot/projects/smpng/sys/netinet6/ip6_mroute.c#21 integrate .. //depot/projects/smpng/sys/netinet6/ip6_output.c#42 integrate .. //depot/projects/smpng/sys/netinet6/mld6.c#14 integrate .. //depot/projects/smpng/sys/netinet6/nd6.c#28 integrate .. //depot/projects/smpng/sys/netinet6/nd6_nbr.c#18 integrate .. //depot/projects/smpng/sys/netipx/ipx_proto.c#6 integrate .. //depot/projects/smpng/sys/netnatm/natm_proto.c#14 integrate .. //depot/projects/smpng/sys/pc98/cbus/fdc.c#2 integrate .. //depot/projects/smpng/sys/pc98/cbus/gdc.c#2 integrate .. //depot/projects/smpng/sys/pc98/cbus/nmi.c#2 integrate .. //depot/projects/smpng/sys/pc98/cbus/sio.c#2 integrate .. //depot/projects/smpng/sys/pc98/pc98/epsonio.h#3 delete .. //depot/projects/smpng/sys/pc98/pc98/machdep.c#4 integrate .. //depot/projects/smpng/sys/pc98/pc98/pc98_machdep.c#5 integrate .. //depot/projects/smpng/sys/pc98/pc98/pc98_machdep.h#4 integrate .. //depot/projects/smpng/sys/pci/if_dc.c#69 integrate .. //depot/projects/smpng/sys/pci/if_pcn.c#35 integrate .. //depot/projects/smpng/sys/pci/if_rl.c#57 integrate .. //depot/projects/smpng/sys/pci/if_ste.c#38 integrate .. //depot/projects/smpng/sys/pci/if_stereg.h#10 integrate .. //depot/projects/smpng/sys/pci/if_tl.c#28 integrate .. //depot/projects/smpng/sys/pci/if_tlreg.h#6 integrate .. //depot/projects/smpng/sys/pci/if_wb.c#31 integrate .. //depot/projects/smpng/sys/pci/if_wbreg.h#5 integrate .. //depot/projects/smpng/sys/powerpc/powerpc/db_hwwatch.c#3 integrate .. //depot/projects/smpng/sys/powerpc/powerpc/pmap.c#56 integrate .. //depot/projects/smpng/sys/sparc64/sparc64/db_hwwatch.c#6 integrate .. //depot/projects/smpng/sys/sparc64/sparc64/pmap.c#60 integrate .. //depot/projects/smpng/sys/sys/acl.h#11 integrate .. //depot/projects/smpng/sys/sys/buf.h#39 integrate .. //depot/projects/smpng/sys/sys/callout.h#10 integrate .. //depot/projects/smpng/sys/sys/conf.h#43 integrate .. //depot/projects/smpng/sys/sys/filedesc.h#28 integrate .. //depot/projects/smpng/sys/sys/iconv.h#11 integrate .. //depot/projects/smpng/sys/sys/kernel.h#32 integrate .. //depot/projects/smpng/sys/sys/ktr.h#22 integrate .. //depot/projects/smpng/sys/sys/mbuf.h#53 integrate .. //depot/projects/smpng/sys/sys/stack.h#2 integrate .. //depot/projects/smpng/sys/sys/sx.h#16 integrate .. //depot/projects/smpng/sys/sys/vnode.h#66 integrate .. //depot/projects/smpng/sys/ufs/ffs/ffs_rawread.c#16 integrate .. //depot/projects/smpng/sys/ufs/ffs/ffs_softdep.c#48 integrate .. //depot/projects/smpng/sys/ufs/ffs/ffs_vfsops.c#75 integrate .. //depot/projects/smpng/sys/ufs/ufs/ufs_vnops.c#52 integrate .. //depot/projects/smpng/sys/vm/pmap.h#27 integrate .. //depot/projects/smpng/sys/vm/uma_core.c#58 integrate .. //depot/projects/smpng/sys/vm/vm_fault.c#50 integrate .. //depot/projects/smpng/sys/vm/vm_map.c#74 integrate Differences ... ==== //depot/projects/smpng/sys/alpha/alpha/busdma_machdep.c#28 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/alpha/alpha/busdma_machdep.c,v 1.51 2005/05/25 07:25:12 marcel Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/alpha/busdma_machdep.c,v 1.52 2005/09/15 17:09:42 jhb Exp $"); #include <sys/param.h> #include <sys/bus.h> @@ -891,6 +891,10 @@ } } } + + /* Ensure any pending writes have drained. */ + if (op & (BUS_DMASYNC_PREWRITE)) + alpha_mb(); } static void ==== //depot/projects/smpng/sys/alpha/alpha/db_trace.c#18 (text+ko) ==== @@ -42,7 +42,7 @@ #include <sys/cdefs.h> /* RCS ID & Copyright macro defns */ /*__KERNEL_RCSID(0, "$NetBSD: db_trace.c,v 1.9 2000/12/13 03:16:36 mycroft Exp $");*/ -__FBSDID("$FreeBSD: src/sys/alpha/alpha/db_trace.c,v 1.24 2005/08/03 04:27:38 jeff Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/alpha/db_trace.c,v 1.25 2005/09/10 03:01:23 marcel Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -100,11 +100,6 @@ }; -int db_md_set_watchpoint(db_expr_t addr, db_expr_t size); -int db_md_clr_watchpoint(db_expr_t addr, db_expr_t size); -void db_md_list_watchpoints(void); - - /* * Decode the function prologue for the function we're in, and note * which registers are stored where, and how large the stack frame is. ==== //depot/projects/smpng/sys/alpha/alpha/pmap.c#70 (text+ko) ==== @@ -148,7 +148,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/alpha/alpha/pmap.c,v 1.178 2005/06/10 03:33:35 alc Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/alpha/pmap.c,v 1.179 2005/09/03 18:20:18 alc Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -1787,12 +1787,12 @@ * 2. Not wired. * 3. Read access. * 4. No page table pages. - * 6. Page IS managed. * but is *MUCH* faster than pmap_enter... */ vm_page_t -pmap_enter_quick(pmap_t pmap, vm_offset_t va, vm_page_t m, vm_page_t mpte) +pmap_enter_quick(pmap_t pmap, vm_offset_t va, vm_page_t m, vm_prot_t prot, + vm_page_t mpte) { register pt_entry_t *pte; int managed; ==== //depot/projects/smpng/sys/alpha/include/param.h#14 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/alpha/include/param.h,v 1.38 2005/01/05 20:05:50 imp Exp $ */ +/* $FreeBSD: src/sys/alpha/include/param.h,v 1.39 2005/09/11 20:51:14 alc Exp $ */ /* From: NetBSD: param.h,v 1.20 1997/09/19 13:52:53 leo Exp */ /*- @@ -106,13 +106,6 @@ #define KERNBASE 0xfffffc0000300000LL /* start of kernel virtual */ #define BTOPKERNBASE ((u_long)KERNBASE >> PGSHIFT) -#define CLSIZE 1 -#define CLSIZELOG2 0 - -/* NOTE: SSIZE, SINCR and UPAGES must be multiples of CLSIZE */ -#define SSIZE 1 /* initial stack size/NBPG */ -#define SINCR 1 /* increment of stack/NBPG */ - #ifndef KSTACK_PAGES #define KSTACK_PAGES 2 /* pages of kstack (with pcb) */ #endif ==== //depot/projects/smpng/sys/alpha/include/vmparam.h#6 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/alpha/include/vmparam.h,v 1.10 2005/01/05 20:05:50 imp Exp $ */ +/* $FreeBSD: src/sys/alpha/include/vmparam.h,v 1.11 2005/09/11 20:51:14 alc Exp $ */ /* From: NetBSD: vmparam.h,v 1.6 1997/09/23 23:23:23 mjacob Exp */ #ifndef _ALPHA_VMPARAM_H #define _ALPHA_VMPARAM_H @@ -118,7 +118,7 @@ * by the page replacement algorithm. Basically this says that if you are * swapped in you deserve some resources. We protect the last SAFERSS * pages against paging and will just swap you out rather than paging you. - * Note that each process has at least UPAGES+CLSIZE pages which are not + * Note that each process has at least UPAGES pages which are not * paged anyways, in addition to SAFERSS. */ #define SAFERSS 10 /* nominal ``small'' resident set size ==== //depot/projects/smpng/sys/amd64/acpica/OsdEnvironment.c#6 (text+ko) ==== @@ -26,7 +26,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/amd64/acpica/OsdEnvironment.c,v 1.12 2004/05/06 02:18:57 njl Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/acpica/OsdEnvironment.c,v 1.13 2005/09/11 18:39:00 obrien Exp $"); /* * 6.1 : Environmental support @@ -35,7 +35,7 @@ #include <sys/linker_set.h> #include <sys/sysctl.h> -#include "acpi.h" +#include <contrib/dev/acpica/acpi.h> static u_long amd64_acpi_root; ==== //depot/projects/smpng/sys/amd64/acpica/acpi_machdep.c#9 (text+ko) ==== @@ -25,12 +25,12 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/amd64/acpica/acpi_machdep.c,v 1.16 2004/10/11 05:39:14 njl Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/acpica/acpi_machdep.c,v 1.17 2005/09/11 18:39:00 obrien Exp $"); #include <sys/param.h> #include <sys/bus.h> -#include "acpi.h" +#include <contrib/dev/acpica/acpi.h> #include <dev/acpica/acpivar.h> static int intr_model = ACPI_INTR_PIC; ==== //depot/projects/smpng/sys/amd64/acpica/acpi_wakeup.c#4 (text+ko) ==== @@ -26,12 +26,12 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/amd64/acpica/acpi_wakeup.c,v 1.21 2003/08/28 16:30:31 njl Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/acpica/acpi_wakeup.c,v 1.22 2005/09/11 18:39:00 obrien Exp $"); #include <sys/param.h> #include <sys/bus.h> -#include "acpi.h" +#include <contrib/dev/acpica/acpi.h> #include <dev/acpica/acpivar.h> int ==== //depot/projects/smpng/sys/amd64/acpica/madt.c#7 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/amd64/acpica/madt.c,v 1.16 2005/04/15 18:44:53 peter Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/acpica/madt.c,v 1.17 2005/09/11 18:39:00 obrien Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -48,7 +48,7 @@ #include <machine/md_var.h> #include <machine/specialreg.h> -#include "acpi.h" +#include <contrib/dev/acpica/acpi.h> #include <contrib/dev/acpica/actables.h> #include <dev/acpica/acpivar.h> #include <dev/pci/pcivar.h> ==== //depot/projects/smpng/sys/amd64/amd64/db_trace.c#14 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/amd64/amd64/db_trace.c,v 1.68 2005/08/03 04:33:48 jeff Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/db_trace.c,v 1.70 2005/09/10 03:01:24 marcel Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -202,9 +202,6 @@ int amd64_set_watch(int watchnum, unsigned int watchaddr, int size, int access, struct dbreg * d); int amd64_clr_watch(int watchnum, struct dbreg * d); -int db_md_set_watchpoint(db_expr_t addr, db_expr_t size); -int db_md_clr_watchpoint(db_expr_t addr, db_expr_t size); -void db_md_list_watchpoints(void); /* * Figure out how many arguments were passed into the frame at "fp". @@ -317,7 +314,8 @@ db_symbol_values(sym, &name, NULL); if (name != NULL) { if (strcmp(name, "calltrap") == 0 || - strcmp(name, "fork_trampoline") == 0) + strcmp(name, "fork_trampoline") == 0 || + strcmp(name, "nmi_calltrap") == 0) frame_type = TRAP; else if (strncmp(name, "Xatpic_intr", 11) == 0 || strncmp(name, "Xatpic_fastintr", 15) == 0 || ==== //depot/projects/smpng/sys/amd64/amd64/exception.S#16 (text+ko) ==== @@ -27,7 +27,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/amd64/amd64/exception.S,v 1.126 2005/08/25 20:33:43 ups Exp $ + * $FreeBSD: src/sys/amd64/amd64/exception.S,v 1.127 2005/08/27 16:03:40 jkoshy Exp $ */ #include "opt_atpic.h" @@ -93,8 +93,6 @@ jmp alltraps IDTVEC(div) TRAP(T_DIVIDE) -IDTVEC(nmi) - TRAP_NOEN(T_NMI) IDTVEC(ofl) TRAP(T_OFLOW) IDTVEC(bnd) @@ -313,6 +311,82 @@ IDTVEC(fast_syscall32) sysret +/* + * NMI handling is special. + * + * First, NMIs do not respect the state of the processor's RFLAGS.IF + * bit and the NMI handler may be invoked at any time, including when + * the processor is in a critical section with RFLAGS.IF == 0. In + * particular, this means that the processor's GS.base values could be + * inconsistent on entry to the handler, and so we need to read + * MSR_GSBASE to determine if a 'swapgs' is needed. We use '%ebx', a + * C-preserved register, to remember whether to swap GS back on the + * exit path. + * + * Second, the processor treats NMIs specially, blocking further NMIs + * until an 'iretq' instruction is executed. We therefore need to + * execute the NMI handler with interrupts disabled to prevent a + * nested interrupt from executing an 'iretq' instruction and + * inadvertently taking the processor out of NMI mode. + */ + +IDTVEC(nmi) + subq $TF_RIP,%rsp + movq $(T_NMI),TF_TRAPNO(%rsp) + movq $0,TF_ADDR(%rsp) + movq $0,TF_ERR(%rsp) + movq %rdi,TF_RDI(%rsp) + movq %rsi,TF_RSI(%rsp) + movq %rdx,TF_RDX(%rsp) + movq %rcx,TF_RCX(%rsp) + movq %r8,TF_R8(%rsp) + movq %r9,TF_R9(%rsp) + movq %rax,TF_RAX(%rsp) + movq %rbx,TF_RBX(%rsp) + movq %rbp,TF_RBP(%rsp) + movq %r10,TF_R10(%rsp) + movq %r11,TF_R11(%rsp) + movq %r12,TF_R12(%rsp) + movq %r13,TF_R13(%rsp) + movq %r14,TF_R14(%rsp) + movq %r15,TF_R15(%rsp) + xorl %ebx,%ebx + testb $SEL_RPL_MASK,TF_CS(%rsp) + jnz nmi_needswapgs /* we came from userland */ + movl $MSR_GSBASE,%ecx + rdmsr + cmpl $VM_MAXUSER_ADDRESS >> 32,%edx + jae nmi_calltrap /* GS.base holds a kernel VA */ +nmi_needswapgs: + incl %ebx + swapgs +/* Note: this label is also used by ddb and gdb: */ +nmi_calltrap: + FAKE_MCOUNT(TF_RIP(%rsp)) + call trap + MEXITCOUNT + testl %ebx,%ebx + jz nmi_restoreregs + swapgs +nmi_restoreregs: + movq TF_RDI(%rsp),%rdi + movq TF_RSI(%rsp),%rsi + movq TF_RDX(%rsp),%rdx + movq TF_RCX(%rsp),%rcx + movq TF_R8(%rsp),%r8 + movq TF_R9(%rsp),%r9 + movq TF_RAX(%rsp),%rax + movq TF_RBX(%rsp),%rbx + movq TF_RBP(%rsp),%rbp + movq TF_R10(%rsp),%r10 + movq TF_R11(%rsp),%r11 + movq TF_R12(%rsp),%r12 + movq TF_R13(%rsp),%r13 + movq TF_R14(%rsp),%r14 + movq TF_R15(%rsp),%r15 + addq $TF_RIP,%rsp + iretq + ENTRY(fork_trampoline) movq %r12, %rdi /* function */ movq %rbx, %rsi /* arg1 */ ==== //depot/projects/smpng/sys/amd64/amd64/genassym.c#14 (text+ko) ==== @@ -33,7 +33,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/amd64/amd64/genassym.c,v 1.155 2004/11/20 02:30:59 das Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/genassym.c,v 1.156 2005/08/27 16:03:40 jkoshy Exp $"); #include "opt_compat.h" #include "opt_kstack_pages.h" @@ -209,3 +209,5 @@ ASSYM(MTX_LOCK, offsetof(struct mtx, mtx_lock)); ASSYM(MTX_RECURSECNT, offsetof(struct mtx, mtx_recurse)); + +ASSYM(MSR_GSBASE, MSR_GSBASE); ==== //depot/projects/smpng/sys/amd64/amd64/pmap.c#45 (text+ko) ==== @@ -77,7 +77,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.526 2005/08/26 05:18:46 alc Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.528 2005/09/04 19:06:26 alc Exp $"); /* * Manages physical address maps. @@ -1872,6 +1872,7 @@ vm_paddr_t opa; pt_entry_t origpte, newpte; vm_page_t mpte, om; + boolean_t invlva; va = trunc_page(va); #ifdef PMAP_DIAGNOSTIC @@ -1935,14 +1936,6 @@ else if (!wired && (origpte & PG_W)) pmap->pm_stats.wired_count--; -#if defined(PMAP_DIAGNOSTIC) - if (pmap_nw_modified((pt_entry_t) origpte)) { - printf( - "pmap_enter: modified page not writable: va: 0x%lx, pte: 0x%lx\n", - va, origpte); - } -#endif - /* * Remove extra pte reference */ @@ -2014,17 +2007,30 @@ * to update the pte. */ if ((origpte & ~(PG_M|PG_A)) != newpte) { - if (origpte & PG_MANAGED) { + if (origpte & PG_V) { + invlva = FALSE; origpte = pte_load_store(pte, newpte | PG_A); - if ((origpte & PG_M) && pmap_track_modified(va)) - vm_page_dirty(om); - if (origpte & PG_A) - vm_page_flag_set(om, PG_REFERENCED); + if (origpte & PG_A) { + if (origpte & PG_MANAGED) + vm_page_flag_set(om, PG_REFERENCED); + if (opa != VM_PAGE_TO_PHYS(m) || ((origpte & + PG_NX) == 0 && (newpte & PG_NX))) + invlva = TRUE; + } + if (origpte & PG_M) { + KASSERT((origpte & PG_RW), + ("pmap_enter: modified page not writable:" + " va: 0x%lx, pte: 0x%lx", va, origpte)); + if ((origpte & PG_MANAGED) && + pmap_track_modified(va)) + vm_page_dirty(om); + if ((newpte & PG_RW) == 0) + invlva = TRUE; + } + if (invlva) + pmap_invalidate_page(pmap, va); } else pte_store(pte, newpte | PG_A); - if (origpte) { - pmap_invalidate_page(pmap, va); - } } vm_page_unlock_queues(); PMAP_UNLOCK(pmap); @@ -2036,12 +2042,12 @@ * 2. Not wired. * 3. Read access. * 4. No page table pages. - * 6. Page IS managed. * but is *MUCH* faster than pmap_enter... */ vm_page_t -pmap_enter_quick(pmap_t pmap, vm_offset_t va, vm_page_t m, vm_page_t mpte) +pmap_enter_quick(pmap_t pmap, vm_offset_t va, vm_page_t m, vm_prot_t prot, + vm_page_t mpte) { pt_entry_t *pte; vm_paddr_t pa; @@ -2130,6 +2136,8 @@ pmap->pm_stats.resident_count++; pa = VM_PAGE_TO_PHYS(m); + if ((prot & VM_PROT_EXECUTE) == 0) + pa |= pg_nx; /* * Now validate mapping with RO protection ==== //depot/projects/smpng/sys/amd64/amd64/trap.c#30 (text+ko) ==== @@ -38,7 +38,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/amd64/amd64/trap.c,v 1.289 2005/06/29 23:23:16 peter Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/trap.c,v 1.290 2005/08/27 16:03:40 jkoshy Exp $"); /* * AMD64 Trap and System call handling @@ -210,7 +210,8 @@ printf( "pid %ld (%s): trap %d with interrupts disabled\n", (long)curproc->p_pid, curproc->p_comm, type); - else if (type != T_BPTFLT && type != T_TRCTRAP) { + else if (type != T_NMI && type != T_BPTFLT && + type != T_TRCTRAP) { /* * XXX not quite right, since this may be for a * multiple fault in user mode. ==== //depot/projects/smpng/sys/amd64/conf/GENERIC#36 (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.441 2005/07/24 17:55:57 mux Exp $ +# $FreeBSD: src/sys/amd64/conf/GENERIC,v 1.442 2005/09/08 03:29:18 scottl Exp $ machine amd64 cpu HAMMER @@ -130,6 +130,7 @@ device arcmsr # Areca SATA II RAID device ciss # Compaq Smart RAID 5* device dpt # DPT Smartcache III, IV - See NOTES for options +device hptmv # Highpoint RocketRAID 182x device iir # Intel Integrated RAID device ips # IBM (Adaptec) ServeRAID device mly # Mylex AcceleRAID/eXtremeRAID ==== //depot/projects/smpng/sys/amd64/conf/NOTES#20 (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.41 2005/07/22 16:02:40 ru Exp $ +# $FreeBSD: src/sys/amd64/conf/NOTES,v 1.42 2005/09/08 03:29:18 scottl Exp $ # # @@ -278,7 +278,7 @@ # # Highpoint RocketRAID 182x. This is really just software RAID on a # Marvell SATA chip. -#device hptmv # Broken, i386-only binary. +device hptmv # # IBM (now Adaptec) ServeRAID controllers ==== //depot/projects/smpng/sys/arm/arm/db_trace.c#13 (text+ko) ==== @@ -30,7 +30,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/arm/arm/db_trace.c,v 1.11 2005/08/03 04:27:38 jeff Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/arm/db_trace.c,v 1.12 2005/09/10 03:01:24 marcel Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -51,9 +51,6 @@ #define INKERNEL(va) (((vm_offset_t)(va)) >= VM_MIN_KERNEL_ADDRESS) -int db_md_set_watchpoint(db_expr_t addr, db_expr_t size); -int db_md_clr_watchpoint(db_expr_t addr, db_expr_t size); -void db_md_list_watchpoints(void); /* * APCS stack frames are awkward beasts, so I don't think even trying to use * a structure to represent them is a good idea. ==== //depot/projects/smpng/sys/arm/arm/pmap.c#19 (text+ko) ==== @@ -147,7 +147,7 @@ #include "opt_vm.h" #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/arm/arm/pmap.c,v 1.36 2005/06/23 11:37:41 cognet Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/arm/pmap.c,v 1.37 2005/09/03 18:20:18 alc Exp $"); #include <sys/param.h> #include <sys/systm.h> #include <sys/kernel.h> @@ -3536,19 +3536,19 @@ * 2. Not wired. * 3. Read access. * 4. No page table pages. - * 6. Page IS managed. * but is *MUCH* faster than pmap_enter... */ vm_page_t -pmap_enter_quick(pmap_t pmap, vm_offset_t va, vm_page_t m, vm_page_t mpte) +pmap_enter_quick(pmap_t pmap, vm_offset_t va, vm_page_t m, vm_prot_t prot, + vm_page_t mpte) { vm_page_busy(m); vm_page_unlock_queues(); VM_OBJECT_UNLOCK(m->object); mtx_lock(&Giant); - pmap_enter(pmap, va, m, VM_PROT_READ|VM_PROT_EXECUTE, FALSE); + pmap_enter(pmap, va, m, prot & (VM_PROT_READ | VM_PROT_EXECUTE), FALSE); pmap_idcache_wbinv_all(pmap); mtx_unlock(&Giant); VM_OBJECT_LOCK(m->object); ==== //depot/projects/smpng/sys/boot/forth/loader.conf#37 (text+ko) ==== @@ -6,7 +6,7 @@ # # All arguments must be in double quotes. # -# $FreeBSD: src/sys/boot/forth/loader.conf,v 1.99 2005/08/18 01:39:43 iedowse Exp $ +# $FreeBSD: src/sys/boot/forth/loader.conf,v 1.100 2005/08/31 10:51:55 glebius Exp $ ############################################################## ### Basic configuration options ############################ @@ -108,7 +108,6 @@ #debug.ktr.mask="0x1200" # Bitmask of KTR events to enable #debug.ktr.verbose="1" # Enable console dump of KTR events #net.graph.maxalloc="128" # Maximum number of queue items to allocate -#net.graph.ngqfreemax="64" # Maximum number of free queue items to cache ############################################################## ==== //depot/projects/smpng/sys/boot/pc98/Makefile.inc#4 (text+ko) ==== @@ -1,11 +1,12 @@ # Common defines for all of /sys/boot/pc98/ # -# $FreeBSD: src/sys/boot/pc98/Makefile.inc,v 1.5 2004/02/09 16:01:44 nyan Exp $ +# $FreeBSD: src/sys/boot/pc98/Makefile.inc,v 1.6 2005/09/13 08:27:38 nyan Exp $ BINDIR?= /boot LOADER_ADDRESS?=0x100000 -CFLAGS+= -ffreestanding -mpreferred-stack-boundary=2 +CFLAGS+= -ffreestanding -mpreferred-stack-boundary=2 \ + -mno-mmx -mno-3dnow -mno-sse -mno-sse2 -mno-sse3 LDFLAGS+= -nostdlib # BTX components ==== //depot/projects/smpng/sys/boot/pc98/boot2/io.c#7 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/boot/pc98/boot2/io.c,v 1.8 2005/05/10 12:02:14 nyan Exp $"); +__FBSDID("$FreeBSD: src/sys/boot/pc98/boot2/io.c,v 1.9 2005/09/14 12:39:06 nyan Exp $"); #include "boot.h" #include <machine/cpufunc.h> @@ -354,7 +354,6 @@ int ret; int i; int data = 0; - u_char epson_machine_id = *(unsigned char *)V(0xA1624); /* PC98_SYSTEM_PARAMETER(0x501) */ ret = ((*(unsigned char*)V(0xA1501)) & 0x08) >> 3; @@ -390,18 +389,8 @@ } else { ret |= M_NOT_H98; } - } else { + } else ret |= M_NOT_H98; - switch (epson_machine_id) { - case 0x20: /* note A */ - case 0x22: /* note W */ - case 0x27: /* note AE */ - case 0x2a: /* note WR */ - ret |= M_NOTE; - break; - default: - break; - } - } + (*(unsigned long *)V(0xA1620)) = ret; } ==== //depot/projects/smpng/sys/boot/pc98/libpc98/comconsole.c#4 (text+ko) ==== @@ -24,7 +24,7 @@ >>> TRUNCATED FOR MAIL (1000 lines) <<<
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200509151848.j8FImTQQ007144>