Merge branch 'u-boot-imx/master' into 'u-boot-arm/master'

[u-boot] / arch / x86 / include / asm / processor.h

diff --git a/arch/x86/include/asm/processor.h b/arch/x86/include/asm/processor.h
index aa8188e51a2f064827fac021ba62915276a34391..17f27cbb68468c31079433dc7cadc1df8b894458 100644 (file)
--- a/arch/x86/include/asm/processor.h
+++ b/arch/x86/include/asm/processor.h
@@ -33,6 +33,7 @@ enum {
        X86_GDT_ENTRY_UNUSED,
        X86_GDT_ENTRY_32BIT_CS,
        X86_GDT_ENTRY_32BIT_DS,
+       X86_GDT_ENTRY_32BIT_FS,
        X86_GDT_ENTRY_16BIT_CS,
        X86_GDT_ENTRY_16BIT_DS,
        X86_GDT_NUM_ENTRIES
@@ -40,6 +41,7 @@ enum {
 #else
 /* NOTE: If the above enum is modified, this define must be checked */
 #define X86_GDT_ENTRY_32BIT_DS 3
+#define X86_GDT_NUM_ENTRIES    7
 #endif
 
 #define X86_GDT_SIZE           (X86_GDT_NUM_ENTRIES * X86_GDT_ENTRY_SIZE)