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:
sched: Reassign prev and switch_count when reacquire_kernel_lock() fail
sched: Fix vmark regression on big machines

Linus Torvalds 341031ca 836f48c5

+6 -3
+1 -1
include/linux/topology.h
··· 99 99 | 1*SD_WAKE_AFFINE \ 100 100 | 1*SD_SHARE_CPUPOWER \ 101 101 | 0*SD_POWERSAVINGS_BALANCE \ 102 - | 0*SD_SHARE_PKG_RESOURCES \ 102 + | 1*SD_SHARE_PKG_RESOURCES \ 103 103 | 0*SD_SERIALIZE \ 104 104 | 0*SD_PREFER_SIBLING \ 105 105 , \
+4 -1
kernel/sched.c
··· 5530 5530 5531 5531 post_schedule(rq); 5532 5532 5533 - if (unlikely(reacquire_kernel_lock(current) < 0)) 5533 + if (unlikely(reacquire_kernel_lock(current) < 0)) { 5534 + prev = rq->curr; 5535 + switch_count = &prev->nivcsw; 5534 5536 goto need_resched_nonpreemptible; 5537 + } 5535 5538 5536 5539 preempt_enable_no_resched(); 5537 5540 if (need_resched())
+1 -1
kernel/sched_fair.c
··· 1508 1508 * If there's an idle sibling in this domain, make that 1509 1509 * the wake_affine target instead of the current cpu. 1510 1510 */ 1511 - if (tmp->flags & SD_PREFER_SIBLING) 1511 + if (tmp->flags & SD_SHARE_PKG_RESOURCES) 1512 1512 target = select_idle_sibling(p, tmp, target); 1513 1513 1514 1514 if (target >= 0) {