Received: by 2002:ab2:6857:0:b0:1ef:ffd0:ce49 with SMTP id l23csp2504387lqp; Mon, 25 Mar 2024 00:06:04 -0700 (PDT) X-Forwarded-Encrypted: i=3; AJvYcCWiZhuBK+cXlh144A15LpFFZfPY0GaXFmEGUc8M0mJf11c9p606jvABKtfnzNBamqrcqq4X/lBaSC37SJ3MwjMmTxTwN9uTp0bZCAr4Gw== X-Google-Smtp-Source: AGHT+IFryJMZxLJZFvdOV2SlyCGToAhmAJUvCuVMvcuXI2f8rlulTuQODbRFbZlXp8E0+GrUA3q0 X-Received: by 2002:a05:6214:1c47:b0:68f:ab60:785d with SMTP id if7-20020a0562141c4700b0068fab60785dmr7315201qvb.11.1711350363777; Mon, 25 Mar 2024 00:06:03 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1711350363; cv=pass; d=google.com; s=arc-20160816; b=TxCvw4s+2gqrrW8hB0kbXILDSRqD+zoYsiJ6Ug7ct8qkcz36QjGf7l5AXo6FaS/7ml gH8bWoo9Is9/eYV8TJM3Gevrwm1R4bXY7VmvqrtPoQmsv6ryQgJx4b1VSSJya/fpvdgy sk4ZnHSXlJMRirW5R0rXvQmUMO68HHJH7OE8xTpItiyKFI1muFC2JABWFX/TKtou9xoK AsqkWCVQ7/eXlf9KNIPxE6S+LjWfrml1W+aLIdjMVVOg3YGvBQlXa64TwiUkwTvHF4Qg dkTFJXFjSoQ6Nl6cNGAJ8nreoJ0rCx72XSET84z1E07Gt13b0LLcUb7+q8wTfYrlQ/RA Eg9g== 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=m1hwzLFvXzKvhGofvepyGOQhdZUp4zpHadGjpC1dQ3A=; fh=usJ3xLYhd/SeAGG2BxBE7aqDb/8g5H/e+7bsrGDXp9M=; b=sdPLJ4sTI6vYyGX/KMGTHNFlzqtbI1KbfpPfHcYHQNZwgltcU0d5+Hl0BYOGy2EGqQ WBzUZumx2LLlbBfOPIGffTYyf6w+0F8I3CvEMzyLcrkyQKVo7pVR5c5oDbYwB+imi0gR 6YdAKZH5iWyKNKkyQvd+dyl7qvcRg+zYMKgpid48XvT10zjv1i/JjgpxaHeUL/KvTooL 8xtfvFYRHHj8oME2Tb+kLGWJjZ4QOS9ZSpNOpOn5Id7lLTusfqbfBN80MkBLjjwjrcQn QfJM/4ofyBGb/21LzRn2fXPFJEp0oi2kL/a9ZVi5wCstlH9FZvj0fxCP0bR0m72hyTmn r/iw==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=ixw9U5yN; arc=pass (i=1 dkim=pass dkdomain=kernel.org); spf=pass (google.com: domain of linux-kernel+bounces-114841-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.199.223 as permitted sender) smtp.mailfrom="linux-kernel+bounces-114841-linux.lists.archive=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from ny.mirrors.kernel.org (ny.mirrors.kernel.org. [147.75.199.223]) by mx.google.com with ESMTPS id ke4-20020a056214300400b0068f08c94871si6962445qvb.513.2024.03.25.00.06.03 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 25 Mar 2024 00:06:03 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel+bounces-114841-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.199.223 as permitted sender) client-ip=147.75.199.223; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=ixw9U5yN; arc=pass (i=1 dkim=pass dkdomain=kernel.org); spf=pass (google.com: domain of linux-kernel+bounces-114841-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.199.223 as permitted sender) smtp.mailfrom="linux-kernel+bounces-114841-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 ny.mirrors.kernel.org (Postfix) with ESMTPS id 7EC5E1C2E156 for ; Mon, 25 Mar 2024 07:06:03 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 439BB2C50CB; Mon, 25 Mar 2024 00:53:01 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="ixw9U5yN" 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 8BDEF13C662; Sun, 24 Mar 2024 23:37:56 +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=1711323477; cv=none; b=I2/FnJUJ1EGR3BCEyDcsiDztfXayt+Krim7dSHPDreJI69Ndmn9ymZYWk955FtONRJnygf3aKxGBeiKrAfbSh5rYK83hud/U6MBO/5DW1By3kO9cn6DE00DQjZIGRiC+BPUmzpjv1SYyg53HfdT0wx6VAMWxu8k0BsdTskdM6x4= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1711323477; c=relaxed/simple; bh=lqgJ4pjtgnbZVl4rOq7wjtiKpzEeNfUDxzln4C2LXAs=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=LmpwpdyvNnzchxp3QnRCuKfQZsT5YtkAz+1alrUfHZjv472ZWTUZ1tETLEdRHJ3MdwnelvJ1iKU1QzB3mk2ezCEy4iCj4+Xyve4Cf9/Qs50tCzxVkkxS5MCVpSNMcaaUJRHQ270ngJ31e/Rz0A0FmSNuLwB9XSPBcWF1tXdQFYM= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=ixw9U5yN; arc=none smtp.client-ip=10.30.226.201 Received: by smtp.kernel.org (Postfix) with ESMTPSA id 57E21C433C7; Sun, 24 Mar 2024 23:37:55 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1711323476; bh=lqgJ4pjtgnbZVl4rOq7wjtiKpzEeNfUDxzln4C2LXAs=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ixw9U5yNhdfqKo78dN2T+npwgeWflu/Ghl/o8E3l5utHuOkXz6Rw2xcioBu2mHWIa DeNgy562wK4rUTjUkXSevWgF8E9hfHyvAzcaucyqTMjv1fyTwuQG+Bc8SOgaIdCrZi t0Q5ypChB1YiWtDPxdhsZr3EFJjoGm3POrOTrflgVKtyaT/+11krbdclXD96uN84AV yLVJmlUBBn0lJai0ElLOH9UC65o2Lf+c9LTpCAd6VyGf2wq3oXAkp2nQXcAuz9uP/F J32xrxbi/jipJ/s9roOpUcsHh/m4MPB9qAWouES6/GWoFSIzHWu2y8gkGSxAZTL/P9 YtW/Pe0mOZKZQ== 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.15 180/317] perf evsel: Fix duplicate initialization of data->id in evsel__parse_sample() Date: Sun, 24 Mar 2024 19:32:40 -0400 Message-ID: <20240324233458.1352854-181-sashal@kernel.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240324233458.1352854-1-sashal@kernel.org> References: <20240324233458.1352854-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 c87f9974c0c10..c19a583ca9f66 100644 --- a/tools/perf/util/evsel.c +++ b/tools/perf/util/evsel.c @@ -2252,7 +2252,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