MFC r263248 & r263257: In intr_event_handle() we already save and set

td_intr_frame, so don't do it also in ia64_handle_intr().

3 files changed, 10 insertions, 7 deletions

diff --git a/sys/ia64/ia64/clock.c b/sys/ia64/ia64/clock.c
index 37a99a1..68dc29b 100644
--- a/sys/ia64/ia64/clock.c
+++ b/sys/ia64/ia64/clock.c
@@ -76,6 +76,7 @@ static u_int
 ia64_ih_clock(struct thread *td, u_int xiv, struct trapframe *tf)
 {
 	struct eventtimer *et;
+	struct trapframe *stf;
 	uint64_t itc, load;
 	uint32_t mode;
 
@@ -96,8 +97,12 @@ ia64_ih_clock(struct thread *td, u_int xiv, struct trapframe *tf)
 	ia64_srlz_d();
 
 	et = &ia64_clock_et;
-	if (et->et_active)
+	if (et->et_active) {
+		stf = td->td_intr_frame;
+		td->td_intr_frame = tf;
 		et->et_event_cb(et, et->et_arg);
+		td->td_intr_frame = stf;
+	}
 	return (1);
 }
 
diff --git a/sys/ia64/ia64/interrupt.c b/sys/ia64/ia64/interrupt.c
index c2372b2..9d66f4e 100644
--- a/sys/ia64/ia64/interrupt.c
+++ b/sys/ia64/ia64/interrupt.c
@@ -301,7 +301,6 @@ void
 ia64_handle_intr(struct trapframe *tf)
 {
 	struct thread *td;
-	struct trapframe *stf;
 	u_int xiv;
 
 	td = curthread;
@@ -316,9 +315,6 @@ ia64_handle_intr(struct trapframe *tf)
 	}
 
 	critical_enter();
-	stf = td->td_intr_frame;
-	td->td_intr_frame = tf;
-
 	do {
 		CTR2(KTR_INTR, "INTR: ITC=%u, XIV=%u",
 		    (u_int)tf->tf_special.ifa, xiv);
@@ -329,8 +325,6 @@ ia64_handle_intr(struct trapframe *tf)
 		xiv = ia64_get_ivr();
 		ia64_srlz_d();
 	} while (xiv != 15);
-
-	td->td_intr_frame = stf;
 	critical_exit();
 
  out:
diff --git a/sys/ia64/ia64/mp_machdep.c b/sys/ia64/ia64/mp_machdep.c
index 0caa41c..b6451ef 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);
 }