Skip to content

Commit

Permalink
genirq: Switch sparse_irq allocator to GFP_KERNEL
Browse files Browse the repository at this point in the history
The allocator functions are now called outside of preempt disabled
regions. Switch to GFP_KERNEL.

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Reviewed-by: Ingo Molnar <mingo@elte.hu>
  • Loading branch information
Thomas Gleixner committed Oct 12, 2010
1 parent a05a900 commit baa0d23
Showing 1 changed file with 2 additions and 3 deletions.
5 changes: 2 additions & 3 deletions kernel/irq/irqdesc.c
Original file line number Diff line number Diff line change
Expand Up @@ -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)
{
Expand Down Expand Up @@ -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)
Expand Down

0 comments on commit baa0d23

Please sign in to comment.