do_entry_int82() is only called by assembly so gains asmlinkage. pvh_start_info_pa and early_hypercall_insn are data used by assembly, and need a SAF-1 annotation.
For the remaining SAF-1 anntations on functions, convert them to asmlinkage for consistency. No functional change. Signed-off-by: Andrew Cooper <[email protected]> --- CC: Jan Beulich <[email protected]> CC: Roger Pau Monné <[email protected]> CC: Stefano Stabellini <[email protected]> CC: Julien Grall <[email protected]> CC: Volodymyr Babchuk <[email protected]> CC: Bertrand Marquis <[email protected]> CC: Michal Orzel <[email protected]> CC: [email protected] <[email protected]> CC: Nicola Vetrini <[email protected]> --- xen/arch/x86/boot/cmdline.c | 3 +-- xen/arch/x86/boot/reloc.c | 3 +-- xen/arch/x86/guest/xen/pvh-boot.c | 2 +- xen/arch/x86/guest/xen/xen.c | 2 +- xen/arch/x86/pv/hypercall.c | 2 +- xen/arch/x86/traps.c | 3 +-- 6 files changed, 6 insertions(+), 9 deletions(-) diff --git a/xen/arch/x86/boot/cmdline.c b/xen/arch/x86/boot/cmdline.c index 196c580e9151..5db5c7b20bf6 100644 --- a/xen/arch/x86/boot/cmdline.c +++ b/xen/arch/x86/boot/cmdline.c @@ -334,8 +334,7 @@ static void vga_parse(const char *cmdline, early_boot_opts_t *ebo) } #endif -/* SAF-1-safe */ -void cmdline_parse_early(const char *cmdline, early_boot_opts_t *ebo) +void asmlinkage cmdline_parse_early(const char *cmdline, early_boot_opts_t *ebo) { if ( !cmdline ) return; diff --git a/xen/arch/x86/boot/reloc.c b/xen/arch/x86/boot/reloc.c index 7a375ad41c1c..82c2d237aab6 100644 --- a/xen/arch/x86/boot/reloc.c +++ b/xen/arch/x86/boot/reloc.c @@ -346,8 +346,7 @@ static multiboot_info_t *mbi2_reloc(uint32_t mbi_in, memctx *ctx) return mbi_out; } -/* SAF-1-safe */ -void *reloc(uint32_t magic, uint32_t in) +void *asmlinkage reloc(uint32_t magic, uint32_t in) { memctx ctx = { trampoline_phys + TRAMPOLINE_HEAP_END }; diff --git a/xen/arch/x86/guest/xen/pvh-boot.c b/xen/arch/x86/guest/xen/pvh-boot.c index e14d7e20e942..8d8f4a34e445 100644 --- a/xen/arch/x86/guest/xen/pvh-boot.c +++ b/xen/arch/x86/guest/xen/pvh-boot.c @@ -22,7 +22,7 @@ /* Initialised in head.S, before .bss is zeroed. */ bool __initdata pvh_boot; -uint32_t __initdata pvh_start_info_pa; +uint32_t __initdata pvh_start_info_pa; /* SAF-1-safe */ static multiboot_info_t __initdata pvh_mbi; static module_t __initdata pvh_mbi_mods[8]; diff --git a/xen/arch/x86/guest/xen/xen.c b/xen/arch/x86/guest/xen/xen.c index 315e5ded05ab..8e13c2fbf307 100644 --- a/xen/arch/x86/guest/xen/xen.c +++ b/xen/arch/x86/guest/xen/xen.c @@ -40,7 +40,7 @@ DEFINE_PER_CPU(struct vcpu_info *, vcpu_info); * 0 vmcall * > 0 vmmcall */ -int8_t __initdata early_hypercall_insn = -1; +int8_t __initdata early_hypercall_insn = -1; /* SAF-1-safe */ /* * Called once during the first hypercall to figure out which instruction to diff --git a/xen/arch/x86/pv/hypercall.c b/xen/arch/x86/pv/hypercall.c index 17581d232e19..b3b9a3255531 100644 --- a/xen/arch/x86/pv/hypercall.c +++ b/xen/arch/x86/pv/hypercall.c @@ -180,7 +180,7 @@ void pv_ring1_init_hypercall_page(void *p) } } -void do_entry_int82(struct cpu_user_regs *regs) +void asmlinkage do_entry_int82(struct cpu_user_regs *regs) { if ( unlikely(untrusted_msi) ) check_for_unexpected_msi((uint8_t)regs->entry_vector); diff --git a/xen/arch/x86/traps.c b/xen/arch/x86/traps.c index 3c01c5eb53b5..29ea6054abab 100644 --- a/xen/arch/x86/traps.c +++ b/xen/arch/x86/traps.c @@ -1336,8 +1336,7 @@ void asmlinkage do_int3(struct cpu_user_regs *regs) pv_inject_hw_exception(X86_EXC_BP, X86_EVENT_NO_EC); } -/* SAF-1-safe */ -void do_general_protection(struct cpu_user_regs *regs) +void asmlinkage do_general_protection(struct cpu_user_regs *regs) { #ifdef CONFIG_PV struct vcpu *v = current; -- 2.39.5
