Ian Campbell
2007-Apr-18 17:49 UTC
[PATCH 5/5] XEN: fixup APIC accessors when !CONFIG_X86_LOCAL_APIC
OK, not strictly in keeping with the subject of the patch set but I
needed this to build ;-)
Should be merged into 02d-xen-apic-esp0.patch
Signed-off-by: Ian Campbell <ian.campbell@xensource.com>
diff -r 6fdbec59813e arch/i386/paravirt-xen/enlighten.c
--- a/arch/i386/paravirt-xen/enlighten.c Wed Aug 23 15:08:37 2006 +0100
+++ b/arch/i386/paravirt-xen/enlighten.c Wed Aug 23 15:08:37 2006 +0100
@@ -310,6 +310,7 @@ static fastcall void xen_io_delay(void)
{
}
+#ifdef CONFIG_X86_LOCAL_APIC
static fastcall void xen_apic_write(unsigned long reg, unsigned long v)
{
}
@@ -322,6 +323,7 @@ static fastcall unsigned long xen_apic_r
{
return 0;
}
+#endif
static fastcall void xen_flush_tlb(void)
{
@@ -422,9 +424,11 @@ static const struct paravirt_ops xen_par
.set_wallclock = xen_set_wallclock,
.get_wallclock = xen_get_wallclock,
+#ifdef CONFIG_X86_LOCAL_APIC
.apic_write = xen_apic_write,
.apic_write_atomic = xen_apic_write_atomic,
.apic_read = xen_apic_read,
+#endif
.flush_tlb_user = xen_flush_tlb,
.flush_tlb_kernel = xen_flush_tlb_global,