diff options
author | Andrew Morton <akpm@osdl.org> | 2007-05-02 19:27:04 +0200 |
---|---|---|
committer | Andi Kleen <andi@basil.nowhere.org> | 2007-05-02 19:27:04 +0200 |
commit | 3dc68d9b58ae644cee8e218e3dcde0dceb5c47a3 (patch) | |
tree | 76a6523d347272a43f29cbc70863dcc41c1065cf | |
parent | fb27145d6ad2548d2d770f33ffa0a268c0afba85 (diff) | |
download | kernel_samsung_smdk4412-3dc68d9b58ae644cee8e218e3dcde0dceb5c47a3.zip kernel_samsung_smdk4412-3dc68d9b58ae644cee8e218e3dcde0dceb5c47a3.tar.gz kernel_samsung_smdk4412-3dc68d9b58ae644cee8e218e3dcde0dceb5c47a3.tar.bz2 |
[PATCH] x86-64: revert x86_64-mm-add-genapic_force
This is obsoleted by new Ingo genapic patches.
Cc: Suresh Siddha <suresh.b.siddha@intel.com>
Cc: Andi Kleen <ak@suse.de>
Cc: "Li, Shaohua" <shaohua.li@intel.com>
Cc: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Andi Kleen <ak@suse.de>
-rw-r--r-- | arch/x86_64/kernel/genapic.c | 9 | ||||
-rw-r--r-- | include/asm-x86_64/genapic.h | 2 |
2 files changed, 2 insertions, 9 deletions
diff --git a/arch/x86_64/kernel/genapic.c b/arch/x86_64/kernel/genapic.c index 0b3603a..7312ddb 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,13 +46,6 @@ 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 diff --git a/include/asm-x86_64/genapic.h b/include/asm-x86_64/genapic.h index b80f4bb..a0e9a4b 100644 --- a/include/asm-x86_64/genapic.h +++ b/include/asm-x86_64/genapic.h @@ -30,6 +30,6 @@ struct genapic { }; -extern struct genapic *genapic, *genapic_force, apic_flat; +extern struct genapic *genapic; #endif |