diff options
| -rw-r--r-- | arch/x86/crypto/Makefile | 2 | ||||
| -rw-r--r-- | crypto/Kconfig | 10 |
2 files changed, 1 insertions, 11 deletions
diff --git a/arch/x86/crypto/Makefile b/arch/x86/crypto/Makefile index 63947a8f9f0f..ca96761a22e4 100644 --- a/arch/x86/crypto/Makefile +++ b/arch/x86/crypto/Makefile | |||
| @@ -52,5 +52,5 @@ aesni-intel-y := aesni-intel_asm.o aesni-intel_glue.o fpu.o | |||
| 52 | ghash-clmulni-intel-y := ghash-clmulni-intel_asm.o ghash-clmulni-intel_glue.o | 52 | ghash-clmulni-intel-y := ghash-clmulni-intel_asm.o ghash-clmulni-intel_glue.o |
| 53 | sha1-ssse3-y := sha1_ssse3_asm.o sha1_ssse3_glue.o | 53 | sha1-ssse3-y := sha1_ssse3_asm.o sha1_ssse3_glue.o |
| 54 | crc32c-intel-y := crc32c-intel_glue.o | 54 | crc32c-intel-y := crc32c-intel_glue.o |
| 55 | crc32c-intel-$(CONFIG_CRYPTO_CRC32C_X86_64) += crc32c-pcl-intel-asm_64.o | 55 | crc32c-intel-$(CONFIG_64BIT) += crc32c-pcl-intel-asm_64.o |
| 56 | crc32-pclmul-y := crc32-pclmul_asm.o crc32-pclmul_glue.o | 56 | crc32-pclmul-y := crc32-pclmul_asm.o crc32-pclmul_glue.o |
diff --git a/crypto/Kconfig b/crypto/Kconfig index 05c0ce52f96d..aed52b2e4a55 100644 --- a/crypto/Kconfig +++ b/crypto/Kconfig | |||
| @@ -322,19 +322,9 @@ config CRYPTO_CRC32C | |||
| 322 | by iSCSI for header and data digests and by others. | 322 | by iSCSI for header and data digests and by others. |
| 323 | See Castagnoli93. Module will be crc32c. | 323 | See Castagnoli93. Module will be crc32c. |
| 324 | 324 | ||
| 325 | config CRYPTO_CRC32C_X86_64 | ||
| 326 | bool | ||
| 327 | depends on X86 && 64BIT | ||
| 328 | select CRYPTO_HASH | ||
| 329 | help | ||
| 330 | In Intel processor with SSE4.2 supported, the processor will | ||
| 331 | support CRC32C calculation using hardware accelerated CRC32 | ||
| 332 | instruction optimized with PCLMULQDQ instruction when available. | ||
| 333 | |||
| 334 | config CRYPTO_CRC32C_INTEL | 325 | config CRYPTO_CRC32C_INTEL |
| 335 | tristate "CRC32c INTEL hardware acceleration" | 326 | tristate "CRC32c INTEL hardware acceleration" |
| 336 | depends on X86 | 327 | depends on X86 |
| 337 | select CRYPTO_CRC32C_X86_64 if 64BIT | ||
| 338 | select CRYPTO_HASH | 328 | select CRYPTO_HASH |
| 339 | help | 329 | help |
| 340 | In Intel processor with SSE4.2 supported, the processor will | 330 | In Intel processor with SSE4.2 supported, the processor will |
