aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexey Starikovskiy <astarikovskiy@suse.de>2008-03-17 15:08:30 -0400
committerIngo Molnar <mingo@elte.hu>2008-04-17 11:41:05 -0400
commit555b07646d5bd0bcd4825e83580d5f6bb34259ea (patch)
tree5714b95606deceba3711e1571c495c83efb6cac0
parent85e46035bec6f114ad07ce8a9c70388568b1afd4 (diff)
x86: rename gsi_start to gsi_base to match mpparse_32.c
Signed-off-by: Alexey Starikovskiy <astarikovskiy@suse.de> Signed-off-by: Ingo Molnar <mingo@elte.hu>
-rw-r--r--arch/x86/kernel/mpparse_64.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/arch/x86/kernel/mpparse_64.c b/arch/x86/kernel/mpparse_64.c
index 19c826485516..83a36eed081b 100644
--- a/arch/x86/kernel/mpparse_64.c
+++ b/arch/x86/kernel/mpparse_64.c
@@ -699,7 +699,7 @@ void __cpuinit mp_register_lapic(u8 id, u8 enabled)
699 699
700static struct mp_ioapic_routing { 700static struct mp_ioapic_routing {
701 int apic_id; 701 int apic_id;
702 int gsi_start; 702 int gsi_base;
703 int gsi_end; 703 int gsi_end;
704 u32 pin_programmed[4]; 704 u32 pin_programmed[4];
705} mp_ioapic_routing[MAX_IO_APICS]; 705} mp_ioapic_routing[MAX_IO_APICS];
@@ -710,7 +710,7 @@ static int mp_find_ioapic(int gsi)
710 710
711 /* Find the IOAPIC that manages this GSI. */ 711 /* Find the IOAPIC that manages this GSI. */
712 for (i = 0; i < nr_ioapics; i++) { 712 for (i = 0; i < nr_ioapics; i++) {
713 if ((gsi >= mp_ioapic_routing[i].gsi_start) 713 if ((gsi >= mp_ioapic_routing[i].gsi_base)
714 && (gsi <= mp_ioapic_routing[i].gsi_end)) 714 && (gsi <= mp_ioapic_routing[i].gsi_end))
715 return i; 715 return i;
716 } 716 }
@@ -755,14 +755,14 @@ void __init mp_register_ioapic(u8 id, u32 address, u32 gsi_base)
755 * and to prevent reprogramming of IOAPIC pins (PCI IRQs). 755 * and to prevent reprogramming of IOAPIC pins (PCI IRQs).
756 */ 756 */
757 mp_ioapic_routing[idx].apic_id = mp_ioapics[idx].mpc_apicid; 757 mp_ioapic_routing[idx].apic_id = mp_ioapics[idx].mpc_apicid;
758 mp_ioapic_routing[idx].gsi_start = gsi_base; 758 mp_ioapic_routing[idx].gsi_base = gsi_base;
759 mp_ioapic_routing[idx].gsi_end = gsi_base + 759 mp_ioapic_routing[idx].gsi_end = gsi_base +
760 io_apic_get_redir_entries(idx); 760 io_apic_get_redir_entries(idx);
761 761
762 printk(KERN_INFO "IOAPIC[%d]: apic_id %d, address 0x%x, " 762 printk(KERN_INFO "IOAPIC[%d]: apic_id %d, address 0x%x, "
763 "GSI %d-%d\n", idx, mp_ioapics[idx].mpc_apicid, 763 "GSI %d-%d\n", idx, mp_ioapics[idx].mpc_apicid,
764 mp_ioapics[idx].mpc_apicaddr, 764 mp_ioapics[idx].mpc_apicaddr,
765 mp_ioapic_routing[idx].gsi_start, 765 mp_ioapic_routing[idx].gsi_base,
766 mp_ioapic_routing[idx].gsi_end); 766 mp_ioapic_routing[idx].gsi_end);
767 767
768 nr_ioapics++; 768 nr_ioapics++;
@@ -780,7 +780,7 @@ void __init mp_override_legacy_irq(u8 bus_irq, u8 polarity, u8 trigger, u32 gsi)
780 ioapic = mp_find_ioapic(gsi); 780 ioapic = mp_find_ioapic(gsi);
781 if (ioapic < 0) 781 if (ioapic < 0)
782 return; 782 return;
783 pin = gsi - mp_ioapic_routing[ioapic].gsi_start; 783 pin = gsi - mp_ioapic_routing[ioapic].gsi_base;
784 784
785 /* 785 /*
786 * TBD: This check is for faulty timer entries, where the override 786 * TBD: This check is for faulty timer entries, where the override
@@ -892,7 +892,7 @@ int mp_register_gsi(u32 gsi, int triggering, int polarity)
892 return gsi; 892 return gsi;
893 } 893 }
894 894
895 ioapic_pin = gsi - mp_ioapic_routing[ioapic].gsi_start; 895 ioapic_pin = gsi - mp_ioapic_routing[ioapic].gsi_base;
896 896
897 /* 897 /*
898 * Avoid pin reprogramming. PRTs typically include entries 898 * Avoid pin reprogramming. PRTs typically include entries