powerpc/vdso: Inconditionally use CFUNC macro

BugLink: https://bugs.launchpad.net/bugs/2089340

[ Upstream commit 65948b0e716a47382731889ee6bbb18642b8b003 ]

During merge of commit 4e991e3c16 ("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: 4e991e3c16 ("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
Signed-off-by: Sasha Levin <sashal@kernel.org>
Signed-off-by: Portia Stephens <portia.stephens@canonical.com>
Signed-off-by: Stefan Bader <stefan.bader@canonical.com>

This commit is contained in:

Christophe Leroy

2024-08-22 10:00:29 +02:00

committed by

Mehmet Basaran

parent 060ce10848

commit e12f226072

1 changed files with 0 additions and 4 deletions

									
										arch/powerpc/kernel/vdso/gettimeofday.S
									
		-4
	
												View File
												
				@@ -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)