From: Anton Vorontsov <anton.vorontsov@linaro.org>
Date: Thu, 15 Nov 2012 02:48:15 +0000 (-0800)
Subject: pstore/ftrace: Adjust for ftrace_ops->func prototype change
X-Git-Tag: v3.8-rc1~98^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=ebacfd1ece3bfa46296fc92c6f996cb5f7fc75e6;p=thirdparty%2Fkernel%2Flinux.git

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>
---

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