diff options
| author | Johannes Berg <johannes.berg@intel.com> | 2018-10-02 21:24:46 +0200 |
|---|---|---|
| committer | Johannes Berg <johannes.berg@intel.com> | 2018-10-02 21:25:36 +0200 |
| commit | eca1c43ffdfba23d0eeee3b8a64aed63d5702d95 (patch) | |
| tree | 442cc5c5c959b0242104dfa13782f4b36b9f5958 | |
| parent | accce7fcc5df96d9fa5431aad86d66e830119d30 (diff) | |
Revert "backports: crypto_memneq has been backported to 3.12 and 3.10"
This reverts commit 1b481348b4564970e3cfa04023f1cc22ce2b6931.
It actually broke the build to include this, as memneq.c is always
built for kernels < 3.13, and thus we get a duplicate symbol export
if we skip the backport definitions.
Easier than making the build system depend on the strange versions
is to just always use our backported version with symbol rename.
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
| -rw-r--r-- | backport/backport-include/crypto/algapi.h | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/backport/backport-include/crypto/algapi.h b/backport/backport-include/crypto/algapi.h index ac6ea848..b6fbdd9b 100644 --- a/backport/backport-include/crypto/algapi.h +++ b/backport/backport-include/crypto/algapi.h @@ -3,9 +3,7 @@ #include <linux/version.h> #include_next <crypto/algapi.h> -#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) +#if LINUX_VERSION_IS_LESS(3,13,0) #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) |