lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'x86/apic' into x86/x2apic

Browse Source 
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>
This commit is contained in:
Ingo Molnar
2008-07-18 23:00:05 +02:00
parent a208f37a46 35b680557f
commit 453c1404c5
20 changed files with 198 additions and 218 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
arch/x86/xen/enlighten.c
View File

@@ -583,7 +583,6 @@ static u32 xen_safe_apic_wait_icr_idle(void)
static struct apic_ops xen_basic_apic_ops = {
.read = xen_apic_read,
.write = xen_apic_write,
.write_atomic = xen_apic_write,
.icr_read = xen_apic_icr_read,
.icr_write = xen_apic_icr_write,
.wait_icr_idle = xen_apic_wait_icr_idle,