diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-07-18 17:00:05 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-07-18 17:00:05 -0400 |
| commit | 453c1404c5273a30d715e5a83372a78cff70b6d9 (patch) | |
| tree | 94a5a3abd85137c4def416a84a45989751260f20 /arch/x86/lguest | |
| parent | a208f37a465e222218974ab20a31b42b7b4893b2 (diff) | |
| parent | 35b680557f95564f70f21a8d3f5c72e101fab260 (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/lguest')
| -rw-r--r-- | arch/x86/lguest/boot.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/x86/lguest/boot.c b/arch/x86/lguest/boot.c index 675ee7a6475e..35c4349cd668 100644 --- a/arch/x86/lguest/boot.c +++ b/arch/x86/lguest/boot.c | |||
| @@ -816,7 +816,6 @@ static u32 lguest_apic_safe_wait_icr_idle(void) | |||
| 816 | static struct apic_ops lguest_basic_apic_ops = { | 816 | static struct apic_ops lguest_basic_apic_ops = { |
| 817 | .read = lguest_apic_read, | 817 | .read = lguest_apic_read, |
| 818 | .write = lguest_apic_write, | 818 | .write = lguest_apic_write, |
| 819 | .write_atomic = lguest_apic_write, | ||
| 820 | .icr_read = lguest_apic_icr_read, | 819 | .icr_read = lguest_apic_icr_read, |
| 821 | .icr_write = lguest_apic_icr_write, | 820 | .icr_write = lguest_apic_icr_write, |
| 822 | .wait_icr_idle = lguest_apic_wait_icr_idle, | 821 | .wait_icr_idle = lguest_apic_wait_icr_idle, |