Merge tag 'drm-amdkfd-fixes-2017-11-26' of git://people.freedesktop.org/~gabbayo...

[mirror_ubuntu-bionic-kernel.git] / mm / nommu.c

diff --git a/mm/nommu.c b/mm/nommu.c
index 53d5175a5c1481f05319f3ccb8f5668fa1ea7ab1..17c00d93de2e4973278845e98554ce2040445f65 100644 (file)
--- a/mm/nommu.c
+++ b/mm/nommu.c
@@ -1164,17 +1164,12 @@ static int do_mmap_private(struct vm_area_struct *vma,
 
        if (vma->vm_file) {
                /* read the contents of a file into the copy */
-               mm_segment_t old_fs;
                loff_t fpos;
 
                fpos = vma->vm_pgoff;
                fpos <<= PAGE_SHIFT;
 
-               old_fs = get_fs();
-               set_fs(KERNEL_DS);
-               ret = __vfs_read(vma->vm_file, base, len, &fpos);
-               set_fs(old_fs);
-
+               ret = kernel_read(vma->vm_file, base, len, &fpos);
                if (ret < 0)
                        goto error_free;