summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorBoris Ostrovsky <boris.ostrovsky@oracle.com>2015-04-30 00:10:15 +0300
committerZefan Li <lizefan@huawei.com>2015-09-18 04:20:36 +0300
commit95f92efede0bece7fa9eaaf4329e5445eb927739 (patch)
tree57fc4967cce861a53767154be0fc90c7d92457a3 /drivers
parentda91140159233782ddd65c4b88a3fe2c9243d36f (diff)
downloadlinux-95f92efede0bece7fa9eaaf4329e5445eb927739.tar.xz
xen/events: Set irq_info->evtchn before binding the channel to CPU in __startup_pirq()
commit 16e6bd5970c88a2ac018b84a5f1dd5c2ff1fdf2c upstream. .. because bind_evtchn_to_cpu(evtchn, cpu) will map evtchn to 'info' and pass 'info' down to xen_evtchn_port_bind_to_cpu(). Signed-off-by: Boris Ostrovsky <boris.ostrovsky@oracle.com> Tested-by: Annie Li <annie.li@oracle.com> Signed-off-by: David Vrabel <david.vrabel@citrix.com> [lizf: Backported to 3.4: adjust filename and context] Signed-off-by: Zefan Li <lizefan@huawei.com>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/xen/events.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/xen/events.c b/drivers/xen/events.c
index 9161f06564eb..fdf842c83a7a 100644
--- a/drivers/xen/events.c
+++ b/drivers/xen/events.c
@@ -563,8 +563,8 @@ static unsigned int __startup_pirq(unsigned int irq)
pirq_query_unmask(irq);
evtchn_to_irq[evtchn] = irq;
- bind_evtchn_to_cpu(evtchn, 0);
info->evtchn = evtchn;
+ bind_evtchn_to_cpu(evtchn, 0);
out:
unmask_evtchn(evtchn);