Pull scheduler changes from Ingo Molnar: "Continued quest to clean up and enhance the cputime code by Frederic Weisbecker, in preparation for future tickless kernel features. Other than that, smallish changes." Fix up trivial conflicts due to additions next to each other in arch/{x86/}Kconfig * 'sched-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: (24 commits) cputime: Make finegrained irqtime accounting generally available cputime: Gather time/stats accounting config options into a single menu ia64: Reuse system and user vtime accounting functions on task switch ia64: Consolidate user vtime accounting vtime: Consolidate system/idle context detection cputime: Use a proper subsystem naming for vtime related APIs sched: cpu_power: enable ARCH_POWER sched/nohz: Clean up select_nohz_load_balancer() sched: Fix load avg vs. cpu-hotplug sched: Remove __ARCH_WANT_INTERRUPTS_ON_CTXSW sched: Fix nohz_idle_balance() sched: Remove useless code in yield_to() sched: Add time unit suffix to sched sysctl knobs sched/debug: Limit sd->*_idx range on sysctl sched: Remove AFFINE_WAKEUPS feature flag s390: Remove leftover account_tick_vtime() header cputime: Consolidate vtime handling on context switch sched: Move cputime code to its own file cputime: Generalize CONFIG_VIRT_CPU_ACCOUNTING tile: Remove SD_PREFER_LOCAL leftover ...
Showing the changes to kernel/time (1 of 32 files). Show all
Unified · Split
| @@ -372,7 +372,7 @@ static ktime_t tick_nohz_stop_sched_tick(struct tick_sched *ts, · 371 unmodified lines | |||
| 372 | * the scheduler tick in nohz_restart_sched_tick. | 372 | * the scheduler tick in nohz_restart_sched_tick. |
| 373 | */ | 373 | */ |
| 374 | if (!ts->tick_stopped) { | 374 | if (!ts->tick_stopped) { |
| 375 | select_nohz_load_balancer(1); | 375 | nohz_balance_enter_idle(cpu); |
| 376 | calc_load_enter_idle(); | 376 | calc_load_enter_idle(); |
| 377 | 377 | ||
| 378 | ts->last_tick = hrtimer_get_expires(&ts->sched_timer); | 378 | ts->last_tick = hrtimer_get_expires(&ts->sched_timer); |
| @@ -570,7 +570,6 @@ static void tick_nohz_restart(struct tick_sched *ts, ktime_t now) · 191 unmodified lines | |||
| 570 | static void tick_nohz_restart_sched_tick(struct tick_sched *ts, ktime_t now) | 570 | static void tick_nohz_restart_sched_tick(struct tick_sched *ts, ktime_t now) |
| 571 | { | 571 | { |
| 572 | /* Update jiffies first */ | 572 | /* Update jiffies first */ |
| 573 | select_nohz_load_balancer(0); | ||
| 574 | tick_do_update_jiffies64(now); | 573 | tick_do_update_jiffies64(now); |
| 575 | update_cpu_load_nohz(); | 574 | update_cpu_load_nohz(); |
| 576 | 575 | ||