Skip to contentSkip to conversation

pci: fix section mismatch on update_res()

PATCH Applied Hidetoshi Seto 2 participants 2 messages Dec 15, 2009 – Dec 16, 2009

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 pci: fix section mismatch on update_res()

From: Jiri Slaby <[email protected]>

Remark update_res from __init to __devinit as it is called also from __devinit functions.

This patch removes the following warning message:

WARNING: vmlinux.o(.devinit.text+0x774a): Section mismatch in reference from the function pci_root_bus_res() to the function .init.text:update_res()
The function __devinit pci_root_bus_res() references a function __init update_res().
If update_res is only used by pci_root_bus_res then annotate update_res with a matching annotation.

---
 arch/x86/pci/bus_numa.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
arch/x86/pci/bus_numa.c +1 -1
index 145df00..f939d60 100644
@@ -51,7 +51,7 @@ void x86_pci_root_bus_res_quirks(struct pci_bus *b)
 	}
 }
 
-void __init update_res(struct pci_root_info *info, size_t start,
+void __devinit update_res(struct pci_root_info *info, size_t start,
 			      size_t end, unsigned long flags, int merge)
 {
 	int i;
Signature · 1 line
1.6.5.6
Applied
#1 lore raw
Quoted 30 lines · On Tue, 15 Dec 2009 10:19:50 +0900 Hidetoshi Seto…

From: Jiri Slaby <[email protected]>

Remark update_res from __init to __devinit as it is called also from __devinit functions.

This patch removes the following warning message:

WARNING: vmlinux.o(.devinit.text+0x774a): Section mismatch in reference from the function pci_root_bus_res() to the function .init.text:update_res()
The function __devinit pci_root_bus_res() references a function __init update_res().
If update_res is only used by pci_root_bus_res then annotate update_res with a matching annotation.

---
 arch/x86/pci/bus_numa.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
arch/x86/pci/bus_numa.c +0 -0
index 145df00..f939d60 100644

arch/x86/pci/bus_numa.c void x86_pci_root_bus_res_quirks(struct pci_bus *b) · line 57

Quoted 8 lines
arch/x86/pci/bus_numa.c +1 -1
@@ -51,7 +51,7 @@ void x86_pci_root_bus_res_quirks(struct pci_bus *b)
 	}
 }
 
-void __init update_res(struct pci_root_info *info, size_t start,
+void __devinit update_res(struct pci_root_info *info, size_t start,
 			      size_t end, unsigned long flags, int
 merge) {
 	int i;

Applied, thanks Hidetoshi-san and Jiri.

Signature · 1 line
Jesse Barnes, Intel Open Source Technology Center