# git rev-parse -q --verify dcf280e6f80be280ca7dd1b058f038654e4a18dd^{commit} dcf280e6f80be280ca7dd1b058f038654e4a18dd already have revision, skipping fetch # git checkout -q -f -B kisskb dcf280e6f80be280ca7dd1b058f038654e4a18dd # git clean -qxdf # < git log -1 # commit dcf280e6f80be280ca7dd1b058f038654e4a18dd # Author: Michael Ellerman # Date: Fri May 27 21:15:41 2022 +1000 # # 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 # Signed-off-by: Michael Ellerman # < /opt/cross/kisskb/korg/gcc-5.5.0-nolibc/powerpc64-linux/bin/powerpc64-linux-gcc --version # < /opt/cross/kisskb/korg/gcc-5.5.0-nolibc/powerpc64-linux/bin/powerpc64-linux-ld --version # < git log --format=%s --max-count=1 dcf280e6f80be280ca7dd1b058f038654e4a18dd # < make -s -j 32 ARCH=powerpc O=/kisskb/build/powerpc-next_ppc64e_defconfig+UP_powerpc-gcc5 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-5.5.0-nolibc/powerpc64-linux/bin/powerpc64-linux- ppc64e_defconfig # Added to kconfig CONFIG_SMP=n # < make -s -j 32 ARCH=powerpc O=/kisskb/build/powerpc-next_ppc64e_defconfig+UP_powerpc-gcc5 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-5.5.0-nolibc/powerpc64-linux/bin/powerpc64-linux- help # make -s -j 32 ARCH=powerpc O=/kisskb/build/powerpc-next_ppc64e_defconfig+UP_powerpc-gcc5 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-5.5.0-nolibc/powerpc64-linux/bin/powerpc64-linux- olddefconfig # make -s -j 32 ARCH=powerpc O=/kisskb/build/powerpc-next_ppc64e_defconfig+UP_powerpc-gcc5 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-5.5.0-nolibc/powerpc64-linux/bin/powerpc64-linux- Completed OK # rm -rf /kisskb/build/powerpc-next_ppc64e_defconfig+UP_powerpc-gcc5 # Build took: 0:01:23.934168