mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: "tip-bot2 for Ingo Molnar" <tip-bot2@linutronix.de>
To: linux-tip-commits@vger.kernel.org
Cc: Ingo Molnar <mingo@kernel.org>,
	Peter Zijlstra <peterz@infradead.org>,
	Dietmar Eggemann <dietmar.eggemann@arm.com>,
	Juri Lelli <juri.lelli@redhat.com>,
	Linus Torvalds <torvalds@linux-foundation.org>,
	Mel Gorman <mgorman@suse.de>,
	Sebastian Andrzej Siewior <bigeasy@linutronix.de>,
	Shrikanth Hegde <sshegde@linux.ibm.com>,
	Steven Rostedt <rostedt@goodmis.org>,
	Valentin Schneider <vschneid@redhat.com>,
	Vincent Guittot <vincent.guittot@linaro.org>,
	x86@kernel.org, linux-kernel@vger.kernel.org
Subject: [tip: sched/core] sched: Clean up and standardize #if/#else/#endif markers in sched/psi.c
Date: Fri, 13 Jun 2025 07:37:31 -0000	[thread overview]
Message-ID: <174980025133.406.5247465925865801360.tip-bot2@tip-bot2> (raw)
In-Reply-To: <20250528080924.2273858-14-mingo@kernel.org>

The following commit has been merged into the sched/core branch of tip:

Commit-ID:     fd3db705f7496c5d6b56ce8d78570dd1da11cd30
Gitweb:        https://git.kernel.org/tip/fd3db705f7496c5d6b56ce8d78570dd1da11cd30
Author:        Ingo Molnar <mingo@kernel.org>
AuthorDate:    Wed, 28 May 2025 10:08:54 +02:00
Committer:     Ingo Molnar <mingo@kernel.org>
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 <mingo@kernel.org>
Acked-by: Peter Zijlstra <peterz@infradead.org>
Cc: Dietmar Eggemann <dietmar.eggemann@arm.com>
Cc: Juri Lelli <juri.lelli@redhat.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Mel Gorman <mgorman@suse.de>
Cc: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
Cc: Shrikanth Hegde <sshegde@linux.ibm.com>
Cc: Steven Rostedt <rostedt@goodmis.org>
Cc: Valentin Schneider <vschneid@redhat.com>
Cc: Vincent Guittot <vincent.guittot@linaro.org>
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_struct *curr, struct task_st
 			psi_schedule_rtpoll_work(group, 1, false);
 	} while ((group = group->parent));
 }
-#endif
+#endif /* CONFIG_IRQ_TIME_ACCOUNTING */
 
 /**
  * psi_memstall_enter - mark the beginning of a memory stall section
@@ -1655,7 +1655,7 @@ static const struct proc_ops psi_irq_proc_ops = {
 	.proc_poll	= psi_fop_poll,
 	.proc_release	= psi_fop_release,
 };
-#endif
+#endif /* CONFIG_IRQ_TIME_ACCOUNTING */
 
 static int __init psi_proc_init(void)
 {

  reply	other threads:[~2025-06-13  7:37 UTC|newest]

Thread overview: 95+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2025-05-28  8:08 [PATCH 00/43] sched: Use the SMP scheduler on UP too Ingo Molnar
2025-05-28  8:08 ` [PATCH 01/43] sched: Clean up and standardize #if/#else/#endif markers in sched/autogroup.[ch] Ingo Molnar
2025-05-30  2:29   ` Sohil Mehta
2025-06-13  7:37   ` [tip: sched/core] " tip-bot2 for Ingo Molnar
2025-05-28  8:08 ` [PATCH 02/43] sched: Clean up and standardize #if/#else/#endif markers in sched/clock.c Ingo Molnar
2025-06-13  7:37   ` [tip: sched/core] " tip-bot2 for Ingo Molnar
2025-05-28  8:08 ` [PATCH 03/43] sched: Clean up and standardize #if/#else/#endif markers in sched/core.c Ingo Molnar
2025-06-13  7:37   ` [tip: sched/core] " tip-bot2 for Ingo Molnar
2025-05-28  8:08 ` [PATCH 04/43] sched: Clean up and standardize #if/#else/#endif markers in sched/cpufreq_schedutil.c Ingo Molnar
2025-06-13  7:37   ` [tip: sched/core] " tip-bot2 for Ingo Molnar
2025-05-28  8:08 ` [PATCH 05/43] sched: Clean up and standardize #if/#else/#endif markers in sched/cpupri.h Ingo Molnar
2025-06-13  7:37   ` [tip: sched/core] " tip-bot2 for Ingo Molnar
2025-05-28  8:08 ` [PATCH 06/43] sched: Clean up and standardize #if/#else/#endif markers in sched/cputime.c Ingo Molnar
2025-06-13  7:37   ` [tip: sched/core] " tip-bot2 for Ingo Molnar
2025-05-28  8:08 ` [PATCH 07/43] sched: Clean up and standardize #if/#else/#endif markers in sched/deadline.c Ingo Molnar
2025-06-13  7:37   ` [tip: sched/core] " tip-bot2 for Ingo Molnar
2025-05-28  8:08 ` [PATCH 08/43] sched: Clean up and standardize #if/#else/#endif markers in sched/debug.c Ingo Molnar
2025-06-13  7:37   ` [tip: sched/core] " tip-bot2 for Ingo Molnar
2025-05-28  8:08 ` [PATCH 09/43] sched: Clean up and standardize #if/#else/#endif markers in sched/fair.c Ingo Molnar
2025-06-13  7:37   ` [tip: sched/core] " tip-bot2 for Ingo Molnar
2025-05-28  8:08 ` [PATCH 10/43] sched: Clean up and standardize #if/#else/#endif markers in sched/idle.c Ingo Molnar
2025-06-13  7:37   ` [tip: sched/core] " tip-bot2 for Ingo Molnar
2025-05-28  8:08 ` [PATCH 11/43] sched: Clean up and standardize #if/#else/#endif markers in sched/loadavg.c Ingo Molnar
2025-06-13  7:37   ` [tip: sched/core] " tip-bot2 for Ingo Molnar
2025-05-28  8:08 ` [PATCH 12/43] sched: Clean up and standardize #if/#else/#endif markers in sched/pelt.[ch] Ingo Molnar
2025-06-13  7:37   ` [tip: sched/core] " tip-bot2 for Ingo Molnar
2025-05-28  8:08 ` [PATCH 13/43] sched: Clean up and standardize #if/#else/#endif markers in sched/psi.c Ingo Molnar
2025-06-13  7:37   ` tip-bot2 for Ingo Molnar [this message]
2025-05-28  8:08 ` [PATCH 14/43] sched: Clean up and standardize #if/#else/#endif markers in sched/rt.c Ingo Molnar
2025-06-13  7:37   ` [tip: sched/core] " tip-bot2 for Ingo Molnar
2025-05-28  8:08 ` [PATCH 15/43] sched: Clean up and standardize #if/#else/#endif markers in sched/sched.h Ingo Molnar
2025-06-13  7:37   ` [tip: sched/core] " tip-bot2 for Ingo Molnar
2025-05-28  8:08 ` [PATCH 16/43] sched: Clean up and standardize #if/#else/#endif markers in sched/stats.[ch] Ingo Molnar
2025-06-13  7:37   ` [tip: sched/core] " tip-bot2 for Ingo Molnar
2025-05-28  8:08 ` [PATCH 17/43] sched: Clean up and standardize #if/#else/#endif markers in sched/syscalls.c Ingo Molnar
2025-06-13  7:37   ` [tip: sched/core] " tip-bot2 for Ingo Molnar
2025-05-28  8:08 ` [PATCH 18/43] sched: Clean up and standardize #if/#else/#endif markers in sched/topology.c Ingo Molnar
2025-06-13  7:37   ` [tip: sched/core] " tip-bot2 for Ingo Molnar
2025-05-28  8:09 ` [PATCH 19/43] sched/smp: Always define sched_domains_mutex_lock()/unlock(), def_root_domain and sched_domains_mutex Ingo Molnar
2025-05-28  8:14   ` [PATCH 20/43] sched/smp: Make SMP unconditional Ingo Molnar
2025-06-13  7:37   ` [tip: sched/core] sched/smp: Always define sched_domains_mutex_lock()/unlock(), def_root_domain and sched_domains_mutex tip-bot2 for Ingo Molnar
2025-05-28  8:09 ` [PATCH 20/43] sched/smp: Make SMP unconditional Ingo Molnar
2025-06-13  7:37   ` [tip: sched/core] " tip-bot2 for Ingo Molnar
2025-05-28  8:09 ` [PATCH 21/43] sched/smp: Always define is_percpu_thread() and scheduler_ipi() Ingo Molnar
2025-06-13  7:37   ` [tip: sched/core] " tip-bot2 for Ingo Molnar
2025-05-28  8:09 ` [PATCH 22/43] sched/smp: Always define rq->hrtick_csd Ingo Molnar
2025-06-13  7:37   ` [tip: sched/core] " tip-bot2 for Ingo Molnar
2025-05-28  8:09 ` [PATCH 23/43] sched/smp: Use the SMP version of try_to_wake_up() Ingo Molnar
2025-06-13  7:37   ` [tip: sched/core] " tip-bot2 for Ingo Molnar
2025-05-28  8:09 ` [PATCH 24/43] sched/smp: Use the SMP version of __task_needs_rq_lock() Ingo Molnar
2025-06-13  7:37   ` [tip: sched/core] " tip-bot2 for Ingo Molnar
2025-05-28  8:09 ` [PATCH 25/43] sched/smp: Use the SMP version of wake_up_new_task() Ingo Molnar
2025-06-13  7:37   ` [tip: sched/core] " tip-bot2 for Ingo Molnar
2025-05-28  8:09 ` [PATCH 26/43] sched/smp: Use the SMP version of sched_exec() Ingo Molnar
2025-06-13  7:37   ` [tip: sched/core] " tip-bot2 for Ingo Molnar
2025-05-28  8:09 ` [PATCH 27/43] sched/smp: Use the SMP version of idle_thread_set_boot_cpu() Ingo Molnar
2025-06-13  7:37   ` [tip: sched/core] " tip-bot2 for Ingo Molnar
2025-05-28  8:09 ` [PATCH 28/43] sched/smp: Use the SMP version of the RT scheduling class Ingo Molnar
2025-06-13  7:37   ` [tip: sched/core] " tip-bot2 for Ingo Molnar
2025-05-28  8:09 ` [PATCH 29/43] sched/smp: Use the SMP version of the deadline " Ingo Molnar
2025-06-13  7:37   ` [tip: sched/core] " tip-bot2 for Ingo Molnar
2025-05-28  8:09 ` [PATCH 30/43] sched/smp: Use the SMP version of scheduler debugging data Ingo Molnar
2025-06-13  7:37   ` [tip: sched/core] " tip-bot2 for Ingo Molnar
2025-05-28  8:09 ` [PATCH 31/43] sched/smp: Use the SMP version of schedstats Ingo Molnar
2025-06-13  7:37   ` [tip: sched/core] " tip-bot2 for Ingo Molnar
2025-05-28  8:09 ` [PATCH 32/43] sched/smp: Use the SMP version of the scheduler syscalls Ingo Molnar
2025-06-13  7:37   ` [tip: sched/core] " tip-bot2 for Ingo Molnar
2025-05-28  8:09 ` [PATCH 33/43] sched/smp: Use the SMP version of sched_update_asym_prefer_cpu() Ingo Molnar
2025-06-13  7:37   ` [tip: sched/core] " tip-bot2 for Ingo Molnar
2025-05-28  8:09 ` [PATCH 34/43] sched/smp: Use the SMP version of the idle scheduling class Ingo Molnar
2025-06-13  7:37   ` [tip: sched/core] " tip-bot2 for Ingo Molnar
2025-05-28  8:09 ` [PATCH 35/43] sched/smp: Use the SMP version of the stop-CPU " Ingo Molnar
2025-06-13  7:37   ` [tip: sched/core] " tip-bot2 for Ingo Molnar
2025-05-28  8:09 ` [PATCH 36/43] sched/smp: Use the SMP version of cpu_of() Ingo Molnar
2025-06-13  7:37   ` [tip: sched/core] " tip-bot2 for Ingo Molnar
2025-05-28  8:09 ` [PATCH 37/43] sched/smp: Use the SMP version of is_migration_disabled() Ingo Molnar
2025-06-13  7:37   ` [tip: sched/core] " tip-bot2 for Ingo Molnar
2025-05-28  8:09 ` [PATCH 38/43] sched/smp: Use the SMP version of rq_pin_lock() Ingo Molnar
2025-06-13  7:37   ` [tip: sched/core] " tip-bot2 for Ingo Molnar
2025-05-28  8:09 ` [PATCH 39/43] sched/smp: Use the SMP version of task_on_cpu() Ingo Molnar
2025-06-13  7:37   ` [tip: sched/core] " tip-bot2 for Ingo Molnar
2025-05-28  8:09 ` [PATCH 40/43] sched/smp: Use the SMP version of WF_ and SD_ flag sanity checks Ingo Molnar
2025-06-13  7:37   ` [tip: sched/core] " tip-bot2 for Ingo Molnar
2025-05-28  8:09 ` [PATCH 41/43] sched/smp: Use the SMP version of ENQUEUE_MIGRATED Ingo Molnar
2025-06-13  7:37   ` [tip: sched/core] " tip-bot2 for Ingo Molnar
2025-05-28  8:09 ` [PATCH 42/43] sched/smp: Use the SMP version of add_nr_running() Ingo Molnar
2025-06-13  7:37   ` [tip: sched/core] " tip-bot2 for Ingo Molnar
2025-05-28  8:09 ` [PATCH 43/43] sched/smp: Use the SMP version of double_rq_clock_clear_update() Ingo Molnar
2025-06-13  7:37   ` [tip: sched/core] " tip-bot2 for Ingo Molnar
2025-05-28  8:58 ` [PATCH 00/43] sched: Use the SMP scheduler on UP too Peter Zijlstra
2025-05-28 14:00   ` Steven Rostedt
2025-05-28 16:10     ` Peter Zijlstra
2025-05-28 16:21       ` Steven Rostedt
2025-05-29  6:42   ` Ingo Molnar
2025-05-30  9:34 ` [PATCH] sched: Break dependency loop between sched.h and preempt.h Herbert Xu

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=174980025133.406.5247465925865801360.tip-bot2@tip-bot2 \
    --to=tip-bot2@linutronix.de \
    --cc=bigeasy@linutronix.de \
    --cc=dietmar.eggemann@arm.com \
    --cc=juri.lelli@redhat.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-tip-commits@vger.kernel.org \
    --cc=mgorman@suse.de \
    --cc=mingo@kernel.org \
    --cc=peterz@infradead.org \
    --cc=rostedt@goodmis.org \
    --cc=sshegde@linux.ibm.com \
    --cc=torvalds@linux-foundation.org \
    --cc=vincent.guittot@linaro.org \
    --cc=vschneid@redhat.com \
    --cc=x86@kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

all inboxes | Powered by JetHome®