Merge tag 'stable/for-linus-3.6-rc3-tag' of git://git.kernel.org/pub/scm/linux/kernel...

[firefly-linux-kernel-4.4.55.git] / include / linux / pstore_ram.h

diff --git a/include/linux/pstore_ram.h b/include/linux/pstore_ram.h
index 3b823d49a85a7fa87f5d8cae9dbde5c4067bb103..098d2a83829618e585cd4412920c6d803af6fa21 100644 (file)
--- a/include/linux/pstore_ram.h
+++ b/include/linux/pstore_ram.h
@@ -24,21 +24,7 @@
 #include <linux/init.h>
 
 struct persistent_ram_buffer;
-
-struct persistent_ram_descriptor {
-       const char      *name;
-       phys_addr_t     size;
-};
-
-struct persistent_ram {
-       phys_addr_t     start;
-       phys_addr_t     size;
-
-       int                                     num_descs;
-       struct persistent_ram_descriptor        *descs;
-
-       struct list_head node;
-};
+struct rs_control;
 
 struct persistent_ram_zone {
        phys_addr_t paddr;
@@ -48,7 +34,6 @@ struct persistent_ram_zone {
        size_t buffer_size;
 
        /* ECC correction */
-       bool ecc;
        char *par_buffer;
        char *par_header;
        struct rs_control *rs_decoder;
@@ -56,22 +41,16 @@ struct persistent_ram_zone {
        int bad_blocks;
        int ecc_block_size;
        int ecc_size;
-       int ecc_symsize;
-       int ecc_poly;
 
        char *old_log;
        size_t old_log_size;
 };
 
-int persistent_ram_early_init(struct persistent_ram *ram);
-
-struct persistent_ram_zone * __init persistent_ram_new(phys_addr_t start,
-                                                      size_t size,
-                                                      bool ecc);
+struct persistent_ram_zone * __devinit persistent_ram_new(phys_addr_t start,
+                                                         size_t size, u32 sig,
+                                                         int ecc_size);
 void persistent_ram_free(struct persistent_ram_zone *prz);
 void persistent_ram_zap(struct persistent_ram_zone *prz);
-struct persistent_ram_zone *persistent_ram_init_ringbuffer(struct device *dev,
-               bool ecc);
 
 int persistent_ram_write(struct persistent_ram_zone *prz, const void *s,
        unsigned int count);
@@ -93,8 +72,10 @@ struct ramoops_platform_data {
        unsigned long   mem_size;
        unsigned long   mem_address;
        unsigned long   record_size;
+       unsigned long   console_size;
+       unsigned long   ftrace_size;
        int             dump_oops;
-       bool            ecc;
+       int             ecc_size;
 };
 
 #endif