From nobody Mon Dec 1 22:00:24 2025 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 7E39D10F1 for ; Mon, 1 Dec 2025 06:47:05 +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=1764571625; cv=none; b=XOu5B7Z6YqNGVD0UqhgxNmb58W8BcPlMv94FexbvNelcOieb5d/9RB98ajSCs8Wb3/6SLzQyKveJX64Zo3lM9oWDFURAvbaYTHXvBIO7X070YAd/waH7VGQGS0+Kgwt6MoIdnQTcJBrgZtFe4eKHlf10Jx44Gofsvt5u6Oai3R8= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1764571625; c=relaxed/simple; bh=d6KM/uAc3610WrsLA2cfidg91+4iq0j2UQnvFJ8L8Dg=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=XizzfGxvMclguYPECgvdIREVXLPkxqzVQwtfjU0lqS4eLz4QsTbetLjwfPx5+0LkKMmuHxzV+brQMVtCD6Jvi2o7aDUwI+vQXixdNUDkgXna+Px1TmHy/SgdQVC14dwn2tv2j9U0Q0a6B9dNLnf10rrtQhPU2TmJhlXzmXIh+dA= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=qNFQ0cvI; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="qNFQ0cvI" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 49E3FC116D0; Mon, 1 Dec 2025 06:47:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1764571625; bh=d6KM/uAc3610WrsLA2cfidg91+4iq0j2UQnvFJ8L8Dg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=qNFQ0cvIZUsXuPE/Tfvw4X+ecwAmvbxBQ4L71/JpQX4cUKxfIY2PrA00qZj6BNXFG rLzEtkSh6aLzQGUAnLPgOijP03evdpSO7hvXiodbUX1X82KReMigHWKI0SzGoYLWjc T7iHM/bndXNge4MkIckDr0wEr8m64oon6+6HCo6BqXKZRCEjtYWyICvA18QS9Log3R naFSrAtQO4BGqNRjmbobt8vf1V8RAVZwlBhak26h+SMHR7Jkdbc1uz5uXNOiHFXJON hEzMIY39eepAb2Fi+kO50wU1/kK44arqJNf2j7zuzPBPOFasqjYBRinm9Bj2re0oaw 8wDOgIpD0vm1g== From: Ingo Molnar To: linux-kernel@vger.kernel.org Cc: Peter Zijlstra , Juri Lelli , Dietmar Eggemann , Valentin Schneider , Vincent Guittot , Shrikanth Hegde , Linus Torvalds , Mel Gorman , Steven Rostedt , Thomas Gleixner , Ingo Molnar Subject: [PATCH 1/6] sched/fair: Join two #ifdef CONFIG_CFS_BANDWIDTH blocks Date: Mon, 1 Dec 2025 07:46:42 +0100 Message-ID: <20251201064647.1851919-2-mingo@kernel.org> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20251201064647.1851919-1-mingo@kernel.org> References: <20251201064647.1851919-1-mingo@kernel.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Join two identical #ifdef blocks: #ifdef CONFIG_CFS_BANDWIDTH ... #endif #ifdef CONFIG_CFS_BANDWIDTH ... #endif Also mark nested #ifdef blocks in the usual fashion, to make it more apparent where in a nested hierarchy of #ifdefs we are at a glance. Signed-off-by: Ingo Molnar --- kernel/sched/sched.h | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/kernel/sched/sched.h b/kernel/sched/sched.h index b419a4d98461..a29965c93832 100644 --- a/kernel/sched/sched.h +++ b/kernel/sched/sched.h @@ -726,9 +726,7 @@ struct cfs_rq { unsigned long h_load; u64 last_h_load_update; struct sched_entity *h_load_next; -#endif /* CONFIG_FAIR_GROUP_SCHED */ =20 -#ifdef CONFIG_FAIR_GROUP_SCHED struct rq *rq; /* CPU runqueue to which this cfs_rq is attached */ =20 /* @@ -746,14 +744,14 @@ struct cfs_rq { /* Locally cached copy of our task_group's idle value */ int idle; =20 -#ifdef CONFIG_CFS_BANDWIDTH +# ifdef CONFIG_CFS_BANDWIDTH int runtime_enabled; s64 runtime_remaining; =20 u64 throttled_pelt_idle; -#ifndef CONFIG_64BIT +# ifndef CONFIG_64BIT u64 throttled_pelt_idle_copy; -#endif +# endif u64 throttled_clock; u64 throttled_clock_pelt; u64 throttled_clock_pelt_time; @@ -765,7 +763,7 @@ struct cfs_rq { struct list_head throttled_list; struct list_head throttled_csd_list; struct list_head throttled_limbo_list; -#endif /* CONFIG_CFS_BANDWIDTH */ +# endif /* CONFIG_CFS_BANDWIDTH */ #endif /* CONFIG_FAIR_GROUP_SCHED */ }; =20 --=20 2.51.0