commit ebacfd1ece3bfa46296fc92c6f996cb5f7fc75e6
author Anton Vorontsov <anton.vorontsov@linaro.org> Wed Nov 14 18:48:15 2012 -0800
committer Anton Vorontsov <anton.vorontsov@linaro.org> Wed Dec 12 19:50:04 2012 -0800
tree 5c6c59914c795e5383fc5d873e1973b851a09380
parent c628937803c652132d21f383736375e2feee4bfb

pstore/ftrace: Adjust for ftrace_ops->func prototype change

This commit fixes the following warning:

 fs/pstore/ftrace.c:51:2: warning: initialization from incompatible
 pointer type [enabled by default]
 fs/pstore/ftrace.c:51:2: warning: (near initialization for
 ‘pstore_ftrace_ops.func’) [enabled by defaula

Signed-off-by: Anton Vorontsov <anton.vorontsov@linaro.org>

fs/pstore/ftrace.c

diff --git a/fs/pstore/ftrace.c b/fs/pstore/ftrace.c
index 2d57e1a..43b1280 100644
--- 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 = {};