diff options
author | Mel Gorman <mgorman@techsingularity.net> | 2016-05-19 20:14:13 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-05-19 22:12:14 -0400 |
commit | 93ea9964d14ad583492ffb9ab7543f015876aaf2 (patch) | |
tree | 1225c8ae0c5d85b40e386d860abcd24f44664633 /mm/page_alloc.c | |
parent | c33d6c06f60f710f0305ae792773e1c2560e1e51 (diff) |
mm, page_alloc: remove field from alloc_context
The classzone_idx can be inferred from preferred_zoneref so remove the
unnecessary field and save stack space.
Signed-off-by: Mel Gorman <mgorman@techsingularity.net>
Cc: Vlastimil Babka <vbabka@suse.cz>
Cc: Jesper Dangaard Brouer <brouer@redhat.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'mm/page_alloc.c')
-rw-r--r-- | mm/page_alloc.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/mm/page_alloc.c b/mm/page_alloc.c index dba8cfd0b2d6..9da66e792e17 100644 --- a/mm/page_alloc.c +++ b/mm/page_alloc.c | |||
@@ -2771,7 +2771,7 @@ zonelist_scan: | |||
2771 | 2771 | ||
2772 | mark = zone->watermark[alloc_flags & ALLOC_WMARK_MASK]; | 2772 | mark = zone->watermark[alloc_flags & ALLOC_WMARK_MASK]; |
2773 | if (!zone_watermark_fast(zone, order, mark, | 2773 | if (!zone_watermark_fast(zone, order, mark, |
2774 | ac->classzone_idx, alloc_flags)) { | 2774 | ac_classzone_idx(ac), alloc_flags)) { |
2775 | int ret; | 2775 | int ret; |
2776 | 2776 | ||
2777 | /* Checked here to keep the fast path fast */ | 2777 | /* Checked here to keep the fast path fast */ |
@@ -2794,7 +2794,7 @@ zonelist_scan: | |||
2794 | default: | 2794 | default: |
2795 | /* did we reclaim enough */ | 2795 | /* did we reclaim enough */ |
2796 | if (zone_watermark_ok(zone, order, mark, | 2796 | if (zone_watermark_ok(zone, order, mark, |
2797 | ac->classzone_idx, alloc_flags)) | 2797 | ac_classzone_idx(ac), alloc_flags)) |
2798 | goto try_this_zone; | 2798 | goto try_this_zone; |
2799 | 2799 | ||
2800 | continue; | 2800 | continue; |
@@ -3114,7 +3114,7 @@ static void wake_all_kswapds(unsigned int order, const struct alloc_context *ac) | |||
3114 | 3114 | ||
3115 | for_each_zone_zonelist_nodemask(zone, z, ac->zonelist, | 3115 | for_each_zone_zonelist_nodemask(zone, z, ac->zonelist, |
3116 | ac->high_zoneidx, ac->nodemask) | 3116 | ac->high_zoneidx, ac->nodemask) |
3117 | wakeup_kswapd(zone, order, zonelist_zone_idx(ac->preferred_zoneref)); | 3117 | wakeup_kswapd(zone, order, ac_classzone_idx(ac)); |
3118 | } | 3118 | } |
3119 | 3119 | ||
3120 | static inline unsigned int | 3120 | static inline unsigned int |
@@ -3422,8 +3422,6 @@ retry_cpuset: | |||
3422 | goto no_zone; | 3422 | goto no_zone; |
3423 | } | 3423 | } |
3424 | 3424 | ||
3425 | ac.classzone_idx = zonelist_zone_idx(ac.preferred_zoneref); | ||
3426 | |||
3427 | /* First allocation attempt */ | 3425 | /* First allocation attempt */ |
3428 | page = get_page_from_freelist(alloc_mask, order, alloc_flags, &ac); | 3426 | page = get_page_from_freelist(alloc_mask, order, alloc_flags, &ac); |
3429 | if (likely(page)) | 3427 | if (likely(page)) |