PERFORCE change 52439 for review

John Baldwin jhb at FreeBSD.org
Fri May 7 10:31:08 PDT 2004


http://perforce.freebsd.org/chv.cgi?CH=52439

Change 52439 by jhb at jhb_slimer on 2004/05/07 10:30:32

	IFC @52438.

Affected files ...

.. //depot/projects/smpng/sys/alpha/alpha/fp_emulate.c#5 integrate
.. //depot/projects/smpng/sys/alpha/alpha/ieee_float.c#4 integrate
.. //depot/projects/smpng/sys/alpha/alpha/pmap.c#56 integrate
.. //depot/projects/smpng/sys/alpha/conf/GENERIC#36 integrate
.. //depot/projects/smpng/sys/alpha/include/float.h#5 integrate
.. //depot/projects/smpng/sys/alpha/include/fpu.h#4 integrate
.. //depot/projects/smpng/sys/amd64/acpica/OsdEnvironment.c#5 integrate
.. //depot/projects/smpng/sys/amd64/acpica/acpi_machdep.c#5 integrate
.. //depot/projects/smpng/sys/amd64/conf/GENERIC#16 integrate
.. //depot/projects/smpng/sys/amd64/include/acpica_machdep.h#4 integrate
.. //depot/projects/smpng/sys/amd64/include/float.h#3 integrate
.. //depot/projects/smpng/sys/arm/include/_types.h#4 integrate
.. //depot/projects/smpng/sys/arm/include/elf.h#4 integrate
.. //depot/projects/smpng/sys/arm/include/endian.h#3 integrate
.. //depot/projects/smpng/sys/arm/include/signal.h#4 integrate
.. //depot/projects/smpng/sys/boot/i386/boot0/Makefile#9 integrate
.. //depot/projects/smpng/sys/boot/i386/boot0/boot0.S#1 branch
.. //depot/projects/smpng/sys/boot/i386/boot0/boot0.s#6 delete
.. //depot/projects/smpng/sys/boot/i386/boot0/boot0ext.S#1 branch
.. //depot/projects/smpng/sys/boot/i386/boot0/boot0ext.s#3 delete
.. //depot/projects/smpng/sys/boot/i386/boot0/boot0sio.s#3 delete
.. //depot/projects/smpng/sys/boot/i386/boot0ext/Makefile#2 integrate
.. //depot/projects/smpng/sys/boot/i386/boot0sio/Makefile#3 integrate
.. //depot/projects/smpng/sys/boot/i386/boot2/boot1.S#2 integrate
.. //depot/projects/smpng/sys/boot/i386/boot2/sio.S#2 integrate
.. //depot/projects/smpng/sys/boot/i386/btx/btx/Makefile#6 integrate
.. //depot/projects/smpng/sys/boot/i386/btx/btx/btx.S#2 integrate
.. //depot/projects/smpng/sys/boot/i386/btx/btxldr/Makefile#6 integrate
.. //depot/projects/smpng/sys/boot/i386/btx/btxldr/btxldr.S#2 integrate
.. //depot/projects/smpng/sys/boot/i386/cdboot/Makefile#5 integrate
.. //depot/projects/smpng/sys/boot/i386/libi386/amd64_tramp.S#3 integrate
.. //depot/projects/smpng/sys/boot/i386/mbr/Makefile#6 integrate
.. //depot/projects/smpng/sys/boot/i386/pxeldr/Makefile#7 integrate
.. //depot/projects/smpng/sys/boot/i386/pxeldr/pxeldr.S#2 integrate
.. //depot/projects/smpng/sys/boot/pc98/boot2/serial_16550.S#5 integrate
.. //depot/projects/smpng/sys/boot/pc98/boot2/serial_8251.S#2 integrate
.. //depot/projects/smpng/sys/boot/pc98/btx/btx/Makefile#6 integrate
.. //depot/projects/smpng/sys/boot/pc98/btx/btx/btx.S#2 integrate
.. //depot/projects/smpng/sys/boot/pc98/btx/btxldr/Makefile#5 integrate
.. //depot/projects/smpng/sys/boot/pc98/btx/btxldr/btxldr.S#2 integrate
.. //depot/projects/smpng/sys/cam/scsi/scsi_da.c#51 integrate
.. //depot/projects/smpng/sys/compat/freebsd32/freebsd32_misc.c#9 integrate
.. //depot/projects/smpng/sys/compat/ndis/kern_ndis.c#14 integrate
.. //depot/projects/smpng/sys/compat/ndis/ntoskrnl_var.h#9 integrate
.. //depot/projects/smpng/sys/compat/ndis/subr_hal.c#7 integrate
.. //depot/projects/smpng/sys/compat/ndis/subr_ntoskrnl.c#14 integrate
.. //depot/projects/smpng/sys/conf/NOTES#68 integrate
.. //depot/projects/smpng/sys/conf/files#109 integrate
.. //depot/projects/smpng/sys/conf/files.amd64#15 integrate
.. //depot/projects/smpng/sys/conf/files.i386#59 integrate
.. //depot/projects/smpng/sys/conf/files.ia64#39 integrate
.. //depot/projects/smpng/sys/conf/files.pc98#57 integrate
.. //depot/projects/smpng/sys/conf/files.sparc64#37 integrate
.. //depot/projects/smpng/sys/conf/kern.pre.mk#34 integrate
.. //depot/projects/smpng/sys/conf/majors#39 integrate
.. //depot/projects/smpng/sys/conf/options#75 integrate
.. //depot/projects/smpng/sys/conf/options.sparc64#9 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/acfreebsd.h#13 integrate
.. //depot/projects/smpng/sys/contrib/pf/net/pf.c#5 integrate
.. //depot/projects/smpng/sys/contrib/pf/net/pf_ioctl.c#5 integrate
.. //depot/projects/smpng/sys/contrib/pf/net/pf_norm.c#4 integrate
.. //depot/projects/smpng/sys/dev/acpica/Osd/OsdSchedule.c#21 integrate
.. //depot/projects/smpng/sys/dev/acpica/Osd/OsdSynch.c#14 integrate
.. //depot/projects/smpng/sys/dev/acpica/Osd/OsdTable.c#7 integrate
.. //depot/projects/smpng/sys/dev/acpica/acpi.c#64 integrate
.. //depot/projects/smpng/sys/dev/acpica/acpi_acad.c#16 integrate
.. //depot/projects/smpng/sys/dev/acpica/acpi_cpu.c#24 integrate
.. //depot/projects/smpng/sys/dev/acpica/acpi_pci.c#9 integrate
.. //depot/projects/smpng/sys/dev/acpica/acpi_pcib.c#22 integrate
.. //depot/projects/smpng/sys/dev/acpica/acpi_thermal.c#25 integrate
.. //depot/projects/smpng/sys/dev/acpica/acpi_timer.c#16 integrate
.. //depot/projects/smpng/sys/dev/acpica/acpivar.h#41 integrate
.. //depot/projects/smpng/sys/dev/asr/asr.c#24 integrate
.. //depot/projects/smpng/sys/dev/ata/ata-all.c#52 integrate
.. //depot/projects/smpng/sys/dev/ata/ata-all.h#27 integrate
.. //depot/projects/smpng/sys/dev/ata/ata-chipset.c#35 integrate
.. //depot/projects/smpng/sys/dev/ata/ata-commands.h#2 integrate
.. //depot/projects/smpng/sys/dev/ata/ata-disk.h#15 integrate
.. //depot/projects/smpng/sys/dev/ata/ata-isa.c#17 integrate
.. //depot/projects/smpng/sys/dev/ata/ata-lowlevel.c#14 integrate
.. //depot/projects/smpng/sys/dev/ata/ata-pci.c#44 integrate
.. //depot/projects/smpng/sys/dev/ata/ata-pci.h#22 integrate
.. //depot/projects/smpng/sys/dev/ata/ata-queue.c#13 integrate
.. //depot/projects/smpng/sys/dev/ata/atapi-cd.h#14 integrate
.. //depot/projects/smpng/sys/dev/ata/atapi-fd.h#10 integrate
.. //depot/projects/smpng/sys/dev/ata/atapi-tape.h#7 integrate
.. //depot/projects/smpng/sys/dev/ciss/ciss.c#32 integrate
.. //depot/projects/smpng/sys/dev/ciss/cissreg.h#7 integrate
.. //depot/projects/smpng/sys/dev/cp/cpddk.c#1 branch
.. //depot/projects/smpng/sys/dev/cp/cpddk.h#1 branch
.. //depot/projects/smpng/sys/dev/cp/if_cp.c#1 branch
.. //depot/projects/smpng/sys/dev/cp/ng_cp.h#1 branch
.. //depot/projects/smpng/sys/dev/ctau/if_ct.c#3 integrate
.. //depot/projects/smpng/sys/dev/cx/if_cx.c#6 integrate
.. //depot/projects/smpng/sys/dev/cy/cy.c#1 branch
.. //depot/projects/smpng/sys/dev/cy/cy_isa.c#1 branch
.. //depot/projects/smpng/sys/dev/cy/cy_pci.c#1 branch
.. //depot/projects/smpng/sys/dev/cy/cyreg.h#1 branch
.. //depot/projects/smpng/sys/dev/cy/cyvar.h#1 branch
.. //depot/projects/smpng/sys/dev/gem/if_gem.c#18 integrate
.. //depot/projects/smpng/sys/dev/hfa/fore_load.c#8 delete
.. //depot/projects/smpng/sys/dev/hme/if_hme.c#15 integrate
.. //depot/projects/smpng/sys/dev/ic/cd1400.h#1 branch
.. //depot/projects/smpng/sys/dev/if_ndis/if_ndis.c#14 integrate
.. //depot/projects/smpng/sys/dev/led/led.c#7 integrate
.. //depot/projects/smpng/sys/dev/mii/brgphy.c#20 integrate
.. //depot/projects/smpng/sys/dev/mii/dcphy.c#11 integrate
.. //depot/projects/smpng/sys/dev/mii/e1000phy.c#9 integrate
.. //depot/projects/smpng/sys/dev/mii/mii.c#9 integrate
.. //depot/projects/smpng/sys/dev/mii/mii_physubr.c#9 integrate
.. //depot/projects/smpng/sys/dev/mii/mlphy.c#9 integrate
.. //depot/projects/smpng/sys/dev/mii/rgephy.c#2 integrate
.. //depot/projects/smpng/sys/dev/mii/ruephy.c#3 integrate
.. //depot/projects/smpng/sys/dev/mii/tlphy.c#11 integrate
.. //depot/projects/smpng/sys/dev/mii/xmphy.c#11 integrate
.. //depot/projects/smpng/sys/dev/pccbb/pccbb.c#43 integrate
.. //depot/projects/smpng/sys/dev/pci/pci.c#38 integrate
.. //depot/projects/smpng/sys/dev/puc/pucdata.c#25 integrate
.. //depot/projects/smpng/sys/dev/sio/sio.c#43 integrate
.. //depot/projects/smpng/sys/dev/sio/sio_ebus.c#5 delete
.. //depot/projects/smpng/sys/dev/sound/pci/cmi.c#21 integrate
.. //depot/projects/smpng/sys/dev/sound/pcm/buffer.c#11 integrate
.. //depot/projects/smpng/sys/dev/uart/uart_core.c#4 integrate
.. //depot/projects/smpng/sys/dev/uart/uart_dev_sab82532.c#3 integrate
.. //depot/projects/smpng/sys/dev/uart/uart_dev_z8530.c#3 integrate
.. //depot/projects/smpng/sys/dev/usb/if_axe.c#10 integrate
.. //depot/projects/smpng/sys/dev/usb/ohcireg.h#6 integrate
.. //depot/projects/smpng/sys/dev/usb/usbdevs#51 integrate
.. //depot/projects/smpng/sys/dev/usb/usbdevs.h#51 integrate
.. //depot/projects/smpng/sys/dev/usb/usbdevs_data.h#51 integrate
.. //depot/projects/smpng/sys/dev/usb/uvisor.c#11 integrate
.. //depot/projects/smpng/sys/dev/usb/uvscom.c#12 integrate
.. //depot/projects/smpng/sys/dev/vinum/vinumio.c#19 integrate
.. //depot/projects/smpng/sys/fs/nwfs/nwfs_io.c#12 integrate
.. //depot/projects/smpng/sys/fs/smbfs/smbfs_io.c#16 integrate
.. //depot/projects/smpng/sys/fs/specfs/spec_vnops.c#33 integrate
.. //depot/projects/smpng/sys/geom/concat/g_concat.c#4 integrate
.. //depot/projects/smpng/sys/geom/gate/g_gate.c#1 branch
.. //depot/projects/smpng/sys/geom/gate/g_gate.h#1 branch
.. //depot/projects/smpng/sys/geom/geom_gpt.c#15 integrate
.. //depot/projects/smpng/sys/i386/acpica/OsdEnvironment.c#8 integrate
.. //depot/projects/smpng/sys/i386/acpica/acpi_asus.c#1 branch
.. //depot/projects/smpng/sys/i386/acpica/acpi_machdep.c#14 integrate
.. //depot/projects/smpng/sys/i386/acpica/acpi_wakeup.c#24 integrate
.. //depot/projects/smpng/sys/i386/acpica/madt.c#8 integrate
.. //depot/projects/smpng/sys/i386/conf/GENERIC#49 integrate
.. //depot/projects/smpng/sys/i386/conf/NOTES#81 integrate
.. //depot/projects/smpng/sys/i386/i386/elan-mmcr.c#18 integrate
.. //depot/projects/smpng/sys/i386/i386/intr_machdep.c#4 integrate
.. //depot/projects/smpng/sys/i386/i386/io_apic.c#5 integrate
.. //depot/projects/smpng/sys/i386/i386/legacy.c#5 integrate
.. //depot/projects/smpng/sys/i386/i386/local_apic.c#8 integrate
.. //depot/projects/smpng/sys/i386/i386/machdep.c#73 integrate
.. //depot/projects/smpng/sys/i386/i386/mptable.c#8 integrate
.. //depot/projects/smpng/sys/i386/i386/mptable_pci.c#2 integrate
.. //depot/projects/smpng/sys/i386/i386/nexus.c#11 integrate
.. //depot/projects/smpng/sys/i386/include/acpica_machdep.h#6 integrate
.. //depot/projects/smpng/sys/i386/include/apicvar.h#4 integrate
.. //depot/projects/smpng/sys/i386/include/bus_pc98.h#9 integrate
.. //depot/projects/smpng/sys/i386/include/float.h#5 integrate
.. //depot/projects/smpng/sys/i386/include/intr_machdep.h#3 integrate
.. //depot/projects/smpng/sys/i386/include/legacyvar.h#3 integrate
.. //depot/projects/smpng/sys/i386/include/mpapic.h#2 delete
.. //depot/projects/smpng/sys/i386/include/pci_cfgreg.h#7 integrate
.. //depot/projects/smpng/sys/i386/isa/atpic.c#7 integrate
.. //depot/projects/smpng/sys/i386/isa/clock.c#33 integrate
.. //depot/projects/smpng/sys/i386/isa/cy.c#24 delete
.. //depot/projects/smpng/sys/i386/isa/cyreg.h#2 delete
.. //depot/projects/smpng/sys/i386/isa/elcr.c#1 branch
.. //depot/projects/smpng/sys/i386/isa/ic/cd1400.h#2 delete
.. //depot/projects/smpng/sys/i386/pci/pci_bus.c#21 integrate
.. //depot/projects/smpng/sys/i386/pci/pci_pir.c#3 integrate
.. //depot/projects/smpng/sys/ia64/acpica/OsdEnvironment.c#7 integrate
.. //depot/projects/smpng/sys/ia64/acpica/acpi_machdep.c#3 integrate
.. //depot/projects/smpng/sys/ia64/acpica/madt.c#12 integrate
.. //depot/projects/smpng/sys/ia64/conf/GENERIC#37 integrate
.. //depot/projects/smpng/sys/ia64/conf/SKI#15 integrate
.. //depot/projects/smpng/sys/ia64/ia64/interrupt.c#25 integrate
.. //depot/projects/smpng/sys/ia64/ia64/trap.c#63 integrate
.. //depot/projects/smpng/sys/ia64/include/acpica_machdep.h#3 integrate
.. //depot/projects/smpng/sys/ia64/include/float.h#6 integrate
.. //depot/projects/smpng/sys/isa/fd.c#33 integrate
.. //depot/projects/smpng/sys/kern/imgact_elf.c#34 integrate
.. //depot/projects/smpng/sys/kern/kern_clock.c#33 integrate
.. //depot/projects/smpng/sys/kern/kern_environment.c#13 integrate
.. //depot/projects/smpng/sys/kern/kern_exec.c#70 integrate
.. //depot/projects/smpng/sys/kern/kern_jail.c#32 integrate
.. //depot/projects/smpng/sys/kern/kern_mac.c#36 integrate
.. //depot/projects/smpng/sys/kern/kern_thread.c#56 integrate
.. //depot/projects/smpng/sys/kern/kern_timeout.c#19 integrate
.. //depot/projects/smpng/sys/kern/link_elf_obj.c#1 branch
.. //depot/projects/smpng/sys/kern/sched_ule.c#29 integrate
.. //depot/projects/smpng/sys/kern/subr_sleepqueue.c#5 integrate
.. //depot/projects/smpng/sys/kern/subr_smp.c#32 integrate
.. //depot/projects/smpng/sys/kern/tty_compat.c#6 integrate
.. //depot/projects/smpng/sys/kern/uipc_syscalls.c#51 integrate
.. //depot/projects/smpng/sys/kern/vfs_bio.c#61 integrate
.. //depot/projects/smpng/sys/kern/vfs_export.c#13 integrate
.. //depot/projects/smpng/sys/kern/vfs_syscalls.c#72 integrate
.. //depot/projects/smpng/sys/libkern/quad.h#7 integrate
.. //depot/projects/smpng/sys/modules/Makefile#75 integrate
.. //depot/projects/smpng/sys/modules/acpi/Makefile#21 integrate
.. //depot/projects/smpng/sys/modules/acpi/acpi/Makefile#4 integrate
.. //depot/projects/smpng/sys/modules/acpi/acpi_asus/Makefile#1 branch
.. //depot/projects/smpng/sys/modules/asr/Makefile#2 integrate
.. //depot/projects/smpng/sys/modules/cp/Makefile#1 branch
.. //depot/projects/smpng/sys/modules/geom/Makefile#6 integrate
.. //depot/projects/smpng/sys/modules/geom/geom_gate/Makefile#1 branch
.. //depot/projects/smpng/sys/modules/ipfilter/Makefile#4 integrate
.. //depot/projects/smpng/sys/modules/netgraph/Makefile#13 integrate
.. //depot/projects/smpng/sys/modules/sio/Makefile#2 integrate
.. //depot/projects/smpng/sys/net/bridge.c#25 integrate
.. //depot/projects/smpng/sys/net/if.c#48 integrate
.. //depot/projects/smpng/sys/net/if.h#17 integrate
.. //depot/projects/smpng/sys/net/if_arcsubr.c#14 integrate
.. //depot/projects/smpng/sys/net/if_atmsubr.c#16 integrate
.. //depot/projects/smpng/sys/net/if_ethersubr.c#47 integrate
.. //depot/projects/smpng/sys/net/if_fddisubr.c#20 integrate
.. //depot/projects/smpng/sys/net/if_gre.c#16 integrate
.. //depot/projects/smpng/sys/net/if_iso88025subr.c#18 integrate
.. //depot/projects/smpng/sys/net/if_var.h#25 integrate
.. //depot/projects/smpng/sys/net/if_vlan.c#25 integrate
.. //depot/projects/smpng/sys/net/radix.c#11 integrate
.. //depot/projects/smpng/sys/net/route.c#21 integrate
.. //depot/projects/smpng/sys/net/route.h#18 integrate
.. //depot/projects/smpng/sys/net/rtsock.c#33 integrate
.. //depot/projects/smpng/sys/net80211/ieee80211.c#9 integrate
.. //depot/projects/smpng/sys/netatalk/aarp.c#13 integrate
.. //depot/projects/smpng/sys/netatalk/at_extern.h#5 integrate
.. //depot/projects/smpng/sys/netatalk/ddp_usrreq.c#19 integrate
.. //depot/projects/smpng/sys/netgraph/bluetooth/common/ng_bluetooth.c#3 integrate
.. //depot/projects/smpng/sys/netgraph/bluetooth/drivers/bt3c/ng_bt3c_pccard.c#5 integrate
.. //depot/projects/smpng/sys/netgraph/bluetooth/drivers/h4/ng_h4.c#5 integrate
.. //depot/projects/smpng/sys/netgraph/bluetooth/drivers/ubt/ng_ubt.c#10 integrate
.. //depot/projects/smpng/sys/netgraph/bluetooth/hci/ng_hci_cmds.c#5 integrate
.. //depot/projects/smpng/sys/netgraph/bluetooth/hci/ng_hci_evnt.c#6 integrate
.. //depot/projects/smpng/sys/netgraph/bluetooth/hci/ng_hci_main.c#3 integrate
.. //depot/projects/smpng/sys/netgraph/bluetooth/hci/ng_hci_misc.c#6 integrate
.. //depot/projects/smpng/sys/netgraph/bluetooth/hci/ng_hci_ulpi.c#6 integrate
.. //depot/projects/smpng/sys/netgraph/bluetooth/l2cap/ng_l2cap_cmds.c#4 integrate
.. //depot/projects/smpng/sys/netgraph/bluetooth/l2cap/ng_l2cap_evnt.c#6 integrate
.. //depot/projects/smpng/sys/netgraph/bluetooth/l2cap/ng_l2cap_llpi.c#6 integrate
.. //depot/projects/smpng/sys/netgraph/bluetooth/l2cap/ng_l2cap_main.c#3 integrate
.. //depot/projects/smpng/sys/netgraph/bluetooth/l2cap/ng_l2cap_misc.c#6 integrate
.. //depot/projects/smpng/sys/netgraph/bluetooth/l2cap/ng_l2cap_ulpi.c#4 integrate
.. //depot/projects/smpng/sys/netgraph/bluetooth/socket/ng_btsocket.c#6 integrate
.. //depot/projects/smpng/sys/netgraph/bluetooth/socket/ng_btsocket_hci_raw.c#12 integrate
.. //depot/projects/smpng/sys/netgraph/bluetooth/socket/ng_btsocket_l2cap.c#10 integrate
.. //depot/projects/smpng/sys/netgraph/bluetooth/socket/ng_btsocket_l2cap_raw.c#9 integrate
.. //depot/projects/smpng/sys/netgraph/bluetooth/socket/ng_btsocket_rfcomm.c#5 integrate
.. //depot/projects/smpng/sys/netgraph/ng_parse.c#11 integrate
.. //depot/projects/smpng/sys/netgraph/ng_pptpgre.c#11 integrate
.. //depot/projects/smpng/sys/netgraph/ng_pptpgre.h#4 integrate
.. //depot/projects/smpng/sys/netinet/if_ether.c#26 integrate
.. //depot/projects/smpng/sys/netinet/in_pcb.c#45 integrate
.. //depot/projects/smpng/sys/netinet/ip_fastfwd.c#6 integrate
.. //depot/projects/smpng/sys/netinet/ip_fw.h#19 integrate
.. //depot/projects/smpng/sys/netinet/ip_fw2.c#31 integrate
.. //depot/projects/smpng/sys/netinet/ip_icmp.c#27 integrate
.. //depot/projects/smpng/sys/netinet/ip_input.c#52 integrate
.. //depot/projects/smpng/sys/netinet/ip_output.c#56 integrate
.. //depot/projects/smpng/sys/netinet/ip_var.h#22 integrate
.. //depot/projects/smpng/sys/netinet/raw_ip.c#38 integrate
.. //depot/projects/smpng/sys/netinet/tcp_hostcache.c#4 integrate
.. //depot/projects/smpng/sys/netinet/tcp_input.c#53 integrate
.. //depot/projects/smpng/sys/netinet/tcp_output.c#24 integrate
.. //depot/projects/smpng/sys/netinet/tcp_subr.c#48 integrate
.. //depot/projects/smpng/sys/netinet/tcp_syncache.c#29 integrate
.. //depot/projects/smpng/sys/netinet/tcp_var.h#25 integrate
.. //depot/projects/smpng/sys/netinet/udp_usrreq.c#42 integrate
.. //depot/projects/smpng/sys/netinet6/nd6.c#20 integrate
.. //depot/projects/smpng/sys/netipsec/key.c#11 integrate
.. //depot/projects/smpng/sys/netipsec/xform_tcp.c#2 integrate
.. //depot/projects/smpng/sys/nfsclient/nfs_bio.c#27 integrate
.. //depot/projects/smpng/sys/pc98/conf/GENERIC#43 integrate
.. //depot/projects/smpng/sys/pc98/conf/NOTES#25 integrate
.. //depot/projects/smpng/sys/pc98/pc98/fd.c#32 integrate
.. //depot/projects/smpng/sys/pc98/pc98/sio.c#41 integrate
.. //depot/projects/smpng/sys/pci/agp.c#20 integrate
.. //depot/projects/smpng/sys/pci/agp_i810.c#15 integrate
.. //depot/projects/smpng/sys/pci/amdpm.c#11 integrate
.. //depot/projects/smpng/sys/pci/cy_pci.c#9 delete
.. //depot/projects/smpng/sys/powerpc/conf/GENERIC#19 integrate
.. //depot/projects/smpng/sys/powerpc/include/float.h#5 integrate
.. //depot/projects/smpng/sys/powerpc/include/param.h#11 integrate
.. //depot/projects/smpng/sys/powerpc/include/pmap.h#13 integrate
.. //depot/projects/smpng/sys/powerpc/powermac/ata_kauai.c#4 integrate
.. //depot/projects/smpng/sys/powerpc/powermac/ata_macio.c#9 integrate
.. //depot/projects/smpng/sys/security/mac/mac_net.c#11 integrate
.. //depot/projects/smpng/sys/security/mac_test/mac_test.c#21 integrate
.. //depot/projects/smpng/sys/sparc64/conf/GENERIC#38 integrate
.. //depot/projects/smpng/sys/sparc64/conf/NOTES#4 integrate
.. //depot/projects/smpng/sys/sparc64/ebus/ebus.c#11 integrate
.. //depot/projects/smpng/sys/sparc64/include/float.h#5 integrate
.. //depot/projects/smpng/sys/sparc64/include/nexusvar.h#3 integrate
.. //depot/projects/smpng/sys/sparc64/isa/ofw_isa.c#6 integrate
.. //depot/projects/smpng/sys/sparc64/isa/ofw_isa.h#3 integrate
.. //depot/projects/smpng/sys/sparc64/pci/psycho.c#28 integrate
.. //depot/projects/smpng/sys/sparc64/pci/psychoreg.h#8 integrate
.. //depot/projects/smpng/sys/sparc64/pci/psychovar.h#10 integrate
.. //depot/projects/smpng/sys/sparc64/sparc64/identcpu.c#12 integrate
.. //depot/projects/smpng/sys/sparc64/sparc64/iommu.c#23 integrate
.. //depot/projects/smpng/sys/sparc64/sparc64/nexus.c#8 integrate
.. //depot/projects/smpng/sys/sparc64/sparc64/ofw_machdep.c#7 integrate
.. //depot/projects/smpng/sys/sys/callout.h#8 integrate
.. //depot/projects/smpng/sys/sys/condvar.h#8 integrate
.. //depot/projects/smpng/sys/sys/elf_common.h#5 integrate
.. //depot/projects/smpng/sys/sys/imgact.h#10 integrate
.. //depot/projects/smpng/sys/sys/imgact_aout.h#8 integrate
.. //depot/projects/smpng/sys/sys/jail.h#10 integrate
.. //depot/projects/smpng/sys/sys/mbuf.h#38 integrate
.. //depot/projects/smpng/sys/sys/mman.h#9 integrate
.. //depot/projects/smpng/sys/sys/proc.h#114 integrate
.. //depot/projects/smpng/sys/sys/types.h#26 integrate
.. //depot/projects/smpng/sys/sys/user.h#18 integrate
.. //depot/projects/smpng/sys/ufs/ffs/ffs_vfsops.c#52 integrate
.. //depot/projects/smpng/sys/vm/device_pager.c#15 integrate
.. //depot/projects/smpng/sys/vm/phys_pager.c#12 integrate
.. //depot/projects/smpng/sys/vm/swap_pager.c#44 integrate
.. //depot/projects/smpng/sys/vm/vm_fault.c#35 integrate
.. //depot/projects/smpng/sys/vm/vm_glue.c#42 integrate
.. //depot/projects/smpng/sys/vm/vm_kern.c#27 integrate
.. //depot/projects/smpng/sys/vm/vm_map.c#60 integrate
.. //depot/projects/smpng/sys/vm/vm_map.h#27 integrate
.. //depot/projects/smpng/sys/vm/vm_page.c#50 integrate
.. //depot/projects/smpng/sys/vm/vnode_pager.c#40 integrate

Differences ...

==== //depot/projects/smpng/sys/alpha/alpha/fp_emulate.c#5 (text+ko) ====

@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/alpha/alpha/fp_emulate.c,v 1.13 2003/08/17 06:42:07 marcel Exp $");
+__FBSDID("$FreeBSD: src/sys/alpha/alpha/fp_emulate.c,v 1.14 2004/05/06 09:35:57 das Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -296,7 +296,7 @@
 		td->td_pcb->pcb_fp_control = control;
 
 		/* Regenerate the control register */
-		fpcr = fpregs->fpr_cr & FPCR_DYN_MASK;
+		fpcr = fpregs->fpr_cr & (FPCR_DYN_MASK | FPCR_STATUS_MASK);
 		fpcr |= ((control & IEEE_STATUS_MASK)
 			 << IEEE_STATUS_TO_FPCR_SHIFT);
 		if (!(control & IEEE_TRAP_ENABLE_INV))

==== //depot/projects/smpng/sys/alpha/alpha/ieee_float.c#4 (text+ko) ====

@@ -37,7 +37,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/alpha/alpha/ieee_float.c,v 1.9 2003/08/22 07:20:25 imp Exp $");
+__FBSDID("$FreeBSD: src/sys/alpha/alpha/ieee_float.c,v 1.10 2004/05/06 09:36:11 das Exp $");
 
 #include <sys/types.h>
 #ifdef TEST
@@ -312,6 +312,9 @@
 			break;
 		}
 
+		if (frac == 0)
+			*status |= FPCR_UNF;
+
 		/*
 		 * Rounding up may take us to TWO if
 		 * fraclo == (TWO - epsilon).  Also If fraclo has been

==== //depot/projects/smpng/sys/alpha/alpha/pmap.c#56 (text+ko) ====

@@ -148,7 +148,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/alpha/alpha/pmap.c,v 1.143 2004/04/11 05:08:26 alc Exp $");
+__FBSDID("$FreeBSD: src/sys/alpha/alpha/pmap.c,v 1.146 2004/04/26 17:49:05 gallatin Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -1074,7 +1074,7 @@
 	 */
 	VM_OBJECT_LOCK(pmap->pm_pteobj);
 	lev1pg = vm_page_grab(pmap->pm_pteobj, NUSERLEV3MAPS + NUSERLEV2MAPS,
-	    VM_ALLOC_NORMAL | VM_ALLOC_RETRY | VM_ALLOC_WIRED);
+	    VM_ALLOC_NORMAL | VM_ALLOC_RETRY | VM_ALLOC_WIRED | VM_ALLOC_ZERO);
 
 	vm_page_lock_queues();
 	vm_page_flag_clear(lev1pg, PG_BUSY);
@@ -1083,10 +1083,7 @@
 	VM_OBJECT_UNLOCK(pmap->pm_pteobj);
 
 	pmap->pm_lev1 = (pt_entry_t*) ALPHA_PHYS_TO_K0SEG(VM_PAGE_TO_PHYS(lev1pg));
-	if ((lev1pg->flags & PG_ZERO) == 0)
-		bzero(pmap->pm_lev1, PAGE_SIZE);
 
-
 	/* install self-referential address mapping entry (not PG_ASM) */
 	pmap->pm_lev1[PTLEV1I] = pmap_phys_to_pte(VM_PAGE_TO_PHYS(lev1pg))
 		| PG_V | PG_KRE | PG_KWE;
@@ -1194,8 +1191,6 @@
 		VM_OBJECT_LOCK(pmap->pm_pteobj);
 	m = vm_page_grab(pmap->pm_pteobj, ptepindex,
 	    VM_ALLOC_WIRED | VM_ALLOC_ZERO | VM_ALLOC_RETRY);
-	if ((m->flags & PG_ZERO) == 0)
-		pmap_zero_page(m);
 
 	KASSERT(m->queue == PQ_NONE,
 		("_pmap_allocpte: %p->queue != PQ_NONE", m));
@@ -1242,7 +1237,6 @@
 
 	vm_page_lock_queues();
 	m->valid = VM_PAGE_BITS_ALL;
-	vm_page_flag_clear(m, PG_ZERO);
 	vm_page_wakeup(m);
 	vm_page_unlock_queues();
 	if (!is_object_locked)
@@ -1906,7 +1900,8 @@
 	 * raise IPL while manipulating pv_table since pmap_enter can be
 	 * called at interrupt time.
 	 */
-	if (pmap_initialized && (m->flags & PG_FICTITIOUS) == 0) {
+	if (pmap_initialized && 
+	    (m->flags & (PG_FICTITIOUS|PG_UNMANAGED)) == 0) {
 		pmap_insert_entry(pmap, va, mpte, m);
 		managed |= PG_MANAGED;
 	}
@@ -1966,7 +1961,7 @@
 pmap_enter_quick(pmap_t pmap, vm_offset_t va, vm_page_t m, vm_page_t mpte)
 {
 	register pt_entry_t *pte;
-
+	int managed;
 
 	/*
 	 * In the case that a page table page is not
@@ -2031,7 +2026,11 @@
 	 * raise IPL while manipulating pv_table since pmap_enter can be
 	 * called at interrupt time.
 	 */
-	pmap_insert_entry(pmap, va, mpte, m);
+	managed = 0;
+	if ((m->flags & (PG_FICTITIOUS|PG_UNMANAGED)) == 0) {
+		pmap_insert_entry(pmap, va, mpte, m);
+		managed = PG_MANAGED | PG_FOR | PG_FOW | PG_FOE;
+	}
 
 	/*
 	 * Increment counters
@@ -2041,7 +2040,7 @@
 	/*
 	 * Now validate mapping with RO protection
 	 */
-	*pte = pmap_phys_to_pte(VM_PAGE_TO_PHYS(m)) | PG_V | PG_KRE | PG_URE | PG_MANAGED | PG_FOR | PG_FOE | PG_FOW;
+	*pte = pmap_phys_to_pte(VM_PAGE_TO_PHYS(m)) | PG_V | PG_KRE | PG_URE | managed;
 
 	alpha_pal_imb();			/* XXX overkill? */
 	return mpte;

==== //depot/projects/smpng/sys/alpha/conf/GENERIC#36 (text+ko) ====

@@ -18,7 +18,7 @@
 #
 # For hardware specific information check HARDWARE.TXT
 #
-# $FreeBSD: src/sys/alpha/conf/GENERIC,v 1.168 2004/01/24 21:45:25 jeff Exp $
+# $FreeBSD: src/sys/alpha/conf/GENERIC,v 1.170 2004/05/02 20:40:17 marcel Exp $
 
 machine		alpha
 cpu		EV4
@@ -60,6 +60,7 @@
 options 	CD9660			#ISO 9660 Filesystem
 options 	PROCFS			#Process filesystem (requires PSEUDOFS)
 options 	PSEUDOFS		#Pseudo-filesystem framework
+options 	GEOM_GPT		#GUID Partition Tables.
 options 	COMPAT_43		#Compatible with BSD 4.3 [KEEP THIS!]
 options 	COMPAT_FREEBSD4		#Compatible with FreeBSD4
 options 	SCSI_DELAY=15000	#Delay (in ms) before probing SCSI
@@ -194,10 +195,10 @@
 device		umass		# Disks/Mass storage - Requires scbus and da0
 device		ums		# Mouse
 # USB Ethernet
-device		aue		# ADMtek USB ethernet
-device		axe		# ASIX Electronics USB ethernet
-device		cue		# CATC USB ethernet
-device		kue		# Kawasaki LSI USB ethernet
+device		aue		# ADMtek USB Ethernet
+device		axe		# ASIX Electronics USB Ethernet
+device		cue		# CATC USB Ethernet
+device		kue		# Kawasaki LSI USB Ethernet
 
 # FireWire support
 device		firewire	# FireWire bus code

==== //depot/projects/smpng/sys/alpha/include/float.h#5 (text+ko) ====

@@ -1,4 +1,4 @@
-/* $FreeBSD: src/sys/alpha/include/float.h,v 1.5 2004/04/05 21:00:50 imp Exp $ */
+/* $FreeBSD: src/sys/alpha/include/float.h,v 1.6 2004/04/25 02:36:28 das Exp $ */
 /* From: NetBSD: float.h,v 1.6 1997/07/17 21:36:03 thorpej Exp */
 
 /*
@@ -41,8 +41,10 @@
 
 #define FLT_RADIX	2		/* b */
 #define FLT_ROUNDS	__flt_rounds()
+#if __ISO_C_VISIBLE >= 1999
 #define	FLT_EVAL_METHOD	0		/* no promotions */
 #define	DECIMAL_DIG	17		/* max precision in decimal digits */
+#endif
 
 #define FLT_MANT_DIG	24		/* p */
 #define FLT_EPSILON	1.19209290E-07F	/* b**(1-p) */

==== //depot/projects/smpng/sys/alpha/include/fpu.h#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/alpha/include/fpu.h,v 1.6 2002/11/16 06:35:51 deischen Exp $
+ * $FreeBSD: src/sys/alpha/include/fpu.h,v 1.7 2004/05/06 09:35:57 das Exp $
  */
 
 #ifndef _MACHINE_FPU_H_
@@ -56,6 +56,8 @@
 #define FPCR_INED	(1LL << 62)	/* Inexact Disable */
 #define FPCR_SUM	(1LL << 63)	/* Summary Bit */
 #define FPCR_MASK	(~0LL << 49)
+#define	FPCR_STATUS_MASK	(FPCR_INV | FPCR_DZE | FPCR_OVF | \
+				 FPCR_UNF | FPCR_INE | FPCR_IOV)
 
 /*
  * Exception summary bits.

==== //depot/projects/smpng/sys/amd64/acpica/OsdEnvironment.c#5 (text+ko) ====

@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/amd64/acpica/OsdEnvironment.c,v 1.11 2003/08/28 16:30:31 njl Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/acpica/OsdEnvironment.c,v 1.12 2004/05/06 02:18:57 njl Exp $");
 
 /*
  * 6.1 : Environmental support
@@ -37,7 +37,7 @@
 
 #include "acpi.h"
 
-u_long amd64_acpi_root;
+static u_long amd64_acpi_root;
 
 SYSCTL_ULONG(_machdep, OID_AUTO, acpi_root, CTLFLAG_RD, &amd64_acpi_root, 0,
 	     "The physical address of the RSDP");

==== //depot/projects/smpng/sys/amd64/acpica/acpi_machdep.c#5 (text+ko) ====

@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/amd64/acpica/acpi_machdep.c,v 1.12 2003/09/22 22:12:46 peter Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/acpica/acpi_machdep.c,v 1.13 2004/04/21 02:10:58 njl Exp $");
 
 #include <sys/param.h>
 #include <sys/bus.h>
@@ -40,8 +40,7 @@
 {
 	struct	acpi_softc *sc;
 
-	if ((sc = device_get_softc(dev)) == NULL)
-		return (ENXIO);
+	sc = device_get_softc(dev);
 
 	acpi_install_wakeup_handler(sc);
 

==== //depot/projects/smpng/sys/amd64/conf/GENERIC#16 (text+ko) ====

@@ -16,7 +16,7 @@
 # If you are in doubt as to the purpose or necessity of a line, check first
 # in NOTES.
 #
-# $FreeBSD: src/sys/amd64/conf/GENERIC,v 1.405 2004/03/25 03:19:28 obrien Exp $
+# $FreeBSD: src/sys/amd64/conf/GENERIC,v 1.407 2004/05/02 20:40:18 marcel Exp $
 
 machine		amd64
 cpu		HAMMER
@@ -44,6 +44,7 @@
 options 	CD9660			# ISO 9660 Filesystem
 options 	PROCFS			# Process filesystem (requires PSEUDOFS)
 options 	PSEUDOFS		# Pseudo-filesystem framework
+options 	GEOM_GPT		# GUID Partition Tables.
 options 	IA32			# Compatible with i386 binaries
 options 	COMPAT_FREEBSD4		# Compatible with FreeBSD4
 options 	SCSI_DELAY=15000	# Delay (in ms) before probing SCSI
@@ -180,7 +181,7 @@
 # PCI Ethernet NICs that use the common MII bus controller code.
 # NOTE: Be sure to keep the 'device miibus' line in order to use these NICs!
 device		miibus		# MII bus support
-device		bfe		# Broadcom BCM440x 10/100 ethernet
+device		bfe		# Broadcom BCM440x 10/100 Ethernet
 device		bge		# Broadcom BCM570xx Gigabit Ethernet
 device		dc		# DEC/Intel 21143 and various workalikes
 device		fxp		# Intel EtherExpress PRO/100B (82557, 82558)
@@ -189,9 +190,9 @@
 device		rl		# RealTek 8129/8139
 device		sf		# Adaptec AIC-6915 (``Starfire'')
 device		sis		# Silicon Integrated Systems SiS 900/SiS 7016
-device		sk		# SysKonnect SK-984x & SK-982x gigabit ethernet
+device		sk		# SysKonnect SK-984x & SK-982x gigabit Ethernet
 device		ste		# Sundance ST201 (D-Link DFE-550TX)
-device		ti		# Alteon Networks Tigon I/II gigabit ethernet
+device		ti		# Alteon Networks Tigon I/II gigabit Ethernet
 device		tl		# Texas Instruments ThunderLAN
 device		tx		# SMC EtherPower II (83c170 ``EPIC'')
 device		vr		# VIA Rhine, Rhine II
@@ -210,8 +211,8 @@
 #device		ie		# EtherExpress 8/16, 3C507, StarLAN 10 etc.
 # XXX kvtop brokenness, pointer/int warnings
 #device		lnc		# NE2100, NE32-VL Lance Ethernet cards
-device		sn		# SMC's 9000 series of ethernet chips
-device		xe		# Xircom pccard ethernet
+device		sn		# SMC's 9000 series of Ethernet chips
+device		xe		# Xircom pccard Ethernet
 
 # ISA devices that use the old ISA shims
 #device		le
@@ -253,10 +254,10 @@
 device		urio		# Diamond Rio 500 MP3 player
 device		uscanner	# Scanners
 # USB Ethernet, requires mii
-device		aue		# ADMtek USB ethernet
-device		axe		# ASIX Electronics USB ethernet
-device		cue		# CATC USB ethernet
-device		kue		# Kawasaki LSI USB ethernet
+device		aue		# ADMtek USB Ethernet
+device		axe		# ASIX Electronics USB Ethernet
+device		cue		# CATC USB Ethernet
+device		kue		# Kawasaki LSI USB Ethernet
 
 # FireWire support
 device		firewire	# FireWire bus code

==== //depot/projects/smpng/sys/amd64/include/acpica_machdep.h#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/amd64/include/acpica_machdep.h,v 1.4 2003/11/21 03:02:00 peter Exp $
+ * $FreeBSD: src/sys/amd64/include/acpica_machdep.h,v 1.5 2004/05/05 20:04:14 njl Exp $
  */
 
 /******************************************************************************
@@ -59,44 +59,14 @@
 
 #define ACPI_FLUSH_CPU_CACHE()	wbinvd()
 
-#define asm         __asm
-/*! [Begin] no source code translation
- *
- * A brief explanation as GNU inline assembly is a bit hairy
- *  %0 is the output parameter in EAX ("=a")
- *  %1 and %2 are the input parameters in ECX ("c")
- *  and an immediate value ("i") respectively
- *  All actual register references are preceded with "%%" as in "%%edx"
- *  Immediate values in the assembly are preceded by "$" as in "$0x1"
- *  The final asm parameter are the operation altered non-output registers.
- */
+/* Section 5.2.9.1:  global lock acquire/release functions */
+extern int	acpi_acquire_global_lock(uint32_t *lock);
+extern int	acpi_release_global_lock(uint32_t *lock);
 #define ACPI_ACQUIRE_GLOBAL_LOCK(GLptr, Acq) \
-    do { \
-        asm("1:     movl %1,%%eax;" \
-            "movl   %%eax,%%edx;" \
-            "andl   %2,%%edx;" \
-            "btsl   $0x1,%%edx;" \
-            "adcl   $0x0,%%edx;" \
-            "lock;  cmpxchgl %%edx,%1;" \
-            "jnz    1b;" \
-            "cmpb   $0x3,%%dl;" \
-            "sbbl   %%eax,%%eax" \
-            : "=a" (Acq), "+m" (GLptr) : "i" (~1L) : "edx"); \
-    } while(0)
-
+		((Acq) = acpi_acquire_global_lock(GLptr))
 #define ACPI_RELEASE_GLOBAL_LOCK(GLptr, Acq) \
-    do { \
-        asm("1:     movl %1,%%eax;" \
-            "movl   %%eax,%%edx;" \
-            "andl   %2,%%edx;" \
-            "lock;  cmpxchgl %%edx,%1;" \
-            "jnz    1b;" \
-            "andl   $0x1,%%eax" \
-            : "=a" (Acq), "+m" (GLptr) : "i" (~3L) : "edx"); \
-    } while(0)
-
-
-/*! [End] no source code translation !*/
+		((Acq) = acpi_release_global_lock(GLptr))
+ 
 #endif /* _KERNEL */
 
 #define ACPI_MACHINE_WIDTH             64

==== //depot/projects/smpng/sys/amd64/include/float.h#3 (text+ko) ====

@@ -27,16 +27,20 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)float.h	7.1 (Berkeley) 5/8/90
- * $FreeBSD: src/sys/amd64/include/float.h,v 1.11 2004/04/05 21:25:51 imp Exp $
+ * $FreeBSD: src/sys/amd64/include/float.h,v 1.12 2004/04/25 02:36:28 das Exp $
  */
 
 #ifndef _MACHINE_FLOAT_H_
 #define _MACHINE_FLOAT_H_ 1
 
+#include <sys/cdefs.h>
+
 #define FLT_RADIX	2		/* b */
 #define FLT_ROUNDS	1		/* FP addition rounds to nearest */
+#if __ISO_C_VISIBLE >= 1999
 #define	FLT_EVAL_METHOD	(-1)		/* i387 semantics are...interesting */
 #define	DECIMAL_DIG	21		/* max precision in decimal digits */
+#endif
 
 #define FLT_MANT_DIG	24		/* p */
 #define FLT_EPSILON	1.19209290E-07F	/* b**(1-p) */

==== //depot/projects/smpng/sys/arm/include/_types.h#4 (text+ko) ====

@@ -33,7 +33,7 @@
  *
  *	From: @(#)ansi.h	8.2 (Berkeley) 1/4/94
  *	From: @(#)types.h	8.3 (Berkeley) 1/5/94
- * $FreeBSD: src/sys/arm/include/_types.h,v 1.4 2004/03/20 20:41:39 marcel Exp $
+ * $FreeBSD: src/sys/arm/include/_types.h,v 1.5 2004/05/04 22:16:29 cognet Exp $
  */
 
 #ifndef _MACHINE__TYPES_H_
@@ -65,6 +65,8 @@
 typedef	__uint32_t	__clock_t;		/* clock()... */
 typedef	unsigned int	__cpumask_t;
 typedef	__int32_t	__critical_t;
+typedef	double		__double_t;
+typedef	double		__float_t;
 typedef	__int32_t	__intfptr_t;
 typedef	__int64_t	__intmax_t;
 typedef	__int32_t	__intptr_t;

==== //depot/projects/smpng/sys/arm/include/elf.h#4 (text+ko) ====

@@ -24,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD: src/sys/arm/include/elf.h,v 1.4 2003/09/25 01:10:23 peter Exp $
+ * $FreeBSD: src/sys/arm/include/elf.h,v 1.5 2004/05/04 22:21:36 cognet Exp $
  */
 
 #ifndef _MACHINE_ELF_H_
@@ -40,6 +40,17 @@
 #define	__ELF_WORD_SIZE	32	/* Used by <sys/elf_generic.h> */
 #include <sys/elf_generic.h>
 
+typedef struct {        /* Auxiliary vector entry on initial stack */
+	int     a_type;                 /* Entry type. */
+	union {
+		long    a_val;          /* Integer value. */
+		void    *a_ptr;         /* Address. */
+		void    (*a_fcn)(void); /* Function pointer (not used). */
+	} a_un;
+} Elf32_Auxinfo;
+
+__ElfType(Auxinfo);
+
 #define	ELF_ARCH	EM_ARM
 
 #define	ELF_MACHINE_OK(x) ((x) == EM_ARM)
@@ -48,6 +59,29 @@
  * Relocation types.
  */
 
+/* Values for a_type. */
+#define AT_NULL         0       /* Terminates the vector. */
+#define AT_IGNORE       1       /* Ignored entry. */
+#define AT_EXECFD       2       /* File descriptor of program to load. */
+#define AT_PHDR         3       /* Program header of program already loaded. */
+#define AT_PHENT        4       /* Size of each program header entry. */
+#define AT_PHNUM        5       /* Number of program header entries. */
+#define AT_PAGESZ       6       /* Page size in bytes. */
+#define AT_BASE         7       /* Interpreter's base address. */
+#define AT_FLAGS        8       /* Flags (unused). */
+#define AT_ENTRY        9       /* Where interpreter should transfer control. */
+
+#define AT_BRK          10      /* Starting point for sbrk and brk. */
+#define AT_DEBUG        11      /* Debugging level. */
+
+#define AT_NOTELF       10      /* Program is not ELF ?? */
+#define AT_UID          11      /* Real uid. */
+#define AT_EUID         12      /* Effective uid. */
+#define AT_GID          13      /* Real gid. */
+#define AT_EGID         14      /* Effective gid. */
+
+#define AT_COUNT        15      /* Count of defined aux entry types. */
+
 #define	R_ARM_NONE		0	/* No relocation. */
 #define	R_ARM_PC24		1
 #define	R_ARM_ABS32		2
@@ -69,7 +103,7 @@
 #define	R_ARM_GLOB_DAT		21	/* Set GOT entry to data address. */
 #define	R_ARM_JUMP_SLOT		22	/* Set GOT entry to code address. */
 #define	R_ARM_RELATIVE		23	/* Add load address of shared object. */
-#define	R_ARM_GOTOFF		24	/* Add GOT-relative symbol address. *
+#define	R_ARM_GOTOFF		24	/* Add GOT-relative symbol address. */
 #define	R_ARM_GOTPC		25	/* Add PC-relative GOT table address. */
 #define	R_ARM_GOT32		26	/* Add PC-relative GOT offset. */
 #define	R_ARM_PLT32		27	/* Add PC-relative PLT offset. */

==== //depot/projects/smpng/sys/arm/include/endian.h#3 (text+ko) ====

@@ -27,12 +27,71 @@
  *
  *	@(#)endian.h	8.1 (Berkeley) 6/10/93
  * $NetBSD: endian.h,v 1.7 1999/08/21 05:53:51 simonb Exp $
- * $FreeBSD: src/sys/arm/include/endian.h,v 1.2 2003/08/03 07:50:19 obrien Exp $
+ * $FreeBSD: src/sys/arm/include/endian.h,v 1.3 2004/05/04 22:24:56 cognet Exp $
  */
 
 #ifndef _ENDIAN_H_
 #define	_ENDIAN_H_
 
-#define	BYTE_ORDER	_LITTLE_ENDIAN
+#include <sys/_types.h>
+
+/*
+ * Definitions for byte order, according to byte significance from low
+ * address to high.
+ */
+#define _LITTLE_ENDIAN  1234    /* LSB first: i386, vax */
+#define _BIG_ENDIAN     4321    /* MSB first: 68000, ibm, net */
+#define _PDP_ENDIAN     3412    /* LSB first in word, MSW first in long */
+
+#define	_BYTE_ORDER	_LITTLE_ENDIAN
+
+#if __BSD_VISIBLE
+#define LITTLE_ENDIAN   _LITTLE_ENDIAN
+#define BIG_ENDIAN      _BIG_ENDIAN
+#define PDP_ENDIAN      _PDP_ENDIAN
+#define BYTE_ORDER      _BYTE_ORDER
+#endif
+
+#define _QUAD_HIGHWORD  1
+#define _QUAD_LOWWORD 0
+#define __ntohl(x)        (__bswap32(x))
+#define __ntohs(x)        (__bswap16(x))
+#define __htonl(x)        (__bswap16(x))
+#define __htons(x)        (__bswap32(x))
+
+static __inline __uint64_t
+__bswap64(__uint64_t _x)
+{
+
+	return ((_x >> 56) | ((_x >> 40) & 0xff00) | ((_x >> 24) & 0xff0000) |
+	    ((_x >> 8) & 0xff000000) | ((_x << 8) & ((__uint64_t)0xff << 32)) |
+	    ((_x << 24) & ((__uint64_t)0xff << 40)) | 
+	    ((_x << 40) & ((__uint64_t)0xff << 48)) | ((_x << 56)));
+}
+
+static __inline __uint32_t
+__bswap32(__uint32_t v)
+{
+	__uint32_t t1;
+
+	t1 = v ^ ((v << 16) | (v >> 16));
+	t1 &= 0xff00ffffU;
+	v = (v >> 8) | (v << 24);
+	v ^= (t1 >> 8);
+	
+	return (v);
+ }
 
+static __inline __uint16_t
+__bswap16(__uint32_t v)
+{
+	__asm __volatile(
+	    "mov    %0, %1, ror #8\n"
+	    "orr    %0, %0, %0, lsr #16\n"
+	    "bic    %0, %0, %0, lsl #16"
+	    : "=r" (v)
+	    : "0" (v));
+	
+	return (v);
+}		
 #endif /* !_ENDIAN_H_ */

==== //depot/projects/smpng/sys/arm/include/signal.h#4 (text+ko) ====

@@ -29,7 +29,7 @@
  *      @(#)signal.h    8.1 (Berkeley) 6/11/93
  *	from: FreeBSD: src/sys/i386/include/signal.h,v 1.13 2000/11/09
  *	from: FreeBSD: src/sys/sparc64/include/signal.h,v 1.6 2001/09/30 18:52:17
- * $FreeBSD: src/sys/arm/include/signal.h,v 1.3 2004/04/05 21:29:41 imp Exp $
+ * $FreeBSD: src/sys/arm/include/signal.h,v 1.4 2004/05/04 22:38:22 cognet Exp $
  */
 
 #ifndef	_MACHINE_SIGNAL_H_
@@ -44,7 +44,6 @@
 #endif
 
 #if __BSD_VISIBLE
-typedef	int osigset_t;
 
 struct osigcontext {
 };

==== //depot/projects/smpng/sys/boot/i386/boot0/Makefile#9 (text+ko) ====

@@ -1,13 +1,10 @@
-# $FreeBSD: src/sys/boot/i386/boot0/Makefile,v 1.23 2004/02/09 14:11:56 ru Exp $
+# $FreeBSD: src/sys/boot/i386/boot0/Makefile,v 1.29 2004/04/28 21:31:19 ru Exp $
 
-PROG=	${BOOT}.out
-INTERNALPROG=
-FILES=	${BOOT}
+PROG?=	boot0
+STRIP=
+BINMODE=${NOBINMODE}
 NOMAN=
-SRCS=	${BOOT}.s
-CLEANFILES= ${BOOT}
-
-BOOT?=	boot0
+SRCS=	${PROG}.S
 
 # The default set of flags compiled into boot0.  This enables update (writing
 # the modified boot0 back to disk after running so that the selection made is
@@ -30,13 +27,10 @@
 # command line
 BOOT_BOOT0_COMCONSOLE_SPEED?=	0xE3
 
-AFLAGS+=--defsym FLAGS=${BOOT_BOOT0_FLAGS} \
-	--defsym TICKS=${BOOT_BOOT0_TICKS} \
-	--defsym COMSPEED=${BOOT_BOOT0_COMCONSOLE_SPEED}
+CFLAGS+=-DFLAGS=${BOOT_BOOT0_FLAGS} \
+	-DTICKS=${BOOT_BOOT0_TICKS} \
+	-DCOMSPEED=${BOOT_BOOT0_COMCONSOLE_SPEED}
 
-LDFLAGS=-N -e start -Ttext ${BOOT_BOOT0_ORG}
-
-${BOOT}: ${BOOT}.out
-	objcopy -S -O binary ${BOOT}.out ${.TARGET}
+LDFLAGS=-N -e start -Ttext ${BOOT_BOOT0_ORG} -Wl,-S,--oformat,binary
 
 .include <bsd.prog.mk>

==== //depot/projects/smpng/sys/boot/i386/boot0ext/Makefile#2 (text+ko) ====

@@ -1,7 +1,7 @@
-# $FreeBSD: src/sys/boot/i386/boot0ext/Makefile,v 1.1 2004/03/26 18:46:31 obrien Exp $
+# $FreeBSD: src/sys/boot/i386/boot0ext/Makefile,v 1.2 2004/04/28 21:31:20 ru Exp $
 
 .PATH: ${.CURDIR}/../boot0
 
-BOOT=	boot0ext
+PROG=	boot0ext
 
 .include "${.CURDIR}/../boot0/Makefile"

==== //depot/projects/smpng/sys/boot/i386/boot0sio/Makefile#3 (text+ko) ====

@@ -1,7 +1,8 @@
-# $FreeBSD: src/sys/boot/i386/boot0sio/Makefile,v 1.2 2004/02/06 21:58:31 ru Exp $
+# $FreeBSD: src/sys/boot/i386/boot0sio/Makefile,v 1.4 2004/04/28 21:31:20 ru Exp $
 
 .PATH: ${.CURDIR}/../boot0
 
-BOOT=	boot0sio
+PROGNAME=	boot0sio
+CFLAGS+=	-DSIO
 
 .include "${.CURDIR}/../boot0/Makefile"

==== //depot/projects/smpng/sys/boot/i386/boot2/boot1.S#2 (text+ko) ====

@@ -1,21 +1,21 @@
-//

>>> TRUNCATED FOR MAIL (1000 lines) <<<


More information about the p4-projects mailing list