Add a weak function for any architecture-specific initialization.  ARM
will use this to register the handlers for the undefined instructions it
uses to implement uprobes.

Signed-off-by: Rabin Vincent <ra...@rab.in>
Signed-off-by: David A. Long <dave.l...@linaro.org>
---
 include/linux/uprobes.h |  1 +
 kernel/events/uprobes.c | 10 ++++++++++
 2 files changed, 11 insertions(+)

diff --git a/include/linux/uprobes.h b/include/linux/uprobes.h
index 2a0aa10..e5a9bfb 100644
--- a/include/linux/uprobes.h
+++ b/include/linux/uprobes.h
@@ -135,6 +135,7 @@ extern int  arch_uprobe_exception_notify(struct 
notifier_block *self, unsigned l
 extern void arch_uprobe_abort_xol(struct arch_uprobe *aup, struct pt_regs 
*regs);
 extern bool __weak arch_uprobe_ignore(struct arch_uprobe *aup, struct pt_regs 
*regs);
 extern void __weak arch_uprobe_xol_copy(struct arch_uprobe *auprobe, void 
*vaddr);
+extern int __weak arch_uprobes_init(void);
 #else /* !CONFIG_UPROBES */
 struct uprobes_state {
 };
diff --git a/kernel/events/uprobes.c b/kernel/events/uprobes.c
index 64471bd..5004f6f 100644
--- a/kernel/events/uprobes.c
+++ b/kernel/events/uprobes.c
@@ -1862,8 +1862,14 @@ static struct notifier_block uprobe_exception_nb = {
        .priority               = INT_MAX-1,    /* notified after kprobes, kgdb 
*/
 };
 
+int __weak __init arch_uprobes_init(void)
+{
+       return 0;
+}
+
 static int __init init_uprobes(void)
 {
+       int ret;
        int i;
 
        for (i = 0; i < UPROBES_HASH_SZ; i++)
@@ -1872,6 +1878,10 @@ static int __init init_uprobes(void)
        if (percpu_init_rwsem(&dup_mmap_sem))
                return -ENOMEM;
 
+       ret = arch_uprobes_init();
+       if (ret)
+               return ret;
+
        return register_die_notifier(&uprobe_exception_nb);
 }
 module_init(init_uprobes);
-- 
1.8.1.2


_______________________________________________
linaro-dev mailing list
linaro-dev@lists.linaro.org
http://lists.linaro.org/mailman/listinfo/linaro-dev

Reply via email to