leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip

Browse Source 
* '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:
Linus Torvalds 2011-03-25 17:51:51 -07:00
commit 26ff6801f7
2 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
arch/x86/kernel/devicetree.c
View File

@ -65,12 +65,10 @@ unsigned int irq_create_of_mapping(struct device_node *controller,
return 0; return 0;
ret = ih->xlate(ih, intspec, intsize, &virq, &type); ret = ih->xlate(ih, intspec, intsize, &virq, &type);
if (ret) if (ret)
return ret; return 0;
if (type == IRQ_TYPE_NONE) if (type == IRQ_TYPE_NONE)
return virq; return virq;
/* set the mask if it is different from current */ irq_set_irq_type(virq, type);
if (type == (irq_to_desc(virq)->status & IRQF_TRIGGER_MASK))
set_irq_type(virq, type);
return virq; return virq;
} }
EXPORT_SYMBOL_GPL(irq_create_of_mapping); EXPORT_SYMBOL_GPL(irq_create_of_mapping);

8
arch/x86/kernel/mpparse.c
View File

@ -714,10 +714,6 @@ static void __init check_irq_src(struct mpc_intsrc *m, int *nr_m_spare)
*nr_m_spare += 1; *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 static int
check_slot(unsigned long mpc_new_phys, unsigned long mpc_new_length, int count) 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; 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, static int __init replace_intsrc_all(struct mpc_table *mpc,
unsigned long mpc_new_phys, unsigned long mpc_new_phys,