PERFORCE change 35280 for review
John Baldwin
jhb at FreeBSD.org
Thu Jul 31 12:37:59 PDT 2003
http://perforce.freebsd.org/chv.cgi?CH=35280
Change 35280 by jhb at jhb_laptop on 2003/07/31 12:37:29
IFC @35277.
Affected files ...
.. //depot/projects/smpng/sys/alpha/alpha/busdma_machdep.c#20 integrate
.. //depot/projects/smpng/sys/alpha/alpha/machdep.c#60 integrate
.. //depot/projects/smpng/sys/alpha/alpha/mp_machdep.c#20 integrate
.. //depot/projects/smpng/sys/alpha/alpha/pmap.c#49 integrate
.. //depot/projects/smpng/sys/alpha/alpha/support.s#8 integrate
.. //depot/projects/smpng/sys/alpha/alpha/vm_machdep.c#25 integrate
.. //depot/projects/smpng/sys/alpha/conf/GENERIC#31 integrate
.. //depot/projects/smpng/sys/alpha/conf/NOTES#6 integrate
.. //depot/projects/smpng/sys/alpha/include/alpha_cpu.h#6 integrate
.. //depot/projects/smpng/sys/alpha/include/bus.h#12 integrate
.. //depot/projects/smpng/sys/alpha/include/param.h#7 integrate
.. //depot/projects/smpng/sys/alpha/include/ucontext.h#5 integrate
.. //depot/projects/smpng/sys/amd64/acpica/OsdEnvironment.c#3 integrate
.. //depot/projects/smpng/sys/amd64/acpica/acpi_machdep.c#2 integrate
.. //depot/projects/smpng/sys/amd64/acpica/acpi_wakeup.c#2 integrate
.. //depot/projects/smpng/sys/amd64/amd64/amd64-gdbstub.c#2 integrate
.. //depot/projects/smpng/sys/amd64/amd64/amd64_mem.c#1 branch
.. //depot/projects/smpng/sys/amd64/amd64/atomic.c#2 integrate
.. //depot/projects/smpng/sys/amd64/amd64/autoconf.c#2 integrate
.. //depot/projects/smpng/sys/amd64/amd64/busdma_machdep.c#5 integrate
.. //depot/projects/smpng/sys/amd64/amd64/critical.c#2 integrate
.. //depot/projects/smpng/sys/amd64/amd64/db_disasm.c#2 integrate
.. //depot/projects/smpng/sys/amd64/amd64/db_interface.c#2 integrate
.. //depot/projects/smpng/sys/amd64/amd64/db_trace.c#2 integrate
.. //depot/projects/smpng/sys/amd64/amd64/dump_machdep.c#2 integrate
.. //depot/projects/smpng/sys/amd64/amd64/elf_machdep.c#3 integrate
.. //depot/projects/smpng/sys/amd64/amd64/genassym.c#6 integrate
.. //depot/projects/smpng/sys/amd64/amd64/identcpu.c#4 integrate
.. //depot/projects/smpng/sys/amd64/amd64/in_cksum.c#2 integrate
.. //depot/projects/smpng/sys/amd64/amd64/initcpu.c#2 integrate
.. //depot/projects/smpng/sys/amd64/amd64/legacy.c#2 integrate
.. //depot/projects/smpng/sys/amd64/amd64/machdep.c#11 integrate
.. //depot/projects/smpng/sys/amd64/amd64/mem.c#4 integrate
.. //depot/projects/smpng/sys/amd64/amd64/nexus.c#5 integrate
.. //depot/projects/smpng/sys/amd64/amd64/pmap.c#8 integrate
.. //depot/projects/smpng/sys/amd64/amd64/sys_machdep.c#3 integrate
.. //depot/projects/smpng/sys/amd64/amd64/trap.c#8 integrate
.. //depot/projects/smpng/sys/amd64/amd64/tsc.c#2 integrate
.. //depot/projects/smpng/sys/amd64/amd64/vm_machdep.c#6 integrate
.. //depot/projects/smpng/sys/amd64/ia32/ia32_genassym.c#2 integrate
.. //depot/projects/smpng/sys/amd64/ia32/ia32_misc.c#2 integrate
.. //depot/projects/smpng/sys/amd64/ia32/ia32_signal.c#3 integrate
.. //depot/projects/smpng/sys/amd64/ia32/ia32_syscall.c#3 integrate
.. //depot/projects/smpng/sys/amd64/ia32/ia32_sysvec.c#4 integrate
.. //depot/projects/smpng/sys/amd64/include/bus_dma.h#6 integrate
.. //depot/projects/smpng/sys/amd64/include/ieeefp.h#2 integrate
.. //depot/projects/smpng/sys/amd64/include/npx.h#3 integrate
.. //depot/projects/smpng/sys/amd64/include/param.h#5 integrate
.. //depot/projects/smpng/sys/amd64/isa/clock.c#2 integrate
.. //depot/projects/smpng/sys/amd64/isa/intr_machdep.c#2 integrate
.. //depot/projects/smpng/sys/amd64/isa/isa.c#2 integrate
.. //depot/projects/smpng/sys/amd64/isa/isa_dma.c#2 integrate
.. //depot/projects/smpng/sys/amd64/isa/ithread.c#2 integrate
.. //depot/projects/smpng/sys/amd64/isa/npx.c#2 integrate
.. //depot/projects/smpng/sys/amd64/pci/pci_bus.c#2 integrate
.. //depot/projects/smpng/sys/amd64/pci/pci_cfgreg.c#2 integrate
.. //depot/projects/smpng/sys/cam/cam_ccb.h#4 integrate
.. //depot/projects/smpng/sys/cam/scsi/scsi_cd.c#18 integrate
.. //depot/projects/smpng/sys/cam/scsi/scsi_da.c#42 integrate
.. //depot/projects/smpng/sys/coda/coda_fbsd.c#6 integrate
.. //depot/projects/smpng/sys/coda/coda_vnops.c#12 integrate
.. //depot/projects/smpng/sys/compat/linprocfs/linprocfs.c#29 integrate
.. //depot/projects/smpng/sys/compat/linux/linux_misc.c#40 integrate
.. //depot/projects/smpng/sys/conf/NOTES#50 integrate
.. //depot/projects/smpng/sys/conf/files#83 integrate
.. //depot/projects/smpng/sys/conf/files.alpha#23 integrate
.. //depot/projects/smpng/sys/conf/files.i386#43 integrate
.. //depot/projects/smpng/sys/conf/files.pc98#44 integrate
.. //depot/projects/smpng/sys/conf/kern.post.mk#23 integrate
.. //depot/projects/smpng/sys/conf/kern.pre.mk#22 integrate
.. //depot/projects/smpng/sys/conf/kmod.mk#20 integrate
.. //depot/projects/smpng/sys/conf/newvers.sh#7 integrate
.. //depot/projects/smpng/sys/conf/options#57 integrate
.. //depot/projects/smpng/sys/conf/options.i386#30 integrate
.. //depot/projects/smpng/sys/conf/options.pc98#31 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/dbcmds.c#15 integrate
.. //depot/projects/smpng/sys/ddb/db_command.c#15 integrate
.. //depot/projects/smpng/sys/ddb/db_output.c#8 integrate
.. //depot/projects/smpng/sys/ddb/db_ps.c#22 integrate
.. //depot/projects/smpng/sys/ddb/ddb.h#9 integrate
.. //depot/projects/smpng/sys/dev/acpica/acpi.c#45 integrate
.. //depot/projects/smpng/sys/dev/acpica/acpi_button.c#8 integrate
.. //depot/projects/smpng/sys/dev/acpica/acpi_ec.c#19 integrate
.. //depot/projects/smpng/sys/dev/acpica/acpi_isab.c#3 integrate
.. //depot/projects/smpng/sys/dev/acpica/acpivar.h#27 integrate
.. //depot/projects/smpng/sys/dev/ahb/ahb.c#9 integrate
.. //depot/projects/smpng/sys/dev/amd/amd.c#7 integrate
.. //depot/projects/smpng/sys/dev/ata/atapi-cam.c#10 integrate
.. //depot/projects/smpng/sys/dev/ath/if_ath.c#4 integrate
.. //depot/projects/smpng/sys/dev/ath/if_athvar.h#3 integrate
.. //depot/projects/smpng/sys/dev/bge/if_bge.c#30 integrate
.. //depot/projects/smpng/sys/dev/bge/if_bgereg.h#17 integrate
.. //depot/projects/smpng/sys/dev/buslogic/bt.c#11 integrate
.. //depot/projects/smpng/sys/dev/ed/if_ed_pccard.c#16 integrate
.. //depot/projects/smpng/sys/dev/em/if_em.h#16 integrate
.. //depot/projects/smpng/sys/dev/ep/if_ep.c#8 integrate
.. //depot/projects/smpng/sys/dev/ep/if_ep_eisa.c#4 integrate
.. //depot/projects/smpng/sys/dev/ep/if_ep_isa.c#4 integrate
.. //depot/projects/smpng/sys/dev/ep/if_ep_mca.c#3 integrate
.. //depot/projects/smpng/sys/dev/ep/if_ep_pccard.c#8 integrate
.. //depot/projects/smpng/sys/dev/ep/if_epreg.h#2 integrate
.. //depot/projects/smpng/sys/dev/ep/if_epvar.h#3 integrate
.. //depot/projects/smpng/sys/dev/fatm/if_fatm.c#4 integrate
.. //depot/projects/smpng/sys/dev/fatm/if_fatmvar.h#2 integrate
.. //depot/projects/smpng/sys/dev/firewire/firewire.c#22 integrate
.. //depot/projects/smpng/sys/dev/firewire/fwdma.c#4 integrate
.. //depot/projects/smpng/sys/dev/firewire/fwohci.c#20 integrate
.. //depot/projects/smpng/sys/dev/firewire/fwohci_pci.c#16 integrate
.. //depot/projects/smpng/sys/dev/firewire/fwohcireg.h#8 integrate
.. //depot/projects/smpng/sys/dev/firewire/if_fwe.c#12 integrate
.. //depot/projects/smpng/sys/dev/firewire/sbp.c#22 integrate
.. //depot/projects/smpng/sys/dev/fxp/if_fxp.c#42 integrate
.. //depot/projects/smpng/sys/dev/harp/if_harp.c#1 branch
.. //depot/projects/smpng/sys/dev/hatm/if_hatm.c#4 integrate
.. //depot/projects/smpng/sys/dev/hatm/if_hatm_ioctl.c#3 integrate
.. //depot/projects/smpng/sys/dev/hatm/if_hatm_tx.c#3 integrate
.. //depot/projects/smpng/sys/dev/hatm/if_hatmvar.h#2 integrate
.. //depot/projects/smpng/sys/dev/hea/eni_if.c#3 integrate
.. //depot/projects/smpng/sys/dev/hfa/fore_aali.h#2 integrate
.. //depot/projects/smpng/sys/dev/hfa/fore_command.c#5 integrate
.. //depot/projects/smpng/sys/dev/hfa/fore_if.c#3 integrate
.. //depot/projects/smpng/sys/dev/hfa/fore_init.c#4 integrate
.. //depot/projects/smpng/sys/dev/hfa/fore_intr.c#2 integrate
.. //depot/projects/smpng/sys/dev/hfa/fore_output.c#6 integrate
.. //depot/projects/smpng/sys/dev/hfa/fore_var.h#4 integrate
.. //depot/projects/smpng/sys/dev/hfa/fore_vcm.c#2 integrate
.. //depot/projects/smpng/sys/dev/hfa/hfa_freebsd.c#5 integrate
.. //depot/projects/smpng/sys/dev/hfa/hfa_freebsd.h#2 integrate
.. //depot/projects/smpng/sys/dev/ie/if_ie.c#6 integrate
.. //depot/projects/smpng/sys/dev/lnc/if_lnc.c#7 integrate
.. //depot/projects/smpng/sys/dev/md/md.c#39 integrate
.. //depot/projects/smpng/sys/dev/patm/if_patm.c#2 integrate
.. //depot/projects/smpng/sys/dev/patm/if_patm_ioctl.c#2 integrate
.. //depot/projects/smpng/sys/dev/patm/if_patm_rx.c#2 integrate
.. //depot/projects/smpng/sys/dev/patm/if_patm_tx.c#2 integrate
.. //depot/projects/smpng/sys/dev/pccard/pccarddevs#28 integrate
.. //depot/projects/smpng/sys/dev/pccard/pccarddevs.h#28 integrate
.. //depot/projects/smpng/sys/dev/pci/pci.c#30 integrate
.. //depot/projects/smpng/sys/dev/pdq/if_fea.c#6 integrate
.. //depot/projects/smpng/sys/dev/raidframe/rf_freebsdkintf.c#9 integrate
.. //depot/projects/smpng/sys/dev/rp/rp.c#12 integrate
.. //depot/projects/smpng/sys/dev/safe/safe.c#1 branch
.. //depot/projects/smpng/sys/dev/safe/safereg.h#1 branch
.. //depot/projects/smpng/sys/dev/safe/safevar.h#1 branch
.. //depot/projects/smpng/sys/dev/syscons/dragon/dragon_saver.c#2 integrate
.. //depot/projects/smpng/sys/dev/syscons/fire/fire_saver.c#3 integrate
.. //depot/projects/smpng/sys/dev/syscons/logo/logo_saver.c#4 integrate
.. //depot/projects/smpng/sys/dev/syscons/warp/warp_saver.c#4 integrate
.. //depot/projects/smpng/sys/dev/usb/umass.c#27 integrate
.. //depot/projects/smpng/sys/dev/usb/usb_mem.c#2 integrate
.. //depot/projects/smpng/sys/dev/utopia/utopia.c#3 integrate
.. //depot/projects/smpng/sys/dev/wi/if_wi.c#54 integrate
.. //depot/projects/smpng/sys/dev/wi/if_wi_pccard.c#21 integrate
.. //depot/projects/smpng/sys/dev/wi/if_wi_pci.c#14 integrate
.. //depot/projects/smpng/sys/dev/wi/if_wivar.h#15 integrate
.. //depot/projects/smpng/sys/fs/hpfs/hpfs_vfsops.c#19 integrate
.. //depot/projects/smpng/sys/fs/msdosfs/msdosfs_vfsops.c#20 integrate
.. //depot/projects/smpng/sys/fs/ntfs/ntfs_subr.c#14 integrate
.. //depot/projects/smpng/sys/fs/ntfs/ntfs_vfsops.c#18 integrate
.. //depot/projects/smpng/sys/fs/nwfs/nwfs_io.c#9 integrate
.. //depot/projects/smpng/sys/fs/smbfs/smbfs_io.c#13 integrate
.. //depot/projects/smpng/sys/fs/smbfs/smbfs_vfsops.c#19 integrate
.. //depot/projects/smpng/sys/fs/smbfs/smbfs_vnops.c#20 integrate
.. //depot/projects/smpng/sys/fs/udf/udf_vfsops.c#10 integrate
.. //depot/projects/smpng/sys/fs/unionfs/union_subr.c#15 integrate
.. //depot/projects/smpng/sys/fs/unionfs/union_vnops.c#11 integrate
.. //depot/projects/smpng/sys/geom/geom_ccd.c#5 integrate
.. //depot/projects/smpng/sys/geom/geom_mbr.c#23 integrate
.. //depot/projects/smpng/sys/gnu/ext2fs/ext2_vfsops.c#23 integrate
.. //depot/projects/smpng/sys/gnu/i386/fpemul/Changelog#2 delete
.. //depot/projects/smpng/sys/gnu/i386/fpemul/README#2 delete
.. //depot/projects/smpng/sys/gnu/i386/fpemul/control_w.h#2 delete
.. //depot/projects/smpng/sys/gnu/i386/fpemul/div_small.s#2 delete
.. //depot/projects/smpng/sys/gnu/i386/fpemul/errors.c#2 delete
.. //depot/projects/smpng/sys/gnu/i386/fpemul/exception.h#2 delete
.. //depot/projects/smpng/sys/gnu/i386/fpemul/fpu_arith.c#2 delete
.. //depot/projects/smpng/sys/gnu/i386/fpemul/fpu_asm.h#2 delete
.. //depot/projects/smpng/sys/gnu/i386/fpemul/fpu_aux.c#4 delete
.. //depot/projects/smpng/sys/gnu/i386/fpemul/fpu_emu.h#2 delete
.. //depot/projects/smpng/sys/gnu/i386/fpemul/fpu_entry.c#5 delete
.. //depot/projects/smpng/sys/gnu/i386/fpemul/fpu_etc.c#2 delete
.. //depot/projects/smpng/sys/gnu/i386/fpemul/fpu_proto.h#2 delete
.. //depot/projects/smpng/sys/gnu/i386/fpemul/fpu_system.h#3 delete
.. //depot/projects/smpng/sys/gnu/i386/fpemul/fpu_trig.c#3 delete
.. //depot/projects/smpng/sys/gnu/i386/fpemul/get_address.c#2 delete
.. //depot/projects/smpng/sys/gnu/i386/fpemul/load_store.c#3 delete
.. //depot/projects/smpng/sys/gnu/i386/fpemul/math_emu.h#2 delete
.. //depot/projects/smpng/sys/gnu/i386/fpemul/poly_2xm1.c#2 delete
.. //depot/projects/smpng/sys/gnu/i386/fpemul/poly_atan.c#2 delete
.. //depot/projects/smpng/sys/gnu/i386/fpemul/poly_div.s#2 delete
.. //depot/projects/smpng/sys/gnu/i386/fpemul/poly_l2.c#2 delete
.. //depot/projects/smpng/sys/gnu/i386/fpemul/poly_mul64.s#2 delete
.. //depot/projects/smpng/sys/gnu/i386/fpemul/poly_sin.c#2 delete
.. //depot/projects/smpng/sys/gnu/i386/fpemul/poly_tan.c#2 delete
.. //depot/projects/smpng/sys/gnu/i386/fpemul/polynomial.s#3 delete
.. //depot/projects/smpng/sys/gnu/i386/fpemul/reg_add_sub.c#2 delete
.. //depot/projects/smpng/sys/gnu/i386/fpemul/reg_compare.c#2 delete
.. //depot/projects/smpng/sys/gnu/i386/fpemul/reg_constant.c#2 delete
.. //depot/projects/smpng/sys/gnu/i386/fpemul/reg_constant.h#2 delete
.. //depot/projects/smpng/sys/gnu/i386/fpemul/reg_div.s#3 delete
.. //depot/projects/smpng/sys/gnu/i386/fpemul/reg_ld_str.c#3 delete
.. //depot/projects/smpng/sys/gnu/i386/fpemul/reg_mul.c#2 delete
.. //depot/projects/smpng/sys/gnu/i386/fpemul/reg_norm.s#2 delete
.. //depot/projects/smpng/sys/gnu/i386/fpemul/reg_round.s#3 delete
.. //depot/projects/smpng/sys/gnu/i386/fpemul/reg_u_add.s#3 delete
.. //depot/projects/smpng/sys/gnu/i386/fpemul/reg_u_div.s#3 delete
.. //depot/projects/smpng/sys/gnu/i386/fpemul/reg_u_mul.s#3 delete
.. //depot/projects/smpng/sys/gnu/i386/fpemul/reg_u_sub.s#3 delete
.. //depot/projects/smpng/sys/gnu/i386/fpemul/status_w.h#2 delete
.. //depot/projects/smpng/sys/gnu/i386/fpemul/version.h#2 delete
.. //depot/projects/smpng/sys/gnu/i386/fpemul/wm_shrx.s#2 delete
.. //depot/projects/smpng/sys/gnu/i386/fpemul/wm_sqrt.s#3 delete
.. //depot/projects/smpng/sys/i386/acpica/acpi_wakeup.c#18 integrate
.. //depot/projects/smpng/sys/i386/conf/NOTES#61 integrate
.. //depot/projects/smpng/sys/i386/i386/busdma_machdep.c#23 integrate
.. //depot/projects/smpng/sys/i386/i386/identcpu.c#22 integrate
.. //depot/projects/smpng/sys/i386/i386/locore.s#18 integrate
.. //depot/projects/smpng/sys/i386/i386/machdep.c#63 integrate
.. //depot/projects/smpng/sys/i386/i386/math_emu.h#3 delete
.. //depot/projects/smpng/sys/i386/i386/math_emulate.c#9 delete
.. //depot/projects/smpng/sys/i386/i386/mp_machdep.c#49 integrate
.. //depot/projects/smpng/sys/i386/i386/mpapic.c#14 integrate
.. //depot/projects/smpng/sys/i386/i386/pmap.c#43 integrate
.. //depot/projects/smpng/sys/i386/i386/sys_machdep.c#31 integrate
.. //depot/projects/smpng/sys/i386/i386/trap.c#60 integrate
.. //depot/projects/smpng/sys/i386/ibcs2/imgact_coff.c#15 integrate
.. //depot/projects/smpng/sys/i386/include/apic.h#9 integrate
.. //depot/projects/smpng/sys/i386/include/asm.h#5 integrate
.. //depot/projects/smpng/sys/i386/include/bus_dma.h#8 integrate
.. //depot/projects/smpng/sys/i386/include/cpufunc.h#23 integrate
.. //depot/projects/smpng/sys/i386/include/frame.h#3 integrate
.. //depot/projects/smpng/sys/i386/include/pcpu.h#7 integrate
.. //depot/projects/smpng/sys/i386/isa/npx.c#35 integrate
.. //depot/projects/smpng/sys/i386/isa/pcvt/pcvt_hdr.h#4 integrate
.. //depot/projects/smpng/sys/i386/isa/vesa.c#9 integrate
.. //depot/projects/smpng/sys/i4b/capi/iavc/iavc.h#2 integrate
.. //depot/projects/smpng/sys/i4b/capi/iavc/iavc_lli.c#7 integrate
.. //depot/projects/smpng/sys/ia64/conf/SKI#14 integrate
.. //depot/projects/smpng/sys/ia64/ia64/busdma_machdep.c#19 integrate
.. //depot/projects/smpng/sys/ia64/ia64/machdep.c#61 integrate
.. //depot/projects/smpng/sys/ia64/ia64/mem.c#13 integrate
.. //depot/projects/smpng/sys/ia64/ia64/mp_machdep.c#22 integrate
.. //depot/projects/smpng/sys/ia64/ia64/pmap.c#50 integrate
.. //depot/projects/smpng/sys/ia64/ia64/trap.c#53 integrate
.. //depot/projects/smpng/sys/ia64/ia64/vm_machdep.c#29 integrate
.. //depot/projects/smpng/sys/ia64/include/_regset.h#3 integrate
.. //depot/projects/smpng/sys/ia64/include/acpica_machdep.h#2 integrate
.. //depot/projects/smpng/sys/ia64/include/bus.h#12 integrate
.. //depot/projects/smpng/sys/ia64/include/cpu.h#15 integrate
.. //depot/projects/smpng/sys/ia64/include/param.h#11 integrate
.. //depot/projects/smpng/sys/ia64/include/setjmp.h#7 integrate
.. //depot/projects/smpng/sys/isofs/cd9660/cd9660_vfsops.c#21 integrate
.. //depot/projects/smpng/sys/kern/init_main.c#37 integrate
.. //depot/projects/smpng/sys/kern/init_sysent.c#31 integrate
.. //depot/projects/smpng/sys/kern/kern_acct.c#30 integrate
.. //depot/projects/smpng/sys/kern/kern_alq.c#5 integrate
.. //depot/projects/smpng/sys/kern/kern_descrip.c#50 integrate
.. //depot/projects/smpng/sys/kern/kern_exec.c#61 integrate
.. //depot/projects/smpng/sys/kern/kern_ktr.c#22 integrate
.. //depot/projects/smpng/sys/kern/kern_ktrace.c#33 integrate
.. //depot/projects/smpng/sys/kern/kern_linker.c#31 integrate
.. //depot/projects/smpng/sys/kern/kern_malloc.c#24 integrate
.. //depot/projects/smpng/sys/kern/kern_mutex.c#72 integrate
.. //depot/projects/smpng/sys/kern/kern_proc.c#55 integrate
.. //depot/projects/smpng/sys/kern/kern_sig.c#74 integrate
.. //depot/projects/smpng/sys/kern/kern_thread.c#41 integrate
.. //depot/projects/smpng/sys/kern/kern_umtx.c#7 integrate
.. //depot/projects/smpng/sys/kern/link_elf.c#22 integrate
.. //depot/projects/smpng/sys/kern/md5c.c#5 integrate
.. //depot/projects/smpng/sys/kern/subr_autoconf.c#4 integrate
.. //depot/projects/smpng/sys/kern/subr_mbuf.c#36 integrate
.. //depot/projects/smpng/sys/kern/subr_prf.c#31 integrate
.. //depot/projects/smpng/sys/kern/subr_trap.c#56 integrate
.. //depot/projects/smpng/sys/kern/subr_witness.c#102 integrate
.. //depot/projects/smpng/sys/kern/sys_pipe.c#31 integrate
.. //depot/projects/smpng/sys/kern/syscalls.c#31 integrate
.. //depot/projects/smpng/sys/kern/syscalls.master#30 integrate
.. //depot/projects/smpng/sys/kern/tty_cons.c#21 integrate
.. //depot/projects/smpng/sys/kern/tty_subr.c#6 integrate
.. //depot/projects/smpng/sys/kern/uipc_mbuf.c#20 integrate
.. //depot/projects/smpng/sys/kern/uipc_socket.c#39 integrate
.. //depot/projects/smpng/sys/kern/uipc_socket2.c#25 integrate
.. //depot/projects/smpng/sys/kern/vfs_cluster.c#27 integrate
.. //depot/projects/smpng/sys/kern/vfs_export.c#11 integrate
.. //depot/projects/smpng/sys/kern/vfs_subr.c#57 integrate
.. //depot/projects/smpng/sys/kern/vfs_syscalls.c#60 integrate
.. //depot/projects/smpng/sys/kern/vfs_vnops.c#40 integrate
.. //depot/projects/smpng/sys/kern/vnode_if.src#15 integrate
.. //depot/projects/smpng/sys/libkern/scanc.c#3 integrate
.. //depot/projects/smpng/sys/modules/Makefile#58 integrate
.. //depot/projects/smpng/sys/modules/cam/Makefile#6 integrate
.. //depot/projects/smpng/sys/modules/fpu/Makefile#3 delete
.. //depot/projects/smpng/sys/modules/gnufpu/Makefile#3 delete
.. //depot/projects/smpng/sys/modules/harp/Makefile#1 branch
.. //depot/projects/smpng/sys/modules/safe/Makefile#1 branch
.. //depot/projects/smpng/sys/net/if.c#35 integrate
.. //depot/projects/smpng/sys/net/if_atm.h#8 integrate
.. //depot/projects/smpng/sys/net/if_atmsubr.c#13 integrate
.. //depot/projects/smpng/sys/net/if_media.h#10 integrate
.. //depot/projects/smpng/sys/net/if_spppsubr.c#14 integrate
.. //depot/projects/smpng/sys/net/route.h#11 integrate
.. //depot/projects/smpng/sys/net80211/ieee80211.c#3 integrate
.. //depot/projects/smpng/sys/net80211/ieee80211_input.c#2 integrate
.. //depot/projects/smpng/sys/net80211/ieee80211_ioctl.c#3 integrate
.. //depot/projects/smpng/sys/net80211/ieee80211_node.c#3 integrate
.. //depot/projects/smpng/sys/net80211/ieee80211_node.h#2 integrate
.. //depot/projects/smpng/sys/net80211/ieee80211_output.c#2 integrate
.. //depot/projects/smpng/sys/net80211/ieee80211_proto.c#2 integrate
.. //depot/projects/smpng/sys/net80211/ieee80211_proto.h#2 integrate
.. //depot/projects/smpng/sys/net80211/ieee80211_var.h#2 integrate
.. //depot/projects/smpng/sys/netatm/atm_cm.c#12 integrate
.. //depot/projects/smpng/sys/netatm/atm_device.c#9 integrate
.. //depot/projects/smpng/sys/netatm/atm_if.c#11 integrate
.. //depot/projects/smpng/sys/netatm/atm_if.h#8 integrate
.. //depot/projects/smpng/sys/netatm/atm_ioctl.h#4 integrate
.. //depot/projects/smpng/sys/netatm/atm_proto.c#5 integrate
.. //depot/projects/smpng/sys/netatm/atm_socket.c#9 integrate
.. //depot/projects/smpng/sys/netatm/atm_subr.c#14 integrate
.. //depot/projects/smpng/sys/netatm/atm_usrreq.c#10 integrate
.. //depot/projects/smpng/sys/netatm/atm_var.h#11 integrate
.. //depot/projects/smpng/sys/netatm/atm_vc.h#2 integrate
.. //depot/projects/smpng/sys/netatm/ipatm/ipatm_if.c#8 integrate
.. //depot/projects/smpng/sys/netatm/ipatm/ipatm_input.c#6 integrate
.. //depot/projects/smpng/sys/netatm/ipatm/ipatm_load.c#6 integrate
.. //depot/projects/smpng/sys/netatm/ipatm/ipatm_output.c#4 integrate
.. //depot/projects/smpng/sys/netatm/ipatm/ipatm_usrreq.c#5 integrate
.. //depot/projects/smpng/sys/netatm/ipatm/ipatm_var.h#5 integrate
.. //depot/projects/smpng/sys/netatm/ipatm/ipatm_vcm.c#6 integrate
.. //depot/projects/smpng/sys/netatm/sigpvc/sigpvc_if.c#6 integrate
.. //depot/projects/smpng/sys/netatm/spans/spans_arp.c#7 integrate
.. //depot/projects/smpng/sys/netatm/spans/spans_cls.c#7 integrate
.. //depot/projects/smpng/sys/netatm/spans/spans_if.c#6 integrate
.. //depot/projects/smpng/sys/netatm/spans/spans_proto.c#7 integrate
.. //depot/projects/smpng/sys/netatm/spans/spans_var.h#5 integrate
.. //depot/projects/smpng/sys/netatm/uni/sscf_uni.c#7 integrate
.. //depot/projects/smpng/sys/netatm/uni/sscf_uni_lower.c#5 integrate
.. //depot/projects/smpng/sys/netatm/uni/sscf_uni_var.h#4 integrate
.. //depot/projects/smpng/sys/netatm/uni/sscop.c#7 integrate
.. //depot/projects/smpng/sys/netatm/uni/sscop_pdu.c#6 integrate
.. //depot/projects/smpng/sys/netatm/uni/sscop_var.h#5 integrate
.. //depot/projects/smpng/sys/netatm/uni/uniarp.c#7 integrate
.. //depot/projects/smpng/sys/netatm/uni/uniarp_cache.c#6 integrate
.. //depot/projects/smpng/sys/netatm/uni/uniarp_input.c#4 integrate
.. //depot/projects/smpng/sys/netatm/uni/uniarp_vcm.c#5 integrate
.. //depot/projects/smpng/sys/netatm/uni/uniip.c#8 integrate
.. //depot/projects/smpng/sys/netatm/uni/uniip_var.h#4 integrate
.. //depot/projects/smpng/sys/netatm/uni/unisig_decode.c#8 integrate
.. //depot/projects/smpng/sys/netatm/uni/unisig_if.c#6 integrate
.. //depot/projects/smpng/sys/netatm/uni/unisig_msg.c#6 integrate
.. //depot/projects/smpng/sys/netatm/uni/unisig_proto.c#3 integrate
.. //depot/projects/smpng/sys/netatm/uni/unisig_subr.c#6 integrate
.. //depot/projects/smpng/sys/netatm/uni/unisig_var.h#5 integrate
.. //depot/projects/smpng/sys/netatm/uni/unisig_vc_state.c#7 integrate
.. //depot/projects/smpng/sys/netgraph/atm/ng_atm.c#4 integrate
.. //depot/projects/smpng/sys/netgraph/atm/ng_atm.h#2 integrate
.. //depot/projects/smpng/sys/netinet/ip_dummynet.c#19 integrate
.. //depot/projects/smpng/sys/netinet/ip_input.c#37 integrate
.. //depot/projects/smpng/sys/netinet/ip_output.c#39 integrate
.. //depot/projects/smpng/sys/netinet/raw_ip.c#26 integrate
.. //depot/projects/smpng/sys/netinet6/ip6_fw.c#11 integrate
.. //depot/projects/smpng/sys/netncp/ncp_ncp.c#10 integrate
.. //depot/projects/smpng/sys/netsmb/smb_conn.h#7 integrate
.. //depot/projects/smpng/sys/netsmb/smb_usr.c#4 integrate
.. //depot/projects/smpng/sys/nfsclient/nfs_lock.c#27 integrate
.. //depot/projects/smpng/sys/nfsclient/nfs_vnops.c#31 integrate
.. //depot/projects/smpng/sys/pc98/conf/GENERIC#35 integrate
.. //depot/projects/smpng/sys/pc98/conf/NOTES#10 integrate
.. //depot/projects/smpng/sys/pc98/i386/machdep.c#57 integrate
.. //depot/projects/smpng/sys/pc98/pc98/pc98gdc.c#8 integrate
.. //depot/projects/smpng/sys/pci/if_dc.c#42 integrate
.. //depot/projects/smpng/sys/pci/if_dcreg.h#17 integrate
.. //depot/projects/smpng/sys/pci/if_rl.c#34 integrate
.. //depot/projects/smpng/sys/pci/if_sis.c#29 integrate
.. //depot/projects/smpng/sys/pci/if_sisreg.h#8 integrate
.. //depot/projects/smpng/sys/pci/if_xl.c#32 integrate
.. //depot/projects/smpng/sys/pci/ncr.c#11 integrate
.. //depot/projects/smpng/sys/powerpc/include/bus.h#12 integrate
.. //depot/projects/smpng/sys/powerpc/include/param.h#8 integrate
.. //depot/projects/smpng/sys/powerpc/powerpc/busdma_machdep.c#14 integrate
.. //depot/projects/smpng/sys/powerpc/powerpc/machdep.c#42 integrate
.. //depot/projects/smpng/sys/powerpc/powerpc/pmap.c#30 integrate
.. //depot/projects/smpng/sys/powerpc/powerpc/vm_machdep.c#26 integrate
.. //depot/projects/smpng/sys/security/mac_biba/mac_biba.c#17 integrate
.. //depot/projects/smpng/sys/sparc64/include/bus.h#19 integrate
.. //depot/projects/smpng/sys/sparc64/include/cache.h#8 integrate
.. //depot/projects/smpng/sys/sparc64/include/param.h#13 integrate
.. //depot/projects/smpng/sys/sparc64/sparc64/bus_machdep.c#20 integrate
.. //depot/projects/smpng/sys/sparc64/sparc64/genassym.c#31 integrate
.. //depot/projects/smpng/sys/sparc64/sparc64/iommu.c#20 integrate
.. //depot/projects/smpng/sys/sparc64/sparc64/machdep.c#54 integrate
.. //depot/projects/smpng/sys/sparc64/sparc64/pmap.c#41 integrate
.. //depot/projects/smpng/sys/sparc64/sparc64/vm_machdep.c#34 integrate
.. //depot/projects/smpng/sys/sys/cdefs.h#20 integrate
.. //depot/projects/smpng/sys/sys/kse.h#12 integrate
.. //depot/projects/smpng/sys/sys/lock.h#27 integrate
.. //depot/projects/smpng/sys/sys/param.h#45 integrate
.. //depot/projects/smpng/sys/sys/proc.h#95 integrate
.. //depot/projects/smpng/sys/sys/socketvar.h#30 integrate
.. //depot/projects/smpng/sys/sys/syscall.h#31 integrate
.. //depot/projects/smpng/sys/sys/syscall.mk#31 integrate
.. //depot/projects/smpng/sys/sys/sysproto.h#33 integrate
.. //depot/projects/smpng/sys/sys/systm.h#43 integrate
.. //depot/projects/smpng/sys/sys/vnode.h#35 integrate
.. //depot/projects/smpng/sys/ufs/ffs/ffs_vfsops.c#43 integrate
.. //depot/projects/smpng/sys/ufs/ffs/ffs_vnops.c#21 integrate
.. //depot/projects/smpng/sys/ufs/ufs/extattr.h#5 integrate
.. //depot/projects/smpng/sys/ufs/ufs/ufs_extattr.c#26 integrate
.. //depot/projects/smpng/sys/ufs/ufs/ufs_quota.c#20 integrate
.. //depot/projects/smpng/sys/ufs/ufs/ufs_vnops.c#30 integrate
.. //depot/projects/smpng/sys/vm/swap_pager.c#29 integrate
.. //depot/projects/smpng/sys/vm/swap_pager.h#10 integrate
.. //depot/projects/smpng/sys/vm/uma_core.c#33 integrate
.. //depot/projects/smpng/sys/vm/uma_int.h#15 integrate
.. //depot/projects/smpng/sys/vm/vm_contig.c#16 integrate
.. //depot/projects/smpng/sys/vm/vm_glue.c#30 integrate
.. //depot/projects/smpng/sys/vm/vm_kern.c#16 integrate
.. //depot/projects/smpng/sys/vm/vm_map.c#41 integrate
.. //depot/projects/smpng/sys/vm/vm_object.c#41 integrate
.. //depot/projects/smpng/sys/vm/vm_swap.c#25 delete
Differences ...
==== //depot/projects/smpng/sys/alpha/alpha/busdma_machdep.c#20 (text+ko) ====
@@ -25,7 +25,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/alpha/alpha/busdma_machdep.c,v 1.42 2003/07/01 21:20:51 mux Exp $");
+__FBSDID("$FreeBSD: src/sys/alpha/alpha/busdma_machdep.c,v 1.43 2003/07/27 13:52:09 mux Exp $");
#include <sys/param.h>
#include <sys/bus.h>
@@ -413,24 +413,29 @@
bus_dmamem_alloc(bus_dma_tag_t dmat, void** vaddr, int flags,
bus_dmamap_t *mapp)
{
+ int mflags;
+
+ if (flags & BUS_DMA_NOWAIT)
+ mflags = M_NOWAIT;
+ else
+ mflags = M_WAITOK;
+ if (flags & BUS_DMA_ZERO)
+ mflags |= M_ZERO;
+
/* If we succeed, no mapping/bouncing will be required */
*mapp = &nobounce_dmamap;
if ((dmat->maxsize <= PAGE_SIZE) && dmat->lowaddr >= ptoa(Maxmem)) {
- *vaddr = malloc(dmat->maxsize, M_DEVBUF,
- (flags & BUS_DMA_NOWAIT) ? M_NOWAIT : M_WAITOK);
+ *vaddr = malloc(dmat->maxsize, M_DEVBUF, mflags);
} else {
/*
* XXX Use Contigmalloc until it is merged into this facility
* and handles multi-seg allocations. Nobody is doing
* multi-seg allocations yet though.
*/
- mtx_lock(&Giant);
- *vaddr = contigmalloc(dmat->maxsize, M_DEVBUF,
- (flags & BUS_DMA_NOWAIT) ? M_NOWAIT : M_WAITOK,
+ *vaddr = contigmalloc(dmat->maxsize, M_DEVBUF, mflags,
0ul, dmat->lowaddr, dmat->alignment? dmat->alignment : 1ul,
dmat->boundary);
- mtx_unlock(&Giant);
}
if (*vaddr == NULL)
return (ENOMEM);
@@ -894,13 +899,11 @@
if (bpage == NULL)
break;
- mtx_lock(&Giant);
bpage->vaddr = (vm_offset_t)contigmalloc(PAGE_SIZE, M_DEVBUF,
M_NOWAIT, 0ul,
dmat->lowaddr,
PAGE_SIZE,
dmat->boundary);
- mtx_unlock(&Giant);
if (bpage->vaddr == 0) {
free(bpage, M_DEVBUF);
break;
==== //depot/projects/smpng/sys/alpha/alpha/machdep.c#60 (text+ko) ====
@@ -88,10 +88,11 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/alpha/alpha/machdep.c,v 1.205 2003/07/15 00:11:03 davidxu Exp $");
+__FBSDID("$FreeBSD: src/sys/alpha/alpha/machdep.c,v 1.211 2003/07/31 05:27:00 marcel Exp $");
#include "opt_compat.h"
#include "opt_ddb.h"
+#include "opt_kstack_pages.h"
#include "opt_msgbuf.h"
#include "opt_maxmem.h"
@@ -548,6 +549,9 @@
alpha_pal_wrmces(alpha_pal_rdmces() &
~(ALPHA_MCES_DSC|ALPHA_MCES_DPC));
+ /* Clear userland thread pointer */
+ alpha_pal_wrunique(0);
+
/*
* Find out what hardware we're on, and do basic initialization.
*/
@@ -2018,14 +2022,18 @@
if (clear_ret != 0) {
mcp->mc_regs[FRAME_V0] = 0;
mcp->mc_regs[FRAME_A4] = 0;
+ mcp->mc_regs[FRAME_A3] = 0;
}
/*
* When the thread is the current thread, the user stack pointer
* is not in the PCB; it must be read from the PAL.
*/
- if (td == curthread)
+ if (td == curthread) {
mcp->mc_regs[FRAME_SP] = alpha_pal_rdusp();
+ mcp->mc_thrptr = alpha_pal_rdunique();
+ } else
+ mcp->mc_thrptr = 0;
mcp->mc_format = _MC_REV0_TRAPFRAME;
PROC_LOCK(curthread->td_proc);
@@ -2047,6 +2055,12 @@
else if ((ret = set_fpcontext(td, mcp)) != 0)
return (ret);
+ /*
+ * NOTE: We only need to restore mc_thrptr when the ucontext format
+ * is _MC_REV0_TRAPFRAME. Only get_mcontext() above creates such
+ * contexts and that's also the only place where we save the thread
+ * pointer in the context.
+ */
if (mcp->mc_format == _MC_REV0_SIGFRAME) {
set_regs(td, (struct reg *)&mcp->mc_regs);
val = (mcp->mc_regs[R_PS] | ALPHA_PSL_USERSET) &
@@ -2056,10 +2070,15 @@
td->td_frame->tf_regs[FRAME_FLAGS] = 0;
if (td == curthread)
alpha_pal_wrusp(mcp->mc_regs[R_SP]);
-
} else {
- if (td == curthread)
+ if (td == curthread) {
alpha_pal_wrusp(mcp->mc_regs[FRAME_SP]);
+ alpha_pal_wrunique(mcp->mc_thrptr);
+ } else {
+ td->td_pcb->pcb_hw.apcb_usp = mcp->mc_regs[FRAME_SP];
+ td->td_pcb->pcb_hw.apcb_unique = mcp->mc_thrptr;
+ }
+
/*
* The context is a trapframe, so just copy it over the
* threads frame.
@@ -2361,9 +2380,3 @@
pcpu->pc_idlepcb.apcb_ptbr = thread0.td_pcb->pcb_hw.apcb_ptbr;
pcpu->pc_current_asngen = 1;
}
-
-intptr_t
-casuptr(intptr_t *p, intptr_t old, intptr_t new)
-{
- return (-1);
-}
==== //depot/projects/smpng/sys/alpha/alpha/mp_machdep.c#20 (text+ko) ====
@@ -25,7 +25,9 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/alpha/alpha/mp_machdep.c,v 1.44 2003/07/03 14:33:17 jhb Exp $");
+__FBSDID("$FreeBSD: src/sys/alpha/alpha/mp_machdep.c,v 1.46 2003/07/31 01:31:31 peter Exp $");
+
+#include "opt_kstack_pages.h"
#include <sys/param.h>
#include <sys/systm.h>
@@ -137,6 +139,9 @@
*/
alpha_pal_wrval((u_int64_t) pcpup);
+ /* Clear userland thread pointer. */
+ alpha_pal_wrunique(0);
+
/*
* Point interrupt/exception vectors to our own.
*/
==== //depot/projects/smpng/sys/alpha/alpha/pmap.c#49 (text+ko) ====
@@ -148,7 +148,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/alpha/alpha/pmap.c,v 1.130 2003/07/06 20:32:42 alc Exp $");
+__FBSDID("$FreeBSD: src/sys/alpha/alpha/pmap.c,v 1.132 2003/07/31 03:39:50 bmilekic Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -642,7 +642,7 @@
if (initial_pvs < MINPV)
initial_pvs = MINPV;
pvzone = uma_zcreate("PV ENTRY", sizeof (struct pv_entry), NULL, NULL,
- NULL, NULL, UMA_ALIGN_PTR, UMA_ZONE_VM);
+ NULL, NULL, UMA_ALIGN_PTR, UMA_ZONE_VM | UMA_ZONE_NOFREE);
uma_prealloc(pvzone, initial_pvs);
/*
@@ -2130,7 +2130,7 @@
mpte = NULL;
for (i = 0; i < PAGEORDER_SIZE; i++) {
- vm_object_t lobject;
+ vm_object_t backing_object, lobject;
pt_entry_t *pte;
addr = addra + pmap_prefault_pageorder[i];
@@ -2150,15 +2150,18 @@
pindex = ((addr - entry->start) + entry->offset) >> PAGE_SHIFT;
lobject = object;
- for (m = vm_page_lookup(lobject, pindex);
- (!m && (lobject->type == OBJT_DEFAULT) && (lobject->backing_object));
- lobject = lobject->backing_object) {
+ VM_OBJECT_LOCK(lobject);
+ while ((m = vm_page_lookup(lobject, pindex)) == NULL &&
+ lobject->type == OBJT_DEFAULT &&
+ (backing_object = lobject->backing_object) != NULL) {
if (lobject->backing_object_offset & PAGE_MASK)
break;
- pindex += (lobject->backing_object_offset >> PAGE_SHIFT);
- m = vm_page_lookup(lobject->backing_object, pindex);
+ pindex += lobject->backing_object_offset >> PAGE_SHIFT;
+ VM_OBJECT_LOCK(backing_object);
+ VM_OBJECT_UNLOCK(lobject);
+ lobject = backing_object;
}
-
+ VM_OBJECT_UNLOCK(lobject);
/*
* give-up when a page is not in memory
*/
==== //depot/projects/smpng/sys/alpha/alpha/support.s#8 (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/alpha/alpha/support.s,v 1.14 2003/06/29 17:14:42 marcel Exp $
+ * $FreeBSD: src/sys/alpha/alpha/support.s,v 1.15 2003/07/24 07:49:45 marcel Exp $
*/
/*
@@ -59,7 +59,35 @@
.text
/**************************************************************************/
-
+
+/*
+ * intptr_t
+ * casuptr(intptr_t *p, intptr_t old, intptr_t new)
+ */
+ LEAF(casuptr, 3)
+ LDGP(pv)
+
+ ldiq t0, VM_MAXUSER_ADDRESS /* verify address validity */
+ cmpult a0, t0, t1
+ beq t1, fusufault
+
+ lda t0, fusufault /* trap faults */
+ ldq t2, PC_CURTHREAD(pcpup)
+ ldq t2, TD_PCB(t2)
+
+ stq t0, PCB_ONFAULT(t2)
+1:
+ ldq_l v0, 0(a0) /* try to load the old value */
+ cmpeq v0, a1, t0 /* compare */
+ beq t0, 2f /* exit if not equal */
+ mov a2, t0 /* setup value to write */
+ stq_c t0, 0(a0) /* write if address still locked */
+ beq t0, 1b /* if it failed, spin */
+2:
+ stq zero, PCB_ONFAULT(t2) /* clean up */
+ RET
+ END(casuptr)
+
/*
* fu{byte,word} : fetch a byte (word) from user memory
*/
==== //depot/projects/smpng/sys/alpha/alpha/vm_machdep.c#25 (text+ko) ====
@@ -67,7 +67,9 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/alpha/alpha/vm_machdep.c,v 1.88 2003/06/15 00:54:07 davidxu Exp $");
+__FBSDID("$FreeBSD: src/sys/alpha/alpha/vm_machdep.c,v 1.91 2003/07/31 01:31:31 peter Exp $");
+
+#include "opt_kstack_pages.h"
#include <sys/param.h>
#include <sys/systm.h>
@@ -145,6 +147,7 @@
*/
bcopy(td1->td_pcb, td2->td_pcb, sizeof(struct pcb));
td2->td_pcb->pcb_hw.apcb_usp = alpha_pal_rdusp();
+ td2->td_pcb->pcb_hw.apcb_unique = 0;
td2->td_pcb->pcb_hw.apcb_flags &= ~ALPHA_PCB_FLAGS_FEN;
/*
@@ -259,7 +262,8 @@
{
td->td_pcb =
- (struct pcb *)(td->td_kstack + KSTACK_PAGES * PAGE_SIZE) - 1;
+ (struct pcb *)(td->td_kstack + KSTACK_PAGES * PAGE_SIZE) - 1;
+ td->td_md.md_pcbpaddr = (void*)vtophys((vm_offset_t)td->td_pcb);
td->td_frame = (struct trapframe *)((caddr_t)td->td_pcb) - 1;
}
==== //depot/projects/smpng/sys/alpha/conf/GENERIC#31 (text+ko) ====
@@ -18,7 +18,7 @@
#
# For hardware specific information check HARDWARE.TXT
#
-# $FreeBSD: src/sys/alpha/conf/GENERIC,v 1.161 2003/06/08 02:03:01 jmallett Exp $
+# $FreeBSD: src/sys/alpha/conf/GENERIC,v 1.162 2003/07/21 19:15:25 ticso Exp $
machine alpha
cpu EV4
@@ -80,6 +80,7 @@
# Standard busses
device isa
+device eisa
device pci
# Floppy drives
==== //depot/projects/smpng/sys/alpha/conf/NOTES#6 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/sys/alpha/conf/NOTES,v 1.151 2003/04/15 20:21:56 jhb Exp $
+# $FreeBSD: src/sys/alpha/conf/NOTES,v 1.152 2003/07/21 19:15:25 ticso Exp $
#
# This file contains machine dependent kernel configuration notes. For
# machine independent notes, look in /sys/conf/NOTES.
@@ -45,6 +45,7 @@
# HARDWARE BUS CONFIGURATION
device isa
+device eisa
device pci
==== //depot/projects/smpng/sys/alpha/include/alpha_cpu.h#6 (text+ko) ====
@@ -1,4 +1,4 @@
-/* $FreeBSD: src/sys/alpha/include/alpha_cpu.h,v 1.9 2002/10/25 20:22:12 jhb Exp $ */
+/* $FreeBSD: src/sys/alpha/include/alpha_cpu.h,v 1.10 2003/07/24 07:41:08 marcel Exp $ */
/* From: NetBSD: alpha_cpu.h,v 1.15 1997/09/20 19:02:34 mjacob Exp */
/*
@@ -459,6 +459,23 @@
}
static __inline void
+alpha_pal_wrunique(u_int64_t tp)
+{
+ register u_int64_t a0 __asm__("$16") = tp;
+ __asm__ __volatile__("call_pal 0x9f # PAL_wrunique"
+ : "+r" (a0) : : "$1", "$22", "$23", "$24", "$25");
+}
+
+static __inline u_int64_t
+alpha_pal_rdunique(void)
+{
+ register u_int64_t v0 __asm__("$0");
+ __asm__ __volatile__("call_pal 0x9e # PAL_rdunique"
+ : "=r" (v0) : : "$1", "$22", "$23", "$24", "$25");
+ return (v0);
+}
+
+static __inline void
alpha_pal_tbi(u_int64_t op, u_int64_t va)
{
register u_int64_t a0 __asm__("$16") = op;
==== //depot/projects/smpng/sys/alpha/include/bus.h#12 (text+ko) ====
@@ -67,7 +67,7 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-/* $FreeBSD: src/sys/alpha/include/bus.h,v 1.22 2003/07/01 15:51:50 scottl Exp $ */
+/* $FreeBSD: src/sys/alpha/include/bus.h,v 1.23 2003/07/27 13:52:09 mux Exp $ */
#ifndef _ALPHA_BUS_H_
#define _ALPHA_BUS_H_
@@ -470,6 +470,7 @@
#define BUS_DMA_NOWAIT 0x01 /* not safe to sleep */
#define BUS_DMA_ALLOCNOW 0x02 /* perform resource allocation now */
#define BUS_DMA_COHERENT 0x04 /* hint: map memory in a coherent way */
+#define BUS_DMA_ZERO 0x08 /* allocate zero'ed memory */
#define BUS_DMA_ISA 0x10 /* map memory for ISA dma */
#define BUS_DMA_BUS2 0x20 /* placeholders for bus functions... */
#define BUS_DMA_BUS3 0x40
==== //depot/projects/smpng/sys/alpha/include/param.h#7 (text+ko) ====
@@ -1,4 +1,4 @@
-/* $FreeBSD: src/sys/alpha/include/param.h,v 1.31 2003/06/14 23:23:52 alc Exp $ */
+/* $FreeBSD: src/sys/alpha/include/param.h,v 1.32 2003/07/31 01:31:31 peter Exp $ */
/* From: NetBSD: param.h,v 1.20 1997/09/19 13:52:53 leo Exp */
/*
@@ -117,7 +117,9 @@
#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
#define KSTACK_GUARD_PAGES 1 /* pages of kstack guard; 0 disables */
#define UAREA_PAGES 1 /* pages of u-area */
==== //depot/projects/smpng/sys/alpha/include/ucontext.h#5 (text+ko) ====
@@ -25,7 +25,7 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
- * $FreeBSD: src/sys/alpha/include/ucontext.h,v 1.6 2002/11/16 06:35:51 deischen Exp $
+ * $FreeBSD: src/sys/alpha/include/ucontext.h,v 1.7 2003/07/24 07:34:31 marcel Exp $
*/
#ifndef _MACHINE_UCONTEXT_H_
@@ -50,7 +50,8 @@
#define _MC_REV0_SIGFRAME 1 /* context is a signal frame */
#define _MC_REV0_TRAPFRAME 2 /* context is a trap frame */
long mc_format;
- long mc_spare[6];
+ long mc_thrptr; /* Thread pointer */
+ long mc_spare[5];
} mcontext_t;
#if defined(_KERNEL) && defined(COMPAT_FREEBSD4)
==== //depot/projects/smpng/sys/amd64/acpica/OsdEnvironment.c#3 (text+ko) ====
@@ -23,10 +23,11 @@
* 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.
- *
- * $FreeBSD: src/sys/amd64/acpica/OsdEnvironment.c,v 1.9 2003/05/31 06:47:05 peter Exp $
*/
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD: src/sys/amd64/acpica/OsdEnvironment.c,v 1.10 2003/07/25 21:10:18 obrien Exp $");
+
/*
* 6.1 : Environmental support
*/
==== //depot/projects/smpng/sys/amd64/acpica/acpi_machdep.c#2 (text+ko) ====
@@ -22,10 +22,11 @@
* 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.
- *
- * $FreeBSD: src/sys/amd64/acpica/acpi_machdep.c,v 1.9 2003/05/01 01:05:21 peter Exp $
*/
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD: src/sys/amd64/acpica/acpi_machdep.c,v 1.10 2003/07/25 21:10:19 obrien Exp $");
+
#include <sys/param.h>
#include <sys/bus.h>
==== //depot/projects/smpng/sys/amd64/acpica/acpi_wakeup.c#2 (text+ko) ====
@@ -23,9 +23,11 @@
* 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.
- *
- * $FreeBSD: src/sys/amd64/acpica/acpi_wakeup.c,v 1.19 2003/05/01 01:05:21 peter Exp $
*/
+
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD: src/sys/amd64/acpica/acpi_wakeup.c,v 1.20 2003/07/25 21:10:19 obrien Exp $");
+
#include <sys/param.h>
#include <sys/bus.h>
==== //depot/projects/smpng/sys/amd64/amd64/amd64-gdbstub.c#2 (text+ko) ====
@@ -92,7 +92,8 @@
*
****************************************************************************/
-/* $FreeBSD: src/sys/amd64/amd64/amd64-gdbstub.c,v 1.24 2003/05/31 22:00:57 peter Exp $ */
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/amd64-gdbstub.c,v 1.25 2003/07/25 21:15:44 obrien Exp $");
#include <sys/param.h>
#include <sys/reboot.h>
==== //depot/projects/smpng/sys/amd64/amd64/atomic.c#2 (text+ko) ====
@@ -22,10 +22,11 @@
* 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.
- *
- * $FreeBSD: src/sys/amd64/amd64/atomic.c,v 1.4 2000/09/06 11:21:14 phk Exp $
*/
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/atomic.c,v 1.5 2003/07/25 21:15:44 obrien Exp $");
+
/* This file creates publically callable functions to perform various
* simple arithmetic on memory which is atomic in the presence of
* interrupts and multiple processors.
==== //depot/projects/smpng/sys/amd64/amd64/autoconf.c#2 (text+ko) ====
@@ -33,10 +33,12 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * from: @(#)autoconf.c 7.1 (Berkeley) 5/9/91
- * $FreeBSD: src/sys/amd64/amd64/autoconf.c,v 1.173 2003/05/01 01:05:21 peter Exp $
+ * @(#)autoconf.c 7.1 (Berkeley) 5/9/91
*/
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/autoconf.c,v 1.174 2003/07/25 21:15:44 obrien Exp $");
+
/*
* Setup the system to run on the current machine.
*
==== //depot/projects/smpng/sys/amd64/amd64/busdma_machdep.c#5 (text+ko) ====
@@ -25,7 +25,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/amd64/amd64/busdma_machdep.c,v 1.49 2003/07/01 19:16:48 mux Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/busdma_machdep.c,v 1.50 2003/07/27 13:52:08 mux Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -390,25 +390,30 @@
bus_dmamem_alloc(bus_dma_tag_t dmat, void** vaddr, int flags,
bus_dmamap_t *mapp)
{
+ int mflags;
+
+ if (flags & BUS_DMA_NOWAIT)
+ mflags = M_NOWAIT;
+ else
+ mflags = M_WAITOK;
+ if (flags & BUS_DMA_ZERO)
+ mflags |= M_ZERO;
+
/* If we succeed, no mapping/bouncing will be required */
*mapp = NULL;
if ((dmat->maxsize <= PAGE_SIZE) &&
dmat->lowaddr >= ptoa((vm_paddr_t)Maxmem)) {
- *vaddr = malloc(dmat->maxsize, M_DEVBUF,
- (flags & BUS_DMA_NOWAIT) ? M_NOWAIT : M_WAITOK);
+ *vaddr = malloc(dmat->maxsize, M_DEVBUF, mflags);
} else {
>>> TRUNCATED FOR MAIL (1000 lines) <<<
More information about the p4-projects
mailing list