Date: Wed, 24 Sep 2008 21:57:01 GMT From: John Baldwin <jhb@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 150405 for review Message-ID: <200809242157.m8OLv1XC067649@repoman.freebsd.org>
index | next in thread | raw e-mail
http://perforce.freebsd.org/chv.cgi?CH=150405 Change 150405 by jhb@jhb_mutex on 2008/09/24 21:56:18 IFC @150398 Affected files ... .. //depot/projects/smpng/sys/amd64/amd64/elf_machdep.c#13 integrate .. //depot/projects/smpng/sys/amd64/amd64/identcpu.c#27 integrate .. //depot/projects/smpng/sys/amd64/linux32/linux32_sysvec.c#31 integrate .. //depot/projects/smpng/sys/arm/arm/elf_machdep.c#8 integrate .. //depot/projects/smpng/sys/boot/Makefile#27 integrate .. //depot/projects/smpng/sys/boot/ofw/libofw/Makefile#9 integrate .. //depot/projects/smpng/sys/boot/ofw/libofw/ofw_console.c#9 integrate .. //depot/projects/smpng/sys/cam/cam.h#4 integrate .. //depot/projects/smpng/sys/cddl/compat/opensolaris/kern/opensolaris_atomic.c#2 integrate .. //depot/projects/smpng/sys/cddl/compat/opensolaris/sys/atomic.h#3 integrate .. //depot/projects/smpng/sys/compat/freebsd32/freebsd32_ioctl.c#1 branch .. //depot/projects/smpng/sys/compat/freebsd32/freebsd32_ioctl.h#1 branch .. //depot/projects/smpng/sys/compat/freebsd32/freebsd32_misc.c#50 integrate .. //depot/projects/smpng/sys/compat/freebsd32/freebsd32_proto.h#45 integrate .. //depot/projects/smpng/sys/compat/freebsd32/freebsd32_syscall.h#45 integrate .. //depot/projects/smpng/sys/compat/freebsd32/freebsd32_syscalls.c#45 integrate .. //depot/projects/smpng/sys/compat/freebsd32/freebsd32_sysent.c#45 integrate .. //depot/projects/smpng/sys/compat/freebsd32/syscalls.master#49 integrate .. //depot/projects/smpng/sys/compat/ia32/ia32_sysvec.c#19 integrate .. //depot/projects/smpng/sys/compat/linux/linux_misc.c#91 integrate .. //depot/projects/smpng/sys/compat/svr4/svr4_sysvec.c#27 integrate .. //depot/projects/smpng/sys/conf/files#219 integrate .. //depot/projects/smpng/sys/conf/files.amd64#56 integrate .. //depot/projects/smpng/sys/conf/files.i386#113 integrate .. //depot/projects/smpng/sys/conf/files.ia64#60 integrate .. //depot/projects/smpng/sys/conf/files.mips#3 integrate .. //depot/projects/smpng/sys/conf/files.sparc64#68 integrate .. //depot/projects/smpng/sys/conf/kern.pre.mk#60 integrate .. //depot/projects/smpng/sys/conf/ldscript.mips#2 integrate .. //depot/projects/smpng/sys/conf/options.mips#2 integrate .. //depot/projects/smpng/sys/conf/options.sparc64#16 integrate .. //depot/projects/smpng/sys/dev/acpica/acpi_quirk.c#5 integrate .. //depot/projects/smpng/sys/dev/ata/ata-chipset.c#87 integrate .. //depot/projects/smpng/sys/dev/ata/ata-pci.c#68 integrate .. //depot/projects/smpng/sys/dev/ata/ata-pci.h#56 integrate .. //depot/projects/smpng/sys/dev/ath/if_ath.c#57 integrate .. //depot/projects/smpng/sys/dev/ath/if_athvar.h#35 integrate .. //depot/projects/smpng/sys/dev/bge/if_bge.c#99 integrate .. //depot/projects/smpng/sys/dev/bm/if_bm.c#3 integrate .. //depot/projects/smpng/sys/dev/cxgb/common/cxgb_ael1002.c#7 integrate .. //depot/projects/smpng/sys/dev/cxgb/common/cxgb_common.h#7 integrate .. //depot/projects/smpng/sys/dev/cxgb/common/cxgb_mc5.c#5 integrate .. //depot/projects/smpng/sys/dev/cxgb/common/cxgb_mv88e1xxx.c#5 integrate .. //depot/projects/smpng/sys/dev/cxgb/common/cxgb_t3_hw.c#7 integrate .. //depot/projects/smpng/sys/dev/cxgb/common/cxgb_tn1010.c#2 integrate .. //depot/projects/smpng/sys/dev/cxgb/common/cxgb_vsc7323.c#2 integrate .. //depot/projects/smpng/sys/dev/cxgb/common/cxgb_vsc8211.c#5 integrate .. //depot/projects/smpng/sys/dev/cxgb/common/cxgb_xgmac.c#6 integrate .. //depot/projects/smpng/sys/dev/cxgb/cxgb_adapter.h#11 integrate .. //depot/projects/smpng/sys/dev/cxgb/cxgb_config.h#5 integrate .. //depot/projects/smpng/sys/dev/cxgb/cxgb_include.h#3 integrate .. //depot/projects/smpng/sys/dev/cxgb/cxgb_main.c#13 integrate .. //depot/projects/smpng/sys/dev/cxgb/cxgb_multiq.c#3 integrate .. //depot/projects/smpng/sys/dev/cxgb/cxgb_offload.c#4 integrate .. //depot/projects/smpng/sys/dev/cxgb/cxgb_offload.h#5 integrate .. //depot/projects/smpng/sys/dev/cxgb/cxgb_osdep.h#8 integrate .. //depot/projects/smpng/sys/dev/cxgb/cxgb_sge.c#12 integrate .. //depot/projects/smpng/sys/dev/cxgb/cxgb_t3fw.c#2 integrate .. //depot/projects/smpng/sys/dev/cxgb/sys/cxgb_support.c#6 integrate .. //depot/projects/smpng/sys/dev/cxgb/sys/uipc_mvec.c#6 integrate .. //depot/projects/smpng/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb.c#3 integrate .. //depot/projects/smpng/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_cm.c#2 integrate .. //depot/projects/smpng/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_cq.c#2 integrate .. //depot/projects/smpng/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_dbg.c#2 integrate .. //depot/projects/smpng/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_ev.c#2 integrate .. //depot/projects/smpng/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_hal.c#2 integrate .. //depot/projects/smpng/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_mem.c#2 integrate .. //depot/projects/smpng/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_provider.c#2 integrate .. //depot/projects/smpng/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_qp.c#2 integrate .. //depot/projects/smpng/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_resource.c#2 integrate .. //depot/projects/smpng/sys/dev/cxgb/ulp/toecore/toedev.c#3 integrate .. //depot/projects/smpng/sys/dev/cxgb/ulp/tom/cxgb_cpl_io.c#10 integrate .. //depot/projects/smpng/sys/dev/cxgb/ulp/tom/cxgb_cpl_socket.c#8 integrate .. //depot/projects/smpng/sys/dev/cxgb/ulp/tom/cxgb_ddp.c#6 integrate .. //depot/projects/smpng/sys/dev/cxgb/ulp/tom/cxgb_defs.h#5 integrate .. //depot/projects/smpng/sys/dev/cxgb/ulp/tom/cxgb_l2t.c#3 integrate .. //depot/projects/smpng/sys/dev/cxgb/ulp/tom/cxgb_l2t.h#2 integrate .. //depot/projects/smpng/sys/dev/cxgb/ulp/tom/cxgb_listen.c#5 integrate .. //depot/projects/smpng/sys/dev/cxgb/ulp/tom/cxgb_t3_ddp.h#4 integrate .. //depot/projects/smpng/sys/dev/cxgb/ulp/tom/cxgb_tcp_offload.c#3 integrate .. //depot/projects/smpng/sys/dev/cxgb/ulp/tom/cxgb_toepcb.h#4 integrate .. //depot/projects/smpng/sys/dev/cxgb/ulp/tom/cxgb_tom.c#6 integrate .. //depot/projects/smpng/sys/dev/cxgb/ulp/tom/cxgb_tom.h#3 integrate .. //depot/projects/smpng/sys/dev/cxgb/ulp/tom/cxgb_tom_sysctl.c#5 integrate .. //depot/projects/smpng/sys/dev/cxgb/ulp/tom/cxgb_vm.c#2 integrate .. //depot/projects/smpng/sys/dev/hwpmc/hwpmc_amd.c#10 integrate .. //depot/projects/smpng/sys/dev/hwpmc/hwpmc_mod.c#25 integrate .. //depot/projects/smpng/sys/dev/hwpmc/hwpmc_piv.c#10 integrate .. //depot/projects/smpng/sys/dev/hwpmc/hwpmc_ppro.c#6 integrate .. //depot/projects/smpng/sys/dev/jme/if_jme.c#4 integrate .. //depot/projects/smpng/sys/dev/jme/if_jmereg.h#3 integrate .. //depot/projects/smpng/sys/dev/kbdmux/kbdmux.c#10 integrate .. //depot/projects/smpng/sys/dev/pci/vga_pci.c#5 integrate .. //depot/projects/smpng/sys/dev/snp/snp.c#31 integrate .. //depot/projects/smpng/sys/dev/usb/if_zyd.c#6 integrate .. //depot/projects/smpng/sys/dev/usb/usbdevs#116 integrate .. //depot/projects/smpng/sys/fs/devfs/devfs_devs.c#29 integrate .. //depot/projects/smpng/sys/fs/devfs/devfs_vnops.c#71 integrate .. //depot/projects/smpng/sys/fs/fdescfs/fdesc_vnops.c#32 integrate .. //depot/projects/smpng/sys/fs/hpfs/hpfs_vnops.c#36 integrate .. //depot/projects/smpng/sys/fs/msdosfs/msdosfs_vnops.c#45 integrate .. //depot/projects/smpng/sys/fs/ntfs/ntfs_vnops.c#30 integrate .. //depot/projects/smpng/sys/fs/portalfs/portal_vnops.c#30 integrate .. //depot/projects/smpng/sys/fs/pseudofs/pseudofs_vnops.c#51 integrate .. //depot/projects/smpng/sys/fs/smbfs/smbfs_node.c#32 integrate .. //depot/projects/smpng/sys/fs/tmpfs/tmpfs.h#4 integrate .. //depot/projects/smpng/sys/fs/tmpfs/tmpfs_subr.c#6 integrate .. //depot/projects/smpng/sys/fs/tmpfs/tmpfs_vnops.c#7 integrate .. //depot/projects/smpng/sys/fs/udf/udf_vnops.c#42 integrate .. //depot/projects/smpng/sys/geom/geom_io.c#49 integrate .. //depot/projects/smpng/sys/gnu/fs/xfs/FreeBSD/xfs_vnops.c#7 integrate .. //depot/projects/smpng/sys/i386/bios/apm.h#6 integrate .. //depot/projects/smpng/sys/i386/i386/bios.c#25 integrate .. //depot/projects/smpng/sys/i386/i386/elf_machdep.c#15 integrate .. //depot/projects/smpng/sys/i386/i386/identcpu.c#59 integrate .. //depot/projects/smpng/sys/i386/i386/intr_machdep.c#33 integrate .. //depot/projects/smpng/sys/i386/i386/pmap.c#127 integrate .. //depot/projects/smpng/sys/i386/ibcs2/ibcs2_sysvec.c#11 integrate .. //depot/projects/smpng/sys/i386/linux/linux_sysvec.c#61 integrate .. //depot/projects/smpng/sys/i386/xen/mp_machdep.c#2 integrate .. //depot/projects/smpng/sys/ia64/ia64/efi.c#5 integrate .. //depot/projects/smpng/sys/ia64/ia64/elf_machdep.c#22 integrate .. //depot/projects/smpng/sys/ia64/ia64/sal.c#13 integrate .. //depot/projects/smpng/sys/kern/imgact_aout.c#32 integrate .. //depot/projects/smpng/sys/kern/init_main.c#74 integrate .. //depot/projects/smpng/sys/kern/kern_intr.c#97 integrate .. //depot/projects/smpng/sys/kern/kern_pmc.c#6 integrate .. //depot/projects/smpng/sys/kern/kern_syscalls.c#7 integrate .. //depot/projects/smpng/sys/kern/subr_clist.c#3 integrate .. //depot/projects/smpng/sys/kern/subr_witness.c#172 integrate .. //depot/projects/smpng/sys/kern/sys_generic.c#54 integrate .. //depot/projects/smpng/sys/kern/tty.c#76 integrate .. //depot/projects/smpng/sys/kern/tty_pts.c#12 integrate .. //depot/projects/smpng/sys/kern/tty_ttydisc.c#3 integrate .. //depot/projects/smpng/sys/kern/uipc_mqueue.c#18 integrate .. //depot/projects/smpng/sys/kern/vfs_cache.c#43 integrate .. //depot/projects/smpng/sys/kern/vfs_mount.c#83 integrate .. //depot/projects/smpng/sys/kern/vfs_vnops.c#86 integrate .. //depot/projects/smpng/sys/libkern/memcmp.c#1 branch .. //depot/projects/smpng/sys/mips/adm5120/obio.c#3 integrate .. //depot/projects/smpng/sys/mips/conf/IDT#3 integrate .. //depot/projects/smpng/sys/mips/idt/obio.c#3 integrate .. //depot/projects/smpng/sys/mips/malta/gt_pci.c#3 integrate .. //depot/projects/smpng/sys/mips/mips/elf_machdep.c#2 integrate .. //depot/projects/smpng/sys/mips/mips/intr_machdep.c#3 integrate .. //depot/projects/smpng/sys/mips/mips/support.S#2 integrate .. //depot/projects/smpng/sys/modules/cxgb/Makefile#6 integrate .. //depot/projects/smpng/sys/modules/cxgb/cxgb/Makefile#6 integrate .. //depot/projects/smpng/sys/modules/cxgb/cxgb_t3fw/Makefile#2 integrate .. //depot/projects/smpng/sys/modules/cxgb/iw_cxgb/Makefile#2 integrate .. //depot/projects/smpng/sys/modules/cxgb/toecore/Makefile#2 integrate .. //depot/projects/smpng/sys/modules/cxgb/tom/Makefile#4 integrate .. //depot/projects/smpng/sys/net/if_clone.c#11 integrate .. //depot/projects/smpng/sys/net/if_clone.h#5 integrate .. //depot/projects/smpng/sys/net/if_lagg.c#12 integrate .. //depot/projects/smpng/sys/net/route.c#39 integrate .. //depot/projects/smpng/sys/net/route.h#28 integrate .. //depot/projects/smpng/sys/net80211/ieee80211.h#15 integrate .. //depot/projects/smpng/sys/net80211/ieee80211_adhoc.c#2 integrate .. //depot/projects/smpng/sys/net80211/ieee80211_crypto.c#13 integrate .. //depot/projects/smpng/sys/net80211/ieee80211_crypto.h#11 integrate .. //depot/projects/smpng/sys/net80211/ieee80211_ddb.c#4 integrate .. //depot/projects/smpng/sys/net80211/ieee80211_freebsd.c#15 integrate .. //depot/projects/smpng/sys/net80211/ieee80211_freebsd.h#13 integrate .. //depot/projects/smpng/sys/net80211/ieee80211_hostap.c#3 integrate .. //depot/projects/smpng/sys/net80211/ieee80211_ht.c#6 integrate .. //depot/projects/smpng/sys/net80211/ieee80211_ht.h#5 integrate .. //depot/projects/smpng/sys/net80211/ieee80211_ioctl.c#37 integrate .. //depot/projects/smpng/sys/net80211/ieee80211_ioctl.h#17 integrate .. //depot/projects/smpng/sys/net80211/ieee80211_node.c#36 integrate .. //depot/projects/smpng/sys/net80211/ieee80211_node.h#22 integrate .. //depot/projects/smpng/sys/net80211/ieee80211_output.c#33 integrate .. //depot/projects/smpng/sys/net80211/ieee80211_sta.c#3 integrate .. //depot/projects/smpng/sys/net80211/ieee80211_var.h#29 integrate .. //depot/projects/smpng/sys/net80211/ieee80211_wds.c#2 integrate .. //depot/projects/smpng/sys/netgraph/netgraph.h#31 integrate .. //depot/projects/smpng/sys/netgraph/ng_base.c#58 integrate .. //depot/projects/smpng/sys/netgraph/ng_source.c#18 integrate .. //depot/projects/smpng/sys/netinet/ip_fw.h#41 integrate .. //depot/projects/smpng/sys/netinet/tcp_input.c#115 integrate .. //depot/projects/smpng/sys/netinet6/udp6_usrreq.c#50 integrate .. //depot/projects/smpng/sys/nfsclient/nfs_vnops.c#75 integrate .. //depot/projects/smpng/sys/powerpc/aim/machdep.c#7 integrate .. //depot/projects/smpng/sys/powerpc/aim/mmu_oea.c#4 integrate .. //depot/projects/smpng/sys/powerpc/booke/machdep.c#5 integrate .. //depot/projects/smpng/sys/powerpc/include/dbdma.h#2 integrate .. //depot/projects/smpng/sys/powerpc/include/md_var.h#12 integrate .. //depot/projects/smpng/sys/powerpc/include/pmap.h#20 integrate .. //depot/projects/smpng/sys/powerpc/include/pte.h#7 integrate .. //depot/projects/smpng/sys/powerpc/ofw/ofw_syscons.c#10 integrate .. //depot/projects/smpng/sys/powerpc/powermac/dbdma.c#2 integrate .. //depot/projects/smpng/sys/powerpc/powermac/dbdmavar.h#2 integrate .. //depot/projects/smpng/sys/powerpc/powerpc/cpu.c#10 integrate .. //depot/projects/smpng/sys/powerpc/powerpc/elf_machdep.c#15 integrate .. //depot/projects/smpng/sys/powerpc/powerpc/syncicache.c#7 integrate .. //depot/projects/smpng/sys/sparc64/include/smp.h#21 integrate .. //depot/projects/smpng/sys/sparc64/include/tick.h#6 integrate .. //depot/projects/smpng/sys/sparc64/pci/psycho.c#47 integrate .. //depot/projects/smpng/sys/sparc64/pci/psychoreg.h#13 integrate .. //depot/projects/smpng/sys/sparc64/sparc64/elf_machdep.c#21 integrate .. //depot/projects/smpng/sys/sparc64/sparc64/genassym.c#45 integrate .. //depot/projects/smpng/sys/sparc64/sparc64/intr_machdep.c#31 integrate .. //depot/projects/smpng/sys/sparc64/sparc64/mp_machdep.c#35 integrate .. //depot/projects/smpng/sys/sparc64/sparc64/tick.c#22 integrate .. //depot/projects/smpng/sys/sys/clist.h#4 integrate .. //depot/projects/smpng/sys/sys/libkern.h#27 integrate .. //depot/projects/smpng/sys/sys/mount.h#66 integrate .. //depot/projects/smpng/sys/sys/param.h#128 integrate .. //depot/projects/smpng/sys/sys/pmckern.h#7 integrate .. //depot/projects/smpng/sys/sys/sysent.h#29 integrate .. //depot/projects/smpng/sys/sys/tty.h#25 integrate .. //depot/projects/smpng/sys/sys/ttydevsw.h#3 integrate .. //depot/projects/smpng/sys/sys/ttydisc.h#3 integrate .. //depot/projects/smpng/sys/sys/ttyhook.h#1 branch .. //depot/projects/smpng/sys/sys/ttyqueue.h#3 integrate .. //depot/projects/smpng/sys/ufs/ffs/ffs_vfsops.c#104 integrate .. //depot/projects/smpng/sys/ufs/ufs/ufs_dirhash.c#26 integrate .. //depot/projects/smpng/sys/ufs/ufs/ufs_vnops.c#70 integrate .. //depot/projects/smpng/sys/vm/vm_mmap.c#70 integrate .. //depot/projects/smpng/sys/vm/vm_pageout.c#67 integrate Differences ... ==== //depot/projects/smpng/sys/amd64/amd64/elf_machdep.c#13 (text+ko) ==== @@ -24,7 +24,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/amd64/amd64/elf_machdep.c,v 1.26 2007/05/22 02:22:57 kan Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/elf_machdep.c,v 1.27 2008/09/24 10:14:37 kib Exp $"); #include <sys/param.h> #include <sys/kernel.h> @@ -46,59 +46,60 @@ #include <machine/md_var.h> struct sysentvec elf64_freebsd_sysvec = { - SYS_MAXSYSCALL, - sysent, - 0, - 0, - NULL, - 0, - NULL, - NULL, - __elfN(freebsd_fixup), - sendsig, - sigcode, - &szsigcode, - NULL, - "FreeBSD ELF64", - __elfN(coredump), - NULL, - MINSIGSTKSZ, - PAGE_SIZE, - VM_MIN_ADDRESS, - VM_MAXUSER_ADDRESS, - USRSTACK, - PS_STRINGS, - VM_PROT_ALL, - exec_copyout_strings, - exec_setregs, - NULL + .sv_size = SYS_MAXSYSCALL, + .sv_table = sysent, + .sv_mask = 0, + .sv_sigsize = 0, + .sv_sigtbl = NULL, + .sv_errsize = 0, + .sv_errtbl = NULL, + .sv_transtrap = NULL, + .sv_fixup = __elfN(freebsd_fixup), + .sv_sendsig = sendsig, + .sv_sigcode = sigcode, + .sv_szsigcode = &szsigcode, + .sv_prepsyscall = NULL, + .sv_name = "FreeBSD ELF64", + .sv_coredump = __elfN(coredump), + .sv_imgact_try = NULL, + .sv_minsigstksz = MINSIGSTKSZ, + .sv_pagesize = PAGE_SIZE, + .sv_minuser = VM_MIN_ADDRESS, + .sv_maxuser = VM_MAXUSER_ADDRESS, + .sv_usrstack = USRSTACK, + .sv_psstrings = PS_STRINGS, + .sv_stackprot = VM_PROT_ALL, + .sv_copyout_strings = exec_copyout_strings, + .sv_setregs = exec_setregs, + .sv_fixlimit = NULL, + .sv_maxssiz = NULL }; static Elf64_Brandinfo freebsd_brand_info = { - ELFOSABI_FREEBSD, - EM_X86_64, - "FreeBSD", - NULL, - "/libexec/ld-elf.so.1", - &elf64_freebsd_sysvec, - NULL, - BI_CAN_EXEC_DYN, - }; + .brand = ELFOSABI_FREEBSD, + .machine = EM_X86_64, + .compat_3_brand = "FreeBSD", + .emul_path = NULL, + .interp_path = "/libexec/ld-elf.so.1", + .sysvec = &elf64_freebsd_sysvec, + .interp_newpath = NULL, + .flags = BI_CAN_EXEC_DYN, +}; SYSINIT(elf64, SI_SUB_EXEC, SI_ORDER_ANY, (sysinit_cfunc_t) elf64_insert_brand_entry, &freebsd_brand_info); static Elf64_Brandinfo freebsd_brand_oinfo = { - ELFOSABI_FREEBSD, - EM_X86_64, - "FreeBSD", - NULL, - "/usr/libexec/ld-elf.so.1", - &elf64_freebsd_sysvec, - NULL, - BI_CAN_EXEC_DYN, - }; + .brand = ELFOSABI_FREEBSD, + .machine = EM_X86_64, + .compat_3_brand = "FreeBSD", + .emul_path = NULL, + .interp_path = "/usr/libexec/ld-elf.so.1", + .sysvec = &elf64_freebsd_sysvec, + .interp_newpath = NULL, + .flags = BI_CAN_EXEC_DYN, +}; SYSINIT(oelf64, SI_SUB_EXEC, SI_ORDER_ANY, (sysinit_cfunc_t) elf64_insert_brand_entry, ==== //depot/projects/smpng/sys/amd64/amd64/identcpu.c#27 (text+ko) ==== @@ -39,7 +39,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/amd64/amd64/identcpu.c,v 1.159 2008/05/23 04:03:52 alc Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/identcpu.c,v 1.160 2008/09/18 18:51:32 stas Exp $"); #include "opt_cpu.h" @@ -249,8 +249,8 @@ "\030POPCNT" "\031<b24>" "\032<b25>" - "\033<b26>" - "\034<b27>" + "\033XSAVE" + "\034OSXSAVE" "\035<b28>" "\036<b29>" "\037<b30>" ==== //depot/projects/smpng/sys/amd64/linux32/linux32_sysvec.c#31 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/amd64/linux32/linux32_sysvec.c,v 1.34 2008/04/08 09:45:47 kib Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/linux32/linux32_sysvec.c,v 1.35 2008/09/24 10:14:37 kib Exp $"); #include "opt_compat.h" #ifndef COMPAT_IA32 @@ -1000,62 +1000,62 @@ } struct sysentvec elf_linux_sysvec = { - LINUX_SYS_MAXSYSCALL, - linux_sysent, - 0, - LINUX_SIGTBLSZ, - bsd_to_linux_signal, - ELAST + 1, - bsd_to_linux_errno, - translate_traps, - elf_linux_fixup, - linux_sendsig, - linux_sigcode, - &linux_szsigcode, - linux_prepsyscall, - "Linux ELF32", - elf32_coredump, - exec_linux_imgact_try, - LINUX_MINSIGSTKSZ, - PAGE_SIZE, - VM_MIN_ADDRESS, - LINUX32_USRSTACK, - LINUX32_USRSTACK, - LINUX32_PS_STRINGS, - VM_PROT_ALL, - linux_copyout_strings, - exec_linux_setregs, - linux32_fixlimit, - &linux32_maxssiz, + .sv_size = LINUX_SYS_MAXSYSCALL, + .sv_table = linux_sysent, + .sv_mask = 0, + .sv_sigsize = LINUX_SIGTBLSZ, + .sv_sigtbl = bsd_to_linux_signal, + .sv_errsize = ELAST + 1, + .sv_errtbl = bsd_to_linux_errno, + .sv_transtrap = translate_traps, + .sv_fixup = elf_linux_fixup, + .sv_sendsig = linux_sendsig, + .sv_sigcode = linux_sigcode, + .sv_szsigcode = &linux_szsigcode, + .sv_prepsyscall = linux_prepsyscall, + .sv_name = "Linux ELF32", + .sv_coredump = elf32_coredump, + .sv_imgact_try = exec_linux_imgact_try, + .sv_minsigstksz = LINUX_MINSIGSTKSZ, + .sv_pagesize = PAGE_SIZE, + .sv_minuser = VM_MIN_ADDRESS, + .sv_maxuser = LINUX32_USRSTACK, + .sv_usrstack = LINUX32_USRSTACK, + .sv_psstrings = LINUX32_PS_STRINGS, + .sv_stackprot = VM_PROT_ALL, + .sv_copyout_strings = linux_copyout_strings, + .sv_setregs = exec_linux_setregs, + .sv_fixlimit = linux32_fixlimit, + .sv_maxssiz = &linux32_maxssiz, }; static Elf32_Brandinfo linux_brand = { - ELFOSABI_LINUX, - EM_386, - "Linux", - "/compat/linux", - "/lib/ld-linux.so.1", - &elf_linux_sysvec, - NULL, - BI_CAN_EXEC_DYN, - }; + .brand = ELFOSABI_LINUX, + .machine = EM_386, + .compat_3_brand = "Linux", + .emul_path = "/compat/linux", + .interp_path = "/lib/ld-linux.so.1", + .sysvec = &elf_linux_sysvec, + .interp_newpath = NULL, + .flags = BI_CAN_EXEC_DYN, +}; static Elf32_Brandinfo linux_glibc2brand = { - ELFOSABI_LINUX, - EM_386, - "Linux", - "/compat/linux", - "/lib/ld-linux.so.2", - &elf_linux_sysvec, - NULL, - BI_CAN_EXEC_DYN, - }; + .brand = ELFOSABI_LINUX, + .machine = EM_386, + .compat_3_brand = "Linux", + .emul_path = "/compat/linux", + .interp_path = "/lib/ld-linux.so.2", + .sysvec = &elf_linux_sysvec, + .interp_newpath = NULL, + .flags = BI_CAN_EXEC_DYN, +}; Elf32_Brandinfo *linux_brandlist[] = { - &linux_brand, - &linux_glibc2brand, - NULL - }; + &linux_brand, + &linux_glibc2brand, + NULL +}; static int linux_elf_modevent(module_t mod, int type, void *data) ==== //depot/projects/smpng/sys/arm/arm/elf_machdep.c#8 (text+ko) ==== @@ -24,7 +24,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/arm/arm/elf_machdep.c,v 1.7 2007/05/22 02:22:57 kan Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/arm/elf_machdep.c,v 1.8 2008/09/24 10:14:37 kib Exp $"); #include <sys/param.h> #include <sys/kernel.h> @@ -46,59 +46,60 @@ #include <machine/md_var.h> struct sysentvec elf32_freebsd_sysvec = { - SYS_MAXSYSCALL, - sysent, - 0, - 0, - NULL, - 0, - NULL, - NULL, - __elfN(freebsd_fixup), - sendsig, - sigcode, - &szsigcode, - NULL, - "FreeBSD ELF32", - __elfN(coredump), - NULL, - MINSIGSTKSZ, - PAGE_SIZE, - VM_MIN_ADDRESS, - VM_MAXUSER_ADDRESS, - USRSTACK, - PS_STRINGS, - VM_PROT_ALL, - exec_copyout_strings, - exec_setregs, - NULL + .sv_size = SYS_MAXSYSCALL, + .sv_table = sysent, + .sv_mask = 0, + .sv_sigsize = 0, + .sv_sigtbl = NULL, + .sv_errsize = 0, + .sv_errtbl = NULL, + .sv_transtrap = NULL, + .sv_fixup = __elfN(freebsd_fixup), + .sv_sendsig = sendsig, + .sv_sigcode = sigcode, + .sv_szsigcode = &szsigcode, + .sv_prepsyscall = NULL, + .sv_name = "FreeBSD ELF32", + .sv_coredump = __elfN(coredump), + .sv_imgact_try = NULL, + .sv_minsigstksz = MINSIGSTKSZ, + .sv_pagesize = PAGE_SIZE, + .sv_minuser = VM_MIN_ADDRESS, + .sv_maxuser = VM_MAXUSER_ADDRESS, + .sv_usrstack = USRSTACK, + .sv_psstrings = PS_STRINGS, + .sv_stackprot = VM_PROT_ALL, + .sv_copyout_strings = exec_copyout_strings, + .sv_setregs = exec_setregs, + .sv_fixlimit = NULL, + .sv_maxssiz = NULL }; static Elf32_Brandinfo freebsd_brand_info = { - ELFOSABI_FREEBSD, - EM_ARM, - "FreeBSD", - NULL, - "/libexec/ld-elf.so.1", - &elf32_freebsd_sysvec, - NULL, - BI_CAN_EXEC_DYN, - }; + .brand = ELFOSABI_FREEBSD, + .machine = EM_ARM, + .compat_3_brand = "FreeBSD", + .emul_path = NULL, + .interp_path = "/libexec/ld-elf.so.1", + .sysvec = &elf32_freebsd_sysvec, + .interp_newpath = NULL, + .flags = BI_CAN_EXEC_DYN, +}; SYSINIT(elf32, SI_SUB_EXEC, SI_ORDER_ANY, (sysinit_cfunc_t) elf32_insert_brand_entry, &freebsd_brand_info); static Elf32_Brandinfo freebsd_brand_oinfo = { - ELFOSABI_FREEBSD, - EM_ARM, - "FreeBSD", - NULL, - "/usr/libexec/ld-elf.so.1", - &elf32_freebsd_sysvec, - NULL, - BI_CAN_EXEC_DYN, - }; + .brand = ELFOSABI_FREEBSD, + .machine = EM_ARM, + .compat_3_brand = "FreeBSD", + .emul_path = NULL, + .interp_path = "/usr/libexec/ld-elf.so.1", + .sysvec = &elf32_freebsd_sysvec, + .interp_newpath = NULL, + .flags = BI_CAN_EXEC_DYN, +}; SYSINIT(oelf32, SI_SUB_EXEC, SI_ORDER_ANY, (sysinit_cfunc_t) elf32_insert_brand_entry, ==== //depot/projects/smpng/sys/boot/Makefile#27 (text+ko) ==== @@ -1,7 +1,11 @@ -# $FreeBSD: src/sys/boot/Makefile,v 1.34 2008/07/23 07:23:33 imp Exp $ +# $FreeBSD: src/sys/boot/Makefile,v 1.35 2008/09/18 15:25:35 obrien Exp $ .include <bsd.own.mk> +.if ${MACHINE_ARCH} == "mips" +MK_FORTH=no # not yet +.endif + .if ${MK_FORTH} != "no" # Build the add-in FORTH interpreter. SUBDIR+= ficl ==== //depot/projects/smpng/sys/boot/ofw/libofw/Makefile#9 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/boot/ofw/libofw/Makefile,v 1.11 2007/06/17 00:17:15 marius Exp $ +# $FreeBSD: src/sys/boot/ofw/libofw/Makefile,v 1.13 2008/09/19 19:49:58 sobomax Exp $ LIB= ofw INTERNALLIB= ==== //depot/projects/smpng/sys/boot/ofw/libofw/ofw_console.c#9 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/boot/ofw/libofw/ofw_console.c,v 1.13 2008/02/06 22:04:28 grehan Exp $"); +__FBSDID("$FreeBSD: src/sys/boot/ofw/libofw/ofw_console.c,v 1.15 2008/09/19 19:49:58 sobomax Exp $"); #include <sys/types.h> ==== //depot/projects/smpng/sys/cam/cam.h#4 (text+ko) ==== @@ -25,7 +25,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/cam/cam.h,v 1.11 2005/01/05 22:34:34 imp Exp $ + * $FreeBSD: src/sys/cam/cam.h,v 1.12 2008/09/18 14:48:46 sbruno Exp $ */ #ifndef _CAM_CAM_H @@ -129,6 +129,7 @@ * requests for the target at the sim level * back into the XPT queue. */ + CAM_SCSI_IT_NEXUS_LOST, /* Initiator/Target Nexus lost. */ CAM_IDE = 0x33, /* Initiator Detected Error */ CAM_RESRC_UNAVAIL, /* Resource Unavailable */ CAM_UNACKED_EVENT, /* Unacknowledged Event by Host */ ==== //depot/projects/smpng/sys/cddl/compat/opensolaris/kern/opensolaris_atomic.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/cddl/compat/opensolaris/kern/opensolaris_atomic.c,v 1.2 2008/03/28 22:16:05 jb Exp $"); +__FBSDID("$FreeBSD: src/sys/cddl/compat/opensolaris/kern/opensolaris_atomic.c,v 1.3 2008/09/18 19:57:06 imp Exp $"); #include <sys/param.h> #include <sys/lock.h> @@ -74,7 +74,8 @@ return (newval); } -#if defined(__sparc64__) || defined(__powerpc__) || defined(__arm__) +#if defined(__sparc64__) || defined(__powerpc__) || defined(__arm__) || \ + defined(__mips__) void atomic_or_8(volatile uint8_t *target, uint8_t value) { ==== //depot/projects/smpng/sys/cddl/compat/opensolaris/sys/atomic.h#3 (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/cddl/compat/opensolaris/sys/atomic.h,v 1.4 2008/05/22 08:33:24 jb Exp $ + * $FreeBSD: src/sys/cddl/compat/opensolaris/sys/atomic.h,v 1.5 2008/09/18 19:57:06 imp Exp $ */ #ifndef _OPENSOLARIS_SYS_ATOMIC_H_ @@ -48,7 +48,8 @@ extern uint8_t atomic_or_8_nv(volatile uint8_t *target, uint8_t value); extern void membar_producer(void); -#if defined(__sparc64__) || defined(__powerpc__) || defined(__arm__) +#if defined(__sparc64__) || defined(__powerpc__) || defined(__arm__) || \ + defined(__mips__) extern void atomic_or_8(volatile uint8_t *target, uint8_t value); #else static __inline void ==== //depot/projects/smpng/sys/compat/freebsd32/freebsd32_misc.c#50 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/compat/freebsd32/freebsd32_misc.c,v 1.78 2008/09/15 17:39:40 obrien Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/freebsd32/freebsd32_misc.c,v 1.79 2008/09/19 15:17:32 obrien Exp $"); #include "opt_compat.h" @@ -85,6 +85,8 @@ #include <machine/cpu.h> +#include <security/audit/audit.h> + #include <compat/freebsd32/freebsd32_util.h> #include <compat/freebsd32/freebsd32.h> #include <compat/freebsd32/freebsd32_ipc.h> @@ -2552,8 +2554,51 @@ return (cpuset_setaffinity(td, &ap)); } +int +freebsd32_nmount(struct thread *td, + struct freebsd32_nmount_args /* { + struct iovec *iovp; + unsigned int iovcnt; + int flags; + } */ *uap) +{ + struct uio *auio; + struct iovec *iov; + int error, k; + + AUDIT_ARG(fflags, uap->flags); + + /* + * Filter out MNT_ROOTFS. We do not want clients of nmount() in + * userspace to set this flag, but we must filter it out if we want + * MNT_UPDATE on the root file system to work. + * MNT_ROOTFS should only be set in the kernel in vfs_mountroot_try(). + */ + uap->flags &= ~MNT_ROOTFS; + + /* + * check that we have an even number of iovec's + * and that we have at least two options. + */ + if ((uap->iovcnt & 1) || (uap->iovcnt < 4)) + return (EINVAL); + + error = freebsd32_copyinuio(uap->iovp, uap->iovcnt, &auio); + if (error) + return (error); + for (iov = auio->uio_iov, k = 0; k < uap->iovcnt; ++k, ++iov) { + if (iov->iov_len > MMAXOPTIONLEN) { + free(auio, M_IOV); + return (EINVAL); + } + } + + error = vfs_donmount(td, uap->flags, auio); + free(auio, M_IOV); + return error; +} + #if 0 - int freebsd32_xxx(struct thread *td, struct freebsd32_xxx_args *uap) { @@ -2578,5 +2623,4 @@ } return (error); } - #endif ==== //depot/projects/smpng/sys/compat/freebsd32/freebsd32_proto.h#45 (text+ko) ==== @@ -2,8 +2,8 @@ * System call prototypes. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/compat/freebsd32/freebsd32_proto.h,v 1.90 2008/09/15 17:39:01 obrien Exp $ - * created from FreeBSD: head/sys/compat/freebsd32/syscalls.master 183042 2008-09-15 17:37:41Z obrien + * $FreeBSD: src/sys/compat/freebsd32/freebsd32_proto.h,v 1.92 2008/09/22 16:09:43 obrien Exp $ + * created from FreeBSD: head/sys/compat/freebsd32/syscalls.master 183270 2008-09-22 16:09:16Z obrien */ #ifndef _FREEBSD32_SYSPROTO_H_ @@ -63,6 +63,11 @@ char ss_l_[PADL_(struct sigaltstack32 *)]; struct sigaltstack32 * ss; char ss_r_[PADR_(struct sigaltstack32 *)]; char oss_l_[PADL_(struct sigaltstack32 *)]; struct sigaltstack32 * oss; char oss_r_[PADR_(struct sigaltstack32 *)]; }; +struct freebsd32_ioctl_args { + char fd_l_[PADL_(int)]; int fd; char fd_r_[PADR_(int)]; + char com_l_[PADL_(uint32_t)]; uint32_t com; char com_r_[PADR_(uint32_t)]; + char data_l_[PADL_(struct md_ioctl32 *)]; struct md_ioctl32 * data; char data_r_[PADR_(struct md_ioctl32 *)]; +}; struct freebsd32_execve_args { char fname_l_[PADL_(char *)]; char * fname; char fname_r_[PADR_(char *)]; char argv_l_[PADL_(u_int32_t *)]; u_int32_t * argv; char argv_r_[PADR_(u_int32_t *)]; @@ -241,6 +246,11 @@ char nevents_l_[PADL_(int)]; int nevents; char nevents_r_[PADR_(int)]; char timeout_l_[PADL_(const struct timespec32 *)]; const struct timespec32 * timeout; char timeout_r_[PADR_(const struct timespec32 *)]; }; +struct freebsd32_nmount_args { + char iovp_l_[PADL_(struct iovec32 *)]; struct iovec32 * iovp; char iovp_r_[PADR_(struct iovec32 *)]; + char iovcnt_l_[PADL_(unsigned int)]; unsigned int iovcnt; char iovcnt_r_[PADR_(unsigned int)]; + char flags_l_[PADL_(int)]; int flags; char flags_r_[PADR_(int)]; +}; struct freebsd32_sendfile_args { char fd_l_[PADL_(int)]; int fd; char fd_r_[PADR_(int)]; char s_l_[PADL_(int)]; int s; char s_r_[PADR_(int)]; @@ -378,6 +388,7 @@ int freebsd32_sendmsg(struct thread *, struct freebsd32_sendmsg_args *); int freebsd32_recvfrom(struct thread *, struct freebsd32_recvfrom_args *); int freebsd32_sigaltstack(struct thread *, struct freebsd32_sigaltstack_args *); +int freebsd32_ioctl(struct thread *, struct freebsd32_ioctl_args *); int freebsd32_execve(struct thread *, struct freebsd32_execve_args *); int freebsd32_setitimer(struct thread *, struct freebsd32_setitimer_args *); int freebsd32_getitimer(struct thread *, struct freebsd32_getitimer_args *); @@ -413,6 +424,7 @@ int freebsd32_sigtimedwait(struct thread *, struct freebsd32_sigtimedwait_args *); int freebsd32_sigwaitinfo(struct thread *, struct freebsd32_sigwaitinfo_args *); int freebsd32_kevent(struct thread *, struct freebsd32_kevent_args *); +int freebsd32_nmount(struct thread *, struct freebsd32_nmount_args *); int freebsd32_sendfile(struct thread *, struct freebsd32_sendfile_args *); int freebsd32_sigaction(struct thread *, struct freebsd32_sigaction_args *); int freebsd32_sigreturn(struct thread *, struct freebsd32_sigreturn_args *); @@ -588,6 +600,7 @@ #define FREEBSD32_SYS_AUE_freebsd32_sendmsg AUE_SENDMSG #define FREEBSD32_SYS_AUE_freebsd32_recvfrom AUE_RECVFROM #define FREEBSD32_SYS_AUE_freebsd32_sigaltstack AUE_SIGALTSTACK +#define FREEBSD32_SYS_AUE_freebsd32_ioctl AUE_NULL #define FREEBSD32_SYS_AUE_freebsd32_execve AUE_EXECVE #define FREEBSD32_SYS_AUE_freebsd32_setitimer AUE_SETITIMER #define FREEBSD32_SYS_AUE_freebsd32_getitimer AUE_GETITIMER @@ -623,6 +636,7 @@ #define FREEBSD32_SYS_AUE_freebsd32_sigtimedwait AUE_SIGWAIT #define FREEBSD32_SYS_AUE_freebsd32_sigwaitinfo AUE_NULL #define FREEBSD32_SYS_AUE_freebsd32_kevent AUE_NULL +#define FREEBSD32_SYS_AUE_freebsd32_nmount AUE_NMOUNT #define FREEBSD32_SYS_AUE_freebsd32_sendfile AUE_SENDFILE #define FREEBSD32_SYS_AUE_freebsd32_sigaction AUE_SIGACTION #define FREEBSD32_SYS_AUE_freebsd32_sigreturn AUE_SIGRETURN ==== //depot/projects/smpng/sys/compat/freebsd32/freebsd32_syscall.h#45 (text+ko) ==== @@ -2,8 +2,8 @@ * System call numbers. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/compat/freebsd32/freebsd32_syscall.h,v 1.89 2008/09/15 17:39:01 obrien Exp $ - * created from FreeBSD: head/sys/compat/freebsd32/syscalls.master 183042 2008-09-15 17:37:41Z obrien + * $FreeBSD: src/sys/compat/freebsd32/freebsd32_syscall.h,v 1.91 2008/09/22 16:09:43 obrien Exp $ + * created from FreeBSD: head/sys/compat/freebsd32/syscalls.master 183270 2008-09-22 16:09:16Z obrien */ #define FREEBSD32_SYS_syscall 0 @@ -58,7 +58,7 @@ #define FREEBSD32_SYS_acct 51 /* 52 is old freebsd32_sigpending */ #define FREEBSD32_SYS_freebsd32_sigaltstack 53 -#define FREEBSD32_SYS_ioctl 54 +#define FREEBSD32_SYS_freebsd32_ioctl 54 #define FREEBSD32_SYS_reboot 55 #define FREEBSD32_SYS_revoke 56 #define FREEBSD32_SYS_symlink 57 @@ -283,7 +283,7 @@ #define FREEBSD32_SYS_extattr_delete_fd 373 #define FREEBSD32_SYS___setugid 374 #define FREEBSD32_SYS_eaccess 376 -#define FREEBSD32_SYS_nmount 378 +#define FREEBSD32_SYS_freebsd32_nmount 378 #define FREEBSD32_SYS_kenv 390 #define FREEBSD32_SYS_lchflags 391 #define FREEBSD32_SYS_uuidgen 392 ==== //depot/projects/smpng/sys/compat/freebsd32/freebsd32_syscalls.c#45 (text+ko) ==== @@ -2,8 +2,8 @@ * System call names. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/compat/freebsd32/freebsd32_syscalls.c,v 1.80 2008/09/15 17:39:01 obrien Exp $ - * created from FreeBSD: head/sys/compat/freebsd32/syscalls.master 183042 2008-09-15 17:37:41Z obrien + * $FreeBSD: src/sys/compat/freebsd32/freebsd32_syscalls.c,v 1.82 2008/09/22 16:09:43 obrien Exp $ + * created from FreeBSD: head/sys/compat/freebsd32/syscalls.master 183270 2008-09-22 16:09:16Z obrien */ const char *freebsd32_syscallnames[] = { @@ -61,7 +61,7 @@ "acct", /* 51 = acct */ "compat.freebsd32_sigpending", /* 52 = old freebsd32_sigpending */ "freebsd32_sigaltstack", /* 53 = freebsd32_sigaltstack */ - "ioctl", /* 54 = ioctl */ + "freebsd32_ioctl", /* 54 = freebsd32_ioctl */ "reboot", /* 55 = reboot */ "revoke", /* 56 = revoke */ "symlink", /* 57 = symlink */ @@ -385,7 +385,7 @@ "#375", /* 375 = nfsclnt */ "eaccess", /* 376 = eaccess */ "#377", /* 377 = afs_syscall */ - "nmount", /* 378 = nmount */ + "freebsd32_nmount", /* 378 = freebsd32_nmount */ "#379", /* 379 = kse_exit */ "#380", /* 380 = kse_wakeup */ "#381", /* 381 = kse_create */ ==== //depot/projects/smpng/sys/compat/freebsd32/freebsd32_sysent.c#45 (text+ko) ==== @@ -2,8 +2,8 @@ * System call switch table. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/compat/freebsd32/freebsd32_sysent.c,v 1.90 2008/09/15 17:39:01 obrien Exp $ - * created from FreeBSD: head/sys/compat/freebsd32/syscalls.master 183042 2008-09-15 17:37:41Z obrien + * $FreeBSD: src/sys/compat/freebsd32/freebsd32_sysent.c,v 1.92 2008/09/22 16:09:43 obrien Exp $ + * created from FreeBSD: head/sys/compat/freebsd32/syscalls.master 183270 2008-09-22 16:09:16Z obrien */ #include "opt_compat.h" @@ -92,7 +92,7 @@ { AS(acct_args), (sy_call_t *)acct, AUE_ACCT, NULL, 0, 0 }, /* 51 = acct */ { compat(0,freebsd32_sigpending), AUE_SIGPENDING, NULL, 0, 0 }, /* 52 = old freebsd32_sigpending */ { AS(freebsd32_sigaltstack_args), (sy_call_t *)freebsd32_sigaltstack, AUE_SIGALTSTACK, NULL, 0, 0 }, /* 53 = freebsd32_sigaltstack */ - { AS(ioctl_args), (sy_call_t *)ioctl, AUE_IOCTL, NULL, 0, 0 }, /* 54 = ioctl */ + { AS(freebsd32_ioctl_args), (sy_call_t *)freebsd32_ioctl, AUE_NULL, NULL, 0, 0 }, /* 54 = freebsd32_ioctl */ { AS(reboot_args), (sy_call_t *)reboot, AUE_REBOOT, NULL, 0, 0 }, /* 55 = reboot */ { AS(revoke_args), (sy_call_t *)revoke, AUE_REVOKE, NULL, 0, 0 }, /* 56 = revoke */ { AS(symlink_args), (sy_call_t *)symlink, AUE_SYMLINK, NULL, 0, 0 }, /* 57 = symlink */ @@ -416,7 +416,7 @@ { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 375 = nfsclnt */ { AS(eaccess_args), (sy_call_t *)eaccess, AUE_EACCESS, NULL, 0, 0 }, /* 376 = eaccess */ { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 377 = afs_syscall */ - { AS(nmount_args), (sy_call_t *)nmount, AUE_NMOUNT, NULL, 0, 0 }, /* 378 = nmount */ + { AS(freebsd32_nmount_args), (sy_call_t *)freebsd32_nmount, AUE_NMOUNT, NULL, 0, 0 }, /* 378 = freebsd32_nmount */ { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 379 = kse_exit */ { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 380 = kse_wakeup */ { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 381 = kse_create */ ==== //depot/projects/smpng/sys/compat/freebsd32/syscalls.master#49 (text+ko) ==== @@ -1,4 +1,4 @@ - $FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.105 2008/09/15 17:37:41 obrien Exp $ + $FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.107 2008/09/22 16:09:16 obrien Exp $ ; from: @(#)syscalls.master 8.2 (Berkeley) 1/13/94 ; from: src/sys/kern/syscalls.master 1.107 ; @@ -134,8 +134,8 @@ 53 AUE_SIGALTSTACK STD { int freebsd32_sigaltstack( \ struct sigaltstack32 *ss, \ struct sigaltstack32 *oss); } -54 AUE_IOCTL NOPROTO { int ioctl(int fd, u_long com, \ - caddr_t data); } +54 AUE_NULL STD { int freebsd32_ioctl(int fd, uint32_t com, \ + struct md_ioctl32 *data); } 55 AUE_REBOOT NOPROTO { int reboot(int opt); } 56 AUE_REVOKE NOPROTO { int revoke(char *path); } 57 AUE_SYMLINK NOPROTO { int symlink(char *path, char *link); } @@ -651,7 +651,7 @@ 375 AUE_NULL UNIMPL nfsclnt 376 AUE_EACCESS NOPROTO { int eaccess(char *path, int flags); } 377 AUE_NULL UNIMPL afs_syscall -378 AUE_NMOUNT NOPROTO { int nmount(struct iovec *iovp, \ +378 AUE_NMOUNT STD { int freebsd32_nmount(struct iovec32 *iovp, \ unsigned int iovcnt, int flags); } 379 AUE_NULL UNIMPL kse_exit 380 AUE_NULL UNIMPL kse_wakeup ==== //depot/projects/smpng/sys/compat/ia32/ia32_sysvec.c#19 (text+ko) ==== @@ -26,7 +26,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/compat/ia32/ia32_sysvec.c,v 1.27 2007/09/24 20:49:39 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/ia32/ia32_sysvec.c,v 1.28 2008/09/24 10:14:37 kib Exp $"); #include "opt_compat.h" @@ -111,61 +111,61 @@ TUNABLE_ULONG("compat.ia32.maxvmem", &ia32_maxvmem); >>> TRUNCATED FOR MAIL (1000 lines) <<<help
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200809242157.m8OLv1XC067649>