diff options
author | Colin Cross | 2013-03-13 19:16:02 -0500 |
---|---|---|
committer | Colin Cross | 2013-03-13 19:16:02 -0500 |
commit | 0b203ab4aacdb6e6dfb8c277aa290f0a02428e6f (patch) | |
tree | 9bab760a750d9cf4504d92603ee7fc82beeb2e38 /mm/huge_memory.c | |
parent | a276def548828763cf5ac228adf8c1ca73f8d4d3 (diff) | |
parent | e28c3f2b514b5581e15614f7cf976131092cf4b6 (diff) | |
download | kernel-common-0b203ab4aacdb6e6dfb8c277aa290f0a02428e6f.tar.gz kernel-common-0b203ab4aacdb6e6dfb8c277aa290f0a02428e6f.tar.xz kernel-common-0b203ab4aacdb6e6dfb8c277aa290f0a02428e6f.zip |
Merge tag 'v3.0.68' into android-3.0
This is the 3.0.68 stable release
Conflicts:
kernel/cgroup.c
Change-Id: I067982d25e18e3a12de93a5eb6429b8829d7ca11
Diffstat (limited to 'mm/huge_memory.c')
-rw-r--r-- | mm/huge_memory.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/mm/huge_memory.c b/mm/huge_memory.c index 8cc11dda6a7..a9ab45ec7d5 100644 --- a/mm/huge_memory.c +++ b/mm/huge_memory.c | |||
@@ -920,6 +920,8 @@ int do_huge_pmd_wp_page(struct mm_struct *mm, struct vm_area_struct *vma, | |||
920 | count_vm_event(THP_FAULT_FALLBACK); | 920 | count_vm_event(THP_FAULT_FALLBACK); |
921 | ret = do_huge_pmd_wp_page_fallback(mm, vma, address, | 921 | ret = do_huge_pmd_wp_page_fallback(mm, vma, address, |
922 | pmd, orig_pmd, page, haddr); | 922 | pmd, orig_pmd, page, haddr); |
923 | if (ret & VM_FAULT_OOM) | ||
924 | split_huge_page(page); | ||
923 | put_page(page); | 925 | put_page(page); |
924 | goto out; | 926 | goto out; |
925 | } | 927 | } |
@@ -927,6 +929,7 @@ int do_huge_pmd_wp_page(struct mm_struct *mm, struct vm_area_struct *vma, | |||
927 | 929 | ||
928 | if (unlikely(mem_cgroup_newpage_charge(new_page, mm, GFP_KERNEL))) { | 930 | if (unlikely(mem_cgroup_newpage_charge(new_page, mm, GFP_KERNEL))) { |
929 | put_page(new_page); | 931 | put_page(new_page); |
932 | split_huge_page(page); | ||
930 | put_page(page); | 933 | put_page(page); |
931 | ret |= VM_FAULT_OOM; | 934 | ret |= VM_FAULT_OOM; |
932 | goto out; | 935 | goto out; |