diff options
| -rw-r--r-- | block/blk-core.c | 8 | ||||
| -rw-r--r-- | block/genhd.c | 2 | ||||
| -rw-r--r-- | include/linux/clk.h | 2 | ||||
| -rw-r--r-- | include/linux/kfifo.h | 2 | ||||
| -rw-r--r-- | ipc/util.c | 6 | ||||
| -rw-r--r-- | kernel/auditsc.c | 2 | ||||
| -rw-r--r-- | lib/bitmap.c | 4 | ||||
| -rw-r--r-- | lib/idr.c | 2 | ||||
| -rw-r--r-- | lib/vsprintf.c | 2 | ||||
| -rw-r--r-- | mm/filemap.c | 2 | ||||
| -rw-r--r-- | security/inode.c | 2 |
11 files changed, 17 insertions, 17 deletions
diff --git a/block/blk-core.c b/block/blk-core.c index 6f8dba161bfe..ce5a389cea94 100644 --- a/block/blk-core.c +++ b/block/blk-core.c | |||
| @@ -240,7 +240,7 @@ EXPORT_SYMBOL(blk_stop_queue); | |||
| 240 | * this function. | 240 | * this function. |
| 241 | * | 241 | * |
| 242 | * This function does not cancel any asynchronous activity arising | 242 | * This function does not cancel any asynchronous activity arising |
| 243 | * out of elevator or throttling code. That would require elevaotor_exit() | 243 | * out of elevator or throttling code. That would require elevator_exit() |
| 244 | * and blkcg_exit_queue() to be called with queue lock initialized. | 244 | * and blkcg_exit_queue() to be called with queue lock initialized. |
| 245 | * | 245 | * |
| 246 | */ | 246 | */ |
| @@ -930,7 +930,7 @@ static struct io_context *rq_ioc(struct bio *bio) | |||
| 930 | * Get a free request from @q. This function may fail under memory | 930 | * Get a free request from @q. This function may fail under memory |
| 931 | * pressure or if @q is dead. | 931 | * pressure or if @q is dead. |
| 932 | * | 932 | * |
| 933 | * Must be callled with @q->queue_lock held and, | 933 | * Must be called with @q->queue_lock held and, |
| 934 | * Returns %NULL on failure, with @q->queue_lock held. | 934 | * Returns %NULL on failure, with @q->queue_lock held. |
| 935 | * Returns !%NULL on success, with @q->queue_lock *not held*. | 935 | * Returns !%NULL on success, with @q->queue_lock *not held*. |
| 936 | */ | 936 | */ |
| @@ -1107,7 +1107,7 @@ rq_starved: | |||
| 1107 | * Get a free request from @q. If %__GFP_WAIT is set in @gfp_mask, this | 1107 | * Get a free request from @q. If %__GFP_WAIT is set in @gfp_mask, this |
| 1108 | * function keeps retrying under memory pressure and fails iff @q is dead. | 1108 | * function keeps retrying under memory pressure and fails iff @q is dead. |
| 1109 | * | 1109 | * |
| 1110 | * Must be callled with @q->queue_lock held and, | 1110 | * Must be called with @q->queue_lock held and, |
| 1111 | * Returns %NULL on failure, with @q->queue_lock held. | 1111 | * Returns %NULL on failure, with @q->queue_lock held. |
| 1112 | * Returns !%NULL on success, with @q->queue_lock *not held*. | 1112 | * Returns !%NULL on success, with @q->queue_lock *not held*. |
| 1113 | */ | 1113 | */ |
| @@ -1238,7 +1238,7 @@ struct request *blk_make_request(struct request_queue *q, struct bio *bio, | |||
| 1238 | EXPORT_SYMBOL(blk_make_request); | 1238 | EXPORT_SYMBOL(blk_make_request); |
| 1239 | 1239 | ||
| 1240 | /** | 1240 | /** |
| 1241 | * blk_rq_set_block_pc - initialize a requeest to type BLOCK_PC | 1241 | * blk_rq_set_block_pc - initialize a request to type BLOCK_PC |
| 1242 | * @rq: request to be initialized | 1242 | * @rq: request to be initialized |
| 1243 | * | 1243 | * |
| 1244 | */ | 1244 | */ |
diff --git a/block/genhd.c b/block/genhd.c index 791f41943132..048e2cee43d2 100644 --- a/block/genhd.c +++ b/block/genhd.c | |||
| @@ -1543,7 +1543,7 @@ void disk_flush_events(struct gendisk *disk, unsigned int mask) | |||
| 1543 | /** | 1543 | /** |
| 1544 | * disk_clear_events - synchronously check, clear and return pending events | 1544 | * disk_clear_events - synchronously check, clear and return pending events |
| 1545 | * @disk: disk to fetch and clear events from | 1545 | * @disk: disk to fetch and clear events from |
| 1546 | * @mask: mask of events to be fetched and clearted | 1546 | * @mask: mask of events to be fetched and cleared |
| 1547 | * | 1547 | * |
| 1548 | * Disk events are synchronously checked and pending events in @mask | 1548 | * Disk events are synchronously checked and pending events in @mask |
| 1549 | * are cleared and returned. This ignores the block count. | 1549 | * are cleared and returned. This ignores the block count. |
diff --git a/include/linux/clk.h b/include/linux/clk.h index fb5e097d8f72..afb44bfaf8d1 100644 --- a/include/linux/clk.h +++ b/include/linux/clk.h | |||
| @@ -238,7 +238,7 @@ void clk_put(struct clk *clk); | |||
| 238 | 238 | ||
| 239 | /** | 239 | /** |
| 240 | * devm_clk_put - "free" a managed clock source | 240 | * devm_clk_put - "free" a managed clock source |
| 241 | * @dev: device used to acuqire the clock | 241 | * @dev: device used to acquire the clock |
| 242 | * @clk: clock source acquired with devm_clk_get() | 242 | * @clk: clock source acquired with devm_clk_get() |
| 243 | * | 243 | * |
| 244 | * Note: drivers must ensure that all clk_enable calls made on this | 244 | * Note: drivers must ensure that all clk_enable calls made on this |
diff --git a/include/linux/kfifo.h b/include/linux/kfifo.h index 554fde3a3927..473b43678ad1 100644 --- a/include/linux/kfifo.h +++ b/include/linux/kfifo.h | |||
| @@ -722,7 +722,7 @@ __kfifo_uint_must_check_helper( \ | |||
| 722 | /** | 722 | /** |
| 723 | * kfifo_dma_out_finish - finish a DMA OUT operation | 723 | * kfifo_dma_out_finish - finish a DMA OUT operation |
| 724 | * @fifo: address of the fifo to be used | 724 | * @fifo: address of the fifo to be used |
| 725 | * @len: number of bytes transferrd | 725 | * @len: number of bytes transferred |
| 726 | * | 726 | * |
| 727 | * This macro finish a DMA OUT operation. The out counter will be updated by | 727 | * This macro finish a DMA OUT operation. The out counter will be updated by |
| 728 | * the len parameter. No error checking will be done. | 728 | * the len parameter. No error checking will be done. |
diff --git a/ipc/util.c b/ipc/util.c index 27d74e69fd57..d73b7af581e2 100644 --- a/ipc/util.c +++ b/ipc/util.c | |||
| @@ -309,7 +309,7 @@ int ipc_addid(struct ipc_ids *ids, struct kern_ipc_perm *new, int size) | |||
| 309 | /** | 309 | /** |
| 310 | * ipcget_new - create a new ipc object | 310 | * ipcget_new - create a new ipc object |
| 311 | * @ns: ipc namespace | 311 | * @ns: ipc namespace |
| 312 | * @ids: ipc identifer set | 312 | * @ids: ipc identifier set |
| 313 | * @ops: the actual creation routine to call | 313 | * @ops: the actual creation routine to call |
| 314 | * @params: its parameters | 314 | * @params: its parameters |
| 315 | * | 315 | * |
| @@ -363,7 +363,7 @@ static int ipc_check_perms(struct ipc_namespace *ns, | |||
| 363 | /** | 363 | /** |
| 364 | * ipcget_public - get an ipc object or create a new one | 364 | * ipcget_public - get an ipc object or create a new one |
| 365 | * @ns: ipc namespace | 365 | * @ns: ipc namespace |
| 366 | * @ids: ipc identifer set | 366 | * @ids: ipc identifier set |
| 367 | * @ops: the actual creation routine to call | 367 | * @ops: the actual creation routine to call |
| 368 | * @params: its parameters | 368 | * @params: its parameters |
| 369 | * | 369 | * |
| @@ -669,7 +669,7 @@ out: | |||
| 669 | 669 | ||
| 670 | /** | 670 | /** |
| 671 | * ipcget - Common sys_*get() code | 671 | * ipcget - Common sys_*get() code |
| 672 | * @ns: namsepace | 672 | * @ns: namespace |
| 673 | * @ids: ipc identifier set | 673 | * @ids: ipc identifier set |
| 674 | * @ops: operations to be called on ipc object creation, permission checks | 674 | * @ops: operations to be called on ipc object creation, permission checks |
| 675 | * and further checks | 675 | * and further checks |
diff --git a/kernel/auditsc.c b/kernel/auditsc.c index 21eae3c05ec0..7208c1df248d 100644 --- a/kernel/auditsc.c +++ b/kernel/auditsc.c | |||
| @@ -2406,7 +2406,7 @@ int __audit_log_bprm_fcaps(struct linux_binprm *bprm, | |||
| 2406 | * @new: the new credentials | 2406 | * @new: the new credentials |
| 2407 | * @old: the old (current) credentials | 2407 | * @old: the old (current) credentials |
| 2408 | * | 2408 | * |
| 2409 | * Record the aguments userspace sent to sys_capset for later printing by the | 2409 | * Record the arguments userspace sent to sys_capset for later printing by the |
| 2410 | * audit system if applicable | 2410 | * audit system if applicable |
| 2411 | */ | 2411 | */ |
| 2412 | void __audit_log_capset(const struct cred *new, const struct cred *old) | 2412 | void __audit_log_capset(const struct cred *new, const struct cred *old) |
diff --git a/lib/bitmap.c b/lib/bitmap.c index 06f7e4fe8d2d..ed0f00c3da0a 100644 --- a/lib/bitmap.c +++ b/lib/bitmap.c | |||
| @@ -882,7 +882,7 @@ EXPORT_SYMBOL(bitmap_bitremap); | |||
| 882 | * read it, you're overqualified for your current job.) | 882 | * read it, you're overqualified for your current job.) |
| 883 | * | 883 | * |
| 884 | * In other words, @orig is mapped onto (surjectively) @dst, | 884 | * In other words, @orig is mapped onto (surjectively) @dst, |
| 885 | * using the the map { <n, m> | the n-th bit of @relmap is the | 885 | * using the map { <n, m> | the n-th bit of @relmap is the |
| 886 | * m-th set bit of @relmap }. | 886 | * m-th set bit of @relmap }. |
| 887 | * | 887 | * |
| 888 | * Any set bits in @orig above bit number W, where W is the | 888 | * Any set bits in @orig above bit number W, where W is the |
| @@ -930,7 +930,7 @@ EXPORT_SYMBOL(bitmap_bitremap); | |||
| 930 | * | 930 | * |
| 931 | * Further lets say we use the following code, invoking | 931 | * Further lets say we use the following code, invoking |
| 932 | * bitmap_fold() then bitmap_onto, as suggested above to | 932 | * bitmap_fold() then bitmap_onto, as suggested above to |
| 933 | * avoid the possitility of an empty @dst result: | 933 | * avoid the possibility of an empty @dst result: |
| 934 | * | 934 | * |
| 935 | * unsigned long *tmp; // a temporary bitmap's bits | 935 | * unsigned long *tmp; // a temporary bitmap's bits |
| 936 | * | 936 | * |
| @@ -625,7 +625,7 @@ static void __idr_remove_all(struct idr *idp) | |||
| 625 | * idr_destroy(). | 625 | * idr_destroy(). |
| 626 | * | 626 | * |
| 627 | * A typical clean-up sequence for objects stored in an idr tree will use | 627 | * A typical clean-up sequence for objects stored in an idr tree will use |
| 628 | * idr_for_each() to free all objects, if necessay, then idr_destroy() to | 628 | * idr_for_each() to free all objects, if necessary, then idr_destroy() to |
| 629 | * free up the id mappings and cached idr_layers. | 629 | * free up the id mappings and cached idr_layers. |
| 630 | */ | 630 | */ |
| 631 | void idr_destroy(struct idr *idp) | 631 | void idr_destroy(struct idr *idp) |
diff --git a/lib/vsprintf.c b/lib/vsprintf.c index 6fe2c84eb055..ba3cd0a35640 100644 --- a/lib/vsprintf.c +++ b/lib/vsprintf.c | |||
| @@ -1937,7 +1937,7 @@ EXPORT_SYMBOL(sprintf); | |||
| 1937 | * @args: Arguments for the format string | 1937 | * @args: Arguments for the format string |
| 1938 | * | 1938 | * |
| 1939 | * The format follows C99 vsnprintf, except %n is ignored, and its argument | 1939 | * The format follows C99 vsnprintf, except %n is ignored, and its argument |
| 1940 | * is skiped. | 1940 | * is skipped. |
| 1941 | * | 1941 | * |
| 1942 | * The return value is the number of words(32bits) which would be generated for | 1942 | * The return value is the number of words(32bits) which would be generated for |
| 1943 | * the given input. | 1943 | * the given input. |
diff --git a/mm/filemap.c b/mm/filemap.c index 65d44fd88c78..f092654cc1a3 100644 --- a/mm/filemap.c +++ b/mm/filemap.c | |||
| @@ -720,7 +720,7 @@ EXPORT_SYMBOL_GPL(add_page_wait_queue); | |||
| 720 | * | 720 | * |
| 721 | * Unlocks the page and wakes up sleepers in ___wait_on_page_locked(). | 721 | |
