- Don't redefine PKSYSTEM_ROUTINE

- Don't include x86 headers for all architectures
- Don't use system_header
- Add a note for ARM team

svn path=/trunk/; revision=37795

diff --git a/reactos/ntoskrnl/include/internal/arm/ke.h b/reactos/ntoskrnl/include/internal/arm/ke.h
index 5bff00a..95d5552 100644 (file)
--- a/reactos/ntoskrnl/include/internal/arm/ke.h
+++ b/reactos/ntoskrnl/include/internal/arm/ke.h
@@ -1,11 +1,6 @@
 #ifndef __NTOSKRNL_INCLUDE_INTERNAL_ARM_KE_H
 #define __NTOSKRNL_INCLUDE_INTERNAL_ARM_KE_H
 
-#if __GNUC__ >=3
-#pragma GCC system_header
-#endif
-
-
 //
 //Lockdown TLB entries
 //

diff --git a/reactos/ntoskrnl/include/internal/arm/mm.h b/reactos/ntoskrnl/include/internal/arm/mm.h
index 5d24793..d049a39 100644 (file)
--- a/reactos/ntoskrnl/include/internal/arm/mm.h
+++ b/reactos/ntoskrnl/include/internal/arm/mm.h
@@ -1,10 +1,6 @@
 #ifndef __NTOSKRNL_INCLUDE_INTERNAL_ARM_MM_H
 #define __NTOSKRNL_INCLUDE_INTERNAL_ARM_MM_H
 
-#if __GNUC__ >=3
-#pragma GCC system_header
-#endif
-
 //
 // Number of bits corresponding to the area that a PDE entry represents (1MB)
 //
@@ -15,7 +11,7 @@
 // Number of bits corresponding to the area that a coarse page table entry represents (4KB)
 //
 #define PTE_SHIFT 12
-#define PAGE_SIZE (1 << PTE_SHIFT)
+//#define PAGE_SIZE (1 << PTE_SHIFT) // FIXME: This conflicts with ndk/arm/mmtypes.h which does #define PAGE_SIZE 0x1000 -- use PTE_SIZE here instead?
 
 //
 // Number of bits corresponding to the area that a coarse page table occupies (1KB)

diff --git a/reactos/ntoskrnl/include/internal/i386/ke.h b/reactos/ntoskrnl/include/internal/i386/ke.h
index aeda542..16c0de2 100644 (file)
--- a/reactos/ntoskrnl/include/internal/i386/ke.h
+++ b/reactos/ntoskrnl/include/internal/i386/ke.h
@@ -1,15 +1,12 @@
 #ifndef __NTOSKRNL_INCLUDE_INTERNAL_I386_KE_H
 #define __NTOSKRNL_INCLUDE_INTERNAL_I386_KE_H
 
-#if __GNUC__ >=3
-#pragma GCC system_header
-#endif
-
 #define FRAME_EDITED        0xFFF8
 
 #ifndef __ASM__
 
 #include "intrin_i.h"
+#include "v86m.h"
 
 #define KeArchFnInit() Ke386FnInit()
 #define KeArchHaltProcessor() Ke386HaltProcessor()
@@ -72,11 +69,6 @@ KeApplicationProcessorInitDispatcher(VOID);
 VOID
 KeCreateApplicationProcessorIdleThread(ULONG Id);
 
-typedef
-VOID
-(NTAPI*PKSYSTEM_ROUTINE)(PKSTART_ROUTINE StartRoutine,
-                    PVOID StartContext);
-
 VOID
 NTAPI
 Ke386InitThreadWithContext(PKTHREAD Thread,

diff --git a/reactos/ntoskrnl/include/internal/i386/mm.h b/reactos/ntoskrnl/include/internal/i386/mm.h
index ce83e73..4486762 100644 (file)
--- a/reactos/ntoskrnl/include/internal/i386/mm.h
+++ b/reactos/ntoskrnl/include/internal/i386/mm.h
@@ -5,8 +5,6 @@
 #ifndef __NTOSKRNL_INCLUDE_INTERNAL_I386_MM_H
 #define __NTOSKRNL_INCLUDE_INTERNAL_I386_MM_H
 
-#ifdef _M_IX86
-
 struct _EPROCESS;
 PULONG MmGetPageDirectory(VOID);
 
@@ -30,6 +28,4 @@ PULONG MmGetPageDirectory(VOID);
 /* Easy accessing PFN in PTE */
 #define PFN_FROM_PTE(v) ((v)->u.Hard.PageFrameNumber)
 
-#endif
-
 #endif /* __NTOSKRNL_INCLUDE_INTERNAL_I386_MM_H */

diff --git a/reactos/ntoskrnl/include/internal/kbd.h b/reactos/ntoskrnl/include/internal/kbd.h
index f357ca7..3a58ef9 100644 (file)
--- a/reactos/ntoskrnl/include/internal/kbd.h
+++ b/reactos/ntoskrnl/include/internal/kbd.h
@@ -1,9 +1,5 @@
 #define __KBD_H
 
-#if __GNUC__ >=3
-#pragma GCC system_header
-#endif
-
 #ifdef __cplusplus
 extern "C" {
 #endif

diff --git a/reactos/ntoskrnl/include/internal/ntoskrnl.h b/reactos/ntoskrnl/include/internal/ntoskrnl.h
index 09f69a7..fe841c0 100644 (file)
--- a/reactos/ntoskrnl/include/internal/ntoskrnl.h
+++ b/reactos/ntoskrnl/include/internal/ntoskrnl.h
@@ -41,8 +41,6 @@
 #define InterlockedAnd               _InterlockedAnd
 
 #include "ke.h"
-#include "i386/mm.h"
-#include "i386/v86m.h"
 #include "ob.h"
 #include "mm.h"
 #include "ex.h"