Merge branches 'for-4.11/upstream-fixes', 'for-4.12/accutouch', 'for-4.12/cp2112...

[mirror_ubuntu-artful-kernel.git] / arch / x86 / xen / apic.c

diff --git a/arch/x86/xen/apic.c b/arch/x86/xen/apic.c
index 44c88ad1841a3696a7225965f16760820bea938a..bcea81f36fc5fdb7e0abae26be7e1d90f57af594 100644 (file)
--- a/arch/x86/xen/apic.c
+++ b/arch/x86/xen/apic.c
@@ -145,7 +145,7 @@ static void xen_silent_inquire(int apicid)
 static int xen_cpu_present_to_apicid(int cpu)
 {
        if (cpu_present(cpu))
-               return xen_get_apic_id(xen_apic_read(APIC_ID));
+               return cpu_data(cpu).apicid;
        else
                return BAD_APICID;
 }