Date: Sat, 7 Oct 2006 10:32:10 GMT From: Roman Divacky <rdivacky@FreeBSD.org> To: Perforce Change Reviews <perforce@FreeBSD.org> Subject: PERFORCE change 107408 for review Message-ID: <200610071032.k97AWAL8060783@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=107408 Change 107408 by rdivacky@rdivacky_witten on 2006/10/07 10:31:22 IFC Affected files ... .. //depot/projects/linuxolator/src/sys/amd64/amd64/machdep.c#2 integrate .. //depot/projects/linuxolator/src/sys/amd64/conf/GENERIC#3 integrate .. //depot/projects/linuxolator/src/sys/amd64/ia32/ia32_signal.c#2 integrate .. //depot/projects/linuxolator/src/sys/amd64/include/clock.h#2 integrate .. //depot/projects/linuxolator/src/sys/amd64/include/elf.h#2 integrate .. //depot/projects/linuxolator/src/sys/amd64/isa/clock.c#2 integrate .. //depot/projects/linuxolator/src/sys/amd64/linux32/linux32_machdep.c#9 integrate .. //depot/projects/linuxolator/src/sys/arm/include/clock.h#2 integrate .. //depot/projects/linuxolator/src/sys/arm/include/elf.h#2 integrate .. //depot/projects/linuxolator/src/sys/boot/common/panic.c#2 integrate .. //depot/projects/linuxolator/src/sys/boot/forth/loader.conf#2 integrate .. //depot/projects/linuxolator/src/sys/boot/i386/btx/btx/btx.S#3 integrate .. //depot/projects/linuxolator/src/sys/boot/i386/libi386/biospci.c#2 integrate .. //depot/projects/linuxolator/src/sys/boot/i386/libi386/biossmap.c#3 integrate .. //depot/projects/linuxolator/src/sys/boot/i386/libi386/bootinfo64.c#2 integrate .. //depot/projects/linuxolator/src/sys/boot/i386/libi386/elf64_freebsd.c#2 integrate .. //depot/projects/linuxolator/src/sys/boot/i386/libi386/libi386.h#2 integrate .. //depot/projects/linuxolator/src/sys/cam/cam_periph.c#2 integrate .. //depot/projects/linuxolator/src/sys/compat/freebsd32/freebsd32_misc.c#3 integrate .. //depot/projects/linuxolator/src/sys/compat/freebsd32/freebsd32_proto.h#4 integrate .. //depot/projects/linuxolator/src/sys/compat/freebsd32/freebsd32_signal.h#1 branch .. //depot/projects/linuxolator/src/sys/compat/freebsd32/freebsd32_syscall.h#4 integrate .. //depot/projects/linuxolator/src/sys/compat/freebsd32/freebsd32_syscalls.c#4 integrate .. //depot/projects/linuxolator/src/sys/compat/freebsd32/freebsd32_sysent.c#4 integrate .. //depot/projects/linuxolator/src/sys/compat/freebsd32/syscalls.master#4 integrate .. //depot/projects/linuxolator/src/sys/compat/ia32/ia32_genassym.c#2 integrate .. //depot/projects/linuxolator/src/sys/compat/ia32/ia32_signal.h#2 integrate .. //depot/projects/linuxolator/src/sys/compat/ia32/ia32_sysvec.c#2 integrate .. //depot/projects/linuxolator/src/sys/conf/Makefile.sun4v#1 branch .. //depot/projects/linuxolator/src/sys/conf/NOTES#4 integrate .. //depot/projects/linuxolator/src/sys/conf/files#4 integrate .. //depot/projects/linuxolator/src/sys/conf/files.sun4v#1 branch .. //depot/projects/linuxolator/src/sys/conf/options#4 integrate .. //depot/projects/linuxolator/src/sys/conf/options.sun4v#1 branch .. //depot/projects/linuxolator/src/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/aic/aic_pccard.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/bge/if_bge.c#4 integrate .. //depot/projects/linuxolator/src/sys/dev/bge/if_bgereg.h#2 integrate .. //depot/projects/linuxolator/src/sys/dev/em/if_em.c#5 integrate .. //depot/projects/linuxolator/src/sys/dev/fxp/if_fxp.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/ipmi/ipmi_smic.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/ips/ips.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/ips/ipsreg.h#2 integrate .. //depot/projects/linuxolator/src/sys/dev/pci/pci_user.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/sound/driver.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/sound/pci/ak452x.c#2 delete .. //depot/projects/linuxolator/src/sys/dev/sound/pci/ak452x.h#2 delete .. //depot/projects/linuxolator/src/sys/dev/sound/pci/atiixp.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/sound/pci/atiixp.h#2 integrate .. //depot/projects/linuxolator/src/sys/dev/sound/pci/envy24.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/sound/pci/envy24ht.c#1 branch .. //depot/projects/linuxolator/src/sys/dev/sound/pci/envy24ht.h#1 branch .. //depot/projects/linuxolator/src/sys/dev/sound/pci/hda/hda_reg.h#1 branch .. //depot/projects/linuxolator/src/sys/dev/sound/pci/hda/hdac.c#1 branch .. //depot/projects/linuxolator/src/sys/dev/sound/pci/hda/hdac.h#1 branch .. //depot/projects/linuxolator/src/sys/dev/sound/pci/hda/hdac_private.h#1 branch .. //depot/projects/linuxolator/src/sys/dev/sound/pci/hda/hdac_reg.h#1 branch .. //depot/projects/linuxolator/src/sys/dev/sound/pci/spicds.c#1 branch .. //depot/projects/linuxolator/src/sys/dev/sound/pci/spicds.h#1 branch .. //depot/projects/linuxolator/src/sys/dev/sound/pcm/ac97.c#3 integrate .. //depot/projects/linuxolator/src/sys/dev/sound/pcm/ac97_patch.c#3 integrate .. //depot/projects/linuxolator/src/sys/dev/sound/pcm/mixer.c#4 integrate .. //depot/projects/linuxolator/src/sys/dev/sound/pcm/mixer.h#4 integrate .. //depot/projects/linuxolator/src/sys/dev/twa/tw_osl_includes.h#2 integrate .. //depot/projects/linuxolator/src/sys/dev/twa/tw_osl_inline.h#2 integrate .. //depot/projects/linuxolator/src/sys/dev/twa/tw_osl_share.h#2 integrate .. //depot/projects/linuxolator/src/sys/dev/ubsec/ubsec.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/usb/ehci.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/usb/ohci.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/usb/ukbd.c#3 integrate .. //depot/projects/linuxolator/src/sys/dev/usb/usb_subr.c#3 integrate .. //depot/projects/linuxolator/src/sys/dev/usb/usbdi.c#2 integrate .. //depot/projects/linuxolator/src/sys/fs/msdosfs/msdosfs_conv.c#2 integrate .. //depot/projects/linuxolator/src/sys/fs/nwfs/nwfs_subr.c#2 integrate .. //depot/projects/linuxolator/src/sys/geom/cache/g_cache.c#1 branch .. //depot/projects/linuxolator/src/sys/geom/cache/g_cache.h#1 branch .. //depot/projects/linuxolator/src/sys/geom/eli/g_eli.c#2 integrate .. //depot/projects/linuxolator/src/sys/geom/eli/g_eli_ctl.c#3 integrate .. //depot/projects/linuxolator/src/sys/geom/label/g_label_msdosfs.c#2 integrate .. //depot/projects/linuxolator/src/sys/geom/label/g_label_msdosfs.h#2 integrate .. //depot/projects/linuxolator/src/sys/geom/nop/g_nop.h#2 integrate .. //depot/projects/linuxolator/src/sys/geom/raid3/g_raid3.c#3 integrate .. //depot/projects/linuxolator/src/sys/i386/bios/apm.c#2 integrate .. //depot/projects/linuxolator/src/sys/i386/conf/GENERIC#3 integrate .. //depot/projects/linuxolator/src/sys/i386/i386/machdep.c#2 integrate .. //depot/projects/linuxolator/src/sys/i386/ibcs2/ibcs2_xenix.c#2 integrate .. //depot/projects/linuxolator/src/sys/i386/include/clock.h#2 integrate .. //depot/projects/linuxolator/src/sys/i386/include/elf.h#2 integrate .. //depot/projects/linuxolator/src/sys/i386/isa/clock.c#2 integrate .. //depot/projects/linuxolator/src/sys/i386/isa/pmtimer.c#2 integrate .. //depot/projects/linuxolator/src/sys/ia64/conf/GENERIC#3 integrate .. //depot/projects/linuxolator/src/sys/ia64/ia32/ia32_signal.c#2 integrate .. //depot/projects/linuxolator/src/sys/ia64/ia64/clock.c#2 integrate .. //depot/projects/linuxolator/src/sys/ia64/include/clock.h#2 integrate .. //depot/projects/linuxolator/src/sys/ia64/include/elf.h#2 integrate .. //depot/projects/linuxolator/src/sys/kern/init_sysent.c#4 integrate .. //depot/projects/linuxolator/src/sys/kern/kern_lock.c#2 integrate .. //depot/projects/linuxolator/src/sys/kern/kern_proc.c#5 integrate .. //depot/projects/linuxolator/src/sys/kern/kern_sig.c#2 integrate .. //depot/projects/linuxolator/src/sys/kern/kern_time.c#2 integrate .. //depot/projects/linuxolator/src/sys/kern/kern_umtx.c#3 integrate .. //depot/projects/linuxolator/src/sys/kern/subr_clock.c#2 integrate .. //depot/projects/linuxolator/src/sys/kern/subr_rtc.c#1 branch .. //depot/projects/linuxolator/src/sys/kern/syscalls.c#4 integrate .. //depot/projects/linuxolator/src/sys/kern/syscalls.master#4 integrate .. //depot/projects/linuxolator/src/sys/kern/systrace_args.c#4 integrate .. //depot/projects/linuxolator/src/sys/kern/tty.c#4 integrate .. //depot/projects/linuxolator/src/sys/kern/tty_pty.c#4 integrate .. //depot/projects/linuxolator/src/sys/kern/vfs_bio.c#2 integrate .. //depot/projects/linuxolator/src/sys/kern/vfs_mount.c#4 integrate .. //depot/projects/linuxolator/src/sys/kern/vfs_subr.c#3 integrate .. //depot/projects/linuxolator/src/sys/modules/geom/Makefile#2 integrate .. //depot/projects/linuxolator/src/sys/modules/geom/geom_cache/Makefile#1 branch .. //depot/projects/linuxolator/src/sys/modules/sound/driver/Makefile#2 integrate .. //depot/projects/linuxolator/src/sys/modules/sound/driver/ak452x/Makefile#2 delete .. //depot/projects/linuxolator/src/sys/modules/sound/driver/envy24/Makefile#2 integrate .. //depot/projects/linuxolator/src/sys/modules/sound/driver/envy24ht/Makefile#1 branch .. //depot/projects/linuxolator/src/sys/modules/sound/driver/hda/Makefile#1 branch .. //depot/projects/linuxolator/src/sys/modules/sound/driver/spicds/Makefile#1 branch .. //depot/projects/linuxolator/src/sys/net/bridgestp.c#2 integrate .. //depot/projects/linuxolator/src/sys/netgraph/atm/ccatm/ng_ccatm.c#2 integrate .. //depot/projects/linuxolator/src/sys/netinet/if_ether.c#3 integrate .. //depot/projects/linuxolator/src/sys/netinet/ip_carp.c#3 integrate .. //depot/projects/linuxolator/src/sys/netinet/ip_fw2.c#3 integrate .. //depot/projects/linuxolator/src/sys/netinet/ip_mroute.c#3 integrate .. //depot/projects/linuxolator/src/sys/netinet/ip_mroute.h#2 integrate .. //depot/projects/linuxolator/src/sys/netinet/ip_output.c#4 integrate .. //depot/projects/linuxolator/src/sys/netinet6/in6_ifattach.c#2 integrate .. //depot/projects/linuxolator/src/sys/netinet6/ip6_mroute.h#2 integrate .. //depot/projects/linuxolator/src/sys/netinet6/nd6.c#3 integrate .. //depot/projects/linuxolator/src/sys/nfsclient/nfs_vfsops.c#4 integrate .. //depot/projects/linuxolator/src/sys/pc98/cbus/clock.c#2 integrate .. //depot/projects/linuxolator/src/sys/pc98/conf/GENERIC#3 integrate .. //depot/projects/linuxolator/src/sys/pc98/pc98/machdep.c#2 integrate .. //depot/projects/linuxolator/src/sys/powerpc/conf/GENERIC#3 integrate .. //depot/projects/linuxolator/src/sys/powerpc/include/clock.h#2 integrate .. //depot/projects/linuxolator/src/sys/powerpc/include/elf.h#2 integrate .. //depot/projects/linuxolator/src/sys/powerpc/powerpc/clock.c#2 integrate .. //depot/projects/linuxolator/src/sys/security/audit/audit.c#3 integrate .. //depot/projects/linuxolator/src/sys/security/audit/audit_bsm.c#4 integrate .. //depot/projects/linuxolator/src/sys/security/audit/audit_syscalls.c#3 integrate .. //depot/projects/linuxolator/src/sys/security/mac/mac_framework.h#1 branch .. //depot/projects/linuxolator/src/sys/sparc64/conf/GENERIC#3 integrate .. //depot/projects/linuxolator/src/sys/sparc64/include/clock.h#2 integrate .. //depot/projects/linuxolator/src/sys/sparc64/include/elf.h#2 integrate .. //depot/projects/linuxolator/src/sys/sun4v/compile/.cvsignore#1 branch .. //depot/projects/linuxolator/src/sys/sun4v/conf/DEFAULTS#1 branch .. //depot/projects/linuxolator/src/sys/sun4v/conf/GENERIC#1 branch .. //depot/projects/linuxolator/src/sys/sun4v/conf/GENERIC.hints#1 branch .. //depot/projects/linuxolator/src/sys/sun4v/conf/MAC#1 branch .. //depot/projects/linuxolator/src/sys/sun4v/conf/Makefile#1 branch .. //depot/projects/linuxolator/src/sys/sun4v/conf/NOTES#1 branch .. //depot/projects/linuxolator/src/sys/sun4v/include/_bus.h#1 branch .. //depot/projects/linuxolator/src/sys/sun4v/include/_inttypes.h#1 branch .. //depot/projects/linuxolator/src/sys/sun4v/include/_limits.h#1 branch .. //depot/projects/linuxolator/src/sys/sun4v/include/_stdint.h#1 branch .. //depot/projects/linuxolator/src/sys/sun4v/include/_types.h#1 branch .. //depot/projects/linuxolator/src/sys/sun4v/include/asi.h#1 branch .. //depot/projects/linuxolator/src/sys/sun4v/include/asm.h#1 branch .. //depot/projects/linuxolator/src/sys/sun4v/include/asmacros.h#1 branch .. //depot/projects/linuxolator/src/sys/sun4v/include/atomic.h#1 branch .. //depot/projects/linuxolator/src/sys/sun4v/include/bus.h#1 branch .. //depot/projects/linuxolator/src/sys/sun4v/include/bus_common.h#1 branch .. //depot/projects/linuxolator/src/sys/sun4v/include/bus_dma.h#1 branch .. //depot/projects/linuxolator/src/sys/sun4v/include/bus_private.h#1 branch .. //depot/projects/linuxolator/src/sys/sun4v/include/cache.h#1 branch .. //depot/projects/linuxolator/src/sys/sun4v/include/ccr.h#1 branch .. //depot/projects/linuxolator/src/sys/sun4v/include/cddl/mdesc.h#1 branch .. //depot/projects/linuxolator/src/sys/sun4v/include/cddl/mdesc_impl.h#1 branch .. //depot/projects/linuxolator/src/sys/sun4v/include/clock.h#1 branch .. //depot/projects/linuxolator/src/sys/sun4v/include/cpu.h#1 branch .. //depot/projects/linuxolator/src/sys/sun4v/include/cpufunc.h#1 branch .. //depot/projects/linuxolator/src/sys/sun4v/include/db_machdep.h#1 branch .. //depot/projects/linuxolator/src/sys/sun4v/include/elf.h#1 branch .. //depot/projects/linuxolator/src/sys/sun4v/include/endian.h#1 branch .. //depot/projects/linuxolator/src/sys/sun4v/include/exec.h#1 branch .. //depot/projects/linuxolator/src/sys/sun4v/include/float.h#1 branch .. //depot/projects/linuxolator/src/sys/sun4v/include/floatingpoint.h#1 branch .. //depot/projects/linuxolator/src/sys/sun4v/include/fp.h#1 branch .. //depot/projects/linuxolator/src/sys/sun4v/include/frame.h#1 branch .. //depot/projects/linuxolator/src/sys/sun4v/include/fsr.h#1 branch .. //depot/projects/linuxolator/src/sys/sun4v/include/gdb_machdep.h#1 branch .. //depot/projects/linuxolator/src/sys/sun4v/include/hv_pcivar.h#1 branch .. //depot/projects/linuxolator/src/sys/sun4v/include/hviommu.h#1 branch .. //depot/projects/linuxolator/src/sys/sun4v/include/hypervisor_api.h#1 branch .. //depot/projects/linuxolator/src/sys/sun4v/include/hypervisorvar.h#1 branch .. //depot/projects/linuxolator/src/sys/sun4v/include/idprom.h#1 branch .. //depot/projects/linuxolator/src/sys/sun4v/include/ieee.h#1 branch .. //depot/projects/linuxolator/src/sys/sun4v/include/ieeefp.h#1 branch .. //depot/projects/linuxolator/src/sys/sun4v/include/in_cksum.h#1 branch .. //depot/projects/linuxolator/src/sys/sun4v/include/instr.h#1 branch .. //depot/projects/linuxolator/src/sys/sun4v/include/intr_machdep.h#1 branch .. //depot/projects/linuxolator/src/sys/sun4v/include/iommureg.h#1 branch .. //depot/projects/linuxolator/src/sys/sun4v/include/iommuvar.h#1 branch .. //depot/projects/linuxolator/src/sys/sun4v/include/kdb.h#1 branch .. //depot/projects/linuxolator/src/sys/sun4v/include/kerneldump.h#1 branch .. //depot/projects/linuxolator/src/sys/sun4v/include/ktr.h#1 branch .. //depot/projects/linuxolator/src/sys/sun4v/include/limits.h#1 branch .. //depot/projects/linuxolator/src/sys/sun4v/include/lsu.h#1 branch .. //depot/projects/linuxolator/src/sys/sun4v/include/md_var.h#1 branch .. //depot/projects/linuxolator/src/sys/sun4v/include/mdesc_bus.h#1 branch .. //depot/projects/linuxolator/src/sys/sun4v/include/mdesc_bus_subr.h#1 branch .. //depot/projects/linuxolator/src/sys/sun4v/include/memdev.h#1 branch .. //depot/projects/linuxolator/src/sys/sun4v/include/metadata.h#1 branch .. //depot/projects/linuxolator/src/sys/sun4v/include/mmu.h#1 branch .. //depot/projects/linuxolator/src/sys/sun4v/include/mutex.h#1 branch .. //depot/projects/linuxolator/src/sys/sun4v/include/nexusvar.h#1 branch .. //depot/projects/linuxolator/src/sys/sun4v/include/ofw_bus.h#1 branch .. //depot/projects/linuxolator/src/sys/sun4v/include/ofw_machdep.h#1 branch .. //depot/projects/linuxolator/src/sys/sun4v/include/ofw_mem.h#1 branch .. //depot/projects/linuxolator/src/sys/sun4v/include/ofw_nexus.h#1 branch .. //depot/projects/linuxolator/src/sys/sun4v/include/ofw_upa.h#1 branch .. //depot/projects/linuxolator/src/sys/sun4v/include/param.h#1 branch .. //depot/projects/linuxolator/src/sys/sun4v/include/pcb.h#1 branch .. //depot/projects/linuxolator/src/sys/sun4v/include/pcpu.h#1 branch .. //depot/projects/linuxolator/src/sys/sun4v/include/pmap.h#1 branch .. //depot/projects/linuxolator/src/sys/sun4v/include/pmc_mdep.h#1 branch .. //depot/projects/linuxolator/src/sys/sun4v/include/proc.h#1 branch .. //depot/projects/linuxolator/src/sys/sun4v/include/profile.h#1 branch .. //depot/projects/linuxolator/src/sys/sun4v/include/pstate.h#1 branch .. //depot/projects/linuxolator/src/sys/sun4v/include/ptrace.h#1 branch .. //depot/projects/linuxolator/src/sys/sun4v/include/reg.h#1 branch .. //depot/projects/linuxolator/src/sys/sun4v/include/reloc.h#1 branch .. //depot/projects/linuxolator/src/sys/sun4v/include/resource.h#1 branch .. //depot/projects/linuxolator/src/sys/sun4v/include/runq.h#1 branch .. //depot/projects/linuxolator/src/sys/sun4v/include/sc_machdep.h#1 branch .. //depot/projects/linuxolator/src/sys/sun4v/include/setjmp.h#1 branch .. //depot/projects/linuxolator/src/sys/sun4v/include/sf_buf.h#1 branch .. //depot/projects/linuxolator/src/sys/sun4v/include/sigframe.h#1 branch .. //depot/projects/linuxolator/src/sys/sun4v/include/signal.h#1 branch .. //depot/projects/linuxolator/src/sys/sun4v/include/smp.h#1 branch .. //depot/projects/linuxolator/src/sys/sun4v/include/stdarg.h#1 branch .. //depot/projects/linuxolator/src/sys/sun4v/include/sun4v_cpufunc.h#1 branch .. //depot/projects/linuxolator/src/sys/sun4v/include/sysarch.h#1 branch .. //depot/projects/linuxolator/src/sys/sun4v/include/tick.h#1 branch .. //depot/projects/linuxolator/src/sys/sun4v/include/tlb.h#1 branch .. //depot/projects/linuxolator/src/sys/sun4v/include/trap.h#1 branch .. //depot/projects/linuxolator/src/sys/sun4v/include/tsb.h#1 branch .. //depot/projects/linuxolator/src/sys/sun4v/include/tstate.h#1 branch .. //depot/projects/linuxolator/src/sys/sun4v/include/tte.h#1 branch .. //depot/projects/linuxolator/src/sys/sun4v/include/tte_hash.h#1 branch .. //depot/projects/linuxolator/src/sys/sun4v/include/ucontext.h#1 branch .. //depot/projects/linuxolator/src/sys/sun4v/include/upa.h#1 branch .. //depot/projects/linuxolator/src/sys/sun4v/include/utrap.h#1 branch .. //depot/projects/linuxolator/src/sys/sun4v/include/varargs.h#1 branch .. //depot/projects/linuxolator/src/sys/sun4v/include/ver.h#1 branch .. //depot/projects/linuxolator/src/sys/sun4v/include/vmparam.h#1 branch .. //depot/projects/linuxolator/src/sys/sun4v/include/watch.h#1 branch .. //depot/projects/linuxolator/src/sys/sun4v/include/wstate.h#1 branch .. //depot/projects/linuxolator/src/sys/sun4v/mdesc/mdesc_bus_if.m#1 branch .. //depot/projects/linuxolator/src/sys/sun4v/mdesc/mdesc_bus_subr.c#1 branch .. //depot/projects/linuxolator/src/sys/sun4v/mdesc/mdesc_diff.c#1 branch .. //depot/projects/linuxolator/src/sys/sun4v/mdesc/mdesc_findname.c#1 branch .. //depot/projects/linuxolator/src/sys/sun4v/mdesc/mdesc_findnodeprop.c#1 branch .. //depot/projects/linuxolator/src/sys/sun4v/mdesc/mdesc_fini.c#1 branch .. //depot/projects/linuxolator/src/sys/sun4v/mdesc/mdesc_getbinsize.c#1 branch .. //depot/projects/linuxolator/src/sys/sun4v/mdesc/mdesc_getgen.c#1 branch .. //depot/projects/linuxolator/src/sys/sun4v/mdesc/mdesc_getpropdata.c#1 branch .. //depot/projects/linuxolator/src/sys/sun4v/mdesc/mdesc_getpropstr.c#1 branch .. //depot/projects/linuxolator/src/sys/sun4v/mdesc/mdesc_getpropval.c#1 branch .. //depot/projects/linuxolator/src/sys/sun4v/mdesc/mdesc_init.c#1 branch .. //depot/projects/linuxolator/src/sys/sun4v/mdesc/mdesc_init_intern.c#1 branch .. //depot/projects/linuxolator/src/sys/sun4v/mdesc/mdesc_nodecount.c#1 branch .. //depot/projects/linuxolator/src/sys/sun4v/mdesc/mdesc_rootnode.c#1 branch .. //depot/projects/linuxolator/src/sys/sun4v/mdesc/mdesc_scandag.c#1 branch .. //depot/projects/linuxolator/src/sys/sun4v/mdesc/mdesc_subr.c#1 branch .. //depot/projects/linuxolator/src/sys/sun4v/mdesc/mdesc_vdevfindval.c#1 branch .. //depot/projects/linuxolator/src/sys/sun4v/sun4v/autoconf.c#1 branch .. //depot/projects/linuxolator/src/sys/sun4v/sun4v/bus_machdep.c#1 branch .. //depot/projects/linuxolator/src/sys/sun4v/sun4v/clock.c#1 branch .. //depot/projects/linuxolator/src/sys/sun4v/sun4v/counter.c#1 branch .. //depot/projects/linuxolator/src/sys/sun4v/sun4v/db_disasm.c#1 branch .. //depot/projects/linuxolator/src/sys/sun4v/sun4v/db_hwwatch.c#1 branch .. //depot/projects/linuxolator/src/sys/sun4v/sun4v/db_interface.c#1 branch .. //depot/projects/linuxolator/src/sys/sun4v/sun4v/db_trace.c#1 branch .. //depot/projects/linuxolator/src/sys/sun4v/sun4v/dump_machdep.c#1 branch .. //depot/projects/linuxolator/src/sys/sun4v/sun4v/eeprom.c#1 branch .. //depot/projects/linuxolator/src/sys/sun4v/sun4v/elf_machdep.c#1 branch .. //depot/projects/linuxolator/src/sys/sun4v/sun4v/exception.S#1 branch .. //depot/projects/linuxolator/src/sys/sun4v/sun4v/fpemu.c#1 branch .. //depot/projects/linuxolator/src/sys/sun4v/sun4v/gdb_machdep.c#1 branch .. //depot/projects/linuxolator/src/sys/sun4v/sun4v/genassym.c#1 branch .. //depot/projects/linuxolator/src/sys/sun4v/sun4v/hcall.S#1 branch .. //depot/projects/linuxolator/src/sys/sun4v/sun4v/hv_pci.c#1 branch .. //depot/projects/linuxolator/src/sys/sun4v/sun4v/hvcons.c#1 branch .. //depot/projects/linuxolator/src/sys/sun4v/sun4v/hviommu.c#1 branch .. //depot/projects/linuxolator/src/sys/sun4v/sun4v/identcpu.c#1 branch .. //depot/projects/linuxolator/src/sys/sun4v/sun4v/in_cksum.c#1 branch .. //depot/projects/linuxolator/src/sys/sun4v/sun4v/interrupt.S#1 branch .. //depot/projects/linuxolator/src/sys/sun4v/sun4v/intr_machdep.c#1 branch .. //depot/projects/linuxolator/src/sys/sun4v/sun4v/iommu.c#1 branch .. //depot/projects/linuxolator/src/sys/sun4v/sun4v/locore.S#1 branch .. //depot/projects/linuxolator/src/sys/sun4v/sun4v/machdep.c#1 branch .. //depot/projects/linuxolator/src/sys/sun4v/sun4v/mem.c#1 branch .. //depot/projects/linuxolator/src/sys/sun4v/sun4v/mp_exception.S#1 branch .. //depot/projects/linuxolator/src/sys/sun4v/sun4v/mp_locore.S#1 branch .. //depot/projects/linuxolator/src/sys/sun4v/sun4v/mp_machdep.c#1 branch .. //depot/projects/linuxolator/src/sys/sun4v/sun4v/nexus.c#1 branch .. //depot/projects/linuxolator/src/sys/sun4v/sun4v/ofw_bus.c#1 branch .. //depot/projects/linuxolator/src/sys/sun4v/sun4v/ofw_machdep.c#1 branch .. //depot/projects/linuxolator/src/sys/sun4v/sun4v/pmap.c#1 branch .. //depot/projects/linuxolator/src/sys/sun4v/sun4v/prof_machdep.c#1 branch .. //depot/projects/linuxolator/src/sys/sun4v/sun4v/rtc.c#1 branch .. //depot/projects/linuxolator/src/sys/sun4v/sun4v/rwindow.c#1 branch .. //depot/projects/linuxolator/src/sys/sun4v/sun4v/simdisk.c#1 branch .. //depot/projects/linuxolator/src/sys/sun4v/sun4v/support.S#1 branch .. //depot/projects/linuxolator/src/sys/sun4v/sun4v/swtch.S#1 branch .. //depot/projects/linuxolator/src/sys/sun4v/sun4v/sys_machdep.c#1 branch .. //depot/projects/linuxolator/src/sys/sun4v/sun4v/t1_copy.S#1 branch .. //depot/projects/linuxolator/src/sys/sun4v/sun4v/tick.c#1 branch .. //depot/projects/linuxolator/src/sys/sun4v/sun4v/tlb.c#1 branch .. //depot/projects/linuxolator/src/sys/sun4v/sun4v/trap.c#1 branch .. //depot/projects/linuxolator/src/sys/sun4v/sun4v/trap_trace.S#1 branch .. //depot/projects/linuxolator/src/sys/sun4v/sun4v/tsb.c#1 branch .. //depot/projects/linuxolator/src/sys/sun4v/sun4v/tte.c#1 branch .. //depot/projects/linuxolator/src/sys/sun4v/sun4v/tte_hash.c#1 branch .. //depot/projects/linuxolator/src/sys/sun4v/sun4v/uio_machdep.c#1 branch .. //depot/projects/linuxolator/src/sys/sun4v/sun4v/vm_machdep.c#1 branch .. //depot/projects/linuxolator/src/sys/sun4v/sun4v/vnex.c#1 branch .. //depot/projects/linuxolator/src/sys/sun4v/sun4v/wbuf.S#1 branch .. //depot/projects/linuxolator/src/sys/sys/_elf_solaris.h#1 branch .. //depot/projects/linuxolator/src/sys/sys/buf.h#2 integrate .. //depot/projects/linuxolator/src/sys/sys/clock.h#2 integrate .. //depot/projects/linuxolator/src/sys/sys/elf.h#1 branch .. //depot/projects/linuxolator/src/sys/sys/elf32.h#2 integrate .. //depot/projects/linuxolator/src/sys/sys/elf64.h#2 integrate .. //depot/projects/linuxolator/src/sys/sys/elf_common.h#2 integrate .. //depot/projects/linuxolator/src/sys/sys/kernel.h#2 integrate .. //depot/projects/linuxolator/src/sys/sys/lockmgr.h#2 integrate .. //depot/projects/linuxolator/src/sys/sys/mount.h#4 integrate .. //depot/projects/linuxolator/src/sys/sys/param.h#4 integrate .. //depot/projects/linuxolator/src/sys/sys/proc.h#3 integrate .. //depot/projects/linuxolator/src/sys/sys/signalvar.h#2 integrate .. //depot/projects/linuxolator/src/sys/sys/syscall.h#4 integrate .. //depot/projects/linuxolator/src/sys/sys/syscall.mk#4 integrate .. //depot/projects/linuxolator/src/sys/sys/sysproto.h#4 integrate .. //depot/projects/linuxolator/src/sys/sys/systm.h#2 integrate .. //depot/projects/linuxolator/src/sys/sys/time.h#2 integrate .. //depot/projects/linuxolator/src/sys/ufs/ufs/ufs_vnops.c#2 integrate Differences ... ==== //depot/projects/linuxolator/src/sys/amd64/amd64/machdep.c#2 (text+ko) ==== @@ -39,7 +39,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/amd64/amd64/machdep.c,v 1.652 2006/09/07 15:03:02 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/machdep.c,v 1.654 2006/10/02 15:42:01 phk Exp $"); #include "opt_atalk.h" #include "opt_atpic.h" @@ -61,6 +61,7 @@ #include <sys/buf.h> #include <sys/bus.h> #include <sys/callout.h> +#include <sys/clock.h> #include <sys/cons.h> #include <sys/cpu.h> #include <sys/eventhandler.h> @@ -630,26 +631,6 @@ load_cr0(cr0); } -static int -sysctl_machdep_adjkerntz(SYSCTL_HANDLER_ARGS) -{ - int error; - error = sysctl_handle_int(oidp, oidp->oid_arg1, oidp->oid_arg2, - req); - if (!error && req->newptr) - resettodr(); - return (error); -} - -SYSCTL_PROC(_machdep, OID_AUTO, adjkerntz, CTLTYPE_INT|CTLFLAG_RW, - &adjkerntz, 0, sysctl_machdep_adjkerntz, "I", ""); - -SYSCTL_INT(_machdep, OID_AUTO, disable_rtc_set, - CTLFLAG_RW, &disable_rtc_set, 0, ""); - -SYSCTL_INT(_machdep, OID_AUTO, wall_cmos_clock, - CTLFLAG_RW, &wall_cmos_clock, 0, ""); - /* * Initialize amd64 and configure to run kernel */ ==== //depot/projects/linuxolator/src/sys/amd64/conf/GENERIC#3 (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.465 2006/09/26 12:36:33 ru Exp $ +# $FreeBSD: src/sys/amd64/conf/GENERIC,v 1.466 2006/10/05 20:31:57 simon Exp $ cpu HAMMER ident GENERIC @@ -26,7 +26,6 @@ makeoptions DEBUG=-g # Build kernel with gdb(1) debug symbols -#options SCHED_ULE # ULE scheduler options SCHED_4BSD # 4BSD scheduler options PREEMPTION # Enable kernel thread preemption options INET # InterNETworking ==== //depot/projects/linuxolator/src/sys/amd64/ia32/ia32_signal.c#2 (text+ko) ==== @@ -32,7 +32,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/amd64/ia32/ia32_signal.c,v 1.14 2005/12/06 23:06:29 peter Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/ia32/ia32_signal.c,v 1.15 2006/10/05 01:56:10 davidxu Exp $"); #include "opt_compat.h" @@ -67,6 +67,7 @@ #include <vm/vm_object.h> #include <vm/vm_extern.h> +#include <compat/freebsd32/freebsd32_signal.h> #include <compat/freebsd32/freebsd32_util.h> #include <compat/freebsd32/freebsd32_proto.h> #include <compat/ia32/ia32_signal.h> @@ -298,7 +299,7 @@ freebsd4_ia32_sendsig(sig_t catcher, ksiginfo_t *ksi, sigset_t *mask) { struct ia32_sigframe4 sf, *sfp; - struct ia32_siginfo siginfo; + struct siginfo32 siginfo; struct proc *p; struct thread *td; struct sigacts *psp; @@ -308,7 +309,7 @@ td = curthread; p = td->td_proc; - siginfo_to_ia32siginfo(&ksi->ksi_info, &siginfo); + siginfo_to_siginfo32(&ksi->ksi_info, &siginfo); PROC_LOCK_ASSERT(p, MA_OWNED); sig = siginfo.si_signo; @@ -407,7 +408,7 @@ ia32_sendsig(sig_t catcher, ksiginfo_t *ksi, sigset_t *mask) { struct ia32_sigframe sf, *sfp; - struct ia32_siginfo siginfo; + struct siginfo32 siginfo; struct proc *p; struct thread *td; struct sigacts *psp; @@ -416,7 +417,7 @@ int oonstack; int sig; - siginfo_to_ia32siginfo(&ksi->ksi_info, &siginfo); + siginfo_to_siginfo32(&ksi->ksi_info, &siginfo); td = curthread; p = td->td_proc; PROC_LOCK_ASSERT(p, MA_OWNED); @@ -741,20 +742,3 @@ pcb->pcb_flags |= PCB_FULLCTX; td->td_retval[1] = 0; } - -void -siginfo_to_ia32siginfo(siginfo_t *src, struct ia32_siginfo *dst) -{ - dst->si_signo = src->si_signo; - dst->si_errno = src->si_errno; - dst->si_code = src->si_code; - dst->si_pid = src->si_pid; - dst->si_uid = src->si_uid; - dst->si_status = src->si_status; - dst->si_addr = dst->si_addr; - dst->si_value.sigval_int = src->si_value.sival_int; - dst->si_band = src->si_band; - dst->si_trapno = src->si_trapno; - dst->si_timerid = src->si_timerid; - dst->si_overrun = src->si_overrun; -} ==== //depot/projects/linuxolator/src/sys/amd64/include/clock.h#2 (text+ko) ==== @@ -3,7 +3,7 @@ * Garrett Wollman, September 1994. * This file is in the public domain. * - * $FreeBSD: src/sys/amd64/include/clock.h,v 1.52 2006/05/19 18:53:50 sobomax Exp $ + * $FreeBSD: src/sys/amd64/include/clock.h,v 1.53 2006/10/02 12:59:55 phk Exp $ */ #ifndef _MACHINE_CLOCK_H_ @@ -14,9 +14,7 @@ * i386 to clock driver interface. * XXX large parts of the driver and its interface are misplaced. */ -extern int adjkerntz; extern int clkintr_pending; -extern int disable_rtc_set; extern int pscnt; extern int psdiv; extern int statclock_disable; @@ -24,7 +22,6 @@ extern int timer0_max_count; extern uint64_t tsc_freq; extern int tsc_is_broken; -extern int wall_cmos_clock; extern struct mtx clock_lock; /* ==== //depot/projects/linuxolator/src/sys/amd64/include/elf.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/amd64/include/elf.h,v 1.18 2004/08/03 08:21:48 dfr Exp $ + * $FreeBSD: src/sys/amd64/include/elf.h,v 1.19 2006/10/04 21:37:09 jb Exp $ */ #ifndef _MACHINE_ELF_H_ @@ -108,31 +108,6 @@ * Relocation types. */ -#define R_X86_64_NONE 0 /* No relocation. */ -#define R_X86_64_64 1 /* Add 64 bit symbol value. */ -#define R_X86_64_PC32 2 /* PC-relative 32 bit signed sym value. */ -#define R_X86_64_GOT32 3 /* PC-relative 32 bit GOT offset. */ -#define R_X86_64_PLT32 4 /* PC-relative 32 bit PLT offset. */ -#define R_X86_64_COPY 5 /* Copy data from shared object. */ -#define R_X86_64_GLOB_DAT 6 /* Set GOT entry to data address. */ -#define R_X86_64_JMP_SLOT 7 /* Set GOT entry to code address. */ -#define R_X86_64_RELATIVE 8 /* Add load address of shared object. */ -#define R_X86_64_GOTPCREL 9 /* Add 32 bit signed pcrel offset to GOT. */ -#define R_X86_64_32 10 /* Add 32 bit zero extended symbol value */ -#define R_X86_64_32S 11 /* Add 32 bit sign extended symbol value */ -#define R_X86_64_16 12 /* Add 16 bit zero extended symbol value */ -#define R_X86_64_PC16 13 /* Add 16 bit signed extended pc relative symbol value */ -#define R_X86_64_8 14 /* Add 8 bit zero extended symbol value */ -#define R_X86_64_PC8 15 /* Add 8 bit signed extended pc relative symbol value */ -#define R_X86_64_DTPMOD64 16 /* ID of module containing symbol */ -#define R_X86_64_DTPOFF64 17 /* Offset in TLS block */ -#define R_X86_64_TPOFF64 18 /* Offset in static TLS block */ -#define R_X86_64_TLSGD 19 /* PC relative offset to GD GOT entry */ -#define R_X86_64_TLSLD 20 /* PC relative offset to LD GOT entry */ -#define R_X86_64_DTPOFF32 21 /* Offset in TLS block */ -#define R_X86_64_GOTTPOFF 22 /* PC relative offset to IE GOT entry */ -#define R_X86_64_TPOFF32 23 /* Offset in static TLS block */ - #define R_X86_64_COUNT 24 /* Count of defined relocation types. */ /* Define "machine" characteristics */ ==== //depot/projects/linuxolator/src/sys/amd64/isa/clock.c#2 (text+ko) ==== @@ -33,7 +33,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/amd64/isa/clock.c,v 1.224 2005/12/22 22:16:05 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/isa/clock.c,v 1.227 2006/10/02 18:23:36 phk Exp $"); /* * Routines to handle clock hardware. @@ -52,6 +52,7 @@ #include <sys/param.h> #include <sys/systm.h> #include <sys/bus.h> +#include <sys/clock.h> #include <sys/lock.h> #include <sys/kdb.h> #include <sys/mutex.h> @@ -92,9 +93,7 @@ #define TIMER_DIV(x) ((timer_freq + (x) / 2) / (x)) -int adjkerntz; /* local offset from GMT in seconds */ int clkintr_pending; -int disable_rtc_set; /* disable resettodr() if != 0 */ int pscnt = 1; int psdiv = 1; int statclock_disable; @@ -104,7 +103,6 @@ u_int timer_freq = TIMER_FREQ; int timer0_max_count; int timer0_real_max_count; -int wall_cmos_clock; /* wall CMOS clock assumed if != 0 */ struct mtx clock_lock; #define RTC_LOCK mtx_lock_spin(&clock_lock) #define RTC_UNLOCK mtx_unlock_spin(&clock_lock) @@ -664,7 +662,7 @@ /* sec now contains the number of seconds, since Jan 1 1970, in the local time zone */ - sec += tz_minuteswest * 60 + (wall_cmos_clock ? adjkerntz : 0); + sec += utc_offset(); y = time_second - sec; if (y <= -2 || y >= 2) { @@ -702,7 +700,7 @@ /* Calculate local time to put in RTC */ - tm -= tz_minuteswest * 60 + (wall_cmos_clock ? adjkerntz : 0); + tm -= utc_offset(); writertc(RTC_SEC, bin2bcd(tm%60)); tm /= 60; /* Write back Seconds */ writertc(RTC_MIN, bin2bcd(tm%60)); tm /= 60; /* Write back Minutes */ ==== //depot/projects/linuxolator/src/sys/amd64/linux32/linux32_machdep.c#9 (text+ko) ==== @@ -29,11 +29,12 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/amd64/linux32/linux32_machdep.c,v 1.17 2006/08/28 13:09:24 netchild Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/linux32/linux32_machdep.c,v 1.18 2006/10/02 12:59:55 phk Exp $"); #include <sys/param.h> #include <sys/kernel.h> #include <sys/systm.h> +#include <sys/clock.h> #include <sys/imgact.h> #include <sys/limits.h> #include <sys/lock.h> ==== //depot/projects/linuxolator/src/sys/arm/include/clock.h#2 (text+ko) ==== @@ -23,13 +23,10 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/arm/include/clock.h,v 1.2 2005/07/27 21:19:28 imp Exp $ + * $FreeBSD: src/sys/arm/include/clock.h,v 1.3 2006/10/02 12:59:55 phk Exp $ */ #ifndef _MACHINE_CLOCK_H_ #define _MACHINE_CLOCK_H_ -#define wall_cmos_clock 0 -#define adjkerntz 0 - #endif /* !_MACHINE_CLOCK_H_ */ ==== //depot/projects/linuxolator/src/sys/arm/include/elf.h#2 (text+ko) ==== @@ -24,7 +24,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/arm/include/elf.h,v 1.7 2006/08/24 23:00:03 cognet Exp $ + * $FreeBSD: src/sys/arm/include/elf.h,v 1.8 2006/10/04 21:37:09 jb Exp $ */ #ifndef _MACHINE_ELF_H_ @@ -82,40 +82,6 @@ #define AT_COUNT 15 /* Count of defined aux entry types. */ -#define R_ARM_NONE 0 /* No relocation. */ -#define R_ARM_PC24 1 -#define R_ARM_ABS32 2 -#define R_ARM_REL32 3 -#define R_ARM_PC13 4 -#define R_ARM_ABS16 5 -#define R_ARM_ABS12 6 -#define R_ARM_THM_ABS5 7 -#define R_ARM_ABS8 8 -#define R_ARM_SBREL32 9 -#define R_ARM_THM_PC22 10 -#define R_ARM_THM_PC8 11 -#define R_ARM_AMP_VCALL9 12 -#define R_ARM_SWI24 13 -#define R_ARM_THM_SWI8 14 -#define R_ARM_XPC25 15 -#define R_ARM_THM_XPC22 16 -#define R_ARM_COPY 20 /* Copy data from shared object. */ -#define R_ARM_GLOB_DAT 21 /* Set GOT entry to data address. */ -#define R_ARM_JUMP_SLOT 22 /* Set GOT entry to code address. */ -#define R_ARM_RELATIVE 23 /* Add load address of shared object. */ -#define R_ARM_GOTOFF 24 /* Add GOT-relative symbol address. */ -#define R_ARM_GOTPC 25 /* Add PC-relative GOT table address. */ -#define R_ARM_GOT32 26 /* Add PC-relative GOT offset. */ -#define R_ARM_PLT32 27 /* Add PC-relative PLT offset. */ -#define R_ARM_GNU_VTENTRY 100 -#define R_ARM_GNU_VTINHERIT 101 -#define R_ARM_RSBREL32 250 -#define R_ARM_THM_RPC22 251 -#define R_ARM_RREL32 252 -#define R_ARM_RABS32 253 -#define R_ARM_RPC24 254 -#define R_ARM_RBASE 255 - #define R_ARM_COUNT 33 /* Count of defined relocation types. */ ==== //depot/projects/linuxolator/src/sys/boot/common/panic.c#2 (text+ko) ==== @@ -34,11 +34,13 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/boot/common/panic.c,v 1.7 2003/08/25 23:30:41 obrien Exp $"); +__FBSDID("$FreeBSD: src/sys/boot/common/panic.c,v 1.8 2006/09/29 20:57:38 ru Exp $"); #include <stand.h> #include <machine/stdarg.h> +extern void exit(int) __dead2; + void panic(const char *fmt,...) { ==== //depot/projects/linuxolator/src/sys/boot/forth/loader.conf#2 (text+ko) ==== @@ -6,7 +6,7 @@ # # All arguments must be in double quotes. # -# $FreeBSD: src/sys/boot/forth/loader.conf,v 1.111 2006/08/18 19:03:28 brueffer Exp $ +# $FreeBSD: src/sys/boot/forth/loader.conf,v 1.113 2006/10/01 14:58:30 ariff Exp $ ############################################################## ### Basic configuration options ############################ @@ -309,7 +309,6 @@ sound_load="NO" # Digital sound subsystem snd_ad1816_load="NO" # ad1816 -snd_ak452x_load="NO" # ak452x snd_als4000_load="NO" # als4000 snd_atiixp_load="NO" # atiixp snd_cmi_load="NO" # cmi @@ -319,9 +318,11 @@ snd_emu10k1_load="NO" # Creative Sound Blaster Live snd_emu10kx_load="NO" # Creative SoundBlaster Live! and Audigy snd_envy24_load="NO" # VIA Envy24 +snd_envy24ht_load="NO" # VIA Envy24HT snd_es137x_load="NO" # es137x snd_ess_load="NO" # ess snd_fm801_load="NO" # fm801 +snd_hda_load="NO" # Intel High Definition Audio (Controller) snd_ich_load="NO" # Intel ICH snd_maestro_load="NO" # Maestro snd_maestro3_load="NO" # Maestro3 @@ -331,6 +332,7 @@ snd_sb8_load="NO" # Sound Blaster Pro snd_sbc_load="NO" # Sbc snd_solo_load="NO" # Solo +snd_spicds_load="NO" # SPI codecs snd_t4dwave_load="NO" # t4dwave snd_via8233_load="NO" # via8233 snd_via82c686_load="NO" # via82c686 ==== //depot/projects/linuxolator/src/sys/boot/i386/btx/btx/btx.S#3 (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.42 2006/09/28 19:42:10 jhb Exp $ + * $FreeBSD: src/sys/boot/i386/btx/btx/btx.S,v 1.43 2006/10/05 15:30:51 jhb Exp $ */ /* @@ -443,12 +443,12 @@ movb $0x4,%cl # Update seg regs rep # in INT_V86 movsl # args -intrtn.2: movl %edx,%esi # Segment registers +intrtn.2: xchgl %edx,%esi # Segment registers leal 0x28(%ebp),%edi # Set up seg movb $0x4,%cl # regs for rep # later movsl # pop - movl %ebx,%esi # Restore exception + xchgl %ebx,%esi # Restore exception movb $0x5,%cl # frame to rep # supervisor movsl # stack @@ -620,9 +620,10 @@ */ int15_87: pushl %esi # Save pushl %edi # registers + movl 0x3C(%ebp),%edi # Load ES movzwl 0x4(%ebp),%eax # Load user's SI - movl 0x3C(%ebp),%edi # Load ES - leal (%eax,%edi,4),%edi # EDI = (ES << 4) + SI + shll $0x4,%edi # EDI = (ES << 4) + + addl %eax,%edi # SI movl 0x11(%edi),%eax # Read base of movb 0x17(%edi),%al # GDT entry ror $8,%eax # for source @@ -898,7 +899,8 @@ dump.3: lodsl # Set offset xchgl %eax,%edx # Save lodsl # Get segment - leal (%edx,%eax,4),%eax # * 0x10 + offset + shll $0x4,%eax # * 0x10 + addl %edx,%eax # + offset xchgl %eax,%esi # Set pointer dump.4: movb $2,%dl # Num lines dump.4a: movb $0x10,%cl # Bytes to dump ==== //depot/projects/linuxolator/src/sys/boot/i386/libi386/biospci.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/boot/i386/libi386/biospci.c,v 1.5 2004/10/22 14:56:23 simokawa Exp $"); +__FBSDID("$FreeBSD: src/sys/boot/i386/libi386/biospci.c,v 1.6 2006/09/29 20:27:41 ru Exp $"); /* * PnP enumerator using the PCI BIOS. @@ -36,6 +36,7 @@ #include <bootstrap.h> #include <isapnp.h> #include <btxv86.h> +#include "libi386.h" /* * Stupid PCI BIOS interface doesn't let you simply enumerate everything ==== //depot/projects/linuxolator/src/sys/boot/i386/libi386/biossmap.c#3 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/boot/i386/libi386/biossmap.c,v 1.5 2006/09/28 19:07:13 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/boot/i386/libi386/biossmap.c,v 1.6 2006/09/29 20:07:16 jhb Exp $"); /* * Obtain memory configuration information from the BIOS @@ -115,8 +115,9 @@ int i; if (smapbase == 0 || smaplen == 0) - return; + return (CMD_ERROR); for (i = 0; i < smaplen; i++) printf("SMAP type=%02x base=%016llx len=%016llx\n", smapbase[i].type, smapbase[i].base, smapbase[i].length); + return (CMD_OK); } ==== //depot/projects/linuxolator/src/sys/boot/i386/libi386/bootinfo64.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/boot/i386/libi386/bootinfo64.c,v 1.36 2003/08/25 23:28:31 obrien Exp $"); +__FBSDID("$FreeBSD: src/sys/boot/i386/libi386/bootinfo64.c,v 1.37 2006/09/29 20:27:41 ru Exp $"); #include <stand.h> #include <sys/param.h> @@ -143,9 +143,7 @@ u_int64_t envp; vm_offset_t size; char *rootdevname; - int i, howto; - char *kernelname; - const char *kernelpath; + int howto; howto = bi_getboothowto(args); ==== //depot/projects/linuxolator/src/sys/boot/i386/libi386/elf64_freebsd.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/boot/i386/libi386/elf64_freebsd.c,v 1.15 2004/08/29 00:48:41 iedowse Exp $"); +__FBSDID("$FreeBSD: src/sys/boot/i386/libi386/elf64_freebsd.c,v 1.16 2006/09/29 20:27:41 ru Exp $"); #define __ELF_WORD_SIZE 64 #include <sys/param.h> @@ -61,7 +61,7 @@ u_int32_t entry_hi; u_int32_t entry_lo; -extern amd64_tramp(); +extern void amd64_tramp(); /* * There is an a.out kernel and one or more a.out modules loaded. ==== //depot/projects/linuxolator/src/sys/boot/i386/libi386/libi386.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/boot/i386/libi386/libi386.h,v 1.25 2006/04/11 20:11:30 jhb Exp $ + * $FreeBSD: src/sys/boot/i386/libi386/libi386.h,v 1.26 2006/09/29 20:27:41 ru Exp $ */ @@ -96,8 +96,8 @@ /* when heap is at the top of extended memory */ /* for other cases - just the same as memtop */ -int biospci_find_devclass(uint32_t class, int index); -int biospci_write_config(uint32_t locator, int offset, int width, int val); +int biospci_find_devclass(uint32_t class, int index, uint32_t *locator); +int biospci_write_config(uint32_t locator, int offset, int width, uint32_t val); int biospci_read_config(uint32_t locator, int offset, int width, uint32_t *val); void biosacpi_detect(void); ==== //depot/projects/linuxolator/src/sys/cam/cam_periph.c#2 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/cam/cam_periph.c,v 1.62 2006/05/24 15:22:21 mjacob Exp $"); +__FBSDID("$FreeBSD: src/sys/cam/cam_periph.c,v 1.63 2006/10/01 20:23:50 mjacob Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -86,6 +86,14 @@ MALLOC_DEFINE(M_CAMPERIPH, "CAM periph", "CAM peripheral buffers"); +static int periph_selto_delay = 1000; +TUNABLE_INT("kern.cam.periph_selto_delay", &periph_selto_delay); +static int periph_noresrc_delay = 500; +TUNABLE_INT("kern.cam.periph_noresrc_delay", &periph_noresrc_delay); +static int periph_busy_delay = 500; +TUNABLE_INT("kern.cam.periph_busy_delay", &periph_busy_delay); + + void periphdriver_register(void *data) { @@ -1544,7 +1552,7 @@ int error, printed = 0; int openings; u_int32_t relsim_flags; - u_int32_t timeout; + u_int32_t timeout = 0; action_string = NULL; status = ccb->ccb_h.status; @@ -1636,11 +1644,11 @@ } /* - * Wait a second to give the device + * Wait a bit to give the device * time to recover before we try again. */ relsim_flags = RELSIM_RELEASE_AFTER_TIMEOUT; - timeout = 1000; + timeout = periph_selto_delay; break; } } @@ -1699,8 +1707,16 @@ } break; case CAM_RESRC_UNAVAIL: + /* Wait a bit for the resource shortage to abate. */ + timeout = periph_noresrc_delay; + /* FALLTHROUGH */ case CAM_BUSY: - /* timeout??? */ + if (timeout == 0) { + /* Wait a bit for the busy condition to abate. */ + timeout = periph_busy_delay; + } + relsim_flags = RELSIM_RELEASE_AFTER_TIMEOUT; + /* FALLTHROUGH */ default: /* decrement the number of retries */ if (ccb->ccb_h.retry_count > 0) { ==== //depot/projects/linuxolator/src/sys/compat/freebsd32/freebsd32_misc.c#3 (text+ko) ==== @@ -25,13 +25,14 @@ */ >>> TRUNCATED FOR MAIL (1000 lines) <<<
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200610071032.k97AWAL8060783>