From patchwork Mon Sep 10 13:14:48 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alban Bedel X-Patchwork-Id: 10594165 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id BF955921 for ; Mon, 10 Sep 2018 13:30:03 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id B10AC28FD0 for ; Mon, 10 Sep 2018 13:30:03 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id A4E6228FE6; Mon, 10 Sep 2018 13:30:03 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.9 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 447E328FD0 for ; Mon, 10 Sep 2018 13:30:03 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728639AbeIJSYI (ORCPT ); Mon, 10 Sep 2018 14:24:08 -0400 Received: from mail.avionic-design.de ([87.253.173.79]:23260 "EHLO mail.avionic-design.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728491AbeIJSYI (ORCPT ); Mon, 10 Sep 2018 14:24:08 -0400 X-Greylist: delayed 910 seconds by postgrey-1.27 at vger.kernel.org; Mon, 10 Sep 2018 14:24:08 EDT Received: from eos.adnet.avionic-design.de (80.242.164.60) by mail.avionic-design.de (172.17.100.63) with Microsoft SMTP Server (TLS) id 15.0.1263.5; Mon, 10 Sep 2018 15:14:54 +0200 From: Alban Bedel To: , CC: , Alban Bedel Subject: [PATCH] backports: crypto_memneq has been backported to 3.12 and 3.10 Date: Mon, 10 Sep 2018 15:14:48 +0200 Message-ID: <20180910131448.23225-1-alban.bedel@avionic-design.de> X-Mailer: git-send-email 2.17.1 MIME-Version: 1.0 X-Originating-IP: [80.242.164.60] X-ClientProxiedBy: mail.avionic-design.de (172.17.100.63) To mail.avionic-design.de (172.17.100.63) Sender: backports-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: backports@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP 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 --- backport/backport-include/crypto/algapi.h | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) 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 #include_next -#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)