[xen master] x86/vpmu: Fix build following vmfork addition

[patchbot@xxxxxxx]

commit b1f0183e5067fbcb87517795e27929982b2404fb
Author:     Andrew Cooper <andrew.cooper3@xxxxxxxxxx>
AuthorDate: Tue Jul 26 14:11:33 2022 +0100
Commit:     Andrew Cooper <andrew.cooper3@xxxxxxxxxx>
CommitDate: Tue Jul 26 15:09:48 2022 +0100

    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 <andrew.cooper3@xxxxxxxxxx>
    Reviewed-by: Jan Beulich <jbeulich@xxxxxxxx>
---
 xen/arch/x86/include/asm/vpmu.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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);
 
--
generated by git-patchbot for /home/xen/git/xen.git#master