diff options
| author | Christophe Leroy <christophe.leroy@csgroup.eu> | 2024-08-22 10:00:29 +0200 |
|---|---|---|
| committer | Michael Ellerman <mpe@ellerman.id.au> | 2024-08-30 21:31:04 +1000 |
| commit | 65948b0e716a47382731889ee6bbb18642b8b003 (patch) | |
| tree | 7262221835ffa015d4b57d82a4334d79c9751715 | |
| parent | dca5b1d69aea36ab559d9ca13729370007c60df1 (diff) | |
powerpc/vdso: Inconditionally use CFUNC macro
During merge of commit 4e991e3c16a3 ("powerpc: add CFUNC assembly
label annotation") a fallback version of CFUNC macro was added at
the last minute, so it can be used inconditionally.
Fixes: 4e991e3c16a3 ("powerpc: add CFUNC assembly label annotation")
Signed-off-by: Christophe Leroy <christophe.leroy@csgroup.eu>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
Link: https://msgid.link/0fa863f2f69b2ca4094ae066fcf1430fb31110c9.1724313540.git.christophe.leroy@csgroup.eu
| -rw-r--r-- | arch/powerpc/kernel/vdso/gettimeofday.S | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/arch/powerpc/kernel/vdso/gettimeofday.S b/arch/powerpc/kernel/vdso/gettimeofday.S index 48fc6658053a..894cb939cd2b 100644 --- a/arch/powerpc/kernel/vdso/gettimeofday.S +++ b/arch/powerpc/kernel/vdso/gettimeofday.S @@ -38,11 +38,7 @@ .else addi r4, r5, VDSO_DATA_OFFSET .endif -#ifdef __powerpc64__ bl CFUNC(DOTSYM(\funct)) -#else - bl \funct -#endif PPC_LL r0, PPC_MIN_STKFRM + PPC_LR_STKOFF(r1) #ifdef __powerpc64__ PPC_LL r2, PPC_MIN_STKFRM + STK_GOT(r1) |