xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

x86, ioapic: Simplify probe_nr_irqs_gsi.

Browse Source 
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>
This commit is contained in:
Eric W. Biederman
2010-03-30 01:07:14 -07:00
committed by H. Peter Anvin
parent d464207c4f
commit 4afc51a835
3 changed files with 3 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
arch/x86/kernel/apic/io_apic.c
View File

@@ -3850,22 +3850,11 @@ int __init io_apic_get_redir_entries (int ioapic)
void __init probe_nr_irqs_gsi(void)
{
int nr = 0;
int nr;
nr = acpi_probe_gsi();
if (nr > nr_irqs_gsi) {
nr = gsi_end + 1;
if (nr > nr_irqs_gsi)
nr_irqs_gsi = nr;
} else {
/* for acpi=off or acpi is not compiled in */
int idx;
nr = 0;
for (idx = 0; idx < nr_ioapics; idx++)
nr += io_apic_get_redir_entries(idx);
if (nr > nr_irqs_gsi)
nr_irqs_gsi = nr;
}
printk(KERN_DEBUG "nr_irqs_gsi: %d\n", nr_irqs_gsi);
}