x86/apic changes for v4.13

GIT PULL Ingo Molnar 1 participant 1 message Jul 3, 2017 x86

lore

Share & tools

lore

Ingo Molnar

author

2017-07-03 08:46 UTC #0 lore raw

Linus,

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

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

# HEAD: 538ac46c64a6bc61e71982091fc1eef0026f322e x86/apic: Make arch_init_msi/htirq_domain __init

Janitorial changes: removal of an unused function plus __init annotations.

Thanks,

Ingo

------------------>
Dou Liyang (2):
x86/apic: Make init_legacy_irqs() __init x86/apic: Make arch_init_msi/htirq_domain __init

Matthias Kaehlcke (1):
x86/ioapic: Remove unused IO_APIC_irq_trigger() function

 arch/x86/kernel/apic/htirq.c   |  2 +-
 arch/x86/kernel/apic/io_apic.c | 22 ----------------------
 arch/x86/kernel/apic/msi.c     |  2 +-
 arch/x86/kernel/apic/vector.c  |  4 ++--
 4 files changed, 4 insertions(+), 26 deletions(-)

arch/x86/kernel/apic/htirq.c +1 -1

index ae50d3454d78..81ff48905623 100644
@@ -150,7 +150,7 @@ static const struct irq_domain_ops htirq_domain_ops = {
 	.deactivate	= htirq_domain_deactivate,
 };
 
-void arch_init_htirq_domain(struct irq_domain *parent)
+void __init arch_init_htirq_domain(struct irq_domain *parent)
 {
 	if (disable_apic)
 		return;

arch/x86/kernel/apic/io_apic.c +0 ~~-22~~

index 347bb9f65737..247880fc29f9 100644
@@ -1200,28 +1200,6 @@ EXPORT_SYMBOL(IO_APIC_get_PCI_irq_vector);
 
 static struct irq_chip ioapic_chip, ioapic_ir_chip;
 
-#ifdef CONFIG_X86_32
-static inline int IO_APIC_irq_trigger(int irq)
-{
-	int apic, idx, pin;
-
-	for_each_ioapic_pin(apic, pin) {
-		idx = find_irq_entry(apic, pin, mp_INT);
-		if ((idx != -1) && (irq == pin_2_irq(idx, apic, pin, 0)))
-			return irq_trigger(idx);
-	}
-	/*
-         * nonexistent IRQs are edge default
-         */
-	return 0;
-}
-#else
-static inline int IO_APIC_irq_trigger(int irq)
-{
-	return 1;
-}
-#endif
-
 static void __init setup_IO_APIC_irqs(void)
 {
 	unsigned int ioapic, pin;

arch/x86/kernel/apic/msi.c +1 -1

index c61aec7e65f4..4c5d1882bec5 100644
@@ -136,7 +136,7 @@ static struct msi_domain_info pci_msi_domain_info = {
 	.handler_name	= "edge",
 };
 
-void arch_init_msi_domain(struct irq_domain *parent)
+void __init arch_init_msi_domain(struct irq_domain *parent)
 {
 	if (disable_apic)
 		return;

arch/x86/kernel/apic/vector.c +2 -2

index f3557a1eb562..e66d8e48e456 100644
@@ -405,7 +405,7 @@ int __init arch_probe_nr_irqs(void)
 }
 
 #ifdef	CONFIG_X86_IO_APIC
-static void init_legacy_irqs(void)
+static void __init init_legacy_irqs(void)
 {
 	int i, node = cpu_to_node(0);
 	struct apic_chip_data *data;

@@ -424,7 +424,7 @@ static void init_legacy_irqs(void)
 	}
 }
 #else
-static void init_legacy_irqs(void) { }
+static inline void init_legacy_irqs(void) { }
 #endif
 
 int __init arch_early_irq_init(void)