From 5ca7892171a19f35f4d0a84c4746e35841b2054d Mon Sep 17 00:00:00 2001
From: ReactOS Portable Systems Group <ros-arm-bringup@svn.reactos.org>
Date: Wed, 15 Jul 2009 17:55:13 +0000
Subject: [PATCH] - Move ARM3's init.c to i386-specific directory.

svn path=/trunk/; revision=41980
---
 reactos/ntoskrnl/mm/ARM3/{ => i386}/init.c |  6 +++---
 reactos/ntoskrnl/ntoskrnl-generic.rbuild   | 11 ++++++++++-
 2 files changed, 13 insertions(+), 4 deletions(-)
 rename reactos/ntoskrnl/mm/ARM3/{ => i386}/init.c (99%)

diff --git a/reactos/ntoskrnl/mm/ARM3/init.c b/reactos/ntoskrnl/mm/ARM3/i386/init.c
similarity index 99%
rename from reactos/ntoskrnl/mm/ARM3/init.c
rename to reactos/ntoskrnl/mm/ARM3/i386/init.c
index 3fa4ba6bd1f..4b442afce1d 100644
--- a/reactos/ntoskrnl/mm/ARM3/init.c
+++ b/reactos/ntoskrnl/mm/ARM3/i386/init.c
@@ -14,7 +14,7 @@
 
 #line 15 "ARM³::INIT"
 #define MODULE_INVOLVED_IN_ARM3
-#include "../ARM3/miarm.h"
+#include "../../ARM3/miarm.h"
 
 /* GLOBALS ********************************************************************/
 
@@ -138,7 +138,7 @@ MiSyncARM3WithROS(IN PVOID AddressStart,
         // This both odious and heinous
         //
         extern ULONG MmGlobalKernelPageDirectory[1024];
-        MmGlobalKernelPageDirectory[Pde] = ((PULONG)PAGEDIRECTORY_MAP)[Pde];
+        MmGlobalKernelPageDirectory[Pde] = ((PULONG)PDE_BASE)[Pde];
         Pde++;
     }
 }
@@ -302,7 +302,7 @@ MmArmInitSystem(IN ULONG Phase,
         //
         // Set CR3 for the system process
         //
-        PointerPte = MiAddressToPde(PAGETABLE_MAP);
+        PointerPte = MiAddressToPde(PTE_BASE);
         PageFrameIndex = PFN_FROM_PTE(PointerPte) << PAGE_SHIFT;
         PsGetCurrentProcess()->Pcb.DirectoryTableBase[0] = PageFrameIndex;
         
diff --git a/reactos/ntoskrnl/ntoskrnl-generic.rbuild b/reactos/ntoskrnl/ntoskrnl-generic.rbuild
index 5fcb2078b51..15dc82e4043 100644
--- a/reactos/ntoskrnl/ntoskrnl-generic.rbuild
+++ b/reactos/ntoskrnl/ntoskrnl-generic.rbuild
@@ -360,12 +360,21 @@
 			</directory>
 		</if>
 		<directory name="ARM3">
+			<if property="ARCH" value="i386">
+				<directory name="i386">
+					<file>init.c</file>
+				</directory>
+			</if>
+			<if property="ARCH" value="arm">
+				<directory name="arm">
+					<file>init.c</file>
+				</directory>
+			</if>
 			<file>contmem.c</file>
 			<file>drvmgmt.c</file>
 			<file>dynamic.c</file>
 			<file>expool.c</file>
 			<file>hypermap.c</file>
-			<file>init.c</file>
 			<file>iosup.c</file>
 			<file>mdlsup.c</file>
 			<file>ncache.c</file>