From 9eff9874c5bb75b311f547317d6ccc43cbac59e5 Mon Sep 17 00:00:00 2001
From: Aiken Harris <harraiken91@gmail.com>
Date: Thu, 2 Apr 2026 15:16:21 +0200
Subject: [PATCH] Synchronize headers with merged assembly code

---
 xtoskrnl/includes/ar/amd64/asmsup.hh | 4 ++--
 xtoskrnl/includes/ar/i686/asmsup.hh  | 8 ++++++++
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/xtoskrnl/includes/ar/amd64/asmsup.hh b/xtoskrnl/includes/ar/amd64/asmsup.hh
index 2fc3047..55f7e29 100644
--- a/xtoskrnl/includes/ar/amd64/asmsup.hh
+++ b/xtoskrnl/includes/ar/amd64/asmsup.hh
@@ -28,12 +28,12 @@ XTCLINK ULONG_PTR ArTrapEntry[256];
 XTCLINK
 XTCDECL
 VOID
-ArHandleSpuriousInterrupt(VOID);
+ArEnableExtendedPhysicalAddressing(IN ULONG_PTR PageMap);
 
 XTCLINK
 XTCDECL
 VOID
-ArEnableExtendedPhysicalAddressing(IN ULONG_PTR PageMap);
+ArHandleSpuriousInterrupt(VOID);
 
 XTCLINK
 XTCDECL
diff --git a/xtoskrnl/includes/ar/i686/asmsup.hh b/xtoskrnl/includes/ar/i686/asmsup.hh
index 46e93ae..6b4ef05 100644
--- a/xtoskrnl/includes/ar/i686/asmsup.hh
+++ b/xtoskrnl/includes/ar/i686/asmsup.hh
@@ -12,6 +12,9 @@
 #include <xtos.hh>
 
 
+/* TrampolineEnableXpa end address to calculate trampoline size */
+XTCLINK PVOID ArEnableExtendedPhysicalAddressingEnd[];
+
 /* External array of pointers to the interrupt handlers */
 XTCLINK ULONG_PTR ArInterruptEntry[256];
 
@@ -22,6 +25,11 @@ XTCLINK PVOID ArStartApplicationProcessorEnd[];
 XTCLINK ULONG_PTR ArTrapEntry[256];
 
 /* Forward reference for assembler code */
+XTCLINK
+XTCDECL
+VOID
+ArEnableExtendedPhysicalAddressing(IN ULONG_PTR PageMap);
+
 XTCLINK
 XTCDECL
 VOID