openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

powerpc/time: Make get_tb() common to PPC32 and PPC64 

mftbu() is always defined now, so the #ifdef can be removed
and replaced by an IS_ENABLED(CONFIG_PPC64) inside the
PPC32 version of get_tb().

Signed-off-by: Christophe Leroy <christophe.leroy@csgroup.eu>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
Link: https://lore.kernel.org/r/47e49717d2643169ffcbe5d507f184cf49f0fe95.1601556145.git.christophe.leroy@csgroup.eu
This commit is contained in:
Christophe Leroy 2020-10-01 12:42:44 +00:00 committed by Michael Ellerman
parent 1156a6285c
commit 9686e431c6
1 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
arch/powerpc/include/asm/time.h
View File

@ -53,16 +53,13 @@ static inline u64 get_vtb(void)
return 0; return 0;
} }
#ifdef CONFIG_PPC64
static inline u64 get_tb(void)
{
return mftb();
}
#else /* CONFIG_PPC64 */
static inline u64 get_tb(void) static inline u64 get_tb(void)
{ {
unsigned int tbhi, tblo, tbhi2; unsigned int tbhi, tblo, tbhi2;
if (IS_ENABLED(CONFIG_PPC64))
return mftb();
do { do {
tbhi = mftbu(); tbhi = mftbu();
tblo = mftb(); tblo = mftb();
@ -71,7 +68,6 @@ static inline u64 get_tb(void)
return ((u64)tbhi << 32) | tblo; return ((u64)tbhi << 32) | tblo;
} }
#endif /* !CONFIG_PPC64 */
static inline void set_tb(unsigned int upper, unsigned int lower) static inline void set_tb(unsigned int upper, unsigned int lower)
{ {