projects
/
linux-2.6-microblaze.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'i2c/for-current' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa...
[linux-2.6-microblaze.git]
/
mm
/
hugetlb_cgroup.c
diff --git
a/mm/hugetlb_cgroup.c
b/mm/hugetlb_cgroup.c
index
9eebfad
..
a67c26e
100644
(file)
--- a/
mm/hugetlb_cgroup.c
+++ b/
mm/hugetlb_cgroup.c
@@
-217,7
+217,7
@@
void hugetlb_cgroup_uncharge_page(int idx, unsigned long nr_pages,
if (hugetlb_cgroup_disabled())
return;
-
VM_BUG_ON(!spin_is_locked(&hugetlb_lock)
);
+
lockdep_assert_held(&hugetlb_lock
);
h_cg = hugetlb_cgroup_from_page(page);
if (unlikely(!h_cg))
return;