[FIX] name conflicts with kernel kprobe

Change-Id: I66368a1c9bac9483fcfb561122ad1bb847feacbf
Signed-off-by: Vyacheslav Cherkashin <v.cherkashin@samsung.com>

6 files changed, 120 insertions, 120 deletions

diff --git a/kprobe/arch/asm-arm/swap_kprobes.c b/kprobe/arch/asm-arm/swap_kprobes.c
index 751accb3..0103fe21 100644
--- a/kprobe/arch/asm-arm/swap_kprobes.c
+++ b/kprobe/arch/asm-arm/swap_kprobes.c
@@ -293,7 +293,7 @@ int arch_make_trampoline_arm(unsigned long addr, unsigned long insn,
 }
 EXPORT_SYMBOL_GPL(arch_make_trampoline_arm);
 
-int arch_prepare_kprobe(struct kprobe *p, struct slot_manager *sm)
+int swap_arch_prepare_kprobe(struct kprobe *p, struct slot_manager *sm)
 {
 	unsigned long addr = (unsigned long)p->addr;
 	unsigned long insn = p->opcode = *p->addr;
@@ -333,19 +333,19 @@ EXPORT_SYMBOL_GPL(prepare_singlestep);
 
 void save_previous_kprobe(struct kprobe_ctlblk *kcb, struct kprobe *p_run)
 {
-	kcb->prev_kprobe.kp = kprobe_running();
+	kcb->prev_kprobe.kp = swap_kprobe_running();
 	kcb->prev_kprobe.status = kcb->kprobe_status;
 }
 
 void restore_previous_kprobe(struct kprobe_ctlblk *kcb)
 {
-	__get_cpu_var(current_kprobe) = kcb->prev_kprobe.kp;
+	__get_cpu_var(swap_current_kprobe) = kcb->prev_kprobe.kp;
 	kcb->kprobe_status = kcb->prev_kprobe.status;
 }
 
 void set_current_kprobe(struct kprobe *p, struct pt_regs *regs, struct kprobe_ctlblk *kcb)
 {
-	__get_cpu_var(current_kprobe) = p;
+	__get_cpu_var(swap_current_kprobe) = p;
 	DBPRINTF ("set_current_kprobe: p=%p addr=%p\n", p, p->addr);
 }
 
@@ -354,9 +354,9 @@ static int kprobe_handler(struct pt_regs *regs)
 	struct kprobe *p, *cur;
 	struct kprobe_ctlblk *kcb;
 
-	kcb = get_kprobe_ctlblk();
-	cur = kprobe_running();
-	p = get_kprobe((void *)regs->ARM_pc);
+	kcb = swap_get_kprobe_ctlblk();
+	cur = swap_kprobe_running();
+	p = swap_get_kprobe((void *)regs->ARM_pc);
 
 	if (p) {
 		if (cur) {
@@ -365,7 +365,7 @@ static int kprobe_handler(struct pt_regs *regs)
 			case KPROBE_HIT_ACTIVE:
 			case KPROBE_HIT_SSDONE:
 				/* A pre- or post-handler probe got us here. */
-				kprobes_inc_nmissed_count(p);
+				swap_kprobes_inc_nmissed_count(p);
 				save_previous_kprobe(kcb, NULL);
 				set_current_kprobe(p, 0, 0);
 				kcb->kprobe_status = KPROBE_REENTER;
@@ -383,7 +383,7 @@ static int kprobe_handler(struct pt_regs *regs)
 			if (!p->pre_handler || !p->pre_handler(p, regs)) {
 				kcb->kprobe_status = KPROBE_HIT_SS;
 				prepare_singlestep(p, regs);
-				reset_current_kprobe();
+				swap_reset_current_kprobe();
 			}
 		}
 	} else {
@@ -424,7 +424,7 @@ int kprobe_trap_handler(struct pt_regs *regs, unsigned int instr)
 	return ret;
 }
 
-int setjmp_pre_handler(struct kprobe *p, struct pt_regs *regs)
+int swap_setjmp_pre_handler(struct kprobe *p, struct pt_regs *regs)
 {
 	struct jprobe *jp = container_of(p, struct jprobe, kp);
 	kprobe_pre_entry_handler_t pre_entry = (kprobe_pre_entry_handler_t)jp->pre_entry;
@@ -451,17 +451,17 @@ void swap_jprobe_return(void)
 }
 EXPORT_SYMBOL_GPL(swap_jprobe_return);
 
-int longjmp_break_handler (struct kprobe *p, struct pt_regs *regs)
+int swap_longjmp_break_handler (struct kprobe *p, struct pt_regs *regs)
 {
 	return 0;
 }
-EXPORT_SYMBOL_GPL(longjmp_break_handler);
+EXPORT_SYMBOL_GPL(swap_longjmp_break_handler);
 
 #ifdef CONFIG_STRICT_MEMORY_RWX
 extern void mem_text_write_kernel_word(unsigned long *addr, unsigned long word);
 #endif
 
-void arch_arm_kprobe(struct kprobe *p)
+void swap_arch_arm_kprobe(struct kprobe *p)
 {
 #ifdef CONFIG_STRICT_MEMORY_RWX
 	mem_text_write_kernel_word(p->addr, BREAKPOINT_INSTRUCTION);
@@ -471,7 +471,7 @@ void arch_arm_kprobe(struct kprobe *p)
 #endif
 }
 
-void arch_disarm_kprobe(struct kprobe *p)
+void swap_arch_disarm_kprobe(struct kprobe *p)
 {
 #ifdef CONFIG_STRICT_MEMORY_RWX
 	mem_text_write_kernel_word(p->addr, p->opcode);
@@ -481,7 +481,7 @@ void arch_disarm_kprobe(struct kprobe *p)
 #endif
 }
 
-void __naked kretprobe_trampoline(void)
+void __naked swap_kretprobe_trampoline(void)
 {
 	__asm__ __volatile__ (
 		"stmdb	sp!, {r0 - r11}		\n\t"
@@ -494,7 +494,8 @@ void __naked kretprobe_trampoline(void)
 		: : : "memory");
 }
 
-void arch_prepare_kretprobe(struct kretprobe_instance *ri, struct pt_regs *regs)
+void swap_arch_prepare_kretprobe(struct kretprobe_instance *ri,
+				 struct pt_regs *regs)
 {
 	unsigned long *ptr_ret_addr;
 
@@ -514,7 +515,7 @@ void arch_prepare_kretprobe(struct kretprobe_instance *ri, struct pt_regs *regs)
 	ri->ret_addr = (unsigned long *)*ptr_ret_addr;
 
 	/* Replace the return addr with trampoline addr */
-	*ptr_ret_addr = (unsigned long)&kretprobe_trampoline;
+	*ptr_ret_addr = (unsigned long)&swap_kretprobe_trampoline;
 }
 
 
@@ -719,7 +720,7 @@ static struct undef_hook undef_ho_k = {
 	.fn		= kprobe_trap_handler
 };
 
-int arch_init_kprobes(void)
+int swap_arch_init_kprobes(void)
 {
 	int ret;
 
@@ -748,7 +749,7 @@ int arch_init_kprobes(void)
 	return 0;
 }
 
-void arch_exit_kprobes(void)
+void swap_arch_exit_kprobes(void)
 {
 	kjump_exit();
 	swap_unregister_undef_hook(&undef_ho_k);
diff --git a/kprobe/arch/asm-arm/swap_kprobes.h b/kprobe/arch/asm-arm/swap_kprobes.h
index 6b624a27..a97420e6 100644
--- a/kprobe/arch/asm-arm/swap_kprobes.h
+++ b/kprobe/arch/asm-arm/swap_kprobes.h
@@ -495,20 +495,21 @@ int arch_make_trampoline_arm(unsigned long addr, unsigned long insn,
 struct slot_manager;
 struct kretprobe;
 struct kretprobe_instance;
-int arch_prepare_kprobe(struct kprobe *p, struct slot_manager *sm);
-void arch_prepare_kretprobe(struct kretprobe_instance *ri, struct pt_regs *regs);
+int swap_arch_prepare_kprobe(struct kprobe *p, struct slot_manager *sm);
+void swap_arch_prepare_kretprobe(struct kretprobe_instance *ri,
+				 struct pt_regs *regs);
 
-void arch_arm_kprobe(struct kprobe *p);
-void arch_disarm_kprobe(struct kprobe *p);
+void swap_arch_arm_kprobe(struct kprobe *p);
+void swap_arch_disarm_kprobe(struct kprobe *p);
 
-int setjmp_pre_handler(struct kprobe *p, struct pt_regs *regs);
-int longjmp_break_handler(struct kprobe *p, struct pt_regs *regs);
+int swap_setjmp_pre_handler(struct kprobe *p, struct pt_regs *regs);
+int swap_longjmp_break_handler(struct kprobe *p, struct pt_regs *regs);
 
 void save_previous_kprobe(struct kprobe_ctlblk *kcb, struct kprobe *cur_p);
 void restore_previous_kprobe(struct kprobe_ctlblk *kcb);
 void set_current_kprobe(struct kprobe *p, struct pt_regs *regs, struct kprobe_ctlblk *kcb);
 
-void __naked kretprobe_trampoline(void);
+void __naked swap_kretprobe_trampoline(void);
 
 static inline unsigned long swap_get_karg(struct pt_regs *regs, unsigned long n)
 {
@@ -542,8 +543,8 @@ unsigned long get_jump_addr(void);
 int set_jump_cb(unsigned long ret_addr, struct pt_regs *regs,
 		jumper_cb_t cb, void *data, size_t size);
 
-int arch_init_kprobes(void);
-void arch_exit_kprobes(void);
+int swap_arch_init_kprobes(void);
+void swap_arch_exit_kprobes(void);
 
 //void gen_insn_execbuf (void);
 //void pc_dep_insn_execbuf (void);
diff --git a/kprobe/arch/asm-x86/swap_kprobes.c b/kprobe/arch/asm-x86/swap_kprobes.c
index 0c8b6056..9bc1f6c7 100644
--- a/kprobe/arch/asm-x86/swap_kprobes.c
+++ b/kprobe/arch/asm-x86/swap_kprobes.c
@@ -58,7 +58,7 @@
 
 extern struct kprobe * per_cpu__current_kprobe;
 extern struct kprobe * per_cpu__current_kprobe;
-extern struct kprobe * current_kprobe;
+extern struct kprobe *swap_current_kprobe;
 
 
 static int (*swap_fixup_exception)(struct pt_regs * regs);
@@ -74,10 +74,10 @@ static void (*swap_show_registers)(struct pt_regs * regs);
  *      - When the probed function returns, this probe
  *        causes the handlers to fire
  */
-static __used void kretprobe_trampoline_holder(void)
+static __used void swap_kretprobe_trampoline_holder(void)
 {
-	asm volatile(".global kretprobe_trampoline\n"
-			"kretprobe_trampoline:\n"
+	asm volatile(".global swap_kretprobe_trampoline\n"
+			"swap_kretprobe_trampoline:\n"
 			"	pushf\n"
 			/* skip cs, ip, orig_ax and gs. */
 			"	subl $16, %esp\n"
@@ -111,7 +111,7 @@ static __used void kretprobe_trampoline_holder(void)
 			"	ret\n");
 }
 
-void kretprobe_trampoline(void);
+void swap_kretprobe_trampoline(void);
 
 /* insert a jmp code */
 static __always_inline void set_jmp_op (void *from, void *to)
@@ -129,7 +129,7 @@ static __always_inline void set_jmp_op (void *from, void *to)
 /*
  * returns non-zero if opcodes can be boosted.
  */
-int can_boost(kprobe_opcode_t *opcodes)
+int swap_can_boost(kprobe_opcode_t *opcodes)
 {
 #define W(row,b0,b1,b2,b3,b4,b5,b6,b7,b8,b9,ba,bb,bc,bd,be,bf)		      \
 	(((b0##UL << 0x0)|(b1##UL << 0x1)|(b2##UL << 0x2)|(b3##UL << 0x3) |   \
@@ -209,7 +209,7 @@ retry:
 			return (opcode != 0x2e && opcode != 0x9a);
 	}
 }
-EXPORT_SYMBOL_GPL(can_boost);
+EXPORT_SYMBOL_GPL(swap_can_boost);
 
 /*
  * returns non-zero if opcode modifies the interrupt flag.
@@ -227,7 +227,7 @@ static int is_IF_modifier (kprobe_opcode_t opcode)
 	return 0;
 }
 
-int arch_prepare_kprobe(struct kprobe *p, struct slot_manager *sm)
+int swap_arch_prepare_kprobe(struct kprobe *p, struct slot_manager *sm)
 {
 	/* insn: must be on special executable page on i386. */
 	p->ainsn.insn = swap_slot_alloc(sm);
@@ -237,7 +237,7 @@ int arch_prepare_kprobe(struct kprobe *p, struct slot_manager *sm)
 	memcpy(p->ainsn.insn, p->addr, MAX_INSN_SIZE);
 
 	p->opcode = *p->addr;
-	p->ainsn.boostable = can_boost(p->addr) ? 0 : -1;
+	p->ainsn.boostable = swap_can_boost(p->addr) ? 0 : -1;
 
 	return 0;
 }
@@ -271,18 +271,18 @@ void save_previous_kprobe (struct kprobe_ctlblk *kcb, struct kprobe *cur_p)
 	{
 		panic("no space to save new probe[]: task = %d/%s, prev %p, current %p, new %p,",
 				current->pid, current->comm, kcb->prev_kprobe.kp->addr,
-				kprobe_running()->addr, cur_p->addr);
+				swap_kprobe_running()->addr, cur_p->addr);
 	}
 
 
-	kcb->prev_kprobe.kp = kprobe_running();
+	kcb->prev_kprobe.kp = swap_kprobe_running();
 	kcb->prev_kprobe.status = kcb->kprobe_status;
 
 }
 
 void restore_previous_kprobe (struct kprobe_ctlblk *kcb)
 {
-	__get_cpu_var (current_kprobe) = kcb->prev_kprobe.kp;
+	__get_cpu_var(swap_current_kprobe) = kcb->prev_kprobe.kp;
 	kcb->kprobe_status = kcb->prev_kprobe.status;
 	kcb->prev_kprobe.kp = NULL;
 	kcb->prev_kprobe.status = 0;
@@ -290,7 +290,7 @@ void restore_previous_kprobe (struct kprobe_ctlblk *kcb)
 
 void set_current_kprobe (struct kprobe *p, struct pt_regs *regs, struct kprobe_ctlblk *kcb)
 {
-	__get_cpu_var (current_kprobe) = p;
+	__get_cpu_var(swap_current_kprobe) = p;
 	DBPRINTF ("set_current_kprobe[]: p=%p addr=%p\n", p, p->addr);
 	kcb->kprobe_saved_eflags = kcb->kprobe_old_eflags = (regs->EREG (flags) & (TF_MASK | IF_MASK));
 	if (is_IF_modifier (p->opcode))
@@ -317,11 +317,11 @@ int kprobe_handler (struct pt_regs *regs)
 #endif
 	preempt_disable ();
 
-	kcb = get_kprobe_ctlblk ();
+	kcb = swap_get_kprobe_ctlblk();
 
 	/* Check we're not actually recursing */
-	if (kprobe_running()) {
-		p = get_kprobe(addr);
+	if (swap_kprobe_running()) {
+		p = swap_get_kprobe(addr);
 		if (p) {
 			if (kcb->kprobe_status == KPROBE_HIT_SS && *p->ainsn.insn == BREAKPOINT_INSTRUCTION) {
 				regs->EREG(flags) &= ~TF_MASK;
@@ -338,7 +338,7 @@ int kprobe_handler (struct pt_regs *regs)
 			 */
 			save_previous_kprobe (kcb, p);
 			set_current_kprobe (p, regs, kcb);
-			kprobes_inc_nmissed_count (p);
+			swap_kprobes_inc_nmissed_count(p);
 			prepare_singlestep (p, regs);
 			kcb->kprobe_status = KPROBE_REENTER;
 			// FIXME should we enable preemption here??...
@@ -358,7 +358,7 @@ int kprobe_handler (struct pt_regs *regs)
 				goto no_kprobe;
 			}
 
-			p = __get_cpu_var(current_kprobe);
+			p = __get_cpu_var(swap_current_kprobe);
 			if (p->break_handler && p->break_handler(p, regs))
 				goto ss_probe;
 
@@ -366,9 +366,8 @@ int kprobe_handler (struct pt_regs *regs)
 		}
 	}
 
-	DBPRINTF ("get_kprobe %p", addr);
 	if (!p)
-		p = get_kprobe(addr);
+		p = swap_get_kprobe(addr);
 
 	if (!p) {
 		if (*addr != BREAKPOINT_INSTRUCTION) {
@@ -426,7 +425,7 @@ ss_probe:
 	if (p->ainsn.boostable == 1 && !p->post_handler)
 	{
 		/* Boost up -- we can execute copied instructions directly */
-		reset_current_kprobe ();
+		swap_reset_current_kprobe();
 		regs->EREG (ip) = (unsigned long) p->ainsn.insn;
 		preempt_enable_no_resched ();
 #ifdef SUPRESS_BUG_MESSAGES
@@ -453,16 +452,15 @@ no_kprobe:
 	return ret;
 }
 
-int setjmp_pre_handler (struct kprobe *p, struct pt_regs *regs)
+int swap_setjmp_pre_handler(struct kprobe *p, struct pt_regs *regs)
 {
 	struct jprobe *jp = container_of (p, struct jprobe, kp);
 	kprobe_pre_entry_handler_t pre_entry;
 	entry_point_t entry;
 
 	unsigned long addr;
-	struct kprobe_ctlblk *kcb = get_kprobe_ctlblk ();
+	struct kprobe_ctlblk *kcb = swap_get_kprobe_ctlblk();
 
-	DBPRINTF ("setjmp_pre_handler %p:%d", p->addr, p->tgid);
 	pre_entry = (kprobe_pre_entry_handler_t) jp->pre_entry;
 	entry = (entry_point_t) jp->entry;
 
@@ -493,7 +491,7 @@ void swap_jprobe_return_end(void);
 
 void swap_jprobe_return(void)
 {
-	struct kprobe_ctlblk *kcb = get_kprobe_ctlblk ();
+	struct kprobe_ctlblk *kcb = swap_get_kprobe_ctlblk();
 
 	asm volatile("       xchgl   %%ebx,%%esp     \n"
 			"       int3			\n"
@@ -616,8 +614,8 @@ no_change:
  */
 static int post_kprobe_handler (struct pt_regs *regs)
 {
-	struct kprobe *cur = kprobe_running ();
-	struct kprobe_ctlblk *kcb = get_kprobe_ctlblk ();
+	struct kprobe *cur = swap_kprobe_running();
+	struct kprobe_ctlblk *kcb = swap_get_kprobe_ctlblk();
 
 	if (!cur)
 		return 0;
@@ -638,7 +636,7 @@ static int post_kprobe_handler (struct pt_regs *regs)
 		restore_previous_kprobe (kcb);
 		goto out;
 	}
-	reset_current_kprobe ();
+	swap_reset_current_kprobe();
 out:
 	preempt_enable_no_resched ();
 
@@ -653,10 +651,10 @@ out:
 	return 1;
 }
 
-int kprobe_fault_handler (struct pt_regs *regs, int trapnr)
+static int kprobe_fault_handler(struct pt_regs *regs, int trapnr)
 {
-	struct kprobe *cur = kprobe_running ();
-	struct kprobe_ctlblk *kcb = get_kprobe_ctlblk ();
+	struct kprobe *cur = swap_kprobe_running();
+	struct kprobe_ctlblk *kcb = swap_get_kprobe_ctlblk();
 
 	switch (kcb->kprobe_status)
 	{
@@ -674,7 +672,7 @@ int kprobe_fault_handler (struct pt_regs *regs, int trapnr)
 			if (kcb->kprobe_status == KPROBE_REENTER)
 				restore_previous_kprobe (kcb);
 			else
-				reset_current_kprobe ();
+				swap_reset_current_kprobe();
 			preempt_enable_no_resched ();
 			break;
 		case KPROBE_HIT_ACTIVE:
@@ -684,7 +682,7 @@ int kprobe_fault_handler (struct pt_regs *regs, int trapnr)
 			 * we can also use npre/npostfault count for accouting
 			 * these specific fault cases.
 			 */
-			kprobes_inc_nmissed_count (cur);
+			swap_kprobes_inc_nmissed_count(cur);
 
 			/*
 			 * We come here because instructions in the pre/post
@@ -714,7 +712,8 @@ int kprobe_fault_handler (struct pt_regs *regs, int trapnr)
 	return 0;
 }
 
-int kprobe_exceptions_notify (struct notifier_block *self, unsigned long val, void *data)
+static int kprobe_exceptions_notify(struct notifier_block *self,
+				    unsigned long val, void *data)
 {
 	struct die_args *args = (struct die_args *) data;
 	int ret = NOTIFY_DONE;
@@ -742,9 +741,10 @@ int kprobe_exceptions_notify (struct notifier_block *self, unsigned long val, vo
 				ret = NOTIFY_STOP;
 			break;
 		case DIE_GPF:
-			// kprobe_running() needs smp_processor_id()
+			/* swap_kprobe_running() needs smp_processor_id() */
 			preempt_disable ();
-			if (kprobe_running () && kprobe_fault_handler (args->regs, args->trapnr))
+			if (swap_kprobe_running() &&
+			    kprobe_fault_handler(args->regs, args->trapnr))
 				ret = NOTIFY_STOP;
 			preempt_enable ();
 			break;
@@ -763,9 +763,9 @@ static struct notifier_block kprobe_exceptions_nb = {
 	.priority = INT_MAX
 };
 
-int longjmp_break_handler (struct kprobe *p, struct pt_regs *regs)
+int swap_longjmp_break_handler(struct kprobe *p, struct pt_regs *regs)
 {
-	struct kprobe_ctlblk *kcb = get_kprobe_ctlblk ();
+	struct kprobe_ctlblk *kcb = swap_get_kprobe_ctlblk();
 	u8 *addr = (u8 *) (regs->EREG (ip) - 1);
 	unsigned long stack_addr = (unsigned long) (kcb->jprobe_saved_esp);
 	struct jprobe *jp = container_of (p, struct jprobe, kp);
@@ -794,13 +794,13 @@ int longjmp_break_handler (struct kprobe *p, struct pt_regs *regs)
 	return 0;
 }
 
-void arch_arm_kprobe (struct kprobe *p)
+void swap_arch_arm_kprobe(struct kprobe *p)
 {
 	swap_text_poke(p->addr,
 		       ((unsigned char[]){BREAKPOINT_INSTRUCTION}), 1);
 }
 
-void arch_disarm_kprobe (struct kprobe *p)
+void swap_arch_disarm_kprobe(struct kprobe *p)
 {
 	swap_text_poke(p->addr, &p->opcode, 1);
 }
@@ -810,7 +810,8 @@ static __used void *trampoline_probe_handler_x86(struct pt_regs *regs)
 	return (void *)trampoline_probe_handler(NULL, regs);
 }
 
-void arch_prepare_kretprobe(struct kretprobe_instance *ri, struct pt_regs *regs)
+void swap_arch_prepare_kretprobe(struct kretprobe_instance *ri,
+				 struct pt_regs *regs)
 {
 	unsigned long *ptr_ret_addr = stack_addr(regs);
 
@@ -826,7 +827,7 @@ void arch_prepare_kretprobe(struct kretprobe_instance *ri, struct pt_regs *regs)
 	ri->ret_addr = (unsigned long *)*ptr_ret_addr;
 
 	/* Replace the return addr with trampoline addr */
-	*ptr_ret_addr = (unsigned long)&kretprobe_trampoline;
+	*ptr_ret_addr = (unsigned long)&swap_kretprobe_trampoline;
 }
 
 int arch_init_module_deps()
@@ -855,12 +856,12 @@ not_found:
 	return -ESRCH;
 }
 
-int arch_init_kprobes(void)
+int swap_arch_init_kprobes(void)
 {
 	return register_die_notifier (&kprobe_exceptions_nb);
 }
 
-void arch_exit_kprobes(void)
+void swap_arch_exit_kprobes(void)
 {
 	unregister_die_notifier (&kprobe_exceptions_nb);
 }
diff --git a/kprobe/arch/asm-x86/swap_kprobes.h b/kprobe/arch/asm-x86/swap_kprobes.h
index 421ca286..1cf5a77d 100644
--- a/kprobe/arch/asm-x86/swap_kprobes.h
+++ b/kprobe/arch/asm-x86/swap_kprobes.h
@@ -177,8 +177,6 @@ static inline int swap_fp_backtrace(struct task_struct *task,
 	return i;
 }
 
-extern int kprobe_exceptions_notify (struct notifier_block *self, unsigned long val, void *data);
-
 struct prev_kprobe {
 	struct kprobe *kp;
 	unsigned long status;
@@ -196,8 +194,6 @@ struct kprobe_ctlblk {
 };
 
 
-int kprobe_fault_handler (struct pt_regs *regs, int trapnr);
-
 /* Architecture specific copy of original instruction */
 struct arch_specific_insn {
 	/* copy of the original instruction */
@@ -216,14 +212,15 @@ int arch_init_module_deps(void);
 struct slot_manager;
 struct kretprobe_instance;
 
-int arch_prepare_kprobe(struct kprobe *p, struct slot_manager *sm);
-void arch_arm_kprobe(struct kprobe *p);
-void arch_disarm_kprobe(struct kprobe *p);
-void arch_prepare_kretprobe(struct kretprobe_instance *ri, struct pt_regs *regs);
-void kretprobe_trampoline(void);
+int swap_arch_prepare_kprobe(struct kprobe *p, struct slot_manager *sm);
+void swap_arch_arm_kprobe(struct kprobe *p);
+void swap_arch_disarm_kprobe(struct kprobe *p);
+void swap_arch_prepare_kretprobe(struct kretprobe_instance *ri,
+				 struct pt_regs *regs);
+void swap_kretprobe_trampoline(void);
 
 void restore_previous_kprobe(struct kprobe_ctlblk *kcb);
-int can_boost(kprobe_opcode_t *opcodes);
+int swap_can_boost(kprobe_opcode_t *opcodes);
 static inline int arch_check_insn(struct arch_specific_insn *ainsn)
 {
 	return 0;
@@ -254,7 +251,7 @@ static inline unsigned long swap_get_sarg(struct pt_regs *regs, unsigned long n)
 	return *((unsigned long *)kernel_stack_pointer(regs) + n + 1);
 }
 
-int arch_init_kprobes(void);
-void arch_exit_kprobes(void);
+int swap_arch_init_kprobes(void);
+void swap_arch_exit_kprobes(void);
 
 #endif /* _SWAP_ASM_X86_KPROBES_H */
diff --git a/kprobe/swap_kprobes.c b/kprobe/swap_kprobes.c
index 2b46adca..c8f2bafc 100644
--- a/kprobe/swap_kprobes.c
+++ b/kprobe/swap_kprobes.c
@@ -74,7 +74,7 @@ static unsigned long sys_exit_addr;
 
 struct slot_manager sm;
 
-DEFINE_PER_CPU(struct kprobe *, current_kprobe) = NULL;
+DEFINE_PER_CPU(struct kprobe *, swap_current_kprobe) = NULL;
 static DEFINE_PER_CPU(struct kprobe_ctlblk, kprobe_ctlblk);
 
 static DEFINE_SPINLOCK(kretprobe_lock);	/* Protects kretprobe_inst_table */
@@ -159,18 +159,18 @@ static inline void reset_kprobe_instance(void)
 	__get_cpu_var(kprobe_instance) = NULL;
 }
 
-/* kprobe_running() will just return the current_kprobe on this CPU */
-struct kprobe *kprobe_running(void)
+/* swap_kprobe_running() will just return the current_kprobe on this CPU */
+struct kprobe *swap_kprobe_running(void)
 {
-	return __get_cpu_var(current_kprobe);
+	return __get_cpu_var(swap_current_kprobe);
 }
 
-void reset_current_kprobe(void)
+void swap_reset_current_kprobe(void)
 {
-	__get_cpu_var(current_kprobe) = NULL;
+	__get_cpu_var(swap_current_kprobe) = NULL;
 }
 
-struct kprobe_ctlblk *get_kprobe_ctlblk(void)
+struct kprobe_ctlblk *swap_get_kprobe_ctlblk(void)
 {
 	return &__get_cpu_var(kprobe_ctlblk);
 }
@@ -181,7 +181,7 @@ struct kprobe_ctlblk *get_kprobe_ctlblk(void)
  * 				OR
  * 	- with preemption disabled - from arch/xxx/kernel/kprobes.c
  */
-struct kprobe *get_kprobe(void *addr)
+struct kprobe *swap_get_kprobe(void *addr)
 {
 	struct hlist_head *head;
 	struct kprobe *p;
@@ -266,7 +266,7 @@ static int aggr_break_handler(struct kprobe *p, struct pt_regs *regs)
 }
 
 /* Walks the list and increments nmissed count for multiprobe case */
-void kprobes_inc_nmissed_count(struct kprobe *p)
+void swap_kprobes_inc_nmissed_count(struct kprobe *p)
 {
 	struct kprobe *kp;
 	if (p->pre_handler != aggr_pre_handler) {
@@ -525,7 +525,7 @@ int swap_register_kprobe(struct kprobe *p)
 	p->nmissed = 0;
 	INIT_LIST_HEAD(&p->list);
 
-	old_p = get_kprobe(p->addr);
+	old_p = swap_get_kprobe(p->addr);
 	if (old_p) {
 		ret = register_aggr_kprobe(old_p, p);
 		if (!ret)
@@ -533,13 +533,13 @@ int swap_register_kprobe(struct kprobe *p)
 		goto out;
 	}
 
-	if ((ret = arch_prepare_kprobe(p, &sm)) != 0)
+	if ((ret = swap_arch_prepare_kprobe(p, &sm)) != 0)
 		goto out;
 
 	DBPRINTF ("before out ret = 0x%x\n", ret);
 	INIT_HLIST_NODE(&p->hlist);
 	hlist_add_head_rcu(&p->hlist, &kprobe_table[hash_ptr(p->addr, KPROBE_HASH_BITS)]);
-	arch_arm_kprobe(p);
+	swap_arch_arm_kprobe(p);
 
 out:
 	DBPRINTF ("out ret = 0x%x\n", ret);
@@ -554,7 +554,7 @@ static void swap_unregister_valid_kprobe(struct kprobe *p, struct kprobe *old_p)
 	if ((old_p == p) || ((old_p->pre_handler == aggr_pre_handler) &&
 	    (p->list.next == &old_p->list) && (p->list.prev == &old_p->list))) {
 		/* Only probe on the hash list */
-		arch_disarm_kprobe(p);
+		swap_arch_disarm_kprobe(p);
 		hlist_del_rcu(&old_p->hlist);
 
 		if (p != old_p)
@@ -582,7 +582,7 @@ void swap_unregister_kprobe(struct kprobe *kp)
 {
 	struct kprobe *old_p, *list_p;
 
-	old_p = get_kprobe(kp->addr);
+	old_p = swap_get_kprobe(kp->addr);
 	if (unlikely (!old_p))
 		return;
 
@@ -601,8 +601,8 @@ EXPORT_SYMBOL_GPL(swap_unregister_kprobe);
 int swap_register_jprobe(struct jprobe *jp)
 {
 	/* Todo: Verify probepoint is a function entry point */
-	jp->kp.pre_handler = setjmp_pre_handler;
-	jp->kp.break_handler = longjmp_break_handler;
+	jp->kp.pre_handler = swap_setjmp_pre_handler;
+	jp->kp.break_handler = swap_longjmp_break_handler;
 
 	return swap_register_kprobe(&jp->kp);
 }
@@ -636,7 +636,7 @@ static int pre_handler_kretprobe(struct kprobe *p, struct pt_regs *regs)
 			rp->entry_handler(ri, regs);
 		}
 
-		arch_prepare_kretprobe(ri, regs);
+		swap_arch_prepare_kretprobe(ri, regs);
 
 		add_rp_inst(ri);
 	} else {
@@ -653,15 +653,17 @@ int trampoline_probe_handler(struct kprobe *p, struct pt_regs *regs)
 	struct kretprobe_instance *ri = NULL;
 	struct hlist_head *head;
 	unsigned long flags, orig_ret_address = 0;
-	unsigned long trampoline_address = (unsigned long)&kretprobe_trampoline;
+	unsigned long trampoline_address;
 
 	struct kprobe_ctlblk *kcb;
 
 	struct hlist_node *tmp;
 	DECLARE_NODE_PTR_FOR_HLIST(node);
 
+	trampoline_address = (unsigned long)&swap_kretprobe_trampoline;
+
 	preempt_disable();
-	kcb = get_kprobe_ctlblk();
+	kcb = swap_get_kprobe_ctlblk();
 
 	spin_lock_irqsave(&kretprobe_lock, flags);
 
@@ -697,10 +699,10 @@ int trampoline_probe_handler(struct kprobe *p, struct pt_regs *regs)
 			/* another task is sharing our hash bucket */
 			continue;
 		if (ri->rp && ri->rp->handler) {
-			__get_cpu_var(current_kprobe) = &ri->rp->kp;
-			get_kprobe_ctlblk()->kprobe_status = KPROBE_HIT_ACTIVE;
+			__get_cpu_var(swap_current_kprobe) = &ri->rp->kp;
+			swap_get_kprobe_ctlblk()->kprobe_status = KPROBE_HIT_ACTIVE;
 			ri->rp->handler(ri, regs);
-			__get_cpu_var(current_kprobe) = NULL;
+			__get_cpu_var(swap_current_kprobe) = NULL;
 		}
 
 		orig_ret_address = (unsigned long)ri->ret_addr;
@@ -718,7 +720,7 @@ int trampoline_probe_handler(struct kprobe *p, struct pt_regs *regs)
 	if (kcb->kprobe_status == KPROBE_REENTER) {
 		restore_previous_kprobe(kcb);
 	} else {
-		reset_current_kprobe();
+		swap_reset_current_kprobe();
 	}
 
 	spin_unlock_irqrestore(&kretprobe_lock, flags);
@@ -916,7 +918,7 @@ static void inline rm_task_trampoline(struct task_struct *p, struct kretprobe_in
 
 static int swap_disarm_krp_inst(struct kretprobe_instance *ri)
 {
-	unsigned long *tramp = (unsigned long *)&kretprobe_trampoline;
+	unsigned long *tramp = (unsigned long *)&swap_kretprobe_trampoline;
 	unsigned long *sp = ri->sp;
 	unsigned long *found = NULL;
 	int retval = -ENOENT;
@@ -1024,16 +1026,14 @@ static int __init init_kprobes(void)
 		return err;
 	}
 
-	err = arch_init_kprobes();
-
-	DBPRINTF ("init_kprobes: arch_init_kprobes - %d", err);
+	err = swap_arch_init_kprobes();
 
 	return err;
 }
 
 static void __exit exit_kprobes(void)
 {
-	arch_exit_kprobes();
+	swap_arch_exit_kprobes();
 	exit_sm();
 }
 
diff --git a/kprobe/swap_kprobes.h b/kprobe/swap_kprobes.h
index aa29f085..5d6aea5f 100644
--- a/kprobe/swap_kprobes.h
+++ b/kprobe/swap_kprobes.h
@@ -217,7 +217,7 @@ struct kretprobe_instance
 };
 
 
-extern void kprobes_inc_nmissed_count (struct kprobe *p);
+extern void swap_kprobes_inc_nmissed_count(struct kprobe *p);
 
 //
 // Large value for fast but memory consuming implementation
@@ -229,14 +229,14 @@ extern void kprobes_inc_nmissed_count (struct kprobe *p);
 
 
 /* Get the kprobe at this addr (if any) - called with preemption disabled */
-struct kprobe *get_kprobe(void *addr);
+struct kprobe *swap_get_kprobe(void *addr);
 
 
 int swap_register_kprobe(struct kprobe *p);
 void swap_unregister_kprobe(struct kprobe *p);
 
-int setjmp_pre_handler (struct kprobe *, struct pt_regs *);
-int longjmp_break_handler (struct kprobe *, struct pt_regs *);
+int swap_setjmp_pre_handler(struct kprobe *, struct pt_regs *);
+int swap_longjmp_break_handler(struct kprobe *, struct pt_regs *);
 
 int swap_register_jprobe(struct jprobe *p);
 void swap_unregister_jprobe(struct jprobe *p);
@@ -267,15 +267,15 @@ int swap_disarm_urp_inst_for_task(struct task_struct *parent, struct task_struct
 int trampoline_probe_handler (struct kprobe *p, struct pt_regs *regs);
 
 
-extern DEFINE_PER_CPU (struct kprobe *, current_kprobe);
+extern DEFINE_PER_CPU(struct kprobe *, swap_current_kprobe);
 extern struct hlist_head kprobe_table[KPROBE_TABLE_SIZE];
 //extern struct hlist_head kretprobe_inst_table[KPROBE_TABLE_SIZE];
 extern atomic_t kprobe_count;
 extern unsigned long sched_addr;
 
-struct kprobe *kprobe_running (void);
-void reset_current_kprobe (void);
-struct kprobe_ctlblk *get_kprobe_ctlblk (void);
+struct kprobe *swap_kprobe_running(void);
+void swap_reset_current_kprobe(void);
+struct kprobe_ctlblk *swap_get_kprobe_ctlblk(void);
 
 void prepare_singlestep(struct kprobe *p, struct pt_regs *regs);