Received: by 2002:a05:6a10:a841:0:0:0:0 with SMTP id d1csp3405383pxy; Mon, 26 Apr 2021 00:33:33 -0700 (PDT) X-Google-Smtp-Source: ABdhPJy8rqNyRyLgyqN9Hs9DEaLXLe3kTKVbulL5edhdsAsfeO61LPODH2U/O/iQCCueJP9qnAJd X-Received: by 2002:a17:90b:e98:: with SMTP id fv24mr2219928pjb.1.1619422413080; Mon, 26 Apr 2021 00:33:33 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1619422413; cv=none; d=google.com; s=arc-20160816; b=ppcw12JgDeu9IW4iudcSK5sigCpJ2KAuIh7SArv4RE1oxjA09QOa8wehT5Rkr0uc0e dgFgTNuUwXbBHqe4NJlPm2/foK8tbaNWAxdx6D4drXxgZiEIPK9P4ShKtRXSaLloaqEp cEeBsAqUksedKTmyft8pw63lE7gBbF5hozqocSPgkfmeaXVxy58UX/N1mWp6fpKHhkt3 1oGnO1QvfTM4XgTolcitnwZrvyDoNXygTxCdSnlfWYIwEM6CfzNb/6Rl6vgpCZFzzE5W CcSfgQXoTNo9l2Xbvtn7FFV/xZem/9EyJrWfj9bMQ8HqaIJ7mX1Bz1C2UBNvcvJvRJ+8 fClA== 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 :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=ybFrSGfmUV4fLea1GKzrEhc/KwEAL6WXu0roJ/6LmbY=; b=yXnGzXGbhGn5SvXoTF/qqFL4gk3B24SuW0xPKqJpgvqbLi5wYBLD9JyrkdPjpTcOG9 dKPchInbejbPiE0W900ow7gOb09e+uRzbQAh0EFmIPWdTrs5a2yVUIGijqeAE4wfExLE TI+msq4NNoNaw6cVypxAEoZibv6p1Xpw0t5VRaQYRlIwcb3nYmYw+b8S3Q7fZXvLmoB3 zY0nzt0hwXikSP6CoIEtTa8fmnDf75buw/g6HykxLjwdlr9cI3Nm5hyubBTOArrnF95J Up6mvoq3TOZK5I16ByY/BYZdmypVBAjzo11mKetmNjyoU/MZI9YSh4Q1SA0dp/7KPDPf 9d5A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=CwUYrLvl; 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=linuxfoundation.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id s1si18031921plp.167.2021.04.26.00.33.20; Mon, 26 Apr 2021 00:33:33 -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=@linuxfoundation.org header.s=korg header.b=CwUYrLvl; 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=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232504AbhDZHc4 (ORCPT + 99 others); Mon, 26 Apr 2021 03:32:56 -0400 Received: from mail.kernel.org ([198.145.29.99]:44276 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232516AbhDZHct (ORCPT ); Mon, 26 Apr 2021 03:32:49 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id D400161077; Mon, 26 Apr 2021 07:32:07 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1619422328; bh=zDxJXd2qXq1dSCjtYIk8HjNfAOGtRtdfoj7hOk/H7d8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=CwUYrLvluErEJBEO6uDrm5zSs/GqaaMnh248fp8gwOwhYiN7T7EWQX2f3UVHJ5Nz6 Kn9Xzwaxm5Mzc8NT+wNfGuWNHuHOQkvi27RkRgTnJ0M6kEkkiUbmQ8Rw/dXnLGvCUN dC2+BR2q1hDUy2WIDjJNSepiTJWvJDAA+LQphEZg= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, John Paul Adrian Glaubitz , Andrew Morton , Linus Torvalds , Sasha Levin Subject: [PATCH 4.4 29/32] ia64: tools: remove duplicate definition of ia64_mf() on ia64 Date: Mon, 26 Apr 2021 09:29:27 +0200 Message-Id: <20210426072817.542932085@linuxfoundation.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210426072816.574319312@linuxfoundation.org> References: <20210426072816.574319312@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 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(-) --- 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()