Patched in Tegra support.

1 files changed, 11 insertions, 32 deletions

diff --git a/mm/madvise.c b/mm/madvise.c
index 03dfa5c7adb..74bf193eff0 100644
--- a/mm/madvise.c
+++ b/mm/madvise.c
@@ -11,11 +11,8 @@
 #include <linux/mempolicy.h>
 #include <linux/page-isolation.h>
 #include <linux/hugetlb.h>
-#include <linux/falloc.h>
 #include <linux/sched.h>
 #include <linux/ksm.h>
-#include <linux/fs.h>
-#include <linux/file.h>
 
 /*
  * Any behaviour which results in changes to the vma->vm_flags needs to
@@ -68,16 +65,6 @@ static long madvise_behavior(struct vm_area_struct * vma,
                 }
                 new_flags &= ~VM_DONTCOPY;
                 break;
-        case MADV_DONTDUMP:
-                new_flags |= VM_DONTDUMP;
-                break;
-        case MADV_DODUMP:
-                if (new_flags & VM_SPECIAL) {
-                        error = -EINVAL;
-                        goto out;
-                }
-                new_flags &= ~VM_DONTDUMP;
-                break;
         case MADV_MERGEABLE:
         case MADV_UNMERGEABLE:
                 error = ksm_madvise(vma, start, end, behavior, &new_flags);
@@ -207,39 +194,33 @@ static long madvise_remove(struct vm_area_struct *vma,
                                 struct vm_area_struct **prev,
                                 unsigned long start, unsigned long end)
 {
-        loff_t offset;
+        struct address_space *mapping;
+        loff_t offset, endoff;
         int error;
-        struct file *f;
 
         *prev = NULL;   /* tell sys_madvise we drop mmap_sem */
 
         if (vma->vm_flags & (VM_LOCKED|VM_NONLINEAR|VM_HUGETLB))
                 return -EINVAL;
 
-        f = vma->vm_file;
-
-        if (!f || !f->f_mapping || !f->f_mapping->host) {
+        if (!vma->vm_file || !vma->vm_file->f_mapping
+                || !vma->vm_file->f_mapping->host) {
                         return -EINVAL;
         }
 
         if ((vma->vm_flags & (VM_SHARED|VM_WRITE)) != (VM_SHARED|VM_WRITE))
                 return -EACCES;
 
+        mapping = vma->vm_file->f_mapping;
+
         offset = (loff_t)(start - vma->vm_start)
                         + ((loff_t)vma->vm_pgoff << PAGE_SHIFT);
+        endoff = (loff_t)(end - vma->vm_start - 1)
+                        + ((loff_t)vma->vm_pgoff << PAGE_SHIFT);
 
-        /*
-         * Filesystem's fallocate may need to take i_mutex.  We need to
-         * explicitly grab a reference because the vma (and hence the
-         * vma's reference to the file) can go away as soon as we drop
-         * mmap_sem.
-         */
-        get_file(f);
+        /* vmtruncate_range needs to take i_mutex */
         up_read(&current->mm->mmap_sem);
-        error = do_fallocate(f,
-                                FALLOC_FL_PUNCH_HOLE | FALLOC_FL_KEEP_SIZE,
-                                offset, end - start);
-        fput(f);
+        error = vmtruncate_range(mapping->host, offset, endoff);
         down_read(&current->mm->mmap_sem);
         return error;
 }
@@ -270,7 +251,7 @@ static int madvise_hwpoison(int bhv, unsigned long start, unsigned long end)
                 printk(KERN_INFO "Injecting memory failure for page %lx at %lx\n",
                        page_to_pfn(p), start);
                 /* Ignore return value for now */
-                memory_failure(page_to_pfn(p), 0, MF_COUNT_INCREASED);
+                __memory_failure(page_to_pfn(p), 0, MF_COUNT_INCREASED);
         }
         return ret;
 }
@@ -312,8 +293,6 @@ madvise_behavior_valid(int behavior)
         case MADV_HUGEPAGE:
         case MADV_NOHUGEPAGE:
 #endif
-        case MADV_DONTDUMP:
-        case MADV_DODUMP:
                 return 1;
 
         default: