• Paul Mundt's avatar
    mm: Fix memory/cpu hotplug section mismatch and oops. · d09c6b80
    Paul Mundt authored
    When building with memory hotplug enabled and cpu hotplug disabled, we
    end up with the following section mismatch:
    
    WARNING: mm/built-in.o(.text+0x4e58): Section mismatch: reference to
    .init.text: (between 'free_area_init_node' and '__build_all_zonelists')
    
    This happens as a result of:
    
            -> free_area_init_node()
              -> free_area_init_core()
                -> zone_pcp_init() <-- all __meminit up to this point
                  -> zone_batchsize() <-- marked as __cpuinit                     fo
    
    This happens because CONFIG_HOTPLUG_CPU=n sets __cpuinit to __init, but
    CONFIG_MEMORY_HOTPLUG=y unsets __meminit.
    
    Changing zone_batchsize() to __devinit fixes this.
    
    __devinit is the only thing that is common between CONFIG_HOTPLUG_CPU=y and
    CONFIG_MEMORY_HOTPLUG=y. In the long run, perhaps this should be moved to
    another section identifier completely. Without this, memory hot-add
    of offline nodes (via hotadd_new_pgdat()) will oops if CPU hotplug is
    not also enabled.
    Signed-off-by: default avatarPaul Mundt <lethal@linux-sh.org>
    Acked-by: default avatarYasunori Goto <y-goto@jp.fujitsu.com>
    Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
    
    --
    
     mm/page_alloc.c |    2 +-
     1 file changed, 1 insertion(+), 1 deletion(-)
    d09c6b80
page_alloc.c 91.2 KB