---

yaml --- r: 53801 b: refs/heads/master c: eab0c72 h: refs/heads/master i: 53799: 99a9d67 v: v3
git-mirror · May 2, 2007 · 01f2b5f · 01f2b5f
1 parent 84b8f69
commit 01f2b5f
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 8 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 692174b97d5b871f4b0f648b1fb17aa37b955876
+refs/heads/master: eab0c72aecd7982b2c848f7d493ba379efcef15e
diff --git a/trunk/include/asm-x86_64/desc.h b/trunk/include/asm-x86_64/desc.h
@@ -135,16 +135,13 @@ static inline void set_ldt_desc(unsigned cpu, void *addr, int size)
 	(info)->useable		== 0	&& \
 	(info)->lm		== 0)
 
-#if TLS_SIZE != 24
-# error update this code.
-#endif
-
 static inline void load_TLS(struct thread_struct *t, unsigned int cpu)
 {
+	unsigned int i;
 	u64 *gdt = (u64 *)(cpu_gdt(cpu) + GDT_ENTRY_TLS_MIN);
-	gdt[0] = t->tls_array[0];
-	gdt[1] = t->tls_array[1];
-	gdt[2] = t->tls_array[2];
+
+	for (i = 0; i < GDT_ENTRY_TLS_ENTRIES; i++)
+		gdt[i] = t->tls_array[i];
 } 
 
 /*