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