summaryrefslogtreecommitdiffstats
path: root/kernel
diff options
context:
space:
mode:
authorRusty Lynch <rusty.lynch@intel.com>2005-07-05 18:54:50 -0700
committerLinus Torvalds <torvalds@g5.osdl.org>2005-07-05 19:19:00 -0700
commit6772926bef3c9f0ec761b39e5702535471fff70b (patch)
treeb55f1b7af51e10c54781e24b5472236323d24ee5 /kernel
parent4b1294f928d9396e45f62b1c306ac8bf9fae036b (diff)
downloadlinux-stable-6772926bef3c9f0ec761b39e5702535471fff70b.tar.gz
linux-stable-6772926bef3c9f0ec761b39e5702535471fff70b.tar.bz2
linux-stable-6772926bef3c9f0ec761b39e5702535471fff70b.zip
[PATCH] kprobes: fix namespace problem and sparc64 build
The following renames arch_init, a kprobes function for performing any architecture specific initialization, to arch_init_kprobes in order to cleanup the namespace. Also, this patch adds arch_init_kprobes to sparc64 to fix the sparc64 kprobes build from the last return probe patch. Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'kernel')
-rw-r--r--kernel/kprobes.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/kprobes.c b/kernel/kprobes.c
index 90c0e82b650c..b0237122b24e 100644
--- a/kernel/kprobes.c
+++ b/kernel/kprobes.c
@@ -574,7 +574,7 @@ static int __init init_kprobes(void)
INIT_HLIST_HEAD(&kretprobe_inst_table[i]);
}
- err = arch_init();
+ err = arch_init_kprobes();
if (!err)
err = register_die_notifier(&kprobe_exceptions_nb);