Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6292d9aa authored by Ashok Raj's avatar Ashok Raj Committed by Linus Torvalds
Browse files

[PATCH] __cpuinit functions wrongly marked __meminit 



__meminit has overzelously been modified and crept its way into marking
cpuup callbacks as __meminit.

Signed-off-by: default avatarAshok Raj <ashok.raj@intel.com>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 88356e90

mm/page_alloc.c

+3 −3
Original line number Diff line number Diff line
@@ -1799,7 +1799,7 @@ void zonetable_add(struct zone *zone, int nid, int zid, unsigned long pfn, 
	memmap_init_zone((size), (nid), (zone), (start_pfn))

#endif



static int __meminit zone_batchsize(struct zone *zone)

static int __cpuinit zone_batchsize(struct zone *zone)

{

	int batch;
@@ -1893,7 +1893,7 @@ static struct per_cpu_pageset 
 * Dynamically allocate memory for the

 * per cpu pageset array in struct zone.

 */

static int __meminit process_zones(int cpu)

static int __cpuinit process_zones(int cpu)

{

	struct zone *zone, *dzone;
@@ -1934,7 +1934,7 @@ static inline void free_zone_pagesets(int cpu) 
	}

}



static int __meminit pageset_cpuup_callback(struct notifier_block *nfb,

static int __cpuinit pageset_cpuup_callback(struct notifier_block *nfb,

		unsigned long action,

		void *hcpu)

{