mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git
synced 2025-01-14 17:53:39 +00:00
x86, apic: rename genapic::apic_destination_logical to genapic::dest_logical
This field name was unreasonably long - shorten it. Signed-off-by: Ingo Molnar <mingo@elte.hu>
This commit is contained in:
parent
0b06e734bf
commit
bdb1a9b62f
@ -30,7 +30,7 @@ struct genapic {
|
|||||||
|
|
||||||
int disable_esr;
|
int disable_esr;
|
||||||
|
|
||||||
int apic_destination_logical;
|
int dest_logical;
|
||||||
unsigned long (*check_apicid_used)(physid_mask_t bitmap, int apicid);
|
unsigned long (*check_apicid_used)(physid_mask_t bitmap, int apicid);
|
||||||
unsigned long (*check_apicid_present)(int apicid);
|
unsigned long (*check_apicid_present)(int apicid);
|
||||||
|
|
||||||
|
@ -74,7 +74,7 @@ static inline void _flat_send_IPI_mask(unsigned long mask, int vector)
|
|||||||
unsigned long flags;
|
unsigned long flags;
|
||||||
|
|
||||||
local_irq_save(flags);
|
local_irq_save(flags);
|
||||||
__send_IPI_dest_field(mask, vector, apic->apic_destination_logical);
|
__send_IPI_dest_field(mask, vector, apic->dest_logical);
|
||||||
local_irq_restore(flags);
|
local_irq_restore(flags);
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -114,7 +114,7 @@ static void flat_send_IPI_allbutself(int vector)
|
|||||||
_flat_send_IPI_mask(mask, vector);
|
_flat_send_IPI_mask(mask, vector);
|
||||||
}
|
}
|
||||||
} else if (num_online_cpus() > 1) {
|
} else if (num_online_cpus() > 1) {
|
||||||
__send_IPI_shortcut(APIC_DEST_ALLBUT, vector, apic->apic_destination_logical);
|
__send_IPI_shortcut(APIC_DEST_ALLBUT, vector, apic->dest_logical);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -123,7 +123,7 @@ static void flat_send_IPI_all(int vector)
|
|||||||
if (vector == NMI_VECTOR)
|
if (vector == NMI_VECTOR)
|
||||||
flat_send_IPI_mask(cpu_online_mask, vector);
|
flat_send_IPI_mask(cpu_online_mask, vector);
|
||||||
else
|
else
|
||||||
__send_IPI_shortcut(APIC_DEST_ALLINC, vector, apic->apic_destination_logical);
|
__send_IPI_shortcut(APIC_DEST_ALLINC, vector, apic->dest_logical);
|
||||||
}
|
}
|
||||||
|
|
||||||
static unsigned int get_apic_id(unsigned long x)
|
static unsigned int get_apic_id(unsigned long x)
|
||||||
@ -185,7 +185,7 @@ struct genapic apic_flat = {
|
|||||||
|
|
||||||
.target_cpus = flat_target_cpus,
|
.target_cpus = flat_target_cpus,
|
||||||
.disable_esr = 0,
|
.disable_esr = 0,
|
||||||
.apic_destination_logical = APIC_DEST_LOGICAL,
|
.dest_logical = APIC_DEST_LOGICAL,
|
||||||
.check_apicid_used = NULL,
|
.check_apicid_used = NULL,
|
||||||
.check_apicid_present = NULL,
|
.check_apicid_present = NULL,
|
||||||
|
|
||||||
@ -331,7 +331,7 @@ struct genapic apic_physflat = {
|
|||||||
|
|
||||||
.target_cpus = physflat_target_cpus,
|
.target_cpus = physflat_target_cpus,
|
||||||
.disable_esr = 0,
|
.disable_esr = 0,
|
||||||
.apic_destination_logical = 0,
|
.dest_logical = 0,
|
||||||
.check_apicid_used = NULL,
|
.check_apicid_used = NULL,
|
||||||
.check_apicid_present = NULL,
|
.check_apicid_present = NULL,
|
||||||
|
|
||||||
|
@ -64,7 +64,7 @@ static void x2apic_send_IPI_mask(const struct cpumask *mask, int vector)
|
|||||||
for_each_cpu(query_cpu, mask)
|
for_each_cpu(query_cpu, mask)
|
||||||
__x2apic_send_IPI_dest(
|
__x2apic_send_IPI_dest(
|
||||||
per_cpu(x86_cpu_to_logical_apicid, query_cpu),
|
per_cpu(x86_cpu_to_logical_apicid, query_cpu),
|
||||||
vector, apic->apic_destination_logical);
|
vector, apic->dest_logical);
|
||||||
local_irq_restore(flags);
|
local_irq_restore(flags);
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -80,7 +80,7 @@ static void x2apic_send_IPI_mask_allbutself(const struct cpumask *mask,
|
|||||||
if (query_cpu != this_cpu)
|
if (query_cpu != this_cpu)
|
||||||
__x2apic_send_IPI_dest(
|
__x2apic_send_IPI_dest(
|
||||||
per_cpu(x86_cpu_to_logical_apicid, query_cpu),
|
per_cpu(x86_cpu_to_logical_apicid, query_cpu),
|
||||||
vector, apic->apic_destination_logical);
|
vector, apic->dest_logical);
|
||||||
local_irq_restore(flags);
|
local_irq_restore(flags);
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -95,7 +95,7 @@ static void x2apic_send_IPI_allbutself(int vector)
|
|||||||
if (query_cpu != this_cpu)
|
if (query_cpu != this_cpu)
|
||||||
__x2apic_send_IPI_dest(
|
__x2apic_send_IPI_dest(
|
||||||
per_cpu(x86_cpu_to_logical_apicid, query_cpu),
|
per_cpu(x86_cpu_to_logical_apicid, query_cpu),
|
||||||
vector, apic->apic_destination_logical);
|
vector, apic->dest_logical);
|
||||||
local_irq_restore(flags);
|
local_irq_restore(flags);
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -187,7 +187,7 @@ struct genapic apic_x2apic_cluster = {
|
|||||||
|
|
||||||
.target_cpus = x2apic_target_cpus,
|
.target_cpus = x2apic_target_cpus,
|
||||||
.disable_esr = 0,
|
.disable_esr = 0,
|
||||||
.apic_destination_logical = APIC_DEST_LOGICAL,
|
.dest_logical = APIC_DEST_LOGICAL,
|
||||||
.check_apicid_used = NULL,
|
.check_apicid_used = NULL,
|
||||||
.check_apicid_present = NULL,
|
.check_apicid_present = NULL,
|
||||||
|
|
||||||
|
@ -183,7 +183,7 @@ struct genapic apic_x2apic_phys = {
|
|||||||
|
|
||||||
.target_cpus = x2apic_target_cpus,
|
.target_cpus = x2apic_target_cpus,
|
||||||
.disable_esr = 0,
|
.disable_esr = 0,
|
||||||
.apic_destination_logical = 0,
|
.dest_logical = 0,
|
||||||
.check_apicid_used = NULL,
|
.check_apicid_used = NULL,
|
||||||
.check_apicid_present = NULL,
|
.check_apicid_present = NULL,
|
||||||
|
|
||||||
|
@ -248,7 +248,7 @@ struct genapic apic_x2apic_uv_x = {
|
|||||||
|
|
||||||
.target_cpus = uv_target_cpus,
|
.target_cpus = uv_target_cpus,
|
||||||
.disable_esr = 0,
|
.disable_esr = 0,
|
||||||
.apic_destination_logical = APIC_DEST_LOGICAL,
|
.dest_logical = APIC_DEST_LOGICAL,
|
||||||
.check_apicid_used = NULL,
|
.check_apicid_used = NULL,
|
||||||
.check_apicid_present = NULL,
|
.check_apicid_present = NULL,
|
||||||
|
|
||||||
|
@ -806,7 +806,7 @@ void send_IPI_self(int vector)
|
|||||||
* Wait for idle.
|
* Wait for idle.
|
||||||
*/
|
*/
|
||||||
apic_wait_icr_idle();
|
apic_wait_icr_idle();
|
||||||
cfg = APIC_DM_FIXED | APIC_DEST_SELF | vector | apic->apic_destination_logical;
|
cfg = APIC_DM_FIXED | APIC_DEST_SELF | vector | apic->dest_logical;
|
||||||
/*
|
/*
|
||||||
* Send the IPI. The write to APIC_ICR fires this off.
|
* Send the IPI. The write to APIC_ICR fires this off.
|
||||||
*/
|
*/
|
||||||
|
@ -30,7 +30,7 @@
|
|||||||
|
|
||||||
static inline int __prepare_ICR(unsigned int shortcut, int vector)
|
static inline int __prepare_ICR(unsigned int shortcut, int vector)
|
||||||
{
|
{
|
||||||
unsigned int icr = shortcut | apic->apic_destination_logical;
|
unsigned int icr = shortcut | apic->dest_logical;
|
||||||
|
|
||||||
switch (vector) {
|
switch (vector) {
|
||||||
default:
|
default:
|
||||||
|
@ -583,7 +583,7 @@ wakeup_secondary_cpu_via_nmi(int logical_apicid, unsigned long start_eip)
|
|||||||
/* Target chip */
|
/* Target chip */
|
||||||
/* Boot on the stack */
|
/* Boot on the stack */
|
||||||
/* Kick the second */
|
/* Kick the second */
|
||||||
apic_icr_write(APIC_DM_NMI | apic->apic_destination_logical, logical_apicid);
|
apic_icr_write(APIC_DM_NMI | apic->dest_logical, logical_apicid);
|
||||||
|
|
||||||
pr_debug("Waiting for send to finish...\n");
|
pr_debug("Waiting for send to finish...\n");
|
||||||
send_status = safe_apic_wait_icr_idle();
|
send_status = safe_apic_wait_icr_idle();
|
||||||
|
@ -70,7 +70,7 @@ struct genapic apic_bigsmp = {
|
|||||||
|
|
||||||
.target_cpus = bigsmp_target_cpus,
|
.target_cpus = bigsmp_target_cpus,
|
||||||
.disable_esr = 1,
|
.disable_esr = 1,
|
||||||
.apic_destination_logical = 0,
|
.dest_logical = 0,
|
||||||
.check_apicid_used = check_apicid_used,
|
.check_apicid_used = check_apicid_used,
|
||||||
.check_apicid_present = check_apicid_present,
|
.check_apicid_present = check_apicid_present,
|
||||||
|
|
||||||
|
@ -37,7 +37,7 @@ struct genapic apic_default = {
|
|||||||
|
|
||||||
.target_cpus = default_target_cpus,
|
.target_cpus = default_target_cpus,
|
||||||
.disable_esr = 0,
|
.disable_esr = 0,
|
||||||
.apic_destination_logical = APIC_DEST_LOGICAL,
|
.dest_logical = APIC_DEST_LOGICAL,
|
||||||
.check_apicid_used = check_apicid_used,
|
.check_apicid_used = check_apicid_used,
|
||||||
.check_apicid_present = check_apicid_present,
|
.check_apicid_present = check_apicid_present,
|
||||||
|
|
||||||
|
@ -113,7 +113,7 @@ struct genapic apic_es7000 = {
|
|||||||
|
|
||||||
.target_cpus = es7000_target_cpus,
|
.target_cpus = es7000_target_cpus,
|
||||||
.disable_esr = 1,
|
.disable_esr = 1,
|
||||||
.apic_destination_logical = 0,
|
.dest_logical = 0,
|
||||||
.check_apicid_used = check_apicid_used,
|
.check_apicid_used = check_apicid_used,
|
||||||
.check_apicid_present = check_apicid_present,
|
.check_apicid_present = check_apicid_present,
|
||||||
|
|
||||||
|
@ -57,7 +57,7 @@ struct genapic apic_numaq = {
|
|||||||
|
|
||||||
.target_cpus = numaq_target_cpus,
|
.target_cpus = numaq_target_cpus,
|
||||||
.disable_esr = 1,
|
.disable_esr = 1,
|
||||||
.apic_destination_logical = APIC_DEST_LOGICAL,
|
.dest_logical = APIC_DEST_LOGICAL,
|
||||||
.check_apicid_used = check_apicid_used,
|
.check_apicid_used = check_apicid_used,
|
||||||
.check_apicid_present = check_apicid_present,
|
.check_apicid_present = check_apicid_present,
|
||||||
|
|
||||||
|
@ -50,7 +50,7 @@ struct genapic apic_summit = {
|
|||||||
|
|
||||||
.target_cpus = summit_target_cpus,
|
.target_cpus = summit_target_cpus,
|
||||||
.disable_esr = 1,
|
.disable_esr = 1,
|
||||||
.apic_destination_logical = APIC_DEST_LOGICAL,
|
.dest_logical = APIC_DEST_LOGICAL,
|
||||||
.check_apicid_used = check_apicid_used,
|
.check_apicid_used = check_apicid_used,
|
||||||
.check_apicid_present = check_apicid_present,
|
.check_apicid_present = check_apicid_present,
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user