diff options
Diffstat (limited to 'mm/memcontrol.c')
-rw-r--r-- | mm/memcontrol.c | 6 |
1 files changed, 3 insertions, 3 deletions
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 | * |