From e1383133704b923d35d65ed0b566d94f9d98f81e Mon Sep 17 00:00:00 2001
From: Anton Vorontsov <anton.vorontsov@linaro.org>
Date: Mon, 9 Jul 2012 17:03:20 -0700
Subject: [PATCH] --- yaml --- r: 318014 b: refs/heads/master c:
 c1743cbc8d20d208bb1d2b10598204f2d89b144c h: refs/heads/master v: v3

---
 [refs]                           |  2 +-
 trunk/fs/pstore/ram_core.c       | 10 ++++------
 trunk/include/linux/pstore_ram.h |  1 -
 3 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/[refs] b/[refs]
index a0e01049f061..2027488f1590 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5ca5d4e61d0cac15f36160ab48425c6e43bf2e2f
+refs/heads/master: c1743cbc8d20d208bb1d2b10598204f2d89b144c
diff --git a/trunk/fs/pstore/ram_core.c b/trunk/fs/pstore/ram_core.c
index 7e5a2a9154ca..4dabbb8e4270 100644
--- a/trunk/fs/pstore/ram_core.c
+++ b/trunk/fs/pstore/ram_core.c
@@ -114,7 +114,7 @@ static void notrace persistent_ram_update_ecc(struct persistent_ram_zone *prz,
 	int ecc_size = prz->ecc_size;
 	int size = prz->ecc_block_size;
 
-	if (!prz->ecc)
+	if (!prz->ecc_size)
 		return;
 
 	block = buffer->data + (start & ~(ecc_block_size - 1));
@@ -133,7 +133,7 @@ static void persistent_ram_update_header_ecc(struct persistent_ram_zone *prz)
 {
 	struct persistent_ram_buffer *buffer = prz->buffer;
 
-	if (!prz->ecc)
+	if (!prz->ecc_size)
 		return;
 
 	persistent_ram_encode_rs8(prz, (uint8_t *)buffer, sizeof(*buffer),
@@ -146,7 +146,7 @@ static void persistent_ram_ecc_old(struct persistent_ram_zone *prz)
 	uint8_t *block;
 	uint8_t *par;
 
-	if (!prz->ecc)
+	if (!prz->ecc_size)
 		return;
 
 	block = buffer->data;
@@ -181,7 +181,7 @@ static int persistent_ram_init_ecc(struct persistent_ram_zone *prz,
 	int ecc_symsize = 8;
 	int ecc_poly = 0x11d;
 
-	if (!prz->ecc)
+	if (!ecc_size)
 		return 0;
 
 	prz->ecc_block_size = 128;
@@ -395,8 +395,6 @@ static int __devinit persistent_ram_post_init(struct persistent_ram_zone *prz,
 {
 	int ret;
 
-	prz->ecc = ecc_size;
-
 	ret = persistent_ram_init_ecc(prz, ecc_size);
 	if (ret)
 		return ret;
diff --git a/trunk/include/linux/pstore_ram.h b/trunk/include/linux/pstore_ram.h
index 94b79f173365..dcf805f56bc6 100644
--- a/trunk/include/linux/pstore_ram.h
+++ b/trunk/include/linux/pstore_ram.h
@@ -33,7 +33,6 @@ struct persistent_ram_zone {
 	size_t buffer_size;
 
 	/* ECC correction */
-	bool ecc;
 	char *par_buffer;
 	char *par_header;
 	struct rs_control *rs_decoder;