diff options
author | Anton Vorontsov <anton.vorontsov@linaro.org> | 2012-11-14 18:48:15 -0800 |
---|---|---|
committer | Anton Vorontsov <anton.vorontsov@linaro.org> | 2012-12-12 19:50:04 -0800 |
commit | ebacfd1ece3bfa46296fc92c6f996cb5f7fc75e6 (patch) | |
tree | 5c6c59914c795e5383fc5d873e1973b851a09380 /fs/pstore | |
parent | c628937803c652132d21f383736375e2feee4bfb (diff) | |
download | linux-stable-ebacfd1ece3bfa46296fc92c6f996cb5f7fc75e6.tar.gz linux-stable-ebacfd1ece3bfa46296fc92c6f996cb5f7fc75e6.tar.bz2 linux-stable-ebacfd1ece3bfa46296fc92c6f996cb5f7fc75e6.zip |
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>
Diffstat (limited to 'fs/pstore')
-rw-r--r-- | fs/pstore/ftrace.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/fs/pstore/ftrace.c b/fs/pstore/ftrace.c index 2d57e1ac0115..43b12807a51d 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 = {}; |