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

Commit 1a8880a1 authored by Suresh Siddha's avatar Suresh Siddha Committed by Ingo Molnar
Browse files

x86, apic: Make apic drivers static 



Apic probe now looks at the apic drivers listed in the
.apicdrivers section. Remove apic_probe[] and make each apic
driver static.

Signed-off-by: default avatarSuresh Siddha <suresh.b.siddha@intel.com>
Tested-by: default avatarCyrill Gorcunov <gorcunov@openvz.org>
Cc: steiner@sgi.com
Cc: gorcunov@openvz.org
Cc: yinghai@kernel.org
Link: http://lkml.kernel.org/r/20110521005526.341718626@sbsiddha-MOBL3.sc.intel.com


Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent 69c252ff

arch/x86/include/asm/apic.h

+0 −7
Original line number Diff line number Diff line
@@ -478,15 +478,10 @@ static inline unsigned default_get_apic_id(unsigned long x) 
#define DEFAULT_TRAMPOLINE_PHYS_HIGH		0x469



#ifdef CONFIG_X86_64

extern struct apic apic_flat;

extern struct apic apic_physflat;

extern struct apic apic_x2apic_cluster;

extern struct apic apic_x2apic_phys;

extern int default_acpi_madt_oem_check(char *, char *);



extern void apic_send_IPI_self(int vector);



extern struct apic apic_x2apic_uv_x;

DECLARE_PER_CPU(int, x2apic_extra_bits);



extern int default_cpu_present_to_apicid(int mps_cpu);
@@ -536,8 +531,6 @@ extern struct apic apic_noop; 


#ifdef CONFIG_X86_32



extern struct apic apic_default;



static inline int noop_x86_32_early_logical_apicid(int cpu)

{

	return BAD_APICID;

arch/x86/kernel/apic/apic_flat_64.c

+8 −2
Original line number Diff line number Diff line
@@ -24,6 +24,12 @@ 
#include <acpi/acpi_bus.h>

#endif



static struct apic apic_physflat;

static struct apic apic_flat;



struct apic __read_mostly *apic = &apic_flat;

EXPORT_SYMBOL_GPL(apic);



static int flat_acpi_madt_oem_check(char *oem_id, char *oem_table_id)

{

	return 1;
@@ -164,7 +170,7 @@ static int flat_phys_pkg_id(int initial_apic_id, int index_msb) 
	return initial_apic_id >> index_msb;

}



struct apic apic_flat =  {

static struct apic apic_flat =  {

	.name				= "flat",

	.probe				= NULL,

	.acpi_madt_oem_check		= flat_acpi_madt_oem_check,
@@ -320,7 +326,7 @@ static int physflat_probe(void) 
	return 0;

}



struct apic apic_physflat =  {

static struct apic apic_physflat =  {



	.name				= "physical flat",

	.probe				= physflat_probe,

arch/x86/kernel/apic/bigsmp_32.c

+1 −1
Original line number Diff line number Diff line
@@ -193,7 +193,7 @@ static int probe_bigsmp(void) 
	return dmi_bigsmp;

}



struct apic apic_bigsmp = {

static struct apic apic_bigsmp = {



	.name				= "bigsmp",

	.probe				= probe_bigsmp,

arch/x86/kernel/apic/es7000_32.c

+2 −2
Original line number Diff line number Diff line
@@ -620,7 +620,7 @@ static int es7000_mps_oem_check_cluster(struct mpc_table *mpc, char *oem, 
}



/* We've been warned by a false positive warning.Use __refdata to keep calm. */

struct apic __refdata apic_es7000_cluster = {

static struct apic __refdata apic_es7000_cluster = {



	.name				= "es7000",

	.probe				= probe_es7000,
@@ -685,7 +685,7 @@ struct apic __refdata apic_es7000_cluster = { 
	.x86_32_early_logical_apicid	= es7000_early_logical_apicid,

};



struct apic __refdata apic_es7000 = {

static struct apic __refdata apic_es7000 = {



	.name				= "es7000",

	.probe				= probe_es7000,

arch/x86/kernel/apic/numaq_32.c

+2 −2
Original line number Diff line number Diff line
@@ -473,7 +473,7 @@ static void numaq_setup_portio_remap(void) 
}



/* Use __refdata to keep false positive warning calm.  */

struct apic __refdata apic_numaq = {

static struct apic __refdata apic_numaq = {



	.name				= "NUMAQ",

	.probe				= probe_numaq,