diff options
author | Ingo Molnar <mingo@elte.hu> | 2009-03-13 06:05:58 -0400 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2009-03-13 06:05:58 -0400 |
commit | cd80a8142efa3468c2cd9fb52845f334c3220d54 (patch) | |
tree | 919e88994bd3c09b34ce852d0a09bb0655d231d0 /kernel/softirq.c | |
parent | 641cd4cfcdc71ce01535b31cc4d57d59a1fae1fc (diff) | |
parent | a98fe7f3425c6b4e90de16f8da63b0429a8fed08 (diff) |
Merge branch 'x86/core' into core/ipi
Diffstat (limited to 'kernel/softirq.c')
-rw-r--r-- | kernel/softirq.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/kernel/softirq.c b/kernel/softirq.c index ebe2a4d59f2c..c349a03b471c 100644 --- a/kernel/softirq.c +++ b/kernel/softirq.c | |||
@@ -796,6 +796,11 @@ int __init __weak early_irq_init(void) | |||
796 | return 0; | 796 | return 0; |
797 | } | 797 | } |
798 | 798 | ||
799 | int __init __weak arch_probe_nr_irqs(void) | ||
800 | { | ||
801 | return 0; | ||
802 | } | ||
803 | |||
799 | int __init __weak arch_early_irq_init(void) | 804 | int __init __weak arch_early_irq_init(void) |
800 | { | 805 | { |
801 | return 0; | 806 | return 0; |