Merge branch 'irq/sparseirq' into cpus4096

Conflicts:
	arch/x86/kernel/io_apic.c

Merge irq/sparseirq here, to resolve conflicts.
This commit is contained in:
Ingo Molnar 2008-12-17 13:16:08 +01:00
commit 948a7b2b5e
10 changed files with 317 additions and 14 deletions

View file

@ -228,6 +228,16 @@ extern struct irq_desc *move_irq_desc(struct irq_desc *old_desc, int cpu);
#endif
static inline struct irq_desc *
irq_remap_to_desc(unsigned int irq, struct irq_desc *desc)
{
#ifdef CONFIG_NUMA_MIGRATE_IRQ_DESC
return irq_to_desc(irq);
#else
return desc;
#endif
}
/*
* Migration helpers for obsolete names, they will go away:
*/