X-Git-Url: http://git.monstr.eu/?p=linux-2.6-microblaze.git;a=blobdiff_plain;f=arch%2Fx86%2Fkernel%2Fkvm.c;h=d0bb2b3fb305f92e1254152764dc5c7e785cea1c;hp=774d924aeda8d386a3a62ac41f17857610755b54;hb=a4cfff3f0f8c07f1f7873a82bdeb3995807dac8c;hpb=8d5678a76689acbf91245a3791fe853ab773090f diff --git a/arch/x86/kernel/kvm.c b/arch/x86/kernel/kvm.c index 774d924aeda8..d0bb2b3fb305 100644 --- a/arch/x86/kernel/kvm.c +++ b/arch/x86/kernel/kvm.c @@ -778,10 +778,11 @@ asm( ".global __raw_callee_save___kvm_vcpu_is_preempted;" ".type __raw_callee_save___kvm_vcpu_is_preempted, @function;" "__raw_callee_save___kvm_vcpu_is_preempted:" +ASM_ENDBR "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");