lkml.org 
[lkml]   [2017]   [Feb]   [6]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 69/89] sched/headers: Move sched_info_on() and force_schedstat_enabled() from <linux/sched.h> to <linux/sched/stat.h>
    Date
    These APIs are not core scheduler but statistics related.

    Update usage sites.

    Cc: Peter Zijlstra <peterz@infradead.org>
    Cc: Mike Galbraith <efault@gmx.de>
    Cc: Thomas Gleixner <tglx@linutronix.de>
    Cc: Linus Torvalds <torvalds@linux-foundation.org>
    Cc: linux-kernel@vger.kernel.org
    Signed-off-by: Ingo Molnar <mingo@kernel.org>
    ---
    arch/x86/kvm/cpuid.c | 2 ++
    arch/x86/kvm/x86.c | 2 ++
    fs/proc/base.c | 1 +
    include/linux/sched.h | 16 ----------------
    include/linux/sched/stat.h | 16 ++++++++++++++++
    kernel/latencytop.c | 1 +
    kernel/profile.c | 2 ++
    7 files changed, 24 insertions(+), 16 deletions(-)

    diff --git a/arch/x86/kvm/cpuid.c b/arch/x86/kvm/cpuid.c
    index e85f6bd7b9d5..1639de8eb969 100644
    --- a/arch/x86/kvm/cpuid.c
    +++ b/arch/x86/kvm/cpuid.c
    @@ -16,6 +16,8 @@
    #include <linux/export.h>
    #include <linux/vmalloc.h>
    #include <linux/uaccess.h>
    +#include <linux/sched/stat.h>
    +
    #include <asm/processor.h>
    #include <asm/user.h>
    #include <asm/fpu/xstate.h>
    diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c
    index d153be8929a6..bd0ccc65a9ea 100644
    --- a/arch/x86/kvm/x86.c
    +++ b/arch/x86/kvm/x86.c
    @@ -54,6 +54,8 @@
    #include <linux/pvclock_gtod.h>
    #include <linux/kvm_irqfd.h>
    #include <linux/irqbypass.h>
    +#include <linux/sched/stat.h>
    +
    #include <trace/events/kvm.h>

    #include <asm/debugreg.h>
    diff --git a/fs/proc/base.c b/fs/proc/base.c
    index cc39b88610a9..82661e386f73 100644
    --- a/fs/proc/base.c
    +++ b/fs/proc/base.c
    @@ -89,6 +89,7 @@
    #include <linux/sched/mm.h>
    #include <linux/sched/coredump.h>
    #include <linux/sched/debug.h>
    +#include <linux/sched/stat.h>
    #include <linux/flex_array.h>
    #include <linux/posix-timers.h>
    #ifdef CONFIG_HARDWALL
    diff --git a/include/linux/sched.h b/include/linux/sched.h
    index 4d2ab113a02e..d93db434cbe2 100644
    --- a/include/linux/sched.h
    +++ b/include/linux/sched.h
    @@ -242,22 +242,6 @@ struct sched_info {
    };
    #endif /* CONFIG_SCHED_INFO */

    -static inline int sched_info_on(void)
    -{
    -#ifdef CONFIG_SCHEDSTATS
    - return 1;
    -#elif defined(CONFIG_TASK_DELAY_ACCT)
    - extern int delayacct_on;
    - return delayacct_on;
    -#else
    - return 0;
    -#endif
    -}
    -
    -#ifdef CONFIG_SCHEDSTATS
    -void force_schedstat_enabled(void);
    -#endif
    -
    /*
    * Integer metrics need fixed point arithmetic, e.g., sched/fair
    * has a few: load, load_avg, util_avg, freq, and capacity.
    diff --git a/include/linux/sched/stat.h b/include/linux/sched/stat.h
    index 851bc8639620..141b74c53fad 100644
    --- a/include/linux/sched/stat.h
    +++ b/include/linux/sched/stat.h
    @@ -21,4 +21,20 @@ extern unsigned long nr_iowait(void);
    extern unsigned long nr_iowait_cpu(int cpu);
    extern void get_iowait_load(unsigned long *nr_waiters, unsigned long *load);

    +static inline int sched_info_on(void)
    +{
    +#ifdef CONFIG_SCHEDSTATS
    + return 1;
    +#elif defined(CONFIG_TASK_DELAY_ACCT)
    + extern int delayacct_on;
    + return delayacct_on;
    +#else
    + return 0;
    +#endif
    +}
    +
    +#ifdef CONFIG_SCHEDSTATS
    +void force_schedstat_enabled(void);
    +#endif
    +
    #endif /* _LINUX_SCHED_STAT_H */
    diff --git a/kernel/latencytop.c b/kernel/latencytop.c
    index 545839b838d6..96b4179cee6a 100644
    --- a/kernel/latencytop.c
    +++ b/kernel/latencytop.c
    @@ -56,6 +56,7 @@
    #include <linux/export.h>
    #include <linux/sched.h>
    #include <linux/sched/debug.h>
    +#include <linux/sched/stat.h>
    #include <linux/list.h>
    #include <linux/stacktrace.h>

    diff --git a/kernel/profile.c b/kernel/profile.c
    index f67ce0aa6bc4..9aa2a4445b0d 100644
    --- a/kernel/profile.c
    +++ b/kernel/profile.c
    @@ -25,6 +25,8 @@
    #include <linux/mutex.h>
    #include <linux/slab.h>
    #include <linux/vmalloc.h>
    +#include <linux/sched/stat.h>
    +
    #include <asm/sections.h>
    #include <asm/irq_regs.h>
    #include <asm/ptrace.h>
    --
    2.7.4
    \
     
     \ /
      Last update: 2017-02-06 14:37    [W:4.073 / U:0.096 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site