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);