ftrace: Have the callbacks receive a struct ftrace_regs instead of pt_regs

[sfrench/cifs-2.6.git] / fs / pstore / ftrace.c

diff --git a/fs/pstore/ftrace.c b/fs/pstore/ftrace.c
index 5c045070129390aed6776c8f0272f8781592b7b0..5939595f0115c6ba33393a263615fcf47f7bccfc 100644 (file)
--- a/fs/pstore/ftrace.c
+++ b/fs/pstore/ftrace.c
@@ -26,8 +26,9 @@ static u64 pstore_ftrace_stamp;
 static void notrace pstore_ftrace_call(unsigned long ip,
                                       unsigned long parent_ip,
                                       struct ftrace_ops *op,
-                                      struct pt_regs *regs)
+                                      struct ftrace_regs *fregs)
 {
+       int bit;
        unsigned long flags;
        struct pstore_ftrace_record rec = {};
        struct pstore_record record = {
@@ -40,6 +41,10 @@ static void notrace pstore_ftrace_call(unsigned long ip,
        if (unlikely(oops_in_progress))
                return;
 
+       bit = ftrace_test_recursion_trylock(ip, parent_ip);
+       if (bit < 0)
+               return;
+
        local_irq_save(flags);
 
        rec.ip = ip;
@@ -49,6 +54,7 @@ static void notrace pstore_ftrace_call(unsigned long ip,
        psinfo->write(&record);
 
        local_irq_restore(flags);
+       ftrace_test_recursion_unlock(bit);
 }
 
 static struct ftrace_ops pstore_ftrace_ops __read_mostly = {