Commit c5b169d4 authored by Vlastimil Babka's avatar Vlastimil Babka Committed by Greg Kroah-Hartman
Browse files

x86/init: fix build with CONFIG_SWAP=n

commit 792adb90

 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: default avatarTomas Pruzina <pruzinat@gmail.com>
Fixes: 377eeaa8

 ("x86/speculation/l1tf: Limit swap file size to MAX_PA/2")
Signed-off-by: default avatarVlastimil Babka <vbabka@suse.cz>
Cc: stable@vger.kernel.org
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent f6be6903
......@@ -883,6 +883,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;
......@@ -903,3 +904,4 @@ unsigned long max_swapfile_size(void)
}
return pages;
}
#endif
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment