diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-12-17 13:16:08 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-12-17 13:16:08 +0100 |
| commit | 948a7b2b5e2bf126fb697aeb11ff379b2c85dd2e (patch) | |
| tree | 727c744438a44d85f7dc340b1bfcb3b127c84f13 /include/linux/irq.h | |
| parent | 9466d6036f73481104039fbe99338baed11c8fea (diff) | |
| parent | 17483a1f34c970e6c2cb8c082d4441bfabbe88a9 (diff) | |
Merge branch 'irq/sparseirq' into cpus4096
Conflicts:
arch/x86/kernel/io_apic.c
Merge irq/sparseirq here, to resolve conflicts.
Diffstat (limited to 'include/linux/irq.h')
| -rw-r--r-- | include/linux/irq.h | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/include/linux/irq.h b/include/linux/irq.h index 59525b74979..fde5e613201 100644 --- a/include/linux/irq.h +++ b/include/linux/irq.h @@ -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: */ |