aboutsummaryrefslogtreecommitdiffstats
path: root/kernel
diff options
context:
space:
mode:
Diffstat (limited to 'kernel')
-rw-r--r--kernel/relay.c2
-rw-r--r--kernel/workqueue.c4
2 files changed, 3 insertions, 3 deletions
diff --git a/kernel/relay.c b/kernel/relay.c
index a4701e7ba7d0..3e076f2acd31 100644
--- a/kernel/relay.c
+++ b/kernel/relay.c
@@ -302,7 +302,7 @@ static struct rchan_callbacks default_channel_callbacks = {
302 302
303/** 303/**
304 * wakeup_readers - wake up readers waiting on a channel 304 * wakeup_readers - wake up readers waiting on a channel
305 * @private: the channel buffer 305 * @work: work struct that contains the the channel buffer
306 * 306 *
307 * This is the work function used to defer reader waking. The 307 * This is the work function used to defer reader waking. The
308 * reason waking is deferred is that calling directly from write 308 * reason waking is deferred is that calling directly from write
diff --git a/kernel/workqueue.c b/kernel/workqueue.c
index 180a8ce11535..a3da07c5af28 100644
--- a/kernel/workqueue.c
+++ b/kernel/workqueue.c
@@ -233,7 +233,7 @@ static void delayed_work_timer_fn(unsigned long __data)
233/** 233/**
234 * queue_delayed_work - queue work on a workqueue after delay 234 * queue_delayed_work - queue work on a workqueue after delay
235 * @wq: workqueue to use 235 * @wq: workqueue to use
236 * @work: delayable work to queue 236 * @dwork: delayable work to queue
237 * @delay: number of jiffies to wait before queueing 237 * @delay: number of jiffies to wait before queueing
238 * 238 *
239 * Returns 0 if @work was already on a queue, non-zero otherwise. 239 * Returns 0 if @work was already on a queue, non-zero otherwise.
@@ -268,7 +268,7 @@ EXPORT_SYMBOL_GPL(queue_delayed_work);
268 * queue_delayed_work_on - queue work on specific CPU after delay 268 * queue_delayed_work_on - queue work on specific CPU after delay
269 * @cpu: CPU number to execute work on 269 * @cpu: CPU number to execute work on
270 * @wq: workqueue to use 270 * @wq: workqueue to use
271 * @work: work to queue 271 * @dwork: work to queue
272 * @delay: number of jiffies to wait before queueing 272 * @delay: number of jiffies to wait before queueing
273 * 273 *
274 * Returns 0 if @work was already on a queue, non-zero otherwise. 274 * Returns 0 if @work was already on a queue, non-zero otherwise.