2 files changed, 11 insertions, 10 deletions

diff --git a/arch/x86/xen/enlighten.c b/arch/x86/xen/enlighten.c
index 95ff6a0e942a..86497d5f44cd 100644
--- a/arch/x86/xen/enlighten.c
+++ b/arch/x86/xen/enlighten.c
@@ -554,14 +554,15 @@ static u32 xen_safe_apic_wait_icr_idle(void)
         return 0;
 }
 
-static struct apic_ops xen_basic_apic_ops = {
-        .read = xen_apic_read,
-        .write = xen_apic_write,
-        .icr_read = xen_apic_icr_read,
-        .icr_write = xen_apic_icr_write,
-        .wait_icr_idle = xen_apic_wait_icr_idle,
-        .safe_wait_icr_idle = xen_safe_apic_wait_icr_idle,
-};
+static void set_xen_basic_apic_ops(void)
+{
+        apic->read = xen_apic_read;
+        apic->write = xen_apic_write;
+        apic->icr_read = xen_apic_icr_read;
+        apic->icr_write = xen_apic_icr_write;
+        apic->wait_icr_idle = xen_apic_wait_icr_idle;
+        apic->safe_wait_icr_idle = xen_safe_apic_wait_icr_idle;
+}
 
 #endif
 
@@ -898,7 +899,7 @@ asmlinkage void __init xen_start_kernel(void)
         /*
          * set up the basic apic ops.
          */
-        apic_ops = &xen_basic_apic_ops;
+        set_xen_basic_apic_ops();
 #endif
 
         if (xen_feature(XENFEAT_mmu_pt_update_preserve_ad)) {
diff --git a/arch/x86/xen/xen-head.S b/arch/x86/xen/xen-head.S
index 63d49a523ed3..1a5ff24e29c0 100644
--- a/arch/x86/xen/xen-head.S
+++ b/arch/x86/xen/xen-head.S
@@ -8,7 +8,7 @@
 
 #include <asm/boot.h>
 #include <asm/asm.h>
-#include <asm/page.h>
+#include <asm/page_types.h>
 
 #include <xen/interface/elfnote.h>
 #include <asm/xen/interface.h>