PERFORCE change 1187433 for review
John Baldwin
jhb at FreeBSD.org
Sat Oct 26 14:31:41 UTC 2013
http://p4web.freebsd.org/@@1187433?ac=10
Change 1187433 by jhb at jhb_pippin on 2013/10/26 14:31:36
IFC @1187432
Affected files ...
.. //depot/projects/smpng/share/man/man9/Makefile#40 integrate
.. //depot/projects/smpng/share/man/man9/disk.9#4 integrate
.. //depot/projects/smpng/share/man/man9/getenv.9#1 branch
.. //depot/projects/smpng/sys/arm/allwinner/a10_wdog.c#2 integrate
.. //depot/projects/smpng/sys/arm/arm/stack_machdep.c#4 integrate
.. //depot/projects/smpng/sys/arm/broadcom/bcm2835/bcm2835_bsc.c#1 branch
.. //depot/projects/smpng/sys/arm/broadcom/bcm2835/bcm2835_bscreg.h#1 branch
.. //depot/projects/smpng/sys/arm/broadcom/bcm2835/bcm2835_bscvar.h#1 branch
.. //depot/projects/smpng/sys/arm/broadcom/bcm2835/bcm2835_gpio.c#4 integrate
.. //depot/projects/smpng/sys/arm/broadcom/bcm2835/bcm2835_spi.c#1 branch
.. //depot/projects/smpng/sys/arm/broadcom/bcm2835/bcm2835_spireg.h#1 branch
.. //depot/projects/smpng/sys/arm/broadcom/bcm2835/bcm2835_spivar.h#1 branch
.. //depot/projects/smpng/sys/arm/broadcom/bcm2835/bcm2835_wdog.c#3 integrate
.. //depot/projects/smpng/sys/arm/broadcom/bcm2835/dwc_otg_brcm.c#3 delete
.. //depot/projects/smpng/sys/arm/broadcom/bcm2835/files.bcm2835#5 integrate
.. //depot/projects/smpng/sys/arm/conf/IMX53-QSB#1 branch
.. //depot/projects/smpng/sys/arm/conf/RADXA#1 branch
.. //depot/projects/smpng/sys/arm/conf/RPI-B#5 integrate
.. //depot/projects/smpng/sys/arm/freescale/imx/files.imx53#2 integrate
.. //depot/projects/smpng/sys/arm/lpc/if_lpe.c#3 integrate
.. //depot/projects/smpng/sys/arm/lpc/lpc_mmc.c#3 integrate
.. //depot/projects/smpng/sys/arm/mv/gpio.c#12 integrate
.. //depot/projects/smpng/sys/arm/rockchip/bus_space.c#1 branch
.. //depot/projects/smpng/sys/arm/rockchip/common.c#1 branch
.. //depot/projects/smpng/sys/arm/rockchip/files.rk30xx#1 branch
.. //depot/projects/smpng/sys/arm/rockchip/rk30xx_gpio.c#1 branch
.. //depot/projects/smpng/sys/arm/rockchip/rk30xx_grf.c#1 branch
.. //depot/projects/smpng/sys/arm/rockchip/rk30xx_grf.h#1 branch
.. //depot/projects/smpng/sys/arm/rockchip/rk30xx_machdep.c#1 branch
.. //depot/projects/smpng/sys/arm/rockchip/rk30xx_pmu.c#1 branch
.. //depot/projects/smpng/sys/arm/rockchip/rk30xx_pmu.h#1 branch
.. //depot/projects/smpng/sys/arm/rockchip/std.rk30xx#1 branch
.. //depot/projects/smpng/sys/arm/xscale/ixp425/if_npe.c#21 integrate
.. //depot/projects/smpng/sys/arm/xscale/ixp425/ixp425_mem.c#5 integrate
.. //depot/projects/smpng/sys/boot/fdt/dts/bcm2835.dtsi#2 integrate
.. //depot/projects/smpng/sys/boot/fdt/dts/beri-sim.dts#1 branch
.. //depot/projects/smpng/sys/boot/fdt/dts/beripad-de4.dts#1 branch
.. //depot/projects/smpng/sys/boot/fdt/dts/digi-ccwmx53.dts#2 integrate
.. //depot/projects/smpng/sys/boot/fdt/dts/imx53-qsb.dts#1 branch
.. //depot/projects/smpng/sys/boot/fdt/dts/rk3188-radxa.dts#1 branch
.. //depot/projects/smpng/sys/boot/fdt/dts/rk3188.dtsi#1 branch
.. //depot/projects/smpng/sys/boot/i386/libi386/Makefile#29 integrate
.. //depot/projects/smpng/sys/boot/i386/libi386/smbios.c#10 integrate
.. //depot/projects/smpng/sys/boot/uboot/lib/disk.c#10 integrate
.. //depot/projects/smpng/sys/boot/uboot/lib/glue.c#11 integrate
.. //depot/projects/smpng/sys/cam/ata/ata_da.c#26 integrate
.. //depot/projects/smpng/sys/cam/ata/ata_pmp.c#14 integrate
.. //depot/projects/smpng/sys/cam/ata/ata_xpt.c#23 integrate
.. //depot/projects/smpng/sys/cam/cam_ccb.h#31 integrate
.. //depot/projects/smpng/sys/cam/cam_periph.c#57 integrate
.. //depot/projects/smpng/sys/cam/cam_periph.h#17 integrate
.. //depot/projects/smpng/sys/cam/cam_queue.c#12 integrate
.. //depot/projects/smpng/sys/cam/cam_queue.h#8 integrate
.. //depot/projects/smpng/sys/cam/cam_sim.c#12 integrate
.. //depot/projects/smpng/sys/cam/cam_sim.h#9 integrate
.. //depot/projects/smpng/sys/cam/cam_xpt.c#91 integrate
.. //depot/projects/smpng/sys/cam/cam_xpt.h#15 integrate
.. //depot/projects/smpng/sys/cam/cam_xpt_internal.h#12 integrate
.. //depot/projects/smpng/sys/cam/cam_xpt_sim.h#9 integrate
.. //depot/projects/smpng/sys/cam/ctl/ctl_backend_block.c#6 integrate
.. //depot/projects/smpng/sys/cam/ctl/ctl_frontend_cam_sim.c#6 integrate
.. //depot/projects/smpng/sys/cam/ctl/scsi_ctl.c#10 integrate
.. //depot/projects/smpng/sys/cam/scsi/scsi_all.h#32 integrate
.. //depot/projects/smpng/sys/cam/scsi/scsi_cd.c#60 integrate
.. //depot/projects/smpng/sys/cam/scsi/scsi_ch.c#33 integrate
.. //depot/projects/smpng/sys/cam/scsi/scsi_da.c#114 integrate
.. //depot/projects/smpng/sys/cam/scsi/scsi_enc.c#8 integrate
.. //depot/projects/smpng/sys/cam/scsi/scsi_enc_internal.h#3 integrate
.. //depot/projects/smpng/sys/cam/scsi/scsi_enc_safte.c#4 integrate
.. //depot/projects/smpng/sys/cam/scsi/scsi_enc_ses.c#8 integrate
.. //depot/projects/smpng/sys/cam/scsi/scsi_pass.c#37 integrate
.. //depot/projects/smpng/sys/cam/scsi/scsi_pt.c#25 integrate
.. //depot/projects/smpng/sys/cam/scsi/scsi_sa.c#48 integrate
.. //depot/projects/smpng/sys/cam/scsi/scsi_sg.c#18 integrate
.. //depot/projects/smpng/sys/cam/scsi/scsi_targ_bh.c#20 integrate
.. //depot/projects/smpng/sys/cam/scsi/scsi_target.c#38 integrate
.. //depot/projects/smpng/sys/cam/scsi/scsi_xpt.c#17 integrate
.. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c#28 integrate
.. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/vdev.h#12 integrate
.. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/vdev_impl.h#13 integrate
.. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_geom.c#20 integrate
.. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_mirror.c#9 integrate
.. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_queue.c#8 integrate
.. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zvol.c#16 integrate
.. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/intel/dtrace/fasttrap_isa.c#6 integrate
.. //depot/projects/smpng/sys/cddl/dev/dtrace/amd64/dtrace_isa.c#6 integrate
.. //depot/projects/smpng/sys/cddl/dev/dtrace/powerpc/dtrace_isa.c#5 integrate
.. //depot/projects/smpng/sys/cddl/dev/sdt/sdt.c#7 integrate
.. //depot/projects/smpng/sys/conf/NOTES#207 integrate
.. //depot/projects/smpng/sys/conf/files#292 integrate
.. //depot/projects/smpng/sys/conf/files.powerpc#82 integrate
.. //depot/projects/smpng/sys/conf/options.mips#16 integrate
.. //depot/projects/smpng/sys/dev/aha/aha.c#26 integrate
.. //depot/projects/smpng/sys/dev/ahci/ahci.c#32 integrate
.. //depot/projects/smpng/sys/dev/ahci/ahci.h#13 integrate
.. //depot/projects/smpng/sys/dev/aic7xxx/aic79xx.c#32 integrate
.. //depot/projects/smpng/sys/dev/aic7xxx/aic7xxx.c#31 integrate
.. //depot/projects/smpng/sys/dev/ata/ata-all.c#120 integrate
.. //depot/projects/smpng/sys/dev/buslogic/bt.c#24 integrate
.. //depot/projects/smpng/sys/dev/cesa/cesa.c#6 integrate
.. //depot/projects/smpng/sys/dev/cfi/cfi_bus_nexus.c#3 integrate
.. //depot/projects/smpng/sys/dev/drm2/i915/i915_drv.c#4 integrate
.. //depot/projects/smpng/sys/dev/fdt/fdt_common.c#9 integrate
.. //depot/projects/smpng/sys/dev/fdt/fdt_common.h#9 integrate
.. //depot/projects/smpng/sys/dev/fdt/fdt_ic_if.m#1 branch
.. //depot/projects/smpng/sys/dev/fdt/fdt_mips.c#3 integrate
.. //depot/projects/smpng/sys/dev/fdt/fdt_pci.c#8 integrate
.. //depot/projects/smpng/sys/dev/fdt/fdt_powerpc.c#4 integrate
.. //depot/projects/smpng/sys/dev/fdt/fdt_slicer.c#3 integrate
.. //depot/projects/smpng/sys/dev/fdt/fdtbus.c#12 integrate
.. //depot/projects/smpng/sys/dev/fdt/simplebus.c#8 integrate
.. //depot/projects/smpng/sys/dev/ffec/if_ffec.c#1 branch
.. //depot/projects/smpng/sys/dev/ffec/if_ffecreg.h#1 branch
.. //depot/projects/smpng/sys/dev/firewire/sbp_targ.c#18 integrate
.. //depot/projects/smpng/sys/dev/iscsi/icl.c#2 integrate
.. //depot/projects/smpng/sys/dev/isf/isf.c#3 delete
.. //depot/projects/smpng/sys/dev/isf/isf.h#3 delete
.. //depot/projects/smpng/sys/dev/isf/isf_fdt.c#2 delete
.. //depot/projects/smpng/sys/dev/isf/isf_nexus.c#3 delete
.. //depot/projects/smpng/sys/dev/isp/isp_freebsd.c#82 integrate
.. //depot/projects/smpng/sys/dev/iwn/if_iwn.c#32 integrate
.. //depot/projects/smpng/sys/dev/iwn/if_iwn_debug.h#1 branch
.. //depot/projects/smpng/sys/dev/iwn/if_iwnreg.h#10 integrate
.. //depot/projects/smpng/sys/dev/iwn/if_iwnvar.h#13 integrate
.. //depot/projects/smpng/sys/dev/md/md.c#109 integrate
.. //depot/projects/smpng/sys/dev/mpt/mpt_cam.c#45 integrate
.. //depot/projects/smpng/sys/dev/mvs/mvs.c#14 integrate
.. //depot/projects/smpng/sys/dev/oce/oce_hw.c#5 integrate
.. //depot/projects/smpng/sys/dev/oce/oce_hw.h#5 integrate
.. //depot/projects/smpng/sys/dev/oce/oce_if.c#6 integrate
.. //depot/projects/smpng/sys/dev/oce/oce_if.h#5 integrate
.. //depot/projects/smpng/sys/dev/oce/oce_mbox.c#5 integrate
.. //depot/projects/smpng/sys/dev/oce/oce_queue.c#5 integrate
.. //depot/projects/smpng/sys/dev/oce/oce_sysctl.c#5 integrate
.. //depot/projects/smpng/sys/dev/oce/oce_util.c#5 integrate
.. //depot/projects/smpng/sys/dev/ofw/ofw_bus.h#3 integrate
.. //depot/projects/smpng/sys/dev/ofw/ofw_bus_if.m#6 integrate
.. //depot/projects/smpng/sys/dev/ofw/ofw_bus_subr.c#10 integrate
.. //depot/projects/smpng/sys/dev/ofw/ofw_bus_subr.h#8 integrate
.. //depot/projects/smpng/sys/dev/ofw/ofw_console.c#36 integrate
.. //depot/projects/smpng/sys/dev/ofw/ofw_fdt.c#7 integrate
.. //depot/projects/smpng/sys/dev/ofw/ofw_iicbus.c#10 integrate
.. //depot/projects/smpng/sys/dev/ofw/ofw_nexus.c#1 branch
.. //depot/projects/smpng/sys/dev/ofw/ofw_nexus.h#1 branch
.. //depot/projects/smpng/sys/dev/ofw/openfirm.c#25 integrate
.. //depot/projects/smpng/sys/dev/ofw/openfirm.h#17 integrate
.. //depot/projects/smpng/sys/dev/pci/pci.c#136 integrate
.. //depot/projects/smpng/sys/dev/pci/pci_private.h#32 integrate
.. //depot/projects/smpng/sys/dev/pci/pcireg.h#43 integrate
.. //depot/projects/smpng/sys/dev/pci/pcivar.h#41 integrate
.. //depot/projects/smpng/sys/dev/re/if_re.c#101 integrate
.. //depot/projects/smpng/sys/dev/siis/siis.c#22 integrate
.. //depot/projects/smpng/sys/dev/spibus/ofw_spibus.c#1 branch
.. //depot/projects/smpng/sys/dev/spibus/spibus.c#10 integrate
.. //depot/projects/smpng/sys/dev/spibus/spibusvar.h#4 integrate
.. //depot/projects/smpng/sys/dev/uart/uart_cpu_fdt.c#3 integrate
.. //depot/projects/smpng/sys/dev/uart/uart_dev_imx.c#2 integrate
.. //depot/projects/smpng/sys/dev/uart/uart_dev_pl011.c#4 integrate
.. //depot/projects/smpng/sys/dev/usb/controller/dwc_otg_fdt.c#1 branch
.. //depot/projects/smpng/sys/dev/usb/serial/u3g.c#36 integrate
.. //depot/projects/smpng/sys/dev/usb/usbdevs#185 integrate
.. //depot/projects/smpng/sys/dev/usb/wlan/if_run.c#22 integrate
.. //depot/projects/smpng/sys/dev/xen/netback/netback.c#12 integrate
.. //depot/projects/smpng/sys/fs/ext2fs/ext2_vnops.c#10 integrate
.. //depot/projects/smpng/sys/geom/concat/g_concat.c#27 integrate
.. //depot/projects/smpng/sys/geom/concat/g_concat.h#12 integrate
.. //depot/projects/smpng/sys/geom/gate/g_gate.c#28 integrate
.. //depot/projects/smpng/sys/geom/geom.h#66 integrate
.. //depot/projects/smpng/sys/geom/geom_dev.c#66 integrate
.. //depot/projects/smpng/sys/geom/geom_disk.c#74 integrate
.. //depot/projects/smpng/sys/geom/geom_disk.h#18 integrate
.. //depot/projects/smpng/sys/geom/geom_int.h#18 integrate
.. //depot/projects/smpng/sys/geom/geom_io.c#63 integrate
.. //depot/projects/smpng/sys/geom/geom_kern.c#29 integrate
.. //depot/projects/smpng/sys/geom/geom_slice.c#44 integrate
.. //depot/projects/smpng/sys/geom/geom_subr.c#72 integrate
.. //depot/projects/smpng/sys/geom/geom_vfs.c#20 integrate
.. //depot/projects/smpng/sys/geom/mirror/g_mirror.c#54 integrate
.. //depot/projects/smpng/sys/geom/mirror/g_mirror.h#19 integrate
.. //depot/projects/smpng/sys/geom/multipath/g_multipath.c#18 integrate
.. //depot/projects/smpng/sys/geom/nop/g_nop.c#19 integrate
.. //depot/projects/smpng/sys/geom/nop/g_nop.h#9 integrate
.. //depot/projects/smpng/sys/geom/part/g_part.c#47 integrate
.. //depot/projects/smpng/sys/geom/raid/g_raid.c#10 integrate
.. //depot/projects/smpng/sys/geom/raid/md_ddf.c#6 integrate
.. //depot/projects/smpng/sys/geom/raid/md_intel.c#7 integrate
.. //depot/projects/smpng/sys/geom/raid/md_jmicron.c#5 integrate
.. //depot/projects/smpng/sys/geom/raid/md_nvidia.c#6 integrate
.. //depot/projects/smpng/sys/geom/raid/md_promise.c#6 integrate
.. //depot/projects/smpng/sys/geom/raid/md_sii.c#5 integrate
.. //depot/projects/smpng/sys/geom/stripe/g_stripe.c#28 integrate
.. //depot/projects/smpng/sys/geom/stripe/g_stripe.h#9 integrate
.. //depot/projects/smpng/sys/geom/zero/g_zero.c#9 integrate
.. //depot/projects/smpng/sys/kern/dtio_kdtrace.c#4 delete
.. //depot/projects/smpng/sys/kern/kern_conf.c#78 integrate
.. //depot/projects/smpng/sys/kern/kern_event.c#75 integrate
.. //depot/projects/smpng/sys/kern/kern_poll.c#43 integrate
.. //depot/projects/smpng/sys/kern/kern_resource.c#95 integrate
.. //depot/projects/smpng/sys/kern/subr_devstat.c#27 integrate
.. //depot/projects/smpng/sys/kern/subr_taskqueue.c#58 integrate
.. //depot/projects/smpng/sys/kern/uipc_syscalls.c#147 integrate
.. //depot/projects/smpng/sys/kern/vfs_bio.c#152 integrate
.. //depot/projects/smpng/sys/mips/beri/beri_pic.c#1 branch
.. //depot/projects/smpng/sys/mips/beri/files.beri#4 integrate
.. //depot/projects/smpng/sys/mips/beri/std.beri#3 integrate
.. //depot/projects/smpng/sys/mips/conf/ALFA_HORNET_UB#1 branch
.. //depot/projects/smpng/sys/mips/conf/ALFA_HORNET_UB.hints#1 branch
.. //depot/projects/smpng/sys/mips/conf/BERI_DE4.hints#3 integrate
.. //depot/projects/smpng/sys/mips/conf/BERI_DE4_BASE#1 branch
.. //depot/projects/smpng/sys/mips/conf/BERI_DE4_MDROOT#3 integrate
.. //depot/projects/smpng/sys/mips/conf/BERI_DE4_SDROOT#3 integrate
.. //depot/projects/smpng/sys/mips/conf/BERI_SIM.hints#3 delete
.. //depot/projects/smpng/sys/mips/conf/BERI_SIM_BASE#1 branch
.. //depot/projects/smpng/sys/mips/conf/BERI_SIM_MDROOT#3 integrate
.. //depot/projects/smpng/sys/mips/conf/BERI_SIM_SDROOT#1 branch
.. //depot/projects/smpng/sys/mips/conf/BERI_TEMPLATE#4 integrate
.. //depot/projects/smpng/sys/mips/include/cpufunc.h#16 integrate
.. //depot/projects/smpng/sys/mips/include/pte.h#11 integrate
.. //depot/projects/smpng/sys/mips/mips/cache.c#8 integrate
.. //depot/projects/smpng/sys/mips/mips/cpu.c#11 integrate
.. //depot/projects/smpng/sys/mips/mips/trap.c#21 integrate
.. //depot/projects/smpng/sys/modules/dtrace/Makefile#13 integrate
.. //depot/projects/smpng/sys/modules/dtrace/dtio/Makefile#4 delete
.. //depot/projects/smpng/sys/modules/dtrace/dtraceall/dtraceall.c#11 integrate
.. //depot/projects/smpng/sys/net/if_media.h#34 integrate
.. //depot/projects/smpng/sys/net/if_tap.c#64 integrate
.. //depot/projects/smpng/sys/net/raw_cb.c#27 integrate
.. //depot/projects/smpng/sys/net/raw_usrreq.c#35 integrate
.. //depot/projects/smpng/sys/net80211/ieee80211_output.c#61 integrate
.. //depot/projects/smpng/sys/net80211/ieee80211_proto.c#46 integrate
.. //depot/projects/smpng/sys/net80211/ieee80211_proto.h#38 integrate
.. //depot/projects/smpng/sys/netinet/in.h#62 integrate
.. //depot/projects/smpng/sys/netinet/tcp_input.c#156 integrate
.. //depot/projects/smpng/sys/netinet6/icmp6.c#77 integrate
.. //depot/projects/smpng/sys/pci/if_rlreg.h#64 integrate
.. //depot/projects/smpng/sys/powerpc/booke/machdep.c#30 integrate
.. //depot/projects/smpng/sys/powerpc/booke/platform_bare.c#14 integrate
.. //depot/projects/smpng/sys/powerpc/booke/pmap.c#36 integrate
.. //depot/projects/smpng/sys/powerpc/include/intr_machdep.h#16 integrate
.. //depot/projects/smpng/sys/powerpc/include/psl.h#9 integrate
.. //depot/projects/smpng/sys/powerpc/mambo/mambo_openpic.c#4 delete
.. //depot/projects/smpng/sys/powerpc/mpc85xx/atpic.c#8 integrate
.. //depot/projects/smpng/sys/powerpc/mpc85xx/fsl_sdhc.c#3 integrate
.. //depot/projects/smpng/sys/powerpc/mpc85xx/pci_fdt.c#7 delete
.. //depot/projects/smpng/sys/powerpc/mpc85xx/pci_mpc85xx.c#1 branch
.. //depot/projects/smpng/sys/powerpc/ofw/ofw_pci.c#9 integrate
.. //depot/projects/smpng/sys/powerpc/ofw/ofw_pci.h#6 integrate
.. //depot/projects/smpng/sys/powerpc/ofw/ofw_pcib_pci.c#13 integrate
.. //depot/projects/smpng/sys/powerpc/ofw/ofw_pcibus.c#9 integrate
.. //depot/projects/smpng/sys/powerpc/ofw/openpic_ofw.c#1 branch
.. //depot/projects/smpng/sys/powerpc/powermac/openpic_macio.c#16 delete
.. //depot/projects/smpng/sys/powerpc/powermac/powermac_thermal.c#4 integrate
.. //depot/projects/smpng/sys/powerpc/powerpc/clock.c#22 integrate
.. //depot/projects/smpng/sys/powerpc/powerpc/exec_machdep.c#10 integrate
.. //depot/projects/smpng/sys/powerpc/powerpc/genassym.c#40 integrate
.. //depot/projects/smpng/sys/powerpc/powerpc/intr_machdep.c#31 integrate
.. //depot/projects/smpng/sys/powerpc/powerpc/nexus.c#15 integrate
.. //depot/projects/smpng/sys/powerpc/powerpc/openpic_fdt.c#3 delete
.. //depot/projects/smpng/sys/powerpc/powerpc/pic_if.m#10 integrate
.. //depot/projects/smpng/sys/powerpc/pseries/vdevice.c#2 integrate
.. //depot/projects/smpng/sys/sparc64/include/bus.h#37 integrate
.. //depot/projects/smpng/sys/sparc64/include/bus_private.h#11 integrate
.. //depot/projects/smpng/sys/sparc64/pci/fire.c#12 integrate
.. //depot/projects/smpng/sys/sparc64/pci/psycho.c#60 integrate
.. //depot/projects/smpng/sys/sparc64/pci/schizo.c#21 integrate
.. //depot/projects/smpng/sys/sparc64/sbus/sbus.c#42 integrate
.. //depot/projects/smpng/sys/sparc64/sparc64/bus_machdep.c#42 integrate
.. //depot/projects/smpng/sys/sys/ata.h#41 integrate
.. //depot/projects/smpng/sys/sys/eventvar.h#6 integrate
.. //depot/projects/smpng/sys/sys/proc.h#230 integrate
.. //depot/projects/smpng/sys/sys/resource.h#25 integrate
.. //depot/projects/smpng/sys/sys/resourcevar.h#37 integrate
.. //depot/projects/smpng/sys/sys/sdt.h#11 integrate
.. //depot/projects/smpng/sys/sys/time.h#39 integrate
.. //depot/projects/smpng/sys/ufs/ffs/ffs_softdep.c#101 integrate
.. //depot/projects/smpng/sys/ufs/ffs/ffs_vfsops.c#135 integrate
.. //depot/projects/smpng/sys/ufs/ffs/ffs_vnops.c#78 integrate
.. //depot/projects/smpng/sys/ufs/ffs/softdep.h#16 integrate
.. //depot/projects/smpng/sys/ufs/ufs/dinode.h#16 integrate
.. //depot/projects/smpng/sys/ufs/ufs/ufs_extern.h#25 integrate
.. //depot/projects/smpng/sys/ufs/ufs/ufsmount.h#27 integrate
.. //depot/projects/smpng/sys/x86/x86/io_apic.c#7 integrate
Differences ...
==== //depot/projects/smpng/share/man/man9/Makefile#40 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: head/share/man/man9/Makefile 256124 2013-10-07 20:30:05Z jhb $
+# $FreeBSD: head/share/man/man9/Makefile 256952 2013-10-23 03:27:42Z eadler $
MAN= accept_filter.9 \
accf_data.9 \
@@ -118,6 +118,7 @@
g_consumer.9 \
g_data.9 \
get_cyclecount.9 \
+ getenv.9 \
getnewvnode.9 \
g_event.9 \
g_geom.9 \
@@ -681,6 +682,14 @@
g_consumer.9 g_new_consumer.9
MLINKS+=g_data.9 g_read_data.9 \
g_data.9 g_write_data.9
+MLINKS+=getenv.9 freeenv.9 \
+ getenv.9 getenv_int.9 \
+ getenv.9 getenv_long.9 \
+ getenv.9 getenv_string.9 \
+ getenv.9 getenv_quad.9 \
+ getenv.9 getenv_uint.9 \
+ getenv.9 getenv_ulong.9 \
+ getenv.9 testenv.9
MLINKS+=g_event.9 g_cancel_event.9 \
g_event.9 g_post_event.9 \
g_event.9 g_waitfor_event.9
@@ -1138,11 +1147,14 @@
sbuf.9 sbuf_finish.9 \
sbuf.9 sbuf_len.9 \
sbuf.9 sbuf_new.9 \
+ sbuf.9 sbuf_new_auto.9 \
sbuf.9 sbuf_new_for_sysctl.9 \
sbuf.9 sbuf_printf.9 \
sbuf.9 sbuf_putc.9 \
sbuf.9 sbuf_set_drain.9 \
sbuf.9 sbuf_setpos.9 \
+ sbuf.9 sbuf_start_section.9 \
+ sbuf.9 sbuf_end_section.9 \
sbuf.9 sbuf_trim.9 \
sbuf.9 sbuf_vprintf.9
MLINKS+=scheduler.9 curpriority_cmp.9 \
==== //depot/projects/smpng/share/man/man9/disk.9#4 (text+ko) ====
@@ -25,7 +25,7 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
.\" DAMAGE.
.\"
-.\" $FreeBSD: head/share/man/man9/disk.9 242359 2012-10-30 13:05:50Z trasz $
+.\" $FreeBSD: head/share/man/man9/disk.9 256884 2013-10-22 10:21:20Z mav $
.\"
.Dd October 30, 2012
.Dt DISK 9
@@ -106,8 +106,6 @@
Optional flags indicating to the storage framework what optional features
or descriptions the storage device driver supports.
Currently supported flags are
-.Dv DISKFLAG_NEEDSGIANT
-(maintained by device driver),
.Dv DISKFLAG_OPEN
(maintained by storage framework),
.Dv DISKFLAG_CANDELETE
==== //depot/projects/smpng/sys/arm/allwinner/a10_wdog.c#2 (text+ko) ====
@@ -24,7 +24,7 @@
* SUCH DAMAGE.
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: head/sys/arm/allwinner/a10_wdog.c 246707 2013-02-12 07:27:40Z gonzo $");
+__FBSDID("$FreeBSD: head/sys/arm/allwinner/a10_wdog.c 256873 2013-10-22 05:22:46Z gonzo $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -150,6 +150,18 @@
(wd_intervals[i].value << WDOG_MODE_INTVL_SHIFT) |
WDOG_MODE_EN | WDOG_MODE_RST_EN);
WRITE(sc, WDOG_CTRL, WDOG_CTRL_RESTART);
+ *error = 0;
+ }
+ else {
+ /*
+ * Can't arm
+ * disable watchdog as watchdog(9) requires
+ */
+ device_printf(sc->dev,
+ "Can't arm, timeout is more than 16 sec\n");
+ mtx_unlock(&sc->mtx);
+ WRITE(sc, WDOG_MODE, 0);
+ return;
}
}
else
==== //depot/projects/smpng/sys/arm/arm/stack_machdep.c#4 (text+ko) ====
@@ -25,7 +25,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: head/sys/arm/arm/stack_machdep.c 250810 2013-05-19 16:25:09Z andrew $");
+__FBSDID("$FreeBSD: head/sys/arm/arm/stack_machdep.c 256941 2013-10-22 21:47:34Z cognet $");
#include <sys/systm.h>
#include <sys/param.h>
@@ -43,13 +43,16 @@
* APCS where it lays out the stack incorrectly. Because of this we disable
* this when building for ARM EABI or when building with clang.
*/
+
+extern vm_offset_t kernel_vm_end;
+
static void
stack_capture(struct stack *st, u_int32_t *frame)
{
#if !defined(__ARM_EABI__) && !defined(__clang__)
vm_offset_t callpc;
- while (INKERNEL(frame)) {
+ while (INKERNEL(frame) && (vm_offset_t)frame < kernel_vm_end) {
callpc = frame[FR_SCP];
if (stack_put(st, callpc) == -1)
break;
==== //depot/projects/smpng/sys/arm/broadcom/bcm2835/bcm2835_gpio.c#4 (text+ko) ====
@@ -26,7 +26,7 @@
*
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: head/sys/arm/broadcom/bcm2835/bcm2835_gpio.c 255370 2013-09-07 18:48:15Z loos $");
+__FBSDID("$FreeBSD: head/sys/arm/broadcom/bcm2835/bcm2835_gpio.c 257127 2013-10-25 18:38:44Z loos $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -56,8 +56,6 @@
#include "gpio_if.h"
-#undef DEBUG
-
#ifdef DEBUG
#define dprintf(fmt, args...) do { printf("%s(): ", __func__); \
printf(fmt,##args); } while (0)
==== //depot/projects/smpng/sys/arm/broadcom/bcm2835/bcm2835_wdog.c#3 (text+ko) ====
@@ -24,7 +24,7 @@
* SUCH DAMAGE.
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: head/sys/arm/broadcom/bcm2835/bcm2835_wdog.c 239922 2012-08-30 20:59:37Z gonzo $");
+__FBSDID("$FreeBSD: head/sys/arm/broadcom/bcm2835/bcm2835_wdog.c 256871 2013-10-22 05:19:42Z gonzo $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -76,11 +76,10 @@
int wdog_armed;
int wdog_period;
char wdog_passwd;
+ struct mtx mtx;
};
-#ifdef notyet
static void bcmwd_watchdog_fn(void *private, u_int cmd, int *error);
-#endif
static int
bcmwd_probe(device_t dev)
@@ -120,19 +119,59 @@
sc->bsh = rman_get_bushandle(sc->res);
bcmwd_lsc = sc;
-#ifdef notyet
+ mtx_init(&sc->mtx, "BCM2835 Watchdog", "bcmwd", MTX_DEF);
EVENTHANDLER_REGISTER(watchdog_list, bcmwd_watchdog_fn, sc, 0);
-#endif
+
return (0);
}
-#ifdef notyet
static void
bcmwd_watchdog_fn(void *private, u_int cmd, int *error)
{
- /* XXX: not yet */
+ struct bcmwd_softc *sc;
+ uint64_t sec;
+ uint32_t ticks, reg;
+
+ sc = private;
+ mtx_lock(&sc->mtx);
+
+ cmd &= WD_INTERVAL;
+
+ if (cmd > 0) {
+ sec = ((uint64_t)1 << (cmd & WD_INTERVAL)) / 1000000000;
+ ticks = (sec << 16) & BCM2835_WDOG_TIME_MASK;
+ if (ticks == 0) {
+ /*
+ * Can't arm
+ * disable watchdog as watchdog(9) requires
+ */
+ device_printf(sc->dev,
+ "Can't arm, timeout is less than 1 second\n");
+ WRITE(sc, BCM2835_RSTC_REG,
+ (BCM2835_PASWORD << BCM2835_PASSWORD_SHIFT) |
+ BCM2835_RSTC_RESET);
+ mtx_unlock(&sc->mtx);
+ return;
+ }
+
+ reg = (BCM2835_PASWORD << BCM2835_PASSWORD_SHIFT) | ticks;
+ WRITE(sc, BCM2835_WDOG_REG, reg);
+
+ reg = READ(sc, BCM2835_RSTC_REG);
+ reg &= BCM2835_RSTC_WRCFG_CLR;
+ reg |= BCM2835_RSTC_WRCFG_FULL_RESET;
+ reg |= (BCM2835_PASWORD << BCM2835_PASSWORD_SHIFT);
+ WRITE(sc, BCM2835_RSTC_REG, reg);
+
+ *error = 0;
+ }
+ else
+ WRITE(sc, BCM2835_RSTC_REG,
+ (BCM2835_PASWORD << BCM2835_PASSWORD_SHIFT) |
+ BCM2835_RSTC_RESET);
+
+ mtx_unlock(&sc->mtx);
}
-#endif
void
bcmwd_watchdog_reset()
==== //depot/projects/smpng/sys/arm/broadcom/bcm2835/files.bcm2835#5 (text+ko) ====
@@ -1,5 +1,6 @@
-# $FreeBSD: head/sys/arm/broadcom/bcm2835/files.bcm2835 253006 2013-07-07 21:23:58Z rpaulo $
+# $FreeBSD: head/sys/arm/broadcom/bcm2835/files.bcm2835 257062 2013-10-24 16:27:33Z loos $
+arm/broadcom/bcm2835/bcm2835_bsc.c optional bcm2835_bsc
arm/broadcom/bcm2835/bcm2835_dma.c standard
arm/broadcom/bcm2835/bcm2835_fb.c optional sc
arm/broadcom/bcm2835/bcm2835_gpio.c optional gpio
@@ -7,11 +8,12 @@
arm/broadcom/bcm2835/bcm2835_machdep.c standard
arm/broadcom/bcm2835/bcm2835_mbox.c standard
arm/broadcom/bcm2835/bcm2835_sdhci.c optional sdhci
+arm/broadcom/bcm2835/bcm2835_spi.c optional bcm2835_spi
arm/broadcom/bcm2835/bcm2835_systimer.c standard
arm/broadcom/bcm2835/bcm2835_wdog.c standard
arm/broadcom/bcm2835/bus_space.c optional fdt
arm/broadcom/bcm2835/common.c optional fdt
-arm/broadcom/bcm2835/dwc_otg_brcm.c optional dwcotg
+dev/usb/controller/dwc_otg_fdt.c optional dwcotg
arm/arm/bus_space_generic.c standard
arm/arm/bus_space_asm_generic.S standard
==== //depot/projects/smpng/sys/arm/conf/RPI-B#5 (text+ko) ====
@@ -15,7 +15,7 @@
# If you are in doubt as to the purpose or necessity of a line, check first
# in NOTES.
#
-# $FreeBSD: head/sys/arm/conf/RPI-B 254461 2013-08-17 18:51:38Z andrew $
+# $FreeBSD: head/sys/arm/conf/RPI-B 257062 2013-10-24 16:27:33Z loos $
ident RPI-B
@@ -79,6 +79,11 @@
device gpio
device gpioled
+# I2C
+device iic
+device iicbus
+device bcm2835_bsc
+
options KDB
options DDB #Enable the kernel debugger
options INVARIANTS #Enable calls of extra sanity checking
@@ -102,6 +107,10 @@
device mii
device smsc
+# SPI
+device spibus
+device bcm2835_spi
+
# Flattened Device Tree
options FDT
# Note: DTB is normally loaded and modified by RPi boot loader, then
==== //depot/projects/smpng/sys/arm/freescale/imx/files.imx53#2 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: head/sys/arm/freescale/imx/files.imx53 255130 2013-09-01 20:15:35Z rpaulo $
+# $FreeBSD: head/sys/arm/freescale/imx/files.imx53 256806 2013-10-20 21:07:38Z ian $
arm/arm/bus_space_asm_generic.S standard
arm/arm/bus_space_generic.c standard
arm/arm/cpufunc_asm_armv5.S standard
@@ -12,8 +12,11 @@
arm/freescale/imx/common.c standard
arm/freescale/imx/bus_space.c standard
-# Dummy serial console
-arm/freescale/imx/console.c standard
+# Special serial console for debuging early boot code
+#arm/freescale/imx/console.c standard
+
+# UART driver (includes serial console support)
+dev/uart/uart_dev_imx.c optional uart
# TrustZone Interrupt Controller
arm/freescale/imx/tzic.c standard
@@ -33,9 +36,6 @@
# i.MX5xx PATA controller
dev/ata/chipsets/ata-fsl.c optional imxata
-# UART driver
-#dev/uart/uart_dev_imx.c optional uart
-
# USB join controller (1 OTG, 3 EHCI)
dev/usb/controller/ehci_imx.c optional ehci
@@ -49,3 +49,6 @@
# IPU - Image Processing Unit (frame buffer also)
arm/freescale/imx/imx51_ipuv3.c optional sc
+# Fast Ethernet Controller
+dev/ffec/if_ffec.c optional ffec
+
==== //depot/projects/smpng/sys/arm/lpc/if_lpe.c#3 (text+ko) ====
@@ -25,7 +25,7 @@
*
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: head/sys/arm/lpc/if_lpe.c 243882 2012-12-05 08:04:20Z glebius $");
+__FBSDID("$FreeBSD: head/sys/arm/lpc/if_lpe.c 257127 2013-10-25 18:38:44Z loos $");
#include <sys/param.h>
#include <sys/endian.h>
@@ -64,9 +64,6 @@
#include "miibus_if.h"
-#define DEBUG
-#undef DEBUG
-
#ifdef DEBUG
#define debugf(fmt, args...) do { printf("%s(): ", __func__); \
printf(fmt,##args); } while (0)
==== //depot/projects/smpng/sys/arm/lpc/lpc_mmc.c#3 (text+ko) ====
@@ -25,7 +25,7 @@
*
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: head/sys/arm/lpc/lpc_mmc.c 239278 2012-08-15 05:37:10Z gonzo $");
+__FBSDID("$FreeBSD: head/sys/arm/lpc/lpc_mmc.c 257127 2013-10-25 18:38:44Z loos $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -65,9 +65,6 @@
#include <arm/lpc/lpcreg.h>
#include <arm/lpc/lpcvar.h>
-#define DEBUG
-#undef DEBUG
-
#ifdef DEBUG
#define debugf(fmt, args...) do { printf("%s(): ", __func__); \
printf(fmt,##args); } while (0)
==== //depot/projects/smpng/sys/arm/mv/gpio.c#12 (text+ko) ====
@@ -29,7 +29,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: head/sys/arm/mv/gpio.c 239367 2012-08-18 11:33:21Z hrs $");
+__FBSDID("$FreeBSD: head/sys/arm/mv/gpio.c 257015 2013-10-23 19:56:13Z nwhitehorn $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -605,7 +605,6 @@
platform_gpio_init(void)
{
phandle_t child, parent, root, ctrl;
- ihandle_t ctrl_ihandle;
pcell_t gpios[MAX_PINS_PER_NODE * GPIOS_PROP_CELLS];
struct gpio_ctrl_entry *e;
int len, rv;
@@ -639,9 +638,7 @@
* contain a ref. to a node defining GPIO
* controller.
*/
- ctrl_ihandle = (ihandle_t)gpios[0];
- ctrl_ihandle = fdt32_to_cpu(ctrl_ihandle);
- ctrl = OF_instance_to_package(ctrl_ihandle);
+ ctrl = OF_xref_phandle(fdt32_to_cpu(gpios[0]));
if (fdt_is_compatible(ctrl, e->compat))
/* Call a handler. */
==== //depot/projects/smpng/sys/arm/xscale/ixp425/if_npe.c#21 (text+ko) ====
@@ -23,7 +23,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: head/sys/arm/xscale/ixp425/if_npe.c 243882 2012-12-05 08:04:20Z glebius $");
+__FBSDID("$FreeBSD: head/sys/arm/xscale/ixp425/if_npe.c 256943 2013-10-22 21:51:07Z cognet $");
/*
* Intel XScale NPE Ethernet driver.
@@ -507,7 +507,6 @@
dma->name, error);
return error;
}
- /* XXX COHERENT for now */
if (bus_dmamem_alloc(dma->buf_tag, (void **)&dma->hwbuf,
BUS_DMA_NOWAIT | BUS_DMA_ZERO | BUS_DMA_COHERENT,
&dma->buf_map) != 0) {
@@ -1073,6 +1072,7 @@
m->m_pkthdr.len = m->m_len = 1536;
/* backload payload and align ip hdr */
m->m_data = m->m_ext.ext_buf + (m->m_ext.ext_size - (1536+ETHER_ALIGN));
+ bus_dmamap_unload(dma->mtag, npe->ix_map);
error = bus_dmamap_load_mbuf_sg(dma->mtag, npe->ix_map, m,
segs, &nseg, 0);
if (error != 0) {
@@ -1085,6 +1085,8 @@
/* NB: buffer length is shifted in word */
hw->ix_ne[0].len = htobe32(segs[0].ds_len << 16);
hw->ix_ne[0].next = 0;
+ bus_dmamap_sync(dma->buf_tag, dma->buf_map,
+ BUS_DMASYNC_PREREAD|BUS_DMASYNC_PREWRITE);
npe->ix_m = m;
/* Flush the memory in the mbuf */
bus_dmamap_sync(dma->mtag, npe->ix_map, BUS_DMASYNC_PREREAD);
@@ -1110,6 +1112,8 @@
struct npebuf *npe = P2V(NPE_QM_Q_ADDR(entry), dma);
struct mbuf *m;
+ bus_dmamap_sync(dma->buf_tag, dma->buf_map,
+ BUS_DMASYNC_POSTREAD);
DPRINTF(sc, "%s: entry 0x%x neaddr 0x%x ne_len 0x%x\n",
__func__, entry, npe->ix_neaddr, npe->ix_hw->ix_ne[0].len);
/*
@@ -1130,7 +1134,6 @@
bus_dmamap_sync(dma->mtag, npe->ix_map,
BUS_DMASYNC_POSTREAD);
- /* XXX flush hw buffer; works now 'cuz coherent */
/* set m_len etc. per rx frame size */
mrx->m_len = be32toh(hw->ix_ne[0].len) & 0xffff;
mrx->m_pkthdr.len = mrx->m_len;
@@ -1313,6 +1316,7 @@
return;
}
npe = sc->tx_free;
+ bus_dmamap_unload(dma->mtag, npe->ix_map);
error = bus_dmamap_load_mbuf_sg(dma->mtag, npe->ix_map,
m, segs, &nseg, 0);
if (error == EFBIG) {
@@ -1355,7 +1359,8 @@
next += sizeof(hw->ix_ne[0]);
}
hw->ix_ne[i-1].next = 0; /* zero last in chain */
- /* XXX flush descriptor instead of using uncached memory */
+ bus_dmamap_sync(dma->buf_tag, dma->buf_map,
+ BUS_DMASYNC_PREREAD|BUS_DMASYNC_PREWRITE);
DPRINTF(sc, "%s: qwrite(%u, 0x%x) ne_data %x ne_len 0x%x\n",
__func__, sc->tx_qid, npe->ix_neaddr,
==== //depot/projects/smpng/sys/arm/xscale/ixp425/ixp425_mem.c#5 (text+ko) ====
@@ -36,7 +36,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: head/sys/arm/xscale/ixp425/ixp425_mem.c 186352 2008-12-20 03:26:09Z sam $");
+__FBSDID("$FreeBSD: head/sys/arm/xscale/ixp425/ixp425_mem.c 256942 2013-10-22 21:49:58Z cognet $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -76,7 +76,7 @@
size = sdram_other[MCU_SDR_CONFIG_MCONF(sdr_config)];
if (size == 0) {
- printf("** SDR_CONFIG retuns unknown value, using 32M\n");
+ printf("** SDR_CONFIG returns unknown value, using 32M\n");
size = 32 * 1024 * 1024;
}
==== //depot/projects/smpng/sys/boot/fdt/dts/bcm2835.dtsi#2 (text+ko) ====
@@ -22,7 +22,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD: head/sys/boot/fdt/dts/bcm2835.dtsi 252439 2013-07-01 05:01:01Z rpaulo $
+ * $FreeBSD: head/sys/boot/fdt/dts/bcm2835.dtsi 257062 2013-10-24 16:27:33Z loos $
*/
/ {
@@ -396,6 +396,30 @@
};
};
+ bsc0 {
+ compatible = "broadcom,bcm2835-bsc",
+ "broadcom,bcm2708-bsc";
+ reg = <0x205000 0x20>;
+ interrupts = <61>;
+ interrupt-parent = <&intc>;
+ };
+
+ bsc1 {
+ compatible = "broadcom,bcm2835-bsc",
+ "broadcom,bcm2708-bsc";
+ reg = <0x804000 0x20>;
+ interrupts = <61>;
+ interrupt-parent = <&intc>;
+ };
+
+ spi0 {
+ compatible = "broadcom,bcm2835-spi",
+ "broadcom,bcm2708-spi";
+ reg = <0x204000 0x20>;
+ interrupts = <62>;
+ interrupt-parent = <&intc>;
+ };
+
dma: dma {
compatible = "broadcom,bcm2835-dma",
"broadcom,bcm2708-dma";
==== //depot/projects/smpng/sys/boot/fdt/dts/digi-ccwmx53.dts#2 (text+ko) ====
@@ -29,7 +29,7 @@
*
* Digi ConnectCore Wi-i.MX53
*
- * $FreeBSD: head/sys/boot/fdt/dts/digi-ccwmx53.dts 255130 2013-09-01 20:15:35Z rpaulo $
+ * $FreeBSD: head/sys/boot/fdt/dts/digi-ccwmx53.dts 256804 2013-10-20 21:03:15Z ian $
*/
/dts-v1/;
@@ -70,9 +70,9 @@
};
/* UART1, console */
- UART1: serial at 53fbc000 {
+ console: serial at 53fbc000 {
status = "okay";
- clock-frequency = <3000000>; /* XXX */
+ clock-frequency = <0>; /* won't load w/o this */
};
clock at 53fd4000 {
@@ -111,13 +111,12 @@
};
aliases {
- UART1 = &UART1;
SSI2 = &SSI2;
};
chosen {
bootargs = "-v";
- stdin = "UART1";
- stdout = "UART1";
+ stdin = &console;
+ stdout = &console;
};
};
==== //depot/projects/smpng/sys/boot/i386/libi386/Makefile#29 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: head/sys/boot/i386/libi386/Makefile 239066 2012-08-05 14:37:48Z ae $
+# $FreeBSD: head/sys/boot/i386/libi386/Makefile 256940 2013-10-22 21:32:28Z jkim $
#
LIB= i386
INTERNALLIB=
@@ -36,6 +36,9 @@
.if defined(BOOT_LITTLE_ENDIAN_UUID)
# Use little-endian UUID format as defined in SMBIOS 2.6.
CFLAGS+= -DSMBIOS_LITTLE_ENDIAN_UUID
+.elif defined(BOOT_NETWORK_ENDIAN_UUID)
+# Use network-endian UUID format for backward compatibility.
+CFLAGS+= -DSMBIOS_NETWORK_ENDIAN_UUID
.endif
.endif
==== //depot/projects/smpng/sys/boot/i386/libi386/smbios.c#10 (text+ko) ====
@@ -25,7 +25,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: head/sys/boot/i386/libi386/smbios.c 190814 2009-04-07 17:58:15Z jkim $");
+__FBSDID("$FreeBSD: head/sys/boot/i386/libi386/smbios.c 256940 2013-10-22 21:32:28Z jkim $");
#include <stand.h>
#include <bootstrap.h>
@@ -122,7 +122,7 @@
smbios_setuuid(const char *name, const caddr_t addr, const int ver)
{
char uuid[37];
- int i, ones, zeros;
+ int byteorder, i, ones, zeros;
UUID_TYPE n;
uint32_t f1;
uint16_t f2, f3;
@@ -152,14 +152,18 @@
* Note: We use network byte order for backward compatibility
* unless SMBIOS version is 2.6+ or little-endian is forced.
*/
-#ifndef SMBIOS_LITTLE_ENDIAN_UUID
- if (ver < 0x0206) {
+#if defined(SMBIOS_LITTLE_ENDIAN_UUID)
+ byteorder = LITTLE_ENDIAN;
+#elif defined(SMBIOS_NETWORK_ENDIAN_UUID)
+ byteorder = BIG_ENDIAN;
+#else
+ byteorder = ver < 0x0206 ? BIG_ENDIAN : LITTLE_ENDIAN;
+#endif
+ if (byteorder != LITTLE_ENDIAN) {
f1 = ntohl(SMBIOS_GET32(addr, 0));
f2 = ntohs(SMBIOS_GET16(addr, 4));
f3 = ntohs(SMBIOS_GET16(addr, 6));
- } else
-#endif
- {
+ } else {
f1 = le32toh(SMBIOS_GET32(addr, 0));
f2 = le16toh(SMBIOS_GET16(addr, 4));
f3 = le16toh(SMBIOS_GET16(addr, 6));
==== //depot/projects/smpng/sys/boot/uboot/lib/disk.c#10 (text+ko) ====
@@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: head/sys/boot/uboot/lib/disk.c 241809 2012-10-21 12:14:58Z ae $");
+__FBSDID("$FreeBSD: head/sys/boot/uboot/lib/disk.c 257127 2013-10-25 18:38:44Z loos $");
#include <sys/param.h>
#include <sys/disk.h>
@@ -45,9 +45,6 @@
#include "glue.h"
#include "libuboot.h"
-#define DEBUG
-#undef DEBUG
-
#define stor_printf(fmt, args...) do { \
printf("%s%d: ", dev->d_dev->dv_name, dev->d_unit); \
printf(fmt, ##args); \
==== //depot/projects/smpng/sys/boot/uboot/lib/glue.c#11 (text+ko) ====
@@ -25,7 +25,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: head/sys/boot/uboot/lib/glue.c 235609 2012-05-18 14:41:14Z gber $");
+__FBSDID("$FreeBSD: head/sys/boot/uboot/lib/glue.c 257127 2013-10-25 18:38:44Z loos $");
#include <sys/types.h>
@@ -34,9 +34,6 @@
#include "api_public.h"
#include "glue.h"
-#define DEBUG
-#undef DEBUG
-
#ifdef DEBUG
#define debugf(fmt, args...) do { printf("%s(): ", __func__); printf(fmt,##args); } while (0)
#else
==== //depot/projects/smpng/sys/cam/ata/ata_da.c#26 (text+ko) ====
@@ -25,7 +25,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: head/sys/cam/ata/ata_da.c 256552 2013-10-15 17:59:41Z mav $");
+__FBSDID("$FreeBSD: head/sys/cam/ata/ata_da.c 257054 2013-10-24 14:05:44Z mav $");
#include "opt_ada.h"
>>> TRUNCATED FOR MAIL (1000 lines) <<<
More information about the p4-projects
mailing list