| From 715dbd33ef4fa28e32ca2d7731ea3645c78a1e6a Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Fri, 24 Jul 2020 23:17:24 +1000 |
| Subject: powerpc/32s: Fix CONFIG_BOOK3S_601 uses |
| |
| From: Michael Ellerman <mpe@ellerman.id.au> |
| |
| [ 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> |
| --- |
| arch/powerpc/include/asm/ptrace.h | 2 +- |
| arch/powerpc/include/asm/timex.h | 2 +- |
| 2 files changed, 2 insertions(+), 2 deletions(-) |
| |
| diff --git a/arch/powerpc/include/asm/ptrace.h b/arch/powerpc/include/asm/ptrace.h |
| index e0195e6b892bc..71ade62fb8975 100644 |
| --- a/arch/powerpc/include/asm/ptrace.h |
| +++ b/arch/powerpc/include/asm/ptrace.h |
| @@ -206,7 +206,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) |
| diff --git a/arch/powerpc/include/asm/timex.h b/arch/powerpc/include/asm/timex.h |
| index d2d2c4bd84358..6047402b0a4db 100644 |
| --- a/arch/powerpc/include/asm/timex.h |
| +++ b/arch/powerpc/include/asm/timex.h |
| @@ -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(); |
| -- |
| 2.25.1 |
| |
