aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRusty Russell <rusty@rustcorp.com.au>2015-03-09 22:12:03 -0400
committerRusty Russell <rusty@rustcorp.com.au>2015-03-09 23:24:38 -0400
commit6a4bd8d1412a6cd72b65d7c86a2c08e9ec1d6b97 (patch)
treea02a0bc867e4931b31238131be010b065655123e
parent87313df7b47c5048d8920a486f77835a49406754 (diff)
ia64: remove deprecated cpus_ usage.
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
-rw-r--r--arch/ia64/kernel/irq_ia64.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/ia64/kernel/irq_ia64.c b/arch/ia64/kernel/irq_ia64.c
index 9f40d972969c..eaa3199f98c8 100644
--- a/arch/ia64/kernel/irq_ia64.c
+++ b/arch/ia64/kernel/irq_ia64.c
@@ -173,7 +173,7 @@ static void __clear_irq_vector(int irq)
173 cfg->vector = IRQ_VECTOR_UNASSIGNED; 173 cfg->vector = IRQ_VECTOR_UNASSIGNED;
174 cfg->domain = CPU_MASK_NONE; 174 cfg->domain = CPU_MASK_NONE;
175 irq_status[irq] = IRQ_UNUSED; 175 irq_status[irq] = IRQ_UNUSED;
176 cpus_andnot(vector_table[vector], vector_table[vector], domain); 176 cpumask_andnot(&vector_table[vector], &vector_table[vector], &domain);
177} 177}
178 178
179static void clear_irq_vector(int irq) 179static void clear_irq_vector(int irq)
@@ -259,7 +259,7 @@ static enum vector_domain_type {
259static cpumask_t vector_allocation_domain(int cpu) 259static cpumask_t vector_allocation_domain(int cpu)
260{ 260{
261 if (vector_domain_type == VECTOR_DOMAIN_PERCPU) 261 if (vector_domain_type == VECTOR_DOMAIN_PERCPU)
262 return cpumask_of_cpu(cpu); 262 return *cpumask_of(cpu);
263 return CPU_MASK_ALL; 263 return CPU_MASK_ALL;
264} 264}
265 265