From 5f306740b63837e718ea2d1fb1c1d4b6a73f35c3 Mon Sep 17 00:00:00 2001
From: Christophe Saout <christophe@saout.de>
Date: Sun, 11 Jan 2009 11:46:23 -0800
Subject: [PATCH] --- yaml --- r: 136385 b: refs/heads/master c:
 28e08861b9afab4168b758fb7b95aa7a4da0f668 h: refs/heads/master i:   136383:
 77a03d9c33c7851f635dd1d32fc58fd2790265d2 v: v3

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

diff --git a/[refs] b/[refs]
index 3f7ba1761efe..cbc665b1217b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 92296c6d6e908c35fca287a21af27be814af9c75
+refs/heads/master: 28e08861b9afab4168b758fb7b95aa7a4da0f668
diff --git a/trunk/drivers/xen/events.c b/trunk/drivers/xen/events.c
index ed7527b3745a..3141e149d595 100644
--- a/trunk/drivers/xen/events.c
+++ b/trunk/drivers/xen/events.c
@@ -26,6 +26,7 @@
 #include <linux/irq.h>
 #include <linux/module.h>
 #include <linux/string.h>
+#include <linux/bootmem.h>
 
 #include <asm/ptrace.h>
 #include <asm/irq.h>
@@ -831,8 +832,8 @@ void __init xen_init_IRQ(void)
 	int i;
 	size_t size = nr_cpu_ids * sizeof(struct cpu_evtchn_s);
 
-	cpu_evtchn_mask_p = kmalloc(size, GFP_KERNEL);
-	BUG_ON(cpu_evtchn_mask == NULL);
+	cpu_evtchn_mask_p = alloc_bootmem(size);
+	BUG_ON(cpu_evtchn_mask_p == NULL);
 
 	init_evtchn_cpu_bindings();