From 3dfd0b171d55a6552568f5c5e469e08916caf248 Mon Sep 17 00:00:00 2001
From: Joe Mario <jmario@redhat.com>
Date: Thu, 4 Oct 2012 17:12:15 -0700
Subject: [PATCH] --- yaml --- r: 330055 b: refs/heads/master c:
 8f243af42adef5f589b8e39656284ca9c9374e44 h: refs/heads/master i:   330053:
 d4818017a987aaf83d71ad1d9be70ff4230477a5   330051:
 912fb2795bcf890946dc0859ad4485a9ca334cdf   330047:
 5ad8e4ba8fc355503359ba6c70b07c2e38da4bc8 v: v3

---
 [refs]                     | 2 +-
 trunk/lib/crc32.c          | 9 ++++++---
 trunk/lib/gen_crc32table.c | 6 +++---
 3 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/[refs] b/[refs]
index ee419dcbb5a5..6ba470696786 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c7fd5bc77e9dc8da74bf833d9312076a86d2823e
+refs/heads/master: 8f243af42adef5f589b8e39656284ca9c9374e44
diff --git a/trunk/lib/crc32.c b/trunk/lib/crc32.c
index 61774b8db4de..072fbd8234d5 100644
--- a/trunk/lib/crc32.c
+++ b/trunk/lib/crc32.c
@@ -188,11 +188,13 @@ u32 __pure __crc32c_le(u32 crc, unsigned char const *p, size_t len)
 #else
 u32 __pure crc32_le(u32 crc, unsigned char const *p, size_t len)
 {
-	return crc32_le_generic(crc, p, len, crc32table_le, CRCPOLY_LE);
+	return crc32_le_generic(crc, p, len,
+			(const u32 (*)[256])crc32table_le, CRCPOLY_LE);
 }
 u32 __pure __crc32c_le(u32 crc, unsigned char const *p, size_t len)
 {
-	return crc32_le_generic(crc, p, len, crc32ctable_le, CRC32C_POLY_LE);
+	return crc32_le_generic(crc, p, len,
+			(const u32 (*)[256])crc32ctable_le, CRC32C_POLY_LE);
 }
 #endif
 EXPORT_SYMBOL(crc32_le);
@@ -253,7 +255,8 @@ u32 __pure crc32_be(u32 crc, unsigned char const *p, size_t len)
 #else
 u32 __pure crc32_be(u32 crc, unsigned char const *p, size_t len)
 {
-	return crc32_be_generic(crc, p, len, crc32table_be, CRCPOLY_BE);
+	return crc32_be_generic(crc, p, len,
+			(const u32 (*)[256])crc32table_be, CRCPOLY_BE);
 }
 #endif
 EXPORT_SYMBOL(crc32_be);
diff --git a/trunk/lib/gen_crc32table.c b/trunk/lib/gen_crc32table.c
index 8f8d5439e2d9..71fcfcd96410 100644
--- a/trunk/lib/gen_crc32table.c
+++ b/trunk/lib/gen_crc32table.c
@@ -109,7 +109,7 @@ int main(int argc, char** argv)
 
 	if (CRC_LE_BITS > 1) {
 		crc32init_le();
-		printf("static const u32 __cacheline_aligned "
+		printf("static u32 __cacheline_aligned "
 		       "crc32table_le[%d][%d] = {",
 		       LE_TABLE_ROWS, LE_TABLE_SIZE);
 		output_table(crc32table_le, LE_TABLE_ROWS,
@@ -119,7 +119,7 @@ int main(int argc, char** argv)
 
 	if (CRC_BE_BITS > 1) {
 		crc32init_be();
-		printf("static const u32 __cacheline_aligned "
+		printf("static u32 __cacheline_aligned "
 		       "crc32table_be[%d][%d] = {",
 		       BE_TABLE_ROWS, BE_TABLE_SIZE);
 		output_table(crc32table_be, LE_TABLE_ROWS,
@@ -128,7 +128,7 @@ int main(int argc, char** argv)
 	}
 	if (CRC_LE_BITS > 1) {
 		crc32cinit_le();
-		printf("static const u32 __cacheline_aligned "
+		printf("static u32 __cacheline_aligned "
 		       "crc32ctable_le[%d][%d] = {",
 		       LE_TABLE_ROWS, LE_TABLE_SIZE);
 		output_table(crc32ctable_le, LE_TABLE_ROWS,