From a65b32fe6b6cfeeedc87c6d55a105947ed76679d Mon Sep 17 00:00:00 2001
From: Thomas Gleixner <tglx@linutronix.de>
Date: Thu, 24 Mar 2011 21:31:25 +0100
Subject: [PATCH] --- yaml --- r: 243357 b: refs/heads/master c:
 a3b975c49e3e21864268892760f630433d96e01a h: refs/heads/master i:   243355:
 622fd54ed67e79da2ce4186cbada2c158e4793ac v: v3

---
 [refs]                     | 2 +-
 trunk/drivers/xen/events.c | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index d589de20682d..e275352364f0 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c442b8068f7c53c40a73a82bbfd96d3f41f6778c
+refs/heads/master: a3b975c49e3e21864268892760f630433d96e01a
diff --git a/trunk/drivers/xen/events.c b/trunk/drivers/xen/events.c
index 0e7e394e42f2..036343ba204e 100644
--- 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);