diff options
author | Gregory Nutt <gnutt@nuttx.org> | 2014-10-10 08:47:41 -0600 |
---|---|---|
committer | Gregory Nutt <gnutt@nuttx.org> | 2014-10-10 08:47:41 -0600 |
commit | cebd34bc8c6a04b2cdc5671feb533526c4478ac7 (patch) | |
tree | bfa60456bee507dde6d61b82fb970bef4cc25144 /nuttx/sched/wqueue | |
parent | 1c1cdb89c3242461047d5b63430fa28090a9a65f (diff) | |
download | px4-nuttx-cebd34bc8c6a04b2cdc5671feb533526c4478ac7.tar.gz px4-nuttx-cebd34bc8c6a04b2cdc5671feb533526c4478ac7.tar.bz2 px4-nuttx-cebd34bc8c6a04b2cdc5671feb533526c4478ac7.zip |
Fix some conditional logic in last work queue repartitioning change
Diffstat (limited to 'nuttx/sched/wqueue')
-rw-r--r-- | nuttx/sched/wqueue/kwork_cancel.c | 2 | ||||
-rw-r--r-- | nuttx/sched/wqueue/kwork_queue.c | 3 |
2 files changed, 1 insertions, 4 deletions
diff --git a/nuttx/sched/wqueue/kwork_cancel.c b/nuttx/sched/wqueue/kwork_cancel.c index 92e70e20d..e8a44acf2 100644 --- a/nuttx/sched/wqueue/kwork_cancel.c +++ b/nuttx/sched/wqueue/kwork_cancel.c @@ -80,7 +80,7 @@ * by calling work_queue() again. * * Input parameters: - * qid - The work queue ID (must be USRWORK) + * qid - The work queue ID (must be HPWORK or LPWORK) * work - The previously queue work structure to cancel * * Returned Value: diff --git a/nuttx/sched/wqueue/kwork_queue.c b/nuttx/sched/wqueue/kwork_queue.c index 357b9fe84..9a979f947 100644 --- a/nuttx/sched/wqueue/kwork_queue.c +++ b/nuttx/sched/wqueue/kwork_queue.c @@ -101,8 +101,6 @@ * ****************************************************************************/ -#if defined(CONFIG_SCHED_USRWORK) && !defined(__KERNEL__) - int work_queue(int qid, FAR struct work_s *work, worker_t worker, FAR void *arg, uint32_t delay) { @@ -129,5 +127,4 @@ int work_queue(int qid, FAR struct work_s *work, worker_t worker, } } -#endif /* CONFIG_SCHED_USRWORK && !__KERNEL__ */ #endif /* CONFIG_SCHED_WORKQUEUE */ |