diff options
author | Eric W. Biederman <ebiederm@xmission.com> | 2010-03-30 04:07:14 -0400 |
---|---|---|
committer | H. Peter Anvin <hpa@zytor.com> | 2010-05-04 16:35:11 -0400 |
commit | 4afc51a835d3aeba11c35090f524e05c84586d27 (patch) | |
tree | e7858e2c41b1736a6ea659e2cf6764d1ff3a4686 /arch/x86/kernel/acpi | |
parent | d464207c4fdd70c2a0febd4f9c58206fa915bb36 (diff) |
x86, ioapic: Simplify probe_nr_irqs_gsi.
Use the global gsi_end value now that all ioapics have
valid gsi numbers instead of a combination of acpi_probe_gsi
and walking all of the ioapics and couting their number of
entries by hand if acpi_probe_gsi gave us an answer we did
not like.
Signed-off-by: Eric W. Biederman <ebiederm@xmission.com>
LKML-Reference: <1269936436-7039-13-git-send-email-ebiederm@xmission.com>
Signed-off-by: H. Peter Anvin <hpa@zytor.com>
Diffstat (limited to 'arch/x86/kernel/acpi')
-rw-r--r-- | arch/x86/kernel/acpi/boot.c | 23 |
1 files changed, 0 insertions, 23 deletions
diff --git a/arch/x86/kernel/acpi/boot.c b/arch/x86/kernel/acpi/boot.c index 3ee92f28a4b2..07a63ce5811a 100644 --- a/arch/x86/kernel/acpi/boot.c +++ b/arch/x86/kernel/acpi/boot.c | |||
@@ -876,29 +876,6 @@ static int __init acpi_parse_madt_lapic_entries(void) | |||
876 | extern int es7000_plat; | 876 | extern int es7000_plat; |
877 | #endif | 877 | #endif |
878 | 878 | ||
879 | int __init acpi_probe_gsi(void) | ||
880 | { | ||
881 | int idx; | ||
882 | int gsi; | ||
883 | int max_gsi = 0; | ||
884 | |||
885 | if (acpi_disabled) | ||
886 | return 0; | ||
887 | |||
888 | if (!acpi_ioapic) | ||
889 | return 0; | ||
890 | |||
891 | max_gsi = 0; | ||
892 | for (idx = 0; idx < nr_ioapics; idx++) { | ||
893 | gsi = mp_gsi_routing[idx].gsi_end; | ||
894 | |||
895 | if (gsi > max_gsi) | ||
896 | max_gsi = gsi; | ||
897 | } | ||
898 | |||
899 | return max_gsi + 1; | ||
900 | } | ||
901 | |||
902 | static void assign_to_mp_irq(struct mpc_intsrc *m, | 879 | static void assign_to_mp_irq(struct mpc_intsrc *m, |
903 | struct mpc_intsrc *mp_irq) | 880 | struct mpc_intsrc *mp_irq) |
904 | { | 881 | { |