diff options
author | Jaswinder Singh Rajput <jaswinderrajput@gmail.com> | 2009-01-12 07:16:17 -0500 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2009-01-14 05:58:27 -0500 |
commit | b5ba7e6d1e7e2ac808afd21be1e56dc34caf20e6 (patch) | |
tree | c9c0b8fcf2cb12a639b63c3060028d89d3a265ca /arch/x86/kernel/acpi/boot.c | |
parent | 3b9dc9f2f123286aaade54c45fef6723d587c664 (diff) |
x86: replacing mp_config_ioapic with mpc_ioapic
Impact: cleanup, solve 80 columns wrap problems
Signed-off-by: Jaswinder Singh Rajput <jaswinderrajput@gmail.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/x86/kernel/acpi/boot.c')
-rw-r--r-- | arch/x86/kernel/acpi/boot.c | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/arch/x86/kernel/acpi/boot.c b/arch/x86/kernel/acpi/boot.c index d37593c2f438..2b27019e64f8 100644 --- a/arch/x86/kernel/acpi/boot.c +++ b/arch/x86/kernel/acpi/boot.c | |||
@@ -912,8 +912,8 @@ static u8 __init uniq_ioapic_id(u8 id) | |||
912 | DECLARE_BITMAP(used, 256); | 912 | DECLARE_BITMAP(used, 256); |
913 | bitmap_zero(used, 256); | 913 | bitmap_zero(used, 256); |
914 | for (i = 0; i < nr_ioapics; i++) { | 914 | for (i = 0; i < nr_ioapics; i++) { |
915 | struct mp_config_ioapic *ia = &mp_ioapics[i]; | 915 | struct mpc_ioapic *ia = &mp_ioapics[i]; |
916 | __set_bit(ia->mp_apicid, used); | 916 | __set_bit(ia->apicid, used); |
917 | } | 917 | } |
918 | if (!test_bit(id, used)) | 918 | if (!test_bit(id, used)) |
919 | return id; | 919 | return id; |
@@ -945,29 +945,29 @@ void __init mp_register_ioapic(int id, u32 address, u32 gsi_base) | |||
945 | 945 | ||
946 | idx = nr_ioapics; | 946 | idx = nr_ioapics; |
947 | 947 | ||
948 | mp_ioapics[idx].mp_type = MP_IOAPIC; | 948 | mp_ioapics[idx].type = MP_IOAPIC; |
949 | mp_ioapics[idx].mp_flags = MPC_APIC_USABLE; | 949 | mp_ioapics[idx].flags = MPC_APIC_USABLE; |
950 | mp_ioapics[idx].mp_apicaddr = address; | 950 | mp_ioapics[idx].apicaddr = address; |
951 | 951 | ||
952 | set_fixmap_nocache(FIX_IO_APIC_BASE_0 + idx, address); | 952 | set_fixmap_nocache(FIX_IO_APIC_BASE_0 + idx, address); |
953 | mp_ioapics[idx].mp_apicid = uniq_ioapic_id(id); | 953 | mp_ioapics[idx].apicid = uniq_ioapic_id(id); |
954 | #ifdef CONFIG_X86_32 | 954 | #ifdef CONFIG_X86_32 |
955 | mp_ioapics[idx].mp_apicver = io_apic_get_version(idx); | 955 | mp_ioapics[idx].apicver = io_apic_get_version(idx); |
956 | #else | 956 | #else |
957 | mp_ioapics[idx].mp_apicver = 0; | 957 | mp_ioapics[idx].apicver = 0; |
958 | #endif | 958 | #endif |
959 | /* | 959 | /* |
960 | * Build basic GSI lookup table to facilitate gsi->io_apic lookups | 960 | * Build basic GSI lookup table to facilitate gsi->io_apic lookups |
961 | * and to prevent reprogramming of IOAPIC pins (PCI GSIs). | 961 | * and to prevent reprogramming of IOAPIC pins (PCI GSIs). |
962 | */ | 962 | */ |
963 | mp_ioapic_routing[idx].apic_id = mp_ioapics[idx].mp_apicid; | 963 | mp_ioapic_routing[idx].apic_id = mp_ioapics[idx].apicid; |
964 | mp_ioapic_routing[idx].gsi_base = gsi_base; | 964 | mp_ioapic_routing[idx].gsi_base = gsi_base; |
965 | mp_ioapic_routing[idx].gsi_end = gsi_base + | 965 | mp_ioapic_routing[idx].gsi_end = gsi_base + |
966 | io_apic_get_redir_entries(idx); | 966 | io_apic_get_redir_entries(idx); |
967 | 967 | ||
968 | printk(KERN_INFO "IOAPIC[%d]: apic_id %d, version %d, address 0x%lx, " | 968 | printk(KERN_INFO "IOAPIC[%d]: apic_id %d, version %d, address 0x%x, " |
969 | "GSI %d-%d\n", idx, mp_ioapics[idx].mp_apicid, | 969 | "GSI %d-%d\n", idx, mp_ioapics[idx].apicid, |
970 | mp_ioapics[idx].mp_apicver, mp_ioapics[idx].mp_apicaddr, | 970 | mp_ioapics[idx].apicver, mp_ioapics[idx].apicaddr, |
971 | mp_ioapic_routing[idx].gsi_base, mp_ioapic_routing[idx].gsi_end); | 971 | mp_ioapic_routing[idx].gsi_base, mp_ioapic_routing[idx].gsi_end); |
972 | 972 | ||
973 | nr_ioapics++; | 973 | nr_ioapics++; |
@@ -1026,7 +1026,7 @@ void __init mp_override_legacy_irq(u8 bus_irq, u8 polarity, u8 trigger, u32 gsi) | |||
1026 | mp_irq.mp_irqflag = (trigger << 2) | polarity; | 1026 | mp_irq.mp_irqflag = (trigger << 2) | polarity; |
1027 | mp_irq.mp_srcbus = MP_ISA_BUS; | 1027 | mp_irq.mp_srcbus = MP_ISA_BUS; |
1028 | mp_irq.mp_srcbusirq = bus_irq; /* IRQ */ | 1028 | mp_irq.mp_srcbusirq = bus_irq; /* IRQ */ |
1029 | mp_irq.mp_dstapic = mp_ioapics[ioapic].mp_apicid; /* APIC ID */ | 1029 | mp_irq.mp_dstapic = mp_ioapics[ioapic].apicid; /* APIC ID */ |
1030 | mp_irq.mp_dstirq = pin; /* INTIN# */ | 1030 | mp_irq.mp_dstirq = pin; /* INTIN# */ |
1031 | 1031 | ||
1032 | save_mp_irq(&mp_irq); | 1032 | save_mp_irq(&mp_irq); |
@@ -1062,7 +1062,7 @@ void __init mp_config_acpi_legacy_irqs(void) | |||
1062 | ioapic = mp_find_ioapic(0); | 1062 | ioapic = mp_find_ioapic(0); |
1063 | if (ioapic < 0) | 1063 | if (ioapic < 0) |
1064 | return; | 1064 | return; |
1065 | dstapic = mp_ioapics[ioapic].mp_apicid; | 1065 | dstapic = mp_ioapics[ioapic].apicid; |
1066 | 1066 | ||
1067 | /* | 1067 | /* |
1068 | * Use the default configuration for the IRQs 0-15. Unless | 1068 | * Use the default configuration for the IRQs 0-15. Unless |