The patch titled Subject: mm/swap: remove unused global variable nr_swapper_spaces has been added to the -mm tree. Its filename is mm-swap-remove-unused-global-variable-nr_swapper_spaces.patch This patch should soon appear at https://ozlabs.org/~akpm/mmots/broken-out/mm-swap-remove-unused-global-variable-nr_swapper_spaces.patch and later at https://ozlabs.org/~akpm/mmotm/broken-out/mm-swap-remove-unused-global-variable-nr_swapper_spaces.patch Before you just go and hit "reply", please: a) Consider who else should be cc'ed b) Prefer to cc a suitable mailing list as well c) Ideally: find the original patch on the mailing list and do a reply-to-all to that, adding suitable additional cc's *** Remember to use Documentation/process/submit-checklist.rst when testing your code *** The -mm tree is included into linux-next and is updated there every 3-4 working days ------------------------------------------------------ From: Miaohe Lin <linmiaohe@xxxxxxxxxx> Subject: mm/swap: remove unused global variable nr_swapper_spaces Since commit b6038942480e ("mm: memcg: add swapcache stat for memcg v2"), the last user of nr_swapper_spaces is gone. So we remove this unused one. Link: https://lkml.kernel.org/r/20210520134022.1370406-5-linmiaohe@xxxxxxxxxx Signed-off-by: Miaohe Lin <linmiaohe@xxxxxxxxxx> Cc: Hugh Dickins <hughd@xxxxxxxxxx> Cc: Matthew Wilcox (Oracle) <willy@xxxxxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- mm/swap_state.c | 3 --- 1 file changed, 3 deletions(-) --- a/mm/swap_state.c~mm-swap-remove-unused-global-variable-nr_swapper_spaces +++ a/mm/swap_state.c @@ -37,7 +37,6 @@ static const struct address_space_operat }; struct address_space *swapper_spaces[MAX_SWAPFILES] __read_mostly; -static unsigned int nr_swapper_spaces[MAX_SWAPFILES] __read_mostly; static bool enable_vma_readahead __read_mostly = true; #define SWAP_RA_WIN_SHIFT (PAGE_SHIFT / 2) @@ -685,7 +684,6 @@ int init_swap_address_space(unsigned int /* swap cache doesn't use writeback related tags */ mapping_set_no_writeback_tags(space); } - nr_swapper_spaces[type] = nr; swapper_spaces[type] = spaces; return 0; @@ -694,7 +692,6 @@ int init_swap_address_space(unsigned int void exit_swap_address_space(unsigned int type) { kvfree(swapper_spaces[type]); - nr_swapper_spaces[type] = 0; swapper_spaces[type] = NULL; } _ Patches currently in -mm which might be from linmiaohe@xxxxxxxxxx are mm-swapfile-use-percpu_ref-to-serialize-against-concurrent-swapoff.patch swap-fix-do_swap_page-race-with-swapoff.patch mm-swap-remove-confusing-checking-for-non_swap_entry-in-swap_ra_info.patch mm-shmem-fix-shmem_swapin-race-with-swapoff.patch mm-swapfile-move-get_swap_page_of_type-under-config_hibernation.patch mm-swap-remove-unused-local-variable-nr_shadows.patch mm-swap_slotsc-delete-meaningless-forward-declarations.patch mm-swap-remove-unused-global-variable-nr_swapper_spaces.patch mm-huge_memoryc-remove-dedicated-macro-hpage_cache_index_mask.patch mm-huge_memoryc-use-page-deferred_list.patch mm-huge_memoryc-add-missing-read-only-thp-checking-in-transparent_hugepage_enabled.patch mm-huge_memoryc-add-missing-read-only-thp-checking-in-transparent_hugepage_enabled-v4.patch mm-huge_memoryc-remove-unnecessary-tlb_remove_page_size-for-huge-zero-pmd.patch mm-huge_memoryc-dont-discard-hugepage-if-other-processes-are-mapping-it.patch