Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
tjh.dev
kernel
os
linux
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
+2
-4
arch/x86/kernel/devicetree.c
+2
-4
arch/x86/kernel/devicetree.c
···
65
return 0;
66
ret = ih->xlate(ih, intspec, intsize, &virq, &type);
67
if (ret)
68
-
return ret;
69
if (type == IRQ_TYPE_NONE)
70
return virq;
71
-
/* set the mask if it is different from current */
72
-
if (type == (irq_to_desc(virq)->status & IRQF_TRIGGER_MASK))
73
-
set_irq_type(virq, type);
74
return virq;
75
}
76
EXPORT_SYMBOL_GPL(irq_create_of_mapping);
+4
-4
arch/x86/kernel/mpparse.c
+4
-4
arch/x86/kernel/mpparse.c
···
714
*nr_m_spare += 1;
715
}
716
}
717
-
#else /* CONFIG_X86_IO_APIC */
718
-
static
719
-
inline void __init check_irq_src(struct mpc_intsrc *m, int *nr_m_spare) {}
720
-
#endif /* CONFIG_X86_IO_APIC */
721
722
static int
723
check_slot(unsigned long mpc_new_phys, unsigned long mpc_new_length, int count)
···
727
728
return ret;
729
}
730
731
static int __init replace_intsrc_all(struct mpc_table *mpc,
732
unsigned long mpc_new_phys,
···
714
*nr_m_spare += 1;
715
}
716
}
717
718
static int
719
check_slot(unsigned long mpc_new_phys, unsigned long mpc_new_length, int count)
···
731
732
return ret;
733
}
734
+
#else /* CONFIG_X86_IO_APIC */
735
+
static
736
+
inline void __init check_irq_src(struct mpc_intsrc *m, int *nr_m_spare) {}
737
+
#endif /* CONFIG_X86_IO_APIC */
738
739
static int __init replace_intsrc_all(struct mpc_table *mpc,
740
unsigned long mpc_new_phys,