提交 51f7bd85 编写于 作者: R Rusty Russell

ia64: Use for_each_cpu_and() and cpumask_any_and() instead of temp var.

Just a bit of manual neatening, before spatch cleans the rest.
Signed-off-by: NRusty Russell <rusty@rustcorp.com.au>
Cc: Tony Luck <tony.luck@intel.com>
Cc: Fenghua Yu <fenghua.yu@intel.com>
Cc: linux-ia64@vger.kernel.org
上级 270bd400
...@@ -161,7 +161,6 @@ int bind_irq_vector(int irq, int vector, cpumask_t domain) ...@@ -161,7 +161,6 @@ int bind_irq_vector(int irq, int vector, cpumask_t domain)
static void __clear_irq_vector(int irq) static void __clear_irq_vector(int irq)
{ {
int vector, cpu; int vector, cpu;
cpumask_t mask;
cpumask_t domain; cpumask_t domain;
struct irq_cfg *cfg = &irq_cfg[irq]; struct irq_cfg *cfg = &irq_cfg[irq];
...@@ -169,8 +168,7 @@ static void __clear_irq_vector(int irq) ...@@ -169,8 +168,7 @@ static void __clear_irq_vector(int irq)
BUG_ON(cfg->vector == IRQ_VECTOR_UNASSIGNED); BUG_ON(cfg->vector == IRQ_VECTOR_UNASSIGNED);
vector = cfg->vector; vector = cfg->vector;
domain = cfg->domain; domain = cfg->domain;
cpumask_and(&mask, &cfg->domain, cpu_online_mask); for_each_cpu_and(cpu, &cfg->domain, cpu_online_mask)
for_each_cpu_mask(cpu, mask)
per_cpu(vector_irq, cpu)[vector] = -1; per_cpu(vector_irq, cpu)[vector] = -1;
cfg->vector = IRQ_VECTOR_UNASSIGNED; cfg->vector = IRQ_VECTOR_UNASSIGNED;
cfg->domain = CPU_MASK_NONE; cfg->domain = CPU_MASK_NONE;
......
...@@ -47,15 +47,14 @@ int ia64_setup_msi_irq(struct pci_dev *pdev, struct msi_desc *desc) ...@@ -47,15 +47,14 @@ int ia64_setup_msi_irq(struct pci_dev *pdev, struct msi_desc *desc)
struct msi_msg msg; struct msi_msg msg;
unsigned long dest_phys_id; unsigned long dest_phys_id;
int irq, vector; int irq, vector;
cpumask_t mask;
irq = create_irq(); irq = create_irq();
if (irq < 0) if (irq < 0)
return irq; return irq;
irq_set_msi_desc(irq, desc); irq_set_msi_desc(irq, desc);
cpumask_and(&mask, &(irq_to_domain(irq)), cpu_online_mask); dest_phys_id = cpu_physical_id(cpumask_any_and(&(irq_to_domain(irq)),
dest_phys_id = cpu_physical_id(first_cpu(mask)); cpu_online_mask));
vector = irq_to_vector(irq); vector = irq_to_vector(irq);
msg.address_hi = 0; msg.address_hi = 0;
...@@ -171,10 +170,9 @@ msi_compose_msg(struct pci_dev *pdev, unsigned int irq, struct msi_msg *msg) ...@@ -171,10 +170,9 @@ msi_compose_msg(struct pci_dev *pdev, unsigned int irq, struct msi_msg *msg)
{ {
struct irq_cfg *cfg = irq_cfg + irq; struct irq_cfg *cfg = irq_cfg + irq;
unsigned dest; unsigned dest;
cpumask_t mask;
cpumask_and(&mask, &(irq_to_domain(irq)), cpu_online_mask); dest = cpu_physical_id(cpumask_first_and(&(irq_to_domain(irq)),
dest = cpu_physical_id(first_cpu(mask)); cpu_online_mask));
msg->address_hi = 0; msg->address_hi = 0;
msg->address_lo = msg->address_lo =
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册