summaryrefslogtreecommitdiffstats
path: root/arch/x86/include/asm/numaq.h
diff options
context:
space:
mode:
authorThomas Gleixner <tglx@linutronix.de>2009-08-29 16:24:51 +0200
committerH. Peter Anvin <hpa@zytor.com>2010-02-20 01:12:29 +0100
commitb72d0db9dd41da1f2ec6274b03e8909583c64e41 (patch)
tree6424768067546f3aa4bd2e5d0a11d6459a6aad51 /arch/x86/include/asm/numaq.h
parentPCI: Add pci_bus_find_ext_capability (diff)
downloadlinux-b72d0db9dd41da1f2ec6274b03e8909583c64e41.tar.xz
linux-b72d0db9dd41da1f2ec6274b03e8909583c64e41.zip
x86: Move pci init function to x86_init
The PCI initialization in pci_subsys_init() is a mess. pci_numaq_init, pci_acpi_init, pci_visws_init and pci_legacy_init are called and each implementation checks and eventually modifies the global variable pcibios_scanned. x86_init functions allow us to do this more elegant. The pci.init function pointer is preset to pci_legacy_init. numaq, acpi and visws can modify the pointer in their early setup functions. The functions return 0 when they did the full initialization including bus scan. A non zero return value indicates that pci_legacy_init needs to be called either because the selected function failed or wants the generic bus scan in pci_legacy_init to happen (e.g. visws). Signed-off-by: Thomas Gleixner <tglx@linutronix.de> LKML-Reference: <43F901BD926A4E43B106BF17856F07559FB80CFE@orsmsx508.amr.corp.intel.com> Acked-by: Jesse Barnes <jbarnes@virtuousgeek.org> Signed-off-by: Jacob Pan <jacob.jun.pan@intel.com> Signed-off-by: H. Peter Anvin <hpa@zytor.com>
Diffstat (limited to 'arch/x86/include/asm/numaq.h')
-rw-r--r--arch/x86/include/asm/numaq.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/x86/include/asm/numaq.h b/arch/x86/include/asm/numaq.h
index 9f0a5f5d29ec..ef6bf81f8460 100644
--- a/arch/x86/include/asm/numaq.h
+++ b/arch/x86/include/asm/numaq.h
@@ -30,6 +30,7 @@
extern int found_numaq;
extern int get_memcfg_numaq(void);
+extern int pci_numaq_init(void);
extern void *xquad_portio;