Skip to contentSkip to conversation

mm: page allocator: Silence build_all_zonelists() section mismatch.

PATCH In review Paul Mundt 2 participants 2 messages Mar 22, 2011 – Mar 23, 2011

Subsystems (2)
lore
Share & tools
lore

Paul Mundt

author
#0 lore raw

PATCH 1/1 mm: page allocator: Silence build_all_zonelists() section mismatch.

The memory hotplug case involves calling to build_all_zonelists() which in turns calls in to setup_zone_pageset(). The latter is marked __meminit while build_all_zonelists() itself has no particular annotation. build_all_zonelists() is only handed a non-NULL pointer in the case of memory hotplug through an existing __meminit path, so the setup_zone_pageset() reference is always safe.

The options as such are either to flag build_all_zonelists() as __ref (as per __build_all_zonelists()), or to simply discard the __meminit annotation from setup_zone_pageset().

---

While discarding the __meminit annotation from setup_zone_pageset() is probably cleanest I expected some people would take issue with this so opted for the more visually offensive __ref route. I can resend for the other way if people prefer, or someone else can do it given that it's a trivial change.

 mm/page_alloc.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
mm/page_alloc.c +1 -1
index 7945247..134e0b8 100644
@@ -3110,7 +3110,7 @@ static __init_refok int __build_all_zonelists(void *data)
  * Called with zonelists_mutex held always
  * unless system_state == SYSTEM_BOOTING.
  */
-void build_all_zonelists(void *data)
+void __ref build_all_zonelists(void *data)
 {
 	set_zonelist_order();
 

--
To unsubscribe, send a message with 'unsubscribe linux-mm' in
the body to [email protected]. For more info on Linux MM,
see: http://www.linux-mm.org/ .
Fight unfair telecom internet charges in Canada: sign http://stopthemeter.ca/
Don't email: <a href=mailto:"[email protected]"> [email protected] </a>

Acked-by on v1 1/1
#1 lore raw
Quoted 15 lines · Paul Mundt

The memory hotplug case involves calling to build_all_zonelists() which in turns calls in to setup_zone_pageset(). The latter is marked __meminit while build_all_zonelists() itself has no particular annotation. build_all_zonelists() is only handed a non-NULL pointer in the case of memory hotplug through an existing __meminit path, so the setup_zone_pageset() reference is always safe.

The options as such are either to flag build_all_zonelists() as __ref (as per __build_all_zonelists()), or to simply discard the __meminit annotation from setup_zone_pageset().

---

Quoted 9 lines

While discarding the __meminit annotation from setup_zone_pageset() is probably cleanest I expected some people would take issue with this so opted for the more visually offensive __ref route. I can resend for the other way if people prefer, or someone else can do it given that it's a trivial change.

 mm/page_alloc.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Discarding __meminit from setup_zone_pageset() would unnecessarily grow the kernel image in the !HOTPLUG case and setting __meminit on build_all_zonelists() looks like it would just cause other section mistmatch warnings so;