From cd3fa32d9b6c73ee7fe91a5de2bfa7f08b1c5ab2 Mon Sep 17 00:00:00 2001
From: Nikanth Karthikesan <knikanth@suse.de>
Date: Tue, 15 Mar 2011 10:59:02 +0530
Subject: [PATCH] --- yaml --- r: 248556 b: refs/heads/master c:
 58c2ee4007bea04cc37041fcbd380fadb7b7be82 h: refs/heads/master v: v3

---
 [refs]                | 2 +-
 trunk/mm/page_alloc.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 9e06874219ca..d92c2f388534 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8620d81fadc0747f567909aa7ae2eeb7135a64e9
+refs/heads/master: 58c2ee4007bea04cc37041fcbd380fadb7b7be82
diff --git a/trunk/mm/page_alloc.c b/trunk/mm/page_alloc.c
index 7945247b1e53..48c9737ad49a 100644
--- a/trunk/mm/page_alloc.c
+++ b/trunk/mm/page_alloc.c
@@ -3448,7 +3448,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;