PERFORCE change 152571 for review
Marko Zec
zec at FreeBSD.org
Thu Nov 6 05:27:45 PST 2008
http://perforce.freebsd.org/chv.cgi?CH=152571
Change 152571 by zec at zec_tca51 on 2008/11/06 13:27:01
IFC @ 152569
Affected files ...
.. //depot/projects/vimage/src/sys/amd64/amd64/dump_machdep.c#11 integrate
.. //depot/projects/vimage/src/sys/amd64/amd64/minidump_machdep.c#13 integrate
.. //depot/projects/vimage/src/sys/boot/powerpc/boot1.chrp/boot1.c#2 integrate
.. //depot/projects/vimage/src/sys/boot/powerpc/boot1.chrp/bootinfo.txt#2 integrate
.. //depot/projects/vimage/src/sys/cddl/compat/opensolaris/kern/opensolaris_kmem.c#3 integrate
.. //depot/projects/vimage/src/sys/cddl/compat/opensolaris/sys/types.h#2 integrate
.. //depot/projects/vimage/src/sys/cddl/compat/opensolaris/sys/uio.h#2 integrate
.. //depot/projects/vimage/src/sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.c#5 integrate
.. //depot/projects/vimage/src/sys/cddl/contrib/opensolaris/uts/common/dtrace/fasttrap.c#2 integrate
.. //depot/projects/vimage/src/sys/cddl/dev/dtrace/dtrace_ioctl.c#2 integrate
.. //depot/projects/vimage/src/sys/cddl/dev/dtrace/dtrace_load.c#2 integrate
.. //depot/projects/vimage/src/sys/cddl/dev/dtrace/dtrace_unload.c#2 integrate
.. //depot/projects/vimage/src/sys/cddl/dev/systrace/systrace.c#2 integrate
.. //depot/projects/vimage/src/sys/compat/freebsd32/freebsd32_proto.h#15 integrate
.. //depot/projects/vimage/src/sys/compat/freebsd32/freebsd32_syscall.h#15 integrate
.. //depot/projects/vimage/src/sys/compat/freebsd32/freebsd32_syscalls.c#15 integrate
.. //depot/projects/vimage/src/sys/compat/freebsd32/freebsd32_sysent.c#15 integrate
.. //depot/projects/vimage/src/sys/compat/freebsd32/syscalls.master#16 integrate
.. //depot/projects/vimage/src/sys/compat/linprocfs/linprocfs.c#28 integrate
.. //depot/projects/vimage/src/sys/compat/linux/linux_emul.c#7 integrate
.. //depot/projects/vimage/src/sys/conf/NOTES#36 integrate
.. //depot/projects/vimage/src/sys/conf/files#42 integrate
.. //depot/projects/vimage/src/sys/conf/kmod.mk#8 integrate
.. //depot/projects/vimage/src/sys/conf/options#35 integrate
.. //depot/projects/vimage/src/sys/dev/acpi_support/acpi_asus.c#9 integrate
.. //depot/projects/vimage/src/sys/dev/acpica/Osd/OsdSchedule.c#4 integrate
.. //depot/projects/vimage/src/sys/dev/acpica/acpi.c#15 integrate
.. //depot/projects/vimage/src/sys/dev/adb/adb_bus.c#2 integrate
.. //depot/projects/vimage/src/sys/dev/adb/adb_mouse.c#2 integrate
.. //depot/projects/vimage/src/sys/dev/adb/adbvar.h#2 integrate
.. //depot/projects/vimage/src/sys/dev/amr/amr.c#7 integrate
.. //depot/projects/vimage/src/sys/dev/amr/amr_cam.c#6 integrate
.. //depot/projects/vimage/src/sys/dev/amr/amrvar.h#4 integrate
.. //depot/projects/vimage/src/sys/dev/an/if_an.c#8 integrate
.. //depot/projects/vimage/src/sys/dev/ath/if_ath.c#22 integrate
.. //depot/projects/vimage/src/sys/dev/cardbus/cardbus_cis.c#4 integrate
.. //depot/projects/vimage/src/sys/dev/cardbus/cardbusreg.h#2 integrate
.. //depot/projects/vimage/src/sys/dev/cxgb/cxgb_main.c#18 integrate
.. //depot/projects/vimage/src/sys/dev/cxgb/cxgb_osdep.h#13 integrate
.. //depot/projects/vimage/src/sys/dev/e1000/if_em.c#2 integrate
.. //depot/projects/vimage/src/sys/dev/e1000/if_igb.c#3 integrate
.. //depot/projects/vimage/src/sys/dev/en/midway.c#5 integrate
.. //depot/projects/vimage/src/sys/dev/hwpmc/hwpmc_mod.c#10 integrate
.. //depot/projects/vimage/src/sys/dev/mn/if_mn.c#1 branch
.. //depot/projects/vimage/src/sys/dev/pci/pcireg.h#10 integrate
.. //depot/projects/vimage/src/sys/dev/snp/snp.c#9 integrate
.. //depot/projects/vimage/src/sys/dev/sound/pci/hda/hdac.c#23 integrate
.. //depot/projects/vimage/src/sys/dev/sound/pcm/channel.c#6 integrate
.. //depot/projects/vimage/src/sys/dev/sound/pcm/channel.h#3 integrate
.. //depot/projects/vimage/src/sys/dev/sound/pcm/mixer.c#5 integrate
.. //depot/projects/vimage/src/sys/dev/sound/pcm/mixer.h#3 integrate
.. //depot/projects/vimage/src/sys/dev/usb/u3g.c#4 integrate
.. //depot/projects/vimage/src/sys/dev/usb/usb_subr.c#6 integrate
.. //depot/projects/vimage/src/sys/dev/usb/usbdevs#34 integrate
.. //depot/projects/vimage/src/sys/dev/usb2/bluetooth/TODO.TXT#1 branch
.. //depot/projects/vimage/src/sys/dev/usb2/bluetooth/ng_ubt2.c#1 branch
.. //depot/projects/vimage/src/sys/dev/usb2/bluetooth/ng_ubt2_var.h#1 branch
.. //depot/projects/vimage/src/sys/dev/usb2/bluetooth/ubtbcmfw2.c#1 branch
.. //depot/projects/vimage/src/sys/dev/usb2/bluetooth/usb2_bluetooth.c#1 branch
.. //depot/projects/vimage/src/sys/dev/usb2/bluetooth/usb2_bluetooth.h#1 branch
.. //depot/projects/vimage/src/sys/dev/usb2/controller/at91dci.c#1 branch
.. //depot/projects/vimage/src/sys/dev/usb2/controller/at91dci.h#1 branch
.. //depot/projects/vimage/src/sys/dev/usb2/controller/at91dci_atmelarm.c#1 branch
.. //depot/projects/vimage/src/sys/dev/usb2/controller/ehci2.c#1 branch
.. //depot/projects/vimage/src/sys/dev/usb2/controller/ehci2.h#1 branch
.. //depot/projects/vimage/src/sys/dev/usb2/controller/ehci2_pci.c#1 branch
.. //depot/projects/vimage/src/sys/dev/usb2/controller/musb2_otg.c#1 branch
.. //depot/projects/vimage/src/sys/dev/usb2/controller/musb2_otg.h#1 branch
.. //depot/projects/vimage/src/sys/dev/usb2/controller/musb2_otg_atmelarm.c#1 branch
.. //depot/projects/vimage/src/sys/dev/usb2/controller/ohci2.c#1 branch
.. //depot/projects/vimage/src/sys/dev/usb2/controller/ohci2.h#1 branch
.. //depot/projects/vimage/src/sys/dev/usb2/controller/ohci2_atmelarm.c#1 branch
.. //depot/projects/vimage/src/sys/dev/usb2/controller/ohci2_pci.c#1 branch
.. //depot/projects/vimage/src/sys/dev/usb2/controller/uhci2.c#1 branch
.. //depot/projects/vimage/src/sys/dev/usb2/controller/uhci2.h#1 branch
.. //depot/projects/vimage/src/sys/dev/usb2/controller/uhci2_pci.c#1 branch
.. //depot/projects/vimage/src/sys/dev/usb2/controller/usb2_bus.h#1 branch
.. //depot/projects/vimage/src/sys/dev/usb2/controller/usb2_controller.c#1 branch
.. //depot/projects/vimage/src/sys/dev/usb2/controller/usb2_controller.h#1 branch
.. //depot/projects/vimage/src/sys/dev/usb2/controller/usb2_pci.h#1 branch
.. //depot/projects/vimage/src/sys/dev/usb2/controller/uss820dci.c#1 branch
.. //depot/projects/vimage/src/sys/dev/usb2/controller/uss820dci.h#1 branch
.. //depot/projects/vimage/src/sys/dev/usb2/controller/uss820dci_atmelarm.c#1 branch
.. //depot/projects/vimage/src/sys/dev/usb2/controller/uss820dci_pccard.c#1 branch
.. //depot/projects/vimage/src/sys/dev/usb2/core/README.TXT#1 branch
.. //depot/projects/vimage/src/sys/dev/usb2/core/usb2_busdma.c#1 branch
.. //depot/projects/vimage/src/sys/dev/usb2/core/usb2_busdma.h#1 branch
.. //depot/projects/vimage/src/sys/dev/usb2/core/usb2_compat_linux.c#1 branch
.. //depot/projects/vimage/src/sys/dev/usb2/core/usb2_compat_linux.h#1 branch
.. //depot/projects/vimage/src/sys/dev/usb2/core/usb2_config_td.c#1 branch
.. //depot/projects/vimage/src/sys/dev/usb2/core/usb2_config_td.h#1 branch
.. //depot/projects/vimage/src/sys/dev/usb2/core/usb2_core.c#1 branch
.. //depot/projects/vimage/src/sys/dev/usb2/core/usb2_core.h#1 branch
.. //depot/projects/vimage/src/sys/dev/usb2/core/usb2_debug.c#1 branch
.. //depot/projects/vimage/src/sys/dev/usb2/core/usb2_debug.h#1 branch
.. //depot/projects/vimage/src/sys/dev/usb2/core/usb2_dev.c#1 branch
.. //depot/projects/vimage/src/sys/dev/usb2/core/usb2_dev.h#1 branch
.. //depot/projects/vimage/src/sys/dev/usb2/core/usb2_device.c#1 branch
.. //depot/projects/vimage/src/sys/dev/usb2/core/usb2_device.h#1 branch
.. //depot/projects/vimage/src/sys/dev/usb2/core/usb2_dynamic.c#1 branch
.. //depot/projects/vimage/src/sys/dev/usb2/core/usb2_dynamic.h#1 branch
.. //depot/projects/vimage/src/sys/dev/usb2/core/usb2_error.c#1 branch
.. //depot/projects/vimage/src/sys/dev/usb2/core/usb2_generic.c#1 branch
.. //depot/projects/vimage/src/sys/dev/usb2/core/usb2_generic.h#1 branch
.. //depot/projects/vimage/src/sys/dev/usb2/core/usb2_handle_request.c#1 branch
.. //depot/projects/vimage/src/sys/dev/usb2/core/usb2_handle_request.h#1 branch
.. //depot/projects/vimage/src/sys/dev/usb2/core/usb2_hid.c#1 branch
.. //depot/projects/vimage/src/sys/dev/usb2/core/usb2_hid.h#1 branch
.. //depot/projects/vimage/src/sys/dev/usb2/core/usb2_hub.c#1 branch
.. //depot/projects/vimage/src/sys/dev/usb2/core/usb2_hub.h#1 branch
.. //depot/projects/vimage/src/sys/dev/usb2/core/usb2_if.m#1 branch
.. //depot/projects/vimage/src/sys/dev/usb2/core/usb2_lookup.c#1 branch
.. //depot/projects/vimage/src/sys/dev/usb2/core/usb2_lookup.h#1 branch
.. //depot/projects/vimage/src/sys/dev/usb2/core/usb2_mbuf.c#1 branch
.. //depot/projects/vimage/src/sys/dev/usb2/core/usb2_mbuf.h#1 branch
.. //depot/projects/vimage/src/sys/dev/usb2/core/usb2_msctest.c#1 branch
.. //depot/projects/vimage/src/sys/dev/usb2/core/usb2_msctest.h#1 branch
.. //depot/projects/vimage/src/sys/dev/usb2/core/usb2_parse.c#1 branch
.. //depot/projects/vimage/src/sys/dev/usb2/core/usb2_parse.h#1 branch
.. //depot/projects/vimage/src/sys/dev/usb2/core/usb2_process.c#1 branch
.. //depot/projects/vimage/src/sys/dev/usb2/core/usb2_process.h#1 branch
.. //depot/projects/vimage/src/sys/dev/usb2/core/usb2_request.c#1 branch
.. //depot/projects/vimage/src/sys/dev/usb2/core/usb2_request.h#1 branch
.. //depot/projects/vimage/src/sys/dev/usb2/core/usb2_sw_transfer.c#1 branch
.. //depot/projects/vimage/src/sys/dev/usb2/core/usb2_sw_transfer.h#1 branch
.. //depot/projects/vimage/src/sys/dev/usb2/core/usb2_transfer.c#1 branch
.. //depot/projects/vimage/src/sys/dev/usb2/core/usb2_transfer.h#1 branch
.. //depot/projects/vimage/src/sys/dev/usb2/core/usb2_util.c#1 branch
.. //depot/projects/vimage/src/sys/dev/usb2/core/usb2_util.h#1 branch
.. //depot/projects/vimage/src/sys/dev/usb2/core/usbdevs#1 branch
.. //depot/projects/vimage/src/sys/dev/usb2/ethernet/if_aue2.c#1 branch
.. //depot/projects/vimage/src/sys/dev/usb2/ethernet/if_aue2_reg.h#1 branch
.. //depot/projects/vimage/src/sys/dev/usb2/ethernet/if_axe2.c#1 branch
.. //depot/projects/vimage/src/sys/dev/usb2/ethernet/if_axe2_reg.h#1 branch
.. //depot/projects/vimage/src/sys/dev/usb2/ethernet/if_cdce2.c#1 branch
.. //depot/projects/vimage/src/sys/dev/usb2/ethernet/if_cdce2_reg.h#1 branch
.. //depot/projects/vimage/src/sys/dev/usb2/ethernet/if_cue2.c#1 branch
.. //depot/projects/vimage/src/sys/dev/usb2/ethernet/if_cue2_reg.h#1 branch
.. //depot/projects/vimage/src/sys/dev/usb2/ethernet/if_kue2.c#1 branch
.. //depot/projects/vimage/src/sys/dev/usb2/ethernet/if_kue2_fw.h#1 branch
.. //depot/projects/vimage/src/sys/dev/usb2/ethernet/if_kue2_reg.h#1 branch
.. //depot/projects/vimage/src/sys/dev/usb2/ethernet/if_rue2.c#1 branch
.. //depot/projects/vimage/src/sys/dev/usb2/ethernet/if_rue2_reg.h#1 branch
.. //depot/projects/vimage/src/sys/dev/usb2/ethernet/if_udav2.c#1 branch
.. //depot/projects/vimage/src/sys/dev/usb2/ethernet/if_udav2_reg.h#1 branch
.. //depot/projects/vimage/src/sys/dev/usb2/ethernet/usb2_ethernet.c#1 branch
.. //depot/projects/vimage/src/sys/dev/usb2/ethernet/usb2_ethernet.h#1 branch
.. //depot/projects/vimage/src/sys/dev/usb2/image/usb2_image.c#1 branch
.. //depot/projects/vimage/src/sys/dev/usb2/image/usb2_image.h#1 branch
.. //depot/projects/vimage/src/sys/dev/usb2/image/uscanner2.c#1 branch
.. //depot/projects/vimage/src/sys/dev/usb2/include/Makefile#1 branch
.. //depot/projects/vimage/src/sys/dev/usb2/include/ufm2_ioctl.h#1 branch
.. //depot/projects/vimage/src/sys/dev/usb2/include/urio2_ioctl.h#1 branch
.. //depot/projects/vimage/src/sys/dev/usb2/include/usb2_cdc.h#1 branch
.. //depot/projects/vimage/src/sys/dev/usb2/include/usb2_defs.h#1 branch
.. //depot/projects/vimage/src/sys/dev/usb2/include/usb2_devid.h#1 branch
.. //depot/projects/vimage/src/sys/dev/usb2/include/usb2_devtable.h#1 branch
.. //depot/projects/vimage/src/sys/dev/usb2/include/usb2_endian.h#1 branch
.. //depot/projects/vimage/src/sys/dev/usb2/include/usb2_error.h#1 branch
.. //depot/projects/vimage/src/sys/dev/usb2/include/usb2_hid.h#1 branch
.. //depot/projects/vimage/src/sys/dev/usb2/include/usb2_ioctl.h#1 branch
.. //depot/projects/vimage/src/sys/dev/usb2/include/usb2_mfunc.h#1 branch
.. //depot/projects/vimage/src/sys/dev/usb2/include/usb2_revision.h#1 branch
.. //depot/projects/vimage/src/sys/dev/usb2/include/usb2_standard.h#1 branch
.. //depot/projects/vimage/src/sys/dev/usb2/input/uhid2.c#1 branch
.. //depot/projects/vimage/src/sys/dev/usb2/input/ukbd2.c#1 branch
.. //depot/projects/vimage/src/sys/dev/usb2/input/ums2.c#1 branch
.. //depot/projects/vimage/src/sys/dev/usb2/input/usb2_input.c#1 branch
.. //depot/projects/vimage/src/sys/dev/usb2/input/usb2_input.h#1 branch
.. //depot/projects/vimage/src/sys/dev/usb2/input/usb2_rdesc.h#1 branch
.. //depot/projects/vimage/src/sys/dev/usb2/misc/udbp2.c#1 branch
.. //depot/projects/vimage/src/sys/dev/usb2/misc/udbp2.h#1 branch
.. //depot/projects/vimage/src/sys/dev/usb2/misc/ufm2.c#1 branch
.. //depot/projects/vimage/src/sys/dev/usb2/misc/usb2_misc.c#1 branch
.. //depot/projects/vimage/src/sys/dev/usb2/misc/usb2_misc.h#1 branch
.. //depot/projects/vimage/src/sys/dev/usb2/ndis/if_ndis_usb2.c#1 branch
.. //depot/projects/vimage/src/sys/dev/usb2/ndis/usb2_ndis.c#1 branch
.. //depot/projects/vimage/src/sys/dev/usb2/ndis/usb2_ndis.h#1 branch
.. //depot/projects/vimage/src/sys/dev/usb2/quirk/usb2_quirk.c#1 branch
.. //depot/projects/vimage/src/sys/dev/usb2/quirk/usb2_quirk.h#1 branch
.. //depot/projects/vimage/src/sys/dev/usb2/serial/uark2.c#1 branch
.. //depot/projects/vimage/src/sys/dev/usb2/serial/ubsa2.c#1 branch
.. //depot/projects/vimage/src/sys/dev/usb2/serial/ubser2.c#1 branch
.. //depot/projects/vimage/src/sys/dev/usb2/serial/uchcom2.c#1 branch
.. //depot/projects/vimage/src/sys/dev/usb2/serial/ucycom2.c#1 branch
.. //depot/projects/vimage/src/sys/dev/usb2/serial/ufoma2.c#1 branch
.. //depot/projects/vimage/src/sys/dev/usb2/serial/uftdi2.c#1 branch
.. //depot/projects/vimage/src/sys/dev/usb2/serial/uftdi2_reg.h#1 branch
.. //depot/projects/vimage/src/sys/dev/usb2/serial/ugensa2.c#1 branch
.. //depot/projects/vimage/src/sys/dev/usb2/serial/uipaq2.c#1 branch
.. //depot/projects/vimage/src/sys/dev/usb2/serial/ulpt2.c#1 branch
.. //depot/projects/vimage/src/sys/dev/usb2/serial/umct2.c#1 branch
.. //depot/projects/vimage/src/sys/dev/usb2/serial/umodem2.c#1 branch
.. //depot/projects/vimage/src/sys/dev/usb2/serial/umoscom2.c#1 branch
.. //depot/projects/vimage/src/sys/dev/usb2/serial/uplcom2.c#1 branch
.. //depot/projects/vimage/src/sys/dev/usb2/serial/usb2_serial.c#1 branch
.. //depot/projects/vimage/src/sys/dev/usb2/serial/usb2_serial.h#1 branch
.. //depot/projects/vimage/src/sys/dev/usb2/serial/uvisor2.c#1 branch
.. //depot/projects/vimage/src/sys/dev/usb2/serial/uvscom2.c#1 branch
.. //depot/projects/vimage/src/sys/dev/usb2/sound/uaudio2.c#1 branch
.. //depot/projects/vimage/src/sys/dev/usb2/sound/uaudio2.h#1 branch
.. //depot/projects/vimage/src/sys/dev/usb2/sound/uaudio2_pcm.c#1 branch
.. //depot/projects/vimage/src/sys/dev/usb2/sound/uaudio2_reg.h#1 branch
.. //depot/projects/vimage/src/sys/dev/usb2/sound/usb2_sound.c#1 branch
.. //depot/projects/vimage/src/sys/dev/usb2/sound/usb2_sound.h#1 branch
.. //depot/projects/vimage/src/sys/dev/usb2/storage/ata-usb2.c#1 branch
.. //depot/projects/vimage/src/sys/dev/usb2/storage/umass2.c#1 branch
.. //depot/projects/vimage/src/sys/dev/usb2/storage/urio2.c#1 branch
.. //depot/projects/vimage/src/sys/dev/usb2/storage/usb2_storage.c#1 branch
.. //depot/projects/vimage/src/sys/dev/usb2/storage/usb2_storage.h#1 branch
.. //depot/projects/vimage/src/sys/dev/usb2/storage/ustorage2_fs.c#1 branch
.. //depot/projects/vimage/src/sys/dev/usb2/template/usb2_template.c#1 branch
.. //depot/projects/vimage/src/sys/dev/usb2/template/usb2_template.h#1 branch
.. //depot/projects/vimage/src/sys/dev/usb2/template/usb2_template_cdce.c#1 branch
.. //depot/projects/vimage/src/sys/dev/usb2/template/usb2_template_msc.c#1 branch
.. //depot/projects/vimage/src/sys/dev/usb2/template/usb2_template_mtp.c#1 branch
.. //depot/projects/vimage/src/sys/dev/usb2/wlan/if_rum2.c#1 branch
.. //depot/projects/vimage/src/sys/dev/usb2/wlan/if_rum2_fw.h#1 branch
.. //depot/projects/vimage/src/sys/dev/usb2/wlan/if_rum2_reg.h#1 branch
.. //depot/projects/vimage/src/sys/dev/usb2/wlan/if_rum2_var.h#1 branch
.. //depot/projects/vimage/src/sys/dev/usb2/wlan/if_ural2.c#1 branch
.. //depot/projects/vimage/src/sys/dev/usb2/wlan/if_ural2_reg.h#1 branch
.. //depot/projects/vimage/src/sys/dev/usb2/wlan/if_ural2_var.h#1 branch
.. //depot/projects/vimage/src/sys/dev/usb2/wlan/if_zyd2.c#1 branch
.. //depot/projects/vimage/src/sys/dev/usb2/wlan/if_zyd2_fw.h#1 branch
.. //depot/projects/vimage/src/sys/dev/usb2/wlan/if_zyd2_reg.h#1 branch
.. //depot/projects/vimage/src/sys/dev/usb2/wlan/usb2_wlan.c#1 branch
.. //depot/projects/vimage/src/sys/dev/usb2/wlan/usb2_wlan.h#1 branch
.. //depot/projects/vimage/src/sys/fs/coda/cnode.h#3 integrate
.. //depot/projects/vimage/src/sys/fs/coda/coda_subr.c#3 integrate
.. //depot/projects/vimage/src/sys/fs/coda/coda_venus.c#4 integrate
.. //depot/projects/vimage/src/sys/fs/ntfs/ntfs_vnops.c#6 integrate
.. //depot/projects/vimage/src/sys/fs/procfs/procfs.c#4 integrate
.. //depot/projects/vimage/src/sys/fs/procfs/procfs_map.c#6 integrate
.. //depot/projects/vimage/src/sys/fs/smbfs/smbfs_vfsops.c#6 integrate
.. //depot/projects/vimage/src/sys/fs/unionfs/union_vfsops.c#8 integrate
.. //depot/projects/vimage/src/sys/geom/geom_disk.c#7 integrate
.. //depot/projects/vimage/src/sys/geom/journal/g_journal.c#9 integrate
.. //depot/projects/vimage/src/sys/geom/part/g_part_apm.c#8 integrate
.. //depot/projects/vimage/src/sys/gnu/fs/ext2fs/ext2_vfsops.c#12 integrate
.. //depot/projects/vimage/src/sys/i386/conf/XEN#4 integrate
.. //depot/projects/vimage/src/sys/i386/i386/bios.c#4 integrate
.. //depot/projects/vimage/src/sys/i386/i386/dump_machdep.c#13 integrate
.. //depot/projects/vimage/src/sys/i386/i386/minidump_machdep.c#13 integrate
.. //depot/projects/vimage/src/sys/isa/isa_common.c#4 integrate
.. //depot/projects/vimage/src/sys/isa/isa_common.h#3 integrate
.. //depot/projects/vimage/src/sys/isa/isavar.h#3 integrate
.. //depot/projects/vimage/src/sys/isa/pnp.c#2 integrate
.. //depot/projects/vimage/src/sys/kern/init_sysent.c#9 integrate
.. //depot/projects/vimage/src/sys/kern/kern_cons.c#1 branch
.. //depot/projects/vimage/src/sys/kern/kern_descrip.c#20 integrate
.. //depot/projects/vimage/src/sys/kern/kern_exec.c#18 integrate
.. //depot/projects/vimage/src/sys/kern/kern_proc.c#15 integrate
.. //depot/projects/vimage/src/sys/kern/kern_sig.c#16 integrate
.. //depot/projects/vimage/src/sys/kern/kern_thr.c#13 integrate
.. //depot/projects/vimage/src/sys/kern/kern_thread.c#18 integrate
.. //depot/projects/vimage/src/sys/kern/sched_ule.c#26 integrate
.. //depot/projects/vimage/src/sys/kern/subr_sleepqueue.c#14 integrate
.. //depot/projects/vimage/src/sys/kern/subr_smp.c#11 integrate
.. //depot/projects/vimage/src/sys/kern/subr_stack.c#6 integrate
.. //depot/projects/vimage/src/sys/kern/sys_process.c#10 integrate
.. //depot/projects/vimage/src/sys/kern/syscalls.c#9 integrate
.. //depot/projects/vimage/src/sys/kern/syscalls.master#10 integrate
.. //depot/projects/vimage/src/sys/kern/systrace_args.c#8 integrate
.. //depot/projects/vimage/src/sys/kern/tty.c#25 integrate
.. //depot/projects/vimage/src/sys/kern/tty_cons.c#8 delete
.. //depot/projects/vimage/src/sys/kern/tty_pts.c#9 integrate
.. //depot/projects/vimage/src/sys/kern/vfs_export.c#15 integrate
.. //depot/projects/vimage/src/sys/kern/vfs_lookup.c#16 integrate
.. //depot/projects/vimage/src/sys/kern/vfs_mount.c#24 integrate
.. //depot/projects/vimage/src/sys/kern/vfs_subr.c#20 integrate
.. //depot/projects/vimage/src/sys/kern/vfs_syscalls.c#18 integrate
.. //depot/projects/vimage/src/sys/kern/vfs_vnops.c#16 integrate
.. //depot/projects/vimage/src/sys/kgssapi/gss_accept_sec_context.c#1 branch
.. //depot/projects/vimage/src/sys/kgssapi/gss_acquire_cred.c#1 branch
.. //depot/projects/vimage/src/sys/kgssapi/gss_add_oid_set_member.c#1 branch
.. //depot/projects/vimage/src/sys/kgssapi/gss_canonicalize_name.c#1 branch
.. //depot/projects/vimage/src/sys/kgssapi/gss_create_empty_oid_set.c#1 branch
.. //depot/projects/vimage/src/sys/kgssapi/gss_delete_sec_context.c#1 branch
.. //depot/projects/vimage/src/sys/kgssapi/gss_display_status.c#1 branch
.. //depot/projects/vimage/src/sys/kgssapi/gss_export_name.c#1 branch
.. //depot/projects/vimage/src/sys/kgssapi/gss_get_mic.c#1 branch
.. //depot/projects/vimage/src/sys/kgssapi/gss_impl.c#1 branch
.. //depot/projects/vimage/src/sys/kgssapi/gss_import_name.c#1 branch
.. //depot/projects/vimage/src/sys/kgssapi/gss_init_sec_context.c#1 branch
.. //depot/projects/vimage/src/sys/kgssapi/gss_names.c#1 branch
.. //depot/projects/vimage/src/sys/kgssapi/gss_pname_to_uid.c#1 branch
.. //depot/projects/vimage/src/sys/kgssapi/gss_release_buffer.c#1 branch
.. //depot/projects/vimage/src/sys/kgssapi/gss_release_cred.c#1 branch
.. //depot/projects/vimage/src/sys/kgssapi/gss_release_name.c#1 branch
.. //depot/projects/vimage/src/sys/kgssapi/gss_release_oid_set.c#1 branch
.. //depot/projects/vimage/src/sys/kgssapi/gss_set_cred_option.c#1 branch
.. //depot/projects/vimage/src/sys/kgssapi/gss_test_oid_set_member.c#1 branch
.. //depot/projects/vimage/src/sys/kgssapi/gss_unwrap.c#1 branch
.. //depot/projects/vimage/src/sys/kgssapi/gss_verify_mic.c#1 branch
.. //depot/projects/vimage/src/sys/kgssapi/gss_wrap.c#1 branch
.. //depot/projects/vimage/src/sys/kgssapi/gss_wrap_size_limit.c#1 branch
.. //depot/projects/vimage/src/sys/kgssapi/gssapi.h#1 branch
.. //depot/projects/vimage/src/sys/kgssapi/gssapi_impl.h#1 branch
.. //depot/projects/vimage/src/sys/kgssapi/gssd.x#1 branch
.. //depot/projects/vimage/src/sys/kgssapi/gssd_prot.c#1 branch
.. //depot/projects/vimage/src/sys/kgssapi/gsstest.c#1 branch
.. //depot/projects/vimage/src/sys/kgssapi/kgss_if.m#1 branch
.. //depot/projects/vimage/src/sys/kgssapi/krb5/kcrypto.c#1 branch
.. //depot/projects/vimage/src/sys/kgssapi/krb5/kcrypto.h#1 branch
.. //depot/projects/vimage/src/sys/kgssapi/krb5/kcrypto_aes.c#1 branch
.. //depot/projects/vimage/src/sys/kgssapi/krb5/kcrypto_arcfour.c#1 branch
.. //depot/projects/vimage/src/sys/kgssapi/krb5/kcrypto_des.c#1 branch
.. //depot/projects/vimage/src/sys/kgssapi/krb5/kcrypto_des3.c#1 branch
.. //depot/projects/vimage/src/sys/kgssapi/krb5/krb5_mech.c#1 branch
.. //depot/projects/vimage/src/sys/mips/idt/if_kr.c#3 integrate
.. //depot/projects/vimage/src/sys/modules/Makefile#32 integrate
.. //depot/projects/vimage/src/sys/modules/amr/Makefile#3 integrate
.. //depot/projects/vimage/src/sys/modules/amr/amr_cam/Makefile#1 branch
.. //depot/projects/vimage/src/sys/modules/kgssapi/Makefile#1 branch
.. //depot/projects/vimage/src/sys/modules/kgssapi_krb5/Makefile#1 branch
.. //depot/projects/vimage/src/sys/modules/krpc/Makefile#2 integrate
.. //depot/projects/vimage/src/sys/modules/nfsclient/Makefile#2 integrate
.. //depot/projects/vimage/src/sys/modules/nfsserver/Makefile#2 integrate
.. //depot/projects/vimage/src/sys/modules/rl/Makefile#2 integrate
.. //depot/projects/vimage/src/sys/modules/snp/Makefile#2 integrate
.. //depot/projects/vimage/src/sys/modules/usb2/Makefile#1 branch
.. //depot/projects/vimage/src/sys/modules/usb2/bluetooth/Makefile#1 branch
.. //depot/projects/vimage/src/sys/modules/usb2/bluetooth_fw/Makefile#1 branch
.. //depot/projects/vimage/src/sys/modules/usb2/bluetooth_ng/Makefile#1 branch
.. //depot/projects/vimage/src/sys/modules/usb2/controller/Makefile#1 branch
.. //depot/projects/vimage/src/sys/modules/usb2/controller_at91dci/Makefile#1 branch
.. //depot/projects/vimage/src/sys/modules/usb2/controller_ehci/Makefile#1 branch
.. //depot/projects/vimage/src/sys/modules/usb2/controller_musb/Makefile#1 branch
.. //depot/projects/vimage/src/sys/modules/usb2/controller_ohci/Makefile#1 branch
.. //depot/projects/vimage/src/sys/modules/usb2/controller_uhci/Makefile#1 branch
.. //depot/projects/vimage/src/sys/modules/usb2/controller_uss820dci/Makefile#1 branch
.. //depot/projects/vimage/src/sys/modules/usb2/core/Makefile#1 branch
.. //depot/projects/vimage/src/sys/modules/usb2/ethernet/Makefile#1 branch
.. //depot/projects/vimage/src/sys/modules/usb2/ethernet_aue/Makefile#1 branch
.. //depot/projects/vimage/src/sys/modules/usb2/ethernet_axe/Makefile#1 branch
.. //depot/projects/vimage/src/sys/modules/usb2/ethernet_cdce/Makefile#1 branch
.. //depot/projects/vimage/src/sys/modules/usb2/ethernet_cue/Makefile#1 branch
.. //depot/projects/vimage/src/sys/modules/usb2/ethernet_dav/Makefile#1 branch
.. //depot/projects/vimage/src/sys/modules/usb2/ethernet_kue/Makefile#1 branch
.. //depot/projects/vimage/src/sys/modules/usb2/ethernet_rue/Makefile#1 branch
.. //depot/projects/vimage/src/sys/modules/usb2/image/Makefile#1 branch
.. //depot/projects/vimage/src/sys/modules/usb2/input/Makefile#1 branch
.. //depot/projects/vimage/src/sys/modules/usb2/input_hid/Makefile#1 branch
.. //depot/projects/vimage/src/sys/modules/usb2/input_kbd/Makefile#1 branch
.. //depot/projects/vimage/src/sys/modules/usb2/input_ms/Makefile#1 branch
.. //depot/projects/vimage/src/sys/modules/usb2/misc/Makefile#1 branch
.. //depot/projects/vimage/src/sys/modules/usb2/misc_dbp/Makefile#1 branch
.. //depot/projects/vimage/src/sys/modules/usb2/misc_fm/Makefile#1 branch
.. //depot/projects/vimage/src/sys/modules/usb2/ndis/Makefile#1 branch
.. //depot/projects/vimage/src/sys/modules/usb2/quirk/Makefile#1 branch
.. //depot/projects/vimage/src/sys/modules/usb2/scanner/Makefile#1 branch
.. //depot/projects/vimage/src/sys/modules/usb2/serial/Makefile#1 branch
.. //depot/projects/vimage/src/sys/modules/usb2/serial_ark/Makefile#1 branch
.. //depot/projects/vimage/src/sys/modules/usb2/serial_bsa/Makefile#1 branch
.. //depot/projects/vimage/src/sys/modules/usb2/serial_bser/Makefile#1 branch
.. //depot/projects/vimage/src/sys/modules/usb2/serial_chcom/Makefile#1 branch
.. //depot/projects/vimage/src/sys/modules/usb2/serial_cycom/Makefile#1 branch
.. //depot/projects/vimage/src/sys/modules/usb2/serial_foma/Makefile#1 branch
.. //depot/projects/vimage/src/sys/modules/usb2/serial_ftdi/Makefile#1 branch
.. //depot/projects/vimage/src/sys/modules/usb2/serial_gensa/Makefile#1 branch
.. //depot/projects/vimage/src/sys/modules/usb2/serial_ipaq/Makefile#1 branch
.. //depot/projects/vimage/src/sys/modules/usb2/serial_lpt/Makefile#1 branch
.. //depot/projects/vimage/src/sys/modules/usb2/serial_mct/Makefile#1 branch
.. //depot/projects/vimage/src/sys/modules/usb2/serial_modem/Makefile#1 branch
.. //depot/projects/vimage/src/sys/modules/usb2/serial_moscom/Makefile#1 branch
.. //depot/projects/vimage/src/sys/modules/usb2/serial_plcom/Makefile#1 branch
.. //depot/projects/vimage/src/sys/modules/usb2/serial_visor/Makefile#1 branch
.. //depot/projects/vimage/src/sys/modules/usb2/serial_vscom/Makefile#1 branch
.. //depot/projects/vimage/src/sys/modules/usb2/sound/Makefile#1 branch
.. //depot/projects/vimage/src/sys/modules/usb2/storage/Makefile#1 branch
.. //depot/projects/vimage/src/sys/modules/usb2/storage_ata/Makefile#1 branch
.. //depot/projects/vimage/src/sys/modules/usb2/storage_fs/Makefile#1 branch
.. //depot/projects/vimage/src/sys/modules/usb2/storage_mass/Makefile#1 branch
.. //depot/projects/vimage/src/sys/modules/usb2/storage_rio/Makefile#1 branch
.. //depot/projects/vimage/src/sys/modules/usb2/template/Makefile#1 branch
.. //depot/projects/vimage/src/sys/modules/usb2/wlan/Makefile#1 branch
.. //depot/projects/vimage/src/sys/modules/usb2/wlan_ral/Makefile#1 branch
.. //depot/projects/vimage/src/sys/modules/usb2/wlan_rum/Makefile#1 branch
.. //depot/projects/vimage/src/sys/modules/usb2/wlan_zyd/Makefile#1 branch
.. //depot/projects/vimage/src/sys/modules/zfs/Makefile#7 integrate
.. //depot/projects/vimage/src/sys/net/if_arcsubr.c#3 integrate
.. //depot/projects/vimage/src/sys/net/if_fddisubr.c#5 integrate
.. //depot/projects/vimage/src/sys/net/if_fwsubr.c#7 integrate
.. //depot/projects/vimage/src/sys/net/if_gif.c#20 integrate
.. //depot/projects/vimage/src/sys/net/if_iso88025subr.c#6 integrate
.. //depot/projects/vimage/src/sys/net/if_spppsubr.c#13 integrate
.. //depot/projects/vimage/src/sys/net/if_tun.c#11 integrate
.. //depot/projects/vimage/src/sys/net/radix_mpath.c#3 integrate
.. //depot/projects/vimage/src/sys/net80211/ieee80211_adhoc.c#5 integrate
.. //depot/projects/vimage/src/sys/net80211/ieee80211_hostap.c#5 integrate
.. //depot/projects/vimage/src/sys/net80211/ieee80211_sta.c#5 integrate
.. //depot/projects/vimage/src/sys/net80211/ieee80211_wds.c#4 integrate
.. //depot/projects/vimage/src/sys/netinet/tcp_input.c#42 integrate
.. //depot/projects/vimage/src/sys/netinet/tcp_subr.c#57 integrate
.. //depot/projects/vimage/src/sys/netsmb/smb_conn.c#3 integrate
.. //depot/projects/vimage/src/sys/netsmb/smb_conn.h#3 integrate
.. //depot/projects/vimage/src/sys/netsmb/smb_dev.c#6 integrate
.. //depot/projects/vimage/src/sys/nfsclient/nfs.h#5 integrate
.. //depot/projects/vimage/src/sys/nfsclient/nfs_krpc.c#1 branch
.. //depot/projects/vimage/src/sys/nfsclient/nfs_nfsiod.c#4 integrate
.. //depot/projects/vimage/src/sys/nfsclient/nfs_socket.c#14 integrate
.. //depot/projects/vimage/src/sys/nfsclient/nfs_subs.c#8 integrate
.. //depot/projects/vimage/src/sys/nfsclient/nfs_vfsops.c#24 integrate
.. //depot/projects/vimage/src/sys/nfsclient/nfsmount.h#4 integrate
.. //depot/projects/vimage/src/sys/nfsserver/nfs.h#5 integrate
.. //depot/projects/vimage/src/sys/nfsserver/nfs_fha.c#1 branch
.. //depot/projects/vimage/src/sys/nfsserver/nfs_fha.h#1 branch
.. //depot/projects/vimage/src/sys/nfsserver/nfs_serv.c#12 integrate
.. //depot/projects/vimage/src/sys/nfsserver/nfs_srvcache.c#5 integrate
.. //depot/projects/vimage/src/sys/nfsserver/nfs_srvkrpc.c#1 branch
.. //depot/projects/vimage/src/sys/nfsserver/nfs_srvsock.c#9 integrate
.. //depot/projects/vimage/src/sys/nfsserver/nfs_srvsubs.c#11 integrate
.. //depot/projects/vimage/src/sys/nfsserver/nfs_syscalls.c#12 integrate
.. //depot/projects/vimage/src/sys/nfsserver/nfsm_subs.h#4 integrate
.. //depot/projects/vimage/src/sys/nfsserver/nfsrvcache.h#2 integrate
.. //depot/projects/vimage/src/sys/nlm/nlm.h#3 integrate
.. //depot/projects/vimage/src/sys/nlm/nlm_advlock.c#5 integrate
.. //depot/projects/vimage/src/sys/nlm/nlm_prot_impl.c#9 integrate
.. //depot/projects/vimage/src/sys/nlm/nlm_prot_svc.c#2 integrate
.. //depot/projects/vimage/src/sys/opencrypto/cryptosoft.c#5 integrate
.. //depot/projects/vimage/src/sys/pci/if_mn.c#4 delete
.. //depot/projects/vimage/src/sys/pci/if_rl.c#11 integrate
.. //depot/projects/vimage/src/sys/pci/if_rlreg.h#15 integrate
.. //depot/projects/vimage/src/sys/powerpc/include/cpufunc.h#5 integrate
.. //depot/projects/vimage/src/sys/powerpc/powermac/cuda.c#2 integrate
.. //depot/projects/vimage/src/sys/powerpc/powermac/pmu.c#2 integrate
.. //depot/projects/vimage/src/sys/rpc/auth.h#2 integrate
.. //depot/projects/vimage/src/sys/rpc/auth_none.c#2 integrate
.. //depot/projects/vimage/src/sys/rpc/auth_unix.c#5 integrate
.. //depot/projects/vimage/src/sys/rpc/clnt.h#3 integrate
.. //depot/projects/vimage/src/sys/rpc/clnt_dg.c#4 integrate
.. //depot/projects/vimage/src/sys/rpc/clnt_rc.c#4 integrate
.. //depot/projects/vimage/src/sys/rpc/clnt_vc.c#3 integrate
.. //depot/projects/vimage/src/sys/rpc/replay.c#1 branch
.. //depot/projects/vimage/src/sys/rpc/replay.h#1 branch
.. //depot/projects/vimage/src/sys/rpc/rpc_com.h#2 integrate
.. //depot/projects/vimage/src/sys/rpc/rpc_generic.c#4 integrate
.. //depot/projects/vimage/src/sys/rpc/rpc_msg.h#2 integrate
.. //depot/projects/vimage/src/sys/rpc/rpc_prot.c#2 integrate
.. //depot/projects/vimage/src/sys/rpc/rpcsec_gss.h#1 branch
.. //depot/projects/vimage/src/sys/rpc/rpcsec_gss/rpcsec_gss.c#1 branch
.. //depot/projects/vimage/src/sys/rpc/rpcsec_gss/rpcsec_gss_conf.c#1 branch
.. //depot/projects/vimage/src/sys/rpc/rpcsec_gss/rpcsec_gss_int.h#1 branch
.. //depot/projects/vimage/src/sys/rpc/rpcsec_gss/rpcsec_gss_misc.c#1 branch
.. //depot/projects/vimage/src/sys/rpc/rpcsec_gss/rpcsec_gss_prot.c#1 branch
.. //depot/projects/vimage/src/sys/rpc/rpcsec_gss/svc_rpcsec_gss.c#1 branch
.. //depot/projects/vimage/src/sys/rpc/svc.c#2 integrate
.. //depot/projects/vimage/src/sys/rpc/svc.h#2 integrate
.. //depot/projects/vimage/src/sys/rpc/svc_auth.c#2 integrate
.. //depot/projects/vimage/src/sys/rpc/svc_auth.h#2 integrate
.. //depot/projects/vimage/src/sys/rpc/svc_auth_unix.c#2 integrate
.. //depot/projects/vimage/src/sys/rpc/svc_dg.c#5 integrate
.. //depot/projects/vimage/src/sys/rpc/svc_generic.c#4 integrate
.. //depot/projects/vimage/src/sys/rpc/svc_vc.c#3 integrate
.. //depot/projects/vimage/src/sys/rpc/xdr.h#2 integrate
.. //depot/projects/vimage/src/sys/security/audit/audit_arg.c#12 integrate
.. //depot/projects/vimage/src/sys/security/audit/audit_bsm_klib.c#11 integrate
.. //depot/projects/vimage/src/sys/security/audit/audit_pipe.c#10 integrate
.. //depot/projects/vimage/src/sys/sys/mount.h#13 integrate
.. //depot/projects/vimage/src/sys/sys/param.h#31 integrate
.. //depot/projects/vimage/src/sys/sys/proc.h#25 integrate
.. //depot/projects/vimage/src/sys/sys/syscall.h#9 integrate
.. //depot/projects/vimage/src/sys/sys/syscall.mk#9 integrate
.. //depot/projects/vimage/src/sys/sys/sysent.h#8 integrate
.. //depot/projects/vimage/src/sys/sys/sysproto.h#9 integrate
.. //depot/projects/vimage/src/sys/sys/tty.h#8 integrate
.. //depot/projects/vimage/src/sys/sys/user.h#9 integrate
.. //depot/projects/vimage/src/sys/tools/vnode_if.awk#2 integrate
.. //depot/projects/vimage/src/sys/ufs/ffs/ffs_softdep.c#12 integrate
.. //depot/projects/vimage/src/sys/ufs/ufs/ufs_acl.c#3 integrate
.. //depot/projects/vimage/src/sys/ufs/ufs/ufs_dirhash.c#6 integrate
.. //depot/projects/vimage/src/sys/ufs/ufs/ufs_vfsops.c#4 integrate
.. //depot/projects/vimage/src/sys/vm/uma.h#5 integrate
.. //depot/projects/vimage/src/sys/xdr/xdr_mbuf.c#2 integrate
Differences ...
==== //depot/projects/vimage/src/sys/amd64/amd64/dump_machdep.c#11 (text+ko) ====
@@ -25,7 +25,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/amd64/amd64/dump_machdep.c,v 1.16 2008/10/01 22:08:53 peter Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/dump_machdep.c,v 1.17 2008/10/31 10:11:35 kib Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -165,7 +165,7 @@
va = 0;
pgs = mdp->md_size / PAGE_SIZE;
pa = mdp->md_start;
- maxdumppgs = di->maxiosize / PAGE_SIZE;
+ maxdumppgs = min(di->maxiosize / PAGE_SIZE, MAXDUMPPGS);
if (maxdumppgs == 0) /* seatbelt */
maxdumppgs = 1;
==== //depot/projects/vimage/src/sys/amd64/amd64/minidump_machdep.c#13 (text) ====
@@ -25,7 +25,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/amd64/amd64/minidump_machdep.c,v 1.8 2008/10/01 22:08:53 peter Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/minidump_machdep.c,v 1.9 2008/10/31 10:11:35 kib Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -104,7 +104,7 @@
int error, i, c;
u_int maxdumpsz;
- maxdumpsz = di->maxiosize;
+ maxdumpsz = min(di->maxiosize, MAXDUMPPGS * PAGE_SIZE);
if (maxdumpsz == 0) /* seatbelt */
maxdumpsz = PAGE_SIZE;
error = 0;
==== //depot/projects/vimage/src/sys/boot/powerpc/boot1.chrp/boot1.c#2 (text+ko) ====
@@ -16,7 +16,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/boot/powerpc/boot1.chrp/boot1.c,v 1.1 2008/10/14 03:32:41 nwhitehorn Exp $");
+__FBSDID("$FreeBSD: src/sys/boot/powerpc/boot1.chrp/boot1.c,v 1.2 2008/10/31 00:52:31 nwhitehorn Exp $");
#include <sys/param.h>
#include <sys/dirent.h>
@@ -561,6 +561,10 @@
va_list ap;
int ret;
+ /* Don't annoy the user as we probe for partitions */
+ if (strcmp(fmt,"Not ufs\n") == 0)
+ return 0;
+
va_start(ap, fmt);
ret = vprintf(fmt, ap);
va_end(ap);
==== //depot/projects/vimage/src/sys/boot/powerpc/boot1.chrp/bootinfo.txt#2 (text+ko) ====
@@ -1,12 +1,13 @@
<CHRP-BOOT>
<DESCRIPTION>FreeBSD/powerpc bootloader</DESCRIPTION>
<OS-NAME>FreeBSD</OS-NAME>
-<VERSION> $FreeBSD: src/sys/boot/powerpc/boot1.chrp/bootinfo.txt,v 1.1 2008/10/14 03:32:41 nwhitehorn Exp $ </VERSION>
+<VERSION> $FreeBSD: src/sys/boot/powerpc/boot1.chrp/bootinfo.txt,v 1.2 2008/10/31 00:52:31 nwhitehorn Exp $ </VERSION>
<COMPATIBLE>
MacRISC MacRISC3 MacRISC4
</COMPATIBLE>
<BOOT-SCRIPT>
+" screen" output
boot &device;:&partition;,\ppc\boot1.elf
</BOOT-SCRIPT>
</CHRP-BOOT>
==== //depot/projects/vimage/src/sys/cddl/compat/opensolaris/kern/opensolaris_kmem.c#3 (text+ko) ====
@@ -25,7 +25,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/cddl/compat/opensolaris/kern/opensolaris_kmem.c,v 1.5 2008/05/24 19:30:38 bz Exp $");
+__FBSDID("$FreeBSD: src/sys/cddl/compat/opensolaris/kern/opensolaris_kmem.c,v 1.7 2008/11/05 20:32:13 rodrigc Exp $");
#include <sys/param.h>
#include <sys/kernel.h>
@@ -93,6 +93,10 @@
zfs_kmem_free(void *buf, size_t size __unused)
{
#ifdef KMEM_DEBUG
+ if (buf == NULL) {
+ printf("%s: attempt to free NULL\n",__func__);
+ return;
+ }
struct kmem_item *i;
buf = (u_char *)buf - sizeof(struct kmem_item);
@@ -236,7 +240,8 @@
}
#ifdef KMEM_DEBUG
-static void
+void kmem_show(void *);
+void
kmem_show(void *dummy __unused)
{
struct kmem_item *i;
@@ -248,12 +253,10 @@
printf("KMEM_DEBUG: Leaked elements:\n\n");
LIST_FOREACH(i, &kmem_items, next) {
printf("address=%p\n", i);
- stack_print(&i->stack);
- printf("\n");
}
}
mtx_unlock(&kmem_items_mtx);
}
-SYSUNINIT(sol_kmem, SI_SUB_DRIVERS, SI_ORDER_FIRST, kmem_show, NULL);
+SYSUNINIT(sol_kmem, SI_SUB_CPU, SI_ORDER_FIRST, kmem_show, NULL);
#endif /* KMEM_DEBUG */
==== //depot/projects/vimage/src/sys/cddl/compat/opensolaris/sys/types.h#2 (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/cddl/compat/opensolaris/sys/types.h,v 1.4 2008/03/28 22:16:06 jb Exp $
+ * $FreeBSD: src/sys/cddl/compat/opensolaris/sys/types.h,v 1.5 2008/11/05 19:39:11 rodrigc Exp $
*/
#ifndef _OPENSOLARIS_SYS_TYPES_H_
@@ -64,12 +64,13 @@
typedef int64_t rlim64_t;
#else
-
+#ifdef NEED_SOLARIS_BOOLEAN
#if defined(__XOPEN_OR_POSIX)
typedef enum { _B_FALSE, _B_TRUE } boolean_t;
#else
typedef enum { B_FALSE, B_TRUE } boolean_t;
#endif /* defined(__XOPEN_OR_POSIX) */
+#endif
typedef longlong_t offset_t;
typedef u_longlong_t u_offset_t;
==== //depot/projects/vimage/src/sys/cddl/compat/opensolaris/sys/uio.h#2 (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/cddl/compat/opensolaris/sys/uio.h,v 1.2 2008/03/28 22:16:06 jb Exp $
+ * $FreeBSD: src/sys/cddl/compat/opensolaris/sys/uio.h,v 1.3 2008/11/05 19:39:11 rodrigc Exp $
*/
#ifndef _OPENSOLARIS_SYS_UIO_H_
@@ -51,6 +51,7 @@
#define uio_loffset uio_offset
+#ifdef BUILDING_ZFS
static __inline int
zfs_uiomove(void *cp, size_t n, enum uio_rw dir, uio_t *uio)
{
@@ -59,5 +60,6 @@
return (uiomove(cp, (int)n, uio));
}
#define uiomove(cp, n, dir, uio) zfs_uiomove((cp), (n), (dir), (uio))
+#endif
#endif /* !_OPENSOLARIS_SYS_UIO_H_ */
==== //depot/projects/vimage/src/sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.c#5 (text+ko) ====
@@ -18,7 +18,7 @@
*
* CDDL HEADER END
*
- * $FreeBSD: src/sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.c,v 1.8 2008/09/27 17:52:48 jb Exp $
+ * $FreeBSD: src/sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.c,v 1.9 2008/11/05 19:39:11 rodrigc Exp $
*/
/*
@@ -3007,6 +3007,9 @@
case DIF_VAR_EXECARGS: {
struct pargs *p_args = curthread->td_proc->p_args;
+ if (p_args == NULL)
+ return(0);
+
return (dtrace_dif_varstrz(
(uintptr_t) p_args->ar_args, p_args->ar_length, state, mstate));
}
@@ -10598,7 +10601,6 @@
/*
* If there is already a buffer allocated for this CPU, it
* is only possible that this is a DR event. In this case,
- * the buffer size must match our specified size.
*/
if (buf->dtb_tomax != NULL) {
ASSERT(buf->dtb_size == size);
@@ -12815,11 +12817,7 @@
state = ddi_get_soft_state(dtrace_softstate, minor);
#else
if (dev != NULL) {
- /*
- * Disable this until we have the ability to set user
- * credentials for DTrace.
- * cr = dev->si_cred;
- */
+ cr = dev->si_cred;
m = dev2unit(dev);
}
@@ -15241,6 +15239,15 @@
}
#endif
+#if !defined(sun)
+#if __FreeBSD_version >= 800039
+static void
+dtrace_dtr(void *data __unused)
+{
+}
+#endif
+#endif
+
/*ARGSUSED*/
static int
#if defined(sun)
@@ -15266,6 +15273,7 @@
#else
cred_t *cred_p = NULL;
+#if __FreeBSD_version < 800039
/*
* The first minor device is the one that is cloned so there is
* nothing more to do here.
@@ -15281,6 +15289,7 @@
*/
if (dev->si_drv1 != NULL)
return (EBUSY);
+#endif
cred_p = dev->si_cred;
#endif
@@ -15292,9 +15301,11 @@
dtrace_cred2priv(cred_p, &priv, &uid, &zoneid);
if (priv == DTRACE_PRIV_NONE) {
#if !defined(sun)
+#if __FreeBSD_version < 800039
/* Destroy the cloned device. */
destroy_dev(dev);
#endif
+#endif
return (EACCES);
}
@@ -15326,7 +15337,11 @@
state = dtrace_state_create(devp, cred_p);
#else
state = dtrace_state_create(dev);
+#if __FreeBSD_version < 800039
dev->si_drv1 = state;
+#else
+ devfs_set_cdevpriv(state, dtrace_dtr);
+#endif
#endif
mutex_exit(&cpu_lock);
@@ -15340,9 +15355,11 @@
#endif
mutex_exit(&dtrace_lock);
#if !defined(sun)
+#if __FreeBSD_version < 800039
/* Destroy the cloned device. */
destroy_dev(dev);
#endif
+#endif
return (EAGAIN);
}
@@ -15368,11 +15385,16 @@
state = ddi_get_soft_state(dtrace_softstate, minor);
#else
+#if __FreeBSD_version < 800039
dtrace_state_t *state = dev->si_drv1;
/* Check if this is not a cloned device. */
if (dev2unit(dev) == 0)
return (0);
+#else
+ dtrace_state_t *state;
+ devfs_get_cdevpriv((void **) &state);
+#endif
#endif
@@ -15392,7 +15414,11 @@
#if !defined(sun)
kmem_free(state, 0);
+#if __FreeBSD_version < 800039
dev->si_drv1 = NULL;
+#else
+ devfs_clear_cdevpriv();
+#endif
#endif
}
@@ -15407,8 +15433,10 @@
mutex_exit(&dtrace_lock);
mutex_exit(&cpu_lock);
+#if __FreeBSD_version < 800039
/* Schedule this cloned device to be destroyed. */
destroy_dev_sched(dev);
+#endif
return (0);
}
@@ -16442,16 +16470,20 @@
static d_ioctl_t dtrace_ioctl;
static void dtrace_load(void *);
static int dtrace_unload(void);
+#if __FreeBSD_version < 800039
static void dtrace_clone(void *, struct ucred *, char *, int , struct cdev **);
static struct clonedevs *dtrace_clones; /* Ptr to the array of cloned devices. */
static eventhandler_tag eh_tag; /* Event handler tag. */
+#else
+static struct cdev *dtrace_dev;
+#endif
void dtrace_invop_init(void);
void dtrace_invop_uninit(void);
static struct cdevsw dtrace_cdevsw = {
.d_version = D_VERSION,
- .d_flags = D_NEEDMINOR,
+ .d_flags = D_TRACKCLOSE | D_NEEDMINOR,
.d_close = dtrace_close,
.d_ioctl = dtrace_ioctl,
.d_open = dtrace_open,
@@ -16459,7 +16491,9 @@
};
#include <dtrace_anon.c>
+#if __FreeBSD_version < 800039
#include <dtrace_clone.c>
+#endif
#include <dtrace_ioctl.c>
#include <dtrace_load.c>
#include <dtrace_modevent.c>
==== //depot/projects/vimage/src/sys/cddl/contrib/opensolaris/uts/common/dtrace/fasttrap.c#2 (text+ko) ====
@@ -2044,13 +2044,6 @@
tp->ftt_proc->ftpc_acount != 0)
break;
- /*
- * The count of active providers can only be
- * decremented (i.e. to zero) during exec, exit, and
- * removal of a meta provider so it should be
- * impossible to drop the count during this operation().
- */
- ASSERT(tp->ftt_proc->ftpc_acount != 0);
tp = tp->ftt_next;
}
==== //depot/projects/vimage/src/sys/cddl/dev/dtrace/dtrace_ioctl.c#2 (text+ko) ====
@@ -18,7 +18,7 @@
*
* CDDL HEADER END
*
- * $FreeBSD: src/sys/cddl/dev/dtrace/dtrace_ioctl.c,v 1.1 2008/05/23 05:59:41 jb Exp $
+ * $FreeBSD: src/sys/cddl/dev/dtrace/dtrace_ioctl.c,v 1.2 2008/11/05 19:39:11 rodrigc Exp $
*
*/
@@ -32,7 +32,12 @@
dtrace_ioctl(struct cdev *dev, u_long cmd, caddr_t addr,
int flags __unused, struct thread *td)
{
+#if __FreeBSD_version < 800039
dtrace_state_t *state = dev->si_drv1;
+#else
+ dtrace_state_t *state;
+ devfs_get_cdevpriv((void **) &state);
+#endif
int error = 0;
if (state == NULL)
return (EINVAL);
==== //depot/projects/vimage/src/sys/cddl/dev/dtrace/dtrace_load.c#2 (text+ko) ====
@@ -18,7 +18,7 @@
*
* CDDL HEADER END
*
- * $FreeBSD: src/sys/cddl/dev/dtrace/dtrace_load.c,v 1.1 2008/05/23 05:59:41 jb Exp $
+ * $FreeBSD: src/sys/cddl/dev/dtrace/dtrace_load.c,v 1.2 2008/11/05 19:39:11 rodrigc Exp $
*
*/
@@ -154,11 +154,15 @@
mutex_exit(&cpu_lock);
+#if __FreeBSD_version < 800039
/* Enable device cloning. */
clone_setup(&dtrace_clones);
/* Setup device cloning events. */
eh_tag = EVENTHANDLER_REGISTER(dev_clone, dtrace_clone, 0, 1000);
+#else
+ dtrace_dev = make_dev(&dtrace_cdevsw, 0, UID_ROOT, GID_WHEEL, 0600, "dtrace/dtrace");
+#endif
return;
}
==== //depot/projects/vimage/src/sys/cddl/dev/dtrace/dtrace_unload.c#2 (text+ko) ====
@@ -18,7 +18,7 @@
*
* CDDL HEADER END
*
- * $FreeBSD: src/sys/cddl/dev/dtrace/dtrace_unload.c,v 1.1 2008/05/23 05:59:41 jb Exp $
+ * $FreeBSD: src/sys/cddl/dev/dtrace/dtrace_unload.c,v 1.2 2008/11/05 19:39:11 rodrigc Exp $
*
*/
@@ -28,6 +28,7 @@
dtrace_state_t *state;
int error = 0;
+#if __FreeBSD_version < 800039
/*
* Check if there is still an event handler callback
* registered.
@@ -40,6 +41,9 @@
/* Stop device cloning. */
clone_cleanup(&dtrace_clones);
}
+#else
+ destroy_dev(dtrace_dev);
+#endif
mutex_enter(&dtrace_provider_lock);
mutex_enter(&dtrace_lock);
==== //depot/projects/vimage/src/sys/cddl/dev/systrace/systrace.c#2 (text+ko) ====
@@ -20,7 +20,7 @@
*
* Portions Copyright 2006-2008 John Birrell jb at freebsd.org
*
- * $FreeBSD: src/sys/cddl/dev/systrace/systrace.c,v 1.1 2008/05/23 05:59:42 jb Exp $
+ * $FreeBSD: src/sys/cddl/dev/systrace/systrace.c,v 1.2 2008/11/05 19:39:11 rodrigc Exp $
*
*/
@@ -50,15 +50,41 @@
#include <sys/proc.h>
#include <sys/selinfo.h>
#include <sys/smp.h>
-#include <sys/syscall.h>
+#include <sys/sysproto.h>
#include <sys/sysent.h>
-#include <sys/sysproto.h>
#include <sys/uio.h>
#include <sys/unistd.h>
#include <machine/stdarg.h>
#include <sys/dtrace.h>
+#ifdef LINUX_SYSTRACE
+#include <linux.h>
+#include <linux_syscall.h>
+#include <linux_proto.h>
+#include <linux_syscallnames.c>
+#include <linux_systrace.c>
+extern struct sysent linux_sysent[];
+#define DEVNAME "dtrace/linsystrace"
+#define PROVNAME "linsyscall"
+#define MAXSYSCALL LINUX_SYS_MAXSYSCALL
+#define SYSCALLNAMES linux_syscallnames
+#define SYSENT linux_sysent
+#else
+/*
+ * The syscall arguments are processed into a DTrace argument array
+ * using a generated function. See sys/kern/makesyscalls.sh.
+ */
+#include <sys/syscall.h>
+#include <kern/systrace_args.c>
+extern const char *syscallnames[];
+#define DEVNAME "dtrace/systrace"
+#define PROVNAME "syscall"
+#define MAXSYSCALL SYS_MAXSYSCALL
+#define SYSCALLNAMES syscallnames
>>> TRUNCATED FOR MAIL (1000 lines) <<<
More information about the p4-projects
mailing list