diff options
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/irq/migration.c | 1 | ||||
| -rw-r--r-- | kernel/irq/spurious.c | 2 | 
2 files changed, 1 insertions, 2 deletions
| diff --git a/kernel/irq/migration.c b/kernel/irq/migration.c index 5e81d34b08d6..e33d9c8d5089 100644 --- a/kernel/irq/migration.c +++ b/kernel/irq/migration.c | |||
| @@ -60,7 +60,6 @@ void move_masked_irq(int irq) | |||
| 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))) | 
| diff --git a/kernel/irq/spurious.c b/kernel/irq/spurious.c index cd424cdf17fc..83f4799f46be 100644 --- a/kernel/irq/spurious.c +++ b/kernel/irq/spurious.c | |||
| @@ -48,7 +48,7 @@ bool irq_wait_for_poll(struct irq_desc *desc) | |||
| 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 | 
