]> git.ipfire.org Git - people/arne_f/kernel.git/commit
x86/init: fix build with CONFIG_SWAP=n
authorVlastimil Babka <vbabka@suse.cz>
Tue, 14 Aug 2018 18:50:47 +0000 (20:50 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 15 Aug 2018 16:13:01 +0000 (18:13 +0200)
commit7cefa38bfc5829dfdcc4ebf92f5db9e7e783f97b
treefcf99c2d3f042cd54f7122f98af800ae1cb39d37
parent7bdbaba8e99782ace50e585549a54af3d079f80d
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>
arch/x86/mm/init.c