]> git.hungrycats.org Git - linux/commitdiff
x86/init: fix build with CONFIG_SWAP=n
authorVlastimil Babka <vbabka@suse.cz>
Tue, 14 Aug 2018 18:50:47 +0000 (20:50 +0200)
committerBen Hutchings <ben@decadent.org.uk>
Wed, 3 Oct 2018 03:10:03 +0000 (04:10 +0100)
commit 792adb90fa724ce07c0171cbc96b9215af4b1045 upstream.

The introduction of generic_max_swapfile_size and arch-specific versions has
broken linking on x86 with CONFIG_SWAP=n due to undefined reference to
'generic_max_swapfile_size'. Fix it by compiling the x86-specific
max_swapfile_size() only with CONFIG_SWAP=y.

Reported-by: Tomas Pruzina <pruzinat@gmail.com>
Fixes: 377eeaa8e11f ("x86/speculation/l1tf: Limit swap file size to MAX_PA/2")
Signed-off-by: Vlastimil Babka <vbabka@suse.cz>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
arch/x86/mm/init.c

index 3345140a926625d56b2b010925c2ebd87d34bdc8..091f0ec7795a3014a8003768a9218190cde3c833 100644 (file)
@@ -701,6 +701,7 @@ void __init zone_sizes_init(void)
        free_area_init_nodes(max_zone_pfns);
 }
 
+#ifdef CONFIG_SWAP
 unsigned long max_swapfile_size(void)
 {
        unsigned long pages;
@@ -713,3 +714,4 @@ unsigned long max_swapfile_size(void)
        }
        return pages;
 }
+#endif