aboutsummaryrefslogtreecommitdiffstats
path: root/kernel/trace/trace.h
diff options
context:
space:
mode:
Diffstat (limited to 'kernel/trace/trace.h')
-rw-r--r--kernel/trace/trace.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/kernel/trace/trace.h b/kernel/trace/trace.h
index 5efc4c707f7e..f92aba52a894 100644
--- a/kernel/trace/trace.h
+++ b/kernel/trace/trace.h
@@ -616,12 +616,12 @@ extern struct tracer nop_trace;
616 * preempt_enable (after a disable), a schedule might take place 616 * preempt_enable (after a disable), a schedule might take place
617 * causing an infinite recursion. 617 * causing an infinite recursion.
618 * 618 *
619 * To prevent this, we read the need_recshed flag before 619 * To prevent this, we read the need_resched flag before
620 * disabling preemption. When we want to enable preemption we 620 * disabling preemption. When we want to enable preemption we
621 * check the flag, if it is set, then we call preempt_enable_no_resched. 621 * check the flag, if it is set, then we call preempt_enable_no_resched.
622 * Otherwise, we call preempt_enable. 622 * Otherwise, we call preempt_enable.
623 * 623 *
624 * The rational for doing the above is that if need resched is set 624 * The rational for doing the above is that if need_resched is set
625 * and we have yet to reschedule, we are either in an atomic location 625 * and we have yet to reschedule, we are either in an atomic location
626 * (where we do not need to check for scheduling) or we are inside 626 * (where we do not need to check for scheduling) or we are inside
627 * the scheduler and do not want to resched. 627 * the scheduler and do not want to resched.
@@ -642,7 +642,7 @@ static inline int ftrace_preempt_disable(void)
642 * 642 *
643 * This is a scheduler safe way to enable preemption and not miss 643 * This is a scheduler safe way to enable preemption and not miss
644 * any preemption checks. The disabled saved the state of preemption. 644 * any preemption checks. The disabled saved the state of preemption.
645 * If resched is set, then we were either inside an atomic or 645 * If resched is set, then we are either inside an atomic or
646 * are inside the scheduler (we would have already scheduled 646 * are inside the scheduler (we would have already scheduled
647 * otherwise). In this case, we do not want to call normal 647 * otherwise). In this case, we do not want to call normal
648 * preempt_enable, but preempt_enable_no_resched instead. 648 * preempt_enable, but preempt_enable_no_resched instead.