summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJens Axboe <axboe@kernel.dk>2021-01-27 20:04:49 +0300
committerJens Axboe <axboe@kernel.dk>2021-01-27 20:04:49 +0300
commit3e3126cf2a6d0afa4c013574df621d08f08d3912 (patch)
tree566a779cfbd9bb7baec2f71645d1274ffab70580
parent48d15436fde6feebcded7bd0fdc8ea4a9181b8fa (diff)
downloadlinux-3e3126cf2a6d0afa4c013574df621d08f08d3912.tar.xz
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 <axboe@kernel.dk>
-rw-r--r--mm/swapfile.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/mm/swapfile.c b/mm/swapfile.c
index bfa9e8b0c2ef..351999a84e6e 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