svn commit: r255165 - head/sys/powerpc/aim

[Justin Hibbits]

Author: jhibbits
Date: Tue Sep  3 00:42:15 2013
New Revision: 255165
URL: http://svnweb.freebsd.org/changeset/base/255165

Log:
  Enable PMC interrupt handling, and fix a DTrace trap handling bug.

Modified:
  head/sys/powerpc/aim/trap.c

Modified: head/sys/powerpc/aim/trap.c
==============================================================================
--- head/sys/powerpc/aim/trap.c	Tue Sep  3 00:34:18 2013	(r255164)
+++ head/sys/powerpc/aim/trap.c	Tue Sep  3 00:42:15 2013	(r255165)
@@ -197,13 +197,11 @@ trap(struct trapframe *frame)
 
 #ifdef HWPMC_HOOKS
 	if (type == EXC_PERF && (pmc_intr != NULL)) {
-#ifdef notyet
-	    (*pmc_intr)(PCPU_GET(cpuid), frame);
-	    if (!user)
+		(*pmc_intr)(PCPU_GET(cpuid), frame);
+		if (user)
+			userret(td, frame);
 		return;
-#endif
 	}
-	else
 #endif
 #ifdef KDTRACE_HOOKS
 	/*
@@ -316,9 +314,11 @@ trap(struct trapframe *frame)
 				if (*(uintptr_t *)frame->srr0 == 0x7c810808) {
 					if (dtrace_invop_jump_addr != NULL) {
 						dtrace_invop_jump_addr(frame);
+						return;
 					}
 				}
 			}
+			break;
 #endif
 #ifdef __powerpc64__
 		case EXC_DSE: