pstore/ftrace: Provide ftrace log merging routine

[linux-2.6-microblaze.git] / fs / pstore / ram.c

diff --git a/fs/pstore/ram.c b/fs/pstore/ram.c
index dba9b4e..26a1f50 100644 (file)
--- a/fs/pstore/ram.c
+++ b/fs/pstore/ram.c
@@ -21,6 +21,7 @@
 #include <linux/pstore_ram.h>
 #include <linux/of.h>
 #include <linux/of_address.h>
+#include "internal.h"
 
 #define RAMOOPS_KERNMSG_HDR "===="
 #define MIN_MEM_SIZE 4096UL
@@ -168,59 +169,6 @@ static bool prz_ok(struct persistent_ram_zone *prz)
                           persistent_ram_ecc_string(prz, NULL, 0));
 }
 
-static
-ssize_t ftrace_log_combine(char **dest_log, size_t *dest_log_size,
-                          const char *src_log, size_t src_log_size)
-{
-       size_t dest_size, src_size, total, dest_off, src_off;
-       size_t dest_idx = 0, src_idx = 0, merged_idx = 0;
-       void *merged_buf;
-       struct pstore_ftrace_record *drec, *srec, *mrec;
-       size_t record_size = sizeof(struct pstore_ftrace_record);
-
-       dest_off = *dest_log_size % record_size;
-       dest_size = *dest_log_size - dest_off;
-
-       src_off = src_log_size % record_size;
-       src_size = src_log_size - src_off;
-
-       total = dest_size + src_size;
-       merged_buf = kmalloc(total, GFP_KERNEL);
-       if (!merged_buf)
-               return -ENOMEM;
-
-       drec = (struct pstore_ftrace_record *)(*dest_log + dest_off);
-       srec = (struct pstore_ftrace_record *)(src_log + src_off);
-       mrec = (struct pstore_ftrace_record *)(merged_buf);
-
-       while (dest_size > 0 && src_size > 0) {
-               if (pstore_ftrace_read_timestamp(&drec[dest_idx]) <
-                   pstore_ftrace_read_timestamp(&srec[src_idx])) {
-                       mrec[merged_idx++] = drec[dest_idx++];
-                       dest_size -= record_size;
-               } else {
-                       mrec[merged_idx++] = srec[src_idx++];
-                       src_size -= record_size;
-               }
-       }
-
-       while (dest_size > 0) {
-               mrec[merged_idx++] = drec[dest_idx++];
-               dest_size -= record_size;
-       }
-
-       while (src_size > 0) {
-               mrec[merged_idx++] = srec[src_idx++];
-               src_size -= record_size;
-       }
-
-       kfree(*dest_log);
-       *dest_log = merged_buf;
-       *dest_log_size = total;
-
-       return 0;
-}
-
 static ssize_t ramoops_pstore_read(struct pstore_record *record)
 {
        ssize_t size = 0;
@@ -293,7 +241,8 @@ static ssize_t ramoops_pstore_read(struct pstore_record *record)
                                                prz_next->corrected_bytes;
                                tmp_prz->bad_blocks += prz_next->bad_blocks;
 
-                               size = ftrace_log_combine(&tmp_prz->old_log,
+                               size = pstore_ftrace_combine_log(
+                                               &tmp_prz->old_log,
                                                &tmp_prz->old_log_size,
                                                prz_next->old_log,
                                                prz_next->old_log_size);