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=-18.9 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS, USER_AGENT_GIT autolearn=unavailable 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 87303C433E0 for ; Wed, 20 Jan 2021 18:58:14 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 28067233ED for ; Wed, 20 Jan 2021 18:58:14 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2388512AbhATS6K (ORCPT ); Wed, 20 Jan 2021 13:58:10 -0500 Received: from us-smtp-delivery-124.mimecast.com ([63.128.21.124]:47934 "EHLO us-smtp-delivery-124.mimecast.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2387505AbhATRjk (ORCPT ); Wed, 20 Jan 2021 12:39:40 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1611164293; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=1YEVSMla8UOmgBC4LmzAJMeE/UB0SCvN1vHTnN1GioY=; b=eRFp/dslELn1Z1K8T71nM0v6M9sdr6YvkLoStbkmEJEkXd3ZD4OYVesbtGP+C71U/y8C9n RRgPs1DCiqpljKunWApaWRGpNVr/ZPjLRuru626s9yUsCWAMuRaNVsSp48P2pcks0/lo+5 I7hBgjEZmLB6j5DIDxlvTggHejsaBVw= Received: from mail-wr1-f69.google.com (mail-wr1-f69.google.com [209.85.221.69]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-430-pTrozdxOMTqt0p6c8Tq1xQ-1; Wed, 20 Jan 2021 12:38:12 -0500 X-MC-Unique: pTrozdxOMTqt0p6c8Tq1xQ-1 Received: by mail-wr1-f69.google.com with SMTP id x12so1004976wrw.21 for ; Wed, 20 Jan 2021 09:38:11 -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=NDtToDyoZuRziK2st5ZQ16gfsbvU2OvAIpncnUI+QD783BFonuT6/ZOQ9wbZdRyw/N Fql7H0I1xhlxiotv8UXRPd960zOxQa0DNDzszdIGDmHV2Ntic8PAOAobN0RPSv8rIT6o 7tLu/R+JliJXi++ywZ8MHynQ1mUzoGgquV5WWK73SKhoKqjhEOyvfVZaCFga3dVrE0vF aY1raX5Oreu2DneaGNGXUnqfngtnwSP8ib4WkwdCQR5/QPyNj+6khdonWwsTiDbD5w8X maPGGeTyYAmzmm+ADojnEPIU3k12S7TlRNuEbN9EDi8M9bTug1tv96Alczb3Bm/ePYwC JnrA== X-Gm-Message-State: AOAM531r1qIe7cgUcYFDV7NXUaHDx9H4Os1JJIEoEMMGQ1U4UWLUuGO0 Eue+E6eeDQexeMsxMx5daynFYSsDpNK8Rf33AWSrMTPZIyPnLe0hYvgnsXVrTIeOfAErDXeLSNa WPYiNrbOh5+mM+R2Hyr+ER/lPiqR9wsEnBBZrvplAgM76MpDUqyxE3MDNjUc5engzN+LGKb2VDJ yw X-Received: by 2002:adf:d238:: with SMTP id k24mr10316342wrh.414.1611164290652; Wed, 20 Jan 2021 09:38:10 -0800 (PST) X-Google-Smtp-Source: ABdhPJxsXKBygCbH5ehSM3hv+i9wV2hjiG6FmiP83Wor2Wz+s8QTVOj8s3jD6nPK36EhOefk08Au5A== X-Received: by 2002:adf:d238:: with SMTP id k24mr10316310wrh.414.1611164290420; Wed, 20 Jan 2021 09:38:10 -0800 (PST) Received: from redfedo.redhat.com ([2a01:cb14:499:3d00:cd47:f651:9d80:157a]) by smtp.gmail.com with ESMTPSA id x11sm4948325wmi.4.2021.01.20.09.38.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 20 Jan 2021 09:38:08 -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, ardb@kernel.org, masahiroy@kernel.org, keescook@chromium.org, michal.lkml@markovi.net, jpoimboe@redhat.com, peterz@infradead.org, mark.rutland@arm.com, broonie@kernel.org, linux-efi@vger.kernel.org, linux-hardening@vger.kernel.org, Julien Thierry Subject: [RFC PATCH 03/17] tools: bug: Remove duplicate definition Date: Wed, 20 Jan 2021 18:37:46 +0100 Message-Id: <20210120173800.1660730-4-jthierry@redhat.com> X-Mailer: git-send-email 2.25.4 In-Reply-To: <20210120173800.1660730-1-jthierry@redhat.com> References: <20210120173800.1660730-1-jthierry@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.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 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.9 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 56952C433DB for ; Wed, 20 Jan 2021 17:43:13 +0000 (UTC) Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) (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 A01F92070A for ; Wed, 20 Jan 2021 17:43:12 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org A01F92070A 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=merlin.20170209; h=Sender:Content-Transfer-Encoding: Content-Type:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To:Message-Id:Date: Subject: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=02VPRh4lqBzNql0CmaOkd8le4 94J2rVGHRnBZPdAavjgYb5+VGwdn67qe0fbxk6AN8plg2abokmHLAi64kk+qnmcOg8JY6gEkjIRjY 2DTD/VAAvqdE+qrLlvD0+/sI7qZSvnZ4LhJOoqgYmSckYE2Bo7BXqJ9pBGXsguMGMsaHm46pELkbF yrxo2Y22SvtVGpdBcHOvRuS8oUrotS2lq3NRJArQ0zurD1lFG5S25SiNEK7IYhuhksN/xpZw1citL 71zNBAbKMz9Ro3T4VQtQWpTAGVGo+u3VmGTWEigaufLCYEHpOTQOpdDYjTNsaWIO3XMSvjvgEl1sr UvVGTqgmw==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1l2HTb-0004AV-DP; Wed, 20 Jan 2021 17:41:03 +0000 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1l2HQu-0002m3-P7 for linux-arm-kernel@lists.infradead.org; Wed, 20 Jan 2021 17:38:19 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1611164293; 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=OUNLES38jeNuMBGpEzrT2JE15yEy/UPvd4WgvRo5jWsBP0Iv13JRNaYkpA4I26CXk8/h3x 3NHZyeaEhoiWgyHJOq9199Xfofql6Ii6OG9sJs5Ue4HF9JHbB1DjX5KUamF3QaEmqvUdX2 GMEEpnanLfjUv1m+Ck1NY5GiV56fWOE= 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-301-z8WgoZEvN5qPPkOLMDy03w-1; Wed, 20 Jan 2021 12:38:11 -0500 X-MC-Unique: z8WgoZEvN5qPPkOLMDy03w-1 Received: by mail-wr1-f70.google.com with SMTP id q18so11966075wrc.20 for ; Wed, 20 Jan 2021 09:38:11 -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=EFTWhuPDkwgx/EQ69slZP0VJkqx6dzFC3vU3o1e7WWb8sYHIiyvplkbPAsp+O+0veD 1/Nhi4vKjNlxn1QH+oXUwg5dv+QwKgN64C33pHq6g38f+gwlIUZxxItnPcZh7Xm2md7a EUc8SAWs9JlgHnAVb1r1PkFYN56ubnwiiUW1OxN15vaF8DzdrbxdQ43VQ1vg6eAt1Zr+ sKx8HQgnGD8pLr/CqDbvI0sGi8ll+xpQ6WsPntbEhpxDX49EOn5nJ7fsx68YRUksGg5d XErG5nyJaPA4NNu3aDqSWRNYLo+OVxts1U+teit4Z0pqfuHJb7xPlLkjgi3CZk7+8Hln aGpw== X-Gm-Message-State: AOAM532CipTnbvO7woCaVi89DivfiAb+0iB4ll/Rr62MSsvU97CihIO4 TWsSWfnjCJuJYm24jk06o06hp7vCBre9U/ohPZslWubmcPA5wjNTRnVEdzXE85DI32m16vvXD6S yEjfiiMtIzC58EdXgB/ugP4RNyIx2T0eenas= X-Received: by 2002:adf:d238:: with SMTP id k24mr10316319wrh.414.1611164290573; Wed, 20 Jan 2021 09:38:10 -0800 (PST) X-Google-Smtp-Source: ABdhPJxsXKBygCbH5ehSM3hv+i9wV2hjiG6FmiP83Wor2Wz+s8QTVOj8s3jD6nPK36EhOefk08Au5A== X-Received: by 2002:adf:d238:: with SMTP id k24mr10316310wrh.414.1611164290420; Wed, 20 Jan 2021 09:38:10 -0800 (PST) Received: from redfedo.redhat.com ([2a01:cb14:499:3d00:cd47:f651:9d80:157a]) by smtp.gmail.com with ESMTPSA id x11sm4948325wmi.4.2021.01.20.09.38.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 20 Jan 2021 09:38:08 -0800 (PST) From: Julien Thierry To: linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org Subject: [RFC PATCH 03/17] tools: bug: Remove duplicate definition Date: Wed, 20 Jan 2021 18:37:46 +0100 Message-Id: <20210120173800.1660730-4-jthierry@redhat.com> X-Mailer: git-send-email 2.25.4 In-Reply-To: <20210120173800.1660730-1-jthierry@redhat.com> References: <20210120173800.1660730-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-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210120_123817_459969_75640049 X-CRM114-Status: GOOD ( 12.47 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: mark.rutland@arm.com, linux-efi@vger.kernel.org, michal.lkml@markovi.net, keescook@chromium.org, peterz@infradead.org, catalin.marinas@arm.com, masahiroy@kernel.org, broonie@kernel.org, linux-hardening@vger.kernel.org, jpoimboe@redhat.com, will@kernel.org, ardb@kernel.org, Julien Thierry 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