[tip:x86/mce3] x86: mce: Make CONFIG_X86_ANCIENT_MCE dependent on CONFIG_X86_MCE

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



Commit-ID:  c31d96338a6041520ba5f1b6a4a5012ef00686b3
Gitweb:     http://git.kernel.org/tip/c31d96338a6041520ba5f1b6a4a5012ef00686b3
Author:     Andi Kleen <andi@xxxxxxxxxxxxxx>
AuthorDate: Thu, 9 Jul 2009 00:31:37 +0200
Committer:  H. Peter Anvin <hpa@xxxxxxxxx>
CommitDate: Thu, 9 Jul 2009 18:39:46 -0700

x86: mce: Make CONFIG_X86_ANCIENT_MCE dependent on CONFIG_X86_MCE

Add a missing depency for ANCIENT_MCE. It didn't matter
in practice because the ANCIENT code wasn't compiled without
X86_MCE, but it's better to express that clearly in
Kconfig.

Signed-off-by: Andi Kleen <ak@xxxxxxxxxxxxxxx>
Signed-off-by: H. Peter Anvin <hpa@xxxxxxxxx>


---
 arch/x86/Kconfig |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
index 356d2ec..5962b87 100644
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@ -823,7 +823,7 @@ config X86_MCE_AMD
 
 config X86_ANCIENT_MCE
 	def_bool n
-	depends on X86_32
+	depends on X86_32 && X86_MCE
 	prompt "Support for old Pentium 5 / WinChip machine checks"
 	---help---
 	  Include support for machine check handling on old Pentium 5 or WinChip
--
To unsubscribe from this list: send the line "unsubscribe linux-tip-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[Index of Archives]     [Linux Stable Commits]     [Linux Stable Kernel]     [Linux Kernel]     [Linux USB Devel]     [Linux Video &Media]     [Linux Audio Users]     [Yosemite News]     [Linux SCSI]

  Powered by Linux