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: Steven Rostedt <srostedt@redhat.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>

diff --git a/arch/arm/kernel/ftrace.c b/arch/arm/kernel/ftrace.c
index 76d50e6091bc5694d19a6d9fab0b59284cd311fd..6c90479e897487dc033de1db6b61ad80377050ca 100644 (file)
--- a/arch/arm/kernel/ftrace.c
+++ b/arch/arm/kernel/ftrace.c
@@ -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)
 {

diff --git a/arch/powerpc/kernel/ftrace.c b/arch/powerpc/kernel/ftrace.c
index 3855ceb937b0d23ae3b5d39bf271aabadea5eb79..6b75522e8b3404cd68b5149ac29cbd076d66bde6 100644 (file)
--- a/arch/powerpc/kernel/ftrace.c
+++ b/arch/powerpc/kernel/ftrace.c
@@ -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 */

diff --git a/arch/sparc64/kernel/ftrace.c b/arch/sparc64/kernel/ftrace.c
index 4298d0aee7137caf896c6e20605620b1b58b0124..447942041a7c39f2b8db7357a5c32361933a24c8 100644 (file)
--- a/arch/sparc64/kernel/ftrace.c
+++ b/arch/sparc64/kernel/ftrace.c
@@ -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);

diff --git a/arch/x86/kernel/ftrace.c b/arch/x86/kernel/ftrace.c
index da4fb0deecf7cf8aafe6426f6c6976d1dfd94846..b399eed23538600a43ec2328822a8c0cac1fbaad 100644 (file)
--- a/arch/x86/kernel/ftrace.c
+++ b/arch/x86/kernel/ftrace.c
@@ -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[];

diff --git a/include/linux/ftrace.h b/include/linux/ftrace.h
index ac58e94668b7cb7fbd47f5013992c3ddc040fb0a..1c4835f86911bc5457ae81b383724fc046c88cec 100644 (file)
--- a/include/linux/ftrace.h
+++ b/include/linux/ftrace.h
@@ -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);

diff --git a/kernel/trace/ftrace.c b/kernel/trace/ftrace.c
index e758cab0836fec0861a9b3e07254687e1b9b3dbc..226fd9132d536007656ae9cecb96732ea2c3c40c 100644 (file)
--- a/kernel/trace/ftrace.c
+++ b/kernel/trace/ftrace.c
@@ -620,7 +620,6 @@ static int ftrace_update_code(void *ignore);
 
 static int __ftrace_modify_code(void *data)
 {
-       unsigned long addr;
        int *command = data;
 
        if (*command & FTRACE_ENABLE_CALLS) {
@@ -639,14 +638,6 @@ static int __ftrace_modify_code(void *data)
        if (*command & FTRACE_UPDATE_TRACE_FUNC)
                ftrace_update_ftrace_func(ftrace_trace_function);
 
-       if (*command & FTRACE_ENABLE_MCOUNT) {
-               addr = (unsigned long)ftrace_record_ip;
-               ftrace_mcount_set(&addr);
-       } else if (*command & FTRACE_DISABLE_MCOUNT) {
-               addr = (unsigned long)ftrace_stub;
-               ftrace_mcount_set(&addr);
-       }
-
        return 0;
 }