From d5fe15e5e68db9b1c72808d1167e4ca110fd3b5d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Herv=C3=A9=20Poussineau?= <hpoussin@reactos.org>
Date: Sat, 7 Mar 2020 19:32:45 +0100
Subject: [PATCH] [NTOS:KD] Merge KdpStub with kd64 version

---
 ntoskrnl/kd/kdmain.c   | 17 -----------------
 ntoskrnl/kd64/kdtrap.c |  2 +-
 2 files changed, 1 insertion(+), 18 deletions(-)

diff --git a/ntoskrnl/kd/kdmain.c b/ntoskrnl/kd/kdmain.c
index 01827ee07fb..f6edda85b6f 100644
--- a/ntoskrnl/kd/kdmain.c
+++ b/ntoskrnl/kd/kdmain.c
@@ -188,23 +188,6 @@ KdpTrap(IN PKTRAP_FRAME TrapFrame,
     return TRUE;
 }
 
-BOOLEAN
-NTAPI
-KdpStub(IN PKTRAP_FRAME TrapFrame,
-        IN PKEXCEPTION_FRAME ExceptionFrame,
-        IN PEXCEPTION_RECORD ExceptionRecord,
-        IN PCONTEXT ContextRecord,
-        IN KPROCESSOR_MODE PreviousMode,
-        IN BOOLEAN SecondChanceException)
-{
-    return KdpTrap(TrapFrame,
-                   ExceptionFrame,
-                   ExceptionRecord,
-                   ContextRecord,
-                   PreviousMode,
-                   SecondChanceException);
-}
-
 /* PUBLIC FUNCTIONS *********************************************************/
 
 static PCHAR
diff --git a/ntoskrnl/kd64/kdtrap.c b/ntoskrnl/kd64/kdtrap.c
index c8cf539967f..7cb266b70d1 100644
--- a/ntoskrnl/kd64/kdtrap.c
+++ b/ntoskrnl/kd64/kdtrap.c
@@ -261,6 +261,7 @@ KdpTrap(IN PKTRAP_FRAME TrapFrame,
     /* Return TRUE or FALSE to caller */
     return Handled;
 }
+#endif
 
 BOOLEAN
 NTAPI
@@ -312,7 +313,6 @@ KdpStub(IN PKTRAP_FRAME TrapFrame,
         return FALSE;
     }
 }
-#endif
 
 BOOLEAN
 NTAPI