Skip to content

Commit

Permalink
genirq: Remove early_init_irq_lock_class()
Browse files Browse the repository at this point in the history
early_init_irq_lock_class() is called way before anything touches the
irq descriptors. In case of SPARSE_IRQ=y this is a NOP operation
because the radix tree is empty at this point. For the SPARSE_IRQ=n
case it's sufficient to set the lock class in early_init_irq(). 

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 3795de2 commit 154cd38
Show file tree
Hide file tree
Showing 3 changed files with 1 addition and 19 deletions.
8 changes: 0 additions & 8 deletions include/linux/lockdep.h
Original file line number Diff line number Diff line change
Expand Up @@ -424,14 +424,6 @@ do { \

#endif /* CONFIG_LOCKDEP */

#ifdef CONFIG_GENERIC_HARDIRQS
extern void early_init_irq_lock_class(void);
#else
static inline void early_init_irq_lock_class(void)
{
}
#endif

#ifdef CONFIG_TRACE_IRQFLAGS
extern void early_boot_irqs_off(void);
extern void early_boot_irqs_on(void);
Expand Down
1 change: 0 additions & 1 deletion init/main.c
Original file line number Diff line number Diff line change
Expand Up @@ -556,7 +556,6 @@ asmlinkage void __init start_kernel(void)

local_irq_disable();
early_boot_irqs_off();
early_init_irq_lock_class();

/*
* Interrupts are still disabled. Do necessary setups, then
Expand Down
11 changes: 1 addition & 10 deletions kernel/irq/irqdesc.c
Original file line number Diff line number Diff line change
Expand Up @@ -231,6 +231,7 @@ int __init early_irq_init(void)
alloc_desc_masks(&desc[i], 0, true);
init_desc_masks(&desc[i]);
desc[i].kstat_irqs = kstat_irqs_all[i];
lockdep_set_class(&desc[i].lock, &irq_desc_lock_class);
}
return arch_early_irq_init();
}
Expand All @@ -251,16 +252,6 @@ void clear_kstat_irqs(struct irq_desc *desc)
memset(desc->kstat_irqs, 0, nr_cpu_ids * sizeof(*(desc->kstat_irqs)));
}

void early_init_irq_lock_class(void)
{
struct irq_desc *desc;
int i;

for_each_irq_desc(i, desc) {
lockdep_set_class(&desc->lock, &irq_desc_lock_class);
}
}

unsigned int kstat_irqs_cpu(unsigned int irq, int cpu)
{
struct irq_desc *desc = irq_to_desc(irq);
Expand Down

0 comments on commit 154cd38

Please sign in to comment.