PERFORCE change 112799 for review
John Baldwin
jhb at FreeBSD.org
Thu Jan 11 13:47:50 PST 2007
http://perforce.freebsd.org/chv.cgi?CH=112799
Change 112799 by jhb at jhb_mutex on 2007/01/11 21:47:23
IFC @112795.
Affected files ...
.. //depot/projects/smpng/sys/amd64/amd64/identcpu.c#21 integrate
.. //depot/projects/smpng/sys/amd64/amd64/mp_machdep.c#39 integrate
.. //depot/projects/smpng/sys/amd64/amd64/nexus.c#21 integrate
.. //depot/projects/smpng/sys/amd64/include/atomic.h#30 integrate
.. //depot/projects/smpng/sys/amd64/include/specialreg.h#11 integrate
.. //depot/projects/smpng/sys/amd64/linux32/linux32_dummy.c#7 integrate
.. //depot/projects/smpng/sys/amd64/linux32/linux32_machdep.c#15 integrate
.. //depot/projects/smpng/sys/amd64/linux32/linux32_proto.h#19 integrate
.. //depot/projects/smpng/sys/amd64/linux32/linux32_syscall.h#19 integrate
.. //depot/projects/smpng/sys/amd64/linux32/linux32_sysent.c#19 integrate
.. //depot/projects/smpng/sys/amd64/linux32/syscalls.master#23 integrate
.. //depot/projects/smpng/sys/arm/at91/at91_mci.c#2 integrate
.. //depot/projects/smpng/sys/arm/at91/at91_pioreg.h#2 integrate
.. //depot/projects/smpng/sys/arm/at91/at91_pmc.c#4 integrate
.. //depot/projects/smpng/sys/arm/at91/at91_spireg.h#3 integrate
.. //depot/projects/smpng/sys/arm/at91/at91_st.c#7 integrate
.. //depot/projects/smpng/sys/arm/at91/files.at91#5 integrate
.. //depot/projects/smpng/sys/arm/at91/if_ate.c#10 integrate
.. //depot/projects/smpng/sys/arm/conf/BWCT#1 branch
.. //depot/projects/smpng/sys/arm/conf/BWCT.hints#1 branch
.. //depot/projects/smpng/sys/arm/include/atomic.h#27 integrate
.. //depot/projects/smpng/sys/boot/common/pnp.c#3 integrate
.. //depot/projects/smpng/sys/boot/common/pnpdata#2 delete
.. //depot/projects/smpng/sys/bsm/audit.h#7 integrate
.. //depot/projects/smpng/sys/bsm/audit_internal.h#5 integrate
.. //depot/projects/smpng/sys/bsm/audit_kevents.h#7 integrate
.. //depot/projects/smpng/sys/bsm/audit_record.h#7 integrate
.. //depot/projects/smpng/sys/compat/linux/linux_emul.c#5 integrate
.. //depot/projects/smpng/sys/compat/linux/linux_emul.h#4 integrate
.. //depot/projects/smpng/sys/compat/linux/linux_mib.c#15 integrate
.. //depot/projects/smpng/sys/compat/linux/linux_mib.h#9 integrate
.. //depot/projects/smpng/sys/compat/linux/linux_misc.c#77 integrate
.. //depot/projects/smpng/sys/compat/linux/linux_misc.h#2 integrate
.. //depot/projects/smpng/sys/compat/linux/linux_signal.c#24 integrate
.. //depot/projects/smpng/sys/conf/NOTES#134 integrate
.. //depot/projects/smpng/sys/conf/files#195 integrate
.. //depot/projects/smpng/sys/conf/kern.post.mk#58 integrate
.. //depot/projects/smpng/sys/conf/options#132 integrate
.. //depot/projects/smpng/sys/conf/options.arm#13 integrate
.. //depot/projects/smpng/sys/contrib/pf/net/if_pfsync.c#24 integrate
.. //depot/projects/smpng/sys/contrib/pf/net/pf.c#25 integrate
.. //depot/projects/smpng/sys/contrib/pf/net/pf_ioctl.c#21 integrate
.. //depot/projects/smpng/sys/dev/acpica/acpi.c#96 integrate
.. //depot/projects/smpng/sys/dev/acpica/acpi_cpu.c#36 integrate
.. //depot/projects/smpng/sys/dev/acpica/acpi_package.c#8 integrate
.. //depot/projects/smpng/sys/dev/acpica/acpi_perf.c#10 integrate
.. //depot/projects/smpng/sys/dev/acpica/acpi_throttle.c#7 integrate
.. //depot/projects/smpng/sys/dev/acpica/acpivar.h#64 integrate
.. //depot/projects/smpng/sys/dev/aic7xxx/aic7xxx.seq#12 integrate
.. //depot/projects/smpng/sys/dev/aic7xxx/aicasm/aicasm_gram.y#11 integrate
.. //depot/projects/smpng/sys/dev/aic7xxx/aicasm/aicasm_macro_gram.y#4 integrate
.. //depot/projects/smpng/sys/dev/arl/if_arl.c#13 integrate
.. //depot/projects/smpng/sys/dev/ata/ata-chipset.c#74 integrate
.. //depot/projects/smpng/sys/dev/ata/ata-pci.h#48 integrate
.. //depot/projects/smpng/sys/dev/bce/if_bce.c#11 integrate
.. //depot/projects/smpng/sys/dev/bce/if_bcereg.h#6 integrate
.. //depot/projects/smpng/sys/dev/bge/if_bgereg.h#50 integrate
.. //depot/projects/smpng/sys/dev/bktr/bktr_i2c.c#10 integrate
.. //depot/projects/smpng/sys/dev/ce/if_ce.c#5 integrate
.. //depot/projects/smpng/sys/dev/cp/if_cp.c#18 integrate
.. //depot/projects/smpng/sys/dev/ctau/if_ct.c#20 integrate
.. //depot/projects/smpng/sys/dev/cx/if_cx.c#27 integrate
.. //depot/projects/smpng/sys/dev/drm/drm_agpsupport.c#6 integrate
.. //depot/projects/smpng/sys/dev/en/midway.c#31 integrate
.. //depot/projects/smpng/sys/dev/fb/boot_font.c#7 integrate
.. //depot/projects/smpng/sys/dev/fb/creatorreg.h#1 branch
.. //depot/projects/smpng/sys/dev/fb/gallant12x22.c#1 branch
.. //depot/projects/smpng/sys/dev/fb/gfb.c#9 delete
.. //depot/projects/smpng/sys/dev/fb/gfb.h#4 integrate
.. //depot/projects/smpng/sys/dev/firewire/if_fwip.c#9 integrate
.. //depot/projects/smpng/sys/dev/gfb/gfb_pci.c#16 delete
.. //depot/projects/smpng/sys/dev/gfb/gfb_pci.h#3 delete
.. //depot/projects/smpng/sys/dev/hptmv/entry.c#11 integrate
.. //depot/projects/smpng/sys/dev/ichsmb/ichsmb.c#13 integrate
.. //depot/projects/smpng/sys/dev/ichsmb/ichsmb_pci.c#13 integrate
.. //depot/projects/smpng/sys/dev/idt/idtreg.h#3 integrate
.. //depot/projects/smpng/sys/dev/isp/isp.c#51 integrate
.. //depot/projects/smpng/sys/dev/isp/isp_freebsd.h#35 integrate
.. //depot/projects/smpng/sys/dev/isp/isp_pci.c#47 integrate
.. //depot/projects/smpng/sys/dev/mfi/mfi.c#15 integrate
.. //depot/projects/smpng/sys/dev/mii/miidevs#21 integrate
.. //depot/projects/smpng/sys/dev/mii/rlswitch.c#1 branch
.. //depot/projects/smpng/sys/dev/mpt/mpt.c#22 integrate
.. //depot/projects/smpng/sys/dev/mpt/mpt.h#19 integrate
.. //depot/projects/smpng/sys/dev/mpt/mpt_cam.c#19 integrate
.. //depot/projects/smpng/sys/dev/mpt/mpt_pci.c#28 integrate
.. //depot/projects/smpng/sys/dev/msk/if_msk.c#2 integrate
.. //depot/projects/smpng/sys/dev/msk/if_mskreg.h#2 integrate
.. //depot/projects/smpng/sys/dev/my/if_my.c#25 integrate
.. //depot/projects/smpng/sys/dev/ppbus/if_plip.c#18 integrate
.. //depot/projects/smpng/sys/dev/re/if_re.c#48 integrate
.. //depot/projects/smpng/sys/dev/sound/pci/emu10kx-pcm.c#3 integrate
.. //depot/projects/smpng/sys/dev/sound/pci/emu10kx.c#3 integrate
.. //depot/projects/smpng/sys/dev/sound/pci/emu10kx.h#3 integrate
.. //depot/projects/smpng/sys/dev/sound/pci/hda/hdac.c#6 integrate
.. //depot/projects/smpng/sys/dev/sound/pcm/feeder.c#17 integrate
.. //depot/projects/smpng/sys/dev/sound/usb/uaudio.c#15 integrate
.. //depot/projects/smpng/sys/dev/syscons/scvesactl.c#8 integrate
.. //depot/projects/smpng/sys/dev/usb/if_aue.c#47 integrate
.. //depot/projects/smpng/sys/dev/usb/if_auereg.h#14 integrate
.. //depot/projects/smpng/sys/dev/usb/usb_ethersubr.c#15 integrate
.. //depot/projects/smpng/sys/dev/usb/usb_ethersubr.h#7 integrate
.. //depot/projects/smpng/sys/dev/usb/usbdi_util.h#10 integrate
.. //depot/projects/smpng/sys/fs/msdosfs/bpb.h#6 integrate
.. //depot/projects/smpng/sys/fs/msdosfs/msdosfs_vfsops.c#51 integrate
.. //depot/projects/smpng/sys/fs/pseudofs/pseudofs_vncache.c#24 integrate
.. //depot/projects/smpng/sys/fs/udf/udf_vfsops.c#32 integrate
.. //depot/projects/smpng/sys/fs/unionfs/union_subr.c#27 integrate
.. //depot/projects/smpng/sys/fs/unionfs/union_vnops.c#33 integrate
.. //depot/projects/smpng/sys/i386/i386/identcpu.c#50 integrate
.. //depot/projects/smpng/sys/i386/i386/mp_machdep.c#104 integrate
.. //depot/projects/smpng/sys/i386/i386/nexus.c#22 integrate
.. //depot/projects/smpng/sys/i386/include/atomic.h#48 integrate
.. //depot/projects/smpng/sys/i386/include/specialreg.h#13 integrate
.. //depot/projects/smpng/sys/i386/linux/linux_dummy.c#18 integrate
.. //depot/projects/smpng/sys/i386/linux/linux_machdep.c#39 integrate
.. //depot/projects/smpng/sys/i386/linux/linux_proto.h#39 integrate
.. //depot/projects/smpng/sys/i386/linux/linux_syscall.h#37 integrate
.. //depot/projects/smpng/sys/i386/linux/linux_sysent.c#38 integrate
.. //depot/projects/smpng/sys/i386/linux/syscalls.master#44 integrate
.. //depot/projects/smpng/sys/i4b/driver/i4b_ipr.c#26 integrate
.. //depot/projects/smpng/sys/isa/pnpparse.c#5 integrate
.. //depot/projects/smpng/sys/kern/kern_acct.c#48 integrate
.. //depot/projects/smpng/sys/kern/kern_descrip.c#99 integrate
.. //depot/projects/smpng/sys/kern/kern_mac.c#48 delete
.. //depot/projects/smpng/sys/kern/kern_prot.c#101 integrate
.. //depot/projects/smpng/sys/kern/kern_switch.c#67 integrate
.. //depot/projects/smpng/sys/kern/kern_synch.c#110 integrate
.. //depot/projects/smpng/sys/kern/kern_thread.c#98 integrate
.. //depot/projects/smpng/sys/kern/sched_4bsd.c#66 integrate
.. //depot/projects/smpng/sys/kern/sched_core.c#5 integrate
.. //depot/projects/smpng/sys/kern/sched_ule.c#72 integrate
.. //depot/projects/smpng/sys/kern/subr_turnstile.c#35 integrate
.. //depot/projects/smpng/sys/kern/tty_pts.c#6 integrate
.. //depot/projects/smpng/sys/kern/uipc_socket.c#98 integrate
.. //depot/projects/smpng/sys/kern/uipc_usrreq.c#69 integrate
.. //depot/projects/smpng/sys/modules/netgraph/Makefile#25 integrate
.. //depot/projects/smpng/sys/modules/netgraph/deflate/Makefile#1 branch
.. //depot/projects/smpng/sys/modules/netgraph/pred1/Makefile#1 branch
.. //depot/projects/smpng/sys/modules/sound/driver/emu10kx/Makefile#2 integrate
.. //depot/projects/smpng/sys/net/ethernet.h#11 integrate
.. //depot/projects/smpng/sys/net/if_enc.c#6 integrate
.. //depot/projects/smpng/sys/net/if_vlan.c#55 integrate
.. //depot/projects/smpng/sys/net80211/ieee80211.c#25 integrate
.. //depot/projects/smpng/sys/net80211/ieee80211_freebsd.c#11 integrate
.. //depot/projects/smpng/sys/net80211/ieee80211_freebsd.h#8 integrate
.. //depot/projects/smpng/sys/net80211/ieee80211_input.c#34 integrate
.. //depot/projects/smpng/sys/net80211/ieee80211_node.c#29 integrate
.. //depot/projects/smpng/sys/net80211/ieee80211_proto.c#22 integrate
.. //depot/projects/smpng/sys/net80211/ieee80211_proto.h#13 integrate
.. //depot/projects/smpng/sys/net80211/ieee80211_var.h#24 integrate
.. //depot/projects/smpng/sys/netatalk/COPYRIGHT#4 integrate
.. //depot/projects/smpng/sys/netatalk/aarp.c#21 integrate
.. //depot/projects/smpng/sys/netatalk/ddp_input.c#16 integrate
.. //depot/projects/smpng/sys/netatalk/ddp_pcb.c#10 integrate
.. //depot/projects/smpng/sys/netatalk/ddp_pcb.h#4 integrate
.. //depot/projects/smpng/sys/netatalk/ddp_usrreq.c#28 integrate
.. //depot/projects/smpng/sys/netgraph/ng_deflate.c#1 branch
.. //depot/projects/smpng/sys/netgraph/ng_deflate.h#1 branch
.. //depot/projects/smpng/sys/netgraph/ng_pred1.c#1 branch
.. //depot/projects/smpng/sys/netgraph/ng_pred1.h#1 branch
.. //depot/projects/smpng/sys/netgraph/ng_sppp.c#11 integrate
.. //depot/projects/smpng/sys/netinet/in.h#36 integrate
.. //depot/projects/smpng/sys/netinet/in_pcb.c#71 integrate
.. //depot/projects/smpng/sys/netinet/ip_divert.c#52 integrate
.. //depot/projects/smpng/sys/netinet/ip_fw.h#36 integrate
.. //depot/projects/smpng/sys/netinet/ip_fw2.c#82 integrate
.. //depot/projects/smpng/sys/netinet/ip_fw_pfil.c#17 integrate
.. //depot/projects/smpng/sys/netinet/raw_ip.c#63 integrate
.. //depot/projects/smpng/sys/netinet/sctp_asconf.c#3 integrate
.. //depot/projects/smpng/sys/netinet/sctp_asconf.h#2 integrate
.. //depot/projects/smpng/sys/netinet/sctp_auth.c#2 integrate
.. //depot/projects/smpng/sys/netinet/sctp_bsd_addr.c#2 integrate
.. //depot/projects/smpng/sys/netinet/sctp_indata.c#4 integrate
.. //depot/projects/smpng/sys/netinet/sctp_input.c#4 integrate
.. //depot/projects/smpng/sys/netinet/sctp_os.h#2 integrate
.. //depot/projects/smpng/sys/netinet/sctp_os_bsd.h#3 integrate
.. //depot/projects/smpng/sys/netinet/sctp_output.c#4 integrate
.. //depot/projects/smpng/sys/netinet/sctp_pcb.c#3 integrate
.. //depot/projects/smpng/sys/netinet/sctp_pcb.h#3 integrate
.. //depot/projects/smpng/sys/netinet/sctp_structs.h#3 integrate
.. //depot/projects/smpng/sys/netinet/sctp_timer.c#3 integrate
.. //depot/projects/smpng/sys/netinet/sctp_usrreq.c#4 integrate
.. //depot/projects/smpng/sys/netinet/sctp_var.h#2 integrate
.. //depot/projects/smpng/sys/netinet/sctputil.c#5 integrate
.. //depot/projects/smpng/sys/netinet/tcp_subr.c#86 integrate
.. //depot/projects/smpng/sys/netinet/udp_usrreq.c#73 integrate
.. //depot/projects/smpng/sys/netinet6/sctp6_usrreq.c#3 integrate
.. //depot/projects/smpng/sys/netipx/ipx.c#12 integrate
.. //depot/projects/smpng/sys/netipx/ipx.h#8 integrate
.. //depot/projects/smpng/sys/netipx/ipx_cksum.c#6 integrate
.. //depot/projects/smpng/sys/netipx/ipx_if.h#6 integrate
.. //depot/projects/smpng/sys/netipx/ipx_input.c#18 integrate
.. //depot/projects/smpng/sys/netipx/ipx_ip.c#16 integrate
.. //depot/projects/smpng/sys/netipx/ipx_ip.h#5 integrate
.. //depot/projects/smpng/sys/netipx/ipx_outputfl.c#7 integrate
.. //depot/projects/smpng/sys/netipx/ipx_pcb.c#20 integrate
.. //depot/projects/smpng/sys/netipx/ipx_pcb.h#10 integrate
.. //depot/projects/smpng/sys/netipx/ipx_proto.c#8 integrate
.. //depot/projects/smpng/sys/netipx/ipx_usrreq.c#26 integrate
.. //depot/projects/smpng/sys/netipx/ipx_var.h#9 integrate
.. //depot/projects/smpng/sys/netipx/spx.h#5 integrate
.. //depot/projects/smpng/sys/netipx/spx_debug.c#4 integrate
.. //depot/projects/smpng/sys/netipx/spx_debug.h#5 integrate
.. //depot/projects/smpng/sys/netipx/spx_timer.h#3 integrate
.. //depot/projects/smpng/sys/netipx/spx_usrreq.c#28 integrate
.. //depot/projects/smpng/sys/netipx/spx_var.h#3 integrate
.. //depot/projects/smpng/sys/netnatm/natm.c#29 integrate
.. //depot/projects/smpng/sys/netnatm/natm.h#7 integrate
.. //depot/projects/smpng/sys/netnatm/natm_pcb.c#9 integrate
.. //depot/projects/smpng/sys/netnatm/natm_proto.c#16 integrate
.. //depot/projects/smpng/sys/nfsserver/nfs_srvsubs.c#36 integrate
.. //depot/projects/smpng/sys/nfsserver/nfsm_subs.h#10 integrate
.. //depot/projects/smpng/sys/pc98/pc98/machdep.c#20 integrate
.. //depot/projects/smpng/sys/pci/agp_intel.c#23 integrate
.. //depot/projects/smpng/sys/pci/agpreg.h#16 integrate
.. //depot/projects/smpng/sys/pci/alpm.c#12 integrate
.. //depot/projects/smpng/sys/pci/amdpm.c#19 integrate
.. //depot/projects/smpng/sys/pci/amdsmb.c#4 integrate
.. //depot/projects/smpng/sys/pci/intpm.c#13 integrate
.. //depot/projects/smpng/sys/pci/intpmreg.h#3 integrate
.. //depot/projects/smpng/sys/pci/nfsmb.c#5 integrate
.. //depot/projects/smpng/sys/pci/viapm.c#14 integrate
.. //depot/projects/smpng/sys/powerpc/conf/NOTES#6 integrate
.. //depot/projects/smpng/sys/powerpc/powerpc/vm_machdep.c#47 integrate
.. //depot/projects/smpng/sys/security/audit/audit.c#7 integrate
.. //depot/projects/smpng/sys/security/audit/audit_arg.c#7 integrate
.. //depot/projects/smpng/sys/security/audit/audit_bsm_klib.c#4 integrate
.. //depot/projects/smpng/sys/security/audit/audit_bsm_token.c#6 integrate
.. //depot/projects/smpng/sys/security/audit/audit_syscalls.c#8 integrate
.. //depot/projects/smpng/sys/security/audit/audit_trigger.c#4 integrate
.. //depot/projects/smpng/sys/security/audit/audit_worker.c#4 integrate
.. //depot/projects/smpng/sys/security/mac/mac_framework.c#1 branch
.. //depot/projects/smpng/sys/security/mac/mac_inet.c#6 integrate
.. //depot/projects/smpng/sys/security/mac/mac_internal.h#12 integrate
.. //depot/projects/smpng/sys/security/mac/mac_label.c#6 integrate
.. //depot/projects/smpng/sys/security/mac/mac_net.c#18 integrate
.. //depot/projects/smpng/sys/security/mac/mac_policy.h#2 integrate
.. //depot/projects/smpng/sys/security/mac/mac_syscalls.c#1 branch
.. //depot/projects/smpng/sys/security/mac/mac_vfs.c#16 integrate
.. //depot/projects/smpng/sys/security/mac_stub/mac_stub.c#20 integrate
.. //depot/projects/smpng/sys/sparc64/include/ofw_nexus.h#1 branch
.. //depot/projects/smpng/sys/sparc64/pci/ofw_pcibus.c#10 integrate
.. //depot/projects/smpng/sys/sparc64/pci/psycho.c#39 integrate
.. //depot/projects/smpng/sys/sparc64/pci/psychoreg.h#11 integrate
.. //depot/projects/smpng/sys/sun4v/sun4v/pmap.c#10 integrate
.. //depot/projects/smpng/sys/sys/copyright.h#10 integrate
.. //depot/projects/smpng/sys/sys/file.h#26 integrate
.. //depot/projects/smpng/sys/sys/priority.h#4 integrate
.. //depot/projects/smpng/sys/sys/proc.h#176 integrate
.. //depot/projects/smpng/sys/sys/rtprio.h#8 integrate
.. //depot/projects/smpng/sys/sys/runq.h#8 integrate
.. //depot/projects/smpng/sys/sys/unpcb.h#11 integrate
.. //depot/projects/smpng/sys/ufs/ufs/ufs_acl.c#16 integrate
.. //depot/projects/smpng/sys/vm/swap_pager.c#67 integrate
.. //depot/projects/smpng/sys/vm/uma.h#19 integrate
.. //depot/projects/smpng/sys/vm/uma_core.c#67 integrate
.. //depot/projects/smpng/sys/vm/vm_kern.c#35 integrate
Differences ...
==== //depot/projects/smpng/sys/amd64/amd64/identcpu.c#21 (text+ko) ====
@@ -39,7 +39,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/amd64/amd64/identcpu.c,v 1.148 2006/08/01 01:23:39 obrien Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/identcpu.c,v 1.149 2007/01/09 19:23:21 jkim Exp $");
#include "opt_cpu.h"
@@ -228,8 +228,8 @@
"\007<b6>"
"\010EST" /* Enhanced SpeedStep */
"\011TM2" /* Thermal Monitor 2 */
- "\012<b9>"
- "\013CNTX-ID" /* L1 context ID available */
+ "\012SSSE3" /* SSSE3 */
+ "\013CNXT-ID" /* L1 context ID available */
"\014<b11>"
"\015<b12>"
"\016CX16" /* CMPXCHG16B Instruction */
==== //depot/projects/smpng/sys/amd64/amd64/mp_machdep.c#39 (text+ko) ====
@@ -25,7 +25,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/amd64/amd64/mp_machdep.c,v 1.278 2006/10/10 23:23:11 jhb Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/mp_machdep.c,v 1.279 2007/01/11 00:17:02 jeff Exp $");
#include "opt_cpu.h"
#include "opt_kstack_pages.h"
@@ -948,11 +948,10 @@
ipi_bitmap = atomic_readandclear_int(&cpu_ipi_pending[cpu]);
-#ifdef IPI_PREEMPTION
- if (ipi_bitmap & IPI_PREEMPT) {
+ if (ipi_bitmap & (1 << IPI_PREEMPT)) {
mtx_lock_spin(&sched_lock);
/* Don't preempt the idle thread */
- if (curthread->td_priority < PRI_MIN_IDLE) {
+ if (curthread != PCPU_GET(idlethread)) {
struct thread *running_thread = curthread;
if (running_thread->td_critnest > 1)
running_thread->td_owepreempt = 1;
@@ -961,7 +960,6 @@
}
mtx_unlock_spin(&sched_lock);
}
-#endif
/* Nothing to do for AST */
}
==== //depot/projects/smpng/sys/amd64/amd64/nexus.c#21 (text+ko) ====
@@ -28,7 +28,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/amd64/amd64/nexus.c,v 1.70 2006/11/13 22:23:32 jhb Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/nexus.c,v 1.71 2007/01/11 19:40:19 jhb Exp $");
/*
* This code implements a `root nexus' for Intel Architecture
@@ -371,24 +371,9 @@
* If this is a memory resource, map it into the kernel.
*/
if (rman_get_bustag(r) == AMD64_BUS_SPACE_MEM) {
- caddr_t vaddr = 0;
+ void *vaddr;
- if (rman_get_end(r) < 1024 * 1024) {
- /*
- * The first 1Mb is mapped at KERNBASE.
- */
- vaddr = (caddr_t)(uintptr_t)(KERNBASE + rman_get_start(r));
- } else {
- u_int64_t paddr;
- u_int64_t psize;
- u_int32_t poffs;
-
- paddr = rman_get_start(r);
- psize = rman_get_size(r);
-
- poffs = paddr - trunc_page(paddr);
- vaddr = (caddr_t) pmap_mapdev(paddr-poffs, psize+poffs) + poffs;
- }
+ vaddr = pmap_mapdev(rman_get_start(r), rman_get_size(r));
rman_set_virtual(r, vaddr);
rman_set_bushandle(r, (bus_space_handle_t) vaddr);
}
@@ -402,12 +387,9 @@
/*
* If this is a memory resource, unmap it.
*/
- if ((rman_get_bustag(r) == AMD64_BUS_SPACE_MEM) &&
- (rman_get_end(r) >= 1024 * 1024)) {
- u_int32_t psize;
-
- psize = rman_get_size(r);
- pmap_unmapdev((vm_offset_t)rman_get_virtual(r), psize);
+ if (rman_get_bustag(r) == AMD64_BUS_SPACE_MEM) {
+ pmap_unmapdev((vm_offset_t)rman_get_virtual(r),
+ rman_get_size(r));
}
return (rman_deactivate_resource(r));
==== //depot/projects/smpng/sys/amd64/include/atomic.h#30 (text+ko) ====
@@ -23,7 +23,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD: src/sys/amd64/include/atomic.h,v 1.41 2006/12/28 08:15:14 bde Exp $
+ * $FreeBSD: src/sys/amd64/include/atomic.h,v 1.44 2006/12/29 15:29:49 bde Exp $
*/
#ifndef _MACHINE_ATOMIC_H_
#define _MACHINE_ATOMIC_H_
@@ -33,30 +33,30 @@
#endif
/*
- * Various simple arithmetic on memory which is atomic in the presence
- * of interrupts and multiple processors.
+ * Various simple operations on memory, each of which is atomic in the
+ * presence of interrupts and multiple processors.
*
- * atomic_set_char(P, V) (*(u_char*)(P) |= (V))
- * atomic_clear_char(P, V) (*(u_char*)(P) &= ~(V))
- * atomic_add_char(P, V) (*(u_char*)(P) += (V))
- * atomic_subtract_char(P, V) (*(u_char*)(P) -= (V))
+ * atomic_set_char(P, V) (*(u_char *)(P) |= (V))
+ * atomic_clear_char(P, V) (*(u_char *)(P) &= ~(V))
+ * atomic_add_char(P, V) (*(u_char *)(P) += (V))
+ * atomic_subtract_char(P, V) (*(u_char *)(P) -= (V))
*
- * atomic_set_short(P, V) (*(u_short*)(P) |= (V))
- * atomic_clear_short(P, V) (*(u_short*)(P) &= ~(V))
- * atomic_add_short(P, V) (*(u_short*)(P) += (V))
- * atomic_subtract_short(P, V) (*(u_short*)(P) -= (V))
+ * atomic_set_short(P, V) (*(u_short *)(P) |= (V))
+ * atomic_clear_short(P, V) (*(u_short *)(P) &= ~(V))
+ * atomic_add_short(P, V) (*(u_short *)(P) += (V))
+ * atomic_subtract_short(P, V) (*(u_short *)(P) -= (V))
*
- * atomic_set_int(P, V) (*(u_int*)(P) |= (V))
- * atomic_clear_int(P, V) (*(u_int*)(P) &= ~(V))
- * atomic_add_int(P, V) (*(u_int*)(P) += (V))
- * atomic_subtract_int(P, V) (*(u_int*)(P) -= (V))
- * atomic_readandclear_int(P) (return *(u_int*)P; *(u_int*)P = 0;)
+ * atomic_set_int(P, V) (*(u_int *)(P) |= (V))
+ * atomic_clear_int(P, V) (*(u_int *)(P) &= ~(V))
+ * atomic_add_int(P, V) (*(u_int *)(P) += (V))
+ * atomic_subtract_int(P, V) (*(u_int *)(P) -= (V))
+ * atomic_readandclear_int(P) (return (*(u_int *)(P)); *(u_int *)(P) = 0;)
*
- * atomic_set_long(P, V) (*(u_long*)(P) |= (V))
- * atomic_clear_long(P, V) (*(u_long*)(P) &= ~(V))
- * atomic_add_long(P, V) (*(u_long*)(P) += (V))
- * atomic_subtract_long(P, V) (*(u_long*)(P) -= (V))
- * atomic_readandclear_long(P) (return *(u_long*)P; *(u_long*)P = 0;)
+ * atomic_set_long(P, V) (*(u_long *)(P) |= (V))
+ * atomic_clear_long(P, V) (*(u_long *)(P) &= ~(V))
+ * atomic_add_long(P, V) (*(u_long *)(P) += (V))
+ * atomic_subtract_long(P, V) (*(u_long *)(P) -= (V))
+ * atomic_readandclear_long(P) (return (*(u_long *)(P)); *(u_long *)(P) = 0;)
*/
/*
@@ -71,9 +71,9 @@
#define ATOMIC_ASM(NAME, TYPE, OP, CONS, V) \
void atomic_##NAME##_##TYPE(volatile u_##TYPE *p, u_##TYPE v)
-int atomic_cmpset_int(volatile u_int *dst, u_int exp, u_int src);
-int atomic_cmpset_long(volatile u_long *dst, u_long exp, u_long src);
-u_int atomic_fetchadd_int(volatile u_int *p, u_int v);
+int atomic_cmpset_int(volatile u_int *dst, u_int exp, u_int src);
+int atomic_cmpset_long(volatile u_long *dst, u_long exp, u_long src);
+u_int atomic_fetchadd_int(volatile u_int *p, u_int v);
#define ATOMIC_STORE_LOAD(TYPE, LOP, SOP) \
u_##TYPE atomic_load_acq_##TYPE(volatile u_##TYPE *p); \
@@ -82,11 +82,11 @@
#else /* !KLD_MODULE && __GNUCLIKE_ASM */
/*
- * For userland, assume the SMP case and use lock prefixes so that
- * the binaries will run on both types of systems.
+ * For userland, always use lock prefixes so that the binaries will run
+ * on both SMP and !SMP systems.
*/
#if defined(SMP) || !defined(_KERNEL)
-#define MPLOCKED lock ;
+#define MPLOCKED "lock ; "
#else
#define MPLOCKED
#endif
@@ -99,9 +99,9 @@
static __inline void \
atomic_##NAME##_##TYPE(volatile u_##TYPE *p, u_##TYPE v)\
{ \
- __asm __volatile(__XSTRING(MPLOCKED) OP \
- : "=m" (*p) \
- : CONS (V), "m" (*p)); \
+ __asm __volatile(MPLOCKED OP \
+ : "=m" (*p) \
+ : CONS (V), "m" (*p)); \
} \
struct __hack
@@ -118,8 +118,8 @@
{
u_char res;
- __asm __volatile (
- " " __XSTRING(MPLOCKED) " "
+ __asm __volatile(
+ " " MPLOCKED " "
" cmpxchgl %2,%1 ; "
" sete %0 ; "
"1: "
@@ -139,8 +139,8 @@
{
u_char res;
- __asm __volatile (
- " " __XSTRING(MPLOCKED) " "
+ __asm __volatile(
+ " " MPLOCKED " "
" cmpxchgq %2,%1 ; "
" sete %0 ; "
"1: "
@@ -163,8 +163,8 @@
atomic_fetchadd_int(volatile u_int *p, u_int v)
{
- __asm __volatile (
- " " __XSTRING(MPLOCKED) " "
+ __asm __volatile(
+ " " MPLOCKED " "
" xaddl %0, %1 ; "
"# atomic_fetchadd_int"
: "+r" (v), /* 0 (result) */
@@ -197,7 +197,7 @@
} \
struct __hack
-#else /* defined(SMP) */
+#else /* !(_KERNEL && !SMP) */
#define ATOMIC_STORE_LOAD(TYPE, LOP, SOP) \
static __inline u_##TYPE \
@@ -205,8 +205,8 @@
{ \
u_##TYPE res; \
\
- __asm __volatile(__XSTRING(MPLOCKED) LOP \
- : "=a" (res), /* 0 (result) */\
+ __asm __volatile(MPLOCKED LOP \
+ : "=a" (res), /* 0 */ \
"=m" (*p) /* 1 */ \
: "m" (*p) /* 2 */ \
: "memory"); \
@@ -227,7 +227,7 @@
} \
struct __hack
-#endif /* SMP */
+#endif /* _KERNEL && !SMP */
#endif /* KLD_MODULE || !__GNUCLIKE_ASM */
@@ -259,7 +259,7 @@
#undef ATOMIC_ASM
#undef ATOMIC_STORE_LOAD
-#if !defined(WANT_FUNCTIONS)
+#ifndef WANT_FUNCTIONS
/* Read the current value and store a zero in the destination. */
#ifdef __GNUCLIKE_ASM
@@ -267,39 +267,39 @@
static __inline u_int
atomic_readandclear_int(volatile u_int *addr)
{
- u_int result;
+ u_int res;
- result = 0;
- __asm __volatile (
+ res = 0;
+ __asm __volatile(
" xchgl %1,%0 ; "
"# atomic_readandclear_int"
- : "+r" (result), /* 0 (result) */
- "=m" (*addr) /* 1 (addr) */
+ : "+r" (res), /* 0 */
+ "=m" (*addr) /* 1 */
: "m" (*addr));
- return (result);
+ return (res);
}
static __inline u_long
atomic_readandclear_long(volatile u_long *addr)
{
- u_long result;
+ u_long res;
- result = 0;
- __asm __volatile (
+ res = 0;
+ __asm __volatile(
" xchgq %1,%0 ; "
"# atomic_readandclear_long"
- : "+r" (result), /* 0 (result) */
- "=m" (*addr) /* 1 (addr) */
+ : "+r" (res), /* 0 */
+ "=m" (*addr) /* 1 */
: "m" (*addr));
- return (result);
+ return (res);
}
#else /* !__GNUCLIKE_ASM */
-u_int atomic_readandclear_int(volatile u_int *);
-u_long atomic_readandclear_long(volatile u_long *);
+u_int atomic_readandclear_int(volatile u_int *addr);
+u_long atomic_readandclear_long(volatile u_long *addr);
#endif /* __GNUCLIKE_ASM */
@@ -437,5 +437,6 @@
#define atomic_cmpset_rel_ptr atomic_cmpset_rel_long
#define atomic_readandclear_ptr atomic_readandclear_long
-#endif /* !defined(WANT_FUNCTIONS) */
-#endif /* ! _MACHINE_ATOMIC_H_ */
+#endif /* !WANT_FUNCTIONS */
+
+#endif /* !_MACHINE_ATOMIC_H_ */
==== //depot/projects/smpng/sys/amd64/include/specialreg.h#11 (text+ko) ====
@@ -27,7 +27,7 @@
* SUCH DAMAGE.
*
* from: @(#)specialreg.h 7.1 (Berkeley) 5/9/91
- * $FreeBSD: src/sys/amd64/include/specialreg.h,v 1.35 2006/07/13 16:09:40 jkim Exp $
+ * $FreeBSD: src/sys/amd64/include/specialreg.h,v 1.36 2007/01/09 19:23:21 jkim Exp $
*/
#ifndef _MACHINE_SPECIALREG_H_
@@ -118,7 +118,8 @@
#define CPUID2_VMX 0x00000020
#define CPUID2_EST 0x00000080
#define CPUID2_TM2 0x00000100
-#define CPUID2_CNTXID 0x00000400
+#define CPUID2_SSSE3 0x00000200
+#define CPUID2_CNXTID 0x00000400
#define CPUID2_CX16 0x00002000
#define CPUID2_XTPR 0x00004000
==== //depot/projects/smpng/sys/amd64/linux32/linux32_dummy.c#7 (text+ko) ====
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/amd64/linux32/linux32_dummy.c,v 1.6 2006/10/28 10:59:59 netchild Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/linux32/linux32_dummy.c,v 1.7 2006/12/31 13:16:00 netchild Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -53,7 +53,6 @@
DUMMY(sysfs);
DUMMY(query_module);
DUMMY(nfsservctl);
-DUMMY(rt_sigtimedwait);
DUMMY(rt_sigqueueinfo);
DUMMY(capget);
DUMMY(capset);
@@ -77,7 +76,6 @@
DUMMY(timer_getoverrun);
DUMMY(timer_delete);
DUMMY(fstatfs64);
-DUMMY(utimes);
DUMMY(fadvise64_64);
DUMMY(mbind);
DUMMY(get_mempolicy);
==== //depot/projects/smpng/sys/amd64/linux32/linux32_machdep.c#15 (text+ko) ====
@@ -29,11 +29,13 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/amd64/linux32/linux32_machdep.c,v 1.23 2006/12/20 20:17:34 jkim Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/linux32/linux32_machdep.c,v 1.25 2007/01/07 19:00:38 netchild Exp $");
#include <sys/param.h>
#include <sys/kernel.h>
#include <sys/systm.h>
+#include <sys/file.h>
+#include <sys/fcntl.h>
#include <sys/clock.h>
#include <sys/imgact.h>
#include <sys/limits.h>
@@ -562,7 +564,7 @@
/* create the emuldata */
error = linux_proc_init(td, p2->p_pid, args->flags);
/* reference it - no need to check this */
- em = em_find(p2, EMUL_UNLOCKED);
+ em = em_find(p2, EMUL_DOLOCK);
KASSERT(em != NULL, ("clone: emuldata not found.\n"));
/* and adjust it */
if (args->flags & CLONE_PARENT_SETTID) {
@@ -728,9 +730,20 @@
off_t pos;
} */ bsd_args;
int error;
+ struct file *fp;
error = 0;
bsd_args.flags = 0;
+ fp = NULL;
+
+ /*
+ * Linux mmap(2):
+ * You must specify exactly one of MAP_SHARED and MAP_PRIVATE
+ */
+ if (! ((linux_args->flags & LINUX_MAP_SHARED) ^
+ (linux_args->flags & LINUX_MAP_PRIVATE)))
+ return (EINVAL);
+
if (linux_args->flags & LINUX_MAP_SHARED)
bsd_args.flags |= MAP_SHARED;
if (linux_args->flags & LINUX_MAP_PRIVATE)
@@ -813,17 +826,44 @@
bsd_args.addr = (caddr_t)PTRIN(linux_args->addr);
bsd_args.len = linux_args->len;
}
+
/*
- * XXX i386 Linux always emulator forces PROT_READ on (why?)
- * so we do the same. We add PROT_EXEC to work around buggy
- * applications (e.g. Java) that take advantage of the fact
- * that execute permissions are not enforced by x86 CPUs.
+ * We add PROT_EXEC to work around buggy applications (e.g. Java)
+ * that take advantage of the fact that execute permissions are not
+ * enforced by x86 CPUs.
*/
- bsd_args.prot = linux_args->prot | PROT_EXEC | PROT_READ;
+ bsd_args.prot = linux_args->prot | PROT_EXEC;
if (linux_args->flags & LINUX_MAP_ANON)
bsd_args.fd = -1;
- else
+ else {
+ /*
+ * Linux follows Solaris mmap(2) description:
+ * The file descriptor fildes is opened with
+ * read permission, regardless of the
+ * protection options specified.
+ * If PROT_WRITE is specified, the application
+ * must have opened the file descriptor
+ * fildes with write permission unless
+ * MAP_PRIVATE is specified in the flag
+ * argument as described below.
+ */
+
+ if ((error = fget(td, linux_args->fd, &fp)) != 0)
+ return (error);
+ if (fp->f_type != DTYPE_VNODE) {
+ fdrop(fp, td);
+ return (EINVAL);
+ }
+
+ /* Linux mmap() just fails for O_WRONLY files */
+ if (! (fp->f_flag & FREAD)) {
+ fdrop(fp, td);
+ return (EACCES);
+ }
+
bsd_args.fd = linux_args->fd;
+ fdrop(fp, td);
+ }
bsd_args.pos = (off_t)linux_args->pgoff * PAGE_SIZE;
bsd_args.pad = 0;
==== //depot/projects/smpng/sys/amd64/linux32/linux32_proto.h#19 (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.26 2006/11/11 21:49:07 ru Exp $
- * created from FreeBSD: src/sys/amd64/linux32/syscalls.master,v 1.23 2006/10/29 14:02:38 netchild Exp
+ * $FreeBSD: src/sys/amd64/linux32/linux32_proto.h,v 1.28 2006/12/31 13:20:30 netchild Exp $
+ * created from FreeBSD: src/sys/amd64/linux32/syscalls.master,v 1.25 2006/12/31 13:16:00 netchild Exp
*/
#ifndef _LINUX_SYSPROTO_H_
@@ -547,7 +547,10 @@
char sigsetsize_l_[PADL_(l_size_t)]; l_size_t sigsetsize; char sigsetsize_r_[PADR_(l_size_t)];
};
struct linux_rt_sigtimedwait_args {
- register_t dummy;
+ char mask_l_[PADL_(l_sigset_t *)]; l_sigset_t * mask; char mask_r_[PADR_(l_sigset_t *)];
+ char ptr_l_[PADL_(l_siginfo_t *)]; l_siginfo_t * ptr; char ptr_r_[PADR_(l_siginfo_t *)];
+ char timeout_l_[PADL_(struct l_timeval *)]; struct l_timeval * timeout; char timeout_r_[PADR_(struct l_timeval *)];
+ char sigsetsize_l_[PADL_(l_size_t)]; l_size_t sigsetsize; char sigsetsize_r_[PADR_(l_size_t)];
};
struct linux_rt_sigqueueinfo_args {
register_t dummy;
@@ -798,7 +801,8 @@
char sig_l_[PADL_(int)]; int sig; char sig_r_[PADR_(int)];
};
struct linux_utimes_args {
- register_t dummy;
+ char fname_l_[PADL_(char *)]; char * fname; char fname_r_[PADR_(char *)];
+ char tptr_l_[PADL_(struct l_timeval *)]; struct l_timeval * tptr; char tptr_r_[PADR_(struct l_timeval *)];
};
struct linux_fadvise64_64_args {
register_t dummy;
@@ -1160,7 +1164,7 @@
#define LINUX_SYS_AUE_linux_fork AUE_FORK
#define LINUX_SYS_AUE_linux_open AUE_OPEN_RWTC
#define LINUX_SYS_AUE_linux_waitpid AUE_WAIT4
-#define LINUX_SYS_AUE_linux_creat AUE_O_CREAT
+#define LINUX_SYS_AUE_linux_creat AUE_CREAT
#define LINUX_SYS_AUE_linux_link AUE_LINK
#define LINUX_SYS_AUE_linux_unlink AUE_UNLINK
#define LINUX_SYS_AUE_linux_execve AUE_EXECVE
@@ -1221,7 +1225,7 @@
#define LINUX_SYS_AUE_linux_lstat AUE_LSTAT
#define LINUX_SYS_AUE_linux_readlink AUE_READLINK
#define LINUX_SYS_AUE_linux_reboot AUE_REBOOT
-#define LINUX_SYS_AUE_linux_readdir AUE_O_GETDENTS
+#define LINUX_SYS_AUE_linux_readdir AUE_GETDIRENTRIES
#define LINUX_SYS_AUE_linux_mmap AUE_MMAP
#define LINUX_SYS_AUE_linux_truncate AUE_TRUNCATE
#define LINUX_SYS_AUE_linux_ftruncate AUE_FTRUNCATE
@@ -1258,7 +1262,7 @@
#define LINUX_SYS_AUE_linux_setfsuid16 AUE_SETFSUID
#define LINUX_SYS_AUE_linux_setfsgid16 AUE_SETFSGID
#define LINUX_SYS_AUE_linux_llseek AUE_LSEEK
-#define LINUX_SYS_AUE_linux_getdents AUE_O_GETDENTS
+#define LINUX_SYS_AUE_linux_getdents AUE_GETDIRENTRIES
#define LINUX_SYS_AUE_linux_select AUE_SELECT
#define LINUX_SYS_AUE_linux_msync AUE_MSYNC
#define LINUX_SYS_AUE_linux_readv AUE_READV
@@ -1313,7 +1317,7 @@
#define LINUX_SYS_AUE_linux_setfsgid AUE_SETFSGID
#define LINUX_SYS_AUE_linux_pivot_root AUE_PIVOT_ROOT
#define LINUX_SYS_AUE_linux_mincore AUE_MINCORE
-#define LINUX_SYS_AUE_linux_getdents64 AUE_O_GETDENTS
+#define LINUX_SYS_AUE_linux_getdents64 AUE_GETDIRENTRIES
#define LINUX_SYS_AUE_linux_fcntl64 AUE_FCNTL
#define LINUX_SYS_AUE_linux_gettid AUE_NULL
#define LINUX_SYS_AUE_linux_setxattr AUE_NULL
@@ -1347,10 +1351,10 @@
#define LINUX_SYS_AUE_linux_clock_gettime AUE_NULL
#define LINUX_SYS_AUE_linux_clock_getres AUE_NULL
#define LINUX_SYS_AUE_linux_clock_nanosleep AUE_NULL
-#define LINUX_SYS_AUE_linux_statfs64 AUE_NULL
-#define LINUX_SYS_AUE_linux_fstatfs64 AUE_NULL
+#define LINUX_SYS_AUE_linux_statfs64 AUE_STATFS
+#define LINUX_SYS_AUE_linux_fstatfs64 AUE_FSTATFS
#define LINUX_SYS_AUE_linux_tgkill AUE_NULL
-#define LINUX_SYS_AUE_linux_utimes AUE_NULL
+#define LINUX_SYS_AUE_linux_utimes AUE_UTIMES
#define LINUX_SYS_AUE_linux_fadvise64_64 AUE_NULL
#define LINUX_SYS_AUE_linux_mbind AUE_NULL
#define LINUX_SYS_AUE_linux_get_mempolicy AUE_NULL
==== //depot/projects/smpng/sys/amd64/linux32/linux32_syscall.h#19 (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.26 2006/11/11 21:49:07 ru Exp $
- * created from FreeBSD: src/sys/amd64/linux32/syscalls.master,v 1.23 2006/10/29 14:02:38 netchild Exp
+ * $FreeBSD: src/sys/amd64/linux32/linux32_syscall.h,v 1.28 2006/12/31 13:20:30 netchild Exp $
+ * created from FreeBSD: src/sys/amd64/linux32/syscalls.master,v 1.25 2006/12/31 13:16:00 netchild Exp
*/
#define LINUX_SYS_exit 1
==== //depot/projects/smpng/sys/amd64/linux32/linux32_sysent.c#19 (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.26 2006/11/11 21:49:07 ru Exp $
- * created from FreeBSD: src/sys/amd64/linux32/syscalls.master,v 1.23 2006/10/29 14:02:38 netchild Exp
+ * $FreeBSD: src/sys/amd64/linux32/linux32_sysent.c,v 1.28 2006/12/31 13:20:30 netchild Exp $
+ * created from FreeBSD: src/sys/amd64/linux32/syscalls.master,v 1.25 2006/12/31 13:16:00 netchild Exp
*/
#include <bsm/audit_kevents.h>
@@ -28,7 +28,7 @@
{ AS(linux_open_args), (sy_call_t *)linux_open, AUE_OPEN_RWTC, NULL, 0, 0 }, /* 5 = linux_open */
{ AS(close_args), (sy_call_t *)close, AUE_CLOSE, NULL, 0, 0 }, /* 6 = close */
{ AS(linux_waitpid_args), (sy_call_t *)linux_waitpid, AUE_WAIT4, NULL, 0, 0 }, /* 7 = linux_waitpid */
- { AS(linux_creat_args), (sy_call_t *)linux_creat, AUE_O_CREAT, NULL, 0, 0 }, /* 8 = linux_creat */
+ { AS(linux_creat_args), (sy_call_t *)linux_creat, AUE_CREAT, NULL, 0, 0 }, /* 8 = linux_creat */
{ AS(linux_link_args), (sy_call_t *)linux_link, AUE_LINK, NULL, 0, 0 }, /* 9 = linux_link */
{ AS(linux_unlink_args), (sy_call_t *)linux_unlink, AUE_UNLINK, NULL, 0, 0 }, /* 10 = linux_unlink */
{ AS(linux_execve_args), (sy_call_t *)linux_execve, AUE_EXECVE, NULL, 0, 0 }, /* 11 = linux_execve */
@@ -109,7 +109,7 @@
{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 86 = linux_uselib */
{ AS(swapon_args), (sy_call_t *)swapon, AUE_SWAPON, NULL, 0, 0 }, /* 87 = swapon */
{ AS(linux_reboot_args), (sy_call_t *)linux_reboot, AUE_REBOOT, NULL, 0, 0 }, /* 88 = linux_reboot */
- { AS(linux_readdir_args), (sy_call_t *)linux_readdir, AUE_O_GETDENTS, NULL, 0, 0 }, /* 89 = linux_readdir */
+ { AS(linux_readdir_args), (sy_call_t *)linux_readdir, AUE_GETDIRENTRIES, NULL, 0, 0 }, /* 89 = linux_readdir */
{ AS(linux_mmap_args), (sy_call_t *)linux_mmap, AUE_MMAP, NULL, 0, 0 }, /* 90 = linux_mmap */
{ AS(munmap_args), (sy_call_t *)munmap, AUE_MUNMAP, NULL, 0, 0 }, /* 91 = munmap */
{ AS(linux_truncate_args), (sy_call_t *)linux_truncate, AUE_TRUNCATE, NULL, 0, 0 }, /* 92 = linux_truncate */
@@ -161,7 +161,7 @@
{ AS(linux_setfsuid16_args), (sy_call_t *)linux_setfsuid16, AUE_SETFSUID, NULL, 0, 0 }, /* 138 = linux_setfsuid16 */
{ AS(linux_setfsgid16_args), (sy_call_t *)linux_setfsgid16, AUE_SETFSGID, NULL, 0, 0 }, /* 139 = linux_setfsgid16 */
{ AS(linux_llseek_args), (sy_call_t *)linux_llseek, AUE_LSEEK, NULL, 0, 0 }, /* 140 = linux_llseek */
- { AS(linux_getdents_args), (sy_call_t *)linux_getdents, AUE_O_GETDENTS, NULL, 0, 0 }, /* 141 = linux_getdents */
+ { AS(linux_getdents_args), (sy_call_t *)linux_getdents, AUE_GETDIRENTRIES, NULL, 0, 0 }, /* 141 = linux_getdents */
{ AS(linux_select_args), (sy_call_t *)linux_select, AUE_SELECT, NULL, 0, 0 }, /* 142 = linux_select */
{ AS(flock_args), (sy_call_t *)flock, AUE_FLOCK, NULL, 0, 0 }, /* 143 = flock */
{ AS(linux_msync_args), (sy_call_t *)linux_msync, AUE_MSYNC, NULL, 0, 0 }, /* 144 = linux_msync */
@@ -197,7 +197,7 @@
{ AS(linux_rt_sigaction_args), (sy_call_t *)linux_rt_sigaction, AUE_NULL, NULL, 0, 0 }, /* 174 = linux_rt_sigaction */
{ AS(linux_rt_sigprocmask_args), (sy_call_t *)linux_rt_sigprocmask, AUE_NULL, NULL, 0, 0 }, /* 175 = linux_rt_sigprocmask */
{ AS(linux_rt_sigpending_args), (sy_call_t *)linux_rt_sigpending, AUE_NULL, NULL, 0, 0 }, /* 176 = linux_rt_sigpending */
- { 0, (sy_call_t *)linux_rt_sigtimedwait, AUE_NULL, NULL, 0, 0 }, /* 177 = linux_rt_sigtimedwait */
+ { AS(linux_rt_sigtimedwait_args), (sy_call_t *)linux_rt_sigtimedwait, AUE_NULL, NULL, 0, 0 }, /* 177 = linux_rt_sigtimedwait */
{ 0, (sy_call_t *)linux_rt_sigqueueinfo, AUE_NULL, NULL, 0, 0 }, /* 178 = linux_rt_sigqueueinfo */
{ AS(linux_rt_sigsuspend_args), (sy_call_t *)linux_rt_sigsuspend, AUE_NULL, NULL, 0, 0 }, /* 179 = linux_rt_sigsuspend */
{ AS(linux_pread_args), (sy_call_t *)linux_pread, AUE_PREAD, NULL, 0, 0 }, /* 180 = linux_pread */
@@ -240,7 +240,7 @@
{ AS(linux_pivot_root_args), (sy_call_t *)linux_pivot_root, AUE_PIVOT_ROOT, NULL, 0, 0 }, /* 217 = linux_pivot_root */
{ AS(linux_mincore_args), (sy_call_t *)linux_mincore, AUE_MINCORE, NULL, 0, 0 }, /* 218 = linux_mincore */
{ AS(madvise_args), (sy_call_t *)madvise, AUE_MADVISE, NULL, 0, 0 }, /* 219 = madvise */
- { AS(linux_getdents64_args), (sy_call_t *)linux_getdents64, AUE_O_GETDENTS, NULL, 0, 0 }, /* 220 = linux_getdents64 */
+ { AS(linux_getdents64_args), (sy_call_t *)linux_getdents64, AUE_GETDIRENTRIES, NULL, 0, 0 }, /* 220 = linux_getdents64 */
{ AS(linux_fcntl64_args), (sy_call_t *)linux_fcntl64, AUE_FCNTL, NULL, 0, 0 }, /* 221 = linux_fcntl64 */
{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 222 = */
{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 223 = */
@@ -288,10 +288,10 @@
{ AS(linux_clock_gettime_args), (sy_call_t *)linux_clock_gettime, AUE_NULL, NULL, 0, 0 }, /* 265 = linux_clock_gettime */
{ AS(linux_clock_getres_args), (sy_call_t *)linux_clock_getres, AUE_NULL, NULL, 0, 0 }, /* 266 = linux_clock_getres */
{ AS(linux_clock_nanosleep_args), (sy_call_t *)linux_clock_nanosleep, AUE_NULL, NULL, 0, 0 }, /* 267 = linux_clock_nanosleep */
- { AS(linux_statfs64_args), (sy_call_t *)linux_statfs64, AUE_NULL, NULL, 0, 0 }, /* 268 = linux_statfs64 */
- { 0, (sy_call_t *)linux_fstatfs64, AUE_NULL, NULL, 0, 0 }, /* 269 = linux_fstatfs64 */
+ { AS(linux_statfs64_args), (sy_call_t *)linux_statfs64, AUE_STATFS, NULL, 0, 0 }, /* 268 = linux_statfs64 */
+ { 0, (sy_call_t *)linux_fstatfs64, AUE_FSTATFS, NULL, 0, 0 }, /* 269 = linux_fstatfs64 */
{ AS(linux_tgkill_args), (sy_call_t *)linux_tgkill, AUE_NULL, NULL, 0, 0 }, /* 270 = linux_tgkill */
- { 0, (sy_call_t *)linux_utimes, AUE_NULL, NULL, 0, 0 }, /* 271 = linux_utimes */
+ { AS(linux_utimes_args), (sy_call_t *)linux_utimes, AUE_UTIMES, NULL, 0, 0 }, /* 271 = linux_utimes */
{ 0, (sy_call_t *)linux_fadvise64_64, AUE_NULL, NULL, 0, 0 }, /* 272 = linux_fadvise64_64 */
{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 273 = */
{ 0, (sy_call_t *)linux_mbind, AUE_NULL, NULL, 0, 0 }, /* 274 = linux_mbind */
==== //depot/projects/smpng/sys/amd64/linux32/syscalls.master#23 (text+ko) ====
@@ -1,4 +1,4 @@
- $FreeBSD: src/sys/amd64/linux32/syscalls.master,v 1.23 2006/10/29 14:02:38 netchild Exp $
+ $FreeBSD: src/sys/amd64/linux32/syscalls.master,v 1.25 2006/12/31 13:16:00 netchild Exp $
; @(#)syscalls.master 8.1 (Berkeley) 7/19/93
; System call name/number master file (or rather, slave, from LINUX).
@@ -50,7 +50,7 @@
6 AUE_CLOSE NOPROTO { int close(int fd); }
7 AUE_WAIT4 STD { int linux_waitpid(l_pid_t pid, \
l_int *status, l_int options); }
-8 AUE_O_CREAT STD { int linux_creat(char *path, \
+8 AUE_CREAT STD { int linux_creat(char *path, \
l_int mode); }
9 AUE_LINK STD { int linux_link(char *path, char *to); }
10 AUE_UNLINK STD { int linux_unlink(char *path); }
@@ -80,7 +80,7 @@
26 AUE_PTRACE STD { int linux_ptrace(l_long req, l_long pid, \
l_long addr, l_long data); }
27 AUE_NULL STD { int linux_alarm(l_uint secs); }
-28 AUE_NULL UNIMPL fstat
+28 AUE_FSTAT UNIMPL fstat
29 AUE_NULL STD { int linux_pause(void); }
30 AUE_UTIME STD { int linux_utime(char *fname, \
struct l_utimbuf *times); }
@@ -160,11 +160,11 @@
84 AUE_LSTAT STD { int linux_lstat(char *path, struct linux_lstat *up); }
85 AUE_READLINK STD { int linux_readlink(char *name, char *buf, \
l_int count); }
-86 AUE_NULL UNIMPL linux_uselib
+86 AUE_USELIB UNIMPL linux_uselib
87 AUE_SWAPON NOPROTO { int swapon(char *name); }
88 AUE_REBOOT STD { int linux_reboot(l_int magic1, \
l_int magic2, l_uint cmd, void *arg); }
-89 AUE_O_GETDENTS STD { int linux_readdir(l_uint fd, \
+89 AUE_GETDIRENTRIES STD { int linux_readdir(l_uint fd, \
struct l_dirent *dent, l_uint count); }
90 AUE_MMAP STD { int linux_mmap(struct l_mmap_argv *ptr); }
91 AUE_MUNMAP NOPROTO { int munmap(caddr_t addr, int len); }
@@ -176,7 +176,7 @@
96 AUE_GETPRIORITY STD { int linux_getpriority(int which, int who); }
97 AUE_SETPRIORITY NOPROTO { int setpriority(int which, int who, \
int prio); }
-98 AUE_AUE_PROFILE UNIMPL profil
+98 AUE_PROFILE UNIMPL profil
99 AUE_STATFS STD { int linux_statfs(char *path, \
struct l_statfs_buf *buf); }
100 AUE_FSTATFS STD { int linux_fstatfs(l_uint fd, \
@@ -243,7 +243,7 @@
140 AUE_LSEEK STD { int linux_llseek(l_int fd, l_ulong ohigh, \
l_ulong olow, l_loff_t *res, \
l_uint whence); }
-141 AUE_O_GETDENTS STD { int linux_getdents(l_uint fd, void *dent, \
+141 AUE_GETDIRENTRIES STD { int linux_getdents(l_uint fd, void *dent, \
l_uint count); }
142 AUE_SELECT STD { int linux_select(l_int nfds, \
l_fd_set *readfds, l_fd_set *writefds, \
@@ -252,9 +252,9 @@
143 AUE_FLOCK NOPROTO { int flock(int fd, int how); }
144 AUE_MSYNC STD { int linux_msync(l_ulong addr, \
>>> TRUNCATED FOR MAIL (1000 lines) <<<
More information about the p4-projects
mailing list