diff options
| author | Siddha, Suresh B <suresh.b.siddha@intel.com> | 2006-12-07 02:14:10 +0100 |
|---|---|---|
| committer | Andi Kleen <andi@basil.nowhere.org> | 2006-12-07 02:14:10 +0100 |
| commit | 9899f826fc90beba4f78083f6230e06cbe1050c9 (patch) | |
| tree | 5d493eaa17da85c57746ffcc2e01a8a6f484fa5f /arch/x86_64 | |
| parent | [PATCH] i386: change the 'no_control' field to 'hotpluggable' in the struct cpu (diff) | |
| download | linux-9899f826fc90beba4f78083f6230e06cbe1050c9.tar.xz linux-9899f826fc90beba4f78083f6230e06cbe1050c9.zip | |
[PATCH] x86-64: add genapic_force
Add genapic_force. Used by the next Intel quirks patch.
Signed-off-by: Suresh Siddha <suresh.b.siddha@intel.com>
Signed-off-by: Andi Kleen <ak@suse.de>
Cc: Andi Kleen <ak@suse.de>
Cc: "Li, Shaohua" <shaohua.li@intel.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Diffstat (limited to 'arch/x86_64')
| -rw-r--r-- | arch/x86_64/kernel/genapic.c | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/arch/x86_64/kernel/genapic.c b/arch/x86_64/kernel/genapic.c index 8e78a75d1866..b007433f96bb 100644 --- a/arch/x86_64/kernel/genapic.c +++ b/arch/x86_64/kernel/genapic.c @@ -33,7 +33,7 @@ extern struct genapic apic_flat; extern struct genapic apic_physflat; struct genapic *genapic = &apic_flat; - +struct genapic *genapic_force; /* * Check the APIC IDs in bios_cpu_apicid and choose the APIC mode. @@ -46,6 +46,13 @@ void __init clustered_apic_check(void) u8 cluster_cnt[NUM_APIC_CLUSTERS]; int max_apic = 0; + /* genapic selection can be forced because of certain quirks. + */ + if (genapic_force) { + genapic = genapic_force; + goto print; + } + #if defined(CONFIG_ACPI) /* * Some x86_64 machines use physical APIC mode regardless of how many |