diff options
| author | Ingo Molnar <mingo@kernel.org> | 2014-03-11 11:34:27 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2014-03-11 11:34:27 +0100 |
| commit | a02ed5e3e05ec5e8af21e645cccc77f3a6480aaf (patch) | |
| tree | 95a0df31b0c9b1e0357b8dd378e2eab637970df4 /kernel/sched/sched.h | |
| parent | trace: Replace hardcoding of 19 with MAX_NICE (diff) | |
| parent | sched/clock: Prevent tracing recursion in sched_clock_cpu() (diff) | |
| download | linux-a02ed5e3e05ec5e8af21e645cccc77f3a6480aaf.tar.xz linux-a02ed5e3e05ec5e8af21e645cccc77f3a6480aaf.zip | |
Merge branch 'sched/urgent' into sched/core
Pick up fixes before queueing up new changes.
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'kernel/sched/sched.h')
| -rw-r--r-- | kernel/sched/sched.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/kernel/sched/sched.h b/kernel/sched/sched.h index 1929deb3f29d..378bff76267f 100644 --- a/kernel/sched/sched.h +++ b/kernel/sched/sched.h @@ -444,7 +444,6 @@ struct dl_rq { } earliest_dl; unsigned long dl_nr_migratory; - unsigned long dl_nr_total; int overloaded; /* |