|
@@ -2336,7 +2336,7 @@ retry:
|
|
|
*/
|
|
|
static int rmqueue_bulk(struct zone *zone, unsigned int order,
|
|
|
unsigned long count, struct list_head *list,
|
|
|
- int migratetype, bool cold)
|
|
|
+ int migratetype)
|
|
|
{
|
|
|
int i, alloced = 0;
|
|
|
|
|
@@ -2358,10 +2358,7 @@ static int rmqueue_bulk(struct zone *zone, unsigned int order,
|
|
|
* merge IO requests if the physical pages are ordered
|
|
|
* properly.
|
|
|
*/
|
|
|
- if (likely(!cold))
|
|
|
- list_add(&page->lru, list);
|
|
|
- else
|
|
|
- list_add_tail(&page->lru, list);
|
|
|
+ list_add(&page->lru, list);
|
|
|
list = &page->lru;
|
|
|
alloced++;
|
|
|
if (is_migrate_cma(get_pcppage_migratetype(page)))
|
|
@@ -2795,7 +2792,7 @@ static inline void zone_statistics(struct zone *preferred_zone, struct zone *z)
|
|
|
|
|
|
/* Remove page from the per-cpu list, caller must protect the list */
|
|
|
static struct page *__rmqueue_pcplist(struct zone *zone, int migratetype,
|
|
|
- bool cold, struct per_cpu_pages *pcp,
|
|
|
+ struct per_cpu_pages *pcp,
|
|
|
struct list_head *list)
|
|
|
{
|
|
|
struct page *page;
|
|
@@ -2804,16 +2801,12 @@ static struct page *__rmqueue_pcplist(struct zone *zone, int migratetype,
|
|
|
if (list_empty(list)) {
|
|
|
pcp->count += rmqueue_bulk(zone, 0,
|
|
|
pcp->batch, list,
|
|
|
- migratetype, cold);
|
|
|
+ migratetype);
|
|
|
if (unlikely(list_empty(list)))
|
|
|
return NULL;
|
|
|
}
|
|
|
|
|
|
- if (cold)
|
|
|
- page = list_last_entry(list, struct page, lru);
|
|
|
- else
|
|
|
- page = list_first_entry(list, struct page, lru);
|
|
|
-
|
|
|
+ page = list_first_entry(list, struct page, lru);
|
|
|
list_del(&page->lru);
|
|
|
pcp->count--;
|
|
|
} while (check_new_pcp(page));
|
|
@@ -2828,14 +2821,13 @@ static struct page *rmqueue_pcplist(struct zone *preferred_zone,
|
|
|
{
|
|
|
struct per_cpu_pages *pcp;
|
|
|
struct list_head *list;
|
|
|
- bool cold = ((gfp_flags & __GFP_COLD) != 0);
|
|
|
struct page *page;
|
|
|
unsigned long flags;
|
|
|
|
|
|
local_irq_save(flags);
|
|
|
pcp = &this_cpu_ptr(zone->pageset)->pcp;
|
|
|
list = &pcp->lists[migratetype];
|
|
|
- page = __rmqueue_pcplist(zone, migratetype, cold, pcp, list);
|
|
|
+ page = __rmqueue_pcplist(zone, migratetype, pcp, list);
|
|
|
if (page) {
|
|
|
__count_zid_vm_events(PGALLOC, page_zonenum(page), 1 << order);
|
|
|
zone_statistics(preferred_zone, zone);
|