| Message ID | 20180910131448.23225-1-alban.bedel@avionic-design.de (mailing list archive) |
|---|---|
| State | Accepted |
| Headers | show |
| Series | backports: crypto_memneq has been backported to 3.12 and 3.10 | expand |
On Mon, 2018-09-10 at 15:14 +0200, Alban Bedel wrote: > crypto_memneq has been backported in 3.12.59 and 3.10.106, it > shouldn't be built for these kernels. FWIW, I just reverted this - if you actually build with this patch then you get __crypto_memneq() twice - since we always build memneq.c. Without the patch, it's renamed to backport___crypto_memneq() and there's no problem. johannes -- To unsubscribe from this list: send the line "unsubscribe backports" in
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)
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> --- backport/backport-include/crypto/algapi.h | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)