diff options
| author |   Ingo Molnar <mingo@kernel.org> | 2016-07-14 10:37:48 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2016-07-14 10:37:48 +0200 |
| commit | cefef3a76287c9b51e946d312aea1637bb3a57ff (patch) | |
| tree | acc1ee1a6a530803951e3c0a0ca65c08a567f563 /kernel/sched/debug.c | |
| parent | Linux 4.7-rc7 (diff) | |
| parent | sched/core: Panic on scheduling while atomic bugs if kernel.panic_on_warn is set (diff) | |
| download | wireguard-linux-cefef3a76287c9b51e946d312aea1637bb3a57ff.tar.xz wireguard-linux-cefef3a76287c9b51e946d312aea1637bb3a57ff.zip | |
Merge branch 'sched/core' into timers/nohz, to avoid conflicts in upcoming patches
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to '')
| -rw-r--r-- | kernel/sched/debug.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/sched/debug.c b/kernel/sched/debug.c index 0368c393a336..2a0a9995256d 100644 --- a/kernel/sched/debug.c +++ b/kernel/sched/debug.c @@ -879,9 +879,9 @@ void proc_sched_show_task(struct task_struct *p, struct seq_file *m) nr_switches = p->nvcsw + p->nivcsw; -#ifdef CONFIG_SCHEDSTATS P(se.nr_migrations); +#ifdef CONFIG_SCHEDSTATS if (schedstat_enabled()) { u64 avg_atom, avg_per_cpu; |