diff options
| author | Andrey Zhizhikin <andrey.zhizhikin@leica-geosystems.com> | 2021-05-14 20:43:43 +0000 |
|---|---|---|
| committer | Andrey Zhizhikin <andrey.zhizhikin@leica-geosystems.com> | 2021-05-14 20:43:43 +0000 |
| commit | 6602fc5788331bd1d75b05384b519fd21f35c742 (patch) | |
| tree | 78b27b509f488392a6c01cbe79ea6b2750c03f72 /mm | |
| parent | d1bb99cd3c58a5569908d8302d2dc2352c9e51dd (diff) | |
| parent | b82e5721a17325739adef83a029340a63b53d4ad (diff) | |
Merge tag 'v5.4.119' into 5.4-2.3.x-imx
This is the 5.4.119 stable release
Signed-off-by: Andrey Zhizhikin <andrey.zhizhikin@leica-geosystems.com>
Diffstat (limited to 'mm')
| -rw-r--r-- | mm/memory-failure.c | 2 | ||||
| -rw-r--r-- | mm/sparse.c | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/mm/memory-failure.c b/mm/memory-failure.c index 3151c87dff73..d823ec74f3fc 100644 --- a/mm/memory-failure.c +++ b/mm/memory-failure.c @@ -1215,7 +1215,7 @@ static int memory_failure_dev_pagemap(unsigned long pfn, int flags, * communicated in siginfo, see kill_proc() */ start = (page->index << PAGE_SHIFT) & ~(size - 1); - unmap_mapping_range(page->mapping, start, start + size, 0); + unmap_mapping_range(page->mapping, start, size, 0); } kill_procs(&tokill, flags & MF_MUST_KILL, !unmap_success, pfn, flags); rc = 0; diff --git a/mm/sparse.c b/mm/sparse.c index 78bbecd904c3..191e29cca3fb 100644 --- a/mm/sparse.c +++ b/mm/sparse.c @@ -551,6 +551,7 @@ static void __init sparse_init_nid(int nid, unsigned long pnum_begin, pr_err("%s: node[%d] memory map backing failed. Some memory will not be available.", __func__, nid); pnum_begin = pnum; + sparse_buffer_fini(); goto failed; } check_usemap_section_nr(nid, usage); |