Skip to contentSkip to conversation

x86/apic changes for v3.1

GIT PULL Ingo Molnar 1 participant 1 message Jul 22, 2011 x86

lore
Share & tools
lore
#0 lore raw

Linus,

Please pull the latest x86-apic-for-linus git tree from:

git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip.git x86-apic-for-linus

Thanks,

Ingo

------------------>
Naga Chumbalkar (6):
x86: print APIC data a little later during boot x86, ioapic: Format clean up for IOAPIC output x86, ioapic: Also print Dest field
x86, x2apic: Preserve high 32-bits of IA32_APIC_BASE MSR x86, ioapic: Print IRTE when IR is enabled
x86, ioapic: Print IR_IO_APIC_route_entry when IR is enabled

 arch/x86/kernel/apic/apic.c    |    2 +-
 arch/x86/kernel/apic/io_apic.c |   93 ++++++++++++++++++++++++++++-----------
 2 files changed, 68 insertions(+), 27 deletions(-)
arch/x86/kernel/apic/apic.c +1 -1
index b9338b8..f7b0c7a 100644
@@ -1429,7 +1429,7 @@ void enable_x2apic(void)
 	rdmsr(MSR_IA32_APICBASE, msr, msr2);
 	if (!(msr & X2APIC_ENABLE)) {
 		printk_once(KERN_INFO "Enabling x2apic\n");
-		wrmsr(MSR_IA32_APICBASE, msr | X2APIC_ENABLE, 0);
+		wrmsr(MSR_IA32_APICBASE, msr | X2APIC_ENABLE, msr2);
 	}
 }
 #endif /* CONFIG_X86_X2APIC */
arch/x86/kernel/apic/io_apic.c +66 -25

129 lines not on this page · raw message