Unverified Commit ddaff2a8 authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

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

Merge Pull Request from: @ci-robot 
 
PR sync from: Lu Jialin <lujialin4@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/3TW5B65JWNOSM3KM5L4O5NBHNMLDZTAB/ 
 
https://gitee.com/openeuler/kernel/issues/I89DEJ 
 
Link:https://gitee.com/openeuler/kernel/pulls/2543

 

Reviewed-by: default avatarJialin Zhang <zhangjialin11@huawei.com>
Signed-off-by: default avatarJialin Zhang <zhangjialin11@huawei.com>
parents b81cf416 21859373

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 */