]> bbs.cooldavid.org Git - net-next-2.6.git/commitdiff
x86: Move alloc_desk_mask variables inside ifdef
authorAndi Kleen <andi@firstfloor.org>
Tue, 20 Jul 2010 22:22:54 +0000 (15:22 -0700)
committerThomas Gleixner <tglx@linutronix.de>
Tue, 27 Jul 2010 18:43:05 +0000 (20:43 +0200)
They are only useful with CONFIG_CPUMASK_OFFSTACK
Avoids hundreds of warnings with a gcc 4.6 -Wall build.

Signed-off-by: Andi Kleen <ak@linux.intel.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
include/linux/irq.h

index c03243ad84b46b220324d499b18e0805e9fb827b..fff1d77c3753126d464fea9f53eec0c6e8a83f2f 100644 (file)
@@ -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;