aboutsummaryrefslogtreecommitdiffstats
path: root/arch/x86/xen
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2008-07-18 17:00:05 -0400
committerIngo Molnar <mingo@elte.hu>2008-07-18 17:00:05 -0400
commit453c1404c5273a30d715e5a83372a78cff70b6d9 (patch)
tree94a5a3abd85137c4def416a84a45989751260f20 /arch/x86/xen
parenta208f37a465e222218974ab20a31b42b7b4893b2 (diff)
parent35b680557f95564f70f21a8d3f5c72e101fab260 (diff)
Merge branch 'x86/apic' into x86/x2apic
Conflicts: arch/x86/kernel/paravirt.c arch/x86/kernel/smpboot.c arch/x86/kernel/vmi_32.c arch/x86/lguest/boot.c arch/x86/xen/enlighten.c include/asm-x86/apic.h include/asm-x86/paravirt.h Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/x86/xen')
-rw-r--r--arch/x86/xen/enlighten.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/x86/xen/enlighten.c b/arch/x86/xen/enlighten.c
index 402f3e2c7bee..008b7b69581e 100644
--- a/arch/x86/xen/enlighten.c
+++ b/arch/x86/xen/enlighten.c
@@ -583,7 +583,6 @@ static u32 xen_safe_apic_wait_icr_idle(void)
583static struct apic_ops xen_basic_apic_ops = { 583static struct apic_ops xen_basic_apic_ops = {
584 .read = xen_apic_read, 584 .read = xen_apic_read,
585 .write = xen_apic_write, 585 .write = xen_apic_write,
586 .write_atomic = xen_apic_write,
587 .icr_read = xen_apic_icr_read, 586 .icr_read = xen_apic_icr_read,
588 .icr_write = xen_apic_icr_write, 587 .icr_write = xen_apic_icr_write,
589 .wait_icr_idle = xen_apic_wait_icr_idle, 588 .wait_icr_idle = xen_apic_wait_icr_idle,