[REFACTOR] rename dbi_arch_uprobe_return()

dbi_arch_uprobe_return() --> arch_ujprobe_return()

diff --git a/kprobe/arch/asm-mips/dbi_kprobes.c b/kprobe/arch/asm-mips/dbi_kprobes.c
index 094244e..796810a 100644 (file)
--- a/kprobe/arch/asm-mips/dbi_kprobes.c
+++ b/kprobe/arch/asm-mips/dbi_kprobes.c
@@ -477,13 +477,13 @@ int setjmp_pre_handler (struct kprobe *p, struct pt_regs *regs)
                }
                else {
                        if (p->tgid)
-                               dbi_arch_uprobe_return ();
+                               arch_ujprobe_return();
                        else
                                dbi_jprobe_return ();
                }
        }
        else if (p->tgid)
-               dbi_arch_uprobe_return ();
+               arch_ujprobe_return();
 
        prepare_singlestep (p, regs);
 
@@ -496,7 +496,7 @@ void dbi_jprobe_return (void)
        preempt_enable_no_resched();
 }
 
-void dbi_arch_uprobe_return (void)
+void arch_ujprobe_return(void)
 {
        preempt_enable_no_resched();
 }
@@ -724,6 +724,5 @@ void __exit dbi_arch_exit_kprobes (void)
        arr_traps_original = NULL;
 }
 
-//EXPORT_SYMBOL_GPL (dbi_arch_uprobe_return);
 //EXPORT_SYMBOL_GPL (dbi_arch_exit_kprobes);
 

diff --git a/kprobe/arch/asm-x86/dbi_kprobes.c b/kprobe/arch/asm-x86/dbi_kprobes.c
index 9c6e03b..1742073 100644 (file)
--- a/kprobe/arch/asm-x86/dbi_kprobes.c
+++ b/kprobe/arch/asm-x86/dbi_kprobes.c
@@ -623,9 +623,8 @@ void dbi_jprobe_return (void)
                        "       nop                     \n"::"b" (kcb->jprobe_saved_esp):"memory");
 }
 
-void dbi_arch_uprobe_return (void)
+void arch_ujprobe_return(void)
 {
-       DBPRINTF("dbi_arch_uprobe_return (void) is empty");
 }
 
 /*

diff --git a/uprobe/arch/asm-arm/swap_uprobes.c b/uprobe/arch/asm-arm/swap_uprobes.c
index 8f7764d..17e349c 100644 (file)
--- a/uprobe/arch/asm-arm/swap_uprobes.c
+++ b/uprobe/arch/asm-arm/swap_uprobes.c
@@ -717,7 +717,7 @@ int setjmp_upre_handler(struct kprobe *p, struct pt_regs *regs)
                entry(regs->ARM_r0, regs->ARM_r1, regs->ARM_r2,
                      regs->ARM_r3, regs->ARM_r4, regs->ARM_r5);
        } else {
-               dbi_arch_uprobe_return();
+               arch_ujprobe_return();
        }
 
        return 0;

diff --git a/uprobe/arch/asm-arm/swap_uprobes.h b/uprobe/arch/asm-arm/swap_uprobes.h
index 3c5e2ff..53b0d04 100644 (file)
--- a/uprobe/arch/asm-arm/swap_uprobes.h
+++ b/uprobe/arch/asm-arm/swap_uprobes.h
@@ -6,7 +6,7 @@ struct pt_regs;
 struct task_struct;
 
 
-static inline void dbi_arch_uprobe_return(void)
+static inline void arch_ujprobe_return(void)
 {
 }
 

diff --git a/uprobe/arch/asm-x86/swap_uprobes.h b/uprobe/arch/asm-x86/swap_uprobes.h
index 2e7bbb2..2609dbe 100644 (file)
--- a/uprobe/arch/asm-x86/swap_uprobes.h
+++ b/uprobe/arch/asm-x86/swap_uprobes.h
@@ -3,7 +3,7 @@
 
 #include <asm/dbi_kprobes.h>
 
-static inline void dbi_arch_uprobe_return(void)
+static inline void arch_ujprobe_return(void)
 {
 }
 

diff --git a/uprobe/swap_uprobes.c b/uprobe/swap_uprobes.c
index 94717a8..d2f195d 100644 (file)
--- a/uprobe/swap_uprobes.c
+++ b/uprobe/swap_uprobes.c
@@ -959,7 +959,7 @@ void dbi_unregister_all_uprobes(struct task_struct *task)
 
 void swap_ujprobe_return(void)
 {
-       dbi_arch_uprobe_return();
+       arch_ujprobe_return();
 }
 EXPORT_SYMBOL_GPL(swap_ujprobe_return);