1 files changed, 5 insertions, 2 deletions

diff --git a/drivers/xen/events.c b/drivers/xen/events.c
index 321a0c8346e5..d770b8c8885b 100644
--- a/drivers/xen/events.c
+++ b/drivers/xen/events.c
@@ -286,9 +286,9 @@ static void bind_evtchn_to_cpu(unsigned int chn, unsigned int cpu)
 
 static void init_evtchn_cpu_bindings(void)
 {
+        int i;
 #ifdef CONFIG_SMP
         struct irq_desc *desc;
-        int i;
 
         /* By default all event channels notify CPU#0. */
         for_each_irq_desc(i, desc) {
@@ -296,7 +296,10 @@ static void init_evtchn_cpu_bindings(void)
         }
 #endif
 
-        memset(cpu_evtchn_mask(0), ~0, sizeof(struct cpu_evtchn_s));
+        for_each_possible_cpu(i)
+                memset(cpu_evtchn_mask(i),
+                       (i == 0) ? ~0 : 0, sizeof(struct cpu_evtchn_s));
+
 }
 
 static inline void clear_evtchn(int port)