Commit 0fa07576 authored by Thomas Gleixner's avatar Thomas Gleixner Committed by Dave Hansen
Browse files

x86/apic: Wrap apic->native_eoi() into a helper 



Prepare for converting the hotpath APIC callbacks to static calls.

Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
Signed-off-by: default avatarDave Hansen <dave.hansen@linux.intel.com>
Acked-by: default avatarPeter Zijlstra (Intel) <peterz@infradead.org>
Tested-by: default avatarMichael Kelley <mikelley@microsoft.com>
Tested-by: default avatarSohil Mehta <sohil.mehta@intel.com>
Tested-by: Juergen Gross <jgross@suse.com> # Xen PV (dom0 and unpriv. guest)
parent 670c04ad

arch/x86/include/asm/apic.h

+6 −0
Original line number Diff line number Diff line
@@ -359,6 +359,11 @@ static inline void apic_eoi(void) 
	apic->eoi();

}



static inline void apic_native_eoi(void)

{

	apic->native_eoi();

}



static inline u64 apic_icr_read(void)

{

	return apic->icr_read();
@@ -397,6 +402,7 @@ static inline void apic_icr_write(u32 low, u32 high) { } 
static inline void apic_wait_icr_idle(void) { }

static inline u32 safe_apic_wait_icr_idle(void) { return 0; }

static inline void apic_set_eoi_cb(void (*eoi)(void)) {}

static inline void apic_native_eoi(void) { WARN_ON_ONCE(1); }



#endif /* CONFIG_X86_LOCAL_APIC */

arch/x86/kernel/kvm.c

+1 −1
Original line number Diff line number Diff line
@@ -343,7 +343,7 @@ static notrace void kvm_guest_apic_eoi_write(void) 
	 */

	if (__test_and_clear_bit(KVM_PV_EOI_BIT, this_cpu_ptr(&kvm_apic_eoi)))

		return;

	apic->native_eoi();

	apic_native_eoi();

}



static void kvm_guest_cpu_init(void)