public-mirrors/linux
1
0
Fork 0
mirror of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2025-08-05 16:54:27 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

x86/init: fix build with CONFIG_SWAP=n

Browse source 
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: 377eeaa8e1 ("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>
This commit is contained in:
Vlastimil Babka 2018-08-14 20:50:47 +02:00 • committed by Linus Torvalds
parent 15bc88cd5f
commit 792adb90fa
1 changed files with 2 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
arch/x86/mm/init.c
View file

@ -914,6 +914,7 @@ void update_cache_mode_entry(unsigned entry, enum page_cache_mode cache)
__pte2cachemode_tbl[entry] = cache; __pte2cachemode_tbl[entry] = cache;
} }
#ifdef CONFIG_SWAP
unsigned long max_swapfile_size(void) unsigned long max_swapfile_size(void)
{ {
unsigned long pages; unsigned long pages;
@ -934,3 +935,4 @@ unsigned long max_swapfile_size(void)
} }
return pages; return pages;
} }
#endif