PERFORCE change 109182 for review
John Birrell
jb at FreeBSD.org
Sat Nov 4 01:21:14 UTC 2006
http://perforce.freebsd.org/chv.cgi?CH=109182
Change 109182 by jb at jb_freebsd8 on 2006/11/04 01:16:23
Manual merge from current.
Affected files ...
.. //depot/projects/dtrace/src/sys/sun4v/sun4v/trap.c#13 edit
Differences ...
==== //depot/projects/dtrace/src/sys/sun4v/sun4v/trap.c#13 (text+ko) ====
@@ -473,16 +473,11 @@
va = TLB_TAR_VA(data);
#if 0
- if (ctx == 0 && (tf->tf_tpc < (uint64_t)copy_nofault_begin || tf->tf_tpc > (uint64_t)fs_nofault_end)) {
- spinlock_enter();
- DELAY(10000*curcpu);
- printf("trap_pfault(type=%ld, data=0x%lx, tpc=0x%lx, ctx=0x%lx)\n",
- type, data, tf->tf_tpc, ctx);
- spinlock_exit();
- }
+ printf("trap_pfault(type=%ld, data=0x%lx, tpc=0x%lx, ctx=0x%lx)\n",
+ type, data, tf->tf_tpc, ctx);
CTR4(KTR_TRAP, "trap_pfault: td=%p pm_ctx=%#lx va=%#lx ctx=%#lx",
- td, p->p_vmspace->vm_pmap.pm_context, va, ctx);
+ td, p->p_vmspace->vm_pmap.pm_context[PCPU_GET(cpuid)], va, ctx);
#endif
if (type == T_DATA_PROTECTION) {
@@ -651,6 +646,10 @@
CTR5(KTR_SYSC, "syscall: td=%p %s(%#lx, %#lx, %#lx)", td,
syscallnames[code], argp[0], argp[1], argp[2]);
+ /*
+ * Try to run the syscall without the MP lock if the syscall
+ * is MP safe.
+ */
#ifdef KTRACE
if (KTRPOINT(td, KTR_SYSCALL))
ktrsyscall(code, narg, argp);
More information about the p4-projects
mailing list