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

psi: Fix "no previous prototype" warnings when CONFIG_CGROUPS=n

When CONFIG_CGROUPS is disabled psi code generates the following warnings:

kernel/sched/psi.c:1112:21: warning: no previous prototype for 'psi_trigger_create' [-Wmissing-prototypes]
1112 | struct psi_trigger *psi_trigger_create(struct psi_group *group,
| ^~~~~~~~~~~~~~~~~~
kernel/sched/psi.c:1182:6: warning: no previous prototype for 'psi_trigger_destroy' [-Wmissing-prototypes]
1182 | void psi_trigger_destroy(struct psi_trigger *t)
| ^~~~~~~~~~~~~~~~~~~
kernel/sched/psi.c:1249:10: warning: no previous prototype for 'psi_trigger_poll' [-Wmissing-prototypes]
1249 | __poll_t psi_trigger_poll(void **trigger_ptr,
| ^~~~~~~~~~~~~~~~

Change declarations of these functions in the header to provide the
prototypes even when they are unused.

Fixes: 0e94682b73bf ("psi: introduce psi monitor")
Reported-by: kernel test robot <lkp@intel.com>
Signed-off-by: Suren Baghdasaryan <surenb@google.com>
Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Link: https://lkml.kernel.org/r/20220119223940.787748-2-surenb@google.com

authored by

Suren Baghdasaryan and committed by
Peter Zijlstra
ec244453 5102bb1c

+5 -6
+5 -6
include/linux/psi.h
··· 25 25 void psi_memstall_leave(unsigned long *flags); 26 26 27 27 int psi_show(struct seq_file *s, struct psi_group *group, enum psi_res res); 28 - 29 - #ifdef CONFIG_CGROUPS 30 - int psi_cgroup_alloc(struct cgroup *cgrp); 31 - void psi_cgroup_free(struct cgroup *cgrp); 32 - void cgroup_move_task(struct task_struct *p, struct css_set *to); 33 - 34 28 struct psi_trigger *psi_trigger_create(struct psi_group *group, 35 29 char *buf, size_t nbytes, enum psi_res res); 36 30 void psi_trigger_replace(void **trigger_ptr, struct psi_trigger *t); 37 31 38 32 __poll_t psi_trigger_poll(void **trigger_ptr, struct file *file, 39 33 poll_table *wait); 34 + 35 + #ifdef CONFIG_CGROUPS 36 + int psi_cgroup_alloc(struct cgroup *cgrp); 37 + void psi_cgroup_free(struct cgroup *cgrp); 38 + void cgroup_move_task(struct task_struct *p, struct css_set *to); 40 39 #endif 41 40 42 41 #else /* CONFIG_PSI */