diff options
Diffstat (limited to 'mm')
-rw-r--r-- | mm/filemap.c | 2 | ||||
-rw-r--r-- | mm/memcontrol.c | 4 | ||||
-rw-r--r-- | mm/memory-failure.c | 2 |
3 files changed, 4 insertions, 4 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/memcontrol.c b/mm/memcontrol.c index 7226e60e52af..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; |
@@ -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 |