diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2022-06-30 12:19:47 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2022-07-02 16:41:12 +0200 |
| commit | edbaf6e5e93acda96aae23ba134ef3c1466da3b5 (patch) | |
| tree | a2d65e2d9f2afcf9c8e49ff01171afc8e3722d7d | |
| parent | f4a80ec8c51d68be4b7a7830c510f75080c5e417 (diff) | |
| download | linux-edbaf6e5e93acda96aae23ba134ef3c1466da3b5.tar.gz linux-edbaf6e5e93acda96aae23ba134ef3c1466da3b5.tar.bz2 linux-edbaf6e5e93acda96aae23ba134ef3c1466da3b5.zip | |
x86, kvm: use proper ASM macros for kvm_vcpu_is_preempted
The build rightfully complains about:
arch/x86/kernel/kvm.o: warning: objtool: __raw_callee_save___kvm_vcpu_is_preempted()+0x12: missing int3 after ret
because the ASM_RET call is not being used correctly in kvm_vcpu_is_preempted().
This was hand-fixed-up in the kvm merge commit a4cfff3f0f8c ("Merge branch
'kvm-older-features' into HEAD") which of course can not be backported to
stable kernels, so just fix this up directly instead.
Cc: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | arch/x86/kernel/kvm.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/kernel/kvm.c b/arch/x86/kernel/kvm.c index 9e3af56747e8..eba6485a59a3 100644 --- a/arch/x86/kernel/kvm.c +++ b/arch/x86/kernel/kvm.c @@ -948,7 +948,7 @@ asm( "movq __per_cpu_offset(,%rdi,8), %rax;" "cmpb $0, " __stringify(KVM_STEAL_TIME_preempted) "+steal_time(%rax);" "setne %al;" -"ret;" +ASM_RET ".size __raw_callee_save___kvm_vcpu_is_preempted, .-__raw_callee_save___kvm_vcpu_is_preempted;" ".popsection"); |