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 <[email protected]> Fixes: 377eeaa ("x86/speculation/l1tf: Limit swap file size to MAX_PA/2") Signed-off-by: Vlastimil Babka <[email protected]> Cc: [email protected] Signed-off-by: Linus Torvalds <[email protected]>
ambv · Aug 14, 2018 · 792adb9 · 792adb9
1 parent 15bc88c
commit 792adb9
Showing 1 changed file with 2 additions and 0 deletions.
diff --git a/arch/x86/mm/init.c b/arch/x86/mm/init.c
@@ -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