]> git.proxmox.com Git - mirror_ubuntu-eoan-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)
commite0a8400c6923a163265d52798cdd4c33f3f8ab5a
tree0299eac1ce8ebca3d52706fc08d056a839708333
parent107bcc6d566cb40184068d888637f9aefe6252dd
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 10629d711ed7 ("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: 41f107266b19 ("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