Date: Wed, 2 Jul 2014 23:33:07 +0000 (UTC) From: Marcel Moolenaar <marcel@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r268198 - stable/10/sys/ia64/ia64 Message-ID: <201407022333.s62NX7fD066542@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: marcel Date: Wed Jul 2 23:33:07 2014 New Revision: 268198 URL: http://svnweb.freebsd.org/changeset/base/268198 Log: MFC r263253: Don't use the ITC as the faulting address for external interrupts. Modified: stable/10/sys/ia64/ia64/exception.S stable/10/sys/ia64/ia64/interrupt.c Directory Properties: stable/10/ (props changed) Modified: stable/10/sys/ia64/ia64/exception.S ============================================================================== --- stable/10/sys/ia64/ia64/exception.S Wed Jul 2 23:32:05 2014 (r268197) +++ stable/10/sys/ia64/ia64/exception.S Wed Jul 2 23:33:07 2014 (r268198) @@ -1388,7 +1388,7 @@ IVT_END(Break_Instruction) IVT_ENTRY(External_Interrupt, 0x3000) { .mib - mov r17=ar.itc // Put the ITC in the trapframe. + mov r17=0 mov r16=ip br.sptk exception_save ;; Modified: stable/10/sys/ia64/ia64/interrupt.c ============================================================================== --- stable/10/sys/ia64/ia64/interrupt.c Wed Jul 2 23:32:05 2014 (r268197) +++ stable/10/sys/ia64/ia64/interrupt.c Wed Jul 2 23:33:07 2014 (r268198) @@ -316,8 +316,8 @@ ia64_handle_intr(struct trapframe *tf) critical_enter(); do { - CTR2(KTR_INTR, "INTR: ITC=%u, XIV=%u", - (u_int)tf->tf_special.ifa, xiv); + CTR3(KTR_INTR, "INTR: XIV=%u, #%u: frame=%p", xiv, + PCPU_GET(cnt.v_intr), tf); if (!(ia64_handler[xiv])(td, xiv, tf)) { ia64_set_eoi(0); ia64_srlz_d();
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201407022333.s62NX7fD066542>