Sigh, I'm overworked.
Showing the changes to kernel (2 of 2 files). Show all
Unified · Split
| @@ -60,7 +60,6 @@ void move_masked_irq(int irq) · 59 unmodified lines | |||
| 60 | 60 | ||
| 61 | void irq_move_irq(struct irq_data *idata) | 61 | void irq_move_irq(struct irq_data *idata) |
| 62 | { | 62 | { |
| 63 | struct irq_desc *desc = irq_data_to_desc(idata); | ||
| 64 | bool masked; | 63 | bool masked; |
| 65 | 64 | ||
| 66 | if (likely(!irqd_is_setaffinity_pending(idata))) | 65 | if (likely(!irqd_is_setaffinity_pending(idata))) |
| @@ -48,7 +48,7 @@ bool irq_wait_for_poll(struct irq_desc *desc) · 47 unmodified lines | |||
| 48 | while (irqd_irq_inprogress(&desc->irq_data)) | 48 | while (irqd_irq_inprogress(&desc->irq_data)) |
| 49 | cpu_relax(); | 49 | cpu_relax(); |
| 50 | raw_spin_lock(&desc->lock); | 50 | raw_spin_lock(&desc->lock); |
| 51 | } while irqd_irq_inprogress(&desc->irq_data); | 51 | } while (irqd_irq_inprogress(&desc->irq_data)); |
| 52 | /* Might have been disabled in meantime */ | 52 | /* Might have been disabled in meantime */ |
| 53 | return !irqd_irq_disabled(&desc->irq_data) && desc->action; | 53 | return !irqd_irq_disabled(&desc->irq_data) && desc->action; |
| 54 | #else | 54 | #else |