iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

powerpc/32s: Fix CONFIG_BOOK3S_601 uses

Browse Source 
[ 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: 12c3f1fd87bf ("powerpc/32s: get rid of CPU_FTR_601 feature")
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
Link: https://lore.kernel.org/r/20200724131728.1643966-5-mpe@ellerman.id.au
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
Michael Ellerman 2020-07-24 23:17:24 +10:00 committed by Greg Kroah-Hartman
parent 09c2050239
commit 69a797a045
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arch/powerpc/include/asm/ptrace.h
View File

@ -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)

2
arch/powerpc/include/asm/timex.h
View File

@ -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();