sched/fair: Mark m*_vruntime() with __maybe_unused
PATCH v2 1/1 sched/fair: Mark m*_vruntime() with __maybe_unused
When max_vruntime() is unused, it prevents kernel builds with clang, make W=1 and CONFIG_WERROR=y:
kernel/sched/fair.c:526:19: error: unused function 'max_vruntime' [-Werror,-Wunused-function]
526 | static inline u64 max_vruntime(u64 max_vruntime, u64 vruntime)
| ^~~~~~~~~~~~
Fix this by marking them with __maybe_unused (all cases for the sake of symmetry).
See also commit 6863f5643dd7 ("kbuild: allow Clang to find unused static inline functions for W=1 build").
---
v2: dropped applied pieces
kernel/sched/fair.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
kernel/sched/fair.c +2 -2
@@ -523,7 +523,7 @@ void account_cfs_rq_runtime(struct cfs_rq *cfs_rq, u64 delta_exec);* Scheduling class tree data structure manipulation methods: */ -static inline u64 max_vruntime (u64 max_vruntime,u64 vruntime) +static inline __maybe_unused u64 max_vruntime (u64 max_vruntime,u64 vruntime) {s64 delta = (s64)(vruntime - max_vruntime);if (delta >0 )
@@ -532,7 +532,7 @@ static inline u64 max_vruntime(u64 max_vruntime, u64 vruntime)return max_vruntime; } -static inline u64 min_vruntime (u64 min_vruntime,u64 vruntime) +static inline __maybe_unused u64 min_vruntime (u64 min_vruntime,u64 vruntime) {s64 delta = (s64)(vruntime - min_vruntime);if (delta <0 )
Signature · 1 line
2.43.0.rc1.1336.g36b5255a03ac
The following commit has been merged into the sched/core branch of tip:
The following commit has been merged into the sched/core branch of tip:
Commit-ID: 95d9fed3a2aea85fe9551c2f007e186d4abb4a2a Gitweb: https://git.kernel.org/tip/95d9fed3a2aea85fe9551c2f007e186d4abb4a2a Author: Andy Shevchenko <[email protected]> AuthorDate: Mon, 02 Dec 2024 19:35:30 +02:00 Committer: Peter Zijlstra <[email protected]> CommitterDate: Mon, 09 Dec 2024 11:48:13 +01:00
sched/fair: Mark m*_vruntime() with __maybe_unused
When max_vruntime() is unused, it prevents kernel builds with clang, make W=1 and CONFIG_WERROR=y:
kernel/sched/fair.c:526:19: error: unused function 'max_vruntime' [-Werror,-Wunused-function]
526 | static inline u64 max_vruntime(u64 max_vruntime, u64 vruntime)
| ^~~~~~~~~~~~
Fix this by marking them with __maybe_unused (all cases for the sake of symmetry).
See also commit 6863f5643dd7 ("kbuild: allow Clang to find unused static inline functions for W=1 build").
--- kernel/sched/fair.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
kernel/sched/fair.c +2 -2
@@ -523,7 +523,7 @@ void account_cfs_rq_runtime(struct cfs_rq *cfs_rq, u64 delta_exec);* Scheduling class tree data structure manipulation methods: */ -static inline u64 max_vruntime (u64 max_vruntime,u64 vruntime) +static inline __maybe_unused u64 max_vruntime (u64 max_vruntime,u64 vruntime) {s64 delta = (s64)(vruntime - max_vruntime);if (delta >0 )
@@ -532,7 +532,7 @@ static inline u64 max_vruntime(u64 max_vruntime, u64 vruntime)return max_vruntime; } -static inline u64 min_vruntime (u64 min_vruntime,u64 vruntime) +static inline __maybe_unused u64 min_vruntime (u64 min_vruntime,u64 vruntime) {s64 delta = (s64)(vruntime - min_vruntime);if (delta <0 )