summaryrefslogtreecommitdiff
path: root/kernel
diff options
context:
space:
mode:
authorIngo Molnar <mingo@kernel.org>2019-11-25 13:48:11 +0100
committerIngo Molnar <mingo@kernel.org>2019-11-25 13:48:11 +0100
commitde881a341c4143650fa50ce95cf450a5c94faa9f (patch)
treea82eb6d7aa731f63cbdcf7952b47cc92cbda2965 /kernel
parent8392853e964c025b0616bd54c0cdf9cbc3c9a769 (diff)
parentd61ca3c25e0330c44d9a18b2a767197f10c0cd16 (diff)
Merge branch 'sched/rt' into sched/core, to pick up commit
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'kernel')
-rw-r--r--kernel/Kconfig.preempt2
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/Kconfig.preempt b/kernel/Kconfig.preempt
index deff97217496..bf82259cff96 100644
--- a/kernel/Kconfig.preempt
+++ b/kernel/Kconfig.preempt
@@ -65,7 +65,7 @@ config PREEMPT_RT
preemptible priority-inheritance aware variants, enforcing
interrupt threading and introducing mechanisms to break up long
non-preemptible sections. This makes the kernel, except for very
- low level and critical code pathes (entry code, scheduler, low
+ low level and critical code paths (entry code, scheduler, low
level interrupt handling) fully preemptible and brings most
execution contexts under scheduler control.