Commit 28f152cd authored by Baisong Zhong's avatar Baisong Zhong Committed by Luis Chamberlain

sched/rt: fix build error when CONFIG_SYSCTL is disable

Avoid random build errors which do not select
CONFIG_SYSCTL by depending on it in Kconfig.

This fixes the following warning:

In file included from kernel/sched/build_policy.c:43:
At top level:
kernel/sched/rt.c:3017:12: error: ‘sched_rr_handler’ defined but not used [-Werror=unused-function]
 3017 | static int sched_rr_handler(struct ctl_table *table, int write, void *buffer,
      |            ^~~~~~~~~~~~~~~~
kernel/sched/rt.c:2978:12: error: ‘sched_rt_handler’ defined but not used [-Werror=unused-function]
 2978 | static int sched_rt_handler(struct ctl_table *table, int write, void *buffer,
      |            ^~~~~~~~~~~~~~~~
cc1: all warnings being treated as errors
make[2]: *** [scripts/Makefile.build:310: kernel/sched/build_policy.o] Error 1
make[1]: *** [scripts/Makefile.build:638: kernel/sched] Error 2
make[1]: *** Waiting for unfinished jobs....
Reported-by: default avatarHulk Robot <hulkci@huawei.com>
Signed-off-by: default avatarBaisong Zhong <zhongbaisong@huawei.com>
[mcgrof: small build fix, we need sched_rt_can_attach() even
 when CONFIG_SYSCTL is disabled]
Signed-off-by: default avatarLuis Chamberlain <mcgrof@kernel.org>
parent dafd7a9d
...@@ -5,7 +5,6 @@ ...@@ -5,7 +5,6 @@
*/ */
int sched_rr_timeslice = RR_TIMESLICE; int sched_rr_timeslice = RR_TIMESLICE;
static int sysctl_sched_rr_timeslice = (MSEC_PER_SEC / HZ) * RR_TIMESLICE;
/* More than 4 hours if BW_SHIFT equals 20. */ /* More than 4 hours if BW_SHIFT equals 20. */
static const u64 max_rt_runtime = MAX_BW; static const u64 max_rt_runtime = MAX_BW;
...@@ -25,11 +24,12 @@ unsigned int sysctl_sched_rt_period = 1000000; ...@@ -25,11 +24,12 @@ unsigned int sysctl_sched_rt_period = 1000000;
*/ */
int sysctl_sched_rt_runtime = 950000; int sysctl_sched_rt_runtime = 950000;
#ifdef CONFIG_SYSCTL
static int sysctl_sched_rr_timeslice = (MSEC_PER_SEC / HZ) * RR_TIMESLICE;
static int sched_rt_handler(struct ctl_table *table, int write, void *buffer, static int sched_rt_handler(struct ctl_table *table, int write, void *buffer,
size_t *lenp, loff_t *ppos); size_t *lenp, loff_t *ppos);
static int sched_rr_handler(struct ctl_table *table, int write, void *buffer, static int sched_rr_handler(struct ctl_table *table, int write, void *buffer,
size_t *lenp, loff_t *ppos); size_t *lenp, loff_t *ppos);
#ifdef CONFIG_SYSCTL
static struct ctl_table sched_rt_sysctls[] = { static struct ctl_table sched_rt_sysctls[] = {
{ {
.procname = "sched_rt_period_us", .procname = "sched_rt_period_us",
...@@ -2911,6 +2911,7 @@ long sched_group_rt_period(struct task_group *tg) ...@@ -2911,6 +2911,7 @@ long sched_group_rt_period(struct task_group *tg)
return rt_period_us; return rt_period_us;
} }
#ifdef CONFIG_SYSCTL
static int sched_rt_global_constraints(void) static int sched_rt_global_constraints(void)
{ {
int ret = 0; int ret = 0;
...@@ -2921,6 +2922,7 @@ static int sched_rt_global_constraints(void) ...@@ -2921,6 +2922,7 @@ static int sched_rt_global_constraints(void)
return ret; return ret;
} }
#endif /* CONFIG_SYSCTL */
int sched_rt_can_attach(struct task_group *tg, struct task_struct *tsk) int sched_rt_can_attach(struct task_group *tg, struct task_struct *tsk)
{ {
...@@ -2932,6 +2934,8 @@ int sched_rt_can_attach(struct task_group *tg, struct task_struct *tsk) ...@@ -2932,6 +2934,8 @@ int sched_rt_can_attach(struct task_group *tg, struct task_struct *tsk)
} }
#else /* !CONFIG_RT_GROUP_SCHED */ #else /* !CONFIG_RT_GROUP_SCHED */
#ifdef CONFIG_SYSCTL
static int sched_rt_global_constraints(void) static int sched_rt_global_constraints(void)
{ {
unsigned long flags; unsigned long flags;
...@@ -2949,8 +2953,10 @@ static int sched_rt_global_constraints(void) ...@@ -2949,8 +2953,10 @@ static int sched_rt_global_constraints(void)
return 0; return 0;
} }
#endif /* CONFIG_SYSCTL */
#endif /* CONFIG_RT_GROUP_SCHED */ #endif /* CONFIG_RT_GROUP_SCHED */
#ifdef CONFIG_SYSCTL
static int sched_rt_global_validate(void) static int sched_rt_global_validate(void)
{ {
if (sysctl_sched_rt_period <= 0) if (sysctl_sched_rt_period <= 0)
...@@ -3035,6 +3041,7 @@ static int sched_rr_handler(struct ctl_table *table, int write, void *buffer, ...@@ -3035,6 +3041,7 @@ static int sched_rr_handler(struct ctl_table *table, int write, void *buffer,
return ret; return ret;
} }
#endif /* CONFIG_SYSCTL */
#ifdef CONFIG_SCHED_DEBUG #ifdef CONFIG_SCHED_DEBUG
void print_rt_stats(struct seq_file *m, int cpu) void print_rt_stats(struct seq_file *m, int cpu)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment