From: Andrew Cooper Date: Tue, 26 Jul 2022 13:11:33 +0000 (+0100) Subject: x86/vpmu: Fix build following vmfork addition X-Git-Tag: 4.17.0-rc1~223 X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=b1f0183e5067fbcb87517795e27929982b2404fb;p=xen.git x86/vpmu: Fix build following vmfork addition GCC with IBT extensions complains: arch/x86/cpu/vpmu.c:351:15: error: conflicting types for 'vpmu_save_force'; have 'void(void *)' with implied 'nocf_check' attribute 351 | void cf_check vpmu_save_force(void *arg) | ^~~~~~~~~~~~~~~ In file included from ./arch/x86/include/asm/domain.h:10, from ./include/xen/domain.h:8, from ./include/xen/sched.h:11, from ./include/xen/event.h:12, from arch/x86/cpu/vpmu.c:23: ./arch/x86/include/asm/vpmu.h:117:6: note: previous declaration of 'vpmu_save_force' with type 'void(void *)' 117 | void vpmu_save_force(void *arg); | ^~~~~~~~~~~~~~~ Adjust the declaraion. Fixes: 755087eb9b10 ("xen/mem_sharing: support forks with active vPMU state") Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich --- diff --git a/xen/arch/x86/include/asm/vpmu.h b/xen/arch/x86/include/asm/vpmu.h index 8a3ae11562..05e1fbfccf 100644 --- a/xen/arch/x86/include/asm/vpmu.h +++ b/xen/arch/x86/include/asm/vpmu.h @@ -114,7 +114,7 @@ void vpmu_do_interrupt(struct cpu_user_regs *regs); void vpmu_initialise(struct vcpu *v); void vpmu_destroy(struct vcpu *v); void vpmu_save(struct vcpu *v); -void vpmu_save_force(void *arg); +void cf_check vpmu_save_force(void *arg); int vpmu_load(struct vcpu *v, bool_t from_guest); void vpmu_dump(struct vcpu *v);