linux-kernel - [tip:x86/mrst] x86, numaq: Make CONFIG_X86_NUMAQ depend on CONFIG

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [day] [month] [year] [list]

Message-ID: <tip-a92d152ef9dd89c578ca2ec7118e9de8fb74a75f@git.kernel.org>
Date:	Thu, 25 Feb 2010 17:06:38 GMT
From:	"tip-bot for Pan, Jacob jun" <jacob.jun.pan@...el.com>
To:	linux-tip-commits@...r.kernel.org
Cc:	linux-kernel@...r.kernel.org, hpa@...or.com, mingo@...hat.com,
	jacob.jun.pan@...el.com, tglx@...utronix.de
Subject: [tip:x86/mrst] x86, numaq: Make CONFIG_X86_NUMAQ depend on CONFIG_PCI

Commit-ID:  a92d152ef9dd89c578ca2ec7118e9de8fb74a75f
Gitweb:     http://git.kernel.org/tip/a92d152ef9dd89c578ca2ec7118e9de8fb74a75f
Author:     Pan, Jacob jun <jacob.jun.pan@...el.com>
AuthorDate: Wed, 24 Feb 2010 16:59:55 -0800
Committer:  H. Peter Anvin <hpa@...or.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@...el.com>
LKML-Reference: <43F901BD926A4E43B106BF17856F0755A321EE1F@...msx508.amr.corp.intel.com>
Signed-off-by: H. Peter Anvin <hpa@...or.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@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/