Date: Fri, 15 Dec 2006 18:15:34 GMT From: Roman Divacky <rdivacky@FreeBSD.org> To: Perforce Change Reviews <perforce@FreeBSD.org> Subject: PERFORCE change 111747 for review Message-ID: <200612151815.kBFIFY3r098234@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=111747 Change 111747 by rdivacky@rdivacky_witten on 2006/12/15 18:15:05 IFC Affected files ... .. //depot/projects/linuxolator/src/sys/amd64/amd64/intr_machdep.c#6 integrate .. //depot/projects/linuxolator/src/sys/amd64/amd64/machdep.c#10 integrate .. //depot/projects/linuxolator/src/sys/amd64/amd64/minidump_machdep.c#2 integrate .. //depot/projects/linuxolator/src/sys/amd64/amd64/mptable_pci.c#3 integrate .. //depot/projects/linuxolator/src/sys/amd64/amd64/pmap.c#5 integrate .. //depot/projects/linuxolator/src/sys/amd64/conf/GENERIC#7 integrate .. //depot/projects/linuxolator/src/sys/amd64/include/intr_machdep.h#4 integrate .. //depot/projects/linuxolator/src/sys/amd64/include/pmap.h#4 integrate .. //depot/projects/linuxolator/src/sys/amd64/pci/pci_bus.c#3 integrate .. //depot/projects/linuxolator/src/sys/arm/at91/kb920x_machdep.c#5 integrate .. //depot/projects/linuxolator/src/sys/arm/at91/uart_dev_at91usart.c#2 integrate .. //depot/projects/linuxolator/src/sys/arm/sa11x0/assabet_machdep.c#4 integrate .. //depot/projects/linuxolator/src/sys/arm/xscale/i80321/ep80219_machdep.c#4 integrate .. //depot/projects/linuxolator/src/sys/arm/xscale/i80321/iq31244_machdep.c#4 integrate .. //depot/projects/linuxolator/src/sys/arm/xscale/ixp425/avila_machdep.c#2 integrate .. //depot/projects/linuxolator/src/sys/arm/xscale/ixp425/files.ixp425#2 integrate .. //depot/projects/linuxolator/src/sys/boot/forth/loader.conf#3 integrate .. //depot/projects/linuxolator/src/sys/boot/i386/btx/btx/btx.S#4 integrate .. //depot/projects/linuxolator/src/sys/cam/cam_periph.c#3 integrate .. //depot/projects/linuxolator/src/sys/cam/cam_xpt.c#5 integrate .. //depot/projects/linuxolator/src/sys/cam/cam_xpt.h#2 integrate .. //depot/projects/linuxolator/src/sys/cam/scsi/scsi_all.h#3 integrate .. //depot/projects/linuxolator/src/sys/cam/scsi/scsi_cd.c#2 integrate .. //depot/projects/linuxolator/src/sys/cam/scsi/scsi_ch.c#2 integrate .. //depot/projects/linuxolator/src/sys/cam/scsi/scsi_da.c#7 integrate .. //depot/projects/linuxolator/src/sys/cam/scsi/scsi_pass.c#2 integrate .. //depot/projects/linuxolator/src/sys/cam/scsi/scsi_pt.c#2 integrate .. //depot/projects/linuxolator/src/sys/cam/scsi/scsi_sa.c#2 integrate .. //depot/projects/linuxolator/src/sys/cam/scsi/scsi_ses.c#2 integrate .. //depot/projects/linuxolator/src/sys/cam/scsi/scsi_targ_bh.c#2 integrate .. //depot/projects/linuxolator/src/sys/cam/scsi/scsi_target.c#2 integrate .. //depot/projects/linuxolator/src/sys/conf/NOTES#12 integrate .. //depot/projects/linuxolator/src/sys/conf/files#13 integrate .. //depot/projects/linuxolator/src/sys/conf/options#9 integrate .. //depot/projects/linuxolator/src/sys/contrib/dev/ath/ah.h#2 integrate .. //depot/projects/linuxolator/src/sys/contrib/dev/ath/ah_desc.h#2 integrate .. //depot/projects/linuxolator/src/sys/contrib/dev/ath/ah_devid.h#2 integrate .. //depot/projects/linuxolator/src/sys/contrib/dev/ath/public/alpha-elf.hal.o.uu#2 integrate .. //depot/projects/linuxolator/src/sys/contrib/dev/ath/public/alpha-elf.inc#2 integrate .. //depot/projects/linuxolator/src/sys/contrib/dev/ath/public/ap30.hal.o.uu#2 integrate .. //depot/projects/linuxolator/src/sys/contrib/dev/ath/public/ap43.hal.o.uu#2 integrate .. //depot/projects/linuxolator/src/sys/contrib/dev/ath/public/ap51.hal.o.uu#2 integrate .. //depot/projects/linuxolator/src/sys/contrib/dev/ath/public/ap61.hal.o.uu#2 integrate .. //depot/projects/linuxolator/src/sys/contrib/dev/ath/public/arm9-le-thumb-elf.hal.o.uu#2 integrate .. //depot/projects/linuxolator/src/sys/contrib/dev/ath/public/arm9-le-thumb-elf.inc#2 integrate .. //depot/projects/linuxolator/src/sys/contrib/dev/ath/public/armv4-be-elf.hal.o.uu#2 integrate .. //depot/projects/linuxolator/src/sys/contrib/dev/ath/public/armv4-be-elf.inc#2 integrate .. //depot/projects/linuxolator/src/sys/contrib/dev/ath/public/armv4-le-elf.hal.o.uu#2 integrate .. //depot/projects/linuxolator/src/sys/contrib/dev/ath/public/armv4-le-elf.inc#2 integrate .. //depot/projects/linuxolator/src/sys/contrib/dev/ath/public/i386-elf.hal.o.uu#2 integrate .. //depot/projects/linuxolator/src/sys/contrib/dev/ath/public/mips-be-elf.hal.o.uu#2 integrate .. //depot/projects/linuxolator/src/sys/contrib/dev/ath/public/mips-le-elf.hal.o.uu#2 integrate .. //depot/projects/linuxolator/src/sys/contrib/dev/ath/public/mips1-be-elf.hal.o.uu#2 integrate .. //depot/projects/linuxolator/src/sys/contrib/dev/ath/public/mips1-le-elf.hal.o.uu#2 integrate .. //depot/projects/linuxolator/src/sys/contrib/dev/ath/public/mipsisa32-be-elf.hal.o.uu#2 integrate .. //depot/projects/linuxolator/src/sys/contrib/dev/ath/public/mipsisa32-le-elf.hal.o.uu#2 integrate .. //depot/projects/linuxolator/src/sys/contrib/dev/ath/public/powerpc-be-eabi.hal.o.uu#2 integrate .. //depot/projects/linuxolator/src/sys/contrib/dev/ath/public/powerpc-be-elf.hal.o.uu#2 integrate .. //depot/projects/linuxolator/src/sys/contrib/dev/ath/public/powerpc-le-eabi.hal.o.uu#2 integrate .. //depot/projects/linuxolator/src/sys/contrib/dev/ath/public/sh4-le-elf.hal.o.uu#2 integrate .. //depot/projects/linuxolator/src/sys/contrib/dev/ath/public/sparc-be-elf.hal.o.uu#2 integrate .. //depot/projects/linuxolator/src/sys/contrib/dev/ath/public/sparc64-be-elf.hal.o.uu#2 integrate .. //depot/projects/linuxolator/src/sys/contrib/dev/ath/public/wackelf.c#1 branch .. //depot/projects/linuxolator/src/sys/contrib/dev/ath/public/x86_64-elf.hal.o.uu#2 integrate .. //depot/projects/linuxolator/src/sys/contrib/dev/ath/public/xscale-be-elf.hal.o.uu#2 integrate .. //depot/projects/linuxolator/src/sys/contrib/dev/ath/public/xscale-be-elf.inc#2 integrate .. //depot/projects/linuxolator/src/sys/contrib/dev/ath/public/xscale-le-elf.hal.o.uu#2 integrate .. //depot/projects/linuxolator/src/sys/contrib/dev/ath/public/xscale-le-elf.inc#2 integrate .. //depot/projects/linuxolator/src/sys/contrib/dev/ath/version.h#2 integrate .. //depot/projects/linuxolator/src/sys/ddb/db_ps.c#3 integrate .. //depot/projects/linuxolator/src/sys/dev/aac/aac_pci.c#3 integrate .. //depot/projects/linuxolator/src/sys/dev/acpica/acpi_pcib_acpi.c#3 integrate .. //depot/projects/linuxolator/src/sys/dev/advansys/adv_eisa.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/advansys/adv_isa.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/advansys/adv_pci.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/advansys/advansys.c#3 integrate .. //depot/projects/linuxolator/src/sys/dev/advansys/adw_pci.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/advansys/adwcam.c#3 integrate .. //depot/projects/linuxolator/src/sys/dev/aha/aha.c#3 integrate .. //depot/projects/linuxolator/src/sys/dev/aha/aha_isa.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/aha/aha_mca.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/ahb/ahb.c#3 integrate .. //depot/projects/linuxolator/src/sys/dev/amd/amd.c#3 integrate .. //depot/projects/linuxolator/src/sys/dev/amr/amr_pci.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/arcmsr/arcmsr.c#3 integrate .. //depot/projects/linuxolator/src/sys/dev/arcmsr/arcmsr.h#2 integrate .. //depot/projects/linuxolator/src/sys/dev/asr/asr.c#4 integrate .. //depot/projects/linuxolator/src/sys/dev/ath/ath_rate/amrr/amrr.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/ath/ath_rate/onoe/onoe.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/ath/ath_rate/sample/sample.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/ath/ath_rate/sample/sample.h#2 integrate .. //depot/projects/linuxolator/src/sys/dev/ath/if_ath.c#4 integrate .. //depot/projects/linuxolator/src/sys/dev/ath/if_athrate.h#2 integrate .. //depot/projects/linuxolator/src/sys/dev/ath/if_athvar.h#4 integrate .. //depot/projects/linuxolator/src/sys/dev/awi/awivar.h#2 integrate .. //depot/projects/linuxolator/src/sys/dev/bce/if_bce.c#8 integrate .. //depot/projects/linuxolator/src/sys/dev/bge/if_bge.c#8 integrate .. //depot/projects/linuxolator/src/sys/dev/bge/if_bgereg.h#5 integrate .. //depot/projects/linuxolator/src/sys/dev/buslogic/bt.c#3 integrate .. //depot/projects/linuxolator/src/sys/dev/buslogic/bt_eisa.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/buslogic/bt_isa.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/buslogic/bt_mca.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/buslogic/bt_pci.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/dc/if_dc.c#4 integrate .. //depot/projects/linuxolator/src/sys/dev/dc/if_dcreg.h#3 integrate .. //depot/projects/linuxolator/src/sys/dev/dpt/dpt_eisa.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/dpt/dpt_isa.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/dpt/dpt_pci.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/esp/esp_sbus.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/firewire/fwdev.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/gem/if_gem.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/gem/if_gemvar.h#2 integrate .. //depot/projects/linuxolator/src/sys/dev/hme/if_hme.c#3 integrate .. //depot/projects/linuxolator/src/sys/dev/hme/if_hmevar.h#2 integrate .. //depot/projects/linuxolator/src/sys/dev/iicbus/iicbb.c#3 integrate .. //depot/projects/linuxolator/src/sys/dev/iicbus/iicbus_if.m#2 integrate .. //depot/projects/linuxolator/src/sys/dev/iicbus/iiconf.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/iicbus/iiconf.h#3 integrate .. //depot/projects/linuxolator/src/sys/dev/iir/iir_pci.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/ipmi/ipmi.c#5 integrate .. //depot/projects/linuxolator/src/sys/dev/isp/isp.c#6 integrate .. //depot/projects/linuxolator/src/sys/dev/isp/isp_freebsd.c#6 integrate .. //depot/projects/linuxolator/src/sys/dev/isp/isp_pci.c#6 integrate .. //depot/projects/linuxolator/src/sys/dev/isp/isp_sbus.c#3 integrate .. //depot/projects/linuxolator/src/sys/dev/isp/isp_target.c#3 integrate .. //depot/projects/linuxolator/src/sys/dev/isp/ispmbox.h#5 integrate .. //depot/projects/linuxolator/src/sys/dev/isp/ispvar.h#5 integrate .. //depot/projects/linuxolator/src/sys/dev/ispfw/ispfw.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/iwi/if_iwi.c#5 integrate .. //depot/projects/linuxolator/src/sys/dev/le/am7990.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/le/am79900.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/le/lance.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/le/lancevar.h#2 integrate .. //depot/projects/linuxolator/src/sys/dev/md/md.c#3 integrate .. //depot/projects/linuxolator/src/sys/dev/mfi/mfi.c#8 integrate .. //depot/projects/linuxolator/src/sys/dev/mfi/mfi_ioctl.h#3 integrate .. //depot/projects/linuxolator/src/sys/dev/mfi/mfireg.h#3 integrate .. //depot/projects/linuxolator/src/sys/dev/mii/brgphy.c#3 integrate .. //depot/projects/linuxolator/src/sys/dev/mii/e1000phy.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/mii/e1000phyreg.h#2 integrate .. //depot/projects/linuxolator/src/sys/dev/mii/miidevs#3 integrate .. //depot/projects/linuxolator/src/sys/dev/mly/mly.c#3 integrate .. //depot/projects/linuxolator/src/sys/dev/mpt/mpt.c#4 integrate .. //depot/projects/linuxolator/src/sys/dev/mpt/mpt.h#4 integrate .. //depot/projects/linuxolator/src/sys/dev/mpt/mpt_cam.c#8 integrate .. //depot/projects/linuxolator/src/sys/dev/mpt/mpt_debug.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/mpt/mpt_pci.c#4 integrate .. //depot/projects/linuxolator/src/sys/dev/mpt/mpt_raid.c#4 integrate .. //depot/projects/linuxolator/src/sys/dev/msk/if_msk.c#1 branch .. //depot/projects/linuxolator/src/sys/dev/msk/if_mskreg.h#1 branch .. //depot/projects/linuxolator/src/sys/dev/nve/if_nvereg.h#2 integrate .. //depot/projects/linuxolator/src/sys/dev/pci/pci.c#11 integrate .. //depot/projects/linuxolator/src/sys/dev/pci/pci_private.h#5 integrate .. //depot/projects/linuxolator/src/sys/dev/pci/pcib_private.h#3 integrate .. //depot/projects/linuxolator/src/sys/dev/pci/pcireg.h#3 integrate .. //depot/projects/linuxolator/src/sys/dev/pci/pcivar.h#5 integrate .. //depot/projects/linuxolator/src/sys/dev/ppbus/vpo.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/ral/rt2560.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/ral/rt2661.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/sk/if_sk.c#3 integrate .. //depot/projects/linuxolator/src/sys/dev/sk/if_skreg.h#3 integrate .. //depot/projects/linuxolator/src/sys/dev/sound/pci/hda/hdac.c#7 integrate .. //depot/projects/linuxolator/src/sys/dev/sound/pcm/channel.c#5 integrate .. //depot/projects/linuxolator/src/sys/dev/sound/pcm/dsp.c#7 integrate .. //depot/projects/linuxolator/src/sys/dev/trm/trm.c#3 integrate .. //depot/projects/linuxolator/src/sys/dev/twa/tw_osl_freebsd.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/usb/if_aue.c#4 integrate .. //depot/projects/linuxolator/src/sys/dev/usb/if_auereg.h#3 integrate .. //depot/projects/linuxolator/src/sys/dev/usb/usb_ethersubr.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/usb/usb_ethersubr.h#2 integrate .. //depot/projects/linuxolator/src/sys/dev/wds/wd7000.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/wi/if_wi.c#3 integrate .. //depot/projects/linuxolator/src/sys/dev/wi/if_wivar.h#2 integrate .. //depot/projects/linuxolator/src/sys/fs/msdosfs/msdosfs_vfsops.c#4 integrate .. //depot/projects/linuxolator/src/sys/fs/procfs/procfs_status.c#3 integrate .. //depot/projects/linuxolator/src/sys/fs/unionfs/union_subr.c#3 integrate .. //depot/projects/linuxolator/src/sys/fs/unionfs/union_vfsops.c#4 integrate .. //depot/projects/linuxolator/src/sys/fs/unionfs/union_vnops.c#3 integrate .. //depot/projects/linuxolator/src/sys/i386/conf/GENERIC#5 integrate .. //depot/projects/linuxolator/src/sys/i386/i386/intr_machdep.c#4 integrate .. //depot/projects/linuxolator/src/sys/i386/i386/machdep.c#8 integrate .. //depot/projects/linuxolator/src/sys/i386/i386/mptable_pci.c#3 integrate .. //depot/projects/linuxolator/src/sys/i386/include/intr_machdep.h#4 integrate .. //depot/projects/linuxolator/src/sys/i386/pci/pci_bus.c#3 integrate .. //depot/projects/linuxolator/src/sys/i386/pci/pci_cfgreg.c#2 integrate .. //depot/projects/linuxolator/src/sys/ia64/ia64/machdep.c#5 integrate .. //depot/projects/linuxolator/src/sys/isofs/cd9660/cd9660_node.h#2 integrate .. //depot/projects/linuxolator/src/sys/kern/init_main.c#6 integrate .. //depot/projects/linuxolator/src/sys/kern/kern_clock.c#3 integrate .. //depot/projects/linuxolator/src/sys/kern/kern_fork.c#9 integrate .. //depot/projects/linuxolator/src/sys/kern/kern_idle.c#4 integrate .. //depot/projects/linuxolator/src/sys/kern/kern_intr.c#4 integrate .. //depot/projects/linuxolator/src/sys/kern/kern_kse.c#3 integrate .. //depot/projects/linuxolator/src/sys/kern/kern_poll.c#3 integrate .. //depot/projects/linuxolator/src/sys/kern/kern_proc.c#7 integrate .. //depot/projects/linuxolator/src/sys/kern/kern_resource.c#6 integrate .. //depot/projects/linuxolator/src/sys/kern/kern_subr.c#3 integrate .. //depot/projects/linuxolator/src/sys/kern/kern_switch.c#3 integrate .. //depot/projects/linuxolator/src/sys/kern/kern_thr.c#7 integrate .. //depot/projects/linuxolator/src/sys/kern/kern_thread.c#3 integrate .. //depot/projects/linuxolator/src/sys/kern/kern_umtx.c#9 integrate .. //depot/projects/linuxolator/src/sys/kern/ksched.c#2 integrate .. //depot/projects/linuxolator/src/sys/kern/sched_4bsd.c#6 integrate .. //depot/projects/linuxolator/src/sys/kern/sched_ule.c#4 integrate .. //depot/projects/linuxolator/src/sys/kern/subr_trap.c#4 integrate .. //depot/projects/linuxolator/src/sys/kern/tty.c#8 integrate .. //depot/projects/linuxolator/src/sys/kern/vfs_bio.c#5 integrate .. //depot/projects/linuxolator/src/sys/kern/vfs_export.c#3 integrate .. //depot/projects/linuxolator/src/sys/modules/Makefile#5 integrate .. //depot/projects/linuxolator/src/sys/modules/isp/Makefile#2 integrate .. //depot/projects/linuxolator/src/sys/modules/msk/Makefile#1 branch .. //depot/projects/linuxolator/src/sys/net/bridgestp.c#8 integrate .. //depot/projects/linuxolator/src/sys/net/bridgestp.h#6 integrate .. //depot/projects/linuxolator/src/sys/net/if_bridge.c#10 integrate .. //depot/projects/linuxolator/src/sys/net/if_bridgevar.h#6 integrate .. //depot/projects/linuxolator/src/sys/net/if_ethersubr.c#4 integrate .. //depot/projects/linuxolator/src/sys/net/if_ppp.c#5 integrate .. //depot/projects/linuxolator/src/sys/net/if_pppvar.h#3 integrate .. //depot/projects/linuxolator/src/sys/net/if_spppsubr.c#2 integrate .. //depot/projects/linuxolator/src/sys/net/ppp_tty.c#3 integrate .. //depot/projects/linuxolator/src/sys/netgraph/ng_nat.c#4 integrate .. //depot/projects/linuxolator/src/sys/netinet/ip_fw2.c#8 integrate .. //depot/projects/linuxolator/src/sys/netinet/ip_output.c#7 integrate .. //depot/projects/linuxolator/src/sys/netinet/libalias/alias.c#4 integrate .. //depot/projects/linuxolator/src/sys/netinet/libalias/alias_db.c#3 integrate .. //depot/projects/linuxolator/src/sys/netinet/libalias/alias_local.h#3 integrate .. //depot/projects/linuxolator/src/sys/netinet/libalias/alias_mod.c#2 integrate .. //depot/projects/linuxolator/src/sys/netinet/libalias/alias_proxy.c#3 integrate .. //depot/projects/linuxolator/src/sys/netinet/libalias/alias_util.c#3 integrate .. //depot/projects/linuxolator/src/sys/netinet/sctp_asconf.c#3 integrate .. //depot/projects/linuxolator/src/sys/netinet/sctp_constants.h#3 integrate .. //depot/projects/linuxolator/src/sys/netinet/sctp_indata.c#3 integrate .. //depot/projects/linuxolator/src/sys/netinet/sctp_input.c#3 integrate .. //depot/projects/linuxolator/src/sys/netinet/sctp_lock_bsd.h#2 integrate .. //depot/projects/linuxolator/src/sys/netinet/sctp_os_bsd.h#2 integrate .. //depot/projects/linuxolator/src/sys/netinet/sctp_output.c#3 integrate .. //depot/projects/linuxolator/src/sys/netinet/sctp_pcb.c#3 integrate .. //depot/projects/linuxolator/src/sys/netinet/sctp_pcb.h#2 integrate .. //depot/projects/linuxolator/src/sys/netinet/sctp_peeloff.c#2 integrate .. //depot/projects/linuxolator/src/sys/netinet/sctp_structs.h#3 integrate .. //depot/projects/linuxolator/src/sys/netinet/sctp_timer.c#2 integrate .. //depot/projects/linuxolator/src/sys/netinet/sctp_uio.h#3 integrate .. //depot/projects/linuxolator/src/sys/netinet/sctp_usrreq.c#3 integrate .. //depot/projects/linuxolator/src/sys/netinet/sctputil.c#3 integrate .. //depot/projects/linuxolator/src/sys/netinet/sctputil.h#3 integrate .. //depot/projects/linuxolator/src/sys/netinet/tcp_hostcache.c#2 integrate .. //depot/projects/linuxolator/src/sys/netinet/tcp_input.c#6 integrate .. //depot/projects/linuxolator/src/sys/netinet/tcp_syncache.c#4 integrate .. //depot/projects/linuxolator/src/sys/netinet6/frag6.c#2 integrate .. //depot/projects/linuxolator/src/sys/netinet6/icmp6.c#2 integrate .. //depot/projects/linuxolator/src/sys/netinet6/in6.c#4 integrate .. //depot/projects/linuxolator/src/sys/netinet6/in6_gif.c#2 integrate .. //depot/projects/linuxolator/src/sys/netinet6/in6_src.c#3 integrate .. //depot/projects/linuxolator/src/sys/netinet6/in6_var.h#2 integrate .. //depot/projects/linuxolator/src/sys/netinet6/ip6_forward.c#2 integrate .. //depot/projects/linuxolator/src/sys/netinet6/ip6_input.c#2 integrate .. //depot/projects/linuxolator/src/sys/netinet6/ip6_mroute.c#2 integrate .. //depot/projects/linuxolator/src/sys/netinet6/ipsec.c#3 integrate .. //depot/projects/linuxolator/src/sys/netinet6/mld6.c#2 integrate .. //depot/projects/linuxolator/src/sys/netinet6/nd6.c#6 integrate .. //depot/projects/linuxolator/src/sys/netinet6/nd6_nbr.c#2 integrate .. //depot/projects/linuxolator/src/sys/netinet6/nd6_rtr.c#2 integrate .. //depot/projects/linuxolator/src/sys/netinet6/scope6.c#2 integrate .. //depot/projects/linuxolator/src/sys/netinet6/sctp6_usrreq.c#3 integrate .. //depot/projects/linuxolator/src/sys/netinet6/udp6_usrreq.c#3 integrate .. //depot/projects/linuxolator/src/sys/netipsec/ipsec.c#3 integrate .. //depot/projects/linuxolator/src/sys/netipsec/ipsec_input.c#2 integrate .. //depot/projects/linuxolator/src/sys/nfsclient/bootp_subr.c#3 integrate .. //depot/projects/linuxolator/src/sys/nfsclient/nfs_diskless.c#2 integrate .. //depot/projects/linuxolator/src/sys/nfsclient/nfs_socket.c#4 integrate .. //depot/projects/linuxolator/src/sys/nfsclient/nfs_vfsops.c#5 integrate .. //depot/projects/linuxolator/src/sys/nfsclient/nfsdiskless.h#2 integrate .. //depot/projects/linuxolator/src/sys/nfsserver/nfs_syscalls.c#4 integrate .. //depot/projects/linuxolator/src/sys/pc98/pc98/machdep.c#6 integrate .. //depot/projects/linuxolator/src/sys/pci/if_xl.c#3 integrate .. //depot/projects/linuxolator/src/sys/pci/if_xlreg.h#3 integrate .. //depot/projects/linuxolator/src/sys/powerpc/include/bus.h#2 integrate .. //depot/projects/linuxolator/src/sys/powerpc/include/pmap.h#2 integrate .. //depot/projects/linuxolator/src/sys/powerpc/powerpc/intr_machdep.c#2 integrate .. //depot/projects/linuxolator/src/sys/powerpc/powerpc/machdep.c#3 integrate .. //depot/projects/linuxolator/src/sys/powerpc/powerpc/mmu_if.m#2 integrate .. //depot/projects/linuxolator/src/sys/powerpc/powerpc/mmu_oea.c#4 integrate .. //depot/projects/linuxolator/src/sys/powerpc/powerpc/ofw_machdep.c#2 integrate .. //depot/projects/linuxolator/src/sys/powerpc/powerpc/pmap_dispatch.c#3 integrate .. //depot/projects/linuxolator/src/sys/powerpc/powerpc/uio_machdep.c#2 integrate .. //depot/projects/linuxolator/src/sys/security/mac/mac_framework.h#5 integrate .. //depot/projects/linuxolator/src/sys/security/mac/mac_inet.c#5 integrate .. //depot/projects/linuxolator/src/sys/security/mac_biba/mac_biba.c#4 integrate .. //depot/projects/linuxolator/src/sys/security/mac_lomac/mac_lomac.c#5 integrate .. //depot/projects/linuxolator/src/sys/security/mac_mls/mac_mls.c#4 integrate .. //depot/projects/linuxolator/src/sys/sparc64/sparc64/elf_machdep.c#2 integrate .. //depot/projects/linuxolator/src/sys/sparc64/sparc64/machdep.c#4 integrate .. //depot/projects/linuxolator/src/sys/sun4v/include/pcpu.h#4 integrate .. //depot/projects/linuxolator/src/sys/sun4v/mdesc/mdesc_init.c#3 integrate .. //depot/projects/linuxolator/src/sys/sun4v/mdesc/mdesc_vdevfindval.c#2 integrate .. //depot/projects/linuxolator/src/sys/sun4v/sun4v/machdep.c#6 integrate .. //depot/projects/linuxolator/src/sys/sun4v/sun4v/mp_machdep.c#3 integrate .. //depot/projects/linuxolator/src/sys/sun4v/sun4v/pmap.c#8 integrate .. //depot/projects/linuxolator/src/sys/sun4v/sun4v/trap.c#6 integrate .. //depot/projects/linuxolator/src/sys/sun4v/sun4v/uio_machdep.c#2 integrate .. //depot/projects/linuxolator/src/sys/sun4v/sun4v/vnex.c#4 integrate .. //depot/projects/linuxolator/src/sys/sys/interrupt.h#2 integrate .. //depot/projects/linuxolator/src/sys/sys/mac_policy.h#6 integrate .. //depot/projects/linuxolator/src/sys/sys/param.h#8 integrate .. //depot/projects/linuxolator/src/sys/sys/proc.h#8 integrate .. //depot/projects/linuxolator/src/sys/sys/rtprio.h#4 integrate .. //depot/projects/linuxolator/src/sys/sys/runq.h#2 integrate .. //depot/projects/linuxolator/src/sys/sys/sched.h#4 integrate .. //depot/projects/linuxolator/src/sys/sys/vnode.h#4 integrate .. //depot/projects/linuxolator/src/sys/vm/vm_glue.c#3 integrate .. //depot/projects/linuxolator/src/sys/vm/vm_page.c#6 integrate .. //depot/projects/linuxolator/src/sys/vm/vm_zeroidle.c#3 integrate Differences ... ==== //depot/projects/linuxolator/src/sys/amd64/amd64/intr_machdep.c#6 (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.26 2006/11/17 16:41:03 jhb Exp $ + * $FreeBSD: src/sys/amd64/amd64/intr_machdep.c,v 1.27 2006/12/12 19:20:18 jhb Exp $ */ /* @@ -190,13 +190,13 @@ int intr_remove_handler(void *cookie) { + struct intsrc *isrc; int error; + isrc = intr_handler_source(cookie); error = intr_event_remove_handler(cookie); -#ifdef XXX if (error == 0) - intrcnt_updatename(/* XXX */); -#endif + intrcnt_updatename(isrc); return (error); } ==== //depot/projects/linuxolator/src/sys/amd64/amd64/machdep.c#10 (text+ko) ==== @@ -39,7 +39,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/amd64/amd64/machdep.c,v 1.664 2006/11/19 20:54:57 alc Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/machdep.c,v 1.666 2006/12/06 18:27:17 sobomax Exp $"); #include "opt_atalk.h" #include "opt_atpic.h" @@ -514,6 +514,7 @@ * help lock contention somewhat, and this is critical for HTT. -Peter */ static int cpu_idle_hlt = 1; +TUNABLE_INT("machdep.cpu_idle_hlt", &cpu_idle_hlt); SYSCTL_INT(_machdep, OID_AUTO, cpu_idle_hlt, CTLFLAG_RW, &cpu_idle_hlt, 0, "Idle loop HLT enable"); @@ -1121,11 +1122,7 @@ * This may be done better later if it gets more high level * components in it. If so just link td->td_proc here. */ -#ifdef KSE - proc_linkup(&proc0, &ksegrp0, &thread0); -#else proc_linkup(&proc0, &thread0); -#endif preload_metadata = (caddr_t)(uintptr_t)(modulep + KERNBASE); preload_bootstrap_relocate(KERNBASE); ==== //depot/projects/linuxolator/src/sys/amd64/amd64/minidump_machdep.c#2 (text) ==== @@ -25,7 +25,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/amd64/amd64/minidump_machdep.c,v 1.1 2006/04/21 04:24:50 peter Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/minidump_machdep.c,v 1.2 2006/12/05 11:31:33 ru Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -215,7 +215,7 @@ j = ((va >> PDRSHIFT) & ((1ul << NPDEPGSHIFT) - 1)); if ((pd[j] & (PG_PS | PG_V)) == (PG_PS | PG_V)) { /* This is an entire 2M page. */ - pa = pd[j] & PG_FRAME & ~PDRMASK; + pa = pd[j] & PG_PS_FRAME; for (k = 0; k < NPTEPG; k++) { if (is_dumpable(pa)) dump_add_page(pa); @@ -326,7 +326,7 @@ j = ((va >> PDRSHIFT) & ((1ul << NPDEPGSHIFT) - 1)); if ((pd[j] & (PG_PS | PG_V)) == (PG_PS | PG_V)) { /* This is a single 2M block. Generate a fake PTP */ - pa = pd[j] & PG_FRAME & ~PDRMASK; + pa = pd[j] & PG_PS_FRAME; for (k = 0; k < NPTEPG; k++) { fakept[k] = (pa + (k * PAGE_SIZE)) | PG_V | PG_RW | PG_A | PG_M; } ==== //depot/projects/linuxolator/src/sys/amd64/amd64/mptable_pci.c#3 (text+ko) ==== @@ -33,7 +33,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/amd64/amd64/mptable_pci.c,v 1.5 2006/11/13 22:23:32 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/mptable_pci.c,v 1.6 2006/12/12 19:27:00 jhb Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -72,6 +72,27 @@ return (bus_generic_attach(dev)); } +/* Pass MSI alloc requests up to the nexus. */ +static int +mptable_hostb_alloc_msi(device_t pcib, device_t dev, int count, int maxcount, + int *irqs) +{ + device_t bus; + + bus = device_get_parent(pcib); + return (PCIB_ALLOC_MSI(device_get_parent(bus), dev, count, maxcount, + irqs)); +} + +static int +mptable_hostb_alloc_msix(device_t pcib, device_t dev, int index, int *irq) +{ + device_t bus; + + bus = device_get_parent(pcib); + return (PCIB_ALLOC_MSIX(device_get_parent(bus), dev, index, irq)); +} + static device_method_t mptable_hostb_methods[] = { /* Device interface */ DEVMETHOD(device_probe, mptable_hostb_probe), @@ -96,9 +117,9 @@ DEVMETHOD(pcib_read_config, legacy_pcib_read_config), DEVMETHOD(pcib_write_config, legacy_pcib_write_config), DEVMETHOD(pcib_route_interrupt, mptable_pci_route_interrupt), - DEVMETHOD(pcib_alloc_msi, pcib_alloc_msi), + DEVMETHOD(pcib_alloc_msi, mptable_hostb_alloc_msi), DEVMETHOD(pcib_release_msi, pcib_release_msi), - DEVMETHOD(pcib_alloc_msix, pcib_alloc_msix), + DEVMETHOD(pcib_alloc_msix, mptable_hostb_alloc_msix), DEVMETHOD(pcib_release_msix, pcib_release_msix), { 0, 0 } @@ -165,4 +186,3 @@ DEFINE_CLASS_0(pcib, mptable_pcib_driver, mptable_pcib_pci_methods, sizeof(struct pcib_softc)); DRIVER_MODULE(mptable_pcib, pci, mptable_pcib_driver, pcib_devclass, 0, 0); - ==== //depot/projects/linuxolator/src/sys/amd64/amd64/pmap.c#5 (text+ko) ==== @@ -77,7 +77,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.576 2006/11/23 21:37:04 ru Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.577 2006/12/05 11:31:33 ru Exp $"); /* * Manages physical address maps. @@ -947,9 +947,7 @@ pde = *pdep; if (pde) { if ((pde & PG_PS) != 0) { - KASSERT((pde & PG_FRAME & PDRMASK) == 0, - ("pmap_extract: bad pde")); - rtval = (pde & PG_FRAME) | (va & PDRMASK); + rtval = (pde & PG_PS_FRAME) | (va & PDRMASK); PMAP_UNLOCK(pmap); return rtval; } @@ -982,9 +980,7 @@ if (pdep != NULL && (pde = *pdep)) { if (pde & PG_PS) { if ((pde & PG_RW) || (prot & VM_PROT_WRITE) == 0) { - KASSERT((pde & PG_FRAME & PDRMASK) == 0, - ("pmap_extract_and_hold: bad pde")); - m = PHYS_TO_VM_PAGE((pde & PG_FRAME) | + m = PHYS_TO_VM_PAGE((pde & PG_PS_FRAME) | (va & PDRMASK)); vm_page_hold(m); } @@ -1013,7 +1009,7 @@ } else { pde = vtopde(va); if (*pde & PG_PS) { - pa = (*pde & ~(NBPDR - 1)) | (va & (NBPDR - 1)); + pa = (*pde & PG_PS_FRAME) | (va & PDRMASK); } else { pa = *vtopte(va); pa = (pa & PG_FRAME) | (va & PAGE_MASK); ==== //depot/projects/linuxolator/src/sys/amd64/conf/GENERIC#7 (text+ko) ==== @@ -16,7 +16,7 @@ # If you are in doubt as to the purpose or necessity of a line, check first # in NOTES. # -# $FreeBSD: src/sys/amd64/conf/GENERIC,v 1.470 2006/12/03 21:02:09 netchild Exp $ +# $FreeBSD: src/sys/amd64/conf/GENERIC,v 1.471 2006/12/13 03:41:47 yongari Exp $ cpu HAMMER ident GENERIC @@ -195,6 +195,7 @@ device dc # DEC/Intel 21143 and various workalikes device fxp # Intel EtherExpress PRO/100B (82557, 82558) device lge # Level 1 LXT1001 gigabit Ethernet +device msk # Marvell/SysKonnect Yukon II Gigabit Ethernet device nge # NatSemi DP83820 gigabit Ethernet device nve # nVidia nForce MCP on-board Ethernet Networking device pcn # AMD Am79C97x PCI 10/100 (precedence over 'le') ==== //depot/projects/linuxolator/src/sys/amd64/include/intr_machdep.h#4 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/amd64/include/intr_machdep.h,v 1.12 2006/11/13 22:23:33 jhb Exp $ + * $FreeBSD: src/sys/amd64/include/intr_machdep.h,v 1.13 2006/12/12 19:24:45 jhb Exp $ */ #ifndef __MACHINE_INTR_MACHDEP_H__ @@ -147,9 +147,9 @@ void intr_resume(void); void intr_suspend(void); void intrcnt_add(const char *name, u_long **countp); -void msi_init(void); int msi_alloc(device_t dev, int count, int maxcount, int *irqs, int *newirq, int *newcount); +void msi_init(void); int msi_release(int *irqs, int count); int msix_alloc(device_t dev, int index, int *irq, int *new); int msix_release(int irq); ==== //depot/projects/linuxolator/src/sys/amd64/include/pmap.h#4 (text+ko) ==== @@ -39,7 +39,7 @@ * * from: hp300: @(#)pmap.h 7.2 (Berkeley) 12/16/90 * from: @(#)pmap.h 7.4 (Berkeley) 5/12/91 - * $FreeBSD: src/sys/amd64/include/pmap.h,v 1.137 2006/11/19 20:54:57 alc Exp $ + * $FreeBSD: src/sys/amd64/include/pmap.h,v 1.138 2006/12/05 11:31:33 ru Exp $ */ #ifndef _MACHINE_PMAP_H_ @@ -71,6 +71,7 @@ #define PG_W PG_AVAIL1 /* "Wired" pseudoflag */ #define PG_MANAGED PG_AVAIL2 #define PG_FRAME (0x000ffffffffff000ul) +#define PG_PS_FRAME (0x000fffffffe00000ul) #define PG_PROT (PG_RW|PG_U) /* all protection bits . */ #define PG_N (PG_NC_PWT|PG_NC_PCD) /* Non-cacheable */ ==== //depot/projects/linuxolator/src/sys/amd64/pci/pci_bus.c#3 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/amd64/pci/pci_bus.c,v 1.118 2006/11/13 22:23:33 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/pci/pci_bus.c,v 1.119 2006/12/12 19:27:00 jhb Exp $"); #include "opt_cpu.h" @@ -81,6 +81,28 @@ return (PCI_INVALID_IRQ); } +/* Pass MSI alloc requests up to the nexus. */ + +static int +legacy_pcib_alloc_msi(device_t pcib, device_t dev, int count, int maxcount, + int *irqs) +{ + device_t bus; + + bus = device_get_parent(pcib); + return (PCIB_ALLOC_MSI(device_get_parent(bus), dev, count, maxcount, + irqs)); +} + +static int +legacy_pcib_alloc_msix(device_t pcib, device_t dev, int index, int *irq) +{ + device_t bus; + + bus = device_get_parent(pcib); + return (PCIB_ALLOC_MSIX(device_get_parent(bus), dev, index, irq)); +} + static const char * legacy_pcib_is_host_bridge(int bus, int slot, int func, uint32_t id, uint8_t class, uint8_t subclass, @@ -322,9 +344,9 @@ DEVMETHOD(pcib_read_config, legacy_pcib_read_config), DEVMETHOD(pcib_write_config, legacy_pcib_write_config), DEVMETHOD(pcib_route_interrupt, legacy_pcib_route_interrupt), - DEVMETHOD(pcib_alloc_msi, pcib_alloc_msi), + DEVMETHOD(pcib_alloc_msi, legacy_pcib_alloc_msi), DEVMETHOD(pcib_release_msi, pcib_release_msi), - DEVMETHOD(pcib_alloc_msix, pcib_alloc_msix), + DEVMETHOD(pcib_alloc_msix, legacy_pcib_alloc_msix), DEVMETHOD(pcib_release_msix, pcib_release_msix), { 0, 0 } ==== //depot/projects/linuxolator/src/sys/arm/at91/kb920x_machdep.c#5 (text) ==== @@ -48,7 +48,7 @@ #include "opt_at91.h" #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/arm/at91/kb920x_machdep.c,v 1.19 2006/11/11 20:57:52 alc Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/at91/kb920x_machdep.c,v 1.20 2006/12/06 06:34:53 julian Exp $"); #define _ARM32_BUS_DMA_PRIVATE #include <sys/param.h> @@ -455,11 +455,7 @@ undefined_handler_address = (u_int)undefinedinstruction_bounce; undefined_init(); -#ifdef KSE - proc_linkup(&proc0, &ksegrp0, &thread0); -#else proc_linkup(&proc0, &thread0); -#endif thread0.td_kstack = kernelstack.pv_va; thread0.td_pcb = (struct pcb *) (thread0.td_kstack + KSTACK_PAGES * PAGE_SIZE) - 1; ==== //depot/projects/linuxolator/src/sys/arm/at91/uart_dev_at91usart.c#2 (text) ==== @@ -26,7 +26,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/arm/at91/uart_dev_at91usart.c,v 1.9 2006/07/20 21:03:43 cognet Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/at91/uart_dev_at91usart.c,v 1.10 2006/12/07 00:24:15 cognet Exp $"); #include "opt_comconsole.h" @@ -323,7 +323,10 @@ static int at91_usart_bus_attach(struct uart_softc *sc) { - int err, i; +#ifndef SKYEYE_WORKAROUNDS + int err; + int i; +#endif uint32_t cr; struct at91_usart_softc *atsc; @@ -345,6 +348,7 @@ sc->sc_rxfifosz = USART_BUFFER_SIZE; sc->sc_hwiflow = 0; +#ifndef SKYEYE_WORKAROUNDS /* * Allocate DMA tags and maps */ @@ -374,6 +378,7 @@ atsc->ping = &atsc->ping_pong[0]; atsc->pong = &atsc->ping_pong[1]; } +#endif /* * Prime the pump with the RX buffer. We use two 64 byte bounce @@ -407,9 +412,13 @@ WR4(&sc->sc_bas, USART_IER, USART_CSR_RXRDY); } WR4(&sc->sc_bas, USART_IER, USART_CSR_RXBRK); +#ifndef SKYEYE_WORKAROUNDS errout:; // XXX bad return (err); +#else + return (0); +#endif } static int ==== //depot/projects/linuxolator/src/sys/arm/sa11x0/assabet_machdep.c#4 (text+ko) ==== @@ -47,7 +47,7 @@ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/arm/sa11x0/assabet_machdep.c,v 1.20 2006/11/11 20:57:52 alc Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/sa11x0/assabet_machdep.c,v 1.21 2006/12/06 06:34:54 julian Exp $"); #include "opt_md.h" @@ -422,11 +422,7 @@ /* Set stack for exception handlers */ -#ifdef KSE - proc_linkup(&proc0, &ksegrp0, &thread0); -#else proc_linkup(&proc0, &thread0); -#endif thread0.td_kstack = kernelstack.pv_va; thread0.td_pcb = (struct pcb *) (thread0.td_kstack + KSTACK_PAGES * PAGE_SIZE) - 1; ==== //depot/projects/linuxolator/src/sys/arm/xscale/i80321/ep80219_machdep.c#4 (text+ko) ==== @@ -49,7 +49,7 @@ #include "opt_ddb.h" #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/arm/xscale/i80321/ep80219_machdep.c,v 1.4 2006/11/17 00:53:39 kevlo Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/xscale/i80321/ep80219_machdep.c,v 1.5 2006/12/06 06:34:54 julian Exp $"); #define _ARM32_BUS_DMA_PRIVATE #include <sys/param.h> @@ -429,11 +429,7 @@ undefined_handler_address = (u_int)undefinedinstruction_bounce; undefined_init(); -#ifdef KSE - proc_linkup(&proc0, &ksegrp0, &thread0); -#else proc_linkup(&proc0, &thread0); -#endif thread0.td_kstack = kernelstack.pv_va; thread0.td_pcb = (struct pcb *) (thread0.td_kstack + KSTACK_PAGES * PAGE_SIZE) - 1; ==== //depot/projects/linuxolator/src/sys/arm/xscale/i80321/iq31244_machdep.c#4 (text+ko) ==== @@ -49,7 +49,7 @@ #include "opt_ddb.h" #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/arm/xscale/i80321/iq31244_machdep.c,v 1.25 2006/11/17 00:53:39 kevlo Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/xscale/i80321/iq31244_machdep.c,v 1.26 2006/12/06 06:34:54 julian Exp $"); #define _ARM32_BUS_DMA_PRIVATE #include <sys/param.h> @@ -427,11 +427,7 @@ undefined_handler_address = (u_int)undefinedinstruction_bounce; undefined_init(); -#ifdef KSE - proc_linkup(&proc0, &ksegrp0, &thread0); -#else proc_linkup(&proc0, &thread0); -#endif thread0.td_kstack = kernelstack.pv_va; thread0.td_pcb = (struct pcb *) (thread0.td_kstack + KSTACK_PAGES * PAGE_SIZE) - 1; ==== //depot/projects/linuxolator/src/sys/arm/xscale/ixp425/avila_machdep.c#2 (text+ko) ==== @@ -49,7 +49,7 @@ #include "opt_ddb.h" #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/arm/xscale/ixp425/avila_machdep.c,v 1.1 2006/11/19 23:55:23 sam Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/xscale/ixp425/avila_machdep.c,v 1.2 2006/12/06 06:34:54 julian Exp $"); #define _ARM32_BUS_DMA_PRIVATE #include <sys/param.h> @@ -493,11 +493,7 @@ undefined_handler_address = (u_int)undefinedinstruction_bounce; undefined_init(); -#ifdef KSE - proc_linkup(&proc0, &ksegrp0, &thread0); -#else proc_linkup(&proc0, &thread0); -#endif thread0.td_kstack = kernelstack.pv_va; thread0.td_pcb = (struct pcb *) (thread0.td_kstack + KSTACK_PAGES * PAGE_SIZE) - 1; ==== //depot/projects/linuxolator/src/sys/arm/xscale/ixp425/files.ixp425#2 (text+ko) ==== @@ -1,4 +1,4 @@ -#$FreeBSD: src/sys/arm/xscale/ixp425/files.ixp425,v 1.1 2006/11/19 23:55:23 sam Exp $ +#$FreeBSD: src/sys/arm/xscale/ixp425/files.ixp425,v 1.2 2006/12/07 00:49:33 sam Exp $ arm/arm/cpufunc_asm_xscale.S standard arm/arm/irq_dispatch.S standard arm/xscale/ixp425/ixp425.c standard @@ -18,7 +18,11 @@ # # NPE-based Ethernet support (requires qmgr also). Note the # firmware images must be downloaded from the Intel web site. +# The URL seems to change frequently; try this as a starting +# place: # +# http://www.intel.com/design/network/products/npfamily/download_ixp400.htm +# arm/xscale/ixp425/if_npe.c optional npe arm/xscale/ixp425/ixp425_npe.c optional npe ixp425_npe_fw.c optional npe_fw \ @@ -31,10 +35,15 @@ # get known values for reference in the _fw.c file. # IxNpeMicrocode.fwo optional npe_fw \ - dependency "$S/arm/xscale/ixp425/IxNpeMicrocode.dat" \ - compile-with "ln -sf $S/arm/xscale/ixp425/IxNpeMicrocode.dat ${.OBJDIR}; ${LD} -b binary -d -warn-common -r -d -o ${.TARGET} IxNpeMicrocode.dat" \ + dependency "IxNpeMicrocode.dat" \ + compile-with "${LD} -b binary -d -warn-common -r -d -o ${.TARGET} IxNpeMicrocode.dat" \ no-implicit-rule \ - clean "IxNpeMicrocode.dat IxNpeMicrocode.fwo" + clean "IxNpeMicrocode.fwo" +IxNpeMicrocode.dat optional npe_fw \ + dependency ".PHONY" \ + compile-with "if [ -e $S/arm/xscale/ixp425/IxNpeMicrocode.dat ]; then ln -sf $S/arm/xscale/ixp425/IxNpeMicrocode.dat .; else echo 'WARNING, no IxNpeMicrocode.dat file; you must obtain this from the Intel web site'; false; fi" \ + no-obj no-implicit-rule \ + clean "IxNpeMicrocode.dat" # # Q-Manager support # ==== //depot/projects/linuxolator/src/sys/boot/forth/loader.conf#3 (text+ko) ==== @@ -6,7 +6,7 @@ # # All arguments must be in double quotes. # -# $FreeBSD: src/sys/boot/forth/loader.conf,v 1.113 2006/10/01 14:58:30 ariff Exp $ +# $FreeBSD: src/sys/boot/forth/loader.conf,v 1.114 2006/12/13 02:48:22 yongari Exp $ ############################################################## ### Basic configuration options ############################ @@ -232,6 +232,7 @@ if_ixgb_load="NO" # Intel PRO/10Gb Ethernet if_le_load="NO" # AMD Am7900 LANCE and Am79C9xx PCnet if_lge_load="NO" # Level 1 LXT1001 NetCellerator PCI Gigabit Ethernet +if_msk_load="NO" # Marvell/SysKonnect Yukon II Gigabit Ethernet if_mxge_load="NO" # Myricom Myri10GE 10Gb Ethernet if_my_load="NO" # Myson PCI Fast Ethernet if_nfe_load="NO" # NVIDIA nForce MCP Networking Adapter ==== //depot/projects/linuxolator/src/sys/boot/i386/btx/btx/btx.S#4 (text+ko) ==== @@ -12,7 +12,7 @@ * warranties of merchantability and fitness for a particular * purpose. * - * $FreeBSD: src/sys/boot/i386/btx/btx/btx.S,v 1.43 2006/10/05 15:30:51 jhb Exp $ + * $FreeBSD: src/sys/boot/i386/btx/btx/btx.S,v 1.44 2006/12/06 17:45:35 jhb Exp $ */ /* @@ -499,6 +499,8 @@ je v86cli # Yes cmpb $0xfb,%al # STI? je v86sti # Yes + cmpb $0xcc,%al # INT3? + je v86mon.7 # Yes, ignore movzwl 0x38(%ebp),%ebx # Load V86 SS shll $0x4,%ebx # To offset pushl %ebx # Save ==== //depot/projects/linuxolator/src/sys/cam/cam_periph.c#3 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/cam/cam_periph.c,v 1.63 2006/10/01 20:23:50 mjacob Exp $"); +__FBSDID("$FreeBSD: src/sys/cam/cam_periph.c,v 1.64 2006/12/05 07:45:27 mjacob Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -334,12 +334,12 @@ if (periph != NULL && periph->unit_number == newunit) { if (wired != 0) { - xpt_print_path(periph->path); - printf("Duplicate Wired Device entry!\n"); - xpt_print_path(periph->path); - printf("Second device (%s device at scbus%d " - "target %d lun %d) will not be wired\n", - periph_name, pathid, target, lun); + xpt_print(periph->path, "Duplicate Wired " + "Device entry!\n"); + xpt_print(periph->path, "Second device (%s " + "device at scbus%d target %d lun %d) will " + "not be wired\n", periph_name, pathid, + target, lun); wired = 0; } continue; @@ -995,8 +995,8 @@ saved_ccb->ccb_h.status |= CAM_AUTOSNS_VALID; #if 0 - xpt_print_path(saved_ccb->ccb_h.path); - printf("Recovered Sense\n"); + xpt_print(saved_ccb->ccb_h.path, + "Recovered Sense\n"); scsi_sense_print(&saved_ccb->csio); cam_error_print(saved_ccb, CAM_ESF_ALL, CAM_EPF_ALL); @@ -1287,8 +1287,7 @@ *timeout = 0; error = ERESTART; if (bootverbose) { - xpt_print_path(ccb->ccb_h.path); - printf("Queue Full\n"); + xpt_print(ccb->ccb_h.path, "Queue Full\n"); } break; } @@ -1300,8 +1299,7 @@ * command completes or a 1 second timeout. */ if (bootverbose) { - xpt_print_path(ccb->ccb_h.path); - printf("Device Busy\n"); + xpt_print(ccb->ccb_h.path, "Device Busy\n"); } if (ccb->ccb_h.retry_count > 0) { ccb->ccb_h.retry_count--; @@ -1314,13 +1312,12 @@ } break; case SCSI_STATUS_RESERV_CONFLICT: - xpt_print_path(ccb->ccb_h.path); - printf("Reservation Conflict\n"); + xpt_print(ccb->ccb_h.path, "Reservation Conflict\n"); error = EIO; break; default: - xpt_print_path(ccb->ccb_h.path); - printf("SCSI Status 0x%x\n", ccb->csio.scsi_status); + xpt_print(ccb->ccb_h.path, "SCSI Status 0x%x\n", + ccb->csio.scsi_status); error = EIO; break; } @@ -1574,42 +1571,38 @@ &timeout); break; case CAM_AUTOSENSE_FAIL: - xpt_print_path(ccb->ccb_h.path); - printf("AutoSense Failed\n"); + xpt_print(ccb->ccb_h.path, "AutoSense Failed\n"); error = EIO; /* we have to kill the command */ break; case CAM_REQ_CMP_ERR: if (bootverbose && printed == 0) { - xpt_print_path(ccb->ccb_h.path); - printf("Request completed with CAM_REQ_CMP_ERR\n"); + xpt_print(ccb->ccb_h.path, + "Request completed with CAM_REQ_CMP_ERR\n"); printed++; } /* FALLTHROUGH */ case CAM_CMD_TIMEOUT: if (bootverbose && printed == 0) { - xpt_print_path(ccb->ccb_h.path); - printf("Command timed out\n"); + xpt_print(ccb->ccb_h.path, "Command timed out\n"); printed++; } /* FALLTHROUGH */ case CAM_UNEXP_BUSFREE: if (bootverbose && printed == 0) { - xpt_print_path(ccb->ccb_h.path); - printf("Unexpected Bus Free\n"); + xpt_print(ccb->ccb_h.path, "Unexpected Bus Free\n"); printed++; } /* FALLTHROUGH */ case CAM_UNCOR_PARITY: if (bootverbose && printed == 0) { - xpt_print_path(ccb->ccb_h.path); - printf("Uncorrected Parity Error\n"); + xpt_print(ccb->ccb_h.path, >>> TRUNCATED FOR MAIL (1000 lines) <<<
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200612151815.kBFIFY3r098234>