diff options
| author | Ingo Molnar | 2018-10-02 09:43:39 +0200 |
|---|---|---|
| committer | Ingo Molnar | 2018-10-02 09:43:39 +0200 |
| commit | b429f71bca5a4ddd914350a39572692e2ea211e0 (patch) | |
| tree | 50cee6fb7b114ad89c778de87bcb44972b7326f5 /kernel/sched/sched.h | |
| parent | sched/topology: Make local variables static (diff) | |
| parent | sched/numa: Avoid task migration for small NUMA improvement (diff) | |
| download | kernel-qcow2-linux-b429f71bca5a4ddd914350a39572692e2ea211e0.tar.gz kernel-qcow2-linux-b429f71bca5a4ddd914350a39572692e2ea211e0.tar.xz kernel-qcow2-linux-b429f71bca5a4ddd914350a39572692e2ea211e0.zip | |
Merge branch 'sched/urgent' into sched/core, to pick up fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'kernel/sched/sched.h')
| -rw-r--r-- | kernel/sched/sched.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/kernel/sched/sched.h b/kernel/sched/sched.h index 3a4ef8f73f08..632804fa0b12 100644 --- a/kernel/sched/sched.h +++ b/kernel/sched/sched.h @@ -787,6 +787,7 @@ struct rq { #ifdef CONFIG_NUMA_BALANCING unsigned int nr_numa_running; unsigned int nr_preferred_running; + unsigned int numa_migrate_on; #endif #define CPU_LOAD_IDX_MAX 5 unsigned long cpu_load[CPU_LOAD_IDX_MAX]; @@ -1531,7 +1532,7 @@ struct sched_class { #ifdef CONFIG_SMP int (*select_task_rq)(struct task_struct *p, int task_cpu, int sd_flag, int flags); - void (*migrate_task_rq)(struct task_struct *p); + void (*migrate_task_rq)(struct task_struct *p, int new_cpu); void (*task_woken)(struct rq *this_rq, struct task_struct *task); |