2 files changed, 9 insertions, 9 deletions
diff --git a/crypto/Kconfig b/crypto/Kconfig
index a9377bef25e3..84d71482bf08 100644
--- a/crypto/Kconfig
+++ b/crypto/Kconfig
@@ -439,7 +439,7 @@ config CRYPTO_CRC32C_INTEL
 config CRYPT_CRC32C_VPMSUM
        tristate "CRC32c CRC algorithm (powerpc64)"
-        depends on PPC64
+        depends on PPC64 && ALTIVEC
        select CRYPTO_HASH
        select CRC32
        help
diff --git a/crypto/sha3_generic.c b/crypto/sha3_generic.c
index 62264397a2d2..7e8ed96236ce 100644
--- a/crypto/sha3_generic.c
+++ b/crypto/sha3_generic.c
@@ -24,14 +24,14 @@
 #define ROTL64(x, y) (((x) << (y)) | ((x) >> (64 - (y))))
 static const u64 keccakf_rndc[24] = {
-        0x0000000000000001, 0x0000000000008082, 0x800000000000808a,
+        0x0000000000000001ULL, 0x0000000000008082ULL, 0x800000000000808aULL,
-        0x8000000080008000, 0x000000000000808b, 0x0000000080000001,
+        0x8000000080008000ULL, 0x000000000000808bULL, 0x0000000080000001ULL,
-        0x8000000080008081, 0x8000000000008009, 0x000000000000008a,
+        0x8000000080008081ULL, 0x8000000000008009ULL, 0x000000000000008aULL,
-        0x0000000000000088, 0x0000000080008009, 0x000000008000000a,
+        0x0000000000000088ULL, 0x0000000080008009ULL, 0x000000008000000aULL,
-        0x000000008000808b, 0x800000000000008b, 0x8000000000008089,
+        0x000000008000808bULL, 0x800000000000008bULL, 0x8000000000008089ULL,
-        0x8000000000008003, 0x8000000000008002, 0x8000000000000080,
+        0x8000000000008003ULL, 0x8000000000008002ULL, 0x8000000000000080ULL,
-        0x000000000000800a, 0x800000008000000a, 0x8000000080008081,
+        0x000000000000800aULL, 0x800000008000000aULL, 0x8000000080008081ULL,
-        0x8000000000008080, 0x0000000080000001, 0x8000000080008008
+        0x8000000000008080ULL, 0x0000000080000001ULL, 0x8000000080008008ULL
 };
 static const int keccakf_rotc[24] = {

diff --git a/crypto/Kconfig b/crypto/Kconfig index a9377bef25e3..84d71482bf08 100644 --- a/crypto/Kconfig +++ b/crypto/Kconfig
@@ -439,7 +439,7 @@ config CRYPTO_CRC32C_INTEL
439		439
440	config CRYPT_CRC32C_VPMSUM	440	config CRYPT_CRC32C_VPMSUM
441	tristate "CRC32c CRC algorithm (powerpc64)"	441	tristate "CRC32c CRC algorithm (powerpc64)"
442	depends on PPC64	442	depends on PPC64 && ALTIVEC
443	select CRYPTO_HASH	443	select CRYPTO_HASH
444	select CRC32	444	select CRC32
445	help	445	help


diff --git a/crypto/sha3_generic.c b/crypto/sha3_generic.c index 62264397a2d2..7e8ed96236ce 100644 --- a/crypto/sha3_generic.c +++ b/crypto/sha3_generic.c
@@ -24,14 +24,14 @@
24	#define ROTL64(x, y) (((x) << (y)) \| ((x) >> (64 - (y))))	24	#define ROTL64(x, y) (((x) << (y)) \| ((x) >> (64 - (y))))
25		25
26	static const u64 keccakf_rndc[24] = {	26	static const u64 keccakf_rndc[24] = {
27	0x0000000000000001, 0x0000000000008082, 0x800000000000808a,	27	0x0000000000000001ULL, 0x0000000000008082ULL, 0x800000000000808aULL,
28	0x8000000080008000, 0x000000000000808b, 0x0000000080000001,	28	0x8000000080008000ULL, 0x000000000000808bULL, 0x0000000080000001ULL,
29	0x8000000080008081, 0x8000000000008009, 0x000000000000008a,	29	0x8000000080008081ULL, 0x8000000000008009ULL, 0x000000000000008aULL,
30	0x0000000000000088, 0x0000000080008009, 0x000000008000000a,	30	0x0000000000000088ULL, 0x0000000080008009ULL, 0x000000008000000aULL,
31	0x000000008000808b, 0x800000000000008b, 0x8000000000008089,	31	0x000000008000808bULL, 0x800000000000008bULL, 0x8000000000008089ULL,
32	0x8000000000008003, 0x8000000000008002, 0x8000000000000080,	32	0x8000000000008003ULL, 0x8000000000008002ULL, 0x8000000000000080ULL,
33	0x000000000000800a, 0x800000008000000a, 0x8000000080008081,	33	0x000000000000800aULL, 0x800000008000000aULL, 0x8000000080008081ULL,
34	0x8000000000008080, 0x0000000080000001, 0x8000000080008008	34	0x8000000000008080ULL, 0x0000000080000001ULL, 0x8000000080008008ULL
35	};	35	};
36		36
37	static const int keccakf_rotc[24] = {	37	static const int keccakf_rotc[24] = {