Skip to content

sched_mergepending.c: Correct some errors in comments. #38

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
acassis merged 5 commits into from
Jan 4, 2020
Merged

sched_mergepending.c: Correct some errors in comments. #38

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
5bb496b
Documentation/NuttXCCodingStandard.html: Remove requirement to decor…
gregory-nutt Jan 3, 2020
ad72c4a
Merge branch 'master' of github.com:apache/incubator-nuttx
gregory-nutt Jan 3, 2020
dc46bf2
Merge branch 'master' of github.com:apache/incubator-nuttx
gregory-nutt Jan 3, 2020
f6aa4d1
Merge branch 'master' of github.com:apache/incubator-nuttx
gregory-nutt Jan 4, 2020
4489753
sched_mergepending.c: Correct some errors in comments.
gregory-nutt Jan 4, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 9 additions & 11 deletions sched/sched/sched_mergepending.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,11 +76,10 @@
* a context switch is needed.
*
* Assumptions:
* - The caller has established a critical section before
* calling this function (calling sched_lock() first is NOT
* a good idea -- use enter_critical_section()).
* - The caller handles the condition that occurs if the
* the head of the sched_mergTSTATE_TASK_PENDINGs is changed.
* - The caller has established a critical section before calling this
* function.
* - The caller handles the condition that occurs if the head of the
* ready-to-run task list is changed.
*
****************************************************************************/

Expand Down Expand Up @@ -181,11 +180,10 @@ bool sched_mergepending(void)
* a context switch is needed.
*
* Assumptions:
* - The caller has established a critical section before
* calling this function (calling sched_lock() first is NOT
* a good idea -- use enter_critical_section()).
* - The caller handles the condition that occurs if the
* the head of the sched_mergTSTATE_TASK_PENDINGs is changed.
* - The caller has established a critical section before calling this
* function.
* - The caller handles the condition that occurs if the head of the
* ready-to-run task list is changed.
*
****************************************************************************/

Expand Down Expand Up @@ -261,7 +259,7 @@ bool sched_mergepending(void)
(FAR dq_queue_t *)&g_pendingtasks,
TSTATE_TASK_PENDING);

/* And return with the schedule locked and tasks in the
/* And return with the scheduler locked and tasks in the
* pending task list.
*/

Expand Down