diff options
| author | Ingo Molnar <mingo@kernel.org> | 2013-11-06 10:50:37 +0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2013-11-06 10:50:37 +0400 |
| commit | c90423d1de12fbeaf0c898e1db0e962de347302b (patch) | |
| tree | 8c7a32b37e74155324ae2b556fcc42718ccf29a3 /include/linux/sched | |
| parent | ecf1f014325ba60f4df35edae1a357c67c5d4eb1 (diff) | |
| parent | b8a216269ec0ce2e961d32e6d640d7010b8a818e (diff) | |
| download | linux-c90423d1de12fbeaf0c898e1db0e962de347302b.tar.xz | |
Merge branch 'sched/core' into core/locking, to prepare the kernel/locking/ file move
Conflicts:
kernel/Makefile
There are conflicts in kernel/Makefile due to file moving in the
scheduler tree - resolve them.
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'include/linux/sched')
| -rw-r--r-- | include/linux/sched/sysctl.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/include/linux/sched/sysctl.h b/include/linux/sched/sysctl.h index 9552afa733d8..41467f8ff8ec 100644 --- a/include/linux/sched/sysctl.h +++ b/include/linux/sched/sysctl.h @@ -47,7 +47,6 @@ extern enum sched_tunable_scaling sysctl_sched_tunable_scaling; extern unsigned int sysctl_numa_balancing_scan_delay; extern unsigned int sysctl_numa_balancing_scan_period_min; extern unsigned int sysctl_numa_balancing_scan_period_max; -extern unsigned int sysctl_numa_balancing_scan_period_reset; extern unsigned int sysctl_numa_balancing_scan_size; extern unsigned int sysctl_numa_balancing_settle_count; |