Date: Tue, 3 Sep 2013 00:42:16 +0000 (UTC) From: Justin Hibbits <jhibbits@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r255165 - head/sys/powerpc/aim Message-ID: <201309030042.r830gGXj074247@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
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:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201309030042.r830gGXj074247>