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

Commit ca97ab90 authored by Jeremy Fitzhardinge's avatar Jeremy Fitzhardinge
Browse files

x86: unstatic ioapic entry funcs 



Unstatic ioapic_write_entry and setup_ioapic_entry functions so that
the Xen code can do its own ioapic routing setup.

Signed-off-by: default avatarJeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com>
parent c3e137d1

arch/x86/include/asm/io_apic.h

+6 −0
Original line number Diff line number Diff line
@@ -169,6 +169,12 @@ extern void reinit_intr_remapped_IO_APIC(int); 


extern void probe_nr_irqs_gsi(void);



extern int setup_ioapic_entry(int apic, int irq,

			      struct IO_APIC_route_entry *entry,

			      unsigned int destination, int trigger,

			      int polarity, int vector);

extern void ioapic_write_entry(int apic, int pin,

			       struct IO_APIC_route_entry e);

#else  /* !CONFIG_X86_IO_APIC */

#define io_apic_assign_pci_irqs 0

static const int timer_through_8259 = 0;

arch/x86/kernel/io_apic.c

+5 −5
Original line number Diff line number Diff line
@@ -486,7 +486,7 @@ __ioapic_write_entry(int apic, int pin, struct IO_APIC_route_entry e) 
	io_apic_write(apic, 0x10 + 2*pin, eu.w1);

}



static void ioapic_write_entry(int apic, int pin, struct IO_APIC_route_entry e)

void ioapic_write_entry(int apic, int pin, struct IO_APIC_route_entry e)

{

	unsigned long flags;

	spin_lock_irqsave(&ioapic_lock, flags);
@@ -1478,7 +1478,7 @@ static void ioapic_register_intr(int irq, struct irq_desc *desc, unsigned long t 
					      handle_edge_irq, "edge");

}



static int setup_ioapic_entry(int apic_id, int irq,

int setup_ioapic_entry(int apic_id, int irq,

		       struct IO_APIC_route_entry *entry,

		       unsigned int destination, int trigger,

		       int polarity, int vector)