git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge master.kernel.org:/home/rmk/linux-2.6-arm-smp
[pandora-kernel.git]
/
kernel
/
kprobes.c
diff --git
a/kernel/kprobes.c
b/kernel/kprobes.c
index
90c0e82
..
b023712
100644
(file)
--- 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);