PERFORCE change 34637 for review
John Baldwin
jhb at FreeBSD.org
Thu Jul 17 11:19:58 PDT 2003
http://perforce.freebsd.org/chv.cgi?CH=34637
Change 34637 by jhb at jhb_laptop on 2003/07/17 11:19:08
IFC @34631.
Affected files ...
.. //depot/projects/smpng/sys/alpha/alpha/machdep.c#59 integrate
.. //depot/projects/smpng/sys/amd64/amd64/machdep.c#10 integrate
.. //depot/projects/smpng/sys/amd64/amd64/pmap.c#7 integrate
.. //depot/projects/smpng/sys/amd64/include/pmap.h#5 integrate
.. //depot/projects/smpng/sys/amd64/include/vmparam.h#3 integrate
.. //depot/projects/smpng/sys/boot/efi/libefi/arch/ia64/ldscript.ia64#5 integrate
.. //depot/projects/smpng/sys/boot/i386/libi386/biosacpi.c#4 integrate
.. //depot/projects/smpng/sys/boot/ia64/skiload/Makefile#8 integrate
.. //depot/projects/smpng/sys/boot/ia64/skiload/ldscript.ia64#2 integrate
.. //depot/projects/smpng/sys/boot/ia64/skiload/main.c#4 integrate
.. //depot/projects/smpng/sys/boot/ia64/skiload/start.S#1 branch
.. //depot/projects/smpng/sys/boot/pc98/boot2/asm.h#3 integrate
.. //depot/projects/smpng/sys/boot/sparc64/loader/main.c#15 integrate
.. //depot/projects/smpng/sys/cam/scsi/scsi_da.c#41 integrate
.. //depot/projects/smpng/sys/conf/NOTES#49 integrate
.. //depot/projects/smpng/sys/conf/files#82 integrate
.. //depot/projects/smpng/sys/conf/kern.pre.mk#21 integrate
.. //depot/projects/smpng/sys/conf/options#56 integrate
.. //depot/projects/smpng/sys/conf/options.i386#29 integrate
.. //depot/projects/smpng/sys/conf/options.ia64#16 integrate
.. //depot/projects/smpng/sys/conf/options.pc98#30 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/CHANGES.txt#5 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/acconfig.h#16 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/acdebug.h#11 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/acdisasm.h#5 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/acevents.h#9 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/acexcep.h#9 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/acfreebsd.h#8 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/acglobal.h#13 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/achware.h#6 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/acinterp.h#12 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/aclocal.h#15 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/acmacros.h#14 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/acnamesp.h#11 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/acobject.h#11 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/acpi.h#4 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/acpiosxf.h#12 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/acpixf.h#12 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/actables.h#7 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/actbl.h#5 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/actypes.h#15 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/acutils.h#16 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/dbcmds.c#14 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/dbdisply.c#15 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/dbexec.c#13 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/dbfileio.c#14 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/dbinput.c#12 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/dbstats.c#12 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/dbutils.c#12 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/dmbuffer.c#5 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/dmobject.c#1 branch
.. //depot/projects/smpng/sys/contrib/dev/acpica/dmopcode.c#5 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/dmresrc.c#4 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/dmwalk.c#4 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/dsfield.c#12 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/dsinit.c#2 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/dsmethod.c#14 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/dsmthdat.c#11 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/dsobject.c#15 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/dsopcode.c#14 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/dswexec.c#13 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/evevent.c#14 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/evgpe.c#2 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/evgpeblk.c#2 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/evmisc.c#14 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/evregion.c#12 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/evrgnini.c#13 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/evsci.c#8 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/evxface.c#12 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/evxfevnt.c#10 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/evxfregn.c#11 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/exconfig.c#13 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/exdump.c#14 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/exfldio.c#12 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/exoparg1.c#10 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/exregion.c#13 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/exstore.c#15 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/exsystem.c#11 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/exutils.c#13 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/hwacpi.c#11 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/hwgpe.c#10 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/hwregs.c#12 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/hwsleep.c#14 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/hwtimer.c#8 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/nsaccess.c#12 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/nsalloc.c#13 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/nsdumpdv.c#5 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/nsload.c#12 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/nsnames.c#12 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/nsparse.c#2 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/nssearch.c#13 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/nsutils.c#13 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/nswalk.c#8 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/nsxfeval.c#5 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/nsxfname.c#8 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/psargs.c#12 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/pswalk.c#8 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/psxface.c#13 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/rsaddr.c#7 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/rscalc.c#8 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/rsio.c#6 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/rsirq.c#8 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/rsmemory.c#5 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/rsmisc.c#7 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/rsxface.c#7 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/tbconvrt.c#12 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/tbget.c#14 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/tbgetall.c#5 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/tbinstal.c#14 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/tbutils.c#12 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/tbxface.c#11 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/utcopy.c#14 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/utdebug.c#14 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/utdelete.c#12 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/uteval.c#11 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/utglobal.c#14 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/utinit.c#12 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/utmisc.c#13 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/utobject.c#12 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/utxface.c#12 integrate
.. //depot/projects/smpng/sys/contrib/ia64/libuwx/src/Makefile#2 integrate
.. //depot/projects/smpng/sys/contrib/ia64/libuwx/src/uwx_trace.c#2 integrate
.. //depot/projects/smpng/sys/contrib/ia64/libuwx/src/uwx_trace.h#2 integrate
.. //depot/projects/smpng/sys/contrib/ia64/libuwx/src/uwx_uinfo.c#2 integrate
.. //depot/projects/smpng/sys/dev/aac/aac.c#28 integrate
.. //depot/projects/smpng/sys/dev/aac/aac_pci.c#23 integrate
.. //depot/projects/smpng/sys/dev/aac/aacvar.h#18 integrate
.. //depot/projects/smpng/sys/dev/acpica/Osd/OsdHardware.c#10 integrate
.. //depot/projects/smpng/sys/dev/acpica/Osd/OsdMemory.c#6 integrate
.. //depot/projects/smpng/sys/dev/acpica/Osd/OsdSynch.c#11 integrate
.. //depot/projects/smpng/sys/dev/acpica/acpi.c#44 integrate
.. //depot/projects/smpng/sys/dev/acpica/acpi_ec.c#18 integrate
.. //depot/projects/smpng/sys/dev/acpica/acpi_isab.c#2 integrate
.. //depot/projects/smpng/sys/dev/acpica/acpi_pci_link.c#6 integrate
.. //depot/projects/smpng/sys/dev/acpica/acpi_pcib.c#15 integrate
.. //depot/projects/smpng/sys/dev/acpica/acpivar.h#26 integrate
.. //depot/projects/smpng/sys/dev/ath/if_ath.c#3 integrate
.. //depot/projects/smpng/sys/dev/ath/if_athvar.h#2 integrate
.. //depot/projects/smpng/sys/dev/bge/if_bge.c#29 integrate
.. //depot/projects/smpng/sys/dev/bge/if_bgereg.h#16 integrate
.. //depot/projects/smpng/sys/dev/ciss/ciss.c#18 integrate
.. //depot/projects/smpng/sys/dev/en/midway.c#18 integrate
.. //depot/projects/smpng/sys/dev/firewire/firewire.c#21 integrate
.. //depot/projects/smpng/sys/dev/firewire/fwdev.c#8 integrate
.. //depot/projects/smpng/sys/dev/fxp/if_fxp.c#41 integrate
.. //depot/projects/smpng/sys/dev/hatm/if_hatm.c#3 integrate
.. //depot/projects/smpng/sys/dev/hatm/if_hatm_intr.c#2 integrate
.. //depot/projects/smpng/sys/dev/hatm/if_hatm_ioctl.c#2 integrate
.. //depot/projects/smpng/sys/dev/hatm/if_hatm_rx.c#2 integrate
.. //depot/projects/smpng/sys/dev/hatm/if_hatm_tx.c#2 integrate
.. //depot/projects/smpng/sys/dev/kbd/atkbd.c#9 integrate
.. //depot/projects/smpng/sys/dev/kbd/atkbdcreg.h#5 integrate
.. //depot/projects/smpng/sys/dev/mii/brgphy.c#15 integrate
.. //depot/projects/smpng/sys/dev/mii/miidevs#10 integrate
.. //depot/projects/smpng/sys/dev/patm/genrtab/Makefile#1 branch
.. //depot/projects/smpng/sys/dev/patm/genrtab/genrtab.c#1 branch
.. //depot/projects/smpng/sys/dev/patm/idt77252reg.h#1 branch
.. //depot/projects/smpng/sys/dev/patm/if_patm.c#1 branch
.. //depot/projects/smpng/sys/dev/patm/if_patm_attach.c#1 branch
.. //depot/projects/smpng/sys/dev/patm/if_patm_intr.c#1 branch
.. //depot/projects/smpng/sys/dev/patm/if_patm_ioctl.c#1 branch
.. //depot/projects/smpng/sys/dev/patm/if_patm_rtables.c#1 branch
.. //depot/projects/smpng/sys/dev/patm/if_patm_rx.c#1 branch
.. //depot/projects/smpng/sys/dev/patm/if_patm_tx.c#1 branch
.. //depot/projects/smpng/sys/dev/patm/if_patmvar.h#1 branch
.. //depot/projects/smpng/sys/dev/pccard/pccarddevs#27 integrate
.. //depot/projects/smpng/sys/dev/pccard/pccarddevs.h#27 integrate
.. //depot/projects/smpng/sys/dev/sbni/if_sbni.c#10 integrate
.. //depot/projects/smpng/sys/dev/usb/ehci.c#2 integrate
.. //depot/projects/smpng/sys/dev/usb/ehci_pci.c#4 integrate
.. //depot/projects/smpng/sys/dev/usb/if_aue.c#22 integrate
.. //depot/projects/smpng/sys/dev/usb/if_axe.c#4 integrate
.. //depot/projects/smpng/sys/dev/usb/if_cue.c#15 integrate
.. //depot/projects/smpng/sys/dev/usb/if_kue.c#14 integrate
.. //depot/projects/smpng/sys/dev/usb/if_rue.c#2 integrate
.. //depot/projects/smpng/sys/dev/usb/ohci.c#23 integrate
.. //depot/projects/smpng/sys/dev/usb/ohcireg.h#5 integrate
.. //depot/projects/smpng/sys/dev/usb/ohcivar.h#8 integrate
.. //depot/projects/smpng/sys/dev/usb/ubsa.c#5 integrate
.. //depot/projects/smpng/sys/dev/usb/ucom.c#11 integrate
.. //depot/projects/smpng/sys/dev/usb/udbp.c#9 integrate
.. //depot/projects/smpng/sys/dev/usb/uftdi.c#7 integrate
.. //depot/projects/smpng/sys/dev/usb/ugen.c#17 integrate
.. //depot/projects/smpng/sys/dev/usb/uhci.c#26 integrate
.. //depot/projects/smpng/sys/dev/usb/uhcivar.h#9 integrate
.. //depot/projects/smpng/sys/dev/usb/uhid.c#15 integrate
.. //depot/projects/smpng/sys/dev/usb/uhub.c#12 integrate
.. //depot/projects/smpng/sys/dev/usb/uplcom.c#7 integrate
.. //depot/projects/smpng/sys/dev/usb/usb.c#20 integrate
.. //depot/projects/smpng/sys/dev/usb/usb_mem.c#1 branch
.. //depot/projects/smpng/sys/dev/usb/usb_mem.h#4 integrate
.. //depot/projects/smpng/sys/dev/usb/usb_port.h#16 integrate
.. //depot/projects/smpng/sys/dev/usb/usb_subr.c#15 integrate
.. //depot/projects/smpng/sys/dev/usb/usbdevs#36 integrate
.. //depot/projects/smpng/sys/dev/usb/usbdevs.h#36 integrate
.. //depot/projects/smpng/sys/dev/usb/usbdevs_data.h#36 integrate
.. //depot/projects/smpng/sys/dev/usb/usbdi.c#13 integrate
.. //depot/projects/smpng/sys/dev/usb/usbdi.h#10 integrate
.. //depot/projects/smpng/sys/dev/usb/usbdi_util.c#8 integrate
.. //depot/projects/smpng/sys/dev/usb/usbdivar.h#11 integrate
.. //depot/projects/smpng/sys/dev/usb/uscanner.c#13 integrate
.. //depot/projects/smpng/sys/dev/usb/uvisor.c#6 integrate
.. //depot/projects/smpng/sys/dev/utopia/idtphy.h#2 integrate
.. //depot/projects/smpng/sys/dev/utopia/utopia.c#2 integrate
.. //depot/projects/smpng/sys/dev/utopia/utopia.h#2 integrate
.. //depot/projects/smpng/sys/dev/wi/if_wi_pccard.c#20 integrate
.. //depot/projects/smpng/sys/geom/geom_dump.c#21 integrate
.. //depot/projects/smpng/sys/i386/i386/busdma_machdep.c#22 integrate
.. //depot/projects/smpng/sys/i386/i386/locore.s#17 integrate
.. //depot/projects/smpng/sys/i386/i386/machdep.c#62 integrate
.. //depot/projects/smpng/sys/i386/i386/mp_machdep.c#48 integrate
.. //depot/projects/smpng/sys/i386/i386/pmap.c#42 integrate
.. //depot/projects/smpng/sys/i386/i386/swtch.s#19 integrate
.. //depot/projects/smpng/sys/i386/isa/apic_vector.s#17 integrate
.. //depot/projects/smpng/sys/ia64/ia64/db_trace.c#12 integrate
.. //depot/projects/smpng/sys/ia64/ia64/exception.S#2 integrate
.. //depot/projects/smpng/sys/ia64/ia64/machdep.c#60 integrate
.. //depot/projects/smpng/sys/ia64/ia64/syscall.S#2 integrate
.. //depot/projects/smpng/sys/ia64/ia64/trap.c#52 integrate
.. //depot/projects/smpng/sys/ia64/ia64/unwind.c#9 integrate
.. //depot/projects/smpng/sys/ia64/include/ia64_cpu.h#10 integrate
.. //depot/projects/smpng/sys/ia64/include/unwind.h#5 integrate
.. //depot/projects/smpng/sys/isa/psm.c#18 integrate
.. //depot/projects/smpng/sys/kern/kern_acct.c#29 integrate
.. //depot/projects/smpng/sys/kern/kern_descrip.c#49 integrate
.. //depot/projects/smpng/sys/kern/kern_lock.c#28 integrate
.. //depot/projects/smpng/sys/kern/kern_malloc.c#23 integrate
.. //depot/projects/smpng/sys/kern/kern_mtxpool.c#7 integrate
.. //depot/projects/smpng/sys/kern/kern_proc.c#54 integrate
.. //depot/projects/smpng/sys/kern/kern_prot.c#73 integrate
.. //depot/projects/smpng/sys/kern/kern_resource.c#38 integrate
.. //depot/projects/smpng/sys/kern/kern_sig.c#73 integrate
.. //depot/projects/smpng/sys/kern/kern_sx.c#19 integrate
.. //depot/projects/smpng/sys/kern/kern_synch.c#54 integrate
.. //depot/projects/smpng/sys/kern/kern_thread.c#40 integrate
.. //depot/projects/smpng/sys/kern/kern_umtx.c#6 integrate
.. //depot/projects/smpng/sys/kern/subr_mbpool.c#1 branch
.. //depot/projects/smpng/sys/kern/subr_param.c#13 integrate
.. //depot/projects/smpng/sys/kern/subr_witness.c#100 integrate
.. //depot/projects/smpng/sys/kern/sys_pipe.c#30 integrate
.. //depot/projects/smpng/sys/kern/uipc_socket.c#38 integrate
.. //depot/projects/smpng/sys/modules/Makefile#57 integrate
.. //depot/projects/smpng/sys/modules/acpi/Makefile#13 integrate
.. //depot/projects/smpng/sys/modules/libmbpool/Makefile#1 branch
.. //depot/projects/smpng/sys/modules/mii/Makefile#6 integrate
.. //depot/projects/smpng/sys/modules/patm/Makefile#1 branch
.. //depot/projects/smpng/sys/modules/usb/Makefile#4 integrate
.. //depot/projects/smpng/sys/net/if_atm.h#7 integrate
.. //depot/projects/smpng/sys/net/if_atmsubr.c#12 integrate
.. //depot/projects/smpng/sys/net/if_ethersubr.c#34 integrate
.. //depot/projects/smpng/sys/net/if_vlan.c#18 integrate
.. //depot/projects/smpng/sys/net/if_vlan_var.h#8 integrate
.. //depot/projects/smpng/sys/netgraph/atm/ng_atm.c#3 integrate
.. //depot/projects/smpng/sys/netgraph/bluetooth/drivers/ubt/ng_ubt.c#6 integrate
.. //depot/projects/smpng/sys/netinet/ip_fw.h#15 integrate
.. //depot/projects/smpng/sys/netinet/ip_fw2.c#17 integrate
.. //depot/projects/smpng/sys/netinet/tcp_input.c#35 integrate
.. //depot/projects/smpng/sys/netinet/tcp_seq.h#5 integrate
.. //depot/projects/smpng/sys/netinet/tcp_syncache.c#18 integrate
.. //depot/projects/smpng/sys/netinet/tcp_timer.c#13 integrate
.. //depot/projects/smpng/sys/netinet/tcp_var.h#15 integrate
.. //depot/projects/smpng/sys/netnatm/natm.c#12 integrate
.. //depot/projects/smpng/sys/pc98/i386/machdep.c#56 integrate
.. //depot/projects/smpng/sys/pc98/pc98/syscons.c#24 integrate
.. //depot/projects/smpng/sys/pci/if_dc.c#41 integrate
.. //depot/projects/smpng/sys/pci/if_dcreg.h#16 integrate
.. //depot/projects/smpng/sys/pci/if_rl.c#33 integrate
.. //depot/projects/smpng/sys/pci/if_rlreg.h#10 integrate
.. //depot/projects/smpng/sys/pci/if_xl.c#31 integrate
.. //depot/projects/smpng/sys/pci/if_xlreg.h#9 integrate
.. //depot/projects/smpng/sys/powerpc/powerpc/machdep.c#41 integrate
.. //depot/projects/smpng/sys/sparc64/conf/GENERIC#32 integrate
.. //depot/projects/smpng/sys/sparc64/include/asmacros.h#13 integrate
.. //depot/projects/smpng/sys/sparc64/include/bus.h#18 integrate
.. //depot/projects/smpng/sys/sparc64/include/bus_private.h#5 integrate
.. //depot/projects/smpng/sys/sparc64/include/elf.h#9 integrate
.. //depot/projects/smpng/sys/sparc64/include/intr_machdep.h#11 integrate
.. //depot/projects/smpng/sys/sparc64/include/iommuvar.h#12 integrate
.. //depot/projects/smpng/sys/sparc64/sparc64/bus_machdep.c#19 integrate
.. //depot/projects/smpng/sys/sparc64/sparc64/exception.S#12 integrate
.. //depot/projects/smpng/sys/sparc64/sparc64/genassym.c#30 integrate
.. //depot/projects/smpng/sys/sparc64/sparc64/interrupt.S#4 integrate
.. //depot/projects/smpng/sys/sparc64/sparc64/intr_machdep.c#18 integrate
.. //depot/projects/smpng/sys/sparc64/sparc64/iommu.c#19 integrate
.. //depot/projects/smpng/sys/sparc64/sparc64/machdep.c#53 integrate
.. //depot/projects/smpng/sys/sys/kernel.h#20 integrate
.. //depot/projects/smpng/sys/sys/mbpool.h#1 branch
.. //depot/projects/smpng/sys/sys/mutex.h#37 integrate
.. //depot/projects/smpng/sys/sys/proc.h#94 integrate
.. //depot/projects/smpng/sys/sys/sysctl.h#20 integrate
.. //depot/projects/smpng/sys/sys/systm.h#42 integrate
.. //depot/projects/smpng/sys/sys/vnode.h#34 integrate
.. //depot/projects/smpng/sys/vm/vm_init.c#8 integrate
Differences ...
==== //depot/projects/smpng/sys/alpha/alpha/machdep.c#59 (text+ko) ====
@@ -88,7 +88,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/alpha/alpha/machdep.c,v 1.204 2003/06/28 06:34:07 davidxu Exp $");
+__FBSDID("$FreeBSD: src/sys/alpha/alpha/machdep.c,v 1.205 2003/07/15 00:11:03 davidxu Exp $");
#include "opt_compat.h"
#include "opt_ddb.h"
@@ -1465,7 +1465,7 @@
* Build siginfo_t for SA thread
*/
void
-thread_siginfo(int sig, u_long code, siginfo_t *si)
+cpu_thread_siginfo(int sig, u_long code, siginfo_t *si)
{
struct proc *p;
struct thread *td;
==== //depot/projects/smpng/sys/amd64/amd64/machdep.c#10 (text+ko) ====
@@ -35,7 +35,7 @@
* SUCH DAMAGE.
*
* from: @(#)machdep.c 7.4 (Berkeley) 6/3/91
- * $FreeBSD: src/sys/amd64/amd64/machdep.c,v 1.583 2003/06/28 06:34:07 davidxu Exp $
+ * $FreeBSD: src/sys/amd64/amd64/machdep.c,v 1.584 2003/07/15 00:11:03 davidxu Exp $
*/
#include "opt_atalk.h"
@@ -303,7 +303,7 @@
* Build siginfo_t for SA thread
*/
void
-thread_siginfo(int sig, u_long code, siginfo_t *si)
+cpu_thread_siginfo(int sig, u_long code, siginfo_t *si)
{
struct proc *p;
struct thread *td;
==== //depot/projects/smpng/sys/amd64/amd64/pmap.c#7 (text+ko) ====
@@ -39,7 +39,7 @@
* SUCH DAMAGE.
*
* from: @(#)pmap.c 7.7 (Berkeley) 5/12/91
- * $FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.419 2003/07/03 20:18:01 alc Exp $
+ * $FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.423 2003/07/09 22:59:45 peter Exp $
*/
/*-
* Copyright (c) 2003 Networks Associates Technology, Inc.
@@ -330,6 +330,8 @@
pde = pmap_pde(pmap, va);
if (pde == NULL || (*pde & PG_V) == 0)
return NULL;
+ if ((*pde & PG_PS) != 0) /* compat with i386 pmap_pte() */
+ return ((pt_entry_t *)pde);
pte = (pt_entry_t *)PHYS_TO_DMAP(*pde & PG_FRAME);
return (&pte[pmap_pte_index(va)]);
}
@@ -386,14 +388,12 @@
((pd_entry_t *)KPDphys)[i] |= PG_RW | PG_V;
}
-#if 0
/* Map from zero to end of allocations under 2M pages */
/* This replaces some of the KPTphys entries above */
for (i = 0; (i << PDRSHIFT) < avail_start; i++) {
((pd_entry_t *)KPDphys)[i] = i << PDRSHIFT;
((pd_entry_t *)KPDphys)[i] |= PG_RW | PG_V | PG_PS;
}
-#endif
/* And connect up the PD to the PDP */
for (i = 0; i < NKPDPE; i++) {
@@ -890,6 +890,7 @@
if (m->hold_count == 0) {
vm_offset_t pteva;
+
/*
* unmap the page table page
*/
@@ -914,9 +915,11 @@
}
--pmap->pm_stats.resident_count;
if (m->pindex < NUPDE) {
- /* Unhold the PD page */
+ /* We just released a PT, unhold the matching PD */
vm_page_t pdpg;
- pdpg = vm_page_lookup(pmap->pm_pteobj, NUPDE + pmap_pdpe_index(va));
+
+ pdpg = vm_page_lookup(pmap->pm_pteobj, NUPDE +
+ ((va >> PDPSHIFT) & (NUPDPE - 1)));
while (vm_page_sleep_if_busy(pdpg, FALSE, "pulook"))
vm_page_lock_queues();
vm_page_unhold(pdpg);
@@ -924,9 +927,11 @@
_pmap_unwire_pte_hold(pmap, va, pdpg);
}
if (m->pindex >= NUPDE && m->pindex < (NUPDE + NUPDPE)) {
- /* Unhold the PDP page */
+ /* We just released a PD, unhold the matching PDP */
vm_page_t pdppg;
- pdppg = vm_page_lookup(pmap->pm_pteobj, NUPDE + NUPDPE + pmap_pml4e_index(va));
+
+ pdppg = vm_page_lookup(pmap->pm_pteobj, NUPDE + NUPDPE +
+ ((va >> PML4SHIFT) & (NUPML4E - 1)));
while (vm_page_sleep_if_busy(pdppg, FALSE, "pulooK"))
vm_page_lock_queues();
vm_page_unhold(pdppg);
@@ -1124,7 +1129,8 @@
_pmap_allocpte(pmap, NUPDE + NUPDPE + pml4index);
} else {
/* Add reference to pdp page */
- pdppg = pmap_page_lookup(pmap->pm_pteobj, NUPDE + NUPDPE + pml4index);
+ pdppg = pmap_page_lookup(pmap->pm_pteobj,
+ NUPDE + NUPDPE + pml4index);
pdppg->hold_count++;
}
pdp = (pdp_entry_t *)PHYS_TO_DMAP(*pml4 & PG_FRAME);
@@ -1150,16 +1156,17 @@
/* Have to allocate a new pd, recurse */
_pmap_allocpte(pmap, NUPDE + pdpindex);
pdp = (pdp_entry_t *)PHYS_TO_DMAP(*pml4 & PG_FRAME);
- pdp = &pdp[pdpindex];
+ pdp = &pdp[pdpindex & ((1ul << NPDPEPGSHIFT) - 1)];
} else {
pdp = (pdp_entry_t *)PHYS_TO_DMAP(*pml4 & PG_FRAME);
- pdp = &pdp[pdpindex];
+ pdp = &pdp[pdpindex & ((1ul << NPDPEPGSHIFT) - 1)];
if ((*pdp & PG_V) == 0) {
/* Have to allocate a new pd, recurse */
_pmap_allocpte(pmap, NUPDE + pdpindex);
} else {
/* Add reference to the pd page */
- pdpg = pmap_page_lookup(pmap->pm_pteobj, NUPDE + pdpindex);
+ pdpg = pmap_page_lookup(pmap->pm_pteobj,
+ NUPDE + pdpindex);
pdpg->hold_count++;
}
}
@@ -1239,7 +1246,7 @@
/***************************************************
-* Pmap allocation/deallocation routines.
+ * Pmap allocation/deallocation routines.
***************************************************/
/*
@@ -2119,7 +2126,7 @@
ptepa += NBPDR;
pde++;
}
- pmap_invalidate_all(kernel_pmap);
+ pmap_invalidate_all(pmap);
}
}
==== //depot/projects/smpng/sys/amd64/include/pmap.h#5 (text+ko) ====
@@ -42,7 +42,7 @@
*
* from: hp300: @(#)pmap.h 7.2 (Berkeley) 12/16/90
* from: @(#)pmap.h 7.4 (Berkeley) 5/12/91
- * $FreeBSD: src/sys/amd64/include/pmap.h,v 1.104 2003/06/22 13:02:45 simokawa Exp $
+ * $FreeBSD: src/sys/amd64/include/pmap.h,v 1.105 2003/07/09 23:04:23 peter Exp $
*/
#ifndef _MACHINE_PMAP_H_
@@ -86,14 +86,18 @@
* Pte related macros. This is complicated by having to deal with
* the sign extension of the 48th bit.
*/
-#define VADDR_SIGN(l4) \
- ((l4) >= NPML4EPG/2 ? ((unsigned long)-1 << 47) : 0ul)
-#define VADDR(l4, l3, l2, l1) ( \
- ((unsigned long)(l4) << PML4SHIFT) | VADDR_SIGN(l4) | \
+#define KVADDR(l4, l3, l2, l1) ( \
+ ((unsigned long)-1 << 47) | \
+ ((unsigned long)(l4) << PML4SHIFT) | \
((unsigned long)(l3) << PDPSHIFT) | \
((unsigned long)(l2) << PDRSHIFT) | \
((unsigned long)(l1) << PAGE_SHIFT))
+#define UVADDR(l4, l3, l2, l1) ( \
+ ((unsigned long)(l4) << PML4SHIFT) | \
+ ((unsigned long)(l3) << PDPSHIFT) | \
+ ((unsigned long)(l2) << PDRSHIFT) | \
+ ((unsigned long)(l1) << PAGE_SHIFT))
#ifndef NKPT
#define NKPT 120 /* initial number of kernel page tables */
@@ -103,7 +107,7 @@
#define NKPDPE 1 /* number of kernel PDP slots */
#define NKPDE (NKPDPE*NPDEPG) /* number of kernel PD slots */
-#define NUPML4E 1 /* number of userland PML4 pages */
+#define NUPML4E (NPML4EPG/2) /* number of userland PML4 pages */
#define NUPDPE (NUPML4E*NPDPEPG)/* number of userland PDP pages */
#define NUPDE (NUPDPE*NPDEPG) /* number of userland PD entries */
@@ -149,10 +153,10 @@
* in the page tables and the evil overlapping.
*/
#ifdef _KERNEL
-#define addr_PTmap (VADDR(PML4PML4I, 0, 0, 0))
-#define addr_PDmap (VADDR(PML4PML4I, PML4PML4I, 0, 0))
-#define addr_PDPmap (VADDR(PML4PML4I, PML4PML4I, PML4PML4I, 0))
-#define addr_PML4map (VADDR(PML4PML4I, PML4PML4I, PML4PML4I, PML4PML4I))
+#define addr_PTmap (KVADDR(PML4PML4I, 0, 0, 0))
+#define addr_PDmap (KVADDR(PML4PML4I, PML4PML4I, 0, 0))
+#define addr_PDPmap (KVADDR(PML4PML4I, PML4PML4I, PML4PML4I, 0))
+#define addr_PML4map (KVADDR(PML4PML4I, PML4PML4I, PML4PML4I, PML4PML4I))
#define addr_PML4pml4e (addr_PML4map + (PML4PML4I * sizeof(pml4_entry_t)))
#define PTmap ((pt_entry_t *)(addr_PTmap))
#define PDmap ((pd_entry_t *)(addr_PDmap))
==== //depot/projects/smpng/sys/amd64/include/vmparam.h#3 (text+ko) ====
@@ -36,7 +36,7 @@
* SUCH DAMAGE.
*
* from: @(#)vmparam.h 5.9 (Berkeley) 5/12/91
- * $FreeBSD: src/sys/amd64/include/vmparam.h,v 1.38 2003/05/23 06:36:46 peter Exp $
+ * $FreeBSD: src/sys/amd64/include/vmparam.h,v 1.39 2003/07/09 23:04:23 peter Exp $
*/
@@ -92,18 +92,18 @@
* messy at times, but hey, we'll do anything to save a page :-)
*/
-#define VM_MAX_KERNEL_ADDRESS VADDR(KPML4I, NPDPEPG-1, NKPDE-1, NPTEPG-1)
-#define VM_MIN_KERNEL_ADDRESS VADDR(KPML4I, KPDPI, 0, 0)
+#define VM_MAX_KERNEL_ADDRESS KVADDR(KPML4I, NPDPEPG-1, NKPDE-1, NPTEPG-1)
+#define VM_MIN_KERNEL_ADDRESS KVADDR(KPML4I, KPDPI, 0, 0)
-#define DMAP_MIN_ADDRESS VADDR(DMPML4I, 0, 0, 0)
-#define DMAP_MAX_ADDRESS VADDR(DMPML4I+1, 0, 0, 0)
+#define DMAP_MIN_ADDRESS KVADDR(DMPML4I, 0, 0, 0)
+#define DMAP_MAX_ADDRESS KVADDR(DMPML4I+1, 0, 0, 0)
-#define KERNBASE VADDR(KPML4I, KPDPI, 0, 0)
+#define KERNBASE KVADDR(KPML4I, KPDPI, 0, 0)
-#define UPT_MAX_ADDRESS VADDR(PML4PML4I, PML4PML4I, PML4PML4I, PML4PML4I)
-#define UPT_MIN_ADDRESS VADDR(PML4PML4I, 0, 0, 0)
+#define UPT_MAX_ADDRESS KVADDR(PML4PML4I, PML4PML4I, PML4PML4I, PML4PML4I)
+#define UPT_MIN_ADDRESS KVADDR(PML4PML4I, 0, 0, 0)
-#define VM_MAXUSER_ADDRESS VADDR(NUPML4E, 0, 0, 0)
+#define VM_MAXUSER_ADDRESS UVADDR(NUPML4E, 0, 0, 0)
#define USRSTACK VM_MAXUSER_ADDRESS
==== //depot/projects/smpng/sys/boot/efi/libefi/arch/ia64/ldscript.ia64#5 (text+ko) ====
@@ -1,4 +1,4 @@
-/* $FreeBSD: src/sys/boot/efi/libefi/arch/ia64/ldscript.ia64,v 1.6 2002/04/06 03:39:22 peter Exp $ */
+/* $FreeBSD: src/sys/boot/efi/libefi/arch/ia64/ldscript.ia64,v 1.7 2003/07/17 00:32:08 marcel Exp $ */
OUTPUT_FORMAT("elf64-ia64-little", "elf64-ia64-little", "elf64-ia64-little")
OUTPUT_ARCH(ia64)
ENTRY(_start_plabel)
@@ -7,74 +7,67 @@
/* Read-only sections, merged into text segment: */
. = 0;
ImageBase = .;
- . += 4096;
- .text :
- {
- *(.text)
- *(.stub)
- /* .gnu.warning sections are handled specially by elf32.em. */
+ . = SIZEOF_HEADERS;
+ . = ALIGN(4096);
+ .text : {
+ *(.text .stub .text.* .gnu.linkonce.t.*)
+ /* .gnu.warning sections are handled specially by elf32.em. */
*(.gnu.warning)
- *(.gnu.linkonce.t*)
*(.plt)
- }
+ } =0x00300000010070000002000001000400
. = ALIGN(4096);
- .hash : { *(.hash) }
- . = ALIGN(4096);
- .data :
- {
- *(.rodata*)
+ .data : {
+ *(.rodata .rodata.* .gnu.linkonce.r.*)
+ *(.rodata1)
+ *(.sdata2 .sdata2.* .gnu.linkonce.s2.*)
+ *(.sbss2 .sbss2.* .gnu.linkonce.sb2.*)
+ *(.opd)
+ *(.IA_64.unwind_info* .gnu.linkonce.ia64unwi.*)
+ *(.IA_64.unwind* .gnu.linkonce.ia64unw.*)
__start_set_Xcommand_set = .;
*(set_Xcommand_set)
__stop_set_Xcommand_set = .;
- *(.ctors)
- *(.data)
+ *(.data .data.* .gnu.linkonce.d.*)
*(.data1)
- *(.gnu.linkonce.d*)
*(.plabel)
- *(.IA_64.unwind)
- *(.IA_64.unwind_info)
- *(.bss)
*(.dynbss)
+ *(.bss .bss.* .gnu.linkonce.b.*)
*(COMMON)
}
. = ALIGN(4096);
__gp = .;
- .sdata :
- {
- *(.got.plt)
- *(.got)
+ .sdata : {
+ *(.got.plt .got)
*(.IA_64.pltoff)
- *(.sdata)
- *(.sbss)
+ *(.sdata .sdata.* .gnu.linkonce.s.*)
+ *(dynsbss)
+ *(.sbss .sbss.* .gnu.linkonce.sb.*)
*(.scommon)
}
. = ALIGN(4096);
- .dynamic : { *(.dynamic) }
+ .dynamic : { *(.dynamic) }
. = ALIGN(4096);
- .rela :
- {
- *(.rela.text)
- *(.rela.gnu.linkonce.t*)
- *(.rela.set.*)
- *(.rela.sdata)
- *(.rela.data)
- *(.rela.gnu.linkonce.d*)
+ .rela : {
+ *(.rela.text .rela.text.* .rela.gnu.linkonce.t.*)
+ *(.rela.rodata .rela.rodata.* .rela.gnu.linkonce.r.*)
+ *(.rela.data .rela.data.* .rela.gnu.linkonce.d.*)
*(.rela.got)
- *(.rela.stab)
- *(.rela.ctors)
+ *(.rela.sdata .rela.sdata.* .rela.gnu.linkonce.s.*)
+ *(.rela.sbss .rela.sbss.* .rela.gnu.linkonce.sb.*)
+ *(.rela.sdata2 .rela.sdata2.* .rela.gnu.linkonce.s2.*)
+ *(.rela.sbss2 .rela.sbss2.* .rela.gnu.linkonce.sb2.*)
+ *(.rela.bss .rela.bss.* .rela.gnu.linkonce.b.*)
+ *(.rela.plt)
+ *(.rela.IA_64.pltoff)
*(.relaset_*)
- *(.rela.IA_64.pltoff)
+ *(.rela.dyn .rela.dyn.*)
}
. = ALIGN(4096);
- .reloc : { *(.reloc) }
+ .reloc : { *(.reloc) }
+ . = ALIGN(4096);
+ .hash : { *(.hash) }
. = ALIGN(4096);
- .dynsym : { *(.dynsym) }
+ .dynsym : { *(.dynsym) }
. = ALIGN(4096);
- .dynstr : { *(.dynstr) }
- .ignored :
- {
- *(.rela.plabel)
- *(.rela.reloc)
- }
+ .dynstr : { *(.dynstr) }
}
-
==== //depot/projects/smpng/sys/boot/i386/libi386/biosacpi.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/biosacpi.c,v 1.4 2003/04/29 18:50:34 njl Exp $
+ * $FreeBSD: src/sys/boot/i386/libi386/biosacpi.c,v 1.5 2003/07/13 22:54:53 njl Exp $
*/
#include <stand.h>
@@ -31,6 +31,7 @@
#include <bootstrap.h>
#include "acfreebsd.h"
+#include "acconfig.h"
#define ACPI_SYSTEM_XFACE
#include "actypes.h"
#include "actbl.h"
==== //depot/projects/smpng/sys/boot/ia64/skiload/Makefile#8 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/sys/boot/ia64/skiload/Makefile,v 1.10 2003/02/26 06:18:52 obrien Exp $
+# $FreeBSD: src/sys/boot/ia64/skiload/Makefile,v 1.11 2003/07/17 01:49:59 marcel Exp $
.PATH: ${.CURDIR}/../common
@@ -7,7 +7,7 @@
NEWVERSWHAT= "ia64 SKI boot" ${MACHINE_ARCH}
BINDIR?= /boot
-SRCS+= main.c conf.c
+SRCS+= conf.c main.c start.S
CFLAGS+= -ffreestanding
==== //depot/projects/smpng/sys/boot/ia64/skiload/ldscript.ia64#2 (text+ko) ====
@@ -1,135 +1,61 @@
-/* $FreeBSD: src/sys/boot/ia64/skiload/ldscript.ia64,v 1.1 2001/09/12 08:34:27 dfr Exp $ */
+/* $FreeBSD: src/sys/boot/ia64/skiload/ldscript.ia64,v 1.2 2003/07/17 01:49:59 marcel Exp $ */
OUTPUT_FORMAT("elf64-ia64-little", "elf64-ia64-little", "elf64-ia64-little")
OUTPUT_ARCH(ia64)
-ENTRY(__start)
+ENTRY(_start)
SECTIONS
{
/* Read-only sections, merged into text segment: */
. = 0x100000;
-
- .text :
- {
- *(.text.ivt)
- . += 8192;
- *(.text)
- *(.stub)
- /* .gnu.warning sections are handled specially by elf32.em. */
+ .text : {
+ *(.text .stub .text.* .gnu.linkonce.t.*)
+ /* .gnu.warning sections are handled specially by elf32.em. */
*(.gnu.warning)
- *(.gnu.linkonce.t*)
- } =0x47ff041f
- .interp : { *(.interp) }
- .hash : { *(.hash) }
- .dynsym : { *(.dynsym) }
- .dynstr : { *(.dynstr) }
- .gnu.version : { *(.gnu.version) }
- .gnu.version_d : { *(.gnu.version_d) }
- .gnu.version_r : { *(.gnu.version_r) }
- .rel.text :
- { *(.rel.text) *(.rel.gnu.linkonce.t*) }
- .rela.text :
- { *(.rela.text) *(.rela.gnu.linkonce.t*) }
- .rel.data :
- { *(.rel.data) *(.rel.gnu.linkonce.d*) }
- .rela.data :
- { *(.rela.data) *(.rela.gnu.linkonce.d*) }
- .rel.rodata :
- { *(.rel.rodata) *(.rel.gnu.linkonce.r*) }
- .rela.rodata :
- { *(.rela.rodata) *(.rela.gnu.linkonce.r*) }
- .rel.got : { *(.rel.got) }
- .rela.got : { *(.rela.got) }
- .rel.ctors : { *(.rel.ctors) }
- .rela.ctors : { *(.rela.ctors) }
- .rel.dtors : { *(.rel.dtors) }
- .rela.dtors : { *(.rela.dtors) }
- .rel.init : { *(.rel.init) }
- .rela.init : { *(.rela.init) }
- .rel.fini : { *(.rel.fini) }
- .rela.fini : { *(.rela.fini) }
- .rel.bss : { *(.rel.bss) }
- .rela.bss : { *(.rela.bss) }
- .rel.plt : { *(.rel.plt) }
- .rela.plt : { *(.rela.plt) }
- .init : { *(.init) } =0x47ff041f
- _etext = .;
- PROVIDE (etext = .);
- .fini : { *(.fini) } =0x47ff041f
- .rodata : { *(.rodata) *(.gnu.linkonce.r*) }
- .rodata1 : { *(.rodata1) }
- .reginfo : { *(.reginfo) }
- /* Adjust the address for the data segment. We want to adjust up to
- the same address within the page on the next page up. */
- . = .;
- .data :
- {
- *(.data)
- *(.gnu.linkonce.d*)
- CONSTRUCTORS
+ *(.plt)
+ } =0x00300000010070000002000001000400
+ .data : {
+ *(.rodata .rodata.* .gnu.linkonce.r.*)
+ *(.rodata1)
+ *(.sdata2 .sdata2.* .gnu.linkonce.s2.*)
+ *(.sbss2 .sbss2.* .gnu.linkonce.sb2.*)
+ *(.opd)
+ *(.IA_64.unwind_info* .gnu.linkonce.ia64unwi.*)
+ *(.IA_64.unwind* .gnu.linkonce.ia64unw.*)
+ __start_set_Xcommand_set = .;
+ *(set_Xcommand_set)
+ __stop_set_Xcommand_set = .;
+ *(.data .data.* .gnu.linkonce.d.*)
+ *(.data1)
+ *(.plabel)
+ *(.dynbss)
+ *(.bss .bss.* .gnu.linkonce.b.*)
+ *(COMMON)
}
- .data1 : { *(.data1) }
- .ctors :
- {
- *(.ctors)
+ __gp = .;
+ .sdata : {
+ *(.got.plt .got)
+ *(.IA_64.pltoff)
+ *(.sdata .sdata.* .gnu.linkonce.s.*)
+ *(dynsbss)
+ *(.sbss .sbss.* .gnu.linkonce.sb.*)
+ *(.scommon)
}
- .dtors :
- {
- *(.dtors)
+ .dynamic : { *(.dynamic) }
+ .rela : {
+ *(.rela.text .rela.text.* .rela.gnu.linkonce.t.*)
+ *(.rela.rodata .rela.rodata.* .rela.gnu.linkonce.r.*)
+ *(.rela.data .rela.data.* .rela.gnu.linkonce.d.*)
+ *(.rela.got)
+ *(.rela.sdata .rela.sdata.* .rela.gnu.linkonce.s.*)
+ *(.rela.sbss .rela.sbss.* .rela.gnu.linkonce.sb.*)
+ *(.rela.sdata2 .rela.sdata2.* .rela.gnu.linkonce.s2.*)
+ *(.rela.sbss2 .rela.sbss2.* .rela.gnu.linkonce.sb2.*)
+ *(.rela.bss .rela.bss.* .rela.gnu.linkonce.b.*)
+ *(.rela.plt)
+ *(.rela.IA_64.pltoff)
+ *(.relaset_*)
+ *(.rela.dyn .rela.dyn.*)
}
- .plt : { *(.plt) }
- /* gp points at .got+(1<<21) */
- __gp = ALIGN(8) + 0x200000;
- .got : { *(.got.plt) *(.got) }
- .dynamic : { *(.dynamic) }
- /* We want the small data sections together, so single-instruction offsets
- can access them all, and initialized data all before uninitialized, so
- we can shorten the on-disk segment size. */
- .sdata : { *(.sdata) }
- _edata = .;
- PROVIDE (edata = .);
- __bss_start = .;
- .sbss : { *(.sbss) *(.scommon) }
- .bss :
- {
- *(.dynbss)
- *(.bss)
- *(COMMON)
- }
- . = ALIGN(64 / 8);
- _end = . ;
- PROVIDE (end = .);
- /* Stabs debugging sections. */
- .stab 0 : { *(.stab) }
- .stabstr 0 : { *(.stabstr) }
- .stab.excl 0 : { *(.stab.excl) }
- .stab.exclstr 0 : { *(.stab.exclstr) }
- .stab.index 0 : { *(.stab.index) }
- .stab.indexstr 0 : { *(.stab.indexstr) }
- .comment 0 : { *(.comment) }
- /* DWARF debug sections.
- Symbols in the DWARF debugging sections are relative to the beginning
- of the section so we begin them at 0. */
- /* DWARF 1 */
- .debug 0 : { *(.debug) }
- .line 0 : { *(.line) }
- /* GNU DWARF 1 extensions */
- .debug_srcinfo 0 : { *(.debug_srcinfo) }
- .debug_sfnames 0 : { *(.debug_sfnames) }
- /* DWARF 1.1 and DWARF 2 */
- .debug_aranges 0 : { *(.debug_aranges) }
- .debug_pubnames 0 : { *(.debug_pubnames) }
- /* DWARF 2 */
- .debug_info 0 : { *(.debug_info) }
- .debug_abbrev 0 : { *(.debug_abbrev) }
- .debug_line 0 : { *(.debug_line) }
- .debug_frame 0 : { *(.debug_frame) }
- .debug_str 0 : { *(.debug_str) }
- .debug_loc 0 : { *(.debug_loc) }
- .debug_macinfo 0 : { *(.debug_macinfo) }
- /* SGI/MIPS DWARF 2 extensions */
- .debug_weaknames 0 : { *(.debug_weaknames) }
- .debug_funcnames 0 : { *(.debug_funcnames) }
- .debug_typenames 0 : { *(.debug_typenames) }
- .debug_varnames 0 : { *(.debug_varnames) }
- /* These must appear regardless of . */
+ .hash : { *(.hash) }
+ .dynsym : { *(.dynsym) }
+ .dynstr : { *(.dynstr) }
}
-
==== //depot/projects/smpng/sys/boot/ia64/skiload/main.c#4 (text+ko) ====
@@ -26,7 +26,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/boot/ia64/skiload/main.c,v 1.3 2003/04/03 21:36:29 obrien Exp $");
+__FBSDID("$FreeBSD: src/sys/boot/ia64/skiload/main.c,v 1.4 2003/07/17 01:49:59 marcel Exp $");
#include <stand.h>
#include <string.h>
@@ -45,17 +45,11 @@
struct arch_switch archsw; /* MI/MD interface boundary */
void
-__start(void)
+ski_main(void)
{
- static char stack[16384] __aligned(16);
static char malloc[512*1024];
int i;
- __asm __volatile("movl gp=__gp;;");
- __asm __volatile("mov sp=%0" :: "r"(&stack[16384]));
- __asm __volatile("bsw.1;;");
- __asm __volatile("mov ar.fpsr=%0" :: "r"(IA64_FPSR_DEFAULT));
-
/*
* initialise the heap as early as possible. Once this is done,
* alloc() is usable. The stack is buried inside us, so this is
==== //depot/projects/smpng/sys/boot/pc98/boot2/asm.h#3 (text+ko) ====
@@ -24,7 +24,7 @@
* the rights to redistribute these changes.
*
* from: Mach, Revision 2.7 92/02/29 15:33:41 rpd
- * $FreeBSD: src/sys/boot/pc98/boot2/asm.h,v 1.4 2002/05/14 12:34:03 nyan Exp $
+ * $FreeBSD: src/sys/boot/pc98/boot2/asm.h,v 1.5 2003/07/13 08:13:52 nyan Exp $
*/
#define S_ARG0 4(%esp)
@@ -64,19 +64,19 @@
#define OUTL outl (%dx)
#else /* wheeze */
+
#define ALIGN
#define LCL(x) x
#define LB(x,n) n
#ifdef __STDC__
#define EXT(x) x
-#define LEXT(x) x ## :
-
+#define LEXT(x) .type EXT(x), at function; EXT(x):
#define LBb(x,n) n ## b
#define LBf(x,n) n ## f
#else /* __STDC__ */
#define EXT(x) _/**/x
-#define LEXT(x) _/**/x/**/:
+#define LEXT(x) .type EXT(x), at function; EXT(x)/**/:
#define LBb(x,n) n/**/b
#define LBf(x,n) n/**/f
#endif /* __STDC__ */
==== //depot/projects/smpng/sys/boot/sparc64/loader/main.c#15 (text+ko) ====
@@ -6,7 +6,7 @@
* As long as the above copyright statement and this notice remain
* unchanged, you can do what ever you want with this file.
*
- * $FreeBSD: src/sys/boot/sparc64/loader/main.c,v 1.20 2003/06/15 19:16:43 jake Exp $
+ * $FreeBSD: src/sys/boot/sparc64/loader/main.c,v 1.21 2003/07/11 16:12:50 tmm Exp $
*/
/*
* FreeBSD/sparc64 kernel loader - machine dependent part
@@ -115,7 +115,7 @@
#ifdef LOADER_BZIP2_SUPPORT
&bzipfs_fsops,
#endif
-#ifdef LOADER_NET_SUPPORT
+#ifdef LOADER_NFS_SUPPORT
&nfs_fsops,
#endif
#ifdef LOADER_TFTP_SUPPORT
>>> TRUNCATED FOR MAIL (1000 lines) <<<
More information about the p4-projects
mailing list