Skip to content

Commit 8ae679c

Browse files
lwfingertorvalds
authored andcommitted
powerpc: Fix build warning on 32-bit PPC
I am getting the following warning when I build kernel 4.9-git on my PowerBook G4 with a 32-bit PPC processor: AS arch/powerpc/kernel/misc_32.o arch/powerpc/kernel/misc_32.S:299:7: warning: "CONFIG_FSL_BOOKE" is not defined [-Wundef] This problem is evident after commit 989cea5 ("kbuild: prevent lib-ksyms.o rebuilds"); however, this change in kbuild only exposes an error that has been in the code since 2005 when this source file was created. That was with commit 9994a33 ("powerpc: Introduce entry_{32,64}.S, misc_{32,64}.S, systbl.S"). The offending line does not make a lot of sense. This error does not seem to cause any errors in the executable, thus I am not recommending that it be applied to any stable versions. Thanks to Nicholas Piggin for suggesting this solution. Fixes: 9994a33 ("powerpc: Introduce entry_{32,64}.S, misc_{32,64}.S, systbl.S") Signed-off-by: Larry Finger <[email protected]> Cc: Nicholas Piggin <[email protected]> Cc: Benjamin Herrenschmidt <[email protected]> Cc: Paul Mackerras <[email protected]> Cc: Michael Ellerman <[email protected]> Cc: [email protected] Signed-off-by: Linus Torvalds <[email protected]>
1 parent d33d5a6 commit 8ae679c

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

arch/powerpc/kernel/misc_32.S

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -296,7 +296,7 @@ _GLOBAL(flush_instruction_cache)
296296
lis r3, KERNELBASE@h
297297
iccci 0,r3
298298
#endif
299-
#elif CONFIG_FSL_BOOKE
299+
#elif defined(CONFIG_FSL_BOOKE)
300300
BEGIN_FTR_SECTION
301301
mfspr r3,SPRN_L1CSR0
302302
ori r3,r3,L1CSR0_CFI|L1CSR0_CLFC

0 commit comments

Comments
 (0)