Commit 8e7c47fc authored by Keir Fraser's avatar Keir Fraser

minios: fix port selection shifts

Event selectors span unsigned longs, whose size is not always 32 bits.
Signed-off-by: default avatarSamuel Thibault <samuel.thibault@eu.citrix.com>
parent 9e20b66f
......@@ -58,7 +58,7 @@ void do_hypervisor_callback(struct pt_regs *regs)
l2i = __ffs(l2);
l2 &= ~(1 << l2i);
port = (l1i << 5) + l2i;
port = (l1i * (sizeof(unsigned long) * 8)) + l2i;
do_event(port, regs);
}
}
......@@ -100,7 +100,8 @@ inline void unmask_evtchn(u32 port)
* a real IO-APIC we 'lose the interrupt edge' if the channel is masked.
*/
if ( synch_test_bit (port, &s->evtchn_pending[0]) &&
!synch_test_and_set_bit(port>>5, &vcpu_info->evtchn_pending_sel) )
!synch_test_and_set_bit(port / (sizeof(unsigned long) * 8),
&vcpu_info->evtchn_pending_sel) )
{
vcpu_info->evtchn_upcall_pending = 1;
if ( !vcpu_info->evtchn_upcall_mask )
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment