Commit adb759e5 authored by Peter Zijlstra's avatar Peter Zijlstra Committed by Paolo Bonzini
Browse files

x86,kvm/xen: Remove superfluous .fixup usage 



Commit 14243b38 ("KVM: x86/xen: Add KVM_IRQ_ROUTING_XEN_EVTCHN and
event channel delivery") adds superfluous .fixup usage after the whole
.fixup section was removed in commit e5eefda5 ("x86: Remove .fixup
section").

Fixes: 14243b38 ("KVM: x86/xen: Add KVM_IRQ_ROUTING_XEN_EVTCHN and event channel delivery")
Reported-by: default avatarBorislav Petkov <bp@alien8.de>
Signed-off-by: default avatarPeter Zijlstra (Intel) <peterz@infradead.org>
Message-Id: <20220123124219.GH20638@worktop.programming.kicks-ass.net>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent 94fea1d8

arch/x86/kvm/xen.c

+2 −8
Original line number Diff line number Diff line
@@ -316,10 +316,7 @@ int __kvm_xen_has_interrupt(struct kvm_vcpu *v) 
				     "\tnotq %0\n"

				     "\t" LOCK_PREFIX "andq %0, %2\n"

				     "2:\n"

				     "\t.section .fixup,\"ax\"\n"

				     "3:\tjmp\t2b\n"

				     "\t.previous\n"

				     _ASM_EXTABLE_UA(1b, 3b)

				     _ASM_EXTABLE_UA(1b, 2b)

				     : "=r" (evtchn_pending_sel),

				       "+m" (vi->evtchn_pending_sel),

				       "+m" (v->arch.xen.evtchn_pending_sel)
@@ -335,10 +332,7 @@ int __kvm_xen_has_interrupt(struct kvm_vcpu *v) 
				     "\tnotl %0\n"

				     "\t" LOCK_PREFIX "andl %0, %2\n"

				     "2:\n"

				     "\t.section .fixup,\"ax\"\n"

				     "3:\tjmp\t2b\n"

				     "\t.previous\n"

				     _ASM_EXTABLE_UA(1b, 3b)

				     _ASM_EXTABLE_UA(1b, 2b)

				     : "=r" (evtchn_pending_sel32),

				       "+m" (vi->evtchn_pending_sel),

				       "+m" (v->arch.xen.evtchn_pending_sel)