diff --git a/[refs] b/[refs] index 12b097c8a5e1..e7bf4898da9d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b0e86f0a3b9329bbebadb01ca935208459df18c3 +refs/heads/master: 1d6f4e60e736a00b50ec668ba1a9fe27afb083a3 diff --git a/trunk/mm/page_alloc.c b/trunk/mm/page_alloc.c index e1028fae3ebb..b2838c24e582 100644 --- a/trunk/mm/page_alloc.c +++ b/trunk/mm/page_alloc.c @@ -2566,7 +2566,7 @@ static void __meminit zone_init_free_lists(struct pglist_data *pgdat, memmap_init_zone((size), (nid), (zone), (start_pfn), MEMMAP_EARLY) #endif -static int __devinit zone_batchsize(struct zone *zone) +static int zone_batchsize(struct zone *zone) { int batch;