From 64d415e5b42ee8431a84ae3eac24a716259e75ad Mon Sep 17 00:00:00 2001
From: Glauber de Oliveira Costa <gcosta@redhat.com>
Date: Wed, 30 Jan 2008 13:31:14 +0100
Subject: [PATCH] --- yaml --- r: 79976 b: refs/heads/master c:
 59fbed775aa5a6f352bfbde6b40508b541086b7e h: refs/heads/master v: v3

---
 [refs]                            | 2 +-
 trunk/include/asm-x86/desc_32.h   | 8 --------
 trunk/include/asm-x86/desc_defs.h | 5 +++++
 3 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/[refs] b/[refs]
index d2620eef89d2..2f9db2868f30 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 75b8bb3e56ca09a467fbbe5229bc68627f7445be
+refs/heads/master: 59fbed775aa5a6f352bfbde6b40508b541086b7e
diff --git a/trunk/include/asm-x86/desc_32.h b/trunk/include/asm-x86/desc_32.h
index 92a72b0381e2..14238df87c7d 100644
--- a/trunk/include/asm-x86/desc_32.h
+++ b/trunk/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/trunk/include/asm-x86/desc_defs.h b/trunk/include/asm-x86/desc_defs.h
index c811f1e0829f..79fe59fc50ec 100644
--- a/trunk/include/asm-x86/desc_defs.h
+++ b/trunk/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.