From 47c6266afda518d3a46df4ee387fb4bc98bd0cf4 Mon Sep 17 00:00:00 2001 From: Marcel Moolenaar Date: Mon, 17 Mar 2014 04:38:10 +0000 Subject: [PATCH] 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(). --- sys/ia64/ia64/mp_machdep.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/sys/ia64/ia64/mp_machdep.c b/sys/ia64/ia64/mp_machdep.c index ea579017d08c..f7084edffda3 100644 --- a/sys/ia64/ia64/mp_machdep.c +++ b/sys/ia64/ia64/mp_machdep.c @@ -113,10 +113,14 @@ ia64_ih_ast(struct thread *td, u_int xiv, struct trapframe *tf) 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); }