[<prev] [next>] [day] [month] [year] [list]
Message-Id: <1244823030-3586-1-git-send-email-jengelh@medozas.de>
Date: Fri, 12 Jun 2009 18:10:30 +0200
From: Jan Engelhardt <jengelh@...ozas.de>
To: mingo@...e.hu
Cc: hpa@...or.com, linux-kernel@...r.kernel.org
Subject: [PATCH] x86: restore MCE menuconfig indent
Commit v2.6.29-rc6-16-gb276268 "unthreaded/unindented" the MCE
options in menuconfig, this patch restores this.
Signed-off-by: Jan Engelhardt <jengelh@...ozas.de>
---
arch/x86/Kconfig | 12 ++++++++----
1 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
index df9e885..acf9b22 100644
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@ -776,10 +776,12 @@ config X86_MCE
to disable it. MCE support simply ignores non-MCE processors like
the 386 and 486, so nearly everyone can say Y here.
+if X86_MCE
+
config X86_MCE_INTEL
def_bool y
prompt "Intel MCE features"
- depends on X86_64 && X86_MCE && X86_LOCAL_APIC
+ depends on X86_64 && X86_LOCAL_APIC
---help---
Additional support for intel specific MCE features such as
the thermal monitor.
@@ -787,7 +789,7 @@ config X86_MCE_INTEL
config X86_MCE_AMD
def_bool y
prompt "AMD MCE features"
- depends on X86_64 && X86_MCE && X86_LOCAL_APIC
+ depends on X86_64 && X86_LOCAL_APIC
---help---
Additional support for AMD specific MCE features such as
the DRAM Error Threshold.
@@ -799,7 +801,7 @@ config X86_MCE_THRESHOLD
config X86_MCE_NONFATAL
tristate "Check for non-fatal errors on AMD Athlon/Duron / Intel Pentium 4"
- depends on X86_32 && X86_MCE
+ depends on X86_32
---help---
Enabling this feature starts a timer that triggers every 5 seconds which
will look at the machine check registers to see if anything happened.
@@ -812,11 +814,13 @@ config X86_MCE_NONFATAL
config X86_MCE_P4THERMAL
bool "check for P4 thermal throttling interrupt."
- depends on X86_32 && X86_MCE && (X86_UP_APIC || SMP)
+ depends on X86_32 && (X86_UP_APIC || SMP)
---help---
Enabling this feature will cause a message to be printed when the P4
enters thermal throttling.
+endif # X86_MCE
+
config VM86
bool "Enable VM86 support" if EMBEDDED
default y
--
1.6.3.2
--
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/
Powered by blists - more mailing lists