diff options
| author | Wolfram Sang <wsa@the-dreams.de> | 2017-12-31 09:58:07 +0100 |
|---|---|---|
| committer | Wolfram Sang <wsa@the-dreams.de> | 2017-12-31 09:58:07 +0100 |
| commit | 639136d2a70ab9837befb22ad5b3d67cb4db2216 (patch) | |
| tree | 64e7d426cf7b7ffdce6798986c63dcdfe025c53d /mm/madvise.c | |
| parent | i2c: ismt: Use %pad specifier for dma_addr_t variables (diff) | |
| parent | i2c: mux: reg: don't log an error for probe deferral (diff) | |
| download | linux-639136d2a70ab9837befb22ad5b3d67cb4db2216.tar.xz linux-639136d2a70ab9837befb22ad5b3d67cb4db2216.zip | |
Merge branch 'i2c-mux/for-next' of https://github.com/peda-r/i2c-mux into i2c/for-4.16
"A couple of patches this time. Just some more compatibles for the
pca954x driver and an error handling tweak for the reg driver."
Diffstat (limited to 'mm/madvise.c')
| -rw-r--r-- | mm/madvise.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/mm/madvise.c b/mm/madvise.c index 375cf32087e4..751e97aa2210 100644 --- a/mm/madvise.c +++ b/mm/madvise.c @@ -276,15 +276,14 @@ static long madvise_willneed(struct vm_area_struct *vma, { struct file *file = vma->vm_file; + *prev = vma; #ifdef CONFIG_SWAP if (!file) { - *prev = vma; force_swapin_readahead(vma, start, end); return 0; } if (shmem_mapping(file->f_mapping)) { - *prev = vma; force_shm_swapin_readahead(vma, start, end, file->f_mapping); return 0; @@ -299,7 +298,6 @@ static long madvise_willneed(struct vm_area_struct *vma, return 0; } - *prev = vma; start = ((start - vma->vm_start) >> PAGE_SHIFT) + vma->vm_pgoff; if (end > vma->vm_end) end = vma->vm_end; |