From: Michael Ellerman <mpe@ellerman.id.au>
To: linuxppc-dev@ozlabs.org
Subject: [PATCH 5/9] powerpc/32s: Fix CONFIG_BOOK3S_601 uses
Date: Fri, 24 Jul 2020 23:17:24 +1000 [thread overview]
Message-ID: <20200724131728.1643966-5-mpe@ellerman.id.au> (raw)
In-Reply-To: <20200724131728.1643966-1-mpe@ellerman.id.au>
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?
---
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 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(struct pt_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.h b/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
next prev parent reply other threads:[~2020-07-24 14:01 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-07-24 13:17 [PATCH 1/9] powerpc/configs: Drop old symbols from ppc6xx_defconfig Michael Ellerman
2020-07-24 13:17 ` [PATCH 2/9] powerpc/configs: Remove dead symbols Michael Ellerman
2020-07-24 13:17 ` [PATCH 3/9] powerpc/52xx: Fix comment about CONFIG_BDI* Michael Ellerman
2020-07-24 13:17 ` [PATCH 4/9] powerpc/64e: Drop dead BOOK3E_MMU_TLB_STATS code Michael Ellerman
2020-07-24 13:17 ` Michael Ellerman [this message]
2020-07-24 18:42 ` [PATCH 5/9] powerpc/32s: Fix CONFIG_BOOK3S_601 uses Christophe Leroy
2020-07-24 13:17 ` [PATCH 6/9] powerpc/32s: Remove TAUException wart in traps.c Michael Ellerman
2020-07-24 13:17 ` [PATCH 7/9] powerpc/boot: Fix CONFIG_PPC_MPC52XX references Michael Ellerman
2020-07-24 13:17 ` [PATCH 8/9] powerpc/kvm: Use correct CONFIG symbol in comment Michael Ellerman
2020-07-24 13:17 ` [PATCH 9/9] powerpc: Drop old comment about CONFIG_POWER Michael Ellerman
2020-07-30 12:50 ` [PATCH 1/9] powerpc/configs: Drop old symbols from ppc6xx_defconfig Michael Ellerman
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200724131728.1643966-5-mpe@ellerman.id.au \
--to=mpe@ellerman.id.au \
--cc=linuxppc-dev@ozlabs.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.