mirrors
/
linux-stable
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
1
0
Fork 0
Code Issues Releases Wiki Activity

x86, apic: clean up ->init_apic_ldr() 

- separate the namespace

 - remove macros

Signed-off-by: Ingo Molnar <mingo@elte.hu>
This commit is contained in:
Ingo Molnar 2009-01-28 06:50:47 +01:00
parent e2d40b1878
commit a5c4329622
12 changed files with 13 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arch/x86/include/asm/bigsmp/apic.h
View File

@ -46,7 +46,7 @@ static inline unsigned long calculate_ldr(int cpu)
* an APIC. See e.g. "AP-388 82489DX User's Manual" (Intel
* document number 292116). So here it goes...
*/
static inline void init_apic_ldr(void)
static inline void bigsmp_init_apic_ldr(void)
{
unsigned long val;
int cpu = smp_processor_id();

4
arch/x86/include/asm/es7000/apic.h
View File

@ -52,7 +52,7 @@ static inline unsigned long calculate_ldr(int cpu)
* an APIC. See e.g. "AP-388 82489DX User's Manual" (Intel
* document number 292116). So here it goes...
*/
static inline void init_apic_ldr_cluster(void)
static inline void es7000_init_apic_ldr_cluster(void)
{
unsigned long val;
int cpu = smp_processor_id();
@ -62,7 +62,7 @@ static inline void init_apic_ldr_cluster(void)
apic_write(APIC_LDR, val);
}
static inline void init_apic_ldr(void)
static inline void es7000_init_apic_ldr(void)
{
unsigned long val;
int cpu = smp_processor_id();

3
arch/x86/include/asm/mach-default/mach_apic.h
View File

@ -19,7 +19,6 @@ static inline const struct cpumask *default_target_cpus(void)
#ifdef CONFIG_X86_64
#include <asm/genapic.h>
#define init_apic_ldr (apic->init_apic_ldr)
#define cpu_mask_to_apicid (apic->cpu_mask_to_apicid)
#define cpu_mask_to_apicid_and (apic->cpu_mask_to_apicid_and)
#define phys_pkg_id (apic->phys_pkg_id)
@ -36,7 +35,7 @@ extern void setup_apic_routing(void);
* an APIC. See e.g. "AP-388 82489DX User's Manual" (Intel
* document number 292116). So here it goes...
*/
static inline void init_apic_ldr(void)
static inline void default_init_apic_ldr(void)
{
unsigned long val;

1
arch/x86/include/asm/mach-generic/mach_apic.h
View File

@ -3,7 +3,6 @@
#include <asm/genapic.h>
#define init_apic_ldr (apic->init_apic_ldr)
#define ioapic_phys_id_map (apic->ioapic_phys_id_map)
#define setup_apic_routing (apic->setup_apic_routing)
#define multi_timer_check (apic->multi_timer_check)

2
arch/x86/include/asm/numaq/apic.h
View File

@ -28,7 +28,7 @@ static inline int numaq_apic_id_registered(void)
return 1;
}
static inline void init_apic_ldr(void)
static inline void numaq_init_apic_ldr(void)
{
/* Already done in NUMA-Q firmware */
}

2
arch/x86/include/asm/summit/apic.h
View File

@ -37,7 +37,7 @@ static inline unsigned long summit_check_apicid_present(int bit)
extern u8 cpu_2_logical_apicid[];
static inline void init_apic_ldr(void)
static inline void summit_init_apic_ldr(void)
{
unsigned long val, id;
int count = 0;

2
arch/x86/kernel/apic.c
View File

@ -1179,7 +1179,7 @@ void __cpuinit setup_local_APIC(void)
* an APIC. See e.g. "AP-388 82489DX User's Manual" (Intel
* document number 292116). So here it goes...
*/
init_apic_ldr();
apic->init_apic_ldr();
/*
* Set Task Priority to 'accept all'. We never change this

2
arch/x86/mach-generic/bigsmp.c
View File

@ -75,7 +75,7 @@ struct genapic apic_bigsmp = {
.check_apicid_present = bigsmp_check_apicid_present,
.vector_allocation_domain = bigsmp_vector_allocation_domain,
.init_apic_ldr = init_apic_ldr,
.init_apic_ldr = bigsmp_init_apic_ldr,
.ioapic_phys_id_map = ioapic_phys_id_map,
.setup_apic_routing = setup_apic_routing,

2
arch/x86/mach-generic/default.c
View File

@ -56,7 +56,7 @@ struct genapic apic_default = {
.check_apicid_present = default_check_apicid_present,
.vector_allocation_domain = default_vector_allocation_domain,
.init_apic_ldr = init_apic_ldr,
.init_apic_ldr = default_init_apic_ldr,
.ioapic_phys_id_map = ioapic_phys_id_map,
.setup_apic_routing = setup_apic_routing,

4
arch/x86/mach-generic/es7000.c
View File

@ -24,7 +24,7 @@ void __init es7000_update_genapic_to_cluster(void)
apic->irq_delivery_mode = INT_DELIVERY_MODE_CLUSTER;
apic->irq_dest_mode = INT_DEST_MODE_CLUSTER;
apic->init_apic_ldr = init_apic_ldr_cluster;
apic->init_apic_ldr = es7000_init_apic_ldr_cluster;
apic->cpu_mask_to_apicid = cpu_mask_to_apicid_cluster;
}
@ -117,7 +117,7 @@ struct genapic apic_es7000 = {
.check_apicid_present = es7000_check_apicid_present,
.vector_allocation_domain = es7000_vector_allocation_domain,
.init_apic_ldr = init_apic_ldr,
.init_apic_ldr = es7000_init_apic_ldr,
.ioapic_phys_id_map = ioapic_phys_id_map,
.setup_apic_routing = setup_apic_routing,

2
arch/x86/mach-generic/numaq.c
View File

@ -62,7 +62,7 @@ struct genapic apic_numaq = {
.check_apicid_present = numaq_check_apicid_present,
.vector_allocation_domain = numaq_vector_allocation_domain,
.init_apic_ldr = init_apic_ldr,
.init_apic_ldr = numaq_init_apic_ldr,
.ioapic_phys_id_map = ioapic_phys_id_map,
.setup_apic_routing = setup_apic_routing,

2
arch/x86/mach-generic/summit.c
View File

@ -55,7 +55,7 @@ struct genapic apic_summit = {
.check_apicid_present = summit_check_apicid_present,
.vector_allocation_domain = summit_vector_allocation_domain,
.init_apic_ldr = init_apic_ldr,
.init_apic_ldr = summit_init_apic_ldr,
.ioapic_phys_id_map = ioapic_phys_id_map,
.setup_apic_routing = setup_apic_routing,