Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

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: default avatarTomas Pruzina <pruzinat@gmail.com>
Fixes: 377eeaa8e11f ("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 aee0861f

arch/x86/mm/init.c

+2 −0
Original line number Diff line number Diff line
@@ -783,6 +783,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;
@@ -803,3 +804,4 @@ unsigned long max_swapfile_size(void) 
	}

	return pages;

}

#endif