diff options
author | Ingo Molnar <mingo@kernel.org> | 2018-05-14 11:22:59 +0200 |
---|---|---|
committer | Ingo Molnar <mingo@kernel.org> | 2018-05-14 11:22:59 +0200 |
commit | 4b96583869c4d990b779eca72976063970d41b8d (patch) | |
tree | f2fdb7760a06f6445f33fdee3ec512fbdb46fcb4 /mm/migrate.c | |
parent | dt-bindings/gic-v3: Add documentation for MBI support (diff) | |
parent | Linux 4.17-rc5 (diff) | |
download | linux-4b96583869c4d990b779eca72976063970d41b8d.tar.xz linux-4b96583869c4d990b779eca72976063970d41b8d.zip |
Merge tag 'v4.17-rc5' into irq/core, to pick up fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
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); } /* |