diff --git a/[refs] b/[refs] index 3855a99ec1b4..f678304d9c70 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c628937803c652132d21f383736375e2feee4bfb +refs/heads/master: ebacfd1ece3bfa46296fc92c6f996cb5f7fc75e6 diff --git a/trunk/fs/pstore/ftrace.c b/trunk/fs/pstore/ftrace.c index 2d57e1ac0115..43b12807a51d 100644 --- a/trunk/fs/pstore/ftrace.c +++ b/trunk/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 = {};