Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1813a684 authored by Andi Kleen's avatar Andi Kleen Committed by Thomas Gleixner
Browse files

x86: Move alloc_desk_mask variables inside ifdef 



They are only useful with CONFIG_CPUMASK_OFFSTACK
Avoids hundreds of warnings with a gcc 4.6 -Wall build.

Signed-off-by: default avatarAndi Kleen <ak@linux.intel.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
parent 25897374

include/linux/irq.h

+1 −1
Original line number Original line Diff line number Diff line
@@ -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,

static inline bool alloc_desc_masks(struct irq_desc *desc, int node,

							bool boot)

							bool boot)

{

{

#ifdef CONFIG_CPUMASK_OFFSTACK

	gfp_t gfp = GFP_ATOMIC;

	gfp_t gfp = GFP_ATOMIC;





	if (boot)

	if (boot)

		gfp = GFP_NOWAIT;

		gfp = GFP_NOWAIT;





#ifdef CONFIG_CPUMASK_OFFSTACK

	if (!alloc_cpumask_var_node(&desc->affinity, gfp, node))

	if (!alloc_cpumask_var_node(&desc->affinity, gfp, node))

		return false;

		return false;