Received: by 2002:a25:683:0:0:0:0:0 with SMTP id 125csp691273ybg; Mon, 1 Jun 2020 11:48:09 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzQTT38pqAsDZnrm10TdJEu8BN4MxyeIqzUGVofgrhvzhIWLBCLnGFuVSuNU1Fy1R3/4XAR X-Received: by 2002:a17:906:2a84:: with SMTP id l4mr20117940eje.6.1591037289595; Mon, 01 Jun 2020 11:48:09 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1591037289; cv=none; d=google.com; s=arc-20160816; b=Ye9jKNlgIq08cku469A8s/WYU6iV92NNwWdZx3fI5+PZzSd2Y5e9pWLu8wjNSNv0ni iskAk5fu61inZcUmTR01xxXrmeyALhaFbN/ge3ew9j7B/gUXKLejt+eUaWGwNChx219U G9xW+Qy6hfMiskwU+j+hTeae+8aWQPWI1LPJeorzCe4BT6ZXzVx78nYbJSsCJz2XAYVq JN33fmTY6eOjDWYQCHtmTSmdoWsSrRCS2sfO9osc5zB8TT8uX+7vScMaCJMY5zEgYkuq GXAYu5RTCL0O9BRM5PvipR5gMQ3C45BsHXzo7ak4XNsZNF84SetatwdoA2DFnfUtdSyd lgpg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=SLW28K6bSkZO8GBYNvqdhnfZpFgMVOc1t4rTHPURPDk=; b=TDvmlsdi2uoT9ksQD37pvldLBzYOUJyNrI3eVTnumn3dxKyCu6cgbY+rEH6PWIbEym NTxXMgCuhb1rhP6A7e8dMe8Ivv+sYDV+jmhzeoLZ6KnYKUYxgrHbNH2idehz6FoYFeIU o2dqcnVa3DYQfqdj7FI61jOwjziFvgBP50Dk0bM3UEmVSeZxu894TwoSWfveQwLVtOVu uWsPCgUW0jObjFsvpYmFF179PE6sghYvghGfDaIugp5pP0VLVCN8U+PkMqX4OZSeRNk7 nNxPt45no/K7fEqnjgahrrVQEbIORoyYH8UqOZDvUE0sM/wlWY0QA9lDciRCwp0ZuDYD mL6g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=WOIgVf3T; 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 Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id p2si174863ejr.544.2020.06.01.11.47.45; Mon, 01 Jun 2020 11:48:09 -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=default header.b=WOIgVf3T; 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 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730310AbgFASqH (ORCPT + 99 others); Mon, 1 Jun 2020 14:46:07 -0400 Received: from mail.kernel.org ([198.145.29.99]:55194 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730796AbgFASIz (ORCPT ); Mon, 1 Jun 2020 14:08:55 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id A4D422068D; Mon, 1 Jun 2020 18:08:54 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1591034935; bh=MbeZa4VffzmxWAR8MGy0BeRxIsWisBaIT8gBRIYAzuI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=WOIgVf3T3y2oOIrVRWHULYOxiZ/RpmVZ7x/TUPdpxC3tAT37p5uM+ijD1WJK0oRZl ZK1+u0xzyKTM2X9FglzxCCoWufVA1D8Azr2P8/jD0qNSue4lzsblFH7zrCvVkOyDlM SsFYY+QlILkxcgYb7Ecku1f8jPpRgxLZOaNU2Vmo= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Matteo Croce , Alexei Starovoitov , Yonghong Song , Sasha Levin Subject: [PATCH 5.4 061/142] samples: bpf: Fix build error Date: Mon, 1 Jun 2020 19:53:39 +0200 Message-Id: <20200601174044.263469330@linuxfoundation.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200601174037.904070960@linuxfoundation.org> References: <20200601174037.904070960@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Matteo Croce [ Upstream commit 23ad04669f81f958e9a4121b0266228d2eb3c357 ] GCC 10 is very strict about symbol clash, and lwt_len_hist_user contains a symbol which clashes with libbpf: /usr/bin/ld: samples/bpf/lwt_len_hist_user.o:(.bss+0x0): multiple definition of `bpf_log_buf'; samples/bpf/bpf_load.o:(.bss+0x8c0): first defined here collect2: error: ld returned 1 exit status bpf_log_buf here seems to be a leftover, so removing it. Signed-off-by: Matteo Croce Signed-off-by: Alexei Starovoitov Acked-by: Yonghong Song Link: https://lore.kernel.org/bpf/20200511113234.80722-1-mcroce@redhat.com Signed-off-by: Sasha Levin --- samples/bpf/lwt_len_hist_user.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/samples/bpf/lwt_len_hist_user.c b/samples/bpf/lwt_len_hist_user.c index 587b68b1f8dd..430a4b7e353e 100644 --- a/samples/bpf/lwt_len_hist_user.c +++ b/samples/bpf/lwt_len_hist_user.c @@ -15,8 +15,6 @@ #define MAX_INDEX 64 #define MAX_STARS 38 -char bpf_log_buf[BPF_LOG_BUF_SIZE]; - static void stars(char *str, long val, long max, int width) { int i; -- 2.25.1