Commit 4d296c24 authored by Steven Rostedt's avatar Steven Rostedt Committed by Ingo Molnar
Browse files

ftrace: remove mcount set 



The arch dependent function ftrace_mcount_set was only used by the daemon
start up code. This patch removes it.

Signed-off-by: default avatarSteven Rostedt <srostedt@redhat.com>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent cb7be3b2

arch/arm/kernel/ftrace.c

+0 −13
Original line number Diff line number Diff line
@@ -95,19 +95,6 @@ int ftrace_update_ftrace_func(ftrace_func_t func) 
	return ret;

}



int ftrace_mcount_set(unsigned long *data)

{

	unsigned long pc, old;

	unsigned long *addr = data;

	unsigned char *new;



	pc = (unsigned long)&mcount_call;

	memcpy(&old, &mcount_call, MCOUNT_INSN_SIZE);

	new = ftrace_call_replace(pc, *addr);

	*addr = ftrace_modify_code(pc, (unsigned char *)&old, new);

	return 0;

}



/* run from kstop_machine */

int __init ftrace_dyn_arch_init(void *data)

{

arch/powerpc/kernel/ftrace.c

+0 −17
Original line number Diff line number Diff line
@@ -126,23 +126,6 @@ notrace int ftrace_update_ftrace_func(ftrace_func_t func) 
	return ret;

}



notrace int ftrace_mcount_set(unsigned long *data)

{

	unsigned long ip = (long)(&mcount_call);

	unsigned long *addr = data;

	unsigned char old[MCOUNT_INSN_SIZE], *new;



	/*

	 * Replace the mcount stub with a pointer to the

	 * ip recorder function.

	 */

	memcpy(old, &mcount_call, MCOUNT_INSN_SIZE);

	new = ftrace_call_replace(ip, *addr);

	*addr = ftrace_modify_code(ip, old, new);



	return 0;

}



int __init ftrace_dyn_arch_init(void *data)

{

	/* This is running in kstop_machine */

arch/sparc64/kernel/ftrace.c

+0 −18
Original line number Diff line number Diff line
@@ -69,24 +69,6 @@ notrace int ftrace_update_ftrace_func(ftrace_func_t func) 
	return ftrace_modify_code(ip, old, new);

}



notrace int ftrace_mcount_set(unsigned long *data)

{

	unsigned long ip = (long)(&mcount_call);

	unsigned long *addr = data;

	unsigned char old[MCOUNT_INSN_SIZE], *new;



	/*

	 * Replace the mcount stub with a pointer to the

	 * ip recorder function.

	 */

	memcpy(old, &mcount_call, MCOUNT_INSN_SIZE);

	new = ftrace_call_replace(ip, *addr);

	*addr = ftrace_modify_code(ip, old, new);



	return 0;

}





int __init ftrace_dyn_arch_init(void *data)

{

	ftrace_mcount_set(data);

arch/x86/kernel/ftrace.c

+0 −7
Original line number Diff line number Diff line
@@ -103,13 +103,6 @@ notrace int ftrace_update_ftrace_func(ftrace_func_t func) 
	return ret;

}



notrace int ftrace_mcount_set(unsigned long *data)

{

	/* mcount is initialized as a nop */

	*data = 0;

	return 0;

}



int __init ftrace_dyn_arch_init(void *data)

{

	extern const unsigned char ftrace_test_p6nop[];

include/linux/ftrace.h

+0 −1
Original line number Diff line number Diff line
@@ -71,7 +71,6 @@ extern int ftrace_ip_converted(unsigned long ip); 
extern unsigned char *ftrace_nop_replace(void);

extern unsigned char *ftrace_call_replace(unsigned long ip, unsigned long addr);

extern int ftrace_dyn_arch_init(void *data);

extern int ftrace_mcount_set(unsigned long *data);

extern int ftrace_update_ftrace_func(ftrace_func_t func);

extern void ftrace_caller(void);

extern void ftrace_call(void);