| Message ID | 20230823055317.751786-2-mpe@ellerman.id.au (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 9a6c05fe9a998386a61b5e70ce07d31ec47a01a0 |
| Headers | show |
| Series | [1/4] powerpc/pseries: Move VPHN constants into vphn.h | expand |
diff --git a/arch/powerpc/include/asm/dtl.h b/arch/powerpc/include/asm/dtl.h index 4bcb9f9ac764..d6f43d149f8d 100644 --- a/arch/powerpc/include/asm/dtl.h +++ b/arch/powerpc/include/asm/dtl.h @@ -39,6 +39,5 @@ extern rwlock_t dtl_access_lock; extern void register_dtl_buffer(int cpu); extern void alloc_dtl_buffers(unsigned long *time_limit); -extern long hcall_vphn(unsigned long cpu, u64 flags, __be32 *associativity); #endif /* _ASM_POWERPC_DTL_H */ diff --git a/arch/powerpc/include/asm/lppaca.h b/arch/powerpc/include/asm/lppaca.h index 12159e5b6888..27f0421188ec 100644 --- a/arch/powerpc/include/asm/lppaca.h +++ b/arch/powerpc/include/asm/lppaca.h @@ -127,8 +127,6 @@ struct slb_shadow { } save_area[SLB_NUM_BOLTED]; } ____cacheline_aligned; -extern long hcall_vphn(unsigned long cpu, u64 flags, __be32 *associativity); - #endif /* CONFIG_PPC_BOOK3S */ #endif /* __KERNEL__ */ #endif /* _ASM_POWERPC_LPPACA_H */ diff --git a/arch/powerpc/include/asm/vphn.h b/arch/powerpc/include/asm/vphn.h index e0970603fce2..8c2f795eea68 100644 --- a/arch/powerpc/include/asm/vphn.h +++ b/arch/powerpc/include/asm/vphn.h @@ -19,4 +19,6 @@ #define VPHN_FLAG_VCPU 1 #define VPHN_FLAG_PCPU 2 +long hcall_vphn(unsigned long cpu, u64 flags, __be32 *associativity); + #endif // _ASM_POWERPC_VPHN_H
Consolidate the two prototypes for hcall_vphn() into vphn.h. Signed-off-by: Michael Ellerman <mpe@ellerman.id.au> --- arch/powerpc/include/asm/dtl.h | 1 - arch/powerpc/include/asm/lppaca.h | 2 -- arch/powerpc/include/asm/vphn.h | 2 ++ 3 files changed, 2 insertions(+), 3 deletions(-)