Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2a275382 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull x86 apic updates from Ingo Molnar:
 "Janitorial changes: removal of an unused function plus __init
  annotations"

* 'x86-apic-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86/apic: Make arch_init_msi/htirq_domain __init
  x86/apic: Make init_legacy_irqs() __init
  x86/ioapic: Remove unused IO_APIC_irq_trigger() function
parents 59b60185 538ac46c

arch/x86/kernel/apic/htirq.c

+1 −1
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -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)