--- a/include/linux/irq.h	2012-02-26 18:41:03.448198204 -0500
+++ b/include/linux/irq.h	2012-02-26 18:40:49.908674173 -0500
@@ -438,12 +438,12 @@
 static inline bool alloc_desc_masks(struct irq_desc *desc, int node,
 							bool boot)
 {
+#ifdef CONFIG_CPUMASK_OFFSTACK
 	gfp_t gfp = GFP_ATOMIC;
 
 	if (boot)
 		gfp = GFP_NOWAIT;
 
-#ifdef CONFIG_CPUMASK_OFFSTACK
 	if (!alloc_cpumask_var_node(&desc->affinity, gfp, node))
 		return false;