Merge branch 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: x86: DT: Cleanup namespace and call irq_set_irq_type() unconditional x86: DT: Fix return condition in irq_create_of_mapping() x86, mpparse: Move check_slot into CONFIG_X86_IO_APIC context
This commit is contained in:
commit
26ff6801f7
|
@ -65,12 +65,10 @@ unsigned int irq_create_of_mapping(struct device_node *controller,
|
|||
return 0;
|
||||
ret = ih->xlate(ih, intspec, intsize, &virq, &type);
|
||||
if (ret)
|
||||
return ret;
|
||||
return 0;
|
||||
if (type == IRQ_TYPE_NONE)
|
||||
return virq;
|
||||
/* set the mask if it is different from current */
|
||||
if (type == (irq_to_desc(virq)->status & IRQF_TRIGGER_MASK))
|
||||
set_irq_type(virq, type);
|
||||
irq_set_irq_type(virq, type);
|
||||
return virq;
|
||||
}
|
||||
EXPORT_SYMBOL_GPL(irq_create_of_mapping);
|
||||
|
|
|
@ -714,10 +714,6 @@ static void __init check_irq_src(struct mpc_intsrc *m, int *nr_m_spare)
|
|||
*nr_m_spare += 1;
|
||||
}
|
||||
}
|
||||
#else /* CONFIG_X86_IO_APIC */
|
||||
static
|
||||
inline void __init check_irq_src(struct mpc_intsrc *m, int *nr_m_spare) {}
|
||||
#endif /* CONFIG_X86_IO_APIC */
|
||||
|
||||
static int
|
||||
check_slot(unsigned long mpc_new_phys, unsigned long mpc_new_length, int count)
|
||||
|
@ -731,6 +727,10 @@ check_slot(unsigned long mpc_new_phys, unsigned long mpc_new_length, int count)
|
|||
|
||||
return ret;
|
||||
}
|
||||
#else /* CONFIG_X86_IO_APIC */
|
||||
static
|
||||
inline void __init check_irq_src(struct mpc_intsrc *m, int *nr_m_spare) {}
|
||||
#endif /* CONFIG_X86_IO_APIC */
|
||||
|
||||
static int __init replace_intsrc_all(struct mpc_table *mpc,
|
||||
unsigned long mpc_new_phys,
|
||||
|
|
Loading…
Reference in a new issue