[tip:x86/mrst] x86, numaq: Make CONFIG_X86_NUMAQ depend on CONFIG_PCI
in [Kernel]
|
Prev: Problem with auto-detecting a HV environment from within Linux
Next: [PATCH 0/5] Rework of msrpm optimization and additional fixes for nested svm
From: tip-bot for Pan, Jacob jun on 25 Feb 2010 12:10 Commit-ID: a92d152ef9dd89c578ca2ec7118e9de8fb74a75f Gitweb: http://git.kernel.org/tip/a92d152ef9dd89c578ca2ec7118e9de8fb74a75f Author: Pan, Jacob jun <jacob.jun.pan(a)intel.com> AuthorDate: Wed, 24 Feb 2010 16:59:55 -0800 Committer: H. Peter Anvin <hpa(a)zytor.com> CommitDate: Thu, 25 Feb 2010 09:04:19 -0800 x86, numaq: Make CONFIG_X86_NUMAQ depend on CONFIG_PCI The NUMAQ initialization sets x86_init.pci.init to pci_numaq_init, which obviously isn't defined if CONFIG_PCI isn't defined. This dependency was implicit in the past, because pci_numaq_init was invoked from arch/x86/pci/legacy.c, which itself was conditioned on CONFIG_PCI. I suspect that no NUMA-Q machines without PCI were ever built, so instead of complicating the code by adding #ifdefs or stub functions, just disable this bit of the configuration space. [ hpa: rewrote the checkin comment ] Signed-off-by: Jacob Pan <jacob.jun.pan(a)intel.com> LKML-Reference: <43F901BD926A4E43B106BF17856F0755A321EE1F(a)orsmsx508.amr.corp.intel.com> Signed-off-by: H. Peter Anvin <hpa(a)zytor.com> --- arch/x86/Kconfig | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig index 0ab2dce..f032294 100644 --- a/arch/x86/Kconfig +++ b/arch/x86/Kconfig @@ -425,6 +425,7 @@ config X86_32_NON_STANDARD config X86_NUMAQ bool "NUMAQ (IBM/Sequent)" depends on X86_32_NON_STANDARD + depends on PCI select NUMA select X86_MPPARSE ---help--- -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo(a)vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/ |