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

Commit 3dc68d9b authored by Andrew Morton's avatar Andrew Morton Committed by Andi Kleen
Browse files

[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: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarAndi Kleen <ak@suse.de>
parent fb27145d

arch/x86_64/kernel/genapic.c

+1 −8
Original line number Original line Diff line number Diff line
@@ -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

include/asm-x86_64/genapic.h

+1 −1
Original line number Original line Diff line number Diff line
@@ -30,6 +30,6 @@ struct genapic { 
};

};









extern struct genapic *genapic, *genapic_force, apic_flat;

extern struct genapic *genapic;





#endif
 
#endif