Merge branch 'WIP.x86/asm' into x86/urgent, because the topic is ready

[linux-2.6-block.git] / arch / x86 / xen / apic.c

diff --git a/arch/x86/xen/apic.c b/arch/x86/xen/apic.c
index 2fa79e2e73ea138e2c17437d209f19952f0a76b4..5e53bfbe5823b78cb6666ce9c3fcf563eed3e47e 100644 (file)
--- a/arch/x86/xen/apic.c
+++ b/arch/x86/xen/apic.c
@@ -215,7 +215,7 @@ static void __init xen_apic_check(void)
 }
 void __init xen_init_apic(void)
 {
-       x86_io_apic_ops.read = xen_io_apic_read;
+       x86_apic_ops.io_apic_read = xen_io_apic_read;
        /* On PV guests the APIC CPUID bit is disabled so none of the
         * routines end up executing. */
        if (!xen_initial_domain())