]> git.baikalelectronics.ru Git - kernel.git/commit
memory-hotplug: Remove "weak" from memory_block_size_bytes() declaration
authorBjorn Helgaas <bhelgaas@google.com>
Tue, 14 Oct 2014 01:00:47 +0000 (19:00 -0600)
committerBjorn Helgaas <bhelgaas@google.com>
Wed, 22 Oct 2014 22:14:04 +0000 (16:14 -0600)
commit036c698e07ca3c81a370350ea77407b23a21aca3
tree0299eac1ce8ebca3d52706fc08d056a839708333
parenteda69f987aea7b5c18ce92788797be3c1395aafb
memory-hotplug: Remove "weak" from memory_block_size_bytes() declaration

drivers/base/memory.c provides a default memory_block_size_bytes()
definition explicitly marked "weak".  Several architectures provide their
own definitions intended to override the default, but the "weak" attribute
on the declaration applied to the arch definitions as well, so the linker
chose one based on link order (see abef42debb2e ("PCI: Remove __weak
annotation from pcibios_get_phb_of_node decl")).

Remove the "weak" attribute from the declaration so we always prefer a
non-weak definition over the weak one, independent of link order.

Fixes: 00951b4e428d ("drivers: base: Add prototype declaration to the header file")
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
Acked-by: Andrew Morton <akpm@linux-foundation.org>
CC: Rashika Kheria <rashika.kheria@gmail.com>
CC: Nathan Fontenot <nfont@austin.ibm.com>
CC: Anton Blanchard <anton@au1.ibm.com>
CC: Heiko Carstens <heiko.carstens@de.ibm.com>
CC: Yinghai Lu <yinghai@kernel.org>
include/linux/memory.h