1 files changed, 7 insertions, 5 deletions

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;