---

yaml --- r: 344449 b: refs/heads/master c: ebacfd1 h: refs/heads/master i: 344447: a9e92ac v: v3
git-mirror · Dec 13, 2012 · 0150243 · 0150243
1 parent 8bec94d
commit 0150243
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git 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
@@ -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 = {};