Merge branch 'master' into for-next

[sfrench/cifs-2.6.git] / mm / page_alloc.c

diff --git a/mm/page_alloc.c b/mm/page_alloc.c
index 9f8a97b9a350d17ec070d5e741c04f8d9998e7a8..df9fc3385fb2524d8b824040a580389e339392f2 100644 (file)
--- a/mm/page_alloc.c
+++ b/mm/page_alloc.c
@@ -3514,7 +3514,7 @@ static void setup_pagelist_highmark(struct per_cpu_pageset *p,
                pcp->batch = PAGE_SHIFT * 8;
 }
 
-static __meminit void setup_zone_pageset(struct zone *zone)
+static void setup_zone_pageset(struct zone *zone)
 {
        int cpu;