From 318f9ef92c0035b8a9c3f0c310e3579767c3a66a Mon Sep 17 00:00:00 2001
From: Pekka Enberg <penberg@cs.helsinki.fi>
Date: Wed, 1 Jul 2009 11:51:18 +0300
Subject: [PATCH] --- yaml --- r: 155034 b: refs/heads/master c:
 a70c352a37671fe1ebcbd317b439aa4760f4ccb7 h: refs/heads/master v: v3

---
 [refs]                     | 2 +-
 trunk/drivers/xen/events.c | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 7957968748af..7369d5699f73 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 789d03f584484af85dbdc64935270c8e45f36ef7
+refs/heads/master: a70c352a37671fe1ebcbd317b439aa4760f4ccb7
diff --git a/trunk/drivers/xen/events.c b/trunk/drivers/xen/events.c
index 891d2e90753a..abad71b1632b 100644
--- a/trunk/drivers/xen/events.c
+++ b/trunk/drivers/xen/events.c
@@ -927,9 +927,9 @@ static struct irq_chip xen_dynamic_chip __read_mostly = {
 void __init xen_init_IRQ(void)
 {
 	int i;
-	size_t size = nr_cpu_ids * sizeof(struct cpu_evtchn_s);
 
-	cpu_evtchn_mask_p = alloc_bootmem(size);
+	cpu_evtchn_mask_p = kcalloc(nr_cpu_ids, sizeof(struct cpu_evtchn_s),
+				    GFP_KERNEL);
 	BUG_ON(cpu_evtchn_mask_p == NULL);
 
 	init_evtchn_cpu_bindings();