From 1ad36042e5e1978289f2d39d7271a2eb1809d4ad Mon Sep 17 00:00:00 2001
From: ReactOS Portable Systems Group <ros-arm-bringup@svn.reactos.org>
Date: Tue, 12 Feb 2008 06:38:41 +0000
Subject: [PATCH] Fix for x86 build.

svn path=/trunk/; revision=32315
---
 reactos/ntoskrnl/include/internal/arm/intrin_i.h  | 1 -
 reactos/ntoskrnl/include/internal/arm/ke.h        | 2 ++
 reactos/ntoskrnl/include/internal/i386/intrin_i.h | 3 ---
 reactos/ntoskrnl/include/internal/i386/ke.h       | 3 +++
 4 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/reactos/ntoskrnl/include/internal/arm/intrin_i.h b/reactos/ntoskrnl/include/internal/arm/intrin_i.h
index 558e3938f9a..05a00a28d7a 100644
--- a/reactos/ntoskrnl/include/internal/arm/intrin_i.h
+++ b/reactos/ntoskrnl/include/internal/arm/intrin_i.h
@@ -41,5 +41,4 @@ KeArmDomainRegisterSet(IN ARM_DOMAIN_REGISTER DomainRegister)
     __asm__ __volatile__ ("mcr p15, 0, %0, c3, c0, 0" : : "r"(DomainRegister.AsUlong) : "cc");
 }
 
-#define KeArchHaltProcessor KeArmHaltProcessor
 #endif
diff --git a/reactos/ntoskrnl/include/internal/arm/ke.h b/reactos/ntoskrnl/include/internal/arm/ke.h
index 6e45d3689de..62ec28e3db1 100644
--- a/reactos/ntoskrnl/include/internal/arm/ke.h
+++ b/reactos/ntoskrnl/include/internal/arm/ke.h
@@ -5,6 +5,8 @@
 #pragma GCC system_header
 #endif
 
+#define KeArchHaltProcessor() KeArmHaltProcessor()
+
 typedef union _ARM_TTB_REGISTER
 {
     struct
diff --git a/reactos/ntoskrnl/include/internal/i386/intrin_i.h b/reactos/ntoskrnl/include/internal/i386/intrin_i.h
index 3cd5f282904..7da484c15f9 100644
--- a/reactos/ntoskrnl/include/internal/i386/intrin_i.h
+++ b/reactos/ntoskrnl/include/internal/i386/intrin_i.h
@@ -410,9 +410,6 @@ Ke386SetEs(IN USHORT Value)
 #error Unknown compiler for inline assembler
 #endif
 
-#define KeArchFnInit() Ke386FnInit()
-#define KeArchHaltProcessor() Ke386HaltProcessor()
-
 #endif
 
 /* EOF */
diff --git a/reactos/ntoskrnl/include/internal/i386/ke.h b/reactos/ntoskrnl/include/internal/i386/ke.h
index fbc8f5903b5..b45436c23cd 100644
--- a/reactos/ntoskrnl/include/internal/i386/ke.h
+++ b/reactos/ntoskrnl/include/internal/i386/ke.h
@@ -45,6 +45,9 @@
 
 #ifndef __ASM__
 
+#define KeArchFnInit() Ke386FnInit()
+#define KeArchHaltProcessor() Ke386HaltProcessor()
+
 extern ULONG Ke386CacheAlignment;
 
 struct _KPCR;