From patchwork Tue Jun 25 18:09:07 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yi-Hung Wei X-Patchwork-Id: 1122194 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=openvswitch.org (client-ip=140.211.169.12; helo=mail.linuxfoundation.org; envelope-from=ovs-dev-bounces@openvswitch.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="IUcZfflT"; dkim-atps=neutral Received: from mail.linuxfoundation.org (mail.linuxfoundation.org [140.211.169.12]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 45YDtk2xFDz9sN6 for ; Wed, 26 Jun 2019 04:18:37 +1000 (AEST) Received: from mail.linux-foundation.org (localhost [127.0.0.1]) by mail.linuxfoundation.org (Postfix) with ESMTP id 469A4DCA; Tue, 25 Jun 2019 18:18:36 +0000 (UTC) X-Original-To: dev@openvswitch.org Delivered-To: ovs-dev@mail.linuxfoundation.org Received: from smtp1.linuxfoundation.org (smtp1.linux-foundation.org [172.17.192.35]) by mail.linuxfoundation.org (Postfix) with ESMTPS id F3D04265 for ; Tue, 25 Jun 2019 18:18:34 +0000 (UTC) X-Greylist: whitelisted by SQLgrey-1.7.6 Received: from mail-pf1-f196.google.com (mail-pf1-f196.google.com [209.85.210.196]) by smtp1.linuxfoundation.org (Postfix) with ESMTPS id AAD7082D for ; Tue, 25 Jun 2019 18:18:34 +0000 (UTC) Received: by mail-pf1-f196.google.com with SMTP id x15so9919756pfq.0 for ; Tue, 25 Jun 2019 11:18:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=wCppvnZGY07ozV7qxNrZ30DBFM7+Dos0ddmJMeM3v/Y=; b=IUcZfflT5OB8rfjx0OsUhPOEjlyipfZl5nGkPz9EBSXaByrqMslDhdEHCTPVEuuNeg tLqvdelFEi8vDk97H+dRSCEG2RTRUa0x99jghhga3TrZv/3DDMP3ktHVaeCsyPKpFkyI eiBMhknn2dsJvMkCaWVY8EkXFjPxognNnTL2/+bsNECDTXFwlmfqVzXZir613y/KZfyz +ozeA7SxIcYuLJuozTcl6BrY7k7T7s6YNjvGhZQ3Mm0xn2QyIdLAt9zrJUASNzZaSkZe Fl7kpremNbHyjR7tg9wouzLfuuw//WGSEo+/6Wmace1cKCPqJMbmcFbtFxR6Tu93Qk/y GsXw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=wCppvnZGY07ozV7qxNrZ30DBFM7+Dos0ddmJMeM3v/Y=; b=FDNCeEX7NXNZye3+40uisBOzOQK60VMg4sX8OwpM8JSGcu9hlVzOmGlSNyBOmEkLJZ QMB6Pt1j8IP7OmhCi3ZicH4zC8EsVKCjPPeNPlhdXpTSEzKxT72a33YK63K3pAbGyBKh 75zI9Im6KzJ2cAddjnbkqG5Akw794k7G3fnXrWJUJ5vYf/pVqZxDNAWi7u8WRt4WvEPB VdBXwUq3bd8yn5zNhiB/Crr8o1wu0UCIW9uiGuHzMlnHsTGN0LXGwX4mLJeMqnSiMrQv OslsY2sHWQNHrZYcDrvJy2bYzTAbF2PW5QNhMHGsBL3NP5GL2dv8qhHV+PyHIAhX5bm4 XM6A== X-Gm-Message-State: APjAAAV4y6mHeTvkBJwRJ117JYJPHAiJd+xGaZYMjvgL12ZKQ8hedpuZ 2SWzh8LXB2Ojvzl91TTYVT0FtE0i X-Google-Smtp-Source: APXvYqyCNdZkoHetqwX3dljHGREX7wy6X4+ReGq0QByfRFDhux6nabqvypQ1G9blVOQbzCWid/IUwA== X-Received: by 2002:a63:6883:: with SMTP id d125mr40759607pgc.281.1561486713595; Tue, 25 Jun 2019 11:18:33 -0700 (PDT) Received: from Husky.eng.vmware.com ([66.170.99.1]) by smtp.gmail.com with ESMTPSA id r6sm2957208pji.0.2019.06.25.11.18.32 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 25 Jun 2019 11:18:32 -0700 (PDT) From: Yi-Hung Wei To: dev@openvswitch.org Date: Tue, 25 Jun 2019 11:09:07 -0700 Message-Id: <1561486147-43240-1-git-send-email-yihung.wei@gmail.com> X-Mailer: git-send-email 2.7.4 X-Spam-Status: No, score=-2.0 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, FREEMAIL_FROM, RCVD_IN_DNSWL_NONE autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on smtp1.linux-foundation.org Subject: [ovs-dev] [PATCH] compat: Fix compilation error on CentOS 7.6 X-BeenThere: ovs-dev@openvswitch.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: ovs-dev-bounces@openvswitch.org Errors-To: ovs-dev-bounces@openvswitch.org This fix the compilation issue on CentOS 7.6 kernel (3.10.0-957.21.3.el7.x86_64). Reported-at: https://mail.openvswitch.org/pipermail/ovs-dev/2019-June/360013.html Reported-by: Fred Neubauer Fixes: 6660a9597a49 ("datapath: compat: Introduce static key support") Signed-off-by: Yi-Hung Wei Tested-by: Greg Rose Reviewed-by: Greg Rose --- Please backport it to branch 2.11 and 2.10. Travis test: https://travis-ci.org/YiHungWei/ovs/builds/550012659 --- datapath/linux/compat/include/linux/static_key.h | 1 + 1 file changed, 1 insertion(+) diff --git a/datapath/linux/compat/include/linux/static_key.h b/datapath/linux/compat/include/linux/static_key.h index 01c6a93f07fe..7e43a49e84f1 100644 --- a/datapath/linux/compat/include/linux/static_key.h +++ b/datapath/linux/compat/include/linux/static_key.h @@ -1,6 +1,7 @@ #ifndef _STATIC_KEY_WRAPPER_H #define _STATIC_KEY_WRAPPER_H +#include #include_next #ifndef HAVE_UPSTREAM_STATIC_KEY /*