From patchwork Fri Apr 26 18:07:43 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yifeng Sun X-Patchwork-Id: 1091736 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="Nvf/jE+7"; 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 44rMY41sW7z9s55 for ; Sat, 27 Apr 2019 04:10:31 +1000 (AEST) Received: from mail.linux-foundation.org (localhost [127.0.0.1]) by mail.linuxfoundation.org (Postfix) with ESMTP id 70A03F94; Fri, 26 Apr 2019 18:10:28 +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 E0F81F6C for ; Fri, 26 Apr 2019 18:07:51 +0000 (UTC) X-Greylist: whitelisted by SQLgrey-1.7.6 Received: from mail-pg1-f193.google.com (mail-pg1-f193.google.com [209.85.215.193]) by smtp1.linuxfoundation.org (Postfix) with ESMTPS id 9204589A for ; Fri, 26 Apr 2019 18:07:51 +0000 (UTC) Received: by mail-pg1-f193.google.com with SMTP id k19so1996931pgh.0 for ; Fri, 26 Apr 2019 11:07:51 -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=yJy7duZVAJQEFjzNQo6sPnu4o5wAzqZnYAdkblveeO0=; b=Nvf/jE+7zJSqF2jCKfDPUsc7KFQ8zxHKStsRgaSbGjDoxOnyeCWW07pwXTGbB41E6i y1e9zaPfE0RKp3UbnDXRWSVKQ5UTliL4yOcRq/yJAh1VMfYBGATBKoqE9H9boc6IroRZ Hrj2OgNDNmE6qKdWNvsnPmArvG2npZ3mLkQgqDwldNv97XMzPdgVtdx/8WXb+elCaoyZ gDxHb3c72uK2/KYIn1rFRebiXSd1+CpXgs3a3YYvYUJP6pTaO4lCRn24qIorAvecDA/A ar4WHmf8IxjN+HlUWzh6B8ISVtPWds2WZqzehLTFZmNcRQYevOSoJJGCN66VBD24IaeO O9BQ== 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=yJy7duZVAJQEFjzNQo6sPnu4o5wAzqZnYAdkblveeO0=; b=hj50kS8qBQwm9H12HFzVjh8OLJx3Ctag89mLR0raLsBq9dCN2UXkbqDJf3lwr42cxD f3caSq3xENh3+we58/C8iMdQWwI9HQIqwdF5D4xMtyrdNgVNjfI9M/d2Njmc+jrdtOO3 KpKgd/AnxVOl0AUcWq7eCTDL1Hf8+Rxopl1XLZIxofxHDgsx4z1w0pBgn0xXyFEkzA7v yM3CW/G66ipPbC3XGFDtqWTO7uxKVStDAACrlQkjT9BkMznFGmHUXFVVo4j35CLYhmka PHI0J6ragPh0h/PwaZ6K0nc20eTBYZfdqkYB56+gD6XM692X0MdnuekKDRh1Sl+za9I4 Ea7A== X-Gm-Message-State: APjAAAUYb2WoLl9hN0rGOQt677Er2AVRre/ALtlVX7EYT/PjwsOrtrg/ gHzxLD0b/0hDWoVHTVvBVOqgbVpg X-Google-Smtp-Source: APXvYqx8pp3lhkzMJtpSxmOaytSLlLV3uKz+dDgGWVKrFTViOzG6WM3EWxV37AOKa63Mgwd1AWuLoQ== X-Received: by 2002:aa7:8252:: with SMTP id e18mr3834867pfn.105.1556302070732; Fri, 26 Apr 2019 11:07:50 -0700 (PDT) Received: from kern417.eng.vmware.com ([66.170.99.2]) by smtp.gmail.com with ESMTPSA id m16sm6495720pff.104.2019.04.26.11.07.49 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 26 Apr 2019 11:07:50 -0700 (PDT) From: Yifeng Sun To: dev@openvswitch.org Date: Fri, 26 Apr 2019 11:07:43 -0700 Message-Id: <1556302063-23767-1-git-send-email-pkusunyifeng@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] datapath: Fix compiling error for latest Linux 4.14 kernel 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 CC: Greg Rose Fixes: f72469405eec9 ("datapath: meter: Use struct_size() in kzalloc()") Signed-off-by: Yifeng Sun --- acinclude.m4 | 2 ++ datapath/linux/compat/include/linux/overflow.h | 2 +- datapath/meter.c | 1 + 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/acinclude.m4 b/acinclude.m4 index 1607d5f4b1d9..548cbe9ef100 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -920,6 +920,8 @@ AC_DEFUN([OVS_CHECK_LINUX_COMPAT], [ [OVS_DEFINE([HAVE_INET_FRAGS_RND])]) OVS_GREP_IFELSE([$KSRC/include/linux/overflow.h], [__LINUX_OVERFLOW_H], [OVS_DEFINE([HAVE_OVERFLOW_H])]) + OVS_GREP_IFELSE([$KSRC/include/linux/overflow.h], [struct_size], + [OVS_DEFINE([HAVE_STRUCT_SIZE])]) OVS_GREP_IFELSE([$KSRC/include/linux/mm.h], [kvmalloc_array], [OVS_DEFINE([HAVE_KVMALLOC_ARRAY])]) OVS_GREP_IFELSE([$KSRC/include/linux/mm.h], [kvmalloc_node], diff --git a/datapath/linux/compat/include/linux/overflow.h b/datapath/linux/compat/include/linux/overflow.h index ff84356db16c..8f1b5b005491 100644 --- a/datapath/linux/compat/include/linux/overflow.h +++ b/datapath/linux/compat/include/linux/overflow.h @@ -1,5 +1,5 @@ /* SPDX-License-Identifier: GPL-2.0 OR MIT */ -#ifdef HAVE_OVERFLOW_H +#if defined(HAVE_OVERFLOW_H) && defined(HAVE_STRUCT_SIZE) #include_next #else #ifndef __LINUX_OVERFLOW_H diff --git a/datapath/meter.c b/datapath/meter.c index 51ec1495033a..eda14682fb96 100644 --- a/datapath/meter.c +++ b/datapath/meter.c @@ -13,6 +13,7 @@ #include #include #include +#include #include #include