svn commit: r219554 - in projects/altix: lib/libstand
sys/amd64/amd64 sys/amd64/conf sys/amd64/include
sys/amd64/linux32 sys/arm/arm sys/arm/at91 sys/arm/s3c2xx0
sys/arm/xscale/i80321 sys/arm/xscal...
Marcel Moolenaar
marcel at FreeBSD.org
Sat Mar 12 01:26:06 UTC 2011
Author: marcel
Date: Sat Mar 12 01:26:04 2011
New Revision: 219554
URL: http://svn.freebsd.org/changeset/base/219554
Log:
Merge svn+ssh://svn.freebsd.org/base/head@219553
Added:
projects/altix/sys/cddl/boot/zfs/zle.c
- copied unchanged from r219553, head/sys/cddl/boot/zfs/zle.c
projects/altix/sys/cddl/compat/opensolaris/kern/opensolaris_sunddi.c
- copied unchanged from r219553, head/sys/cddl/compat/opensolaris/kern/opensolaris_sunddi.c
projects/altix/sys/cddl/compat/opensolaris/kern/opensolaris_sysevent.c
- copied unchanged from r219553, head/sys/cddl/compat/opensolaris/kern/opensolaris_sysevent.c
projects/altix/sys/cddl/compat/opensolaris/sys/systeminfo.h
- copied unchanged from r219553, head/sys/cddl/compat/opensolaris/sys/systeminfo.h
projects/altix/sys/cddl/contrib/opensolaris/common/zfs/zfs_fletcher.c
- copied unchanged from r219553, head/sys/cddl/contrib/opensolaris/common/zfs/zfs_fletcher.c
projects/altix/sys/cddl/contrib/opensolaris/common/zfs/zfs_fletcher.h
- copied unchanged from r219553, head/sys/cddl/contrib/opensolaris/common/zfs/zfs_fletcher.h
projects/altix/sys/cddl/contrib/opensolaris/common/zfs/zfs_ioctl_compat.c
- copied unchanged from r219553, head/sys/cddl/contrib/opensolaris/common/zfs/zfs_ioctl_compat.c
projects/altix/sys/cddl/contrib/opensolaris/common/zfs/zfs_ioctl_compat.h
- copied unchanged from r219553, head/sys/cddl/contrib/opensolaris/common/zfs/zfs_ioctl_compat.h
projects/altix/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/bpobj.c
- copied unchanged from r219553, head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/bpobj.c
projects/altix/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/ddt.c
- copied unchanged from r219553, head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/ddt.c
projects/altix/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/ddt_zap.c
- copied unchanged from r219553, head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/ddt_zap.c
projects/altix/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_diff.c
- copied unchanged from r219553, head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_diff.c
projects/altix/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_deadlist.c
- copied unchanged from r219553, head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_deadlist.c
projects/altix/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_scan.c
- copied unchanged from r219553, head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_scan.c
projects/altix/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sa.c
- copied unchanged from r219553, head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sa.c
projects/altix/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/bpobj.h
- copied unchanged from r219553, head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/bpobj.h
projects/altix/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/ddt.h
- copied unchanged from r219553, head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/ddt.h
projects/altix/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_deadlist.h
- copied unchanged from r219553, head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_deadlist.h
projects/altix/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_scan.h
- copied unchanged from r219553, head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_scan.h
projects/altix/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/sa.h
- copied unchanged from r219553, head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/sa.h
projects/altix/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/sa_impl.h
- copied unchanged from r219553, head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/sa_impl.h
projects/altix/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_onexit.h
- copied unchanged from r219553, head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_onexit.h
projects/altix/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_sa.h
- copied unchanged from r219553, head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_sa.h
projects/altix/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_stat.h
- copied unchanged from r219553, head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_stat.h
projects/altix/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zrlock.h
- copied unchanged from r219553, head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zrlock.h
projects/altix/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_debug.c
- copied unchanged from r219553, head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_debug.c
projects/altix/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_onexit.c
- copied unchanged from r219553, head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_onexit.c
projects/altix/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_sa.c
- copied unchanged from r219553, head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_sa.c
projects/altix/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zle.c
- copied unchanged from r219553, head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zle.c
projects/altix/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zrlock.c
- copied unchanged from r219553, head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zrlock.c
projects/altix/sys/cddl/contrib/opensolaris/uts/common/os/fm.c
- copied unchanged from r219553, head/sys/cddl/contrib/opensolaris/uts/common/os/fm.c
projects/altix/sys/cddl/contrib/opensolaris/uts/common/sys/fs/zut.h
- copied unchanged from r219553, head/sys/cddl/contrib/opensolaris/uts/common/sys/fs/zut.h
projects/altix/sys/cddl/contrib/opensolaris/uts/common/sys/sysevent/dev.h
- copied unchanged from r219553, head/sys/cddl/contrib/opensolaris/uts/common/sys/sysevent/dev.h
projects/altix/sys/dev/ath/ath_hal/ah_regdomain/
- copied from r219553, head/sys/dev/ath/ath_hal/ah_regdomain/
projects/altix/sys/dev/ath/ath_hal/ah_regdomain.h
- copied unchanged from r219553, head/sys/dev/ath/ath_hal/ah_regdomain.h
projects/altix/sys/dev/ath/ath_hal/ar9002/ar9002phy.h
- copied unchanged from r219553, head/sys/dev/ath/ath_hal/ar9002/ar9002phy.h
projects/altix/sys/dev/ath/ath_hal/ar9002/ar9280_olc.c
- copied unchanged from r219553, head/sys/dev/ath/ath_hal/ar9002/ar9280_olc.c
projects/altix/sys/dev/ath/ath_hal/ar9002/ar9280_olc.h
- copied unchanged from r219553, head/sys/dev/ath/ath_hal/ar9002/ar9280_olc.h
projects/altix/sys/dev/ath/ath_hal/ar9002/ar9285_cal.c
- copied unchanged from r219553, head/sys/dev/ath/ath_hal/ar9002/ar9285_cal.c
projects/altix/sys/dev/ath/ath_hal/ar9002/ar9285_cal.h
- copied unchanged from r219553, head/sys/dev/ath/ath_hal/ar9002/ar9285_cal.h
projects/altix/sys/dev/ath/ath_hal/ar9002/ar9285phy.h
- copied unchanged from r219553, head/sys/dev/ath/ath_hal/ar9002/ar9285phy.h
projects/altix/sys/dev/ath/if_ath_keycache.c
- copied unchanged from r219553, head/sys/dev/ath/if_ath_keycache.c
projects/altix/sys/dev/ath/if_ath_keycache.h
- copied unchanged from r219553, head/sys/dev/ath/if_ath_keycache.h
projects/altix/sys/dev/ath/if_ath_sysctl.c
- copied unchanged from r219553, head/sys/dev/ath/if_ath_sysctl.c
projects/altix/sys/dev/ath/if_ath_sysctl.h
- copied unchanged from r219553, head/sys/dev/ath/if_ath_sysctl.h
projects/altix/sys/kern/capabilities.conf
- copied unchanged from r219553, head/sys/kern/capabilities.conf
projects/altix/sys/kern/kern_loginclass.c
- copied unchanged from r219553, head/sys/kern/kern_loginclass.c
projects/altix/sys/kern/sys_capability.c
- copied unchanged from r219553, head/sys/kern/sys_capability.c
projects/altix/sys/netgraph/netflow/netflow_v9.c
- copied unchanged from r219553, head/sys/netgraph/netflow/netflow_v9.c
projects/altix/sys/netgraph/netflow/netflow_v9.h
- copied unchanged from r219553, head/sys/netgraph/netflow/netflow_v9.h
projects/altix/sys/sparc64/pci/ofw_pci_if.m
- copied unchanged from r219553, head/sys/sparc64/pci/ofw_pci_if.m
projects/altix/sys/sys/capability.h
- copied unchanged from r219553, head/sys/sys/capability.h
projects/altix/sys/sys/loginclass.h
- copied unchanged from r219553, head/sys/sys/loginclass.h
Deleted:
projects/altix/sys/cddl/compat/opensolaris/sys/sysmacros.h
projects/altix/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_scrub.c
projects/altix/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/fletcher.c
projects/altix/sys/cddl/contrib/opensolaris/uts/common/sys/byteorder.h
projects/altix/sys/dev/drm/drm-preprocess.sh
projects/altix/sys/dev/drm/drm-subprocess.pl
Modified:
projects/altix/lib/libstand/environment.c
projects/altix/sys/amd64/amd64/elf_machdep.c
projects/altix/sys/amd64/amd64/identcpu.c
projects/altix/sys/amd64/amd64/machdep.c
projects/altix/sys/amd64/amd64/pmap.c
projects/altix/sys/amd64/amd64/prof_machdep.c
projects/altix/sys/amd64/amd64/sys_machdep.c
projects/altix/sys/amd64/amd64/trap.c
projects/altix/sys/amd64/conf/GENERIC
projects/altix/sys/amd64/conf/NOTES
projects/altix/sys/amd64/include/clock.h
projects/altix/sys/amd64/linux32/linux32_genassym.c
projects/altix/sys/amd64/linux32/linux32_sysvec.c
projects/altix/sys/arm/arm/elf_machdep.c
projects/altix/sys/arm/arm/sys_machdep.c
projects/altix/sys/arm/at91/at91_machdep.c
projects/altix/sys/arm/s3c2xx0/s3c24x0_machdep.c
projects/altix/sys/arm/xscale/i80321/iq80321.c
projects/altix/sys/arm/xscale/ixp425/files.ixp425
projects/altix/sys/arm/xscale/pxa/pxa_machdep.c
projects/altix/sys/boot/common/gpt.c
projects/altix/sys/boot/common/interp.c
projects/altix/sys/boot/common/ufsread.c
projects/altix/sys/boot/common/util.h
projects/altix/sys/boot/efi/libefi/efipart.c
projects/altix/sys/boot/ficl/words.c
projects/altix/sys/boot/i386/boot0/Makefile
projects/altix/sys/boot/i386/boot2/boot2.c
projects/altix/sys/boot/i386/btx/btx/Makefile
projects/altix/sys/boot/i386/btx/btxldr/Makefile
projects/altix/sys/boot/i386/gptboot/Makefile
projects/altix/sys/boot/i386/gptzfsboot/Makefile
projects/altix/sys/boot/i386/libi386/Makefile
projects/altix/sys/boot/i386/pxeldr/Makefile
projects/altix/sys/boot/i386/zfsboot/Makefile
projects/altix/sys/boot/pc98/boot2/boot2.c
projects/altix/sys/boot/pc98/btx/btx/Makefile
projects/altix/sys/boot/pc98/btx/btxldr/Makefile
projects/altix/sys/boot/zfs/zfs.c
projects/altix/sys/boot/zfs/zfsimpl.c
projects/altix/sys/bsm/audit_errno.h
projects/altix/sys/cam/ata/ata_da.c
projects/altix/sys/cam/cam.c
projects/altix/sys/cam/cam_periph.c
projects/altix/sys/cam/cam_xpt.c
projects/altix/sys/cam/scsi/scsi_cd.c
projects/altix/sys/cam/scsi/scsi_da.c
projects/altix/sys/cam/scsi/scsi_sa.c
projects/altix/sys/cddl/boot/zfs/fletcher.c
projects/altix/sys/cddl/boot/zfs/zfsimpl.h
projects/altix/sys/cddl/boot/zfs/zfssubr.c
projects/altix/sys/cddl/compat/opensolaris/kern/opensolaris_atomic.c
projects/altix/sys/cddl/compat/opensolaris/kern/opensolaris_kmem.c
projects/altix/sys/cddl/compat/opensolaris/kern/opensolaris_misc.c
projects/altix/sys/cddl/compat/opensolaris/kern/opensolaris_policy.c
projects/altix/sys/cddl/compat/opensolaris/kern/opensolaris_string.c
projects/altix/sys/cddl/compat/opensolaris/kern/opensolaris_taskq.c
projects/altix/sys/cddl/compat/opensolaris/kern/opensolaris_vfs.c
projects/altix/sys/cddl/compat/opensolaris/kern/opensolaris_zone.c
projects/altix/sys/cddl/compat/opensolaris/sys/atomic.h
projects/altix/sys/cddl/compat/opensolaris/sys/byteorder.h
projects/altix/sys/cddl/compat/opensolaris/sys/dirent.h
projects/altix/sys/cddl/compat/opensolaris/sys/file.h
projects/altix/sys/cddl/compat/opensolaris/sys/kmem.h
projects/altix/sys/cddl/compat/opensolaris/sys/misc.h
projects/altix/sys/cddl/compat/opensolaris/sys/mount.h
projects/altix/sys/cddl/compat/opensolaris/sys/mutex.h
projects/altix/sys/cddl/compat/opensolaris/sys/policy.h
projects/altix/sys/cddl/compat/opensolaris/sys/proc.h
projects/altix/sys/cddl/compat/opensolaris/sys/rwlock.h
projects/altix/sys/cddl/compat/opensolaris/sys/sid.h
projects/altix/sys/cddl/compat/opensolaris/sys/stat.h
projects/altix/sys/cddl/compat/opensolaris/sys/string.h
projects/altix/sys/cddl/compat/opensolaris/sys/sunddi.h
projects/altix/sys/cddl/compat/opensolaris/sys/systm.h
projects/altix/sys/cddl/compat/opensolaris/sys/taskq.h
projects/altix/sys/cddl/compat/opensolaris/sys/time.h
projects/altix/sys/cddl/compat/opensolaris/sys/types.h
projects/altix/sys/cddl/compat/opensolaris/sys/uio.h
projects/altix/sys/cddl/compat/opensolaris/sys/vfs.h
projects/altix/sys/cddl/compat/opensolaris/sys/vnode.h
projects/altix/sys/cddl/compat/opensolaris/sys/zone.h
projects/altix/sys/cddl/contrib/opensolaris/common/acl/acl_common.c
projects/altix/sys/cddl/contrib/opensolaris/common/acl/acl_common.h
projects/altix/sys/cddl/contrib/opensolaris/common/atomic/amd64/opensolaris_atomic.S
projects/altix/sys/cddl/contrib/opensolaris/common/atomic/i386/opensolaris_atomic.S
projects/altix/sys/cddl/contrib/opensolaris/common/atomic/ia64/opensolaris_atomic.S
projects/altix/sys/cddl/contrib/opensolaris/common/atomic/powerpc64/opensolaris_atomic.S
projects/altix/sys/cddl/contrib/opensolaris/common/atomic/sparc64/opensolaris_atomic.S
projects/altix/sys/cddl/contrib/opensolaris/common/avl/avl.c
projects/altix/sys/cddl/contrib/opensolaris/common/nvpair/nvpair.c
projects/altix/sys/cddl/contrib/opensolaris/common/unicode/u8_textprep.c
projects/altix/sys/cddl/contrib/opensolaris/common/zfs/zfs_comutil.c
projects/altix/sys/cddl/contrib/opensolaris/common/zfs/zfs_comutil.h
projects/altix/sys/cddl/contrib/opensolaris/common/zfs/zfs_deleg.c
projects/altix/sys/cddl/contrib/opensolaris/common/zfs/zfs_deleg.h
projects/altix/sys/cddl/contrib/opensolaris/common/zfs/zfs_namecheck.c
projects/altix/sys/cddl/contrib/opensolaris/common/zfs/zfs_prop.c
projects/altix/sys/cddl/contrib/opensolaris/common/zfs/zfs_prop.h
projects/altix/sys/cddl/contrib/opensolaris/common/zfs/zpool_prop.c
projects/altix/sys/cddl/contrib/opensolaris/common/zfs/zprop_common.c
projects/altix/sys/cddl/contrib/opensolaris/uts/common/Makefile.files
projects/altix/sys/cddl/contrib/opensolaris/uts/common/fs/gfs.c
projects/altix/sys/cddl/contrib/opensolaris/uts/common/fs/vnode.c
projects/altix/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c
projects/altix/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/bplist.c
projects/altix/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dbuf.c
projects/altix/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu.c
projects/altix/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_object.c
projects/altix/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_objset.c
projects/altix/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_send.c
projects/altix/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_traverse.c
projects/altix/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_tx.c
projects/altix/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_zfetch.c
projects/altix/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dnode.c
projects/altix/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dnode_sync.c
projects/altix/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_dataset.c
projects/altix/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_deleg.c
projects/altix/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_dir.c
projects/altix/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_pool.c
projects/altix/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_prop.c
projects/altix/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_synctask.c
projects/altix/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/lzjb.c
projects/altix/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/metaslab.c
projects/altix/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/refcount.c
projects/altix/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sha256.c
projects/altix/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa.c
projects/altix/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa_config.c
projects/altix/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa_errlog.c
projects/altix/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa_history.c
projects/altix/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa_misc.c
projects/altix/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/space_map.c
projects/altix/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/arc.h
projects/altix/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/bplist.h
projects/altix/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dbuf.h
projects/altix/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dmu.h
projects/altix/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_impl.h
projects/altix/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_objset.h
projects/altix/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_traverse.h
projects/altix/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_tx.h
projects/altix/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dnode.h
projects/altix/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_dataset.h
projects/altix/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_deleg.h
projects/altix/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_dir.h
projects/altix/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_pool.h
projects/altix/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_prop.h
projects/altix/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_synctask.h
projects/altix/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/metaslab.h
projects/altix/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/metaslab_impl.h
projects/altix/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/refcount.h
projects/altix/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/spa.h
projects/altix/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/spa_boot.h
projects/altix/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/spa_impl.h
projects/altix/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/txg.h
projects/altix/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/txg_impl.h
projects/altix/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/uberblock.h
projects/altix/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/uberblock_impl.h
projects/altix/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/vdev.h
projects/altix/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/vdev_impl.h
projects/altix/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zap.h
projects/altix/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zap_impl.h
projects/altix/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zap_leaf.h
projects/altix/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_acl.h
projects/altix/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_context.h
projects/altix/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_debug.h
projects/altix/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_dir.h
projects/altix/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_fuid.h
projects/altix/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_ioctl.h
projects/altix/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_vfsops.h
projects/altix/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_znode.h
projects/altix/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zil.h
projects/altix/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zil_impl.h
projects/altix/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zio.h
projects/altix/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zio_checksum.h
projects/altix/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zio_compress.h
projects/altix/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zio_impl.h
projects/altix/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zvol.h
projects/altix/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/txg.c
projects/altix/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/uberblock.c
projects/altix/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev.c
projects/altix/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_cache.c
projects/altix/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_disk.c
projects/altix/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_file.c
projects/altix/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_geom.c
projects/altix/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_label.c
projects/altix/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_mirror.c
projects/altix/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_missing.c
projects/altix/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_queue.c
projects/altix/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_raidz.c
projects/altix/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_root.c
projects/altix/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zap.c
projects/altix/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zap_leaf.c
projects/altix/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zap_micro.c
projects/altix/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_acl.c
projects/altix/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_byteswap.c
projects/altix/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ctldir.c
projects/altix/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_dir.c
projects/altix/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_fm.c
projects/altix/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_fuid.c
projects/altix/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c
projects/altix/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_log.c
projects/altix/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_replay.c
projects/altix/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_rlock.c
projects/altix/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c
projects/altix/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c
projects/altix/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_znode.c
projects/altix/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zil.c
projects/altix/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zio.c
projects/altix/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zio_checksum.c
projects/altix/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zio_compress.c
projects/altix/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zio_inject.c
projects/altix/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zvol.c
projects/altix/sys/cddl/contrib/opensolaris/uts/common/os/callb.c
projects/altix/sys/cddl/contrib/opensolaris/uts/common/sys/acl.h
projects/altix/sys/cddl/contrib/opensolaris/uts/common/sys/acl_impl.h
projects/altix/sys/cddl/contrib/opensolaris/uts/common/sys/avl.h
projects/altix/sys/cddl/contrib/opensolaris/uts/common/sys/callb.h
projects/altix/sys/cddl/contrib/opensolaris/uts/common/sys/cpupart.h
projects/altix/sys/cddl/contrib/opensolaris/uts/common/sys/cpuvar.h
projects/altix/sys/cddl/contrib/opensolaris/uts/common/sys/cred.h
projects/altix/sys/cddl/contrib/opensolaris/uts/common/sys/debug.h
projects/altix/sys/cddl/contrib/opensolaris/uts/common/sys/fm/fs/zfs.h
projects/altix/sys/cddl/contrib/opensolaris/uts/common/sys/fm/protocol.h
projects/altix/sys/cddl/contrib/opensolaris/uts/common/sys/fm/util.h
projects/altix/sys/cddl/contrib/opensolaris/uts/common/sys/fs/zfs.h
projects/altix/sys/cddl/contrib/opensolaris/uts/common/sys/gfs.h
projects/altix/sys/cddl/contrib/opensolaris/uts/common/sys/idmap.h
projects/altix/sys/cddl/contrib/opensolaris/uts/common/sys/isa_defs.h
projects/altix/sys/cddl/contrib/opensolaris/uts/common/sys/nvpair.h
projects/altix/sys/cddl/contrib/opensolaris/uts/common/sys/processor.h
projects/altix/sys/cddl/contrib/opensolaris/uts/common/sys/sysevent.h
projects/altix/sys/cddl/contrib/opensolaris/uts/common/sys/sysevent/eventdefs.h
projects/altix/sys/cddl/contrib/opensolaris/uts/common/sys/sysmacros.h
projects/altix/sys/cddl/contrib/opensolaris/uts/common/sys/taskq.h
projects/altix/sys/cddl/contrib/opensolaris/uts/common/sys/u8_textprep.h
projects/altix/sys/cddl/contrib/opensolaris/uts/common/sys/vnode.h
projects/altix/sys/cddl/dev/dtrace/amd64/dtrace_subr.c
projects/altix/sys/cddl/dev/dtrace/i386/dtrace_subr.c
projects/altix/sys/compat/freebsd32/freebsd32.h
projects/altix/sys/compat/freebsd32/freebsd32_proto.h
projects/altix/sys/compat/freebsd32/freebsd32_syscall.h
projects/altix/sys/compat/freebsd32/freebsd32_syscalls.c
projects/altix/sys/compat/freebsd32/freebsd32_sysent.c
projects/altix/sys/compat/freebsd32/syscalls.master
projects/altix/sys/compat/ia32/ia32_sysvec.c
projects/altix/sys/compat/linux/linux_emul.c
projects/altix/sys/compat/linux/linux_emul.h
projects/altix/sys/compat/linux/linux_fork.c
projects/altix/sys/compat/linux/linux_futex.c
projects/altix/sys/compat/ndis/kern_ndis.c
projects/altix/sys/compat/ndis/subr_ntoskrnl.c
projects/altix/sys/compat/svr4/svr4_sysvec.c
projects/altix/sys/compat/x86bios/x86bios.c
projects/altix/sys/conf/Makefile.amd64
projects/altix/sys/conf/Makefile.i386
projects/altix/sys/conf/NOTES
projects/altix/sys/conf/files
projects/altix/sys/conf/kern.pre.mk
projects/altix/sys/conf/options
projects/altix/sys/contrib/altq/altq/altq_cbq.c
projects/altix/sys/contrib/altq/altq/altq_cdnr.c
projects/altix/sys/contrib/altq/altq/altq_hfsc.c
projects/altix/sys/contrib/altq/altq/altq_priq.c
projects/altix/sys/contrib/altq/altq/altq_red.c
projects/altix/sys/contrib/altq/altq/altq_rio.c
projects/altix/sys/contrib/altq/altq/altq_rmclass.c
projects/altix/sys/contrib/altq/altq/altq_subr.c
projects/altix/sys/contrib/altq/altq/altq_var.h
projects/altix/sys/contrib/altq/altq/if_altq.h
projects/altix/sys/crypto/aesni/aeskeys_amd64.S
projects/altix/sys/crypto/aesni/aeskeys_i386.S
projects/altix/sys/crypto/sha2/sha2.c
projects/altix/sys/dev/acpica/acpivar.h
projects/altix/sys/dev/advansys/adwcam.c
projects/altix/sys/dev/ahci/ahci.c
projects/altix/sys/dev/aic7xxx/aic79xx_osm.h
projects/altix/sys/dev/aic7xxx/aic7xxx_osm.h
projects/altix/sys/dev/asr/i2omsg.h
projects/altix/sys/dev/ata/ata-disk.c
projects/altix/sys/dev/ata/ata-dma.c
projects/altix/sys/dev/ata/chipsets/ata-ahci.c
projects/altix/sys/dev/ata/chipsets/ata-siliconimage.c
projects/altix/sys/dev/ath/ah_osdep.c
projects/altix/sys/dev/ath/ath_hal/ah.c
projects/altix/sys/dev/ath/ath_hal/ah_eeprom.h
projects/altix/sys/dev/ath/ath_hal/ah_eeprom_v14.c
projects/altix/sys/dev/ath/ath_hal/ah_eeprom_v14.h
projects/altix/sys/dev/ath/ath_hal/ah_internal.h
projects/altix/sys/dev/ath/ath_hal/ah_regdomain.c
projects/altix/sys/dev/ath/ath_hal/ar5212/ar5212.h
projects/altix/sys/dev/ath/ath_hal/ar5212/ar5212_misc.c
projects/altix/sys/dev/ath/ath_hal/ar5416/ar5416.h
projects/altix/sys/dev/ath/ath_hal/ar5416/ar5416_attach.c
projects/altix/sys/dev/ath/ath_hal/ar5416/ar5416_cal.c
projects/altix/sys/dev/ath/ath_hal/ar5416/ar5416_cal.h
projects/altix/sys/dev/ath/ath_hal/ar5416/ar5416_phy.c
projects/altix/sys/dev/ath/ath_hal/ar5416/ar5416_reset.c
projects/altix/sys/dev/ath/ath_hal/ar5416/ar5416reg.h
projects/altix/sys/dev/ath/ath_hal/ar9002/ar9280.h
projects/altix/sys/dev/ath/ath_hal/ar9002/ar9280_attach.c
projects/altix/sys/dev/ath/ath_hal/ar9002/ar9285.h
projects/altix/sys/dev/ath/ath_hal/ar9002/ar9285_attach.c
projects/altix/sys/dev/ath/ath_hal/ar9002/ar9285_reset.c
projects/altix/sys/dev/ath/ath_rate/sample/sample.c
projects/altix/sys/dev/ath/if_ath.c
projects/altix/sys/dev/ath/if_ath_misc.h
projects/altix/sys/dev/ath/if_ath_tx.c
projects/altix/sys/dev/ath/if_ath_tx_ht.c
projects/altix/sys/dev/ath/if_athioctl.h
projects/altix/sys/dev/bktr/bktr_card.c
projects/altix/sys/dev/ctau/ctau.c
projects/altix/sys/dev/ctau/ctddk.h
projects/altix/sys/dev/cxgb/cxgb_main.c
projects/altix/sys/dev/cxgbe/adapter.h
projects/altix/sys/dev/cxgbe/common/common.h
projects/altix/sys/dev/cxgbe/t4_main.c
projects/altix/sys/dev/cxgbe/t4_sge.c
projects/altix/sys/dev/dc/if_dc.c
projects/altix/sys/dev/drm/mach64_dma.c
projects/altix/sys/dev/drm/r300_reg.h
projects/altix/sys/dev/e1000/e1000_82575.c
projects/altix/sys/dev/e1000/e1000_ich8lan.c
projects/altix/sys/dev/ep/if_epreg.h
projects/altix/sys/dev/fdc/fdc.c
projects/altix/sys/dev/firewire/fwohci.c
projects/altix/sys/dev/firewire/sbp.c
projects/altix/sys/dev/fxp/if_fxp.c
projects/altix/sys/dev/isp/isp.c
projects/altix/sys/dev/isp/isp_freebsd.c
projects/altix/sys/dev/isp/isp_freebsd.h
projects/altix/sys/dev/isp/isp_pci.c
projects/altix/sys/dev/isp/ispvar.h
projects/altix/sys/dev/ixgb/ixgb_ee.c
projects/altix/sys/dev/malo/if_malohal.h
projects/altix/sys/dev/mps/mps.c
projects/altix/sys/dev/mps/mps_sas.c
projects/altix/sys/dev/mps/mpsvar.h
projects/altix/sys/dev/mpt/mpt.c
projects/altix/sys/dev/mpt/mpt_cam.c
projects/altix/sys/dev/mpt/mpt_user.c
projects/altix/sys/dev/mwl/mwlhal.h
projects/altix/sys/dev/nxge/xgehal/xgehal-device.c
projects/altix/sys/dev/nxge/xgehal/xgehal-ring-fp.c
projects/altix/sys/dev/pci/pci.c
projects/altix/sys/dev/random/randomdev_soft.c
projects/altix/sys/dev/sdhci/sdhci.c
projects/altix/sys/dev/sis/if_sis.c
projects/altix/sys/dev/sis/if_sisreg.h
projects/altix/sys/dev/sk/if_sk.c
projects/altix/sys/dev/sound/pci/es137x.c
projects/altix/sys/dev/sound/pcm/buffer.c
projects/altix/sys/dev/sound/usb/uaudio.c
projects/altix/sys/dev/stge/if_stge.c
projects/altix/sys/dev/sym/sym_fw1.h
projects/altix/sys/dev/sym/sym_fw2.h
projects/altix/sys/dev/ti/if_ti.c
projects/altix/sys/dev/ti/if_tireg.h
projects/altix/sys/dev/uart/uart_dev_ns8250.c
projects/altix/sys/dev/usb/controller/usb_controller.c
projects/altix/sys/dev/usb/quirk/usb_quirk.c
projects/altix/sys/dev/usb/quirk/usb_quirk.h
projects/altix/sys/dev/usb/serial/ulpt.c
projects/altix/sys/dev/usb/usb_generic.c
projects/altix/sys/dev/usb/usb_ioctl.h
projects/altix/sys/dev/usb/usb_process.c
projects/altix/sys/dev/usb/usb_transfer.c
projects/altix/sys/dev/usb/usbdevs
projects/altix/sys/dev/usb/usbdi.h
projects/altix/sys/dev/usb/wlan/if_run.c
projects/altix/sys/dev/vx/if_vxreg.h
projects/altix/sys/dev/wpi/if_wpi.c
projects/altix/sys/dev/xl/if_xl.c
projects/altix/sys/fs/ext2fs/ext2_alloc.c
projects/altix/sys/fs/fdescfs/fdesc_vnops.c
projects/altix/sys/fs/msdosfs/msdosfs_vnops.c
projects/altix/sys/fs/nfsclient/nfs_clvfsops.c
projects/altix/sys/fs/nfsserver/nfs_nfsdport.c
projects/altix/sys/fs/nullfs/null_vnops.c
projects/altix/sys/fs/tmpfs/tmpfs_vnops.c
projects/altix/sys/geom/bde/g_bde.c
projects/altix/sys/geom/cache/g_cache.c
projects/altix/sys/geom/concat/g_concat.c
projects/altix/sys/geom/eli/g_eli.c
projects/altix/sys/geom/gate/g_gate.c
projects/altix/sys/geom/geom_bsd.c
projects/altix/sys/geom/geom_disk.c
projects/altix/sys/geom/geom_disk.h
projects/altix/sys/geom/geom_fox.c
projects/altix/sys/geom/geom_mbr.c
projects/altix/sys/geom/geom_pc98.c
projects/altix/sys/geom/geom_sunlabel.c
projects/altix/sys/geom/geom_vfs.c
projects/altix/sys/geom/geom_vol_ffs.c
projects/altix/sys/geom/journal/g_journal.c
projects/altix/sys/geom/label/g_label.c
projects/altix/sys/geom/label/g_label_ext2fs.c
projects/altix/sys/geom/linux_lvm/g_linux_lvm.c
projects/altix/sys/geom/mirror/g_mirror.c
projects/altix/sys/geom/multipath/g_multipath.c
projects/altix/sys/geom/part/g_part_apm.c
projects/altix/sys/geom/part/g_part_bsd.c
projects/altix/sys/geom/part/g_part_ebr.c
projects/altix/sys/geom/part/g_part_gpt.c
projects/altix/sys/geom/part/g_part_mbr.c
projects/altix/sys/geom/part/g_part_pc98.c
projects/altix/sys/geom/part/g_part_vtoc8.c
projects/altix/sys/geom/raid3/g_raid3.c
projects/altix/sys/geom/sched/gs_scheduler.h
projects/altix/sys/geom/shsec/g_shsec.c
projects/altix/sys/geom/stripe/g_stripe.c
projects/altix/sys/geom/uzip/g_uzip.c
projects/altix/sys/geom/virstor/g_virstor.c
projects/altix/sys/gnu/fs/xfs/xfs_dir_leaf.c
projects/altix/sys/gnu/fs/xfs/xfs_itable.c
projects/altix/sys/i386/conf/GENERIC
projects/altix/sys/i386/i386/elf_machdep.c
projects/altix/sys/i386/i386/identcpu.c
projects/altix/sys/i386/i386/machdep.c
projects/altix/sys/i386/i386/sys_machdep.c
projects/altix/sys/i386/i386/trap.c
projects/altix/sys/i386/ibcs2/ibcs2_sysvec.c
projects/altix/sys/i386/include/clock.h
projects/altix/sys/i386/include/pmap.h
projects/altix/sys/i386/isa/prof_machdep.c
projects/altix/sys/i386/linux/linux_sysvec.c
projects/altix/sys/ia64/ia64/elf_machdep.c
projects/altix/sys/ia64/ia64/machdep.c
projects/altix/sys/kern/Makefile
projects/altix/sys/kern/imgact_aout.c
projects/altix/sys/kern/imgact_shell.c
projects/altix/sys/kern/init_main.c
projects/altix/sys/kern/init_sysent.c
projects/altix/sys/kern/kern_cpuset.c
projects/altix/sys/kern/kern_dtrace.c
projects/altix/sys/kern/kern_exec.c
projects/altix/sys/kern/kern_fork.c
projects/altix/sys/kern/kern_jail.c
projects/altix/sys/kern/kern_ktr.c
projects/altix/sys/kern/kern_ktrace.c
projects/altix/sys/kern/kern_lock.c
projects/altix/sys/kern/kern_ntptime.c
projects/altix/sys/kern/kern_pmc.c
projects/altix/sys/kern/kern_proc.c
projects/altix/sys/kern/kern_prot.c
projects/altix/sys/kern/kern_thr.c
projects/altix/sys/kern/kern_thread.c
projects/altix/sys/kern/kern_umtx.c
projects/altix/sys/kern/ksched.c
projects/altix/sys/kern/makesyscalls.sh
projects/altix/sys/kern/subr_bus.c
projects/altix/sys/kern/subr_mchain.c
projects/altix/sys/kern/subr_stack.c
projects/altix/sys/kern/subr_trap.c
projects/altix/sys/kern/subr_unit.c
projects/altix/sys/kern/subr_witness.c
projects/altix/sys/kern/syscalls.c
projects/altix/sys/kern/syscalls.master
projects/altix/sys/kern/systrace_args.c
projects/altix/sys/kern/sysv_msg.c
projects/altix/sys/kern/sysv_sem.c
projects/altix/sys/kern/sysv_shm.c
projects/altix/sys/kern/tty_pts.c
projects/altix/sys/kern/uipc_cow.c
projects/altix/sys/kern/uipc_mbuf.c
projects/altix/sys/kern/uipc_mqueue.c
projects/altix/sys/kern/uipc_sem.c
projects/altix/sys/kern/vfs_subr.c
projects/altix/sys/libkern/jenkins.h
projects/altix/sys/mips/include/pmap.h
projects/altix/sys/mips/mips/cache_mipsNN.c
projects/altix/sys/mips/mips/elf64_machdep.c
projects/altix/sys/mips/mips/elf_machdep.c
projects/altix/sys/mips/mips/machdep.c
projects/altix/sys/mips/mips/pmap.c
projects/altix/sys/mips/mips/swtch.S
projects/altix/sys/mips/rmi/fmn.c
projects/altix/sys/mips/sibyte/sb_zbpci.c
projects/altix/sys/modules/ath/Makefile
projects/altix/sys/modules/bios/smapi/Makefile
projects/altix/sys/modules/linux/Makefile
projects/altix/sys/modules/netgraph/netflow/Makefile
projects/altix/sys/modules/opensolaris/Makefile
projects/altix/sys/modules/usb/Makefile
projects/altix/sys/modules/zfs/Makefile
projects/altix/sys/net/if_gif.c
projects/altix/sys/net/if_gre.c
projects/altix/sys/net/if_lagg.c
projects/altix/sys/net/if_media.c
projects/altix/sys/net/route.c
projects/altix/sys/net80211/_ieee80211.h
projects/altix/sys/net80211/ieee80211.c
projects/altix/sys/net80211/ieee80211.h
projects/altix/sys/net80211/ieee80211_adhoc.c
projects/altix/sys/net80211/ieee80211_ageq.c
projects/altix/sys/net80211/ieee80211_hostap.c
projects/altix/sys/net80211/ieee80211_ht.c
projects/altix/sys/net80211/ieee80211_ht.h
projects/altix/sys/net80211/ieee80211_input.c
projects/altix/sys/net80211/ieee80211_mesh.c
projects/altix/sys/net80211/ieee80211_output.c
projects/altix/sys/net80211/ieee80211_proto.c
projects/altix/sys/net80211/ieee80211_sta.c
projects/altix/sys/net80211/ieee80211_wds.c
projects/altix/sys/netgraph/bluetooth/socket/ng_btsocket_rfcomm.c
projects/altix/sys/netgraph/netflow/netflow.c
projects/altix/sys/netgraph/netflow/netflow.h
projects/altix/sys/netgraph/netflow/ng_netflow.c
projects/altix/sys/netgraph/netflow/ng_netflow.h
projects/altix/sys/netgraph/ng_one2many.c
projects/altix/sys/netgraph/ng_one2many.h
projects/altix/sys/netgraph/ng_source.c
projects/altix/sys/netinet/if_ether.c
projects/altix/sys/netinet/ip_input.c
projects/altix/sys/netinet/ipfw/ip_fw_private.h
projects/altix/sys/netinet/libalias/alias_sctp.c
projects/altix/sys/netinet/sctp.h
projects/altix/sys/netinet/sctp_cc_functions.c
projects/altix/sys/netinet/sctp_constants.h
projects/altix/sys/netinet/sctp_dtrace_declare.h
projects/altix/sys/netinet/sctp_dtrace_define.h
projects/altix/sys/netinet/sctp_indata.c
projects/altix/sys/netinet/sctp_input.c
projects/altix/sys/netinet/sctp_output.c
projects/altix/sys/netinet/sctp_pcb.c
projects/altix/sys/netinet/sctp_structs.h
projects/altix/sys/netinet/sctp_sysctl.c
projects/altix/sys/netinet/sctp_sysctl.h
projects/altix/sys/netinet/sctp_timer.c
projects/altix/sys/netinet/sctp_uio.h
projects/altix/sys/netinet/sctp_usrreq.c
projects/altix/sys/netinet/sctputil.c
projects/altix/sys/netinet/tcp_offload.h
projects/altix/sys/netinet/tcp_subr.c
projects/altix/sys/netinet/tcp_syncache.c
projects/altix/sys/netinet/tcp_timewait.c
projects/altix/sys/netinet6/in6.h
projects/altix/sys/nfsclient/nfs_vfsops.c
projects/altix/sys/nfsserver/nfs_serv.c
projects/altix/sys/opencrypto/xform.h
projects/altix/sys/pc98/cbus/fdc.c
projects/altix/sys/pc98/conf/GENERIC
projects/altix/sys/pc98/pc98/machdep.c
projects/altix/sys/powerpc/ofw/ofw_machdep.c
projects/altix/sys/powerpc/powerpc/elf32_machdep.c
projects/altix/sys/powerpc/powerpc/elf64_machdep.c
projects/altix/sys/security/audit/audit.c
projects/altix/sys/security/audit/audit_bsm_errno.c
projects/altix/sys/security/mac/mac_syscalls.c
projects/altix/sys/sparc64/conf/GENERIC
projects/altix/sys/sparc64/include/iommureg.h
projects/altix/sys/sparc64/pci/sbbc.c
projects/altix/sys/sparc64/sparc64/elf_machdep.c
projects/altix/sys/sparc64/sparc64/trap.c
projects/altix/sys/sun4v/conf/GENERIC
projects/altix/sys/sys/aac_ioctl.h
projects/altix/sys/sys/errno.h
projects/altix/sys/sys/eventhandler.h
projects/altix/sys/sys/ktrace.h
projects/altix/sys/sys/limits.h
projects/altix/sys/sys/param.h
projects/altix/sys/sys/priv.h
projects/altix/sys/sys/syscall.h
projects/altix/sys/sys/syscall.mk
projects/altix/sys/sys/sysent.h
projects/altix/sys/sys/sysproto.h
projects/altix/sys/sys/ucred.h
projects/altix/sys/sys/umtx.h
projects/altix/sys/sys/user.h
projects/altix/sys/ufs/ffs/ffs_alloc.c
projects/altix/sys/ufs/ufs/dirhash.h
projects/altix/sys/ufs/ufs/ufs_dirhash.c
projects/altix/sys/ufs/ufs/ufs_quota.c
projects/altix/sys/vm/device_pager.c
projects/altix/sys/vm/sg_pager.c
projects/altix/sys/vm/swap_pager.c
projects/altix/sys/vm/vm_map.h
projects/altix/sys/vm/vm_mmap.c
projects/altix/sys/vm/vm_page.c
projects/altix/sys/vm/vm_page.h
projects/altix/sys/x86/cpufreq/est.c
projects/altix/sys/x86/isa/clock.c
projects/altix/sys/x86/x86/tsc.c
Directory Properties:
projects/altix/lib/libstand/ (props changed)
projects/altix/sys/ (props changed)
projects/altix/sys/amd64/include/xen/ (props changed)
projects/altix/sys/boot/i386/efi/ (props changed)
projects/altix/sys/boot/ia64/efi/ (props changed)
projects/altix/sys/boot/ia64/ski/ (props changed)
projects/altix/sys/boot/powerpc/boot1.chrp/ (props changed)
projects/altix/sys/boot/powerpc/ofw/ (props changed)
projects/altix/sys/cddl/contrib/opensolaris/ (props changed)
projects/altix/sys/conf/ (props changed)
projects/altix/sys/contrib/dev/acpica/ (props changed)
projects/altix/sys/contrib/octeon-sdk/ (props changed)
projects/altix/sys/contrib/pf/ (props changed)
projects/altix/sys/contrib/x86emu/ (props changed)
projects/altix/sys/kern/subr_busdma.c (props changed)
Modified: projects/altix/lib/libstand/environment.c
==============================================================================
--- projects/altix/lib/libstand/environment.c Sat Mar 12 00:41:57 2011 (r219553)
+++ projects/altix/lib/libstand/environment.c Sat Mar 12 01:26:04 2011 (r219554)
@@ -59,7 +59,7 @@ env_getenv(const char *name)
* Some notes:
*
* If the EV_VOLATILE flag is set, a copy of the variable is made.
- * If EV_DYNAMIC is set, the the variable has been allocated with
+ * If EV_DYNAMIC is set, the variable has been allocated with
* malloc and ownership transferred to the environment.
* If (value) is NULL, the variable is set but has no value.
*/
Modified: projects/altix/sys/amd64/amd64/elf_machdep.c
==============================================================================
--- projects/altix/sys/amd64/amd64/elf_machdep.c Sat Mar 12 00:41:57 2011 (r219553)
+++ projects/altix/sys/amd64/amd64/elf_machdep.c Sat Mar 12 01:26:04 2011 (r219554)
@@ -81,6 +81,7 @@ struct sysentvec elf64_freebsd_sysvec =
.sv_syscallnames = syscallnames,
.sv_shared_page_base = SHAREDPAGE,
.sv_shared_page_len = PAGE_SIZE,
+ .sv_schedtail = NULL,
};
INIT_SYSENTVEC(elf64_sysvec, &elf64_freebsd_sysvec);
Modified: projects/altix/sys/amd64/amd64/identcpu.c
==============================================================================
--- projects/altix/sys/amd64/amd64/identcpu.c Sat Mar 12 00:41:57 2011 (r219553)
+++ projects/altix/sys/amd64/amd64/identcpu.c Sat Mar 12 01:26:04 2011 (r219554)
@@ -193,10 +193,12 @@ printcpuinfo(void)
printf("%s (", cpu_model);
switch(cpu_class) {
case CPUCLASS_K8:
- hw_clockrate = (tsc_freq + 5000) / 1000000;
- printf("%jd.%02d-MHz ",
- (intmax_t)(tsc_freq + 4999) / 1000000,
- (u_int)((tsc_freq + 4999) / 10000) % 100);
+ if (tsc_freq != 0) {
+ hw_clockrate = (tsc_freq + 5000) / 1000000;
+ printf("%jd.%02d-MHz ",
+ (intmax_t)(tsc_freq + 4999) / 1000000,
+ (u_int)((tsc_freq + 4999) / 10000) % 100);
+ }
printf("K8");
break;
default:
Modified: projects/altix/sys/amd64/amd64/machdep.c
==============================================================================
--- projects/altix/sys/amd64/amd64/machdep.c Sat Mar 12 00:41:57 2011 (r219553)
+++ projects/altix/sys/amd64/amd64/machdep.c Sat Mar 12 01:26:04 2011 (r219554)
@@ -80,6 +80,9 @@ __FBSDID("$FreeBSD$");
#include <sys/reboot.h>
#include <sys/sched.h>
#include <sys/signalvar.h>
+#ifdef SMP
+#include <sys/smp.h>
+#endif
#include <sys/syscallsubr.h>
#include <sys/sysctl.h>
#include <sys/sysent.h>
@@ -544,20 +547,22 @@ cpu_est_clockrate(int cpu_id, uint64_t *
return (EINVAL);
/* If TSC is P-state invariant, DELAY(9) based logic fails. */
- if (tsc_is_invariant)
+ if (tsc_is_invariant && tsc_freq != 0)
return (EOPNOTSUPP);
/* If we're booting, trust the rate calibrated moments ago. */
- if (cold) {
+ if (cold && tsc_freq != 0) {
*rate = tsc_freq;
return (0);
}
#ifdef SMP
- /* Schedule ourselves on the indicated cpu. */
- thread_lock(curthread);
- sched_bind(curthread, cpu_id);
- thread_unlock(curthread);
+ if (smp_cpus > 1) {
+ /* Schedule ourselves on the indicated cpu. */
+ thread_lock(curthread);
+ sched_bind(curthread, cpu_id);
+ thread_unlock(curthread);
+ }
#endif
/* Calibrate by measuring a short delay. */
@@ -568,12 +573,24 @@ cpu_est_clockrate(int cpu_id, uint64_t *
intr_restore(reg);
#ifdef SMP
- thread_lock(curthread);
- sched_unbind(curthread);
- thread_unlock(curthread);
+ if (smp_cpus > 1) {
+ thread_lock(curthread);
+ sched_unbind(curthread);
+ thread_unlock(curthread);
+ }
#endif
- *rate = (tsc2 - tsc1) * 1000;
+ tsc2 -= tsc1;
+ if (tsc_freq != 0) {
+ *rate = tsc2 * 1000;
+ return (0);
+ }
+
+ /*
+ * Subtract 0.5% of the total. Empirical testing has shown that
+ * overhead in DELAY() works out to approximately this value.
+ */
+ *rate = tsc2 * 1000 - tsc2 * 5;
return (0);
}
Modified: projects/altix/sys/amd64/amd64/pmap.c
==============================================================================
--- projects/altix/sys/amd64/amd64/pmap.c Sat Mar 12 00:41:57 2011 (r219553)
+++ projects/altix/sys/amd64/amd64/pmap.c Sat Mar 12 01:26:04 2011 (r219554)
@@ -457,7 +457,7 @@ CTASSERT(powerof2(NDMPML4E));
static void
create_pagetables(vm_paddr_t *firstaddr)
{
- int i;
+ int i, j, ndm1g;
/* Allocate pages */
KPTphys = allocpages(firstaddr, NKPT);
@@ -469,8 +469,11 @@ create_pagetables(vm_paddr_t *firstaddr)
if (ndmpdp < 4) /* Minimum 4GB of dirmap */
ndmpdp = 4;
DMPDPphys = allocpages(firstaddr, NDMPML4E);
- if ((amd_feature & AMDID_PAGE1GB) == 0)
- DMPDphys = allocpages(firstaddr, ndmpdp);
+ ndm1g = 0;
+ if ((amd_feature & AMDID_PAGE1GB) != 0)
+ ndm1g = ptoa(Maxmem) >> PDPSHIFT;
+ if (ndm1g < ndmpdp)
+ DMPDphys = allocpages(firstaddr, ndmpdp - ndm1g);
dmaplimit = (vm_paddr_t)ndmpdp << PDPSHIFT;
/* Fill in the underlying page table pages */
@@ -502,32 +505,28 @@ create_pagetables(vm_paddr_t *firstaddr)
}
/*
- * Now, set up the direct map region using either 2MB or 1GB pages.
- * Later, if pmap_mapdev{_attr}() uses the direct map for non-write-
- * back memory, pmap_change_attr() will demote any 2MB or 1GB page
- * mappings that are partially used.
- */
- if ((amd_feature & AMDID_PAGE1GB) == 0) {
- for (i = 0; i < NPDEPG * ndmpdp; i++) {
- ((pd_entry_t *)DMPDphys)[i] = (vm_paddr_t)i << PDRSHIFT;
- /* Preset PG_M and PG_A because demotion expects it. */
- ((pd_entry_t *)DMPDphys)[i] |= PG_RW | PG_V | PG_PS |
- PG_G | PG_M | PG_A;
- }
- /* And the direct map space's PDP */
- for (i = 0; i < ndmpdp; i++) {
- ((pdp_entry_t *)DMPDPphys)[i] = DMPDphys +
- (i << PAGE_SHIFT);
- ((pdp_entry_t *)DMPDPphys)[i] |= PG_RW | PG_V | PG_U;
- }
- } else {
- for (i = 0; i < ndmpdp; i++) {
- ((pdp_entry_t *)DMPDPphys)[i] =
- (vm_paddr_t)i << PDPSHIFT;
- /* Preset PG_M and PG_A because demotion expects it. */
- ((pdp_entry_t *)DMPDPphys)[i] |= PG_RW | PG_V | PG_PS |
- PG_G | PG_M | PG_A;
- }
+ * Now, set up the direct map region using 2MB and/or 1GB pages. If
+ * the end of physical memory is not aligned to a 1GB page boundary,
+ * then the residual physical memory is mapped with 2MB pages. Later,
+ * if pmap_mapdev{_attr}() uses the direct map for non-write-back
+ * memory, pmap_change_attr() will demote any 2MB or 1GB page mappings
+ * that are partially used.
+ */
+ for (i = NPDEPG * ndm1g, j = 0; i < NPDEPG * ndmpdp; i++, j++) {
+ ((pd_entry_t *)DMPDphys)[j] = (vm_paddr_t)i << PDRSHIFT;
+ /* Preset PG_M and PG_A because demotion expects it. */
+ ((pd_entry_t *)DMPDphys)[j] |= PG_RW | PG_V | PG_PS | PG_G |
+ PG_M | PG_A;
+ }
+ for (i = 0; i < ndm1g; i++) {
+ ((pdp_entry_t *)DMPDPphys)[i] = (vm_paddr_t)i << PDPSHIFT;
+ /* Preset PG_M and PG_A because demotion expects it. */
+ ((pdp_entry_t *)DMPDPphys)[i] |= PG_RW | PG_V | PG_PS | PG_G |
+ PG_M | PG_A;
+ }
+ for (j = 0; i < ndmpdp; i++, j++) {
+ ((pdp_entry_t *)DMPDPphys)[i] = DMPDphys + (j << PAGE_SHIFT);
+ ((pdp_entry_t *)DMPDPphys)[i] |= PG_RW | PG_V | PG_U;
}
/* And recursively map PML4 to itself in order to get PTmap */
Modified: projects/altix/sys/amd64/amd64/prof_machdep.c
==============================================================================
--- projects/altix/sys/amd64/amd64/prof_machdep.c Sat Mar 12 00:41:57 2011 (r219553)
+++ projects/altix/sys/amd64/amd64/prof_machdep.c Sat Mar 12 01:26:04 2011 (r219554)
@@ -319,7 +319,7 @@ startguprof(gp)
if (cputime_clock == CPUTIME_CLOCK_UNINITIALIZED) {
cputime_clock = CPUTIME_CLOCK_I8254;
#if defined(I586_CPU) || defined(I686_CPU)
- if (tsc_freq != 0 && !tsc_is_broken && mp_ncpus == 1)
+ if (tsc_freq != 0 && mp_ncpus == 1)
cputime_clock = CPUTIME_CLOCK_TSC;
#endif
}
Modified: projects/altix/sys/amd64/amd64/sys_machdep.c
==============================================================================
--- projects/altix/sys/amd64/amd64/sys_machdep.c Sat Mar 12 00:41:57 2011 (r219553)
+++ projects/altix/sys/amd64/amd64/sys_machdep.c Sat Mar 12 01:26:04 2011 (r219554)
@@ -33,8 +33,11 @@
#include <sys/cdefs.h>
__FBSDID("$FreeBSD$");
+#include "opt_capabilities.h"
+
#include <sys/param.h>
#include <sys/systm.h>
+#include <sys/capability.h>
#include <sys/kernel.h>
#include <sys/lock.h>
#include <sys/malloc.h>
@@ -177,6 +180,32 @@ sysarch(td, uap)
uint64_t a64base;
struct i386_ioperm_args iargs;
+#ifdef CAPABILITIES
+ /*
+ * Whitelist of operations which are safe enough for capability mode.
+ */
+ if (IN_CAPABILITY_MODE(td)) {
+ switch (uap->op) {
+ case I386_GET_LDT:
+ case I386_SET_LDT:
+ case I386_GET_IOPERM:
+ case I386_GET_FSBASE:
+ case I386_SET_FSBASE:
+ case I386_GET_GSBASE:
+ case I386_SET_GSBASE:
+ case AMD64_GET_FSBASE:
+ case AMD64_SET_FSBASE:
+ case AMD64_GET_GSBASE:
+ case AMD64_SET_GSBASE:
+ break;
+
+ case I386_SET_IOPERM:
+ default:
+ return (ECAPMODE);
+ }
+ }
+#endif
+
if (uap->op == I386_GET_LDT || uap->op == I386_SET_LDT)
return (sysarch_ldt(td, uap, UIO_USERSPACE));
/*
Modified: projects/altix/sys/amd64/amd64/trap.c
==============================================================================
--- projects/altix/sys/amd64/amd64/trap.c Sat Mar 12 00:41:57 2011 (r219553)
+++ projects/altix/sys/amd64/amd64/trap.c Sat Mar 12 01:26:04 2011 (r219554)
@@ -235,7 +235,7 @@ trap(struct trapframe *frame)
* A trap can occur while DTrace executes a probe. Before
* executing the probe, DTrace blocks re-scheduling and sets
* a flag in it's per-cpu flags to indicate that it doesn't
- * want to fault. On returning from the the probe, the no-fault
+ * want to fault. On returning from the probe, the no-fault
* flag is cleared and finally re-scheduling is enabled.
*
* If the DTrace kernel module has registered a trap handler,
Modified: projects/altix/sys/amd64/conf/GENERIC
==============================================================================
--- projects/altix/sys/amd64/conf/GENERIC Sat Mar 12 00:41:57 2011 (r219553)
+++ projects/altix/sys/amd64/conf/GENERIC Sat Mar 12 01:26:04 2011 (r219554)
@@ -287,7 +287,7 @@ device uhci # UHCI PCI->USB interface
device ohci # OHCI PCI->USB interface
device ehci # EHCI PCI->USB interface (USB 2.0)
device usb # USB Bus (required)
-#device udbp # USB Double Bulk Pipe devices
+#device udbp # USB Double Bulk Pipe devices (needs netgraph)
device uhid # "Human Interface Devices"
device ukbd # Keyboard
device ulpt # Printer
Modified: projects/altix/sys/amd64/conf/NOTES
==============================================================================
--- projects/altix/sys/amd64/conf/NOTES Sat Mar 12 00:41:57 2011 (r219553)
+++ projects/altix/sys/amd64/conf/NOTES Sat Mar 12 01:26:04 2011 (r219554)
@@ -547,7 +547,7 @@ options LINSYSFS
# KSTACK_PAGES is the number of memory pages to assign to the kernel
# stack of each thread.
-options KSTACK_PAGES=3
+options KSTACK_PAGES=5
#####################################################################
Modified: projects/altix/sys/amd64/include/clock.h
==============================================================================
--- projects/altix/sys/amd64/include/clock.h Sat Mar 12 00:41:57 2011 (r219553)
+++ projects/altix/sys/amd64/include/clock.h Sat Mar 12 01:26:04 2011 (r219554)
@@ -18,7 +18,6 @@ extern int clkintr_pending;
extern u_int i8254_freq;
extern int i8254_max_count;
extern uint64_t tsc_freq;
-extern int tsc_is_broken;
extern int tsc_is_invariant;
void i8254_init(void);
Modified: projects/altix/sys/amd64/linux32/linux32_genassym.c
==============================================================================
--- projects/altix/sys/amd64/linux32/linux32_genassym.c Sat Mar 12 00:41:57 2011 (r219553)
+++ projects/altix/sys/amd64/linux32/linux32_genassym.c Sat Mar 12 01:26:04 2011 (r219554)
@@ -9,8 +9,6 @@ __FBSDID("$FreeBSD$");
ASSYM(LINUX_SIGF_HANDLER, offsetof(struct l_sigframe, sf_handler));
ASSYM(LINUX_SIGF_SC, offsetof(struct l_sigframe, sf_sc));
-ASSYM(LINUX_SC_ES, offsetof(struct l_sigcontext, sc_es));
-ASSYM(LINUX_SC_DS, offsetof(struct l_sigcontext, sc_ds));
ASSYM(LINUX_RT_SIGF_HANDLER, offsetof(struct l_rt_sigframe, sf_handler));
ASSYM(LINUX_RT_SIGF_UC, offsetof(struct l_rt_sigframe, sf_sc));
ASSYM(LINUX_RT_SIGF_SC, offsetof(struct l_ucontext, uc_mcontext));
Modified: projects/altix/sys/amd64/linux32/linux32_sysvec.c
==============================================================================
--- projects/altix/sys/amd64/linux32/linux32_sysvec.c Sat Mar 12 00:41:57 2011 (r219553)
+++ projects/altix/sys/amd64/linux32/linux32_sysvec.c Sat Mar 12 01:26:04 2011 (r219554)
@@ -128,7 +128,6 @@ static void linux32_fixlimit(struct rlim
static boolean_t linux32_trans_osrel(const Elf_Note *note, int32_t *osrel);
static eventhandler_tag linux_exit_tag;
-static eventhandler_tag linux_schedtail_tag;
static eventhandler_tag linux_exec_tag;
/*
@@ -1063,6 +1062,7 @@ struct sysentvec elf_linux_sysvec = {
.sv_set_syscall_retval = cpu_set_syscall_retval,
.sv_fetch_syscall_args = linux32_fetch_syscall_args,
.sv_syscallnames = NULL,
+ .sv_schedtail = linux_schedtail,
};
static char GNU_ABI_VENDOR[] = "GNU";
@@ -1156,8 +1156,6 @@ linux_elf_modevent(module_t mod, int typ
mtx_init(&futex_mtx, "ftllk", NULL, MTX_DEF);
linux_exit_tag = EVENTHANDLER_REGISTER(process_exit,
linux_proc_exit, NULL, 1000);
- linux_schedtail_tag = EVENTHANDLER_REGISTER(schedtail,
- linux_schedtail, NULL, 1000);
linux_exec_tag = EVENTHANDLER_REGISTER(process_exec,
linux_proc_exec, NULL, 1000);
linux_szplatform = roundup(strlen(linux_platform) + 1,
@@ -1189,7 +1187,6 @@ linux_elf_modevent(module_t mod, int typ
sx_destroy(&emul_shared_lock);
mtx_destroy(&futex_mtx);
EVENTHANDLER_DEREGISTER(process_exit, linux_exit_tag);
- EVENTHANDLER_DEREGISTER(schedtail, linux_schedtail_tag);
EVENTHANDLER_DEREGISTER(process_exec, linux_exec_tag);
linux_osd_jail_deregister();
if (bootverbose)
Modified: projects/altix/sys/arm/arm/elf_machdep.c
==============================================================================
--- projects/altix/sys/arm/arm/elf_machdep.c Sat Mar 12 00:41:57 2011 (r219553)
+++ projects/altix/sys/arm/arm/elf_machdep.c Sat Mar 12 01:26:04 2011 (r219554)
@@ -78,6 +78,7 @@ struct sysentvec elf32_freebsd_sysvec =
.sv_set_syscall_retval = cpu_set_syscall_retval,
.sv_fetch_syscall_args = NULL, /* XXXKIB */
.sv_syscallnames = syscallnames,
+ .sv_schedtail = NULL,
};
static Elf32_Brandinfo freebsd_brand_info = {
Modified: projects/altix/sys/arm/arm/sys_machdep.c
==============================================================================
--- projects/altix/sys/arm/arm/sys_machdep.c Sat Mar 12 00:41:57 2011 (r219553)
+++ projects/altix/sys/arm/arm/sys_machdep.c Sat Mar 12 01:26:04 2011 (r219554)
@@ -36,8 +36,11 @@
#include <sys/cdefs.h>
__FBSDID("$FreeBSD$");
+#include "opt_capabilities.h"
+
#include <sys/param.h>
#include <sys/systm.h>
+#include <sys/capability.h>
#include <sys/proc.h>
#include <sys/sysproto.h>
#include <sys/syscall.h>
@@ -104,6 +107,24 @@ sysarch(td, uap)
{
int error;
+#ifdef CAPABILITIES
+ /*
+ * Whitelist of operations which are safe enough for capability mode.
+ */
+ if (IN_CAPABILITY_MODE(td)) {
+ switch (uap->op) {
+ case ARM_SYNC_ICACHE:
+ case ARM_DRAIN_WRITEBUF:
+ case ARM_SET_TP:
+ case ARM_GET_TP:
+ break;
+
+ default:
+ return (ECAPMODE);
+ }
+ }
+#endif
+
switch (uap->op) {
case ARM_SYNC_ICACHE :
error = arm32_sync_icache(td, uap->parms);
Modified: projects/altix/sys/arm/at91/at91_machdep.c
==============================================================================
--- projects/altix/sys/arm/at91/at91_machdep.c Sat Mar 12 00:41:57 2011 (r219553)
+++ projects/altix/sys/arm/at91/at91_machdep.c Sat Mar 12 01:26:04 2011 (r219554)
@@ -256,6 +256,9 @@ initarm(void *arg, void *arg2)
pcpu_init(pcpup, 0, sizeof(struct pcpu));
PCPU_SET(curthread, &thread0);
+ /* Do basic tuning, hz etc */
+ init_param1();
+
freemempos = (lastaddr + PAGE_MASK) & ~PAGE_MASK;
/* Define a macro to simplify memory allocation */
#define valloc_pages(var, np) \
@@ -302,8 +305,6 @@ initarm(void *arg, void *arg2)
valloc_pages(kernelstack, KSTACK_PAGES);
valloc_pages(msgbufpv, round_page(msgbufsize) / PAGE_SIZE);
- /* Do basic tuning, hz etc */
- init_param1();
/*
* Now we start construction of the L1 page table
* We start by mapping the L2 page tables into the L1.
Modified: projects/altix/sys/arm/s3c2xx0/s3c24x0_machdep.c
==============================================================================
--- projects/altix/sys/arm/s3c2xx0/s3c24x0_machdep.c Sat Mar 12 00:41:57 2011 (r219553)
+++ projects/altix/sys/arm/s3c2xx0/s3c24x0_machdep.c Sat Mar 12 01:26:04 2011 (r219554)
@@ -257,6 +257,9 @@ initarm(void *arg, void *arg2)
pcpu_init(pcpup, 0, sizeof(struct pcpu));
PCPU_SET(curthread, &thread0);
+ /* Do basic tuning, hz etc */
+ init_param1();
+
#define KERNEL_TEXT_BASE (KERNBASE)
freemempos = (lastaddr + PAGE_MASK) & ~PAGE_MASK;
/* Define a macro to simplify memory allocation */
@@ -438,8 +441,6 @@ initarm(void *arg, void *arg2)
phys_avail[2] = 0;
phys_avail[3] = 0;
- /* Do basic tuning, hz etc */
- init_param1();
init_param2(physmem);
kdb_init();
Modified: projects/altix/sys/arm/xscale/i80321/iq80321.c
==============================================================================
--- projects/altix/sys/arm/xscale/i80321/iq80321.c Sat Mar 12 00:41:57 2011 (r219553)
+++ projects/altix/sys/arm/xscale/i80321/iq80321.c Sat Mar 12 01:26:04 2011 (r219554)
@@ -139,7 +139,7 @@ iq80321_attach(device_t dev)
device_get_name(dev));
/*
- * We have mapped the the PCI I/O windows in the early
+ * We have mapped the PCI I/O windows in the early
* bootstrap phase.
*/
sc->sc_iow_vaddr = IQ80321_IOW_VBASE;
Modified: projects/altix/sys/arm/xscale/ixp425/files.ixp425
==============================================================================
--- projects/altix/sys/arm/xscale/ixp425/files.ixp425 Sat Mar 12 00:41:57 2011 (r219553)
+++ projects/altix/sys/arm/xscale/ixp425/files.ixp425 Sat Mar 12 01:26:04 2011 (r219554)
@@ -38,7 +38,7 @@ IxNpeMicrocode.fwo optional npe_fw \
no-implicit-rule \
clean "IxNpeMicrocode.fwo"
IxNpeMicrocode.dat optional npe_fw \
- dependency ".PHONY" \
+ dependency "$S/contrib/dev/npe/IxNpeMicrocode.dat.uu" \
compile-with "uudecode < $S/contrib/dev/npe/IxNpeMicrocode.dat.uu" \
no-obj no-implicit-rule \
clean "IxNpeMicrocode.dat"
Modified: projects/altix/sys/arm/xscale/pxa/pxa_machdep.c
==============================================================================
--- projects/altix/sys/arm/xscale/pxa/pxa_machdep.c Sat Mar 12 00:41:57 2011 (r219553)
+++ projects/altix/sys/arm/xscale/pxa/pxa_machdep.c Sat Mar 12 01:26:04 2011 (r219554)
@@ -182,6 +182,9 @@ initarm(void *arg, void *arg2)
pcpu_init(pcpup, 0, sizeof(struct pcpu));
PCPU_SET(curthread, &thread0);
+ /* Do basic tuning, hz etc */
+ init_param1();
+
freemempos = 0xa0200000;
/* Define a macro to simplify memory allocation */
#define valloc_pages(var, np) \
@@ -424,8 +427,6 @@ initarm(void *arg, void *arg2)
phys_avail[0] = round_page(virtual_avail - KERNBASE + phys_avail[0]);
#endif
- /* Do basic tuning, hz etc */
- init_param1();
init_param2(physmem);
kdb_init();
return ((void *)(kernelstack.pv_va + USPACE_SVC_STACK_TOP -
Modified: projects/altix/sys/boot/common/gpt.c
==============================================================================
--- projects/altix/sys/boot/common/gpt.c Sat Mar 12 00:41:57 2011 (r219553)
+++ projects/altix/sys/boot/common/gpt.c Sat Mar 12 01:26:04 2011 (r219554)
@@ -71,7 +71,7 @@ gptupdate(const char *which, struct dsk
entries_per_sec = DEV_BSIZE / hdr->hdr_entsz;
slba = curent / entries_per_sec;
firstent = slba * entries_per_sec;
- bcpy(&table[firstent], secbuf, DEV_BSIZE);
+ bcopy(&table[firstent], secbuf, DEV_BSIZE);
slba += hdr->hdr_lba_table;
if (drvwrite(dskp, secbuf, slba, 1)) {
printf("%s: unable to update %s GPT partition table\n",
@@ -82,7 +82,7 @@ gptupdate(const char *which, struct dsk
hdr->hdr_crc_self = 0;
hdr->hdr_crc_self = crc32(hdr, hdr->hdr_size);
bzero(secbuf, DEV_BSIZE);
- bcpy(hdr, secbuf, hdr->hdr_size);
+ bcopy(hdr, secbuf, hdr->hdr_size);
if (drvwrite(dskp, secbuf, hdr->hdr_lba_self, 1)) {
printf("%s: unable to update %s GPT header\n", BOOTPROG, which);
return;
@@ -191,7 +191,7 @@ gptread_hdr(const char *which, struct ds
printf("%s: unable to read %s GPT header\n", BOOTPROG, which);
return (-1);
}
- bcpy(secbuf, hdr, sizeof(*hdr));
+ bcopy(secbuf, hdr, sizeof(*hdr));
if (bcmp(hdr->hdr_sig, GPT_HDR_SIG, sizeof(hdr->hdr_sig)) != 0 ||
hdr->hdr_lba_self != hdrlba || hdr->hdr_revision < 0x00010000 ||
hdr->hdr_entsz < sizeof(struct gpt_ent) ||
@@ -259,7 +259,7 @@ gptbootconv(const char *which, struct ds
}
if (!sector_updated)
continue;
- bcpy(&table[nent], secbuf, DEV_BSIZE);
+ bcopy(&table[nent], secbuf, DEV_BSIZE);
if (drvwrite(dskp, secbuf, slba, 1)) {
printf("%s: unable to update %s GPT partition table\n",
BOOTPROG, which);
@@ -271,7 +271,7 @@ gptbootconv(const char *which, struct ds
hdr->hdr_crc_self = 0;
hdr->hdr_crc_self = crc32(hdr, hdr->hdr_size);
bzero(secbuf, DEV_BSIZE);
- bcpy(hdr, secbuf, hdr->hdr_size);
+ bcopy(hdr, secbuf, hdr->hdr_size);
if (drvwrite(dskp, secbuf, hdr->hdr_lba_self, 1))
printf("%s: unable to update %s GPT header\n", BOOTPROG, which);
}
@@ -299,7 +299,7 @@ gptread_table(const char *which, const u
}
ent = (struct gpt_ent *)secbuf;
for (part = 0; part < entries_per_sec; part++, ent++) {
- bcpy(ent, &table[nent], sizeof(table[nent]));
+ bcopy(ent, &table[nent], sizeof(table[nent]));
if (++nent >= hdr->hdr_entries)
break;
}
Modified: projects/altix/sys/boot/common/interp.c
==============================================================================
--- projects/altix/sys/boot/common/interp.c Sat Mar 12 00:41:57 2011 (r219553)
+++ projects/altix/sys/boot/common/interp.c Sat Mar 12 01:26:04 2011 (r219554)
@@ -246,6 +246,17 @@ include(const char *filename)
if (*cp == '\0')
continue; /* ignore empty line, save memory */
sp = malloc(sizeof(struct includeline) + strlen(cp) + 1);
+ /* On malloc failure (it happens!), free as much as possible and exit */
+ if (sp == NULL) {
+ while (script != NULL) {
+ se = script;
+ script = script->next;
+ free(se);
+ }
+ sprintf(command_errbuf, "file '%s' line %d: memory allocation "
+ "failure - aborting\n", filename, line);
+ return (CMD_ERROR);
+ }
strcpy(sp->text, cp);
#ifndef BOOT_FORTH
sp->flags = flags;
Modified: projects/altix/sys/boot/common/ufsread.c
==============================================================================
--- projects/altix/sys/boot/common/ufsread.c Sat Mar 12 00:41:57 2011 (r219553)
+++ projects/altix/sys/boot/common/ufsread.c Sat Mar 12 01:26:04 2011 (r219554)
@@ -87,7 +87,7 @@ static struct dmadat *dmadat;
static ino_t lookup(const char *);
static ssize_t fsread(ino_t, void *, size_t);
-static int ls, dsk_meta;
+static uint8_t ls, dsk_meta;
static uint32_t fs_off;
static __inline int
@@ -126,8 +126,6 @@ lookup(const char *path)
ino = ROOTINO;
dt = DT_DIR;
- name[0] = '/';
- name[1] = '\0';
for (;;) {
if (*path == '/')
path++;
Modified: projects/altix/sys/boot/common/util.h
==============================================================================
--- projects/altix/sys/boot/common/util.h Sat Mar 12 00:41:57 2011 (r219553)
+++ projects/altix/sys/boot/common/util.h Sat Mar 12 01:26:04 2011 (r219554)
@@ -37,7 +37,7 @@ void memcpy(void *dst, const void *src,
void memset(void *b, int c, size_t len);
int memcmp(const void *b1, const void *b2, size_t len);
-#define bcpy(src, dst, len) memcpy((dst), (src), (len))
+#define bcopy(src, dst, len) memcpy((dst), (src), (len))
#define bzero(buf, size) memset((buf), 0, (size))
#define bcmp(b1, b2, len) (memcmp((b1), (b2), (len)) != 0)
Modified: projects/altix/sys/boot/efi/libefi/efipart.c
==============================================================================
--- projects/altix/sys/boot/efi/libefi/efipart.c Sat Mar 12 00:41:57 2011 (r219553)
+++ projects/altix/sys/boot/efi/libefi/efipart.c Sat Mar 12 01:26:04 2011 (r219554)
@@ -204,7 +204,7 @@ efipart_readwrite(EFI_BLOCK_IO *blkio, i
}
if (EFI_ERROR(status))
- printf("%s: rw=%d, status=%lu\n", __func__, rw, status);
+ printf("%s: rw=%d, status=%u\n", __func__, rw, status);
return (efi_status_to_errno(status));
}
Modified: projects/altix/sys/boot/ficl/words.c
==============================================================================
--- projects/altix/sys/boot/ficl/words.c Sat Mar 12 00:41:57 2011 (r219553)
+++ projects/altix/sys/boot/ficl/words.c Sat Mar 12 01:26:04 2011 (r219554)
@@ -1293,7 +1293,7 @@ static void ifCoIm(FICL_VM *pVM)
** compiles an "else"...
** 1) Compile a branch and a patch address; the address gets patched
** by "endif" to point past the "else" code.
-** 2) Pop the the "if" patch address
+** 2) Pop the "if" patch address
** 3) Patch the "if" branch to point to the current compile address.
** 4) Push the "else" patch address. ("endif" patches this to jump past
** the "else" code.
Modified: projects/altix/sys/boot/i386/boot0/Makefile
==============================================================================
--- projects/altix/sys/boot/i386/boot0/Makefile Sat Mar 12 00:41:57 2011 (r219553)
+++ projects/altix/sys/boot/i386/boot0/Makefile Sat Mar 12 01:26:04 2011 (r219554)
@@ -19,6 +19,12 @@ SRCS= ${PROG}.S
OPTS ?= -DVOLUME_SERIAL -DPXE
CFLAGS += ${OPTS}
+.if ${CC:T:Mclang} == "clang"
+# XXX: clang integrated-as doesn't grok .codeNN directives yet
+CFLAGS+= ${.IMPSRC:T:Mboot0.S:C/^.+$/-no-integrated-as/}
+CFLAGS+= ${.IMPSRC:T:Mboot0ext.S:C/^.+$/-no-integrated-as/}
+.endif
+
# Flags used in the boot0.S code:
# 0x0f all valid partitions enabled.
# 0x80 'packet', use BIOS EDD (LBA) extensions instead of CHS
Modified: projects/altix/sys/boot/i386/boot2/boot2.c
==============================================================================
--- projects/altix/sys/boot/i386/boot2/boot2.c Sat Mar 12 00:41:57 2011 (r219553)
+++ projects/altix/sys/boot/i386/boot2/boot2.c Sat Mar 12 01:26:04 2011 (r219554)
@@ -125,14 +125,14 @@ static struct dsk {
unsigned drive;
unsigned type;
unsigned unit;
- unsigned slice;
- unsigned part;
+ uint8_t slice;
+ uint8_t part;
unsigned start;
int init;
} dsk;
static char cmd[512], cmddup[512];
-static char kname[1024];
-static uint16_t opts;
+static const char *kname;
+static uint32_t opts;
static int comspeed = SIOSPD;
static struct bootinfo bootinfo;
static uint8_t ioctrl = IO_KEYBOARD;
@@ -144,7 +144,6 @@ static int xfsread(ino_t, void *, size_t
static int dskread(void *, unsigned, unsigned);
static void printf(const char *,...);
static void putchar(int);
-static uint32_t memsize(void);
static int drvread(void *, unsigned, unsigned);
static int keyhit(unsigned);
static int xputc(int);
@@ -182,15 +181,6 @@ xfsread(ino_t inode, void *buf, size_t n
return 0;
}
-static inline uint32_t
-memsize(void)
-{
- v86.addr = MEM_EXT;
- v86.eax = 0x8800;
- v86int();
- return v86.eax;
-}
-
static inline void
getstr(void)
{
@@ -236,6 +226,7 @@ main(void)
uint8_t autoboot;
ino_t ino;
+ kname = NULL;
dmadat = (void *)(roundup2(__base + (int32_t)&_end, 0x10000) - __base);
v86.ctl = V86_FLAGS;
v86.efl = PSL_RESERVED_DEFAULT | PSL_I;
@@ -245,9 +236,6 @@ main(void)
dsk.slice = *(uint8_t *)PTOV(ARGS + 1) + 1;
bootinfo.bi_version = BOOTINFO_VERSION;
bootinfo.bi_size = sizeof(bootinfo);
- bootinfo.bi_basemem = 0; /* XXX will be filled by loader or kernel */
- bootinfo.bi_extmem = memsize();
- bootinfo.bi_memsizes_valid++;
/* Process configuration file */
@@ -271,11 +259,11 @@ main(void)
* or in case of failure, try to load a kernel directly instead.
*/
- if (autoboot && !*kname) {
- memcpy(kname, PATH_BOOT3, sizeof(PATH_BOOT3));
+ if (autoboot && !kname) {
+ kname = PATH_BOOT3;
if (!keyhit(3*SECOND)) {
load();
- memcpy(kname, PATH_KERNEL, sizeof(PATH_KERNEL));
+ kname = PATH_KERNEL;
}
}
@@ -290,7 +278,7 @@ main(void)
'a' + dsk.part, kname);
if (ioctrl & IO_SERIAL)
sio_flush();
- if (!autoboot || keyhit(5*SECOND))
+ if (!autoboot || keyhit(3*SECOND))
getstr();
else if (!autoboot || !OPT_CHECK(RBX_QUIET))
putchar('\n');
@@ -319,9 +307,8 @@ load(void)
static Elf32_Shdr es[2];
caddr_t p;
ino_t ino;
- uint32_t addr, x;
+ uint32_t addr;
int i, j;
- uint8_t fmt;
if (!(ino = lookup(kname))) {
if (!ls)
@@ -330,15 +317,8 @@ load(void)
}
if (xfsread(ino, &hdr, sizeof(hdr)))
return;
- if (N_GETMAGIC(hdr.ex) == ZMAGIC)
- fmt = 0;
- else if (IS_ELF(hdr.eh))
- fmt = 1;
- else {
- printf("Invalid %s\n", "format");
- return;
- }
- if (fmt == 0) {
+
+ if (N_GETMAGIC(hdr.ex) == ZMAGIC) {
addr = hdr.ex.a_entry & 0xffffff;
p = PTOV(addr);
fs_off = PAGE_SIZE;
@@ -347,7 +327,7 @@ load(void)
p += roundup2(hdr.ex.a_text, PAGE_SIZE);
if (xfsread(ino, p, hdr.ex.a_data))
return;
- } else {
+ } else if (IS_ELF(hdr.eh)) {
fs_off = hdr.eh.e_phoff;
for (j = i = 0; i < hdr.eh.e_phnum && j < 2; i++) {
if (xfsread(ino, ep + j, sizeof(ep[0])))
@@ -379,7 +359,11 @@ load(void)
}
addr = hdr.eh.e_entry & 0xffffff;
bootinfo.bi_esymtab = VTOP(p);
+ } else {
+ printf("Invalid %s\n", "format");
+ return;
}
+
bootinfo.bi_kernelname = VTOP(kname);
bootinfo.bi_bios_dev = dsk.drive;
__exec((caddr_t)addr, RB_BOOTINFO | (opts & RBX_MASK),
@@ -474,11 +458,7 @@ parse()
? DRV_HARD : 0) + drv;
dsk_meta = 0;
}
- if ((i = ep - arg)) {
- if ((size_t)i >= sizeof(kname))
- return -1;
- memcpy(kname, arg, i + 1);
- }
+ kname = arg;
}
arg = p;
}
@@ -491,7 +471,8 @@ dskread(void *buf, unsigned lba, unsigne
struct dos_partition *dp;
struct disklabel *d;
char *sec;
- unsigned sl, i;
+ unsigned i;
+ uint8_t sl;
if (!dsk_meta) {
sec = dmadat->secbuf;
@@ -551,7 +532,7 @@ static void
printf(const char *fmt,...)
{
va_list ap;
- char buf[10];
+ static char buf[10];
char *s;
unsigned u;
int c;
@@ -630,7 +611,7 @@ keyhit(unsigned ticks)
t1 = *(uint32_t *)PTOV(0x46c);
if (!t0)
t0 = t1;
- if (t1 < t0 || t1 >= t0 + ticks)
+ if ((uint32_t)(t1 - t0) >= ticks)
return 0;
}
}
Modified: projects/altix/sys/boot/i386/btx/btx/Makefile
==============================================================================
--- projects/altix/sys/boot/i386/btx/btx/Makefile Sat Mar 12 00:41:57 2011 (r219553)
+++ projects/altix/sys/boot/i386/btx/btx/Makefile Sat Mar 12 01:26:04 2011 (r219554)
@@ -13,6 +13,11 @@ BOOT_BTX_FLAGS=0x0
CFLAGS+=-DBTX_FLAGS=${BOOT_BTX_FLAGS}
+.if ${CC:T:Mclang} == "clang"
+# XXX: clang integrated-as doesn't grok .codeNN directives yet
+CFLAGS+=${.IMPSRC:T:Mbtx.S:C/^.+$/-no-integrated-as/}
+.endif
+
.if defined(BTX_SERIAL)
BOOT_COMCONSOLE_PORT?= 0x3f8
BOOT_COMCONSOLE_SPEED?= 9600
Modified: projects/altix/sys/boot/i386/btx/btxldr/Makefile
==============================================================================
--- projects/altix/sys/boot/i386/btx/btxldr/Makefile Sat Mar 12 00:41:57 2011 (r219553)
+++ projects/altix/sys/boot/i386/btx/btxldr/Makefile Sat Mar 12 01:26:04 2011 (r219554)
@@ -11,6 +11,11 @@ CFLAGS+=-DLOADER_ADDRESS=${LOADER_ADDRES
CFLAGS+=-DBTXLDR_VERBOSE
.endif
+.if ${CC:T:Mclang} == "clang"
+# XXX: clang integrated-as doesn't grok .codeNN directives yet
+CFLAGS+=${.IMPSRC:T:Mbtxldr.S:C/^.+$/-no-integrated-as/}
+.endif
+
LDFLAGS=-e start -Ttext ${LOADER_ADDRESS} -Wl,-N,-S,--oformat,binary
.include <bsd.prog.mk>
Modified: projects/altix/sys/boot/i386/gptboot/Makefile
==============================================================================
--- projects/altix/sys/boot/i386/gptboot/Makefile Sat Mar 12 00:41:57 2011 (r219553)
+++ projects/altix/sys/boot/i386/gptboot/Makefile Sat Mar 12 01:26:04 2011 (r219554)
@@ -41,6 +41,11 @@ CFLAGS= -DBOOTPROG=\"gptboot\" \
-Wpointer-arith -Wshadow -Wstrict-prototypes -Wwrite-strings \
-Winline --param max-inline-insns-single=100
+.if ${CC:T:Mclang} == "clang"
+# XXX: clang integrated-as doesn't grok .codeNN directives yet
+CFLAGS+= ${.IMPSRC:T:Mgptldr.S:C/^.+$/-no-integrated-as/}
+.endif
+
LDFLAGS=-static -N --gc-sections
# Pick up ../Makefile.inc early.
@@ -60,7 +65,8 @@ gptldr.bin: gptldr.out
gptldr.out: gptldr.o
${LD} ${LDFLAGS} -e start -Ttext ${ORG1} -o ${.TARGET} gptldr.o
-CLEANFILES+= gptboot.bin gptboot.out gptboot.o sio.o ufsread.o
+CLEANFILES+= gptboot.bin gptboot.out gptboot.o sio.o gpt.o crc32.o drv.o \
+ cons.o util.o
gptboot.bin: gptboot.out
objcopy -S -O binary gptboot.out ${.TARGET}
Modified: projects/altix/sys/boot/i386/gptzfsboot/Makefile
==============================================================================
--- projects/altix/sys/boot/i386/gptzfsboot/Makefile Sat Mar 12 00:41:57 2011 (r219553)
+++ projects/altix/sys/boot/i386/gptzfsboot/Makefile Sat Mar 12 01:26:04 2011 (r219554)
@@ -33,11 +33,17 @@ CFLAGS= -DBOOTPROG=\"gptzfsboot\" \
-I${.CURDIR}/../../../cddl/boot/zfs \
-I${.CURDIR}/../btx/lib -I. \
-I${.CURDIR}/../boot2 \
+ -I${.CURDIR}/../../.. \
-Wall -Waggregate-return -Wbad-function-cast -Wcast-align \
-Wmissing-declarations -Wmissing-prototypes -Wnested-externs \
-Wpointer-arith -Wshadow -Wstrict-prototypes -Wwrite-strings \
-Winline --param max-inline-insns-single=100
+.if ${CC:T:Mclang} == "clang"
+# XXX: clang integrated-as doesn't grok .codeNN directives yet
+CFLAGS+= ${.IMPSRC:T:Mgptldr.S:C/^.+$/-no-integrated-as/}
+.endif
+
LDFLAGS=-static -N --gc-sections
# Pick up ../Makefile.inc early.
Modified: projects/altix/sys/boot/i386/libi386/Makefile
==============================================================================
--- projects/altix/sys/boot/i386/libi386/Makefile Sat Mar 12 00:41:57 2011 (r219553)
+++ projects/altix/sys/boot/i386/libi386/Makefile Sat Mar 12 01:26:04 2011 (r219554)
@@ -53,6 +53,11 @@ CFLAGS+= -I${.CURDIR}/../../common -I${.
# the location of libstand
CFLAGS+= -I${.CURDIR}/../../../../lib/libstand/
+.if ${CC:T:Mclang} == "clang"
+# XXX: clang integrated-as doesn't grok .codeNN directives yet
+CFLAGS+= ${.IMPSRC:T:Mamd64_tramp.S:C/^.+$/-no-integrated-as/}
+.endif
+
.if ${MACHINE_CPUARCH} == "amd64"
CLEANFILES+= machine
machine:
Modified: projects/altix/sys/boot/i386/pxeldr/Makefile
==============================================================================
--- projects/altix/sys/boot/i386/pxeldr/Makefile Sat Mar 12 00:41:57 2011 (r219553)
+++ projects/altix/sys/boot/i386/pxeldr/Makefile Sat Mar 12 01:26:04 2011 (r219554)
@@ -23,6 +23,11 @@ CFLAGS+=-DPROBE_KEYBOARD
CFLAGS+=-DALWAYS_SERIAL
.endif
+.if ${CC:T:Mclang} == "clang"
+# XXX: clang integrated-as doesn't grok .codeNN directives yet
+CFLAGS+=${.IMPSRC:T:Mpxeldr.S:C/^.+$/-no-integrated-as/}
+.endif
+
LOADERBIN= ${.OBJDIR}/../loader/loader.bin
CLEANFILES+= ${BOOT}.tmp
Modified: projects/altix/sys/boot/i386/zfsboot/Makefile
==============================================================================
--- projects/altix/sys/boot/i386/zfsboot/Makefile Sat Mar 12 00:41:57 2011 (r219553)
+++ projects/altix/sys/boot/i386/zfsboot/Makefile Sat Mar 12 01:26:04 2011 (r219554)
@@ -40,6 +40,11 @@ CFLAGS= -DBOOTPROG=\"zfsboot\" \
-Wpointer-arith -Wshadow -Wstrict-prototypes -Wwrite-strings \
-Winline --param max-inline-insns-single=100
+.if ${CC:T:Mclang} == "clang"
+# XXX: clang integrated-as doesn't grok .codeNN directives yet
+CFLAGS+= ${.IMPSRC:T:Mzfsldr.S:C/^.+$/-no-integrated-as/}
+.endif
+
LDFLAGS=-static -N --gc-sections
# Pick up ../Makefile.inc early.
@@ -64,7 +69,7 @@ CLEANFILES+= zfsboot2 zfsboot.ld zfsboot
# We currently allow 32768 bytes for zfsboot - in practice it could be
# any size up to 3.5Mb but keeping it fixed size simplifies zfsldr.
#
-BOOT2SIZE= 32768
+BOOT2SIZE= 65536
zfsboot2: zfsboot.ld
@set -- `ls -l zfsboot.ld`; x=$$((${BOOT2SIZE}-$$5)); \
Modified: projects/altix/sys/boot/pc98/boot2/boot2.c
==============================================================================
--- projects/altix/sys/boot/pc98/boot2/boot2.c Sat Mar 12 00:41:57 2011 (r219553)
+++ projects/altix/sys/boot/pc98/boot2/boot2.c Sat Mar 12 01:26:04 2011 (r219554)
@@ -133,11 +133,11 @@ static struct dsk {
unsigned start;
} dsk;
static char cmd[512], cmddup[512];
-static char kname[1024];
-static uint16_t opts;
+static const char *kname = NULL;
+static uint32_t opts;
static int comspeed = SIOSPD;
static struct bootinfo bootinfo;
-static uint8_t ioctrl = IO_KEYBOARD;
+static unsigned ioctrl = IO_KEYBOARD;
void exit(int);
static void load(void);
@@ -146,7 +146,6 @@ static int xfsread(ino_t, void *, size_t
static int dskread(void *, unsigned, unsigned);
static void printf(const char *,...);
static void putchar(int);
-static uint32_t memsize(void);
static int drvread(void *, unsigned);
static int keyhit(unsigned);
static int xputc(int);
@@ -184,13 +183,6 @@ xfsread(ino_t inode, void *buf, size_t n
return 0;
}
-static inline uint32_t
-memsize(void)
-{
- return (*(u_char *)PTOV(0x401) * 128 * 1024 +
- *(uint16_t *)PTOV(0x594) * 1024 * 1024);
-}
-
static inline void
getstr(void)
{
@@ -382,9 +374,6 @@ main(void)
#endif
bootinfo.bi_version = BOOTINFO_VERSION;
bootinfo.bi_size = sizeof(bootinfo);
- bootinfo.bi_basemem = 0; /* XXX will be filled by loader or kernel */
- bootinfo.bi_extmem = memsize();
- bootinfo.bi_memsizes_valid++;
/* Process configuration file */
@@ -408,11 +397,11 @@ main(void)
* or in case of failure, try to load a kernel directly instead.
*/
- if (autoboot && !*kname) {
- memcpy(kname, PATH_BOOT3, sizeof(PATH_BOOT3));
+ if (autoboot && !kname) {
+ kname = PATH_BOOT3;
if (!keyhit(3*SECOND)) {
load();
- memcpy(kname, PATH_KERNEL, sizeof(PATH_KERNEL));
+ kname = PATH_KERNEL;
}
}
@@ -427,7 +416,7 @@ main(void)
'a' + dsk.part, kname);
if (ioctrl & IO_SERIAL)
sio_flush();
- if (!autoboot || keyhit(5*SECOND))
+ if (!autoboot || keyhit(3*SECOND))
getstr();
else if (!autoboot || !OPT_CHECK(RBX_QUIET))
putchar('\n');
@@ -611,11 +600,7 @@ parse()
dsk.daua = dsk.disk | dsk.unit;
dsk_meta = 0;
}
- if ((i = ep - arg)) {
- if ((size_t)i >= sizeof(kname))
- return -1;
- memcpy(kname, arg, i + 1);
- }
+ kname = arg;
}
*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
More information about the svn-src-projects
mailing list