diff --git a/[refs] b/[refs]
index 6b127ee2f83d..d5494e93e3da 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 881c2975d02b6575c417a6eee40868d60a9ecba9
+refs/heads/master: 26048d75e8d6c840742468667f4a7ab8c2df74c9
diff --git a/trunk/include/asm-x86/desc_64.h b/trunk/include/asm-x86/desc_64.h
index c037c7d55b92..448f96ed973f 100644
--- a/trunk/include/asm-x86/desc_64.h
+++ b/trunk/include/asm-x86/desc_64.h
@@ -150,7 +150,7 @@ static inline void set_ldt(void *addr, int entries)
 static inline void load_TLS(struct thread_struct *t, unsigned int cpu)
 {
 	unsigned int i;
-	u64 *gdt = (u64 *)(get_cpu_gdt_table(cpu) + GDT_ENTRY_TLS_MIN);
+	struct desc_struct *gdt = (get_cpu_gdt_table(cpu) + GDT_ENTRY_TLS_MIN);
 
 	for (i = 0; i < GDT_ENTRY_TLS_ENTRIES; i++)
 		gdt[i] = t->tls_array[i];
diff --git a/trunk/include/asm-x86/processor_64.h b/trunk/include/asm-x86/processor_64.h
index 7b7f8a142e20..a0a9e5515097 100644
--- a/trunk/include/asm-x86/processor_64.h
+++ b/trunk/include/asm-x86/processor_64.h
@@ -19,6 +19,7 @@
 #include <linux/personality.h>
 #include <linux/cpumask.h>
 #include <asm/processor-flags.h>
+#include <asm/desc_defs.h>
 
 #define TF_MASK		0x00000100
 #define IF_MASK		0x00000200
@@ -244,7 +245,7 @@ struct thread_struct {
  *               goes into MSR_IA32_DS_AREA */
 	unsigned long	ds_area_msr;
 /* cached TLS descriptors. */
-	u64 tls_array[GDT_ENTRY_TLS_ENTRIES];
+	struct desc_struct tls_array[GDT_ENTRY_TLS_ENTRIES];
 } __attribute__((aligned(16)));
 
 #define INIT_THREAD  { \