* [PATCH] arch/um: Add a dummy cacheflush.h header
@ 2020-09-22 7:49 Borislav Petkov
2020-09-22 9:41 ` [tip: x86/pti] arch/um: Add a dummy <asm/cacheflush.h> header tip-bot2 for Borislav Petkov
0 siblings, 1 reply; 2+ messages in thread
From: Borislav Petkov @ 2020-09-22 7:49 UTC (permalink / raw)
To: X86 ML; +Cc: LKML, Ingo Molnar, Richard Weinberger, Balbir Singh
From: Borislav Petkov <bp@suse.de>
... in order to fix the defconfig build:
./arch/x86/include/asm/cacheflush.h: In function ‘l1d_flush_hw’:
./arch/x86/include/asm/cacheflush.h:15:6: error: implicit declaration of \
function ‘static_cpu_has’; did you mean ‘static_key_false’? [-Werror=implicit-function-declaration]
15 | if (static_cpu_has(X86_FEATURE_FLUSH_L1D)) {
| ^~~~~~~~~~~~~~
| static_key_false
cc1: some warnings being treated as errors
./arch/x86/include/asm/cacheflush.h:16:3: error: implicit declaration of \
function ‘wrmsrl’ [-Werror=implicit-function-declaration]
16 | wrmsrl(MSR_IA32_FLUSH_CMD, L1D_FLUSH);
|
Fixes: a9210620ec36 ("x86/mm: Optionally flush L1D on context switch")
Reported-by: Ingo Molnar <mingo@kernel.org>
Signed-off-by: Borislav Petkov <bp@suse.de>
Cc: Richard Weinberger <richard@nod.at>
Cc: Balbir Singh <sblbir@amazon.com>
---
arch/um/include/asm/cacheflush.h | 9 +++++++++
1 file changed, 9 insertions(+)
create mode 100644 arch/um/include/asm/cacheflush.h
diff --git a/arch/um/include/asm/cacheflush.h b/arch/um/include/asm/cacheflush.h
new file mode 100644
index 000000000000..b9dee9760043
--- /dev/null
+++ b/arch/um/include/asm/cacheflush.h
@@ -0,0 +1,9 @@
+/* SPDX-License-Identifier: GPL-2.0 */
+#ifndef _ASM_UML_CACHEFLUSH_H
+#define _ASM_UML_CACHEFLUSH_H
+
+#undef ARCH_IMPLEMENTS_FLUSH_DCACHE_PAGE
+#include <asm-generic/cacheflush.h>
+
+static inline int l1d_flush_hw(void) { return -EOPNOTSUPP; }
+#endif /* _ASM_UML_CACHEFLUSH_H */
--
2.21.0
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [tip: x86/pti] arch/um: Add a dummy <asm/cacheflush.h> header
2020-09-22 7:49 [PATCH] arch/um: Add a dummy cacheflush.h header Borislav Petkov
@ 2020-09-22 9:41 ` tip-bot2 for Borislav Petkov
0 siblings, 0 replies; 2+ messages in thread
From: tip-bot2 for Borislav Petkov @ 2020-09-22 9:41 UTC (permalink / raw)
To: linux-tip-commits; +Cc: Ingo Molnar, Borislav Petkov, x86, LKML
The following commit has been merged into the x86/pti branch of tip:
Commit-ID: e9c142f6f54db85c212ca64aefd4f2c232dac4ae
Gitweb: https://git.kernel.org/tip/e9c142f6f54db85c212ca64aefd4f2c232dac4ae
Author: Borislav Petkov <bp@suse.de>
AuthorDate: Tue, 22 Sep 2020 09:49:51 +02:00
Committer: Ingo Molnar <mingo@kernel.org>
CommitterDate: Tue, 22 Sep 2020 11:35:47 +02:00
arch/um: Add a dummy <asm/cacheflush.h> header
... in order to fix the defconfig build:
./arch/x86/include/asm/cacheflush.h: In function ‘l1d_flush_hw’:
./arch/x86/include/asm/cacheflush.h:15:6: error: implicit declaration of \
function ‘static_cpu_has’; did you mean ‘static_key_false’? [-Werror=implicit-function-declaration]
[ mingo: Changed the header guard to the existing nomenclature. ]
Fixes: a9210620ec36 ("x86/mm: Optionally flush L1D on context switch")
Reported-by: Ingo Molnar <mingo@kernel.org>
Signed-off-by: Borislav Petkov <bp@suse.de>
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Link: https://lore.kernel.org/r/20200922074951.2192-1-bp@alien8.de
---
arch/um/include/asm/cacheflush.h | 9 +++++++++
1 file changed, 9 insertions(+)
create mode 100644 arch/um/include/asm/cacheflush.h
diff --git a/arch/um/include/asm/cacheflush.h b/arch/um/include/asm/cacheflush.h
new file mode 100644
index 0000000..f693cb9
--- /dev/null
+++ b/arch/um/include/asm/cacheflush.h
@@ -0,0 +1,9 @@
+/* SPDX-License-Identifier: GPL-2.0 */
+#ifndef _ASM_UM_CACHEFLUSH_H
+#define _ASM_UM_CACHEFLUSH_H
+
+#undef ARCH_IMPLEMENTS_FLUSH_DCACHE_PAGE
+#include <asm-generic/cacheflush.h>
+
+static inline int l1d_flush_hw(void) { return -EOPNOTSUPP; }
+#endif /* _ASM_UM_CACHEFLUSH_H */
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2020-09-22 9:42 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-09-22 7:49 [PATCH] arch/um: Add a dummy cacheflush.h header Borislav Petkov
2020-09-22 9:41 ` [tip: x86/pti] arch/um: Add a dummy <asm/cacheflush.h> header tip-bot2 for Borislav Petkov
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).