projects
/
linux-2.6-block.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branches 'irq/sparseirq', 'irq/genirq' and 'irq/urgent'; commit 'v2.6.28' into...
[linux-2.6-block.git]
/
arch
/
x86
/
kernel
/
setup.c
diff --git
a/arch/x86/kernel/setup.c
b/arch/x86/kernel/setup.c
index bdec76e5559433d77366b85535f0563451614501..5e028e1926ebf036ed2f7ce0dd6b35c01f96e240 100644
(file)
--- a/
arch/x86/kernel/setup.c
+++ b/
arch/x86/kernel/setup.c
@@
-1080,7
+1080,7
@@
void __init setup_arch(char **cmdline_p)
ioapic_init_mappings();
/* need to wait for io_apic is mapped */
-
nr_irqs = probe_nr_irqs
();
+
probe_nr_irqs_gsi
();
kvm_guest_init();