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-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

Pull scheduler fixes from Ingo Molnar:
"A Kconfig fix, a build fix and a membarrier bug fix"

* 'sched-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
membarrier: Disable preemption when calling smp_call_function_many()
sched/isolation: Make CONFIG_CPU_ISOLATION=y depend on SMP or COMPILE_TEST
ia64, sched/cputime: Fix build error if CONFIG_VIRT_CPU_ACCOUNTING_NATIVE=y

Linus Torvalds 67549d46 02776b9b

+4 -1
+1 -1
arch/ia64/kernel/time.c
··· 88 88 } 89 89 90 90 if (ti->softirq_time) { 91 - delta = cycle_to_nsec(ti->softirq_time)); 91 + delta = cycle_to_nsec(ti->softirq_time); 92 92 account_system_index_time(tsk, delta, CPUTIME_SOFTIRQ); 93 93 } 94 94
+1
init/Kconfig
··· 461 461 462 462 config CPU_ISOLATION 463 463 bool "CPU isolation" 464 + depends on SMP || COMPILE_TEST 464 465 default y 465 466 help 466 467 Make sure that CPUs running critical tasks are not disturbed by
+2
kernel/sched/membarrier.c
··· 89 89 rcu_read_unlock(); 90 90 } 91 91 if (!fallback) { 92 + preempt_disable(); 92 93 smp_call_function_many(tmpmask, ipi_mb, NULL, 1); 94 + preempt_enable(); 93 95 free_cpumask_var(tmpmask); 94 96 } 95 97 cpus_read_unlock();