diff --git a/[refs] b/[refs]
index 35a0faab6a38..6a993f4711dd 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 75909fd619d15400e7c6d0fc3af09838ee8b166e
+refs/heads/master: ff3c536291ce96ef6f45704cd37eaed71127dd42
diff --git a/trunk/drivers/xen/events.c b/trunk/drivers/xen/events.c
index 9ce1ab6c268d..1e3b934a4cf7 100644
--- a/trunk/drivers/xen/events.c
+++ b/trunk/drivers/xen/events.c
@@ -774,7 +774,7 @@ void xen_poll_irq(int irq)
 
 		poll.nr_ports = 1;
 		poll.timeout = 0;
-		poll.ports = &evtchn;
+		set_xen_guest_handle(poll.ports, &evtchn);
 
 		if (HYPERVISOR_sched_op(SCHEDOP_poll, &poll) != 0)
 			BUG();