From owner-p4-projects@FreeBSD.ORG Wed Jun 21 10:11:57 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 387DB16A484; Wed, 21 Jun 2006 10:11:57 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id EF61C16A47E for ; Wed, 21 Jun 2006 10:11:56 +0000 (UTC) (envelope-from scottl@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 7FF6443D97 for ; Wed, 21 Jun 2006 10:11:49 +0000 (GMT) (envelope-from scottl@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k5LABnDc063153 for ; Wed, 21 Jun 2006 10:11:49 GMT (envelope-from scottl@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k5LABjEZ063150 for perforce@freebsd.org; Wed, 21 Jun 2006 10:11:45 GMT (envelope-from scottl@freebsd.org) Date: Wed, 21 Jun 2006 10:11:45 GMT Message-Id: <200606211011.k5LABjEZ063150@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to scottl@freebsd.org using -f From: Scott Long To: Perforce Change Reviews Cc: Subject: PERFORCE change 99742 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 21 Jun 2006 10:11:57 -0000 http://perforce.freebsd.org/chv.cgi?CH=99742 Change 99742 by scottl@scottl-wv1u on 2006/06/21 10:11:33 IFC Affected files ... .. //depot/projects/scottl-camlock/src/sys/amd64/amd64/fpu.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/amd64/initcpu.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/amd64/machdep.c#9 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/amd64/pmap.c#11 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/amd64/trap.c#8 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/conf/GENERIC#10 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/include/md_var.h#5 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/linux32/linux32_dummy.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/linux32/linux32_proto.h#6 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/linux32/linux32_syscall.h#6 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/linux32/linux32_sysent.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/linux32/syscalls.master#6 integrate .. //depot/projects/scottl-camlock/src/sys/arm/arm/elf_trampoline.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/arm/arm/pmap.c#10 integrate .. //depot/projects/scottl-camlock/src/sys/arm/at91/at91_pmc.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/arm/at91/at91rm92reg.h#3 integrate .. //depot/projects/scottl-camlock/src/sys/arm/at91/if_ate.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/arm/at91/kb920x_machdep.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/arm/conf/IQ31244#5 integrate .. //depot/projects/scottl-camlock/src/sys/arm/conf/KB920X#4 integrate .. //depot/projects/scottl-camlock/src/sys/arm/conf/SIMICS#5 integrate .. //depot/projects/scottl-camlock/src/sys/arm/conf/SKYEYE#4 integrate .. //depot/projects/scottl-camlock/src/sys/boot/Makefile#6 integrate .. //depot/projects/scottl-camlock/src/sys/compat/ndis/subr_ndis.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/conf/Makefile.arm#8 integrate .. //depot/projects/scottl-camlock/src/sys/conf/NOTES#12 integrate .. //depot/projects/scottl-camlock/src/sys/conf/kern.post.mk#8 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/pf/net/if_pfsync.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/ddb/db_sym.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/dev/aac/aac_pci.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ata/ata-chipset.c#10 integrate .. //depot/projects/scottl-camlock/src/sys/dev/bge/if_bge.c#9 integrate .. //depot/projects/scottl-camlock/src/sys/dev/bge/if_bgereg.h#8 integrate .. //depot/projects/scottl-camlock/src/sys/dev/digi/digi.c#8 integrate .. //depot/projects/scottl-camlock/src/sys/dev/mfi/mfi.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/dev/mfi/mfi_disk.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/dev/mfi/mfi_pci.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/dev/mfi/mfireg.h#3 integrate .. //depot/projects/scottl-camlock/src/sys/dev/mfi/mfivar.h#3 integrate .. //depot/projects/scottl-camlock/src/sys/dev/mxge/eth_z8e.dat.gz.uu#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/mxge/ethp_z8e.dat.gz.uu#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/mxge/if_mxge.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/mxge/if_mxge_var.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/mxge/mxge_mcp.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/myri10ge/eth_z8e.dat.gz.uu#2 delete .. //depot/projects/scottl-camlock/src/sys/dev/myri10ge/ethp_z8e.dat.gz.uu#2 delete .. //depot/projects/scottl-camlock/src/sys/dev/myri10ge/if_myri10ge.c#3 delete .. //depot/projects/scottl-camlock/src/sys/dev/myri10ge/if_myri10ge_var.h#2 delete .. //depot/projects/scottl-camlock/src/sys/dev/myri10ge/mcp_gen_header.h#2 delete .. //depot/projects/scottl-camlock/src/sys/dev/myri10ge/myri10ge_mcp.h#2 delete .. //depot/projects/scottl-camlock/src/sys/dev/sound/driver.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/dev/sound/midi/midi.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/dev/sound/midi/sequencer.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/dev/sound/pci/ak452x.c#1 branch .. //depot/projects/scottl-camlock/src/sys/dev/sound/pci/ak452x.h#1 branch .. //depot/projects/scottl-camlock/src/sys/dev/sound/pci/cmi.c#8 integrate .. //depot/projects/scottl-camlock/src/sys/dev/sound/pci/envy24.c#1 branch .. //depot/projects/scottl-camlock/src/sys/dev/sound/pci/envy24.h#1 branch .. //depot/projects/scottl-camlock/src/sys/dev/sound/pci/es137x.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/dev/sound/pci/ich.c#10 integrate .. //depot/projects/scottl-camlock/src/sys/dev/sound/pci/maestro.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/dev/sound/pci/via8233.c#8 integrate .. //depot/projects/scottl-camlock/src/sys/dev/sound/pcm/feeder_rate.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/dev/sound/pcm/sound.c#8 integrate .. //depot/projects/scottl-camlock/src/sys/dev/sound/pcm/vchan.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/uhid.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/umodem.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/uplcom.c#8 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/usbdevs#10 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/uscanner.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/uvisor.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/dev/wl/if_wl.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/geom/geom_dev.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/i386/acpica/acpi_wakeup.c#8 integrate .. //depot/projects/scottl-camlock/src/sys/i386/conf/GENERIC#10 integrate .. //depot/projects/scottl-camlock/src/sys/i386/conf/XBOX#3 integrate .. //depot/projects/scottl-camlock/src/sys/i386/i386/db_trace.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/i386/i386/identcpu.c#8 integrate .. //depot/projects/scottl-camlock/src/sys/i386/i386/pmap.c#11 integrate .. //depot/projects/scottl-camlock/src/sys/i386/i386/trap.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/i386/include/specialreg.h#5 integrate .. //depot/projects/scottl-camlock/src/sys/i386/linux/linux_dummy.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/i386/linux/linux_proto.h#9 integrate .. //depot/projects/scottl-camlock/src/sys/i386/linux/linux_syscall.h#9 integrate .. //depot/projects/scottl-camlock/src/sys/i386/linux/linux_sysent.c#9 integrate .. //depot/projects/scottl-camlock/src/sys/i386/linux/syscalls.master#9 integrate .. //depot/projects/scottl-camlock/src/sys/ia64/conf/GENERIC#8 integrate .. //depot/projects/scottl-camlock/src/sys/ia64/conf/SKI#6 integrate .. //depot/projects/scottl-camlock/src/sys/ia64/ia64/pmap.c#9 integrate .. //depot/projects/scottl-camlock/src/sys/kern/kern_linker.c#10 integrate .. //depot/projects/scottl-camlock/src/sys/kern/kern_module.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/kern/kern_synch.c#10 integrate .. //depot/projects/scottl-camlock/src/sys/kern/kern_sysctl.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/kern/kern_tc.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/kern/link_elf.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/kern/link_elf_obj.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/kern/sched_4bsd.c#8 integrate .. //depot/projects/scottl-camlock/src/sys/kern/sched_core.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/kern/sched_ule.c#8 integrate .. //depot/projects/scottl-camlock/src/sys/kern/subr_firmware.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/kern/subr_kdb.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/kern/uipc_socket.c#9 integrate .. //depot/projects/scottl-camlock/src/sys/kern/uipc_socket2.c#8 integrate .. //depot/projects/scottl-camlock/src/sys/kern/uipc_syscalls.c#11 integrate .. //depot/projects/scottl-camlock/src/sys/kern/uipc_usrreq.c#9 integrate .. //depot/projects/scottl-camlock/src/sys/kern/vfs_cache.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/modules/Makefile#11 integrate .. //depot/projects/scottl-camlock/src/sys/modules/myri10ge/Makefile#2 delete .. //depot/projects/scottl-camlock/src/sys/modules/myri10ge/myri10ge/Makefile#2 delete .. //depot/projects/scottl-camlock/src/sys/modules/myri10ge/myri10ge_eth_z8e/Makefile#2 delete .. //depot/projects/scottl-camlock/src/sys/modules/myri10ge/myri10ge_ethp_z8e/Makefile#2 delete .. //depot/projects/scottl-camlock/src/sys/modules/ppc/Makefile#1 branch .. //depot/projects/scottl-camlock/src/sys/modules/sound/driver/Makefile#4 integrate .. //depot/projects/scottl-camlock/src/sys/modules/sound/driver/ak452x/Makefile#1 branch .. //depot/projects/scottl-camlock/src/sys/modules/sound/driver/envy24/Makefile#1 branch .. //depot/projects/scottl-camlock/src/sys/net/bpf.c#10 integrate .. //depot/projects/scottl-camlock/src/sys/net/if.c#9 integrate .. //depot/projects/scottl-camlock/src/sys/net/if.h#7 integrate .. //depot/projects/scottl-camlock/src/sys/net/if_bridge.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/net/if_clone.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/net/if_var.h#7 integrate .. //depot/projects/scottl-camlock/src/sys/net/if_vlan.c#9 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/ip_fw2.c#10 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/tcp_input.c#9 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/tcp_seq.h#5 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/tcp_syncache.c#9 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/tcp_var.h#9 integrate .. //depot/projects/scottl-camlock/src/sys/pc98/conf/GENERIC#8 integrate .. //depot/projects/scottl-camlock/src/sys/posix4/ksched.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/powerpc/conf/GENERIC#8 integrate .. //depot/projects/scottl-camlock/src/sys/powerpc/powerpc/mmu_if.m#4 integrate .. //depot/projects/scottl-camlock/src/sys/powerpc/powerpc/mmu_oea.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/powerpc/powerpc/pmap_dispatch.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/security/audit/audit_bsm_token.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/sparc64/conf/GENERIC#9 integrate .. //depot/projects/scottl-camlock/src/sys/sparc64/sparc64/pmap.c#9 integrate .. //depot/projects/scottl-camlock/src/sys/sys/linker.h#7 integrate .. //depot/projects/scottl-camlock/src/sys/sys/protosw.h#8 integrate .. //depot/projects/scottl-camlock/src/sys/sys/sched.h#7 integrate .. //depot/projects/scottl-camlock/src/sys/sys/socketvar.h#9 integrate .. //depot/projects/scottl-camlock/src/sys/sys/sockio.h#5 integrate .. //depot/projects/scottl-camlock/src/sys/tools/fw_stub.awk#2 integrate .. //depot/projects/scottl-camlock/src/sys/vm/pmap.h#8 integrate .. //depot/projects/scottl-camlock/src/sys/vm/vm_fault.c#8 integrate .. //depot/projects/scottl-camlock/src/sys/vm/vm_map.c#9 integrate Differences ... ==== //depot/projects/scottl-camlock/src/sys/amd64/amd64/fpu.c#6 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/fpu.c,v 1.158 2006/04/19 07:00:19 cperciva Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/fpu.c,v 1.159 2006/06/19 22:36:01 davidxu Exp $"); #include #include @@ -125,6 +125,10 @@ mxcsr = __INITIAL_MXCSR__; ldmxcsr(mxcsr); fxsave(&fpu_cleanstate); + if (fpu_cleanstate.sv_env.en_mxcsr_mask) + cpu_mxcsr_mask = fpu_cleanstate.sv_env.en_mxcsr_mask; + else + cpu_mxcsr_mask = 0xFFBF; start_emulating(); bzero(fpu_cleanstate.sv_fp, sizeof(fpu_cleanstate.sv_fp)); bzero(fpu_cleanstate.sv_xmm, sizeof(fpu_cleanstate.sv_xmm)); ==== //depot/projects/scottl-camlock/src/sys/amd64/amd64/initcpu.c#4 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/initcpu.c,v 1.49 2005/10/14 22:52:00 jkim Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/initcpu.c,v 1.50 2006/06/19 22:59:28 davidxu Exp $"); #include "opt_cpu.h" @@ -60,6 +60,7 @@ u_int cpu_procinfo2; /* Multicore info */ char cpu_vendor[20]; /* CPU Origin code */ u_int cpu_fxsr; /* SSE enabled */ +u_int cpu_mxcsr_mask; /* Valid bits in mxcsr */ /* * Initialize CPU control registers ==== //depot/projects/scottl-camlock/src/sys/amd64/amd64/machdep.c#9 (text+ko) ==== @@ -39,7 +39,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/machdep.c,v 1.649 2006/05/11 17:29:22 phk Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/machdep.c,v 1.650 2006/06/19 22:36:01 davidxu Exp $"); #include "opt_atalk.h" #include "opt_atpic.h" @@ -1507,7 +1507,7 @@ penv_xmm->en_rip = penv_fpreg->en_rip; penv_xmm->en_rdp = penv_fpreg->en_rdp; penv_xmm->en_mxcsr = penv_fpreg->en_mxcsr; - penv_xmm->en_mxcsr_mask = penv_fpreg->en_mxcsr_mask; + penv_xmm->en_mxcsr_mask = penv_fpreg->en_mxcsr_mask & cpu_mxcsr_mask; /* FPU registers */ for (i = 0; i < 8; ++i) @@ -1634,6 +1634,7 @@ static int set_fpcontext(struct thread *td, const mcontext_t *mcp) { + struct savefpu *fpstate; if (mcp->mc_fpformat == _MC_FPFMT_NODEV) return (0); @@ -1649,7 +1650,9 @@ * be called with interrupts disabled. * XXX obsolete on trap-16 systems? */ - fpusetregs(td, (struct savefpu *)&mcp->mc_fpstate); + fpstate = (struct savefpu *)&mcp->mc_fpstate; + fpstate->sv_env.en_mxcsr &= cpu_mxcsr_mask; + fpusetregs(td, fpstate); } else return (EINVAL); return (0); ==== //depot/projects/scottl-camlock/src/sys/amd64/amd64/pmap.c#11 (text+ko) ==== @@ -77,7 +77,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.556 2006/06/12 20:05:27 alc Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.558 2006/06/20 20:52:10 alc Exp $"); /* * Manages physical address maps. @@ -1664,7 +1664,7 @@ static const struct timeval printinterval = { 60, 0 }; static struct timeval lastprint; static vm_pindex_t colour; - int bit, field; + int bit, field, page_req; pv_entry_t pv; struct pv_chunk *pc; vm_page_t m; @@ -1697,7 +1697,8 @@ } } /* No free items, allocate another chunk */ - m = vm_page_alloc(NULL, colour, VM_ALLOC_SYSTEM | VM_ALLOC_NOOBJ); + page_req = try ? VM_ALLOC_NORMAL : VM_ALLOC_SYSTEM; + m = vm_page_alloc(NULL, colour, page_req | VM_ALLOC_NOOBJ); if (m == NULL) { if (try) { pv_entry_count--; @@ -2335,6 +2336,7 @@ vm_page_t m, mpte; vm_pindex_t diff, psize; + VM_OBJECT_LOCK_ASSERT(m_start->object, MA_OWNED); psize = atop(end - start); mpte = NULL; m = m_start; @@ -2356,15 +2358,13 @@ * but is *MUCH* faster than pmap_enter... */ -vm_page_t -pmap_enter_quick(pmap_t pmap, vm_offset_t va, vm_page_t m, vm_prot_t prot, - vm_page_t mpte) +void +pmap_enter_quick(pmap_t pmap, vm_offset_t va, vm_page_t m, vm_prot_t prot) { PMAP_LOCK(pmap); - mpte = pmap_enter_quick_locked(pmap, va, m, prot, mpte); + (void) pmap_enter_quick_locked(pmap, va, m, prot, NULL); PMAP_UNLOCK(pmap); - return (mpte); } static vm_page_t @@ -2378,7 +2378,6 @@ (m->flags & (PG_FICTITIOUS | PG_UNMANAGED)) != 0, ("pmap_enter_quick_locked: managed mapping within the clean submap")); mtx_assert(&vm_page_queue_mtx, MA_OWNED); - VM_OBJECT_LOCK_ASSERT(m->object, MA_OWNED); PMAP_LOCK_ASSERT(pmap, MA_OWNED); /* @@ -2396,7 +2395,6 @@ if (mpte && (mpte->pindex == ptepindex)) { mpte->wire_count++; } else { - retry: /* * Get the page directory entry */ @@ -2414,18 +2412,8 @@ } else { mpte = _pmap_allocpte(pmap, ptepindex, M_NOWAIT); - if (mpte == NULL) { - PMAP_UNLOCK(pmap); - vm_page_busy(m); - vm_page_unlock_queues(); - VM_OBJECT_UNLOCK(m->object); - VM_WAIT; - VM_OBJECT_LOCK(m->object); - vm_page_lock_queues(); - vm_page_wakeup(m); - PMAP_LOCK(pmap); - goto retry; - } + if (mpte == NULL) + return (mpte); } } } else { @@ -2448,12 +2436,16 @@ } /* - * Enter on the PV list if part of our managed memory. Note that we - * raise IPL while manipulating pv_table since pmap_enter can be - * called at interrupt time. + * Enter on the PV list if part of our managed memory. */ - if ((m->flags & (PG_FICTITIOUS|PG_UNMANAGED)) == 0) - pmap_insert_entry(pmap, va, m); + if ((m->flags & (PG_FICTITIOUS | PG_UNMANAGED)) == 0 && + !pmap_try_insert_pv_entry(pmap, va, m)) { + if (mpte != NULL) { + pmap_unwire_pte_hold(pmap, va, mpte); + mpte = NULL; + } + return (mpte); + } /* * Increment counters ==== //depot/projects/scottl-camlock/src/sys/amd64/amd64/trap.c#8 (text+ko) ==== @@ -38,7 +38,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/trap.c,v 1.303 2006/03/13 23:55:31 peter Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/trap.c,v 1.304 2006/06/20 12:44:21 yar Exp $"); /* * AMD64 Trap and System call handling @@ -681,15 +681,9 @@ } #ifdef KDB - if (debugger_on_panic || kdb_active) { - register_t rflags; - rflags = intr_disable(); - if (kdb_trap(type, 0, frame)) { - intr_restore(rflags); + if (debugger_on_panic || kdb_active) + if (kdb_trap(type, 0, frame)) return; - } - intr_restore(rflags); - } #endif printf("trap number = %d\n", type); if (type <= MAX_TRAP_MSG) ==== //depot/projects/scottl-camlock/src/sys/amd64/conf/GENERIC#10 (text+ko) ==== @@ -16,7 +16,7 @@ # If you are in doubt as to the purpose or necessity of a line, check first # in NOTES. # -# $FreeBSD: src/sys/amd64/conf/GENERIC,v 1.459 2006/06/13 13:12:56 davidxu Exp $ +# $FreeBSD: src/sys/amd64/conf/GENERIC,v 1.460 2006/06/15 19:58:52 netchild Exp $ cpu HAMMER ident GENERIC @@ -46,7 +46,6 @@ options PROCFS # Process filesystem (requires PSEUDOFS) options PSEUDOFS # Pseudo-filesystem framework options GEOM_GPT # GUID Partition Tables. -options COMPAT_43 # Needed by COMPAT_LINUX32 options COMPAT_43TTY # BSD 4.3 TTY compat [KEEP THIS!] options COMPAT_IA32 # Compatible with i386 binaries options COMPAT_FREEBSD4 # Compatible with FreeBSD4 ==== //depot/projects/scottl-camlock/src/sys/amd64/include/md_var.h#5 (text+ko) ==== @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/amd64/include/md_var.h,v 1.77 2006/04/21 04:24:50 peter Exp $ + * $FreeBSD: src/sys/amd64/include/md_var.h,v 1.78 2006/06/19 22:36:01 davidxu Exp $ */ #ifndef _MACHINE_MD_VAR_H_ @@ -47,6 +47,7 @@ extern u_int cpu_fxsr; extern u_int cpu_high; extern u_int cpu_id; +extern u_int cpu_mxcsr_mask; extern u_int cpu_procinfo; extern u_int cpu_procinfo2; extern char cpu_vendor[]; ==== //depot/projects/scottl-camlock/src/sys/amd64/linux32/linux32_dummy.c#3 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/linux32/linux32_dummy.c,v 1.2 2006/05/10 18:17:28 netchild Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/linux32/linux32_dummy.c,v 1.3 2006/06/21 08:45:40 netchild Exp $"); #include #include @@ -67,6 +67,62 @@ DUMMY(fadvise64); DUMMY(ptrace); DUMMY(settimeofday); +DUMMY(lookup_dcookie); +DUMMY(epoll_create); +DUMMY(epoll_ctl); +DUMMY(epoll_wait); +DUMMY(remap_file_pages); +DUMMY(set_tid_address); +DUMMY(timer_create); +DUMMY(timer_settime); +DUMMY(timer_gettime); +DUMMY(timer_getoverrun); +DUMMY(timer_delete); +DUMMY(clock_settime); +DUMMY(clock_gettime); +DUMMY(clock_getres); +DUMMY(clock_nanosleep); +DUMMY(statfs64); +DUMMY(fstatfs64); +DUMMY(tgkill); +DUMMY(utimes); +DUMMY(fadvise64_64); +DUMMY(mbind); +DUMMY(get_mempolicy); +DUMMY(set_mempolicy); +DUMMY(mq_open); +DUMMY(mq_unlink); +DUMMY(mq_timedsend); +DUMMY(mq_timedreceive); +DUMMY(mq_notify); +DUMMY(mq_getsetattr); +DUMMY(kexec_load); +DUMMY(waitid); +DUMMY(add_key); +DUMMY(request_key); +DUMMY(keyctl); +DUMMY(ioprio_set); +DUMMY(ioprio_get); +DUMMY(inotify_init); +DUMMY(inotify_add_watch); +DUMMY(inotify_rm_watch); +DUMMY(migrate_pages); +DUMMY(openat); +DUMMY(mkdirat); +DUMMY(mknodat); +DUMMY(fchownat); +DUMMY(futimesat); +DUMMY(fstatat64); +DUMMY(unlinkat); +DUMMY(renameat); +DUMMY(linkat); +DUMMY(symlinkat); +DUMMY(readlinkat); +DUMMY(fchmodat); +DUMMY(faccessat); +DUMMY(pselect6); +DUMMY(ppoll); +DUMMY(unshare); #define DUMMY_XATTR(s) \ int \ ==== //depot/projects/scottl-camlock/src/sys/amd64/linux32/linux32_proto.h#6 (text+ko) ==== @@ -2,8 +2,8 @@ * System call prototypes. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/amd64/linux32/linux32_proto.h,v 1.12 2006/06/13 18:48:29 netchild Exp $ - * created from FreeBSD: src/sys/amd64/linux32/syscalls.master,v 1.10 2006/06/13 18:43:55 netchild Exp + * $FreeBSD: src/sys/amd64/linux32/linux32_proto.h,v 1.13 2006/06/20 20:41:28 netchild Exp $ + * created from FreeBSD: src/sys/amd64/linux32/syscalls.master,v 1.11 2006/06/20 20:38:44 netchild Exp */ #ifndef _LINUX_SYSPROTO_H_ @@ -707,6 +707,174 @@ struct linux_fadvise64_args { register_t dummy; }; +struct linux_lookup_dcookie_args { + register_t dummy; +}; +struct linux_epoll_create_args { + register_t dummy; +}; +struct linux_epoll_ctl_args { + register_t dummy; +}; +struct linux_epoll_wait_args { + register_t dummy; +}; +struct linux_remap_file_pages_args { + register_t dummy; +}; +struct linux_set_tid_address_args { + register_t dummy; +}; +struct linux_timer_create_args { + register_t dummy; +}; +struct linux_timer_settime_args { + register_t dummy; +}; +struct linux_timer_gettime_args { + register_t dummy; +}; +struct linux_timer_getoverrun_args { + register_t dummy; +}; +struct linux_timer_delete_args { + register_t dummy; +}; +struct linux_clock_settime_args { + register_t dummy; +}; +struct linux_clock_gettime_args { + register_t dummy; +}; +struct linux_clock_getres_args { + register_t dummy; +}; +struct linux_clock_nanosleep_args { + register_t dummy; +}; +struct linux_statfs64_args { + register_t dummy; +}; +struct linux_fstatfs64_args { + register_t dummy; +}; +struct linux_tgkill_args { + register_t dummy; +}; +struct linux_utimes_args { + register_t dummy; +}; +struct linux_fadvise64_64_args { + register_t dummy; +}; +struct linux_mbind_args { + register_t dummy; +}; +struct linux_get_mempolicy_args { + register_t dummy; +}; +struct linux_set_mempolicy_args { + register_t dummy; +}; +struct linux_mq_open_args { + register_t dummy; +}; +struct linux_mq_unlink_args { + register_t dummy; +}; +struct linux_mq_timedsend_args { + register_t dummy; +}; +struct linux_mq_timedreceive_args { + register_t dummy; +}; +struct linux_mq_notify_args { + register_t dummy; +}; +struct linux_mq_getsetattr_args { + register_t dummy; +}; +struct linux_kexec_load_args { + register_t dummy; +}; +struct linux_waitid_args { + register_t dummy; +}; +struct linux_add_key_args { + register_t dummy; +}; +struct linux_request_key_args { + register_t dummy; +}; +struct linux_keyctl_args { + register_t dummy; +}; +struct linux_ioprio_set_args { + register_t dummy; +}; +struct linux_ioprio_get_args { + register_t dummy; +}; +struct linux_inotify_init_args { + register_t dummy; +}; +struct linux_inotify_add_watch_args { + register_t dummy; +}; +struct linux_inotify_rm_watch_args { + register_t dummy; +}; +struct linux_migrate_pages_args { + register_t dummy; +}; +struct linux_openat_args { + register_t dummy; +}; +struct linux_mkdirat_args { + register_t dummy; +}; +struct linux_mknodat_args { + register_t dummy; +}; +struct linux_fchownat_args { + register_t dummy; +}; +struct linux_futimesat_args { + register_t dummy; +}; +struct linux_fstatat64_args { + register_t dummy; +}; +struct linux_unlinkat_args { + register_t dummy; +}; +struct linux_renameat_args { + register_t dummy; +}; +struct linux_linkat_args { + register_t dummy; +}; +struct linux_symlinkat_args { + register_t dummy; +}; +struct linux_readlinkat_args { + register_t dummy; +}; +struct linux_fchmodat_args { + register_t dummy; +}; +struct linux_faccessat_args { + register_t dummy; +}; +struct linux_pselect6_args { + register_t dummy; +}; +struct linux_ppoll_args { + register_t dummy; +}; +struct linux_unshare_args { + register_t dummy; +}; #define nosys linux_nosys int linux_fork(struct thread *, struct linux_fork_args *); int linux_open(struct thread *, struct linux_open_args *); @@ -878,6 +1046,62 @@ int linux_lremovexattr(struct thread *, struct linux_lremovexattr_args *); int linux_fremovexattr(struct thread *, struct linux_fremovexattr_args *); int linux_fadvise64(struct thread *, struct linux_fadvise64_args *); +int linux_lookup_dcookie(struct thread *, struct linux_lookup_dcookie_args *); +int linux_epoll_create(struct thread *, struct linux_epoll_create_args *); +int linux_epoll_ctl(struct thread *, struct linux_epoll_ctl_args *); +int linux_epoll_wait(struct thread *, struct linux_epoll_wait_args *); +int linux_remap_file_pages(struct thread *, struct linux_remap_file_pages_args *); +int linux_set_tid_address(struct thread *, struct linux_set_tid_address_args *); +int linux_timer_create(struct thread *, struct linux_timer_create_args *); +int linux_timer_settime(struct thread *, struct linux_timer_settime_args *); +int linux_timer_gettime(struct thread *, struct linux_timer_gettime_args *); +int linux_timer_getoverrun(struct thread *, struct linux_timer_getoverrun_args *); +int linux_timer_delete(struct thread *, struct linux_timer_delete_args *); +int linux_clock_settime(struct thread *, struct linux_clock_settime_args *); +int linux_clock_gettime(struct thread *, struct linux_clock_gettime_args *); +int linux_clock_getres(struct thread *, struct linux_clock_getres_args *); +int linux_clock_nanosleep(struct thread *, struct linux_clock_nanosleep_args *); +int linux_statfs64(struct thread *, struct linux_statfs64_args *); +int linux_fstatfs64(struct thread *, struct linux_fstatfs64_args *); +int linux_tgkill(struct thread *, struct linux_tgkill_args *); +int linux_utimes(struct thread *, struct linux_utimes_args *); +int linux_fadvise64_64(struct thread *, struct linux_fadvise64_64_args *); +int linux_mbind(struct thread *, struct linux_mbind_args *); +int linux_get_mempolicy(struct thread *, struct linux_get_mempolicy_args *); +int linux_set_mempolicy(struct thread *, struct linux_set_mempolicy_args *); +int linux_mq_open(struct thread *, struct linux_mq_open_args *); +int linux_mq_unlink(struct thread *, struct linux_mq_unlink_args *); +int linux_mq_timedsend(struct thread *, struct linux_mq_timedsend_args *); +int linux_mq_timedreceive(struct thread *, struct linux_mq_timedreceive_args *); +int linux_mq_notify(struct thread *, struct linux_mq_notify_args *); +int linux_mq_getsetattr(struct thread *, struct linux_mq_getsetattr_args *); +int linux_kexec_load(struct thread *, struct linux_kexec_load_args *); +int linux_waitid(struct thread *, struct linux_waitid_args *); +int linux_add_key(struct thread *, struct linux_add_key_args *); +int linux_request_key(struct thread *, struct linux_request_key_args *); +int linux_keyctl(struct thread *, struct linux_keyctl_args *); +int linux_ioprio_set(struct thread *, struct linux_ioprio_set_args *); +int linux_ioprio_get(struct thread *, struct linux_ioprio_get_args *); +int linux_inotify_init(struct thread *, struct linux_inotify_init_args *); +int linux_inotify_add_watch(struct thread *, struct linux_inotify_add_watch_args *); +int linux_inotify_rm_watch(struct thread *, struct linux_inotify_rm_watch_args *); +int linux_migrate_pages(struct thread *, struct linux_migrate_pages_args *); +int linux_openat(struct thread *, struct linux_openat_args *); +int linux_mkdirat(struct thread *, struct linux_mkdirat_args *); +int linux_mknodat(struct thread *, struct linux_mknodat_args *); +int linux_fchownat(struct thread *, struct linux_fchownat_args *); +int linux_futimesat(struct thread *, struct linux_futimesat_args *); +int linux_fstatat64(struct thread *, struct linux_fstatat64_args *); +int linux_unlinkat(struct thread *, struct linux_unlinkat_args *); +int linux_renameat(struct thread *, struct linux_renameat_args *); +int linux_linkat(struct thread *, struct linux_linkat_args *); +int linux_symlinkat(struct thread *, struct linux_symlinkat_args *); +int linux_readlinkat(struct thread *, struct linux_readlinkat_args *); +int linux_fchmodat(struct thread *, struct linux_fchmodat_args *); +int linux_faccessat(struct thread *, struct linux_faccessat_args *); +int linux_pselect6(struct thread *, struct linux_pselect6_args *); +int linux_ppoll(struct thread *, struct linux_ppoll_args *); +int linux_unshare(struct thread *, struct linux_unshare_args *); #ifdef COMPAT_43 ==== //depot/projects/scottl-camlock/src/sys/amd64/linux32/linux32_syscall.h#6 (text+ko) ==== @@ -2,8 +2,8 @@ * System call numbers. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/amd64/linux32/linux32_syscall.h,v 1.12 2006/06/13 18:48:29 netchild Exp $ - * created from FreeBSD: src/sys/amd64/linux32/syscalls.master,v 1.10 2006/06/13 18:43:55 netchild Exp + * $FreeBSD: src/sys/amd64/linux32/linux32_syscall.h,v 1.13 2006/06/20 20:41:28 netchild Exp $ + * created from FreeBSD: src/sys/amd64/linux32/syscalls.master,v 1.11 2006/06/20 20:38:44 netchild Exp */ #define LINUX_SYS_exit 1 @@ -221,4 +221,60 @@ #define LINUX_SYS_linux_fremovexattr 237 #define LINUX_SYS_linux_fadvise64 250 #define LINUX_SYS_exit_group 252 +#define LINUX_SYS_linux_lookup_dcookie 253 +#define LINUX_SYS_linux_epoll_create 254 +#define LINUX_SYS_linux_epoll_ctl 255 +#define LINUX_SYS_linux_epoll_wait 256 +#define LINUX_SYS_linux_remap_file_pages 257 +#define LINUX_SYS_linux_set_tid_address 258 +#define LINUX_SYS_linux_timer_create 259 +#define LINUX_SYS_linux_timer_settime 260 +#define LINUX_SYS_linux_timer_gettime 261 +#define LINUX_SYS_linux_timer_getoverrun 262 +#define LINUX_SYS_linux_timer_delete 263 +#define LINUX_SYS_linux_clock_settime 264 +#define LINUX_SYS_linux_clock_gettime 265 +#define LINUX_SYS_linux_clock_getres 266 +#define LINUX_SYS_linux_clock_nanosleep 267 +#define LINUX_SYS_linux_statfs64 268 +#define LINUX_SYS_linux_fstatfs64 269 +#define LINUX_SYS_linux_tgkill 270 +#define LINUX_SYS_linux_utimes 271 +#define LINUX_SYS_linux_fadvise64_64 272 +#define LINUX_SYS_linux_mbind 274 +#define LINUX_SYS_linux_get_mempolicy 275 +#define LINUX_SYS_linux_set_mempolicy 276 +#define LINUX_SYS_linux_mq_open 277 +#define LINUX_SYS_linux_mq_unlink 278 +#define LINUX_SYS_linux_mq_timedsend 279 +#define LINUX_SYS_linux_mq_timedreceive 280 +#define LINUX_SYS_linux_mq_notify 281 +#define LINUX_SYS_linux_mq_getsetattr 282 +#define LINUX_SYS_linux_kexec_load 283 +#define LINUX_SYS_linux_waitid 284 +#define LINUX_SYS_linux_add_key 286 +#define LINUX_SYS_linux_request_key 287 +#define LINUX_SYS_linux_keyctl 288 +#define LINUX_SYS_linux_ioprio_set 289 +#define LINUX_SYS_linux_ioprio_get 290 +#define LINUX_SYS_linux_inotify_init 291 +#define LINUX_SYS_linux_inotify_add_watch 292 +#define LINUX_SYS_linux_inotify_rm_watch 293 +#define LINUX_SYS_linux_migrate_pages 294 +#define LINUX_SYS_linux_openat 295 +#define LINUX_SYS_linux_mkdirat 296 +#define LINUX_SYS_linux_mknodat 297 +#define LINUX_SYS_linux_fchownat 298 +#define LINUX_SYS_linux_futimesat 299 +#define LINUX_SYS_linux_fstatat64 300 +#define LINUX_SYS_linux_unlinkat 301 +#define LINUX_SYS_linux_renameat 302 +#define LINUX_SYS_linux_linkat 303 +#define LINUX_SYS_linux_symlinkat 304 +#define LINUX_SYS_linux_readlinkat 305 +#define LINUX_SYS_linux_fchmodat 306 +#define LINUX_SYS_linux_faccessat 307 +#define LINUX_SYS_linux_pselect6 308 +#define LINUX_SYS_linux_ppoll 309 +#define LINUX_SYS_linux_unshare 310 #define LINUX_SYS_MAXSYSCALL 311 ==== //depot/projects/scottl-camlock/src/sys/amd64/linux32/linux32_sysent.c#6 (text+ko) ==== @@ -2,8 +2,8 @@ * System call switch table. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/amd64/linux32/linux32_sysent.c,v 1.12 2006/06/13 18:48:29 netchild Exp $ - * created from FreeBSD: src/sys/amd64/linux32/syscalls.master,v 1.10 2006/06/13 18:43:55 netchild Exp + * $FreeBSD: src/sys/amd64/linux32/linux32_sysent.c,v 1.13 2006/06/20 20:41:28 netchild Exp $ + * created from FreeBSD: src/sys/amd64/linux32/syscalls.master,v 1.11 2006/06/20 20:38:44 netchild Exp */ #include @@ -273,62 +273,62 @@ { SYF_MPSAFE | 0, (sy_call_t *)linux_fadvise64, AUE_NULL }, /* 250 = linux_fadvise64 */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 251 = */ { SYF_MPSAFE | AS(sys_exit_args), (sy_call_t *)sys_exit, AUE_EXIT }, /* 252 = exit_group */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 253 = linux_lookup_dcookie */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 254 = linux_epoll_create */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 255 = linux_epoll_ctl */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 256 = linux_epoll_wait */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 257 = linux_remap_file_pages */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 258 = linux_set_tid_address */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 259 = linux_timer_create */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 260 = linux_timer_settime */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 261 = linux_timer_gettime */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 262 = linux_timer_getoverrun */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 263 = linux_timer_delete */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 264 = linux_clock_settime */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 265 = linux_clock_gettime */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 266 = linux_clock_getres */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 267 = linux_clock_nanosleep */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 268 = linux_statfs64 */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 269 = linux_fstatfs64 */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 270 = linux_tgkill */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 271 = linux_utimes */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 272 = linux_fadvise64_64 */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 273 = linux_ni_syscall */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 274 = linux_mbind */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 275 = linux_get_mempolicy */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 276 = linux_set_mempolicy */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 277 = linux_mq_open */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 278 = linux_mq_unlink */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 279 = linux_mq_timedsend */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 280 = linux_mq_timedreceive */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 281 = linux_mq_notify */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 282 = linux_mq_getsetattr */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 283 = linux_kexec_load */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 284 = linux_waitid */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 285 = linux_ni_syscall */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 286 = linux_add_key */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 287 = linux_request_key */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 288 = linux_keyctl */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 289 = linux_ioprio_set */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 290 = linux_ioprio_get */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 291 = linux_inotify_init */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 292 = linux_inotify_add_watch */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 293 = linux_inotify_rm_watch */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 294 = linux_migrate_pages */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 295 = linux_openat */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 296 = linux_mkdirat */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 297 = linux_mknodat */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 298 = linux_fchownat */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 299 = linux_futimesat */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 300 = linux_fstatat64 */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 301 = linux_unlinkat */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 302 = linux_renameat */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 303 = linux_linkat */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 304 = linux_symlinkat */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 305 = linux_readlinkat */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 306 = linux_fchmodat */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 307 = linux_faccessat */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 308 = linux_pselect6 */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 309 = linux_ppoll */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 310 = linux_unshare */ + { SYF_MPSAFE | 0, (sy_call_t *)linux_lookup_dcookie, AUE_NULL }, /* 253 = linux_lookup_dcookie */ + { SYF_MPSAFE | 0, (sy_call_t *)linux_epoll_create, AUE_NULL }, /* 254 = linux_epoll_create */ + { SYF_MPSAFE | 0, (sy_call_t *)linux_epoll_ctl, AUE_NULL }, /* 255 = linux_epoll_ctl */ + { SYF_MPSAFE | 0, (sy_call_t *)linux_epoll_wait, AUE_NULL }, /* 256 = linux_epoll_wait */ + { SYF_MPSAFE | 0, (sy_call_t *)linux_remap_file_pages, AUE_NULL }, /* 257 = linux_remap_file_pages */ + { SYF_MPSAFE | 0, (sy_call_t *)linux_set_tid_address, AUE_NULL }, /* 258 = linux_set_tid_address */ + { SYF_MPSAFE | 0, (sy_call_t *)linux_timer_create, AUE_NULL }, /* 259 = linux_timer_create */ + { SYF_MPSAFE | 0, (sy_call_t *)linux_timer_settime, AUE_NULL }, /* 260 = linux_timer_settime */ + { SYF_MPSAFE | 0, (sy_call_t *)linux_timer_gettime, AUE_NULL }, /* 261 = linux_timer_gettime */ + { SYF_MPSAFE | 0, (sy_call_t *)linux_timer_getoverrun, AUE_NULL }, /* 262 = linux_timer_getoverrun */ + { SYF_MPSAFE | 0, (sy_call_t *)linux_timer_delete, AUE_NULL }, /* 263 = linux_timer_delete */ + { SYF_MPSAFE | 0, (sy_call_t *)linux_clock_settime, AUE_CLOCK_SETTIME }, /* 264 = linux_clock_settime */ + { SYF_MPSAFE | 0, (sy_call_t *)linux_clock_gettime, AUE_NULL }, /* 265 = linux_clock_gettime */ + { SYF_MPSAFE | 0, (sy_call_t *)linux_clock_getres, AUE_NULL }, /* 266 = linux_clock_getres */ + { SYF_MPSAFE | 0, (sy_call_t *)linux_clock_nanosleep, AUE_NULL }, /* 267 = linux_clock_nanosleep */ + { SYF_MPSAFE | 0, (sy_call_t *)linux_statfs64, AUE_NULL }, /* 268 = linux_statfs64 */ + { SYF_MPSAFE | 0, (sy_call_t *)linux_fstatfs64, AUE_NULL }, /* 269 = linux_fstatfs64 */ + { SYF_MPSAFE | 0, (sy_call_t *)linux_tgkill, AUE_NULL }, /* 270 = linux_tgkill */ + { SYF_MPSAFE | 0, (sy_call_t *)linux_utimes, AUE_NULL }, /* 271 = linux_utimes */ + { SYF_MPSAFE | 0, (sy_call_t *)linux_fadvise64_64, AUE_NULL }, /* 272 = linux_fadvise64_64 */ + { 0, (sy_call_t *)nosys, AUE_NULL }, /* 273 = */ + { SYF_MPSAFE | 0, (sy_call_t *)linux_mbind, AUE_NULL }, /* 274 = linux_mbind */ + { SYF_MPSAFE | 0, (sy_call_t *)linux_get_mempolicy, AUE_NULL }, /* 275 = linux_get_mempolicy */ + { SYF_MPSAFE | 0, (sy_call_t *)linux_set_mempolicy, AUE_NULL }, /* 276 = linux_set_mempolicy */ + { SYF_MPSAFE | 0, (sy_call_t *)linux_mq_open, AUE_NULL }, /* 277 = linux_mq_open */ + { SYF_MPSAFE | 0, (sy_call_t *)linux_mq_unlink, AUE_NULL }, /* 278 = linux_mq_unlink */ + { SYF_MPSAFE | 0, (sy_call_t *)linux_mq_timedsend, AUE_NULL }, /* 279 = linux_mq_timedsend */ + { SYF_MPSAFE | 0, (sy_call_t *)linux_mq_timedreceive, AUE_NULL }, /* 280 = linux_mq_timedreceive */ + { SYF_MPSAFE | 0, (sy_call_t *)linux_mq_notify, AUE_NULL }, /* 281 = linux_mq_notify */ + { SYF_MPSAFE | 0, (sy_call_t *)linux_mq_getsetattr, AUE_NULL }, /* 282 = linux_mq_getsetattr */ + { SYF_MPSAFE | 0, (sy_call_t *)linux_kexec_load, AUE_NULL }, /* 283 = linux_kexec_load */ + { SYF_MPSAFE | 0, (sy_call_t *)linux_waitid, AUE_NULL }, /* 284 = linux_waitid */ + { 0, (sy_call_t *)nosys, AUE_NULL }, /* 285 = */ + { SYF_MPSAFE | 0, (sy_call_t *)linux_add_key, AUE_NULL }, /* 286 = linux_add_key */ + { SYF_MPSAFE | 0, (sy_call_t *)linux_request_key, AUE_NULL }, /* 287 = linux_request_key */ + { SYF_MPSAFE | 0, (sy_call_t *)linux_keyctl, AUE_NULL }, /* 288 = linux_keyctl */ + { SYF_MPSAFE | 0, (sy_call_t *)linux_ioprio_set, AUE_NULL }, /* 289 = linux_ioprio_set */ + { SYF_MPSAFE | 0, (sy_call_t *)linux_ioprio_get, AUE_NULL }, /* 290 = linux_ioprio_get */ + { SYF_MPSAFE | 0, (sy_call_t *)linux_inotify_init, AUE_NULL }, /* 291 = linux_inotify_init */ + { SYF_MPSAFE | 0, (sy_call_t *)linux_inotify_add_watch, AUE_NULL }, /* 292 = linux_inotify_add_watch */ + { SYF_MPSAFE | 0, (sy_call_t *)linux_inotify_rm_watch, AUE_NULL }, /* 293 = linux_inotify_rm_watch */ + { SYF_MPSAFE | 0, (sy_call_t *)linux_migrate_pages, AUE_NULL }, /* 294 = linux_migrate_pages */ + { SYF_MPSAFE | 0, (sy_call_t *)linux_openat, AUE_NULL }, /* 295 = linux_openat */ + { SYF_MPSAFE | 0, (sy_call_t *)linux_mkdirat, AUE_NULL }, /* 296 = linux_mkdirat */ + { SYF_MPSAFE | 0, (sy_call_t *)linux_mknodat, AUE_NULL }, /* 297 = linux_mknodat */ + { SYF_MPSAFE | 0, (sy_call_t *)linux_fchownat, AUE_NULL }, /* 298 = linux_fchownat */ + { SYF_MPSAFE | 0, (sy_call_t *)linux_futimesat, AUE_NULL }, /* 299 = linux_futimesat */ + { SYF_MPSAFE | 0, (sy_call_t *)linux_fstatat64, AUE_NULL }, /* 300 = linux_fstatat64 */ + { SYF_MPSAFE | 0, (sy_call_t *)linux_unlinkat, AUE_NULL }, /* 301 = linux_unlinkat */ + { SYF_MPSAFE | 0, (sy_call_t *)linux_renameat, AUE_NULL }, /* 302 = linux_renameat */ + { SYF_MPSAFE | 0, (sy_call_t *)linux_linkat, AUE_NULL }, /* 303 = linux_linkat */ + { SYF_MPSAFE | 0, (sy_call_t *)linux_symlinkat, AUE_NULL }, /* 304 = linux_symlinkat */ + { SYF_MPSAFE | 0, (sy_call_t *)linux_readlinkat, AUE_NULL }, /* 305 = linux_readlinkat */ + { SYF_MPSAFE | 0, (sy_call_t *)linux_fchmodat, AUE_NULL }, /* 306 = linux_fchmodat */ + { SYF_MPSAFE | 0, (sy_call_t *)linux_faccessat, AUE_NULL }, /* 307 = linux_faccessat */ + { SYF_MPSAFE | 0, (sy_call_t *)linux_pselect6, AUE_NULL }, /* 308 = linux_pselect6 */ + { SYF_MPSAFE | 0, (sy_call_t *)linux_ppoll, AUE_NULL }, /* 309 = linux_ppoll */ + { SYF_MPSAFE | 0, (sy_call_t *)linux_unshare, AUE_NULL }, /* 310 = linux_unshare */ }; ==== //depot/projects/scottl-camlock/src/sys/amd64/linux32/syscalls.master#6 (text+ko) ==== @@ -1,4 +1,4 @@ - $FreeBSD: src/sys/amd64/linux32/syscalls.master,v 1.10 2006/06/13 18:43:55 netchild Exp $ + $FreeBSD: src/sys/amd64/linux32/syscalls.master,v 1.11 2006/06/20 20:38:44 netchild Exp $ ; @(#)syscalls.master 8.1 (Berkeley) 7/19/93 ; System call name/number master file (or rather, slave, from LINUX). @@ -418,61 +418,61 @@ 251 AUE_NULL UNIMPL 252 AUE_EXIT MNOPROTO { void sys_exit(int rval); } exit_group \ sys_exit_args void -253 AUE_NULL UNIMPL linux_lookup_dcookie -254 AUE_NULL UNIMPL linux_epoll_create -255 AUE_NULL UNIMPL linux_epoll_ctl -256 AUE_NULL UNIMPL linux_epoll_wait -257 AUE_NULL UNIMPL linux_remap_file_pages -258 AUE_NULL UNIMPL linux_set_tid_address -259 AUE_NULL UNIMPL linux_timer_create -260 AUE_NULL UNIMPL linux_timer_settime -261 AUE_NULL UNIMPL linux_timer_gettime -262 AUE_NULL UNIMPL linux_timer_getoverrun -263 AUE_NULL UNIMPL linux_timer_delete -264 AUE_CLOCK_SETTIME UNIMPL linux_clock_settime -265 AUE_NULL UNIMPL linux_clock_gettime -266 AUE_NULL UNIMPL linux_clock_getres -267 AUE_NULL UNIMPL linux_clock_nanosleep -268 AUE_NULL UNIMPL linux_statfs64 -269 AUE_NULL UNIMPL linux_fstatfs64 -270 AUE_NULL UNIMPL linux_tgkill /* 270 */ -271 AUE_NULL UNIMPL linux_utimes -272 AUE_NULL UNIMPL linux_fadvise64_64 -273 AUE_NULL UNIMPL linux_ni_syscall /* linux_vserver */ -274 AUE_NULL UNIMPL linux_mbind -275 AUE_NULL UNIMPL linux_get_mempolicy -276 AUE_NULL UNIMPL linux_set_mempolicy -277 AUE_NULL UNIMPL linux_mq_open -278 AUE_NULL UNIMPL linux_mq_unlink -279 AUE_NULL UNIMPL linux_mq_timedsend >>> TRUNCATED FOR MAIL (1000 lines) <<<