Merge branch 'master'

3 files changed, 27 insertions, 21 deletions

diff --git a/arch/um/sys-i386/Makefile b/arch/um/sys-i386/Makefile
index 6dfeb70f6957..150059dbee12 100644
--- a/arch/um/sys-i386/Makefile
+++ b/arch/um/sys-i386/Makefile
@@ -5,7 +5,7 @@ obj-y = bitops.o bugs.o checksum.o delay.o fault.o ksyms.o ldt.o ptrace.o \
 obj-$(CONFIG_HIGHMEM) += highmem.o
 obj-$(CONFIG_MODULES) += module.o
 
-USER_OBJS := bugs.o ptrace_user.o sigcontext.o fault.o
+USER_OBJS := bugs.o ptrace_user.o sigcontext.o fault.o stub_segv.o
 
 SYMLINKS = bitops.c semaphore.c highmem.c module.c
 
diff --git a/arch/um/sys-i386/ldt.c b/arch/um/sys-i386/ldt.c
index 6360f1c958d0..17746b4c08ff 100644
--- a/arch/um/sys-i386/ldt.c
+++ b/arch/um/sys-i386/ldt.c
@@ -228,7 +228,7 @@ static int read_ldt(void __user * ptr, unsigned long bytecount)
                 size = LDT_ENTRY_SIZE*LDT_DIRECT_ENTRIES;
                 if(size > bytecount)
                         size = bytecount;
-                if(copy_to_user(ptr, ldt->entries, size))
+                if(copy_to_user(ptr, ldt->u.entries, size))
                         err = -EFAULT;
                 bytecount -= size;
                 ptr += size;
@@ -239,7 +239,7 @@ static int read_ldt(void __user * ptr, unsigned long bytecount)
                         size = PAGE_SIZE;
                         if(size > bytecount)
                                 size = bytecount;
-                        if(copy_to_user(ptr, ldt->pages[i], size)){
+                        if(copy_to_user(ptr, ldt->u.pages[i], size)){
                                 err = -EFAULT;
                                 break;
                         }
@@ -321,10 +321,11 @@ static int write_ldt(void __user * ptr, unsigned long bytecount, int func)
                     i*LDT_ENTRIES_PER_PAGE <= ldt_info.entry_number;
                     i++){
                         if(i == 0)
-                                memcpy(&entry0, ldt->entries, sizeof(entry0));
-                        ldt->pages[i] = (struct ldt_entry *)
-                                        __get_free_page(GFP_KERNEL|__GFP_ZERO);
-                        if(!ldt->pages[i]){
+                                memcpy(&entry0, ldt->u.entries,
+                                       sizeof(entry0));
+                        ldt->u.pages[i] = (struct ldt_entry *)
+                                __get_free_page(GFP_KERNEL|__GFP_ZERO);
+                        if(!ldt->u.pages[i]){
                                 err = -ENOMEM;
                                 /* Undo the change in host */
                                 memset(&ldt_info, 0, sizeof(ldt_info));
@@ -332,8 +333,9 @@ static int write_ldt(void __user * ptr, unsigned long bytecount, int func)
                                 goto out_unlock;
                         }
                         if(i == 0) {
-                                memcpy(ldt->pages[0], &entry0, sizeof(entry0));
-                                memcpy(ldt->pages[0]+1, ldt->entries+1,
+                                memcpy(ldt->u.pages[0], &entry0,
+                                       sizeof(entry0));
+                                memcpy(ldt->u.pages[0]+1, ldt->u.entries+1,
                                        sizeof(entry0)*(LDT_DIRECT_ENTRIES-1));
                         }
                         ldt->entry_count = (i + 1) * LDT_ENTRIES_PER_PAGE;
@@ -343,9 +345,9 @@ static int write_ldt(void __user * ptr, unsigned long bytecount, int func)
                 ldt->entry_count = ldt_info.entry_number + 1;
 
         if(ldt->entry_count <= LDT_DIRECT_ENTRIES)
-                ldt_p = ldt->entries + ldt_info.entry_number;
+                ldt_p = ldt->u.entries + ldt_info.entry_number;
         else
-                ldt_p = ldt->pages[ldt_info.entry_number/LDT_ENTRIES_PER_PAGE] +
+                ldt_p = ldt->u.pages[ldt_info.entry_number/LDT_ENTRIES_PER_PAGE] +
                         ldt_info.entry_number%LDT_ENTRIES_PER_PAGE;
 
         if(ldt_info.base_addr == 0 && ldt_info.limit == 0 &&
@@ -501,8 +503,8 @@ long init_new_ldt(struct mmu_context_skas * new_mm,
                  */
                 down(&from_mm->ldt.semaphore);
                 if(from_mm->ldt.entry_count <= LDT_DIRECT_ENTRIES){
-                        memcpy(new_mm->ldt.entries, from_mm->ldt.entries,
-                               sizeof(new_mm->ldt.entries));
+                        memcpy(new_mm->ldt.u.entries, from_mm->ldt.u.entries,
+                               sizeof(new_mm->ldt.u.entries));
                 }
                 else{
                         i = from_mm->ldt.entry_count / LDT_ENTRIES_PER_PAGE;
@@ -512,9 +514,10 @@ long init_new_ldt(struct mmu_context_skas * new_mm,
                                         err = -ENOMEM;
                                         break;
                                 }
-                                new_mm->ldt.pages[i] = (struct ldt_entry*)page;
-                                memcpy(new_mm->ldt.pages[i],
-                                       from_mm->ldt.pages[i], PAGE_SIZE);
+                                new_mm->ldt.u.pages[i] =
+                                        (struct ldt_entry *) page;
+                                memcpy(new_mm->ldt.u.pages[i],
+                                       from_mm->ldt.u.pages[i], PAGE_SIZE);
                         }
                 }
                 new_mm->ldt.entry_count = from_mm->ldt.entry_count;
@@ -532,7 +535,7 @@ void free_ldt(struct mmu_context_skas * mm)
         if(!ptrace_ldt && mm->ldt.entry_count > LDT_DIRECT_ENTRIES){
                 i = mm->ldt.entry_count / LDT_ENTRIES_PER_PAGE;
                 while(i-- > 0){
-                        free_page((long )mm->ldt.pages[i]);
+                        free_page((long )mm->ldt.u.pages[i]);
                 }
         }
         mm->ldt.entry_count = 0;
diff --git a/arch/um/sys-i386/stub_segv.c b/arch/um/sys-i386/stub_segv.c
index 1e88b275edac..a37f672ec964 100644
--- a/arch/um/sys-i386/stub_segv.c
+++ b/arch/um/sys-i386/stub_segv.c
@@ -3,9 +3,11 @@
  * Licensed under the GPL
  */
 
-#include <asm/signal.h>
+#include <signal.h>
+#include <sys/select.h> /* The only way I can see to get sigset_t */
 #include <asm/unistd.h>
 #include "uml-config.h"
+#include "sysdep/stub.h"
 #include "sysdep/sigcontext.h"
 #include "sysdep/faultinfo.h"
 
@@ -13,13 +15,14 @@ void __attribute__ ((__section__ (".__syscall_stub")))
 stub_segv_handler(int sig)
 {
         struct sigcontext *sc = (struct sigcontext *) (&sig + 1);
+        int pid;
 
         GET_FAULTINFO_FROM_SC(*((struct faultinfo *) UML_CONFIG_STUB_DATA),
                               sc);
 
-        __asm__("movl %0, %%eax ; int $0x80": : "g" (__NR_getpid));
-        __asm__("movl %%eax, %%ebx ; movl %0, %%eax ; movl %1, %%ecx ;"
-                "int $0x80": : "g" (__NR_kill), "g" (SIGUSR1));
+        pid = stub_syscall0(__NR_getpid);
+        stub_syscall2(__NR_kill, pid, SIGUSR1);
+
         /* Load pointer to sigcontext into esp, since we need to leave
          * the stack in its original form when we do the sigreturn here, by
          * hand.