Merge HEAD from master.kernel.org:/pub/scm/linux/kernel/git/roland/infiniband.git

[linux-2.6] / arch / i386 / kernel / kprobes.c

diff --git a/arch/i386/kernel/kprobes.c b/arch/i386/kernel/kprobes.c
index fc8b1752176189b7c12d367af9eb78efd323dff7..a6d8c45961d3ccb33503f38535802d3a7e022afc 100644 (file)
--- a/arch/i386/kernel/kprobes.c
+++ b/arch/i386/kernel/kprobes.c
@@ -537,7 +537,7 @@ static struct kprobe trampoline_p = {
        .pre_handler = trampoline_probe_handler
 };
 
-int __init arch_init(void)
+int __init arch_init_kprobes(void)
 {
        return register_kprobe(&trampoline_p);
 }