Merge remote-tracking branch 'ftrace/for-next'

[deliverable/linux.git] / arch / sh / kernel / ftrace.c

diff --git a/arch/sh/kernel/ftrace.c b/arch/sh/kernel/ftrace.c
index 95eccd49672f40ca7f5e10f998c3226581221c29..53783978162e2d1c82c1f44b349f7530d650c341 100644 (file)
--- a/arch/sh/kernel/ftrace.c
+++ b/arch/sh/kernel/ftrace.c
@@ -139,7 +139,7 @@ static void ftrace_mod_code(void)
                clear_mod_flag();
 }
 
-void ftrace_nmi_enter(void)
+void arch_ftrace_nmi_enter(void)
 {
        if (atomic_inc_return(&nmi_running) & MOD_CODE_WRITE_FLAG) {
                smp_rmb();
@@ -150,7 +150,7 @@ void ftrace_nmi_enter(void)
        smp_mb();
 }
 
-void ftrace_nmi_exit(void)
+void arch_ftrace_nmi_exit(void)
 {
        /* Finish all executions before clearing nmi_running */
        smp_mb();