diff options
| author | Sam Ravnborg <sam@ravnborg.org> | 2008-04-29 22:38:48 +0200 |
|---|---|---|
| committer | Jesse Barnes <jbarnes@hobbes.lan> | 2008-04-29 13:41:59 -0700 |
| commit | 98db6f193c93e9b4729215af2c9101210e11d26c (patch) | |
| tree | 942e41010b70ae79897921aa13e16f372f4ea2e1 /include/linux/pci.h | |
| parent | 7663c1e2792a9662b23dec6e19bfcd3d55360b8f (diff) | |
| download | linux-98db6f193c93e9b4729215af2c9101210e11d26c.tar.gz linux-98db6f193c93e9b4729215af2c9101210e11d26c.tar.bz2 linux-98db6f193c93e9b4729215af2c9101210e11d26c.zip | |
x86: fix section mismatch in pci_scan_bus
Fix following section mismatch warning:
WARNING: vmlinux.o(.text+0x275616): Section mismatch in reference from the function pci_scan_bus() to the function .devinit.text:pci_scan_bus_parented()
The warning was seen with a CONFIG_DEBUG_SECTION_MISMATCH=y build.
The inline function pci_scan_bus refer to functions annotated
__devinit - so annotate it __devinit too.
This revealed a few x86 specific functions that were only
used from __init or __devinit context.
So annotate these __devinit and the warning was killed.
The added include in pci.h was not strictly required but
added to avoid being dependent on indirect includes.
Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
Signed-off-by: Jesse Barnes <jbarnes@hobbes.lan>
Diffstat (limited to 'include/linux/pci.h')
| -rw-r--r-- | include/linux/pci.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/linux/pci.h b/include/linux/pci.h index 96acd0dae241..a59517b4930f 100644 --- a/include/linux/pci.h +++ b/include/linux/pci.h @@ -44,6 +44,7 @@ #include <linux/mod_devicetable.h> #include <linux/types.h> +#include <linux/init.h> #include <linux/ioport.h> #include <linux/list.h> #include <linux/compiler.h> @@ -474,7 +475,7 @@ extern struct pci_bus *pci_find_bus(int domain, int busnr); void pci_bus_add_devices(struct pci_bus *bus); struct pci_bus *pci_scan_bus_parented(struct device *parent, int bus, struct pci_ops *ops, void *sysdata); -static inline struct pci_bus *pci_scan_bus(int bus, struct pci_ops *ops, +static inline struct pci_bus * __devinit pci_scan_bus(int bus, struct pci_ops *ops, void *sysdata) { struct pci_bus *root_bus; |