Skip to contentSkip to conversation

__cpuinit functions wrongly marked __meminit

DISCUSSION Ashok Raj 2 participants 2 messages Jan 21, 2006

lore
Share & tools
lore

Ashok Raj

author
#0 lore raw

Hi Andrew

This is required, __meminit has overzelously been modified and crept its way into marking cpuup callbacks as __meminit.

I still have some trouble in getting cpu up to work on x86_64, even with these changes and it might be some other changes that iam trying to hunt down.

Seems NUMA related. IA64 seems to work fine for now.

Signature · 44 lines
Cheers,
Ashok Raj
- Open Source Technology Center


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

Signed-off-by: Ashok Raj <[email protected]>
------------------------------------------------
 mm/page_alloc.c |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

Index: linux-2.6.16-rc1-mm2/mm/page_alloc.c
===================================================================
--- linux-2.6.16-rc1-mm2.orig/mm/page_alloc.c
+++ linux-2.6.16-rc1-mm2/mm/page_alloc.c
@@ -1876,7 +1876,7 @@ void zonetable_add(struct zone *zone, in
 	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;
 
@@ -1970,7 +1970,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;
 
@@ -2011,7 +2011,7 @@ static inline void free_zone_pagesets(in
 	}
 }
 
-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)
 {
#1 lore raw
Quoted 3 lines · Ashok Raj

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

OK.

We do have tools which will auto-detect things like this. reference_discarded.pl, reference_init.pl. I think they should work in this case. One would need to use a number of .config combinations to get full coverage of course.