---

yaml --- r: 212912 b: refs/heads/master c: 1813a68 h: refs/heads/master v: v3
git-mirror · Jul 27, 2010 · b644295 · b644295
1 parent f5f9126
commit b644295
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 25897374297906eeebef8864299406bdcb5859c3
+refs/heads/master: 1813a68457bb45b378d5bbec615b167deff3bcfc
diff --git a/trunk/include/linux/irq.h b/trunk/include/linux/irq.h
@@ -439,12 +439,12 @@ extern int set_irq_msi(unsigned int irq, struct msi_desc *entry);
 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;