From patchwork Thu Nov 16 14:38:55 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Felix Fietkau X-Patchwork-Id: 10061321 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 3DDF660230 for ; Thu, 16 Nov 2017 14:39:01 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 3089B2AAAA for ; Thu, 16 Nov 2017 14:39:01 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 2522A2AAB5; Thu, 16 Nov 2017 14:39:01 +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=-6.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,T_DKIM_INVALID 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 D6C232AAAD for ; Thu, 16 Nov 2017 14:38:59 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1759158AbdKPOi7 (ORCPT ); Thu, 16 Nov 2017 09:38:59 -0500 Received: from nbd.name ([46.4.11.11]:51826 "EHLO nbd.name" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1759363AbdKPOi6 (ORCPT ); Thu, 16 Nov 2017 09:38:58 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=nbd.name; s=20160729; h=References:In-Reply-To:Message-Id:Date:Subject:To:From:Sender: Reply-To:Cc:MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Id:List-Help:List-Unsubscribe:List-Subscribe: List-Post:List-Owner:List-Archive; bh=QYoynIoUAokx+hHWlUGMACCBRT4fFGWAyOrnMrIgktk=; b=BVk4/zf7Zt5Azris2xMICQr7uF LCy78WjXBYgfbZbyOqCiHq0alMeIt9Krzjk1lEm4VkiLXAHwGspw/XwyGQxoyVz7zyBtwWrIwo0B3 /mhcv0TFoKk/jcFB4cXoX+oQ+ZvgunDBZq5gfxX0x4K5T8xz3o+j0Xu6b4v3Y2WDgOUY=; Received: by nf.local (Postfix, from userid 501) id EED401BAB8FBB; Thu, 16 Nov 2017 15:38:55 +0100 (CET) From: Felix Fietkau To: backports@vger.kernel.org Subject: [PATCH 4/4] backports: fix missing linux/verification.h error on < 4.7 Date: Thu, 16 Nov 2017 15:38:55 +0100 Message-Id: <20171116143855.12307-4-nbd@nbd.name> X-Mailer: git-send-email 2.14.2 In-Reply-To: <20171116143855.12307-1-nbd@nbd.name> References: <20171116143855.12307-1-nbd@nbd.name> Sender: backports-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: backports@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Signed-off-by: Felix Fietkau --- backport/backport-include/linux/verification.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/backport/backport-include/linux/verification.h b/backport/backport-include/linux/verification.h index 10e1bcfb..5fd0a2d3 100644 --- a/backport/backport-include/linux/verification.h +++ b/backport/backport-include/linux/verification.h @@ -1,7 +1,7 @@ #ifndef __BP_VERIFICATION_H #define __BP_VERIFICATION_H #include -#ifndef CPTCFG_BPAUTO_BUILD_SYSTEM_DATA_VERIFICATION +#if LINUX_VERSION_IS_GEQ(4,7,0) && !defined(CPTCFG_BPAUTO_BUILD_SYSTEM_DATA_VERIFICATION) #include_next #else #include @@ -24,5 +24,5 @@ extern int verify_pkcs7_signature(const void *data, size_t len, const void *data, size_t len, size_t asn1hdrlen), void *ctx); -#endif /* LINUX_VERSION_IS_GEQ(4,7,0) */ +#endif /* LINUX_VERSION_IS_GEQ(4,7,0) && !defined(CPTCFG_BPAUTO_BUILD_SYSTEM_DATA_VERIFICATION) */ #endif /* __BP_VERIFICATION_H */