diff mbox series

[SRU,Xenial,2/2] UBUNTU: SAUCE: powerpc/uaccess: only include kup-radix.h on PPC_BOOK3S_64

Message ID 20201124231007.2309907-3-cascardo@canonical.com
State New
Headers show
Series LP: #1905475 Fix powerpc build | expand

Commit Message

Thadeu Lima de Souza Cascardo Nov. 24, 2020, 11:10 p.m. UTC 
BugLink: https://bugs.launchpad.net/bugs/1905475

This fixes up backport of upstream commit
9a32a7e78bd0cd9a9b6332cbdc345ee5ffd0c5de ("powerpc/64s: flush L1D after user accesses").

That backport fails to build with configurations that have CONFIG_PPC64 but not
CONFIG_PPC_BOOK3S_64, which is used in some flavours of powerpc.

Signed-off-by: Thadeu Lima de Souza Cascardo <cascardo@canonical.com>
---
 arch/powerpc/include/asm/kup.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
diff mbox series

Patch

diff --git a/arch/powerpc/include/asm/kup.h b/arch/powerpc/include/asm/kup.h
index e87f41cd9615..0935de3bae27 100644
--- a/arch/powerpc/include/asm/kup.h
+++ b/arch/powerpc/include/asm/kup.h
@@ -6,7 +6,7 @@ 
 
 #include <asm/pgtable.h>
 
-#ifdef CONFIG_PPC64
+#ifdef CONFIG_PPC_BOOK3S_64
 #include <asm/book3s/64/kup-radix.h>
 #else
 static inline void allow_user_access(void __user *to, const void __user *from,