diff options
author | Ingo Molnar <mingo@kernel.org> | 2013-12-17 15:22:35 +0100 |
---|---|---|
committer | Ingo Molnar <mingo@kernel.org> | 2013-12-17 15:22:35 +0100 |
commit | ffe732c2430c55074bebb172d33d909c662cd0e3 (patch) | |
tree | d39087d7b5d8caa505b23b6ea2abc2e33efa5be5 /include/linux/sched.h | |
parent | 40ea2b42d7c44386cf81d5636d574193da2c8df2 (diff) | |
parent | 757dfcaa41844595964f1220f1d33182dae49976 (diff) | |
download | linux-stable-ffe732c2430c55074bebb172d33d909c662cd0e3.tar.gz linux-stable-ffe732c2430c55074bebb172d33d909c662cd0e3.tar.bz2 linux-stable-ffe732c2430c55074bebb172d33d909c662cd0e3.zip |
Merge branch 'sched/urgent' into sched/core
Merge the latest batch of fixes before applying development patches.
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'include/linux/sched.h')
-rw-r--r-- | include/linux/sched.h | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/include/linux/sched.h b/include/linux/sched.h index cda8d634bc47..3a1e9857b393 100644 --- a/include/linux/sched.h +++ b/include/linux/sched.h @@ -439,8 +439,6 @@ struct task_cputime { .sum_exec_runtime = 0, \ } -#define PREEMPT_ENABLED (PREEMPT_NEED_RESCHED) - #ifdef CONFIG_PREEMPT_COUNT #define PREEMPT_DISABLED (1 + PREEMPT_ENABLED) #else @@ -830,8 +828,6 @@ struct sched_domain { unsigned int balance_interval; /* initialise to 1. units in ms. */ unsigned int nr_balance_failed; /* initialise to 0 */ - u64 last_update; - /* idle_balance() stats */ u64 max_newidle_lb_cost; unsigned long next_decay_max_lb_cost; @@ -933,7 +929,8 @@ struct pipe_inode_info; struct uts_namespace; struct load_weight { - unsigned long weight, inv_weight; + unsigned long weight; + u32 inv_weight; }; struct sched_avg { |