hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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
This commit is contained in:
Linus Torvalds 2018-01-12 10:23:59 -08:00
parent 02776b9b53 541676078b
commit 67549d46d4
3 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arch/ia64/kernel/time.c
View File

@ -88,7 +88,7 @@ void vtime_flush(struct task_struct *tsk)
} }
if (ti->softirq_time) { if (ti->softirq_time) {
delta = cycle_to_nsec(ti->softirq_time)); delta = cycle_to_nsec(ti->softirq_time);
account_system_index_time(tsk, delta, CPUTIME_SOFTIRQ); account_system_index_time(tsk, delta, CPUTIME_SOFTIRQ);
} }

1
init/Kconfig
View File

@ -461,6 +461,7 @@ endmenu # "CPU/Task time and stats accounting"
config CPU_ISOLATION config CPU_ISOLATION
bool "CPU isolation" bool "CPU isolation"
depends on SMP || COMPILE_TEST
default y default y
help help
Make sure that CPUs running critical tasks are not disturbed by Make sure that CPUs running critical tasks are not disturbed by

2
kernel/sched/membarrier.c
View File

@ -89,7 +89,9 @@ static int membarrier_private_expedited(void)
rcu_read_unlock(); rcu_read_unlock();
} }
if (!fallback) { if (!fallback) {
preempt_disable();
smp_call_function_many(tmpmask, ipi_mb, NULL, 1); smp_call_function_many(tmpmask, ipi_mb, NULL, 1);
preempt_enable();
free_cpumask_var(tmpmask); free_cpumask_var(tmpmask);
} }
cpus_read_unlock(); cpus_read_unlock();