summaryrefslogtreecommitdiffstats
path: root/arch/powerpc/include/asm
diff options
context:
space:
mode:
authorChristophe Leroy <christophe.leroy@csgroup.eu>2020-10-01 12:42:43 +0000
committerMichael Ellerman <mpe@ellerman.id.au>2020-10-08 21:17:16 +1100
commit1156a6285cd38e5a6987ddee3758e7954c56cb3d (patch)
tree555c7e1db76d521bcaf7cb2623db1e8bca841c75 /arch/powerpc/include/asm
parente8d5bf30eafc37e31ce68bc7ccf1db970fe3cd04 (diff)
downloadlinux-1156a6285cd38e5a6987ddee3758e7954c56cb3d.tar.bz2
powerpc/time: Make get_tbl() common to PPC32 and PPC64
On PPC64, get_tbl() is defined as an alias of get_tb() which return the result of mftb(). That exactly the same as what the PPC32 version does. We don't need two versions. Remove the PPC64 definition of get_tbl() and use the PPC32 version for both. Signed-off-by: Christophe Leroy <christophe.leroy@csgroup.eu> Signed-off-by: Michael Ellerman <mpe@ellerman.id.au> Link: https://lore.kernel.org/r/a8eaabb87d69534e533ebac805163e08146e05bd.1601556145.git.christophe.leroy@csgroup.eu
Diffstat (limited to 'arch/powerpc/include/asm')
-rw-r--r--arch/powerpc/include/asm/time.h7
1 files changed, 0 insertions, 7 deletions
diff --git a/arch/powerpc/include/asm/time.h b/arch/powerpc/include/asm/time.h
index 3dd2deb623da..6ec0409d10f4 100644
--- a/arch/powerpc/include/asm/time.h
+++ b/arch/powerpc/include/asm/time.h
@@ -38,18 +38,11 @@ struct div_result {
u64 result_low;
};
-#ifdef CONFIG_PPC64
-
/* For compatibility, get_tbl() is defined as get_tb() on ppc64 */
-#define get_tbl get_tb
-
-#else
-
static inline unsigned long get_tbl(void)
{
return mftb();
}
-#endif /* !CONFIG_PPC64 */
static inline u64 get_vtb(void)
{