PERFORCE change 48624 for review
John Baldwin
jhb at FreeBSD.org
Wed Mar 10 13:56:06 PST 2004
http://perforce.freebsd.org/chv.cgi?CH=48624
Change 48624 by jhb at jhb_slimer on 2004/03/10 13:55:03
IFC @48610.
Affected files ...
.. //depot/projects/smpng/sys/alpha/alpha/machdep.c#66 integrate
.. //depot/projects/smpng/sys/alpha/alpha/pmap.c#54 integrate
.. //depot/projects/smpng/sys/alpha/alpha/promcons.c#17 integrate
.. //depot/projects/smpng/sys/alpha/include/critical.h#4 integrate
.. //depot/projects/smpng/sys/alpha/include/pmap.h#17 integrate
.. //depot/projects/smpng/sys/amd64/amd64/critical.c#6 integrate
.. //depot/projects/smpng/sys/amd64/amd64/identcpu.c#7 integrate
.. //depot/projects/smpng/sys/amd64/amd64/local_apic.c#4 integrate
.. //depot/projects/smpng/sys/amd64/amd64/machdep.c#22 integrate
.. //depot/projects/smpng/sys/amd64/amd64/mp_machdep.c#7 integrate
.. //depot/projects/smpng/sys/amd64/amd64/pmap.c#23 integrate
.. //depot/projects/smpng/sys/amd64/amd64/trap.c#16 integrate
.. //depot/projects/smpng/sys/amd64/conf/NOTES#4 integrate
.. //depot/projects/smpng/sys/amd64/include/cpufunc.h#7 integrate
.. //depot/projects/smpng/sys/amd64/include/critical.h#5 integrate
.. //depot/projects/smpng/sys/amd64/include/dvcfg.h#1 branch
.. //depot/projects/smpng/sys/amd64/include/physio_proc.h#1 branch
.. //depot/projects/smpng/sys/amd64/include/pmap.h#9 integrate
.. //depot/projects/smpng/sys/boot/efi/libefi/efi_console.c#4 integrate
.. //depot/projects/smpng/sys/boot/forth/loader.conf#22 integrate
.. //depot/projects/smpng/sys/cam/cam_xpt.c#19 integrate
.. //depot/projects/smpng/sys/compat/ndis/kern_ndis.c#10 integrate
.. //depot/projects/smpng/sys/compat/ndis/ntoskrnl_var.h#6 integrate
.. //depot/projects/smpng/sys/compat/ndis/subr_ndis.c#11 integrate
.. //depot/projects/smpng/sys/compat/ndis/subr_ntoskrnl.c#9 integrate
.. //depot/projects/smpng/sys/conf/NOTES#63 integrate
.. //depot/projects/smpng/sys/conf/files#105 integrate
.. //depot/projects/smpng/sys/conf/files.amd64#13 integrate
.. //depot/projects/smpng/sys/conf/files.i386#55 integrate
.. //depot/projects/smpng/sys/conf/files.pc98#53 integrate
.. //depot/projects/smpng/sys/conf/kern.mk#10 integrate
.. //depot/projects/smpng/sys/conf/kmod.mk#28 integrate
.. //depot/projects/smpng/sys/conf/options#71 integrate
.. //depot/projects/smpng/sys/conf/options.amd64#6 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/CHANGES.txt#6 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/acapps.h#4 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/acconfig.h#18 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/acdebug.h#12 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/acdisasm.h#7 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/acdispat.h#9 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/acefi.h#7 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/acenv.h#12 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/acevents.h#11 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/acexcep.h#11 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/acfreebsd.h#10 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/acgcc.h#11 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/acglobal.h#15 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/achware.h#7 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/acinterp.h#13 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/aclocal.h#16 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/acmacros.h#16 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/acnamesp.h#12 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/acobject.h#13 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/acoutput.h#9 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/acparser.h#12 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/acpi.h#5 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/acpica_prep.sh#6 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/acpiosxf.h#13 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/acpixf.h#13 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/acresrc.h#6 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/acstruct.h#11 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/actables.h#8 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/actbl.h#7 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/actbl1.h#5 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/actbl2.h#6 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/actypes.h#17 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/acutils.h#18 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/amlcode.h#11 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/amlresrc.h#4 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/common/adisasm.c#3 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/common/getopt.c#2 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/compiler/aslanalyze.c#3 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/compiler/aslcodegen.c#2 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/compiler/aslcompile.c#3 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/compiler/aslcompiler.h#2 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/compiler/aslcompiler.l#2 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/compiler/aslcompiler.y#3 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/compiler/aslerror.c#2 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/compiler/aslfiles.c#2 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/compiler/aslfold.c#3 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/compiler/aslglobal.h#2 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/compiler/asllength.c#2 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/compiler/asllisting.c#2 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/compiler/aslload.c#2 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/compiler/asllookup.c#2 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/compiler/aslmain.c#2 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/compiler/aslmap.c#2 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/compiler/aslopcodes.c#2 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/compiler/asloperands.c#2 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/compiler/aslopt.c#2 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/compiler/aslresource.c#2 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/compiler/aslrestype1.c#2 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/compiler/aslrestype2.c#2 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/compiler/aslstubs.c#2 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/compiler/asltransform.c#2 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/compiler/asltree.c#3 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/compiler/asltypes.h#3 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/compiler/aslutils.c#3 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/dbcmds.c#17 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/dbdisply.c#17 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/dbexec.c#15 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/dbfileio.c#16 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/dbhistry.c#7 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/dbinput.c#13 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/dbstats.c#14 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/dbutils.c#14 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/dbxface.c#14 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/dmbuffer.c#6 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/dmnames.c#5 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/dmobject.c#3 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/dmopcode.c#6 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/dmresrc.c#7 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/dmresrcl.c#5 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/dmresrcs.c#4 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/dmutils.c#5 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/dmwalk.c#5 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/dsfield.c#14 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/dsinit.c#4 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/dsmethod.c#16 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/dsmthdat.c#15 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/dsobject.c#16 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/dsopcode.c#16 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/dsutils.c#15 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/dswexec.c#15 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/dswload.c#16 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/dswscope.c#10 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/dswstate.c#14 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/evevent.c#15 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/evgpe.c#4 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/evgpeblk.c#4 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/evmisc.c#16 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/evregion.c#14 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/evrgnini.c#15 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/evsci.c#9 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/evxface.c#13 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/evxfevnt.c#11 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/evxfregn.c#13 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/exconfig.c#15 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/exconvrt.c#12 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/excreate.c#14 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/exdump.c#16 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/exfield.c#11 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/exfldio.c#16 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/exmisc.c#16 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/exmutex.c#9 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/exnames.c#10 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/exoparg1.c#12 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/exoparg2.c#10 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/exoparg3.c#8 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/exoparg6.c#6 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/exprep.c#14 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/exregion.c#15 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/exresnte.c#14 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/exresolv.c#14 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/exresop.c#15 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/exstore.c#19 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/exstoren.c#11 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/exstorob.c#10 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/exsystem.c#13 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/exutils.c#15 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/hwacpi.c#13 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/hwgpe.c#11 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/hwregs.c#14 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/hwsleep.c#16 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/hwtimer.c#9 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/nsaccess.c#14 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/nsalloc.c#15 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/nsdump.c#16 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/nsdumpdv.c#7 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/nseval.c#14 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/nsinit.c#13 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/nsload.c#13 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/nsnames.c#13 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/nsobject.c#13 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/nsparse.c#3 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/nssearch.c#15 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/nsutils.c#15 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/nswalk.c#9 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/nsxfeval.c#6 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/nsxfname.c#10 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/nsxfobj.c#13 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/osunixxf.c#3 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/psargs.c#14 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/psopcode.c#14 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/psparse.c#16 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/psscope.c#8 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/pstree.c#9 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/psutils.c#10 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/pswalk.c#9 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/psxface.c#15 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/rsaddr.c#10 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/rscalc.c#10 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/rscreate.c#13 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/rsdump.c#10 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/rsio.c#7 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/rsirq.c#11 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/rslist.c#8 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/rsmemory.c#6 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/rsmisc.c#8 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/rsutils.c#9 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/rsxface.c#8 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/tbconvrt.c#14 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/tbget.c#16 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/tbgetall.c#7 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/tbinstal.c#16 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/tbrsdt.c#6 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/tbutils.c#13 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/tbxface.c#13 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/tbxfroot.c#13 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/utalloc.c#12 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/utclib.c#7 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/utcopy.c#15 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/utdebug.c#16 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/utdelete.c#15 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/uteval.c#13 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/utglobal.c#16 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/utinit.c#13 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/utmath.c#7 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/utmisc.c#14 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/utobject.c#14 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/utxface.c#13 integrate
.. //depot/projects/smpng/sys/contrib/pf/net/if_pflog.c#2 integrate
.. //depot/projects/smpng/sys/contrib/pf/net/if_pfsync.c#2 integrate
.. //depot/projects/smpng/sys/contrib/pf/net/pf.c#2 integrate
.. //depot/projects/smpng/sys/contrib/pf/net/pf_ioctl.c#2 integrate
.. //depot/projects/smpng/sys/contrib/pf/net/pf_norm.c#2 integrate
.. //depot/projects/smpng/sys/ddb/db_command.c#17 integrate
.. //depot/projects/smpng/sys/dev/aac/aac.c#38 integrate
.. //depot/projects/smpng/sys/dev/acpica/Osd/OsdHardware.c#12 integrate
.. //depot/projects/smpng/sys/dev/acpica/acpi.c#61 integrate
.. //depot/projects/smpng/sys/dev/acpica/acpi_acad.c#14 integrate
.. //depot/projects/smpng/sys/dev/acpica/acpi_cpu.c#21 integrate
.. //depot/projects/smpng/sys/dev/acpica/acpi_ec.c#24 integrate
.. //depot/projects/smpng/sys/dev/acpica/acpi_lid.c#10 integrate
.. //depot/projects/smpng/sys/dev/acpica/acpi_pci.c#7 integrate
.. //depot/projects/smpng/sys/dev/acpica/acpi_pcib_acpi.c#7 integrate
.. //depot/projects/smpng/sys/dev/acpica/acpi_powerres.c#14 integrate
.. //depot/projects/smpng/sys/dev/acpica/acpi_thermal.c#23 integrate
.. //depot/projects/smpng/sys/dev/acpica/acpi_timer.c#13 integrate
.. //depot/projects/smpng/sys/dev/acpica/acpi_video.c#1 branch
.. //depot/projects/smpng/sys/dev/acpica/acpivar.h#39 integrate
.. //depot/projects/smpng/sys/dev/adlink/adlink.c#7 integrate
.. //depot/projects/smpng/sys/dev/advansys/advmcode.h#2 integrate
.. //depot/projects/smpng/sys/dev/ata/ata-all.c#48 integrate
.. //depot/projects/smpng/sys/dev/ata/ata-all.h#24 integrate
.. //depot/projects/smpng/sys/dev/ata/ata-chipset.c#31 integrate
.. //depot/projects/smpng/sys/dev/ata/ata-disk.c#38 integrate
.. //depot/projects/smpng/sys/dev/ata/ata-queue.c#10 integrate
.. //depot/projects/smpng/sys/dev/ata/atapi-cam.c#20 integrate
.. //depot/projects/smpng/sys/dev/ata/atapi-cd.c#48 integrate
.. //depot/projects/smpng/sys/dev/ata/atapi-fd.c#23 integrate
.. //depot/projects/smpng/sys/dev/ata/atapi-tape.c#26 integrate
.. //depot/projects/smpng/sys/dev/bfe/if_bfe.c#4 integrate
.. //depot/projects/smpng/sys/dev/ctau/ctau.c#2 integrate
.. //depot/projects/smpng/sys/dev/ctau/if_ct.c#2 integrate
.. //depot/projects/smpng/sys/dev/cx/if_cx.c#4 integrate
.. //depot/projects/smpng/sys/dev/drm/drm_drv.h#17 integrate
.. //depot/projects/smpng/sys/dev/drm/drm_os_freebsd.h#15 integrate
.. //depot/projects/smpng/sys/dev/drm/drm_vm.h#8 integrate
.. //depot/projects/smpng/sys/dev/drm/radeon_state.c#8 integrate
.. //depot/projects/smpng/sys/dev/drm/sis_ds.h#2 integrate
.. //depot/projects/smpng/sys/dev/drm/sis_mm.c#3 integrate
.. //depot/projects/smpng/sys/dev/ed/if_ed.c#18 integrate
.. //depot/projects/smpng/sys/dev/ed/if_edvar.h#6 integrate
.. //depot/projects/smpng/sys/dev/en/midway.c#22 integrate
.. //depot/projects/smpng/sys/dev/hatm/if_hatm.c#12 integrate
.. //depot/projects/smpng/sys/dev/hifn/hifn7751reg.h#4 integrate
.. //depot/projects/smpng/sys/dev/if_ndis/if_ndis.c#10 integrate
.. //depot/projects/smpng/sys/dev/if_ndis/if_ndis_pccard.c#1 branch
.. //depot/projects/smpng/sys/dev/if_ndis/if_ndis_pci.c#1 branch
.. //depot/projects/smpng/sys/dev/if_ndis/if_ndisvar.h#5 integrate
.. //depot/projects/smpng/sys/dev/ips/ips.c#9 integrate
.. //depot/projects/smpng/sys/dev/ips/ips.h#6 integrate
.. //depot/projects/smpng/sys/dev/ips/ips_commands.c#8 integrate
.. //depot/projects/smpng/sys/dev/ips/ips_disk.c#6 integrate
.. //depot/projects/smpng/sys/dev/ips/ips_pci.c#7 integrate
.. //depot/projects/smpng/sys/dev/lnc/if_lnc.c#12 integrate
.. //depot/projects/smpng/sys/dev/lnc/if_lncvar.h#3 integrate
.. //depot/projects/smpng/sys/dev/md/md.c#46 integrate
.. //depot/projects/smpng/sys/dev/mlx/mlx.c#14 integrate
.. //depot/projects/smpng/sys/dev/patm/if_patm.c#5 integrate
.. //depot/projects/smpng/sys/dev/patm/if_patm_attach.c#4 integrate
.. //depot/projects/smpng/sys/dev/patm/if_patm_intr.c#3 integrate
.. //depot/projects/smpng/sys/dev/patm/if_patm_ioctl.c#5 integrate
.. //depot/projects/smpng/sys/dev/patm/if_patm_rtables.c#3 integrate
.. //depot/projects/smpng/sys/dev/patm/if_patm_rx.c#5 integrate
.. //depot/projects/smpng/sys/dev/patm/if_patm_tx.c#5 integrate
.. //depot/projects/smpng/sys/dev/pccbb/pccbb.c#40 integrate
.. //depot/projects/smpng/sys/dev/random/harvest.c#8 integrate
.. //depot/projects/smpng/sys/dev/sound/isa/ad1816.c#12 integrate
.. //depot/projects/smpng/sys/dev/sound/isa/ess.c#9 integrate
.. //depot/projects/smpng/sys/dev/sound/isa/sb16.c#11 integrate
.. //depot/projects/smpng/sys/dev/sound/isa/sb8.c#9 integrate
.. //depot/projects/smpng/sys/dev/sound/pci/als4000.c#11 integrate
.. //depot/projects/smpng/sys/dev/sound/pci/au88x0.c#6 integrate
.. //depot/projects/smpng/sys/dev/sound/pci/aureal.c#8 integrate
.. //depot/projects/smpng/sys/dev/sound/pci/cmi.c#18 integrate
.. //depot/projects/smpng/sys/dev/sound/pci/cs4281.c#10 integrate
.. //depot/projects/smpng/sys/dev/sound/pci/csapcm.c#7 integrate
.. //depot/projects/smpng/sys/dev/sound/pci/ds1.c#12 integrate
.. //depot/projects/smpng/sys/dev/sound/pci/emu10k1.c#16 integrate
.. //depot/projects/smpng/sys/dev/sound/pci/es137x.c#10 integrate
.. //depot/projects/smpng/sys/dev/sound/pci/fm801.c#11 integrate
.. //depot/projects/smpng/sys/dev/sound/pci/ich.c#25 integrate
.. //depot/projects/smpng/sys/dev/sound/pci/maestro.c#10 integrate
.. //depot/projects/smpng/sys/dev/sound/pci/maestro3.c#16 integrate
.. //depot/projects/smpng/sys/dev/sound/pci/neomagic.c#6 integrate
.. //depot/projects/smpng/sys/dev/sound/pci/solo.c#9 integrate
.. //depot/projects/smpng/sys/dev/sound/pci/t4dwave.c#15 integrate
.. //depot/projects/smpng/sys/dev/sound/pci/via8233.c#10 integrate
.. //depot/projects/smpng/sys/dev/sound/pci/via82c686.c#15 integrate
.. //depot/projects/smpng/sys/dev/sound/pci/vibes.c#9 integrate
.. //depot/projects/smpng/sys/dev/sound/pcm/channel.c#27 integrate
.. //depot/projects/smpng/sys/dev/sound/pcm/channel.h#10 integrate
.. //depot/projects/smpng/sys/dev/sound/pcm/dsp.c#20 integrate
.. //depot/projects/smpng/sys/dev/sound/pcm/sound.c#22 integrate
.. //depot/projects/smpng/sys/dev/sound/pcm/sound.h#15 integrate
.. //depot/projects/smpng/sys/dev/trm/trm.c#15 integrate
.. //depot/projects/smpng/sys/dev/trm/trm.h#4 integrate
.. //depot/projects/smpng/sys/dev/usb/if_udav.c#1 branch
.. //depot/projects/smpng/sys/dev/usb/if_udavreg.h#1 branch
.. //depot/projects/smpng/sys/dev/usb/ubser.c#1 branch
.. //depot/projects/smpng/sys/dev/usb/ubser.h#1 branch
.. //depot/projects/smpng/sys/dev/usb/uftdi.c#10 integrate
.. //depot/projects/smpng/sys/dev/usb/umass.c#36 integrate
.. //depot/projects/smpng/sys/dev/usb/usbdevs#47 integrate
.. //depot/projects/smpng/sys/dev/usb/usbdevs.h#47 integrate
.. //depot/projects/smpng/sys/dev/usb/usbdevs_data.h#47 integrate
.. //depot/projects/smpng/sys/dev/usb/usbdi.c#16 integrate
.. //depot/projects/smpng/sys/dev/utopia/utopia.c#4 integrate
.. //depot/projects/smpng/sys/dev/vinum/vinumext.h#10 integrate
.. //depot/projects/smpng/sys/dev/vinum/vinumio.c#17 integrate
.. //depot/projects/smpng/sys/dev/vinum/vinumrequest.c#15 integrate
.. //depot/projects/smpng/sys/dev/watchdog/watchdog.c#1 branch
.. //depot/projects/smpng/sys/fs/portalfs/portal_vnops.c#15 integrate
.. //depot/projects/smpng/sys/fs/specfs/spec_vnops.c#30 integrate
.. //depot/projects/smpng/sys/fs/udf/udf_vnops.c#16 integrate
.. //depot/projects/smpng/sys/geom/bde/g_bde_work.c#12 integrate
.. //depot/projects/smpng/sys/geom/concat/g_concat.c#3 integrate
.. //depot/projects/smpng/sys/geom/concat/g_concat.h#3 integrate
.. //depot/projects/smpng/sys/geom/geom.h#36 integrate
.. //depot/projects/smpng/sys/geom/geom_dump.c#23 integrate
.. //depot/projects/smpng/sys/geom/geom_event.c#27 integrate
.. //depot/projects/smpng/sys/geom/geom_int.h#12 integrate
.. //depot/projects/smpng/sys/geom/geom_subr.c#38 integrate
.. //depot/projects/smpng/sys/i386/acpica/acpi_toshiba.c#2 integrate
.. //depot/projects/smpng/sys/i386/conf/NOTES#78 integrate
.. //depot/projects/smpng/sys/i386/i386/critical.c#10 integrate
.. //depot/projects/smpng/sys/i386/i386/elan-mmcr.c#15 integrate
.. //depot/projects/smpng/sys/i386/i386/geode.c#2 integrate
.. //depot/projects/smpng/sys/i386/i386/p4tcc.c#2 integrate
.. //depot/projects/smpng/sys/i386/i386/pmap.c#58 integrate
.. //depot/projects/smpng/sys/i386/i386/vm_machdep.c#48 integrate
.. //depot/projects/smpng/sys/i386/include/cpufunc.h#25 integrate
.. //depot/projects/smpng/sys/i386/include/critical.h#6 integrate
.. //depot/projects/smpng/sys/i386/include/pmap.h#19 integrate
.. //depot/projects/smpng/sys/ia64/ia64/pmap.c#54 integrate
.. //depot/projects/smpng/sys/ia64/include/critical.h#4 integrate
.. //depot/projects/smpng/sys/ia64/include/pmap.h#15 integrate
.. //depot/projects/smpng/sys/isa/fd.c#30 integrate
.. //depot/projects/smpng/sys/kern/init_main.c#42 integrate
.. //depot/projects/smpng/sys/kern/kern_acct.c#32 integrate
.. //depot/projects/smpng/sys/kern/kern_clock.c#31 integrate
.. //depot/projects/smpng/sys/kern/kern_exec.c#67 integrate
.. //depot/projects/smpng/sys/kern/kern_exit.c#73 integrate
.. //depot/projects/smpng/sys/kern/kern_fork.c#74 integrate
.. //depot/projects/smpng/sys/kern/kern_intr.c#42 integrate
.. //depot/projects/smpng/sys/kern/kern_sig.c#88 integrate
.. //depot/projects/smpng/sys/kern/kern_synch.c#66 integrate
.. //depot/projects/smpng/sys/kern/kern_sysctl.c#37 integrate
.. //depot/projects/smpng/sys/kern/kern_tc.c#28 integrate
.. //depot/projects/smpng/sys/kern/kern_thread.c#52 integrate
.. //depot/projects/smpng/sys/kern/sched_4bsd.c#24 integrate
.. //depot/projects/smpng/sys/kern/subr_sleepqueue.c#2 integrate
.. //depot/projects/smpng/sys/kern/subr_smp.c#29 integrate
.. //depot/projects/smpng/sys/kern/subr_trap.c#62 integrate
.. //depot/projects/smpng/sys/kern/uipc_socket.c#48 integrate
.. //depot/projects/smpng/sys/kern/uipc_socket2.c#31 integrate
.. //depot/projects/smpng/sys/kern/uipc_syscalls.c#48 integrate
.. //depot/projects/smpng/sys/kern/uipc_usrreq.c#33 integrate
.. //depot/projects/smpng/sys/kern/vfs_bio.c#59 integrate
.. //depot/projects/smpng/sys/kern/vfs_subr.c#70 integrate
.. //depot/projects/smpng/sys/kern/vfs_syscalls.c#69 integrate
.. //depot/projects/smpng/sys/modules/Makefile#71 integrate
.. //depot/projects/smpng/sys/modules/acpi/Makefile#20 integrate
.. //depot/projects/smpng/sys/modules/acpi/acpi/Makefile#3 integrate
.. //depot/projects/smpng/sys/modules/acpi/acpi_video/Makefile#1 branch
.. //depot/projects/smpng/sys/modules/ctau/Makefile#1 branch
.. //depot/projects/smpng/sys/modules/if_ndis/Makefile#2 integrate
.. //depot/projects/smpng/sys/modules/ndis/Makefile#3 integrate
.. //depot/projects/smpng/sys/modules/netgraph/Makefile#11 integrate
.. //depot/projects/smpng/sys/modules/netgraph/atmllc/Makefile#1 branch
.. //depot/projects/smpng/sys/modules/netgraph/vlan/Makefile#1 branch
.. //depot/projects/smpng/sys/modules/ubser/Makefile#1 branch
.. //depot/projects/smpng/sys/modules/udav/Makefile#1 branch
.. //depot/projects/smpng/sys/net/bpf.c#33 integrate
.. //depot/projects/smpng/sys/net/bpfdesc.h#8 integrate
.. //depot/projects/smpng/sys/net/if_disc.c#11 integrate
.. //depot/projects/smpng/sys/net/if_ethersubr.c#43 integrate
.. //depot/projects/smpng/sys/net/if_faith.c#19 integrate
.. //depot/projects/smpng/sys/net/if_fddisubr.c#16 integrate
.. //depot/projects/smpng/sys/net/if_loop.c#27 integrate
.. //depot/projects/smpng/sys/net/if_stf.c#23 integrate
.. //depot/projects/smpng/sys/net/if_tap.c#24 integrate
.. //depot/projects/smpng/sys/net/raw_usrreq.c#14 integrate
.. //depot/projects/smpng/sys/netatalk/ddp_usrreq.c#17 integrate
.. //depot/projects/smpng/sys/netgraph/bluetooth/socket/ng_btsocket_hci_raw.c#11 integrate
.. //depot/projects/smpng/sys/netgraph/bluetooth/socket/ng_btsocket_l2cap.c#9 integrate
.. //depot/projects/smpng/sys/netgraph/bluetooth/socket/ng_btsocket_l2cap_raw.c#8 integrate
.. //depot/projects/smpng/sys/netgraph/bluetooth/socket/ng_btsocket_rfcomm.c#4 integrate
.. //depot/projects/smpng/sys/netgraph/ng_atmllc.c#1 branch
.. //depot/projects/smpng/sys/netgraph/ng_atmllc.h#1 branch
.. //depot/projects/smpng/sys/netgraph/ng_iface.c#11 integrate
.. //depot/projects/smpng/sys/netgraph/ng_iface.h#4 integrate
.. //depot/projects/smpng/sys/netgraph/ng_vlan.c#1 branch
.. //depot/projects/smpng/sys/netgraph/ng_vlan.h#1 branch
.. //depot/projects/smpng/sys/netinet/in_pcb.c#42 integrate
.. //depot/projects/smpng/sys/netinet/in_var.h#9 integrate
.. //depot/projects/smpng/sys/netinet/ip_dummynet.c#29 integrate
.. //depot/projects/smpng/sys/netinet/ip_encap.c#12 integrate
.. //depot/projects/smpng/sys/netinet/ip_input.c#50 integrate
.. //depot/projects/smpng/sys/netinet/ip_mroute.c#30 integrate
.. //depot/projects/smpng/sys/netinet/ip_output.c#53 integrate
.. //depot/projects/smpng/sys/netinet/pim.h#2 integrate
.. //depot/projects/smpng/sys/netinet/tcp_input.c#51 integrate
.. //depot/projects/smpng/sys/netinet/tcp_subr.c#46 integrate
.. //depot/projects/smpng/sys/netinet/tcp_var.h#23 integrate
.. //depot/projects/smpng/sys/netinet6/ah_core.c#7 integrate
.. //depot/projects/smpng/sys/netinet6/in6.c#20 integrate
.. //depot/projects/smpng/sys/netinet6/ip6_input.c#30 integrate
.. //depot/projects/smpng/sys/netinet6/mld6.c#8 integrate
.. //depot/projects/smpng/sys/netipx/ipx_pcb.c#10 integrate
.. //depot/projects/smpng/sys/netipx/spx_usrreq.c#11 integrate
.. //depot/projects/smpng/sys/netnatm/natm.c#17 integrate
.. //depot/projects/smpng/sys/netsmb/smb_conn.c#11 integrate
.. //depot/projects/smpng/sys/netsmb/smb_trantcp.c#16 integrate
.. //depot/projects/smpng/sys/nfs4client/nfs4_socket.c#2 integrate
.. //depot/projects/smpng/sys/nfs4client/nfs4_subs.c#3 integrate
.. //depot/projects/smpng/sys/nfs4client/nfs4_vfsops.c#3 integrate
.. //depot/projects/smpng/sys/nfs4client/nfs4_vnops.c#2 integrate
.. //depot/projects/smpng/sys/nfsclient/nfs.h#14 integrate
.. //depot/projects/smpng/sys/nfsclient/nfs_vfsops.c#35 integrate
.. //depot/projects/smpng/sys/nfsserver/nfs.h#10 integrate
.. //depot/projects/smpng/sys/nfsserver/nfs_srvcache.c#7 integrate
.. //depot/projects/smpng/sys/nfsserver/nfs_srvsock.c#16 integrate
.. //depot/projects/smpng/sys/nfsserver/nfs_srvsubs.c#18 integrate
.. //depot/projects/smpng/sys/opencrypto/crypto.c#10 integrate
.. //depot/projects/smpng/sys/pc98/conf/GENERIC#40 integrate
.. //depot/projects/smpng/sys/pc98/conf/NOTES#22 integrate
.. //depot/projects/smpng/sys/pc98/pc98/fd.c#29 integrate
.. //depot/projects/smpng/sys/pc98/pc98/sio_cbus.c#6 integrate
.. //depot/projects/smpng/sys/pc98/pc98/wd_cd.h#3 integrate
.. //depot/projects/smpng/sys/powerpc/include/critical.h#5 integrate
.. //depot/projects/smpng/sys/powerpc/include/sr.h#3 integrate
.. //depot/projects/smpng/sys/powerpc/include/ucontext.h#2 integrate
.. //depot/projects/smpng/sys/powerpc/include/vmparam.h#4 integrate
.. //depot/projects/smpng/sys/powerpc/powermac/ata_kauai.c#2 integrate
.. //depot/projects/smpng/sys/powerpc/powerpc/copyinout.c#9 integrate
.. //depot/projects/smpng/sys/powerpc/powerpc/machdep.c#50 integrate
.. //depot/projects/smpng/sys/powerpc/powerpc/pmap.c#38 integrate
.. //depot/projects/smpng/sys/powerpc/powerpc/vm_machdep.c#32 integrate
.. //depot/projects/smpng/sys/rpc/rpcclnt.c#4 integrate
.. //depot/projects/smpng/sys/security/mac/mac_net.c#10 integrate
.. //depot/projects/smpng/sys/sparc64/include/_types.h#4 integrate
.. //depot/projects/smpng/sys/sparc64/include/critical.h#4 integrate
.. //depot/projects/smpng/sys/sparc64/sparc64/pmap.c#45 integrate
.. //depot/projects/smpng/sys/sys/_null.h#4 integrate
.. //depot/projects/smpng/sys/sys/eventhandler.h#19 integrate
.. //depot/projects/smpng/sys/sys/filedesc.h#21 integrate
.. //depot/projects/smpng/sys/sys/kernel.h#23 integrate
.. //depot/projects/smpng/sys/sys/mdioctl.h#7 integrate
.. //depot/projects/smpng/sys/sys/mutex.h#40 integrate
.. //depot/projects/smpng/sys/sys/param.h#58 integrate
.. //depot/projects/smpng/sys/sys/pcpu.h#11 integrate
.. //depot/projects/smpng/sys/sys/socketvar.h#35 integrate
.. //depot/projects/smpng/sys/sys/time.h#14 integrate
.. //depot/projects/smpng/sys/sys/watchdog.h#3 integrate
.. //depot/projects/smpng/sys/vm/pmap.h#23 integrate
.. //depot/projects/smpng/sys/vm/uma_core.c#42 integrate
.. //depot/projects/smpng/sys/vm/vm_contig.c#22 integrate
.. //depot/projects/smpng/sys/vm/vm_extern.h#21 integrate
.. //depot/projects/smpng/sys/vm/vm_fault.c#34 integrate
.. //depot/projects/smpng/sys/vm/vm_glue.c#39 integrate
.. //depot/projects/smpng/sys/vm/vm_map.c#57 integrate
.. //depot/projects/smpng/sys/vm/vm_mmap.c#41 integrate
.. //depot/projects/smpng/sys/vm/vm_object.c#51 integrate
.. //depot/projects/smpng/sys/vm/vm_page.c#48 integrate
.. //depot/projects/smpng/sys/vm/vm_page.h#22 integrate
.. //depot/projects/smpng/sys/vm/vm_pageout.c#44 integrate
.. //depot/projects/smpng/sys/vm/vm_zeroidle.c#15 integrate
Differences ...
==== //depot/projects/smpng/sys/alpha/alpha/machdep.c#66 (text+ko) ====
@@ -88,7 +88,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/alpha/alpha/machdep.c,v 1.216 2004/01/03 02:02:24 davidxu Exp $");
+__FBSDID("$FreeBSD: src/sys/alpha/alpha/machdep.c,v 1.218 2004/03/01 19:19:15 kensmith Exp $");
#include "opt_compat.h"
#include "opt_ddb.h"
@@ -201,6 +201,9 @@
long unknownmem; /* amount of memory with an unknown use */
int ncpus; /* number of cpus */
+int promcons_dly_mkdev = 1; /* need to delay call to make_dev() */
+void promcons_delayed_makedev(void);
+
vm_offset_t phys_avail[10];
/* must be 2 less so 0 0 can signal end of chunks */
@@ -582,22 +585,6 @@
}
snprintf(cpu_model, sizeof(cpu_model), "%s", platform.model);
- /*
- * Initalize the real console, so the the bootstrap console is
- * no longer necessary.
- */
-#ifndef NO_SIO
- if (platform.cons_init) {
- platform.cons_init();
- promcndetach();
- }
-#else
- if (platform.cons_init)
- platform.cons_init();
- promcndetach();
- cninit();
-#endif
-
/* NO MORE FIRMWARE ACCESS ALLOWED */
#ifdef _PMAP_MAY_USE_PROM_CONSOLE
/*
@@ -889,6 +876,32 @@
}
/*
+ * Initalize the real console, so the the bootstrap console is
+ * no longer necessary. Note this now involves mutexes as part
+ * of some operations so needs to be after proc0/thread0/curthread
+ * become valid.
+ */
+#ifndef NO_SIO
+ if (platform.cons_init) {
+ platform.cons_init();
+ promcndetach();
+ }
+#else
+ if (platform.cons_init)
+ platform.cons_init();
+ promcndetach();
+ cninit();
+#endif
+
+ /*
+ * Check to see if promcons needs to make_dev() now,
+ * doing it before now crashes with kernel stack issues.
+ */
+ if (promcons_dly_mkdev > 1)
+ promcons_delayed_makedev();
+ promcons_dly_mkdev = 0;
+
+ /*
* Initialize the virtual memory system, and set the
* page table base register in proc 0's PCB.
*/
==== //depot/projects/smpng/sys/alpha/alpha/pmap.c#54 (text+ko) ====
@@ -148,7 +148,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/alpha/alpha/pmap.c,v 1.139 2003/10/03 22:46:52 alc Exp $");
+__FBSDID("$FreeBSD: src/sys/alpha/alpha/pmap.c,v 1.140 2004/03/07 21:06:46 alc Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -1109,18 +1109,6 @@
mtx_lock_spin(&allpmaps_lock);
LIST_INSERT_HEAD(&allpmaps, pmap, pm_list);
mtx_unlock_spin(&allpmaps_lock);
-}
-
-/*
- * Wire in kernel global address entries. To avoid a race condition
- * between pmap initialization and pmap_growkernel, this procedure
- * should be called after the vmspace is attached to the process
- * but before this pmap is activated.
- */
-void
-pmap_pinit2(pmap)
- struct pmap *pmap;
-{
bcopy(PTlev1 + K1SEGLEV1I, pmap->pm_lev1 + K1SEGLEV1I, nklev2 * PTESIZE);
}
==== //depot/projects/smpng/sys/alpha/alpha/promcons.c#17 (text+ko) ====
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/alpha/alpha/promcons.c,v 1.34 2004/02/21 21:10:38 phk Exp $");
+__FBSDID("$FreeBSD: src/sys/alpha/alpha/promcons.c,v 1.36 2004/02/28 16:36:14 kensmith Exp $");
#include <sys/param.h>
#include <sys/kernel.h>
@@ -83,6 +83,9 @@
int promparam(struct tty *, struct termios *);
void promstop(struct tty *, int);
+extern int promcons_dly_mkdev;
+void promcons_delayed_makedev(void);
+
int
promopen(dev, flag, mode, td)
dev_t dev;
@@ -248,12 +251,24 @@
{
prom_consdev.cn_pri = CN_NORMAL;
sprintf(prom_consdev.cn_name, "promcons");
- make_dev(&prom_cdevsw, 0, UID_ROOT, GID_WHEEL, 0600, "promcons");
+ if (promcons_dly_mkdev)
+ promcons_dly_mkdev++;
+ else {
+ make_dev(&prom_cdevsw, 0, UID_ROOT, GID_WHEEL, 0600, "promcons");
+ }
cnadd(&prom_consdev);
promcn_attached = 1;
}
void
+promcons_delayed_makedev(void)
+{
+ if (promcn_attached) {
+ make_dev(&prom_cdevsw, 0, UID_ROOT, GID_WHEEL, 0600, "promcons");
+ }
+}
+
+void
promcndetach(void)
{
if (promcn_attached) {
==== //depot/projects/smpng/sys/alpha/include/critical.h#4 (text+ko) ====
@@ -33,7 +33,7 @@
* related support functions residing
* in <arch>/<arch>/critical.c - prototyped
*
- * $FreeBSD: src/sys/alpha/include/critical.h,v 1.3 2003/08/12 23:24:03 imp Exp $
+ * $FreeBSD: src/sys/alpha/include/critical.h,v 1.4 2004/03/05 09:19:59 le Exp $
*/
#ifndef _MACHINE_CRITICAL_H_
@@ -81,8 +81,8 @@
#else /* !__GNUC__ */
-void cpu_critical_enter(void)
-void cpu_critical_exit(void)
+void cpu_critical_enter(void);
+void cpu_critical_exit(void);
#endif /* __GNUC__ */
==== //depot/projects/smpng/sys/alpha/include/pmap.h#17 (text+ko) ====
@@ -43,7 +43,7 @@
* from: hp300: @(#)pmap.h 7.2 (Berkeley) 12/16/90
* from: @(#)pmap.h 7.4 (Berkeley) 5/12/91
* from: i386 pmap.h,v 1.54 1997/11/20 19:30:35 bde Exp
- * $FreeBSD: src/sys/alpha/include/pmap.h,v 1.24 2003/10/06 01:47:11 bms Exp $
+ * $FreeBSD: src/sys/alpha/include/pmap.h,v 1.25 2004/03/07 07:13:15 alc Exp $
*/
#ifndef _MACHINE_PMAP_H_
@@ -212,8 +212,6 @@
extern pt_entry_t *CMAP1;
extern vm_offset_t avail_end;
extern vm_offset_t avail_start;
-extern vm_offset_t clean_eva;
-extern vm_offset_t clean_sva;
extern vm_offset_t phys_avail[];
extern vm_offset_t virtual_avail;
extern vm_offset_t virtual_end;
==== //depot/projects/smpng/sys/amd64/amd64/critical.c#6 (text+ko) ====
@@ -26,15 +26,19 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/amd64/amd64/critical.c,v 1.13 2003/12/06 23:13:22 peter Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/critical.c,v 1.14 2004/03/05 14:31:21 bde Exp $");
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/proc.h>
+
#include <machine/critical.h>
+#include <machine/psl.h>
/*
* cpu_critical_fork_exit() - cleanup after fork
+ *
+ * Enable interrupts in the saved copy of eflags.
*/
void
cpu_critical_fork_exit(void)
==== //depot/projects/smpng/sys/amd64/amd64/identcpu.c#7 (text+ko) ====
@@ -41,7 +41,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/amd64/amd64/identcpu.c,v 1.128 2003/11/21 03:01:59 peter Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/identcpu.c,v 1.129 2004/03/06 00:51:30 peter Exp $");
#include "opt_cpu.h"
@@ -123,8 +123,8 @@
}
if (strcmp(cpu_vendor, "GenuineIntel") == 0) {
- /* How the hell did you get here?? */
- strcat(cpu_model, "Yamhill?");
+ /* Better late than never I suppose.. */
+ strcat(cpu_model, "IA-32e");
} else if (strcmp(cpu_vendor, "AuthenticAMD") == 0) {
/*
* Values taken from AMD Processor Recognition
==== //depot/projects/smpng/sys/amd64/amd64/local_apic.c#4 (text+ko) ====
@@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/amd64/amd64/local_apic.c,v 1.7 2004/01/30 00:24:45 peter Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/local_apic.c,v 1.8 2004/03/08 00:15:29 peter Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -691,8 +691,8 @@
intr_restore(eflags);
}
+#define BEFORE_SPIN 1000000
#ifdef DETECT_DEADLOCK
-#define BEFORE_SPIN 1000000
#define AFTER_SPIN 1000
#endif
@@ -723,11 +723,9 @@
destfield = dest;
}
-#ifdef DETECT_DEADLOCK
- /* Check for an earlier stuck IPI. */
+ /* Wait for an earlier IPI to finish. */
if (!lapic_ipi_wait(BEFORE_SPIN))
panic("APIC: Previous IPI is stuck");
-#endif
lapic_ipi_raw(icrlo, destfield);
==== //depot/projects/smpng/sys/amd64/amd64/machdep.c#22 (text+ko) ====
@@ -39,7 +39,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/amd64/amd64/machdep.c,v 1.604 2004/02/25 23:12:39 peter Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/machdep.c,v 1.605 2004/03/08 00:16:52 peter Exp $");
#include "opt_atalk.h"
#include "opt_atpic.h"
@@ -1162,6 +1162,7 @@
pcpu_init(pc, 0, sizeof(struct pcpu));
PCPU_SET(prvspace, pc);
PCPU_SET(curthread, &thread0);
+ PCPU_SET(curpcb, thread0.td_pcb);
PCPU_SET(tssp, &common_tss[0]);
/*
==== //depot/projects/smpng/sys/amd64/amd64/mp_machdep.c#7 (text+ko) ====
@@ -25,7 +25,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/amd64/amd64/mp_machdep.c,v 1.234 2004/01/30 00:24:45 peter Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/mp_machdep.c,v 1.235 2004/03/08 00:25:03 peter Exp $");
#include "opt_cpu.h"
#include "opt_kstack_pages.h"
@@ -57,6 +57,7 @@
#include <machine/clock.h>
#include <machine/md_var.h>
#include <machine/pcb.h>
+#include <machine/psl.h>
#include <machine/smp.h>
#include <machine/specialreg.h>
#include <machine/tss.h>
==== //depot/projects/smpng/sys/amd64/amd64/pmap.c#23 (text+ko) ====
@@ -75,7 +75,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.452 2004/02/05 00:11:05 peter Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.453 2004/03/07 21:06:47 alc Exp $");
/*
* Manages physical address maps.
@@ -1103,19 +1103,6 @@
}
/*
- * Wire in kernel global address entries. To avoid a race condition
- * between pmap initialization and pmap_growkernel, this procedure
- * should be called after the vmspace is attached to the process
- * but before this pmap is activated.
- */
-void
-pmap_pinit2(pmap)
- struct pmap *pmap;
-{
- /* XXX: Remove this stub when no longer called */
-}
-
-/*
* this routine is called if the page table page is not
* mapped correctly.
*
==== //depot/projects/smpng/sys/amd64/amd64/trap.c#16 (text+ko) ====
@@ -38,7 +38,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/amd64/amd64/trap.c,v 1.272 2004/01/29 00:05:03 peter Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/trap.c,v 1.273 2004/03/08 00:17:27 peter Exp $");
/*
* AMD64 Trap and System call handling
@@ -371,8 +371,7 @@
frame.tf_rip = (long)doreti_iret_fault;
goto out;
}
- if (PCPU_GET(curpcb) != NULL &&
- PCPU_GET(curpcb)->pcb_onfault != NULL) {
+ if (PCPU_GET(curpcb)->pcb_onfault != NULL) {
frame.tf_rip =
(long)PCPU_GET(curpcb)->pcb_onfault;
goto out;
@@ -555,7 +554,6 @@
nogo:
if (!usermode) {
if (td->td_intr_nesting_level == 0 &&
- PCPU_GET(curpcb) != NULL &&
PCPU_GET(curpcb)->pcb_onfault != NULL) {
frame->tf_rip = (long)PCPU_GET(curpcb)->pcb_onfault;
return (0);
==== //depot/projects/smpng/sys/amd64/conf/NOTES#4 (text+ko) ====
@@ -4,31 +4,67 @@
# 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.4 2004/02/19 04:39:14 obrien Exp $
+# $FreeBSD: src/sys/amd64/conf/NOTES,v 1.10 2004/03/05 08:04:10 obrien Exp $
#
+# We don't have modules on amd64.
+makeoptions NO_MODULES=not_yet
+
#
# This directive is mandatory; it defines the architecture to be
-# configured for; in this case, the 386 family based IBM-PC and
-# compatibles.
+# configured for; in this case, the AMD64 family based machines.
#
machine amd64
-cpu HAMMER
-#
+#
# We want LINT to cover profiling as well
-profile 2
+#XXX#profile 2
+
+
+#####################################################################
+# SMP OPTIONS:
+#
+# The apic device enables the use of the I/O APIC for interrupt delivery.
+# The apic device can be used in both UP and SMP kernels, but is required
+# for SMP kernels. Thus, the apic device is not strictly an SMP option,
+# but it is a prerequisite for SMP.
+#
+# Notes:
+#
+# By default, mixed mode is used to route IRQ0 from the AT timer via
+# the 8259A master PIC through the ExtINT pin on the first I/O APIC.
+# This can be disabled via the NO_MIXED_MODE option. In that case,
+# IRQ0 will be routed via an intpin on the first I/O APIC. Not all
+# motherboards hook IRQ0 up to the first I/O APIC even though their
+# MP table or MADT may claim to do so. That is why mixed mode is
+# enabled by default.
+#
+
+# Optional:
+device atpic # Optional legacy pic support
+device mptable # Optional MPSPEC mptable support
+options NO_MIXED_MODE # Disable use of mixed mode
-# Debug options
-options NPX_DEBUG # enable npx debugging (FPU/math emu)
- #new math emulator
+#####################################################################
+# CPU OPTIONS
+
+#
+# You must specify at least one CPU (the one you intend to run on);
+# deleting the specification for CPUs you don't need to use may make
+# parts of the system run faster.
+#
+cpu HAMMER # aka K8, aka Opteron & Athlon64
+
+#
+# Options for CPU features.
+#
#
# PERFMON causes the driver for Pentium/Pentium Pro performance counters
# to be compiled. See perfmon(4) for more information.
#
-options PERFMON
+#XXX#options PERFMON
#####################################################################
@@ -39,7 +75,7 @@
# of network device drivers, which has significant benefits in terms
# of robustness to overloads and responsivity, as well as permitting
# accurate scheduling of the CPU time between kernel network processing
-# and other activities. The drawback is a moderate (up to 1/HZ seconds)
+# and other activities. The drawback is a moderate (up to 1/HZ seconds)
# potential increase in response times.
# It is strongly recommended to use HZ=1000 or 2000 with DEVICE_POLLING
# to achieve smoother behaviour.
@@ -48,8 +84,8 @@
# the CPU fraction reserved to userland with the sysctl variable
# kern.polling.user_frac (default 50, range 0..100).
#
-# Only the "dc" "fxp" and "sis" devices support this mode of operation at
-# the time of this writing.
+# Not all device drivers support this mode of operation at the time of
+# this writing. See polling(4) for more details.
options DEVICE_POLLING
@@ -59,20 +95,22 @@
# The following options are used for debugging clock behavior only, and
# should not be used for production systems.
-#
-# CLK_CALIBRATION_LOOP will run the clock calibration loop at startup
-# until the user presses a key.
+# CLK_CALIBRATION_LOOP causes clock calibration to be run in a loop at
+# startup until the user presses a key. (The i8254 clock is always
+# calibrated relative to the RTC (mc146818a) and this option causes the
+# calibration to be repeated.)
options CLK_CALIBRATION_LOOP
+# CLK_USE_I8254_CALIBRATION causes the calibrated frequency of the i8254
+# clock to actually be used.
>>> TRUNCATED FOR MAIL (1000 lines) <<<
More information about the p4-projects
mailing list