The patch titled
i386: apic= command line option should always be
has been added to the -mm tree. Its filename is
i386-apic=-command-line-option-should-always-be.patch
See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find
out what to do about this
------------------------------------------------------
Subject: i386: apic= command line option should always be
From: "Jan Beulich" <jbeulich@xxxxxxxxxx>
When using apic= on the kernel command line, this had no effect for machines
matched by either the ACPI MADT or the MPS OEM table scan. However, when such
option is specified, it should also take effect for this set of systems.
Signed-off-by: Jan Beulich <jbeulich@xxxxxxxxxx>
Signed-off-by: Andi Kleen <ak@xxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
arch/i386/mach-generic/probe.c | 16 ++++++++++------
1 file changed, 10 insertions(+), 6 deletions(-)
diff -puN arch/i386/mach-generic/probe.c~i386-apic=-command-line-option-should-always-be arch/i386/mach-generic/probe.c
--- devel/arch/i386/mach-generic/probe.c~i386-apic=-command-line-option-should-always-be 2006-05-29 14:16:20.000000000 -0700
+++ devel-akpm/arch/i386/mach-generic/probe.c 2006-05-29 14:16:20.000000000 -0700
@@ -93,9 +93,11 @@ int __init mps_oem_check(struct mp_confi
int i;
for (i = 0; apic_probe[i]; ++i) {
if (apic_probe[i]->mps_oem_check(mpc,oem,productid)) {
- genapic = apic_probe[i];
- printk(KERN_INFO "Switched to APIC driver `%s'.\n",
- genapic->name);
+ if (!cmdline_apic) {
+ genapic = apic_probe[i];
+ printk(KERN_INFO "Switched to APIC driver `%s'.\n",
+ genapic->name);
+ }
return 1;
}
}
@@ -107,9 +109,11 @@ int __init acpi_madt_oem_check(char *oem
int i;
for (i = 0; apic_probe[i]; ++i) {
if (apic_probe[i]->acpi_madt_oem_check(oem_id, oem_table_id)) {
- genapic = apic_probe[i];
- printk(KERN_INFO "Switched to APIC driver `%s'.\n",
- genapic->name);
+ if (!cmdline_apic) {
+ genapic = apic_probe[i];
+ printk(KERN_INFO "Switched to APIC driver `%s'.\n",
+ genapic->name);
+ }
return 1;
}
}
_
Patches currently in -mm which might be from jbeulich@xxxxxxxxxx are
i386-apic=-command-line-option-should-always-be.patch
x86_64-fix-last_tsc-calculation-of-pm-timer.patch
dprintk-adjustments-to-cpufreq-nforce2.patch
dprintk-adjustments-to-cpufreq-speedstep-centrino.patch
cpufreq-dprintk-adjustments.patch
fix-recovery-path-from-errors-during-pcie_init.patch
mpt_interrupt-should-return-irq_none-when.patch
x86_64-reliable-stack-trace-support-i386-fix.patch
fix-x86-microcode-driver-handling-of-multiple-matching.patch
adjust-handle_irr_event-return-type.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
