x86: Move Global Descriptor Table defines to processor.h

diff --git a/arch/i386/cpu/cpu.c b/arch/i386/cpu/cpu.c
index ae40384f099aabc193052ea65c0111fa23f43d4a..1dcbb983f5c62e2ca14a1d4d74e64fea2a933f19 100644 (file)
--- a/arch/i386/cpu/cpu.c
+++ b/arch/i386/cpu/cpu.c
@@ -35,6 +35,7 @@
 
 #include <common.h>
 #include <command.h>
+#include <asm/processor.h>
 #include <asm/interrupt.h>
 
 /* Constructor for a conventional segment GDT (or LDT) entry */
@@ -46,13 +47,6 @@
         (((base)  & 0x00ffffffULL) << 16) |            \
         (((limit) & 0x0000ffffULL)))
 
-/* Simple and small GDT entries for booting only */
-
-#define GDT_ENTRY_32BIT_CS     2
-#define GDT_ENTRY_32BIT_DS     (GDT_ENTRY_32BIT_CS + 1)
-#define GDT_ENTRY_16BIT_CS     (GDT_ENTRY_32BIT_DS + 1)
-#define GDT_ENTRY_16BIT_DS     (GDT_ENTRY_16BIT_CS + 1)
-
 /*
  * Set up the GDT
  */

diff --git a/arch/i386/include/asm/processor.h b/arch/i386/include/asm/processor.h
index 5dedba82ca7bdab05943297994b2dba2bb5d140c..22a129813cd396dac842aa75c3ce0ceef9b0c548 100644 (file)
--- a/arch/i386/include/asm/processor.h
+++ b/arch/i386/include/asm/processor.h
@@ -23,7 +23,10 @@
 
 #ifndef __ASM_PROCESSOR_H_
 #define __ASM_PROCESSOR_H_ 1
-/* Currently this header is unused in the i386 port
- * but some generic files #include <asm/processor.h>
- * so this file is a placeholder. */
+
+#define GDT_ENTRY_32BIT_CS     2
+#define GDT_ENTRY_32BIT_DS     (GDT_ENTRY_32BIT_CS + 1)
+#define GDT_ENTRY_16BIT_CS     (GDT_ENTRY_32BIT_DS + 1)
+#define GDT_ENTRY_16BIT_DS     (GDT_ENTRY_16BIT_CS + 1)
+
 #endif