target/linux/ppc40x/patches-2.6.30/900-backport-fix-annotation-of-pcibios_claim_one_bus.patch

   1 From: Stephen Rothwell <sfr@canb.auug.org.au>
   2 Date: Mon, 1 Jun 2009 14:53:53 +0000 (+0000)
   3 Subject: powerpc/pci: Fix annotation of pcibios_claim_one_bus
   4 X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Fbenh%2Fpowerpc.git;a=commitdiff_plain;h=baf75b0a42a1b3f6fca80f8949b6141eaff61b0d
   5
   6 powerpc/pci: Fix annotation of pcibios_claim_one_bus
   7
   8 It was __devinit, but it is also within a CONFIG_HOTPLUG guarded section
   9 of code, so the __devinit does nothing but cause the following warning:
  10
  11 WARNING: vmlinux.o(.text+0x107a8): Section mismatch in reference from the function pcibios_finish_adding_to_bus() to the function .devinit.text:pcibios_claim_one_bus()
  12 The function pcibios_finish_adding_to_bus() references
  13 the function __devinit pcibios_claim_one_bus().
  14 This is often because pcibios_finish_adding_to_bus lacks a __devinit
  15 annotation or the annotation of pcibios_claim_one_bus is wrong.
  16
  17 It is also only (externally) used in arch/powerpc/kernel/of_platform.c
  18 which cannot be built as a module so don't export it.
  19
  20 Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
  21 Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
  22 ---
  23
  24 --- a/arch/powerpc/kernel/pci-common.c
  25 +++ b/arch/powerpc/kernel/pci-common.c
  26 @@ -1505,7 +1505,7 @@ void __init pcibios_resource_survey(void
  27   * rest of the code later, for now, keep it as-is as our main
  28   * resource allocation function doesn't deal with sub-trees yet.
  29   */
  30 -void __devinit pcibios_claim_one_bus(struct pci_bus *bus)
  31 +void pcibios_claim_one_bus(struct pci_bus *bus)
  32  {
  33         struct pci_dev *dev;
  34         struct pci_bus *child_bus;
  35 @@ -1533,7 +1533,6 @@ void __devinit pcibios_claim_one_bus(str
  36         list_for_each_entry(child_bus, &bus->children, node)
  37                 pcibios_claim_one_bus(child_bus);
  38  }
  39 -EXPORT_SYMBOL_GPL(pcibios_claim_one_bus);
  40
  41
  42  /* pcibios_finish_adding_to_bus