diff options
-rw-r--r-- | block/ll_rw_blk.c | 1 | ||||
-rw-r--r-- | drivers/base/firmware_class.c | 1 | ||||
-rw-r--r-- | drivers/message/i2o/exec-osm.c | 2 | ||||
-rw-r--r-- | kernel/relay.c | 2 | ||||
-rw-r--r-- | kernel/workqueue.c | 4 | ||||
-rw-r--r-- | mm/slab.c | 1 |
6 files changed, 7 insertions, 4 deletions
diff --git a/block/ll_rw_blk.c b/block/ll_rw_blk.c index e07c079e07e6..fb6789725e1b 100644 --- a/block/ll_rw_blk.c +++ b/block/ll_rw_blk.c | |||
@@ -2453,6 +2453,7 @@ EXPORT_SYMBOL(blk_rq_map_user); | |||
2453 | * @rq: request to map data to | 2453 | * @rq: request to map data to |
2454 | * @iov: pointer to the iovec | 2454 | * @iov: pointer to the iovec |
2455 | * @iov_count: number of elements in the iovec | 2455 | * @iov_count: number of elements in the iovec |
2456 | * @len: I/O byte count | ||
2456 | * | 2457 | * |
2457 | * Description: | 2458 | * Description: |
2458 | * Data will be mapped directly for zero copy io, if possible. Otherwise | 2459 | * Data will be mapped directly for zero copy io, if possible. Otherwise |
diff --git a/drivers/base/firmware_class.c b/drivers/base/firmware_class.c index 4bad2870c485..64558f45e6bc 100644 --- a/drivers/base/firmware_class.c +++ b/drivers/base/firmware_class.c | |||
@@ -127,6 +127,7 @@ static ssize_t firmware_loading_show(struct device *dev, | |||
127 | /** | 127 | /** |
128 | * firmware_loading_store - set value in the 'loading' control file | 128 | * firmware_loading_store - set value in the 'loading' control file |
129 | * @dev: device pointer | 129 | * @dev: device pointer |
130 | * @attr: device attribute pointer | ||
130 | * @buf: buffer to scan for loading control value | 131 | * @buf: buffer to scan for loading control value |
131 | * @count: number of bytes in @buf | 132 | * @count: number of bytes in @buf |
132 | * | 133 | * |
diff --git a/drivers/message/i2o/exec-osm.c b/drivers/message/i2o/exec-osm.c index a539d3b61e76..5278aad92bc4 100644 --- a/drivers/message/i2o/exec-osm.c +++ b/drivers/message/i2o/exec-osm.c | |||
@@ -367,7 +367,7 @@ static int i2o_exec_remove(struct device *dev) | |||
367 | 367 | ||
368 | /** | 368 | /** |
369 | * i2o_exec_lct_modified - Called on LCT NOTIFY reply | 369 | * i2o_exec_lct_modified - Called on LCT NOTIFY reply |
370 | * @work: work struct for a specific controller | 370 | * @_work: work struct for a specific controller |
371 | * | 371 | * |
372 | * This function handles asynchronus LCT NOTIFY replies. It parses the | 372 | * This function handles asynchronus LCT NOTIFY replies. It parses the |
373 | * new LCT and if the buffer for the LCT was to small sends a LCT NOTIFY | 373 | * new LCT and if the buffer for the LCT was to small sends a LCT NOTIFY |
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. |
@@ -3587,6 +3587,7 @@ out: | |||
3587 | * @cachep: The cache to allocate from. | 3587 | * @cachep: The cache to allocate from. |
3588 | * @flags: See kmalloc(). | 3588 | * @flags: See kmalloc(). |
3589 | * @nodeid: node number of the target node. | 3589 | * @nodeid: node number of the target node. |
3590 | * @caller: return address of caller, used for debug information | ||
3590 | * | 3591 | * |
3591 | * Identical to kmem_cache_alloc but it will allocate memory on the given | 3592 | * Identical to kmem_cache_alloc but it will allocate memory on the given |
3592 | * node, which can improve the performance for cpu bound structures. | 3593 | * node, which can improve the performance for cpu bound structures. |