aboutsummaryrefslogtreecommitdiffstats
path: root/mm
diff options
context:
space:
mode:
Diffstat (limited to 'mm')
-rw-r--r--mm/kmemleak.c4
-rw-r--r--mm/memcontrol.c2
2 files changed, 3 insertions, 3 deletions
diff --git a/mm/kmemleak.c b/mm/kmemleak.c
index 8bf765c4f58..13f33b3081e 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 f99f5991d6b..7226e60e52a 100644
--- a/mm/memcontrol.c
+++ b/mm/memcontrol.c
@@ -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 */
1726int mem_cgroup_try_charge_swapin(struct mm_struct *mm, 1726int mem_cgroup_try_charge_swapin(struct mm_struct *mm,