x86: apic namespace cleanup
boot_cpu_physical_apicid is a global variable and used as function argument as well. Rename the function arguments to avoid confusion. Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
This commit is contained in:
parent
bc07844a33
commit
e11dadabf4
|
@ -292,7 +292,7 @@ struct apic {
|
||||||
int (*cpu_present_to_apicid)(int mps_cpu);
|
int (*cpu_present_to_apicid)(int mps_cpu);
|
||||||
physid_mask_t (*apicid_to_cpu_present)(int phys_apicid);
|
physid_mask_t (*apicid_to_cpu_present)(int phys_apicid);
|
||||||
void (*setup_portio_remap)(void);
|
void (*setup_portio_remap)(void);
|
||||||
int (*check_phys_apicid_present)(int boot_cpu_physical_apicid);
|
int (*check_phys_apicid_present)(int phys_apicid);
|
||||||
void (*enable_apic_mode)(void);
|
void (*enable_apic_mode)(void);
|
||||||
int (*phys_pkg_id)(int cpuid_apic, int index_msb);
|
int (*phys_pkg_id)(int cpuid_apic, int index_msb);
|
||||||
|
|
||||||
|
@ -426,7 +426,7 @@ extern struct apic apic_x2apic_uv_x;
|
||||||
DECLARE_PER_CPU(int, x2apic_extra_bits);
|
DECLARE_PER_CPU(int, x2apic_extra_bits);
|
||||||
|
|
||||||
extern int default_cpu_present_to_apicid(int mps_cpu);
|
extern int default_cpu_present_to_apicid(int mps_cpu);
|
||||||
extern int default_check_phys_apicid_present(int boot_cpu_physical_apicid);
|
extern int default_check_phys_apicid_present(int phys_apicid);
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
static inline void default_wait_for_init_deassert(atomic_t *deassert)
|
static inline void default_wait_for_init_deassert(atomic_t *deassert)
|
||||||
|
@ -542,9 +542,9 @@ static inline int __default_cpu_present_to_apicid(int mps_cpu)
|
||||||
}
|
}
|
||||||
|
|
||||||
static inline int
|
static inline int
|
||||||
__default_check_phys_apicid_present(int boot_cpu_physical_apicid)
|
__default_check_phys_apicid_present(int phys_apicid)
|
||||||
{
|
{
|
||||||
return physid_isset(boot_cpu_physical_apicid, phys_cpu_present_map);
|
return physid_isset(phys_apicid, phys_cpu_present_map);
|
||||||
}
|
}
|
||||||
|
|
||||||
#ifdef CONFIG_X86_32
|
#ifdef CONFIG_X86_32
|
||||||
|
@ -554,13 +554,13 @@ static inline int default_cpu_present_to_apicid(int mps_cpu)
|
||||||
}
|
}
|
||||||
|
|
||||||
static inline int
|
static inline int
|
||||||
default_check_phys_apicid_present(int boot_cpu_physical_apicid)
|
default_check_phys_apicid_present(int phys_apicid)
|
||||||
{
|
{
|
||||||
return __default_check_phys_apicid_present(boot_cpu_physical_apicid);
|
return __default_check_phys_apicid_present(phys_apicid);
|
||||||
}
|
}
|
||||||
#else
|
#else
|
||||||
extern int default_cpu_present_to_apicid(int mps_cpu);
|
extern int default_cpu_present_to_apicid(int mps_cpu);
|
||||||
extern int default_check_phys_apicid_present(int boot_cpu_physical_apicid);
|
extern int default_check_phys_apicid_present(int phys_apicid);
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
static inline physid_mask_t default_apicid_to_cpu_present(int phys_apicid)
|
static inline physid_mask_t default_apicid_to_cpu_present(int phys_apicid)
|
||||||
|
|
|
@ -112,7 +112,7 @@ static physid_mask_t bigsmp_ioapic_phys_id_map(physid_mask_t phys_map)
|
||||||
return physids_promote(0xFFL);
|
return physids_promote(0xFFL);
|
||||||
}
|
}
|
||||||
|
|
||||||
static int bigsmp_check_phys_apicid_present(int boot_cpu_physical_apicid)
|
static int bigsmp_check_phys_apicid_present(int phys_apicid)
|
||||||
{
|
{
|
||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
|
|
|
@ -413,7 +413,7 @@ static inline physid_mask_t numaq_apicid_to_cpu_present(int logical_apicid)
|
||||||
/* Where the IO area was mapped on multiquad, always 0 otherwise */
|
/* Where the IO area was mapped on multiquad, always 0 otherwise */
|
||||||
void *xquad_portio;
|
void *xquad_portio;
|
||||||
|
|
||||||
static inline int numaq_check_phys_apicid_present(int boot_cpu_physical_apicid)
|
static inline int numaq_check_phys_apicid_present(int phys_apicid)
|
||||||
{
|
{
|
||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
|
|
|
@ -272,7 +272,7 @@ static physid_mask_t summit_apicid_to_cpu_present(int apicid)
|
||||||
return physid_mask_of_physid(0);
|
return physid_mask_of_physid(0);
|
||||||
}
|
}
|
||||||
|
|
||||||
static int summit_check_phys_apicid_present(int boot_cpu_physical_apicid)
|
static int summit_check_phys_apicid_present(int physical_apicid)
|
||||||
{
|
{
|
||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
|
|
|
@ -129,9 +129,9 @@ int default_cpu_present_to_apicid(int mps_cpu)
|
||||||
return __default_cpu_present_to_apicid(mps_cpu);
|
return __default_cpu_present_to_apicid(mps_cpu);
|
||||||
}
|
}
|
||||||
|
|
||||||
int default_check_phys_apicid_present(int boot_cpu_physical_apicid)
|
int default_check_phys_apicid_present(int phys_apicid)
|
||||||
{
|
{
|
||||||
return __default_check_phys_apicid_present(boot_cpu_physical_apicid);
|
return __default_check_phys_apicid_present(phys_apicid);
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue