From nobody Fri Oct 10 15:42:36 2025 Received: from galois.linutronix.de (Galois.linutronix.de [193.142.43.55]) (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 EDB5D2EBDFA; Fri, 13 Jun 2025 07:37:33 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=193.142.43.55 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1749800255; cv=none; b=iJ2XVAWJa+7i2TJ8To2oZZIIF6UZ5mTk419m8wwsdcC9Cf44hd1K5iwULbYUJoPXiwdBHmxh5nNpd9vJ17jQ4bZPCL35ZurWXZmjCRrZ2TiiZFGsbtgc3uTaNlNDcB03nRMjz+GinvzL0Dwhvb3P/rWO0GQAOE+eq480lAyZy1g= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1749800255; c=relaxed/simple; bh=J0DjSD11m1yvi3288GoGxHHXpY6y3lOvNDTKcHftiCI=; h=Date:From:To:Subject:Cc:In-Reply-To:References:MIME-Version: Message-ID:Content-Type; b=j9gLfIn/7D3YYSxKVQ+0XVcO+SEf9k2lwh14UsNOuKJ82b8ddXo0yEx6e/8L+GLBd7hYeuOfnVIchpoKkJymo9VkV/ODq45uH/BNpP8V96ZtE7O7iOJ50q21I9qk0avK1HdxrfJuurAIYBwiF4Q806c+MOAhUKtEBGhmpgXQ2aI= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linutronix.de; spf=pass smtp.mailfrom=linutronix.de; dkim=pass (2048-bit key) header.d=linutronix.de header.i=@linutronix.de header.b=jvkcfTeW; dkim=permerror (0-bit key) header.d=linutronix.de header.i=@linutronix.de header.b=f5SO3w7N; arc=none smtp.client-ip=193.142.43.55 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linutronix.de Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linutronix.de Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=linutronix.de header.i=@linutronix.de header.b="jvkcfTeW"; dkim=permerror (0-bit key) header.d=linutronix.de header.i=@linutronix.de header.b="f5SO3w7N" Date: Fri, 13 Jun 2025 07:37:31 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1749800252; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=HpyphSlymWeqrC1sPlQUPsY27E/OKIQJhOv+9zq//ss=; b=jvkcfTeWtQoXqJU6abIMKgZTXAQcqN7KSQKtzw/8s9AfphOpCLR5Z5V7RMBH1Ubbm28ts3 ZO9vsHLg7JqZr2qsjD8gDw81aYvt3np4+FK9wJ4Yd/a+CfeiWYo+07c4tbAyCl2vAqPicm Q4hVW8uMnM4Q9D91lfswre2lxAP50/MDImWfo5+MT1HwA/nogCZDQgJ5HPDsFhbggYBhup u4yM30HYnoTr1Xi65cj9NA7bw0ahwLix+Bn1gLCgjN7VcOZrsKmfqZgpkSfzWxU/uJZTGe NMgGIdR7uhcRD0flAAnuDE+b681gFQjnknc8IY7hjevo/G/ouvPP5gFxZCVJyQ== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1749800252; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=HpyphSlymWeqrC1sPlQUPsY27E/OKIQJhOv+9zq//ss=; b=f5SO3w7N369P017Ub6s71FNWUYUxhLzczoqPJtEMOO4zUJY8kShsfvNQ7lSnIAhuCFO9a4 Kxzpv6O85Om5B1AQ== From: "tip-bot2 for Ingo Molnar" Sender: tip-bot2@linutronix.de Reply-to: linux-kernel@vger.kernel.org To: linux-tip-commits@vger.kernel.org Subject: [tip: sched/core] sched: Clean up and standardize #if/#else/#endif markers in sched/psi.c Cc: Ingo Molnar , Peter Zijlstra , Dietmar Eggemann , Juri Lelli , Linus Torvalds , Mel Gorman , Sebastian Andrzej Siewior , Shrikanth Hegde , Steven Rostedt , Valentin Schneider , Vincent Guittot , x86@kernel.org, linux-kernel@vger.kernel.org In-Reply-To: <20250528080924.2273858-14-mingo@kernel.org> References: <20250528080924.2273858-14-mingo@kernel.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-ID: <174980025133.406.5247465925865801360.tip-bot2@tip-bot2> Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails Precedence: bulk Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable The following commit has been merged into the sched/core branch of tip: Commit-ID: fd3db705f7496c5d6b56ce8d78570dd1da11cd30 Gitweb: https://git.kernel.org/tip/fd3db705f7496c5d6b56ce8d78570dd1d= a11cd30 Author: Ingo Molnar AuthorDate: Wed, 28 May 2025 10:08:54 +02:00 Committer: Ingo Molnar CommitterDate: Fri, 13 Jun 2025 08:47:17 +02:00 sched: Clean up and standardize #if/#else/#endif markers in sched/psi.c - Use the standard #ifdef marker format for larger blocks, where appropriate: #if CONFIG_FOO ... #else /* !CONFIG_FOO: */ ... #endif /* !CONFIG_FOO */ Signed-off-by: Ingo Molnar Acked-by: Peter Zijlstra Cc: Dietmar Eggemann Cc: Juri Lelli Cc: Linus Torvalds Cc: Mel Gorman Cc: Sebastian Andrzej Siewior Cc: Shrikanth Hegde Cc: Steven Rostedt Cc: Valentin Schneider Cc: Vincent Guittot Link: https://lore.kernel.org/r/20250528080924.2273858-14-mingo@kernel.org --- kernel/sched/psi.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/kernel/sched/psi.c b/kernel/sched/psi.c index 333a7ba..5837cd8 100644 --- a/kernel/sched/psi.c +++ b/kernel/sched/psi.c @@ -1039,7 +1039,7 @@ void psi_account_irqtime(struct rq *rq, struct task_s= truct *curr, struct task_st psi_schedule_rtpoll_work(group, 1, false); } while ((group =3D group->parent)); } -#endif +#endif /* CONFIG_IRQ_TIME_ACCOUNTING */ =20 /** * psi_memstall_enter - mark the beginning of a memory stall section @@ -1655,7 +1655,7 @@ static const struct proc_ops psi_irq_proc_ops =3D { .proc_poll =3D psi_fop_poll, .proc_release =3D psi_fop_release, }; -#endif +#endif /* CONFIG_IRQ_TIME_ACCOUNTING */ =20 static int __init psi_proc_init(void) {