[PATCH] mm: page allocator: Silence build_all_zonelists() section mismatch.

From: Paul Mundt
Date: Tue Mar 22 2011 - 09:31:31 EST


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().

Signed-off-by: Paul Mundt <lethal@xxxxxxxxxxxx>

---

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(-)

diff --git a/mm/page_alloc.c b/mm/page_alloc.c
index 7945247..134e0b8 100644
--- a/mm/page_alloc.c
+++ b/mm/page_alloc.c
@@ -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 from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/