3 files changed, 16 insertions, 11 deletions

diff --git a/fs/pstore/ram.c b/fs/pstore/ram.c
index 1dd108e0cc60..0b311bc18916 100644
--- a/fs/pstore/ram.c
+++ b/fs/pstore/ram.c
@@ -25,6 +25,7 @@
 #include <linux/kernel.h>
 #include <linux/err.h>
 #include <linux/module.h>
+#include <linux/version.h>
 #include <linux/pstore.h>
 #include <linux/time.h>
 #include <linux/io.h>
@@ -309,7 +310,7 @@ static int ramoops_init_przs(struct device *dev, struct ramoops_context *cxt,
         for (i = 0; i < cxt->max_dump_cnt; i++) {
                 size_t sz = cxt->record_size;
 
-                cxt->przs[i] = persistent_ram_new(*paddr, sz, cxt->ecc_size);
+                cxt->przs[i] = persistent_ram_new(*paddr, sz, 0, cxt->ecc_size);
                 if (IS_ERR(cxt->przs[i])) {
                         err = PTR_ERR(cxt->przs[i]);
                         dev_err(dev, "failed to request mem region (0x%zx@0x%llx): %d\n",
@@ -327,7 +328,7 @@ fail_prz:
 
 static int ramoops_init_prz(struct device *dev, struct ramoops_context *cxt,
                             struct persistent_ram_zone **prz,
-                            phys_addr_t *paddr, size_t sz)
+                            phys_addr_t *paddr, size_t sz, u32 sig)
 {
         if (!sz)
                 return 0;
@@ -335,7 +336,7 @@ static int ramoops_init_prz(struct device *dev, struct ramoops_context *cxt,
         if (*paddr + sz > *paddr + cxt->size)
                 return -ENOMEM;
 
-        *prz = persistent_ram_new(*paddr, sz, cxt->ecc_size);
+        *prz = persistent_ram_new(*paddr, sz, sig, cxt->ecc_size);
         if (IS_ERR(*prz)) {
                 int err = PTR_ERR(*prz);
 
@@ -394,11 +395,13 @@ static int __devinit ramoops_probe(struct platform_device *pdev)
         if (err)
                 goto fail_out;
 
-        err = ramoops_init_prz(dev, cxt, &cxt->cprz, &paddr, cxt->console_size);
+        err = ramoops_init_prz(dev, cxt, &cxt->cprz, &paddr,
+                               cxt->console_size, 0);
         if (err)
                 goto fail_init_cprz;
 
-        err = ramoops_init_prz(dev, cxt, &cxt->fprz, &paddr, cxt->ftrace_size);
+        err = ramoops_init_prz(dev, cxt, &cxt->fprz, &paddr, cxt->ftrace_size,
+                               LINUX_VERSION_CODE);
         if (err)
                 goto fail_init_fprz;
 
diff --git a/fs/pstore/ram_core.c b/fs/pstore/ram_core.c
index 4dabbb8e4270..eecd2a8a84dd 100644
--- a/fs/pstore/ram_core.c
+++ b/fs/pstore/ram_core.c
@@ -391,7 +391,7 @@ static int persistent_ram_buffer_map(phys_addr_t start, phys_addr_t size,
 }
 
 static int __devinit persistent_ram_post_init(struct persistent_ram_zone *prz,
-                                              int ecc_size)
+                                              u32 sig, int ecc_size)
 {
         int ret;
 
@@ -399,7 +399,9 @@ static int __devinit persistent_ram_post_init(struct persistent_ram_zone *prz,
         if (ret)
                 return ret;
 
-        if (prz->buffer->sig == PERSISTENT_RAM_SIG) {
+        sig ^= PERSISTENT_RAM_SIG;
+
+        if (prz->buffer->sig == sig) {
                 if (buffer_size(prz) > prz->buffer_size ||
                     buffer_start(prz) > buffer_size(prz))
                         pr_info("persistent_ram: found existing invalid buffer,"
@@ -417,7 +419,7 @@ static int __devinit persistent_ram_post_init(struct persistent_ram_zone *prz,
                         " (sig = 0x%08x)\n", prz->buffer->sig);
         }
 
-        prz->buffer->sig = PERSISTENT_RAM_SIG;
+        prz->buffer->sig = sig;
         persistent_ram_zap(prz);
 
         return 0;
@@ -442,7 +444,7 @@ void persistent_ram_free(struct persistent_ram_zone *prz)
 }
 
 struct persistent_ram_zone * __devinit persistent_ram_new(phys_addr_t start,
-                                                          size_t size,
+                                                          size_t size, u32 sig,
                                                           int ecc_size)
 {
         struct persistent_ram_zone *prz;
@@ -458,7 +460,7 @@ struct persistent_ram_zone * __devinit persistent_ram_new(phys_addr_t start,
         if (ret)
                 goto err;
 
-        ret = persistent_ram_post_init(prz, ecc_size);
+        ret = persistent_ram_post_init(prz, sig, ecc_size);
         if (ret)
                 goto err;
 
diff --git a/include/linux/pstore_ram.h b/include/linux/pstore_ram.h
index ba2b211aaa81..098d2a838296 100644
--- a/include/linux/pstore_ram.h
+++ b/include/linux/pstore_ram.h
@@ -47,7 +47,7 @@ struct persistent_ram_zone {
 };
 
 struct persistent_ram_zone * __devinit persistent_ram_new(phys_addr_t start,
-                                                          size_t size,
+                                                          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);