Received: by 2002:a05:6a10:17d3:0:0:0:0 with SMTP id hz19csp2832424pxb; Mon, 19 Apr 2021 15:26:13 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxxLZdQtMG+BBxRx9yYqyqidDU9AWBIOLK0FSqx3EDzu6QX1IR88ypBUUDNAj0u9XXalId2 X-Received: by 2002:a17:90a:2847:: with SMTP id p7mr1460309pjf.1.1618871173577; Mon, 19 Apr 2021 15:26:13 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1618871173; cv=none; d=google.com; s=arc-20160816; b=XRcxn3L4gNSJrlQy/hlxGQRTh5O2UH1GWQivnEuN5DmSUBtEBf1INhzKCB+vhoqX7e flF56Wuh7aZDn2Pr9rGfHKdiaveaLCsd++WzhhE5gyETN4t885mNlutfLCInV21gGE6/ tQKtncfLotzrP1pb3WXT161SdgoKdPINDN+4tz7+7gsKpLtaZv0AGC0km5uVujjmUP1j GcCB+OmtBHJWMwH/hoSGtzx3sm/w1heK7CIVtqMwxnaDOF0hUrq/6yXgrbVuuXaca1d3 qYiJ9kWwipW5H3M+RTo4YEKBAPXtu2xtfBowdZMg7S2uVKEW1nM+SX7THoy7JM9Nv01g tonQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=w1NKIBGyTwbJeSeFVYSnfcQxStt2U3v60I+wqmJJjKk=; b=kM/pOJF3BjiBGIPDA6SRZP1ET5KbBjbHy3UIflo6z+JvRxjoSnQeVhjZ9G+H07GO9B AyTTvVDpE9pce1nqBl2nceMOTEmzdblOFQotMyRjZRZkzuNQAj2Wy0lqMJF0TGR+bfTF a1lHyzhxPpew/oV2NkoyMI6gd3T4SMcfiPsFbSyL4GIoIZtVivPlDbbiE9ivjjQfVl17 sPEaC8OQKAlZuR4sHMtEne5swE2/ecJAhSWAkYjEa6+98Ib3cyqJCJwHpVLn8zSW31av BMExpt8kdR2HJRJuw1SENIz5zsAt1K4hgXH4qC1QbnVkq6nF7V0oB+/giMZPnQ/JzN84 93OA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=JHfWns41; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id i8si11654848pgj.60.2021.04.19.15.26.02; Mon, 19 Apr 2021 15:26:13 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=JHfWns41; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S242511AbhDSUwt (ORCPT + 99 others); Mon, 19 Apr 2021 16:52:49 -0400 Received: from mail.kernel.org ([198.145.29.99]:59618 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S240996AbhDSUuU (ORCPT ); Mon, 19 Apr 2021 16:50:20 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 79124613F0; Mon, 19 Apr 2021 20:46:19 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1618865180; bh=HGKoeYccslyDMJAjKQum+MqK9xLjwCuOgVCaBy/LkXk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=JHfWns41RShimJLHieBA5JN730VZFkBTzn4FslZg+xByqb/wq/HHghUq7MMoGBoAs K3cHTnjyHnqBPRbxJM5jFjvcNWEeLehv6CM9CfyDyPZ4PlKDprONfOa+7BQkwj7Xko so9RbAwhjgPnXtUYMsKdEQSyAoiwIcB5KAJU7bgcz2bkmqF9na9cgpx+MAmVcfuOOh wUMeYaV6yaDRBoQN/dRTmF2qbQIERyXosPK/lPVs1QHEaoOHkjcziG5QJJ6ufWa5OR pTxS6YJRQUFngNFIEOG+BrWg67YH61HpdRIXl1T4gTg9QC3iZLzlDoS8TxbemMTBAA gYMYeqagxmJmw== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: John Paul Adrian Glaubitz , Andrew Morton , Linus Torvalds , Sasha Levin , netdev@vger.kernel.org, bpf@vger.kernel.org Subject: [PATCH AUTOSEL 4.4 7/7] ia64: tools: remove duplicate definition of ia64_mf() on ia64 Date: Mon, 19 Apr 2021 16:46:08 -0400 Message-Id: <20210419204608.7191-7-sashal@kernel.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210419204608.7191-1-sashal@kernel.org> References: <20210419204608.7191-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: John Paul Adrian Glaubitz [ Upstream commit f4bf09dc3aaa4b07cd15630f2023f68cb2668809 ] The ia64_mf() macro defined in tools/arch/ia64/include/asm/barrier.h is already defined in on ia64 which causes libbpf failing to build: CC /usr/src/linux/tools/bpf/bpftool//libbpf/staticobjs/libbpf.o In file included from /usr/src/linux/tools/include/asm/barrier.h:24, from /usr/src/linux/tools/include/linux/ring_buffer.h:4, from libbpf.c:37: /usr/src/linux/tools/include/asm/../../arch/ia64/include/asm/barrier.h:43: error: "ia64_mf" redefined [-Werror] 43 | #define ia64_mf() asm volatile ("mf" ::: "memory") | In file included from /usr/include/ia64-linux-gnu/asm/intrinsics.h:20, from /usr/include/ia64-linux-gnu/asm/swab.h:11, from /usr/include/linux/swab.h:8, from /usr/include/linux/byteorder/little_endian.h:13, from /usr/include/ia64-linux-gnu/asm/byteorder.h:5, from /usr/src/linux/tools/include/uapi/linux/perf_event.h:20, from libbpf.c:36: /usr/include/ia64-linux-gnu/asm/gcc_intrin.h:382: note: this is the location of the previous definition 382 | #define ia64_mf() __asm__ volatile ("mf" ::: "memory") | cc1: all warnings being treated as errors Thus, remove the definition from tools/arch/ia64/include/asm/barrier.h. Signed-off-by: John Paul Adrian Glaubitz Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds Signed-off-by: Sasha Levin --- tools/arch/ia64/include/asm/barrier.h | 3 --- 1 file changed, 3 deletions(-) diff --git a/tools/arch/ia64/include/asm/barrier.h b/tools/arch/ia64/include/asm/barrier.h index e4422b4b634e..94ae4a333a35 100644 --- a/tools/arch/ia64/include/asm/barrier.h +++ b/tools/arch/ia64/include/asm/barrier.h @@ -38,9 +38,6 @@ * sequential memory pages only. */ -/* XXX From arch/ia64/include/uapi/asm/gcc_intrin.h */ -#define ia64_mf() asm volatile ("mf" ::: "memory") - #define mb() ia64_mf() #define rmb() mb() #define wmb() mb() -- 2.30.2