]> git.baikalelectronics.ru Git - kernel.git/commit
PCI: Remove __weak annotation from pcibios_get_phb_of_node decl
authorBjorn Helgaas <bhelgaas@google.com>
Wed, 10 Apr 2013 15:56:54 +0000 (09:56 -0600)
committerBjorn Helgaas <bhelgaas@google.com>
Wed, 10 Apr 2013 15:56:54 +0000 (09:56 -0600)
commitabef42debb2e5cba3ab46b2f9ad3b28ddc7a8e8d
tree359e488fdc8478753a76ea034ea2c59826f03e22
parent025d7a061973fce562117d8afddd51b81bc911f1
PCI: Remove __weak annotation from pcibios_get_phb_of_node decl

The __weak annotation on the pcibios_get_phb_of_node() declaration
causes *every* definition to be marked "weak."  The linker then
selects one based on link order, which may be the wrong one.

Gabor found that on MIPS, the linker selected the generic implementation
from drivers/pci even though arch/mips supplied a definition without the
__weak annotation:

$ mipsel-openwrt-linux-readelf -s arch/mips/pci/built-in.o \
    drivers/pci/built-in.o vmlinux.o | grep pcibios_get_phb_of_node
      86: 0000046c    12 FUNC    WEAK   DEFAULT    2 pcibios_get_phb_of_node
    1430: 00012e2c   104 FUNC    WEAK   DEFAULT    2 pcibios_get_phb_of_node
   31898: 0017e4ec   104 FUNC    WEAK   DEFAULT    2 pcibios_get_phb_of_node

This removes the __weak annotation from the pcibios_get_phb_of_node()
declaration so arch-specific non-weak implementations work reliably.

Suggested-by: Gabor Juhos <juhosg@openwrt.org>
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
include/linux/pci.h