psi: fix "defined but not used" warnings when CONFIG_PROC_FS=n
commit44585f7bc0
upstream. When CONFIG_PROC_FS is disabled psi code generates the following warnings: kernel/sched/psi.c:1364:30: warning: 'psi_cpu_proc_ops' defined but not used [-Wunused-const-variable=] 1364 | static const struct proc_ops psi_cpu_proc_ops = { | ^~~~~~~~~~~~~~~~ kernel/sched/psi.c:1355:30: warning: 'psi_memory_proc_ops' defined but not used [-Wunused-const-variable=] 1355 | static const struct proc_ops psi_memory_proc_ops = { | ^~~~~~~~~~~~~~~~~~~ kernel/sched/psi.c:1346:30: warning: 'psi_io_proc_ops' defined but not used [-Wunused-const-variable=] 1346 | static const struct proc_ops psi_io_proc_ops = { | ^~~~~~~~~~~~~~~ Make definitions of these structures and related functions conditional on CONFIG_PROC_FS config. Link: https://lkml.kernel.org/r/20220119223940.787748-3-surenb@google.com Fixes:0e94682b73
("psi: introduce psi monitor") Signed-off-by: Suren Baghdasaryan <surenb@google.com> Reported-by: kernel test robot <lkp@intel.com> Acked-by: Johannes Weiner <hannes@cmpxchg.org> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Родитель
949c4c1889
Коммит
442414e8c4
|
@ -1082,44 +1082,6 @@ int psi_show(struct seq_file *m, struct psi_group *group, enum psi_res res)
|
|||
return 0;
|
||||
}
|
||||
|
||||
static int psi_io_show(struct seq_file *m, void *v)
|
||||
{
|
||||
return psi_show(m, &psi_system, PSI_IO);
|
||||
}
|
||||
|
||||
static int psi_memory_show(struct seq_file *m, void *v)
|
||||
{
|
||||
return psi_show(m, &psi_system, PSI_MEM);
|
||||
}
|
||||
|
||||
static int psi_cpu_show(struct seq_file *m, void *v)
|
||||
{
|
||||
return psi_show(m, &psi_system, PSI_CPU);
|
||||
}
|
||||
|
||||
static int psi_open(struct file *file, int (*psi_show)(struct seq_file *, void *))
|
||||
{
|
||||
if (file->f_mode & FMODE_WRITE && !capable(CAP_SYS_RESOURCE))
|
||||
return -EPERM;
|
||||
|
||||
return single_open(file, psi_show, NULL);
|
||||
}
|
||||
|
||||
static int psi_io_open(struct inode *inode, struct file *file)
|
||||
{
|
||||
return psi_open(file, psi_io_show);
|
||||
}
|
||||
|
||||
static int psi_memory_open(struct inode *inode, struct file *file)
|
||||
{
|
||||
return psi_open(file, psi_memory_show);
|
||||
}
|
||||
|
||||
static int psi_cpu_open(struct inode *inode, struct file *file)
|
||||
{
|
||||
return psi_open(file, psi_cpu_show);
|
||||
}
|
||||
|
||||
struct psi_trigger *psi_trigger_create(struct psi_group *group,
|
||||
char *buf, size_t nbytes, enum psi_res res)
|
||||
{
|
||||
|
@ -1278,6 +1240,45 @@ __poll_t psi_trigger_poll(void **trigger_ptr,
|
|||
return ret;
|
||||
}
|
||||
|
||||
#ifdef CONFIG_PROC_FS
|
||||
static int psi_io_show(struct seq_file *m, void *v)
|
||||
{
|
||||
return psi_show(m, &psi_system, PSI_IO);
|
||||
}
|
||||
|
||||
static int psi_memory_show(struct seq_file *m, void *v)
|
||||
{
|
||||
return psi_show(m, &psi_system, PSI_MEM);
|
||||
}
|
||||
|
||||
static int psi_cpu_show(struct seq_file *m, void *v)
|
||||
{
|
||||
return psi_show(m, &psi_system, PSI_CPU);
|
||||
}
|
||||
|
||||
static int psi_open(struct file *file, int (*psi_show)(struct seq_file *, void *))
|
||||
{
|
||||
if (file->f_mode & FMODE_WRITE && !capable(CAP_SYS_RESOURCE))
|
||||
return -EPERM;
|
||||
|
||||
return single_open(file, psi_show, NULL);
|
||||
}
|
||||
|
||||
static int psi_io_open(struct inode *inode, struct file *file)
|
||||
{
|
||||
return psi_open(file, psi_io_show);
|
||||
}
|
||||
|
||||
static int psi_memory_open(struct inode *inode, struct file *file)
|
||||
{
|
||||
return psi_open(file, psi_memory_show);
|
||||
}
|
||||
|
||||
static int psi_cpu_open(struct inode *inode, struct file *file)
|
||||
{
|
||||
return psi_open(file, psi_cpu_show);
|
||||
}
|
||||
|
||||
static ssize_t psi_write(struct file *file, const char __user *user_buf,
|
||||
size_t nbytes, enum psi_res res)
|
||||
{
|
||||
|
@ -1392,3 +1393,5 @@ static int __init psi_proc_init(void)
|
|||
return 0;
|
||||
}
|
||||
module_init(psi_proc_init);
|
||||
|
||||
#endif /* CONFIG_PROC_FS */
|
||||
|
|
Загрузка…
Ссылка в новой задаче