[PATCH] kprobes: fix namespace problem and sparc64 build

[sfrench/cifs-2.6.git] / arch / x86_64 / kernel / kprobes.c

diff --git a/arch/x86_64/kernel/kprobes.c b/arch/x86_64/kernel/kprobes.c
index acd2a778ebe6ddafeb7d036f370e2ef2bca9c849..5c6dc705148299e5cede75693244e10ebe367410 100644 (file)
--- a/arch/x86_64/kernel/kprobes.c
+++ b/arch/x86_64/kernel/kprobes.c
@@ -682,7 +682,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);
 }