From: Michael Ellerman <mpe@ellerman.id.au>
Date: Fri, 27 May 2022 11:15:41 +0000 (+1000)
Subject: powerpc/64: Include cache.h directly in paca.h
X-Git-Tag: v5.19-rc1~107^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=dcf280e6f80be280ca7dd1b058f038654e4a18dd;p=thirdparty%2Fkernel%2Flinux.git

powerpc/64: Include cache.h directly in paca.h

paca.h uses ____cacheline_aligned without directly including cache.h,
where it's defined.

For Book3S builds that's OK because paca.h includes lppaca.h, and it
does include cache.h.

But Book3E builds have been getting cache.h indirectly via printk.h,
which is dicey, and in fact that include was recently removed, leading
to build errors such as:

  ld: fs/isofs/dir.o:(.bss+0x0): multiple definition of `____cacheline_aligned'; fs/isofs/namei.o:(.bss+0x0): first defined here

So include cache.h directly to fix the build error.

Fixes: 534aa1dc975a ("printk: stop including cache.h from printk.h")
Reported-by: Guenter Roeck <linux@roeck-us.net>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
---

diff --git a/arch/powerpc/include/asm/paca.h b/arch/powerpc/include/asm/paca.h
index 03330b7d835f8..4d7aaab827023 100644
--- a/arch/powerpc/include/asm/paca.h
+++ b/arch/powerpc/include/asm/paca.h
@@ -12,6 +12,7 @@
 
 #ifdef CONFIG_PPC64
 
+#include <linux/cache.h>
 #include <linux/string.h>
 #include <asm/types.h>
 #include <asm/lppaca.h>