Patched in Tegra support.

5 files changed, 52 insertions, 43 deletions

diff --git a/arch/um/kernel/skas/clone.c b/arch/um/kernel/skas/clone.c
index 289771dadf8..2c8583c1a34 100644
--- a/arch/um/kernel/skas/clone.c
+++ b/arch/um/kernel/skas/clone.c
@@ -7,10 +7,11 @@
 #include <sched.h>
 #include <asm/unistd.h>
 #include <sys/time.h>
-#include <as-layout.h>
-#include <ptrace_user.h>
-#include <stub-data.h>
-#include <sysdep/stub.h>
+#include "as-layout.h"
+#include "kern_constants.h"
+#include "ptrace_user.h"
+#include "stub-data.h"
+#include "sysdep/stub.h"
 
 /*
  * This is in a separate file because it needs to be compiled with any
diff --git a/arch/um/kernel/skas/mmu.c b/arch/um/kernel/skas/mmu.c
index ff03067a3b1..1aee587e9c5 100644
--- a/arch/um/kernel/skas/mmu.c
+++ b/arch/um/kernel/skas/mmu.c
@@ -3,14 +3,14 @@
  * Licensed under the GPL
  */
 
-#include <linux/mm.h>
-#include <linux/sched.h>
-#include <linux/slab.h>
-#include <asm/pgalloc.h>
-#include <asm/pgtable.h>
-#include <as-layout.h>
-#include <os.h>
-#include <skas.h>
+#include "linux/mm.h"
+#include "linux/sched.h"
+#include "linux/slab.h"
+#include "asm/pgalloc.h"
+#include "asm/pgtable.h"
+#include "as-layout.h"
+#include "os.h"
+#include "skas.h"
 
 extern int __syscall_stub_start;
 
@@ -92,6 +92,8 @@ int init_new_context(struct task_struct *task, struct mm_struct *mm)
                 goto out_free;
         }
 
+        to_mm->stub_pages = NULL;
+
         return 0;
 
  out_free:
@@ -101,8 +103,9 @@ int init_new_context(struct task_struct *task, struct mm_struct *mm)
         return ret;
 }
 
-void uml_setup_stubs(struct mm_struct *mm)
+void arch_dup_mmap(struct mm_struct *oldmm, struct mm_struct *mm)
 {
+        struct page **pages;
         int err, ret;
 
         if (!skas_needs_stub)
@@ -117,20 +120,29 @@ void uml_setup_stubs(struct mm_struct *mm)
         if (ret)
                 goto out;
 
-        mm->context.stub_pages[0] = virt_to_page(&__syscall_stub_start);
-        mm->context.stub_pages[1] = virt_to_page(mm->context.id.stack);
+        pages = kmalloc(2 * sizeof(struct page *), GFP_KERNEL);
+        if (pages == NULL) {
+                printk(KERN_ERR "arch_dup_mmap failed to allocate 2 page "
+                       "pointers\n");
+                goto out;
+        }
+
+        pages[0] = virt_to_page(&__syscall_stub_start);
+        pages[1] = virt_to_page(mm->context.id.stack);
+        mm->context.stub_pages = pages;
 
         /* dup_mmap already holds mmap_sem */
         err = install_special_mapping(mm, STUB_START, STUB_END - STUB_START,
                                       VM_READ | VM_MAYREAD | VM_EXEC |
-                                      VM_MAYEXEC | VM_DONTCOPY,
-                                      mm->context.stub_pages);
+                                      VM_MAYEXEC | VM_DONTCOPY, pages);
         if (err) {
                 printk(KERN_ERR "install_special_mapping returned %d\n", err);
-                goto out;
+                goto out_free;
         }
         return;
 
+out_free:
+        kfree(pages);
 out:
         force_sigsegv(SIGSEGV, current);
 }
@@ -139,6 +151,8 @@ void arch_exit_mmap(struct mm_struct *mm)
 {
         pte_t *pte;
 
+        if (mm->context.stub_pages != NULL)
+                kfree(mm->context.stub_pages);
         pte = virt_to_pte(mm, STUB_CODE);
         if (pte != NULL)
                 pte_clear(mm, STUB_CODE, pte);
diff --git a/arch/um/kernel/skas/process.c b/arch/um/kernel/skas/process.c
index 4da11b3c8dd..2e9852c0d48 100644
--- a/arch/um/kernel/skas/process.c
+++ b/arch/um/kernel/skas/process.c
@@ -3,12 +3,12 @@
  * Licensed under the GPL
  */
 
-#include <linux/init.h>
-#include <linux/sched.h>
-#include <as-layout.h>
-#include <kern.h>
-#include <os.h>
-#include <skas.h>
+#include "linux/init.h"
+#include "linux/sched.h"
+#include "as-layout.h"
+#include "kern.h"
+#include "os.h"
+#include "skas.h"
 
 int new_mm(unsigned long stack)
 {
@@ -41,7 +41,7 @@ static int __init start_kernel_proc(void *unused)
         cpu_tasks[0].pid = pid;
         cpu_tasks[0].task = current;
 #ifdef CONFIG_SMP
-        init_cpu_online(get_cpu_mask(0));
+        cpu_online_map = cpumask_of_cpu(0);
 #endif
         start_kernel();
         return 0;
diff --git a/arch/um/kernel/skas/syscall.c b/arch/um/kernel/skas/syscall.c
index c0681e09743..f5173e1ec3a 100644
--- a/arch/um/kernel/skas/syscall.c
+++ b/arch/um/kernel/skas/syscall.c
@@ -3,11 +3,11 @@
  * Licensed under the GPL
  */
 
-#include <linux/kernel.h>
-#include <linux/ptrace.h>
-#include <kern_util.h>
-#include <sysdep/ptrace.h>
-#include <sysdep/syscalls.h>
+#include "linux/kernel.h"
+#include "linux/ptrace.h"
+#include "kern_util.h"
+#include "sysdep/ptrace.h"
+#include "sysdep/syscalls.h"
 
 extern int syscall_table_size;
 #define NR_SYSCALLS (syscall_table_size / sizeof(void *))
@@ -18,7 +18,7 @@ void handle_syscall(struct uml_pt_regs *r)
         long result;
         int syscall;
 
-        syscall_trace_enter(regs);
+        syscall_trace(r, 0);
 
         /*
          * This should go in the declaration of syscall, but when I do that,
@@ -34,7 +34,7 @@ void handle_syscall(struct uml_pt_regs *r)
                 result = -ENOSYS;
         else result = EXECUTE_SYSCALL(syscall, regs);
 
-        PT_REGS_SET_SYSCALL_RETURN(regs, result);
+        REGS_SET_SYSCALL_RETURN(r->gp, result);
 
-        syscall_trace_leave(regs);
+        syscall_trace(r, 1);
 }
diff --git a/arch/um/kernel/skas/uaccess.c b/arch/um/kernel/skas/uaccess.c
index 1d3e0c17340..696634214dc 100644
--- a/arch/um/kernel/skas/uaccess.c
+++ b/arch/um/kernel/skas/uaccess.c
@@ -6,13 +6,12 @@
 #include <linux/err.h>
 #include <linux/highmem.h>
 #include <linux/mm.h>
-#include <linux/module.h>
 #include <linux/sched.h>
 #include <asm/current.h>
 #include <asm/page.h>
 #include <asm/pgtable.h>
-#include <kern_util.h>
-#include <os.h>
+#include "kern_util.h"
+#include "os.h"
 
 pte_t *virt_to_pte(struct mm_struct *mm, unsigned long addr)
 {
@@ -69,7 +68,7 @@ static int do_op_one_page(unsigned long addr, int len, int is_write,
                 return -1;
 
         page = pte_page(*pte);
-        addr = (unsigned long) kmap_atomic(page) +
+        addr = (unsigned long) kmap_atomic(page, KM_UML_USERCOPY) +
                 (addr & ~PAGE_MASK);
 
         current->thread.fault_catcher = &buf;
@@ -82,7 +81,7 @@ static int do_op_one_page(unsigned long addr, int len, int is_write,
 
         current->thread.fault_catcher = NULL;
 
-        kunmap_atomic((void *)addr);
+        kunmap_atomic((void *)addr, KM_UML_USERCOPY);
 
         return n;
 }
@@ -150,7 +149,6 @@ int copy_from_user(void *to, const void __user *from, int n)
                buffer_op((unsigned long) from, n, 0, copy_chunk_from_user, &to):
                n;
 }
-EXPORT_SYMBOL(copy_from_user);
 
 static int copy_chunk_to_user(unsigned long to, int len, void *arg)
 {
@@ -172,7 +170,6 @@ int copy_to_user(void __user *to, const void *from, int n)
                buffer_op((unsigned long) to, n, 1, copy_chunk_to_user, &from) :
                n;
 }
-EXPORT_SYMBOL(copy_to_user);
 
 static int strncpy_chunk_from_user(unsigned long from, int len, void *arg)
 {
@@ -207,7 +204,6 @@ int strncpy_from_user(char *dst, const char __user *src, int count)
                 return -EFAULT;
         return strnlen(dst, count);
 }
-EXPORT_SYMBOL(strncpy_from_user);
 
 static int clear_chunk(unsigned long addr, int len, void *unused)
 {
@@ -230,7 +226,6 @@ int clear_user(void __user *mem, int len)
         return access_ok(VERIFY_WRITE, mem, len) ?
                buffer_op((unsigned long) mem, len, 1, clear_chunk, NULL) : len;
 }
-EXPORT_SYMBOL(clear_user);
 
 static int strnlen_chunk(unsigned long str, int len, void *arg)
 {
@@ -256,4 +251,3 @@ int strnlen_user(const void __user *str, int len)
                 return count + 1;
         return -EFAULT;
 }
-EXPORT_SYMBOL(strnlen_user);