diff --git a/[refs] b/[refs] index dc24f7790cb7..9b8b3683cff3 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 427d5416f317681498337ab19218d195edea02d6 +refs/heads/master: 6dbf6d3bb955d5a92005b6ecd6ffad2c5b95b963 diff --git a/trunk/mm/memory.c b/trunk/mm/memory.c index ce3c9e4492d8..7f8c03ec587c 100644 --- a/trunk/mm/memory.c +++ b/trunk/mm/memory.c @@ -1711,7 +1711,7 @@ static int do_wp_page(struct mm_struct *mm, struct vm_area_struct *vma, } return ret; oom_free_new: - __free_page(new_page); + page_cache_release(new_page); oom: if (old_page) page_cache_release(old_page); @@ -2163,7 +2163,7 @@ static int do_anonymous_page(struct mm_struct *mm, struct vm_area_struct *vma, page_cache_release(page); goto unlock; oom_free_page: - __free_page(page); + page_cache_release(page); oom: return VM_FAULT_OOM; }