Skip to content

Commit dcf280e

Browse files
committed
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: 534aa1d ("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>
1 parent c85ab4f commit dcf280e

1 file changed

Lines changed: 1 addition & 0 deletions

File tree

  • arch/powerpc/include/asm

arch/powerpc/include/asm/paca.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212

1313
#ifdef CONFIG_PPC64
1414

15+
#include <linux/cache.h>
1516
#include <linux/string.h>
1617
#include <asm/types.h>
1718
#include <asm/lppaca.h>

0 commit comments

Comments
 (0)