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

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

diff --git a/[refs] b/[refs]
index 8e6ba806f885..5b2e00da640b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8d947344c47a40626730bb80d136d8daac9f2060
+refs/heads/master: 25deca53e9b74a899efd3ae1f4493f4f2ce36846
diff --git a/trunk/include/asm-x86/desc_64.h b/trunk/include/asm-x86/desc_64.h
index 887393f044b1..c49f928ed8b6 100644
--- a/trunk/include/asm-x86/desc_64.h
+++ b/trunk/include/asm-x86/desc_64.h
@@ -113,7 +113,7 @@ static inline void store_idt(struct desc_ptr *dtr)
 static inline void set_tssldt_descriptor(void *ptr, unsigned long tss,
 					 unsigned type, unsigned size)
 {
-	struct ldttss_desc d;
+	struct ldttss_desc64 d;
 
 	memset(&d, 0, sizeof(d));
 	d.limit0 = size & 0xFFFF;
diff --git a/trunk/include/asm-x86/desc_defs.h b/trunk/include/asm-x86/desc_defs.h
index 9732285116af..09ea05243497 100644
--- a/trunk/include/asm-x86/desc_defs.h
+++ b/trunk/include/asm-x86/desc_defs.h
@@ -58,7 +58,7 @@ enum {
 };
 
 // LDT or TSS descriptor in the GDT. 16 bytes.
-struct ldttss_desc {
+struct ldttss_desc64 {
 	u16 limit0;
 	u16 base0;
 	unsigned base1 : 8, type : 5, dpl : 2, p : 1;
@@ -69,8 +69,10 @@ struct ldttss_desc {
 
 #ifdef CONFIG_X86_64
 typedef struct gate_struct64 gate_desc;
+typedef struct ldttss_desc64 ldt_desc;
 #else
 typedef struct desc_struct gate_desc;
+typedef struct desc_struct ldt_desc;
 #endif
 
 struct desc_ptr {