diff options
author | Valentin Schneider <valentin.schneider@arm.com> | 2019-09-23 10:36:12 -0400 |
---|---|---|
committer | Ingo Molnar <mingo@kernel.org> | 2019-09-25 11:42:32 -0400 |
commit | a49b4f4012ef233143c5f7ce44f97851e54d5ef9 (patch) | |
tree | 9d39821367916b49ada43fc72b231607173c9a36 /kernel/sched | |
parent | 763a9ec06c409dcde2a761aac4bb83ff3938e0b3 (diff) |
sched/core: Fix preempt_schedule() interrupt return comment
preempt_schedule_irq() is the one that should be called on return from
interrupt, clean up the comment to avoid any ambiguity.
Signed-off-by: Valentin Schneider <valentin.schneider@arm.com>
Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Acked-by: Thomas Gleixner <tglx@linutronix.de>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: linux-m68k@lists.linux-m68k.org
Cc: linux-riscv@lists.infradead.org
Cc: uclinux-h8-devel@lists.sourceforge.jp
Link: https://lkml.kernel.org/r/20190923143620.29334-2-valentin.schneider@arm.com
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'kernel/sched')
-rw-r--r-- | kernel/sched/core.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/kernel/sched/core.c b/kernel/sched/core.c index 83ea23e9e91f..00ef44c8f7b5 100644 --- a/kernel/sched/core.c +++ b/kernel/sched/core.c | |||
@@ -4218,9 +4218,8 @@ static void __sched notrace preempt_schedule_common(void) | |||
4218 | 4218 | ||
4219 | #ifdef CONFIG_PREEMPTION | 4219 | #ifdef CONFIG_PREEMPTION |
4220 | /* | 4220 | /* |
4221 | * this is the entry point to schedule() from in-kernel preemption | 4221 | * This is the entry point to schedule() from in-kernel preemption |
4222 | * off of preempt_enable. Kernel preemptions off return from interrupt | 4222 | * off of preempt_enable. |
4223 | * occur there and call schedule directly. | ||
4224 | */ | 4223 | */ |
4225 | asmlinkage __visible void __sched notrace preempt_schedule(void) | 4224 | asmlinkage __visible void __sched notrace preempt_schedule(void) |
4226 | { | 4225 | { |
@@ -4291,7 +4290,7 @@ EXPORT_SYMBOL_GPL(preempt_schedule_notrace); | |||
4291 | #endif /* CONFIG_PREEMPTION */ | 4290 | #endif /* CONFIG_PREEMPTION */ |
4292 | 4291 | ||
4293 | /* | 4292 | /* |
4294 | * this is the entry point to schedule() from kernel preemption | 4293 | * This is the entry point to schedule() from kernel preemption |
4295 | * off of irq context. | 4294 | * off of irq context. |
4296 | * Note, that this is called and return with irqs disabled. This will | 4295 | * Note, that this is called and return with irqs disabled. This will |
4297 | * protect us against recursive calling from irq. | 4296 | * protect us against recursive calling from irq. |