Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 69a797a0 authored by Michael Ellerman's avatar Michael Ellerman Committed by Greg Kroah-Hartman
Browse files

powerpc/32s: Fix CONFIG_BOOK3S_601 uses 



[ Upstream commit df4d4ef22446b3a789a4efd74d34f2ec1e24deb2 ]

We have two uses of CONFIG_BOOK3S_601, which doesn't exist. Fix them
to use CONFIG_PPC_BOOK3S_601 which is the correct symbol.

Fixes: 12c3f1fd ("powerpc/32s: get rid of CPU_FTR_601 feature")
Signed-off-by: default avatarMichael Ellerman <mpe@ellerman.id.au>
Link: https://lore.kernel.org/r/20200724131728.1643966-5-mpe@ellerman.id.au


Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 09c20502

arch/powerpc/include/asm/ptrace.h

+1 −1
Original line number Diff line number Diff line
@@ -203,7 +203,7 @@ do { \ 
#endif /* __powerpc64__ */



#define arch_has_single_step()	(1)

#ifndef CONFIG_BOOK3S_601

#ifndef CONFIG_PPC_BOOK3S_601

#define arch_has_block_step()	(true)

#else

#define arch_has_block_step()	(false)

arch/powerpc/include/asm/timex.h

+1 −1
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@ typedef unsigned long cycles_t; 


static inline cycles_t get_cycles(void)

{

	if (IS_ENABLED(CONFIG_BOOK3S_601))

	if (IS_ENABLED(CONFIG_PPC_BOOK3S_601))

		return 0;



	return mftb();