1 files changed, 6 insertions, 2 deletions

diff --git a/drivers/xen/events.c b/drivers/xen/events.c
index d659480125f0..7c64473c9f3f 100644
--- a/drivers/xen/events.c
+++ b/drivers/xen/events.c
@@ -665,7 +665,7 @@ static void __xen_evtchn_do_upcall(void)
 
                 count = __get_cpu_var(xed_nesting_count);
                 __get_cpu_var(xed_nesting_count) = 0;
-        } while(count != 1);
+        } while (count != 1 || vcpu_info->evtchn_upcall_pending);
 
 out:
 
@@ -689,6 +689,7 @@ void xen_hvm_evtchn_do_upcall(void)
 {
         __xen_evtchn_do_upcall();
 }
+EXPORT_SYMBOL_GPL(xen_hvm_evtchn_do_upcall);
 
 /* Rebind a new event channel to an existing irq. */
 void rebind_evtchn_irq(int evtchn, int irq)
@@ -725,7 +726,10 @@ static int rebind_irq_to_cpu(unsigned irq, unsigned tcpu)
         struct evtchn_bind_vcpu bind_vcpu;
         int evtchn = evtchn_from_irq(irq);
 
-        if (!VALID_EVTCHN(evtchn))
+        /* events delivered via platform PCI interrupts are always
+         * routed to vcpu 0 */
+        if (!VALID_EVTCHN(evtchn) ||
+                (xen_hvm_domain() && !xen_have_vector_callback))
                 return -1;
 
         /* Send future instances of this interrupt to other vcpu. */