Merge tag 'v6.6-p2' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6

Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git

kernel os linux

Pull crypto fix from Herbert Xu:
"This fixes a random config build failure on powerpc"

* tag 'v6.6-p2' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6:
crypto: powerpc/chacha20,poly1305-p10 - Add dependency on VSX

Linus Torvalds 2 years ago 0fe2b86c 29aa98d0

+2 -2

1 changed file

expand all

arch

powerpc

crypto

Kconfig

+2 -2

arch/powerpc/crypto/Kconfig

··· 113 113 114 114 config CRYPTO_CHACHA20_P10 115 115 tristate "Ciphers: ChaCha20, XChacha20, XChacha12 (P10 or later)" 116 - depends on PPC64 && CPU_LITTLE_ENDIAN 116 + depends on PPC64 && CPU_LITTLE_ENDIAN && VSX 117 117 select CRYPTO_SKCIPHER 118 118 select CRYPTO_LIB_CHACHA_GENERIC 119 119 select CRYPTO_ARCH_HAVE_LIB_CHACHA ··· 127 127 128 128 config CRYPTO_POLY1305_P10 129 129 tristate "Hash functions: Poly1305 (P10 or later)" 130 - depends on PPC64 && CPU_LITTLE_ENDIAN 130 + depends on PPC64 && CPU_LITTLE_ENDIAN && VSX 131 131 select CRYPTO_HASH 132 132 select CRYPTO_LIB_POLY1305_GENERIC 133 133 help