Commit 7276c6a2 authored by Thomas Gleixner's avatar Thomas Gleixner

x86/irq: Rename VECTOR_UNDEFINED to VECTOR_UNUSED

VECTOR_UNDEFINED is a misnomer. The vector is defined, but unused.
Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
Cc: Jiang Liu <jiang.liu@linux.intel.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Rusty Russell <rusty@rustcorp.com.au>
Cc: Bjorn Helgaas <bhelgaas@google.com>
Link: http://lkml.kernel.org/r/20150802203609.477282494@linutronix.deSigned-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
parent 24c70e07
...@@ -182,7 +182,7 @@ extern char irq_entries_start[]; ...@@ -182,7 +182,7 @@ extern char irq_entries_start[];
#define trace_irq_entries_start irq_entries_start #define trace_irq_entries_start irq_entries_start
#endif #endif
#define VECTOR_UNDEFINED (-1) #define VECTOR_UNUSED (-1)
#define VECTOR_RETRIGGERED (-2) #define VECTOR_RETRIGGERED (-2)
typedef int vector_irq_t[NR_VECTORS]; typedef int vector_irq_t[NR_VECTORS];
......
...@@ -169,8 +169,7 @@ static int __assign_irq_vector(int irq, struct apic_chip_data *d, ...@@ -169,8 +169,7 @@ static int __assign_irq_vector(int irq, struct apic_chip_data *d,
goto next; goto next;
for_each_cpu_and(new_cpu, vector_cpumask, cpu_online_mask) { for_each_cpu_and(new_cpu, vector_cpumask, cpu_online_mask) {
if (per_cpu(vector_irq, new_cpu)[vector] > if (per_cpu(vector_irq, new_cpu)[vector] > VECTOR_UNUSED)
VECTOR_UNDEFINED)
goto next; goto next;
} }
/* Found one! */ /* Found one! */
...@@ -232,7 +231,7 @@ static void clear_irq_vector(int irq, struct apic_chip_data *data) ...@@ -232,7 +231,7 @@ static void clear_irq_vector(int irq, struct apic_chip_data *data)
vector = data->cfg.vector; vector = data->cfg.vector;
for_each_cpu_and(cpu, data->domain, cpu_online_mask) for_each_cpu_and(cpu, data->domain, cpu_online_mask)
per_cpu(vector_irq, cpu)[vector] = VECTOR_UNDEFINED; per_cpu(vector_irq, cpu)[vector] = VECTOR_UNUSED;
data->cfg.vector = 0; data->cfg.vector = 0;
cpumask_clear(data->domain); cpumask_clear(data->domain);
...@@ -247,7 +246,7 @@ static void clear_irq_vector(int irq, struct apic_chip_data *data) ...@@ -247,7 +246,7 @@ static void clear_irq_vector(int irq, struct apic_chip_data *data)
vector++) { vector++) {
if (per_cpu(vector_irq, cpu)[vector] != irq) if (per_cpu(vector_irq, cpu)[vector] != irq)
continue; continue;
per_cpu(vector_irq, cpu)[vector] = VECTOR_UNDEFINED; per_cpu(vector_irq, cpu)[vector] = VECTOR_UNUSED;
break; break;
} }
} }
...@@ -423,12 +422,12 @@ static void __setup_vector_irq(int cpu) ...@@ -423,12 +422,12 @@ static void __setup_vector_irq(int cpu)
/* Mark the free vectors */ /* Mark the free vectors */
for (vector = 0; vector < NR_VECTORS; ++vector) { for (vector = 0; vector < NR_VECTORS; ++vector) {
irq = per_cpu(vector_irq, cpu)[vector]; irq = per_cpu(vector_irq, cpu)[vector];
if (irq <= VECTOR_UNDEFINED) if (irq <= VECTOR_UNUSED)
continue; continue;
data = apic_chip_data(irq_get_irq_data(irq)); data = apic_chip_data(irq_get_irq_data(irq));
if (!cpumask_test_cpu(cpu, data->domain)) if (!cpumask_test_cpu(cpu, data->domain))
per_cpu(vector_irq, cpu)[vector] = VECTOR_UNDEFINED; per_cpu(vector_irq, cpu)[vector] = VECTOR_UNUSED;
} }
} }
...@@ -552,7 +551,7 @@ asmlinkage __visible void smp_irq_move_cleanup_interrupt(void) ...@@ -552,7 +551,7 @@ asmlinkage __visible void smp_irq_move_cleanup_interrupt(void)
retry: retry:
irq = __this_cpu_read(vector_irq[vector]); irq = __this_cpu_read(vector_irq[vector]);
if (irq <= VECTOR_UNDEFINED) if (irq <= VECTOR_UNUSED)
continue; continue;
desc = irq_to_desc(irq); desc = irq_to_desc(irq);
...@@ -592,7 +591,7 @@ asmlinkage __visible void smp_irq_move_cleanup_interrupt(void) ...@@ -592,7 +591,7 @@ asmlinkage __visible void smp_irq_move_cleanup_interrupt(void)
apic->send_IPI_self(IRQ_MOVE_CLEANUP_VECTOR); apic->send_IPI_self(IRQ_MOVE_CLEANUP_VECTOR);
goto unlock; goto unlock;
} }
__this_cpu_write(vector_irq[vector], VECTOR_UNDEFINED); __this_cpu_write(vector_irq[vector], VECTOR_UNUSED);
unlock: unlock:
raw_spin_unlock(&desc->lock); raw_spin_unlock(&desc->lock);
} }
......
...@@ -228,7 +228,7 @@ __visible unsigned int __irq_entry do_IRQ(struct pt_regs *regs) ...@@ -228,7 +228,7 @@ __visible unsigned int __irq_entry do_IRQ(struct pt_regs *regs)
__func__, smp_processor_id(), __func__, smp_processor_id(),
vector, irq); vector, irq);
} else { } else {
__this_cpu_write(vector_irq[vector], VECTOR_UNDEFINED); __this_cpu_write(vector_irq[vector], VECTOR_UNUSED);
} }
} }
...@@ -401,7 +401,7 @@ int check_irq_vectors_for_cpu_disable(void) ...@@ -401,7 +401,7 @@ int check_irq_vectors_for_cpu_disable(void)
for (vector = FIRST_EXTERNAL_VECTOR; for (vector = FIRST_EXTERNAL_VECTOR;
vector < first_system_vector; vector++) { vector < first_system_vector; vector++) {
if (!test_bit(vector, used_vectors) && if (!test_bit(vector, used_vectors) &&
per_cpu(vector_irq, cpu)[vector] <= VECTOR_UNDEFINED) per_cpu(vector_irq, cpu)[vector] <= VECTOR_UNUSED)
count++; count++;
} }
} }
...@@ -506,7 +506,7 @@ void fixup_irqs(void) ...@@ -506,7 +506,7 @@ void fixup_irqs(void)
for (vector = FIRST_EXTERNAL_VECTOR; vector < NR_VECTORS; vector++) { for (vector = FIRST_EXTERNAL_VECTOR; vector < NR_VECTORS; vector++) {
unsigned int irr; unsigned int irr;
if (__this_cpu_read(vector_irq[vector]) <= VECTOR_UNDEFINED) if (__this_cpu_read(vector_irq[vector]) <= VECTOR_UNUSED)
continue; continue;
irr = apic_read(APIC_IRR + (vector / 32 * 0x10)); irr = apic_read(APIC_IRR + (vector / 32 * 0x10));
...@@ -524,7 +524,7 @@ void fixup_irqs(void) ...@@ -524,7 +524,7 @@ void fixup_irqs(void)
raw_spin_unlock(&desc->lock); raw_spin_unlock(&desc->lock);
} }
if (__this_cpu_read(vector_irq[vector]) != VECTOR_RETRIGGERED) if (__this_cpu_read(vector_irq[vector]) != VECTOR_RETRIGGERED)
__this_cpu_write(vector_irq[vector], VECTOR_UNDEFINED); __this_cpu_write(vector_irq[vector], VECTOR_UNUSED);
} }
} }
#endif #endif
...@@ -52,7 +52,7 @@ static struct irqaction irq2 = { ...@@ -52,7 +52,7 @@ static struct irqaction irq2 = {
}; };
DEFINE_PER_CPU(vector_irq_t, vector_irq) = { DEFINE_PER_CPU(vector_irq_t, vector_irq) = {
[0 ... NR_VECTORS - 1] = VECTOR_UNDEFINED, [0 ... NR_VECTORS - 1] = VECTOR_UNUSED,
}; };
int vector_used_by_percpu_irq(unsigned int vector) int vector_used_by_percpu_irq(unsigned int vector)
...@@ -60,7 +60,7 @@ int vector_used_by_percpu_irq(unsigned int vector) ...@@ -60,7 +60,7 @@ int vector_used_by_percpu_irq(unsigned int vector)
int cpu; int cpu;
for_each_online_cpu(cpu) { for_each_online_cpu(cpu) {
if (per_cpu(vector_irq, cpu)[vector] > VECTOR_UNDEFINED) if (per_cpu(vector_irq, cpu)[vector] > VECTOR_UNUSED)
return 1; return 1;
} }
......
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