From 611d62ecb0f53d3266ce37dfad1a1ff8760952e1 Mon Sep 17 00:00:00 2001
From: Timo Kreuzer <timo.kreuzer@reactos.org>
Date: Tue, 13 Sep 2011 12:53:50 +0000
Subject: [PATCH] [NTOSKRNL] Move x86 specific file trap_x.h into
 include/internal/i386

svn path=/trunk/; revision=53699
---
 reactos/ntoskrnl/include/internal/i386/ke.h           | 2 +-
 reactos/ntoskrnl/include/internal/{ => i386}/trap_x.h | 4 ++--
 reactos/ntoskrnl/ke/i386/kiinit.c                     | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)
 rename reactos/ntoskrnl/include/internal/{ => i386}/trap_x.h (99%)

diff --git a/reactos/ntoskrnl/include/internal/i386/ke.h b/reactos/ntoskrnl/include/internal/i386/ke.h
index d55fdc17b4e..bbcab28189d 100644
--- a/reactos/ntoskrnl/include/internal/i386/ke.h
+++ b/reactos/ntoskrnl/include/internal/i386/ke.h
@@ -493,7 +493,7 @@ extern CHAR KiSystemCallExit2[];
 //
 // Trap Macros
 //
-#include "../trap_x.h"
+#include "trap_x.h"
 
 //
 // Returns a thread's FPU save area
diff --git a/reactos/ntoskrnl/include/internal/trap_x.h b/reactos/ntoskrnl/include/internal/i386/trap_x.h
similarity index 99%
rename from reactos/ntoskrnl/include/internal/trap_x.h
rename to reactos/ntoskrnl/include/internal/i386/trap_x.h
index dadd25d61fa..ae8524f071e 100644
--- a/reactos/ntoskrnl/include/internal/trap_x.h
+++ b/reactos/ntoskrnl/include/internal/i386/trap_x.h
@@ -1,7 +1,7 @@
 /*
  * PROJECT:         ReactOS Kernel
  * LICENSE:         BSD - See COPYING.ARM in the top level directory
- * FILE:            ntoskrnl/include/trap_x.h
+ * FILE:            ntoskrnl/include/i386/trap_x.h
  * PURPOSE:         Internal Inlined Functions for the Trap Handling Code
  * PROGRAMMERS:     ReactOS Portable Systems Group
  */
@@ -91,7 +91,7 @@ KiFillTrapFrameDebug(IN PKTRAP_FRAME TrapFrame)
     TrapFrame->DbgArgPointer = TrapFrame->Edx;
     TrapFrame->DbgArgMark = 0xBADB0D00;
     TrapFrame->DbgEip = TrapFrame->Eip;
-    TrapFrame->DbgEbp = TrapFrame->Ebp;   
+    TrapFrame->DbgEbp = TrapFrame->Ebp;
     TrapFrame->PreviousPreviousMode = -1;
 }
 
diff --git a/reactos/ntoskrnl/ke/i386/kiinit.c b/reactos/ntoskrnl/ke/i386/kiinit.c
index 49b2362c3d0..bf3be1d83cf 100644
--- a/reactos/ntoskrnl/ke/i386/kiinit.c
+++ b/reactos/ntoskrnl/ke/i386/kiinit.c
@@ -11,7 +11,7 @@
 #include <ntoskrnl.h>
 #define NDEBUG
 #include <debug.h>
-#include "internal/trap_x.h"
+#include "internal/i386/trap_x.h"
 
 /* GLOBALS *******************************************************************/