Date: Mon, 17 Mar 2014 04:38:10 +0000 (UTC) From: Marcel Moolenaar <marcel@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r263257 - head/sys/ia64/ia64 Message-ID: <201403170438.s2H4cA9X048341@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: marcel Date: Mon Mar 17 04:38:10 2014 New Revision: 263257 URL: http://svnweb.freebsd.org/changeset/base/263257 Log: In intr_event_handle() we already save and set td_intr_frame, so don't do it also in ia64_handle_intr(). With ia64_handle_intr() not saving and setting td_intr_frame, make sure to do it for timer interrupts in ia64_ih_hardclock(). Modified: head/sys/ia64/ia64/mp_machdep.c Modified: head/sys/ia64/ia64/mp_machdep.c ============================================================================== --- head/sys/ia64/ia64/mp_machdep.c Mon Mar 17 02:14:13 2014 (r263256) +++ head/sys/ia64/ia64/mp_machdep.c Mon Mar 17 04:38:10 2014 (r263257) @@ -113,10 +113,14 @@ ia64_ih_ast(struct thread *td, u_int xiv static u_int ia64_ih_hardclock(struct thread *td, u_int xiv, struct trapframe *tf) { + struct trapframe *stf; PCPU_INC(md.stats.pcs_nhardclocks); CTR1(KTR_SMP, "IPI_HARDCLOCK, cpuid=%d", PCPU_GET(cpuid)); + stf = td->td_intr_frame; + td->td_intr_frame = tf; hardclockintr(); + td->td_intr_frame = stf; return (0); }
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201403170438.s2H4cA9X048341>