diff options
| author | Will Deacon <will@kernel.org> | 2022-07-25 10:57:02 +0100 |
|---|---|---|
| committer | Will Deacon <will@kernel.org> | 2022-07-25 10:57:02 +0100 |
| commit | 03939cf0d5d5eaf4141c594e427eb5ba14fbcd91 (patch) | |
| tree | 7fd2bee2dcd0cd2879490564fb26dd78db35aaca /mm | |
| parent | 02eab44c71df05882be9352ca12d8a60f7a10649 (diff) | |
| parent | d0637c505f8a1d8c4088642f1f3e9e3b22da14f6 (diff) | |
Merge branch 'for-next/mm' into for-next/core
* for-next/mm:
arm64: enable THP_SWAP for arm64
Diffstat (limited to 'mm')
| -rw-r--r-- | mm/swap_slots.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mm/swap_slots.c b/mm/swap_slots.c index 2a65a89b5b4d..10b94d64cc25 100644 --- a/mm/swap_slots.c +++ b/mm/swap_slots.c @@ -307,7 +307,7 @@ swp_entry_t folio_alloc_swap(struct folio *folio) entry.val = 0; if (folio_test_large(folio)) { - if (IS_ENABLED(CONFIG_THP_SWAP)) + if (IS_ENABLED(CONFIG_THP_SWAP) && arch_thp_swp_supported()) get_swap_pages(1, &entry, folio_nr_pages(folio)); goto out; } |