diff options
| author | Vlastimil Babka <vbabka@suse.cz> | 2018-08-14 20:50:47 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2018-08-15 17:42:11 +0200 |
| commit | 4b90ff885c6cc88795b678414aaf5d7b0153a5dc (patch) | |
| tree | b2c58f05aa5b9a5a88b9a55b437f3f4298788004 /arch | |
| parent | eb993211b9d7856a9ab8c487c701c84103842713 (diff) | |
x86/init: fix build with CONFIG_SWAP=n
commit 792adb90fa724ce07c0171cbc96b9215af4b1045 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: 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>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/x86/mm/init.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/x86/mm/init.c b/arch/x86/mm/init.c index 3a8e9abe0667..4954a6cef50a 100644 --- a/arch/x86/mm/init.c +++ b/arch/x86/mm/init.c @@ -770,6 +770,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; @@ -790,3 +791,4 @@ unsigned long max_swapfile_size(void) } return pages; } +#endif |