diff options
| author | Tim Chen <tim.c.chen@linux.intel.com> | 2014-01-23 12:25:47 +0100 |
|---|---|---|
| committer | Herbert Xu <herbert@gondor.apana.org.au> | 2014-02-25 12:45:04 +0100 |
| commit | 06e5a1f29819759392239669beb2cad27059c8ec (patch) | |
| tree | 641318660e841f02bd766ebf1bf375452c106c99 | |
| parent | crypto: caam - fix ERA retrieval function (diff) | |
| download | linux-06e5a1f29819759392239669beb2cad27059c8ec.tar.xz linux-06e5a1f29819759392239669beb2cad27059c8ec.zip | |
CRC32C: Add soft module dependency to load other accelerated crc32c modules
We added the soft module dependency of crc32c module alias
to generic crc32c module so other hardware accelerated crc32c
modules could get loaded and used before the generic version.
We also renamed the crypto/crc32c.c containing the generic
crc32c crypto computation to crypto/crc32c_generic.c according
to convention.
Signed-off-by: Tim Chen <tim.c.chen@linux.intel.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
| -rw-r--r-- | crypto/Makefile | 2 | ||||
| -rw-r--r-- | crypto/crc32c_generic.c (renamed from crypto/crc32c.c) | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/crypto/Makefile b/crypto/Makefile index b29402a7b9b5..38e64231dcd3 100644 --- a/crypto/Makefile +++ b/crypto/Makefile @@ -81,7 +81,7 @@ obj-$(CONFIG_CRYPTO_SALSA20) += salsa20_generic.o obj-$(CONFIG_CRYPTO_DEFLATE) += deflate.o obj-$(CONFIG_CRYPTO_ZLIB) += zlib.o obj-$(CONFIG_CRYPTO_MICHAEL_MIC) += michael_mic.o -obj-$(CONFIG_CRYPTO_CRC32C) += crc32c.o +obj-$(CONFIG_CRYPTO_CRC32C) += crc32c_generic.o obj-$(CONFIG_CRYPTO_CRC32) += crc32.o obj-$(CONFIG_CRYPTO_CRCT10DIF) += crct10dif_common.o crct10dif_generic.o obj-$(CONFIG_CRYPTO_AUTHENC) += authenc.o authencesn.o diff --git a/crypto/crc32c.c b/crypto/crc32c_generic.c index 06f7018c9d95..d9c7beba8e50 100644 --- a/crypto/crc32c.c +++ b/crypto/crc32c_generic.c @@ -170,3 +170,5 @@ module_exit(crc32c_mod_fini); MODULE_AUTHOR("Clay Haapala <chaapala@cisco.com>"); MODULE_DESCRIPTION("CRC32c (Castagnoli) calculations wrapper for lib/crc32c"); MODULE_LICENSE("GPL"); +MODULE_ALIAS("crc32c"); +MODULE_SOFTDEP("pre: crc32c"); |