diff options
Diffstat (limited to 'mm')
-rw-r--r-- | mm/filemap.c | 2 | ||||
-rw-r--r-- | mm/kmemleak.c | 4 | ||||
-rw-r--r-- | mm/memcontrol.c | 6 | ||||
-rw-r--r-- | mm/memory-failure.c | 2 | ||||
-rw-r--r-- | mm/truncate.c | 2 |
5 files changed, 8 insertions, 8 deletions
diff --git a/mm/filemap.c b/mm/filemap.c index ef169f37156d..c3d3506ecaba 100644 --- a/mm/filemap.c +++ b/mm/filemap.c | |||
@@ -1844,7 +1844,7 @@ static size_t __iovec_copy_from_user_inatomic(char *vaddr, | |||
1844 | 1844 | ||
1845 | /* | 1845 | /* |
1846 | * Copy as much as we can into the page and return the number of bytes which | 1846 | * Copy as much as we can into the page and return the number of bytes which |
1847 | * were sucessfully copied. If a fault is encountered then return the number of | 1847 | * were successfully copied. If a fault is encountered then return the number of |
1848 | * bytes which were copied. | 1848 | * bytes which were copied. |
1849 | */ | 1849 | */ |
1850 | size_t iov_iter_copy_from_user_atomic(struct page *page, | 1850 | size_t iov_iter_copy_from_user_atomic(struct page *page, |
diff --git a/mm/kmemleak.c b/mm/kmemleak.c index 8bf765c4f58d..13f33b3081ec 100644 --- a/mm/kmemleak.c +++ b/mm/kmemleak.c | |||
@@ -1050,8 +1050,8 @@ static void scan_object(struct kmemleak_object *object) | |||
1050 | unsigned long flags; | 1050 | unsigned long flags; |
1051 | 1051 | ||
1052 | /* | 1052 | /* |
1053 | * Once the object->lock is aquired, the corresponding memory block | 1053 | * Once the object->lock is acquired, the corresponding memory block |
1054 | * cannot be freed (the same lock is aquired in delete_object). | 1054 | * cannot be freed (the same lock is acquired in delete_object). |
1055 | */ | 1055 | */ |
1056 | spin_lock_irqsave(&object->lock, flags); | 1056 | spin_lock_irqsave(&object->lock, flags); |
1057 | if (object->flags & OBJECT_NO_SCAN) | 1057 | if (object->flags & OBJECT_NO_SCAN) |
diff --git a/mm/memcontrol.c b/mm/memcontrol.c index f99f5991d6bb..c31a310aa146 100644 --- a/mm/memcontrol.c +++ b/mm/memcontrol.c | |||
@@ -209,7 +209,7 @@ struct mem_cgroup { | |||
209 | int prev_priority; /* for recording reclaim priority */ | 209 | int prev_priority; /* for recording reclaim priority */ |
210 | 210 | ||
211 | /* | 211 | /* |
212 | * While reclaiming in a hiearchy, we cache the last child we | 212 | * While reclaiming in a hierarchy, we cache the last child we |
213 | * reclaimed from. | 213 | * reclaimed from. |
214 | */ | 214 | */ |
215 | int last_scanned_child; | 215 | int last_scanned_child; |
@@ -1720,7 +1720,7 @@ int mem_cgroup_cache_charge(struct page *page, struct mm_struct *mm, | |||
1720 | /* | 1720 | /* |
1721 | * While swap-in, try_charge -> commit or cancel, the page is locked. | 1721 | * While swap-in, try_charge -> commit or cancel, the page is locked. |
1722 | * And when try_charge() successfully returns, one refcnt to memcg without | 1722 | * And when try_charge() successfully returns, one refcnt to memcg without |
1723 | * struct page_cgroup is aquired. This refcnt will be cumsumed by | 1723 | * struct page_cgroup is acquired. This refcnt will be consumed by |
1724 | * "commit()" or removed by "cancel()" | 1724 | * "commit()" or removed by "cancel()" |
1725 | */ | 1725 | */ |
1726 | int mem_cgroup_try_charge_swapin(struct mm_struct *mm, | 1726 | int mem_cgroup_try_charge_swapin(struct mm_struct *mm, |
@@ -2466,7 +2466,7 @@ static int mem_cgroup_hierarchy_write(struct cgroup *cont, struct cftype *cft, | |||
2466 | 2466 | ||
2467 | cgroup_lock(); | 2467 | cgroup_lock(); |
2468 | /* | 2468 | /* |
2469 | * If parent's use_hiearchy is set, we can't make any modifications | 2469 | * If parent's use_hierarchy is set, we can't make any modifications |
2470 | * in the child subtrees. If it is unset, then the change can | 2470 | * in the child subtrees. If it is unset, then the change can |
2471 | * occur, provided the current cgroup has no children. | 2471 | * occur, provided the current cgroup has no children. |
2472 | * | 2472 | * |
diff --git a/mm/memory-failure.c b/mm/memory-failure.c index dacc64183874..1ac49fef95ab 100644 --- a/mm/memory-failure.c +++ b/mm/memory-failure.c | |||
@@ -174,7 +174,7 @@ static void kill_procs_ao(struct list_head *to_kill, int doit, int trapno, | |||
174 | list_for_each_entry_safe (tk, next, to_kill, nd) { | 174 | list_for_each_entry_safe (tk, next, to_kill, nd) { |
175 | if (doit) { | 175 | if (doit) { |
176 | /* | 176 | /* |
177 | * In case something went wrong with munmaping | 177 | * In case something went wrong with munmapping |
178 | * make sure the process doesn't catch the | 178 | * make sure the process doesn't catch the |
179 | * signal and then access the memory. Just kill it. | 179 | * signal and then access the memory. Just kill it. |
180 | * the signal handlers | 180 | * the signal handlers |
diff --git a/mm/truncate.c b/mm/truncate.c index 450cebdabfc0..2c147a7e5f2c 100644 --- a/mm/truncate.c +++ b/mm/truncate.c | |||
@@ -490,7 +490,7 @@ EXPORT_SYMBOL_GPL(invalidate_inode_pages2_range); | |||
490 | * Any pages which are found to be mapped into pagetables are unmapped prior to | 490 | * Any pages which are found to be mapped into pagetables are unmapped prior to |
491 | * invalidation. | 491 | * invalidation. |
492 | * | 492 | * |
493 | * Returns -EIO if any pages could not be invalidated. | 493 | * Returns -EBUSY if any pages could not be invalidated. |
494 | */ | 494 | */ |
495 | int invalidate_inode_pages2(struct address_space *mapping) | 495 | int invalidate_inode_pages2(struct address_space *mapping) |
496 | { | 496 | { |