The patch titled Subject: crc32: Don't reference unnecessary crc32 tables in single-bit mode has been removed from the -mm tree. Its filename was crc32-bolt-on-crc32c-dont-reference-unnecessary-crc32-tables-in-single-bit-mode.patch This patch was dropped because it was folded into crc32-bolt-on-crc32c.patch The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/ ------------------------------------------------------ From: "Darrick J. Wong" <djwong@xxxxxxxxxx> Subject: crc32: Don't reference unnecessary crc32 tables in single-bit mode When compiling with single bit mode (CRC32_BIT=y) we shouldn't reference the crc32 tables, since they aren't built in single-bit mode. Many thanks to Randy Dunlap for finding this bug: http://marc.info/?l=linux-kernel&m=132709702422141&w=2 Signed-off-by: Darrick J. Wong <djwong@xxxxxxxxxx> Cc: Herbert Xu <herbert@xxxxxxxxxxxxxxxxxxx> Cc: Bob Pearson <rpearson@xxxxxxxxxxxxxxxxxxxxx> Reported-by: Randy Dunlap <rdunlap@xxxxxxxxxxxx> Acked-by: Randy Dunlap <rdunlap@xxxxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- lib/crc32.c | 21 +++++++++++++++++++-- 1 file changed, 19 insertions(+), 2 deletions(-) diff -puN lib/crc32.c~crc32-bolt-on-crc32c-dont-reference-unnecessary-crc32-tables-in-single-bit-mode lib/crc32.c --- a/lib/crc32.c~crc32-bolt-on-crc32c-dont-reference-unnecessary-crc32-tables-in-single-bit-mode +++ a/lib/crc32.c @@ -174,16 +174,26 @@ static inline u32 __pure crc32_le_generi return crc; } +#if CRC_LE_BITS == 1 +u32 __pure crc32_le(u32 crc, unsigned char const *p, size_t len) +{ + return crc32_le_generic(crc, p, len, NULL, CRCPOLY_LE); +} +u32 __pure __crc32c_le(u32 crc, unsigned char const *p, size_t len) +{ + return crc32_le_generic(crc, p, len, NULL, CRC32C_POLY_LE); +} +#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); } -EXPORT_SYMBOL(crc32_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); } +#endif +EXPORT_SYMBOL(crc32_le); EXPORT_SYMBOL(__crc32c_le); /** @@ -233,10 +243,17 @@ static inline u32 __pure crc32_be_generi return crc; } +#if CRC_LE_BITS == 1 +u32 __pure crc32_be(u32 crc, unsigned char const *p, size_t len) +{ + return crc32_be_generic(crc, p, len, NULL, CRCPOLY_BE); +} +#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); } +#endif EXPORT_SYMBOL(crc32_be); #ifdef CONFIG_CRC32_SELFTEST _ Patches currently in -mm which might be from djwong@xxxxxxxxxx are origin.patch crc32-removed-two-instances-of-trailing-whitespaces.patch crc32-move-long-comment-about-crc32-fundamentals-to-documentation.patch crc32-simplify-unit-test-code.patch crc32-miscellaneous-cleanups.patch crc32-fix-mixing-of-endian-specific-types.patch crc32-make-crc__bits-definition-correspond-to-actual-bit-counts.patch crc32-add-slice-by-8-algorithm-to-existing-code.patch crc32-optimize-loop-counter-for-x86.patch crc32-add-note-about-this-patchset-to-crc32c.patch crc32-bolt-on-crc32c.patch crypto-crc32c-should-use-library-implementation.patch crc32-add-self-test-code-for-crc32c.patch crc32-select-an-algorithm-via-kconfig.patch -- To unsubscribe from this list: send the line "unsubscribe mm-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html