summaryrefslogtreecommitdiffstats
path: root/net/key
diff options
context:
space:
mode:
authorPaul Mundt <lethal@linux-sh.org>2007-06-14 15:13:16 +0900
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-06-15 16:18:08 -0700
commitd09c6b809432668371b5de9102f4f9aa6a7c79cc (patch)
tree23a80218149ce732dfab1afca6abd3f370bc0131 /net/key
parent902233ee494f9d9da6dbb818316fcbf892bebbed (diff)
downloadop-kernel-dev-d09c6b809432668371b5de9102f4f9aa6a7c79cc.zip
op-kernel-dev-d09c6b809432668371b5de9102f4f9aa6a7c79cc.tar.gz
mm: Fix memory/cpu hotplug section mismatch and oops.
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: Paul Mundt <lethal@linux-sh.org> Acked-by: Yasunori Goto <y-goto@jp.fujitsu.com> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> -- mm/page_alloc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
Diffstat (limited to 'net/key')
0 files changed, 0 insertions, 0 deletions
OpenPOWER on IntegriCloud