Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf

[~andy/linux] / arch / s390 / kernel / ftrace.c

diff --git a/arch/s390/kernel/ftrace.c b/arch/s390/kernel/ftrace.c
index e3043aef87a96d17d62defc3c14a828625668507..1014ad5f7693eda79c3caa4ad8b7e8b5edb5f3fc 100644 (file)
--- a/arch/s390/kernel/ftrace.c
+++ b/arch/s390/kernel/ftrace.c
@@ -15,6 +15,7 @@
 #include <linux/kprobes.h>
 #include <trace/syscall.h>
 #include <asm/asm-offsets.h>
+#include "entry.h"
 
 #ifdef CONFIG_DYNAMIC_FTRACE
 
@@ -177,7 +178,7 @@ int ftrace_enable_ftrace_graph_caller(void)
 
        offset = ((void *) prepare_ftrace_return -
                  (void *) ftrace_graph_caller) / 2;
-       return probe_kernel_write(ftrace_graph_caller + 2,
+       return probe_kernel_write((void *) ftrace_graph_caller + 2,
                                  &offset, sizeof(offset));
 }
 
@@ -185,7 +186,7 @@ int ftrace_disable_ftrace_graph_caller(void)
 {
        static unsigned short offset = 0x0002;
 
-       return probe_kernel_write(ftrace_graph_caller + 2,
+       return probe_kernel_write((void *) ftrace_graph_caller + 2,
                                  &offset, sizeof(offset));
 }