diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2018-01-12 10:23:59 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2018-01-12 10:23:59 -0800 |
| commit | 67549d46d42eed58731028bebe304bc8cbd7af01 (patch) | |
| tree | a0f5f7664ae96d3f0ce693f46987a820539dcae5 /init/Kconfig | |
| parent | 02776b9b5399183f273fa898fef64b1e977a5f85 (diff) | |
| parent | 541676078b52f365f53d46ee5517d305cd1b6350 (diff) | |
| download | talos-obmc-linux-67549d46d42eed58731028bebe304bc8cbd7af01.tar.gz talos-obmc-linux-67549d46d42eed58731028bebe304bc8cbd7af01.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:
"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
Diffstat (limited to 'init/Kconfig')
| -rw-r--r-- | init/Kconfig | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/init/Kconfig b/init/Kconfig index 19a6b845d834..a9a2e2c86671 100644 --- a/init/Kconfig +++ b/init/Kconfig @@ -461,6 +461,7 @@ endmenu # "CPU/Task time and stats accounting" config CPU_ISOLATION bool "CPU isolation" + depends on SMP || COMPILE_TEST default y help Make sure that CPUs running critical tasks are not disturbed by |
