aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--block/genhd.c2
-rw-r--r--include/linux/clk.h2
-rw-r--r--lib/bitmap.c4
-rw-r--r--lib/idr.c2
-rw-r--r--lib/vsprintf.c2
-rw-r--r--mm/filemap.c2
-rw-r--r--security/inode.c2
7 files changed, 8 insertions, 8 deletions
diff --git a/block/genhd.c b/block/genhd.c
index 7567ed0a8..cc2d9ac28 100644
--- a/block/genhd.c
+++ b/block/genhd.c
@@ -1663,7 +1663,7 @@ void disk_flush_events(struct gendisk *disk, unsigned int mask)
/**
* disk_clear_events - synchronously check, clear and return pending events
* @disk: disk to fetch and clear events from
- * @mask: mask of events to be fetched and clearted
+ * @mask: mask of events to be fetched and cleared
*
* Disk events are synchronously checked and pending events in @mask
* are cleared and returned. This ignores the block count.
diff --git a/include/linux/clk.h b/include/linux/clk.h
index 9a6d04524..169f41dc8 100644
--- a/include/linux/clk.h
+++ b/include/linux/clk.h
@@ -207,7 +207,7 @@ void clk_put(struct clk *clk);
/**
* devm_clk_put - "free" a managed clock source
- * @dev: device used to acuqire the clock
+ * @dev: device used to acquire the clock
* @clk: clock source acquired with devm_clk_get()
*
* Note: drivers must ensure that all clk_enable calls made on this
diff --git a/lib/bitmap.c b/lib/bitmap.c
index c0634aa92..a1f6f128c 100644
--- a/lib/bitmap.c
+++ b/lib/bitmap.c
@@ -887,7 +887,7 @@ EXPORT_SYMBOL(bitmap_bitremap);
* read it, you're overqualified for your current job.)
*
* In other words, @orig is mapped onto (surjectively) @dst,
- * using the the map { <n, m> | the n-th bit of @relmap is the
+ * using the map { <n, m> | the n-th bit of @relmap is the
* m-th set bit of @relmap }.
*
* Any set bits in @orig above bit number W, where W is the
@@ -935,7 +935,7 @@ EXPORT_SYMBOL(bitmap_bitremap);
*
* Further lets say we use the following code, invoking
* bitmap_fold() then bitmap_onto, as suggested above to
- * avoid the possitility of an empty @dst result:
+ * avoid the possibility of an empty @dst result:
*
* unsigned long *tmp; // a temporary bitmap's bits
*
diff --git a/lib/idr.c b/lib/idr.c
index a3bfde8ad..99c892364 100644
--- a/lib/idr.c
+++ b/lib/idr.c
@@ -654,7 +654,7 @@ EXPORT_SYMBOL(__idr_remove_all);
* idr_destroy().
*
* A typical clean-up sequence for objects stored in an idr tree will use
- * idr_for_each() to free all objects, if necessay, then idr_destroy() to
+ * idr_for_each() to free all objects, if necessary, then idr_destroy() to
* free up the id mappings and cached idr_layers.
*/
void idr_destroy(struct idr *idp)
diff --git a/lib/vsprintf.c b/lib/vsprintf.c
index 620fae4c1..50126a963 100644
--- a/lib/vsprintf.c
+++ b/lib/vsprintf.c
@@ -1719,7 +1719,7 @@ EXPORT_SYMBOL(sprintf);
* @args: Arguments for the format string
*
* The format follows C99 vsnprintf, except %n is ignored, and its argument
- * is skiped.
+ * is skipped.
*
* The return value is the number of words(32bits) which would be generated for
* the given input.
diff --git a/mm/filemap.c b/mm/filemap.c
index 255e5d7ba..f023964e7 100644
--- a/mm/filemap.c
+++ b/mm/filemap.c
@@ -597,7 +597,7 @@ EXPORT_SYMBOL_GPL(add_page_wait_queue);
*
* Unlocks the page and wakes up sleepers in ___wait_on_page_locked().
* Also wakes sleepers in wait_on_page_writeback() because the wakeup
- * mechananism between PageLocked pages and PageWriteback pages is shared.
+ * mechanism between PageLocked pages and PageWriteback pages is shared.
* But that's OK - sleepers in wait_on_page_writeback() just go back to sleep.
*
* The mb is necessary to enforce ordering between the clear_bit and the read
diff --git a/security/inode.c b/security/inode.c
index 43ce6e190..8e7ca6207 100644
--- a/security/inode.c
+++ b/security/inode.c
@@ -74,7 +74,7 @@ static struct file_system_type fs_type = {
* pointer must be passed to the securityfs_remove() function when the file is
* to be removed (no automatic cleanup happens if your module is unloaded,
* you are responsible here). If an error occurs, the function will return
- * the erorr value (via ERR_PTR).
+ * the error value (via ERR_PTR).
*
* If securityfs is not enabled in the kernel, the value %-ENODEV is
* returned.