Commit 792adb90 authored Aug 14, 2018 by Vlastimil Babka Committed by Linus Torvalds Aug 14, 2018

x86/init: fix build with CONFIG_SWAP=n



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: 377eeaa8 ("x86/speculation/l1tf: Limit swap file size to MAX_PA/2")
Signed-off-by: Vlastimil Babka <vbabka@suse.cz>
Cc: stable@vger.kernel.org
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

parent 15bc88cd

arch/x86/mm/init.c

+2 −0

Original line number	Diff line number	Diff line
		@@ -914,6 +914,7 @@ void update_cache_mode_entry(unsigned entry, enum page_cache_mode cache)
		__pte2cachemode_tbl[entry] = cache;
		}

		#ifdef CONFIG_SWAP
		unsigned long max_swapfile_size(void)
		{
		unsigned long pages;
		@@ -934,3 +935,4 @@ unsigned long max_swapfile_size(void)
		}
		return pages;
		}
		#endif

Admin message