x86: move constants to desc_defs.h

this patch moves constant definitions regarding descriptor types
from desc_32.h to desc_defs.h. The change from defines to enum
to comply with previous versions in desc_defs.h

Signed-off-by: Glauber de Oliveira Costa <gcosta@redhat.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>

2 files changed, 5 insertions, 8 deletions

diff --git a/include/asm-x86/desc_32.h b/include/asm-x86/desc_32.h
index 92a72b0381e2..14238df87c7d 100644
--- a/include/asm-x86/desc_32.h
+++ b/include/asm-x86/desc_32.h
@@ -44,14 +44,6 @@ static inline void pack_gate(gate_desc *gate,
         gate->b = (base & 0xffff0000) | ((type & 0xff) << 8) | (flags & 0xff);
 }
 
-#define DESCTYPE_LDT    0x82    /* present, system, DPL-0, LDT */
-#define DESCTYPE_TSS    0x89    /* present, system, DPL-0, 32-bit TSS */
-#define DESCTYPE_TASK   0x85    /* present, system, DPL-0, task gate */
-#define DESCTYPE_INT    0x8e    /* present, system, DPL-0, interrupt gate */
-#define DESCTYPE_TRAP   0x8f    /* present, system, DPL-0, trap gate */
-#define DESCTYPE_DPL3   0x60    /* DPL-3 */
-#define DESCTYPE_S      0x10    /* !system */
-
 #ifdef CONFIG_PARAVIRT
 #include <asm/paravirt.h>
 #else
diff --git a/include/asm-x86/desc_defs.h b/include/asm-x86/desc_defs.h
index c811f1e0829f..79fe59fc50ec 100644
--- a/include/asm-x86/desc_defs.h
+++ b/include/asm-x86/desc_defs.h
@@ -55,6 +55,11 @@ struct gate_struct64 {
 enum {
         DESC_TSS = 0x9,
         DESC_LDT = 0x2,
+        DESCTYPE_TASK = 0x85,   /* present, system, DPL-0, task gate */
+        DESCTYPE_INT =  0x8e,   /* present, system, DPL-0, interrupt gate */
+        DESCTYPE_TRAP = 0x8f,   /* present, system, DPL-0, trap gate */
+        DESCTYPE_DPL3 = 0x60,   /* DPL-3 */
+        DESCTYPE_S =    0x10,   /* !system */
 };
 
 // LDT or TSS descriptor in the GDT. 16 bytes.