[NTOS]: All calls to DbgPrint will go to DbgPrintEarly for now.

[NTOS]: More header fixes to match new definitions.

svn path=/trunk/; revision=45514

diff --git a/reactos/ntoskrnl/include/internal/arm/ke.h b/reactos/ntoskrnl/include/internal/arm/ke.h
index 964b63b..7bd1c6e 100644 (file)
--- a/reactos/ntoskrnl/include/internal/arm/ke.h
+++ b/reactos/ntoskrnl/include/internal/arm/ke.h
@@ -54,7 +54,7 @@
 // All architectures but x86 have it in the PRCB's KeContextSwitches
 //
 #define KeGetContextSwitches(Prcb)  \
-    Prcb->KeContextSwitches
+    CONTAINING_RECORD(Prcb, KIPCR, PrcbData)->ContextSwitches
 
 //
 // Returns the Interrupt State from a Trap Frame.
@@ -107,13 +107,6 @@ KiApcInterrupt(
 
 #include "mm.h"
 
-VOID
-KeFillFixedEntryTb(
-    IN ARM_PTE Pte,
-    IN PVOID Virtual,
-    IN ULONG Index
-);
-
 VOID
 KeFlushTb(
     VOID

diff --git a/reactos/ntoskrnl/include/internal/arm/mm.h b/reactos/ntoskrnl/include/internal/arm/mm.h
index f318d9a..4266f09 100644 (file)
--- a/reactos/ntoskrnl/include/internal/arm/mm.h
+++ b/reactos/ntoskrnl/include/internal/arm/mm.h
@@ -27,6 +27,7 @@
 #define PDE_BASE    0xC0400000
 #define HYPER_SPACE 0xC0404000
 
+#if 0
 typedef struct _HARDWARE_PDE_ARMV6
 {
     ULONG Valid:1;     // Only for small pages
@@ -77,6 +78,7 @@ typedef struct _HARDWARE_PTE_ARMV6
 C_ASSERT(sizeof(HARDWARE_PDE_ARMV6) == sizeof(ULONG));
 C_ASSERT(sizeof(HARDWARE_LARGE_PTE_ARMV6) == sizeof(ULONG));
 C_ASSERT(sizeof(HARDWARE_PTE_ARMV6) == sizeof(ULONG));
+#endif
 
 /* For FreeLDR */
 typedef struct _PAGE_TABLE_ARM

diff --git a/reactos/ntoskrnl/include/precomp.h b/reactos/ntoskrnl/include/precomp.h
index 8974e9b..8948bae 100644 (file)
--- a/reactos/ntoskrnl/include/precomp.h
+++ b/reactos/ntoskrnl/include/precomp.h
@@ -8,6 +8,11 @@
 
 /* INCLUDES ******************************************************************/
 
+/* ARM Bringup Hack */
+#ifdef _M_ARM
+#define DbgPrint DbgPrintEarly
+#endif
+
 /* Version Data */
 #undef __MSVCRT__
 #include <psdk/ntverp.h>