x86/apic changes for v3.7

GIT PULL Ingo Molnar 1 participant 1 message Oct 1, 2012

Subsystems (2)

x86 ACPI

lore

Share & tools

lore

Ingo Molnar

author

2012-10-01 13:24 UTC #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/tip.git x86-apic-for-linus

HEAD: 57c078ce13983d27c83f962b3e9722887209005c x86/api: Rename mp_register_lapic in a comment

Smaller fixes and cleanups.

Thanks,

Ingo

------------------>
Sebastian Andrzej Siewior (1):
x86: dt: Use linear irq domain for ioapic(s)

Yasuaki Ishimatsu (1):
x86/api: Rename mp_register_lapic in a comment

Yuanhan Liu (1):
x86/irq/i8259: Fix incorrect comment

 arch/x86/kernel/acpi/boot.c  |  2 +-
 arch/x86/kernel/devicetree.c | 51 ++++++++++++++++++++++++++++++++++++--------
 arch/x86/kernel/i8259.c      |  2 +-
 3 files changed, 44 insertions(+), 11 deletions(-)

arch/x86/kernel/acpi/boot.c +1 -1

index b2297e5..e651f7a 100644
@@ -656,7 +656,7 @@ static int __cpuinit _acpi_map_lsapic(acpi_handle handle, int *pcpu)
 	acpi_register_lapic(physid, ACPI_MADT_ENABLED);
 
 	/*
-	 * If mp_register_lapic successfully generates a new logical cpu
+	 * If acpi_register_lapic successfully generates a new logical cpu
 	 * number, then the following will get us exactly what was mapped
 	 */
 	cpumask_andnot(new_map, cpu_present_mask, tmp_map);

arch/x86/kernel/devicetree.c +42 -9

63 lines not on this page · raw message

arch/x86/kernel/i8259.c +1 -1

index 36d1853..9a5c460 100644
@@ -263,7 +263,7 @@ static void i8259A_shutdown(void)
 	 * out of.
 	 */
 	outb(0xff, PIC_MASTER_IMR);	/* mask all of 8259A-1 */
-	outb(0xff, PIC_SLAVE_IMR);	/* mask all of 8259A-1 */
+	outb(0xff, PIC_SLAVE_IMR);	/* mask all of 8259A-2 */
 }
 
 static struct syscore_ops i8259_syscore_ops = {