From patchwork Fri Mar 15 14:33:17 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Luca Coelho X-Patchwork-Id: 10854881 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 8E1D215AC for ; Fri, 15 Mar 2019 14:33:31 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 77A1A2AA4F for ; Fri, 15 Mar 2019 14:33:31 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 6C6FB2AA5E; Fri, 15 Mar 2019 14:33:31 +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 24FAC2AA4F for ; Fri, 15 Mar 2019 14:33:31 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729287AbfCOOda (ORCPT ); Fri, 15 Mar 2019 10:33:30 -0400 Received: from paleale.coelho.fi ([176.9.41.70]:44048 "EHLO farmhouse.coelho.fi" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1729283AbfCOOda (ORCPT ); Fri, 15 Mar 2019 10:33:30 -0400 Received: from 91-156-6-193.elisa-laajakaista.fi ([91.156.6.193] helo=redipa.ger.corp.intel.com) by farmhouse.coelho.fi with esmtpsa (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.91) (envelope-from ) id 1h4ntn-0004kR-FU; Fri, 15 Mar 2019 16:33:29 +0200 From: Luca Coelho To: backports@vger.kernel.org Cc: Luca Coelho Date: Fri, 15 Mar 2019 16:33:17 +0200 Message-Id: <20190315143318.4714-6-luca@coelho.fi> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190315143318.4714-1-luca@coelho.fi> References: <20190315143318.4714-1-luca@coelho.fi> MIME-Version: 1.0 Subject: [PATCH 5/6] backport: fix handling of nospec.h for 4.15.0 and 4.15.1 Sender: backports-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: backports@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Luca Coelho The patch that introduces nospec.h was cherry-picked for 4.15 only in 4.15.2, so we need to adjust the ifdefs of our stub. Signed-off-by: Luca Coelho --- backport/backport-include/linux/nospec.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/backport/backport-include/linux/nospec.h b/backport/backport-include/linux/nospec.h index 50cf46737cbb..07647241f78f 100644 --- a/backport/backport-include/linux/nospec.h +++ b/backport/backport-include/linux/nospec.h @@ -1,7 +1,8 @@ #ifndef _BACKPORT_LINUX_NOSPEC_H #define _BACKPORT_LINUX_NOSPEC_H -#if LINUX_VERSION_IS_GEQ(4,14,18) || \ +#if LINUX_VERSION_IS_GEQ(4,15,2) || \ + LINUX_VERSION_IN_RANGE(4,14,18, 4,15,0) || \ LINUX_VERSION_IN_RANGE(4,9,81, 4,10,0) || \ LINUX_VERSION_IN_RANGE(4,4,118, 4,5,0) #include_next