From: Jens Axboe Date: Wed, 27 Jan 2021 17:04:49 +0000 (-0700) Subject: mm: only make map_swap_entry available for CONFIG_HIBERNATION X-Git-Tag: v5.12-rc1~103^2~38 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=3e3126cf2a6d0afa4c013574df621d08f08d3912;p=thirdparty%2Fkernel%2Flinux.git mm: only make map_swap_entry available for CONFIG_HIBERNATION Current tree spews this on compile: mm/swapfile.c:2290:17: warning: ‘map_swap_entry’ defined but not used [-Wunused-function] 2290 | static sector_t map_swap_entry(swp_entry_t entry, struct block_device **bdev) | ^~~~~~~~~~~~~~ if !CONFIG_HIBERNATION, as we don't use the function unless we have that config option set. Fixes: 48d15436fde6 ("mm: remove get_swap_bio") Signed-off-by: Jens Axboe --- diff --git a/mm/swapfile.c b/mm/swapfile.c index bfa9e8b0c2ef6..351999a84e6e4 100644 --- a/mm/swapfile.c +++ b/mm/swapfile.c @@ -47,7 +47,6 @@ static bool swap_count_continued(struct swap_info_struct *, pgoff_t, unsigned char); static void free_swap_count_continuations(struct swap_info_struct *); -static sector_t map_swap_entry(swp_entry_t, struct block_device**); DEFINE_SPINLOCK(swap_lock); static unsigned int nr_swapfiles; @@ -1791,6 +1790,9 @@ int free_swap_and_cache(swp_entry_t entry) } #ifdef CONFIG_HIBERNATION + +static sector_t map_swap_entry(swp_entry_t, struct block_device**); + /* * Find the swap type that corresponds to given device (if any). * @@ -2281,6 +2283,7 @@ static void drain_mmlist(void) spin_unlock(&mmlist_lock); } +#ifdef CONFIG_HIBERNATION /* * Use this swapdev's extent info to locate the (PAGE_SIZE) block which * corresponds to page offset for the specified swap entry. @@ -2300,6 +2303,7 @@ static sector_t map_swap_entry(swp_entry_t entry, struct block_device **bdev) se = offset_to_swap_extent(sis, offset); return se->start_block + (offset - se->start_page); } +#endif /* * Free all of a swapdev's extent information