* [PATCH] x86/init: fix build with CONFIG_SWAP=n
@ 2018-08-14 18:50 Vlastimil Babka
2018-08-14 18:59 ` Linus Torvalds
0 siblings, 1 reply; 2+ messages in thread
From: Vlastimil Babka @ 2018-08-14 18:50 UTC (permalink / raw)
To: Thomas Gleixner, Ingo Molnar
Cc: H . Peter Anvin, x86, linux-kernel, Dave Hansen, Andi Kleen,
Linus Torvalds, Tomas Pruzina, Vlastimil Babka, stable
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
---
arch/x86/mm/init.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/arch/x86/mm/init.c b/arch/x86/mm/init.c
index 156ed8154af8..acfab322fbe0 100644
--- a/arch/x86/mm/init.c
+++ b/arch/x86/mm/init.c
@@ -914,6 +914,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;
@@ -934,3 +935,4 @@ unsigned long max_swapfile_size(void)
}
return pages;
}
+#endif
--
2.18.0
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: [PATCH] x86/init: fix build with CONFIG_SWAP=n
2018-08-14 18:50 [PATCH] x86/init: fix build with CONFIG_SWAP=n Vlastimil Babka
@ 2018-08-14 18:59 ` Linus Torvalds
0 siblings, 0 replies; 2+ messages in thread
From: Linus Torvalds @ 2018-08-14 18:59 UTC (permalink / raw)
To: Vlastimil Babka
Cc: Thomas Gleixner, Ingo Molnar, Peter Anvin,
the arch/x86 maintainers, Linux Kernel Mailing List, Dave Hansen,
Andi Kleen, pruzinat, stable
On Tue, Aug 14, 2018 at 11:51 AM Vlastimil Babka <vbabka@suse.cz> wrote:
>
> 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.
Pretty much all the x86 people are on vacation this week, so I just
took this directly.
Linus
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2018-08-14 18:59 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-08-14 18:50 [PATCH] x86/init: fix build with CONFIG_SWAP=n Vlastimil Babka
2018-08-14 18:59 ` Linus Torvalds
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®