summaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorVlastimil Babka <vbabka@suse.cz>2018-08-14 21:50:47 +0300
committerLinus Torvalds <torvalds@linux-foundation.org>2018-08-14 21:59:01 +0300
commit792adb90fa724ce07c0171cbc96b9215af4b1045 (patch)
treedb584b7bb4de0b73424f99f736610eb54a9b0259 /arch
parent15bc88cd5f8e095fa7fe8494d1980ad29885d984 (diff)
downloadlinux-792adb90fa724ce07c0171cbc96b9215af4b1045.tar.xz
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: 377eeaa8e11f ("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>
Diffstat (limited to 'arch')
-rw-r--r--arch/x86/mm/init.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/x86/mm/init.c b/arch/x86/mm/init.c
index 156ed8154af8..acfab322fbe0 100644
--- 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