diff options
| author | Steven Rostedt (VMware) <rostedt@goodmis.org> | 2017-11-17 12:43:21 -0500 |
|---|---|---|
| committer | Steven Rostedt (VMware) <rostedt@goodmis.org> | 2017-11-17 12:43:21 -0500 |
| commit | be2f0015c7f4ea2d756d2d64518d2a8dc4a49dcb (patch) | |
| tree | 73513be6f15f31543d25cbf2d1d3b991000b6a4f /mm | |
| parent | 7351926daee6459111f2485fc154ee6cda5615ac (diff) | |
| parent | 8a697a50c090053cf6c53a096972dd841332fe59 (diff) | |
Merge tag 'v4.9.48' into v4.9-rt
This is the 4.9.48 stable release
Diffstat (limited to 'mm')
| -rw-r--r-- | mm/madvise.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/mm/madvise.c b/mm/madvise.c index 63a12162f4c6..55f30ec32e5b 100644 --- a/mm/madvise.c +++ b/mm/madvise.c @@ -533,6 +533,8 @@ static long madvise_remove(struct vm_area_struct *vma, static int madvise_hwpoison(int bhv, unsigned long start, unsigned long end) { struct page *p; + struct zone *zone; + if (!capable(CAP_SYS_ADMIN)) return -EPERM; for (; start < end; start += PAGE_SIZE << @@ -561,6 +563,11 @@ static int madvise_hwpoison(int bhv, unsigned long start, unsigned long end) if (ret) return ret; } + + /* Ensure that all poisoned pages are removed from per-cpu lists */ + for_each_populated_zone(zone) + drain_all_pages(zone); + return 0; } #endif |