>From 07ef8d9eb228c9c4bd6b7a2a2feb97325070e25b Mon Sep 17 00:00:00 2001 From: Jacob Pan <jacob.jun.pan@xxxxxxxxx> Date: Fri, 5 Dec 2008 16:01:17 -0800 Subject: [PATCH] Avoid calling early PCI mmconfig init if pci=noearly is given in cmdline Signed-off-by: Jacob Pan <jacob.jun.pan@xxxxxxxxx> --- arch/x86/pci/init.c | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/arch/x86/pci/init.c b/arch/x86/pci/init.c index d6c950f..dd516c3 100644 --- a/arch/x86/pci/init.c +++ b/arch/x86/pci/init.c @@ -11,8 +11,11 @@ static __init int pci_arch_init(void) type = pci_direct_probe(); #endif - - pci_mmcfg_early_init(); + if (!(pci_probe & PCI_PROBE_NOEARLY)) + pci_mmcfg_early_init(); +#ifdef CONFIG_PCI_MMCONFIG + pci_mmcfg_late_init(); +#endif #ifdef CONFIG_PCI_OLPC if (!pci_olpc_init()) -- 1.5.5.1 -- To unsubscribe from this list: send the line "unsubscribe linux-pci" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
