aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGlauber de Oliveira Costa <gcosta@redhat.com>2008-01-30 07:33:19 -0500
committerIngo Molnar <mingo@elte.hu>2008-01-30 07:33:19 -0500
commitb03878307a78ba0248f6f8d24279c846f1a26f6e (patch)
treeadbd4e225c31415995ea892b5b8089f7ccd970b5
parent8a650ce297c723ebe7da17ec2890f6971438aee1 (diff)
x86: provide a native_init_IRQ function on 64-bit
x86_64 lacks a native_init_IRQ() function, so we turn the arch's init_IRQ() function into a native construct Signed-off-by: Glauber de Oliveira Costa <gcosta@redhat.com> Signed-off-by: Ingo Molnar <mingo@elte.hu> Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
-rw-r--r--arch/x86/kernel/i8259_64.c4
-rw-r--r--include/asm-x86/hw_irq_64.h1
2 files changed, 4 insertions, 1 deletions
diff --git a/arch/x86/kernel/i8259_64.c b/arch/x86/kernel/i8259_64.c
index d3edb9f23f2c..fa57a1568508 100644
--- a/arch/x86/kernel/i8259_64.c
+++ b/arch/x86/kernel/i8259_64.c
@@ -456,7 +456,9 @@ void __init init_ISA_irqs (void)
456 } 456 }
457} 457}
458 458
459void __init init_IRQ(void) 459void init_IRQ(void) __attribute__((weak, alias("native_init_IRQ")));
460
461void __init native_init_IRQ(void)
460{ 462{
461 int i; 463 int i;
462 464
diff --git a/include/asm-x86/hw_irq_64.h b/include/asm-x86/hw_irq_64.h
index a346159b6ac3..312a58d6dac6 100644
--- a/include/asm-x86/hw_irq_64.h
+++ b/include/asm-x86/hw_irq_64.h
@@ -141,6 +141,7 @@ extern void print_IO_APIC(void);
141extern int IO_APIC_get_PCI_irq_vector(int bus, int slot, int fn); 141extern int IO_APIC_get_PCI_irq_vector(int bus, int slot, int fn);
142extern void send_IPI(int dest, int vector); 142extern void send_IPI(int dest, int vector);
143extern void setup_ioapic_dest(void); 143extern void setup_ioapic_dest(void);
144extern void native_init_IRQ(void);
144 145
145extern unsigned long io_apic_irqs; 146extern unsigned long io_apic_irqs;
146 147