Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

sched/fair: Join two #ifdef CONFIG_FAIR_GROUP_SCHED blocks

Join two identical #ifdef blocks:

#ifdef CONFIG_FAIR_GROUP_SCHED
...
#endif

#ifdef CONFIG_FAIR_GROUP_SCHED
...
#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 <mingo@kernel.org>
Reviewed-by: Shrikanth Hegde <sshegde@linux.ibm.com>
Link: https://patch.msgid.link/20251201064647.1851919-2-mingo@kernel.org

+4 -6
+4 -6
kernel/sched/sched.h
··· 726 726 unsigned long h_load; 727 727 u64 last_h_load_update; 728 728 struct sched_entity *h_load_next; 729 - #endif /* CONFIG_FAIR_GROUP_SCHED */ 730 729 731 - #ifdef CONFIG_FAIR_GROUP_SCHED 732 730 struct rq *rq; /* CPU runqueue to which this cfs_rq is attached */ 733 731 734 732 /* ··· 744 746 /* Locally cached copy of our task_group's idle value */ 745 747 int idle; 746 748 747 - #ifdef CONFIG_CFS_BANDWIDTH 749 + # ifdef CONFIG_CFS_BANDWIDTH 748 750 int runtime_enabled; 749 751 s64 runtime_remaining; 750 752 751 753 u64 throttled_pelt_idle; 752 - #ifndef CONFIG_64BIT 754 + # ifndef CONFIG_64BIT 753 755 u64 throttled_pelt_idle_copy; 754 - #endif 756 + # endif 755 757 u64 throttled_clock; 756 758 u64 throttled_clock_pelt; 757 759 u64 throttled_clock_pelt_time; ··· 763 765 struct list_head throttled_list; 764 766 struct list_head throttled_csd_list; 765 767 struct list_head throttled_limbo_list; 766 - #endif /* CONFIG_CFS_BANDWIDTH */ 768 + # endif /* CONFIG_CFS_BANDWIDTH */ 767 769 #endif /* CONFIG_FAIR_GROUP_SCHED */ 768 770 }; 769 771