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

[karo-tx-linux.git] / arch / x86 / kernel / ftrace.c

diff --git a/arch/x86/kernel/ftrace.c b/arch/x86/kernel/ftrace.c
index 8b7b0a51e742cd26defe12b535f37a865ee3c172..311bcf338f07e75a48115ef4edf3df5f748b6940 100644 (file)
--- a/arch/x86/kernel/ftrace.c
+++ b/arch/x86/kernel/ftrace.c
@@ -556,6 +556,7 @@ void ftrace_replace_code(int enable)
        run_sync();
 
        report = "updating code";
+       count = 0;
 
        for_ftrace_rec_iter(iter) {
                rec = ftrace_rec_iter_record(iter);
@@ -563,11 +564,13 @@ void ftrace_replace_code(int enable)
                ret = add_update(rec, enable);
                if (ret)
                        goto remove_breakpoints;
+               count++;
        }
 
        run_sync();
 
        report = "removing breakpoints";
+       count = 0;
 
        for_ftrace_rec_iter(iter) {
                rec = ftrace_rec_iter_record(iter);
@@ -575,6 +578,7 @@ void ftrace_replace_code(int enable)
                ret = finish_update(rec, enable);
                if (ret)
                        goto remove_breakpoints;
+               count++;
        }
 
        run_sync();