diff options
| author | Mizuma, Masayoshi <m.mizuma@jp.fujitsu.com> | 2014-04-18 15:07:18 -0700 |
|---|---|---|
| committer | Ben Hutchings <ben@decadent.org.uk> | 2014-05-18 14:58:06 +0100 |
| commit | b8309464fb222570eadd3e9d4668dd1f01ad8189 (patch) | |
| tree | ed29125bb6d90f2785dc2f04b9f9cfa7fdb70955 /mm/hugetlb.c | |
| parent | f9a65249cf4ed11170dadd3d5b61c6864bdf7df7 (diff) | |
| download | kernel_samsung_smdk4412-b8309464fb222570eadd3e9d4668dd1f01ad8189.zip kernel_samsung_smdk4412-b8309464fb222570eadd3e9d4668dd1f01ad8189.tar.gz kernel_samsung_smdk4412-b8309464fb222570eadd3e9d4668dd1f01ad8189.tar.bz2 | |
mm/hugetlb.c: add cond_resched_lock() in return_unused_surplus_pages()
commit 7848a4bf51b34f41fcc9bd77e837126d99ae84e3 upstream.
soft lockup in freeing gigantic hugepage fixed in commit 55f67141a892 "mm:
hugetlb: fix softlockup when a large number of hugepages are freed." can
happen in return_unused_surplus_pages(), so let's fix it.
Signed-off-by: Masayoshi Mizuma <m.mizuma@jp.fujitsu.com>
Signed-off-by: Naoya Horiguchi <n-horiguchi@ah.jp.nec.com>
Cc: Joonsoo Kim <iamjoonsoo.kim@lge.com>
Cc: Michal Hocko <mhocko@suse.cz>
Cc: Aneesh Kumar <aneesh.kumar@linux.vnet.ibm.com>
Cc: KOSAKI Motohiro <kosaki.motohiro@jp.fujitsu.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
[bwh: Backported to 3.2: adjust context]
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
Diffstat (limited to 'mm/hugetlb.c')
| -rw-r--r-- | mm/hugetlb.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/mm/hugetlb.c b/mm/hugetlb.c index d399f5f..cac2441 100644 --- a/mm/hugetlb.c +++ b/mm/hugetlb.c @@ -1078,6 +1078,7 @@ static void return_unused_surplus_pages(struct hstate *h, while (nr_pages--) { if (!free_pool_huge_page(h, &node_states[N_HIGH_MEMORY], 1)) break; + cond_resched_lock(&hugetlb_lock); } } |