Re: [PATCH 5/9] powerpc/32s: Fix CONFIG_BOOK3S_601 uses
From: Christophe Leroy <hidden>
Date: 2020-07-24 18:43:21
Michael Ellerman [off-list ref] a écrit :
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>
---
I think the bug in get_cycles() at least demonstrates that no one has
booted a 601 since v5.4. Time to drop 601?Would be great. I can submit a patch for that in August. Christophe
quoted hunk ↗ jump to hunk
--- 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.hb/arch/powerpc/include/asm/ptrace.h index f194339cef3b..155a197c0aa1 100644--- a/arch/powerpc/include/asm/ptrace.h +++ b/arch/powerpc/include/asm/ptrace.h@@ -243,7 +243,7 @@ static inline void set_trap_norestart(structpt_regs *regs) } #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.hb/arch/powerpc/include/asm/timex.h index d2d2c4bd8435..6047402b0a4d 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