3.16.59-rc1 review patch. If anyone has any objections, please let me know.
------------------
From: Vlastimil Babka vbabka@suse.cz
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 | 2 ++ 1 file changed, 2 insertions(+)
--- a/arch/x86/mm/init.c +++ b/arch/x86/mm/init.c @@ -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