Received: by 2002:a05:6a10:17d3:0:0:0:0 with SMTP id hz19csp2829489pxb; Mon, 19 Apr 2021 15:21:34 -0700 (PDT) X-Google-Smtp-Source: ABdhPJws0Ar9PYFvWo5ix70y1oXDb7K2gShfZOFmERYNZkaRiS3UC+tneeg4cJ9Dy8lo5RXXrW+2 X-Received: by 2002:aa7:8e0d:0:b029:214:a511:d88b with SMTP id c13-20020aa78e0d0000b0290214a511d88bmr21792443pfr.2.1618870894081; Mon, 19 Apr 2021 15:21:34 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1618870894; cv=none; d=google.com; s=arc-20160816; b=s/ZqxM/mb3LaFAkev7piqYsZGosey6AT7GLZF9Aq9M+W/aHSffhKgu1G83t1H8G7dC t8qgK59JgQE2CFwnzNVEepfGYNGix683+yTTntewRDinXRAGhwG2GGKfd/ioaaPZKcdy mfajwVQZln+reZJQ2nZtV4g8nzwsJ8jBzsMTdTlRrCq94YzxCCOHrt4Byk4X/3/WLJ70 qWknLS+9CXa6cXXJLw9fyF0Q6aiof5hVO7BGDHP0zyTGQp7LyAsTwSHHYGHL89M1/THh DvTD/GWrbAmUpJ06ozK1BI8kGp+CihRyLHTB3vtYkNfWpIq/IicgV/gn1CvoNCR4Ry62 Kjow== 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=vj6A30lsPOh8OOBfdqJ7lazzKyqm7yBtUQh2vQIPHPA=; b=lE3QzDJfxZfZGKT2l2rJFWGSf3yPmJ8w3jNMEsJ7PYr+TJrrxJk8Z/eKDshWkLIjCG 0sW4NYwLebbYMli+J0WkhtalrRGM7v89b2BZ8fqVwocu+tM7LYJp2iYwcBnYWH9OCbGI tzw/7GuInMC8jmJwo/8O3bX2qvANfhoct1ME+hUmshw5LyYwT7rjdSFYBf+bj2g8xlc+ hexOnjbRkGTDkzQi/fEEcGKGEeWtFJfcZvTbi1zcF9CpCj0fBpZfYXdCuovOvrEgySdq SVYqWOZm6xcYWgts6XuQqdHXxpPQw2caGRJVeONBBd2uKQvFdULfYfyPuv4HfIzR9V8T Ndrw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=Ie712FMU; 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 lk18si994073pjb.42.2021.04.19.15.21.22; Mon, 19 Apr 2021 15:21:34 -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=Ie712FMU; 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 S240408AbhDSUpt (ORCPT + 99 others); Mon, 19 Apr 2021 16:45:49 -0400 Received: from mail.kernel.org ([198.145.29.99]:54422 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S242516AbhDSUoq (ORCPT ); Mon, 19 Apr 2021 16:44:46 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 47E6C613C9; Mon, 19 Apr 2021 20:44:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1618865056; bh=x2n7AHMk4xuQM/Nj3J0Y6kw8h5pEDWqP9+6+2bmkT/c=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Ie712FMUwc4UZgo28WsYxgaSvaCpWK8E5nOqH6QPxWgEtSexUVSw4f2pfaCWfjbzO T0W13KBJz7NxgGr1Elb/OYu3Gq/xGBGx/X2PQcpdkSKzlg6xaPBxUiS3ymzgniZChU tkU38SCYmW+cmC+GSas2T4umxvP+E52nz9nzdIM6gGE91rCVmTXfvnw2c8KtiLAn4T A5tlGjVdec5QsHMQKtzBm7uGkm0wA91ItvBF7YJs0O9Dcx6lvp9HtcScO8RxLo1/cz c41PTnlUbbycI6BQa8rlLGiQt/qBaPGJ941uYcIELmzVcLzMpRbNSmJaO4YK8YjZvT D2Oz2p9N7q6kg== 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 5.11 21/23] ia64: tools: remove duplicate definition of ia64_mf() on ia64 Date: Mon, 19 Apr 2021 16:43:40 -0400 Message-Id: <20210419204343.6134-21-sashal@kernel.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210419204343.6134-1-sashal@kernel.org> References: <20210419204343.6134-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 4d471d9511a5..6fffe5682713 100644 --- a/tools/arch/ia64/include/asm/barrier.h +++ b/tools/arch/ia64/include/asm/barrier.h @@ -39,9 +39,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