---

yaml --- r: 243315 b: refs/heads/master c: b5f0149 h: refs/heads/master i: 243313: 3efc8da 243311: d01e96f v: v3
git-mirror · Mar 29, 2011 · 3fb1f54 · 3fb1f54
1 parent 8c78513
commit 3fb1f54
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 91ce72e08047190291777ec56598118225910203
+refs/heads/master: b5f0149626ebca4e5f8dd465d335d1b05f28608b
diff --git a/trunk/arch/ia64/sn/kernel/irq.c b/trunk/arch/ia64/sn/kernel/irq.c
@@ -109,7 +109,7 @@ static void sn_ack_irq(struct irq_data *data)
 	HUB_S((u64*)LOCAL_MMR_ADDR(SH_EVENT_OCCURRED_ALIAS), mask);
 	__set_bit(irq, (volatile void *)pda->sn_in_service_ivecs);
 
-	move_native_irq(irq);
+	irq_move_irq(data);
 }
 
 static void sn_irq_info_free(struct rcu_head *head);

diff --git a/trunk/arch/ia64/sn/kernel/msi_sn.c b/trunk/arch/ia64/sn/kernel/msi_sn.c
@@ -214,7 +214,7 @@ static int sn_set_msi_irq_affinity(struct irq_data *data,
 
 static void sn_ack_msi_irq(struct irq_data *data)
 {
-	move_native_irq(data->irq);
+	irq_move_irq(data);
 	ia64_eoi();
 }