Commit eb316ae7 authored by Michael Ellerman's avatar Michael Ellerman
Browse files

powerpc: Move patch sites out of asm-prototypes.h 



The definitions for the patch sites etc. don't belong in
asm-prototypes.h, they are not EXPORT'ed asm symbols.

Move them into sections.h which is traditionally used for asm symbols.

Signed-off-by: default avatarMichael Ellerman <mpe@ellerman.id.au>
Link: https://lore.kernel.org/r/20220818050659.187181-1-mpe@ellerman.id.au
parent 7a26c952

arch/powerpc/include/asm/asm-prototypes.h

+0 −13
Original line number Diff line number Diff line
@@ -55,19 +55,6 @@ struct kvm_vcpu; 
void _kvmppc_restore_tm_pr(struct kvm_vcpu *vcpu, u64 guest_msr);

void _kvmppc_save_tm_pr(struct kvm_vcpu *vcpu, u64 guest_msr);



/* Patch sites */

extern s32 patch__call_flush_branch_caches1;

extern s32 patch__call_flush_branch_caches2;

extern s32 patch__call_flush_branch_caches3;

extern s32 patch__flush_count_cache_return;

extern s32 patch__flush_link_stack_return;

extern s32 patch__call_kvm_flush_link_stack;

extern s32 patch__call_kvm_flush_link_stack_p9;

extern s32 patch__memset_nocache, patch__memcpy_nocache;



extern long flush_branch_caches;

extern long kvm_flush_link_stack;



#ifdef CONFIG_PPC_TRANSACTIONAL_MEM

void kvmppc_save_tm_hv(struct kvm_vcpu *vcpu, u64 msr, bool preserve_nv);

void kvmppc_restore_tm_hv(struct kvm_vcpu *vcpu, u64 msr, bool preserve_nv);

arch/powerpc/include/asm/sections.h

+13 −0
Original line number Diff line number Diff line
@@ -14,6 +14,19 @@ typedef struct func_desc func_desc_t; 


extern char __head_end[];



/* Patch sites */

extern s32 patch__call_flush_branch_caches1;

extern s32 patch__call_flush_branch_caches2;

extern s32 patch__call_flush_branch_caches3;

extern s32 patch__flush_count_cache_return;

extern s32 patch__flush_link_stack_return;

extern s32 patch__call_kvm_flush_link_stack;

extern s32 patch__call_kvm_flush_link_stack_p9;

extern s32 patch__memset_nocache, patch__memcpy_nocache;



extern long flush_branch_caches;

extern long kvm_flush_link_stack;



#ifdef __powerpc64__



extern char __start_interrupts[];

arch/powerpc/kernel/security.c

+1 −0
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ 
#include <asm/asm-prototypes.h>

#include <asm/code-patching.h>

#include <asm/security_features.h>

#include <asm/sections.h>

#include <asm/setup.h>

#include <asm/inst.h>