diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2018-05-11 18:04:12 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2018-05-11 18:04:12 -0700 |
| commit | f0ab773f5c96c29a5227234c4b5a820f5591b74d (patch) | |
| tree | a98d6190989c2190e522b8d1966727125bcbcbb3 /mm/migrate.c | |
| parent | 4bc871984f7cb5b2dec3ae64b570cb02f9ce2227 (diff) | |
| parent | 2075b16e32c26e4031b9fd3cbe26c54676a8fcb5 (diff) | |
| download | lwn-f0ab773f5c96c29a5227234c4b5a820f5591b74d.tar.gz lwn-f0ab773f5c96c29a5227234c4b5a820f5591b74d.zip | |
Merge branch 'akpm' (patches from Andrew)
Merge misc fixes from Andrew Morton:
"13 fixes"
* emailed patches from Andrew Morton <akpm@linux-foundation.org>:
rbtree: include rcu.h
scripts/faddr2line: fix error when addr2line output contains discriminator
ocfs2: take inode cluster lock before moving reflinked inode from orphan dir
mm, oom: fix concurrent munlock and oom reaper unmap, v3
mm: migrate: fix double call of radix_tree_replace_slot()
proc/kcore: don't bounds check against address 0
mm: don't show nr_indirectly_reclaimable in /proc/vmstat
mm: sections are not offlined during memory hotremove
z3fold: fix reclaim lock-ups
init: fix false positives in W+X checking
lib/find_bit_benchmark.c: avoid soft lockup in test_find_first_bit()
KASAN: prohibit KASAN+STRUCTLEAK combination
MAINTAINERS: update Shuah's email address
Diffstat (limited to 'mm/migrate.c')
| -rw-r--r-- | mm/migrate.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/mm/migrate.c b/mm/migrate.c index 568433023831..8c0af0f7cab1 100644 --- a/mm/migrate.c +++ b/mm/migrate.c @@ -528,14 +528,12 @@ int migrate_page_move_mapping(struct address_space *mapping, int i; int index = page_index(page); - for (i = 0; i < HPAGE_PMD_NR; i++) { + for (i = 1; i < HPAGE_PMD_NR; i++) { pslot = radix_tree_lookup_slot(&mapping->i_pages, index + i); radix_tree_replace_slot(&mapping->i_pages, pslot, newpage + i); } - } else { - radix_tree_replace_slot(&mapping->i_pages, pslot, newpage); } /* |