From patchwork Wed Feb 7 15:30:06 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gregory Rose X-Patchwork-Id: 870425 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; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="KfGvbSJC"; 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 3zc52y0Hdrz9s4q for ; Thu, 8 Feb 2018 02:34:02 +1100 (AEDT) Received: from mail.linux-foundation.org (localhost [127.0.0.1]) by mail.linuxfoundation.org (Postfix) with ESMTP id 81FF811DF; Wed, 7 Feb 2018 15:30: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 BD5D711DD for ; Wed, 7 Feb 2018 15:30:27 +0000 (UTC) X-Greylist: whitelisted by SQLgrey-1.7.6 Received: from mail-pl0-f65.google.com (mail-pl0-f65.google.com [209.85.160.65]) by smtp1.linuxfoundation.org (Postfix) with ESMTPS id AF74232F for ; Wed, 7 Feb 2018 15:30:26 +0000 (UTC) Received: by mail-pl0-f65.google.com with SMTP id j19-v6so222382pll.2 for ; Wed, 07 Feb 2018 07:30:26 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=3x2Wdn52nZKqIEwgK9q486mRovIVeDxEEqteyL4FTtg=; b=KfGvbSJCTXbsj6QiZ5/iGsdPZXvCr23mxLqeMtQqSpTEWvMZvaS02o2lUdyE0RfRyC KzSgsmWQVrWEfsm33jkg1p6yMyx5hTOTEHz56HTNffXE2RVp4f4sMau4CbuU26vRfbUc GT/i+fXZ58nsZ0WmX/ksVRodQqsrHGzjZywtZgoRM0c79cBETkncwFhjyGq0SRxpat4z dF17hpAIuQijPgm9RxXmB7kJYpCN2KOH8LP0QkGemtgnnQH7xNVCIiaIPlnD0cCyrKMS 14VJar44nVK43jTT5Ac3Lqf8mR6ohGoNNH9xbr56DFOkjtmX1NRWGfAG2WCL89CwtUUQ ig7A== 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:in-reply-to :references; bh=3x2Wdn52nZKqIEwgK9q486mRovIVeDxEEqteyL4FTtg=; b=dRzwXP4NfQTnxPtqNwX1/V8awxxMov7PI5MArcWb50B24TIwrLWdnJLHoFengYIpA5 3XD9NeX46DiABC38P9w8kmz33BevQZiDvG2GozoGZ5i2xnY64GjVMNOqPWxsNdjfx3JV 9G9++5XIrc5R59iRnbkxravXnpKrzloStaUKvOO3+chQasp21ugj8PimMJPiBpgxf6wQ SSpqkDQOuylM4LqwuMmkqz93nOMg8xailM9KT116rTO84FB8ZiLMuizPMzVmayF82Xh6 rgoJta3XfXGGMRb5KaI5MBFYUumKPk/J0XAnkhoCzUKf3iNz12hc4ex1BrX4dKRiOkkj Aj7g== X-Gm-Message-State: APf1xPDbMVfkdLWULEJ3XHy7oVOW6WLl+RQOCKdQKniy29VhW3I8kdOS XI/UffDIKwETmTNNmf9uUryFgw== X-Google-Smtp-Source: AH8x224smwnPuGhyzfP0sBWE/fY6UqilaxdOJQCHemOZrd/mV4diaKVSPwo9HrZmPVQCGIHlhM0XvA== X-Received: by 2002:a17:902:7789:: with SMTP id o9-v6mr6406873pll.84.1518017425887; Wed, 07 Feb 2018 07:30:25 -0800 (PST) Received: from gizo.domain (184-100-240-187.ptld.qwest.net. [184.100.240.187]) by smtp.gmail.com with ESMTPSA id e88sm5176558pfl.80.2018.02.07.07.30.23 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 07 Feb 2018 07:30:24 -0800 (PST) From: Greg Rose To: dev@openvswitch.org Date: Wed, 7 Feb 2018 07:30:06 -0800 Message-Id: <1518017410-31711-7-git-send-email-gvrose8192@gmail.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1518017410-31711-1-git-send-email-gvrose8192@gmail.com> References: <1518017410-31711-1-git-send-email-gvrose8192@gmail.com> X-Spam-Status: No, score=-1.7 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_ENVFROM_END_DIGIT,FREEMAIL_FROM, RCVD_IN_DNSWL_NONE autolearn=no version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on smtp1.linux-foundation.org Subject: [ovs-dev] [PATCH V2 06/10] compat: Fix compiler headers 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 Since Linux kernel upstream commit d15155824c50 ("linux/compiler.h: Split into compiler.h and compiler_types.h") this error check for the gcc compiler header is no longer valid. Remove so that openvswitch builds for linux kernels 4.14.8 and since. Signed-off-by: Greg Rose --- acinclude.m4 | 3 +++ datapath/linux/compat/include/linux/compiler-gcc.h | 2 ++ 2 files changed, 5 insertions(+) diff --git a/acinclude.m4 b/acinclude.m4 index 768c20c..b8ac7db 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -798,6 +798,9 @@ AC_DEFUN([OVS_CHECK_LINUX_COMPAT], [ OVS_FIND_PARAM_IFELSE([$KSRC/include/linux/netdevice.h], [netdev_master_upper_dev_link], [extack], [OVS_DEFINE([HAVE_UPPER_DEV_LINK_EXTACK])]) + OVS_GREP_IFELSE([$KSRC/include/linux/compiler_types.h], + [__LINUX_COMPILER_TYPES_H], + [OVS_DEFINE([HAVE_LINUX_COMPILER_TYPES_H])]) if cmp -s datapath/linux/kcompat.h.new \ datapath/linux/kcompat.h >/dev/null 2>&1; then diff --git a/datapath/linux/compat/include/linux/compiler-gcc.h b/datapath/linux/compat/include/linux/compiler-gcc.h index bf057f7..bfcd531 100644 --- a/datapath/linux/compat/include/linux/compiler-gcc.h +++ b/datapath/linux/compat/include/linux/compiler-gcc.h @@ -1,6 +1,8 @@ #ifndef __LINUX_COMPILER_H +#ifndef HAVE_LINUX_COMPILER_TYPES_H #error "Please don't include directly, include instead." #endif +#endif #include_next