PERFORCE change 60151 for review
John Baldwin
jhb at FreeBSD.org
Fri Aug 20 10:10:41 PDT 2004
http://perforce.freebsd.org/chv.cgi?CH=60151
Change 60151 by jhb at jhb_slimer on 2004/08/20 17:10:02
IFC @60147.
Affected files ...
.. //depot/projects/smpng/sys/Makefile#7 integrate
.. //depot/projects/smpng/sys/alpha/alpha/elf_machdep.c#14 integrate
.. //depot/projects/smpng/sys/alpha/alpha/pmap.c#62 integrate
.. //depot/projects/smpng/sys/alpha/linux/linux.h#8 integrate
.. //depot/projects/smpng/sys/amd64/acpica/acpi_machdep.c#7 integrate
.. //depot/projects/smpng/sys/amd64/amd64/busdma_machdep.c#10 integrate
.. //depot/projects/smpng/sys/amd64/amd64/cpu_switch.S#12 integrate
.. //depot/projects/smpng/sys/amd64/amd64/db_interface.c#7 integrate
.. //depot/projects/smpng/sys/amd64/amd64/elf_machdep.c#8 integrate
.. //depot/projects/smpng/sys/amd64/amd64/exception.S#10 integrate
.. //depot/projects/smpng/sys/amd64/amd64/intr_machdep.c#5 integrate
.. //depot/projects/smpng/sys/amd64/amd64/io_apic.c#4 integrate
.. //depot/projects/smpng/sys/amd64/amd64/legacy.c#5 integrate
.. //depot/projects/smpng/sys/amd64/amd64/local_apic.c#6 integrate
.. //depot/projects/smpng/sys/amd64/amd64/machdep.c#27 integrate
.. //depot/projects/smpng/sys/amd64/amd64/mp_machdep.c#11 integrate
.. //depot/projects/smpng/sys/amd64/amd64/trap.c#21 integrate
.. //depot/projects/smpng/sys/amd64/amd64/vm_machdep.c#19 integrate
.. //depot/projects/smpng/sys/amd64/conf/GENERIC#21 integrate
.. //depot/projects/smpng/sys/amd64/conf/NOTES#8 integrate
.. //depot/projects/smpng/sys/amd64/include/intr_machdep.h#3 integrate
.. //depot/projects/smpng/sys/amd64/isa/atpic.c#7 integrate
.. //depot/projects/smpng/sys/amd64/isa/clock.c#9 integrate
.. //depot/projects/smpng/sys/amd64/isa/isa.h#3 integrate
.. //depot/projects/smpng/sys/amd64/isa/isa_dma.c#6 integrate
.. //depot/projects/smpng/sys/amd64/linux32/Makefile#1 branch
.. //depot/projects/smpng/sys/amd64/linux32/linux.h#1 branch
.. //depot/projects/smpng/sys/amd64/linux32/linux32_dummy.c#1 branch
.. //depot/projects/smpng/sys/amd64/linux32/linux32_genassym.c#1 branch
.. //depot/projects/smpng/sys/amd64/linux32/linux32_ipc64.h#1 branch
.. //depot/projects/smpng/sys/amd64/linux32/linux32_locore.s#1 branch
.. //depot/projects/smpng/sys/amd64/linux32/linux32_machdep.c#1 branch
.. //depot/projects/smpng/sys/amd64/linux32/linux32_proto.h#1 branch
.. //depot/projects/smpng/sys/amd64/linux32/linux32_syscall.h#1 branch
.. //depot/projects/smpng/sys/amd64/linux32/linux32_sysent.c#1 branch
.. //depot/projects/smpng/sys/amd64/linux32/linux32_sysvec.c#1 branch
.. //depot/projects/smpng/sys/amd64/linux32/syscalls.conf#1 branch
.. //depot/projects/smpng/sys/amd64/linux32/syscalls.master#1 branch
.. //depot/projects/smpng/sys/arm/arm/elf_machdep.c#3 integrate
.. //depot/projects/smpng/sys/arm/arm/pmap.c#7 integrate
.. //depot/projects/smpng/sys/boot/Makefile#16 integrate
.. //depot/projects/smpng/sys/boot/common/help.common#13 integrate
.. //depot/projects/smpng/sys/boot/common/loader.8#29 integrate
.. //depot/projects/smpng/sys/boot/ofw/common/main.c#7 integrate
.. //depot/projects/smpng/sys/boot/ofw/libofw/ofw_console.c#4 integrate
.. //depot/projects/smpng/sys/boot/ofw/libofw/ofw_net.c#7 integrate
.. //depot/projects/smpng/sys/boot/ofw/libofw/openfirm.c#9 integrate
.. //depot/projects/smpng/sys/boot/ofw/libofw/openfirm.h#7 integrate
.. //depot/projects/smpng/sys/boot/powerpc/loader/Makefile#12 integrate
.. //depot/projects/smpng/sys/boot/sparc64/boot1/boot1.c#8 integrate
.. //depot/projects/smpng/sys/boot/sparc64/loader/Makefile#15 integrate
.. //depot/projects/smpng/sys/boot/sparc64/loader/main.c#17 integrate
.. //depot/projects/smpng/sys/cam/scsi/scsi_all.c#20 integrate
.. //depot/projects/smpng/sys/cam/scsi/scsi_da.c#54 integrate
.. //depot/projects/smpng/sys/cam/scsi/scsi_target.c#15 integrate
.. //depot/projects/smpng/sys/compat/ia32/ia32_sysvec.c#11 integrate
.. //depot/projects/smpng/sys/compat/linprocfs/linprocfs.c#39 integrate
.. //depot/projects/smpng/sys/compat/linux/linux_file.c#23 integrate
.. //depot/projects/smpng/sys/compat/linux/linux_getcwd.c#14 integrate
.. //depot/projects/smpng/sys/compat/linux/linux_ioctl.c#34 integrate
.. //depot/projects/smpng/sys/compat/linux/linux_ipc.c#16 integrate
.. //depot/projects/smpng/sys/compat/linux/linux_ipc.h#6 integrate
.. //depot/projects/smpng/sys/compat/linux/linux_mib.c#10 integrate
.. //depot/projects/smpng/sys/compat/linux/linux_misc.c#49 integrate
.. //depot/projects/smpng/sys/compat/linux/linux_signal.c#15 integrate
.. //depot/projects/smpng/sys/compat/linux/linux_socket.c#19 integrate
.. //depot/projects/smpng/sys/compat/linux/linux_stats.c#19 integrate
.. //depot/projects/smpng/sys/compat/linux/linux_sysctl.c#10 integrate
.. //depot/projects/smpng/sys/compat/linux/linux_uid16.c#19 integrate
.. //depot/projects/smpng/sys/compat/linux/linux_util.h#9 integrate
.. //depot/projects/smpng/sys/compat/ndis/kern_ndis.c#18 integrate
.. //depot/projects/smpng/sys/compat/ndis/ndis_var.h#14 integrate
.. //depot/projects/smpng/sys/compat/ndis/subr_ndis.c#19 integrate
.. //depot/projects/smpng/sys/compat/ndis/subr_ntoskrnl.c#19 integrate
.. //depot/projects/smpng/sys/conf/Makefile.powerpc#23 integrate
.. //depot/projects/smpng/sys/conf/NOTES#77 integrate
.. //depot/projects/smpng/sys/conf/files#117 integrate
.. //depot/projects/smpng/sys/conf/files.amd64#21 integrate
.. //depot/projects/smpng/sys/conf/files.i386#67 integrate
.. //depot/projects/smpng/sys/conf/files.ia64#44 integrate
.. //depot/projects/smpng/sys/conf/files.pc98#63 integrate
.. //depot/projects/smpng/sys/conf/files.powerpc#21 integrate
.. //depot/projects/smpng/sys/conf/files.sparc64#42 integrate
.. //depot/projects/smpng/sys/conf/kern.pre.mk#38 integrate
.. //depot/projects/smpng/sys/conf/kmod.mk#33 integrate
.. //depot/projects/smpng/sys/conf/newvers.sh#13 integrate
.. //depot/projects/smpng/sys/conf/options#84 integrate
.. //depot/projects/smpng/sys/conf/options.amd64#8 integrate
.. //depot/projects/smpng/sys/conf/options.i386#42 integrate
.. //depot/projects/smpng/sys/conf/options.ia64#19 integrate
.. //depot/projects/smpng/sys/conf/options.pc98#40 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/aclocal.h#19 integrate
.. //depot/projects/smpng/sys/contrib/dev/oltr/if_oltr.c#11 integrate
.. //depot/projects/smpng/sys/contrib/ngatm/FREEBSD-Xlist#1 branch
.. //depot/projects/smpng/sys/contrib/ngatm/netnatm/api/cc_conn.c#2 integrate
.. //depot/projects/smpng/sys/contrib/ngatm/netnatm/api/cc_dump.c#2 integrate
.. //depot/projects/smpng/sys/contrib/ngatm/netnatm/api/cc_user.c#2 integrate
.. //depot/projects/smpng/sys/contrib/ngatm/netnatm/msg/uni_ie.c#3 integrate
.. //depot/projects/smpng/sys/contrib/ngatm/netnatm/msg/unistruct.h#3 integrate
.. //depot/projects/smpng/sys/contrib/ngatm/netnatm/sig/sig_call.c#3 integrate
.. //depot/projects/smpng/sys/contrib/ngatm/netnatm/sig/sig_coord.c#3 integrate
.. //depot/projects/smpng/sys/contrib/ngatm/netnatm/sig/sig_party.c#3 integrate
.. //depot/projects/smpng/sys/contrib/ngatm/netnatm/sig/sig_print.c#3 integrate
.. //depot/projects/smpng/sys/contrib/ngatm/netnatm/sig/sig_reset.c#3 integrate
.. //depot/projects/smpng/sys/contrib/ngatm/netnatm/sig/sig_uni.c#3 integrate
.. //depot/projects/smpng/sys/contrib/pf/net/if_pfsync.c#7 integrate
.. //depot/projects/smpng/sys/contrib/pf/net/pf.c#8 integrate
.. //depot/projects/smpng/sys/contrib/pf/net/pf_if.c#3 integrate
.. //depot/projects/smpng/sys/contrib/pf/net/pf_ioctl.c#7 integrate
.. //depot/projects/smpng/sys/contrib/pf/net/pf_norm.c#7 integrate
.. //depot/projects/smpng/sys/contrib/pf/net/pfvar.h#4 integrate
.. //depot/projects/smpng/sys/dev/aac/aac.c#42 integrate
.. //depot/projects/smpng/sys/dev/aac/aac_cam.c#12 integrate
.. //depot/projects/smpng/sys/dev/aac/aac_disk.c#21 integrate
.. //depot/projects/smpng/sys/dev/aac/aac_pci.c#32 integrate
.. //depot/projects/smpng/sys/dev/aac/aacreg.h#13 integrate
.. //depot/projects/smpng/sys/dev/aac/aacvar.h#24 integrate
.. //depot/projects/smpng/sys/dev/acpica/Osd/OsdInterrupt.c#12 integrate
.. //depot/projects/smpng/sys/dev/acpica/Osd/OsdSchedule.c#22 integrate
.. //depot/projects/smpng/sys/dev/acpica/acpi.c#71 integrate
.. //depot/projects/smpng/sys/dev/acpica/acpi_acad.c#20 integrate
.. //depot/projects/smpng/sys/dev/acpica/acpi_battery.c#10 integrate
.. //depot/projects/smpng/sys/dev/acpica/acpi_cmbat.c#22 integrate
.. //depot/projects/smpng/sys/dev/acpica/acpi_cpu.c#27 integrate
.. //depot/projects/smpng/sys/dev/acpica/acpi_ec.c#32 integrate
.. //depot/projects/smpng/sys/dev/acpica/acpi_lid.c#14 integrate
.. //depot/projects/smpng/sys/dev/acpica/acpi_pci.c#14 integrate
.. //depot/projects/smpng/sys/dev/acpica/acpi_pci_link.c#17 integrate
.. //depot/projects/smpng/sys/dev/acpica/acpi_pcib.c#25 integrate
.. //depot/projects/smpng/sys/dev/acpica/acpi_pcib_acpi.c#12 integrate
.. //depot/projects/smpng/sys/dev/acpica/acpi_pcib_pci.c#7 integrate
.. //depot/projects/smpng/sys/dev/acpica/acpi_pcibvar.h#3 integrate
.. //depot/projects/smpng/sys/dev/acpica/acpi_powerres.c#18 integrate
.. //depot/projects/smpng/sys/dev/acpica/acpi_resource.c#19 integrate
.. //depot/projects/smpng/sys/dev/acpica/acpi_thermal.c#27 integrate
.. //depot/projects/smpng/sys/dev/acpica/acpi_video.c#6 integrate
.. //depot/projects/smpng/sys/dev/acpica/acpiio.h#6 integrate
.. //depot/projects/smpng/sys/dev/acpica/acpivar.h#46 integrate
.. //depot/projects/smpng/sys/dev/aic7xxx/ahc_eisa.c#12 integrate
.. //depot/projects/smpng/sys/dev/aic7xxx/ahc_isa.c#1 branch
.. //depot/projects/smpng/sys/dev/aic7xxx/ahc_pci.c#18 integrate
.. //depot/projects/smpng/sys/dev/aic7xxx/aic79xx.c#21 integrate
.. //depot/projects/smpng/sys/dev/aic7xxx/aic79xx.h#18 integrate
.. //depot/projects/smpng/sys/dev/aic7xxx/aic79xx_osm.c#16 integrate
.. //depot/projects/smpng/sys/dev/aic7xxx/aic7xxx.c#20 integrate
.. //depot/projects/smpng/sys/dev/aic7xxx/aic7xxx.h#11 integrate
.. //depot/projects/smpng/sys/dev/aic7xxx/aic7xxx.seq#10 integrate
.. //depot/projects/smpng/sys/dev/aic7xxx/aic7xxx_osm.c#15 integrate
.. //depot/projects/smpng/sys/dev/aic7xxx/aic7xxx_osm.h#14 integrate
.. //depot/projects/smpng/sys/dev/aic7xxx/aic_osm_lib.c#2 integrate
.. //depot/projects/smpng/sys/dev/aic7xxx/aic_osm_lib.h#3 integrate
.. //depot/projects/smpng/sys/dev/amr/amr.c#22 integrate
.. //depot/projects/smpng/sys/dev/amr/amr_pci.c#15 integrate
.. //depot/projects/smpng/sys/dev/amr/amrio.h#4 integrate
.. //depot/projects/smpng/sys/dev/ar/if_ar.c#15 integrate
.. //depot/projects/smpng/sys/dev/arl/if_arl.c#7 integrate
.. //depot/projects/smpng/sys/dev/ata/ata-all.c#56 integrate
.. //depot/projects/smpng/sys/dev/ata/ata-all.h#29 integrate
.. //depot/projects/smpng/sys/dev/ata/ata-chipset.c#40 integrate
.. //depot/projects/smpng/sys/dev/ata/ata-dma.c#38 integrate
.. //depot/projects/smpng/sys/dev/ata/ata-lowlevel.c#18 integrate
.. //depot/projects/smpng/sys/dev/ata/ata-pci.c#48 integrate
.. //depot/projects/smpng/sys/dev/ata/ata-queue.c#16 integrate
.. //depot/projects/smpng/sys/dev/awi/awi.c#20 integrate
.. //depot/projects/smpng/sys/dev/ciss/ciss.c#35 integrate
.. //depot/projects/smpng/sys/dev/cm/smc90cx6.c#10 integrate
.. //depot/projects/smpng/sys/dev/cp/cpddk.c#2 integrate
.. //depot/projects/smpng/sys/dev/cp/cpddk.h#2 integrate
.. //depot/projects/smpng/sys/dev/cp/if_cp.c#5 integrate
.. //depot/projects/smpng/sys/dev/cs/if_cs.c#11 integrate
.. //depot/projects/smpng/sys/dev/ctau/if_ct.c#7 integrate
.. //depot/projects/smpng/sys/dev/cx/if_cx.c#11 integrate
.. //depot/projects/smpng/sys/dev/ed/if_ed.c#23 integrate
.. //depot/projects/smpng/sys/dev/eisa/eisaconf.c#9 integrate
.. //depot/projects/smpng/sys/dev/esp/esp_sbus.c#3 integrate
.. //depot/projects/smpng/sys/dev/ex/if_ex.c#13 integrate
.. //depot/projects/smpng/sys/dev/exca/exca.c#12 integrate
.. //depot/projects/smpng/sys/dev/exca/excavar.h#6 integrate
.. //depot/projects/smpng/sys/dev/fdc/fdc.c#5 integrate
.. //depot/projects/smpng/sys/dev/fdc/fdc_acpi.c#3 integrate
.. //depot/projects/smpng/sys/dev/fdc/fdc_isa.c#4 integrate
.. //depot/projects/smpng/sys/dev/fdc/fdc_pccard.c#3 integrate
.. //depot/projects/smpng/sys/dev/fdc/fdcreg.h#2 delete
.. //depot/projects/smpng/sys/dev/fdc/fdcvar.h#3 integrate
.. //depot/projects/smpng/sys/dev/fe/if_fe.c#14 integrate
.. //depot/projects/smpng/sys/dev/firewire/if_fwe.c#24 integrate
.. //depot/projects/smpng/sys/dev/firewire/if_fwip.c#3 integrate
.. //depot/projects/smpng/sys/dev/fxp/if_fxp.c#54 integrate
.. //depot/projects/smpng/sys/dev/gem/if_gem.c#20 integrate
.. //depot/projects/smpng/sys/dev/hme/if_hme.c#18 integrate
.. //depot/projects/smpng/sys/dev/hme/if_hme_pci.c#12 integrate
.. //depot/projects/smpng/sys/dev/hme/if_hme_sbus.c#10 integrate
.. //depot/projects/smpng/sys/dev/hme/if_hmevar.h#6 integrate
.. //depot/projects/smpng/sys/dev/ie/if_ie.c#11 integrate
.. //depot/projects/smpng/sys/dev/if_ndis/if_ndis_pci.c#5 integrate
.. //depot/projects/smpng/sys/dev/iicbus/if_ic.c#11 integrate
.. //depot/projects/smpng/sys/dev/isp/isp_sbus.c#10 integrate
.. //depot/projects/smpng/sys/dev/ixgb/if_ixgb.c#3 integrate
.. //depot/projects/smpng/sys/dev/lge/if_lge.c#23 integrate
.. //depot/projects/smpng/sys/dev/lnc/if_lnc.c#17 integrate
.. //depot/projects/smpng/sys/dev/mii/mii.c#11 integrate
.. //depot/projects/smpng/sys/dev/nge/if_nge.c#34 integrate
.. //depot/projects/smpng/sys/dev/ofw/ofw_bus.h#1 branch
.. //depot/projects/smpng/sys/dev/ofw/ofw_bus_if.m#1 branch
.. //depot/projects/smpng/sys/dev/ofw/ofw_disk.c#12 integrate
.. //depot/projects/smpng/sys/dev/ofw/openfirm.c#8 integrate
.. //depot/projects/smpng/sys/dev/ofw/openfirm.h#6 integrate
.. //depot/projects/smpng/sys/dev/ofw/openfirmio.c#10 integrate
.. //depot/projects/smpng/sys/dev/ofw/openpromio.c#6 integrate
.. //depot/projects/smpng/sys/dev/pccard/pccard.c#28 integrate
.. //depot/projects/smpng/sys/dev/pccbb/pccbb.c#46 integrate
.. //depot/projects/smpng/sys/dev/pccbb/pccbb_isa.c#1 branch
.. //depot/projects/smpng/sys/dev/pccbb/pccbb_pci.c#1 branch
.. //depot/projects/smpng/sys/dev/pccbb/pccbbvar.h#13 integrate
.. //depot/projects/smpng/sys/dev/pcf/envctrl.c#2 integrate
.. //depot/projects/smpng/sys/dev/pcf/pcf_ebus.c#2 integrate
.. //depot/projects/smpng/sys/dev/pcf/pcf_isa.c#2 integrate
.. //depot/projects/smpng/sys/dev/pcf/pcfvar.h#3 integrate
.. //depot/projects/smpng/sys/dev/pcic/i82365.c#10 delete
.. //depot/projects/smpng/sys/dev/pcic/i82365_isa.c#5 delete
.. //depot/projects/smpng/sys/dev/pcic/i82365reg.h#2 delete
.. //depot/projects/smpng/sys/dev/pcic/i82365var.h#2 delete
.. //depot/projects/smpng/sys/dev/ppbus/if_plip.c#12 integrate
.. //depot/projects/smpng/sys/dev/puc/puc_ebus.c#3 integrate
.. //depot/projects/smpng/sys/dev/puc/puc_sbus.c#4 integrate
.. //depot/projects/smpng/sys/dev/random/randomdev_soft.c#3 integrate
.. //depot/projects/smpng/sys/dev/ray/if_ray.c#14 integrate
.. //depot/projects/smpng/sys/dev/sab/sab.c#21 integrate
.. //depot/projects/smpng/sys/dev/sbni/if_sbni.c#16 integrate
.. //depot/projects/smpng/sys/dev/snc/dp83932.c#10 integrate
.. //depot/projects/smpng/sys/dev/sr/if_sr.c#16 integrate
.. //depot/projects/smpng/sys/dev/twa/twa_freebsd.c#4 integrate
.. //depot/projects/smpng/sys/dev/twa/twa_reg.h#2 integrate
.. //depot/projects/smpng/sys/dev/tx/if_tx.c#19 integrate
.. //depot/projects/smpng/sys/dev/txp/if_txp.c#22 integrate
.. //depot/projects/smpng/sys/dev/uart/uart_bus_ebus.c#5 integrate
.. //depot/projects/smpng/sys/dev/uart/uart_bus_isa.c#3 integrate
.. //depot/projects/smpng/sys/dev/uart/uart_cpu.h#4 integrate
.. //depot/projects/smpng/sys/dev/uart/uart_cpu_alpha.c#4 integrate
.. //depot/projects/smpng/sys/dev/uart/uart_cpu_amd64.c#4 integrate
.. //depot/projects/smpng/sys/dev/uart/uart_cpu_i386.c#4 integrate
.. //depot/projects/smpng/sys/dev/uart/uart_cpu_ia64.c#4 integrate
.. //depot/projects/smpng/sys/dev/uart/uart_cpu_pc98.c#5 integrate
.. //depot/projects/smpng/sys/dev/uart/uart_cpu_sparc64.c#6 integrate
.. //depot/projects/smpng/sys/dev/usb/if_aue.c#34 integrate
.. //depot/projects/smpng/sys/dev/usb/if_axe.c#14 integrate
.. //depot/projects/smpng/sys/dev/usb/if_cue.c#25 integrate
.. //depot/projects/smpng/sys/dev/usb/if_kue.c#22 integrate
.. //depot/projects/smpng/sys/dev/usb/if_rue.c#12 integrate
.. //depot/projects/smpng/sys/dev/usb/if_udav.c#4 integrate
.. //depot/projects/smpng/sys/dev/usb/ubser.c#5 integrate
.. //depot/projects/smpng/sys/dev/usb/udbp.c#13 integrate
.. //depot/projects/smpng/sys/dev/usb/ufm.c#13 integrate
.. //depot/projects/smpng/sys/dev/usb/ugen.c#25 integrate
.. //depot/projects/smpng/sys/dev/usb/uhid.c#22 integrate
.. //depot/projects/smpng/sys/dev/usb/uhub.c#18 integrate
.. //depot/projects/smpng/sys/dev/usb/ukbd.c#16 integrate
.. //depot/projects/smpng/sys/dev/usb/ulpt.c#19 integrate
.. //depot/projects/smpng/sys/dev/usb/umass.c#40 integrate
.. //depot/projects/smpng/sys/dev/usb/ums.c#18 integrate
.. //depot/projects/smpng/sys/dev/usb/urio.c#19 integrate
.. //depot/projects/smpng/sys/dev/usb/usb_port.h#19 integrate
.. //depot/projects/smpng/sys/dev/usb/usb_quirks.c#10 integrate
.. //depot/projects/smpng/sys/dev/usb/usb_subr.c#24 integrate
.. //depot/projects/smpng/sys/dev/usb/usbdevs#59 integrate
.. //depot/projects/smpng/sys/dev/usb/usbdi.h#12 integrate
.. //depot/projects/smpng/sys/dev/usb/uscanner.c#25 integrate
.. //depot/projects/smpng/sys/dev/vx/if_vx.c#16 integrate
.. //depot/projects/smpng/sys/dev/vx/if_vx_eisa.c#8 integrate
.. //depot/projects/smpng/sys/dev/vx/if_vx_pci.c#9 integrate
.. //depot/projects/smpng/sys/dev/vx/if_vxreg.h#4 integrate
.. //depot/projects/smpng/sys/dev/vx/if_vxvar.h#3 integrate
.. //depot/projects/smpng/sys/dev/xe/if_xe.c#19 integrate
.. //depot/projects/smpng/sys/dev/zs/zs_macio.c#5 integrate
.. //depot/projects/smpng/sys/dev/zs/zs_sbus.c#6 integrate
.. //depot/projects/smpng/sys/fs/fifofs/fifo_vnops.c#28 integrate
.. //depot/projects/smpng/sys/fs/pseudofs/pseudofs_vncache.c#18 integrate
.. //depot/projects/smpng/sys/fs/pseudofs/pseudofs_vnops.c#31 integrate
.. //depot/projects/smpng/sys/gdb/gdb_main.c#2 integrate
.. //depot/projects/smpng/sys/geom/geom_io.c#31 integrate
.. //depot/projects/smpng/sys/geom/geom_slice.c#30 integrate
.. //depot/projects/smpng/sys/geom/mirror/g_mirror.c#2 integrate
.. //depot/projects/smpng/sys/geom/mirror/g_mirror.h#2 integrate
.. //depot/projects/smpng/sys/geom/mirror/g_mirror_ctl.c#2 integrate
.. //depot/projects/smpng/sys/geom/nop/g_nop.c#4 integrate
.. //depot/projects/smpng/sys/geom/raid3/g_raid3.c#1 branch
.. //depot/projects/smpng/sys/geom/raid3/g_raid3.h#1 branch
.. //depot/projects/smpng/sys/geom/raid3/g_raid3_ctl.c#1 branch
.. //depot/projects/smpng/sys/geom/stripe/g_stripe.c#6 integrate
.. //depot/projects/smpng/sys/geom/uzip/g_uzip.c#1 branch
.. //depot/projects/smpng/sys/geom/vinum/geom_vinum_drive.c#4 integrate
.. //depot/projects/smpng/sys/geom/vinum/geom_vinum_init.c#3 integrate
.. //depot/projects/smpng/sys/geom/vinum/geom_vinum_plex.c#4 integrate
.. //depot/projects/smpng/sys/geom/vinum/geom_vinum_state.c#2 integrate
.. //depot/projects/smpng/sys/geom/vinum/geom_vinum_subr.c#4 integrate
.. //depot/projects/smpng/sys/gnu/ext2fs/ext2_vnops.c#22 integrate
.. //depot/projects/smpng/sys/i386/acpica/acpi_asus.c#6 integrate
.. //depot/projects/smpng/sys/i386/acpica/acpi_panasonic.c#2 integrate
.. //depot/projects/smpng/sys/i386/acpica/acpi_toshiba.c#6 integrate
.. //depot/projects/smpng/sys/i386/acpica/acpi_wakeup.c#29 integrate
.. //depot/projects/smpng/sys/i386/conf/GENERIC#54 integrate
.. //depot/projects/smpng/sys/i386/conf/NOTES#87 integrate
.. //depot/projects/smpng/sys/i386/i386/elf_machdep.c#12 integrate
.. //depot/projects/smpng/sys/i386/i386/legacy.c#7 integrate
.. //depot/projects/smpng/sys/i386/i386/mp_machdep.c#66 integrate
.. //depot/projects/smpng/sys/i386/i386/mp_watchdog.c#1 branch
.. //depot/projects/smpng/sys/i386/include/mp_watchdog.h#1 branch
.. //depot/projects/smpng/sys/i386/include/vmparam.h#7 integrate
.. //depot/projects/smpng/sys/i386/linux/linux.h#8 integrate
.. //depot/projects/smpng/sys/ia64/disasm/disasm_decode.c#2 integrate
.. //depot/projects/smpng/sys/ia64/ia64/elf_machdep.c#15 integrate
.. //depot/projects/smpng/sys/ia64/ia64/machdep.c#83 integrate
.. //depot/projects/smpng/sys/ia64/ia64/unaligned.c#8 integrate
.. //depot/projects/smpng/sys/ia64/ia64/unwind.c#12 integrate
.. //depot/projects/smpng/sys/ia64/include/md_var.h#16 integrate
.. //depot/projects/smpng/sys/ia64/include/pcb.h#11 integrate
.. //depot/projects/smpng/sys/isa/psm.c#28 integrate
.. //depot/projects/smpng/sys/kern/bus_if.m#10 integrate
.. //depot/projects/smpng/sys/kern/device_if.m#3 integrate
.. //depot/projects/smpng/sys/kern/imgact_elf.c#39 integrate
.. //depot/projects/smpng/sys/kern/init_main.c#46 integrate
.. //depot/projects/smpng/sys/kern/kern_condvar.c#38 integrate
.. //depot/projects/smpng/sys/kern/kern_conf.c#28 integrate
.. //depot/projects/smpng/sys/kern/kern_descrip.c#65 integrate
.. //depot/projects/smpng/sys/kern/kern_event.c#31 integrate
.. //depot/projects/smpng/sys/kern/kern_exec.c#74 integrate
.. //depot/projects/smpng/sys/kern/kern_exit.c#82 integrate
.. //depot/projects/smpng/sys/kern/kern_fork.c#81 integrate
.. //depot/projects/smpng/sys/kern/kern_intr.c#50 integrate
.. //depot/projects/smpng/sys/kern/kern_lock.c#32 integrate
.. //depot/projects/smpng/sys/kern/kern_mutex.c#85 integrate
.. //depot/projects/smpng/sys/kern/kern_physio.c#14 integrate
.. //depot/projects/smpng/sys/kern/kern_proc.c#64 integrate
.. //depot/projects/smpng/sys/kern/kern_shutdown.c#46 integrate
.. //depot/projects/smpng/sys/kern/kern_sig.c#95 integrate
.. //depot/projects/smpng/sys/kern/kern_switch.c#42 integrate
.. //depot/projects/smpng/sys/kern/kern_synch.c#78 integrate
.. //depot/projects/smpng/sys/kern/kern_tc.c#29 integrate
.. //depot/projects/smpng/sys/kern/kern_thread.c#64 integrate
.. //depot/projects/smpng/sys/kern/sched_4bsd.c#33 integrate
.. //depot/projects/smpng/sys/kern/sched_ule.c#38 integrate
.. //depot/projects/smpng/sys/kern/subr_disk.c#22 integrate
.. //depot/projects/smpng/sys/kern/subr_kdb.c#3 integrate
.. //depot/projects/smpng/sys/kern/subr_rman.c#17 integrate
.. //depot/projects/smpng/sys/kern/subr_sleepqueue.c#10 integrate
.. //depot/projects/smpng/sys/kern/subr_smp.c#33 integrate
.. //depot/projects/smpng/sys/kern/sys_pipe.c#47 integrate
.. //depot/projects/smpng/sys/kern/tty.c#46 integrate
.. //depot/projects/smpng/sys/kern/tty_cons.c#29 integrate
.. //depot/projects/smpng/sys/kern/uipc_socket.c#55 integrate
.. //depot/projects/smpng/sys/kern/uipc_socket2.c#36 integrate
.. //depot/projects/smpng/sys/kern/uipc_syscalls.c#58 integrate
.. //depot/projects/smpng/sys/kern/uipc_usrreq.c#39 integrate
.. //depot/projects/smpng/sys/kern/vfs_aio.c#48 integrate
.. //depot/projects/smpng/sys/kern/vfs_subr.c#79 integrate
.. //depot/projects/smpng/sys/kern/vfs_vnops.c#49 integrate
.. //depot/projects/smpng/sys/modules/Makefile#80 integrate
.. //depot/projects/smpng/sys/modules/agp/Makefile#6 integrate
.. //depot/projects/smpng/sys/modules/aic7xxx/ahc/Makefile#5 integrate
.. //depot/projects/smpng/sys/modules/aic7xxx/ahc/ahc_eisa/Makefile#3 integrate
.. //depot/projects/smpng/sys/modules/aic7xxx/ahc/ahc_isa/Makefile#1 branch
.. //depot/projects/smpng/sys/modules/cbb/Makefile#4 integrate
.. //depot/projects/smpng/sys/modules/esp/Makefile#2 integrate
.. //depot/projects/smpng/sys/modules/geom/Makefile#10 integrate
.. //depot/projects/smpng/sys/modules/geom/geom_raid3/Makefile#1 branch
.. //depot/projects/smpng/sys/modules/geom/geom_uzip/Makefile#1 branch
.. //depot/projects/smpng/sys/modules/hme/Makefile#2 integrate
.. //depot/projects/smpng/sys/modules/ip_mroute_mod/Makefile#5 integrate
.. //depot/projects/smpng/sys/modules/ipfw/Makefile#4 integrate
.. //depot/projects/smpng/sys/modules/isp/Makefile#2 integrate
.. //depot/projects/smpng/sys/modules/linprocfs/Makefile#3 integrate
.. //depot/projects/smpng/sys/modules/netgraph/atm/Makefile#5 integrate
.. //depot/projects/smpng/sys/modules/netgraph/atm/ccatm/Makefile#1 branch
.. //depot/projects/smpng/sys/modules/pf/Makefile#4 integrate
.. //depot/projects/smpng/sys/modules/uart/Makefile#5 integrate
.. //depot/projects/smpng/sys/net/bpf.c#39 integrate
.. //depot/projects/smpng/sys/net/bridge.c#28 integrate
.. //depot/projects/smpng/sys/net/if.c#52 integrate
.. //depot/projects/smpng/sys/net/if_media.h#13 integrate
.. //depot/projects/smpng/sys/net/if_tap.c#28 integrate
.. //depot/projects/smpng/sys/net/if_var.h#30 integrate
.. //depot/projects/smpng/sys/net/if_vlan.c#31 integrate
.. //depot/projects/smpng/sys/net/route.c#23 integrate
.. //depot/projects/smpng/sys/net/rtsock.c#37 integrate
.. //depot/projects/smpng/sys/netgraph/atm/ccatm/ng_ccatm.c#1 branch
.. //depot/projects/smpng/sys/netgraph/atm/ccatm/ng_ccatm_cust.h#1 branch
.. //depot/projects/smpng/sys/netgraph/atm/ng_ccatm.h#1 branch
.. //depot/projects/smpng/sys/netgraph/bluetooth/include/ng_btsocket.h#6 integrate
.. //depot/projects/smpng/sys/netgraph/netgraph.h#12 integrate
.. //depot/projects/smpng/sys/netgraph/ng_bridge.c#15 integrate
.. //depot/projects/smpng/sys/netgraph/ng_message.h#9 integrate
.. //depot/projects/smpng/sys/netinet/icmp_var.h#7 integrate
.. //depot/projects/smpng/sys/netinet/if_atm.c#7 integrate
.. //depot/projects/smpng/sys/netinet/if_atm.h#4 integrate
.. //depot/projects/smpng/sys/netinet/igmp.h#3 integrate
.. //depot/projects/smpng/sys/netinet/in.c#21 integrate
.. //depot/projects/smpng/sys/netinet/in.h#27 integrate
.. //depot/projects/smpng/sys/netinet/in_pcb.c#48 integrate
.. //depot/projects/smpng/sys/netinet/in_pcb.h#32 integrate
.. //depot/projects/smpng/sys/netinet/in_proto.c#16 integrate
.. //depot/projects/smpng/sys/netinet/in_var.h#11 integrate
.. //depot/projects/smpng/sys/netinet/ip_divert.c#36 integrate
.. //depot/projects/smpng/sys/netinet/ip_dummynet.c#32 integrate
.. //depot/projects/smpng/sys/netinet/ip_dummynet.h#14 integrate
.. //depot/projects/smpng/sys/netinet/ip_fastfwd.c#8 integrate
.. //depot/projects/smpng/sys/netinet/ip_fw.h#22 integrate
.. //depot/projects/smpng/sys/netinet/ip_fw2.c#37 integrate
.. //depot/projects/smpng/sys/netinet/ip_fw_pfil.c#1 branch
.. //depot/projects/smpng/sys/netinet/ip_gre.c#13 integrate
.. //depot/projects/smpng/sys/netinet/ip_icmp.c#31 integrate
.. //depot/projects/smpng/sys/netinet/ip_id.c#5 integrate
.. //depot/projects/smpng/sys/netinet/ip_input.c#56 integrate
.. //depot/projects/smpng/sys/netinet/ip_mroute.c#35 integrate
.. //depot/projects/smpng/sys/netinet/ip_mroute.h#7 integrate
.. //depot/projects/smpng/sys/netinet/ip_output.c#61 integrate
.. //depot/projects/smpng/sys/netinet/ip_var.h#23 integrate
.. //depot/projects/smpng/sys/netinet/raw_ip.c#42 integrate
.. //depot/projects/smpng/sys/netinet/tcp.h#8 integrate
.. //depot/projects/smpng/sys/netinet/tcp_debug.h#4 integrate
.. //depot/projects/smpng/sys/netinet/tcp_hostcache.c#5 integrate
.. //depot/projects/smpng/sys/netinet/tcp_input.c#58 integrate
.. //depot/projects/smpng/sys/netinet/tcp_output.c#28 integrate
.. //depot/projects/smpng/sys/netinet/tcp_sack.c#2 integrate
.. //depot/projects/smpng/sys/netinet/tcp_subr.c#53 integrate
.. //depot/projects/smpng/sys/netinet/tcp_syncache.c#33 integrate
.. //depot/projects/smpng/sys/netinet/tcp_timer.c#18 integrate
.. //depot/projects/smpng/sys/netinet/tcp_timer.h#8 integrate
.. //depot/projects/smpng/sys/netinet/tcp_usrreq.c#32 integrate
.. //depot/projects/smpng/sys/netinet/tcp_var.h#28 integrate
.. //depot/projects/smpng/sys/netinet/tcpip.h#3 integrate
.. //depot/projects/smpng/sys/netinet/udp_usrreq.c#47 integrate
.. //depot/projects/smpng/sys/netinet/udp_var.h#6 integrate
.. //depot/projects/smpng/sys/netinet6/frag6.c#7 integrate
.. //depot/projects/smpng/sys/netinet6/in6_pcb.c#33 integrate
.. //depot/projects/smpng/sys/netinet6/in6_proto.c#8 integrate
.. //depot/projects/smpng/sys/netinet6/ip6_id.c#2 integrate
.. //depot/projects/smpng/sys/netinet6/ip6_input.c#33 integrate
.. //depot/projects/smpng/sys/netinet6/ip6_output.c#33 integrate
.. //depot/projects/smpng/sys/netinet6/ip6_var.h#12 integrate
.. //depot/projects/smpng/sys/netinet6/ipsec.c#16 integrate
.. //depot/projects/smpng/sys/netinet6/raw_ip6.c#28 integrate
.. //depot/projects/smpng/sys/netipsec/xform_ipip.c#8 integrate
.. //depot/projects/smpng/sys/pccard/i82365.h#10 integrate
.. //depot/projects/smpng/sys/pccard/pcic.c#25 integrate
.. //depot/projects/smpng/sys/pccard/pcic_isa.c#10 integrate
.. //depot/projects/smpng/sys/pci/agp.c#22 integrate
.. //depot/projects/smpng/sys/pci/agp_amd.c#14 integrate
.. //depot/projects/smpng/sys/pci/agp_amd64.c#1 branch
.. //depot/projects/smpng/sys/pci/agp_sis.c#10 integrate
.. //depot/projects/smpng/sys/pci/agp_via.c#13 integrate
.. //depot/projects/smpng/sys/pci/agpreg.h#11 integrate
.. //depot/projects/smpng/sys/pci/if_dc.c#58 integrate
.. //depot/projects/smpng/sys/pci/if_de.c#19 integrate
.. //depot/projects/smpng/sys/pci/if_sk.c#35 integrate
.. //depot/projects/smpng/sys/pci/if_skreg.h#7 integrate
.. //depot/projects/smpng/sys/pci/if_vr.c#30 integrate
.. //depot/projects/smpng/sys/powerpc/conf/GENERIC#23 integrate
.. //depot/projects/smpng/sys/powerpc/include/memdev.h#1 branch
.. //depot/projects/smpng/sys/powerpc/include/ofw_machdep.h#2 integrate
.. //depot/projects/smpng/sys/powerpc/include/pmap.h#14 integrate
.. //depot/projects/smpng/sys/powerpc/ofw/ofw_pcib_pci.c#4 integrate
.. //depot/projects/smpng/sys/powerpc/ofw/ofw_syscons.c#4 integrate
.. //depot/projects/smpng/sys/powerpc/powermac/ata_kauai.c#5 integrate
.. //depot/projects/smpng/sys/powerpc/powermac/ata_macio.c#10 integrate
.. //depot/projects/smpng/sys/powerpc/powermac/grackle.c#6 integrate
.. //depot/projects/smpng/sys/powerpc/powermac/hrowpic.c#7 integrate
.. //depot/projects/smpng/sys/powerpc/powermac/macio.c#9 integrate
.. //depot/projects/smpng/sys/powerpc/powermac/maciovar.h#5 integrate
.. //depot/projects/smpng/sys/powerpc/powermac/openpic_macio.c#7 integrate
.. //depot/projects/smpng/sys/powerpc/powermac/uninorth.c#6 integrate
.. //depot/projects/smpng/sys/powerpc/powerpc/elf_machdep.c#12 integrate
.. //depot/projects/smpng/sys/powerpc/powerpc/locore.S#7 integrate
.. //depot/projects/smpng/sys/powerpc/powerpc/mem.c#1 branch
.. //depot/projects/smpng/sys/powerpc/powerpc/nexus.c#9 integrate
.. //depot/projects/smpng/sys/powerpc/powerpc/ofw_machdep.c#9 integrate
.. //depot/projects/smpng/sys/powerpc/powerpc/ofwmagic.S#3 integrate
.. //depot/projects/smpng/sys/powerpc/powerpc/openpic.c#7 integrate
.. //depot/projects/smpng/sys/powerpc/powerpc/pmap.c#45 integrate
.. //depot/projects/smpng/sys/powerpc/psim/iobus.c#6 integrate
.. //depot/projects/smpng/sys/powerpc/psim/openpic_iobus.c#5 integrate
.. //depot/projects/smpng/sys/sparc64/central/central.c#3 integrate
.. //depot/projects/smpng/sys/sparc64/central/centralvar.h#2 delete
.. //depot/projects/smpng/sys/sparc64/conf/GENERIC#44 integrate
.. //depot/projects/smpng/sys/sparc64/conf/NOTES#8 integrate
.. //depot/projects/smpng/sys/sparc64/ebus/ebus.c#16 integrate
.. //depot/projects/smpng/sys/sparc64/ebus/ebusvar.h#3 delete
.. //depot/projects/smpng/sys/sparc64/fhc/fhc.c#4 integrate
.. //depot/projects/smpng/sys/sparc64/fhc/fhc_central.c#3 integrate
.. //depot/projects/smpng/sys/sparc64/fhc/fhc_nexus.c#3 integrate
.. //depot/projects/smpng/sys/sparc64/fhc/fhcvar.h#2 integrate
.. //depot/projects/smpng/sys/sparc64/include/eeprom.h#3 integrate
.. //depot/projects/smpng/sys/sparc64/include/ofw_bus.h#7 integrate
.. //depot/projects/smpng/sys/sparc64/include/ofw_machdep.h#5 integrate
.. //depot/projects/smpng/sys/sparc64/include/pmap.h#27 integrate
.. //depot/projects/smpng/sys/sparc64/isa/isa.c#12 integrate
.. //depot/projects/smpng/sys/sparc64/pci/apb.c#9 integrate
.. //depot/projects/smpng/sys/sparc64/pci/ofw_pci.h#8 integrate
.. //depot/projects/smpng/sys/sparc64/pci/ofw_pci_if.m#4 integrate
.. //depot/projects/smpng/sys/sparc64/pci/ofw_pcib.c#4 integrate
.. //depot/projects/smpng/sys/sparc64/pci/ofw_pcib_subr.c#4 integrate
.. //depot/projects/smpng/sys/sparc64/pci/ofw_pcib_subr.h#3 integrate
.. //depot/projects/smpng/sys/sparc64/pci/ofw_pcibus.c#3 integrate
.. //depot/projects/smpng/sys/sparc64/pci/psycho.c#34 integrate
.. //depot/projects/smpng/sys/sparc64/sbus/sbus.c#19 integrate
.. //depot/projects/smpng/sys/sparc64/sbus/sbusvar.h#4 integrate
.. //depot/projects/smpng/sys/sparc64/sparc64/eeprom.c#4 integrate
.. //depot/projects/smpng/sys/sparc64/sparc64/eeprom_ebus.c#6 integrate
.. //depot/projects/smpng/sys/sparc64/sparc64/eeprom_fhc.c#6 delete
.. //depot/projects/smpng/sys/sparc64/sparc64/eeprom_sbus.c#6 integrate
.. //depot/projects/smpng/sys/sparc64/sparc64/elf_machdep.c#16 integrate
.. //depot/projects/smpng/sys/sparc64/sparc64/machdep.c#64 integrate
.. //depot/projects/smpng/sys/sparc64/sparc64/mem.c#13 integrate
.. //depot/projects/smpng/sys/sparc64/sparc64/nexus.c#12 integrate
.. //depot/projects/smpng/sys/sparc64/sparc64/ofw_bus.c#9 integrate
.. //depot/projects/smpng/sys/sparc64/sparc64/ofw_machdep.c#9 integrate
.. //depot/projects/smpng/sys/sparc64/sparc64/pmap.c#52 integrate
.. //depot/projects/smpng/sys/sparc64/sparc64/tsb.c#22 integrate
.. //depot/projects/smpng/sys/sparc64/sparc64/uio_machdep.c#4 integrate
.. //depot/projects/smpng/sys/sys/bio.h#21 integrate
.. //depot/projects/smpng/sys/sys/cdefs.h#26 integrate
.. //depot/projects/smpng/sys/sys/event.h#13 integrate
.. //depot/projects/smpng/sys/sys/eventvar.h#3 integrate
.. //depot/projects/smpng/sys/sys/fdcio.h#3 integrate
.. //depot/projects/smpng/sys/sys/filedesc.h#23 integrate
.. //depot/projects/smpng/sys/sys/imgact_elf.h#8 integrate
.. //depot/projects/smpng/sys/sys/mbuf.h#42 integrate
.. //depot/projects/smpng/sys/sys/param.h#68 integrate
.. //depot/projects/smpng/sys/sys/proc.h#123 integrate
.. //depot/projects/smpng/sys/sys/selinfo.h#8 integrate
.. //depot/projects/smpng/sys/sys/sleepqueue.h#4 integrate
.. //depot/projects/smpng/sys/sys/socket.h#23 integrate
.. //depot/projects/smpng/sys/sys/vnode.h#47 integrate
.. //depot/projects/smpng/sys/ufs/ffs/ffs_vnops.c#31 integrate
.. //depot/projects/smpng/sys/ufs/ffs/fs.h#15 integrate
.. //depot/projects/smpng/sys/ufs/ufs/ufs_acl.c#15 integrate
.. //depot/projects/smpng/sys/ufs/ufs/ufs_dirhash.c#19 integrate
.. //depot/projects/smpng/sys/ufs/ufs/ufs_vnops.c#37 integrate
.. //depot/projects/smpng/sys/vm/vm.h#7 integrate
.. //depot/projects/smpng/sys/vm/vm_fault.c#38 integrate
.. //depot/projects/smpng/sys/vm/vm_map.c#66 integrate
.. //depot/projects/smpng/sys/vm/vm_map.h#32 integrate
.. //depot/projects/smpng/sys/vm/vm_meter.c#18 integrate
.. //depot/projects/smpng/sys/vm/vnode_pager.c#41 integrate
Differences ...
==== //depot/projects/smpng/sys/Makefile#7 (text+ko) ====
@@ -1,9 +1,11 @@
-# $FreeBSD: src/sys/Makefile,v 1.30 2004/05/16 00:19:12 cognet Exp $
+# $FreeBSD: src/sys/Makefile,v 1.31 2004/08/19 09:54:28 des Exp $
# The boot loader
+.if !defined(NO_BOOT)
.if ${MACHINE_ARCH} != "arm"
SUBDIR= boot
.endif
+.endif
# Loadable kernel modules
.if defined(MODULES_WITH_WORLD)
==== //depot/projects/smpng/sys/alpha/alpha/elf_machdep.c#14 (text+ko) ====
@@ -24,7 +24,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/alpha/alpha/elf_machdep.c,v 1.18 2004/05/16 20:00:27 peter Exp $");
+__FBSDID("$FreeBSD: src/sys/alpha/alpha/elf_machdep.c,v 1.19 2004/08/11 02:35:04 marcel Exp $");
#include <sys/param.h>
#include <sys/kernel.h>
@@ -106,6 +106,13 @@
&freebsd_brand_oinfo);
+void
+elf64_dump_thread(struct thread *td __unused, void *dst __unused,
+ size_t *off __unused)
+{
+}
+
+
/* Process one elf relocation with addend. */
static int
elf_reloc_internal(linker_file_t lf, Elf_Addr relocbase, const void *data,
==== //depot/projects/smpng/sys/alpha/alpha/pmap.c#62 (text+ko) ====
@@ -148,7 +148,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/alpha/alpha/pmap.c,v 1.165 2004/08/04 18:04:43 alc Exp $");
+__FBSDID("$FreeBSD: src/sys/alpha/alpha/pmap.c,v 1.166 2004/08/15 20:54:25 alc Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -2173,7 +2173,7 @@
/*
* this routine is used to modify bits in ptes
*/
-static void
+static __inline void
pmap_changebit(vm_page_t m, int bit, boolean_t setem)
{
pv_entry_t pv;
@@ -2410,7 +2410,7 @@
pmap_emulate_reference(struct vmspace *vm, vm_offset_t v, int user, int write)
{
pmap_t pmap;
- pt_entry_t faultoff, *pte;
+ pt_entry_t *pte;
/*
* Convert process and virtual address to physical address.
@@ -2427,32 +2427,15 @@
PMAP_LOCK(pmap);
pte = pmap_lev3pte(pmap, v);
}
-#ifdef INVARIANTS /* These checks are more expensive */
- if (!pmap_pte_v(pte))
- panic("pmap_emulate_reference: invalid pte");
-#if 0
+
/*
- * Can't do these, because cpu_fork and cpu_swapin call
- * pmap_emulate_reference(), and the bits aren't guaranteed,
- * for them...
+ * Another CPU can modify the pmap between the emulation trap and this
+ * CPU locking the pmap. As a result, the pte may be inconsistent
+ * with the access that caused the emulation trap. In such cases,
+ * invalidate this CPU's TLB entry and return.
*/
- if (write) {
- if (!(*pte & (user ? PG_UWE : PG_UWE | PG_KWE)))
- panic("pmap_emulate_reference: write but unwritable");
- if (!(*pte & PG_FOW))
- panic("pmap_emulate_reference: write but not FOW");
- } else {
- if (!(*pte & (user ? PG_URE : PG_URE | PG_KRE)))
- panic("pmap_emulate_reference: !write but unreadable");
- if (!(*pte & (PG_FOR | PG_FOE)))
- panic("pmap_emulate_reference: !write but not FOR|FOE");
- }
-#endif
- /* Other diagnostics? */
-#endif
- KASSERT((*pte & PG_MANAGED) != 0,
- ("pmap_emulate_reference(%p, 0x%lx, %d, %d): pa 0x%lx not managed",
- curthread, v, user, write, pmap_pte_pa(pte)));
+ if (!pmap_pte_v(pte))
+ goto tbis;
/*
* Twiddle the appropriate bits to reflect the reference
@@ -2463,12 +2446,19 @@
* (2) if it was a write fault, mark page as modified.
*/
if (write) {
- faultoff = PG_FOR | PG_FOE | PG_FOW;
+ if (!(*pte & (user ? PG_UWE : PG_UWE | PG_KWE)))
+ goto tbis;
+ if (!(*pte & PG_FOW))
+ goto tbis;
+ *pte &= ~(PG_FOR | PG_FOE | PG_FOW);
} else {
- faultoff = PG_FOR | PG_FOE;
+ if (!(*pte & (user ? PG_URE : PG_URE | PG_KRE)))
+ goto tbis;
+ if (!(*pte & (PG_FOR | PG_FOE)))
+ goto tbis;
+ *pte &= ~(PG_FOR | PG_FOE);
}
-
- *pte = (*pte & ~faultoff);
+tbis:
ALPHA_TBIS(v);
PMAP_UNLOCK(pmap);
}
==== //depot/projects/smpng/sys/alpha/linux/linux.h#8 (text+ko) ====
@@ -25,7 +25,7 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
- * $FreeBSD: src/sys/alpha/linux/linux.h,v 1.58 2003/04/16 20:04:47 jhb Exp $
+ * $FreeBSD: src/sys/alpha/linux/linux.h,v 1.59 2004/08/16 07:05:44 tjr Exp $
*/
#ifndef _ALPHA_LINUX_LINUX_H_
@@ -45,6 +45,9 @@
MALLOC_DECLARE(M_LINUX);
#endif
+#define PTRIN(v) (void *)(v)
+#define PTROUT(v) (l_uintptr_t)(v)
+
typedef int l_int;
typedef int64_t l_long;
typedef int64_t l_longlong;
@@ -55,6 +58,7 @@
typedef unsigned short l_ushort;
typedef char *l_caddr_t;
+typedef l_ulong l_uintptr_t;
typedef l_long l_clock_t;
typedef l_int l_daddr_t;
typedef l_uint l_dev_t;
==== //depot/projects/smpng/sys/amd64/acpica/acpi_machdep.c#7 (text+ko) ====
@@ -25,7 +25,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/amd64/acpica/acpi_machdep.c,v 1.14 2004/06/30 04:42:29 njl Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/acpica/acpi_machdep.c,v 1.15 2004/08/16 23:10:18 peter Exp $");
#include <sys/param.h>
#include <sys/bus.h>
@@ -40,8 +40,7 @@
{
struct acpi_softc *sc;
- sc = device_get_softc(dev);
-
+ sc = devclass_get_softc(devclass_find("acpi"), 0);
acpi_install_wakeup_handler(sc);
if (intr_model != ACPI_INTR_PIC)
==== //depot/projects/smpng/sys/amd64/amd64/busdma_machdep.c#10 (text+ko) ====
@@ -25,7 +25,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/amd64/amd64/busdma_machdep.c,v 1.56 2004/07/08 01:28:33 peter Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/busdma_machdep.c,v 1.57 2004/08/16 22:53:03 peter Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -526,7 +526,7 @@
if ((dmat->lowaddr < ptoa((vm_paddr_t)Maxmem)
|| dmat->boundary > 0 || dmat->alignment > 1)
- && map->pagesneeded == 0) {
+ && map != &nobounce_dmamap && map->pagesneeded == 0) {
vm_offset_t vendaddr;
/*
==== //depot/projects/smpng/sys/amd64/amd64/cpu_switch.S#12 (text+ko) ====
@@ -30,7 +30,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD: src/sys/amd64/amd64/cpu_switch.S,v 1.150 2004/05/16 22:43:57 peter Exp $
+ * $FreeBSD: src/sys/amd64/amd64/cpu_switch.S,v 1.151 2004/08/16 22:53:29 peter Exp $
*/
#include <machine/asmacros.h>
@@ -53,7 +53,7 @@
/*
* cpu_throw()
*
- * This is the second half of cpu_swtch(). It is used when the current
+ * This is the second half of cpu_switch(). It is used when the current
* thread is either a dummy or slated to die, and we no longer care
* about its state. This is only a slight optimization and is probably
* not worth it anymore. Note that we need to clear the pm_active bits so
==== //depot/projects/smpng/sys/amd64/amd64/db_interface.c#7 (text+ko) ====
@@ -25,7 +25,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/amd64/amd64/db_interface.c,v 1.79 2004/07/10 23:47:18 marcel Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/db_interface.c,v 1.80 2004/08/16 23:10:46 peter Exp $");
/*
* Interface to new debugger.
@@ -33,11 +33,9 @@
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/kdb.h>
-#include <sys/reboot.h>
#include <sys/cons.h>
#include <sys/pcpu.h>
#include <sys/proc.h>
-#include <sys/smp.h>
#include <machine/cpu.h>
==== //depot/projects/smpng/sys/amd64/amd64/elf_machdep.c#8 (text+ko) ====
@@ -24,7 +24,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/amd64/amd64/elf_machdep.c,v 1.21 2004/05/17 21:16:49 peter Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/elf_machdep.c,v 1.22 2004/08/11 02:35:04 marcel Exp $");
#include <sys/param.h>
#include <sys/kernel.h>
@@ -102,6 +102,14 @@
(sysinit_cfunc_t) elf64_insert_brand_entry,
&freebsd_brand_oinfo);
+
+void
+elf64_dump_thread(struct thread *td __unused, void *dst __unused,
+ size_t *off __unused)
+{
+}
+
+
/* Process one elf relocation with addend. */
static int
elf_reloc_internal(linker_file_t lf, Elf_Addr relocbase, const void *data,
==== //depot/projects/smpng/sys/amd64/amd64/exception.S#10 (text+ko) ====
@@ -27,11 +27,11 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD: src/sys/amd64/amd64/exception.S,v 1.119 2004/05/24 12:42:16 bde Exp $
+ * $FreeBSD: src/sys/amd64/amd64/exception.S,v 1.120 2004/08/16 12:51:32 obrien Exp $
*/
#include "opt_atpic.h"
-#include "opt_ia32.h"
+#include "opt_compat.h"
#include <machine/asmacros.h>
#include <machine/psl.h>
@@ -307,7 +307,7 @@
* included.
*/
-#ifdef IA32
+#ifdef COMPAT_IA32
.data
.p2align 4
.text
==== //depot/projects/smpng/sys/amd64/amd64/intr_machdep.c#5 (text+ko) ====
@@ -26,7 +26,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD: src/sys/amd64/amd64/intr_machdep.c,v 1.8 2004/07/19 16:37:47 jhb Exp $
+ * $FreeBSD: src/sys/amd64/amd64/intr_machdep.c,v 1.9 2004/08/16 23:12:29 peter Exp $
*/
/*
@@ -212,8 +212,7 @@
* For stray and threaded interrupts, we mask and EOI the
* source.
*/
- isrc->is_pic->pic_disable_source(isrc);
- isrc->is_pic->pic_eoi_source(isrc);
+ isrc->is_pic->pic_disable_source(isrc, PIC_EOI);
if (ih == NULL)
error = EINVAL;
else
==== //depot/projects/smpng/sys/amd64/amd64/io_apic.c#4 (text+ko) ====
@@ -28,7 +28,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/amd64/amd64/io_apic.c,v 1.10 2004/07/08 01:42:49 peter Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/io_apic.c,v 1.11 2004/08/16 23:12:29 peter Exp $");
#include "opt_atpic.h"
#include "opt_isa.h"
@@ -119,7 +119,7 @@
static const char *ioapic_bus_string(int bus_type);
static void ioapic_print_vector(struct ioapic_intsrc *intpin);
static void ioapic_enable_source(struct intsrc *isrc);
-static void ioapic_disable_source(struct intsrc *isrc);
+static void ioapic_disable_source(struct intsrc *isrc, int eoi);
static void ioapic_eoi_source(struct intsrc *isrc);
static void ioapic_enable_intr(struct intsrc *isrc);
static int ioapic_vector(struct intsrc *isrc);
@@ -148,6 +148,12 @@
#endif
TUNABLE_INT("hw.apic.mixed_mode", &mixed_mode_active);
+static __inline void
+_ioapic_eoi_source(struct intsrc *isrc)
+{
+ lapic_eoi();
+}
+
static u_int
ioapic_read(volatile ioapic_t *apic, int reg)
{
@@ -225,7 +231,7 @@
}
static void
-ioapic_disable_source(struct intsrc *isrc)
+ioapic_disable_source(struct intsrc *isrc, int eoi)
{
struct ioapic_intsrc *intpin = (struct ioapic_intsrc *)isrc;
struct ioapic *io = (struct ioapic *)isrc->is_pic;
@@ -240,6 +246,10 @@
flags);
intpin->io_masked = 1;
}
+
+ if (eoi == PIC_EOI)
+ _ioapic_eoi_source(isrc);
+
mtx_unlock_spin(&icu_lock);
}
@@ -247,7 +257,7 @@
ioapic_eoi_source(struct intsrc *isrc)
{
- lapic_eoi();
+ _ioapic_eoi_source(isrc);
}
/*
==== //depot/projects/smpng/sys/amd64/amd64/legacy.c#5 (text+ko) ====
@@ -28,7 +28,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/amd64/amd64/legacy.c,v 1.55 2004/06/03 20:25:05 peter Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/legacy.c,v 1.56 2004/08/16 22:54:50 peter Exp $");
/*
* This code implements a system driver for legacy systems that do not
@@ -51,7 +51,6 @@
static MALLOC_DEFINE(M_LEGACYDEV, "legacydrv", "legacy system device");
struct legacy_device {
- struct resource_list lg_resources;
int lg_pcibus;
};
@@ -63,15 +62,8 @@
static int legacy_print_child(device_t, device_t);
static device_t legacy_add_child(device_t bus, int order, const char *name,
int unit);
-static struct resource *legacy_alloc_resource(device_t, device_t, int, int *,
- u_long, u_long, u_long, u_int);
static int legacy_read_ivar(device_t, device_t, int, uintptr_t *);
static int legacy_write_ivar(device_t, device_t, int, uintptr_t);
-static int legacy_release_resource(device_t, device_t, int, int,
- struct resource *);
-static int legacy_set_resource(device_t, device_t, int, int, u_long, u_long);
-static int legacy_get_resource(device_t, device_t, int, int, u_long *, u_long *);
-static void legacy_delete_resource(device_t, device_t, int, int);
static device_method_t legacy_methods[] = {
/* Device interface */
@@ -88,11 +80,8 @@
DEVMETHOD(bus_add_child, legacy_add_child),
DEVMETHOD(bus_read_ivar, legacy_read_ivar),
DEVMETHOD(bus_write_ivar, legacy_write_ivar),
- DEVMETHOD(bus_set_resource, legacy_set_resource),
- DEVMETHOD(bus_get_resource, legacy_get_resource),
- DEVMETHOD(bus_alloc_resource, legacy_alloc_resource),
- DEVMETHOD(bus_release_resource, legacy_release_resource),
- DEVMETHOD(bus_delete_resource, legacy_delete_resource),
+ DEVMETHOD(bus_alloc_resource, bus_generic_alloc_resource),
+ DEVMETHOD(bus_release_resource, bus_generic_release_resource),
DEVMETHOD(bus_activate_resource, bus_generic_activate_resource),
DEVMETHOD(bus_deactivate_resource, bus_generic_deactivate_resource),
DEVMETHOD(bus_setup_intr, bus_generic_setup_intr),
@@ -183,30 +172,12 @@
}
static int
-legacy_print_all_resources(device_t dev)
-{
- struct legacy_device *atdev = DEVTOAT(dev);
>>> TRUNCATED FOR MAIL (1000 lines) <<<
More information about the p4-projects
mailing list