From b644295a0d4ecfac7b4e4bae506ca4edcdbcb549 Mon Sep 17 00:00:00 2001
From: Andi Kleen <andi@firstfloor.org>
Date: Tue, 20 Jul 2010 15:22:54 -0700
Subject: [PATCH] --- yaml --- r: 212912 b: refs/heads/master c:
 1813a68457bb45b378d5bbec615b167deff3bcfc h: refs/heads/master v: v3

---
 [refs]                    | 2 +-
 trunk/include/linux/irq.h | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 262467f1f7cb..833bd2caabd9 100644
--- 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
index c03243ad84b4..fff1d77c3753 100644
--- 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;