diff options
| author | Randy Dunlap <randy.dunlap@oracle.com> | 2006-12-22 10:06:52 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.osdl.org> | 2006-12-22 17:55:47 +0100 |
| commit | af9997e426f9ddfe7a84cb4cd3c7ff938fabd41a (patch) | |
| tree | 8bbb991c584b1a555b35950900455517f5e55ee9 /kernel | |
| parent | [PATCH] slab: fix kmem_ptr_validate definition (diff) | |
| download | linux-af9997e426f9ddfe7a84cb4cd3c7ff938fabd41a.tar.xz linux-af9997e426f9ddfe7a84cb4cd3c7ff938fabd41a.zip | |
[PATCH] fix kernel-doc warnings in 2.6.20-rc1
Fix kernel-doc warnings in 2.6.20-rc1.
Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/relay.c | 2 | ||||
| -rw-r--r-- | kernel/workqueue.c | 4 |
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 = { /** * wakeup_readers - wake up readers waiting on a channel - * @private: the channel buffer + * @work: work struct that contains the the channel buffer * * This is the work function used to defer reader waking. The * 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) /** * queue_delayed_work - queue work on a workqueue after delay * @wq: workqueue to use - * @work: delayable work to queue + * @dwork: delayable work to queue * @delay: number of jiffies to wait before queueing * * Returns 0 if @work was already on a queue, non-zero otherwise. @@ -268,7 +268,7 @@ EXPORT_SYMBOL_GPL(queue_delayed_work); * queue_delayed_work_on - queue work on specific CPU after delay * @cpu: CPU number to execute work on * @wq: workqueue to use - * @work: work to queue + * @dwork: work to queue * @delay: number of jiffies to wait before queueing * * Returns 0 if @work was already on a queue, non-zero otherwise. |