The patch titled
i386: apic= command line option should always be
has been removed from the -mm tree. Its filename is
i386-apic=-command-line-option-should-always-be.patch
This patch was probably dropped from -mm because
it has now been merged into a subsystem tree or
into Linus's tree, or because it was folded into
its parent patch in the -mm tree.
------------------------------------------------------
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-30 21:24:55.000000000 -0700
+++ devel-akpm/arch/i386/mach-generic/probe.c 2006-05-30 21:24:55.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
origin.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
fix-x86-microcode-driver-handling-of-multiple-matching.patch
vdso-randomize-the-i386-vdso-by-moving-it-into-a-vma-vs-x86_64-mm-reliable-stack-trace-support-i386.patch
vdso-randomize-the-i386-vdso-by-moving-it-into-a-vma-vs-x86_64-mm-reliable-stack-trace-support-i386-2.patch
adjust-handle_irr_event-return-type.patch
lock-validator-irqtrace-cleanup-include-asm-x86_64-irqflagsh.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
