mm/hugetlb.c: add cond_resched_lock() in return_unused_surplus_pages()
authorMizuma, Masayoshi <m.mizuma@jp.fujitsu.com>
Fri, 18 Apr 2014 22:07:18 +0000 (15:07 -0700)
committerBen Hutchings <ben@decadent.org.uk>
Sun, 18 May 2014 13:58:06 +0000 (14:58 +0100)
commitb8309464fb222570eadd3e9d4668dd1f01ad8189
treeed29125bb6d90f2785dc2f04b9f9cfa7fdb70955
parentf9a65249cf4ed11170dadd3d5b61c6864bdf7df7
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>
mm/hugetlb.c