lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[PATCH] x86-64: revert x86_64-mm-add-genapic_force

Browse Source 
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>
This commit is contained in:
Andrew Morton
2007-05-02 19:27:04 +02:00
committed by Andi Kleen
parent fb27145d6a
commit 3dc68d9b58
2 changed files with 2 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
arch/x86_64/kernel/genapic.c
View File

@@ -33,7 +33,7 @@ extern struct genapic apic_flat;
extern struct genapic apic_physflat; extern struct genapic apic_physflat;
struct genapic *genapic = &apic_flat; struct genapic *genapic = &apic_flat;
struct genapic *genapic_force;
/* /*
* Check the APIC IDs in bios_cpu_apicid and choose the APIC mode. * 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]; u8 cluster_cnt[NUM_APIC_CLUSTERS];
int max_apic = 0; 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) #if defined(CONFIG_ACPI)
/* /*
* Some x86_64 machines use physical APIC mode regardless of how many * Some x86_64 machines use physical APIC mode regardless of how many

2
include/asm-x86_64/genapic.h
View File

@@ -30,6 +30,6 @@ struct genapic {
}; };
extern struct genapic *genapic, *genapic_force, apic_flat; extern struct genapic *genapic;
#endif #endif