Patched in Tegra support.

1 files changed, 16 insertions, 94 deletions

diff --git a/mm/util.c b/mm/util.c
index c55e26b17d9..88ea1bd661c 100644
--- a/mm/util.c
+++ b/mm/util.c
@@ -1,10 +1,9 @@
 #include <linux/mm.h>
 #include <linux/slab.h>
 #include <linux/string.h>
-#include <linux/export.h>
+#include <linux/module.h>
 #include <linux/err.h>
 #include <linux/sched.h>
-#include <linux/security.h>
 #include <asm/uaccess.h>
 
 #include "internal.h"
@@ -105,25 +104,6 @@ void *memdup_user(const void __user *src, size_t len)
 }
 EXPORT_SYMBOL(memdup_user);
 
-static __always_inline void *__do_krealloc(const void *p, size_t new_size,
-                                           gfp_t flags)
-{
-        void *ret;
-        size_t ks = 0;
-
-        if (p)
-                ks = ksize(p);
-
-        if (ks >= new_size)
-                return (void *)p;
-
-        ret = kmalloc_track_caller(new_size, flags);
-        if (ret && p)
-                memcpy(ret, p, ks);
-
-        return ret;
-}
-
 /**
  * __krealloc - like krealloc() but don't free @p.
  * @p: object to reallocate memory for.
@@ -136,11 +116,23 @@ static __always_inline void *__do_krealloc(const void *p, size_t new_size,
  */
 void *__krealloc(const void *p, size_t new_size, gfp_t flags)
 {
+        void *ret;
+        size_t ks = 0;
+
         if (unlikely(!new_size))
                 return ZERO_SIZE_PTR;
 
-        return __do_krealloc(p, new_size, flags);
+        if (p)
+                ks = ksize(p);
+
+        if (ks >= new_size)
+                return (void *)p;
+
+        ret = kmalloc_track_caller(new_size, flags);
+        if (ret && p)
+                memcpy(ret, p, ks);
 
+        return ret;
 }
 EXPORT_SYMBOL(__krealloc);
 
@@ -152,7 +144,7 @@ EXPORT_SYMBOL(__krealloc);
  *
  * The contents of the object pointed to are preserved up to the
  * lesser of the new and old sizes.  If @p is %NULL, krealloc()
- * behaves exactly like kmalloc().  If @new_size is 0 and @p is not a
+ * behaves exactly like kmalloc().  If @size is 0 and @p is not a
  * %NULL pointer, the object pointed to is freed.
  */
 void *krealloc(const void *p, size_t new_size, gfp_t flags)
@@ -164,7 +156,7 @@ void *krealloc(const void *p, size_t new_size, gfp_t flags)
                 return ZERO_SIZE_PTR;
         }
 
-        ret = __do_krealloc(p, new_size, flags);
+        ret = __krealloc(p, new_size, flags);
         if (ret && p != ret)
                 kfree(p);
 
@@ -247,47 +239,6 @@ void __vma_link_list(struct mm_struct *mm, struct vm_area_struct *vma,
                 next->vm_prev = vma;
 }
 
-/* Check if the vma is being used as a stack by this task */
-static int vm_is_stack_for_task(struct task_struct *t,
-                                struct vm_area_struct *vma)
-{
-        return (vma->vm_start <= KSTK_ESP(t) && vma->vm_end >= KSTK_ESP(t));
-}
-
-/*
- * Check if the vma is being used as a stack.
- * If is_group is non-zero, check in the entire thread group or else
- * just check in the current task. Returns the pid of the task that
- * the vma is stack for.
- */
-pid_t vm_is_stack(struct task_struct *task,
-                  struct vm_area_struct *vma, int in_group)
-{
-        pid_t ret = 0;
-
-        if (vm_is_stack_for_task(task, vma))
-                return task->pid;
-
-        if (in_group) {
-                struct task_struct *t;
-                rcu_read_lock();
-                if (!pid_alive(task))
-                        goto done;
-
-                t = task;
-                do {
-                        if (vm_is_stack_for_task(t, vma)) {
-                                ret = t->pid;
-                                goto done;
-                        }
-                } while_each_thread(task, t);
-done:
-                rcu_read_unlock();
-        }
-
-        return ret;
-}
-
 #if defined(CONFIG_MMU) && !defined(HAVE_ARCH_PICK_MMAP_LAYOUT)
 void arch_pick_mmap_layout(struct mm_struct *mm)
 {
@@ -349,35 +300,6 @@ int __attribute__((weak)) get_user_pages_fast(unsigned long start,
 }
 EXPORT_SYMBOL_GPL(get_user_pages_fast);
 
-unsigned long vm_mmap_pgoff(struct file *file, unsigned long addr,
-        unsigned long len, unsigned long prot,
-        unsigned long flag, unsigned long pgoff)
-{
-        unsigned long ret;
-        struct mm_struct *mm = current->mm;
-
-        ret = security_mmap_file(file, prot, flag);
-        if (!ret) {
-                down_write(&mm->mmap_sem);
-                ret = do_mmap_pgoff(file, addr, len, prot, flag, pgoff);
-                up_write(&mm->mmap_sem);
-        }
-        return ret;
-}
-
-unsigned long vm_mmap(struct file *file, unsigned long addr,
-        unsigned long len, unsigned long prot,
-        unsigned long flag, unsigned long offset)
-{
-        if (unlikely(offset + PAGE_ALIGN(len) < offset))
-                return -EINVAL;
-        if (unlikely(offset & ~PAGE_MASK))
-                return -EINVAL;
-
-        return vm_mmap_pgoff(file, addr, len, prot, flag, offset >> PAGE_SHIFT);
-}
-EXPORT_SYMBOL(vm_mmap);
-
 /* Tracepoints definitions. */
 EXPORT_TRACEPOINT_SYMBOL(kmalloc);
 EXPORT_TRACEPOINT_SYMBOL(kmem_cache_alloc);