diff options
author | Boris Ostrovsky <boris.ostrovsky@oracle.com> | 2015-04-29 17:10:15 -0400 |
---|---|---|
committer | Sasha Levin <sasha.levin@oracle.com> | 2015-05-23 15:53:13 -0400 |
commit | 3b2ec381961c77785353337031a00691416b4479 (patch) | |
tree | 18a6f646c273fe87cbd80a7fe7ba1ab5fd1bc4c3 /drivers/xen | |
parent | 0120beac6be73f3bdf3ddce4eb428d7667c08cef (diff) | |
download | linux-stable-3b2ec381961c77785353337031a00691416b4479.tar.gz linux-stable-3b2ec381961c77785353337031a00691416b4479.tar.bz2 linux-stable-3b2ec381961c77785353337031a00691416b4479.zip |
xen/events: Set irq_info->evtchn before binding the channel to CPU in __startup_pirq()
[ Upstream commit 16e6bd5970c88a2ac018b84a5f1dd5c2ff1fdf2c ]
.. 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>
Cc: <stable@vger.kernel.org>
Signed-off-by: David Vrabel <david.vrabel@citrix.com>
Signed-off-by: Sasha Levin <sasha.levin@oracle.com>
Diffstat (limited to 'drivers/xen')
-rw-r--r-- | drivers/xen/events/events_base.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/xen/events/events_base.c b/drivers/xen/events/events_base.c index a1ec564d791c..2b8553bd8715 100644 --- a/drivers/xen/events/events_base.c +++ b/drivers/xen/events/events_base.c @@ -529,8 +529,8 @@ static unsigned int __startup_pirq(unsigned int irq) if (rc) goto err; - bind_evtchn_to_cpu(evtchn, 0); info->evtchn = evtchn; + bind_evtchn_to_cpu(evtchn, 0); rc = xen_evtchn_port_setup(info); if (rc) |