PERFORCE change 107413 for review
Alex Lyashkov
als at FreeBSD.org
Sat Oct 7 04:55:05 PDT 2006
http://perforce.freebsd.org/chv.cgi?CH=107413
Change 107413 by als at als_head on 2006/10/07 11:54:37
update to HEAD
Affected files ...
.. //depot/projects/jail2/sys/amd64/amd64/local_apic.c#4 integrate
.. //depot/projects/jail2/sys/amd64/amd64/machdep.c#5 integrate
.. //depot/projects/jail2/sys/amd64/conf/GENERIC#4 integrate
.. //depot/projects/jail2/sys/amd64/ia32/ia32_signal.c#2 integrate
.. //depot/projects/jail2/sys/amd64/include/clock.h#2 integrate
.. //depot/projects/jail2/sys/amd64/include/elf.h#2 integrate
.. //depot/projects/jail2/sys/amd64/isa/clock.c#2 integrate
.. //depot/projects/jail2/sys/amd64/linux32/linux32_machdep.c#5 integrate
.. //depot/projects/jail2/sys/arm/include/clock.h#2 integrate
.. //depot/projects/jail2/sys/arm/include/elf.h#3 integrate
.. //depot/projects/jail2/sys/boot/common/merge_help.awk#2 integrate
.. //depot/projects/jail2/sys/boot/common/panic.c#2 integrate
.. //depot/projects/jail2/sys/boot/ficl/Makefile#2 integrate
.. //depot/projects/jail2/sys/boot/forth/loader.conf#3 integrate
.. //depot/projects/jail2/sys/boot/i386/Makefile.inc#2 integrate
.. //depot/projects/jail2/sys/boot/i386/btx/btx/btx.S#2 integrate
.. //depot/projects/jail2/sys/boot/i386/libi386/biospci.c#2 integrate
.. //depot/projects/jail2/sys/boot/i386/libi386/biossmap.c#2 integrate
.. //depot/projects/jail2/sys/boot/i386/libi386/bootinfo64.c#2 integrate
.. //depot/projects/jail2/sys/boot/i386/libi386/elf64_freebsd.c#2 integrate
.. //depot/projects/jail2/sys/boot/i386/libi386/libi386.h#2 integrate
.. //depot/projects/jail2/sys/boot/i386/loader/help.i386#2 integrate
.. //depot/projects/jail2/sys/boot/i386/pxeldr/pxeboot.8#2 integrate
.. //depot/projects/jail2/sys/boot/pc98/boot2/inode.h#2 integrate
.. //depot/projects/jail2/sys/bsm/audit_kevents.h#5 integrate
.. //depot/projects/jail2/sys/cam/cam_periph.c#2 integrate
.. //depot/projects/jail2/sys/compat/freebsd32/freebsd32_misc.c#4 integrate
.. //depot/projects/jail2/sys/compat/freebsd32/freebsd32_proto.h#7 integrate
.. //depot/projects/jail2/sys/compat/freebsd32/freebsd32_signal.h#1 branch
.. //depot/projects/jail2/sys/compat/freebsd32/freebsd32_syscall.h#7 integrate
.. //depot/projects/jail2/sys/compat/freebsd32/freebsd32_syscalls.c#7 integrate
.. //depot/projects/jail2/sys/compat/freebsd32/freebsd32_sysent.c#7 integrate
.. //depot/projects/jail2/sys/compat/freebsd32/syscalls.master#7 integrate
.. //depot/projects/jail2/sys/compat/ia32/ia32_genassym.c#2 integrate
.. //depot/projects/jail2/sys/compat/ia32/ia32_signal.h#2 integrate
.. //depot/projects/jail2/sys/compat/ia32/ia32_sysvec.c#2 integrate
.. //depot/projects/jail2/sys/conf/Makefile.sun4v#1 branch
.. //depot/projects/jail2/sys/conf/NOTES#7 integrate
.. //depot/projects/jail2/sys/conf/files#6 integrate
.. //depot/projects/jail2/sys/conf/files.sun4v#1 branch
.. //depot/projects/jail2/sys/conf/options#6 integrate
.. //depot/projects/jail2/sys/conf/options.sun4v#1 branch
.. //depot/projects/jail2/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c#4 integrate
.. //depot/projects/jail2/sys/dev/aic/aic_pccard.c#2 integrate
.. //depot/projects/jail2/sys/dev/ata/ata-chipset.c#5 integrate
.. //depot/projects/jail2/sys/dev/atkbdc/atkbd.c#2 integrate
.. //depot/projects/jail2/sys/dev/bge/if_bge.c#7 integrate
.. //depot/projects/jail2/sys/dev/bge/if_bgereg.h#5 integrate
.. //depot/projects/jail2/sys/dev/digi/digi.c#3 integrate
.. //depot/projects/jail2/sys/dev/em/if_em.c#6 integrate
.. //depot/projects/jail2/sys/dev/fxp/if_fxp.c#2 integrate
.. //depot/projects/jail2/sys/dev/ipmi/ipmi.c#3 integrate
.. //depot/projects/jail2/sys/dev/ipmi/ipmi_smic.c#2 integrate
.. //depot/projects/jail2/sys/dev/ips/ips.c#2 integrate
.. //depot/projects/jail2/sys/dev/ips/ipsreg.h#2 integrate
.. //depot/projects/jail2/sys/dev/isp/isp_freebsd.c#4 integrate
.. //depot/projects/jail2/sys/dev/isp/isp_freebsd.h#4 integrate
.. //depot/projects/jail2/sys/dev/kbdmux/kbdmux.c#4 integrate
.. //depot/projects/jail2/sys/dev/mfi/mfi.c#6 integrate
.. //depot/projects/jail2/sys/dev/mfi/mfi_debug.c#1 branch
.. //depot/projects/jail2/sys/dev/mfi/mfivar.h#4 integrate
.. //depot/projects/jail2/sys/dev/pci/pci_user.c#2 integrate
.. //depot/projects/jail2/sys/dev/smbus/smb.c#3 integrate
.. //depot/projects/jail2/sys/dev/sound/driver.c#5 integrate
.. //depot/projects/jail2/sys/dev/sound/midi/sequencer.c#4 integrate
.. //depot/projects/jail2/sys/dev/sound/pci/ak452x.c#3 delete
.. //depot/projects/jail2/sys/dev/sound/pci/ak452x.h#2 delete
.. //depot/projects/jail2/sys/dev/sound/pci/atiixp.c#2 integrate
.. //depot/projects/jail2/sys/dev/sound/pci/atiixp.h#2 integrate
.. //depot/projects/jail2/sys/dev/sound/pci/envy24.c#4 integrate
.. //depot/projects/jail2/sys/dev/sound/pci/envy24ht.c#1 branch
.. //depot/projects/jail2/sys/dev/sound/pci/envy24ht.h#1 branch
.. //depot/projects/jail2/sys/dev/sound/pci/hda/hda_reg.h#1 branch
.. //depot/projects/jail2/sys/dev/sound/pci/hda/hdac.c#1 branch
.. //depot/projects/jail2/sys/dev/sound/pci/hda/hdac.h#1 branch
.. //depot/projects/jail2/sys/dev/sound/pci/hda/hdac_private.h#1 branch
.. //depot/projects/jail2/sys/dev/sound/pci/hda/hdac_reg.h#1 branch
.. //depot/projects/jail2/sys/dev/sound/pci/spicds.c#1 branch
.. //depot/projects/jail2/sys/dev/sound/pci/spicds.h#1 branch
.. //depot/projects/jail2/sys/dev/sound/pcm/ac97.c#2 integrate
.. //depot/projects/jail2/sys/dev/sound/pcm/ac97_patch.c#2 integrate
.. //depot/projects/jail2/sys/dev/sound/pcm/ac97_patch.h#2 integrate
.. //depot/projects/jail2/sys/dev/sound/pcm/channel.c#3 integrate
.. //depot/projects/jail2/sys/dev/sound/pcm/dsp.c#3 integrate
.. //depot/projects/jail2/sys/dev/sound/pcm/mixer.c#3 integrate
.. //depot/projects/jail2/sys/dev/sound/pcm/mixer.h#4 integrate
.. //depot/projects/jail2/sys/dev/sound/pcm/sound.h#4 integrate
.. //depot/projects/jail2/sys/dev/sound/usb/uaudio_pcm.c#2 integrate
.. //depot/projects/jail2/sys/dev/syscons/scvidctl.c#2 integrate
.. //depot/projects/jail2/sys/dev/syscons/syscons.c#3 integrate
.. //depot/projects/jail2/sys/dev/twa/tw_osl_includes.h#2 integrate
.. //depot/projects/jail2/sys/dev/twa/tw_osl_inline.h#2 integrate
.. //depot/projects/jail2/sys/dev/twa/tw_osl_share.h#2 integrate
.. //depot/projects/jail2/sys/dev/uart/uart_kbd_sun.c#3 integrate
.. //depot/projects/jail2/sys/dev/ubsec/ubsec.c#3 integrate
.. //depot/projects/jail2/sys/dev/usb/ehci.c#3 integrate
.. //depot/projects/jail2/sys/dev/usb/ohci.c#3 integrate
.. //depot/projects/jail2/sys/dev/usb/ukbd.c#3 integrate
.. //depot/projects/jail2/sys/dev/usb/usb_subr.c#3 integrate
.. //depot/projects/jail2/sys/dev/usb/usbdi.c#3 integrate
.. //depot/projects/jail2/sys/dev/vkbd/vkbd.c#2 integrate
.. //depot/projects/jail2/sys/fs/devfs/devfs_vfsops.c#4 integrate
.. //depot/projects/jail2/sys/fs/hpfs/hpfs_vfsops.c#2 integrate
.. //depot/projects/jail2/sys/fs/msdosfs/msdosfs_conv.c#2 integrate
.. //depot/projects/jail2/sys/fs/msdosfs/msdosfs_vfsops.c#3 integrate
.. //depot/projects/jail2/sys/fs/ntfs/ntfs_vfsops.c#2 integrate
.. //depot/projects/jail2/sys/fs/nullfs/null_vfsops.c#2 integrate
.. //depot/projects/jail2/sys/fs/nwfs/nwfs_subr.c#2 integrate
.. //depot/projects/jail2/sys/fs/nwfs/nwfs_vfsops.c#2 integrate
.. //depot/projects/jail2/sys/fs/portalfs/portal_vfsops.c#2 integrate
.. //depot/projects/jail2/sys/fs/procfs/procfs_ioctl.c#2 integrate
.. //depot/projects/jail2/sys/fs/smbfs/smbfs_vfsops.c#3 integrate
.. //depot/projects/jail2/sys/fs/udf/udf_vfsops.c#4 integrate
.. //depot/projects/jail2/sys/fs/umapfs/umap_vfsops.c#2 integrate
.. //depot/projects/jail2/sys/fs/unionfs/union_vfsops.c#2 integrate
.. //depot/projects/jail2/sys/geom/cache/g_cache.c#1 branch
.. //depot/projects/jail2/sys/geom/cache/g_cache.h#1 branch
.. //depot/projects/jail2/sys/geom/eli/g_eli.c#3 integrate
.. //depot/projects/jail2/sys/geom/eli/g_eli_ctl.c#4 integrate
.. //depot/projects/jail2/sys/geom/label/g_label_msdosfs.c#3 integrate
.. //depot/projects/jail2/sys/geom/label/g_label_msdosfs.h#2 integrate
.. //depot/projects/jail2/sys/geom/nop/g_nop.h#3 integrate
.. //depot/projects/jail2/sys/geom/raid3/g_raid3.c#4 integrate
.. //depot/projects/jail2/sys/gnu/fs/ext2fs/ext2_inode.c#2 integrate
.. //depot/projects/jail2/sys/gnu/fs/ext2fs/ext2_vfsops.c#2 integrate
.. //depot/projects/jail2/sys/gnu/fs/reiserfs/reiserfs_vfsops.c#2 integrate
.. //depot/projects/jail2/sys/i386/bios/apm.c#2 integrate
.. //depot/projects/jail2/sys/i386/conf/GENERIC#4 integrate
.. //depot/projects/jail2/sys/i386/i386/busdma_machdep.c#3 integrate
.. //depot/projects/jail2/sys/i386/i386/local_apic.c#4 integrate
.. //depot/projects/jail2/sys/i386/i386/machdep.c#4 integrate
.. //depot/projects/jail2/sys/i386/ibcs2/ibcs2_xenix.c#4 integrate
.. //depot/projects/jail2/sys/i386/include/clock.h#2 integrate
.. //depot/projects/jail2/sys/i386/include/elf.h#2 integrate
.. //depot/projects/jail2/sys/i386/isa/clock.c#3 integrate
.. //depot/projects/jail2/sys/i386/isa/pmtimer.c#2 integrate
.. //depot/projects/jail2/sys/ia64/conf/GENERIC#4 integrate
.. //depot/projects/jail2/sys/ia64/ia32/ia32_signal.c#2 integrate
.. //depot/projects/jail2/sys/ia64/ia64/clock.c#2 integrate
.. //depot/projects/jail2/sys/ia64/include/clock.h#2 integrate
.. //depot/projects/jail2/sys/ia64/include/elf.h#2 integrate
.. //depot/projects/jail2/sys/isofs/cd9660/cd9660_vfsops.c#2 integrate
.. //depot/projects/jail2/sys/kern/init_main.c#4 integrate
.. //depot/projects/jail2/sys/kern/init_sysent.c#6 integrate
.. //depot/projects/jail2/sys/kern/kern_event.c#3 integrate
.. //depot/projects/jail2/sys/kern/kern_lock.c#3 integrate
.. //depot/projects/jail2/sys/kern/kern_proc.c#5 integrate
.. //depot/projects/jail2/sys/kern/kern_sig.c#3 integrate
.. //depot/projects/jail2/sys/kern/kern_time.c#3 integrate
.. //depot/projects/jail2/sys/kern/kern_umtx.c#5 integrate
.. //depot/projects/jail2/sys/kern/subr_clock.c#2 integrate
.. //depot/projects/jail2/sys/kern/subr_rtc.c#1 branch
.. //depot/projects/jail2/sys/kern/sys_generic.c#3 integrate
.. //depot/projects/jail2/sys/kern/syscalls.c#6 integrate
.. //depot/projects/jail2/sys/kern/syscalls.master#6 integrate
.. //depot/projects/jail2/sys/kern/systrace_args.c#5 integrate
.. //depot/projects/jail2/sys/kern/tty.c#5 integrate
.. //depot/projects/jail2/sys/kern/tty_pts.c#2 integrate
.. //depot/projects/jail2/sys/kern/tty_pty.c#3 integrate
.. //depot/projects/jail2/sys/kern/tty_tty.c#3 integrate
.. //depot/projects/jail2/sys/kern/uipc_mqueue.c#2 integrate
.. //depot/projects/jail2/sys/kern/vfs_bio.c#3 integrate
.. //depot/projects/jail2/sys/kern/vfs_cluster.c#2 integrate
.. //depot/projects/jail2/sys/kern/vfs_export.c#2 integrate
.. //depot/projects/jail2/sys/kern/vfs_mount.c#6 integrate
.. //depot/projects/jail2/sys/kern/vfs_subr.c#5 integrate
.. //depot/projects/jail2/sys/kern/vfs_syscalls.c#6 integrate
.. //depot/projects/jail2/sys/modules/digi/digi/Makefile#2 integrate
.. //depot/projects/jail2/sys/modules/geom/Makefile#2 integrate
.. //depot/projects/jail2/sys/modules/geom/geom_cache/Makefile#1 branch
.. //depot/projects/jail2/sys/modules/if_tap/Makefile#2 integrate
.. //depot/projects/jail2/sys/modules/kbdmux/Makefile#2 integrate
.. //depot/projects/jail2/sys/modules/libalias/Makefile#2 integrate
.. //depot/projects/jail2/sys/modules/libalias/libalias/Makefile#1 branch
.. //depot/projects/jail2/sys/modules/libalias/modules/Makefile#1 branch
.. //depot/projects/jail2/sys/modules/libalias/modules/Makefile.inc#1 branch
.. //depot/projects/jail2/sys/modules/libalias/modules/cuseeme/Makefile#1 branch
.. //depot/projects/jail2/sys/modules/libalias/modules/dummy/Makefile#1 branch
.. //depot/projects/jail2/sys/modules/libalias/modules/ftp/Makefile#1 branch
.. //depot/projects/jail2/sys/modules/libalias/modules/irc/Makefile#1 branch
.. //depot/projects/jail2/sys/modules/libalias/modules/modules.inc#1 branch
.. //depot/projects/jail2/sys/modules/libalias/modules/nbt/Makefile#1 branch
.. //depot/projects/jail2/sys/modules/libalias/modules/pptp/Makefile#1 branch
.. //depot/projects/jail2/sys/modules/libalias/modules/skinny/Makefile#1 branch
.. //depot/projects/jail2/sys/modules/libalias/modules/smedia/Makefile#1 branch
.. //depot/projects/jail2/sys/modules/mfi/Makefile#2 integrate
.. //depot/projects/jail2/sys/modules/procfs/Makefile#2 integrate
.. //depot/projects/jail2/sys/modules/sound/driver/Makefile#4 integrate
.. //depot/projects/jail2/sys/modules/sound/driver/ak452x/Makefile#2 delete
.. //depot/projects/jail2/sys/modules/sound/driver/envy24/Makefile#2 integrate
.. //depot/projects/jail2/sys/modules/sound/driver/envy24ht/Makefile#1 branch
.. //depot/projects/jail2/sys/modules/sound/driver/hda/Makefile#1 branch
.. //depot/projects/jail2/sys/modules/sound/driver/spicds/Makefile#1 branch
.. //depot/projects/jail2/sys/modules/ukbd/Makefile#2 integrate
.. //depot/projects/jail2/sys/modules/vkbd/Makefile#2 integrate
.. //depot/projects/jail2/sys/modules/wlan/Makefile#2 integrate
.. //depot/projects/jail2/sys/net/bridgestp.c#3 integrate
.. //depot/projects/jail2/sys/net/if_tap.c#3 integrate
.. //depot/projects/jail2/sys/net/if_tap.h#2 integrate
.. //depot/projects/jail2/sys/net80211/ieee80211_ioctl.c#4 integrate
.. //depot/projects/jail2/sys/netgraph/atm/ccatm/ng_ccatm.c#2 integrate
.. //depot/projects/jail2/sys/netinet/if_ether.c#4 integrate
.. //depot/projects/jail2/sys/netinet/in.c#2 integrate
.. //depot/projects/jail2/sys/netinet/in_var.h#2 integrate
.. //depot/projects/jail2/sys/netinet/ip_carp.c#3 integrate
.. //depot/projects/jail2/sys/netinet/ip_fw2.c#6 integrate
.. //depot/projects/jail2/sys/netinet/ip_mroute.c#2 integrate
.. //depot/projects/jail2/sys/netinet/ip_mroute.h#2 integrate
.. //depot/projects/jail2/sys/netinet/ip_output.c#4 integrate
.. //depot/projects/jail2/sys/netinet/ip_var.h#2 integrate
.. //depot/projects/jail2/sys/netinet/libalias/alias.c#2 integrate
.. //depot/projects/jail2/sys/netinet/libalias/alias.h#2 integrate
.. //depot/projects/jail2/sys/netinet/libalias/alias_cuseeme.c#2 integrate
.. //depot/projects/jail2/sys/netinet/libalias/alias_db.c#2 integrate
.. //depot/projects/jail2/sys/netinet/libalias/alias_dummy.c#1 branch
.. //depot/projects/jail2/sys/netinet/libalias/alias_ftp.c#2 integrate
.. //depot/projects/jail2/sys/netinet/libalias/alias_irc.c#2 integrate
.. //depot/projects/jail2/sys/netinet/libalias/alias_local.h#2 integrate
.. //depot/projects/jail2/sys/netinet/libalias/alias_mod.c#1 branch
.. //depot/projects/jail2/sys/netinet/libalias/alias_mod.h#1 branch
.. //depot/projects/jail2/sys/netinet/libalias/alias_nbt.c#2 integrate
.. //depot/projects/jail2/sys/netinet/libalias/alias_old.c#2 integrate
.. //depot/projects/jail2/sys/netinet/libalias/alias_pptp.c#2 integrate
.. //depot/projects/jail2/sys/netinet/libalias/alias_proxy.c#2 integrate
.. //depot/projects/jail2/sys/netinet/libalias/alias_skinny.c#2 integrate
.. //depot/projects/jail2/sys/netinet/libalias/alias_smedia.c#2 integrate
.. //depot/projects/jail2/sys/netinet/libalias/alias_util.c#2 integrate
.. //depot/projects/jail2/sys/netinet/libalias/libalias.3#3 integrate
.. //depot/projects/jail2/sys/netinet/tcp_input.c#6 integrate
.. //depot/projects/jail2/sys/netinet/tcp_output.c#3 integrate
.. //depot/projects/jail2/sys/netinet/tcp_subr.c#5 integrate
.. //depot/projects/jail2/sys/netinet/tcp_timer.h#4 integrate
.. //depot/projects/jail2/sys/netinet6/in6_ifattach.c#4 integrate
.. //depot/projects/jail2/sys/netinet6/ip6_mroute.h#2 integrate
.. //depot/projects/jail2/sys/netinet6/nd6.c#4 integrate
.. //depot/projects/jail2/sys/nfsclient/nfs_vfsops.c#5 integrate
.. //depot/projects/jail2/sys/nfsclient/nfs_vnops.c#4 integrate
.. //depot/projects/jail2/sys/pc98/cbus/clock.c#2 integrate
.. //depot/projects/jail2/sys/pc98/cbus/pckbd.c#2 integrate
.. //depot/projects/jail2/sys/pc98/conf/GENERIC#4 integrate
.. //depot/projects/jail2/sys/pc98/pc98/machdep.c#3 integrate
.. //depot/projects/jail2/sys/pci/agp_i810.c#4 integrate
.. //depot/projects/jail2/sys/powerpc/conf/GENERIC#4 integrate
.. //depot/projects/jail2/sys/powerpc/include/clock.h#2 integrate
.. //depot/projects/jail2/sys/powerpc/include/elf.h#2 integrate
.. //depot/projects/jail2/sys/powerpc/powerpc/clock.c#3 integrate
.. //depot/projects/jail2/sys/security/audit/audit.c#3 integrate
.. //depot/projects/jail2/sys/security/audit/audit_bsm.c#6 integrate
.. //depot/projects/jail2/sys/security/audit/audit_syscalls.c#3 integrate
.. //depot/projects/jail2/sys/security/audit/audit_worker.c#4 integrate
.. //depot/projects/jail2/sys/security/mac/mac_framework.h#1 branch
.. //depot/projects/jail2/sys/sparc64/conf/GENERIC#4 integrate
.. //depot/projects/jail2/sys/sparc64/include/clock.h#2 integrate
.. //depot/projects/jail2/sys/sparc64/include/elf.h#2 integrate
.. //depot/projects/jail2/sys/sun4v/compile/.cvsignore#1 branch
.. //depot/projects/jail2/sys/sun4v/conf/DEFAULTS#1 branch
.. //depot/projects/jail2/sys/sun4v/conf/GENERIC#1 branch
.. //depot/projects/jail2/sys/sun4v/conf/GENERIC.hints#1 branch
.. //depot/projects/jail2/sys/sun4v/conf/MAC#1 branch
.. //depot/projects/jail2/sys/sun4v/conf/Makefile#1 branch
.. //depot/projects/jail2/sys/sun4v/conf/NOTES#1 branch
.. //depot/projects/jail2/sys/sun4v/include/_bus.h#1 branch
.. //depot/projects/jail2/sys/sun4v/include/_inttypes.h#1 branch
.. //depot/projects/jail2/sys/sun4v/include/_limits.h#1 branch
.. //depot/projects/jail2/sys/sun4v/include/_stdint.h#1 branch
.. //depot/projects/jail2/sys/sun4v/include/_types.h#1 branch
.. //depot/projects/jail2/sys/sun4v/include/asi.h#1 branch
.. //depot/projects/jail2/sys/sun4v/include/asm.h#1 branch
.. //depot/projects/jail2/sys/sun4v/include/asmacros.h#1 branch
.. //depot/projects/jail2/sys/sun4v/include/atomic.h#1 branch
.. //depot/projects/jail2/sys/sun4v/include/bus.h#1 branch
.. //depot/projects/jail2/sys/sun4v/include/bus_common.h#1 branch
.. //depot/projects/jail2/sys/sun4v/include/bus_dma.h#1 branch
.. //depot/projects/jail2/sys/sun4v/include/bus_private.h#1 branch
.. //depot/projects/jail2/sys/sun4v/include/cache.h#1 branch
.. //depot/projects/jail2/sys/sun4v/include/ccr.h#1 branch
.. //depot/projects/jail2/sys/sun4v/include/cddl/mdesc.h#1 branch
.. //depot/projects/jail2/sys/sun4v/include/cddl/mdesc_impl.h#1 branch
.. //depot/projects/jail2/sys/sun4v/include/clock.h#1 branch
.. //depot/projects/jail2/sys/sun4v/include/cpu.h#1 branch
.. //depot/projects/jail2/sys/sun4v/include/cpufunc.h#1 branch
.. //depot/projects/jail2/sys/sun4v/include/db_machdep.h#1 branch
.. //depot/projects/jail2/sys/sun4v/include/elf.h#1 branch
.. //depot/projects/jail2/sys/sun4v/include/endian.h#1 branch
.. //depot/projects/jail2/sys/sun4v/include/exec.h#1 branch
.. //depot/projects/jail2/sys/sun4v/include/float.h#1 branch
.. //depot/projects/jail2/sys/sun4v/include/floatingpoint.h#1 branch
.. //depot/projects/jail2/sys/sun4v/include/fp.h#1 branch
.. //depot/projects/jail2/sys/sun4v/include/frame.h#1 branch
.. //depot/projects/jail2/sys/sun4v/include/fsr.h#1 branch
.. //depot/projects/jail2/sys/sun4v/include/gdb_machdep.h#1 branch
.. //depot/projects/jail2/sys/sun4v/include/hv_pcivar.h#1 branch
.. //depot/projects/jail2/sys/sun4v/include/hviommu.h#1 branch
.. //depot/projects/jail2/sys/sun4v/include/hypervisor_api.h#1 branch
.. //depot/projects/jail2/sys/sun4v/include/hypervisorvar.h#1 branch
.. //depot/projects/jail2/sys/sun4v/include/idprom.h#1 branch
.. //depot/projects/jail2/sys/sun4v/include/ieee.h#1 branch
.. //depot/projects/jail2/sys/sun4v/include/ieeefp.h#1 branch
.. //depot/projects/jail2/sys/sun4v/include/in_cksum.h#1 branch
.. //depot/projects/jail2/sys/sun4v/include/instr.h#1 branch
.. //depot/projects/jail2/sys/sun4v/include/intr_machdep.h#1 branch
.. //depot/projects/jail2/sys/sun4v/include/iommureg.h#1 branch
.. //depot/projects/jail2/sys/sun4v/include/iommuvar.h#1 branch
.. //depot/projects/jail2/sys/sun4v/include/kdb.h#1 branch
.. //depot/projects/jail2/sys/sun4v/include/kerneldump.h#1 branch
.. //depot/projects/jail2/sys/sun4v/include/ktr.h#1 branch
.. //depot/projects/jail2/sys/sun4v/include/limits.h#1 branch
.. //depot/projects/jail2/sys/sun4v/include/lsu.h#1 branch
.. //depot/projects/jail2/sys/sun4v/include/md_var.h#1 branch
.. //depot/projects/jail2/sys/sun4v/include/mdesc_bus.h#1 branch
.. //depot/projects/jail2/sys/sun4v/include/mdesc_bus_subr.h#1 branch
.. //depot/projects/jail2/sys/sun4v/include/memdev.h#1 branch
.. //depot/projects/jail2/sys/sun4v/include/metadata.h#1 branch
.. //depot/projects/jail2/sys/sun4v/include/mmu.h#1 branch
.. //depot/projects/jail2/sys/sun4v/include/mutex.h#1 branch
.. //depot/projects/jail2/sys/sun4v/include/nexusvar.h#1 branch
.. //depot/projects/jail2/sys/sun4v/include/ofw_bus.h#1 branch
.. //depot/projects/jail2/sys/sun4v/include/ofw_machdep.h#1 branch
.. //depot/projects/jail2/sys/sun4v/include/ofw_mem.h#1 branch
.. //depot/projects/jail2/sys/sun4v/include/ofw_nexus.h#1 branch
.. //depot/projects/jail2/sys/sun4v/include/ofw_upa.h#1 branch
.. //depot/projects/jail2/sys/sun4v/include/param.h#1 branch
.. //depot/projects/jail2/sys/sun4v/include/pcb.h#1 branch
.. //depot/projects/jail2/sys/sun4v/include/pcpu.h#1 branch
.. //depot/projects/jail2/sys/sun4v/include/pmap.h#1 branch
.. //depot/projects/jail2/sys/sun4v/include/pmc_mdep.h#1 branch
.. //depot/projects/jail2/sys/sun4v/include/proc.h#1 branch
.. //depot/projects/jail2/sys/sun4v/include/profile.h#1 branch
.. //depot/projects/jail2/sys/sun4v/include/pstate.h#1 branch
.. //depot/projects/jail2/sys/sun4v/include/ptrace.h#1 branch
.. //depot/projects/jail2/sys/sun4v/include/reg.h#1 branch
.. //depot/projects/jail2/sys/sun4v/include/reloc.h#1 branch
.. //depot/projects/jail2/sys/sun4v/include/resource.h#1 branch
.. //depot/projects/jail2/sys/sun4v/include/runq.h#1 branch
.. //depot/projects/jail2/sys/sun4v/include/sc_machdep.h#1 branch
.. //depot/projects/jail2/sys/sun4v/include/setjmp.h#1 branch
.. //depot/projects/jail2/sys/sun4v/include/sf_buf.h#1 branch
.. //depot/projects/jail2/sys/sun4v/include/sigframe.h#1 branch
.. //depot/projects/jail2/sys/sun4v/include/signal.h#1 branch
.. //depot/projects/jail2/sys/sun4v/include/smp.h#1 branch
.. //depot/projects/jail2/sys/sun4v/include/stdarg.h#1 branch
.. //depot/projects/jail2/sys/sun4v/include/sun4v_cpufunc.h#1 branch
.. //depot/projects/jail2/sys/sun4v/include/sysarch.h#1 branch
.. //depot/projects/jail2/sys/sun4v/include/tick.h#1 branch
.. //depot/projects/jail2/sys/sun4v/include/tlb.h#1 branch
.. //depot/projects/jail2/sys/sun4v/include/trap.h#1 branch
.. //depot/projects/jail2/sys/sun4v/include/tsb.h#1 branch
.. //depot/projects/jail2/sys/sun4v/include/tstate.h#1 branch
.. //depot/projects/jail2/sys/sun4v/include/tte.h#1 branch
.. //depot/projects/jail2/sys/sun4v/include/tte_hash.h#1 branch
.. //depot/projects/jail2/sys/sun4v/include/ucontext.h#1 branch
.. //depot/projects/jail2/sys/sun4v/include/upa.h#1 branch
.. //depot/projects/jail2/sys/sun4v/include/utrap.h#1 branch
.. //depot/projects/jail2/sys/sun4v/include/varargs.h#1 branch
.. //depot/projects/jail2/sys/sun4v/include/ver.h#1 branch
.. //depot/projects/jail2/sys/sun4v/include/vmparam.h#1 branch
.. //depot/projects/jail2/sys/sun4v/include/watch.h#1 branch
.. //depot/projects/jail2/sys/sun4v/include/wstate.h#1 branch
.. //depot/projects/jail2/sys/sun4v/mdesc/mdesc_bus_if.m#1 branch
.. //depot/projects/jail2/sys/sun4v/mdesc/mdesc_bus_subr.c#1 branch
.. //depot/projects/jail2/sys/sun4v/mdesc/mdesc_diff.c#1 branch
.. //depot/projects/jail2/sys/sun4v/mdesc/mdesc_findname.c#1 branch
.. //depot/projects/jail2/sys/sun4v/mdesc/mdesc_findnodeprop.c#1 branch
.. //depot/projects/jail2/sys/sun4v/mdesc/mdesc_fini.c#1 branch
.. //depot/projects/jail2/sys/sun4v/mdesc/mdesc_getbinsize.c#1 branch
.. //depot/projects/jail2/sys/sun4v/mdesc/mdesc_getgen.c#1 branch
.. //depot/projects/jail2/sys/sun4v/mdesc/mdesc_getpropdata.c#1 branch
.. //depot/projects/jail2/sys/sun4v/mdesc/mdesc_getpropstr.c#1 branch
.. //depot/projects/jail2/sys/sun4v/mdesc/mdesc_getpropval.c#1 branch
.. //depot/projects/jail2/sys/sun4v/mdesc/mdesc_init.c#1 branch
.. //depot/projects/jail2/sys/sun4v/mdesc/mdesc_init_intern.c#1 branch
.. //depot/projects/jail2/sys/sun4v/mdesc/mdesc_nodecount.c#1 branch
.. //depot/projects/jail2/sys/sun4v/mdesc/mdesc_rootnode.c#1 branch
.. //depot/projects/jail2/sys/sun4v/mdesc/mdesc_scandag.c#1 branch
.. //depot/projects/jail2/sys/sun4v/mdesc/mdesc_subr.c#1 branch
.. //depot/projects/jail2/sys/sun4v/mdesc/mdesc_vdevfindval.c#1 branch
.. //depot/projects/jail2/sys/sun4v/sun4v/autoconf.c#1 branch
.. //depot/projects/jail2/sys/sun4v/sun4v/bus_machdep.c#1 branch
.. //depot/projects/jail2/sys/sun4v/sun4v/clock.c#1 branch
.. //depot/projects/jail2/sys/sun4v/sun4v/counter.c#1 branch
.. //depot/projects/jail2/sys/sun4v/sun4v/db_disasm.c#1 branch
.. //depot/projects/jail2/sys/sun4v/sun4v/db_hwwatch.c#1 branch
.. //depot/projects/jail2/sys/sun4v/sun4v/db_interface.c#1 branch
.. //depot/projects/jail2/sys/sun4v/sun4v/db_trace.c#1 branch
.. //depot/projects/jail2/sys/sun4v/sun4v/dump_machdep.c#1 branch
.. //depot/projects/jail2/sys/sun4v/sun4v/eeprom.c#1 branch
.. //depot/projects/jail2/sys/sun4v/sun4v/elf_machdep.c#1 branch
.. //depot/projects/jail2/sys/sun4v/sun4v/exception.S#1 branch
.. //depot/projects/jail2/sys/sun4v/sun4v/fpemu.c#1 branch
.. //depot/projects/jail2/sys/sun4v/sun4v/gdb_machdep.c#1 branch
.. //depot/projects/jail2/sys/sun4v/sun4v/genassym.c#1 branch
.. //depot/projects/jail2/sys/sun4v/sun4v/hcall.S#1 branch
.. //depot/projects/jail2/sys/sun4v/sun4v/hv_pci.c#1 branch
.. //depot/projects/jail2/sys/sun4v/sun4v/hvcons.c#1 branch
.. //depot/projects/jail2/sys/sun4v/sun4v/hviommu.c#1 branch
.. //depot/projects/jail2/sys/sun4v/sun4v/identcpu.c#1 branch
.. //depot/projects/jail2/sys/sun4v/sun4v/in_cksum.c#1 branch
.. //depot/projects/jail2/sys/sun4v/sun4v/interrupt.S#1 branch
.. //depot/projects/jail2/sys/sun4v/sun4v/intr_machdep.c#1 branch
.. //depot/projects/jail2/sys/sun4v/sun4v/iommu.c#1 branch
.. //depot/projects/jail2/sys/sun4v/sun4v/locore.S#1 branch
.. //depot/projects/jail2/sys/sun4v/sun4v/machdep.c#1 branch
.. //depot/projects/jail2/sys/sun4v/sun4v/mem.c#1 branch
.. //depot/projects/jail2/sys/sun4v/sun4v/mp_exception.S#1 branch
.. //depot/projects/jail2/sys/sun4v/sun4v/mp_locore.S#1 branch
.. //depot/projects/jail2/sys/sun4v/sun4v/mp_machdep.c#1 branch
.. //depot/projects/jail2/sys/sun4v/sun4v/nexus.c#1 branch
.. //depot/projects/jail2/sys/sun4v/sun4v/ofw_bus.c#1 branch
.. //depot/projects/jail2/sys/sun4v/sun4v/ofw_machdep.c#1 branch
.. //depot/projects/jail2/sys/sun4v/sun4v/pmap.c#1 branch
.. //depot/projects/jail2/sys/sun4v/sun4v/prof_machdep.c#1 branch
.. //depot/projects/jail2/sys/sun4v/sun4v/rtc.c#1 branch
.. //depot/projects/jail2/sys/sun4v/sun4v/rwindow.c#1 branch
.. //depot/projects/jail2/sys/sun4v/sun4v/simdisk.c#1 branch
.. //depot/projects/jail2/sys/sun4v/sun4v/support.S#1 branch
.. //depot/projects/jail2/sys/sun4v/sun4v/swtch.S#1 branch
.. //depot/projects/jail2/sys/sun4v/sun4v/sys_machdep.c#1 branch
.. //depot/projects/jail2/sys/sun4v/sun4v/t1_copy.S#1 branch
.. //depot/projects/jail2/sys/sun4v/sun4v/tick.c#1 branch
.. //depot/projects/jail2/sys/sun4v/sun4v/tlb.c#1 branch
.. //depot/projects/jail2/sys/sun4v/sun4v/trap.c#1 branch
.. //depot/projects/jail2/sys/sun4v/sun4v/trap_trace.S#1 branch
.. //depot/projects/jail2/sys/sun4v/sun4v/tsb.c#1 branch
.. //depot/projects/jail2/sys/sun4v/sun4v/tte.c#1 branch
.. //depot/projects/jail2/sys/sun4v/sun4v/tte_hash.c#1 branch
.. //depot/projects/jail2/sys/sun4v/sun4v/uio_machdep.c#1 branch
.. //depot/projects/jail2/sys/sun4v/sun4v/vm_machdep.c#1 branch
.. //depot/projects/jail2/sys/sun4v/sun4v/vnex.c#1 branch
.. //depot/projects/jail2/sys/sun4v/sun4v/wbuf.S#1 branch
.. //depot/projects/jail2/sys/sys/_elf_solaris.h#1 branch
.. //depot/projects/jail2/sys/sys/buf.h#2 integrate
.. //depot/projects/jail2/sys/sys/clock.h#2 integrate
.. //depot/projects/jail2/sys/sys/consio.h#2 integrate
.. //depot/projects/jail2/sys/sys/copyright.h#2 integrate
.. //depot/projects/jail2/sys/sys/digiio.h#2 integrate
.. //depot/projects/jail2/sys/sys/elf.h#1 branch
.. //depot/projects/jail2/sys/sys/elf32.h#2 integrate
.. //depot/projects/jail2/sys/sys/elf64.h#2 integrate
.. //depot/projects/jail2/sys/sys/elf_common.h#2 integrate
.. //depot/projects/jail2/sys/sys/ioccom.h#2 integrate
.. //depot/projects/jail2/sys/sys/kbio.h#2 integrate
.. //depot/projects/jail2/sys/sys/kernel.h#4 integrate
.. //depot/projects/jail2/sys/sys/lockmgr.h#3 integrate
.. //depot/projects/jail2/sys/sys/mount.h#3 integrate
.. //depot/projects/jail2/sys/sys/param.h#5 integrate
.. //depot/projects/jail2/sys/sys/pioctl.h#2 integrate
.. //depot/projects/jail2/sys/sys/proc.h#3 integrate
.. //depot/projects/jail2/sys/sys/signalvar.h#2 integrate
.. //depot/projects/jail2/sys/sys/syscall.h#6 integrate
.. //depot/projects/jail2/sys/sys/syscall.mk#6 integrate
.. //depot/projects/jail2/sys/sys/sysproto.h#6 integrate
.. //depot/projects/jail2/sys/sys/systm.h#5 integrate
.. //depot/projects/jail2/sys/sys/time.h#3 integrate
.. //depot/projects/jail2/sys/sys/ttycom.h#2 integrate
.. //depot/projects/jail2/sys/ufs/ffs/ffs_snapshot.c#3 integrate
.. //depot/projects/jail2/sys/ufs/ffs/ffs_softdep.c#3 integrate
.. //depot/projects/jail2/sys/ufs/ffs/ffs_vfsops.c#3 integrate
.. //depot/projects/jail2/sys/ufs/ufs/inode.h#2 integrate
.. //depot/projects/jail2/sys/ufs/ufs/ufs_quota.c#3 integrate
.. //depot/projects/jail2/sys/ufs/ufs/ufs_vnops.c#4 integrate
.. //depot/projects/jail2/sys/vm/vm_page.c#5 integrate
Differences ...
==== //depot/projects/jail2/sys/amd64/amd64/local_apic.c#4 (text+ko) ====
@@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/amd64/amd64/local_apic.c,v 1.29 2006/09/11 20:12:42 jhb Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/local_apic.c,v 1.31 2006/09/27 22:09:35 sobomax Exp $");
#include "opt_hwpmc_hooks.h"
@@ -613,13 +613,17 @@
/* Send EOI first thing. */
lapic_eoi();
-#ifdef SMP
+#if defined(SMP) && !defined(SCHED_ULE)
/*
* Don't do any accounting for the disabled HTT cores, since it
* will provide misleading numbers for the userland.
*
* No locking is necessary here, since even if we loose the race
* when hlt_cpus_mask changes it is not a big deal, really.
+ *
+ * Don't do that for ULE, since ULE doesn't consider hlt_cpus_mask
+ * and unlike other schedulers it actually schedules threads to
+ * those CPUs.
*/
if ((hlt_cpus_mask & (1 << PCPU_GET(cpuid))) != 0)
return;
==== //depot/projects/jail2/sys/amd64/amd64/machdep.c#5 (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/jail2/sys/amd64/conf/GENERIC#4 (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.464 2006/07/09 16:39:21 mjacob 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
@@ -49,6 +48,7 @@
options COMPAT_IA32 # Compatible with i386 binaries
options COMPAT_FREEBSD4 # Compatible with FreeBSD4
options COMPAT_FREEBSD5 # Compatible with FreeBSD5
+options COMPAT_FREEBSD6 # Compatible with FreeBSD6
options SCSI_DELAY=5000 # Delay (in ms) before probing SCSI
options KTRACE # ktrace(1) support
options SYSVSHM # SYSV-style shared memory
==== //depot/projects/jail2/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/jail2/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/jail2/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/jail2/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/jail2/sys/amd64/linux32/linux32_machdep.c#5 (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/jail2/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/jail2/sys/arm/include/elf.h#3 (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/jail2/sys/boot/common/merge_help.awk#2 (text+ko) ====
@@ -1,6 +1,6 @@
#!/usr/bin/awk -f
#
-# $FreeBSD: src/sys/boot/common/merge_help.awk,v 1.5 2001/11/07 17:53:25 fenner Exp $
+# $FreeBSD: src/sys/boot/common/merge_help.awk,v 1.6 2006/09/28 19:06:20 jhb Exp $
#
# Merge two boot loader help files for FreeBSD 3.0
# Joe Abley <jabley at patho.gen.nz>
@@ -25,9 +25,12 @@
match($0, " T[[:graph:]]+");
T = substr($0, RSTART + 2, RLENGTH - 2);
match($0, " S[[:graph:]]+");
+ SSTART = RSTART
S = (RLENGTH == -1) ? "" : substr($0, RSTART + 2, RLENGTH - 2);
match($0, " D[[:graph:]][[:print:]]*$");
D = substr($0, RSTART + 2);
+ if (SSTART > RSTART)
+ S = "";
# find a suitable place to store this one...
ind++;
==== //depot/projects/jail2/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/jail2/sys/boot/ficl/Makefile#2 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/sys/boot/ficl/Makefile,v 1.43 2006/05/12 04:07:42 jhb Exp $
+# $FreeBSD: src/sys/boot/ficl/Makefile,v 1.44 2006/09/28 10:02:03 ru Exp $
#
.PATH: ${.CURDIR}/${MACHINE_ARCH:S/amd64/i386/}
BASE_SRCS= dict.c ficl.c fileaccess.c float.c loader.c math64.c \
@@ -42,7 +42,7 @@
#SOFTWORDS+= oo.fr classes.fr
.if ${MACHINE_ARCH} == "amd64"
-CFLAGS+= -m32 -I.
+CFLAGS+= -m32 -march=i386 -I.
.endif
CFLAGS+= -I${.CURDIR} -I${.CURDIR}/${MACHINE_ARCH:S/amd64/i386/} \
==== //depot/projects/jail2/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.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/jail2/sys/boot/i386/Makefile.inc#2 (text+ko) ====
@@ -1,6 +1,6 @@
# Common defines for all of /sys/boot/i386/
#
-# $FreeBSD: src/sys/boot/i386/Makefile.inc,v 1.11 2005/07/15 12:22:14 ache Exp $
+# $FreeBSD: src/sys/boot/i386/Makefile.inc,v 1.12 2006/09/28 10:02:04 ru Exp $
BINDIR?= /boot
@@ -10,7 +10,7 @@
LDFLAGS+= -nostdlib
.if ${MACHINE_ARCH} == "amd64"
-CFLAGS+= -m32
+CFLAGS+= -m32 -march=i386
LDFLAGS+= -m elf_i386_fbsd
AFLAGS+= --32
.endif
==== //depot/projects/jail2/sys/boot/i386/btx/btx/btx.S#2 (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.38 2004/11/24 14:54:33 jhb Exp $
+ * $FreeBSD: src/sys/boot/i386/btx/btx/btx.S,v 1.43 2006/10/05 15:30:51 jhb Exp $
*/
>>> TRUNCATED FOR MAIL (1000 lines) <<<
More information about the p4-projects
mailing list