From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.8 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED, USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 9C435C433E0 for ; Wed, 3 Mar 2021 23:46:55 +0000 (UTC) Received: from desiato.infradead.org (desiato.infradead.org [90.155.92.199]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 87E9464F1E for ; Wed, 3 Mar 2021 23:46:52 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 87E9464F1E Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=desiato.20200630; h=Sender:Content-Transfer-Encoding :Content-Type:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To:Message-Id:Date: Subject:Cc:To:From:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=+FwJibMD+X/KYJ1YbyxxAnzYCbfcptpW0nVXaIdf43E=; b=JKq57CZlbCFMpCAGGNnWd8co1 AEovi/bTDjyKRBlmx1WGNfTWD2X37OegseD5F/cOg+J6Aa9vV7yDmaZuKkbPqUe4tOztvLg0DIQQ4 BX7SfwBDEt+rs22ygSylSBEMngbgqg5BlQJDkZreoG9UXaFHlGwOQX8H78E0E2cK+NYXUgWuoRJkd nHMWDnHaIrdMArFF8hXgnuc1wb4K9KZiaX35HT1/iTtvwqaWdk43A4NUM2TQQpF5kVb0K7nY3snPX 0V+iqRapt/+FvNIlo44zz/r+pRUE+VT+fVly1jp/nmO4mHrmfcFdjjISK+3gfK5G2thAccSg60Tog beLP5EjfQ==; Received: from localhost ([::1] helo=desiato.infradead.org) by desiato.infradead.org with esmtp (Exim 4.94 #2 (Red Hat Linux)) id 1lHb85-0070DK-Bs; Wed, 03 Mar 2021 23:42:15 +0000 Received: from us-smtp-delivery-124.mimecast.com ([63.128.21.124]) by desiato.infradead.org with esmtps (Exim 4.94 #2 (Red Hat Linux)) id 1lHV0L-005jqb-0y for linux-arm-kernel@lists.infradead.org; Wed, 03 Mar 2021 17:09:48 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1614791383; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=1YEVSMla8UOmgBC4LmzAJMeE/UB0SCvN1vHTnN1GioY=; b=WSj+/YNoV6HTRAJI4Tcht/Fja29zTeDyA+wSaBQblWByqz9YuVXMiEQPM4krLc7voe0bsn /RyBKnkaeWlsBDpqM7IIqJM1zMuSAbAHRwQXWGP4hq1rJhCnwBsS+1Xstu+77ZGxM+DdnP bJc+UWsqEKHV9W2oAX3PZJ9IUNCv2gk= Received: from mail-wr1-f70.google.com (mail-wr1-f70.google.com [209.85.221.70]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-604-kzVnYzGJO9mX-BBMqqWbUA-1; Wed, 03 Mar 2021 12:09:42 -0500 X-MC-Unique: kzVnYzGJO9mX-BBMqqWbUA-1 Received: by mail-wr1-f70.google.com with SMTP id b15so11346315wrm.1 for ; Wed, 03 Mar 2021 09:09:42 -0800 (PST) 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:mime-version:content-transfer-encoding; bh=1YEVSMla8UOmgBC4LmzAJMeE/UB0SCvN1vHTnN1GioY=; b=WYav8MA/IZBrKal2vq+QS+/fcl/suSq3Pk6oHMEorDhkqFmwptWzmHe0nfHLmLALuv RHDRb7Gfnqall2P/Qxj1VpYOjfG8IG3kM5y5SdUd/AmMQenmiukCztonDTX3/TlK8oi1 +k6nJ6EJKS256p+hsk7OO8415SM4hAp8oTV2cXBYgSuLTvPl2gZG8GpgCzpUWShifI39 /E9TG49NTOeiz1EZ9ba6NSuN/ihRmW7yONjZh+cLQg1E29o9QdYTKA7EModWtCMA269N 5obXCspwChidhdwLcGKgxyTsb3uFGf/80W22+zK5qNzIyUM9XL9jtLspBQU5BlhofMwo DDlQ== X-Gm-Message-State: AOAM533M5jgCA5Za/iE0fPNOcC7oq+AvPB6IwOEPqZARWfeTPf/OOiwJ oSl4REW/hRgkBhPmZFlQ8Wd1j/cEuPB9n4Uex+Gj3QVXpgyhWsMFS2TovExZg7k/EwvfbbkvBKJ z8yLl+mFT/Nbjptj1SXbTvMx/6zPpjDoalqA= X-Received: by 2002:a7b:cb81:: with SMTP id m1mr1678wmi.117.1614791380977; Wed, 03 Mar 2021 09:09:40 -0800 (PST) X-Google-Smtp-Source: ABdhPJwIImTFgzOt8MQZOzCEwSA6Uw7WaOSsf2aCOzgesHaqq1/c7Ru6SY01IxtrxnwNpeTXV0PpXQ== X-Received: by 2002:a7b:cb81:: with SMTP id m1mr1592wmi.117.1614791379697; Wed, 03 Mar 2021 09:09:39 -0800 (PST) Received: from redfedo.redhat.com ([2a01:cb14:499:3d00:cd47:f651:9d80:157a]) by smtp.gmail.com with ESMTPSA id r7sm33066226wre.25.2021.03.03.09.09.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 03 Mar 2021 09:09:39 -0800 (PST) From: Julien Thierry To: linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org Cc: catalin.marinas@arm.com, will@kernel.org, mark.rutland@arm.com, ardb@kernel.org, masahiroy@kernel.org, jpoimboe@redhat.com, peterz@infradead.org, ycote@redhat.com, Julien Thierry Subject: [RFC PATCH v2 03/13] tools: bug: Remove duplicate definition Date: Wed, 3 Mar 2021 18:09:22 +0100 Message-Id: <20210303170932.1838634-4-jthierry@redhat.com> X-Mailer: git-send-email 2.25.4 In-Reply-To: <20210303170932.1838634-1-jthierry@redhat.com> References: <20210303170932.1838634-1-jthierry@redhat.com> MIME-Version: 1.0 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=jthierry@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Under tools, bug.h only defines BUILD_BUG_ON_ZERO() which is already defined in build_bug.h. This prevents a file to include both headers at the same time. Have bug.h include build_bug.h instead. Signed-off-by: Julien Thierry --- tools/include/linux/bug.h | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/tools/include/linux/bug.h b/tools/include/linux/bug.h index 85f80258a15f..548be7cffa8e 100644 --- a/tools/include/linux/bug.h +++ b/tools/include/linux/bug.h @@ -2,10 +2,6 @@ #ifndef _TOOLS_PERF_LINUX_BUG_H #define _TOOLS_PERF_LINUX_BUG_H -/* Force a compilation error if condition is true, but also produce a - result (of value 0 and type size_t), so the expression can be used - e.g. in a structure initializer (or where-ever else comma expressions - aren't permitted). */ -#define BUILD_BUG_ON_ZERO(e) (sizeof(struct { int:-!!(e); })) +#include #endif /* _TOOLS_PERF_LINUX_BUG_H */ -- 2.25.4 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel