4 files changed, 9 insertions, 4 deletions

diff --git a/arch/um/kernel/exec_kern.c b/arch/um/kernel/exec_kern.c
index 569fe8b9b053..c264e1c05ab3 100644
--- a/arch/um/kernel/exec_kern.c
+++ b/arch/um/kernel/exec_kern.c
@@ -33,7 +33,7 @@ void start_thread(struct pt_regs *regs, unsigned long eip, unsigned long esp)
 extern void log_exec(char **argv, void *tty);
 
 static long execve1(char *file, char __user * __user *argv,
-                    char *__user __user *env)
+                    char __user *__user *env)
 {
         long error;
 
diff --git a/arch/um/kernel/physmem.c b/arch/um/kernel/physmem.c
index f3b583a878a6..544665e04513 100644
--- a/arch/um/kernel/physmem.c
+++ b/arch/um/kernel/physmem.c
@@ -265,7 +265,7 @@ int init_maps(unsigned long physmem, unsigned long iomem, unsigned long highmem)
         highmem_len = highmem_pages * sizeof(struct page);
 
         total_pages = phys_pages + iomem_pages + highmem_pages;
-        total_len = phys_len + iomem_pages + highmem_len;
+        total_len = phys_len + iomem_len + highmem_len;
 
         if(kmalloc_ok){
                 map = kmalloc(total_len, GFP_KERNEL);
diff --git a/arch/um/kernel/reboot.c b/arch/um/kernel/reboot.c
index 6f1a3a288117..3ef73bf2e781 100644
--- a/arch/um/kernel/reboot.c
+++ b/arch/um/kernel/reboot.c
@@ -5,6 +5,7 @@
 
 #include "linux/module.h"
 #include "linux/sched.h"
+#include "asm/smp.h"
 #include "user_util.h"
 #include "kern_util.h"
 #include "kern.h"
diff --git a/arch/um/kernel/tt/syscall_kern.c b/arch/um/kernel/tt/syscall_kern.c
index 3d29c90514cc..3fda9a03c59a 100644
--- a/arch/um/kernel/tt/syscall_kern.c
+++ b/arch/um/kernel/tt/syscall_kern.c
@@ -23,16 +23,20 @@ void syscall_handler_tt(int sig, struct pt_regs *regs)
         int syscall;
 #ifdef CONFIG_SYSCALL_DEBUG
         int index;
-        index = record_syscall_start(syscall);
 #endif
         sc = UPT_SC(&regs->regs);
         SC_START_SYSCALL(sc);
 
+        syscall = UPT_SYSCALL_NR(&regs->regs);
+
+#ifdef CONFIG_SYSCALL_DEBUG
+        index = record_syscall_start(syscall);
+#endif
+
         syscall_trace(&regs->regs, 0);
 
         current->thread.nsyscalls++;
         nsyscalls++;
-        syscall = UPT_SYSCALL_NR(&regs->regs);
 
         if((syscall >= NR_syscalls) || (syscall < 0))
                 result = -ENOSYS;