From 13a553743d842e13b22e57cac7d80521b2c281f2 Mon Sep 17 00:00:00 2001
From: Yinghai Lu <yinghai@kernel.org>
Date: Fri, 12 Jun 2009 11:33:02 +0300
Subject: [PATCH] --- yaml --- r: 148169 b: refs/heads/master c:
 28be225b23b115573e0ecc8ef9996f42a1652f74 h: refs/heads/master i:   148167:
 6f8b6dfc682307571826e8ae0d997ca7cd0abf01 v: v3

---
 [refs]                    | 2 +-
 trunk/kernel/irq/handle.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index c11c0090c04c..0a94f1b39471 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ca371c0d7e23d0d0afae65fc83a0e91cf7399573
+refs/heads/master: 28be225b23b115573e0ecc8ef9996f42a1652f74
diff --git a/trunk/kernel/irq/handle.c b/trunk/kernel/irq/handle.c
index 104578541230..065205bdd920 100644
--- a/trunk/kernel/irq/handle.c
+++ b/trunk/kernel/irq/handle.c
@@ -45,7 +45,7 @@ void handle_bad_irq(unsigned int irq, struct irq_desc *desc)
 #if defined(CONFIG_SMP) && defined(CONFIG_GENERIC_HARDIRQS)
 static void __init init_irq_default_affinity(void)
 {
-	alloc_bootmem_cpumask_var(&irq_default_affinity);
+	alloc_cpumask_var(&irq_default_affinity, GFP_NOWAIT);
 	cpumask_setall(irq_default_affinity);
 }
 #else