---

yaml --- r: 116409 b: refs/heads/master c: a84488c h: refs/heads/master i: 116407: 44fe7fa v: v3
git-mirror · Oct 16, 2008 · f5ed6f8 · f5ed6f8
1 parent fd67aad
commit f5ed6f8
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 301e619020dd67bde7e7e64bb9ffb7f30d26c979
+refs/heads/master: a84488c213a8cfc29200344a6fb6357d48c8ed85
diff --git a/trunk/arch/x86/kernel/setup.c b/trunk/arch/x86/kernel/setup.c
@@ -1074,8 +1074,10 @@ void __init setup_arch(char **cmdline_p)
 		nr_irqs = 32 * nr_cpu_ids + 224;
 	init_cpu_to_node();
 #endif
+#ifdef CONFIG_X86_IO_APIC
 	pin_map_size = nr_irqs * 2;
 	first_free_entry = nr_irqs;
+#endif
 
 	init_apic_mappings();
 	ioapic_init_mappings();