Commit baa0d233 authored by Thomas Gleixner's avatar Thomas Gleixner
Browse files

genirq: Switch sparse_irq allocator to GFP_KERNEL 



The allocator functions are now called outside of preempt disabled
regions. Switch to GFP_KERNEL.

Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
Reviewed-by: default avatarIngo Molnar <mingo@elte.hu>
parent a05a900a

kernel/irq/irqdesc.c

+2 −3
Original line number Diff line number Diff line
@@ -95,7 +95,7 @@ static DECLARE_BITMAP(allocated_irqs, NR_IRQS); 


#ifdef CONFIG_SPARSE_IRQ



static RADIX_TREE(irq_desc_tree, GFP_ATOMIC);

static RADIX_TREE(irq_desc_tree, GFP_KERNEL);



static void irq_insert_desc(unsigned int irq, struct irq_desc *desc)

{
@@ -126,9 +126,8 @@ static inline void free_masks(struct irq_desc *desc) { } 


static struct irq_desc *alloc_desc(int irq, int node)

{

	/* Temporary hack until we can switch to GFP_KERNEL */

	gfp_t gfp = gfp_allowed_mask == GFP_BOOT_MASK ? GFP_NOWAIT : GFP_ATOMIC;

	struct irq_desc *desc;

	gfp_t gfp = GFP_KERNEL;



	desc = kzalloc_node(sizeof(*desc), gfp, node);

	if (!desc)