diff options
| author | Alex Shi <alex.shi@linaro.org> | 2016-08-23 12:31:00 +0800 |
|---|---|---|
| committer | Alex Shi <alex.shi@linaro.org> | 2016-08-23 12:31:00 +0800 |
| commit | e8aab86f8308d6aaa0df0fb77276e15b4bb1c46d (patch) | |
| tree | dc2f0d7e9482a5a47668e9ec061e70fb7b99691c /mm | |
| parent | 0e790100f1c49f32a390d0cc55801230fd04ba56 (diff) | |
| parent | d45da77ced2a983edc2cd55d26e7693b1f3613dd (diff) | |
Merge tag 'v3.18.40' into linux-linaro-lsk-v3.18
This is the 3.18.40 stable release
Diffstat (limited to 'mm')
| -rw-r--r-- | mm/hugetlb.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/mm/hugetlb.c b/mm/hugetlb.c index 549bf5ac3d6e..7a57e302338f 100644 --- a/mm/hugetlb.c +++ b/mm/hugetlb.c @@ -1675,6 +1675,10 @@ static unsigned long set_max_huge_pages(struct hstate *h, unsigned long count, * and reducing the surplus. */ spin_unlock(&hugetlb_lock); + + /* yield cpu to avoid soft lockup */ + cond_resched(); + if (hstate_is_gigantic(h)) ret = alloc_fresh_gigantic_page(h, nodes_allowed); else |