lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

x86: Use the proper accessors in fixup_irqs()

Browse Source 
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
This commit is contained in:
Thomas Gleixner
2011-02-10 21:40:36 +01:00
parent 5451ddc562
commit 51c43ac6e4
1 changed files with 13 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
arch/x86/kernel/irq.c
View File

@@ -293,6 +293,7 @@ void fixup_irqs(void)
static int warned; static int warned;
struct irq_desc *desc; struct irq_desc *desc;
struct irq_data *data; struct irq_data *data;
struct irq_chip *chip;
for_each_irq_desc(irq, desc) { for_each_irq_desc(irq, desc) {
int break_affinity = 0; int break_affinity = 0;
@@ -307,7 +308,7 @@ void fixup_irqs(void)
/* interrupt's are disabled at this point */ /* interrupt's are disabled at this point */
raw_spin_lock(&desc->lock); raw_spin_lock(&desc->lock);
data = &desc->irq_data; data = irq_desc_get_irq_data(desc);
affinity = data->affinity; affinity = data->affinity;
if (!irq_has_action(irq) || if (!irq_has_action(irq) ||
cpumask_subset(affinity, cpu_online_mask)) { cpumask_subset(affinity, cpu_online_mask)) {
@@ -327,16 +328,17 @@ void fixup_irqs(void)
affinity = cpu_all_mask; affinity = cpu_all_mask;
} }
if (!(desc->status & IRQ_MOVE_PCNTXT) && data->chip->irq_mask) chip = irq_data_get_irq_chip(data);
data->chip->irq_mask(data); if (!irqd_can_move_in_process_context(data) && chip->irq_mask)
chip->irq_mask(data);
if (data->chip->irq_set_affinity) if (chip->irq_set_affinity)
data->chip->irq_set_affinity(data, affinity, true); chip->irq_set_affinity(data, affinity, true);
else if (!(warned++)) else if (!(warned++))
set_affinity = 0; set_affinity = 0;
if (!(desc->status & IRQ_MOVE_PCNTXT) && data->chip->irq_unmask) if (!irqd_can_move_in_process_context(data) && chip->irq_unmask)
data->chip->irq_unmask(data); chip->irq_unmask(data);
raw_spin_unlock(&desc->lock); raw_spin_unlock(&desc->lock);
@@ -368,10 +370,11 @@ void fixup_irqs(void)
irq = __this_cpu_read(vector_irq[vector]); irq = __this_cpu_read(vector_irq[vector]);
desc = irq_to_desc(irq); desc = irq_to_desc(irq);
data = &desc->irq_data; data = irq_desc_get_irq_data(desc);
chip = irq_data_get_irq_chip(data);
raw_spin_lock(&desc->lock); raw_spin_lock(&desc->lock);
if (data->chip->irq_retrigger) if (chip->irq_retrigger)
data->chip->irq_retrigger(data); chip->irq_retrigger(data);
raw_spin_unlock(&desc->lock); raw_spin_unlock(&desc->lock);
} }
} }