---

yaml --- r: 243389 b: refs/heads/master c: e240ae4 h: refs/heads/master i: 243387: 49c401f v: v3
git-mirror · Mar 29, 2011 · 977f261 · 977f261
1 parent 5bd7ffb
commit 977f261
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3b3af761669ae59530a8be763b83c937c6096772
+refs/heads/master: e240ae4aad9c5c0da189cb6c956cca58abd428d0
diff --git a/trunk/drivers/xen/events.c b/trunk/drivers/xen/events.c
@@ -585,7 +585,7 @@ static void ack_pirq(struct irq_data *data)
 {
 	int evtchn = evtchn_from_irq(data->irq);
 
-	move_native_irq(data->irq);
+	irq_move_irq(data);
 
 	if (VALID_EVTCHN(evtchn)) {
 		mask_evtchn(evtchn);
@@ -1339,7 +1339,7 @@ static void ack_dynirq(struct irq_data *data)
 {
 	int evtchn = evtchn_from_irq(data->irq);
 
-	move_masked_irq(data->irq);
+	irq_move_masked_irq(data);
 
 	if (VALID_EVTCHN(evtchn))
 		unmask_evtchn(evtchn);