lkml.org 
[lkml]   [2022]   [Jan]   [31]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.15 166/171] psi: fix "no previous prototype" warnings when CONFIG_CGROUPS=n
    Date
    From: Suren Baghdasaryan <surenb@google.com>

    commit 51e50fbd3efc6064c30ed73a5e009018b36e290a upstream.

    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: 0e94682b73bf ("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>
    ---
    include/linux/psi.h | 11 +++++------
    1 file changed, 5 insertions(+), 6 deletions(-)

    --- a/include/linux/psi.h
    +++ b/include/linux/psi.h
    @@ -24,18 +24,17 @@ void psi_memstall_enter(unsigned long *f
    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);
    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 */

    \
     
     \ /
      Last update: 2022-01-31 12:40    [W:3.927 / U:0.056 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site