Commit a11aae86 authored by Michael Ellerman's avatar Michael Ellerman Committed by Lee Jones
Browse files

UPSTREAM: 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.

Bug: 254441685
Fixes: 534aa1dc ("printk: stop including cache.h from printk.h")
Reported-by: default avatarGuenter Roeck <linux@roeck-us.net>
Signed-off-by: default avatarMichael Ellerman <mpe@ellerman.id.au>
(cherry picked from commit dcf280e6)
Signed-off-by: default avatarLee Jones <joneslee@google.com>
Change-Id: Ic33c3ed809ef8ea61439a15a9a222c1eb3580b74
parent a3eb9c57
Loading
Loading
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment