2012-05-12 14:20:55 +00:00
|
|
|
From 56dddacff93fc987ea0b6076d087388e5be72cf2 Mon Sep 17 00:00:00 2001
|
2011-11-20 00:01:55 +00:00
|
|
|
From: Thomas Gleixner <tglx@linutronix.de>
|
|
|
|
|
Date: Thu, 21 Jul 2011 16:47:49 +0200
|
2012-05-12 14:20:55 +00:00
|
|
|
Subject: [PATCH 111/267] mm-page-alloc-fix.patch
|
2011-11-20 00:01:55 +00:00
|
|
|
|
|
|
|
|
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
|
|
|
|
|
---
|
|
|
|
|
mm/page_alloc.c | 4 ++--
|
|
|
|
|
1 file changed, 2 insertions(+), 2 deletions(-)
|
|
|
|
|
|
2012-05-12 14:20:55 +00:00
|
|
|
diff --git a/mm/page_alloc.c b/mm/page_alloc.c
|
|
|
|
|
index 5124fb0..49675c7 100644
|
|
|
|
|
--- a/mm/page_alloc.c
|
|
|
|
|
+++ b/mm/page_alloc.c
|
|
|
|
|
@@ -1960,8 +1960,8 @@ __alloc_pages_direct_compact(gfp_t gfp_mask, unsigned int order,
|
2011-11-20 00:01:55 +00:00
|
|
|
if (*did_some_progress != COMPACT_SKIPPED) {
|
|
|
|
|
|
|
|
|
|
/* Page migration frees to the PCP lists but we want merging */
|
|
|
|
|
- drain_pages(get_cpu());
|
|
|
|
|
- put_cpu();
|
|
|
|
|
+ drain_pages(get_cpu_light());
|
|
|
|
|
+ put_cpu_light();
|
|
|
|
|
|
|
|
|
|
page = get_page_from_freelist(gfp_mask, nodemask,
|
|
|
|
|
order, zonelist, high_zoneidx,
|
2012-05-12 14:20:55 +00:00
|
|
|
--
|
|
|
|
|
1.7.10
|
|
|
|
|
|
