From 1f647e447985c839c2c51d3c0436e9f9ce430cd2 Mon Sep 17 00:00:00 2001
From: Timo Kreuzer <timo.kreuzer@reactos.org>
Date: Thu, 5 Dec 2024 16:51:26 +0200
Subject: [PATCH] [HAL] Remove KiEoiHelper hack

---
 hal/halx86/apic/rtctimer.c | 6 ++++++
 hal/halx86/include/halp.h  | 1 -
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/hal/halx86/apic/rtctimer.c b/hal/halx86/apic/rtctimer.c
index 5bdf6bf93c9..2cc67908a0f 100644
--- a/hal/halx86/apic/rtctimer.c
+++ b/hal/halx86/apic/rtctimer.c
@@ -156,7 +156,10 @@ HalpClockInterruptHandler(IN PKTRAP_FRAME TrapFrame)
     if (!HalBeginSystemInterrupt(CLOCK_LEVEL, APIC_CLOCK_VECTOR, &Irql))
     {
         /* Spurious, just end the interrupt */
+#ifdef _M_IX86
         KiEoiHelper(TrapFrame);
+#endif
+        return;
     }
 
     /* Read register C, so that the next interrupt can happen */
@@ -207,7 +210,10 @@ HalpClockIpiHandler(IN PKTRAP_FRAME TrapFrame)
     if (!HalBeginSystemInterrupt(CLOCK_LEVEL, CLOCK_IPI_VECTOR, &Irql))
     {
         /* Spurious, just end the interrupt */
+#ifdef _M_IX86
         KiEoiHelper(TrapFrame);
+#endif
+        return;
     }
 
     /* Call the kernel to update runtimes */
diff --git a/hal/halx86/include/halp.h b/hal/halx86/include/halp.h
index c1ee6a67cae..64fa72b3df0 100644
--- a/hal/halx86/include/halp.h
+++ b/hal/halx86/include/halp.h
@@ -586,7 +586,6 @@ HalInitializeBios(
 #ifdef _M_AMD64
 #define KfLowerIrql KeLowerIrql
 #define KiEnterInterruptTrap(TrapFrame) /* We do all neccessary in asm code */
-#define KiEoiHelper(TrapFrame) return /* Just return to the caller */
 #define HalBeginSystemInterrupt(Irql, Vector, OldIrql) ((*(OldIrql) = PASSIVE_LEVEL), TRUE)
 #endif // _M_AMD64