diff options
| author | Ingo Molnar <mingo@kernel.org> | 2017-03-23 07:35:15 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2017-03-23 07:35:15 +0100 |
| commit | 4ccb6aea4b3eb97c94575d1ed4bf10744169f082 (patch) | |
| tree | a2ca8bc8b567608bd4067593b752f78c895d713b /fs/proc/loadavg.c | |
| parent | x86/asm: Optimize clear_page() (diff) | |
| parent | mm, swap: Remove WARN_ON_ONCE() in free_swap_slot() (diff) | |
| download | linux-4ccb6aea4b3eb97c94575d1ed4bf10744169f082.tar.xz linux-4ccb6aea4b3eb97c94575d1ed4bf10744169f082.zip | |
Merge branch 'linus' into x86/asm, to refresh the topic tree with fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'fs/proc/loadavg.c')
| -rw-r--r-- | fs/proc/loadavg.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/fs/proc/loadavg.c b/fs/proc/loadavg.c index aec66e6c2060..983fce5c2418 100644 --- a/fs/proc/loadavg.c +++ b/fs/proc/loadavg.c @@ -3,6 +3,8 @@ #include <linux/pid_namespace.h> #include <linux/proc_fs.h> #include <linux/sched.h> +#include <linux/sched/loadavg.h> +#include <linux/sched/stat.h> #include <linux/seq_file.h> #include <linux/seqlock.h> #include <linux/time.h> |