x86 fixes

GIT PULL Ingo Molnar 1 participant 1 message Mar 25, 2011 x86

lore

Share & tools

lore

Ingo Molnar

author

2011-03-25 13:35 UTC #0 lore raw

Linus,

Please pull the latest x86-fixes-for-linus git tree from:

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

Thanks,

Ingo

------------------>
Rakib Mullick (1):
x86, mpparse: Move check_slot into CONFIG_X86_IO_APIC context

Thomas Gleixner (2):
x86: DT: Fix return condition in irq_create_of_mapping()
x86: DT: Cleanup namespace and call irq_set_irq_type() unconditional

 arch/x86/kernel/devicetree.c |    6 ++----
 arch/x86/kernel/mpparse.c    |    8 ++++----
 2 files changed, 6 insertions(+), 8 deletions(-)

arch/x86/kernel/devicetree.c +2 -4

index 7a8cebc..706a9fb 100644
@@ -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);

arch/x86/kernel/mpparse.c +4 -4

index 6f789a8..5a532ce 100644
@@ -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,