From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pdx-out-009.esa.us-west-2.outbound.mail-perimeter.amazon.com (pdx-out-009.esa.us-west-2.outbound.mail-perimeter.amazon.com [35.155.198.111]) (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 E037532B99E; Thu, 25 Jun 2026 13:33:13 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=35.155.198.111 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1782394395; cv=none; b=a8MAxG5TPTqzQ3cr3pNItWMdTN4B6TyTY0XFql4txGMvWa8JTfz2X1xnmeyieXQTm+Ms9F+6JYkpSvbNv2KTw4MJGnMriLDVZ07XBT2Qh6hGYYHHZ/x8YZcXLbz8Ub1iawYxTQnwl+0qROtCnJfyirOMia6jwMF6RDN1XzQX+84= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1782394395; c=relaxed/simple; bh=SXhUwl+laSI9u/4qk/+IskF6bDfbnxjEkCdnyyGQ8hw=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=bGWBwzM6GmzxhfcawCi9+Hz6DzaNUpCZiSzjmxneZ52qUwm6Hax2B/pkYZusHXU7jqBQeBW1Pxo0pXzIF6akevPAab1Q49iI0IVV+mzilUlDiVP1R/ZYw6mTkDzYpO0L+Kz3LyKKIurYJksMEaxgIDDrJQo6frjjjpe8Z7JRMDE= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=amazon.de; spf=pass smtp.mailfrom=amazon.de; dkim=pass (2048-bit key) header.d=amazon.de header.i=@amazon.de header.b=Iubw0+xx; arc=none smtp.client-ip=35.155.198.111 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=amazon.de Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=amazon.de Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=amazon.de header.i=@amazon.de header.b="Iubw0+xx" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amazon.de; i=@amazon.de; q=dns/txt; s=amazoncorp2; t=1782394393; x=1813930393; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=1Pi1Ori/UusSIX4A+OO709SsxBMpol/iraNZc5CkFgM=; b=Iubw0+xxprPE/jeZIhDTHTfgMZno8K8xJqcCVubnu2xxvM8p1dj3x0j/ 04KRfFsZAXeA2aycRCeWciZTekogRohPQ/JKjXLkGHYX222w9BcCaAifT tF3e11JZW/Es2lfznQ+aj3jeckAC+ANjGKDVE8WBoztrcmswJ6zUpAneV s3aHsk3y23GNdnM2mKA8oKx+M2kVHyjjZcDaaLcwd2mRCxsMk/YKg8Zy6 h/yVt/juo3Ac0ERUPHop8N67e4QKbQYJ2DhhfAcCX7BDTtyLnkntCY1j3 yfnMX4rGFak5Dw63FZ0Co62xNGgNgsUUBp/lnKj8Lwh3MCgacN9GHCrcT g==; X-CSE-ConnectionGUID: ePwdvc6dSKadaXm6e8pX8Q== X-CSE-MsgGUID: cyEeNFEmQX+jt2p593ydzA== X-IronPort-AV: E=Sophos;i="6.24,224,1774310400"; d="scan'208";a="22378713" Received: from ip-10-5-12-219.us-west-2.compute.internal (HELO smtpout.naws.us-west-2.prod.farcaster.email.amazon.dev) ([10.5.12.219]) by internal-pdx-out-009.esa.us-west-2.outbound.mail-perimeter.amazon.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 25 Jun 2026 13:33:11 +0000 Received: from EX19MTAUWA002.ant.amazon.com [205.251.233.178:12286] by smtpin.naws.us-west-2.prod.farcaster.email.amazon.dev [10.0.37.116:2525] with esmtp (Farcaster) id 678a7bb4-0869-42dd-8705-9e4ab771808f; Thu, 25 Jun 2026 13:33:11 +0000 (UTC) X-Farcaster-Flow-ID: 678a7bb4-0869-42dd-8705-9e4ab771808f Received: from EX19D001UWA001.ant.amazon.com (10.13.138.214) by EX19MTAUWA002.ant.amazon.com (10.250.64.202) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA) id 15.2.2562.43; Thu, 25 Jun 2026 13:33:10 +0000 Received: from dev-dsk-simonlie-1b-ad174abf.eu-west-1.amazon.com (172.19.78.185) by EX19D001UWA001.ant.amazon.com (10.13.138.214) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA) id 15.2.2562.43; Thu, 25 Jun 2026 13:33:08 +0000 From: Simon Liebold To: Peter Zijlstra , Ingo Molnar , Arnaldo Carvalho de Melo , Mark Rutland , Alexander Shishkin , Jiri Olsa , "Namhyung Kim" , Simon Liebold , Ian Rogers , , , CC: Adrian Hunter , Paolo Bonzini , Sean Christopherson , "Arnaldo Carvalho de Melo" Subject: [PATCH 6.1.y 2/2] perf block-range: Move debug code behind ifndef NDEBUG Date: Thu, 25 Jun 2026 13:32:22 +0000 Message-ID: <20260625133222.3412820-3-simonlie@amazon.de> X-Mailer: git-send-email 2.50.1 In-Reply-To: <20260625133222.3412820-1-simonlie@amazon.de> References: <20260625133222.3412820-1-simonlie@amazon.de> Precedence: bulk X-Mailing-List: linux-perf-users@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-ClientProxiedBy: EX19D037UWB002.ant.amazon.com (10.13.138.121) To EX19D001UWA001.ant.amazon.com (10.13.138.214) Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit From: Ian Rogers [ Upstream commit 984a785f25e5b5db5fa673130b60dca6ca794406 ] Make good on a comment and avoid a unused-but-set-variable warning. Signed-off-by: Ian Rogers Cc: Adrian Hunter Cc: Alexander Shishkin Cc: Ingo Molnar Cc: Jiri Olsa Cc: Mark Rutland Cc: Namhyung Kim Cc: Paolo Bonzini Cc: Peter Zijlstra Cc: Sean Christopherson Link: https://lore.kernel.org/r/20230330183827.1412303-1-irogers@google.com Signed-off-by: Arnaldo Carvalho de Melo Stable-dep-of: 616b14b47a86 ("perf build: Conditionally define NDEBUG") Signed-off-by: Simon Liebold --- tools/perf/util/block-range.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/tools/perf/util/block-range.c b/tools/perf/util/block-range.c index 1be4326575013..680e92774d0cd 100644 --- a/tools/perf/util/block-range.c +++ b/tools/perf/util/block-range.c @@ -11,11 +11,7 @@ struct { static void block_range__debug(void) { - /* - * XXX still paranoid for now; see if we can make this depend on - * DEBUG=1 builds. - */ -#if 1 +#ifndef NDEBUG struct rb_node *rb; u64 old = 0; /* NULL isn't executable */ -- 2.50.1 Amazon Web Services Development Center Germany GmbH Tamara-Danz-Str. 13 10243 Berlin Geschaeftsfuehrung: Christof Hellmis, Andreas Stieger Eingetragen am Amtsgericht Charlottenburg unter HRB 257764 B Sitz: Berlin Ust-ID: DE 365 538 597