Merge branch 'x86/core' into core/ipi

2009-03-13 11:05:58 +01:00
parent 641cd4cfcd a98fe7f342
commit cd80a8142e
522 changed files with 20897 additions and 18874 deletions
--- a/kernel/softirq.c
+++ b/kernel/softirq.c
@@ -796,6 +796,11 @@ int __init __weak early_irq_init(void)
 	return 0;
 }

+int __init __weak arch_probe_nr_irqs(void)
+{
+	return 0;
+}
+
 int __init __weak arch_early_irq_init(void)
 {
 	return 0;