Received: by 2002:ab2:6857:0:b0:1ef:ffd0:ce49 with SMTP id l23csp2591191lqp; Mon, 25 Mar 2024 03:50:24 -0700 (PDT) X-Forwarded-Encrypted: i=3; AJvYcCVI4n+NorFUqLRMNNPTJjpmmpnmJ3moQCmlsy/H0x2iVW2QMhJQClWfOgL9ImZw7d0nEome8gRi9F90/IvytS62V7p755C46T+0dC1UnQ== X-Google-Smtp-Source: AGHT+IGris3UtbFot6ishTLa7ejfTEzOnc+lhOnxZUj8BlSKkZP+1QkNharOpZIAIkue5eryZIyy X-Received: by 2002:a17:902:f54f:b0:1e0:d62e:77d with SMTP id h15-20020a170902f54f00b001e0d62e077dmr239135plf.23.1711363824394; Mon, 25 Mar 2024 03:50:24 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1711363824; cv=pass; d=google.com; s=arc-20160816; b=YVKrbPLDskF68rFnDq8l+vA0KNfj4gGe1U7gITcQZNvdl1+5Yx56Nf/hCu6FpBqSFy WKccsNt3BJyJ9joxv8X180XWlpZc7esr2domi2yRXHKEqBgcPvgjAX0k+4Xy2mBMD0sU NE5EBlMkRCUcsmZSrSmZvpgpuAEs6lad7RePMOtPF0oKOnuggiOhIQfw8+VPQU82lA7p 6XeU8EvGbPuLdwlRXjiqhKokoZwT3Zu3+0EYrtozYKHlKVJDLbsfDKdj8phynXZ0wF07 p1aqOrxMW2TMnBDpKHcTp4SiIgvs0IJK1NU9MTvsZUFxTxK2nApr4idOf5k3jKIinNQT cS1g== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:list-unsubscribe :list-subscribe:list-id:precedence:references:in-reply-to:message-id :date:subject:cc:to:from:dkim-signature; bh=ZdNAUEgPO7MRcd7tyWAwfcCCb8XNsJn9zKg24zRCPig=; fh=usJ3xLYhd/SeAGG2BxBE7aqDb/8g5H/e+7bsrGDXp9M=; b=DdM0GDsCYShKJv9KJ0/5eZzk371YwMLfVN/xXKuq/rHjC8iNyEGvd50IpbkmFnrhUd 6JMhCZBjwHjnlyftG0c+2LKR21tX5lAs4S1x4FRkWqEDK9eWJV3fBMgGF/v/1UVgoAbO oo24Gb+naf+jNTfk3ikspROwH6h7mB9Re6Ecqg6CDnEf9FtLII1RdgA+/He2mDDQjOkg qHiRwc6Dy+twaMl1UgK9IFuozH9WTzqy/aeCcMGDyh/+8wzc+QKl5KZ324dVVJ95oU+4 0BwgkgP/yiKqb/y+iCjD6qUNQ5Tygt8PLjYdTDbzB8a7gcigFhwwiy5M+P06wf1Te865 TYhA==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=fTdsDpZ0; arc=pass (i=1 dkim=pass dkdomain=kernel.org); spf=pass (google.com: domain of linux-kernel+bounces-116176-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:40f1:3f00::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-116176-linux.lists.archive=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from sy.mirrors.kernel.org (sy.mirrors.kernel.org. [2604:1380:40f1:3f00::1]) by mx.google.com with ESMTPS id b2-20020a170903228200b001e0b5f5e9b1si2720375plh.442.2024.03.25.03.50.23 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 25 Mar 2024 03:50:24 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel+bounces-116176-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:40f1:3f00::1 as permitted sender) client-ip=2604:1380:40f1:3f00::1; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=fTdsDpZ0; arc=pass (i=1 dkim=pass dkdomain=kernel.org); spf=pass (google.com: domain of linux-kernel+bounces-116176-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:40f1:3f00::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-116176-linux.lists.archive=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by sy.mirrors.kernel.org (Postfix) with ESMTPS id 61BF0B427DD for ; Mon, 25 Mar 2024 10:22:49 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 599433B719E; Mon, 25 Mar 2024 03:33:08 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="fTdsDpZ0" Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 1C4E217C18C; Sun, 24 Mar 2024 23:42:36 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1711323757; cv=none; b=m+OiBS/Yg00jF2opejbcoKL7v2YaN2MmVmScVHMGFfFkZyNYl9O82ZxA6GgPcq/TiZsFOW72O3QFqUBpZ4auuRhgWlwSpleHdyY9Cqh5b78LDbg5PwgQo5rG6eyzJPjPZQoXKlqUdl6hQ91F9vmu261y1QuZHxBLFwY5K7a9JVM= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1711323757; c=relaxed/simple; bh=3vXI18eSmx91c3I9eECkPkzDJfQ1uc8BQ8OqRe3Mojw=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=G0ZsX+CT8OD+KGQ4aSpmyP+9M+Wv/tXi5kxI2G//bTtmtI7rgf7Bn+P850z5vni8Z1jfv2t1+hcSJW7B0asqhErKzu7lYOUlPSr5TD8MLCXOWwHNiLCTUmu1h3wEkyx+vWGfpagBFA51rFgapO/SZSABjhjy18HblggAR8CXxWU= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=fTdsDpZ0; arc=none smtp.client-ip=10.30.226.201 Received: by smtp.kernel.org (Postfix) with ESMTPSA id 2D58EC43394; Sun, 24 Mar 2024 23:42:35 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1711323756; bh=3vXI18eSmx91c3I9eECkPkzDJfQ1uc8BQ8OqRe3Mojw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=fTdsDpZ00zDNGuWC+MNSgKpL/5z6OvOVJy2Pos4F3dYVLnQ8KTBcPVkQdPrgkp2Dk 3LbEqKdlTR04rqcKdvpRZAXglWms4JpqwvozS4OdedMd/05xJ1Q25UIDDYqu41n+KZ YtSBiP80IdihOf1ngnmanZ9bwpBpdjFypLY3kOUQf5VxYYItTHQ8/GKbrhWBfyRYBf emb+jRILDVS3eSpYRag1dw41acIdpLE50jW7A90gppJka4xmJxtTFicmm5nJcxx8uw NoOs5U5/d+kSl4RXy16GT+jArcOpQzHpUClt099GZksJ1/ZpvT46lww9MFDLHc9XFw bUn8ohK7ZkpUQ== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Yang Jihong , Arnaldo Carvalho de Melo , Ian Rogers , Namhyung Kim , Sasha Levin Subject: [PATCH 5.10 130/238] perf evsel: Fix duplicate initialization of data->id in evsel__parse_sample() Date: Sun, 24 Mar 2024 19:38:38 -0400 Message-ID: <20240324234027.1354210-131-sashal@kernel.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240324234027.1354210-1-sashal@kernel.org> References: <20240324234027.1354210-1-sashal@kernel.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit From: Yang Jihong [ Upstream commit 4962aec0d684c8edb14574ccd0da53e4926ff834 ] data->id has been initialized at line 2362, remove duplicate initialization. Fixes: 3ad31d8a0df2 ("perf evsel: Centralize perf_sample initialization") Signed-off-by: Yang Jihong Reviewed-by: Arnaldo Carvalho de Melo Reviewed-by: Ian Rogers Signed-off-by: Namhyung Kim Link: https://lore.kernel.org/r/20240127025756.4041808-1-yangjihong1@huawei.com Signed-off-by: Sasha Levin --- tools/perf/util/evsel.c | 1 - 1 file changed, 1 deletion(-) diff --git a/tools/perf/util/evsel.c b/tools/perf/util/evsel.c index 1a1cbd16d76d4..d9a4c0202a8c3 100644 --- a/tools/perf/util/evsel.c +++ b/tools/perf/util/evsel.c @@ -2109,7 +2109,6 @@ int evsel__parse_sample(struct evsel *evsel, union perf_event *event, data->period = evsel->core.attr.sample_period; data->cpumode = event->header.misc & PERF_RECORD_MISC_CPUMODE_MASK; data->misc = event->header.misc; - data->id = -1ULL; data->data_src = PERF_MEM_DATA_SRC_NONE; if (event->header.type != PERF_RECORD_SAMPLE) { -- 2.43.0