summaryrefslogtreecommitdiff
path: root/backport
diff options
context:
space:
mode:
authorAlban Bedel <alban.bedel@avionic-design.de>2018-09-10 15:14:48 +0200
committerJohannes Berg <johannes.berg@intel.com>2018-09-10 21:23:10 +0200
commit1b481348b4564970e3cfa04023f1cc22ce2b6931 (patch)
treea7f8610e38347d81e6891a17f0132565de877d36 /backport
parenta28ba2a16e3905162f65427cbcf5cfe3e1f68b3c (diff)
backports: crypto_memneq has been backported to 3.12 and 3.10
crypto_memneq has been backported in 3.12.59 and 3.10.106, it shouldn't be built for these kernels. Signed-off-by: Alban Bedel <alban.bedel@avionic-design.de> Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'backport')
-rw-r--r--backport/backport-include/crypto/algapi.h4
1 files changed, 3 insertions, 1 deletions
diff --git a/backport/backport-include/crypto/algapi.h b/backport/backport-include/crypto/algapi.h
index b6fbdd9b..ac6ea848 100644
--- a/backport/backport-include/crypto/algapi.h
+++ b/backport/backport-include/crypto/algapi.h
@@ -3,7 +3,9 @@
#include <linux/version.h>
#include_next <crypto/algapi.h>
-#if LINUX_VERSION_IS_LESS(3,13,0)
+#if LINUX_VERSION_IS_LESS(3,13,0) && \
+ !LINUX_VERSION_IN_RANGE(3,12,59, 3,12,255) && \
+ !LINUX_VERSION_IN_RANGE(3,10,106, 3,10,255)
#define __crypto_memneq LINUX_BACKPORT(__crypto_memneq)
noinline unsigned long __crypto_memneq(const void *a, const void *b, size_t size);
#define crypto_memneq LINUX_BACKPORT(crypto_memneq)