2 files changed, 9 insertions, 5 deletions

diff --git a/arch/i386/kernel/ldt.c b/arch/i386/kernel/ldt.c
index bb50afbee921..fe1ffa55587d 100644
--- a/arch/i386/kernel/ldt.c
+++ b/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/include/asm-i386/desc.h b/include/asm-i386/desc.h
index ccb11c032839..6df1a53c190e 100644
--- a/include/asm-i386/desc.h
+++ b/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