]> www.infradead.org Git - users/willy/xarray.git/commitdiff
powerpc/vdso: Inconditionally use CFUNC macro
authorChristophe Leroy <christophe.leroy@csgroup.eu>
Thu, 22 Aug 2024 08:00:29 +0000 (10:00 +0200)
committerMichael Ellerman <mpe@ellerman.id.au>
Fri, 30 Aug 2024 11:31:04 +0000 (21:31 +1000)
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
arch/powerpc/kernel/vdso/gettimeofday.S

index 48fc6658053aa4f1eefc23ebb9c086af17b0eeb6..894cb939cd2b314d8704b26c407b529c77c85921 100644 (file)
        .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)