From bf7f07509dff80f1b5843d9092cbedaa9d2e91c3 Mon Sep 17 00:00:00 2001
From: Zachary Amsden <zach@vmware.com>
Date: Sat, 3 Sep 2005 15:56:47 -0700
Subject: [PATCH] --- yaml --- r: 6987 b: refs/heads/master c:
 f2f30ebca6c0c95e987cb9a1fd1495770a75432e h: refs/heads/master i:   6985:
 f1e88e5c9c24f04e49538e960ad3aba8a29abc16   6983:
 0026af6e9e681d79ac9532eb28e38066ad1b7549 v: v3

---
 [refs]                        | 2 +-
 trunk/arch/i386/kernel/ldt.c  | 7 ++-----
 trunk/include/asm-i386/desc.h | 7 +++++++
 3 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/[refs] b/[refs]
index a90585d578ae..954121948134 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e9f86e351fda5b3c40192fc3990453613f160779
+refs/heads/master: f2f30ebca6c0c95e987cb9a1fd1495770a75432e
diff --git a/trunk/arch/i386/kernel/ldt.c b/trunk/arch/i386/kernel/ldt.c
index bb50afbee921..fe1ffa55587d 100644
--- a/trunk/arch/i386/kernel/ldt.c
+++ b/trunk/arch/i386/kernel/ldt.c
@@ -177,7 +177,7 @@ static int read_default_ldt(void __user * ptr, unsigned long bytecount)
 static int write_ldt(void __user * ptr, unsigned long bytecount, int oldmode)
 {
 	struct mm_struct * mm = current->mm;
-	__u32 entry_1, entry_2, *lp;
+	__u32 entry_1, entry_2;
 	int error;
 	struct user_desc ldt_info;
 
@@ -205,8 +205,6 @@ static int write_ldt(void __user * ptr, unsigned long bytecount, int oldmode)
 			goto out_unlock;
 	}
 
-	lp = (__u32 *) ((ldt_info.entry_number << 3) + (char *) mm->context.ldt);
-
    	/* Allow LDTs to be cleared by the user. */
    	if (ldt_info.base_addr == 0 && ldt_info.limit == 0) {
 		if (oldmode || LDT_empty(&ldt_info)) {
@@ -223,8 +221,7 @@ static int write_ldt(void __user * ptr, unsigned long bytecount, int oldmode)
 
 	/* Install the new entry ...  */
 install:
-	*lp	= entry_1;
-	*(lp+1)	= entry_2;
+	write_ldt_entry(mm->context.ldt, ldt_info.entry_number, entry_1, entry_2);
 	error = 0;
 
 out_unlock:
diff --git a/trunk/include/asm-i386/desc.h b/trunk/include/asm-i386/desc.h
index ccb11c032839..6df1a53c190e 100644
--- a/trunk/include/asm-i386/desc.h
+++ b/trunk/include/asm-i386/desc.h
@@ -96,6 +96,13 @@ static inline void set_ldt_desc(unsigned int cpu, void *addr, unsigned int size)
 	(info)->seg_not_present	== 1	&& \
 	(info)->useable		== 0	)
 
+static inline void write_ldt_entry(void *ldt, int entry, __u32 entry_a, __u32 entry_b)
+{
+	__u32 *lp = (__u32 *)((char *)ldt + entry*8);
+	*lp = entry_a;
+	*(lp+1) = entry_b;
+}
+
 #if TLS_SIZE != 24
 # error update this code.
 #endif