Merge branch 'x86/core' into core/ipi

[sfrench/cifs-2.6.git] / kernel / softirq.c

diff --git a/kernel/softirq.c b/kernel/softirq.c
index ebe2a4d59f2c33be9d2aabbe42a2748116a24b20..c349a03b471cc5357c72b8b58cfd6d03390b80ff 100644 (file)
--- 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;