diff --git a/[refs] b/[refs] index 33f23af59214..8e94fe20d96d 100644 --- 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 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);