diff --git a/[refs] b/[refs]
index 28a28908a73e..e6088d889251 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 902233ee494f9d9da6dbb818316fcbf892bebbed
+refs/heads/master: d09c6b809432668371b5de9102f4f9aa6a7c79cc
diff --git a/trunk/mm/page_alloc.c b/trunk/mm/page_alloc.c
index bd8e33582d25..05ace44852eb 100644
--- a/trunk/mm/page_alloc.c
+++ b/trunk/mm/page_alloc.c
@@ -1968,7 +1968,7 @@ void zone_init_free_lists(struct pglist_data *pgdat, struct zone *zone,
 	memmap_init_zone((size), (nid), (zone), (start_pfn), MEMMAP_EARLY)
 #endif
 
-static int __cpuinit zone_batchsize(struct zone *zone)
+static int __devinit zone_batchsize(struct zone *zone)
 {
 	int batch;