From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
To: linux-kernel@vger.kernel.org
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
stable@vger.kernel.org,
John Paul Adrian Glaubitz <glaubitz@physik.fu-berlin.de>,
Andrew Morton <akpm@linux-foundation.org>,
Linus Torvalds <torvalds@linux-foundation.org>,
Sasha Levin <sashal@kernel.org>
Subject: [PATCH 5.4 19/20] ia64: tools: remove duplicate definition of ia64_mf() on ia64
Date: Mon, 26 Apr 2021 09:30:10 +0200 [thread overview]
Message-ID: <20210426072817.323224583@linuxfoundation.org> (raw)
In-Reply-To: <20210426072816.686976183@linuxfoundation.org>
From: John Paul Adrian Glaubitz <glaubitz@physik.fu-berlin.de>
[ Upstream commit f4bf09dc3aaa4b07cd15630f2023f68cb2668809 ]
The ia64_mf() macro defined in tools/arch/ia64/include/asm/barrier.h is
already defined in <asm/gcc_intrin.h> 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 <glaubitz@physik.fu-berlin.de>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
---
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
next prev parent reply other threads:[~2021-04-26 7:42 UTC|newest]
Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-04-26 7:29 [PATCH 5.4 00/20] 5.4.115-rc1 review Greg Kroah-Hartman
2021-04-26 7:29 ` [PATCH 5.4 01/20] s390/ptrace: return -ENOSYS when invalid syscall is supplied Greg Kroah-Hartman
2021-04-26 7:29 ` [PATCH 5.4 02/20] gpio: omap: Save and restore sysconfig Greg Kroah-Hartman
2021-04-26 7:29 ` [PATCH 5.4 03/20] pinctrl: lewisburg: Update number of pins in community Greg Kroah-Hartman
2021-04-26 7:29 ` [PATCH 5.4 04/20] arm64: dts: allwinner: Revert SD card CD GPIO for Pine64-LTS Greg Kroah-Hartman
2021-04-26 7:29 ` [PATCH 5.4 05/20] locking/qrwlock: Fix ordering in queued_write_lock_slowpath() Greg Kroah-Hartman
2021-04-26 7:29 ` [PATCH 5.4 06/20] perf/x86/intel/uncore: Remove uncore extra PCI dev HSWEP_PCI_PCU_3 Greg Kroah-Hartman
2021-04-26 7:29 ` [PATCH 5.4 07/20] perf/x86/kvm: Fix Broadwell Xeon stepping in isolation_ucodes[] Greg Kroah-Hartman
2021-04-26 7:29 ` [PATCH 5.4 08/20] perf auxtrace: Fix potential NULL pointer dereference Greg Kroah-Hartman
2021-04-26 7:30 ` [PATCH 5.4 09/20] HID: google: add don USB id Greg Kroah-Hartman
2021-04-26 7:30 ` [PATCH 5.4 10/20] HID: alps: fix error return code in alps_input_configured() Greg Kroah-Hartman
2021-04-26 7:30 ` [PATCH 5.4 11/20] HID: wacom: Assign boolean values to a bool variable Greg Kroah-Hartman
2021-04-26 7:30 ` [PATCH 5.4 12/20] ARM: dts: Fix swapped mmc order for omap3 Greg Kroah-Hartman
2021-04-26 7:30 ` [PATCH 5.4 13/20] net: geneve: check skb is large enough for IPv4/IPv6 header Greg Kroah-Hartman
2021-04-26 7:30 ` [PATCH 5.4 14/20] s390/entry: save the caller of psw_idle Greg Kroah-Hartman
2021-04-26 7:30 ` [PATCH 5.4 15/20] xen-netback: Check for hotplug-status existence before watching Greg Kroah-Hartman
2021-04-26 7:30 ` [PATCH 5.4 16/20] cavium/liquidio: Fix duplicate argument Greg Kroah-Hartman
2021-04-26 7:30 ` [PATCH 5.4 17/20] csky: change a Kconfig symbol name to fix e1000 build error Greg Kroah-Hartman
2021-04-26 7:30 ` [PATCH 5.4 18/20] ia64: fix discontig.c section mismatches Greg Kroah-Hartman
2021-04-26 7:30 ` Greg Kroah-Hartman [this message]
2021-04-26 7:30 ` [PATCH 5.4 20/20] x86/crash: Fix crash_setup_memmap_entries() out-of-bounds access Greg Kroah-Hartman
2021-04-26 13:04 ` [PATCH 5.4 00/20] 5.4.115-rc1 review Jon Hunter
2021-04-26 17:10 ` Florian Fainelli
2021-04-26 18:34 ` Guenter Roeck
2021-04-26 20:31 ` Sudip Mukherjee
2021-04-26 23:46 ` Shuah Khan
2021-04-27 2:12 ` Samuel Zou
2021-04-27 6:33 ` Naresh Kamboju
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210426072817.323224583@linuxfoundation.org \
--to=gregkh@linuxfoundation.org \
--cc=akpm@linux-foundation.org \
--cc=glaubitz@physik.fu-berlin.de \
--cc=linux-kernel@vger.kernel.org \
--cc=sashal@kernel.org \
--cc=stable@vger.kernel.org \
--cc=torvalds@linux-foundation.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).