diff options
| author | Christophe Leroy <christophe.leroy@csgroup.eu> | 2022-01-21 16:30:27 +0000 |
|---|---|---|
| committer | Michael Ellerman <mpe@ellerman.id.au> | 2022-02-12 22:47:43 +1100 |
| commit | fd1feade75fb1a9275c39d76c5ccdbbbe6b37aa3 (patch) | |
| tree | 6f34bdf2144d5a3ea59ee140bac7ac29fb3adde3 /arch/powerpc/kernel/vdso32/getcpu.S | |
| parent | d88378d8d2c776154c6b606f2a423a81d7795f6f (diff) | |
powerpc/vdso: Merge vdso64 and vdso32 into a single directory
merge vdso64 into vdso32 and rename it vdso.
Reported-by: kernel test robot <lkp@intel.com>
Signed-off-by: Christophe Leroy <christophe.leroy@csgroup.eu>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
Link: https://lore.kernel.org/r/4dbe05cc130f6a0858d09ac72e436c373cb08b70.1642782130.git.christophe.leroy@csgroup.eu
Diffstat (limited to 'arch/powerpc/kernel/vdso32/getcpu.S')
| -rw-r--r-- | arch/powerpc/kernel/vdso32/getcpu.S | 50 |
1 files changed, 0 insertions, 50 deletions
diff --git a/arch/powerpc/kernel/vdso32/getcpu.S b/arch/powerpc/kernel/vdso32/getcpu.S deleted file mode 100644 index 8e08ccf19062..000000000000 --- a/arch/powerpc/kernel/vdso32/getcpu.S +++ /dev/null @@ -1,50 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0-or-later */ -/* - * - * Copyright (C) IBM Corporation, 2012 - * - * Author: Anton Blanchard <anton@au.ibm.com> - */ -#include <asm/ppc_asm.h> -#include <asm/vdso.h> - - .text -/* - * Exact prototype of getcpu - * - * int __kernel_getcpu(unsigned *cpu, unsigned *node); - * - */ -#if defined(CONFIG_PPC64) -V_FUNCTION_BEGIN(__kernel_getcpu) - .cfi_startproc - mfspr r5,SPRN_SPRG_VDSO_READ - PPC_LCMPI cr0,r3,0 - PPC_LCMPI cr1,r4,0 - clrlwi r6,r5,16 - rlwinm r7,r5,16,31-15,31-0 - beq cr0,1f - stw r6,0(r3) -1: crclr cr0*4+so - li r3,0 /* always success */ - beqlr cr1 - stw r7,0(r4) - blr - .cfi_endproc -V_FUNCTION_END(__kernel_getcpu) -#elif !defined(CONFIG_SMP) -V_FUNCTION_BEGIN(__kernel_getcpu) - .cfi_startproc - cmpwi cr0, r3, 0 - cmpwi cr1, r4, 0 - li r5, 0 - beq cr0, 1f - stw r5, 0(r3) -1: li r3, 0 /* always success */ - crclr cr0*4+so - beqlr cr1 - stw r5, 0(r4) - blr - .cfi_endproc -V_FUNCTION_END(__kernel_getcpu) -#endif |