PERFORCE change 36220 for review
John Baldwin
jhb at FreeBSD.org
Fri Aug 15 14:41:35 PDT 2003
http://perforce.freebsd.org/chv.cgi?CH=36220
Change 36220 by jhb at jhb_laptop on 2003/08/15 14:40:58
IFC @36214.
Affected files ...
.. //depot/projects/smpng/sys/alpha/alpha/critical.c#5 integrate
.. //depot/projects/smpng/sys/alpha/alpha/mp_machdep.c#22 integrate
.. //depot/projects/smpng/sys/alpha/alpha/pmap.c#50 integrate
.. //depot/projects/smpng/sys/alpha/alpha/swtch.s#7 integrate
.. //depot/projects/smpng/sys/alpha/alpha/vm_machdep.c#26 integrate
.. //depot/projects/smpng/sys/alpha/include/critical.h#3 integrate
.. //depot/projects/smpng/sys/amd64/amd64/busdma_machdep.c#6 integrate
.. //depot/projects/smpng/sys/amd64/amd64/critical.c#4 integrate
.. //depot/projects/smpng/sys/amd64/amd64/pmap.c#10 integrate
.. //depot/projects/smpng/sys/amd64/include/critical.h#3 integrate
.. //depot/projects/smpng/sys/boot/i386/libi386/biosacpi.c#5 integrate
.. //depot/projects/smpng/sys/boot/i386/libi386/biospnp.c#4 integrate
.. //depot/projects/smpng/sys/boot/powerpc/loader/start.c#3 integrate
.. //depot/projects/smpng/sys/cam/scsi/scsi_da.c#43 integrate
.. //depot/projects/smpng/sys/compat/svr4/svr4_misc.c#26 integrate
.. //depot/projects/smpng/sys/conf/NOTES#52 integrate
.. //depot/projects/smpng/sys/conf/files#84 integrate
.. //depot/projects/smpng/sys/conf/files.i386#45 integrate
.. //depot/projects/smpng/sys/conf/files.ia64#31 integrate
.. //depot/projects/smpng/sys/conf/files.pc98#46 integrate
.. //depot/projects/smpng/sys/conf/kern.post.mk#24 integrate
.. //depot/projects/smpng/sys/conf/majors#26 integrate
.. //depot/projects/smpng/sys/conf/options#59 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/acfreebsd.h#9 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/common/adisasm.c#1 branch
.. //depot/projects/smpng/sys/contrib/dev/acpica/common/getopt.c#1 branch
.. //depot/projects/smpng/sys/contrib/dev/acpica/compiler/aslanalyze.c#1 branch
.. //depot/projects/smpng/sys/contrib/dev/acpica/compiler/aslcodegen.c#1 branch
.. //depot/projects/smpng/sys/contrib/dev/acpica/compiler/aslcompile.c#1 branch
.. //depot/projects/smpng/sys/contrib/dev/acpica/compiler/aslcompiler.h#1 branch
.. //depot/projects/smpng/sys/contrib/dev/acpica/compiler/aslcompiler.l#1 branch
.. //depot/projects/smpng/sys/contrib/dev/acpica/compiler/aslcompiler.y#1 branch
.. //depot/projects/smpng/sys/contrib/dev/acpica/compiler/aslerror.c#1 branch
.. //depot/projects/smpng/sys/contrib/dev/acpica/compiler/aslfiles.c#1 branch
.. //depot/projects/smpng/sys/contrib/dev/acpica/compiler/aslfold.c#1 branch
.. //depot/projects/smpng/sys/contrib/dev/acpica/compiler/aslglobal.h#1 branch
.. //depot/projects/smpng/sys/contrib/dev/acpica/compiler/asllength.c#1 branch
.. //depot/projects/smpng/sys/contrib/dev/acpica/compiler/asllisting.c#1 branch
.. //depot/projects/smpng/sys/contrib/dev/acpica/compiler/aslload.c#1 branch
.. //depot/projects/smpng/sys/contrib/dev/acpica/compiler/asllookup.c#1 branch
.. //depot/projects/smpng/sys/contrib/dev/acpica/compiler/aslmain.c#1 branch
.. //depot/projects/smpng/sys/contrib/dev/acpica/compiler/aslmap.c#1 branch
.. //depot/projects/smpng/sys/contrib/dev/acpica/compiler/aslopcodes.c#1 branch
.. //depot/projects/smpng/sys/contrib/dev/acpica/compiler/asloperands.c#1 branch
.. //depot/projects/smpng/sys/contrib/dev/acpica/compiler/aslopt.c#1 branch
.. //depot/projects/smpng/sys/contrib/dev/acpica/compiler/aslresource.c#1 branch
.. //depot/projects/smpng/sys/contrib/dev/acpica/compiler/aslrestype1.c#1 branch
.. //depot/projects/smpng/sys/contrib/dev/acpica/compiler/aslrestype2.c#1 branch
.. //depot/projects/smpng/sys/contrib/dev/acpica/compiler/aslstubs.c#1 branch
.. //depot/projects/smpng/sys/contrib/dev/acpica/compiler/asltransform.c#1 branch
.. //depot/projects/smpng/sys/contrib/dev/acpica/compiler/asltree.c#1 branch
.. //depot/projects/smpng/sys/contrib/dev/acpica/compiler/asltypes.h#1 branch
.. //depot/projects/smpng/sys/contrib/dev/acpica/compiler/aslutils.c#1 branch
.. //depot/projects/smpng/sys/contrib/dev/acpica/osunixxf.c#1 branch
.. //depot/projects/smpng/sys/contrib/dev/oltr/if_oltr.c#5 integrate
.. //depot/projects/smpng/sys/ddb/db_access.c#3 integrate
.. //depot/projects/smpng/sys/dev/aac/aacvar.h#19 integrate
.. //depot/projects/smpng/sys/dev/acpica/acpi.c#46 integrate
.. //depot/projects/smpng/sys/dev/acpica/acpi_acad.c#10 integrate
.. //depot/projects/smpng/sys/dev/acpica/acpi_battery.c#8 integrate
.. //depot/projects/smpng/sys/dev/acpica/acpi_button.c#9 integrate
.. //depot/projects/smpng/sys/dev/acpica/acpi_cmbat.c#13 integrate
.. //depot/projects/smpng/sys/dev/acpica/acpi_pcib_acpi.c#5 integrate
.. //depot/projects/smpng/sys/dev/amd/amd.c#8 integrate
.. //depot/projects/smpng/sys/dev/ath/if_ath.c#6 integrate
.. //depot/projects/smpng/sys/dev/ath/if_ath_pci.c#3 integrate
.. //depot/projects/smpng/sys/dev/bge/if_bge.c#32 integrate
.. //depot/projects/smpng/sys/dev/bge/if_bgereg.h#18 integrate
.. //depot/projects/smpng/sys/dev/bktr/bktr_audio.c#3 integrate
.. //depot/projects/smpng/sys/dev/bktr/bktr_audio.h#2 integrate
.. //depot/projects/smpng/sys/dev/bktr/bktr_core.c#10 integrate
.. //depot/projects/smpng/sys/dev/bktr/bktr_os.c#14 integrate
.. //depot/projects/smpng/sys/dev/bktr/bktr_reg.h#4 integrate
.. //depot/projects/smpng/sys/dev/bktr/msp34xx.c#1 branch
.. //depot/projects/smpng/sys/dev/ciss/ciss.c#19 integrate
.. //depot/projects/smpng/sys/dev/ct/ct.c#3 integrate
.. //depot/projects/smpng/sys/dev/dgb/dgb.c#13 integrate
.. //depot/projects/smpng/sys/dev/dgb/dgreg.h#2 integrate
.. //depot/projects/smpng/sys/dev/digi/digi.c#18 integrate
.. //depot/projects/smpng/sys/dev/digi/digi.h#6 integrate
.. //depot/projects/smpng/sys/dev/digi/digireg.h#2 integrate
.. //depot/projects/smpng/sys/dev/ed/if_ed.c#13 integrate
.. //depot/projects/smpng/sys/dev/ed/if_ed_cbus.c#7 integrate
.. //depot/projects/smpng/sys/dev/ed/if_ed_pccard.c#17 integrate
.. //depot/projects/smpng/sys/dev/en/if_en_pci.c#2 integrate
.. //depot/projects/smpng/sys/dev/en/midway.c#19 integrate
.. //depot/projects/smpng/sys/dev/en/midwayvar.h#7 integrate
.. //depot/projects/smpng/sys/dev/fatm/if_fatm.c#5 integrate
.. //depot/projects/smpng/sys/dev/fatm/if_fatmvar.h#3 integrate
.. //depot/projects/smpng/sys/dev/firewire/firewire.c#23 integrate
.. //depot/projects/smpng/sys/dev/firewire/firewire.h#8 integrate
.. //depot/projects/smpng/sys/dev/firewire/firewirereg.h#12 integrate
.. //depot/projects/smpng/sys/dev/firewire/fwdev.c#10 integrate
.. //depot/projects/smpng/sys/dev/firewire/fwohci.c#22 integrate
.. //depot/projects/smpng/sys/dev/hatm/if_hatm.c#5 integrate
.. //depot/projects/smpng/sys/dev/hatm/if_hatm_ioctl.c#4 integrate
.. //depot/projects/smpng/sys/dev/hatm/if_hatm_rx.c#3 integrate
.. //depot/projects/smpng/sys/dev/hatm/if_hatm_tx.c#4 integrate
.. //depot/projects/smpng/sys/dev/hatm/if_hatmvar.h#3 integrate
.. //depot/projects/smpng/sys/dev/ida/ida_disk.c#10 integrate
.. //depot/projects/smpng/sys/dev/ie/if_ievar.h#2 integrate
.. //depot/projects/smpng/sys/dev/iicbus/iic.c#7 integrate
.. //depot/projects/smpng/sys/dev/iicbus/iicsmb.c#4 integrate
.. //depot/projects/smpng/sys/dev/md/md.c#40 integrate
.. //depot/projects/smpng/sys/dev/mii/brgphy.c#16 integrate
.. //depot/projects/smpng/sys/dev/mlx/mlx.c#11 integrate
.. //depot/projects/smpng/sys/dev/mly/mly.c#17 integrate
.. //depot/projects/smpng/sys/dev/patm/if_patm.c#3 integrate
.. //depot/projects/smpng/sys/dev/patm/if_patm_ioctl.c#3 integrate
.. //depot/projects/smpng/sys/dev/patm/if_patm_rx.c#3 integrate
.. //depot/projects/smpng/sys/dev/patm/if_patm_tx.c#3 integrate
.. //depot/projects/smpng/sys/dev/patm/if_patmvar.h#2 integrate
.. //depot/projects/smpng/sys/dev/pccard/pccarddevs#29 integrate
.. //depot/projects/smpng/sys/dev/pccard/pccarddevs.h#29 integrate
.. //depot/projects/smpng/sys/dev/pccbb/pccbb.c#33 integrate
.. //depot/projects/smpng/sys/dev/pccbb/pccbbreg.h#8 integrate
.. //depot/projects/smpng/sys/dev/ppbus/ppbconf.h#2 integrate
.. //depot/projects/smpng/sys/dev/puc/pucdata.c#16 integrate
.. //depot/projects/smpng/sys/dev/rc/rc.c#7 integrate
.. //depot/projects/smpng/sys/dev/safe/safe.c#2 integrate
.. //depot/projects/smpng/sys/dev/smbus/smb.c#6 integrate
.. //depot/projects/smpng/sys/dev/snc/dp83932.c#6 integrate
.. //depot/projects/smpng/sys/dev/sound/pci/csa.c#6 integrate
.. //depot/projects/smpng/sys/dev/sound/pci/ich.c#22 integrate
.. //depot/projects/smpng/sys/dev/sound/pci/ich.h#3 integrate
.. //depot/projects/smpng/sys/dev/sound/pcm/dsp.c#15 integrate
.. //depot/projects/smpng/sys/dev/sound/pcm/feeder.c#9 integrate
.. //depot/projects/smpng/sys/dev/sound/pcm/feeder.h#4 integrate
.. //depot/projects/smpng/sys/dev/sym/sym_fw.h#3 integrate
.. //depot/projects/smpng/sys/dev/trm/trm.c#10 integrate
.. //depot/projects/smpng/sys/dev/twe/twe.c#6 integrate
.. //depot/projects/smpng/sys/dev/twe/twe_compat.h#6 integrate
.. //depot/projects/smpng/sys/dev/twe/twe_freebsd.c#16 integrate
.. //depot/projects/smpng/sys/dev/twe/twe_tables.h#3 integrate
.. //depot/projects/smpng/sys/dev/twe/tweio.h#2 integrate
.. //depot/projects/smpng/sys/dev/twe/twereg.h#4 integrate
.. //depot/projects/smpng/sys/dev/twe/twevar.h#4 integrate
.. //depot/projects/smpng/sys/dev/tx/if_tx.c#11 integrate
.. //depot/projects/smpng/sys/dev/usb/umass.c#28 integrate
.. //depot/projects/smpng/sys/dev/usb/uvisor.c#7 integrate
.. //depot/projects/smpng/sys/dev/vinum/vinumio.c#15 integrate
.. //depot/projects/smpng/sys/dev/wi/if_wi_pccard.c#22 integrate
.. //depot/projects/smpng/sys/dev/wi/if_wi_pci.c#15 integrate
.. //depot/projects/smpng/sys/fs/msdosfs/msdosfs_vfsops.c#21 integrate
.. //depot/projects/smpng/sys/fs/msdosfs/msdosfs_vnops.c#20 integrate
.. //depot/projects/smpng/sys/fs/msdosfs/msdosfsmount.h#5 integrate
.. //depot/projects/smpng/sys/fs/procfs/procfs_map.c#4 integrate
.. //depot/projects/smpng/sys/fs/specfs/spec_vnops.c#25 integrate
.. //depot/projects/smpng/sys/fs/udf/udf_vfsops.c#11 integrate
.. //depot/projects/smpng/sys/geom/geom_dev.c#29 integrate
.. //depot/projects/smpng/sys/geom/geom_io.c#22 integrate
.. //depot/projects/smpng/sys/i386/conf/NOTES#62 integrate
.. //depot/projects/smpng/sys/i386/conf/PAE#6 integrate
.. //depot/projects/smpng/sys/i386/i386/busdma_machdep.c#24 integrate
.. //depot/projects/smpng/sys/i386/i386/critical.c#8 integrate
.. //depot/projects/smpng/sys/i386/i386/exception.s#15 integrate
.. //depot/projects/smpng/sys/i386/i386/i686_mem.c#7 integrate
.. //depot/projects/smpng/sys/i386/i386/identcpu.c#23 integrate
.. //depot/projects/smpng/sys/i386/i386/initcpu.c#18 integrate
.. //depot/projects/smpng/sys/i386/i386/mp_clock.c#7 integrate
.. //depot/projects/smpng/sys/i386/i386/mp_machdep.c#50 integrate
.. //depot/projects/smpng/sys/i386/i386/perfmon.c#11 integrate
.. //depot/projects/smpng/sys/i386/i386/pmap.c#45 integrate
.. //depot/projects/smpng/sys/i386/i386/support.s#11 integrate
.. //depot/projects/smpng/sys/i386/i386/trap.c#61 integrate
.. //depot/projects/smpng/sys/i386/i386/tsc.c#6 integrate
.. //depot/projects/smpng/sys/i386/ibcs2/ibcs2_ipc.h#2 integrate
.. //depot/projects/smpng/sys/i386/ibcs2/ibcs2_stat.c#11 integrate
.. //depot/projects/smpng/sys/i386/include/apic.h#10 integrate
.. //depot/projects/smpng/sys/i386/include/clock.h#5 integrate
.. //depot/projects/smpng/sys/i386/include/cpufunc.h#24 integrate
.. //depot/projects/smpng/sys/i386/include/critical.h#4 integrate
.. //depot/projects/smpng/sys/i386/include/specialreg.h#6 integrate
.. //depot/projects/smpng/sys/i386/isa/clock.c#26 integrate
.. //depot/projects/smpng/sys/i386/isa/cxreg.h#2 integrate
.. //depot/projects/smpng/sys/i386/isa/if_rdp.c#9 integrate
.. //depot/projects/smpng/sys/i386/isa/pcaudio.c#11 delete
.. //depot/projects/smpng/sys/i386/isa/spic.c#7 integrate
.. //depot/projects/smpng/sys/i386/isa/spigot.c#14 integrate
.. //depot/projects/smpng/sys/i386/isa/wt.c#8 integrate
.. //depot/projects/smpng/sys/ia64/ia64/critical.c#4 integrate
.. //depot/projects/smpng/sys/ia64/ia64/elf_machdep.c#9 integrate
.. //depot/projects/smpng/sys/ia64/ia64/exception.S#4 integrate
.. //depot/projects/smpng/sys/ia64/ia64/machdep.c#63 integrate
.. //depot/projects/smpng/sys/ia64/ia64/mp_machdep.c#24 integrate
.. //depot/projects/smpng/sys/ia64/ia64/pmap.c#51 integrate
.. //depot/projects/smpng/sys/ia64/ia64/ptrace_machdep.c#1 branch
.. //depot/projects/smpng/sys/ia64/ia64/support.S#2 integrate
.. //depot/projects/smpng/sys/ia64/ia64/syscall.S#3 integrate
.. //depot/projects/smpng/sys/ia64/ia64/trap.c#54 integrate
.. //depot/projects/smpng/sys/ia64/ia64/vm_machdep.c#30 integrate
.. //depot/projects/smpng/sys/ia64/include/cpu.h#17 integrate
.. //depot/projects/smpng/sys/ia64/include/critical.h#3 integrate
.. //depot/projects/smpng/sys/ia64/include/ia64_cpu.h#11 integrate
.. //depot/projects/smpng/sys/ia64/include/ieeefp.h#4 integrate
.. //depot/projects/smpng/sys/ia64/include/pcb.h#9 integrate
.. //depot/projects/smpng/sys/ia64/include/ptrace.h#4 integrate
.. //depot/projects/smpng/sys/ia64/include/ucontext.h#4 integrate
.. //depot/projects/smpng/sys/isofs/cd9660/cd9660_vfsops.c#22 integrate
.. //depot/projects/smpng/sys/kern/kern_descrip.c#51 integrate
.. //depot/projects/smpng/sys/kern/kern_fork.c#64 integrate
.. //depot/projects/smpng/sys/kern/kern_ktrace.c#34 integrate
.. //depot/projects/smpng/sys/kern/kern_proc.c#56 integrate
.. //depot/projects/smpng/sys/kern/kern_sig.c#75 integrate
.. //depot/projects/smpng/sys/kern/kern_synch.c#56 integrate
.. //depot/projects/smpng/sys/kern/kern_tc.c#23 integrate
.. //depot/projects/smpng/sys/kern/kern_thr.c#12 integrate
.. //depot/projects/smpng/sys/kern/kern_thread.c#44 integrate
.. //depot/projects/smpng/sys/kern/link_elf.c#23 integrate
.. //depot/projects/smpng/sys/kern/sched_4bsd.c#12 integrate
.. //depot/projects/smpng/sys/kern/subr_blist.c#6 integrate
.. //depot/projects/smpng/sys/kern/subr_kobj.c#4 integrate
.. //depot/projects/smpng/sys/kern/subr_param.c#14 integrate
.. //depot/projects/smpng/sys/kern/subr_trap.c#57 integrate
.. //depot/projects/smpng/sys/kern/sys_pipe.c#32 integrate
.. //depot/projects/smpng/sys/kern/sys_process.c#31 integrate
.. //depot/projects/smpng/sys/kern/sysv_msg.c#19 integrate
.. //depot/projects/smpng/sys/kern/sysv_sem.c#20 integrate
.. //depot/projects/smpng/sys/kern/sysv_shm.c#18 integrate
.. //depot/projects/smpng/sys/kern/uipc_socket.c#40 integrate
.. //depot/projects/smpng/sys/kern/uipc_syscalls.c#37 integrate
.. //depot/projects/smpng/sys/kern/vfs_subr.c#58 integrate
.. //depot/projects/smpng/sys/kern/vfs_syscalls.c#61 integrate
.. //depot/projects/smpng/sys/libkern/arc4random.c#5 integrate
.. //depot/projects/smpng/sys/libkern/random.c#4 integrate
.. //depot/projects/smpng/sys/modules/Makefile#59 integrate
.. //depot/projects/smpng/sys/modules/bktr/bktr/Makefile#4 integrate
.. //depot/projects/smpng/sys/modules/en/Makefile#3 integrate
.. //depot/projects/smpng/sys/modules/netgraph/atm/Makefile#2 integrate
.. //depot/projects/smpng/sys/modules/netgraph/atm/atmpif/Makefile#1 branch
.. //depot/projects/smpng/sys/net/bpf.c#24 integrate
.. //depot/projects/smpng/sys/net/bpfdesc.h#6 integrate
.. //depot/projects/smpng/sys/net/if_atm.h#9 integrate
.. //depot/projects/smpng/sys/net/if_loop.c#19 integrate
.. //depot/projects/smpng/sys/net80211/ieee80211.c#4 integrate
.. //depot/projects/smpng/sys/net80211/ieee80211_input.c#3 integrate
.. //depot/projects/smpng/sys/net80211/ieee80211_node.c#4 integrate
.. //depot/projects/smpng/sys/net80211/ieee80211_node.h#3 integrate
.. //depot/projects/smpng/sys/netgraph/atm/atmpif/ng_atmpif.c#1 branch
.. //depot/projects/smpng/sys/netgraph/atm/atmpif/ng_atmpif_harp.c#1 branch
.. //depot/projects/smpng/sys/netgraph/atm/atmpif/ng_atmpif_var.h#1 branch
.. //depot/projects/smpng/sys/netgraph/atm/ng_atmpif.h#1 branch
.. //depot/projects/smpng/sys/netinet/if_atm.c#4 integrate
.. //depot/projects/smpng/sys/netinet/in.h#22 integrate
.. //depot/projects/smpng/sys/netinet/in_pcb.c#33 integrate
.. //depot/projects/smpng/sys/netinet/in_proto.c#9 integrate
.. //depot/projects/smpng/sys/netinet/ip_mroute.c#23 integrate
.. //depot/projects/smpng/sys/netinet/ip_mroute.h#5 integrate
.. //depot/projects/smpng/sys/netinet/ip_output.c#40 integrate
.. //depot/projects/smpng/sys/netinet/ip_var.h#13 integrate
.. //depot/projects/smpng/sys/netinet/pim.h#1 branch
.. //depot/projects/smpng/sys/netinet/pim_var.h#1 branch
.. //depot/projects/smpng/sys/netinet/raw_ip.c#27 integrate
.. //depot/projects/smpng/sys/netinet/tcp_input.c#36 integrate
.. //depot/projects/smpng/sys/netinet/tcp_output.c#14 integrate
.. //depot/projects/smpng/sys/netinet/tcp_syncache.c#19 integrate
.. //depot/projects/smpng/sys/netinet6/nd6.c#11 integrate
.. //depot/projects/smpng/sys/netinet6/nd6.h#5 integrate
.. //depot/projects/smpng/sys/netinet6/nd6_rtr.c#7 integrate
.. //depot/projects/smpng/sys/netipsec/ipsec_input.c#5 integrate
.. //depot/projects/smpng/sys/netnatm/natm.c#13 integrate
.. //depot/projects/smpng/sys/netnatm/natm.h#4 integrate
.. //depot/projects/smpng/sys/netnatm/natm_pcb.c#5 integrate
.. //depot/projects/smpng/sys/netnatm/natm_proto.c#9 integrate
.. //depot/projects/smpng/sys/nfsclient/bootp_subr.c#18 integrate
.. //depot/projects/smpng/sys/nfsclient/nfs_diskless.c#4 integrate
.. //depot/projects/smpng/sys/nfsclient/nfs_vfsops.c#25 integrate
.. //depot/projects/smpng/sys/nfsclient/nfsdiskless.h#5 integrate
.. //depot/projects/smpng/sys/pc98/conf/NOTES#11 integrate
.. //depot/projects/smpng/sys/pc98/pc98/clock.c#18 integrate
.. //depot/projects/smpng/sys/pc98/pc98/pcaudio.c#9 delete
.. //depot/projects/smpng/sys/pci/if_rl.c#35 integrate
.. //depot/projects/smpng/sys/pci/if_rlreg.h#11 integrate
.. //depot/projects/smpng/sys/pci/if_ti.c#29 integrate
.. //depot/projects/smpng/sys/pci/meteor.c#9 integrate
.. //depot/projects/smpng/sys/powerpc/include/critical.h#4 integrate
.. //depot/projects/smpng/sys/powerpc/powerpc/critical.c#4 integrate
.. //depot/projects/smpng/sys/powerpc/powerpc/swtch.S#3 integrate
.. //depot/projects/smpng/sys/powerpc/powerpc/vm_machdep.c#27 integrate
.. //depot/projects/smpng/sys/sparc64/include/critical.h#3 integrate
.. //depot/projects/smpng/sys/sparc64/sparc64/critical.c#5 integrate
.. //depot/projects/smpng/sys/sparc64/sparc64/machdep.c#55 integrate
.. //depot/projects/smpng/sys/sys/blist.h#6 integrate
.. //depot/projects/smpng/sys/sys/buf.h#21 integrate
.. //depot/projects/smpng/sys/sys/kse.h#13 integrate
.. //depot/projects/smpng/sys/sys/mman.h#7 integrate
.. //depot/projects/smpng/sys/sys/namei.h#11 integrate
.. //depot/projects/smpng/sys/sys/param.h#46 integrate
.. //depot/projects/smpng/sys/sys/pipe.h#5 integrate
.. //depot/projects/smpng/sys/sys/proc.h#98 integrate
.. //depot/projects/smpng/sys/sys/ptrace.h#9 integrate
.. //depot/projects/smpng/sys/sys/queue.h#8 integrate
.. //depot/projects/smpng/sys/sys/socketvar.h#31 integrate
.. //depot/projects/smpng/sys/sys/soundcard.h#7 integrate
.. //depot/projects/smpng/sys/ufs/ffs/ffs_balloc.c#11 integrate
.. //depot/projects/smpng/sys/ufs/ffs/ffs_vfsops.c#44 integrate
.. //depot/projects/smpng/sys/ufs/ffs/ffs_vnops.c#22 integrate
.. //depot/projects/smpng/sys/ufs/ufs/inode.h#9 integrate
.. //depot/projects/smpng/sys/ufs/ufs/ufs_inode.c#14 integrate
.. //depot/projects/smpng/sys/vm/default_pager.c#5 integrate
.. //depot/projects/smpng/sys/vm/device_pager.c#11 integrate
.. //depot/projects/smpng/sys/vm/phys_pager.c#10 integrate
.. //depot/projects/smpng/sys/vm/swap_pager.c#31 integrate
.. //depot/projects/smpng/sys/vm/swap_pager.h#12 integrate
.. //depot/projects/smpng/sys/vm/uma_core.c#35 integrate
.. //depot/projects/smpng/sys/vm/uma_int.h#16 integrate
.. //depot/projects/smpng/sys/vm/vm_contig.c#17 integrate
.. //depot/projects/smpng/sys/vm/vm_extern.h#16 integrate
.. //depot/projects/smpng/sys/vm/vm_glue.c#32 integrate
.. //depot/projects/smpng/sys/vm/vm_init.c#9 integrate
.. //depot/projects/smpng/sys/vm/vm_kern.c#18 integrate
.. //depot/projects/smpng/sys/vm/vm_kern.h#4 integrate
.. //depot/projects/smpng/sys/vm/vm_map.c#42 integrate
.. //depot/projects/smpng/sys/vm/vm_map.h#20 integrate
.. //depot/projects/smpng/sys/vm/vm_mmap.c#31 integrate
.. //depot/projects/smpng/sys/vm/vm_object.c#42 integrate
.. //depot/projects/smpng/sys/vm/vm_object.h#21 integrate
.. //depot/projects/smpng/sys/vm/vm_pageout.c#36 integrate
.. //depot/projects/smpng/sys/vm/vm_pageq.c#10 integrate
.. //depot/projects/smpng/sys/vm/vm_pager.c#15 integrate
.. //depot/projects/smpng/sys/vm/vm_pager.h#8 integrate
.. //depot/projects/smpng/sys/vm/vm_unix.c#8 integrate
.. //depot/projects/smpng/sys/vm/vm_zeroidle.c#12 integrate
.. //depot/projects/smpng/sys/vm/vnode_pager.c#32 integrate
Differences ...
==== //depot/projects/smpng/sys/alpha/alpha/critical.c#5 (text+ko) ====
@@ -1,10 +1,32 @@
/*-
- * Copyright (c) 2001 Matthew Dillon. This code is distributed under
- * the BSD copyright, /usr/src/COPYRIGHT.
+ * Copyright (c) 2002 Matthew Dillon. All Rights Reserved.
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 4. Neither the name of the University nor the names of its contributors
+ * may be used to endorse or promote products derived from this software
+ * without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS
+ * OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
+ * GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/alpha/alpha/critical.c,v 1.5 2003/08/04 20:32:44 jhb Exp $");
+__FBSDID("$FreeBSD: src/sys/alpha/alpha/critical.c,v 1.6 2003/08/12 23:24:03 imp Exp $");
#include <sys/param.h>
#include <sys/systm.h>
==== //depot/projects/smpng/sys/alpha/alpha/mp_machdep.c#22 (text+ko) ====
@@ -25,7 +25,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/alpha/alpha/mp_machdep.c,v 1.46 2003/07/31 01:31:31 peter Exp $");
+__FBSDID("$FreeBSD: src/sys/alpha/alpha/mp_machdep.c,v 1.47 2003/08/12 19:33:35 jhb Exp $");
#include "opt_kstack_pages.h"
==== //depot/projects/smpng/sys/alpha/alpha/pmap.c#50 (text+ko) ====
@@ -148,7 +148,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/alpha/alpha/pmap.c,v 1.132 2003/07/31 03:39:50 bmilekic Exp $");
+__FBSDID("$FreeBSD: src/sys/alpha/alpha/pmap.c,v 1.133 2003/08/07 18:35:16 gallatin Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -1552,10 +1552,11 @@
pv->pv_pmap = pmap;
pv->pv_ptem = mpte;
+ vm_page_lock_queues();
TAILQ_INSERT_TAIL(&pmap->pm_pvlist, pv, pv_plist);
TAILQ_INSERT_TAIL(&m->md.pv_list, pv, pv_list);
m->md.pv_list_count++;
-
+ vm_page_unlock_queues();
splx(s);
}
==== //depot/projects/smpng/sys/alpha/alpha/swtch.s#7 (text+ko) ====
@@ -25,7 +25,7 @@
* rights to redistribute these changes.
*
* $NetBSD: locore.s,v 1.47 1998/03/22 07:26:32 thorpej Exp $
- * $FreeBSD: src/sys/alpha/alpha/swtch.s,v 1.33 2002/07/12 18:34:21 jhb Exp $
+ * $FreeBSD: src/sys/alpha/alpha/swtch.s,v 1.34 2003/08/12 19:33:35 jhb Exp $
*/
#define _LOCORE
==== //depot/projects/smpng/sys/alpha/alpha/vm_machdep.c#26 (text+ko) ====
@@ -67,7 +67,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/alpha/alpha/vm_machdep.c,v 1.91 2003/07/31 01:31:31 peter Exp $");
+__FBSDID("$FreeBSD: src/sys/alpha/alpha/vm_machdep.c,v 1.92 2003/08/11 01:38:23 marcel Exp $");
#include "opt_kstack_pages.h"
@@ -248,8 +248,6 @@
void
cpu_thread_exit(struct thread *td)
{
-
- return;
}
void
@@ -318,8 +316,31 @@
void
cpu_set_upcall_kse(struct thread *td, struct kse_upcall *ku)
{
+ struct pcb *pcb;
+ struct trapframe *tf;
+ uint64_t stack;
- /* XXX */
+ pcb = td->td_pcb;
+ tf = td->td_frame;
+ stack = ((uint64_t)ku->ku_stack.ss_sp + ku->ku_stack.ss_size) & ~15;
+
+ bzero(tf->tf_regs, FRAME_SIZE * sizeof(tf->tf_regs[0]));
+ bzero(&pcb->pcb_fp, sizeof(pcb->pcb_fp));
+ pcb->pcb_fp_control = 0;
+ pcb->pcb_fp.fpr_cr = FPCR_DYN_NORMAL | FPCR_INVD | FPCR_DZED |
+ FPCR_OVFD | FPCR_INED | FPCR_UNFD;
+ if (td != curthread) {
+ pcb->pcb_hw.apcb_usp = stack;
+ pcb->pcb_hw.apcb_unique = 0;
+ } else {
+ alpha_pal_wrusp(stack);
+ alpha_pal_wrunique(0);
+ }
+ tf->tf_regs[FRAME_PS] = ALPHA_PSL_USERSET;
+ tf->tf_regs[FRAME_PC] = (u_long)ku->ku_func;
+ tf->tf_regs[FRAME_A0] = (u_long)ku->ku_mailbox;
+ tf->tf_regs[FRAME_T12] = tf->tf_regs[FRAME_PC]; /* aka. PV */
+ tf->tf_regs[FRAME_FLAGS] = 0; /* full restore */
}
/*
==== //depot/projects/smpng/sys/alpha/include/critical.h#3 (text+ko) ====
@@ -1,6 +1,28 @@
/*-
- * Copyright (c) 2002 Matthew Dillon. This code is distributed under
- * the BSD copyright, /usr/src/COPYRIGHT.
+ * Copyright (c) 2002 Matthew Dillon. All Rights Reserved.
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 4. Neither the name of the University nor the names of its contributors
+ * may be used to endorse or promote products derived from this software
+ * without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS
+ * OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
+ * GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
* This file contains prototypes and high-level inlines related to
* machine-level critical function support:
@@ -11,7 +33,7 @@
* related support functions residing
* in <arch>/<arch>/critical.c - prototyped
*
- * $FreeBSD: src/sys/alpha/include/critical.h,v 1.2 2003/08/04 20:32:44 jhb Exp $
+ * $FreeBSD: src/sys/alpha/include/critical.h,v 1.3 2003/08/12 23:24:03 imp Exp $
*/
#ifndef _MACHINE_CRITICAL_H_
==== //depot/projects/smpng/sys/amd64/amd64/busdma_machdep.c#6 (text+ko) ====
@@ -25,7 +25,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/amd64/amd64/busdma_machdep.c,v 1.50 2003/07/27 13:52:08 mux Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/busdma_machdep.c,v 1.51 2003/08/04 23:40:35 scottl Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -476,7 +476,8 @@
else
pmap = NULL;
- if (dmat->lowaddr < ptoa((vm_paddr_t)Maxmem)) {
+ if (dmat->lowaddr < ptoa((vm_paddr_t)Maxmem) &&
+ map->pagesneeded == 0) {
vm_offset_t vendaddr;
/*
==== //depot/projects/smpng/sys/amd64/amd64/critical.c#4 (text+ko) ====
@@ -1,10 +1,32 @@
/*-
- * Copyright (c) 2001 Matthew Dillon. This code is distributed under
- * the BSD copyright, /usr/src/COPYRIGHT.
+ * Copyright (c) 2002 Matthew Dillon. All Rights Reserved.
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 4. Neither the name of the University nor the names of its contributors
+ * may be used to endorse or promote products derived from this software
+ * without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS
+ * OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
+ * GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/amd64/amd64/critical.c,v 1.11 2003/08/04 20:32:44 jhb Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/critical.c,v 1.12 2003/08/12 23:24:04 imp Exp $");
#include <sys/param.h>
#include <sys/systm.h>
==== //depot/projects/smpng/sys/amd64/amd64/pmap.c#10 (text+ko) ====
@@ -73,7 +73,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.428 2003/08/02 19:26:08 alc Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.430 2003/08/10 21:53:55 alc Exp $");
/*
* Manages physical address maps.
@@ -208,7 +208,7 @@
static PMAP_INLINE void free_pv_entry(pv_entry_t pv);
static pv_entry_t get_pv_entry(void);
static void amd64_protection_init(void);
-static void pmap_changebit(vm_page_t m, int bit, boolean_t setem)
+static void pmap_clear_ptes(vm_page_t m, int bit)
__always_inline;
static int pmap_remove_pte(pmap_t pmap, pt_entry_t *ptq, vm_offset_t sva);
@@ -1466,10 +1466,12 @@
pv->pv_pmap = pmap;
pv->pv_ptem = mpte;
+ vm_page_lock_queues();
TAILQ_INSERT_TAIL(&pmap->pm_pvlist, pv, pv_plist);
TAILQ_INSERT_TAIL(&m->md.pv_list, pv, pv_list);
m->md.pv_list_count++;
+ vm_page_unlock_queues();
splx(s);
}
@@ -2609,17 +2611,17 @@
}
/*
- * this routine is used to modify bits in ptes
+ * Clear the given bit in each of the given page's ptes.
*/
static __inline void
-pmap_changebit(vm_page_t m, int bit, boolean_t setem)
+pmap_clear_ptes(vm_page_t m, int bit)
{
register pv_entry_t pv;
- register pt_entry_t *pte;
+ pt_entry_t pbits, *pte;
int s;
if (!pmap_initialized || (m->flags & PG_FICTITIOUS) ||
- (!setem && bit == PG_RW && (m->flags & PG_WRITEABLE) == 0))
+ (bit == PG_RW && (m->flags & PG_WRITEABLE) == 0))
return;
s = splvm();
@@ -2632,7 +2634,7 @@
/*
* don't write protect pager mappings
*/
- if (!setem && (bit == PG_RW)) {
+ if (bit == PG_RW) {
if (!pmap_track_modified(pv->pv_va))
continue;
}
@@ -2645,26 +2647,20 @@
#endif
pte = pmap_pte(pv->pv_pmap, pv->pv_va);
-
- if (setem) {
- *pte |= bit;
- pmap_invalidate_page(pv->pv_pmap, pv->pv_va);
- } else {
- pt_entry_t pbits = *pte;
- if (pbits & bit) {
- if (bit == PG_RW) {
- if (pbits & PG_M) {
- vm_page_dirty(m);
- }
- pte_store(pte, pbits & ~(PG_M|PG_RW));
- } else {
- pte_store(pte, pbits & ~bit);
+ pbits = *pte;
+ if (pbits & bit) {
+ if (bit == PG_RW) {
+ if (pbits & PG_M) {
+ vm_page_dirty(m);
}
- pmap_invalidate_page(pv->pv_pmap, pv->pv_va);
+ pte_store(pte, pbits & ~(PG_M|PG_RW));
+ } else {
+ pte_store(pte, pbits & ~bit);
}
+ pmap_invalidate_page(pv->pv_pmap, pv->pv_va);
}
}
- if (!setem && bit == PG_RW)
+ if (bit == PG_RW)
vm_page_flag_clear(m, PG_WRITEABLE);
splx(s);
}
@@ -2679,7 +2675,7 @@
{
if ((prot & VM_PROT_WRITE) == 0) {
if (prot & (VM_PROT_READ | VM_PROT_EXECUTE)) {
- pmap_changebit(m, PG_RW, FALSE);
+ pmap_clear_ptes(m, PG_RW);
} else {
pmap_remove_all(m);
}
@@ -2750,7 +2746,7 @@
void
pmap_clear_modify(vm_page_t m)
{
- pmap_changebit(m, PG_M, FALSE);
+ pmap_clear_ptes(m, PG_M);
}
/*
@@ -2761,7 +2757,7 @@
void
pmap_clear_reference(vm_page_t m)
{
- pmap_changebit(m, PG_A, FALSE);
+ pmap_clear_ptes(m, PG_A);
}
/*
==== //depot/projects/smpng/sys/amd64/include/critical.h#3 (text+ko) ====
@@ -1,6 +1,28 @@
/*-
- * Copyright (c) 2002 Matthew Dillon. This code is distributed under
- * the BSD copyright, /usr/src/COPYRIGHT.
+ * Copyright (c) 2002 Matthew Dillon. All Rights Reserved.
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 4. Neither the name of the University nor the names of its contributors
+ * may be used to endorse or promote products derived from this software
+ * without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS
+ * OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
+ * GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
* This file contains prototypes and high-level inlines related to
* machine-level critical function support:
@@ -11,7 +33,7 @@
* related support functions residing
* in <arch>/<arch>/critical.c - prototyped
*
- * $FreeBSD: src/sys/amd64/include/critical.h,v 1.4 2003/08/04 20:32:45 jhb Exp $
+ * $FreeBSD: src/sys/amd64/include/critical.h,v 1.5 2003/08/12 23:24:04 imp Exp $
*/
#ifndef _MACHINE_CRITICAL_H_
==== //depot/projects/smpng/sys/boot/i386/libi386/biosacpi.c#5 (text+ko) ====
@@ -23,7 +23,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD: src/sys/boot/i386/libi386/biosacpi.c,v 1.5 2003/07/13 22:54:53 njl Exp $
+ * $FreeBSD: src/sys/boot/i386/libi386/biosacpi.c,v 1.6 2003/08/07 14:53:14 njl Exp $
*/
#include <stand.h>
@@ -66,6 +66,7 @@
sprintf(buf, "%d", revision);
setenv("hint.acpi.0.revision", buf, 1);
sprintf(buf, "%6s", rsdp->OemId);
+ buf[6] = '\0';
setenv("hint.acpi.0.oem", buf, 1);
sprintf(buf, "0x%08x", rsdp->RsdtPhysicalAddress);
setenv("hint.acpi.0.rsdt", buf, 1);
==== //depot/projects/smpng/sys/boot/i386/libi386/biospnp.c#4 (text+ko) ====
@@ -23,7 +23,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD: src/sys/boot/i386/libi386/biospnp.c,v 1.7 2002/09/23 18:54:26 alfred Exp $
+ * $FreeBSD: src/sys/boot/i386/libi386/biospnp.c,v 1.8 2003/08/07 15:04:24 jhb Exp $
*/
/*
@@ -263,7 +263,7 @@
switch(*p) {
case 'w':
- i = va_arg(ap, uint);
+ i = va_arg(ap, u_int);
*(u_int16_t *)argp = i;
argp += sizeof(u_int16_t);
break;
==== //depot/projects/smpng/sys/boot/powerpc/loader/start.c#3 (text+ko) ====
@@ -1,4 +1,4 @@
-/* $FreeBSD: src/sys/boot/powerpc/loader/start.c,v 1.2 2001/10/07 13:22:25 benno Exp $ */
+/* $FreeBSD: src/sys/boot/powerpc/loader/start.c,v 1.3 2003/08/05 11:30:18 grehan Exp $ */
/* $NetBSD: Locore.c,v 1.7 2000/08/20 07:04:59 tsubai Exp $ */
/*
@@ -38,63 +38,63 @@
void startup(void *, int, int (*)(void *), char *, int);
#ifdef XCOFF_GLUE
-asm("
- .text
- .globl _entry
-_entry:
- .long _start,0,0
+asm(" \n\
+ .text \n\
+ .globl _entry \n\
+_entry: \n\
+ .long _start,0,0 \n\
");
#endif
-__asm("
- .data
-stack:
- .space 16388
-
- .text
- .globl _start
-_start:
- li 8,0
- li 9,0x100
- mtctr 9
-1:
- dcbf 0,8
- icbi 0,8
- addi 8,8,0x20
- bdnz 1b
- sync
- isync
-
- lis 1,stack at ha
- addi 1,1,stack at l
- addi 1,1,8192
-
- mfmsr 8
- li 0,0
- mtmsr 0
- isync
-
- mtibatu 0,0
- mtibatu 1,0
- mtibatu 2,0
- mtibatu 3,0
- mtdbatu 0,0
- mtdbatu 1,0
- mtdbatu 2,0
- mtdbatu 3,0
-
- li 9,0x12 /* BATL(0, BAT_M, BAT_PP_RW) */
- mtibatl 0,9
- mtdbatl 0,9
- li 9,0x1ffe /* BATU(0, BAT_BL_256M, BAT_Vs) */
- mtibatu 0,9
- mtdbatu 0,9
- isync
-
- mtmsr 8
- isync
-
- b startup
+__asm(" \n\
+ .data \n\
+stack: \n\
+ .space 16388 \n\
+ \n\
+ .text \n\
+ .globl _start \n\
+_start: \n\
+ li %r8,0 \n\
+ li %r9,0x100 \n\
+ mtctr %r9 \n\
+1: \n\
+ dcbf %r0,%r8 \n\
+ icbi %r0,%r8 \n\
+ addi %r8,%r8,0x20 \n\
+ bdnz 1b \n\
+ sync \n\
+ isync \n\
+ \n\
+ lis %r1,stack at ha \n\
+ addi %r1,%r1,stack at l \n\
+ addi %r1,%r1,8192 \n\
+ \n\
+ mfmsr %r8 \n\
+ li %r0,0 \n\
+ mtmsr %r0 \n\
+ isync \n\
+ \n\
+ mtibatu 0,%r0 \n\
+ mtibatu 1,%r0 \n\
+ mtibatu 2,%r0 \n\
+ mtibatu 3,%r0 \n\
+ mtdbatu 0,%r0 \n\
+ mtdbatu 1,%r0 \n\
+ mtdbatu 2,%r0 \n\
+ mtdbatu 3,%r0 \n\
+ \n\
+ li %r9,0x12 /* BATL(0, BAT_M, BAT_PP_RW) */ \n\
+ mtibatl 0,%r9 \n\
+ mtdbatl 0,%r9 \n\
+ li %r9,0x1ffe /* BATU(0, BAT_BL_256M, BAT_Vs) */ \n\
+ mtibatu 0,%r9 \n\
+ mtdbatu 0,%r9 \n\
+ isync \n\
+ \n\
+ mtmsr %r8 \n\
+ isync \n\
+ \n\
+ b startup \n\
");
void
==== //depot/projects/smpng/sys/cam/scsi/scsi_da.c#43 (text+ko) ====
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_da.c,v 1.149 2003/07/29 18:08:16 njl Exp $");
+__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_da.c,v 1.151 2003/08/06 17:30:03 njl Exp $");
#ifdef _KERNEL
#include "opt_da.h"
@@ -146,22 +146,7 @@
static struct da_quirk_entry da_quirk_table[] =
{
-#ifdef DA_OLD_QUIRKS
- /*
- * Logitec USB/Firewire LHD-P30FU
- */
{
- /* USB part */
- {T_DIRECT, SIP_MEDIA_FIXED, "HITACHI_", "DK23DA*", "*"},
- /*quirks*/ DA_Q_NO_6_BYTE
- },
- {
- /* Firewire part */
- {T_DIRECT, SIP_MEDIA_FIXED, "LSILogic", "SYM13FW*", "*"},
- /*quirks*/ DA_Q_NO_6_BYTE
- },
-#endif /* DA_OLD_QUIRKS */
- {
/*
* Fujitsu M2513A MO drives.
* Tested devices: M2513A2 firmware versions 1200 & 1300.
@@ -296,24 +281,6 @@
},
{
/*
- * Maxtor 3000LE USB Drive
- */
- {T_DIRECT, SIP_MEDIA_FIXED, "MAXTOR*", "K040H2*", "*"},
- /*quirks*/ DA_Q_NO_6_BYTE
- },
- {
- /*
- * LaCie USB drive, among others
- */
- {T_DIRECT, SIP_MEDIA_FIXED, "Maxtor*", "D080H4*", "*"},
- /*quirks*/ DA_Q_NO_6_BYTE
- },
- {
- {T_OPTICAL, SIP_MEDIA_REMOVABLE, "FUJITSU", "MCF3064AP", "*"},
- /*quirks*/ DA_Q_NO_6_BYTE
- },
- {
- /*
* Microtech USB CameraMate
*/
{T_DIRECT, SIP_MEDIA_REMOVABLE, "eUSB Compact*",
@@ -338,13 +305,6 @@
},
{
/*
- * Olympus digital cameras (D-370)
- */
- {T_DIRECT, SIP_MEDIA_REMOVABLE, "OLYMPUS", "D-*", "*"},
- /*quirks*/ DA_Q_NO_6_BYTE
- },
- {
- /*
* Olympus digital cameras (E-100RS, E-10).
*/
{T_DIRECT, SIP_MEDIA_REMOVABLE, "OLYMPUS", "E-*", "*"},
@@ -367,34 +327,6 @@
},
{
/*
- * Nikon Coolpix E775/E995 Cameras
- */
- {T_DIRECT, SIP_MEDIA_REMOVABLE, "NIKON", "NIKON DSC E*", "*"},
- /*quirks*/ DA_Q_NO_6_BYTE
>>> TRUNCATED FOR MAIL (1000 lines) <<<
More information about the p4-projects
mailing list