]> git.baikalelectronics.ru Git - kernel.git/commit
powerpc/64: Include cache.h directly in paca.h
authorMichael Ellerman <mpe@ellerman.id.au>
Fri, 27 May 2022 11:15:41 +0000 (21:15 +1000)
committerMichael Ellerman <mpe@ellerman.id.au>
Fri, 27 May 2022 12:20:09 +0000 (22:20 +1000)
commit633637e9ac2ba918da1e16c5ba7f61b8c7d425f1
tree69a8439ef7fb90f02021e2c3634d3ea1059577ab
parent29bce0f43b3d6a9b54cf36e8f751d52f6adc7a41
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: 2cc092d1f56c ("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>
arch/powerpc/include/asm/paca.h