projects
/
linux.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
e8d5bf3
)
powerpc/time: Make get_tbl() common to PPC32 and PPC64
author
Christophe Leroy
<christophe.leroy@csgroup.eu>
Thu, 1 Oct 2020 12:42:43 +0000
(12:42 +0000)
committer
Michael Ellerman
<mpe@ellerman.id.au>
Thu, 8 Oct 2020 10:17:16 +0000
(21:17 +1100)
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
arch/powerpc/include/asm/time.h
patch
|
blob
|
history
diff --git
a/arch/powerpc/include/asm/time.h
b/arch/powerpc/include/asm/time.h
index 3dd2deb623da14c0ad0b2228b09ee8454cccec4f..6ec0409d10f43fba671fb12d9a5564a2f676b7ce 100644
(file)
--- 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)
{