diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2020-03-24 17:03:07 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2020-03-24 17:03:07 +1100 |
| commit | 32096db33a7c5d0363e0f6f8b3c925e12b80ac6c (patch) | |
| tree | 247fa0651a4ceb76ed83687026c9c9306660bea7 /mm/swap_state.c | |
| parent | 75f49f22d0b827a31ef8a2cf0eba4bc995d1bf83 (diff) | |
| parent | ed2d96bf85bfae4d5d31b9cabe014349e2a5c5de (diff) | |
| download | linux-next-32096db33a7c5d0363e0f6f8b3c925e12b80ac6c.tar.gz | |
Merge branch 'akpm-current/current'
Diffstat (limited to 'mm/swap_state.c')
| -rw-r--r-- | mm/swap_state.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mm/swap_state.c b/mm/swap_state.c index 8e7ce9a9bc5e..ebed37bbf7a3 100644 --- a/mm/swap_state.c +++ b/mm/swap_state.c @@ -116,7 +116,7 @@ int add_to_swap_cache(struct page *page, swp_entry_t entry, gfp_t gfp) struct address_space *address_space = swap_address_space(entry); pgoff_t idx = swp_offset(entry); XA_STATE_ORDER(xas, &address_space->i_pages, idx, compound_order(page)); - unsigned long i, nr = compound_nr(page); + unsigned long i, nr = hpage_nr_pages(page); VM_BUG_ON_PAGE(!PageLocked(page), page); VM_BUG_ON_PAGE(PageSwapCache(page), page); |