3 files changed, 32 insertions, 46 deletions

diff --git a/arch/um/kernel/ksyms.c b/arch/um/kernel/ksyms.c
index 7c7142ba3bd7..f0ced9840a27 100644
--- a/arch/um/kernel/ksyms.c
+++ b/arch/um/kernel/ksyms.c
@@ -26,7 +26,6 @@ EXPORT_SYMBOL(get_kmem_end);
 
 EXPORT_SYMBOL(high_physmem);
 EXPORT_SYMBOL(empty_zero_page);
-EXPORT_SYMBOL(um_virt_to_phys);
 EXPORT_SYMBOL(handle_page_fault);
 EXPORT_SYMBOL(find_iomem);
 
diff --git a/arch/um/kernel/process.c b/arch/um/kernel/process.c
index 62a4e0e12c9c..541a2bf331c5 100644
--- a/arch/um/kernel/process.c
+++ b/arch/um/kernel/process.c
@@ -255,49 +255,6 @@ void cpu_idle(void)
         default_idle();
 }
 
-void *um_virt_to_phys(struct task_struct *task, unsigned long addr,
-                      pte_t *pte_out)
-{
-        pgd_t *pgd;
-        pud_t *pud;
-        pmd_t *pmd;
-        pte_t *pte;
-        pte_t ptent;
-
-        if (task->mm == NULL)
-                return ERR_PTR(-EINVAL);
-        pgd = pgd_offset(task->mm, addr);
-        if (!pgd_present(*pgd))
-                return ERR_PTR(-EINVAL);
-
-        pud = pud_offset(pgd, addr);
-        if (!pud_present(*pud))
-                return ERR_PTR(-EINVAL);
-
-        pmd = pmd_offset(pud, addr);
-        if (!pmd_present(*pmd))
-                return ERR_PTR(-EINVAL);
-
-        pte = pte_offset_kernel(pmd, addr);
-        ptent = *pte;
-        if (!pte_present(ptent))
-                return ERR_PTR(-EINVAL);
-
-        if (pte_out != NULL)
-                *pte_out = ptent;
-        return (void *) (pte_val(ptent) & PAGE_MASK) + (addr & ~PAGE_MASK);
-}
-
-char *current_cmd(void)
-{
-#if defined(CONFIG_SMP) || defined(CONFIG_HIGHMEM)
-        return "(Unknown)";
-#else
-        void *addr = um_virt_to_phys(current, current->mm->arg_start, NULL);
-        return IS_ERR(addr) ? "(Unknown)": __va((unsigned long) addr);
-#endif
-}
-
 void dump_thread(struct pt_regs *regs, struct user *u)
 {
 }
diff --git a/arch/um/kernel/skas/uaccess.c b/arch/um/kernel/skas/uaccess.c
index 1d8b119f2d0e..302425b03d49 100644
--- a/arch/um/kernel/skas/uaccess.c
+++ b/arch/um/kernel/skas/uaccess.c
@@ -12,8 +12,38 @@
 #include "kern_util.h"
 #include "os.h"
 
-extern void *um_virt_to_phys(struct task_struct *task, unsigned long addr,
-                             pte_t *pte_out);
+static void *um_virt_to_phys(struct task_struct *task, unsigned long addr,
+                             pte_t *pte_out)
+{
+        pgd_t *pgd;
+        pud_t *pud;
+        pmd_t *pmd;
+        pte_t *pte;
+        pte_t ptent;
+
+        if (task->mm == NULL)
+                return ERR_PTR(-EINVAL);
+        pgd = pgd_offset(task->mm, addr);
+        if (!pgd_present(*pgd))
+                return ERR_PTR(-EINVAL);
+
+        pud = pud_offset(pgd, addr);
+        if (!pud_present(*pud))
+                return ERR_PTR(-EINVAL);
+
+        pmd = pmd_offset(pud, addr);
+        if (!pmd_present(*pmd))
+                return ERR_PTR(-EINVAL);
+
+        pte = pte_offset_kernel(pmd, addr);
+        ptent = *pte;
+        if (!pte_present(ptent))
+                return ERR_PTR(-EINVAL);
+
+        if (pte_out != NULL)
+                *pte_out = ptent;
+        return (void *) (pte_val(ptent) & PAGE_MASK) + (addr & ~PAGE_MASK);
+}
 
 static unsigned long maybe_map(unsigned long virt, int is_write)
 {