Commit 84957774 authored by Suren Baghdasaryan's avatar Suren Baghdasaryan Committed by openeuler-sync-bot
Browse files

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

mainline inclusion
from mainline-v5.17-rc2
commit 51e50fbd
category: bugfix
bugzilla: https://gitee.com/openeuler/kernel/issues/I89DEJ
CVE: NA

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=51e50fbd3efc6064c30ed73a5e009018b36e290a

-------------------------------------------------

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 the declarations of these functions in the header to provide the
prototypes even when they are unused.

Link: https://lkml.kernel.org/r/20220119223940.787748-2-surenb@google.com


Fixes: 0e94682b ("psi: introduce psi monitor")
Signed-off-by: default avatarSuren Baghdasaryan <surenb@google.com>
Reported-by: default avatarkernel test robot <lkp@intel.com>
Acked-by: default avatarJohannes Weiner <hannes@cmpxchg.org>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
Conflict:
	include/linux/psi.h
Signed-off-by: default avatarLu Jialin <lujialin4@huawei.com>
(cherry picked from commit 21859373)
parent 0eeec93e

include/linux/psi.h

+5 −6
Original line number Diff line number Diff line
@@ -26,12 +26,6 @@ void psi_memstall_enter(unsigned long *flags); 
void psi_memstall_leave(unsigned long *flags);



int psi_show(struct seq_file *s, struct psi_group *group, enum psi_res res);



#ifdef CONFIG_CGROUPS

int psi_cgroup_alloc(struct cgroup *cgrp);

void psi_cgroup_free(struct cgroup *cgrp);

void cgroup_move_task(struct task_struct *p, struct css_set *to);



struct psi_trigger *psi_trigger_create(struct psi_group *group, char *buf,

				       size_t nbytes, enum psi_res res,

				       struct kernfs_open_file *of);
@@ -39,6 +33,11 @@ void psi_trigger_destroy(struct psi_trigger *t); 


__poll_t psi_trigger_poll(void **trigger_ptr, struct file *file,

			poll_table *wait);



#ifdef CONFIG_CGROUPS

int psi_cgroup_alloc(struct cgroup *cgrp);

void psi_cgroup_free(struct cgroup *cgrp);

void cgroup_move_task(struct task_struct *p, struct css_set *to);

#endif



#else /* CONFIG_PSI */