---

yaml --- r: 243224 b: refs/heads/master c: a6aeddd h: refs/heads/master v: v3
git-mirror · Mar 28, 2011 · 3de9a11 · 3de9a11
1 parent a1d416a
commit 3de9a11
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 30398bf6c684a77274dbdabf7efc1f24e4a99028
+refs/heads/master: a6aeddd1c4e464a2150f97ca2d1c3d68cfbd9296
diff --git a/trunk/kernel/irq/migration.c b/trunk/kernel/irq/migration.c
@@ -60,7 +60,6 @@ void move_masked_irq(int irq)
 
 void irq_move_irq(struct irq_data *idata)
 {
-	struct irq_desc *desc = irq_data_to_desc(idata);
 	bool masked;
 
 	if (likely(!irqd_is_setaffinity_pending(idata)))

diff --git a/trunk/kernel/irq/spurious.c b/trunk/kernel/irq/spurious.c
@@ -48,7 +48,7 @@ bool irq_wait_for_poll(struct irq_desc *desc)
 		while (irqd_irq_inprogress(&desc->irq_data))
 			cpu_relax();
 		raw_spin_lock(&desc->lock);
-	} while irqd_irq_inprogress(&desc->irq_data);
+	} while (irqd_irq_inprogress(&desc->irq_data));
 	/* Might have been disabled in meantime */
 	return !irqd_irq_disabled(&desc->irq_data) && desc->action;
 #else