5 files changed, 68 insertions, 9 deletions

diff --git a/arch/um/sys-i386/Makefile b/arch/um/sys-i386/Makefile
index 374d61a19439..59cc70275754 100644
--- a/arch/um/sys-i386/Makefile
+++ b/arch/um/sys-i386/Makefile
@@ -1,5 +1,5 @@
 obj-y = bugs.o checksum.o delay.o fault.o ksyms.o ldt.o ptrace.o \
-        ptrace_user.o signal.o sigcontext.o syscalls.o sysrq.o \
+        ptrace_user.o setjmp.o signal.o sigcontext.o syscalls.o sysrq.o \
         sys_call_table.o tls.o
 
 obj-$(CONFIG_MODE_SKAS) += stub.o stub_segv.o
diff --git a/arch/um/sys-i386/bugs.c b/arch/um/sys-i386/bugs.c
index 41b0ab2fe830..f1bcd399ac90 100644
--- a/arch/um/sys-i386/bugs.c
+++ b/arch/um/sys-i386/bugs.c
@@ -13,6 +13,7 @@
 #include "sysdep/ptrace.h"
 #include "task.h"
 #include "os.h"
+#include "user_util.h"
 
 #define MAXTOKEN 64
 
@@ -104,17 +105,17 @@ int cpu_feature(char *what, char *buf, int len)
 static int check_cpu_flag(char *feature, int *have_it)
 {
         char buf[MAXTOKEN], c;
-        int fd, len = sizeof(buf)/sizeof(buf[0]);
+        int fd, len = ARRAY_SIZE(buf);
 
         printk("Checking for host processor %s support...", feature);
         fd = os_open_file("/proc/cpuinfo", of_read(OPENFLAGS()), 0);
         if(fd < 0){
                 printk("Couldn't open /proc/cpuinfo, err = %d\n", -fd);
-                return(0);
+                return 0;
         }
 
         *have_it = 0;
-        if(!find_cpuinfo_line(fd, "flags", buf, sizeof(buf) / sizeof(buf[0])))
+        if(!find_cpuinfo_line(fd, "flags", buf, ARRAY_SIZE(buf)))
                 goto out;
 
         c = token(fd, buf, len - 1, ' ');
@@ -138,7 +139,7 @@ static int check_cpu_flag(char *feature, int *have_it)
         if(*have_it == 0) printk("No\n");
         else if(*have_it == 1) printk("Yes\n");
         os_close_file(fd);
-        return(1);
+        return 1;
 }
 
 #if 0 /* This doesn't work in tt mode, plus it's causing compilation problems
diff --git a/arch/um/sys-i386/ldt.c b/arch/um/sys-i386/ldt.c
index fe0877b3509c..69971b78beaf 100644
--- a/arch/um/sys-i386/ldt.c
+++ b/arch/um/sys-i386/ldt.c
@@ -424,9 +424,8 @@ void ldt_get_host_info(void)
                         size++;
         }
 
-        if(size < sizeof(dummy_list)/sizeof(dummy_list[0])) {
+        if(size < ARRAY_SIZE(dummy_list))
                 host_ldt_entries = dummy_list;
-        }
         else {
                 size = (size + 1) * sizeof(dummy_list[0]);
                 host_ldt_entries = (short *)kmalloc(size, GFP_KERNEL);
diff --git a/arch/um/sys-i386/ptrace_user.c b/arch/um/sys-i386/ptrace_user.c
index 40aa88531446..5f3cc6685820 100644
--- a/arch/um/sys-i386/ptrace_user.c
+++ b/arch/um/sys-i386/ptrace_user.c
@@ -15,6 +15,7 @@
 #include "user.h"
 #include "os.h"
 #include "uml-config.h"
+#include "user_util.h"
 
 int ptrace_getregs(long pid, unsigned long *regs_out)
 {
@@ -51,7 +52,7 @@ static void write_debugregs(int pid, unsigned long *regs)
         int nregs, i;
 
         dummy = NULL;
-        nregs = sizeof(dummy->u_debugreg)/sizeof(dummy->u_debugreg[0]);
+        nregs = ARRAY_SIZE(dummy->u_debugreg);
         for(i = 0; i < nregs; i++){
                 if((i == 4) || (i == 5)) continue;
                 if(ptrace(PTRACE_POKEUSR, pid, &dummy->u_debugreg[i],
@@ -68,7 +69,7 @@ static void read_debugregs(int pid, unsigned long *regs)
         int nregs, i;
 
         dummy = NULL;
-        nregs = sizeof(dummy->u_debugreg)/sizeof(dummy->u_debugreg[0]);
+        nregs = ARRAY_SIZE(dummy->u_debugreg);
         for(i = 0; i < nregs; i++){
                 regs[i] = ptrace(PTRACE_PEEKUSR, pid,
                                  &dummy->u_debugreg[i], 0);
diff --git a/arch/um/sys-i386/setjmp.S b/arch/um/sys-i386/setjmp.S
new file mode 100644
index 000000000000..b766792c9933
--- /dev/null
+++ b/arch/um/sys-i386/setjmp.S
@@ -0,0 +1,58 @@
+#
+# arch/i386/setjmp.S
+#
+# setjmp/longjmp for the i386 architecture
+#
+
+#
+# The jmp_buf is assumed to contain the following, in order:
+#       %ebx
+#       %esp
+#       %ebp
+#       %esi
+#       %edi
+#       <return address>
+#
+
+        .text
+        .align 4
+        .globl setjmp
+        .type setjmp, @function
+setjmp:
+#ifdef _REGPARM
+        movl %eax,%edx
+#else
+        movl 4(%esp),%edx
+#endif
+        popl %ecx                       # Return address, and adjust the stack
+        xorl %eax,%eax                  # Return value
+        movl %ebx,(%edx)
+        movl %esp,4(%edx)               # Post-return %esp!
+        pushl %ecx                      # Make the call/return stack happy
+        movl %ebp,8(%edx)
+        movl %esi,12(%edx)
+        movl %edi,16(%edx)
+        movl %ecx,20(%edx)              # Return address
+        ret
+
+        .size setjmp,.-setjmp
+
+        .text
+        .align 4
+        .globl longjmp
+        .type longjmp, @function
+longjmp:
+#ifdef _REGPARM
+        xchgl %eax,%edx
+#else
+        movl 4(%esp),%edx               # jmp_ptr address
+        movl 8(%esp),%eax               # Return value
+#endif
+        movl (%edx),%ebx
+        movl 4(%edx),%esp
+        movl 8(%edx),%ebp
+        movl 12(%edx),%esi
+        movl 16(%edx),%edi
+        jmp *20(%edx)
+
+        .size longjmp,.-longjmp