OpenE2K
/
linux
6
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

genirq: Remove early_init_irq_lock_class() 

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>
This commit is contained in:
Thomas Gleixner 2010-09-22 15:58:45 +02:00
parent 3795de236d
commit 154cd387cd
3 changed files with 1 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
include/linux/lockdep.h
View File

@ -424,14 +424,6 @@ do { \
#endif /* CONFIG_LOCKDEP */ #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 #ifdef CONFIG_TRACE_IRQFLAGS
extern void early_boot_irqs_off(void); extern void early_boot_irqs_off(void);
extern void early_boot_irqs_on(void); extern void early_boot_irqs_on(void);

1
init/main.c
View File

@ -556,7 +556,6 @@ asmlinkage void __init start_kernel(void)
local_irq_disable(); local_irq_disable();
early_boot_irqs_off(); early_boot_irqs_off();
early_init_irq_lock_class();
/* /*
* Interrupts are still disabled. Do necessary setups, then * Interrupts are still disabled. Do necessary setups, then

11
kernel/irq/irqdesc.c
View File

@ -231,6 +231,7 @@ int __init early_irq_init(void)
alloc_desc_masks(&desc[i], 0, true); alloc_desc_masks(&desc[i], 0, true);
init_desc_masks(&desc[i]); init_desc_masks(&desc[i]);
desc[i].kstat_irqs = kstat_irqs_all[i]; desc[i].kstat_irqs = kstat_irqs_all[i];
lockdep_set_class(&desc[i].lock, &irq_desc_lock_class);
} }
return arch_early_irq_init(); return arch_early_irq_init();
} }
@ -251,16 +252,6 @@ void clear_kstat_irqs(struct irq_desc *desc)
memset(desc->kstat_irqs, 0, nr_cpu_ids * sizeof(*(desc->kstat_irqs))); 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) unsigned int kstat_irqs_cpu(unsigned int irq, int cpu)
{ {
struct irq_desc *desc = irq_to_desc(irq); struct irq_desc *desc = irq_to_desc(irq);