[REFACTOR] remove argument 'atomic' in US API

4 files changed, 22 insertions, 22 deletions

diff --git a/uprobe/arch/asm-arm/swap_uprobes.c b/uprobe/arch/asm-arm/swap_uprobes.c
index e25f3aea..77ec1223 100644
--- a/uprobe/arch/asm-arm/swap_uprobes.c
+++ b/uprobe/arch/asm-arm/swap_uprobes.c
@@ -536,7 +536,7 @@ static int arch_copy_trampoline_thumb_uprobe(struct kprobe *p, struct task_struc
 	return 0;
 }
 
-int arch_prepare_uprobe(struct uprobe *up, struct hlist_head *page_list, int atomic)
+int arch_prepare_uprobe(struct uprobe *up, struct hlist_head *page_list)
 {
 	int ret = 0;
 	struct kprobe *p = &up->kp;
diff --git a/uprobe/arch/asm-arm/swap_uprobes.h b/uprobe/arch/asm-arm/swap_uprobes.h
index 34e1edb9..a0c23921 100644
--- a/uprobe/arch/asm-arm/swap_uprobes.h
+++ b/uprobe/arch/asm-arm/swap_uprobes.h
@@ -10,7 +10,7 @@ static inline void dbi_arch_uprobe_return(void)
 {
 }
 
-int arch_prepare_uprobe(struct uprobe *up, struct hlist_head *page_list, int atomic);
+int arch_prepare_uprobe(struct uprobe *up, struct hlist_head *page_list);
 
 int setjmp_upre_handler(struct kprobe *p, struct pt_regs *regs);
 static inline int longjmp_break_uhandler(struct kprobe *p, struct pt_regs *regs)
diff --git a/uprobe/swap_uprobes.c b/uprobe/swap_uprobes.c
index c4ab6f7e..e0d2908d 100644
--- a/uprobe/swap_uprobes.c
+++ b/uprobe/swap_uprobes.c
@@ -506,7 +506,7 @@ static struct uretprobe_instance *get_free_urp_inst(struct uretprobe *rp)
 }
 // ===================================================================
 
-int dbi_register_uprobe(struct uprobe *up, int atomic)
+int dbi_register_uprobe(struct uprobe *up)
 {
 	int ret = 0;
 	struct kprobe *p, *old_p;
@@ -551,7 +551,7 @@ int dbi_register_uprobe(struct uprobe *up, int atomic)
 		goto out;
 	}
 
-	ret = arch_prepare_uprobe(up, &uprobe_insn_pages, atomic);
+	ret = arch_prepare_uprobe(up, &uprobe_insn_pages);
 	if (ret) {
 		DBPRINTF("goto out\n", ret);
 		goto out;
@@ -570,7 +570,7 @@ out:
 	return ret;
 }
 
-void dbi_unregister_uprobe(struct uprobe *up, int atomic)
+void dbi_unregister_uprobe(struct uprobe *up)
 {
 	struct kprobe *p, *old_p, *list_p;
 	int cleanup_p;
@@ -635,7 +635,7 @@ valid_p:
 	}
 }
 
-int dbi_register_ujprobe(struct ujprobe *jp, int atomic)
+int dbi_register_ujprobe(struct ujprobe *jp)
 {
 	int ret = 0;
 
@@ -643,14 +643,14 @@ int dbi_register_ujprobe(struct ujprobe *jp, int atomic)
 	jp->up.kp.pre_handler = setjmp_upre_handler;
 	jp->up.kp.break_handler = longjmp_break_uhandler;
 
-	ret = dbi_register_uprobe(&jp->up, atomic);
+	ret = dbi_register_uprobe(&jp->up);
 
 	return ret;
 }
 
-void dbi_unregister_ujprobe(struct ujprobe *jp, int atomic)
+void dbi_unregister_ujprobe(struct ujprobe *jp)
 {
-	dbi_unregister_uprobe(&jp->up, atomic);
+	dbi_unregister_uprobe(&jp->up);
 	/*
 	 * Here is an attempt to unregister even those probes that have not been
 	 * installed (hence not added to the hlist).
@@ -753,7 +753,7 @@ static int pre_handler_uretprobe(struct kprobe *p, struct pt_regs *regs)
 	return 0;
 }
 
-int dbi_register_uretprobe(struct uretprobe *rp, int atomic)
+int dbi_register_uretprobe(struct uretprobe *rp)
 {
 	int i, ret = 0;
 	struct uretprobe_instance *inst;
@@ -792,7 +792,7 @@ int dbi_register_uretprobe(struct uretprobe *rp, int atomic)
 	rp->nmissed = 0;
 
 	/* Establish function entry probe point */
-	ret = dbi_register_uprobe(&rp->up, atomic);
+	ret = dbi_register_uprobe(&rp->up);
 	if (ret) {
 		free_urp_inst(rp);
 		goto out;
@@ -888,7 +888,7 @@ int dbi_disarm_urp_inst_for_task(struct task_struct *parent, struct task_struct
 }
 EXPORT_SYMBOL_GPL(dbi_disarm_urp_inst_for_task);
 
-void dbi_unregister_uretprobe(struct uretprobe *rp, int atomic)
+void dbi_unregister_uretprobe(struct uretprobe *rp)
 {
 	unsigned long flags;
 	struct uretprobe_instance *ri;
@@ -928,10 +928,10 @@ void dbi_unregister_uretprobe(struct uretprobe *rp, int atomic)
 	spin_unlock_irqrestore(&uretprobe_lock, flags);
 	free_urp_inst(rp);
 
-	dbi_unregister_uprobe(&rp->up, atomic);
+	dbi_unregister_uprobe(&rp->up);
 }
 
-void dbi_unregister_all_uprobes(struct task_struct *task, int atomic)
+void dbi_unregister_all_uprobes(struct task_struct *task)
 {
 	struct hlist_head *head;
 	struct hlist_node *node, *tnode;
@@ -945,7 +945,7 @@ void dbi_unregister_all_uprobes(struct task_struct *task, int atomic)
 				struct uprobe *up = container_of(p, struct uprobe, kp);
 				printk("dbi_unregister_all_uprobes: delete uprobe at %p[%lx] for %s/%d\n",
 						p->addr, (unsigned long)p->opcode, task->comm, task->pid);
-				dbi_unregister_uprobe(up, atomic);
+				dbi_unregister_uprobe(up);
 			}
 		}
 	}
diff --git a/uprobe/swap_uprobes.h b/uprobe/swap_uprobes.h
index 678ce246..68b2cbc2 100644
--- a/uprobe/swap_uprobes.h
+++ b/uprobe/swap_uprobes.h
@@ -80,16 +80,16 @@ struct uretprobe_instance {
 	struct task_struct *task;
 };
 
-int dbi_register_uprobe(struct uprobe *p, int atomic);
-void dbi_unregister_uprobe(struct uprobe *p, int atomic);
+int dbi_register_uprobe(struct uprobe *p);
+void dbi_unregister_uprobe(struct uprobe *p);
 
-int dbi_register_ujprobe(struct ujprobe *jp, int atomic);
-void dbi_unregister_ujprobe(struct ujprobe *jp, int atomic);
+int dbi_register_ujprobe(struct ujprobe *jp);
+void dbi_unregister_ujprobe(struct ujprobe *jp);
 
-int dbi_register_uretprobe(struct uretprobe *rp, int atomic);
-void dbi_unregister_uretprobe(struct uretprobe *rp, int atomic);
+int dbi_register_uretprobe(struct uretprobe *rp);
+void dbi_unregister_uretprobe(struct uretprobe *rp);
 
-void dbi_unregister_all_uprobes(struct task_struct *task, int atomic);
+void dbi_unregister_all_uprobes(struct task_struct *task);
 
 void dbi_uprobe_return(void);
 struct kprobe *get_ukprobe(void *addr, pid_t tgid);