From 49ff48594f8cdee7690510ae3aeedb20285db53d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Arve=20Hj=C3=B8nnev=C3=A5g?= <arve@android.com>
Date: Wed, 5 Dec 2012 21:19:51 -0800
Subject: [PATCH] --- yaml --- r: 371685 b: refs/heads/master c:
 bd08ec33b5c23833581e5a36b2a69ccae6b39a28 h: refs/heads/master i:   371683:
 d1b330d2b24a8f01d7866c8f6f73f5be9867bd27 v: v3

---
 [refs]                     |  2 +-
 trunk/fs/pstore/ram.c      | 12 ++++++++++--
 trunk/fs/pstore/ram_core.c |  3 +++
 3 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 5436739906e2..fefee9209025 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c31ad081e8734aab3fb45d2f32e9969994dd076e
+refs/heads/master: bd08ec33b5c23833581e5a36b2a69ccae6b39a28
diff --git a/trunk/fs/pstore/ram.c b/trunk/fs/pstore/ram.c
index a5ee252c264e..32cbd7c8a90c 100644
--- a/trunk/fs/pstore/ram.c
+++ b/trunk/fs/pstore/ram.c
@@ -136,6 +136,7 @@ static ssize_t ramoops_pstore_read(u64 *id, enum pstore_type_id *type,
 				   char **buf, struct pstore_info *psi)
 {
 	ssize_t size;
+	ssize_t ecc_notice_size;
 	struct ramoops_context *cxt = psi->data;
 	struct persistent_ram_zone *prz;
 
@@ -156,11 +157,18 @@ static ssize_t ramoops_pstore_read(u64 *id, enum pstore_type_id *type,
 	time->tv_nsec = 0;
 
 	size = persistent_ram_old_size(prz);
-	*buf = kmemdup(persistent_ram_old(prz), size, GFP_KERNEL);
+
+	/* ECC correction notice */
+	ecc_notice_size = persistent_ram_ecc_string(prz, NULL, 0);
+
+	*buf = kmalloc(size + ecc_notice_size + 1, GFP_KERNEL);
 	if (*buf == NULL)
 		return -ENOMEM;
 
-	return size;
+	memcpy(*buf, persistent_ram_old(prz), size);
+	persistent_ram_ecc_string(prz, *buf + size, ecc_notice_size + 1);
+
+	return size + ecc_notice_size;
 }
 
 static size_t ramoops_write_kmsg_hdr(struct persistent_ram_zone *prz)
diff --git a/trunk/fs/pstore/ram_core.c b/trunk/fs/pstore/ram_core.c
index c6f641c10179..59337326e288 100644
--- a/trunk/fs/pstore/ram_core.c
+++ b/trunk/fs/pstore/ram_core.c
@@ -235,6 +235,9 @@ ssize_t persistent_ram_ecc_string(struct persistent_ram_zone *prz,
 {
 	ssize_t ret;
 
+	if (!prz->ecc_info.ecc_size)
+		return 0;
+
 	if (prz->corrected_bytes || prz->bad_blocks)
 		ret = snprintf(str, len, ""
 			"\n%d Corrected bytes, %d unrecoverable blocks\n",