media: radio: s610: fix indentation warning

[GitHub/moto-9609/android_kernel_motorola_exynos9610.git] / crypto / Kconfig

diff --git a/crypto/Kconfig b/crypto/Kconfig
index d8b96515abe8ec7a388f8115cd7aee65c80185a3..0734c3240c0b6ad76afd133868aecad89c46f884 100644 (file)
--- a/crypto/Kconfig
+++ b/crypto/Kconfig
@@ -930,7 +930,8 @@ config CRYPTO_AES_TI
          8 for decryption), this implementation only uses just two S-boxes of
          256 bytes each, and attempts to eliminate data dependent latencies by
          prefetching the entire table into the cache at the start of each
-         block.
+         block. Interrupts are also disabled to avoid races where cachelines
+         are evicted when the CPU is interrupted to do something else.
 
 config CRYPTO_AES_586
        tristate "AES cipher algorithms (i586)"
@@ -1324,32 +1325,6 @@ config CRYPTO_SALSA20
          The Salsa20 stream cipher algorithm is designed by Daniel J.
          Bernstein <djb@cr.yp.to>. See <http://cr.yp.to/snuffle.html>
 
-config CRYPTO_SALSA20_586
-       tristate "Salsa20 stream cipher algorithm (i586)"
-       depends on (X86 || UML_X86) && !64BIT
-       select CRYPTO_BLKCIPHER
-       help
-         Salsa20 stream cipher algorithm.
-
-         Salsa20 is a stream cipher submitted to eSTREAM, the ECRYPT
-         Stream Cipher Project. See <http://www.ecrypt.eu.org/stream/>
-
-         The Salsa20 stream cipher algorithm is designed by Daniel J.
-         Bernstein <djb@cr.yp.to>. See <http://cr.yp.to/snuffle.html>
-
-config CRYPTO_SALSA20_X86_64
-       tristate "Salsa20 stream cipher algorithm (x86_64)"
-       depends on (X86 || UML_X86) && 64BIT
-       select CRYPTO_BLKCIPHER
-       help
-         Salsa20 stream cipher algorithm.
-
-         Salsa20 is a stream cipher submitted to eSTREAM, the ECRYPT
-         Stream Cipher Project. See <http://www.ecrypt.eu.org/stream/>
-
-         The Salsa20 stream cipher algorithm is designed by Daniel J.
-         Bernstein <djb@cr.yp.to>. See <http://cr.yp.to/snuffle.html>
-
 config CRYPTO_CHACHA20
        tristate "ChaCha20 cipher algorithm"
        select CRYPTO_BLKCIPHER
@@ -1627,6 +1602,27 @@ config CRYPTO_TWOFISH_AVX_X86_64
          See also:
          <http://www.schneier.com/twofish.html>
 
+config CRYPTO_DISKCIPHER
+       bool "Diskcipher support"
+       default n
+       help
+        Diskcipher support the crypt operation of the block host device
+        that has inline crypto engine.
+
+config CRYPTO_DISKCIPHER_DUN
+       bool "Diskcipher use dun"
+       default y
+       depends on CRYPTO_DISKCIPHER && F2FS_FS_ENCRYPTION
+       help
+        support Diskcipher use dun(device unit number)
+
+config CRYPTO_DISKCIPHER_DEBUG
+       bool "Diskcipher debug support"
+       default n
+       depends on CRYPTO_DISKCIPHER
+       help
+        support Diskcipher debug
+
 comment "Compression"
 
 config CRYPTO_DEFLATE