Commit 658ffd7e authored by David Rientjes's avatar David Rientjes Committed by H. Peter Anvin

x86, apic: Remove check_apicid_present callback

The check_apicid_present() apic callback is never called, so remove it
and functions that implement it.
Signed-off-by: default avatarDavid Rientjes <rientjes@google.com>
Link: http://lkml.kernel.org/r/alpine.DEB.2.02.1407302350160.17503@chino.kir.corp.google.comSigned-off-by: default avatarH. Peter Anvin <hpa@zytor.com>
parent c460b5d3
...@@ -292,7 +292,6 @@ struct apic { ...@@ -292,7 +292,6 @@ struct apic {
int dest_logical; int dest_logical;
unsigned long (*check_apicid_used)(physid_mask_t *map, int apicid); unsigned long (*check_apicid_used)(physid_mask_t *map, int apicid);
unsigned long (*check_apicid_present)(int apicid);
void (*vector_allocation_domain)(int cpu, struct cpumask *retmask, void (*vector_allocation_domain)(int cpu, struct cpumask *retmask,
const struct cpumask *mask); const struct cpumask *mask);
...@@ -608,11 +607,6 @@ static inline unsigned long default_check_apicid_used(physid_mask_t *map, int ap ...@@ -608,11 +607,6 @@ static inline unsigned long default_check_apicid_used(physid_mask_t *map, int ap
return physid_isset(apicid, *map); return physid_isset(apicid, *map);
} }
static inline unsigned long default_check_apicid_present(int bit)
{
return physid_isset(bit, phys_cpu_present_map);
}
static inline void default_ioapic_phys_id_map(physid_mask_t *phys_map, physid_mask_t *retmap) static inline void default_ioapic_phys_id_map(physid_mask_t *phys_map, physid_mask_t *retmap)
{ {
*retmap = *phys_map; *retmap = *phys_map;
......
...@@ -168,7 +168,6 @@ static struct apic apic_flat = { ...@@ -168,7 +168,6 @@ static struct apic apic_flat = {
.disable_esr = 0, .disable_esr = 0,
.dest_logical = APIC_DEST_LOGICAL, .dest_logical = APIC_DEST_LOGICAL,
.check_apicid_used = NULL, .check_apicid_used = NULL,
.check_apicid_present = NULL,
.vector_allocation_domain = flat_vector_allocation_domain, .vector_allocation_domain = flat_vector_allocation_domain,
.init_apic_ldr = flat_init_apic_ldr, .init_apic_ldr = flat_init_apic_ldr,
...@@ -279,7 +278,6 @@ static struct apic apic_physflat = { ...@@ -279,7 +278,6 @@ static struct apic apic_physflat = {
.disable_esr = 0, .disable_esr = 0,
.dest_logical = 0, .dest_logical = 0,
.check_apicid_used = NULL, .check_apicid_used = NULL,
.check_apicid_present = NULL,
.vector_allocation_domain = default_vector_allocation_domain, .vector_allocation_domain = default_vector_allocation_domain,
/* not needed, but shouldn't hurt: */ /* not needed, but shouldn't hurt: */
......
...@@ -94,11 +94,6 @@ static unsigned long noop_check_apicid_used(physid_mask_t *map, int apicid) ...@@ -94,11 +94,6 @@ static unsigned long noop_check_apicid_used(physid_mask_t *map, int apicid)
return physid_isset(apicid, *map); return physid_isset(apicid, *map);
} }
static unsigned long noop_check_apicid_present(int bit)
{
return physid_isset(bit, phys_cpu_present_map);
}
static void noop_vector_allocation_domain(int cpu, struct cpumask *retmask, static void noop_vector_allocation_domain(int cpu, struct cpumask *retmask,
const struct cpumask *mask) const struct cpumask *mask)
{ {
...@@ -134,7 +129,6 @@ struct apic apic_noop = { ...@@ -134,7 +129,6 @@ struct apic apic_noop = {
.disable_esr = 0, .disable_esr = 0,
.dest_logical = APIC_DEST_LOGICAL, .dest_logical = APIC_DEST_LOGICAL,
.check_apicid_used = noop_check_apicid_used, .check_apicid_used = noop_check_apicid_used,
.check_apicid_present = noop_check_apicid_present,
.vector_allocation_domain = noop_vector_allocation_domain, .vector_allocation_domain = noop_vector_allocation_domain,
.init_apic_ldr = noop_init_apic_ldr, .init_apic_ldr = noop_init_apic_ldr,
......
...@@ -217,7 +217,6 @@ static const struct apic apic_numachip __refconst = { ...@@ -217,7 +217,6 @@ static const struct apic apic_numachip __refconst = {
.disable_esr = 0, .disable_esr = 0,
.dest_logical = 0, .dest_logical = 0,
.check_apicid_used = NULL, .check_apicid_used = NULL,
.check_apicid_present = NULL,
.vector_allocation_domain = default_vector_allocation_domain, .vector_allocation_domain = default_vector_allocation_domain,
.init_apic_ldr = flat_init_apic_ldr, .init_apic_ldr = flat_init_apic_ldr,
......
...@@ -31,11 +31,6 @@ static unsigned long bigsmp_check_apicid_used(physid_mask_t *map, int apicid) ...@@ -31,11 +31,6 @@ static unsigned long bigsmp_check_apicid_used(physid_mask_t *map, int apicid)
return 0; return 0;
} }
static unsigned long bigsmp_check_apicid_present(int bit)
{
return 1;
}
static int bigsmp_early_logical_apicid(int cpu) static int bigsmp_early_logical_apicid(int cpu)
{ {
/* on bigsmp, logical apicid is the same as physical */ /* on bigsmp, logical apicid is the same as physical */
...@@ -168,7 +163,6 @@ static struct apic apic_bigsmp = { ...@@ -168,7 +163,6 @@ static struct apic apic_bigsmp = {
.disable_esr = 1, .disable_esr = 1,
.dest_logical = 0, .dest_logical = 0,
.check_apicid_used = bigsmp_check_apicid_used, .check_apicid_used = bigsmp_check_apicid_used,
.check_apicid_present = bigsmp_check_apicid_present,
.vector_allocation_domain = default_vector_allocation_domain, .vector_allocation_domain = default_vector_allocation_domain,
.init_apic_ldr = bigsmp_init_apic_ldr, .init_apic_ldr = bigsmp_init_apic_ldr,
......
...@@ -88,7 +88,6 @@ static struct apic apic_default = { ...@@ -88,7 +88,6 @@ static struct apic apic_default = {
.disable_esr = 0, .disable_esr = 0,
.dest_logical = APIC_DEST_LOGICAL, .dest_logical = APIC_DEST_LOGICAL,
.check_apicid_used = default_check_apicid_used, .check_apicid_used = default_check_apicid_used,
.check_apicid_present = default_check_apicid_present,
.vector_allocation_domain = flat_vector_allocation_domain, .vector_allocation_domain = flat_vector_allocation_domain,
.init_apic_ldr = default_init_apic_ldr, .init_apic_ldr = default_init_apic_ldr,
......
...@@ -249,7 +249,6 @@ static struct apic apic_x2apic_cluster = { ...@@ -249,7 +249,6 @@ static struct apic apic_x2apic_cluster = {
.disable_esr = 0, .disable_esr = 0,
.dest_logical = APIC_DEST_LOGICAL, .dest_logical = APIC_DEST_LOGICAL,
.check_apicid_used = NULL, .check_apicid_used = NULL,
.check_apicid_present = NULL,
.vector_allocation_domain = cluster_vector_allocation_domain, .vector_allocation_domain = cluster_vector_allocation_domain,
.init_apic_ldr = init_x2apic_ldr, .init_apic_ldr = init_x2apic_ldr,
......
...@@ -103,7 +103,6 @@ static struct apic apic_x2apic_phys = { ...@@ -103,7 +103,6 @@ static struct apic apic_x2apic_phys = {
.disable_esr = 0, .disable_esr = 0,
.dest_logical = 0, .dest_logical = 0,
.check_apicid_used = NULL, .check_apicid_used = NULL,
.check_apicid_present = NULL,
.vector_allocation_domain = default_vector_allocation_domain, .vector_allocation_domain = default_vector_allocation_domain,
.init_apic_ldr = init_x2apic_ldr, .init_apic_ldr = init_x2apic_ldr,
......
...@@ -365,7 +365,6 @@ static struct apic __refdata apic_x2apic_uv_x = { ...@@ -365,7 +365,6 @@ static struct apic __refdata apic_x2apic_uv_x = {
.disable_esr = 0, .disable_esr = 0,
.dest_logical = APIC_DEST_LOGICAL, .dest_logical = APIC_DEST_LOGICAL,
.check_apicid_used = NULL, .check_apicid_used = NULL,
.check_apicid_present = NULL,
.vector_allocation_domain = default_vector_allocation_domain, .vector_allocation_domain = default_vector_allocation_domain,
.init_apic_ldr = uv_init_apic_ldr, .init_apic_ldr = uv_init_apic_ldr,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment