Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2ba567cb authored by Jan Beulich's avatar Jan Beulich Committed by Linus Torvalds
Browse files

[PATCH] i386: apic= command line option should always be 



From: "Jan Beulich" <jbeulich@novell.com>

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: default avatarJan Beulich <jbeulich@novell.com>
Signed-off-by: default avatarAndi Kleen <ak@suse.de>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent dc9a7195

arch/i386/mach-generic/probe.c

+10 −6
Original line number Diff line number Diff line
@@ -93,9 +93,11 @@ int __init mps_oem_check(struct mp_config_table *mpc, char *oem, char *productid 
	int i;

	for (i = 0; apic_probe[i]; ++i) { 

		if (apic_probe[i]->mps_oem_check(mpc,oem,productid)) { 

			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_id, char *oem_table_id) 
	int i;

	for (i = 0; apic_probe[i]; ++i) { 

		if (apic_probe[i]->acpi_madt_oem_check(oem_id, oem_table_id)) { 

			if (!cmdline_apic) {

				genapic = apic_probe[i];

				printk(KERN_INFO "Switched to APIC driver `%s'.\n",

				       genapic->name);

			}

			return 1;

		} 

	}