forge/linux-pinenote
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'sched/urgent' into sched/core

Browse source 
Merge the latest batch of fixes before applying development patches.

Signed-off-by: Ingo Molnar <mingo@kernel.org>
This commit is contained in:
Ingo Molnar 2013-12-17 15:22:35 +01:00
commit ffe732c243
636 changed files with 6877 additions and 3013 deletions
Download patch file Download diff file Expand all files Collapse all files

7
include/linux/sched.h
View file

@ -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 {