diff options
author | Richard Weinberger <richard@nod.at> | 2022-08-01 22:31:22 +0300 |
---|---|---|
committer | Richard Weinberger <richard@nod.at> | 2022-08-01 22:31:22 +0300 |
commit | 9661524b9b26a45ecb045d7d36f85e83d8021a86 (patch) | |
tree | 28d50d77a798e097fd2040fd6f8a6fd9bb5dea65 /mm/migrate.c | |
parent | e8166841a6996ac837caa24ee0da9d3f1eaad7be (diff) | |
parent | f8cd9f632f4415b1e8838bdca8ab42cfb37a6584 (diff) | |
download | linux-9661524b9b26a45ecb045d7d36f85e83d8021a86.tar.xz |
Merge tag 'spi-nor/for-5.20' into mtd/next
SPI NOR core changes:
- move SECT_4K_PMC flag out of the core as it's a vendor specific flag
- s/addr_width/addr_nbytes: address width means the number of IO lines
used for the address, whereas in the code it is used as the number of
address bytes.
- do not change nor->addr_nbytes at SFDP parsing time. At the SFDP parsing
time we should not change members of struct spi_nor, but instead fill
members of struct spi_nor_flash_parameters which could later on be used
by the callers.
- track flash's internal address mode so that we can use 4B opcodes
together with opcodes that don't have a 4B opcode correspondent.
SPI NOR manufacturer drivers changes:
- esmt: Rename "f25l32qa" flash name to "f25l32qa-2s".
- micron-st: Skip FSR reading if SPI controller does not support it to
allow flashes that support FSR to work even when attached to such SPI
controllers.
- spansion: Add s25hl-t/s25hs-t IDs and fixups.
Diffstat (limited to 'mm/migrate.c')
-rw-r--r-- | mm/migrate.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/mm/migrate.c b/mm/migrate.c index e51588e95f57..6c1ea61f39d8 100644 --- a/mm/migrate.c +++ b/mm/migrate.c @@ -1106,6 +1106,7 @@ static int unmap_and_move(new_page_t get_new_page, if (!newpage) return -ENOMEM; + newpage->private = 0; rc = __unmap_and_move(page, newpage, force, mode); if (rc == MIGRATEPAGE_SUCCESS) set_page_owner_migrate_reason(newpage, reason); |