Skip to content

Commit eb316ae

Browse files
committed
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: Michael Ellerman <[email protected]> Link: https://lore.kernel.org/r/[email protected]
1 parent 7a26c95 commit eb316ae

File tree

3 files changed

+14
-13
lines changed

3 files changed

+14
-13
lines changed

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

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -55,19 +55,6 @@ struct kvm_vcpu;
5555
void _kvmppc_restore_tm_pr(struct kvm_vcpu *vcpu, u64 guest_msr);
5656
void _kvmppc_save_tm_pr(struct kvm_vcpu *vcpu, u64 guest_msr);
5757

58-
/* Patch sites */
59-
extern s32 patch__call_flush_branch_caches1;
60-
extern s32 patch__call_flush_branch_caches2;
61-
extern s32 patch__call_flush_branch_caches3;
62-
extern s32 patch__flush_count_cache_return;
63-
extern s32 patch__flush_link_stack_return;
64-
extern s32 patch__call_kvm_flush_link_stack;
65-
extern s32 patch__call_kvm_flush_link_stack_p9;
66-
extern s32 patch__memset_nocache, patch__memcpy_nocache;
67-
68-
extern long flush_branch_caches;
69-
extern long kvm_flush_link_stack;
70-
7158
#ifdef CONFIG_PPC_TRANSACTIONAL_MEM
7259
void kvmppc_save_tm_hv(struct kvm_vcpu *vcpu, u64 msr, bool preserve_nv);
7360
void kvmppc_restore_tm_hv(struct kvm_vcpu *vcpu, u64 msr, bool preserve_nv);

arch/powerpc/include/asm/sections.h

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,19 @@ typedef struct func_desc func_desc_t;
1414

1515
extern char __head_end[];
1616

17+
/* Patch sites */
18+
extern s32 patch__call_flush_branch_caches1;
19+
extern s32 patch__call_flush_branch_caches2;
20+
extern s32 patch__call_flush_branch_caches3;
21+
extern s32 patch__flush_count_cache_return;
22+
extern s32 patch__flush_link_stack_return;
23+
extern s32 patch__call_kvm_flush_link_stack;
24+
extern s32 patch__call_kvm_flush_link_stack_p9;
25+
extern s32 patch__memset_nocache, patch__memcpy_nocache;
26+
27+
extern long flush_branch_caches;
28+
extern long kvm_flush_link_stack;
29+
1730
#ifdef __powerpc64__
1831

1932
extern char __start_interrupts[];

arch/powerpc/kernel/security.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
#include <asm/asm-prototypes.h>
1717
#include <asm/code-patching.h>
1818
#include <asm/security_features.h>
19+
#include <asm/sections.h>
1920
#include <asm/setup.h>
2021
#include <asm/inst.h>
2122

0 commit comments

Comments
 (0)