aboutsummaryrefslogtreecommitdiffstats
path: root/arch/x86/kernel/io_apic_64.c
diff options
context:
space:
mode:
authorMaciej W. Rozycki <macro@linux-mips.org>2008-05-27 16:19:34 -0400
committerIngo Molnar <mingo@elte.hu>2008-07-08 03:13:04 -0400
commitf7633ce55b2ea2926a39d7ca9d0bb06c43edd2c2 (patch)
tree651c65bd69b9a14822e12a64e2f59edf08116953 /arch/x86/kernel/io_apic_64.c
parent6b4722a7779ebadcf016fd96ce3156b6acda8a31 (diff)
x86: I/O APIC: rename setup_ExtINT_IRQ0_pin()
Rename setup_ExtINT_IRQ0_pin() to setup_timer_IRQ0_pin() to better reflect the upcoming role of a function setting up a (semi-)arbitrary I/O APIC pin appropriately for the 8254 timer. By "appropriate" the following settings are meant: edge-triggered, active-high, all the other settings per-architecture. Adjust comments to reflect code appropriately. No functional changes. Signed-off-by: Maciej W. Rozycki <macro@linux-mips.org> Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/x86/kernel/io_apic_64.c')
-rw-r--r--arch/x86/kernel/io_apic_64.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/arch/x86/kernel/io_apic_64.c b/arch/x86/kernel/io_apic_64.c
index 565f19b01bf4..6c4635fa97a6 100644
--- a/arch/x86/kernel/io_apic_64.c
+++ b/arch/x86/kernel/io_apic_64.c
@@ -897,10 +897,10 @@ static void __init setup_IO_APIC_irqs(void)
897} 897}
898 898
899/* 899/*
900 * Set up the 8259A-master output pin as broadcast to all 900 * Set up the timer pin, possibly with the 8259A-master behind.
901 * CPUs.
902 */ 901 */
903static void __init setup_ExtINT_IRQ0_pin(unsigned int apic, unsigned int pin, int vector) 902static void __init setup_timer_IRQ0_pin(unsigned int apic, unsigned int pin,
903 int vector)
904{ 904{
905 struct IO_APIC_route_entry entry; 905 struct IO_APIC_route_entry entry;
906 906
@@ -920,7 +920,7 @@ static void __init setup_ExtINT_IRQ0_pin(unsigned int apic, unsigned int pin, in
920 920
921 /* 921 /*
922 * The timer IRQ doesn't have to know that behind the 922 * The timer IRQ doesn't have to know that behind the
923 * scene we have a 8259A-master in AEOI mode ... 923 * scene we may have a 8259A-master in AEOI mode ...
924 */ 924 */
925 set_irq_chip_and_handler_name(0, &ioapic_chip, handle_edge_irq, "edge"); 925 set_irq_chip_and_handler_name(0, &ioapic_chip, handle_edge_irq, "edge");
926 926
@@ -1690,7 +1690,7 @@ static inline void __init check_timer(void)
1690 /* 1690 /*
1691 * legacy devices should be connected to IO APIC #0 1691 * legacy devices should be connected to IO APIC #0
1692 */ 1692 */
1693 setup_ExtINT_IRQ0_pin(apic2, pin2, cfg->vector); 1693 setup_timer_IRQ0_pin(apic2, pin2, cfg->vector);
1694 enable_8259A_irq(0); 1694 enable_8259A_irq(0);
1695 if (timer_irq_works()) { 1695 if (timer_irq_works()) {
1696 apic_printk(APIC_VERBOSE," works.\n"); 1696 apic_printk(APIC_VERBOSE," works.\n");