diff options
| author | Jonathan Corbet <corbet@lwn.net> | 2017-03-07 00:22:51 -0700 |
|---|---|---|
| committer | Jonathan Corbet <corbet@lwn.net> | 2017-03-07 00:22:51 -0700 |
| commit | 07d045372921bfaa843ea00749c150b099ca0a49 (patch) | |
| tree | f849e8432047d3e0fc04590ddfb6a76ba953f9b6 /crypto/Makefile | |
| parent | 1bd9a34ffdd5f22ef74ed68b5d8b6fb4b781d58c (diff) | |
| parent | 4c6427919ee920d5963cf826de76292286342aa0 (diff) | |
| download | linux-crypto-07d045372921bfaa843ea00749c150b099ca0a49.tar.gz linux-crypto-07d045372921bfaa843ea00749c150b099ca0a49.zip | |
Merge tag 'v4.11-rc1' into docs-next
Linux 4.11-rc1
Diffstat (limited to 'crypto/Makefile')
| -rw-r--r-- | crypto/Makefile | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/crypto/Makefile b/crypto/Makefile index b8f0e3eb..8a440572 100644 --- a/crypto/Makefile +++ b/crypto/Makefile @@ -75,6 +75,7 @@ obj-$(CONFIG_CRYPTO_SHA256) += sha256_generic.o obj-$(CONFIG_CRYPTO_SHA512) += sha512_generic.o obj-$(CONFIG_CRYPTO_SHA3) += sha3_generic.o obj-$(CONFIG_CRYPTO_WP512) += wp512.o +CFLAGS_wp512.o := $(call cc-option,-fno-schedule-insns) # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=79149 obj-$(CONFIG_CRYPTO_TGR192) += tgr192.o obj-$(CONFIG_CRYPTO_GF128MUL) += gf128mul.o obj-$(CONFIG_CRYPTO_ECB) += ecb.o @@ -98,7 +99,9 @@ obj-$(CONFIG_CRYPTO_BLOWFISH_COMMON) += blowfish_common.o obj-$(CONFIG_CRYPTO_TWOFISH) += twofish_generic.o obj-$(CONFIG_CRYPTO_TWOFISH_COMMON) += twofish_common.o obj-$(CONFIG_CRYPTO_SERPENT) += serpent_generic.o +CFLAGS_serpent_generic.o := $(call cc-option,-fsched-pressure) # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=79149 obj-$(CONFIG_CRYPTO_AES) += aes_generic.o +obj-$(CONFIG_CRYPTO_AES_TI) += aes_ti.o obj-$(CONFIG_CRYPTO_CAMELLIA) += camellia_generic.o obj-$(CONFIG_CRYPTO_CAST_COMMON) += cast_common.o obj-$(CONFIG_CRYPTO_CAST5) += cast5_generic.o |