From 0150243f2b53a23f8406a9ae2fe77582013bfa3d Mon Sep 17 00:00:00 2001
From: Anton Vorontsov <anton.vorontsov@linaro.org>
Date: Wed, 14 Nov 2012 18:48:15 -0800
Subject: [PATCH] --- yaml --- r: 344449 b: refs/heads/master c:
 ebacfd1ece3bfa46296fc92c6f996cb5f7fc75e6 h: refs/heads/master i:   344447:
 a9e92ac487ba9577194bb86beaa28c3823505a61 v: v3

---
 [refs]                   | 2 +-
 trunk/fs/pstore/ftrace.c | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

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 = {};