Skip to content

Commit bed280b

Browse files
lwfingergregkh
authored andcommitted
powerpc: Fix build warning on 32-bit PPC
commit 8ae679c4bc2ea2d16d92620da8e3e9332fa4039f upstream. 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 989cea5c14be ("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 <Larry.Finger@lwfinger.net> Cc: Nicholas Piggin <npiggin@gmail.com> Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org> Cc: Paul Mackerras <paulus@samba.org> Cc: Michael Ellerman <mpe@ellerman.id.au> Cc: linuxppc-dev@lists.ozlabs.org Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1 parent fa48a16 commit bed280b

1 file changed

Lines changed: 1 addition & 1 deletion

File tree

arch/powerpc/kernel/misc_32.S

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -313,7 +313,7 @@ _GLOBAL(flush_instruction_cache)
313313
lis r3, KERNELBASE@h
314314
iccci 0,r3
315315
#endif
316-
#elif CONFIG_FSL_BOOKE
316+
#elif defined(CONFIG_FSL_BOOKE)
317317
BEGIN_FTR_SECTION
318318
mfspr r3,SPRN_L1CSR0
319319
ori r3,r3,L1CSR0_CFI|L1CSR0_CLFC

0 commit comments

Comments
 (0)