diff options
Diffstat (limited to 'mm')
| -rw-r--r-- | mm/page_alloc.c | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/mm/page_alloc.c b/mm/page_alloc.c index 04bf1ad50144..bd1a686e40fe 100644 --- a/mm/page_alloc.c +++ b/mm/page_alloc.c | |||
| @@ -3903,8 +3903,6 @@ __alloc_pages_slowpath(gfp_t gfp_mask, unsigned int order, | |||
| 3903 | enum compact_result compact_result; | 3903 | enum compact_result compact_result; |
| 3904 | int compaction_retries; | 3904 | int compaction_retries; |
| 3905 | int no_progress_loops; | 3905 | int no_progress_loops; |
| 3906 | unsigned long alloc_start = jiffies; | ||
| 3907 | unsigned int stall_timeout = 10 * HZ; | ||
| 3908 | unsigned int cpuset_mems_cookie; | 3906 | unsigned int cpuset_mems_cookie; |
| 3909 | int reserve_flags; | 3907 | int reserve_flags; |
| 3910 | 3908 | ||
| @@ -4036,14 +4034,6 @@ retry: | |||
| 4036 | if (!can_direct_reclaim) | 4034 | if (!can_direct_reclaim) |
| 4037 | goto nopage; | 4035 | goto nopage; |
| 4038 | 4036 | ||
| 4039 | /* Make sure we know about allocations which stall for too long */ | ||
| 4040 | if (time_after(jiffies, alloc_start + stall_timeout)) { | ||
| 4041 | warn_alloc(gfp_mask & ~__GFP_NOWARN, ac->nodemask, | ||
| 4042 | "page allocation stalls for %ums, order:%u", | ||
| 4043 | jiffies_to_msecs(jiffies-alloc_start), order); | ||
| 4044 | stall_timeout += 10 * HZ; | ||
| 4045 | } | ||
| 4046 | |||
| 4047 | /* Avoid recursion of direct reclaim */ | 4037 | /* Avoid recursion of direct reclaim */ |
| 4048 | if (current->flags & PF_MEMALLOC) | 4038 | if (current->flags & PF_MEMALLOC) |
| 4049 | goto nopage; | 4039 | goto nopage; |
