diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-06-05 18:47:15 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-06-05 18:47:15 +0200 |
| commit | 0b3e9f3f21c42d064f5f4088df4088e3d55755eb (patch) | |
| tree | b153a9346bf21a64a9e5c5f3f440f00b591fd269 /kernel/time | |
| parent | Pull 'for-linus' branches of git://git.kernel.org/pub/scm/linux/kernel/git/vi... (diff) | |
| parent | sched: Remove NULL assignment of dattr_cur (diff) | |
| download | linux-0b3e9f3f21c42d064f5f4088df4088e3d55755eb.tar.xz linux-0b3e9f3f21c42d064f5f4088df4088e3d55755eb.zip | |
Merge branch 'sched-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull scheduler fixes from Ingo Molnar.
* 'sched-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
sched: Remove NULL assignment of dattr_cur
sched: Remove the last NULL entry from sched_feat_names
sched: Make sched_feat_names const
sched/rt: Fix SCHED_RR across cgroups
sched: Move nr_cpus_allowed out of 'struct sched_rt_entity'
sched: Make sure to not re-read variables after validation
sched: Fix SD_OVERLAP
sched: Don't try allocating memory from offline nodes
sched/nohz: Fix rq->cpu_load calculations some more
sched/x86: Use cpu_llc_shared_mask(cpu) for coregroup_mask
Diffstat (limited to 'kernel/time')
| -rw-r--r-- | kernel/time/tick-sched.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/kernel/time/tick-sched.c b/kernel/time/tick-sched.c index efd386667536..da70c6db496c 100644 --- a/kernel/time/tick-sched.c +++ b/kernel/time/tick-sched.c @@ -576,6 +576,7 @@ void tick_nohz_idle_exit(void) /* Update jiffies first */ select_nohz_load_balancer(0); tick_do_update_jiffies64(now); + update_cpu_load_nohz(); #ifndef CONFIG_VIRT_CPU_ACCOUNTING /* |