Date: Wed, 9 Oct 2002 12:27:47 -0700 (PDT) From: John Baldwin <jhb@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 18978 for review Message-ID: <200210091927.g99JRl3w047902@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/p4db/chv.cgi?CH=18978 Change 18978 by jhb@jhb_laptop on 2002/10/09 12:27:42 IFC @18977. Affected files ... .. //depot/projects/smpng/sys/alpha/alpha/busdma_machdep.c#7 integrate .. //depot/projects/smpng/sys/alpha/alpha/dec_2100_a50.c#4 integrate .. //depot/projects/smpng/sys/alpha/alpha/dec_axppci_33.c#5 integrate .. //depot/projects/smpng/sys/alpha/conf/GENERIC#23 integrate .. //depot/projects/smpng/sys/alpha/conf/SIMOS#7 integrate .. //depot/projects/smpng/sys/alpha/include/bus.h#3 integrate .. //depot/projects/smpng/sys/alpha/include/cpu.h#6 integrate .. //depot/projects/smpng/sys/alpha/include/setjmp.h#2 integrate .. //depot/projects/smpng/sys/alpha/include/stdarg.h#5 integrate .. //depot/projects/smpng/sys/alpha/include/varargs.h#4 integrate .. //depot/projects/smpng/sys/boot/alpha/boot1/Makefile#4 integrate .. //depot/projects/smpng/sys/boot/common/ufsread.c#3 integrate .. //depot/projects/smpng/sys/boot/i386/boot2/Makefile#8 integrate .. //depot/projects/smpng/sys/boot/i386/boot2/boot1.s#4 integrate .. //depot/projects/smpng/sys/boot/i386/boot2/boot2.c#14 integrate .. //depot/projects/smpng/sys/boot/i386/btx/btx/btx.s#3 integrate .. //depot/projects/smpng/sys/boot/i386/btx/btxldr/btxldr.s#2 integrate .. //depot/projects/smpng/sys/boot/pc98/boot2/Makefile#7 integrate .. //depot/projects/smpng/sys/boot/pc98/libpc98/biosdisk.c#4 integrate .. //depot/projects/smpng/sys/cam/scsi/scsi_all.h#5 integrate .. //depot/projects/smpng/sys/cam/scsi/scsi_cd.c#9 integrate .. //depot/projects/smpng/sys/cam/scsi/scsi_da.c#25 integrate .. //depot/projects/smpng/sys/compat/svr4/svr4_stream.c#11 integrate .. //depot/projects/smpng/sys/conf/NOTES#25 integrate .. //depot/projects/smpng/sys/conf/files#51 integrate .. //depot/projects/smpng/sys/conf/files.alpha#19 integrate .. //depot/projects/smpng/sys/conf/files.i386#32 integrate .. //depot/projects/smpng/sys/conf/files.ia64#19 integrate .. //depot/projects/smpng/sys/conf/files.pc98#31 integrate .. //depot/projects/smpng/sys/conf/files.sparc64#21 integrate .. //depot/projects/smpng/sys/conf/kern.mk#1 branch .. //depot/projects/smpng/sys/conf/kmod.mk#15 integrate .. //depot/projects/smpng/sys/conf/majors#14 integrate .. //depot/projects/smpng/sys/conf/options#37 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/CHANGES.txt#2 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/acconfig.h#13 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/acdebug.h#9 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/acexcep.h#7 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/acglobal.h#10 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/acinterp.h#9 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/aclocal.h#12 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/acmacros.h#12 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/acnamesp.h#8 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/acparser.h#9 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/actbl2.h#3 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/actypes.h#12 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/acutils.h#13 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/dbcmds.c#10 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/dbdisply.c#12 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/dbexec.c#10 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/dbinput.c#10 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/dbstats.c#9 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/dbxface.c#11 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/dmnames.c#3 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/dsfield.c#9 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/dsobject.c#12 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/dsopcode.c#11 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/dsutils.c#11 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/dswload.c#12 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/dswscope.c#6 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/evevent.c#11 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/evmisc.c#11 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/exconvrt.c#9 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/excreate.c#10 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/exdump.c#11 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/exmisc.c#12 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/exoparg1.c#7 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/exoparg2.c#7 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/exresnte.c#10 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/exresolv.c#10 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/exresop.c#11 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/exstore.c#12 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/exstoren.c#7 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/exstorob.c#7 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/nsdump.c#12 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/nsdumpdv.c#3 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/nsload.c#10 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/nsutils.c#10 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/psxface.c#11 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/rsdump.c#7 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/tbget.c#11 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/tbxface.c#9 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/utclib.c#5 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/utcopy.c#11 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/utdebug.c#12 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/utglobal.c#11 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/utinit.c#10 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/utmisc.c#10 integrate .. //depot/projects/smpng/sys/ddb/db_ps.c#13 integrate .. //depot/projects/smpng/sys/dev/acpica/acpi.c#33 integrate .. //depot/projects/smpng/sys/dev/acpica/acpi_pci_link.c#1 branch .. //depot/projects/smpng/sys/dev/acpica/acpi_pcib.c#13 integrate .. //depot/projects/smpng/sys/dev/acpica/acpi_pcib_acpi.c#2 integrate .. //depot/projects/smpng/sys/dev/acpica/acpi_pcib_pci.c#2 integrate .. //depot/projects/smpng/sys/dev/acpica/acpi_pcibvar.h#2 integrate .. //depot/projects/smpng/sys/dev/acpica/acpi_resource.c#10 integrate .. //depot/projects/smpng/sys/dev/advansys/adv_eisa.c#2 integrate .. //depot/projects/smpng/sys/dev/advansys/adv_pci.c#2 integrate .. //depot/projects/smpng/sys/dev/advansys/adw_pci.c#2 integrate .. //depot/projects/smpng/sys/dev/aha/aha.c#3 integrate .. //depot/projects/smpng/sys/dev/aha/aha_isa.c#2 integrate .. //depot/projects/smpng/sys/dev/aha/aha_mca.c#2 integrate .. //depot/projects/smpng/sys/dev/ata/ata-pci.c#24 integrate .. //depot/projects/smpng/sys/dev/buslogic/bt_eisa.c#2 integrate .. //depot/projects/smpng/sys/dev/buslogic/bt_isa.c#2 integrate .. //depot/projects/smpng/sys/dev/buslogic/bt_mca.c#2 integrate .. //depot/projects/smpng/sys/dev/buslogic/bt_pci.c#2 integrate .. //depot/projects/smpng/sys/dev/cardbus/cardbus.c#10 integrate .. //depot/projects/smpng/sys/dev/cardbus/cardbusreg.h#3 integrate .. //depot/projects/smpng/sys/dev/cardbus/cardbusvar.h#4 integrate .. //depot/projects/smpng/sys/dev/dpt/dpt_eisa.c#2 integrate .. //depot/projects/smpng/sys/dev/dpt/dpt_isa.c#2 integrate .. //depot/projects/smpng/sys/dev/dpt/dpt_pci.c#2 integrate .. //depot/projects/smpng/sys/dev/exca/exca.c#5 integrate .. //depot/projects/smpng/sys/dev/hifn/hifn7751.c#1 branch .. //depot/projects/smpng/sys/dev/hifn/hifn7751reg.h#1 branch .. //depot/projects/smpng/sys/dev/hifn/hifn7751var.h#1 branch .. //depot/projects/smpng/sys/dev/mcd/mcd.c#1 branch .. //depot/projects/smpng/sys/dev/mcd/mcd_isa.c#1 branch .. //depot/projects/smpng/sys/dev/mcd/mcdreg.h#1 branch .. //depot/projects/smpng/sys/dev/mcd/mcdvar.h#1 branch .. //depot/projects/smpng/sys/dev/pccard/pccard.c#13 integrate .. //depot/projects/smpng/sys/dev/pccard/pccard_cis.c#9 integrate .. //depot/projects/smpng/sys/dev/pccbb/pccbb.c#20 integrate .. //depot/projects/smpng/sys/dev/pccbb/pccbbvar.h#8 integrate .. //depot/projects/smpng/sys/dev/scd/scd.c#1 branch .. //depot/projects/smpng/sys/dev/scd/scdreg.h#1 branch .. //depot/projects/smpng/sys/dev/ubsec/ubsec.c#1 branch .. //depot/projects/smpng/sys/dev/ubsec/ubsecreg.h#1 branch .. //depot/projects/smpng/sys/dev/ubsec/ubsecvar.h#1 branch .. //depot/projects/smpng/sys/dev/usb/ubsa.c#1 branch .. //depot/projects/smpng/sys/dev/usb/usbdevs#23 integrate .. //depot/projects/smpng/sys/dev/usb/usbdevs.h#24 integrate .. //depot/projects/smpng/sys/dev/usb/usbdevs_data.h#24 integrate .. //depot/projects/smpng/sys/dev/vinum/vinumconfig.c#7 integrate .. //depot/projects/smpng/sys/dev/vinum/vinumio.c#9 integrate .. //depot/projects/smpng/sys/fs/devfs/devfs_rule.c#3 integrate .. //depot/projects/smpng/sys/fs/devfs/devfs_vnops.c#20 integrate .. //depot/projects/smpng/sys/fs/portalfs/portal_vfsops.c#8 integrate .. //depot/projects/smpng/sys/fs/umapfs/umap_vfsops.c#10 integrate .. //depot/projects/smpng/sys/fs/unionfs/union_vfsops.c#13 integrate .. //depot/projects/smpng/sys/geom/geom.h#12 integrate .. //depot/projects/smpng/sys/geom/geom_bsd.c#13 integrate .. //depot/projects/smpng/sys/geom/geom_dev.c#11 integrate .. //depot/projects/smpng/sys/geom/geom_disk.c#11 integrate .. //depot/projects/smpng/sys/geom/geom_dump.c#8 integrate .. //depot/projects/smpng/sys/geom/geom_int.h#4 integrate .. //depot/projects/smpng/sys/geom/geom_io.c#9 integrate .. //depot/projects/smpng/sys/geom/geom_kern.c#5 integrate .. //depot/projects/smpng/sys/geom/geom_subr.c#11 integrate .. //depot/projects/smpng/sys/i386/conf/GENERIC#29 integrate .. //depot/projects/smpng/sys/i386/conf/GENERIC.hints#2 integrate .. //depot/projects/smpng/sys/i386/conf/NOTES#43 integrate .. //depot/projects/smpng/sys/i386/conf/OLDCARD#5 integrate .. //depot/projects/smpng/sys/i386/i386/busdma_machdep.c#7 integrate .. //depot/projects/smpng/sys/i386/i386/machdep.c#47 integrate .. //depot/projects/smpng/sys/i386/i386/sys_machdep.c#22 integrate .. //depot/projects/smpng/sys/i386/i386/trap.c#44 integrate .. //depot/projects/smpng/sys/i386/i386/vm_machdep.c#28 integrate .. //depot/projects/smpng/sys/i386/include/bus_dma.h#2 integrate .. //depot/projects/smpng/sys/i386/include/setjmp.h#2 integrate .. //depot/projects/smpng/sys/i386/include/stdarg.h#7 integrate .. //depot/projects/smpng/sys/i386/include/ucontext.h#4 integrate .. //depot/projects/smpng/sys/i386/include/varargs.h#4 integrate .. //depot/projects/smpng/sys/i386/isa/matcd/TODO#2 delete .. //depot/projects/smpng/sys/i386/isa/matcd/audio.c#2 delete .. //depot/projects/smpng/sys/i386/isa/matcd/creative.h#2 delete .. //depot/projects/smpng/sys/i386/isa/matcd/matcd.c#6 delete .. //depot/projects/smpng/sys/i386/isa/matcd/matcddrv.h#2 delete .. //depot/projects/smpng/sys/i386/isa/matcd/options.h#2 delete .. //depot/projects/smpng/sys/i386/isa/mcd.c#6 delete .. //depot/projects/smpng/sys/i386/isa/mcdreg.h#2 delete .. //depot/projects/smpng/sys/i386/isa/scd.c#8 integrate .. //depot/projects/smpng/sys/i386/pci/pci_cfgreg.c#14 integrate .. //depot/projects/smpng/sys/ia64/conf/GENERIC#21 integrate .. //depot/projects/smpng/sys/ia64/conf/SKI#7 integrate .. //depot/projects/smpng/sys/ia64/ia64/busdma_machdep.c#7 integrate .. //depot/projects/smpng/sys/ia64/ia64/clock.c#8 integrate .. //depot/projects/smpng/sys/ia64/ia64/interrupt.c#14 integrate .. //depot/projects/smpng/sys/ia64/ia64/machdep.c#44 integrate .. //depot/projects/smpng/sys/ia64/ia64/mp_machdep.c#16 integrate .. //depot/projects/smpng/sys/ia64/ia64/sapic.c#9 integrate .. //depot/projects/smpng/sys/ia64/ia64/trap.c#37 integrate .. //depot/projects/smpng/sys/ia64/ia64/vm_machdep.c#18 integrate .. //depot/projects/smpng/sys/ia64/include/bus.h#3 integrate .. //depot/projects/smpng/sys/ia64/include/clock.h#3 integrate .. //depot/projects/smpng/sys/ia64/include/cpu.h#10 integrate .. //depot/projects/smpng/sys/ia64/include/sapicvar.h#3 integrate .. //depot/projects/smpng/sys/ia64/include/setjmp.h#4 integrate .. //depot/projects/smpng/sys/ia64/include/stdarg.h#6 integrate .. //depot/projects/smpng/sys/ia64/include/varargs.h#4 integrate .. //depot/projects/smpng/sys/kern/bus_if.m#6 integrate .. //depot/projects/smpng/sys/kern/init_main.c#25 integrate .. //depot/projects/smpng/sys/kern/kern_acct.c#20 integrate .. //depot/projects/smpng/sys/kern/kern_condvar.c#19 integrate .. //depot/projects/smpng/sys/kern/kern_conf.c#14 integrate .. //depot/projects/smpng/sys/kern/kern_exit.c#48 integrate .. //depot/projects/smpng/sys/kern/kern_fork.c#46 integrate .. //depot/projects/smpng/sys/kern/kern_mac.c#4 integrate .. //depot/projects/smpng/sys/kern/kern_proc.c#37 integrate .. //depot/projects/smpng/sys/kern/kern_resource.c#28 integrate .. //depot/projects/smpng/sys/kern/kern_switch.c#22 integrate .. //depot/projects/smpng/sys/kern/kern_synch.c#33 integrate .. //depot/projects/smpng/sys/kern/kern_thread.c#8 integrate .. //depot/projects/smpng/sys/kern/subr_bus.c#13 integrate .. //depot/projects/smpng/sys/kern/subr_disk.c#12 integrate .. //depot/projects/smpng/sys/kern/subr_sbuf.c#9 integrate .. //depot/projects/smpng/sys/kern/subr_trap.c#39 integrate .. //depot/projects/smpng/sys/kern/sys_socket.c#12 integrate .. //depot/projects/smpng/sys/kern/uipc_sem.c#2 integrate .. //depot/projects/smpng/sys/kern/uipc_socket.c#27 integrate .. //depot/projects/smpng/sys/kern/uipc_syscalls.c#27 integrate .. //depot/projects/smpng/sys/kern/vfs_subr.c#33 integrate .. //depot/projects/smpng/sys/kern/vfs_syscalls.c#46 integrate .. //depot/projects/smpng/sys/libkern/fnmatch.c#1 branch .. //depot/projects/smpng/sys/libkern/iconv.c#3 integrate .. //depot/projects/smpng/sys/libkern/quad.h#3 integrate .. //depot/projects/smpng/sys/modules/Makefile#34 integrate .. //depot/projects/smpng/sys/modules/acpi/Makefile#10 integrate .. //depot/projects/smpng/sys/modules/cryptodev/Makefile#1 branch .. //depot/projects/smpng/sys/modules/hifn/Makefile#1 branch .. //depot/projects/smpng/sys/modules/mcd/Makefile#1 branch .. //depot/projects/smpng/sys/modules/ubsec/Makefile#1 branch .. //depot/projects/smpng/sys/net/bridge.c#14 integrate .. //depot/projects/smpng/sys/nfsserver/nfs_serv.c#21 integrate .. //depot/projects/smpng/sys/opencrypto/cast.c#1 branch .. //depot/projects/smpng/sys/opencrypto/cast.h#1 branch .. //depot/projects/smpng/sys/opencrypto/castsb.h#1 branch .. //depot/projects/smpng/sys/opencrypto/criov.c#1 branch .. //depot/projects/smpng/sys/opencrypto/crmbuf.c#1 branch .. //depot/projects/smpng/sys/opencrypto/crypto.c#1 branch .. //depot/projects/smpng/sys/opencrypto/crypto_if.m#1 branch .. //depot/projects/smpng/sys/opencrypto/cryptodev.c#1 branch .. //depot/projects/smpng/sys/opencrypto/cryptodev.h#1 branch .. //depot/projects/smpng/sys/opencrypto/cryptosoft.c#1 branch .. //depot/projects/smpng/sys/opencrypto/cryptosoft.h#1 branch .. //depot/projects/smpng/sys/opencrypto/deflate.c#1 branch .. //depot/projects/smpng/sys/opencrypto/deflate.h#1 branch .. //depot/projects/smpng/sys/opencrypto/rijndael.c#1 branch .. //depot/projects/smpng/sys/opencrypto/rijndael.h#1 branch .. //depot/projects/smpng/sys/opencrypto/rmd160.c#1 branch .. //depot/projects/smpng/sys/opencrypto/rmd160.h#1 branch .. //depot/projects/smpng/sys/opencrypto/skipjack.c#1 branch .. //depot/projects/smpng/sys/opencrypto/skipjack.h#1 branch .. //depot/projects/smpng/sys/opencrypto/xform.c#1 branch .. //depot/projects/smpng/sys/opencrypto/xform.h#1 branch .. //depot/projects/smpng/sys/pc98/conf/GENERIC#25 integrate .. //depot/projects/smpng/sys/pc98/i386/machdep.c#41 integrate .. //depot/projects/smpng/sys/pc98/pc98/fd.c#15 integrate .. //depot/projects/smpng/sys/pc98/pc98/pcaudio.c#7 integrate .. //depot/projects/smpng/sys/pc98/pc98/wd.c#5 integrate .. //depot/projects/smpng/sys/pc98/pc98/wd_cd.c#8 integrate .. //depot/projects/smpng/sys/pccard/pcic_pci.c#25 integrate .. //depot/projects/smpng/sys/pci/if_dc.c#21 integrate .. //depot/projects/smpng/sys/pci/if_dcreg.h#9 integrate .. //depot/projects/smpng/sys/posix4/aio.h#3 delete .. //depot/projects/smpng/sys/posix4/semaphore.h#4 integrate .. //depot/projects/smpng/sys/powerpc/conf/GENERIC#11 integrate .. //depot/projects/smpng/sys/powerpc/include/db_machdep.h#5 integrate .. //depot/projects/smpng/sys/powerpc/include/param.h#6 integrate .. //depot/projects/smpng/sys/powerpc/include/setjmp.h#3 integrate .. //depot/projects/smpng/sys/powerpc/include/stdarg.h#7 integrate .. //depot/projects/smpng/sys/powerpc/include/varargs.h#4 integrate .. //depot/projects/smpng/sys/powerpc/powerpc/db_disasm.c#2 integrate .. //depot/projects/smpng/sys/powerpc/powerpc/db_interface.c#2 integrate .. //depot/projects/smpng/sys/powerpc/powerpc/db_memrw.c#2 integrate .. //depot/projects/smpng/sys/powerpc/powerpc/db_trace.c#3 integrate .. //depot/projects/smpng/sys/powerpc/powerpc/pmap.c#23 integrate .. //depot/projects/smpng/sys/powerpc/powerpc/trap.c#26 integrate .. //depot/projects/smpng/sys/security/mac_biba/mac_biba.c#4 integrate .. //depot/projects/smpng/sys/security/mac_bsdextended/mac_bsdextended.c#2 integrate .. //depot/projects/smpng/sys/security/mac_mls/mac_mls.c#4 integrate .. //depot/projects/smpng/sys/security/mac_none/mac_none.c#2 integrate .. //depot/projects/smpng/sys/security/mac_test/mac_test.c#2 integrate .. //depot/projects/smpng/sys/sparc64/conf/GENERIC#20 integrate .. //depot/projects/smpng/sys/sparc64/include/bus.h#8 integrate .. //depot/projects/smpng/sys/sparc64/include/clock.h#5 integrate .. //depot/projects/smpng/sys/sparc64/include/setjmp.h#6 integrate .. //depot/projects/smpng/sys/sparc64/include/stdarg.h#5 integrate .. //depot/projects/smpng/sys/sparc64/include/varargs.h#4 integrate .. //depot/projects/smpng/sys/sparc64/sparc64/bus_machdep.c#8 integrate .. //depot/projects/smpng/sys/sys/_sigset.h#2 integrate .. //depot/projects/smpng/sys/sys/bio.h#11 integrate .. //depot/projects/smpng/sys/sys/bus.h#7 integrate .. //depot/projects/smpng/sys/sys/cdefs.h#16 integrate .. //depot/projects/smpng/sys/sys/diskpc98.h#2 integrate .. //depot/projects/smpng/sys/sys/dmap.h#2 integrate .. //depot/projects/smpng/sys/sys/errno.h#8 integrate .. //depot/projects/smpng/sys/sys/file.h#13 integrate .. //depot/projects/smpng/sys/sys/libkern.h#7 integrate .. //depot/projects/smpng/sys/sys/mac.h#3 integrate .. //depot/projects/smpng/sys/sys/mac_policy.h#3 integrate .. //depot/projects/smpng/sys/sys/mbuf.h#13 integrate .. //depot/projects/smpng/sys/sys/proc.h#60 integrate .. //depot/projects/smpng/sys/sys/random.h#3 integrate .. //depot/projects/smpng/sys/sys/resourcevar.h#10 integrate .. //depot/projects/smpng/sys/sys/sbuf.h#7 integrate .. //depot/projects/smpng/sys/sys/select.h#4 integrate .. //depot/projects/smpng/sys/sys/signal.h#8 integrate .. //depot/projects/smpng/sys/sys/sysctl.h#13 integrate .. //depot/projects/smpng/sys/sys/types.h#18 integrate .. //depot/projects/smpng/sys/ufs/ffs/ffs_snapshot.c#16 integrate .. //depot/projects/smpng/sys/ufs/ffs/ffs_vfsops.c#31 integrate .. //depot/projects/smpng/sys/ufs/ufs/inode.h#7 integrate .. //depot/projects/smpng/sys/x86_64/include/stdarg.h#4 integrate Differences ... ==== //depot/projects/smpng/sys/alpha/alpha/busdma_machdep.c#7 (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/busdma_machdep.c,v 1.23 2002/04/04 21:03:13 jhb Exp $ + * $FreeBSD: src/sys/alpha/alpha/busdma_machdep.c,v 1.24 2002/10/04 20:40:39 sam Exp $ */ #include <sys/param.h> @@ -32,10 +32,14 @@ #include <sys/interrupt.h> #include <sys/lock.h> #include <sys/malloc.h> +#include <sys/mbuf.h> #include <sys/mutex.h> +#include <sys/proc.h> +#include <sys/uio.h> #include <vm/vm.h> #include <vm/vm_page.h> +#include <vm/vm_map.h> #include <machine/bus.h> #include <machine/sgmap.h> @@ -535,6 +539,209 @@ } /* + * Utility function to load a linear buffer. lastaddrp holds state + * between invocations (for multiple-buffer loads). segp contains + * the starting segment on entrace, and the ending segment on exit. + * first indicates if this is the first invocation of this function. + */ +static int +_bus_dmamap_load_buffer(bus_dma_tag_t dmat, + bus_dma_segment_t segs[], + void *buf, bus_size_t buflen, + struct thread *td, + int flags, + vm_offset_t *lastaddrp, + int *segp, + int first) +{ + bus_size_t sgsize; + bus_addr_t curaddr, lastaddr, baddr, bmask; + vm_offset_t vaddr = (vm_offset_t)buf; + int seg; + pmap_t pmap; + + if (td != NULL) + pmap = vmspace_pmap(td->td_proc->p_vmspace); + else + pmap = NULL; + + lastaddr = *lastaddrp; + bmask = ~(dmat->boundary - 1); + + for (seg = *segp; buflen > 0 ; ) { + /* + * Get the physical address for this segment. + */ + if (pmap) + curaddr = pmap_extract(pmap, vaddr); + else + curaddr = pmap_kextract(vaddr); + + /* + * Compute the segment size, and adjust counts. + */ + sgsize = PAGE_SIZE - ((u_long)curaddr & PAGE_MASK); + if (buflen < sgsize) + sgsize = buflen; + + /* + * Make sure we don't cross any boundaries. + */ + if (dmat->boundary > 0) { + baddr = (curaddr + dmat->boundary) & bmask; + if (sgsize > (baddr - curaddr)) + sgsize = (baddr - curaddr); + } + + /* + * Insert chunk into a segment, coalescing with + * previous segment if possible. + */ + if (first) { + segs[seg].ds_addr = curaddr + alpha_XXX_dmamap_or; + segs[seg].ds_len = sgsize; + first = 0; + } else { + if (curaddr == lastaddr && + (segs[seg].ds_len + sgsize) <= dmat->maxsegsz && + (dmat->boundary == 0 || + (segs[seg].ds_addr & bmask) == (curaddr & bmask))) + segs[seg].ds_len += sgsize; + else { + if (++seg >= dmat->nsegments) + break; + segs[seg].ds_addr = curaddr + alpha_XXX_dmamap_or; + segs[seg].ds_len = sgsize; + } + } + + lastaddr = curaddr + sgsize; + vaddr += sgsize; + buflen -= sgsize; + } + + *segp = seg; + *lastaddrp = lastaddr; + + /* + * Did we fit? + */ + return (buflen != 0 ? EFBIG : 0); /* XXX better return value here? */ +} + +/* + * Like _bus_dmamap_load(), but for mbufs. + */ +int +bus_dmamap_load_mbuf(bus_dma_tag_t dmat, bus_dmamap_t map, + struct mbuf *m0, + bus_dmamap_callback2_t *callback, void *callback_arg, + int flags) +{ +#ifdef __GNUC__ + bus_dma_segment_t dm_segments[dmat->nsegments]; +#else + bus_dma_segment_t dm_segments[BUS_DMAMAP_NSEGS]; +#endif + int nsegs, error; + + KASSERT(dmat->lowaddr >= ptoa(Maxmem) || map != NULL, + ("bus_dmamap_load_mbuf: No support for bounce pages!")); + KASSERT(m0->m_flags & M_PKTHDR, + ("bus_dmamap_load_mbuf: no packet header")); + + nsegs = 0; + error = 0; + if (m0->m_pkthdr.len <= dmat->maxsize) { + int first = 1; + vm_offset_t lastaddr = 0; + struct mbuf *m; + + for (m = m0; m != NULL && error == 0; m = m->m_next) { + error = _bus_dmamap_load_buffer(dmat, + dm_segments, + m->m_data, m->m_len, + NULL, flags, &lastaddr, &nsegs, first); + first = 0; + } + } else { + error = EINVAL; + } + + if (error) { + /* force "no valid mappings" in callback */ + (*callback)(callback_arg, dm_segments, 0, 0, error); + } else { + (*callback)(callback_arg, dm_segments, + nsegs+1, m0->m_pkthdr.len, error); + } + return (error); +} + +/* + * Like _bus_dmamap_load(), but for uios. + */ +int +bus_dmamap_load_uio(bus_dma_tag_t dmat, bus_dmamap_t map, + struct uio *uio, + bus_dmamap_callback2_t *callback, void *callback_arg, + int flags) +{ + vm_offset_t lastaddr; +#ifdef __GNUC__ + bus_dma_segment_t dm_segments[dmat->nsegments]; +#else + bus_dma_segment_t dm_segments[BUS_DMAMAP_NSEGS]; +#endif + int nsegs, error, first, i; + bus_size_t resid; + struct iovec *iov; + struct thread *td = NULL; + + KASSERT(dmat->lowaddr >= ptoa(Maxmem) || map != NULL, + ("bus_dmamap_load_uio: No support for bounce pages!")); + + resid = uio->uio_resid; + iov = uio->uio_iov; + + if (uio->uio_segflg == UIO_USERSPACE) { + td = uio->uio_td; + KASSERT(td != NULL, + ("bus_dmamap_load_uio: USERSPACE but no proc")); + } + + nsegs = 0; + error = 0; + first = 1; + for (i = 0; i < uio->uio_iovcnt && resid != 0 && !error; i++) { + /* + * Now at the first iovec to load. Load each iovec + * until we have exhausted the residual count. + */ + bus_size_t minlen = + resid < iov[i].iov_len ? resid : iov[i].iov_len; + caddr_t addr = (caddr_t) iov[i].iov_base; + + error = _bus_dmamap_load_buffer(dmat, + dm_segments, + addr, minlen, + td, flags, &lastaddr, &nsegs, first); + first = 0; + + resid -= minlen; + } + + if (error) { + /* force "no valid mappings" in callback */ + (*callback)(callback_arg, dm_segments, 0, 0, error); + } else { + (*callback)(callback_arg, dm_segments, + nsegs+1, uio->uio_resid, error); + } + return (error); +} + +/* * Release the mapping held by map. */ void ==== //depot/projects/smpng/sys/alpha/alpha/dec_2100_a50.c#4 (text+ko) ==== @@ -1,5 +1,5 @@ /* $NetBSD: dec_2100_a50.c,v 1.39 1998/04/17 02:45:19 mjacob Exp $ */ -/* $FreeBSD: src/sys/alpha/alpha/dec_2100_a50.c,v 1.13 2002/08/22 19:52:15 peter Exp $ */ +/* $FreeBSD: src/sys/alpha/alpha/dec_2100_a50.c,v 1.14 2002/10/04 15:58:03 keramida Exp $ */ /* * Copyright (c) 1995, 1996, 1997 Carnegie-Mellon University. @@ -198,7 +198,7 @@ pirq = 1; break; default: - panic("dec_2100_a50_intr_map bogus PCI pin %d\n", + panic("dec_2100_a50_intr_map: bogus PCI pin %d\n", cfg->intpin); } @@ -216,7 +216,7 @@ pirq = 2; break; default: - panic("dec_2100_a50_intr_map bogus PCI pin %d\n", + panic("dec_2100_a50_intr_map: bogus PCI pin %d\n", cfg->intpin); }; ==== //depot/projects/smpng/sys/alpha/alpha/dec_axppci_33.c#5 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/alpha/alpha/dec_axppci_33.c,v 1.16 2002/08/22 19:52:15 peter Exp $ */ +/* $FreeBSD: src/sys/alpha/alpha/dec_axppci_33.c,v 1.17 2002/10/04 15:56:02 keramida Exp $ */ /* $NetBSD: dec_axppci_33.c,v 1.38 1998/07/07 08:49:12 ross Exp $ */ /* @@ -251,7 +251,7 @@ break; #ifdef DIAGNOSTIC default: /* XXX gcc -Wuninitialized */ - panic("dec_axppci_33_intr_route bogus: PCI pin %d\n", + panic("dec_axppci_33_intr_route: bogus PCI pin %d\n", pin); #endif }; ==== //depot/projects/smpng/sys/alpha/conf/GENERIC#23 (text+ko) ==== @@ -18,7 +18,7 @@ # # For hardware specific information check HARDWARE.TXT # -# $FreeBSD: src/sys/alpha/conf/GENERIC,v 1.150 2002/08/20 00:10:19 peter Exp $ +# $FreeBSD: src/sys/alpha/conf/GENERIC,v 1.151 2002/10/05 16:35:20 phk Exp $ machine alpha cpu EV4 @@ -31,6 +31,8 @@ makeoptions DEBUG=-g #Build kernel with gdb(1) debug symbols +options NO_GEOM + # Platforms supported options API_UP1000 # UP1000, UP1100 (Nautilus) options DEC_AXPPCI_33 # UDB, Multia, AXPpci33, NoName ==== //depot/projects/smpng/sys/alpha/conf/SIMOS#7 (text+ko) ==== @@ -11,13 +11,15 @@ # device lines is present in the ./NOTES file. If you are in doubt as # to the purpose or necessity of a line, check first in NOTES. # -# $FreeBSD: src/sys/alpha/conf/SIMOS,v 1.22 2002/07/23 06:36:23 peter Exp $ +# $FreeBSD: src/sys/alpha/conf/SIMOS,v 1.23 2002/10/05 16:35:21 phk Exp $ machine alpha cpu EV5 ident SIMOS maxusers 10 +options NO_GEOM + options DEC_KN8AE options SIMOS options INET #InterNETworking ==== //depot/projects/smpng/sys/alpha/include/bus.h#3 (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.10 2002/02/27 17:15:40 tmm Exp $ */ +/* $FreeBSD: src/sys/alpha/include/bus.h,v 1.11 2002/10/04 20:40:39 sam Exp $ */ #ifndef _ALPHA_BUS_H_ #define _ALPHA_BUS_H_ @@ -560,6 +560,29 @@ void *callback_arg, int flags); /* + * Like bus_dmamap_callback but includes map size in bytes. This is + * defined as a separate interface to maintain compatiiblity for users + * of bus_dmamap_callback_t--at some point these interfaces should be merged. + */ +typedef void bus_dmamap_callback2_t(void *, bus_dma_segment_t *, int, bus_size_t, int); +/* + * Like bus_dmamap_load but for mbufs. Note the use of the + * bus_dmamap_callback2_t interface. + */ +int bus_dmamap_load_mbuf(bus_dma_tag_t dmat, bus_dmamap_t map, + struct mbuf *mbuf, + bus_dmamap_callback2_t *callback, void *callback_arg, + int flags); +/* + * Like bus_dmamap_load but for uios. Note the use of the + * bus_dmamap_callback2_t interface. + */ +int bus_dmamap_load_uio(bus_dma_tag_t dmat, bus_dmamap_t map, + struct uio *ui, + bus_dmamap_callback2_t *callback, void *callback_arg, + int flags); + +/* * Perform a syncronization operation on the given map. */ void _bus_dmamap_sync(bus_dma_tag_t, bus_dmamap_t, bus_dmasync_op_t); ==== //depot/projects/smpng/sys/alpha/include/cpu.h#6 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/alpha/include/cpu.h,v 1.32 2002/03/20 18:58:45 obrien Exp $ */ +/* $FreeBSD: src/sys/alpha/include/cpu.h,v 1.33 2002/10/06 05:24:13 obrien Exp $ */ /* From: NetBSD: cpu.h,v 1.18 1997/09/23 23:17:49 mjacob Exp */ /* @@ -81,7 +81,7 @@ #define CPU_ADJKERNTZ 7 /* int: timezone offset (seconds) */ #define CPU_DISRTCSET 8 /* int: disable resettodr() call */ #define CPU_WALLCLOCK 9 /* int: indicates wall CMOS clock */ -#define CPU_MAXID 9 /* 9 valid machdep IDs */ +#define CPU_MAXID 10 /* valid machdep IDs */ #define CTL_MACHDEP_NAMES { \ { 0, 0 }, \ ==== //depot/projects/smpng/sys/alpha/include/setjmp.h#2 (text+ko) ==== @@ -1,7 +1,4 @@ -/* $FreeBSD: src/sys/alpha/include/setjmp.h,v 1.4 2000/10/06 11:53:31 bde Exp $ */ -/* From: NetBSD: setjmp.h,v 1.2 1997/04/06 08:47:41 cgd Exp */ - -/* +/*- * Copyright (c) 1994, 1995 Carnegie-Mellon University. * All rights reserved. * @@ -26,21 +23,31 @@ * * any improvements or extensions that they make and grant Carnegie the * rights to redistribute these changes. + * + * $NetBSD: setjmp.h,v 1.2 1997/04/06 08:47:41 cgd Exp $ + * $FreeBSD: src/sys/alpha/include/setjmp.h,v 1.6 2002/10/05 05:47:55 mike Exp $ */ /* * machine/setjmp.h: machine dependent setjmp-related information. */ -#define _JBLEN 81 /* size, in longs, of a jmp_buf */ +#ifndef _MACHINE_SETJMP_H_ +#define _MACHINE_SETJMP_H_ + +#include <sys/cdefs.h> + +#define _JBLEN 81 /* Size, in longs, of a jmp_buf. */ /* * jmp_buf and sigjmp_buf are encapsulated in different structs to force * compile-time diagnostics for mismatches. The structs are the same * internally to avoid some run-time errors for mismatches. */ -#ifndef _ANSI_SOURCE -typedef struct _sigjmp_buf { long _sjb[_JBLEN + 1]; } sigjmp_buf[1]; -#endif /* not ANSI */ +#if __BSD_VISIBLE || __POSIX_VISIBLE || __XSI_VISIBLE +typedef struct _sigjmp_buf { long _sjb[_JBLEN + 1]; } sigjmp_buf[1]; +#endif + +typedef struct _jmp_buf { long _jb[_JBLEN + 1]; } jmp_buf[1]; -typedef struct _jmp_buf { long _jb[_JBLEN + 1]; } jmp_buf[1]; +#endif /* !_MACHINE_SETJMP_H_ */ ==== //depot/projects/smpng/sys/alpha/include/stdarg.h#5 (text+ko) ==== @@ -33,15 +33,19 @@ * * @(#)stdarg.h 8.1 (Berkeley) 6/10/93 * $NetBSD: stdarg.h,v 1.7 1997/04/06 08:47:44 cgd Exp $ - * $FreeBSD: src/sys/alpha/include/stdarg.h,v 1.5 2002/09/18 07:33:15 mike Exp $ + * $FreeBSD: src/sys/alpha/include/stdarg.h,v 1.6 2002/10/06 22:01:06 mike Exp $ */ -#ifndef _ALPHA_STDARG_H_ -#define _ALPHA_STDARG_H_ +#ifndef _MACHINE_STDARG_H_ +#define _MACHINE_STDARG_H_ +#include <sys/cdefs.h> #include <sys/_types.h> -typedef __va_list va_list; +#ifndef _VA_LIST_DECLARED +#define _VA_LIST_DECLARED +typedef __va_list va_list; +#endif #if defined(__GNUC__) && (__GNUC__ == 2 && __GNUC_MINOR__ > 95 || __GNUC__ >= 3) @@ -51,8 +55,10 @@ #define va_arg(ap, type) \ __builtin_va_arg((ap), type) +#if __ISO_C_VISIBLE >= 1999 #define va_copy(dest, src) \ __builtin_va_copy((dest), (src)) +#endif #define va_end(ap) \ __builtin_va_end(ap) @@ -83,4 +89,4 @@ #endif /* __GNUC__ post GCC 2.95 */ -#endif /* !_ALPHA_STDARG_H_ */ +#endif /* !_MACHINE_STDARG_H_ */ ==== //depot/projects/smpng/sys/alpha/include/varargs.h#4 (text+ko) ==== @@ -38,7 +38,7 @@ * * @(#)varargs.h 8.2 (Berkeley) 3/22/94 * $NetBSD: varargs.h,v 1.7 1997/04/06 08:47:46 cgd Exp $ - * $FreeBSD: src/sys/alpha/include/varargs.h,v 1.4 2002/08/21 16:19:58 mike Exp $ + * $FreeBSD: src/sys/alpha/include/varargs.h,v 1.5 2002/10/06 22:02:06 mike Exp $ */ #ifndef _ALPHA_VARARGS_H_ @@ -48,7 +48,11 @@ #include <sys/_types.h> +#ifndef _VA_LIST_DECLARED +#define _VA_LIST_DECLARED typedef __va_list va_list; +#endif + typedef int __builtin_va_alist_t __attribute__((__mode__(__word__))); #define va_alist __builtin_va_alist ==== //depot/projects/smpng/sys/boot/alpha/boot1/Makefile#4 (text+ko) ==== @@ -1,5 +1,5 @@ # $NetBSD: Makefile,v 1.15 1998/03/28 00:21:35 thorpej Exp $ -# $FreeBSD: src/sys/boot/alpha/boot1/Makefile,v 1.13 2002/06/11 06:56:31 phk Exp $ +# $FreeBSD: src/sys/boot/alpha/boot1/Makefile,v 1.14 2002/10/07 08:14:10 phk Exp $ .include <../Makefile.inc> @@ -14,6 +14,7 @@ CFLAGS+= -I${.CURDIR}/../../common -I${.CURDIR} CFLAGS+= -I${LIBSTANDDIR} CFLAGS+= -I${.CURDIR}/.. +CFLAGS+= -DUFS1_ONLY NOMAN=1 STRIP= BINDIR?= /boot ==== //depot/projects/smpng/sys/boot/common/ufsread.c#3 (text+ko) ==== @@ -23,7 +23,7 @@ */ /* - * $FreeBSD: src/sys/boot/common/ufsread.c,v 1.5 2002/06/21 22:33:56 jake Exp $ + * $FreeBSD: src/sys/boot/common/ufsread.c,v 1.7 2002/10/08 15:46:45 phk Exp $ */ #include <ufs/ufs/dinode.h> @@ -33,12 +33,12 @@ * We use 4k `virtual' blocks for filesystem data, whatever the actual * filesystem block size. FFS blocks are always a multiple of 4k. */ -#define VBLKSIZE 4096 -#define VBLKSHIFT 12 +#define VBLKSHIFT 12 +#define VBLKSIZE (1 << VBLKSHIFT) #define VBLKMASK (VBLKSIZE - 1) #define DBPERVBLK (VBLKSIZE / DEV_BSIZE) -#define INDIRPERVBLK(fs) (NINDIR(fs) / ((fs)->fs_bsize / VBLKSIZE)) -#define IPERVBLK(fs) (INOPB(fs) / ((fs)->fs_bsize / VBLKSIZE)) +#define INDIRPERVBLK(fs) (NINDIR(fs) / ((fs)->fs_bsize >> VBLKSHIFT)) +#define IPERVBLK(fs) (INOPB(fs) / ((fs)->fs_bsize >> VBLKSHIFT)) #define INO_TO_VBA(fs, ipervblk, x) \ (fsbtodb(fs, cgimin(fs, ino_to_cg(fs, x))) + \ (((x) % (fs)->fs_ipg) / (ipervblk) * DBPERVBLK)) @@ -62,7 +62,7 @@ static int ls, dsk_meta; static uint32_t fs_off; -static inline int +static __inline__ int fsfind(const char *name, ino_t * ino) { char buf[DEV_BSIZE]; @@ -122,9 +122,6 @@ return dt == DT_REG ? ino : 0; } -#ifndef __sparc64__ -#define UFS1_ONLY -#endif #ifdef UFS1_ONLY static ssize_t @@ -180,7 +177,7 @@ n = INDIRPERVBLK(fs); addr = dp1.di_ib[0]; vbaddr = fsbtodb(fs, addr) + - (lbn - NDADDR) / n * DBPERVBLK; + (lbn - NDADDR) / (n * DBPERVBLK); if (indmap != vbaddr) { if (dskread(indbuf, vbaddr, DBPERVBLK)) return -1; @@ -225,13 +222,15 @@ static struct ufs2_dinode dp2; static ino_t inomap; char *blkbuf; - caddr_t indbuf; + void *indbuf; struct fs *fs; char *s; size_t n, nb, size, off, vboff; ufs_lbn_t lbn; ufs2_daddr_t addr, vbaddr; static ufs2_daddr_t blkmap, indmap; + u_int u; + blkbuf = dmadat->blkbuf; indbuf = dmadat->indbuf; @@ -284,14 +283,14 @@ } else if (lbn < NDADDR + NINDIR(fs)) { n = INDIRPERVBLK(fs); addr = DIP(di_ib[0]); - vbaddr = fsbtodb(fs, addr) + - (lbn - NDADDR) / n * DBPERVBLK; + u = (u_int)(lbn - NDADDR) / (n * DBPERVBLK); + vbaddr = fsbtodb(fs, addr) + u; if (indmap != vbaddr) { if (dskread(indbuf, vbaddr, DBPERVBLK)) return -1; indmap = vbaddr; } - n = (lbn - NDADDR) % n; + n = (lbn - NDADDR) & (n - 1); if (fs->fs_magic == FS_UFS1_MAGIC) addr = ((ufs1_daddr_t *)indbuf)[n]; else ==== //depot/projects/smpng/sys/boot/i386/boot2/Makefile#8 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/boot/i386/boot2/Makefile,v 1.32 2002/07/29 09:40:14 ru Exp $ +# $FreeBSD: src/sys/boot/i386/boot2/Makefile,v 1.40 2002/10/08 18:19:01 jhb Exp $ PROG= boot2 NOMAN= @@ -24,8 +24,13 @@ BTX= ${.CURDIR}/../btx .endif +REL1= 0x700 ORG1= 0x7c00 -ORG2= 0x1000 +ORG2= 0x2000 + +# Setting this to anything else gives UFS1+2 support and larger +# boot2 binary. +BOOT2_UFS?= UFS1_ONLY CFLAGS= -elf -ffreestanding -Os -fno-builtin \ -fno-guess-branch-probability \ @@ -36,6 +41,12 @@ -Wmissing-declarations -Wmissing-prototypes -Wnested-externs \ -Wpointer-arith -Wshadow -Wstrict-prototypes -Wwrite-strings +.if ${BOOT2_UFS} == "UFS1_ONLY" +CFLAGS+= -D${BOOT2_UFS} +.else +# nothing here +.endif + LDFLAGS=-nostdlib -static -N all: boot1 boot2 @@ -47,7 +58,8 @@ ${LD} ${LDFLAGS} -e start -Ttext ${ORG1} -o ${.TARGET} boot1.o boot1.o: boot1.s - ${AS} ${AFLAGS} --defsym FLAGS=${B1FLAGS} ${.IMPSRC} -o ${.TARGET} + ${CPP} ${CFLAGS} ${.IMPSRC} | \ + ${AS} ${AFLAGS} --defsym FLAGS=${B1FLAGS} -o ${.TARGET} boot2.o: boot2.c ${.CURDIR}/../../common/ufsread.c ${CC} ${CFLAGS} -S -o boot2.s.tmp ${.IMPSRC} @@ -57,15 +69,23 @@ boot2.h: boot1.out ${NM} -t d ${.ALLSRC} | awk '/([0-9])+ T xread/ \ - { x = $$1 - ORG1; printf("#define XREADORG 0x7%x\n", x) }' \ - ORG1=`printf "%d" ${ORG1}` > boot2.h + { x = $$1 - ORG1; \ + printf("#define XREADORG %#x\n", REL1 + x) }' \ + ORG1=`printf "%d" ${ORG1}` \ + REL1=`printf "%d" ${REL1}` > boot2.h boot2: boot2.ldr boot2.bin ${BTX}/btx/btx btxld -v -E ${ORG2} -f bin -b ${BTX}/btx/btx -l boot2.ldr \ -o boot2.ld -P 1 boot2.bin +.if ${BOOT2_UFS} == "UFS1_ONLY" @ls -l boot2.ld | awk '{ x = 7680 - $$5; \ print x " bytes available"; if (x < 0) exit 1 }' dd if=boot2.ld of=${.TARGET} obs=7680 conv=osync 2>/dev/null +.else + @ls -l boot2.ld | awk '{ x = 9728 - $$5; \ + print x " bytes available"; if (x < 0) exit 1 }' + dd if=boot2.ld of=${.TARGET} obs=9728 conv=osync 2>/dev/null +.endif boot2.ldr: dd if=/dev/zero of=${.TARGET} bs=512 count=1 2>/dev/null @@ -75,7 +95,7 @@ boot2.out: boot2.o sio.o >>> TRUNCATED FOR MAIL (1000 lines) <<< To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200210091927.g99JRl3w047902>