tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

Merge branch 'sched-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip

* 'sched-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
x86, tsc: Fix a preemption leak in restore_sched_clock_state()
sched: Move sched_avg_update() to update_cpu_load()

Linus Torvalds aad1830e 3e6dce76

+6 -2
+6
kernel/sched.c
··· 1294 1294 static void sched_rt_avg_update(struct rq *rq, u64 rt_delta) 1295 1295 { 1296 1296 } 1297 + 1298 + static void sched_avg_update(struct rq *rq) 1299 + { 1300 + } 1297 1301 #endif /* CONFIG_SMP */ 1298 1302 1299 1303 #if BITS_PER_LONG == 32 ··· 3186 3182 3187 3183 this_rq->cpu_load[i] = (old_load * (scale - 1) + new_load) >> i; 3188 3184 } 3185 + 3186 + sched_avg_update(this_rq); 3189 3187 } 3190 3188 3191 3189 static void update_cpu_load_active(struct rq *this_rq)
-2
kernel/sched_fair.c
··· 2267 2267 struct rq *rq = cpu_rq(cpu); 2268 2268 u64 total, available; 2269 2269 2270 - sched_avg_update(rq); 2271 - 2272 2270 total = sched_avg_period() + (rq->clock - rq->age_stamp); 2273 2271 available = total - rq->rt_avg; 2274 2272