Merge branch 'delete-xt-disk' of git://git.kernel.org/pub/scm/linux/kernel/git/paulg...

[firefly-linux-kernel-4.4.55.git] / fs / pstore / ftrace.c

diff --git a/fs/pstore/ftrace.c b/fs/pstore/ftrace.c
index 2d57e1ac0115ae12357e108c22ef8d783637ab87..43b12807a51d71ad39c41e55e8ac83473e5ac7a6 100644 (file)
--- a/fs/pstore/ftrace.c
+++ b/fs/pstore/ftrace.c
@@ -28,7 +28,9 @@
 #include "internal.h"
 
 static void notrace pstore_ftrace_call(unsigned long ip,
-                                      unsigned long parent_ip)
+                                      unsigned long parent_ip,
+                                      struct ftrace_ops *op,
+                                      struct pt_regs *regs)
 {
        unsigned long flags;
        struct pstore_ftrace_record rec = {};